fix(exec): expand tilde workdirs from OS home

vincentkoc · vincentkoc · commit 710e0eff9d98 · 2026-06-18T17:26:48.000+08:00
diff --git a/src/agents/bash-tools.shared.test.ts b/src/agents/bash-tools.shared.test.ts
@@ -7,7 +7,12 @@ import { mkdir, mkdtemp, rm } from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
 import { afterEach, describe, expect, it, vi } from "vitest";
-import { deriveSessionName, readEnvInt, resolveSandboxWorkdir } from "./bash-tools.shared.js";
+import {
+  deriveSessionName,
+  readEnvInt,
+  resolveSandboxWorkdir,
+  resolveWorkdir,
+} from "./bash-tools.shared.js";
 
 async function withTempDir(run: (dir: string) => Promise<void>) {
   const dir = await mkdtemp(path.join(os.tmpdir(), "openclaw-bash-workdir-"));
@@ -144,3 +149,26 @@ describe("deriveSessionName", () => {
     }
   });
 });
+
+describe("resolveWorkdir", () => {
+  afterEach(() => {
+    vi.unstubAllEnvs();
+  });
+
+  it("expands tilde using the OS home instead of OPENCLAW_HOME", async () => {
+    await withTempDir(async (root) => {
+      const osHome = path.join(root, "os-home");
+      const openclawHome = path.join(root, "openclaw-home");
+      const workspace = path.join(osHome, "workspace");
+      await mkdir(workspace, { recursive: true });
+      await mkdir(openclawHome, { recursive: true });
+      vi.stubEnv("HOME", osHome);
+      vi.stubEnv("OPENCLAW_HOME", openclawHome);
+
+      const warnings: string[] = [];
+
+      expect(resolveWorkdir("~/workspace", warnings)).toBe(workspace);
+      expect(warnings).toStrictEqual([]);
+    });
+  });
+});
diff --git a/src/agents/bash-tools.shared.ts b/src/agents/bash-tools.shared.ts
@@ -8,6 +8,7 @@ import fs from "node:fs/promises";
 import { homedir } from "node:os";
 import path from "node:path";
 import { parseStrictInteger } from "@openclaw/normalization-core/number-coercion";
+import { expandHomePrefix, resolveRequiredOsHomeDir } from "../infra/home-dir.js";
 import { sliceUtf16Safe } from "../utils.js";
 import { assertSandboxPath } from "./sandbox-paths.js";
 import type { SandboxBackendExecSpec } from "./sandbox/backend-handle.types.js";
@@ -181,18 +182,13 @@ function normalizeContainerPath(input: string): string {
 
 /** Resolves a host workdir, falling back to a safe cwd/home path with a warning. */
 export function resolveWorkdir(workdir: string, warnings: string[]) {
-  // Expand leading ~/ (or bare ~) to the user's home directory.
-  if (workdir.startsWith("~/")) {
-    workdir = homedir() + workdir.slice(1);
-  } else if (workdir === "~") {
-    workdir = homedir();
-  }
   const current = safeCwd();
   const fallback = current ?? homedir();
+  const expandedWorkdir = expandHomePrefix(workdir, { home: resolveRequiredOsHomeDir() });
   try {
-    const stats = statSync(workdir);
+    const stats = statSync(expandedWorkdir);
     if (stats.isDirectory()) {
-      return workdir;
+      return expandedWorkdir;
     }
   } catch {
     // ignore, fallback below
diff --git a/src/agents/bash-tools.test.ts b/src/agents/bash-tools.test.ts
@@ -27,7 +27,6 @@ import {
   type ProcessSession,
 } from "./bash-process-registry.js";
 import { createExecTool, createProcessTool } from "./bash-tools.js";
-import { resolveWorkdir } from "./bash-tools.shared.js";
 import { resolveShellFromPath, sanitizeBinaryOutput } from "./shell-utils.js";
 
 vi.mock("../infra/channel-summary.js", () => ({
@@ -1103,35 +1102,3 @@ describe("exec backgrounded onUpdate suppression", () => {
     isWin ? 10_000 : 5_000,
   );
 });
-
-describe("resolveWorkdir", () => {
-  // FIX #94434: tilde expansion - expanded ~/ no longer contains literal "~"
-  it("expands leading ~/ so warning shows expanded path not literal tilde", () => {
-    const warnings: string[] = [];
-    resolveWorkdir("~/nonexistent-94434-test", warnings);
-    expect(warnings.length).toBeGreaterThan(0);
-    // Warning must reference the expanded path, not the literal "~/"
-    expect(warnings[0]).not.toContain('"~/');
-    // Warning must contain the home directory
-    expect(warnings[0]).toContain("/home/");
-  });
-
-  // FIX #94434: bare ~ expands to homedir and succeeds when homedir exists
-  it("expands bare ~ to homedir successfully", () => {
-    const warnings: string[] = [];
-    const result = resolveWorkdir("~", warnings);
-    // ~ expands to homedir; homedir exists so no warning
-    expect(warnings).toHaveLength(0);
-    // Result is a non-empty string (the homedir path)
-    expect(result.length).toBeGreaterThan(0);
-    expect(result.startsWith("/home/") || result.startsWith("/root/")).toBe(true);
-  });
-
-  it("falls back with warning when absolute path does not exist", () => {
-    const warnings: string[] = [];
-    const result = resolveWorkdir("/nonexistent-94434-test-path", warnings);
-    expect(warnings.length).toBeGreaterThan(0);
-    expect(warnings[0]).toContain("Warning: workdir");
-    expect(result).toEqual(expect.any(String));
-  });
-});
