fix(update): prefer package root as managed-service handoff cwd

ztexydt-cqh · ztexydt-cqh · commit 973c740cad0a · 2026-05-30T12:08:13.000+08:00
When a global install triggered an update from the Dashboard, the managed service handoff script fell back to os.homedir() as its working directory. This caused the update command (e.g. node dist/index.js update ...) to run in the wrong directory, so the relative entry path could not be resolved and the update silently failed after gateway restart. CLI updates bypass the handoff path and call runGatewayUpdate directly with the correct cwd, which is why they succeeded while Dashboard updates failed. Changes: - update-managed-service-handoff.ts: move root to the first candidate in resolveManagedServiceHandoffCwd so the handoff runs in the package root. - update-managed-service-handoff.test.ts: update test to assert cwd matches the provided root instead of os.homedir(). Fixes #87889
diff --git a/src/gateway/server-methods/update-managed-service-handoff.test.ts b/src/gateway/server-methods/update-managed-service-handoff.test.ts
@@ -135,8 +135,10 @@ describe("managed service update handoff", () => {
       KEEP_ME: "1",
     });
 
+    const handoffRoot = await fs.mkdtemp(path.join(os.tmpdir(), "openclaw-handoff-cwd-test-"));
+    tempDirs.add(handoffRoot);
     const result = await startManagedServiceUpdateHandoff({
-      root: "/tmp/openclaw",
+      root: handoffRoot,
       timeoutMs: 1_800_000,
       restartDelayMs: 500,
       parentPid: 12345,
@@ -171,8 +173,8 @@ describe("managed service update handoff", () => {
     };
     expect(helperParams.metaPath).toMatch(/sentinel-meta\.json$/u);
     expect(helperParams.sentinelPath).toMatch(/restart-sentinel\.json$/u);
-    expect(options.cwd).toBe(os.homedir());
-    expect(helperParams.cwd).toBe(os.homedir());
+    expect(options.cwd).toBe(handoffRoot);
+    expect(helperParams.cwd).toBe(handoffRoot);
     expect(options.detached).toBe(true);
     expect(options.env.KEEP_ME).toBe("1");
     for (const [key, value] of Object.entries(serviceIdentityEnv)) {
diff --git a/src/gateway/server-methods/update-managed-service-handoff.ts b/src/gateway/server-methods/update-managed-service-handoff.ts
@@ -306,7 +306,7 @@ export function stripSupervisorHintEnv(env: NodeJS.ProcessEnv): NodeJS.ProcessEn
 }
 
 async function resolveManagedServiceHandoffCwd(root: string): Promise<string> {
-  const candidates = [os.homedir(), os.tmpdir(), path.dirname(process.execPath), root];
+  const candidates = [root, os.homedir(), os.tmpdir(), path.dirname(process.execPath)];
   for (const candidate of candidates) {
     if (!candidate.trim()) {
       continue;

Original file line number	Diff line number	Diff line change
`@@ -306,7 +306,7 @@ export function stripSupervisorHintEnv(env: NodeJS.ProcessEnv): NodeJS.ProcessEn`
`306`	`306`	`}`
`307`	`307`
`308`	`308`	`async function resolveManagedServiceHandoffCwd(root: string): Promise<string> {`
`309`		`- const candidates = [os.homedir(), os.tmpdir(), path.dirname(process.execPath), root];`
	`309`	`+ const candidates = [root, os.homedir(), os.tmpdir(), path.dirname(process.execPath)];`
`310`	`310`	`for (const candidate of candidates) {`
`311`	`311`	`if (!candidate.trim()) {`
`312`	`312`	`continue;`