fix(openshell): upload staged workspace contents

vincentkoc · vincentkoc · commit d9034da0a606 · 2026-06-24T15:07:48.000+08:00
diff --git a/extensions/openshell/src/backend.e2e.test.ts b/extensions/openshell/src/backend.e2e.test.ts
@@ -382,7 +382,7 @@ function buildOpenShellPolicyYaml(params: {
 
 filesystem_policy:
   include_workdir: true
-  read_only: [/usr, /lib, /proc, /dev/urandom, /app, /etc, /var/log]
+  read_only: [/usr, /lib, /proc, /dev/urandom, /app, /etc, /var/log, /opt]
   read_write: [/sandbox, /tmp, /dev/null]
 
 landlock:
diff --git a/extensions/openshell/src/backend.ts b/extensions/openshell/src/backend.ts
@@ -45,6 +45,21 @@ type PendingExec = {
 };
 
 const MATERIALIZED_SKILLS_REMOTE_PARTS = [".openclaw", "sandbox-skills"] as const;
+export function buildOpenShellDirectoryUploadArgs(params: {
+  sandboxName: string;
+  localPath: string;
+  remotePath: string;
+}): string[] {
+  return [
+    "sandbox",
+    "upload",
+    "--no-git-ignore",
+    params.sandboxName,
+    params.localPath,
+    normalizeRemotePath(params.remotePath),
+  ];
+}
+
 export const PINNED_REMOTE_PATH_MUTATION_SCRIPT = [
   "set -eu",
   'die() { echo "$1" >&2; exit 1; }',
@@ -738,26 +753,26 @@ class OpenShellSandboxBackendImpl {
       async ({ dir: tmpDir }) => {
         // Stage a symlink-free snapshot so upload never dereferences host paths
         // outside the mirrored workspace tree.
-        const remoteRootName = path.posix.basename(remotePath);
+        const remoteRootName = path.posix.basename(normalizeRemotePath(remotePath));
         const stagedRoot = path.join(tmpDir, remoteRootName);
         await stageDirectoryContents({
           sourceDir: localPath,
           targetDir: stagedRoot,
         });
-        const result = await runOpenShellCli({
-          context: this.params.execContext,
-          args: [
-            "sandbox",
-            "upload",
-            "--no-git-ignore",
-            this.params.execContext.sandboxName,
-            stagedRoot,
-            path.posix.dirname(remotePath),
-          ],
-          cwd: this.params.createParams.workspaceDir,
-        });
-        if (result.code !== 0) {
-          throw new Error(result.stderr.trim() || "openshell sandbox upload failed");
+        const stagedEntries = (await fs.readdir(stagedRoot)).toSorted();
+        for (const entry of stagedEntries) {
+          const result = await runOpenShellCli({
+            context: this.params.execContext,
+            args: buildOpenShellDirectoryUploadArgs({
+              sandboxName: this.params.execContext.sandboxName,
+              localPath: path.join(stagedRoot, entry),
+              remotePath,
+            }),
+            cwd: this.params.createParams.workspaceDir,
+          });
+          if (result.code !== 0) {
+            throw new Error(result.stderr.trim() || "openshell sandbox upload failed");
+          }
         }
       },
     );
diff --git a/extensions/openshell/src/openshell-core.test.ts b/extensions/openshell/src/openshell-core.test.ts
@@ -29,6 +29,7 @@ const cliMocks = vi.hoisted(() => ({
 
 let createOpenShellSandboxBackendManager: typeof import("./backend.js").createOpenShellSandboxBackendManager;
 let createOpenShellSandboxBackendFactory: typeof import("./backend.js").createOpenShellSandboxBackendFactory;
+let buildOpenShellDirectoryUploadArgs: typeof import("./backend.js").buildOpenShellDirectoryUploadArgs;
 let ensureOpenShellRemoteRealDirectoryScript: typeof import("./backend.js").ENSURE_OPEN_SHELL_REMOTE_REAL_DIRECTORY_SCRIPT;
 
 describe("openshell cli helpers", () => {
@@ -172,6 +173,7 @@ describe("openshell backend manager", () => {
       };
     });
     ({
+      buildOpenShellDirectoryUploadArgs,
       ENSURE_OPEN_SHELL_REMOTE_REAL_DIRECTORY_SCRIPT: ensureOpenShellRemoteRealDirectoryScript,
       createOpenShellSandboxBackendFactory,
       createOpenShellSandboxBackendManager,
@@ -187,6 +189,30 @@ describe("openshell backend manager", () => {
     vi.clearAllMocks();
   });
 
+  it("uploads staged directory snapshots to the managed remote directory itself", () => {
+    expect(
+      buildOpenShellDirectoryUploadArgs({
+        sandboxName: "openclaw-session",
+        localPath: "/tmp/openclaw-upload/sandbox/seed.txt",
+        remotePath: "/sandbox",
+      }),
+    ).toEqual([
+      "sandbox",
+      "upload",
+      "--no-git-ignore",
+      "openclaw-session",
+      "/tmp/openclaw-upload/sandbox/seed.txt",
+      "/sandbox",
+    ]);
+    expect(
+      buildOpenShellDirectoryUploadArgs({
+        sandboxName: "openclaw-session",
+        localPath: "/tmp/openclaw-upload/project",
+        remotePath: "/sandbox/./project",
+      }).at(-1),
+    ).toBe("/sandbox/project");
+  });
+
   it.runIf(process.platform !== "win32")(
     "preserves caller positional args after OpenShell remote directory validation",
     async () => {
