@opencode/core 2.1.3 → 2.1.4

package/dist/chunks/{instruction-discovery-cgwzn4dm.js → location-nte6bvsd.js}

@@ -1,64 +1,64 @@
 import {
   Service86,
   node90
-} from "./instruction-discovery-8d991bzx.js";
+} from "./location-5nankzt7.js";
 import {
   reserveSequence2,
   Service85,
   node89
-} from "./instruction-discovery-7nepz6ee.js";
+} from "./location-wedh6qfb.js";
 import {
   SessionEvent2
-} from "./instruction-discovery-ec1grn59.js";
+} from "./location-ec1grn59.js";
 import {
   SessionMessage2
-} from "./instruction-discovery-gftt206x.js";
+} from "./location-gftt206x.js";
 import {
   update2
-} from "./instruction-discovery-b6vsg801.js";
+} from "./location-b6vsg801.js";
 import {
   AbsolutePath2,
   RelativePath2
-} from "./instruction-discovery-z5v4ffb3.js";
+} from "./location-z5v4ffb3.js";
 import {
   ProjectTable2
-} from "./instruction-discovery-034tev2y.js";
+} from "./location-034tev2y.js";
 import {
   SessionTable2,
   SessionMessageTable2,
   SessionInboxTable2
-} from "./instruction-discovery-998yhzzq.js";
+} from "./location-998yhzzq.js";
 import {
   apply2,
   initialize3,
   advanceEpoch2,
   rewind2
-} from "./instruction-discovery-w7zjqt6n.js";
+} from "./location-zkgq49d1.js";
 import {
   decodeMessageRowSync2
-} from "./instruction-discovery-11xg13et.js";
+} from "./location-5qebhevh.js";
 import {
   projectAdmitted2,
   projectDelivered2,
   projectCancelled2,
   projectDeliveryChanged2
-} from "./instruction-discovery-bzfg3f7z.js";
+} from "./location-ky7vvs7w.js";
 import {
   initialize2
-} from "./instruction-discovery-7w0k7xvm.js";
+} from "./location-jdcya02q.js";
 import {
   Slug2
-} from "./instruction-discovery-gebd4c9n.js";
+} from "./location-gebd4c9n.js";
 import {
   __export
-} from "./instruction-discovery-9rqn6x4v.js";
+} from "./location-9rqn6x4v.js";
 
 // src/session/projector.ts
 var exports_projector = {};
 __export(exports_projector, {
   SessionAlreadyProjected: () => SessionAlreadyProjected2,
   SessionProjector: () => exports_projector,
-  node: () => node30
+  node: () => node31
 });
 import { and, asc, desc, eq, gt, gte, inArray, isNull, lt, lte, or, sql } from "drizzle-orm";
 import { DateTime, Effect, Layer, Schema, Stream } from "effect";
@@ -482,6 +482,6 @@ var layer = Layer.effectDiscard(Effect.gen(function* () {
     return publishSessionUsage(db, bus, event.data.sessionID);
   }), Effect.forkScoped({ startImmediately: true }));
 }));
-var node30 = makeGlobalNode({ name: "session-projector", layer, deps: [node89, node90] });
+var node31 = makeGlobalNode({ name: "session-projector", layer, deps: [node89, node90] });
 
-export { SessionAlreadyProjected2, node30, exports_projector };
+export { SessionAlreadyProjected2, node31, exports_projector };

package/dist/chunks/{instruction-discovery-p015t6z3.js → location-p015t6z3.js}

@@ -1,9 +1,9 @@
 import {
   WebSocketConstructor2
-} from "./instruction-discovery-jze0r7bz.js";
+} from "./location-jze0r7bz.js";
 import {
   __export
-} from "./instruction-discovery-9rqn6x4v.js";
+} from "./location-9rqn6x4v.js";
 
 // src/effect/app-node-platform.ts
 var exports_app_node_platform = {};

package/dist/chunks/{instruction-discovery-a4b9rhwe.js → location-p184mqc5.js}

@@ -1,22 +1,26 @@
 import {
-  Service73,
-  node77
-} from "./instruction-discovery-v4gdxem8.js";
+  Service75,
+  node79
+} from "./location-dqc1xg2h.js";
+import {
+  Service68,
+  node72
+} from "./location-xewrm1yq.js";
 import {
   SessionSchema2
-} from "./instruction-discovery-c2sed5cq.js";
+} from "./location-axe3mf62.js";
 import {
   __export
-} from "./instruction-discovery-9rqn6x4v.js";
+} from "./location-9rqn6x4v.js";
 
 // src/session/runner/model.ts
 var exports_model = {};
 __export(exports_model, {
   ModelNotSelectedError: () => ModelNotSelectedError2,
   ModelUnavailableError: () => ModelUnavailableError2,
-  Service: () => Service60,
+  Service: () => Service49,
   SessionRunnerModel: () => exports_model,
-  node: () => node64,
+  node: () => node51,
   resolved: () => resolved2
 });
 import { makeLocationNode } from "@opencode/util/effect/app-node";
@@ -39,7 +43,7 @@ class ModelUnavailableError2 extends Schema.TaggedError()("SessionRunnerModel.Mo
   }
 }
 
-class Service60 extends Context.Service()("@opencode/SessionRunnerModel") {
+class Service49 extends Context.Service()("@opencode/SessionRunnerModel") {
 }
 var resolved2 = (model, options) => ({
   model,
@@ -54,12 +58,15 @@ var resolved2 = (model, options) => ({
   compaction: options.compaction,
   transport: options.transport
 });
-var layer = Layer.effect(Service60, Effect.gen(function* () {
-  const resolver = yield* Service73;
-  return Service60.of({
+var layer = Layer.effect(Service49, Effect.gen(function* () {
+  const resolver = yield* Service68;
+  const agents = yield* Service75;
+  return Service49.of({
     resolve: Effect.fn("SessionRunnerModel.resolve")(function* (session, available) {
       if (!session.model) {
-        const resolved = yield* resolver.resolve();
+        const agent = (yield* agents.select(session.agent)).info?.model;
+        const preferred = agent && (yield* available()).find((model) => model.providerID === agent.providerID && model.id === agent.id);
+        const resolved = preferred ? yield* resolver.resolveModel(preferred, agent.variant) : yield* resolver.resolve();
         if (resolved)
           return resolved;
         return yield* new ModelNotSelectedError2({ sessionID: session.id });
@@ -74,6 +81,6 @@ var layer = Layer.effect(Service60, Effect.gen(function* () {
     })
   });
 }));
-var node64 = makeLocationNode({ service: Service60, layer, deps: [node77] });
+var node51 = makeLocationNode({ service: Service49, layer, deps: [node72, node79] });
 
-export { ModelNotSelectedError2, ModelUnavailableError2, Service60, resolved2, node64, exports_model };
+export { ModelNotSelectedError2, ModelUnavailableError2, Service49, resolved2, node51, exports_model };

package/dist/chunks/{instruction-discovery-d63q5jb9.js → location-p894etz3.js}

@@ -1,63 +1,63 @@
 import {
   NonNegativeInt2
-} from "./instruction-discovery-z5v4ffb3.js";
+} from "./location-z5v4ffb3.js";
 import {
   latest2,
-  Service62
-} from "./instruction-discovery-4wn1snmt.js";
+  Service58
+} from "./location-4v3515yy.js";
 import {
   typeFollowing2
-} from "./instruction-discovery-zkg84ctx.js";
+} from "./location-zkg84ctx.js";
 import {
-  Service48
-} from "./instruction-discovery-4n11yhw4.js";
+  Service60
+} from "./location-r20swzxr.js";
 import {
-  Service61
-} from "./instruction-discovery-bwg9673r.js";
+  Service50
+} from "./location-jh9pmtvm.js";
 import {
-  Service66
-} from "./instruction-discovery-3p713cmj.js";
+  Service72
+} from "./location-tseqrb92.js";
 import {
   Service14,
   resolvePath2
-} from "./instruction-discovery-18b8n2mx.js";
+} from "./location-x6zjgj80.js";
 import {
   output2,
   notice2,
   metadata2,
   notification2
-} from "./instruction-discovery-k814nvkf.js";
+} from "./location-k814nvkf.js";
 import {
-  Service52,
+  Service57,
   name16
-} from "./instruction-discovery-6q77emv1.js";
+} from "./location-sk6vvdwr.js";
 import {
   NotFoundError7,
-  Service44
-} from "./instruction-discovery-wh2p867q.js";
+  Service55
+} from "./location-4y92vxjf.js";
 import {
-  Service25
-} from "./instruction-discovery-5hny5v5k.js";
+  Service26
+} from "./location-d5m0d1jd.js";
 import {
-  scan2
-} from "./instruction-discovery-8p073n4r.js";
+  scan3
+} from "./location-2s6r54qs.js";
 import {
   __export
-} from "./instruction-discovery-9rqn6x4v.js";
+} from "./location-9rqn6x4v.js";
 
 // src/tool/plugin/shell.ts
-var exports_shell = {};
-__export(exports_shell, {
+var exports_shell2 = {};
+__export(exports_shell2, {
   DEFAULT_TIMEOUT_MS: () => DEFAULT_TIMEOUT_MS2,
-  Input: () => Input10,
-  Plugin: () => Plugin12,
-  ShellTool: () => exports_shell,
-  name: () => name10
+  Input: () => Input9,
+  Plugin: () => Plugin45,
+  ShellTool: () => exports_shell2,
+  name: () => name9
 });
 import { ToolFailure } from "@opencode/ai";
 import { Deferred, Effect, Schema, Scope } from "effect";
 import { shellParserWasm } from "#shell-parser-wasm";
-var name10 = "shell";
+var name9 = "shell";
 var DEFAULT_TIMEOUT_MS2 = 2 * 60 * 1000;
 var BACKGROUND_INSTRUCTION = "You will be notified automatically when the command finishes. The notification will include the command's output. Unless the user explicitly asks otherwise, DO NOT poll for completion, even if you need the final result to continue. Repeatedly sleeping and reading or searching the output file is polling, not useful work. You may read the current output if it lets you do useful work now, but do not repeatedly check it while waiting for the command to finish. Keep working on anything that does not depend on the result. If you have nothing else to do, end your response; you will be resumed automatically when the command finishes.";
 var OS = process.platform === "darwin" ? "macOS" : process.platform === "win32" ? "Windows" : process.platform === "linux" ? "Linux" : process.platform;
@@ -71,7 +71,7 @@ var description = (shell) => [
   "Commands accept an optional timeout, background commands have no timeout by default.",
   "Background commands return immediately, and you will be notified when they complete."
 ].join(" ");
-var Input10 = Schema.Struct({
+var Input9 = Schema.Struct({
   command: Schema.String.annotate({ description: "Shell command string to execute" }),
   workdir: Schema.optionalKey(Schema.String).annotate({
     description: "Working directory to execute the command in. Defaults to the current working directory. When possible, avoid changing directories in the command and set the working directory here instead."
@@ -117,19 +117,19 @@ Output is streaming to: ${file}`,
   truncated: false,
   status: "running"
 });
-var Plugin12 = {
+var Plugin45 = {
   id: "opencode.tool.shell",
   effect: Effect.fn("ShellTool.Plugin")(function* (ctx) {
-    const sessions = yield* Service25;
-    const jobs = yield* Service61;
+    const sessions = yield* Service26;
+    const jobs = yield* Service50;
     const scope = yield* Scope.Scope;
-    const environment = yield* Service48;
+    const environment = yield* Service60;
     const access = yield* Service14;
-    const shell = yield* Service44;
-    const shellSelect = yield* Service52;
+    const shell = yield* Service55;
+    const shellSelect = yield* Service57;
     const compatibleShell = shellSelect.resolve({ priority: "compat" });
-    const permission = yield* Service66;
-    const config = yield* Service62;
+    const permission = yield* Service72;
+    const config = yield* Service58;
     const prepare = Effect.fn("ShellTool.prepare")(function* (invocation, context) {
       const source = {
         type: "tool",
@@ -140,7 +140,7 @@ var Plugin12 = {
       invocation.cwd = target.absolute;
       const timeout = invocation.timeout;
       const portable = latest2(yield* config.entries(), "experimental")?.portable_shell_scanner ?? (shellParserWasm.bash === "" || ctx.app.channel === "local" || ctx.app.channel === "dev");
-      const parsed = yield* scan2(invocation.command, invocation.shell, target.absolute, { portable });
+      const parsed = yield* scan3(invocation.command, invocation.shell, target.absolute, { portable });
       const directories = yield* Effect.forEach(parsed.directories, (directory) => access.resolve({
         path: resolvePath2(target.absolute, directory),
         kind: "directory"
@@ -148,7 +148,7 @@ var Plugin12 = {
       yield* access.authorizeExternal([target, ...directories], context);
       if (parsed.commands.length > 0)
         yield* permission.assert({
-          action: name10,
+          action: name9,
           resources: parsed.commands.map((command) => command.resource),
           save: parsed.commands.map((command) => command.save),
           sessionID: context.sessionID,
@@ -185,10 +185,10 @@ var Plugin12 = {
         yield* jobs.completeBackground(info.notificationID);
     }, Effect.forkIn(scope, { startImmediately: true }));
     yield* ctx.tool.transform((editor) => editor.add({
-      name: name10,
+      name: name9,
       options: { codemode: false },
       description: description(),
-      input: Input10,
+      input: Input9,
       output: Output,
       execute: (input, context) => Effect.gen(function* () {
         const timeout = input.background === true ? input.timeout ?? 0 : input.timeout ?? DEFAULT_TIMEOUT_MS2;
@@ -225,7 +225,7 @@ Command exceeded timeout of ${finalTimeout} ms. Retry with a larger timeout if t
 `)), Effect.onInterrupt(() => shell.remove(info.id).pipe(Effect.ignore)));
         const job = yield* jobs.start({
           id: info.id,
-          type: name10,
+          type: name9,
           title: info.command,
           metadata: { sessionID: context.sessionID, shellID: info.id },
           recovery: {
@@ -255,7 +255,7 @@ Command exceeded timeout of ${finalTimeout} ms. Retry with a larger timeout if t
       }).pipe(Effect.map(toolResult), Effect.mapError((error) => new ToolFailure({ message: `Unable to execute command: ${input.command}`, error })))
     })).pipe(Effect.orDie);
     const hook = (event) => Effect.gen(function* () {
-      const tool = event.tools[name10];
+      const tool = event.tools[name9];
       if (!tool)
         return;
       tool.description = description(name16(yield* compatibleShell));
@@ -266,4 +266,4 @@ Command exceeded timeout of ${finalTimeout} ms. Retry with a larger timeout if t
   })
 };
 
-export { name10, DEFAULT_TIMEOUT_MS2, Input10, Plugin12, exports_shell };
+export { name9, DEFAULT_TIMEOUT_MS2, Input9, Plugin45, exports_shell2 };

package/dist/chunks/{instruction-discovery-pc1v25hk.js → location-pc1v25hk.js}

@@ -1,6 +1,6 @@
 import {
   which2
-} from "./instruction-discovery-qaymkmh1.js";
+} from "./location-qaymkmh1.js";
 
 // src/formatter/builtins.ts
 import { Effect } from "effect";

package/dist/chunks/{instruction-discovery-pknna89w.js → location-pknna89w.js}

@@ -1,6 +1,6 @@
 import {
   Timestamps2
-} from "./instruction-discovery-qfa1cgps.js";
+} from "./location-qfa1cgps.js";
 
 // src/credential/sql.ts
 import { integer, sqliteTable, text } from "drizzle-orm/sqlite-core";

package/dist/chunks/{instruction-discovery-hq055v4c.js → location-pt3agb94.js}

@@ -1,16 +1,16 @@
 import {
   ID13,
   mergeOverlay2
-} from "./instruction-discovery-n5194rg1.js";
+} from "./location-ght5gt7k.js";
 import {
-  ID12,
+  ID7,
   VariantID2,
-  Info20,
+  Info17,
   compatibility2
-} from "./instruction-discovery-20e5g7bx.js";
+} from "./location-6b66j3w1.js";
 import {
   __export
-} from "./instruction-discovery-9rqn6x4v.js";
+} from "./location-9rqn6x4v.js";
 
 // src/modal/models.ts
 var exports_models2 = {};
@@ -75,8 +75,8 @@ function derive3(baseURL, remote, existing) {
   const templates = new Map(existing.map((model) => [model.id, model]));
   const result = new Map;
   for (const item of remote) {
-    const template = templates.get(ID12.make(item.base_model_id ?? item.hugging_face_id ?? item.id));
-    const id = ID12.make(item.id);
+    const template = templates.get(ID7.make(item.base_model_id ?? item.hugging_face_id ?? item.id));
+    const id = ID7.make(item.id);
     result.set(id, build(id, item, baseURL, template));
   }
   return result;
@@ -94,10 +94,10 @@ function limit(value, fallback) {
 function build(id, remote, baseURL, previous) {
   const cost = previous?.cost[0];
   const input = previous?.limit.input;
-  return Info20.make({
-    ...Info20.default(providerID, id),
+  return Info17.make({
+    ...Info17.default(providerID, id),
     id,
-    modelID: ID12.make(remote.id),
+    modelID: ID7.make(remote.id),
     providerID,
     name: remote.name ?? previous?.name ?? remote.id,
     family: previous?.family,

package/dist/chunks/{instruction-discovery-c1tsfj35.js → location-ptcpq2hv.js}

@@ -1,17 +1,17 @@
 import {
   mergeOverlay2,
-  Service76
-} from "./instruction-discovery-n5194rg1.js";
+  Service77
+} from "./location-ght5gt7k.js";
 import {
-  Service62
-} from "./instruction-discovery-4wn1snmt.js";
+  Service58
+} from "./location-4v3515yy.js";
 
 // src/plugin/provider/configured.ts
 import { Effect, Option } from "effect";
 var configuredSettings2 = Effect.fn("ProviderPlugin.configuredSettings")(function* (id) {
-  const providers = yield* Service76;
+  const providers = yield* Service77;
   const current = (yield* providers.get(id))?.settings;
-  const service = yield* Effect.serviceOption(Service62);
+  const service = yield* Effect.serviceOption(Service58);
   const entries = Option.isSome(service) ? yield* service.value.entries() : [];
   return foldSettings2(entries, id, current);
 });

package/dist/chunks/{instruction-discovery-vfjveysg.js → location-q1rqw855.js}

@@ -1,13 +1,13 @@
 import {
   Service85
-} from "./instruction-discovery-7nepz6ee.js";
+} from "./location-wedh6qfb.js";
 import {
   supportsText2
-} from "./instruction-discovery-20e5g7bx.js";
+} from "./location-6b66j3w1.js";
 import {
-  Service15,
+  Service13,
   Event2
-} from "./instruction-discovery-e2mf0cbs.js";
+} from "./location-akfw3dm8.js";
 
 // src/plugin/models-dev.ts
 import { define } from "@opencode/plugin/effect/plugin";
@@ -38,7 +38,7 @@ var BEDROCK_PROFILE_ONLY_IDS = [
 var ModelsDevPlugin2 = define({
   id: "opencode.models.dev",
   effect: Effect.fn(function* (ctx) {
-    const modelsDev = yield* Service15;
+    const modelsDev = yield* Service13;
     const bus = yield* Service85;
     const loaded = { data: snapshots(yield* modelsDev.get()) };
     yield* ctx.integration.transform((integrations) => {

package/dist/chunks/{instruction-discovery-1m4hc5mh.js → location-q55b1wrz.js}

@@ -1,37 +1,37 @@
 import {
   batch2
-} from "./instruction-discovery-vd3b3yk9.js";
+} from "./location-vd3b3yk9.js";
 import {
-  Service62
-} from "./instruction-discovery-4wn1snmt.js";
+  Service58
+} from "./location-4v3515yy.js";
 import {
   match2
-} from "./instruction-discovery-z38nccrw.js";
+} from "./location-z38nccrw.js";
 import {
-  Service18,
+  Service25,
   statements2,
   decision2
-} from "./instruction-discovery-tzjzgnfr.js";
+} from "./location-ytvhabzn.js";
 import {
   observe2
-} from "./instruction-discovery-6pjqjmy2.js";
+} from "./location-6pjqjmy2.js";
 import {
   __export
-} from "./instruction-discovery-9rqn6x4v.js";
+} from "./location-9rqn6x4v.js";
 
 // src/config/plugin/policy.ts
 var exports_policy = {};
 __export(exports_policy, {
   ConfigPolicyPlugin: () => exports_policy,
-  Plugin: () => Plugin50
+  Plugin: () => Plugin26
 });
 import { define } from "@opencode/plugin/effect/plugin";
 import { Effect, Stream } from "effect";
-var Plugin50 = define({
+var Plugin26 = define({
   id: "opencode.config.policy",
   effect: Effect.fn(function* (ctx) {
-    const config = yield* Service62;
-    const managed = yield* Service18;
+    const config = yield* Service58;
+    const managed = yield* Service25;
     const reload = batch2(Effect.all([ctx.provider.reload(), ctx.mcp.reload(), ctx.skill.reload()], { discard: true }));
     const loaded = yield* observe2(config, ctx.event, reload);
     yield* managed.changes().pipe(Stream.runForEach(() => reload), Effect.forkScoped({ startImmediately: true }));
@@ -76,4 +76,4 @@ var Plugin50 = define({
   })
 });
 
-export { Plugin50, exports_policy };
+export { Plugin26, exports_policy };

package/dist/chunks/{instruction-discovery-kkh84317.js → location-q89bkvf2.js}

@@ -1,9 +1,9 @@
 import {
   ID13
-} from "./instruction-discovery-n5194rg1.js";
+} from "./location-ght5gt7k.js";
 import {
   configuredSettings2
-} from "./instruction-discovery-c1tsfj35.js";
+} from "./location-ptcpq2hv.js";
 
 // src/plugin/provider/cloudflare-workers-ai.ts
 import { Effect } from "effect";

package/dist/chunks/{instruction-discovery-1cx70z4q.js → location-qbgwvbz8.js}

@@ -1,23 +1,23 @@
 import {
   Service85
-} from "./instruction-discovery-7nepz6ee.js";
+} from "./location-wedh6qfb.js";
 import {
   key2
-} from "./instruction-discovery-zba5tm1j.js";
+} from "./location-bjhzkqyk.js";
 import {
   Event19
-} from "./instruction-discovery-2p8pcvpp.js";
+} from "./location-v0ajt838.js";
 import {
   ID14
-} from "./instruction-discovery-3ffdjm8e.js";
+} from "./location-dgj49q4q.js";
 import {
   ID13,
-  Service76
-} from "./instruction-discovery-n5194rg1.js";
+  Service77
+} from "./location-ght5gt7k.js";
 import {
   load3,
   derive3
-} from "./instruction-discovery-hq055v4c.js";
+} from "./location-pt3agb94.js";
 
 // src/plugin/provider/modal.ts
 import { Effect, Semaphore, Stream } from "effect";
@@ -26,7 +26,7 @@ var providerID = ID13.make("modal");
 var ModalPlugin2 = define({
   id: "opencode.provider.modal",
   effect: Effect.fn(function* (ctx) {
-    const providers = yield* Service76;
+    const providers = yield* Service77;
     const bus = yield* Service85;
     const loading = Semaphore.makeUnsafe(1);
     const loaded = {};

package/dist/chunks/{instruction-discovery-8mhma7yw.js → location-qbm0r1ap.js}

@@ -1,17 +1,17 @@
 import {
   Service85
-} from "./instruction-discovery-7nepz6ee.js";
+} from "./location-wedh6qfb.js";
 import {
   ID16,
   Event19,
   Service80
-} from "./instruction-discovery-2p8pcvpp.js";
+} from "./location-v0ajt838.js";
 import {
   ID13
-} from "./instruction-discovery-n5194rg1.js";
+} from "./location-ght5gt7k.js";
 import {
   configuredSettings2
-} from "./instruction-discovery-c1tsfj35.js";
+} from "./location-ptcpq2hv.js";
 
 // src/plugin/provider/google-vertex.ts
 import { Effect, Option, Schema, Stream } from "effect";
@@ -147,10 +147,11 @@ var GoogleVertexPlugin2 = define({
         for (const model of models.list(item.provider.id)) {
           if (typeof model.settings?.baseURL !== "string")
             continue;
+          const baseURL = replaceVertexVars(model.settings.baseURL, project, location);
           models.update(item.provider.id, model.id, (draft) => {
             draft.settings = {
               ...draft.settings,
-              baseURL: replaceVertexVars(String(draft.settings?.baseURL), project, location)
+              baseURL
             };
           });
         }