From 0159269a513ec8031ecc5d69bce2ab40a73ef2c9 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Fri, 13 Mar 2026 21:34:17 +0000
Subject: [PATCH] refactor: share openclaw tool sandbox config

---
 src/agents/openclaw-tools.ts | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/agents/openclaw-tools.ts b/src/agents/openclaw-tools.ts
index ea12b5121..25b5cae0f 100644
--- a/src/agents/openclaw-tools.ts
+++ b/src/agents/openclaw-tools.ts
@@ -87,15 +87,16 @@ export function createOpenClawTools(
     options?.spawnWorkspaceDir ?? options?.workspaceDir,
   );
   const runtimeWebTools = getActiveRuntimeWebToolsMetadata();
+  const sandbox =
+    options?.sandboxRoot && options?.sandboxFsBridge
+      ? { root: options.sandboxRoot, bridge: options.sandboxFsBridge }
+      : undefined;
   const imageTool = options?.agentDir?.trim()
     ? createImageTool({
         config: options?.config,
         agentDir: options.agentDir,
         workspaceDir,
-        sandbox:
-          options?.sandboxRoot && options?.sandboxFsBridge
-            ? { root: options.sandboxRoot, bridge: options.sandboxFsBridge }
-            : undefined,
+        sandbox,
         fsPolicy: options?.fsPolicy,
         modelHasVision: options?.modelHasVision,
       })
@@ -105,10 +106,7 @@ export function createOpenClawTools(
         config: options?.config,
         agentDir: options.agentDir,
         workspaceDir,
-        sandbox:
-          options?.sandboxRoot && options?.sandboxFsBridge
-            ? { root: options.sandboxRoot, bridge: options.sandboxFsBridge }
-            : undefined,
+        sandbox,
         fsPolicy: options?.fsPolicy,
       })
     : null;