diff --git a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
index 96f223b63b..0cd4996cee 100644
--- a/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
+++ b/packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
@@ -201,9 +201,7 @@ export function Session() {
     if (part.type !== "tool") return
     if (part.sessionID !== route.sessionID) return
     if (part.state.status !== "completed") return
-
-    const metadata = part.state.metadata as { switched?: boolean }
-    if (!metadata?.switched) return
+    if (part.id === lastSwitch) return
 
     if (part.tool === "plan_exit") {
       local.agent.set("build")
diff --git a/packages/opencode/src/tool/plan.ts b/packages/opencode/src/tool/plan.ts
index 19ab527fd5..6cb7a691c8 100644
--- a/packages/opencode/src/tool/plan.ts
+++ b/packages/opencode/src/tool/plan.ts
@@ -66,7 +66,7 @@ export const PlanExitTool = Tool.define("plan_exit", {
 
     return {
       title: "Switching to build agent",
-      output: "User chose to continue planning. Wait for further instructions.",
+      output: "User approved switching to build agent. Wait for further instructions.",
       metadata: {},
     }
   },