diff --git a/gateway/src/harness/agent-harness.ts b/gateway/src/harness/agent-harness.ts
index 1163b7b8..af6bf6b9 100644
--- a/gateway/src/harness/agent-harness.ts
+++ b/gateway/src/harness/agent-harness.ts
@@ -902,7 +902,13 @@ export class AgentHarness {
       'main',
       this.mcpClient,
       this.availableMCPTools,
-      this.workspaceManager
+      this.workspaceManager,
+      undefined, // no image callback
+      (storeName, newState) => {
+        this.workspaceManager?.setState(storeName, newState).catch((err) =>
+          this.config.logger.error({ err, storeName }, 'Failed to sync workspace after main agent mutation')
+        );
+      }
     );
 
     // Build shared subagent context