fix(core): tighten plan switch reminder copy

Rewrite enter and leave synthetics to state the read-only constraint
and its removal without extra workflow instructions.

packages/cli/src/acp/service.ts

@@ -422,7 +422,8 @@ async function loadCatalog(client: OpenCodeClient, cwd: string): Promise<Catalog
         defaultModel: {
           providerID: defaultModel.providerID,
           id: defaultModel.id,
-          variant: defaultModel.variants.find((variant) => variant.id === "default")?.id,
+          variant:
+            defaultModel.variants.find((variant) => variant.id === "default")?.id ?? defaultModel.variants[0]?.id,
         },
         modes: agents.map((agent) => ({ id: agent.id, name: agent.name, description: agent.description })),
         defaultModeID: defaultAgent.id,

packages/cli/test/acp/service-lifecycle.test.ts

@@ -3,38 +3,6 @@ import type { SessionConfigOption } from "@agentclientprotocol/sdk"
 import { makeACPFixture, makeSession, secondModel } from "./service-fixture"
 
 describe("acp service lifecycle", () => {
-  test("does not persist the first catalog variant when no explicit default exists", async () => {
-    const model = { ...secondModel, variants: [{ id: "none" }, { id: "high" }] }
-    await using fixture = makeACPFixture({
-      models: [model],
-      defaultModel: model,
-      fetch(request) {
-        if (request.method === "POST" && request.path === "/api/session") {
-          return Response.json({
-            data: makeSession("ses_default_variant", {
-              model: { providerID: model.providerID, id: model.id },
-            }),
-          })
-        }
-        return undefined
-      },
-    })
-
-    const created = await fixture.service.newSession({ cwd: "/workspace", mcpServers: [] })
-
-    expect(fixture.requests).toContainEqual({
-      method: "POST",
-      path: "/api/session",
-      query: {},
-      body: {
-        location: { directory: "/workspace" },
-        agent: "build",
-        model: { providerID: "test", id: "second-model" },
-      },
-    })
-    expect(currentValue(created, "effort")).toBe("none")
-  })
-
   test("loads and forks with paginated replay while resume does not replay", async () => {
     await using fixture = makeACPFixture({
       fetch(request) {

packages/core/src/plugin/agent.ts

@@ -101,16 +101,6 @@ export const Plugin = define({
         item.permissions.push({ action: "question", resource: "*", effect: "allow" })
       })
 
-      draft.update(Agent.ID.make("plan"), (item) => {
-        item.name = Agent.Name.make("Plan")
-        item.description = "Plan mode. Disallows all edit tools."
-        item.mode = "primary"
-        item.permissions.push(
-          { action: "question", resource: "*", effect: "allow" },
-          { action: "edit", resource: "*", effect: "deny" },
-        )
-      })
-
       draft.update(Agent.ID.make("general"), (item) => {
         item.name = Agent.Name.make("General")
         item.description =

packages/core/src/plugin/internal.ts

@@ -60,6 +60,7 @@ import { WellKnown } from "../wellknown"
 import { WriteTool } from "../tool/plugin/write"
 import { AgentPlugin } from "./agent"
 import { CommandPlugin } from "./command"
+import { PlanPlugin } from "./plan"
 import { ModelsDevPlugin } from "./models-dev"
 import { ProviderPlugins } from "./provider"
 import { WebSearchPlugins } from "./websearch"
@@ -192,6 +193,7 @@ export type InternalPlugin = Plugin<Requirements | Scope.Scope>
 const pre = [
   WellKnownPlugin.Plugin,
   AgentPlugin.Plugin,
+  PlanPlugin.Plugin,
   CommandPlugin.Plugin,
   SkillPlugin.Plugin,
   ...SystemPromptPlugin.Plugins,

packages/core/src/plugin/plan.ts

@@ -0,0 +1,55 @@
+export * as PlanPlugin from "./plan"
+
+import { ToolFailure } from "@opencode-ai/ai"
+import { define } from "@opencode-ai/plugin/effect/plugin"
+import { Effect, Stream } from "effect"
+import { Agent } from "../agent"
+
+const plan = Agent.ID.make("plan")
+
+const enter = `<system-reminder>
+You are in Plan mode. This is a READ-ONLY environment. You are not allowed to edit files, and you may not ask a subagent to edit them either.
+</system-reminder>`
+
+const leave = `<system-reminder>
+You are no longer in Plan mode. The previous read-only restrictions no longer apply. You may edit files again.
+</system-reminder>`
+
+export const Plugin = define({
+  id: "opencode.plan",
+  effect: Effect.fn(function* (ctx) {
+    yield* ctx.agent.transform((draft) => {
+      draft.update(plan, (item) => {
+        item.name = Agent.Name.make("Plan")
+        item.description = "Read-only agent for exploring the codebase and planning work before implementation."
+        item.mode = "primary"
+        item.permissions.push({ action: "question", resource: "*", effect: "allow" })
+      })
+    })
+
+    yield* ctx.tool.hook("execute.before", (event) => {
+      if (event.agent !== plan) return Effect.void
+      if (event.tool !== "edit" && event.tool !== "write" && event.tool !== "patch") return Effect.void
+      return new ToolFailure({
+        message: `Cannot use ${event.tool} in Plan mode. You are in a read-only mode and must not modify files.`,
+      })
+    })
+
+    yield* ctx.event.subscribe().pipe(
+      Stream.filter((event) => event.type === "session.agent.selected"),
+      Stream.runForEach((event) => {
+        if (event.data.agent === event.data.previous) return Effect.void
+        const text = event.data.agent === plan ? enter : event.data.previous === plan ? leave : undefined
+        if (!text) return Effect.void
+        return ctx.session
+          .synthetic({
+            sessionID: event.data.sessionID,
+            text,
+            resume: false,
+          })
+          .pipe(Effect.catch(() => Effect.void))
+      }),
+      Effect.forkScoped({ startImmediately: true }),
+    )
+  }),
+})

packages/core/test/agent.test.ts

@@ -165,7 +165,6 @@ describe("Agent", () => {
         "compaction",
         "explore",
         "general",
-        "plan",
         "summary",
         "title",
       ])

packages/protocol/openapi.json

@@ -14300,9 +14300,15 @@
               "agent": {
                 "type": "string"
               },
+              "previous": {
+                "type": "string"
+              },
               "model": {
                 "$ref": "#/components/schemas/Model.Ref"
               },
+              "previous": {
+                "$ref": "#/components/schemas/Model.Ref"
+              },
               "version": {
                 "type": "string"
               }
@@ -14373,9 +14379,6 @@
               },
               "agent": {
                 "type": "string"
-              },
-              "previous": {
-                "type": "string"
               }
             },
             "required": ["sessionID", "agent"],
@@ -14444,9 +14447,6 @@
               },
               "model": {
                 "$ref": "#/components/schemas/Model.Ref"
-              },
-              "previous": {
-                "$ref": "#/components/schemas/Model.Ref"
               }
             },
             "required": ["sessionID", "model"],

packages/www/openapi.json

@@ -14300,9 +14300,15 @@
               "agent": {
                 "type": "string"
               },
+              "previous": {
+                "type": "string"
+              },
               "model": {
                 "$ref": "#/components/schemas/Model.Ref"
               },
+              "previous": {
+                "$ref": "#/components/schemas/Model.Ref"
+              },
               "version": {
                 "type": "string"
               }
@@ -14373,9 +14379,6 @@
               },
               "agent": {
                 "type": "string"
-              },
-              "previous": {
-                "type": "string"
               }
             },
             "required": ["sessionID", "agent"],
@@ -14444,9 +14447,6 @@
               },
               "model": {
                 "$ref": "#/components/schemas/Model.Ref"
-              },
-              "previous": {
-                "$ref": "#/components/schemas/Model.Ref"
               }
             },
             "required": ["sessionID", "model"],

packages/www/public/openapi.json

@@ -14300,9 +14300,15 @@
               "agent": {
                 "type": "string"
               },
+              "previous": {
+                "type": "string"
+              },
               "model": {
                 "$ref": "#/components/schemas/Model.Ref"
               },
+              "previous": {
+                "$ref": "#/components/schemas/Model.Ref"
+              },
               "version": {
                 "type": "string"
               }
@@ -14373,9 +14379,6 @@
               },
               "agent": {
                 "type": "string"
-              },
-              "previous": {
-                "type": "string"
               }
             },
             "required": ["sessionID", "agent"],
@@ -14444,9 +14447,6 @@
               },
               "model": {
                 "$ref": "#/components/schemas/Model.Ref"
-              },
-              "previous": {
-                "$ref": "#/components/schemas/Model.Ref"
               }
             },
             "required": ["sessionID", "model"],