diff --git a/packages/server/agents.json b/packages/server/agents.json
index d82a09105..0637a088a 100644
--- a/packages/server/agents.json
+++ b/packages/server/agents.json
@@ -1,50 +1 @@
-[
-  {
-    "id": "2ecc51dc-8f52-43ab-8637-4ba46f32394a",
-    "title": "Finish Agent Chat Image Upload",
-    "sessionId": "019a1d14-12ca-76eb-9223-d7d01300dc92",
-    "options": {
-      "type": "claude",
-      "sessionId": null
-    },
-    "createdAt": "2025-10-25T20:34:05.716Z",
-    "lastActivityAt": "2025-10-25T20:37:53.588Z",
-    "cwd": "/Users/moboudra/dev/voice-dev"
-  },
-  {
-    "id": "e46d161a-e62f-4ab4-aacc-a25c7150762f",
-    "title": "Add Press Feedback to Global Footer",
-    "sessionId": "823b28b2-c1b6-4418-bda8-b159326c475a",
-    "options": {
-      "type": "claude",
-      "sessionId": "823b28b2-c1b6-4418-bda8-b159326c475a"
-    },
-    "createdAt": "2025-10-25T20:40:58.222Z",
-    "lastActivityAt": "2025-10-25T20:40:58.222Z",
-    "cwd": "/Users/moboudra/dev/voice-dev"
-  },
-  {
-    "id": "d97317df-8572-40ef-9513-72b1bcacec5d",
-    "title": "Agent d97317df",
-    "sessionId": "019a1f22-1604-7698-a517-72f5d09d4173",
-    "options": {
-      "type": "claude",
-      "sessionId": null
-    },
-    "createdAt": "2025-10-26T06:08:38.234Z",
-    "lastActivityAt": "2025-10-26T06:08:38.234Z",
-    "cwd": "/Users/moboudra/dev/voice-dev"
-  },
-  {
-    "id": "ee685172-a0c4-4575-a4c4-ad6b10e380a3",
-    "title": "Agent ee685172",
-    "sessionId": "546da3f3-0d5e-42b5-b541-1c853ac5de4b",
-    "options": {
-      "type": "claude",
-      "sessionId": "546da3f3-0d5e-42b5-b541-1c853ac5de4b"
-    },
-    "createdAt": "2025-10-26T06:21:26.065Z",
-    "lastActivityAt": "2025-10-26T06:21:26.065Z",
-    "cwd": "/var/folders/xl/kkk9drfd3ms_t8x7rmy4z6900000gn/T/acp-test-CHqB3A"
-  }
-]
\ No newline at end of file
+[]
\ No newline at end of file
diff --git a/packages/server/src/server/acp/agent-manager.ts b/packages/server/src/server/acp/agent-manager.ts
index 089309ec6..8d8ace904 100644
--- a/packages/server/src/server/acp/agent-manager.ts
+++ b/packages/server/src/server/acp/agent-manager.ts
@@ -1115,6 +1115,17 @@ export class AgentManager {
         agent.currentAssistantMessageId = null;
         agent.currentThoughtId = null;
       }
+
+      // Handle mode changes
+      if (update.update.sessionUpdate === "current_mode_update") {
+        const newModeId = update.update.currentModeId;
+        const runtime = this.getRuntime(agent);
+
+        if (runtime && runtime.currentModeId !== newModeId) {
+          console.log(`[Agent ${agentId}] Mode changed: ${runtime.currentModeId} -> ${newModeId}`);
+          runtime.currentModeId = newModeId;
+        }
+      }
     }
 
     // Create agent update with enriched notification wrapped in discriminated union