fix(uninstall): guard cleanup ancestors of cwd

sallyom · sallyom · commit 8cfb48d7d9e6 · 2026-06-06T01:01:22.000-04:00
diff --git a/src/commands/cleanup-utils.test.ts b/src/commands/cleanup-utils.test.ts
@@ -213,4 +213,27 @@ describe("cleanup path removals", () => {
     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,7 +83,7 @@ function isUnsafeRemovalTarget(target: string): boolean {
   if (home && resolved === path.resolve(home)) {
     return true;
   }
-  if (resolved === path.resolve(process.cwd())) {
+  if (isPathWithin(path.resolve(process.cwd()), resolved)) {
     return true;
   }
   return false;

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