Python
feat(memhub): delete-data and backup restore need the path typed twice
alvinfeiefe7df40489f
diff --git a/memhub/README.md b/memhub/README.mdindex 62e9f11..0c06ec2 100644--- a/memhub/README.md+++ b/memhub/README.md@@ -109,8 +109,8 @@ Node、Host Bridge 或模型。用户显式执行 `memhub install` 后,CLI 才Python Core 和运行所需的 Python 依赖位于 MemHub 受管 Runtime,不写入系统 Python。MemHub 的 SQLite 数据默认位于 `~/.one-memory`,不在 npm 包或 Runtime 版本目录中。`npm uninstall` 只移除 npm CLI;`memhub uninstall` 移除服务、受管 Runtime 和 CLI 链接,-默认保留 Memory。只有独立的 `memhub delete-data` 在 Runtime 停止且显式加 `--yes` 后-才会删除数据(不加 `--yes` 只预览要删除的目录)。`memhub stop` 停止受管服务时也会关闭+默认保留 Memory。只有独立的 `memhub delete-data` 在 Runtime 停止、显式加 `--yes` 并用+`--confirm <数据目录>` 再写一遍同一个目录后才会删除数据(不加参数只预览要删除的目录)。`memhub stop` 停止受管服务时也会关闭登录自动启动,再次 `memhub start` 会恢复。当前平台能力和安装边界以源码、CI 与发布说明为准。未完成真机验收的平台不会仅凭跨平台diff --git a/memhub/apps/cli/src/cli.test.ts b/memhub/apps/cli/src/cli.test.tsindex 0053315..a2d39bc 100644--- a/memhub/apps/cli/src/cli.test.ts+++ b/memhub/apps/cli/src/cli.test.ts@@ -1,4 +1,11 @@-import { mkdtemp, readdir, readFile, realpath, rm } from "node:fs/promises";+import {+ mkdir,+ mkdtemp,+ readdir,+ readFile,+ realpath,+ rm,+} from "node:fs/promises";import { tmpdir } from "node:os";import path from "node:path";import {@@ -2793,11 +2800,67 @@ describe("backup restore drives the Core managed-restore contract", () => {state: "preview",target: "/tmp/x",applied: false,- next_step: "memhub backup restore --source /tmp/x --yes",+ next_step: "memhub backup restore --source /tmp/x --yes --confirm /tmp/x",});});- it("restores with --yes alone (no second path confirmation)", async () => {+ it("deletes data only when --confirm repeats the data directory", async () => {+ const home = await mkdtemp(path.join(tmpdir(), "memhub-delete-home-"));+ const dataDir = path.join(home, ".one-memory");+ await mkdir(path.join(dataDir, "logs"), { recursive: true });+ const deleteData = async (...extra: string[]) => {+ const output = captureStdout();+ try {+ const code = await run(+ ["delete-data", "--data-dir", dataDir, ...extra, "--json"],+ { HOME: home },+ );+ return { code, document: JSON.parse(output.value()) };+ } finally {+ output.restore();+ }+ };+ try {+ const refused = await deleteData("--yes");+ expect(refused.code).toBe(4);+ expect(refused.document).toMatchObject({+ state: "blocked",+ code: "data_deletion_confirmation_required",+ });+ expect(await readdir(dataDir)).toEqual(["logs"]);++ const deleted = await deleteData("--yes", "--confirm", dataDir);+ expect(deleted.code).toBe(0);+ expect(await readdir(dataDir).catch(() => [])).toEqual([]);+ } finally {+ await rm(home, { recursive: true, force: true });+ }+ });++ it("refuses --yes without repeating the backup path", async () => {+ const maintenance = vi.fn();+ const output = captureStdout();+ let code: number;+ try {+ code = await run(+ ["backup", "restore", "--source", "/tmp/x", "--yes", "--json"],+ {},+ { runMaintenanceRestore: maintenance },+ );+ } finally {+ output.restore();+ }+ expect(code!).toBe(4);+ expect(maintenance).not.toHaveBeenCalled();+ expect(JSON.parse(output.value())).toMatchObject({+ state: "rejected",+ code: "backup_restore_confirmation_required",+ next_step:+ "恢复需要再写一遍备份路径:memhub backup restore --source /tmp/x --yes --confirm /tmp/x",+ });+ });++ it("restores with --yes and the repeated backup path", async () => {const maintenance = vi.fn(async () => ({state: "restored" as const,result: {@@ -2811,7 +2874,16 @@ describe("backup restore drives the Core managed-restore contract", () => {let code: number;try {code = await run(- ["backup", "restore", "--source", "/tmp/x", "--yes", "--json"],+ [+ "backup",+ "restore",+ "--source",+ "/tmp/x",+ "--yes",+ "--confirm",+ "/tmp/x",+ "--json",+ ],{},{ runMaintenanceRestore: maintenance },);diff --git a/memhub/apps/cli/src/cli.ts b/memhub/apps/cli/src/cli.tsindex 3679198..094531c 100644--- a/memhub/apps/cli/src/cli.ts+++ b/memhub/apps/cli/src/cli.ts@@ -2996,7 +2996,7 @@ async function runCommand(apply: false,...(plan.state === "preview"? {- next_step: `确认要永久删除这个数据目录后运行:${PRODUCT} delete-data --data-dir ${dataDir} --yes`,+ next_step: `确认要永久删除这个数据目录后运行(--confirm 必须再写一遍同一个目录):${PRODUCT} delete-data --data-dir ${dataDir} --yes --confirm ${dataDir}`,}: {}),},@@ -3012,12 +3012,27 @@ async function runCommand();return EXIT_PLAN_BLOCKED;}- try {- // A legacy `--confirm <path>` must still name this exact directory.- const receipt = await applyDataDeletion(- plan,- parsed.confirmPath ?? plan.data_dir,+ if (parsed.confirmPath === undefined) {+ // Deleting every memory is the one action with no way back: `--yes`+ // alone is not enough, the directory has to be typed a second time.+ process.stdout.write(+ `${JSON.stringify(+ {+ ...plan,+ state: "blocked",+ apply: false,+ code: "data_deletion_confirmation_required",+ next_step: `删除需要再写一遍数据目录:${PRODUCT} delete-data --data-dir ${plan.data_dir} --yes --confirm ${plan.data_dir}`,+ },+ null,+ 2,+ )}\n`,);+ return EXIT_PLAN_BLOCKED;+ }+ try {+ // `--confirm <path>` must name this exact directory.+ const receipt = await applyDataDeletion(plan, parsed.confirmPath);await removeInstallReceipt(defaultInstallReceiptPath(environment.HOME ?? os.homedir()),);@@ -3469,7 +3484,7 @@ async function applyBackupRestore(if (!restoreConfirmationMatches(parsed.source, parsed.confirmPath)) {return refuse("backup_restore_confirmation_mismatch",- `--confirm 必须与 --source 相同;也可以去掉 --confirm:${PRODUCT} backup restore --source ${parsed.source} --yes`,+ `--confirm 必须与 --source 相同:${PRODUCT} backup restore --source ${parsed.source} --yes --confirm ${parsed.source}`,);}if (!parsed.confirmed) {@@ -3478,9 +3493,18 @@ async function applyBackupRestore(target: parsed.source,effect:"用这份受管备份覆盖当前主库(来源、写入队列、配置);先自动做一份保护性备份。SDK 记忆库 hy-memory/ 不会被替换。需要 Runtime 已停止",- retry: `${PRODUCT} backup restore --source ${parsed.source} --yes`,+ retry: `${PRODUCT} backup restore --source ${parsed.source} --yes --confirm ${parsed.source}`,});}+ if (parsed.confirmPath === undefined) {+ // Restoring overwrites the live database: the backup has to be named a+ // second time, the same rule as delete-data.+ return refuse(+ "backup_restore_confirmation_required",+ `恢复需要再写一遍备份路径:${PRODUCT} backup restore --source ${parsed.source} --yes --confirm ${parsed.source}`,+ EXIT_PLAN_BLOCKED,+ );+ }const config = resolveRuntimeCliConfig(environment, process.argv[1]);const status = await inspectRuntimeStatus({dataDir: config.dataDir,@@ -6449,8 +6473,8 @@ function serviceDataDirectory(return value;}-/** Parse `delete-data`: preview by default; `--yes` alone still only previews- * unless `--confirm <path>` repeats the exact directory. */+/** Parse `delete-data`: preview by default; deleting needs `--yes` AND+ * `--confirm <path>` repeating the exact directory (`--yes` alone is refused). */function parseDataDeletionCommand(arguments_: readonly string[],): { dataDir?: string; confirmed: boolean; confirmPath?: string } | null {diff --git a/memhub/apps/cli/src/command-catalog.ts b/memhub/apps/cli/src/command-catalog.tsindex 2dcb58e..e73cf63 100644--- a/memhub/apps/cli/src/command-catalog.ts+++ b/memhub/apps/cli/src/command-catalog.ts@@ -555,14 +555,24 @@ export const COMMANDS: readonly CommandDescriptor[] = [{name: "delete-data",summary:- "删除 MemHub 数据目录(记忆、来源、配置),不可逆。这是唯一会删除数据的命令;uninstall 不会。需要 Runtime 已停止;不加 --yes 时只预览要删除的目录。",- usage: "memhub delete-data [--data-dir <path>] [--yes] [--json]",+ "删除 MemHub 数据目录(记忆、来源、配置),不可逆。这是唯一会删除数据的命令;uninstall 不会。需要 Runtime 已停止;不加参数时只预览要删除的目录;删除需要 --yes 并用 --confirm 再写一遍同一个目录。",+ usage:+ "memhub delete-data [--data-dir <path>] [--yes --confirm <path>] [--json]",options: [{flag: "--data-dir <path>",summary: "要删除的数据目录绝对路径;默认当前使用的数据目录。",},- DESTRUCTIVE_CONFIRM_OPTION,+ {+ ...DESTRUCTIVE_CONFIRM_OPTION,+ summary:+ "删除时必须加,且要同时给出 --confirm <path>;不加时只预览,exit 0。",+ },+ {+ flag: "--confirm <path>",+ summary:+ "删除时必须加:再写一遍要删除的数据目录,与预览中的目录完全一致才执行。",+ },JSON_OPTION,],exit_codes: [EXIT_OK, EXIT_FAILED, EXIT_USAGE, EXIT_PLAN_BLOCKED],@@ -663,10 +673,10 @@ export const COMMANDS: readonly CommandDescriptor[] = [{name: "backup",summary:- "备份与恢复主库(来源、写入队列、配置)。注意:不包含记忆本身——SDK 记忆库 hy-memory/ 不在备份里,restore 也不会替换它。create 的目标要放在 <数据目录>/backups/ 下才能被 restore 使用;restore 覆盖现有主库,需 Runtime 已停止并加 --yes。",+ "备份与恢复主库(来源、写入队列、配置)。注意:不包含记忆本身——SDK 记忆库 hy-memory/ 不在备份里,restore 也不会替换它。create 的目标要放在 <数据目录>/backups/ 下才能被 restore 使用;restore 覆盖现有主库,需 Runtime 已停止,并加 --yes 与 --confirm <同一个备份路径>。",usage:"memhub backup create --target <path> [--json]\n" +- " memhub backup restore --source <path> [--yes] [--json]",+ " memhub backup restore --source <path> [--yes --confirm <path>] [--json]",options: [{flag: "--target <path>",@@ -679,7 +689,13 @@ export const COMMANDS: readonly CommandDescriptor[] = [},{...DESTRUCTIVE_CONFIRM_OPTION,- summary: "restore 必须加;create 不需要。",+ summary:+ "restore 必须加,且要同时给出 --confirm <path>;create 不需要。",+ },+ {+ flag: "--confirm <path>",+ summary:+ "restore 必须加:再写一遍 --source 的备份路径,完全一致才执行。",},JSON_OPTION,],diff --git a/memhub/apps/cli/src/command-contract.test.ts b/memhub/apps/cli/src/command-contract.test.tsindex dcd47f5..7c2508c 100644--- a/memhub/apps/cli/src/command-contract.test.ts+++ b/memhub/apps/cli/src/command-contract.test.ts@@ -257,10 +257,16 @@ describe("CLI-22 shared output contract", () => {}expect(general.stdout()).toContain("确认约定");for (const [command, usage] of [- ["backup", "memhub backup restore --source <path> [--yes]"],+ [+ "backup",+ "memhub backup restore --source <path> [--yes --confirm <path>]",+ ],["memories", "memhub memories delete <memory-id>"],["models", "memhub models remove <profile-id> [--yes]"],- ["delete-data", "memhub delete-data [--data-dir <path>] [--yes]"],+ [+ "delete-data",+ "memhub delete-data [--data-dir <path>] [--yes --confirm <path>]",+ ],["graph-width", "[--yes]"],] as const) {const streams = captureStreams();@@ -270,7 +276,10 @@ describe("CLI-22 shared output contract", () => {streams.restore();}expect(streams.stdout()).toContain(usage);- expect(streams.stdout()).not.toContain("--confirm <path>");+ // Only the two commands with no way back repeat the target path.+ if (command !== "backup" && command !== "delete-data") {+ expect(streams.stdout()).not.toContain("--confirm <path>");+ }}});diff --git a/memhub/apps/cli/src/usage.ts b/memhub/apps/cli/src/usage.tsindex e53c002..92cf0c6 100644--- a/memhub/apps/cli/src/usage.ts+++ b/memhub/apps/cli/src/usage.ts@@ -42,7 +42,7 @@ export function renderGeneralHelp(): string {(exit) => ` ${exit.code} ${pad(exit.name, 17)}${exit.summary}`,),"",- "确认约定:只有不可逆操作(memories delete、models remove、delete-data、backup restore、graph-width --decision rebuild_with_new)需要 --yes;不加时只说明将要做什么,不做任何改动,exit 0。install/upgrade/uninstall/service-install/service-uninstall 不加 --yes 时只出计划。其它写命令直接执行。",+ "确认约定:只有不可逆操作(memories delete、models remove、delete-data、backup restore、graph-width --decision rebuild_with_new)需要 --yes;不加时只说明将要做什么,不做任何改动,exit 0。delete-data 与 backup restore 还要用 --confirm <path> 再写一遍目标路径。install/upgrade/uninstall/service-install/service-uninstall 不加 --yes 时只出计划。其它写命令直接执行。","异步操作返回 ID,用对应命令查进度:sources receipt、models receipt、memories add-status、write status。","目前仅支持 macOS 与 Linux 连接本机 Runtime。","stdout 只输出数据,进度与诊断写入 stderr。",diff --git a/memhub/docs/cli/EXPERIENCE.md b/memhub/docs/cli/EXPERIENCE.mdindex 20655fb..383ffca 100644--- a/memhub/docs/cli/EXPERIENCE.md+++ b/memhub/docs/cli/EXPERIENCE.md@@ -115,7 +115,7 @@ node apps/cli/dist/one-memory.cjs write status <request_id> --json```bashnode apps/cli/dist/one-memory.cjs backup create --target <数据目录>/backups/<文件名> --jsonnode apps/cli/dist/one-memory.cjs backup restore --source <数据目录>/backups/<文件名> # 预览-node apps/cli/dist/one-memory.cjs backup restore --source <数据目录>/backups/<文件名> --yes # 执行+node apps/cli/dist/one-memory.cjs backup restore --source <数据目录>/backups/<文件名> --yes --confirm <数据目录>/backups/<文件名> # 执行```备份只包含主库(来源、写入队列、配置),**不包含记忆本身**(`hy-memory/`)。目标必须在@@ -145,7 +145,8 @@ node apps/cli/dist/one-memory.cjs sync resume --source codex只有不可逆操作需要 `--yes`:`memories delete`、`models remove`、`delete-data`、`backup restore`、`graph-width --decision rebuild_with_new`。不加时只说明将要做什么,不做任何-改动(exit 0)。install / upgrade / uninstall / service-install / service-uninstall 不加 `--yes`+改动(exit 0)。`delete-data` 和 `backup restore` 还要用 `--confirm <路径>` 再写一遍目标(数据目录 /+备份文件),只加 `--yes` 会被拒绝。install / upgrade / uninstall / service-install / service-uninstall 不加 `--yes`时只出计划。其它写命令直接执行。## 12. 卸载(保留数据)