fix(tui): follow agent model selection

packages/cli/src/commands/handlers/default.ts

@@ -4,7 +4,7 @@ import { run } from "@opencode-ai/tui"
 import { Commands } from "../commands"
 import { Runtime } from "../../framework/runtime"
 import { Config } from "../../config"
-import { Context, Effect, FileSystem, Option } from "effect"
+import { Context, Effect, FileSystem, Option, Queue } from "effect"
 import { ServerConnection } from "../../services/server-connection"
 import { Updater } from "../../services/updater"
 import { UpdatePreflight } from "../../services/update-preflight"
@@ -19,11 +19,21 @@ export default Runtime.handler(Commands, (input) =>
     if (requestedDirectory !== undefined) process.chdir(requestedDirectory)
     const preflight = UpdatePreflight.make()
     yield* Effect.addFinalizer(() => Effect.promise(() => preflight.close()))
+    const serviceStarts = yield* Queue.unbounded<{
+      readonly reason: "missing" | "version-mismatch"
+      readonly previousVersion?: string
+    }>()
+    yield* Queue.take(serviceStarts).pipe(
+      Effect.flatMap((event) => Effect.logInfo("background service starting", event)),
+      Effect.forever,
+      Effect.forkScoped,
+    )
     const server = yield* ServerConnection.resolve({
       server: requestedServer,
       standalone: input.standalone,
       mismatch: "replace",
       onStart: (reason, previousVersion) => {
+        Queue.offerUnsafe(serviceStarts, { reason, previousVersion })
         if (reason === "version-mismatch" && preflight.begin(previousVersion)) return
         process.stderr.write(
           reason === "version-mismatch"

packages/cli/src/server-process.ts

@@ -194,6 +194,13 @@ const register = Effect.fnUntraced(function* (
   yield* current.pipe(
     Effect.filterOrFail(owns),
     Effect.repeat(Schedule.spaced("5 seconds")),
+    Effect.tapError(() =>
+      Effect.logWarning("managed service registration lost; shutting down", {
+        serviceID: id,
+        servicePID: process.pid,
+        registration: file,
+      }),
+    ),
     Effect.ignore,
     Effect.andThen(shutdown),
     Effect.forkScoped,

packages/tui/src/component/prompt/index.tsx

@@ -1232,7 +1232,6 @@ export function Prompt(props: PromptProps) {
     } else if (slashHead && isCommand) {
       move.startSubmit()
       const model = { providerID: selection.providerID, id: selection.modelID, variant }
-      const cancelCommit = local.model.trackSessionCommit(sessionID, model)
 
       void client.api.session
         .command({
@@ -1247,7 +1246,6 @@ export function Prompt(props: PromptProps) {
           delivery,
         })
         .catch((error) => {
-          cancelCommit()
           toast.show({ title: "Failed to run command", message: errorMessage(error), variant: "error" })
         })
     } else if (isSkill) {
@@ -1271,11 +1269,7 @@ export function Prompt(props: PromptProps) {
         (session.model.variant ?? "default") !== (variant ?? "default")
       ) {
         const model = { providerID: selection.providerID, id: selection.modelID, variant }
-        const cancelCommit = local.model.trackSessionCommit(sessionID, model)
-        await client.api.session.switchModel({ sessionID, model }).catch((error) => {
-          cancelCommit()
-          throw error
-        })
+        await client.api.session.switchModel({ sessionID, model })
       }
       if (session?.revert) {
         const error = await client.api.session.revert.commit({ sessionID }).then(

packages/tui/src/context/local.tsx

@@ -45,6 +45,39 @@ export function recentModels(model: ModelPreferenceModel, recent: ModelPreferenc
     .map((item) => ({ providerID: item.providerID, modelID: item.modelID }))
 }
 
+type ModelSelection = ModelPreferenceModel & { variant?: string }
+
+type AgentSelection = {
+  id: string
+  model?: { providerID: string; id: string; variant?: string }
+}
+
+type SessionSelection = {
+  agent?: string
+  model?: { providerID: string; id: string; variant?: string }
+}
+
+export function resolveAgentModelSelection(input: {
+  selected?: ModelSelection
+  agent?: AgentSelection
+  session?: SessionSelection
+  available: (model: ModelPreferenceModel) => boolean
+}) {
+  const model = (value: SessionSelection["model"]): ModelSelection | undefined =>
+    value && {
+      providerID: value.providerID,
+      modelID: value.id,
+      variant: normalizeModelVariant(value.variant),
+    }
+  const candidates = [
+    input.selected,
+    input.session?.agent === input.agent?.id ? model(input.session?.model) : undefined,
+    model(input.agent?.model),
+    model(input.session?.model),
+  ]
+  return candidates.find((item): item is ModelSelection => !!item && input.available(item))
+}
+
 export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
   name: "Local",
   init: () => {
@@ -67,13 +100,6 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
       return !!models()?.some((item) => item.providerID === model.providerID && item.id === model.modelID)
     }
 
-    function getFirstValidModel(...modelFns: (() => ModelPreferenceModel | undefined)[]) {
-      for (const modelFn of modelFns) {
-        const model = modelFn()
-        if (model && isModelValid(model)) return model
-      }
-    }
-
     function createAgent() {
       const agents = createMemo(() =>
         (data.location.agent.list(location.ref) ?? []).filter((agent) => agent.mode !== "subagent" && !agent.hidden),
@@ -132,7 +158,6 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
     const agent = createAgent()
 
     function createModel() {
-      type ModelSelection = ModelPreferenceModel & { variant?: string }
       const [preferences, setPreferences] = createStore<ModelPreference & { ready: boolean }>({
         ready: false,
         recent: [],
@@ -141,16 +166,13 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
       })
       const [selectionState, setSelectionState] = createStore<{
         newSessionModelByLocationAgent: Record<string, ModelPreferenceModel | undefined>
-        draftBySession: Record<string, ModelSelection | undefined>
+        modelBySessionAgent: Record<string, Record<string, ModelSelection | undefined> | undefined>
       }>({
         newSessionModelByLocationAgent: {},
-        draftBySession: {},
+        modelBySessionAgent: {},
       })
 
       const repository = createModelPreferenceRepository(path.join(paths.state, "model.json"))
-      const pendingSelectionCommits = new Map<string, string>()
-      const selectionKey = (value: ModelSelection) =>
-        `${modelPreferenceKey(value)}:${normalizeModelVariant(value.variant) ?? "default"}`
       const saveState = {
         pending: false,
       }
@@ -208,20 +230,19 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
         }
       })
 
-      const newSessionModel = createMemo(() => {
+      const newSessionSelection = createMemo<ModelSelection | undefined>(() => {
         const a = agent.current()
-        return getFirstValidModel(
-          () => a && selectionState.newSessionModelByLocationAgent[locationAgentKey(a.id)],
-          () => a?.model && { providerID: a.model.providerID, modelID: a.model.id },
-          fallbackModel,
-        )
+        const selected = a && selectionState.newSessionModelByLocationAgent[locationAgentKey(a.id)]
+        const resolved = resolveAgentModelSelection({ selected, agent: a, available: isModelValid }) ?? fallbackModel()
+        if (!resolved) return
+        if (selected || !a?.model || resolved.providerID !== a.model.providerID || resolved.modelID !== a.model.id)
+          return { ...resolved, variant: normalizeModelVariant(preferences.variant[modelPreferenceKey(resolved)]) }
+        return resolved
       })
 
       const currentSelection = createMemo<ModelSelection | undefined>(() => {
         if (route.data.type === "session") return sessionSelection(route.data.sessionID)
-        const model = newSessionModel()
-        if (!model) return
-        return { ...model, variant: normalizeModelVariant(preferences.variant[modelPreferenceKey(model)]) }
+        return newSessionSelection()
       })
 
       const currentModel = createMemo(() => {
@@ -235,27 +256,23 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
         return `${JSON.stringify([ref.directory, ref.workspaceID])}:${agentID}`
       }
 
-      function durableSelection(sessionID: string): ModelSelection | undefined {
-        const model = data.session.get(sessionID)?.model
-        if (!model) return
-        return {
-          providerID: model.providerID,
-          modelID: model.id,
-          variant: normalizeModelVariant(model.variant),
-        }
-      }
-
       function sessionSelection(sessionID: string) {
-        return selectionState.draftBySession[sessionID] ?? durableSelection(sessionID)
+        const current = agent.current()
+        return resolveAgentModelSelection({
+          selected: current && selectionState.modelBySessionAgent[sessionID]?.[current.id],
+          agent: current,
+          session: data.session.get(sessionID),
+          available: isModelValid,
+        })
       }
 
-      function setSessionDraft(sessionID: string, selection: ModelSelection) {
-        const durable = durableSelection(sessionID)
-        setSelectionState(
-          "draftBySession",
-          sessionID,
-          durable && selectionKey(durable) === selectionKey(selection) ? undefined : selection,
-        )
+      function setSessionSelection(sessionID: string, selection: ModelSelection) {
+        const current = agent.current()
+        if (!current) return
+        setSelectionState("modelBySessionAgent", sessionID, {
+          ...selectionState.modelBySessionAgent[sessionID],
+          [current.id]: selection,
+        })
       }
 
       function selectModel(model: ModelPreferenceModel) {
@@ -269,7 +286,7 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
           )
           const info = models()?.find((item) => item.providerID === model.providerID && item.id === model.modelID)
           const variant = preferred && info?.variants?.some((item) => item.id === preferred) ? preferred : undefined
-          setSessionDraft(sessionID, { ...model, variant })
+          setSessionSelection(sessionID, { ...model, variant })
           return true
         }
         const current = agent.current()
@@ -278,27 +295,9 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
         return true
       }
 
-      onCleanup(
-        event.on("session.model.selected", (evt) => {
-          const expected = pendingSelectionCommits.get(evt.data.sessionID)
-          if (!expected) return
-          const committed = selectionKey({
-            providerID: evt.data.model.providerID,
-            modelID: evt.data.model.id,
-            variant: evt.data.model.variant,
-          })
-          if (committed !== expected) return
-          pendingSelectionCommits.delete(evt.data.sessionID)
-          const draft = selectionState.draftBySession[evt.data.sessionID]
-          if (draft && selectionKey(draft) === committed)
-            setSelectionState("draftBySession", evt.data.sessionID, undefined)
-        }),
-      )
-
       onCleanup(
         event.on("session.deleted", (evt) => {
-          pendingSelectionCommits.delete(evt.data.sessionID)
-          setSelectionState("draftBySession", evt.data.sessionID, undefined)
+          setSelectionState("modelBySessionAgent", evt.data.sessionID, undefined)
         }),
       )
 
@@ -308,20 +307,6 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
         available(model = currentModel()) {
           return model ? isModelValid(model) : false
         },
-        trackSessionCommit(
-          sessionID: string,
-          value: {
-            providerID: string
-            id: string
-            variant?: string
-          },
-        ) {
-          const committed = selectionKey({ providerID: value.providerID, modelID: value.id, variant: value.variant })
-          pendingSelectionCommits.set(sessionID, committed)
-          return () => {
-            if (pendingSelectionCommits.get(sessionID) === committed) pendingSelectionCommits.delete(sessionID)
-          }
-        },
         get ready() {
           return preferences.ready
         },
@@ -436,7 +421,7 @@ export const { use: useLocal, provider: LocalProvider } = createSimpleContext({
             const m = currentSelection()
             if (!m) return
             if (route.data.type === "session") {
-              setSessionDraft(route.data.sessionID, { ...m, variant: normalizeModelVariant(value) })
+              setSessionSelection(route.data.sessionID, { ...m, variant: normalizeModelVariant(value) })
             }
             setPreferences("variant", modelPreferenceKey(m), normalizeModelVariant(value))
             savePreferences()

packages/tui/src/feature-plugins/home/footer.tsx

@@ -99,7 +99,7 @@ function View(props: { context: Plugin.Context }) {
 }
 
 export default Plugin.define({
-  id: "opencode.home-footer",
+  id: "opencode.home.footer",
   setup(context) {
     // Root takeover: an external plugin replacing home.footer wins (last-
     // enabled) and this builtin shows as suppressed, not silently gone.

packages/tui/src/feature-plugins/prompt/footer.tsx

@@ -83,7 +83,7 @@ export function PromptFooter(props: { context: Plugin.Context; sessionID?: strin
 }
 
 export default Plugin.define({
-  id: "opencode.prompt-footer",
+  id: "opencode.prompt.footer",
   setup(context) {
     context.ui.slot({
       append: "prompt.footer",

packages/tui/src/feature-plugins/sidebar/context.tsx

@@ -42,7 +42,7 @@ export function SidebarContext(props: { context: Plugin.Context; sessionID: stri
 }
 
 export default Plugin.define({
-  id: "internal:sidebar-context",
+  id: "opencode.sidebar.context",
   setup(context) {
     context.ui.slot({
       append: "sidebar.content",

packages/tui/src/feature-plugins/sidebar/footer.tsx

@@ -40,7 +40,7 @@ function View(props: { context: Plugin.Context; sessionID: string }) {
 }
 
 export default Plugin.define({
-  id: "opencode.sidebar-footer",
+  id: "opencode.sidebar.footer",
   setup(context) {
     // Append keeps the path open to additive plugin claims; an external
     // replace still takes the boundary over.

packages/tui/src/feature-plugins/sidebar/mcp.tsx

@@ -71,7 +71,7 @@ function View(props: { context: Plugin.Context; sessionID: string }) {
 }
 
 export default Plugin.define({
-  id: "internal:sidebar-mcp",
+  id: "opencode.sidebar.mcp",
   setup(context) {
     context.ui.slot({
       append: "sidebar.content",

packages/tui/src/feature-plugins/system/diff-viewer.tsx

@@ -1079,7 +1079,7 @@ function Commands(props: { context: Plugin.Context }) {
 }
 
 export default Plugin.define({
-  id: "diff-viewer",
+  id: "opencode.diffs",
   setup(context) {
     context.ui.router.register({
       name: ROUTE,

packages/tui/src/routes/session/form.tsx

@@ -523,18 +523,6 @@ export function FormPrompt(props: {
           textarea?.setText("")
         },
       },
-      {
-        id: "prompt.paste",
-        title: "Paste into answer",
-        group: "Form",
-        async run(_input, event) {
-          event?.preventDefault()
-          event?.stopPropagation()
-          const content = await clipboard.read()
-          if (content?.mime !== "text/plain") return
-          textarea?.insertText(content.data)
-        },
-      },
       {
         bind: "escape",
         title: textual() ? "Dismiss form" : "Close answer edit",

packages/tui/test/cli/tui/diff-viewer.test.tsx

@@ -29,7 +29,7 @@ test("closing the diff viewer returns to the route it opened from", async () =>
   try {
     expect(viewer.current()).toEqual({
       type: "plugin",
-      id: "diff-viewer",
+      id: "opencode.diffs",
       name: "diff",
       data: { mode: "working", sessionID: "session-1", returnRoute: startRoute },
     })
@@ -207,7 +207,7 @@ async function renderDiffViewer(
             navigate(destination: Destination) {
               setCurrent(
                 destination.type === "plugin" && !("id" in destination)
-                  ? { ...destination, id: "diff-viewer" }
+                  ? { ...destination, id: "opencode.diffs" }
                   : destination,
               )
             },
@@ -334,7 +334,7 @@ test("branch diff source requests branch VCS diff", async () => {
   const viewer = await renderDiffViewer([], {
     initialRoute: {
       type: "plugin",
-      id: "diff-viewer",
+      id: "opencode.diffs",
       name: "diff",
       data: { mode: "branch", sessionID: "session-1", returnRoute: startRoute },
     },
@@ -342,7 +342,7 @@ test("branch diff source requests branch VCS diff", async () => {
   try {
     expect(viewer.current()).toEqual({
       type: "plugin",
-      id: "diff-viewer",
+      id: "opencode.diffs",
       name: "diff",
       data: { mode: "branch", sessionID: "session-1", returnRoute: startRoute },
     })

packages/tui/test/cli/tui/form.test.tsx

@@ -14,7 +14,7 @@ import { TestTuiContexts } from "../../fixture/tui-environment"
 import { createTuiResolvedConfig } from "../../fixture/tui-runtime"
 import { createApi, createEventStream, createFetch } from "../../fixture/tui-client"
 
-async function mountForm(root: string, width = 80, fields?: FormWithLocation["fields"], height = 20, pasted?: string) {
+async function mountForm(root: string, width = 80, fields?: FormWithLocation["fields"], height = 20) {
   const state = path.join(root, "state")
   await mkdir(state, { recursive: true })
 
@@ -58,7 +58,7 @@ async function mountForm(root: string, width = 80, fields?: FormWithLocation["fi
         }}
         clipboard={{
           async read() {
-            return pasted ? { data: pasted, mime: "text/plain" } : undefined
+            return undefined
           },
           write(text) {
             copied.push(text)
@@ -217,34 +217,6 @@ test("pasting on a custom choice opens its editor without submitting", async ()
   }
 })
 
-test("ctrl-v pastes clipboard text into a custom answer", async () => {
-  await using tmp = await tmpdir()
-  const prompt = await mountForm(
-    tmp.path,
-    80,
-    [
-      {
-        key: "target",
-        type: "string",
-        options: [{ value: "staging", label: "Staging" }],
-        custom: true,
-      },
-    ],
-    20,
-    "production west",
-  )
-  try {
-    prompt.app.mockInput.pressArrow("down")
-    prompt.app.mockInput.pressEnter()
-    await prompt.app.waitFor(() => prompt.app.renderer.currentFocusedEditor !== null)
-
-    prompt.app.mockInput.pressKey("v", { ctrl: true })
-    await prompt.app.waitFor(() => prompt.app.renderer.currentFocusedEditor?.plainText === "production west")
-  } finally {
-    prompt.app.renderer.destroy()
-  }
-})
-
 test("typing a custom multiselect answer selects it before commit", async () => {
   await using tmp = await tmpdir()
   const prompt = await mountForm(tmp.path, 80, [

packages/tui/test/context/local.test.ts

@@ -1,5 +1,5 @@
 import { expect, test } from "bun:test"
-import { parseModel, recentModels } from "../../src/context/local"
+import { parseModel, recentModels, resolveAgentModelSelection } from "../../src/context/local"
 
 test("parses model IDs containing slashes", () => {
   expect(parseModel("provider/family/model")).toEqual({
@@ -20,3 +20,47 @@ test("moves a model to the front, deduplicates, and limits recents", () => {
     ...recent.slice(6, 10),
   ])
 })
+
+test("uses the configured model when switching agents", () => {
+  expect(
+    resolveAgentModelSelection({
+      agent: { id: "build", model: { providerID: "provider", id: "build-model", variant: "max" } },
+      session: {
+        agent: "plan",
+        model: { providerID: "provider", id: "plan-model", variant: "high" },
+      },
+      available: () => true,
+    }),
+  ).toEqual({ providerID: "provider", modelID: "build-model", variant: "max" })
+})
+
+test("keeps a manual model selection for each session agent", () => {
+  expect(
+    resolveAgentModelSelection({
+      selected: { providerID: "provider", modelID: "manual-model", variant: "high" },
+      agent: { id: "build", model: { providerID: "provider", id: "build-model", variant: "max" } },
+      session: { agent: "plan", model: { providerID: "provider", id: "plan-model" } },
+      available: () => true,
+    }),
+  ).toEqual({ providerID: "provider", modelID: "manual-model", variant: "high" })
+})
+
+test("keeps the durable model while the active agent is unchanged", () => {
+  expect(
+    resolveAgentModelSelection({
+      agent: { id: "plan", model: { providerID: "provider", id: "configured-model", variant: "max" } },
+      session: { agent: "plan", model: { providerID: "provider", id: "manual-model", variant: "high" } },
+      available: () => true,
+    }),
+  ).toEqual({ providerID: "provider", modelID: "manual-model", variant: "high" })
+})
+
+test("keeps the session model when the next agent has no configured model", () => {
+  expect(
+    resolveAgentModelSelection({
+      agent: { id: "review" },
+      session: { agent: "plan", model: { providerID: "provider", id: "plan-model", variant: "high" } },
+      available: () => true,
+    }),
+  ).toEqual({ providerID: "provider", modelID: "plan-model", variant: "high" })
+})