fix(session): use session selection for commands

.github/workflows/publish.yml

@@ -75,7 +75,7 @@ jobs:
   build-cli:
     needs: version
     runs-on: blacksmith-4vcpu-ubuntu-2404
-    if: github.repository == 'anomalyco/opencode' && github.ref_name != 'beta'
+    if: github.repository == 'anomalyco/opencode'
     steps:
       - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
         with:
@@ -91,7 +91,7 @@ jobs:
           opencode-app-secret: ${{ secrets.OPENCODE_APP_SECRET }}
 
       - name: Build legacy CLI
-        if: github.ref_name != 'v2' && github.ref_name != 'beta'
+        if: github.ref_name != 'v2'
         run: ./packages/opencode/script/build.ts ${{ (github.ref_name == 'beta' && '--sourcemaps') || '' }}
         env:
           OPENCODE_VERSION: ${{ needs.version.outputs.version }}
@@ -109,7 +109,7 @@ jobs:
           GH_TOKEN: ${{ steps.committer.outputs.token }}
 
       - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        if: github.ref_name != 'v2' && github.ref_name != 'beta'
+        if: github.ref_name != 'v2'
         with:
           name: opencode-cli
           path: |
@@ -117,7 +117,7 @@ jobs:
             packages/opencode/dist/opencode-linux*
 
       - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        if: github.ref_name != 'v2' && github.ref_name != 'beta'
+        if: github.ref_name != 'v2'
         with:
           name: opencode-cli-windows
           path: packages/opencode/dist/opencode-windows*
@@ -132,7 +132,7 @@ jobs:
 
   build-node-cli:
     needs: version
-    if: github.repository == 'anomalyco/opencode' && github.ref_name != 'beta'
+    if: github.repository == 'anomalyco/opencode'
     strategy:
       fail-fast: false
       matrix:
@@ -184,7 +184,7 @@ jobs:
       - build-cli
       - version
     runs-on: blacksmith-4vcpu-windows-2025
-    if: github.repository == 'anomalyco/opencode' && github.ref_name != 'v2' && github.ref_name != 'beta'
+    if: github.repository == 'anomalyco/opencode' && github.ref_name != 'v2'
     env:
       AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
       AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
@@ -377,7 +377,7 @@ jobs:
         env:
           OPENCODE_VERSION: ${{ needs.version.outputs.version }}
           OPENCODE_CHANNEL: ${{ (github.ref_name == 'beta' && 'beta') || 'prod' }}
-          OPENCODE_CLI_TARGET: ${{ matrix.settings.target }}
+          RUST_TARGET: ${{ matrix.settings.target }}
 
       - name: Build
         run: bun run build
@@ -393,7 +393,6 @@ jobs:
           VITE_SENTRY_DSN: ${{ vars.WEB_SENTRY_DSN }}
           VITE_SENTRY_ENVIRONMENT: ${{ (github.ref_name == 'beta' && 'beta') || 'production' }}
           VITE_SENTRY_RELEASE: desktop@${{ needs.version.outputs.version }}
-          OPENCODE_CLI_TARGET: ${{ matrix.settings.target }}
 
       - name: Package
         if: needs.version.outputs.release
@@ -497,31 +496,29 @@ jobs:
           registry-url: "https://registry.npmjs.org"
 
       - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
-        if: github.ref_name != 'v2' && github.ref_name != 'beta'
+        if: github.ref_name != 'v2'
         with:
           name: opencode-cli
           path: packages/opencode/dist
 
       - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
-        if: github.ref_name != 'v2' && github.ref_name != 'beta'
+        if: github.ref_name != 'v2'
         with:
           name: opencode-cli-windows
           path: packages/opencode/dist
 
       - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
-        if: github.ref_name != 'v2' && github.ref_name != 'beta'
+        if: github.ref_name != 'v2'
         with:
           name: opencode-cli-signed-windows
           path: packages/opencode/dist
 
       - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
-        if: github.ref_name != 'beta'
         with:
           name: opencode-preview-cli
           path: packages/cli/dist
 
       - uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
-        if: github.ref_name != 'beta'
         with:
           pattern: opencode-node-cli-*
           path: packages/cli/dist/node

bun.lock

@@ -439,7 +439,6 @@
         "@actions/artifact": "4.0.0",
         "@lydell/node-pty": "catalog:",
         "@opencode-ai/app": "workspace:*",
-        "@opencode-ai/client": "workspace:*",
         "@opencode-ai/ui": "workspace:*",
         "@sentry/solid": "catalog:",
         "@sentry/vite-plugin": "catalog:",

packages/app/src/components/prompt-input/submit.ts

@@ -76,6 +76,27 @@ export async function sendFollowupDraft(input: FollowupSendInput) {
     return true
   }
 
+  const select = async () => {
+    const session = input.session()
+    if (session?.agent !== input.draft.agent) {
+      await input.api.switchAgent({ sessionID: input.draft.sessionID, agent: input.draft.agent })
+    }
+    if (
+      session?.model?.providerID === input.draft.model.providerID &&
+      session.model.id === input.draft.model.modelID &&
+      (session.model.variant ?? "default") === (input.draft.variant ?? "default")
+    )
+      return
+    await input.api.switchModel({
+      sessionID: input.draft.sessionID,
+      model: {
+        id: input.draft.model.modelID,
+        providerID: input.draft.model.providerID,
+        variant: input.draft.variant,
+      },
+    })
+  }
+
   const [head, ...tail] = text.split(" ")
   const cmd = head?.startsWith("/") ? head.slice(1) : undefined
   if (cmd && input.sync.data.command.find((item) => item.name === cmd)) {
@@ -86,18 +107,13 @@ export async function sendFollowupDraft(input: FollowupSendInput) {
         return false
       }
 
+      await select()
       const messageID = Identifier.ascending("message")
       await input.api.command({
         sessionID: input.draft.sessionID,
         id: messageID,
         command: cmd,
         arguments: tail.join(" "),
-        agent: input.draft.agent,
-        model: {
-          id: input.draft.model.modelID,
-          providerID: input.draft.model.providerID,
-          variant: input.draft.variant,
-        },
         files: await Promise.all(
           images.map(async (attachment) => ({
             uri: await blobDataUrl(attachment.blob, attachment.mime),
@@ -167,24 +183,7 @@ export async function sendFollowupDraft(input: FollowupSendInput) {
       return false
     }
 
-    const session = input.session()
-    if (session?.agent !== input.draft.agent) {
-      await input.api.switchAgent({ sessionID: input.draft.sessionID, agent: input.draft.agent })
-    }
-    if (
-      session?.model?.providerID !== input.draft.model.providerID ||
-      session.model.id !== input.draft.model.modelID ||
-      (session.model.variant ?? "default") !== (input.draft.variant ?? "default")
-    ) {
-      await input.api.switchModel({
-        sessionID: input.draft.sessionID,
-        model: {
-          id: input.draft.model.modelID,
-          providerID: input.draft.model.providerID,
-          variant: input.draft.variant,
-        },
-      })
-    }
+    await select()
 
     await input.api.prompt({
       sessionID: input.draft.sessionID,
@@ -524,14 +523,22 @@ export function createPromptSubmit(input: PromptSubmitInput) {
         clearInput()
         const messageID = Identifier.ascending("message")
         serverSync().session.set("session_status", session.id, { type: "busy" })
-        sdk()
-          .api.session.command({
+        void (async () => {
+          if (session.agent !== agent) await sdk().api.session.switchAgent({ sessionID: session.id, agent })
+          if (
+            session.model?.providerID !== model.providerID ||
+            session.model.id !== model.modelID ||
+            (session.model.variant ?? "default") !== (variant ?? "default")
+          )
+            await sdk().api.session.switchModel({
+              sessionID: session.id,
+              model: { id: model.modelID, providerID: model.providerID, variant },
+            })
+          await sdk().api.session.command({
             sessionID: session.id,
             id: messageID,
             command: commandName,
             arguments: args.join(" "),
-            agent,
-            model: { id: model.modelID, providerID: model.providerID, variant },
             files: await Promise.all(
               images.map(async (attachment) => ({
                 uri: await blobDataUrl(attachment.blob, attachment.mime),
@@ -539,14 +546,14 @@ export function createPromptSubmit(input: PromptSubmitInput) {
               })),
             ),
           })
-          .catch((err) => {
-            serverSync().session.set("session_status", session.id, { type: "idle" })
-            showToast({
-              title: language.t("prompt.toast.commandSendFailed.title"),
-              description: formatServerError(err, language.t, language.t("common.requestFailed")),
-            })
-            restoreInput()
+        })().catch((err) => {
+          serverSync().session.set("session_status", session.id, { type: "idle" })
+          showToast({
+            title: language.t("prompt.toast.commandSendFailed.title"),
+            description: formatServerError(err, language.t, language.t("common.requestFailed")),
           })
+          restoreInput()
+        })
         return
       }
     }

packages/client/src/effect/api/api.ts

@@ -193,8 +193,6 @@ export type Endpoint5_13Input = {
   readonly id?: SessionMessage.ID | undefined
   readonly command: string
   readonly arguments?: string | undefined
-  readonly agent?: Agent.ID | undefined
-  readonly model?: Model.Ref | undefined
   readonly files?: ReadonlyArray<PromptInput.FileAttachment> | undefined
   readonly agents?: ReadonlyArray<AgentAttachment> | undefined
   readonly skills?: ReadonlyArray<PromptInput.SkillAttachment> | undefined

packages/client/src/effect/generated/client.ts

@@ -431,8 +431,6 @@ const Endpoint5_13 = (raw: RawClient["server.session"]) => (input: Endpoint5_13I
         id: input["id"],
         command: input["command"],
         arguments: input["arguments"],
-        agent: input["agent"],
-        model: input["model"],
         files: input["files"],
         agents: input["agents"],
         skills: input["skills"],

packages/client/src/promise/generated/client.ts

@@ -635,8 +635,6 @@ export function make(options: ClientOptions) {
               id: input["id"],
               command: input["command"],
               arguments: input["arguments"],
-              agent: input["agent"],
-              model: input["model"],
               files: input["files"],
               agents: input["agents"],
               skills: input["skills"],

packages/client/src/promise/generated/types.ts

@@ -41,7 +41,6 @@ export type SessionMessageAgentSelected = {
   time: { created: number }
   type: "agent-switched"
   agent: string
-  previous?: string
 }
 
 export type PromptBase64 = string
@@ -2536,7 +2535,6 @@ export type SessionImportInput = {
           readonly time: { readonly created: number }
           readonly type: "agent-switched"
           readonly agent: string
-          readonly previous?: string
         }
       | {
           readonly id: string
@@ -2788,7 +2786,6 @@ export type SessionImportInput = {
           readonly time: { readonly created: number }
           readonly type: "agent-switched"
           readonly agent: string
-          readonly previous?: string
         }
       | {
           readonly id: string
@@ -3040,7 +3037,6 @@ export type SessionImportInput = {
           readonly time: { readonly created: number }
           readonly type: "agent-switched"
           readonly agent: string
-          readonly previous?: string
         }
       | {
           readonly id: string
@@ -3489,8 +3485,6 @@ export type SessionCommandInput = {
     readonly id?: string | null
     readonly command: string
     readonly arguments?: string | null
-    readonly agent?: string | null
-    readonly model?: { readonly id: string; readonly providerID: string; readonly variant?: string } | null
     readonly files?: ReadonlyArray<{
       readonly uri: string
       readonly name?: string
@@ -3512,8 +3506,6 @@ export type SessionCommandInput = {
     readonly id?: string | null
     readonly command: string
     readonly arguments?: string | null
-    readonly agent?: string | null
-    readonly model?: { readonly id: string; readonly providerID: string; readonly variant?: string } | null
     readonly files?: ReadonlyArray<{
       readonly uri: string
       readonly name?: string
@@ -3535,8 +3527,6 @@ export type SessionCommandInput = {
     readonly id?: string | null
     readonly command: string
     readonly arguments?: string | null
-    readonly agent?: string | null
-    readonly model?: { readonly id: string; readonly providerID: string; readonly variant?: string } | null
     readonly files?: ReadonlyArray<{
       readonly uri: string
       readonly name?: string
@@ -3554,58 +3544,10 @@ export type SessionCommandInput = {
     readonly delivery?: "steer" | "queue" | null
     readonly resume?: boolean | null
   }["arguments"]
-  readonly agent?: {
-    readonly id?: string | null
-    readonly command: string
-    readonly arguments?: string | null
-    readonly agent?: string | null
-    readonly model?: { readonly id: string; readonly providerID: string; readonly variant?: string } | null
-    readonly files?: ReadonlyArray<{
-      readonly uri: string
-      readonly name?: string
-      readonly description?: string
-      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
-    }>
-    readonly agents?: ReadonlyArray<{
-      readonly name: string
-      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
-    }>
-    readonly skills?: ReadonlyArray<{
-      readonly id: string
-      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
-    }>
-    readonly delivery?: "steer" | "queue" | null
-    readonly resume?: boolean | null
-  }["agent"]
-  readonly model?: {
-    readonly id?: string | null
-    readonly command: string
-    readonly arguments?: string | null
-    readonly agent?: string | null
-    readonly model?: { readonly id: string; readonly providerID: string; readonly variant?: string } | null
-    readonly files?: ReadonlyArray<{
-      readonly uri: string
-      readonly name?: string
-      readonly description?: string
-      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
-    }>
-    readonly agents?: ReadonlyArray<{
-      readonly name: string
-      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
-    }>
-    readonly skills?: ReadonlyArray<{
-      readonly id: string
-      readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
-    }>
-    readonly delivery?: "steer" | "queue" | null
-    readonly resume?: boolean | null
-  }["model"]
   readonly files?: {
     readonly id?: string | null
     readonly command: string
     readonly arguments?: string | null
-    readonly agent?: string | null
-    readonly model?: { readonly id: string; readonly providerID: string; readonly variant?: string } | null
     readonly files?: ReadonlyArray<{
       readonly uri: string
       readonly name?: string
@@ -3627,8 +3569,6 @@ export type SessionCommandInput = {
     readonly id?: string | null
     readonly command: string
     readonly arguments?: string | null
-    readonly agent?: string | null
-    readonly model?: { readonly id: string; readonly providerID: string; readonly variant?: string } | null
     readonly files?: ReadonlyArray<{
       readonly uri: string
       readonly name?: string
@@ -3650,8 +3590,6 @@ export type SessionCommandInput = {
     readonly id?: string | null
     readonly command: string
     readonly arguments?: string | null
-    readonly agent?: string | null
-    readonly model?: { readonly id: string; readonly providerID: string; readonly variant?: string } | null
     readonly files?: ReadonlyArray<{
       readonly uri: string
       readonly name?: string
@@ -3673,8 +3611,6 @@ export type SessionCommandInput = {
     readonly id?: string | null
     readonly command: string
     readonly arguments?: string | null
-    readonly agent?: string | null
-    readonly model?: { readonly id: string; readonly providerID: string; readonly variant?: string } | null
     readonly files?: ReadonlyArray<{
       readonly uri: string
       readonly name?: string
@@ -3696,8 +3632,6 @@ export type SessionCommandInput = {
     readonly id?: string | null
     readonly command: string
     readonly arguments?: string | null
-    readonly agent?: string | null
-    readonly model?: { readonly id: string; readonly providerID: string; readonly variant?: string } | null
     readonly files?: ReadonlyArray<{
       readonly uri: string
       readonly name?: string

packages/core/src/aisdk.ts

@@ -508,23 +508,8 @@ function toolOutput(result: ToolResultValue) {
     case "text":
     case "error":
       return { type: "text" as const, value: messageValue(result.value) }
-    case "content":
-      return {
-        type: "content" as const,
-        value: result.value.map((item) => {
-          if (item.type === "text") return { type: "text" as const, text: item.text }
-          const data = /^data:[^;,]+(?:;[^,]*)*;base64,(.*)$/s.exec(item.uri)?.[1]
-          const image = item.mime.toLowerCase().startsWith("image/")
-          if (data !== undefined)
-            return image
-              ? { type: "image-data" as const, data, mediaType: item.mime }
-              : { type: "file-data" as const, data, mediaType: item.mime, filename: item.name }
-          return image ? { type: "image-url" as const, url: item.uri } : { type: "file-url" as const, url: item.uri }
-        }),
-      }
-    case "json":
-      return { type: "json" as const, value: jsonValue(result.value) }
   }
+  return { type: "json" as const, value: jsonValue(result.value) }
 }
 
 function tool(input: ToolDefinition): LanguageModelV3FunctionTool {

packages/core/src/plugin/agent.ts

@@ -101,6 +101,16 @@ 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/hooks.ts

@@ -3,7 +3,7 @@ export * as PluginHooks from "./hooks"
 import type { AISDKHooks } from "@opencode-ai/plugin/effect/aisdk"
 import type { SessionHooks } from "@opencode-ai/plugin/effect/session"
 import type { ShellHooks } from "@opencode-ai/plugin/effect/shell"
-import type { ToolFailures, ToolHooks } from "@opencode-ai/plugin/effect/tool"
+import type { ToolHooks } from "@opencode-ai/plugin/effect/tool"
 import { Context, Effect, Layer, Scope } from "effect"
 import { makeLocationNode } from "@opencode-ai/util/effect/app-node"
 import { State } from "../state"
@@ -15,29 +15,19 @@ export interface Domains {
   readonly tool: ToolHooks
 }
 
-type NoFailures<Spec> = { readonly [Name in keyof Spec]: never }
-
-// Failure channel for each hook event. Only tool execute.before may fail: a Tool.Error rejects the call before it runs.
-interface Failures extends Record<keyof Domains, unknown> {
-  readonly aisdk: NoFailures<AISDKHooks>
-  readonly session: NoFailures<SessionHooks>
-  readonly shell: NoFailures<ShellHooks>
-  readonly tool: ToolFailures
-}
-
-type Callback<Event, Error> = (event: Event) => Effect.Effect<void, Error>
+type Callback<Event> = (event: Event) => Effect.Effect<void>
 
 export interface Interface {
-  readonly register: <Domain extends keyof Domains, Name extends keyof Domains[Domain] & keyof Failures[Domain]>(
+  readonly register: <Domain extends keyof Domains, Name extends keyof Domains[Domain]>(
     domain: Domain,
     name: Name,
-    callback: Callback<Domains[Domain][Name], Failures[Domain][Name]>,
+    callback: Callback<Domains[Domain][Name]>,
   ) => Effect.Effect<State.Registration, never, Scope.Scope>
-  readonly trigger: <Domain extends keyof Domains, Name extends keyof Domains[Domain] & keyof Failures[Domain]>(
+  readonly trigger: <Domain extends keyof Domains, Name extends keyof Domains[Domain]>(
     domain: Domain,
     name: Name,
     event: Domains[Domain][Name],
-  ) => Effect.Effect<Domains[Domain][Name], Failures[Domain][Name]>
+  ) => Effect.Effect<Domains[Domain][Name]>
 }
 
 export class Service extends Context.Service<Service, Interface>()("@opencode/PluginHooks") {}
@@ -66,9 +56,7 @@ const layer = Layer.effect(
 
     const trigger: Interface["trigger"] = Effect.fn("PluginHooks.trigger")(function* (domain, name, event) {
       for (const callback of callbacks.get(key(domain, name)) ?? []) {
-        const result: Effect.Effect<void, Failures[typeof domain][typeof name]> = Reflect.apply(callback, undefined, [
-          event,
-        ])
+        const result: Effect.Effect<void> = Reflect.apply(callback, undefined, [event])
         yield* result
       }
       return event

packages/core/src/plugin/host.ts

@@ -349,7 +349,6 @@ export const make = Effect.fn("PluginHost.make")(function* (plugin: import("../p
             input?.location ?? Location.Ref.make({ directory: location.directory, workspaceID: location.workspaceID }),
         }),
       get: (input) => runtime.session.get(input.sessionID),
-      message: runtime.session.message,
       prompt: runtime.session.prompt,
       generate: (input) => runtime.session.generate(input).pipe(Effect.map((text) => ({ text }))),
       command: runtime.session.command,

packages/core/src/plugin/internal.ts

@@ -60,7 +60,6 @@ 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"
@@ -193,7 +192,6 @@ 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

@@ -1,56 +0,0 @@
-export * as PlanPlugin from "./plan"
-
-import { ToolFailure } from "@opencode-ai/ai"
-import { define } from "@opencode-ai/plugin/effect/plugin"
-import { SessionMessage } from "@opencode-ai/schema/session-message"
-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) =>
-        Effect.gen(function* () {
-          const message = yield* ctx.session.message({
-            sessionID: event.data.sessionID,
-            messageID: SessionMessage.ID.fromEvent(event.id),
-          })
-          if (message?.type !== "agent-switched" || message.agent === message.previous) return
-          const text = message.agent === plan ? enter : message.previous === plan ? leave : undefined
-          if (!text) return
-          yield* ctx.session.synthetic({ sessionID: event.data.sessionID, text, resume: false })
-        }).pipe(Effect.catch(() => Effect.void)),
-      ),
-      Effect.forkScoped({ startImmediately: true }),
-    )
-  }),
-})

packages/core/src/plugin/promise.ts

@@ -310,8 +310,6 @@ export function fromPromise(plugin: Plugin) {
                   ...input,
                   sessionID: Session.ID.make(input.sessionID),
                   id: input.id == null ? undefined : SessionMessage.ID.make(input.id),
-                  agent: input.agent == null ? undefined : Agent.ID.make(input.agent),
-                  model: input.model == null ? undefined : model(input.model),
                   skills: input.skills?.map((skill) => ({ ...skill, id: Skill.ID.make(skill.id) })),
                   arguments: input.arguments ?? undefined,
                   delivery: input.delivery ?? undefined,

packages/core/src/plugin/runtime.ts

@@ -14,7 +14,6 @@ export interface Interface {
     | "get"
     | "create"
     | "messages"
-    | "message"
     | "prompt"
     | "generate"
     | "command"
@@ -60,7 +59,6 @@ export const layerWithCell = (cell: Cell) =>
         get: (sessionID) => require(cell, (runtime) => runtime.session.get(sessionID)),
         create: (input) => require(cell, (runtime) => runtime.session.create(input)),
         messages: (input) => require(cell, (runtime) => runtime.session.messages(input)),
-        message: (input) => require(cell, (runtime) => runtime.session.message(input)),
         prompt: (input) => require(cell, (runtime) => runtime.session.prompt(input)),
         generate: (input) => require(cell, (runtime) => runtime.session.generate(input)),
         command: (input) => require(cell, (runtime) => runtime.session.command(input)),

packages/core/src/session.ts

@@ -233,8 +233,6 @@ export interface Interface {
     sessionID: SessionSchema.ID
     command: string
     arguments?: string
-    agent?: Agent.ID
-    model?: Model.Ref
     files?: PromptInput.Prompt["files"]
     agents?: PromptInput.Prompt["agents"]
     skills?: PromptInput.Prompt["skills"]
@@ -625,13 +623,13 @@ const layer = Layer.effect(
         const evaluated = yield* commands.evaluate({ name: input.command, arguments: input.arguments })
 
         // TODO(v2 commands): decide whether command-level subtask/background execution belongs in v2 commands.
-        const agent = command.agent ?? input.agent
+        const agent = command.agent
         const commandAgent = yield* Effect.gen(function* () {
           if (!command.agent) return undefined
           const agents = yield* Agent.Service.pipe(Effect.provide(locations.get(session.location)))
           return yield* agents.get(Agent.ID.make(command.agent))
         })
-        const model = command.model ?? commandAgent?.model ?? input.model
+        const model = command.model ?? commandAgent?.model
         if (agent !== undefined && session.agent !== Agent.ID.make(agent))
           yield* result.switchAgent({ sessionID: input.sessionID, agent: Agent.ID.make(agent) })
         if (model !== undefined) yield* result.switchModel({ sessionID: input.sessionID, model })

packages/core/src/session/message-updater.ts

@@ -4,7 +4,6 @@ import { SessionEvent } from "./event"
 import { SessionMessage } from "./message"
 
 export interface Adapter {
-  readonly getAgent: () => Effect.Effect<SessionMessage.AgentSelected["agent"] | undefined, never, never>
   readonly getModel: () => Effect.Effect<SessionMessage.ModelSelected["model"] | undefined, never, never>
   readonly getCurrentAssistant: () => Effect.Effect<SessionMessage.Assistant | undefined, never, never>
   readonly getAssistant: (
@@ -60,19 +59,15 @@ export function update(adapter: Adapter, event: SessionEvent.DurableEvent) {
       "session.created": () => Effect.void,
       "session.usage.recorded": () => Effect.void,
       "session.agent.selected": (event) => {
-        return Effect.gen(function* () {
-          const previous = yield* adapter.getAgent()
-          yield* adapter.appendMessage(
-            SessionMessage.AgentSelected.make({
-              id: SessionMessage.ID.fromEvent(event.id),
-              type: "agent-switched",
-              metadata: event.metadata,
-              agent: event.data.agent,
-              previous,
-              time: { created: event.created },
-            }),
-          )
-        })
+        return adapter.appendMessage(
+          SessionMessage.AgentSelected.make({
+            id: SessionMessage.ID.fromEvent(event.id),
+            type: "agent-switched",
+            metadata: event.metadata,
+            agent: event.data.agent,
+            time: { created: event.created },
+          }),
+        )
       },
       "session.model.selected": (event) => {
         return Effect.gen(function* () {

packages/core/src/session/projector.ts

@@ -5,7 +5,6 @@ import { DateTime, Effect, Layer, Schema, Stream } from "effect"
 import { Database } from "../database/database"
 import { Bus } from "../bus"
 import { makeGlobalNode } from "@opencode-ai/util/effect/app-node"
-import { Agent } from "../agent"
 import { Model } from "../model"
 import { SessionEvent } from "./event"
 import { SessionMessage } from "./message"
@@ -231,17 +230,6 @@ function run(db: DatabaseService, event: MessageEvent) {
     }
     const appendMessage = (message: SessionMessage.Info) => insertMessage(db, event, message)
     const adapter: SessionMessageUpdater.Adapter = {
-      getAgent() {
-        return db
-          .select({ agent: SessionTable.agent })
-          .from(SessionTable)
-          .where(eq(SessionTable.id, event.data.sessionID))
-          .get()
-          .pipe(
-            Effect.orDie,
-            Effect.map((row) => (row?.agent ? Agent.ID.make(row.agent) : undefined)),
-          )
-      },
       getModel() {
         return db
           .select({ model: SessionTable.model })
@@ -410,15 +398,12 @@ const layer = Layer.effectDiscard(
       db.delete(SessionTable).where(eq(SessionTable.id, event.data.sessionID)).run().pipe(Effect.orDie),
     )
     yield* bus.project(SessionEvent.AgentSelected, (event) =>
-      Effect.gen(function* () {
-        yield* run(db, event)
-        yield* db
-          .update(SessionTable)
-          .set({ agent: event.data.agent, time_updated: DateTime.toEpochMillis(event.created) })
-          .where(eq(SessionTable.id, event.data.sessionID))
-          .run()
-          .pipe(Effect.orDie)
-      }),
+      db
+        .update(SessionTable)
+        .set({ agent: event.data.agent, time_updated: DateTime.toEpochMillis(event.created) })
+        .where(eq(SessionTable.id, event.data.sessionID))
+        .run()
+        .pipe(Effect.orDie, Effect.andThen(run(db, event))),
     )
     yield* bus.project(SessionEvent.ModelSelected, (event) =>
       Effect.gen(function* () {

packages/core/src/session/runner/to-llm-message.ts

@@ -59,25 +59,6 @@ const attachmentContent = (file: FileAttachment): ContentPart[] => {
   return []
 }
 
-const userAttachmentContent = (files: readonly FileAttachment[]) => {
-  const eligible = files.filter(
-    (file) => imageMimes.has(file.mime) && file.source.type === "inline" && file.mention?.text,
-  )
-  if (eligible.length < 2) return files.flatMap(attachmentContent)
-
-  const seen = new Map<string, string[]>()
-  return files.flatMap((file) => {
-    if (!imageMimes.has(file.mime) || file.source.type !== "inline" || !file.mention?.text)
-      return attachmentContent(file)
-    const metadata = JSON.stringify([file.mime, file.name ?? null, file.description ?? null, file.mention.text])
-    const matches = seen.get(metadata)
-    if (matches?.includes(file.data)) return []
-    if (matches) matches.push(file.data)
-    if (!matches) seen.set(metadata, [file.data])
-    return attachmentContent(file)
-  })
-}
-
 const decodeToolInput = Schema.decodeUnknownOption(Schema.UnknownFromJsonString)
 
 const providerMetadata = (
@@ -205,7 +186,7 @@ function toLLMMessage(message: SessionMessage.Info, model: Model.Ref, providerMe
       const content = [
         ...(message.skills ?? []).map((skill) => Message.text(skill.text)),
         ...(message.text === "" ? [] : [Message.text(message.text)]),
-        ...userAttachmentContent(message.files ?? []),
+        ...(message.files ?? []).flatMap(attachmentContent),
       ]
       if (content.length === 0) return []
       return [

packages/core/test/agent.test.ts

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

packages/core/test/aisdk.test.ts

@@ -275,73 +275,6 @@ it.effect("projects replay metadata onto AI SDK prompt parts", () =>
   }),
 )
 
-it.effect("preserves tool result content in AI SDK prompts", () =>
-  Effect.gen(function* () {
-    const aisdk = yield* AISDK.Service
-    yield* aisdk.hook.sdk((event) => {
-      event.sdk = { languageModel: () => ({ provider: event.model.providerID }) }
-    })
-
-    const resolved = yield* aisdk.model(model("test-ai-sdk"))
-    const prepared = yield* compileRequest(
-      LLM.request({
-        model: resolved,
-        messages: [
-          Message.tool({
-            id: "call_1",
-            name: "read",
-            result: {
-              type: "content",
-              value: [
-                { type: "text", text: "attachments" },
-                { type: "file", uri: "data:image/png;base64,AAAA", mime: "image/png", name: "pixel.png" },
-                {
-                  type: "file",
-                  uri: "data:application/pdf;charset=utf-8;base64,JVBERg==",
-                  mime: "application/pdf",
-                  name: "document.pdf",
-                },
-                { type: "file", uri: "data:audio/mpeg;base64,SUQz", mime: "audio/mpeg", name: "clip.mp3" },
-                { type: "file", uri: "https://example.com/pixel.png", mime: "image/png" },
-                { type: "file", uri: "https://example.com/document.pdf", mime: "application/pdf" },
-              ],
-            },
-          }),
-        ],
-      }),
-    )
-
-    expect(prepared.body.prompt).toEqual([
-      {
-        role: "tool",
-        content: [
-          {
-            type: "tool-result",
-            toolCallId: "call_1",
-            toolName: "read",
-            output: {
-              type: "content",
-              value: [
-                { type: "text", text: "attachments" },
-                { type: "image-data", data: "AAAA", mediaType: "image/png" },
-                {
-                  type: "file-data",
-                  data: "JVBERg==",
-                  mediaType: "application/pdf",
-                  filename: "document.pdf",
-                },
-                { type: "file-data", data: "SUQz", mediaType: "audio/mpeg", filename: "clip.mp3" },
-                { type: "image-url", url: "https://example.com/pixel.png" },
-                { type: "file-url", url: "https://example.com/document.pdf" },
-              ],
-            },
-          },
-        ],
-      },
-    ])
-  }),
-)
-
 it.effect("emits malformed AI SDK tool input without executing it", () =>
   Effect.gen(function* () {
     const aisdk = yield* AISDK.Service

packages/core/test/plugin.test.ts

@@ -1,5 +1,4 @@
 import { describe, expect } from "bun:test"
-import { ToolFailure } from "@opencode-ai/ai"
 import { Context, Effect, Exit, Fiber, Schema, Stream } from "effect"
 import { Plugin as EffectPlugin } from "@opencode-ai/plugin/effect"
 import { Config as ConfigSchema } from "@opencode-ai/schema/config"
@@ -396,51 +395,4 @@ describe("Plugin", () => {
       })
     }),
   )
-
-  it.effect("rejects tool execution when an execute.before hook fails", () =>
-    Effect.gen(function* () {
-      const plugins = yield* Plugin.Service
-      const registry = yield* Tool.Service
-      const executed: unknown[] = []
-
-      const plugin = EffectPlugin.define({
-        id: "tool-hook-reject",
-        effect: (ctx) =>
-          Effect.gen(function* () {
-            yield* ctx.tool
-              .transform((draft) =>
-                draft.add({
-                  name: "echo",
-                  options: { codemode: false },
-                  description: "Echo",
-                  input: Schema.Struct({ text: Schema.String }),
-                  output: Schema.Struct({ text: Schema.String }),
-                  execute: ({ text }) =>
-                    Effect.sync(() => executed.push({ text })).pipe(Effect.as({ output: { text } })),
-                }),
-              )
-              .pipe(Effect.orDie)
-
-            yield* ctx.tool
-              .hook("execute.before", () => new ToolFailure({ message: "write disabled" }))
-              .pipe(Effect.asVoid)
-          }),
-      })
-
-      yield* plugins.activate([versioned(plugin)])
-
-      const toolSet = yield* registry.snapshot()
-      const failure = yield* toolSet
-        .execute({
-          sessionID: Session.ID.make("ses_hook_reject"),
-          agent: Agent.ID.make("build"),
-          messageID: SessionMessage.ID.make("msg_hook_reject"),
-          call: { type: "tool-call", id: "call-hook-reject", name: "echo", input: { text: "original" } },
-        })
-        .pipe(Effect.flip)
-
-      expect(failure).toMatchObject({ _tag: "Tool.Error", message: "write disabled" })
-      expect(executed).toEqual([])
-    }),
-  )
 })

packages/core/test/plugin/host.ts

@@ -102,7 +102,6 @@ export function host(overrides: Overrides = {}): Plugin.Context {
       hook: overrides.session?.hook ?? (() => Effect.die("unused session.hook")),
       create: overrides.session?.create ?? (() => Effect.die("unused session.create")),
       get: overrides.session?.get ?? (() => Effect.die("unused session.get")),
-      message: overrides.session?.message ?? (() => Effect.die("unused session.message")),
       prompt: overrides.session?.prompt ?? (() => Effect.die("unused session.prompt")),
       generate: overrides.session?.generate ?? (() => Effect.die("unused session.generate")),
       command: overrides.session?.command ?? (() => Effect.die("unused session.command")),

packages/core/test/session-create.test.ts

@@ -647,7 +647,7 @@ describe("Session.create", () => {
   it.effect("switches the selected agent through the durable Session event", () =>
     Effect.gen(function* () {
       const session = yield* Session.Service
-      const created = yield* session.create({ location, agent: Agent.ID.make("build") })
+      const created = yield* session.create({ location })
 
       yield* session.switchAgent({ sessionID: created.id, agent: Agent.ID.make("plan") })
 
@@ -655,9 +655,6 @@ describe("Session.create", () => {
       expect(
         Array.from(yield* logEvents(session, created.id, true).pipe(Stream.drop(1), Stream.take(1), Stream.runCollect)),
       ).toMatchObject([{ type: "session.agent.selected", data: { agent: "plan" } }])
-      expect(yield* session.messages({ sessionID: created.id, order: "asc" })).toMatchObject([
-        { type: "agent-switched", agent: "plan", previous: "build" },
-      ])
     }),
   )
 

packages/core/test/session-projector.test.ts

@@ -358,7 +358,6 @@ describe("SessionProjector", () => {
           directory: "/project",
           title: "test",
           version: "test",
-          agent: "plan",
           model: previousModel,
         })
         .run()
@@ -460,10 +459,6 @@ describe("SessionProjector", () => {
         text: "synthetic context",
         metadata: { source: "projector-test" },
       })
-      expect(messages.find((message) => message.type === "agent-switched")).toMatchObject({
-        agent: build,
-        previous: "plan",
-      })
       expect(messages.find((message) => message.type === "model-switched")).toMatchObject({ previous: previousModel })
       expect(messages.find((message) => message.type === "shell")).toMatchObject({
         command: "pwd",

packages/core/test/session-runner-message.test.ts

@@ -373,103 +373,6 @@ Recent work
     ])
   })
 
-  test("deduplicates provider media while preserving durable attachment references", () => {
-    const data = Base64.make("AAECAw==")
-    const messages = toLLMMessages(
-      [
-        SessionMessage.User.make({
-          id: id("user-duplicate-image"),
-          type: "user",
-          text: "[Image 1] [Image 1] [Image 2]",
-          files: [
-            FileAttachment.make({
-              data,
-              mime: "image/png",
-              source: { type: "inline" },
-              name: "image.png",
-              mention: { start: 0, end: 9, text: "[Image 1]" },
-            }),
-            FileAttachment.make({
-              data,
-              mime: "image/png",
-              source: { type: "inline" },
-              name: "image.png",
-              mention: { start: 10, end: 19, text: "[Image 1]" },
-            }),
-            FileAttachment.make({
-              data,
-              mime: "image/png",
-              source: { type: "inline" },
-              name: "image.png",
-              description: "alternate use",
-              mention: { start: 20, end: 29, text: "[Image 2]" },
-            }),
-          ],
-          time: { created },
-        }),
-      ],
-      model,
-    )
-
-    expect(messages[0]?.content).toEqual([
-      { type: "text", text: "[Image 1] [Image 1] [Image 2]" },
-      { type: "media", mediaType: "image/png", data, filename: "image.png" },
-      {
-        type: "media",
-        mediaType: "image/png",
-        data,
-        filename: "image.png",
-        metadata: { description: "alternate use" },
-      },
-    ])
-  })
-
-  test("preserves provider media with distinct labels or URI sources", () => {
-    const data = Base64.make("AAECAw==")
-    const messages = toLLMMessages(
-      [
-        SessionMessage.User.make({
-          id: id("user-distinct-images"),
-          type: "user",
-          text: "[Image 1] [Image 2]",
-          files: [
-            FileAttachment.make({
-              data,
-              mime: "image/png",
-              source: { type: "inline" },
-              name: "image.png",
-              mention: { start: 0, end: 9, text: "[Image 1]" },
-            }),
-            FileAttachment.make({
-              data,
-              mime: "image/png",
-              source: { type: "inline" },
-              name: "image.png",
-              mention: { start: 10, end: 19, text: "[Image 2]" },
-            }),
-            FileAttachment.make({
-              data,
-              mime: "image/png",
-              source: { type: "uri", uri: "file:///project/image.png" },
-              name: "image.png",
-              mention: { start: 0, end: 9, text: "[Image 1]" },
-            }),
-            FileAttachment.make({
-              data,
-              mime: "image/png",
-              source: { type: "inline" },
-              name: "image.png",
-            }),
-          ],
-          time: { created },
-        }),
-      ],
-      model,
-    )
-
-    expect(messages[0]?.content.filter((part) => part.type === "media")).toHaveLength(4)
-  })
-
   test("replays durable tool media into canonical tool messages without structured base64", () => {
     const messages = toLLMMessages(
       [

packages/desktop/electron-builder.config.test.ts

@@ -57,35 +57,35 @@ test("keeps a hidden prod launcher for old Linux pins", async () => {
   expect(desktop).toContain("NoDisplay=true")
 })
 
-for (const channel of ["dev", "beta"] as const) {
-  test(`bundles the CLI outside the ${channel} app archive`, async () => {
+test("bundles the CLI outside the dev app archive", async () => {
+  const previous = process.env.OPENCODE_CHANNEL
+  process.env.OPENCODE_CHANNEL = "dev"
+  const module = await import("./electron-builder.config.ts?cli-resource")
+  const config = module.default as Configuration
+  if (previous === undefined) delete process.env.OPENCODE_CHANNEL
+  else process.env.OPENCODE_CHANNEL = previous
+
+  expect(config.files).toContain("!resources/opencode-cli*")
+  expect(config.extraResources).toContainEqual({
+    from: "resources/",
+    to: "",
+    filter: ["opencode-cli*"],
+  })
+})
+
+for (const channel of ["beta", "prod"] as const) {
+  test(`does not bundle the CLI in ${channel} builds`, async () => {
     const previous = process.env.OPENCODE_CHANNEL
     process.env.OPENCODE_CHANNEL = channel
-    const module = await import(`./electron-builder.config.ts?cli-resource=${channel}`)
+    const module = await import(`./electron-builder.config.ts?no-cli-resource=${channel}`)
     const config = module.default as Configuration
     if (previous === undefined) delete process.env.OPENCODE_CHANNEL
     else process.env.OPENCODE_CHANNEL = previous
 
-    expect(config.files).toContain("!resources/opencode-cli*")
-    expect(config.extraResources).toContainEqual({
+    expect(config.extraResources).not.toContainEqual({
       from: "resources/",
       to: "",
       filter: ["opencode-cli*"],
     })
   })
 }
-
-test("does not bundle the CLI in prod builds", async () => {
-  const previous = process.env.OPENCODE_CHANNEL
-  process.env.OPENCODE_CHANNEL = "prod"
-  const module = await import("./electron-builder.config.ts?no-cli-resource=prod")
-  const config = module.default as Configuration
-  if (previous === undefined) delete process.env.OPENCODE_CHANNEL
-  else process.env.OPENCODE_CHANNEL = previous
-
-  expect(config.extraResources).not.toContainEqual({
-    from: "resources/",
-    to: "",
-    filter: ["opencode-cli*"],
-  })
-})

packages/desktop/electron-builder.config.ts

@@ -57,7 +57,7 @@ const getBase = (appId: string): Configuration => ({
   },
   files: ["out/**/*", "resources/**/*", "!resources/opencode-cli*"],
   extraResources: [
-    ...(channel !== "prod"
+    ...(channel === "dev"
       ? [
           {
             from: "resources/",

packages/desktop/package.json

@@ -37,7 +37,6 @@
     "@actions/artifact": "4.0.0",
     "@lydell/node-pty": "catalog:",
     "@opencode-ai/app": "workspace:*",
-    "@opencode-ai/client": "workspace:*",
     "@opencode-ai/ui": "workspace:*",
     "@sentry/solid": "catalog:",
     "@sentry/vite-plugin": "catalog:",

packages/desktop/scripts/copy-bundles.ts

@@ -1,9 +1,9 @@
 import { $ } from "bun"
 import * as path from "node:path"
 
-import { CLI_TARGET } from "./utils"
+import { RUST_TARGET } from "./utils"
 
-if (!CLI_TARGET) throw new Error("OPENCODE_CLI_TARGET not defined")
+if (!RUST_TARGET) throw new Error("RUST_TARGET not defined")
 
 const BUNDLE_DIR = "dist"
 const BUNDLES_OUT_DIR = path.join(process.cwd(), "dist/bundles")

packages/desktop/scripts/prebuild.ts

@@ -8,4 +8,3 @@ await $`bun ./scripts/copy-icons.ts ${channel}`
 await $`bun ./scripts/copy-metainfo.ts ${channel}`
 
 if (channel === "dev") await downloadCliToResources()
-if (channel === "beta") await downloadCliToResources("next")

packages/desktop/scripts/utils.ts

@@ -13,46 +13,46 @@ export function resolveChannel(): Channel {
   return "dev"
 }
 
-export const CLI_BINARIES: Array<{ target: string; package: string; os: string; cpu: string }> = [
+export const CLI_BINARIES: Array<{ rustTarget: string; package: string; os: string; cpu: string }> = [
   {
-    target: "aarch64-apple-darwin",
+    rustTarget: "aarch64-apple-darwin",
     package: "@opencode-ai/cli-darwin-arm64",
     os: "darwin",
     cpu: "arm64",
   },
   {
-    target: "x86_64-apple-darwin",
+    rustTarget: "x86_64-apple-darwin",
     package: "@opencode-ai/cli-darwin-x64-baseline",
     os: "darwin",
     cpu: "x64",
   },
   {
-    target: "aarch64-pc-windows-msvc",
+    rustTarget: "aarch64-pc-windows-msvc",
     package: "@opencode-ai/cli-windows-arm64",
     os: "win32",
     cpu: "arm64",
   },
   {
-    target: "x86_64-pc-windows-msvc",
+    rustTarget: "x86_64-pc-windows-msvc",
     package: "@opencode-ai/cli-windows-x64-baseline",
     os: "win32",
     cpu: "x64",
   },
   {
-    target: "x86_64-unknown-linux-gnu",
+    rustTarget: "x86_64-unknown-linux-gnu",
     package: "@opencode-ai/cli-linux-x64-baseline",
     os: "linux",
     cpu: "x64",
   },
   {
-    target: "aarch64-unknown-linux-gnu",
+    rustTarget: "aarch64-unknown-linux-gnu",
     package: "@opencode-ai/cli-linux-arm64",
     os: "linux",
     cpu: "arm64",
   },
 ]
 
-export const CLI_TARGET = Bun.env.OPENCODE_CLI_TARGET
+export const RUST_TARGET = Bun.env.RUST_TARGET
 
 function nativeTarget() {
   const { platform, arch } = process
@@ -62,19 +62,19 @@ function nativeTarget() {
   throw new Error(`Unsupported platform: ${platform}/${arch}`)
 }
 
-export function getCurrentCli(target = CLI_TARGET ?? nativeTarget()) {
-  const binaryConfig = CLI_BINARIES.find((item) => item.target === target)
+export function getCurrentCli(target = RUST_TARGET ?? nativeTarget()) {
+  const binaryConfig = CLI_BINARIES.find((item) => item.rustTarget === target)
   if (!binaryConfig) throw new Error(`CLI configuration not available for target '${target}'`)
 
   return binaryConfig
 }
 
-export async function downloadCliToResources(version = CLI_VERSION) {
+export async function downloadCliToResources() {
   const cli = getCurrentCli()
   const directory = await mkdtemp(join(tmpdir(), "opencode-cli-"))
   const dest = windowsify("resources/opencode-cli")
   try {
-    await $`bun install --no-save --cwd ${directory} ${`${cli.package}@${version}`} ${`--os=${cli.os}`} ${`--cpu=${cli.cpu}`}`
+    await $`bun install --no-save --cwd ${directory} ${`${cli.package}@${CLI_VERSION}`} ${`--os=${cli.os}`} ${`--cpu=${cli.cpu}`}`
     await copyFile(
       join(directory, "node_modules", cli.package, "bin", cli.os === "win32" ? "opencode2.exe" : "opencode2"),
       dest,
@@ -88,7 +88,7 @@ export async function downloadCliToResources(version = CLI_VERSION) {
   }
   if (process.platform === "darwin") await $`codesign --force --sign - ${dest}`
 
-  console.log(`Copied ${cli.package}@${version} to ${dest}`)
+  console.log(`Copied ${cli.package} to ${dest}`)
 }
 
 export function windowsify(path: string) {

packages/desktop/src/main/background-cli.ts

@@ -1,4 +1,3 @@
-import { Service } from "@opencode-ai/client/service"
 import { execFile } from "node:child_process"
 import { existsSync } from "node:fs"
 import { chmod, copyFile, mkdir, rename, rm } from "node:fs/promises"
@@ -9,34 +8,52 @@ import { app } from "electron"
 
 const execFileAsync = promisify(execFile)
 const root = dirname(fileURLToPath(import.meta.url))
+const stateHome = process.env.XDG_STATE_HOME
+const desktopStateNames = ["ai.opencode.desktop.dev", "ai.opencode.desktop.beta", "ai.opencode.desktop"]
 
 type Logger = {
   log(message: string, meta?: Record<string, unknown>): void
   error(message: string, meta?: Record<string, unknown>): void
 }
 
-export async function startBackgroundCli(logger: Logger) {
+export async function startBackgroundCli(logger: Logger, shellStateHome?: string) {
   const bundled = app.isPackaged
     ? join(process.resourcesPath, executableName())
     : join(root, "../../resources", executableName())
   logger.log("v2 CLI executable resolved", { bundled, packaged: app.isPackaged })
-  const version = parseVersion(await run(bundled, ["--version"], logger))
+  const version = await run(bundled, ["--version"], logger)
   const binary = app.isPackaged ? await installCli(bundled, version, logger) : bundled
-  const service = await Service.ensure({
-    version,
-    command: [binary, "serve", "--service"],
-    onStart: (reason, previousVersion) => logger.log("v2 CLI background service starting", { reason, previousVersion }),
+
+  const candidates = [
+    ...new Set([stateHome, shellStateHome, ...desktopStateNames.map((name) => join(app.getPath("appData"), name))]),
+  ].filter((candidate) => candidate === undefined || existsSync(candidate))
+  const discovered = await Promise.all(
+    candidates.map(async (candidate) => ({
+      stateHome: candidate,
+      url: serviceUrl(await run(binary, ["service", "status"], logger, { stateHome: candidate })),
+    })),
+  )
+  const found = discovered.find((candidate) => candidate.url !== undefined)
+  logger.log("v2 CLI background instance checked", {
+    detected: Boolean(found),
+    ...endpoint(found?.url),
+  })
+
+  const daemonStateHome = found?.stateHome ?? stateHome
+  const url = await run(binary, ["service", "start"], logger, { stateHome: daemonStateHome })
+  const password = await run(binary, ["service", "get", "password"], logger, {
+    redact: true,
+    stateHome: daemonStateHome,
   })
-  if (service.auth?.type !== "basic") throw new Error("V2 CLI background service did not provide authentication")
   logger.log("v2 CLI background service ready", {
-    username: service.auth.username,
-    version,
-    ...endpoint(service.url),
+    existing: Boolean(found),
+    username: "opencode",
+    ...endpoint(url),
   })
   return {
-    url: service.url,
-    username: service.auth.username,
-    password: service.auth.password,
+    url,
+    username: "opencode",
+    password,
   }
 }
 
@@ -60,13 +77,21 @@ async function installCli(source: string, version: string, logger: Logger) {
   return destination
 }
 
-async function run(binary: string, args: string[], logger: Logger) {
+async function run(
+  binary: string,
+  args: string[],
+  logger: Logger,
+  options: { redact?: boolean; stateHome?: string } = {},
+) {
   logger.log("v2 CLI command started", { binary, args })
-  return execFileAsync(binary, args, { windowsHide: true }).then(
+  const env = { ...process.env }
+  if (options.stateHome === undefined) delete env.XDG_STATE_HOME
+  else env.XDG_STATE_HOME = options.stateHome
+  return execFileAsync(binary, args, { env, windowsHide: true }).then(
     (result) => {
       const stdout = result.stdout.trim()
       const stderr = result.stderr.trim()
-      logger.log("v2 CLI command completed", { args, stdout, stderr })
+      logger.log("v2 CLI command completed", { args, stdout: options.redact ? "[redacted]" : stdout, stderr })
       return stdout
     },
     (error: unknown) => {
@@ -74,7 +99,7 @@ async function run(binary: string, args: string[], logger: Logger) {
       logger.error("v2 CLI command failed", {
         args,
         error: error instanceof Error ? error.message : String(error),
-        stdout: output.stdout?.trim() ?? "",
+        stdout: options.redact && output.stdout ? "[redacted]" : (output.stdout?.trim() ?? ""),
         stderr: output.stderr?.trim() ?? "",
       })
       throw error
@@ -82,11 +107,11 @@ async function run(binary: string, args: string[], logger: Logger) {
   )
 }
 
-function parseVersion(output: string) {
-  const marker = output.lastIndexOf(" v")
-  const version = marker === -1 ? output : output.slice(marker + 2)
-  if (!version) throw new Error("V2 CLI did not provide a version")
-  return version
+function serviceUrl(status: string) {
+  if (URL.canParse(status)) return status
+  if (!status.startsWith("running ")) return
+  const url = status.slice("running ".length).trim()
+  return URL.canParse(url) ? url : undefined
 }
 
 function endpoint(url: string | undefined) {

packages/desktop/src/main/index.ts

@@ -181,7 +181,7 @@ const main = Effect.gen(function* () {
     return
   }
 
-  preferAppEnv()
+  const shellEnv = preferAppEnv(app.getPath("userData"))
 
   app.on("second-instance", (_event: Event, argv: string[]) => {
     const urls = argv.filter((arg: string) => arg.startsWith("opencode://"))
@@ -310,7 +310,7 @@ const main = Effect.gen(function* () {
     useEnvProxy()
 
     logger.log("starting v2 background service")
-    const sidecar = yield* Effect.promise(() => startBackgroundCli(logger))
+    const sidecar = yield* Effect.promise(() => startBackgroundCli(logger, shellEnv?.XDG_STATE_HOME))
     yield* Deferred.succeed(serverReady, {
       url: sidecar.url,
       username: sidecar.username,

packages/desktop/src/main/server.ts

@@ -17,16 +17,17 @@ export function setDefaultServerUrl(url: string | null) {
   getStore().delete(DEFAULT_SERVER_URL_KEY)
 }
 
-export function preferAppEnv() {
+export function preferAppEnv(userDataPath: string) {
   const shell = process.platform === "win32" ? null : getUserShell()
   const shellEnv = shell ? loadShellEnv(shell, getLogger()) : null
-  if (!shellEnv?.XDG_STATE_HOME) delete process.env.XDG_STATE_HOME
   Object.assign(process.env, {
     ...shellEnv,
     OPENCODE_EXPERIMENTAL_ICON_DISCOVERY: "true",
     OPENCODE_EXPERIMENTAL_FILEWATCHER: "true",
     OPENCODE_CLIENT: "desktop",
+    XDG_STATE_HOME: process.env.XDG_STATE_HOME ?? userDataPath,
   })
+  return shellEnv
 }
 
 export async function checkHealth(url: string, password?: string | null): Promise<boolean> {

packages/plugin/src/effect/registration.ts

@@ -4,11 +4,9 @@ export interface Registration {
   readonly dispose: Effect.Effect<void>
 }
 
-export type Hooks<Spec, Failures extends Record<keyof Spec, unknown> = Record<keyof Spec, never>> = <
-  Name extends keyof Spec,
->(
+export type Hooks<Spec> = <Name extends keyof Spec>(
   name: Name,
-  callback: (input: Spec[Name]) => Effect.Effect<void, Failures[Name]>,
+  callback: (input: Spec[Name]) => Effect.Effect<void>,
 ) => Effect.Effect<Registration, never, Scope.Scope>
 
 export type Transform<Input> = (callback: (input: Input) => void) => Effect.Effect<Registration, never, Scope.Scope>

packages/plugin/src/effect/session.ts

@@ -3,8 +3,7 @@ import type { Message, SystemPart } from "@opencode-ai/ai"
 import type { Agent } from "@opencode-ai/schema/agent"
 import type { Model } from "@opencode-ai/schema/model"
 import type { Session } from "@opencode-ai/schema/session"
-import type { SessionMessage } from "@opencode-ai/schema/session-message"
-import type { Effect, JsonSchema } from "effect"
+import type { JsonSchema } from "effect"
 import type { Hooks } from "./registration.js"
 
 export interface SessionContext {
@@ -41,9 +40,5 @@ export type SessionDomain = Pick<
   SessionApi<unknown>,
   "create" | "get" | "prompt" | "generate" | "command" | "synthetic" | "interrupt" | "rename" | "wait"
 > & {
-  readonly message: (input: {
-    readonly sessionID: Session.ID
-    readonly messageID: SessionMessage.ID
-  }) => Effect.Effect<SessionMessage.Info | undefined, unknown>
   readonly hook: Hooks<SessionHooks>
 }

packages/plugin/src/effect/tool.ts

@@ -38,13 +38,7 @@ export interface ToolHooks {
   )
 }
 
-// Only execute.before may fail: a Tool.Error rejects the call before the tool runs.
-export interface ToolFailures extends Record<keyof ToolHooks, unknown> {
-  readonly "execute.before": Tool.Error
-  readonly "execute.after": never
-}
-
 export interface ToolDomain {
   readonly transform: Transform<ToolDraft>
-  readonly hook: Hooks<ToolHooks, ToolFailures>
+  readonly hook: Hooks<ToolHooks>
 }

packages/protocol/openapi.json

@@ -12733,9 +12733,6 @@
           },
           "agent": {
             "type": "string"
-          },
-          "previous": {
-            "type": "string"
           }
         },
         "required": ["id", "time", "type", "agent"],

packages/protocol/src/groups/session.ts

@@ -341,8 +341,6 @@ export const makeSessionGroup = <I extends HttpApiMiddleware.AnyId, S>(sessionLo
           id: SessionMessage.ID.pipe(Schema.optional),
           command: Schema.String,
           arguments: Schema.String.pipe(Schema.optional),
-          agent: Agent.ID.pipe(Schema.optional),
-          model: Model.Ref.pipe(Schema.optional),
           files: PromptInput.Prompt.fields.files,
           agents: PromptInput.Prompt.fields.agents,
           skills: PromptInput.Prompt.fields.skills,

packages/schema/src/session-message.ts

@@ -42,7 +42,6 @@ export const AgentSelected = Schema.Struct({
   ...Base,
   type: Schema.tag("agent-switched"),
   agent: Agent.ID,
-  previous: Agent.ID.pipe(optional),
 }).annotate({ identifier: "Session.Message.AgentSelected" })
 
 export interface ModelSelected extends Schema.Schema.Type<typeof ModelSelected> {}

packages/server/src/handlers/session.ts

@@ -355,8 +355,6 @@ export const SessionHandler = HttpApiBuilder.group(Api, "server.session", (handl
                 id: ctx.payload.id,
                 command: ctx.payload.command,
                 arguments: ctx.payload.arguments,
-                agent: ctx.payload.agent,
-                model: ctx.payload.model,
                 files: ctx.payload.files,
                 agents: ctx.payload.agents,
                 skills: ctx.payload.skills,

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

@@ -60,11 +60,6 @@ import { Keymap, type KeymapCommand } from "../../context/keymap"
 import { abbreviateHome } from "../../runtime"
 import { PluginSlot } from "../../plugin/render"
 import type { SessionPending } from "@opencode-ai/schema/session-pending"
-import {
-  deduplicatePromptImages,
-  preserveMentionlessPromptAttachments,
-  promptAttachmentLabel,
-} from "../../prompt/attachment"
 import { DialogImagePreview } from "../dialog-image-preview"
 
 export type PromptProps = {
@@ -336,7 +331,7 @@ export function Prompt(props: PromptProps) {
   }
 
   const imageAttachments = createMemo(() =>
-    (deduplicatePromptImages(store.prompt.files) ?? []).filter((file) => file.uri.startsWith("data:image/")),
+    (store.prompt.files ?? []).filter((file) => typeof file.uri === "string" && file.uri.startsWith("data:image/")),
   )
   const imagePreviewHeight = createMemo(() => Math.max(4, Math.min(8, Math.floor(dimensions().height / 4))))
   const imagePreviewWidth = createMemo(() => imagePreviewHeight() * 2)
@@ -741,7 +736,6 @@ export function Prompt(props: PromptProps) {
     setStore(
       produce((draft) => {
         const newMap = new Map<number, PromptPartRef>()
-        const fileExtmarks = new Map<number, NonNullable<PromptInfo["files"]>[number]>()
         const files: NonNullable<PromptInfo["files"]> = []
         const agents: NonNullable<PromptInfo["agents"]> = []
         const skills: NonNullable<PromptInfo["skills"]> = []
@@ -755,8 +749,9 @@ export function Prompt(props: PromptProps) {
             if (!part?.mention) continue
             part.mention.start = extmark.start
             part.mention.end = extmark.end
+            const index = files.length
             files.push(part)
-            fileExtmarks.set(extmark.id, part)
+            newMap.set(extmark.id, { type: "file", index })
             continue
           }
           if (ref.type === "agent") {
@@ -788,19 +783,8 @@ export function Prompt(props: PromptProps) {
           newMap.set(extmark.id, { type: "pasted", index })
         }
 
-        const nextFiles = preserveMentionlessPromptAttachments(draft.prompt.files, files)
-        const fileIndices = new Map(nextFiles.map((file, index) => [file, index]))
-        for (const [extmark, file] of fileExtmarks) {
-          const index = fileIndices.get(file)
-          if (index !== undefined) newMap.set(extmark, { type: "file", index })
-        }
-
         draft.extmarkToPart = newMap
-        if (
-          nextFiles.length !== draft.prompt.files?.length ||
-          nextFiles.some((file, index) => file !== draft.prompt.files?.[index])
-        )
-          draft.prompt.files = nextFiles
+        draft.prompt.files = files
         draft.prompt.agents = agents
         draft.prompt.skills = skills
         draft.prompt.pasted = pasted
@@ -1154,6 +1138,7 @@ export function Prompt(props: PromptProps) {
 
     // Capture mode before it gets reset
     const currentMode = store.mode
+
     if (store.mode === "shell") {
       move.startSubmit()
       void client.api.session.shell({
@@ -1164,15 +1149,23 @@ export function Prompt(props: PromptProps) {
     } else if (slashHead && isCommand) {
       move.startSubmit()
       const model = { providerID: selection.providerID, id: selection.modelID, variant }
+      if (session?.agent !== agent.id) await client.api.session.switchAgent({ sessionID, agent: agent.id })
       const cancelCommit = local.model.trackSessionCommit(sessionID, model)
+      if (
+        session?.model?.providerID !== model.providerID ||
+        session.model.id !== model.id ||
+        (session.model.variant ?? "default") !== (model.variant ?? "default")
+      )
+        await client.api.session.switchModel({ sessionID, model }).catch((error) => {
+          cancelCommit()
+          throw error
+        })
 
       void client.api.session
         .command({
           sessionID,
           command: slashHead.name,
           arguments: slashHead.arguments,
-          agent: agent.id,
-          model,
           files: store.prompt.files,
           agents: store.prompt.agents,
           skills: store.prompt.skills?.length ? store.prompt.skills : undefined,
@@ -1391,7 +1384,13 @@ export function Prompt(props: PromptProps) {
   function pasteAttachment(file: { filename?: string; uri: string }) {
     const currentOffset = input.cursorOffset
     const extmarkStart = currentOffset
-    const virtualText = promptAttachmentLabel(store.prompt.files, { uri: file.uri, name: file.filename })
+    const pdf = file.uri.startsWith("data:application/pdf;")
+    const count = pdf
+      ? (store.prompt.files?.filter(
+          (attachment) => typeof attachment.uri === "string" && attachment.uri.startsWith("data:application/pdf;"),
+        ).length ?? 0)
+      : imageAttachments().length
+    const virtualText = pdf ? `[PDF ${count + 1}]` : `[Image ${count + 1}]`
     const extmarkEnd = extmarkStart + virtualText.length
     const textToInsert = virtualText + " "
 

packages/tui/src/context/data.tsx

@@ -386,8 +386,7 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
             },
           }))
           break
-        case "session.agent.selected": {
-          const previous = store.session.info[event.data.sessionID]?.agent
+        case "session.agent.selected":
           if (store.session.info[event.data.sessionID])
             setStore("session", "info", event.data.sessionID, "agent", event.data.agent)
           message.update(event.data.sessionID, (draft, index) => {
@@ -395,12 +394,10 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
               id: messageIDFromEvent(event.id),
               type: "agent-switched",
               agent: event.data.agent,
-              previous,
               time: { created: event.created },
             })
           })
           break
-        }
         case "session.model.selected":
           if (store.session.info[event.data.sessionID])
             setStore("session", "info", event.data.sessionID, "model", event.data.model)

packages/tui/src/mini/stream-v2.transport.ts

@@ -1653,8 +1653,6 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
       )
     }
 
-    const selected = await resolveSelectedModel(input, client, next)
-    if (next.variant && !selected) throw new Error("Cannot select a variant before selecting a model")
     input.trace?.write("send.command", { sessionID: input.sessionID, messageID, command: command.name, delivery })
     return client.session.command(
       {
@@ -1662,8 +1660,6 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
         id: messageID,
         command: command.name,
         arguments: command.arguments,
-        agent: next.agent,
-        model: selected,
         files: attachments.files.length ? attachments.files : undefined,
         agents: agents.length ? agents : undefined,
         skills: skills.length ? skills : undefined,
@@ -1706,12 +1702,10 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
       const client = sdk
       if (next.agent)
         await client.session.switchAgent({ sessionID: input.sessionID, agent: next.agent }, { signal: next.signal })
-      if (!next.prompt.command) {
-        const selected = await resolveSelectedModel(input, client, next)
-        if (next.variant && !selected) throw new Error("Cannot select a variant before selecting a model")
-        if (selected)
-          await client.session.switchModel({ sessionID: input.sessionID, model: selected }, { signal: next.signal })
-      }
+      const selected = await resolveSelectedModel(input, client, next)
+      if (next.variant && !selected) throw new Error("Cannot select a variant before selecting a model")
+      if (selected)
+        await client.session.switchModel({ sessionID: input.sessionID, model: selected }, { signal: next.signal })
       mergePending(await admitPrompt(next, client, delivery))
       settlementClient = client
     },
@@ -1750,6 +1744,12 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
         return
       }
       if (command) {
+        if (next.agent)
+          await client.session.switchAgent({ sessionID: input.sessionID, agent: next.agent }, { signal: next.signal })
+        const selected = await resolveSelectedModel(input, client, next)
+        if (next.variant && !selected) throw new Error("Cannot select a variant before selecting a model")
+        if (selected)
+          await client.session.switchModel({ sessionID: input.sessionID, model: selected }, { signal: next.signal })
         await runTurnWait(
           next,
           messageID,

packages/tui/src/prompt/attachment.ts

@@ -1,96 +0,0 @@
-import type { PromptInput } from "@opencode-ai/schema"
-
-type PromptFile = PromptInput.FileAttachment
-type PromptFileIdentity = Pick<PromptFile, "uri" | "name" | "description">
-type ProjectedFile = Readonly<{
-  data: string
-  mime: string
-  source: { type: string }
-  name?: string
-  description?: string
-  mention?: { text: string }
-}>
-
-function attachmentKind(uri: string) {
-  if (uri.startsWith("data:image/")) return "Image"
-  if (uri.startsWith("data:application/pdf;")) return "PDF"
-  return undefined
-}
-
-function attachmentMetadata(file: PromptFileIdentity) {
-  return JSON.stringify([file.name ?? null, file.description ?? null])
-}
-
-function deduplicateByIdentity<T>(
-  items: readonly T[],
-  identity: (item: T) => { metadata: string; payload: string } | undefined,
-) {
-  const seen = new Map<string, string[]>()
-  return items.filter((item) => {
-    const key = identity(item)
-    if (!key) return true
-    const matches = seen.get(key.metadata)
-    if (matches?.includes(key.payload)) return false
-    if (matches) matches.push(key.payload)
-    if (!matches) seen.set(key.metadata, [key.payload])
-    return true
-  })
-}
-
-export function deduplicatePromptImages(files: readonly PromptFile[] | undefined) {
-  if (!files || files.length < 2) return files
-  return deduplicateByIdentity(files, (file) =>
-    file.uri.startsWith("data:image/") && file.mention?.text
-      ? {
-          metadata: JSON.stringify([attachmentMetadata(file), file.mention.text]),
-          payload: file.uri,
-        }
-      : undefined,
-  )
-}
-
-export function preserveMentionlessPromptAttachments(
-  files: readonly PromptFile[] | undefined,
-  mentioned: PromptFile[],
-) {
-  if (!files) return mentioned
-  const tracked = mentioned.values()
-  return files.flatMap((file) => {
-    if (!file.mention?.text) return [file]
-    const next = tracked.next()
-    return next.done ? [] : [next.value]
-  })
-}
-
-export function deduplicateVisibleImages<T extends ProjectedFile>(files: readonly T[]) {
-  return deduplicateByIdentity(files, (file) =>
-    file.mime.startsWith("image/") && file.source.type === "inline" && file.mention?.text
-      ? {
-          metadata: JSON.stringify([file.mime, file.name ?? null, file.description ?? null, file.mention.text]),
-          payload: file.data,
-        }
-      : undefined,
-  )
-}
-
-export function promptAttachmentLabel(files: readonly PromptFile[] | undefined, file: PromptFileIdentity) {
-  const kind = attachmentKind(file.uri)
-  if (!kind) throw new Error(`Unsupported inline attachment: ${file.uri}`)
-  const metadata = attachmentMetadata(file)
-  const existing =
-    kind === "Image"
-      ? files?.find(
-          (candidate) =>
-            candidate.uri === file.uri && attachmentMetadata(candidate) === metadata && candidate.mention?.text,
-        )?.mention?.text
-      : undefined
-  if (existing) return existing
-
-  const pattern = new RegExp(`^\\[${kind} (\\d+)\\]$`)
-  const count =
-    files?.reduce((highest, candidate) => {
-      const match = candidate.mention?.text.match(pattern)
-      return match ? Math.max(highest, Number(match[1])) : highest
-    }, 0) ?? 0
-  return `[${kind} ${count + 1}]`
-}

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

@@ -70,7 +70,6 @@ import stripAnsi from "strip-ansi"
 import { usePromptRef } from "../../context/prompt"
 import { sessionTabsFitVertically, SESSION_SIDEBAR_WIDTH } from "../../ui/layout"
 import { projectedPromptInput } from "../../prompt/codec"
-import { deduplicateVisibleImages } from "../../prompt/attachment"
 import { useEpilogue } from "../../context/epilogue"
 import { normalizePath } from "../../util/path"
 import { PermissionPrompt } from "./permission"
@@ -650,18 +649,8 @@ export function Session() {
       slash: {
         name: "compact",
       },
-      run: async () => {
-        const selection = local.model.current()
-        if (selection)
-          await client.api.session.switchModel({
-            sessionID: route.sessionID,
-            model: {
-              providerID: selection.providerID,
-              id: selection.modelID,
-              variant: local.model.variant.current(),
-            },
-          })
-        await client.api.session.compact({ sessionID: route.sessionID })
+      run: () => {
+        void client.api.session.compact({ sessionID: route.sessionID })
         dialog.clear()
       },
     },
@@ -1662,12 +1651,7 @@ function SessionSwitchMessageV2(props: { message: SessionMessageInfo }) {
   const ctx = use()
   const theme = useTheme()
   const text = () => {
-    if (props.message.type === "agent-switched") {
-      const agent = Locale.titlecase(props.message.agent)
-      if (props.message.previous && props.message.previous !== props.message.agent)
-        return `Switched agent from ${Locale.titlecase(props.message.previous)} to ${agent}`
-      return `Switched agent to ${agent}`
-    }
+    if (props.message.type === "agent-switched") return `Switched agent to ${props.message.agent}`
     if (props.message.type === "model-switched")
       return switchLabel(props.message.model, ctx.models(), props.message.previous)
     return ""
@@ -1915,7 +1899,7 @@ function UserMessage(props: { message: SessionMessageUser }) {
   const ctx = use()
   const data = useData()
   const local = useLocal()
-  const files = createMemo(() => deduplicateVisibleImages(props.message.files ?? []))
+  const files = createMemo(() => props.message.files ?? [])
   const skills = createMemo(() => props.message.skills ?? [])
   const images = createMemo(() =>
     files().flatMap((file) =>

packages/tui/test/mini/stream-v2.transport.test.ts

@@ -2855,8 +2855,6 @@ describe("V2 mini transport", () => {
       id: "msg_cmd",
       command: "deploy",
       arguments: "prod",
-      agent: "build",
-      model: { providerID: "test", id: "model" },
       files: [
         { uri: "file:///tmp/context.txt", name: "context.txt" },
         {
@@ -2868,9 +2866,11 @@ describe("V2 mini transport", () => {
       skills: [{ id: "api-design", mention: { start: 13, end: 24, text: "/api-design" } }],
       delivery: "steer",
     })
-    // Selection rides the command payload; no separate client-side switch.
-    expect(client.session.switchAgent).not.toHaveBeenCalled()
-    expect(client.session.switchModel).not.toHaveBeenCalled()
+    expect(client.session.switchAgent).toHaveBeenCalledWith({ sessionID: "ses_1", agent: "build" }, expect.anything())
+    expect(client.session.switchModel).toHaveBeenCalledWith(
+      { sessionID: "ses_1", model: { providerID: "test", id: "model" } },
+      expect.anything(),
+    )
     await transport.close()
   })
 

packages/tui/test/prompt/attachment.test.ts

@@ -1,125 +0,0 @@
-import { describe, expect, test } from "bun:test"
-import {
-  deduplicatePromptImages,
-  deduplicateVisibleImages,
-  preserveMentionlessPromptAttachments,
-  promptAttachmentLabel,
-} from "../../src/prompt/attachment"
-
-describe("prompt attachments", () => {
-  test("deduplicates identical inline images while preserving other attachments", () => {
-    const files = [
-      {
-        uri: "data:image/png;base64,AAA",
-        name: "first.png",
-        mention: { start: 0, end: 9, text: "[Image 1]" },
-      },
-      { uri: "file:///same", name: "first.txt" },
-      { uri: "data:application/pdf;base64,CCC", name: "first.pdf" },
-      {
-        uri: "data:image/png;base64,BBB",
-        name: "second.png",
-        mention: { start: 10, end: 19, text: "[Image 2]" },
-      },
-      {
-        uri: "data:image/png;base64,AAA",
-        name: "first.png",
-        mention: { start: 20, end: 29, text: "[Image 1]" },
-      },
-      {
-        uri: "data:image/png;base64,AAA",
-        name: "first.png",
-        description: "alternate use",
-        mention: { start: 30, end: 39, text: "[Image 1]" },
-      },
-      { uri: "file:///same", name: "second.txt" },
-      { uri: "data:application/pdf;base64,CCC", name: "first.pdf" },
-    ]
-
-    expect(deduplicatePromptImages(files)).toEqual([
-      files[0],
-      files[1],
-      files[2],
-      files[3],
-      files[5],
-      files[6],
-      files[7],
-    ])
-    expect(files).toHaveLength(8)
-  })
-
-  test("reuses labels for identical image data", () => {
-    const first = "data:image/png;base64,AAA"
-    const second = "data:image/png;base64,BBB"
-    const files = [{ uri: first, mention: { start: 0, end: 9, text: "[Image 1]" } }]
-
-    expect(promptAttachmentLabel(files, { uri: first })).toBe("[Image 1]")
-    expect(promptAttachmentLabel([...files, { ...files[0], mention: undefined }], { uri: second })).toBe("[Image 2]")
-    expect(promptAttachmentLabel([{ uri: first }], { uri: first })).toBe("[Image 1]")
-  })
-
-  test("numbers PDFs independently from images", () => {
-    const files = [{ uri: "data:image/png;base64,AAA" }]
-
-    expect(promptAttachmentLabel(files, { uri: "data:application/pdf;base64,BBB" })).toBe("[PDF 1]")
-  })
-
-  test("does not reuse a label when attachment metadata differs", () => {
-    const uri = "data:image/png;base64,AAA"
-    const files = [{ uri, name: "one.png", mention: { start: 0, end: 9, text: "[Image 1]" } }]
-
-    expect(promptAttachmentLabel(files, { uri, name: "two.png" })).toBe("[Image 2]")
-  })
-
-  test("does not reuse numbers after an earlier attachment is removed", () => {
-    const files = [{ uri: "data:image/png;base64,BBB", mention: { start: 0, end: 9, text: "[Image 2]" } }]
-
-    expect(promptAttachmentLabel(files, { uri: "data:image/png;base64,CCC" })).toBe("[Image 3]")
-  })
-
-  test("preserves mentionless attachments when tracked mentions are synchronized", () => {
-    const mentionless = { uri: "data:image/png;base64,AAA" }
-    const emptyMention = {
-      uri: "data:image/png;base64,CCC",
-      mention: { start: 0, end: 0, text: "" },
-    }
-    const mentioned = {
-      uri: "data:image/png;base64,BBB",
-      mention: { start: 0, end: 9, text: "[Image 1]" },
-    }
-
-    const restored = preserveMentionlessPromptAttachments([mentionless, emptyMention, mentioned], [mentioned])
-    expect(restored).toEqual([mentionless, emptyMention, mentioned])
-    expect(restored.indexOf(mentioned)).toBe(2)
-
-    const another = {
-      uri: "data:image/png;base64,DDD",
-      mention: { start: 10, end: 19, text: "[Image 2]" },
-    }
-    expect(preserveMentionlessPromptAttachments([mentioned, mentionless, another], [another, mentioned])).toEqual([
-      another,
-      mentionless,
-      mentioned,
-    ])
-  })
-
-  test("deduplicates visible inline image cards without dropping durable references", () => {
-    const file = {
-      data: "AAA",
-      mime: "image/png",
-      source: { type: "inline" },
-      name: "clipboard",
-      mention: { text: "[Image 1]" },
-    }
-    const files = [file, { ...file, mention: { text: "[Image 1]" } }]
-
-    expect(deduplicateVisibleImages(files)).toEqual([file])
-    expect(files).toHaveLength(2)
-
-    const distinct = [
-      { ...file, mention: { text: "[Image 2]" } },
-      { ...file, mention: undefined },
-    ]
-    expect(deduplicateVisibleImages([file, ...distinct])).toEqual([file, ...distinct])
-  })
-})

packages/tui/test/prompt/history.test.ts

@@ -41,21 +41,4 @@ describe("prompt history", () => {
     const b = entry("describe this", [{ name: "b.png", uri: "data:image/png;base64,BBB" }])
     expect(isDuplicateEntry(a, b)).toBe(false)
   })
-
-  test("preserves duplicate attachment mentions for prompt restoration", () => {
-    const value = entry("[Image 1] [Image 1]", [
-      {
-        name: "clipboard",
-        uri: "data:image/png;base64,AAA",
-        mention: { start: 0, end: 9, text: "[Image 1]" },
-      },
-      {
-        name: "clipboard",
-        uri: "data:image/png;base64,AAA",
-        mention: { start: 10, end: 19, text: "[Image 1]" },
-      },
-    ])
-
-    expect(parsePromptHistory(JSON.stringify(value))).toEqual([value])
-  })
 })

packages/www/openapi.json

@@ -12733,9 +12733,6 @@
           },
           "agent": {
             "type": "string"
-          },
-          "previous": {
-            "type": "string"
           }
         },
         "required": ["id", "time", "type", "agent"],

packages/www/public/openapi.json

@@ -12733,9 +12733,6 @@
           },
           "agent": {
             "type": "string"
-          },
-          "previous": {
-            "type": "string"
           }
         },
         "required": ["id", "time", "type", "agent"],

script/publish.ts

@@ -35,34 +35,32 @@ if (Script.release && !Script.preview) {
 
 await prepareReleaseFiles()
 
-if (Script.channel !== "beta") {
-  console.log("\n=== schema ===\n")
-  await $`bun ./packages/schema/script/publish.ts`
+console.log("\n=== schema ===\n")
+await $`bun ./packages/schema/script/publish.ts`
 
-  console.log("\n=== theme ===\n")
-  await $`bun ./packages/theme/script/publish.ts`
+console.log("\n=== theme ===\n")
+await $`bun ./packages/theme/script/publish.ts`
 
-  console.log("\n=== ai ===\n")
-  await $`bun ./packages/ai/script/publish.ts`
+console.log("\n=== ai ===\n")
+await $`bun ./packages/ai/script/publish.ts`
 
-  console.log("\n=== util ===\n")
-  await $`bun ./packages/util/script/publish.ts`
+console.log("\n=== util ===\n")
+await $`bun ./packages/util/script/publish.ts`
 
-  console.log("\n=== protocol ===\n")
-  await $`bun ./packages/protocol/script/publish.ts`
+console.log("\n=== protocol ===\n")
+await $`bun ./packages/protocol/script/publish.ts`
 
-  console.log("\n=== client ===\n")
-  await $`bun ./packages/client/script/publish.ts`
+console.log("\n=== client ===\n")
+await $`bun ./packages/client/script/publish.ts`
 
-  console.log("\n=== cli ===\n")
-  await $`bun ./packages/cli/script/publish.ts`
+console.log("\n=== cli ===\n")
+await $`bun ./packages/cli/script/publish.ts`
 
-  console.log("\n=== plugin ===\n")
-  await $`bun ./packages/plugin/script/publish.ts`
+console.log("\n=== plugin ===\n")
+await $`bun ./packages/plugin/script/publish.ts`
 
-  console.log("\n=== ui ===\n")
-  await $`bun ./packages/ui/script/publish.ts`
-}
+console.log("\n=== ui ===\n")
+await $`bun ./packages/ui/script/publish.ts`
 
 if (Script.release) {
   await $`bun ./packages/desktop/scripts/finalize-latest-json.ts`