From 1398e556a19b36d7775e21d5ed6e387eb9d8b03f Mon Sep 17 00:00:00 2001
From: kumarabhirup <hey@kumareth.com>
Date: Tue, 3 Mar 2026 15:38:07 -0800
Subject: [PATCH] feat(api): register default agent in config on workspace
 switch

Call setDefaultAgentInConfig when switching workspaces so the gateway picks up the active workspace agent.
---
 apps/web/app/api/workspace/switch/route.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/web/app/api/workspace/switch/route.ts b/apps/web/app/api/workspace/switch/route.ts
index 5e6d9700122..8b18058649d 100644
--- a/apps/web/app/api/workspace/switch/route.ts
+++ b/apps/web/app/api/workspace/switch/route.ts
@@ -4,6 +4,7 @@ import {
   resolveOpenClawStateDir,
   resolveWorkspaceRoot,
   setUIActiveWorkspace,
+  setDefaultAgentInConfig,
 } from "@/lib/workspace";
 
 export const dynamic = "force-dynamic";
@@ -45,6 +46,7 @@ export async function POST(req: Request) {
   }
 
   setUIActiveWorkspace(requestedWorkspace);
+  setDefaultAgentInConfig(requestedWorkspace);
   const activeWorkspace = getActiveWorkspaceName();
   const selected = discoverWorkspaces().find((workspace) => workspace.name === activeWorkspace) ?? null;
   return Response.json({