@opencode/core 0.0.0-dev-19684 → 0.0.0-dev-19685

package/dist/chunks/{shell-ne3jdqry.js → aisdk-native-e0a154fg.js}

@@ -1,17 +1,17 @@
 import {
   __export
-} from "./shell-9rqn6x4v.js";
+} from "./aisdk-native-9rqn6x4v.js";
 
 // src/workspace/driver.ts
 var exports_driver = {};
 __export(exports_driver, {
   Binding: () => Binding2,
-  Error: () => Error5,
+  Error: () => Error4,
   ProviderNotFound: () => ProviderNotFound2,
   RegistryService: () => RegistryService2,
   WorkspaceDriver: () => exports_driver,
-  make: () => make21,
-  node: () => node72,
+  make: () => make16,
+  node: () => node50,
   registry: () => registry2,
   registryNode: () => registryNode2
 });
@@ -19,7 +19,7 @@ import { makeGlobalNode } from "@opencode/util/effect/app-node";
 import { Context, Effect, Layer, Schema } from "effect";
 var Binding2 = Schema.Record(Schema.String, Schema.Json);
 
-class Error5 extends Schema.TaggedError()("WorkspaceDriver.Error", {
+class Error4 extends Schema.TaggedError()("WorkspaceDriver.Error", {
   message: Schema.optional(Schema.String),
   cause: Schema.optional(Schema.Defect())
 }) {
@@ -29,7 +29,7 @@ class ProviderNotFound2 extends Schema.TaggedError()("WorkspaceDriver.ProviderNo
   provider: Schema.String
 }) {
 }
-var make21 = (driver) => driver;
+var make16 = (driver) => driver;
 
 class RegistryService2 extends Context.Service()("@opencode/WorkspaceDriverRegistry") {
 }
@@ -44,6 +44,6 @@ var registryNode2 = (drivers) => makeGlobalNode({
   layer: Layer.succeed(RegistryService2, RegistryService2.of(registry2(drivers))),
   deps: []
 });
-var node72 = registryNode2({});
+var node50 = registryNode2({});
 
-export { Binding2, Error5, ProviderNotFound2, make21, RegistryService2, registry2, registryNode2, node72, exports_driver };
+export { Binding2, Error4, ProviderNotFound2, make16, RegistryService2, registry2, registryNode2, node50, exports_driver };

package/dist/chunks/{shell-vqtmypvq.js → aisdk-native-e65aczms.js}

@@ -1,33 +1,33 @@
 import {
-  Service81,
-  node85
-} from "./shell-jase78w4.js";
+  Service78,
+  node82
+} from "./aisdk-native-rhcmf0p0.js";
 import {
   optional2,
   statics2
-} from "./shell-922hggd3.js";
+} from "./aisdk-native-922hggd3.js";
 import {
   Ref4,
-  Service77,
-  node81
-} from "./shell-t3479h02.js";
+  Service75,
+  node79
+} from "./aisdk-native-wk3ypdaq.js";
 import {
   __export
-} from "./shell-9rqn6x4v.js";
+} from "./aisdk-native-9rqn6x4v.js";
 
 // src/rpc.ts
 var exports_rpc = {};
 __export(exports_rpc, {
   Rpc: () => exports_rpc,
-  Service: () => Service22,
+  Service: () => Service36,
   define: () => define2,
-  node: () => node25
+  node: () => node39
 });
 import { define as define2 } from "@opencode/schema/rpc";
 import { Event } from "@opencode/schema/event";
 import { makeLocationNode } from "@opencode/util/effect/app-node";
 import { Context, Deferred, Effect, JsonSchema, Layer, Schema, SchemaRepresentation, Stream } from "effect";
-class Service22 extends Context.Service()("@opencode/Rpc") {
+class Service36 extends Context.Service()("@opencode/Rpc") {
 }
 
 class DeclaredError extends Error {
@@ -39,9 +39,9 @@ class DeclaredError extends Error {
     this.data = data;
   }
 }
-var layer = Layer.effect(Service22, Effect.gen(function* () {
-  const bus = yield* Service81;
-  const location = yield* Service77;
+var layer = Layer.effect(Service36, Effect.gen(function* () {
+  const bus = yield* Service78;
+  const location = yield* Service75;
   const ref = Ref4.make({ directory: location.directory, workspaceID: location.workspaceID });
   const closed = yield* Deferred.make();
   const callContext = {
@@ -118,14 +118,14 @@ var layer = Layer.effect(Service22, Effect.gen(function* () {
           const registered = events.get(name);
           if (!registered)
             return Stream.fail(new Error(`Unknown RPC event: ${definition.id}.${name}`));
-          return bus.subscribe(registered.definition).pipe(Stream.provideService(Service77, location), Stream.mapEffect((payload) => logicalEvent(definition, name, payload, ref)));
+          return bus.subscribe(registered.definition).pipe(Stream.provideService(Service75, location), Stream.mapEffect((payload) => logicalEvent(definition, name, payload, ref)));
         }
       }
     };
   };
-  return Service22.of({ register, call, client, close: Deferred.succeed(closed, undefined).pipe(Effect.asVoid) });
+  return Service36.of({ register, call, client, close: Deferred.succeed(closed, undefined).pipe(Effect.asVoid) });
 }));
-var node25 = makeLocationNode({ service: Service22, layer, deps: [node85, node81] });
+var node39 = makeLocationNode({ service: Service36, layer, deps: [node82, node79] });
 var fields = {
   id: Event.ID,
   created: Schema.Finite,
@@ -210,4 +210,4 @@ var logicalEvent = Effect.fn("Rpc.logicalEvent")(function* (definition, name, pa
   };
 });
 
-export { Service22, node25, exports_rpc, define2 };
+export { Service36, node39, exports_rpc, define2 };

package/dist/chunks/{shell-p1nm93x7.js → aisdk-native-e6hmchc5.js}

@@ -1,15 +1,15 @@
 import {
   PositiveInt2
-} from "./shell-922hggd3.js";
+} from "./aisdk-native-922hggd3.js";
 import {
   __export
-} from "./shell-9rqn6x4v.js";
+} from "./aisdk-native-9rqn6x4v.js";
 
 // src/v1/config/provider.ts
 var exports_provider2 = {};
 __export(exports_provider2, {
   ConfigProviderV1: () => exports_provider2,
-  Info: () => Info22,
+  Info: () => Info13,
   Model: () => Model2,
   ModelStatus: () => ModelStatus2
 });
@@ -61,7 +61,7 @@ var Model2 = Schema.Struct({
     disabled: Schema.optional(Schema.Boolean).annotate({ description: "Disable this variant for the model" })
   }), [Schema.Record(Schema.String, Schema.Any)])).annotate({ description: "Variant-specific configuration" }))
 });
-var Info22 = Schema.Struct({
+var Info13 = Schema.Struct({
   api: Schema.optional(Schema.String),
   name: Schema.optional(Schema.String),
   env: Schema.optional(Schema.mutable(Schema.Array(Schema.String))),
@@ -95,4 +95,4 @@ var Info22 = Schema.Struct({
   models: Schema.optional(Schema.Record(Schema.String, Model2))
 }).annotate({ identifier: "ProviderConfig" });
 
-export { ModelStatus2, Model2, Info22, exports_provider2 };
+export { ModelStatus2, Model2, Info13, exports_provider2 };

package/dist/chunks/{shell-rhjbct0v.js → aisdk-native-eaj1djv9.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./shell-9rqn6x4v.js";
+} from "./aisdk-native-9rqn6x4v.js";
 
 // src/instructions/index.ts
 var exports_instructions6 = {};
@@ -10,7 +10,7 @@ __export(exports_instructions6, {
   Hash: () => Hash2,
   InitializationBlocked: () => InitializationBlocked2,
   Instructions: () => exports_instructions6,
-  Key: () => Key3,
+  Key: () => Key4,
   Values: () => Values2,
   applyHashDelta: () => applyHashDelta2,
   combine: () => combine2,
@@ -18,7 +18,7 @@ __export(exports_instructions6, {
   diffByKey: () => diffByKey2,
   empty: () => empty3,
   hash: () => hash2,
-  make: () => make20,
+  make: () => make21,
   read: () => read3,
   removed: () => removed2,
   renderInitial: () => renderInitial2,
@@ -28,7 +28,7 @@ __export(exports_instructions6, {
 import { createHash } from "crypto";
 import { Instruction } from "@opencode/schema/instruction";
 import { Data, Effect, Option, Schema } from "effect";
-var Key3 = Instruction.Key;
+var Key4 = Instruction.Key;
 var Hash2 = Instruction.Hash;
 var Values2 = Instruction.Values;
 var Delta2 = Instruction.Delta;
@@ -36,21 +36,21 @@ var NonValue = Data.taggedEnum();
 var unavailable3 = NonValue.Unavailable();
 var removed2 = NonValue.Removed();
 
-class InitializationBlocked2 extends Schema.TaggedError()("Instructions.InitializationBlocked", { keys: Schema.Array(Key3) }) {
+class InitializationBlocked2 extends Schema.TaggedError()("Instructions.InitializationBlocked", { keys: Schema.Array(Key4) }) {
   get message() {
     return `Instruction initialization blocked by unavailable sources: ${this.keys.join(", ")}`;
   }
 }
 
 class DuplicateKeyError2 extends Schema.TaggedError()("Instructions.DuplicateKeyError", {
-  key: Key3
+  key: Key4
 }) {
   get message() {
     return `Duplicate instruction key: ${this.key}`;
   }
 }
 var empty3 = [];
-function make20(source) {
+function make21(source) {
   const decode = Schema.decodeUnknownOption(source.codec);
   const encode = Schema.encodeSync(source.codec);
   const initial = (value) => requireText(source.key, "initial", source.render.initial(value));
@@ -193,4 +193,4 @@ function requireText(key, kind, text) {
   return text;
 }
 
-export { Key3, Hash2, Values2, Delta2, unavailable3, removed2, InitializationBlocked2, DuplicateKeyError2, empty3, make20, combine2, read3, diff2, renderInitial2, renderUpdate2, hash2, applyHashDelta2, diffByKey2, exports_instructions6 };
+export { Key4, Hash2, Values2, Delta2, unavailable3, removed2, InitializationBlocked2, DuplicateKeyError2, empty3, make21, combine2, read3, diff2, renderInitial2, renderUpdate2, hash2, applyHashDelta2, diffByKey2, exports_instructions6 };

package/dist/chunks/{shell-qq3hkfz9.js → aisdk-native-eda3kmbe.js}

@@ -1,19 +1,19 @@
 import {
   SessionEvent2
-} from "./shell-ec1grn59.js";
+} from "./aisdk-native-ec1grn59.js";
 import {
   toSessionError2
-} from "./shell-72j6m2ks.js";
+} from "./aisdk-native-j6gqw2pj.js";
 import {
   __export
-} from "./shell-9rqn6x4v.js";
+} from "./aisdk-native-9rqn6x4v.js";
 
 // src/session/runner/retry.ts
 var exports_retry = {};
 __export(exports_retry, {
   SessionRunnerRetry: () => exports_retry,
   isRetryable: () => isRetryable2,
-  make: () => make6,
+  make: () => make5,
   policy: () => policy2,
   transient: () => transient2
 });
@@ -96,7 +96,7 @@ var transient2 = (decide, input) => (effect) => Effect.retry(effect, {
     return true;
   })
 });
-var make6 = (bus, sessionID) => Effect.gen(function* () {
+var make5 = (bus, sessionID) => Effect.gen(function* () {
   const decide = yield* policy2(sessionID);
   const wait = (input) => Effect.gen(function* () {
     const scheduled = yield* Clock.currentTimeMillis;
@@ -113,4 +113,4 @@ var make6 = (bus, sessionID) => Effect.gen(function* () {
   return { decide, wait };
 });
 
-export { isRetryable2, policy2, transient2, make6, exports_retry };
+export { isRetryable2, policy2, transient2, make5, exports_retry };

package/dist/chunks/{shell-9sdzjm5d.js → aisdk-native-eegh8h7g.js}

@@ -1,17 +1,17 @@
 import {
   useragent2
-} from "./shell-v0x7c1q7.js";
+} from "./aisdk-native-pb231g4a.js";
 import {
   call2
-} from "./shell-56gdpj1q.js";
+} from "./aisdk-native-56gdpj1q.js";
 import {
   __export
-} from "./shell-9rqn6x4v.js";
+} from "./aisdk-native-9rqn6x4v.js";
 
 // src/plugin/websearch/parallel.ts
 var exports_parallel = {};
 __export(exports_parallel, {
-  Plugin: () => Plugin35,
+  Plugin: () => Plugin37,
   WebSearchParallel: () => exports_parallel,
   endpoint: () => endpoint5
 });
@@ -47,7 +47,7 @@ var McpOutput = Schema.Struct({
   content: Schema.Array(Schema.Struct({ type: Schema.Literal("text"), text: Schema.String })),
   structuredContent: SearchResponse
 });
-var Plugin35 = define({
+var Plugin37 = define({
   id: "opencode.websearch.parallel",
   effect: Effect.fn("WebSearchParallel.Plugin")(function* (ctx) {
     const http = yield* HttpClient.HttpClient;
@@ -93,4 +93,4 @@ var Plugin35 = define({
   })
 });
 
-export { endpoint5, Plugin35, exports_parallel };
+export { endpoint5, Plugin37, exports_parallel };

package/dist/chunks/{shell-ef5x83kb.js → aisdk-native-ef5x83kb.js}

@@ -1,6 +1,6 @@
 import {
   which2
-} from "./shell-qaymkmh1.js";
+} from "./aisdk-native-qaymkmh1.js";
 
 // src/util/git-executable.ts
 import path from "path";

package/dist/chunks/{shell-5g8n0xjn.js → aisdk-native-ep530p1t.js}

@@ -1,49 +1,49 @@
 import {
   typeFollowing2
-} from "./shell-2a5m3afh.js";
+} from "./aisdk-native-2a5m3afh.js";
 import {
   RelativePath2
-} from "./shell-922hggd3.js";
+} from "./aisdk-native-922hggd3.js";
 import {
-  Service77
-} from "./shell-t3479h02.js";
+  Service75
+} from "./aisdk-native-wk3ypdaq.js";
 import {
-  Service66
-} from "./shell-497trp6d.js";
+  Service42
+} from "./aisdk-native-h7c2rqcj.js";
 import {
-  Service20
-} from "./shell-bvvhb128.js";
+  Service41
+} from "./aisdk-native-cjq1148t.js";
 import {
   DEFAULT_SEARCH_LIMIT2,
   DEFAULT_SEARCH_TIMEOUT_MS2,
   GlobInput2,
   Entry2
-} from "./shell-jft4q2kn.js";
+} from "./aisdk-native-vqr31nzc.js";
 import {
-  Service58
-} from "./shell-cywpmpyh.js";
+  Service71
+} from "./aisdk-native-g4bm5adv.js";
 import {
-  Service47
-} from "./shell-13y8bxtp.js";
+  Service70
+} from "./aisdk-native-p1p0zqxa.js";
 import {
   __export
-} from "./shell-9rqn6x4v.js";
+} from "./aisdk-native-9rqn6x4v.js";
 
 // src/tool/plugin/glob.ts
 var exports_glob = {};
 __export(exports_glob, {
   GlobTool: () => exports_glob,
-  Input: () => Input11,
-  Output: () => Output7,
-  Plugin: () => Plugin30,
-  name: () => name11,
-  toModelContent: () => toModelContent6
+  Input: () => Input5,
+  Output: () => Output3,
+  Plugin: () => Plugin23,
+  name: () => name5,
+  toModelContent: () => toModelContent3
 });
 import { ToolFailure } from "@opencode/ai";
 import { Effect, Schema } from "effect";
 import path from "path";
-var name11 = "glob";
-var Input11 = Schema.Struct({
+var name5 = "glob";
+var Input5 = Schema.Struct({
   pattern: GlobInput2.fields.pattern.annotate({ description: "Glob pattern to match files against" }),
   path: Schema.optionalKey(RelativePath2).annotate({
     description: "Directory to search. Defaults to the current working directory."
@@ -55,35 +55,35 @@ var Input11 = Schema.Struct({
     description: `Maximum number of matching files to return (default: ${DEFAULT_SEARCH_LIMIT2})`
   })
 });
-var Output7 = Schema.Array(Entry2);
-var toModelContent6 = (entries, truncated = false) => {
+var Output3 = Schema.Array(Entry2);
+var toModelContent3 = (entries, truncated = false) => {
   const lines = entries.length === 0 ? ["No files found"] : entries.map((item) => item.path);
   if (truncated)
     lines.push("", `(Results are truncated: showing first ${entries.length} results. Consider using a more specific path or pattern.)`);
   return lines.join(`
 `);
 };
-var Plugin30 = {
+var Plugin23 = {
   id: "opencode.tool.glob",
   effect: Effect.fn("GlobTool.Plugin")(function* (ctx) {
-    const environment = yield* Service66;
-    const ripgrep = yield* Service20;
-    const location = yield* Service77;
-    const access = yield* Service47;
-    const permission = yield* Service58;
+    const environment = yield* Service42;
+    const ripgrep = yield* Service41;
+    const location = yield* Service75;
+    const access = yield* Service70;
+    const permission = yield* Service71;
     yield* ctx.tool.transform((editor) => editor.add({
-      name: name11,
+      name: name5,
       options: { codemode: false },
       description: 'Search file paths using a glob pattern (examples: "**/*.ts", "src/**/*.tsx").',
-      input: Input11,
-      output: Output7,
+      input: Input5,
+      output: Output3,
       execute: (input, context) => Effect.gen(function* () {
         const searchPath = input.path === "undefined" || input.path === "null" ? undefined : input.path;
         const source = { type: "tool", messageID: context.messageID, id: context.id };
         const target = yield* access.resolve({ path: searchPath ?? ".", kind: "directory" });
         yield* access.authorizeExternal([target], context);
         yield* permission.assert({
-          action: name11,
+          action: name5,
           resources: [input.pattern],
           save: ["*"],
           metadata: {
@@ -118,11 +118,11 @@ var Plugin30 = {
         return { entries: entries.slice(0, limit), truncated: entries.length > limit };
       }).pipe(Effect.map((result) => ({
         output: result.entries,
-        content: toModelContent6(result.entries.map((entry) => ({ ...entry, path: path.resolve(location.directory, entry.path) })), result.truncated),
+        content: toModelContent3(result.entries.map((entry) => ({ ...entry, path: path.resolve(location.directory, entry.path) })), result.truncated),
         metadata: { count: result.entries.length, truncated: result.truncated }
       })), Effect.mapError((error) => error instanceof ToolFailure ? error : new ToolFailure({ message: `Unable to find files matching ${input.pattern}`, error })))
     })).pipe(Effect.orDie);
   })
 };
 
-export { name11, Input11, Output7, toModelContent6, Plugin30, exports_glob };
+export { name5, Input5, Output3, toModelContent3, Plugin23, exports_glob };

package/dist/chunks/{shell-fwmjdqts.js → aisdk-native-eqjmr049.js}

@@ -1,47 +1,51 @@
 import {
-  ID9,
-  Service61
-} from "./shell-nbv082sw.js";
+  ID16,
+  Service74
+} from "./aisdk-native-tmj2byc7.js";
+import {
+  Ref2,
+  Service63
+} from "./aisdk-native-6qmp3fby.js";
 import {
   latest2,
-  Service64
-} from "./shell-ecszv4cx.js";
+  Service54
+} from "./aisdk-native-ry6xxh2r.js";
 import {
   SessionSchema2
-} from "./shell-6bsje7ws.js";
+} from "./aisdk-native-q3t37ft6.js";
 import {
-  Service56
-} from "./shell-pkqjmvx8.js";
+  Service53
+} from "./aisdk-native-nz76xpbf.js";
 import {
   evaluate2,
-  Service58
-} from "./shell-cywpmpyh.js";
+  Service71
+} from "./aisdk-native-g4bm5adv.js";
 import {
-  Service23
-} from "./shell-fsjyrg72.js";
+  Service18
+} from "./aisdk-native-147w0500.js";
 import {
   NO_TEXT2
-} from "./shell-x1ezjp6w.js";
+} from "./aisdk-native-x1ezjp6w.js";
 import {
-  make5
-} from "./shell-8k29n9b8.js";
+  make6
+} from "./aisdk-native-xn9n415p.js";
 import {
   __export
-} from "./shell-9rqn6x4v.js";
+} from "./aisdk-native-9rqn6x4v.js";
 
 // src/tool/plugin/subagent.ts
 var exports_subagent = {};
 __export(exports_subagent, {
-  Input: () => Input12,
-  Output: () => Output8,
-  Plugin: () => Plugin31,
+  Input: () => Input8,
+  Output: () => Output6,
+  Plugin: () => Plugin26,
   SubagentTool: () => exports_subagent,
-  description: () => description5,
-  name: () => name12
+  description: () => description3,
+  name: () => name8
 });
 import { ToolFailure } from "@opencode/ai";
 import { Effect, Schema } from "effect";
-var name12 = "subagent";
+var name8 = "subagent";
 var backgroundResult = (sessionID) => ({
   sessionID,
   status: "running",
@@ -52,10 +56,15 @@ var backgroundResult = (sessionID) => ({
   ].join(`
 `)
 });
-var Input12 = Schema.Struct({
-  agent: Schema.String.annotate({ description: "The type of specialized agent to use for this task" }),
+var Input8 = Schema.Struct({
+  agent: Schema.String.annotate({
+    description: "The type of specialized agent to use for this task. If the user asks for a subagent by a name that is not one of the available subagents, they most likely mean a model: pick a suitable agent and pass the name through the model parameter instead."
+  }),
   description: Schema.String.annotate({ description: "A short 3-5 word label for the task, displayed to the user" }),
   prompt: Schema.String.annotate({ description: "The task for the subagent to perform" }),
+  model: Schema.optionalKey(Schema.String).annotate({
+    description: 'NEVER set this unless the user explicitly asks for a particular model or variant. The value is written as "providerID/modelID", or "providerID/modelID#variant" to include a variant. Do not guess the ID: look the model up with the models tool, filtering to your own provider first.'
+  }),
   sessionID: Schema.optionalKey(SessionSchema2.ID).annotate({
     description: "Continue a specific previous subagent conversation by passing its sessionID. Calls without a sessionID start a new conversation."
   }),
@@ -63,12 +72,12 @@ var Input12 = Schema.Struct({
     description: "Run the subagent in the background and return immediately. You will be notified when it completes. DO NOT sleep, poll, or proactively check on its progress."
   })
 });
-var Output8 = Schema.Struct({
+var Output6 = Schema.Struct({
   sessionID: SessionSchema2.ID,
   status: Schema.Literals(["completed", "running"]),
   output: Schema.String
 });
-var description5 = [
+var description3 = [
   "Spawns an agent in a child session to work on the specified task.",
   "The output includes a sessionID you can pass back later to continue that specific conversation with the subagent.",
   "New child sessions start with fresh context, so include all relevant context and instructions when you don't pass a sessionID.",
@@ -77,21 +86,40 @@ var description5 = [
   "Use background only for independent work that can run while you continue elsewhere."
 ].join(`
 `);
-var Plugin31 = {
+var Plugin26 = {
   id: "opencode.tool.subagent",
   effect: Effect.fn("SubagentTool.Plugin")(function* (ctx) {
-    const sessions = yield* Service23;
-    const jobs = yield* Service56;
-    const agents = yield* Service61;
-    const config = yield* Service64;
-    const permission = yield* Service58;
-    const subagents = yield* make5;
+    const sessions = yield* Service18;
+    const jobs = yield* Service53;
+    const agents = yield* Service74;
+    const config = yield* Service54;
+    const permission = yield* Service71;
+    const models = yield* Service63;
+    const subagents = yield* make6;
+    const resolveModel = Effect.fn("SubagentTool.resolveModel")(function* (input) {
+      const ref = yield* Effect.try({
+        try: () => Ref2.parse(input),
+        catch: () => new ToolFailure({
+          message: `Invalid model "${input}". Use "providerID/modelID" or "providerID/modelID#variant".`
+        })
+      });
+      const model = (yield* models.available()).find((model) => model.providerID === ref.providerID && model.id === ref.id);
+      if (model === undefined)
+        return yield* new ToolFailure({
+          message: `Model "${ref.providerID}/${ref.id}" is not available. Use the models tool to see what is available.`
+        });
+      if (ref.variant !== undefined && !model.variants.some((variant) => variant.id === ref.variant))
+        return yield* new ToolFailure({
+          message: model.variants.length === 0 ? `Model "${ref.providerID}/${ref.id}" has no variants. Omit the variant.` : `Variant "${ref.variant}" is not available for "${ref.providerID}/${ref.id}". Available: ${model.variants.map((variant) => variant.id).join(", ")}.`
+        });
+      return ref;
+    });
     yield* ctx.tool.transform((editor) => editor.add({
-      name: name12,
+      name: name8,
       options: { codemode: false },
-      description: description5,
-      input: Input12,
-      output: Output8,
+      description: description3,
+      input: Input8,
+      output: Output6,
       execute: (input, context) => Effect.gen(function* () {
         const parent = yield* sessions.get(context.sessionID).pipe(Effect.mapError((error) => new ToolFailure({ message: `Parent session not found: ${context.sessionID}`, error })));
         let current = parent;
@@ -111,7 +139,7 @@ var Plugin31 = {
         if (agent.mode === "primary")
           return yield* new ToolFailure({ message: `Agent ${input.agent} cannot run as a subagent` });
         yield* permission.assert({
-          action: name12,
+          action: name8,
           resources: [agent.id],
           save: [agent.id],
           sessionID: context.sessionID,
@@ -127,14 +155,20 @@ var Plugin31 = {
           return yield* new ToolFailure({
             message: `Session ${existing.id} is not a child of the current session`
           });
-        if (existing !== undefined && existing.agent !== agent.id) {
-          yield* sessions.switchAgent({ sessionID: existing.id, agent: agent.id }).pipe(Effect.andThen(agent.model === undefined ? Effect.void : sessions.switchModel({ sessionID: existing.id, model: agent.model })), Effect.mapError((error) => new ToolFailure({ message: `Failed to switch subagent session agent: ${existing.id}`, error })));
+        const override = input.model === undefined ? undefined : yield* resolveModel(input.model);
+        if (existing !== undefined) {
+          const switched = existing.agent !== agent.id;
+          const model = override ?? (switched ? agent.model : undefined);
+          yield* Effect.all([
+            switched ? sessions.switchAgent({ sessionID: existing.id, agent: agent.id }) : Effect.void,
+            model === undefined ? Effect.void : sessions.switchModel({ sessionID: existing.id, model })
+          ]).pipe(Effect.mapError((error) => new ToolFailure({ message: `Failed to switch subagent session: ${existing.id}`, error })));
         }
-        const model = agent.model ?? parent.model;
+        const model = override ?? agent.model ?? parent.model;
         const child = existing ?? (yield* sessions.create({
           parentID: context.sessionID,
           title: input.description,
-          agent: ID9.make(input.agent),
+          agent: ID16.make(input.agent),
           model
         }).pipe(Effect.mapError((error) => new ToolFailure({ message: `Parent session not found: ${context.sessionID}`, error }))));
         const background = input.background === true;
@@ -184,13 +218,13 @@ ${output.output}
       })))
     })).pipe(Effect.orDie);
     const hook = (event) => Effect.gen(function* () {
-      const tool = event.tools[name12];
+      const tool = event.tools[name8];
       if (!tool)
         return;
       const selected = yield* agents.resolve(event.agent);
       if (!selected)
         return;
-      const available = (yield* agents.list()).filter((agent) => agent.mode !== "primary" && !agent.hidden && evaluate2(name12, agent.id, selected.permissions).effect !== "deny").toSorted((a, b) => a.id.localeCompare(b.id));
+      const available = (yield* agents.list()).filter((agent) => agent.mode !== "primary" && !agent.hidden && evaluate2(name8, agent.id, selected.permissions).effect !== "deny").toSorted((a, b) => a.id.localeCompare(b.id));
       if (available.length === 0)
         return;
       tool.description = [
@@ -207,4 +241,4 @@ ${output.output}
   })
 };
 
-export { name12, Input12, Output8, description5, Plugin31, exports_subagent };
+export { name8, Input8, Output6, description3, Plugin26, exports_subagent };