fix(uninstall): exit nonzero when the gateway registration cannot be removed

src/lib/actions/uninstall/run-plan-gateway-segregation.test.ts

@@ -213,6 +213,9 @@ describe("uninstall gateway-port segregation (#3053)", () => {
 
   it("does not use legacy gateway destroy when external registration removal is unsupported (#6576)", () => {
     const calls: Array<{ args: string[]; command: string }> = [];
+    const logs: string[] = [];
+    const rmSync = vi.fn();
+    const warnings: string[] = [];
     const responses = new Map<string, RunResult>([
       ["openshell gateway list -o json", ok(JSON.stringify([{ name: "nemoclaw" }]))],
       [
@@ -241,7 +244,9 @@ describe("uninstall gateway-port segregation (#3053)", () => {
           },
           requiredCapabilities: [],
         }),
-        rmSync: vi.fn(),
+        error: (line) => warnings.push(line),
+        log: (line) => logs.push(line),
+        rmSync,
         run: (command, args) => {
           calls.push({ args, command });
           return responses.get([command, ...args].join(" ")) ?? ok();
@@ -250,12 +255,18 @@ describe("uninstall gateway-port segregation (#3053)", () => {
       },
     );
 
-    expect(result.exitCode).toBe(0);
+    expect(result.exitCode).toBe(1);
     const openshellCalls = calls
       .filter(({ command }) => command === "openshell")
       .map(({ args }) => args);
     expect(openshellCalls).toContainEqual(["gateway", "remove", "nemoclaw"]);
     expect(openshellCalls).not.toContainEqual(["gateway", "destroy", "-g", "nemoclaw"]);
+    expect(warnings).toContain(
+      "Could not remove local registration for externally supervised gateway 'nemoclaw'. NemoClaw will not use the legacy gateway destroy command for an externally supervised gateway.",
+    );
+    expect(rmSync).not.toHaveBeenCalled();
+    expect(logs).not.toContain("[3/6] NemoClaw CLI");
+    expect(logs).not.toContain("Claws retracted. Until next time.");
   });
 
   it("fails before uninstall effects when gateway authority revalidation fails (#6576)", () => {
@@ -317,37 +328,103 @@ describe("uninstall gateway-port segregation (#3053)", () => {
     expect(openshellCalls).toContainEqual(["gateway", "destroy", "-g", "nemoclaw"]);
   });
 
-  it("does not hide a current gateway remove failure behind the legacy verb", () => {
+  it.each(["permission denied", "gateway service endpoint not found"])(
+    "does not hide a current gateway remove failure reported as %s behind the legacy verb",
+    (diagnostic) => {
+      const calls: Array<{ args: string[]; command: string }> = [];
+      const logs: string[] = [];
+      const rmSync = vi.fn();
+      const warnings: string[] = [];
+      const responses = new Map<string, RunResult>([
+        ["openshell gateway list -o json", ok(JSON.stringify([{ name: "nemoclaw" }]))],
+        ["openshell gateway remove nemoclaw", { status: 1, stdout: "", stderr: diagnostic }],
+      ]);
+      const result = runUninstallPlan(
+        { assumeYes: true, deleteModels: false, keepOpenShell: true },
+        {
+          commandExists: (command) => command !== "docker" && command !== "pgrep",
+          env: { HOME: STATIC_TEST_HOME, TMPDIR: "/tmp/test" } as NodeJS.ProcessEnv,
+          error: (line) => warnings.push(line),
+          existsSync: () => false,
+          isTty: false,
+          log: (line) => logs.push(line),
+          rmSync,
+          run: (command, args) => {
+            calls.push({ args, command });
+            return responses.get([command, ...args].join(" ")) ?? ok();
+          },
+          runDocker: () => ok(""),
+        },
+      );
+
+      expect(result.exitCode).toBe(1);
+      const openshellCalls = calls
+        .filter(({ command }) => command === "openshell")
+        .map(({ args }) => args);
+      expect(openshellCalls).toContainEqual(["gateway", "remove", "nemoclaw"]);
+      expect(openshellCalls.some((args) => args[1] === "destroy")).toBe(false);
+      expect(warnings).toContain(
+        "Could not remove gateway registration 'nemoclaw': openshell gateway remove failed (exit 1).",
+      );
+      expect(warnings).not.toContain("Gateway 'nemoclaw' already removed or unreachable");
+      expect(rmSync).not.toHaveBeenCalled();
+      expect(logs).not.toContain("[3/6] NemoClaw CLI");
+      expect(logs).not.toContain("Claws retracted. Until next time.");
+    },
+  );
+
+  it("fails closed when the legacy gateway destroy command fails", () => {
     const calls: Array<{ args: string[]; command: string }> = [];
+    const logs: string[] = [];
+    const rmSync = vi.fn();
     const warnings: string[] = [];
     const responses = new Map<string, RunResult>([
       ["openshell gateway list -o json", ok(JSON.stringify([{ name: "nemoclaw" }]))],
-      ["openshell gateway remove nemoclaw", { status: 1, stdout: "", stderr: "permission denied" }],
+      [
+        "openshell gateway remove nemoclaw",
+        { status: 2, stdout: "", stderr: "unrecognized subcommand 'remove'" },
+      ],
+      [
+        "openshell gateway destroy -g nemoclaw",
+        {
+          status: 1,
+          stdout: "",
+          stderr: "connection refused; OPENAI_API_KEY=must-not-be-logged",
+        },
+      ],
     ]);
     const result = runUninstallPlan(
       { assumeYes: true, deleteModels: false, keepOpenShell: true },
       {
         commandExists: (command) => command !== "docker" && command !== "pgrep",
         env: { HOME: STATIC_TEST_HOME, TMPDIR: "/tmp/test" } as NodeJS.ProcessEnv,
+        error: (line) => warnings.push(line),
         existsSync: () => false,
         isTty: false,
-        rmSync: vi.fn(),
+        log: (line) => logs.push(line),
+        rmSync,
         run: (command, args) => {
           calls.push({ args, command });
           return responses.get([command, ...args].join(" ")) ?? ok();
         },
         runDocker: () => ok(""),
-        error: (line) => warnings.push(line),
       },
     );
 
-    expect(result.exitCode).toBe(0);
+    expect(result.exitCode).toBe(1);
     const openshellCalls = calls
       .filter(({ command }) => command === "openshell")
       .map(({ args }) => args);
     expect(openshellCalls).toContainEqual(["gateway", "remove", "nemoclaw"]);
-    expect(openshellCalls.some((args) => args[1] === "destroy")).toBe(false);
-    expect(warnings.join("\n")).toContain("Gateway 'nemoclaw' already removed or unreachable");
+    expect(openshellCalls).toContainEqual(["gateway", "destroy", "-g", "nemoclaw"]);
+    expect(warnings).toContain(
+      "Could not remove gateway registration 'nemoclaw': openshell gateway destroy failed (connection refused; exit 1).",
+    );
+    expect(warnings.join("\n")).not.toContain("must-not-be-logged");
+    expect(warnings).not.toContain("Gateway 'nemoclaw' already removed or unreachable");
+    expect(rmSync).not.toHaveBeenCalled();
+    expect(logs).not.toContain("[3/6] NemoClaw CLI");
+    expect(logs).not.toContain("Claws retracted. Until next time.");
   });
 
   it("preserves the gateways/ subtree so uninstalling one environment leaves the others", () => {

src/lib/actions/uninstall/run-plan-portable-leftover-state.test.ts

@@ -315,7 +315,18 @@ describe("uninstall on a host that owns no portable lifecycle resource", () => {
     const result = uninstall(host);
 
     expect(result.exitCode).toBe(0);
-    expect(host.rmSync.mock.calls.map(([target]) => String(target))).toContain(host.stateDir);
+    const removedPaths = host.rmSync.mock.calls.map(([target]) => String(target));
+    const stagedCleanupPrefix = path.join(
+      path.dirname(host.stateDir),
+      `.${path.basename(host.stateDir)}-cleanup-`,
+    );
+    expect(
+      removedPaths.some(
+        (target) => target.startsWith(stagedCleanupPrefix) && path.basename(target) === "content",
+      ),
+    ).toBe(true);
+    expect(removedPaths).not.toContain(host.stateDir);
+    expect(fs.existsSync(host.stateDir)).toBe(false);
   });
 
   it("refuses an unknown portable uninstall artifact in the configuration directory (#9581)", () => {

src/lib/actions/uninstall/run-plan-preserved-registry.test.ts

@@ -46,50 +46,6 @@ function runUninstallPlan(options: UninstallRunOptions, deps: UninstallRunDeps)
   });
 }
 
-function okWithKnownGatewayList(command: string, args: readonly string[]): RunResult {
-  return command === "openshell" && args[0] === "gateway" && args[1] === "list"
-    ? ok(JSON.stringify([{ name: "nemoclaw" }]))
-    : ok();
-}
-
-function setupStateDir(): { tmpHome: string; stateDir: string } {
-  const tmpHome = fs.mkdtempSync(path.join(os.tmpdir(), "nemoclaw-uninstall-registry-"));
-  const stateDir = path.join(tmpHome, ".nemoclaw");
-  fs.mkdirSync(path.join(stateDir, "rebuild-backups"), { recursive: true });
-  fs.mkdirSync(path.join(stateDir, "backups"), { recursive: true });
-  fs.writeFileSync(
-    path.join(stateDir, "sandboxes.json"),
-    JSON.stringify({
-      defaultSandbox: "preserved-box",
-      sandboxes: { "preserved-box": { name: "preserved-box" } },
-    }),
-  );
-  return { tmpHome, stateDir };
-}
-
-function preserveCaseDeps(
-  tmpHome: string,
-  logs: string[],
-  warnings: string[],
-  opts: { envOverrides?: Record<string, string> } = {},
-): UninstallRunDeps {
-  return {
-    commandExists: (command) => command === "openshell",
-    env: {
-      HOME: tmpHome,
-      NEMOCLAW_NON_INTERACTIVE: "",
-      NEMOCLAW_UNINSTALL_DESTROY_USER_DATA: "",
-      ...(opts.envOverrides ?? {}),
-    } as NodeJS.ProcessEnv,
-    error: (line) => warnings.push(line),
-    existsSync: (target: string) => target.startsWith(tmpHome) && fs.existsSync(target),
-    isTty: false,
-    log: (line) => logs.push(line),
-    run: vi.fn(okWithKnownGatewayList),
-    runDocker: () => ok(""),
-  };
-}
-
 describe("uninstall messaging for a preserved-but-orphaned sandbox registry (#6520)", () => {
   it("uses the 'already removed' wording for provider and sandbox delete no-ops", () => {
     // Same defect family as the gateway wording fix (#3456 sub-bug 4): when
@@ -111,6 +67,11 @@ describe("uninstall messaging for a preserved-but-orphaned sandbox registry (#65
         run: (command, args) =>
           command === "openshell" && args[0] === "gateway" && args[1] === "list"
             ? ok(JSON.stringify([{ name: "nemoclaw" }]))
+            : command === "openshell" &&
+                args[0] === "gateway" &&
+                args[1] === "remove" &&
+                args[2] === "nemoclaw"
+              ? ok()
             : command === "openshell"
               ? notFound()
               : args[0] === "-c"
@@ -127,72 +88,4 @@ describe("uninstall messaging for a preserved-but-orphaned sandbox registry (#65
     expect(combined).not.toContain("Deleted provider 'nvidia-nim' skipped");
     expect(combined).not.toContain("Deleted all OpenShell sandboxes skipped");
   });
-
-  it("warns that preserved sandboxes.json cannot be auto-recovered after uninstall removes its dependencies", () => {
-    // Uninstall keeps sandboxes.json but removes the gateway, provider
-    // registrations, and Docker image its recorded sandboxes depend on. Say
-    // so at the moment the preserve choice is made, with a remediation path,
-    // instead of letting a later reinstall report false success.
-    const { tmpHome } = setupStateDir();
-    try {
-      const logs: string[] = [];
-      const warnings: string[] = [];
-      const result = runUninstallPlan(
-        { assumeYes: true, deleteModels: false, keepOpenShell: true },
-        preserveCaseDeps(tmpHome, logs, warnings),
-      );
-
-      expect(result.exitCode).toBe(0);
-      const joined = warnings.join("\n");
-      expect(joined).toContain("sandboxes.json");
-      expect(joined).toContain("cannot be recovered automatically");
-      expect(joined).toContain("--destroy-user-data");
-    } finally {
-      fs.rmSync(tmpHome, { recursive: true, force: true });
-    }
-  });
-
-  it("warns on the interactive keep path when the purge prompt is declined", () => {
-    const { tmpHome } = setupStateDir();
-    try {
-      const logs: string[] = [];
-      const warnings: string[] = [];
-      // First reply confirms the uninstall itself; the empty second reply
-      // declines the purge prompt, keeping user data.
-      const replies = ["yes", ""];
-      const result = runUninstallPlan(
-        { assumeYes: false, deleteModels: false, keepOpenShell: true },
-        {
-          ...preserveCaseDeps(tmpHome, logs, warnings),
-          isTty: true,
-          readLine: () => replies.shift() ?? null,
-        },
-      );
-
-      expect(result.exitCode).toBe(0);
-      expect(logs).toContain("Keeping user data.");
-      expect(warnings.join("\n")).toContain("cannot be recovered automatically");
-    } finally {
-      fs.rmSync(tmpHome, { recursive: true, force: true });
-    }
-  });
-
-  it("does not warn about unrecoverable sandboxes when user data is purged", () => {
-    const { tmpHome } = setupStateDir();
-    try {
-      const logs: string[] = [];
-      const warnings: string[] = [];
-      const result = runUninstallPlan(
-        { assumeYes: true, deleteModels: false, keepOpenShell: true },
-        preserveCaseDeps(tmpHome, logs, warnings, {
-          envOverrides: { NEMOCLAW_UNINSTALL_DESTROY_USER_DATA: "1" },
-        }),
-      );
-
-      expect(result.exitCode).toBe(0);
-      expect(warnings.join("\n")).not.toContain("cannot be recovered automatically");
-    } finally {
-      fs.rmSync(tmpHome, { recursive: true, force: true });
-    }
-  });
 });