fix(uninstall): refuse to remove current working directory during cleanup (#90813)

xydigit-sj · sallyom · web-flow · commit 743051d400ff · 2026-06-06T01:51:16.000-04:00
* fix(uninstall): refuse to remove current working directory during cleanup

* fix(uninstall): guard cleanup ancestors of cwd

---------

Co-authored-by: sallyom &lt;somalley@redhat.com&gt;
diff --git a/docs/install/uninstall.md b/docs/install/uninstall.md
@@ -21,7 +21,13 @@ openclaw uninstall
 
 When using the CLI, state removal preserves configured workspace directories unless you also select `--workspace`.
 
-Non-interactive (automation / npx):
+Preview what will be removed (safe):
+
+```bash
+openclaw uninstall --dry-run --all
+```
+
+Non-interactive (automation / npx). Use with caution and only after confirming scopes:
 
 ```bash
 openclaw uninstall --all --yes --non-interactive
diff --git a/src/commands/cleanup-utils.test.ts b/src/commands/cleanup-utils.test.ts
@@ -9,6 +9,7 @@ import type { RuntimeEnv } from "../runtime.js";
 import { withEnvAsync } from "../test-utils/env.js";
 import {
   buildCleanupPlan,
+  removePath,
   removeStateAndLinkedPaths,
   removeWorkspaceAttestationPaths,
   removeWorkspaceDirs,
@@ -201,4 +202,38 @@ describe("cleanup path removals", () => {
       await fs.rm(tmpRoot, { recursive: true, force: true });
     }
   });
+
+  it("refuses to remove the current working directory", async () => {
+    const runtime = createRuntimeMock();
+    const result = await removePath(process.cwd(), runtime, { dryRun: true });
+
+    expect(result.ok).toBe(false);
+    expect(result.skipped).toBeUndefined();
+    expect(runtime.error.mock.calls.length).toBe(1);
+    expect(runtime.error.mock.calls[0][0]).toMatch(/Refusing to remove unsafe path/);
+    expect(runtime.log.mock.calls.length).toBe(0);
+  });
+
+  it("refuses to remove a directory containing the current working directory", async () => {
+    const runtime = createRuntimeMock();
+    const tmpRoot = await fs.mkdtemp(path.join(os.tmpdir(), "openclaw-cleanup-cwd-"));
+    const nestedCwd = path.join(tmpRoot, "nested");
+    const cwdSpy = vi.spyOn(process, "cwd");
+
+    try {
+      await fs.mkdir(nestedCwd);
+      cwdSpy.mockReturnValue(nestedCwd);
+
+      const result = await removePath(tmpRoot, runtime, { dryRun: true });
+
+      expect(result.ok).toBe(false);
+      expect(result.skipped).toBeUndefined();
+      expect(runtime.error.mock.calls.length).toBe(1);
+      expect(runtime.error.mock.calls[0][0]).toMatch(/Refusing to remove unsafe path/);
+      expect(runtime.log.mock.calls.length).toBe(0);
+    } finally {
+      cwdSpy.mockRestore();
+      await fs.rm(tmpRoot, { recursive: true, force: true });
+    }
+  });
 });
diff --git a/src/commands/cleanup-utils.ts b/src/commands/cleanup-utils.ts
@@ -83,6 +83,9 @@ function isUnsafeRemovalTarget(target: string): boolean {
   if (home && resolved === path.resolve(home)) {
     return true;
   }
+  if (isPathWithin(path.resolve(process.cwd()), resolved)) {
+    return true;
+  }
   return false;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,9 @@ function isUnsafeRemovalTarget(target: string): boolean {`
`83`	`83`	`if (home && resolved === path.resolve(home)) {`
`84`	`84`	`return true;`
`85`	`85`	`}`
	`86`	`+ if (isPathWithin(path.resolve(process.cwd()), resolved)) {`
	`87`	`+ return true;`
	`88`	`+ }`
`86`	`89`	`return false;`
`87`	`90`	`}`
`88`	`91`