@opencode/core 2.0.21 → 2.0.23

package/dist/chunks/{job-5k4xw9x6.js → generate-fep41vc5.js}

@@ -2,35 +2,35 @@ import {
   ephemeral2,
   Service83,
   node87
-} from "./job-vdqv4tww.js";
+} from "./generate-z8hrkqzq.js";
 import {
   Key3,
   unavailable3,
   removed2,
-  make20,
+  make21,
   diffByKey2
-} from "./job-rhjbct0v.js";
+} from "./generate-s8d7rejh.js";
 import {
   AbsolutePath2
-} from "./job-922hggd3.js";
+} from "./generate-z5v4ffb3.js";
 import {
   create3
-} from "./job-rdw6cm16.js";
+} from "./generate-rdw6cm16.js";
 import {
   __export
-} from "./job-9rqn6x4v.js";
+} from "./generate-9rqn6x4v.js";
 
 // src/instruction-discovery.ts
 var exports_instruction_discovery = {};
 __export(exports_instruction_discovery, {
-  Event: () => Event10,
+  Event: () => Event8,
   File: () => File2,
   InstructionDiscovery: () => exports_instruction_discovery,
   Options: () => Options6,
-  Service: () => Service43,
+  Service: () => Service47,
   configured: () => configured7,
-  layer: () => layer18,
-  node: () => node47
+  layer: () => layer20,
+  node: () => node50
 });
 import { Context, Effect, Layer, Schema } from "effect";
 import { makeLocationNode } from "@opencode/util/effect/app-node";
@@ -42,7 +42,7 @@ class File2 extends Schema.Class("InstructionDiscovery.File")({
 }
 var Files = Schema.Array(File2);
 var key = Key3.make("core/instructions");
-var Event10 = {
+var Event8 = {
   Updated: ephemeral2({ type: "instruction-discovery.updated", schema: {} })
 };
 var Options6 = Schema.Struct({
@@ -50,9 +50,9 @@ var Options6 = Schema.Struct({
   global: Schema.optional(Schema.Boolean)
 });
 
-class Service43 extends Context.Service()("@opencode/InstructionDiscovery") {
+class Service47 extends Context.Service()("@opencode/InstructionDiscovery") {
 }
-var layer18 = (options) => Layer.effect(Service43, Effect.gen(function* () {
+var layer20 = (options) => Layer.effect(Service47, Effect.gen(function* () {
   const bus = yield* Service83;
   const state = create3({
     name: "instruction-discovery",
@@ -72,9 +72,9 @@ var layer18 = (options) => Layer.effect(Service43, Effect.gen(function* () {
         editor.available = false;
       }
     }),
-    notify: () => bus.publish(Event10.Updated, {}).pipe(Effect.asVoid)
+    notify: () => bus.publish(Event8.Updated, {}).pipe(Effect.asVoid)
   });
-  const source = (value) => make20({
+  const source = (value) => make21({
     key,
     codec: Schema.toCodecJson(Files),
     read: Effect.succeed(value),
@@ -90,7 +90,7 @@ var layer18 = (options) => Layer.effect(Service43, Effect.gen(function* () {
       return unavailable3;
     return Array.from(current.files.values());
   });
-  return Service43.of({
+  return Service47.of({
     project: options?.project !== false,
     global: options?.global !== false,
     transform: state.transform,
@@ -106,12 +106,12 @@ var layer18 = (options) => Layer.effect(Service43, Effect.gen(function* () {
 }));
 function configured7(options) {
   return makeLocationNode({
-    service: Service43,
-    layer: layer18(options),
+    service: Service47,
+    layer: layer20(options),
     deps: [node87]
   });
 }
-var node47 = configured7();
+var node50 = configured7();
 function render(files) {
   return files.map((file) => `Instructions from: ${file.path}
 ${file.content}`).join(`
@@ -142,4 +142,4 @@ ${render([after])}`;
 `);
 }
 
-export { File2, Event10, Options6, Service43, layer18, configured7, node47, exports_instruction_discovery };
+export { File2, Event8, Options6, Service47, layer20, configured7, node50, exports_instruction_discovery };

package/dist/chunks/{job-jy3q8cv1.js → generate-ffxkc1dx.js}

@@ -1,25 +1,25 @@
 import {
   webSocketConstructor2
-} from "./job-5t3nmthw.js";
+} from "./generate-5t3nmthw.js";
 import {
   __export
-} from "./job-9rqn6x4v.js";
+} from "./generate-9rqn6x4v.js";
 
 // src/session/model-transport.ts
 var exports_model_transport = {};
 __export(exports_model_transport, {
-  Service: () => Service32,
+  Service: () => Service27,
   SessionModelTransport: () => exports_model_transport,
-  layer: () => layer13,
+  layer: () => layer12,
   makeLayer: () => makeLayer2,
-  node: () => node35
+  node: () => node30
 });
 import {
   WebSocketTransport
 } from "@opencode/ai/route";
 import { AIError, AIErrorReason, TransportError } from "@opencode/ai";
 import { Hash } from "@opencode/util/hash";
-import { Cause, Clock, Context, Effect, Fiber, Layer, Metric, Queue, Scope, Semaphore, Stream } from "effect";
+import { Cause, Clock, Context, Duration, Effect, Fiber, Layer, Metric, Queue, Scope, Semaphore, Stream } from "effect";
 import { Headers } from "effect/unstable/http";
 import { Socket } from "effect/unstable/socket";
 import { makeGlobalNode } from "@opencode/util/effect/app-node";
@@ -33,7 +33,7 @@ var events = Metric.counter("opencode_session_websocket_events_total", {
 });
 var metric = (event, attributes = {}) => Metric.update(events.pipe(Metric.withAttributes({ event, ...attributes })), 1);
 
-class Service32 extends Context.Service()("@opencode/SessionModelTransport") {
+class Service27 extends Context.Service()("@opencode/SessionModelTransport") {
 }
 var transportError = (message, input) => new AIError({
   reason: new TransportError({ message, transport: "websocket", ...input })
@@ -57,7 +57,7 @@ var observationFrame = (observation) => {
   return Effect.fail(observation.error);
 };
 var observationTerminal = (observation) => observation.type !== "frame";
-var makeLayer2 = (connector) => Layer.effect(Service32, Effect.gen(function* () {
+var makeLayer2 = (connector) => Layer.effect(Service27, Effect.gen(function* () {
   const scope = yield* Scope.Scope;
   const states = new Map;
   const state = (sessionID) => {
@@ -266,7 +266,7 @@ var makeLayer2 = (connector) => Layer.effect(Service32, Effect.gen(function* ()
     let terminal;
     const token = {};
     const frames = Stream.fromQueue(active.queue).pipe(Stream.timeoutOrElse({
-      duration: idleTimeout ?? IDLE_TIMEOUT,
+      duration: idleTimeout === false ? Duration.infinity : idleTimeout ?? IDLE_TIMEOUT,
       orElse: () => Stream.fail(transportError("Timed out waiting for WebSocket data", {
         url: exchange.connect.url,
         operation: "read",
@@ -367,11 +367,11 @@ var makeLayer2 = (connector) => Layer.effect(Service32, Effect.gen(function* ()
     }, { discard: true });
   });
   yield* Effect.addFinalizer(() => closeAll);
-  return Service32.of({ bind, close, closeAll });
+  return Service27.of({ bind, close, closeAll });
 }));
-var layer13 = Layer.unwrap(Effect.map(Socket.WebSocketConstructor, (constructor) => makeLayer2({
+var layer12 = Layer.unwrap(Effect.map(Socket.WebSocketConstructor, (constructor) => makeLayer2({
   open: (input) => WebSocketTransport.open(input).pipe(Effect.provideService(Socket.WebSocketConstructor, constructor))
 })));
-var node35 = makeGlobalNode({ service: Service32, layer: layer13, deps: [webSocketConstructor2] });
+var node30 = makeGlobalNode({ service: Service27, layer: layer12, deps: [webSocketConstructor2] });
 
-export { Service32, makeLayer2, layer13, node35, exports_model_transport };
+export { Service27, makeLayer2, layer12, node30, exports_model_transport };

package/dist/chunks/{job-2dre8qhb.js → generate-fjh44twp.js}

@@ -1,9 +1,9 @@
 import {
-  Service54
-} from "./job-3vy408b5.js";
+  Service66
+} from "./generate-5v5aasd4.js";
 import {
   __export
-} from "./job-9rqn6x4v.js";
+} from "./generate-9rqn6x4v.js";
 
 // src/mcp/stdio.ts
 var exports_stdio = {};
@@ -12,14 +12,16 @@ __export(exports_stdio, {
   make: () => make2
 });
 import { ReadBuffer, serializeMessage } from "@modelcontextprotocol/client";
-import { Cause, Duration, Effect, Queue, Scope, Stream } from "effect";
+import { Cause, Duration, Effect, Fiber, Option, Queue, Scope, Stream } from "effect";
 import { ChildProcess } from "effect/unstable/process";
 var CLOSE_GRACE = Duration.seconds(2);
 var FORCE_KILL_AFTER = Duration.seconds(2);
 var OUTGOING_CAPACITY = 64;
 var MAX_FRAME_BYTES = 16 * 1024 * 1024;
+var EXIT_WAIT = Duration.seconds(1);
+var STDERR_TAIL = 1000;
 var make2 = Effect.fnUntraced(function* (options) {
-  const environment = yield* Service54;
+  const environment = yield* Service66;
   const scope = yield* Effect.scope;
   const outgoing = yield* Queue.bounded(OUTGOING_CAPACITY);
   const buffer = new ReadBuffer;
@@ -27,6 +29,7 @@ var make2 = Effect.fnUntraced(function* (options) {
   let startup;
   let closing;
   let trailingBytes = 0;
+  let stderr = "";
   const stop = Effect.fnUntraced(function* (handle) {
     yield* Effect.timeoutOption(handle.exitCode, CLOSE_GRACE).pipe(Effect.ignore);
     const terminated = yield* Effect.timeoutOption(handle.kill({ killSignal: "SIGTERM" }), FORCE_KILL_AFTER);
@@ -97,16 +100,24 @@ var make2 = Effect.fnUntraced(function* (options) {
     }
   });
   const startOutput = (handle) => Effect.gen(function* () {
+    const drain = yield* Effect.forkScoped(handle.stderr.pipe(Stream.decodeText(), Stream.tap((output) => Effect.sync(() => stderr = (stderr + output).slice(-STDERR_TAIL))), Stream.runForEach((output) => output.trim() === "" ? Effect.void : Effect.logDebug("mcp server stderr", { server: options.server, output })), Effect.ignore));
     yield* Effect.forkScoped(Stream.runForEach(handle.stdout, deliver).pipe(Effect.tapCause((cause) => Effect.sync(() => {
       const error = Cause.squash(cause);
       transport.onerror?.(error instanceof Error ? error : new Error(String(error)));
     })), Effect.ignore, Effect.ensuring(Effect.gen(function* () {
       const unexpected = state.phase !== "closed";
-      if (unexpected)
+      if (unexpected) {
+        const code = yield* Fiber.await(drain).pipe(Effect.andThen(handle.exitCode), Effect.timeoutOption(EXIT_WAIT), Effect.orElseSucceed(() => Option.none()));
+        const exited = Option.match(code, {
+          onNone: () => "MCP server process exited",
+          onSome: (code) => `MCP server process exited with code ${code}`
+        });
+        const output = stderr.trim();
+        transport.onerror?.(new Error(output ? `${exited}: ${output}` : exited));
         yield* Effect.promise(close);
+      }
       transport.onclose?.();
     }))));
-    yield* Effect.forkScoped(handle.stderr.pipe(Stream.decodeText(), Stream.runForEach((output) => output.trim() === "" ? Effect.void : Effect.logDebug("mcp server stderr", { server: options.server, output })), Effect.ignore));
   });
   return transport;
 });

package/dist/chunks/{job-2ydcz6pr.js → generate-g2xfdbz5.js}

@@ -1,29 +1,29 @@
 import {
   Service84,
   node88
-} from "./job-vsq07z0a.js";
+} from "./generate-6zp854ra.js";
 import {
   SessionTable2,
   SessionMessageTable2
-} from "./job-z07pqspn.js";
+} from "./generate-9e5bzkjp.js";
 import {
   decodeMessageRow2,
-  load5
-} from "./job-2sf5vtpp.js";
+  load4
+} from "./generate-pd0d3v86.js";
 import {
   fromRow2
-} from "./job-vmgq4x8b.js";
+} from "./generate-5pyjqqve.js";
 import {
   __export
-} from "./job-9rqn6x4v.js";
+} from "./generate-9rqn6x4v.js";
 
 // src/session/store.ts
 var exports_store = {};
 __export(exports_store, {
   ListInput: () => ListInput5,
-  Service: () => Service69,
+  Service: () => Service59,
   SessionStore: () => exports_store,
-  node: () => node73
+  node: () => node62
 });
 import { and, asc, desc, eq, gt, isNotNull, isNull, like, lt, notInArray, or, sql } from "drizzle-orm";
 import { Context, Effect, Layer, Schema } from "effect";
@@ -52,11 +52,11 @@ var ListProjectInput = Schema.Struct({
 var ListAllInput = Schema.Struct(ListInputBase);
 var ListInput5 = Schema.Union([ListDirectoryInput, ListProjectInput, ListAllInput]);
 
-class Service69 extends Context.Service()("@opencode/SessionStore") {
+class Service59 extends Context.Service()("@opencode/SessionStore") {
 }
-var layer = Layer.effect(Service69, Effect.gen(function* () {
+var layer = Layer.effect(Service59, Effect.gen(function* () {
   const { db } = yield* Service84;
-  return Service69.of({
+  return Service59.of({
     get: Effect.fnUntraced(function* (sessionID) {
       const row = yield* db.select().from(SessionTable2).where(eq(SessionTable2.id, sessionID)).get().pipe(Effect.orDie);
       return row ? fromRow2(row) : undefined;
@@ -98,7 +98,7 @@ var layer = Layer.effect(Service69, Effect.gen(function* () {
       const rows = yield* (input.limit === undefined ? query.all() : query.limit(input.limit).all()).pipe(Effect.orDie);
       return yield* Effect.forEach(direction === "previous" ? rows.toReversed() : rows, decodeMessageRow2);
     }),
-    context: Effect.fn("SessionStore.context")((sessionID) => load5(db, sessionID, "latest")),
+    context: Effect.fn("SessionStore.context")((sessionID) => load4(db, sessionID, "latest")),
     message: Effect.fn("SessionStore.message")(function* (messageID) {
       const row = yield* db.select().from(SessionMessageTable2).where(eq(SessionMessageTable2.id, messageID)).get().pipe(Effect.orDie);
       return row ? {
@@ -125,6 +125,6 @@ var layer = Layer.effect(Service69, Effect.gen(function* () {
     })
   });
 }));
-var node73 = makeGlobalNode({ service: Service69, layer, deps: [node88] });
+var node62 = makeGlobalNode({ service: Service59, layer, deps: [node88] });
 
-export { ListInput5, Service69, node73, exports_store };
+export { ListInput5, Service59, node62, exports_store };

package/dist/chunks/{job-ypqa2cd5.js → generate-g9c3k2sz.js}

@@ -1,42 +1,36 @@
 import {
   PositiveInt2
-} from "./job-922hggd3.js";
+} from "./generate-z5v4ffb3.js";
 import {
   Action2
-} from "./job-mjymc32g.js";
+} from "./generate-6m42r3np.js";
 import {
-  Info10
-} from "./job-tdhe5xga.js";
+  Info14
+} from "./generate-3rd28rcz.js";
 import {
-  Info17
-} from "./job-tn0aqsam.js";
-import {
-  Info13
-} from "./job-sxz6gkc3.js";
+  Info16
+} from "./generate-b27vhd2z.js";
 import {
-  Info15
-} from "./job-nxhqveyz.js";
+  Info17
+} from "./generate-w2h15q85.js";
 import {
   Spec2
-} from "./job-fcrkznn8.js";
+} from "./generate-7dqw4kz8.js";
 import {
-  Info12
-} from "./job-qn4ba14w.js";
+  Info18
+} from "./generate-zmr78fwr.js";
 import {
-  Info8
-} from "./job-jmvgh3qv.js";
-import {
-  migrate2,
   normalizeAction2,
   migrateAgent2,
-  commands2,
+  migrateCommand2,
+  modelSelection2,
   migrateMcp2,
   migrateProvider2,
   providerID2
-} from "./job-pxz4gc4z.js";
+} from "./generate-5yzz6hd1.js";
 import {
   __export
-} from "./job-9rqn6x4v.js";
+} from "./generate-9rqn6x4v.js";
 
 // src/config/normalize.ts
 var exports_normalize = {};
@@ -54,6 +48,7 @@ import { ConfigCompaction } from "@opencode/schema/config/compaction";
 import { ConfigFormatter } from "@opencode/schema/config/formatter";
 import { ConfigLSP } from "@opencode/schema/config/lsp";
 import { ConfigMedia } from "@opencode/schema/config/media";
+import { ConfigModel } from "@opencode/schema/config/model";
 import { ConfigMCP } from "@opencode/schema/config/mcp";
 import { ConfigPlugin } from "@opencode/schema/config/plugin";
 import { ConfigPolicy } from "@opencode/schema/config/policy";
@@ -72,6 +67,7 @@ var unsupportedExperimental = [
 ];
 var unsupportedProvider = ["id", "whitelist", "blacklist"];
 var unsupportedModel = ["release_date", "attachment", "reasoning", "temperature", "experimental"];
+var LegacyAutoupdate = Schema.Literals([true, false, "notify"]);
 function normalize2(input) {
   if (!isRecord(input))
     return {
@@ -84,18 +80,15 @@ function normalize2(input) {
   const encoded = {};
   unsupportedTopLevel.forEach((key) => unsupportedIfPresent(input, key, [key], diagnostics));
   const legacySnapshots = own(input, "snapshot") ? decodeEncoded(Schema.Boolean, input.snapshot, ["snapshot"], diagnostics) : undefined;
-  const legacyUpdate = own(input, "autoupdate") ? decodeValue(Info8.fields.autoupdate, input.autoupdate, ["autoupdate"], diagnostics) : undefined;
+  const legacyUpdate = own(input, "autoupdate") ? decodeValue(LegacyAutoupdate, input.autoupdate, ["autoupdate"], diagnostics) : undefined;
   const nativeUpdate = own(input, "update") ? decodeEncoded(Info.fields.update, input.update, ["update"], diagnostics) : undefined;
   const legacyShare = own(input, "autoshare") ? decodeValue(Schema.Boolean, input.autoshare, ["autoshare"], diagnostics) === true ? "auto" : undefined : undefined;
-  const legacyMedia = own(input, "attachment") ? decodeValue(Info17, input.attachment, ["attachment"], diagnostics) : undefined;
-  if (legacyMedia !== undefined) {
-    const migrated = migrate2({ attachment: legacyMedia }).media;
-    if (migrated !== undefined)
-      encoded.media = canonical(ConfigMedia.Info, migrated);
-  }
+  const legacyMedia = own(input, "attachment") ? decodeEncoded(ConfigMedia.Info, input.attachment, ["attachment"], diagnostics) : undefined;
+  if (legacyMedia !== undefined)
+    encoded.media = legacyMedia;
   if (legacySnapshots !== undefined)
     encoded.snapshots = legacySnapshots;
-  const migratedUpdate = legacyUpdate === undefined ? undefined : migrate2({ autoupdate: legacyUpdate }).update;
+  const migratedUpdate = legacyUpdate === false ? "disable" : legacyUpdate === "notify" ? "notify" : legacyUpdate === true ? "auto" : undefined;
   const update = prefer(migratedUpdate, nativeUpdate, ["update"], diagnostics);
   if (update !== undefined)
     encoded.update = update;
@@ -104,17 +97,14 @@ function normalize2(input) {
   const legacyReferences = decodeMap(input.reference, ConfigReference.Entry, ["reference"], diagnostics, decodeEncoded);
   const nativeReferences = decodeMap(input.references, ConfigReference.Entry, ["references"], diagnostics, decodeEncoded);
   mergeMap(encoded, "references", legacyReferences, nativeReferences, isRecord(input.reference) || isRecord(input.references), diagnostics);
-  const legacyCommands = decodeMap(input.command, Info13, ["command"], diagnostics, decodeValue);
+  const legacyCommands = decodeMap(input.command, Info16, ["command"], diagnostics, decodeValue);
   diagnoseSelectionMap(input.command, ["command"], diagnostics);
-  const migratedCommands = mapValues(legacyCommands, (value) => {
-    const migrated = commands2({ value })?.value;
-    return migrated === undefined ? undefined : canonical(ConfigCommand.Info, migrated);
-  });
+  const migratedCommands = mapValues(legacyCommands, (value) => canonical(ConfigCommand.Info, migrateCommand2(value)));
   const nativeCommands = decodeMap(input.commands, ConfigCommand.Info, ["commands"], diagnostics, decodeEncoded);
   mergeMap(encoded, "commands", migratedCommands, nativeCommands, isRecord(input.command) || isRecord(input.commands), diagnostics);
-  const legacyAgents = mapValues(decodeMap(input.agent, Info10, ["agent"], diagnostics, decodeValue), (value) => canonical(ConfigAgent.Info, migrateAgent2(value)));
+  const legacyAgents = mapValues(decodeMap(input.agent, Info14, ["agent"], diagnostics, decodeValue), (value) => canonical(ConfigAgent.Info, migrateAgent2(value)));
   const legacySmallModel = own(input, "small_model") ? decodeValue(Schema.String, input.small_model, ["small_model"], diagnostics) : undefined;
-  const migratedSmallModel = legacySmallModel ? migrate2({ small_model: legacySmallModel }).agents?.title?.model : undefined;
+  const migratedSmallModel = modelSelection2(legacySmallModel);
   if (legacySmallModel && !migratedSmallModel)
     diagnostics.push({
       kind: "unsupported",
@@ -126,7 +116,7 @@ function normalize2(input) {
       model: migratedSmallModel,
       ...legacyAgents.title
     };
-  const modeAgents = mapValues(decodeMap(input.mode, Info10, ["mode"], diagnostics, decodeValue), (value) => canonical(ConfigAgent.Info, migrateAgent2({ ...value, mode: "primary" })));
+  const modeAgents = mapValues(decodeMap(input.mode, Info14, ["mode"], diagnostics, decodeValue), (value) => canonical(ConfigAgent.Info, migrateAgent2({ ...value, mode: "primary" })));
   const migratedAgents = mergeMaps(legacyAgents, modeAgents, ["agents"], diagnostics);
   const nativeAgents = decodeMap(input.agents, ConfigAgent.Info, ["agents"], diagnostics, decodeEncoded);
   diagnoseAgentUnsupported(input.agent, ["agent"], diagnostics);
@@ -152,10 +142,12 @@ function normalize2(input) {
   normalizeWatcher(input, encoded, diagnostics);
   normalizeFormatter(input, encoded, diagnostics);
   normalizeLsp(input, encoded, diagnostics);
+  const model = own(input, "model") ? decodeValue(ConfigModel.Selection, input.model, ["model"], diagnostics) : undefined;
+  if (model)
+    encoded.model = { ...model, providerID: providerID2(model.providerID) };
   const nativeAtomic = {
     $schema: Info.fields.$schema,
     shell: Info.fields.shell,
-    model: Info.fields.model,
     default_agent: Info.fields.default_agent,
     share: Info.fields.share,
     enterprise: Info.fields.enterprise,
@@ -225,7 +217,7 @@ function normalizeMcp(input, encoded, diagnostics) {
           normalizeMcpTimeout(value, timeout, path, diagnostics);
           return;
         }
-        const server = decodeValue(Info15, value, path, diagnostics);
+        const server = decodeValue(Info17, value, path, diagnostics);
         if (server !== undefined)
           setOwn(legacyServers, name, canonical(ConfigMCP.Server, migrateMcp2(server)));
       });
@@ -421,7 +413,7 @@ function migrateProviders(value, diagnostics) {
     diagnoseProviderUnsupported(raw, path, diagnostics);
     if (invalidProviderOverlays(raw, path, diagnostics))
       return [];
-    const provider = decodeValue(Info12, raw, path, diagnostics);
+    const provider = decodeValue(Info18, raw, path, diagnostics);
     if (provider === undefined)
       return [];
     const destination = providerID2(name);

package/dist/chunks/{job-97h51v5t.js → generate-gcxxm8yg.js}

@@ -1,21 +1,22 @@
 import {
-  ID12,
+  ID13,
   isAISDK2,
   packageName2,
+  timeouts2,
   mergeOverlay2
-} from "./job-5svcwqmc.js";
+} from "./generate-3edgjjmd.js";
 import {
   __export
-} from "./job-9rqn6x4v.js";
+} from "./generate-9rqn6x4v.js";
 
 // src/aisdk.ts
 var exports_aisdk = {};
 __export(exports_aisdk, {
   AISDK: () => exports_aisdk,
   InitError: () => InitError2,
-  Service: () => Service66,
+  Service: () => Service74,
   locationLayer: () => locationLayer2,
-  node: () => node70
+  node: () => node78
 });
 import { makeLocationNode } from "@opencode/util/effect/app-node";
 import { APICallError } from "@ai-sdk/provider";
@@ -96,23 +97,22 @@ function prepareOptions(model, pkg) {
     body: projected.body
   };
   const customFetch = options.fetch;
-  const chunkTimeout = options.chunkTimeout;
+  const timeouts = timeouts2(options);
+  delete options.headerTimeout;
   delete options.chunkTimeout;
   delete options.compaction;
   delete options.transport;
   options.fetch = async (input, init) => {
     const opts = { ...init ?? {} };
-    const signals = [
+    const headers = new AbortController;
+    const headerTimer = timeouts.headerTimeout === false ? undefined : setTimeout(() => headers.abort(new Error(HEADER_TIMEOUT_MESSAGE)), timeouts.headerTimeout);
+    const chunks = new AbortController;
+    opts.signal = AbortSignal.any([
       opts.signal,
-      typeof chunkTimeout === "number" && chunkTimeout > 0 ? new AbortController : undefined,
-      options.timeout !== undefined && options.timeout !== null && options.timeout !== false ? AbortSignal.timeout(options.timeout) : undefined
-    ].filter((item) => item !== undefined && item !== null);
-    const chunkAbortCtl = signals.find((item) => item instanceof AbortController);
-    const abortSignals = signals.map((item) => item instanceof AbortController ? item.signal : item);
-    if (abortSignals.length === 1)
-      opts.signal = abortSignals[0];
-    if (abortSignals.length > 1)
-      opts.signal = AbortSignal.any(abortSignals);
+      headers.signal,
+      chunks.signal,
+      timeouts.timeout ? AbortSignal.timeout(timeouts.timeout) : undefined
+    ].filter((item) => item !== undefined && item !== null));
     if (typeof opts.body === "string" && model.body !== undefined) {
       const decoded = Option.getOrUndefined(decodeJson(opts.body));
       if (Schema.is(Schema.Record(Schema.String, Schema.Json))(decoded)) {
@@ -121,10 +121,10 @@ function prepareOptions(model, pkg) {
     }
     const send = typeof customFetch === "function" ? customFetch : fetch;
     const middleware = httpMiddleware.getStore();
-    const res = middleware ? await throughMiddleware(middleware, send, input, { ...opts, timeout: false }) : await send(input, { ...opts, timeout: false });
-    if (!chunkAbortCtl || typeof chunkTimeout !== "number")
+    const res = await (middleware ? throughMiddleware(middleware, send, input, { ...opts, timeout: false }) : send(input, { ...opts, timeout: false })).finally(() => clearTimeout(headerTimer));
+    if (timeouts.chunkTimeout === false)
       return res;
-    return wrapSSE(res, chunkTimeout, chunkAbortCtl);
+    return wrapSSE(res, timeouts.chunkTimeout, chunks);
   };
   return options;
 }
@@ -148,9 +148,10 @@ function throughMiddleware(store, send, input, init) {
     return new Response(stream, { status: response.status, headers: response.headers });
   }), { signal: init.signal ?? undefined });
 }
+var HEADER_TIMEOUT_MESSAGE = "Response headers timed out";
 
 class InitError2 extends Schema.TaggedError()("AISDK.InitError", {
-  providerID: ID12,
+  providerID: ID13,
   cause: Schema.Defect()
 }) {
 }
@@ -158,9 +159,9 @@ function initError(providerID) {
   return Effect.catchCause((cause) => Effect.fail(new InitError2({ providerID, cause: Cause.squash(cause) })));
 }
 
-class Service66 extends Context.Service()("@opencode/AISDK") {
+class Service74 extends Context.Service()("@opencode/AISDK") {
 }
-var locationLayer2 = Layer.effect(Service66, Effect.gen(function* () {
+var locationLayer2 = Layer.effect(Service74, Effect.gen(function* () {
   let sdkHooks = [];
   let languageHooks = [];
   const languages = new Map;
@@ -198,7 +199,7 @@ var locationLayer2 = Layer.effect(Service66, Effect.gen(function* () {
     }
     return event;
   });
-  const service = Service66.of({
+  const service = Service74.of({
     hook: {
       sdk: register(() => sdkHooks, (next) => sdkHooks = next),
       language: register(() => languageHooks, (next) => languageHooks = next)
@@ -342,7 +343,17 @@ function providerOptionKey(packageName, providerID) {
 function requestSettings(settings) {
   if (settings === undefined)
     return;
-  const result = Object.fromEntries(Object.entries(settings).filter(([key]) => !["apiKey", "authToken", "baseURL", "chunkTimeout", "compaction", "fetch", "timeout", "transport"].includes(key)));
+  const result = Object.fromEntries(Object.entries(settings).filter(([key]) => ![
+    "apiKey",
+    "authToken",
+    "baseURL",
+    "chunkTimeout",
+    "compaction",
+    "fetch",
+    "headerTimeout",
+    "timeout",
+    "transport"
+  ].includes(key)));
   return Object.keys(result).length === 0 ? undefined : result;
 }
 function mapBodyToProviderOptions(model, packageName) {
@@ -785,7 +796,8 @@ var NETWORK_ERROR_MESSAGES = new Set([
   "failed to fetch",
   "terminated",
   "other side closed",
-  "sse read timed out"
+  "sse read timed out",
+  HEADER_TIMEOUT_MESSAGE.toLowerCase()
 ]);
 var NativeErrorShape = Schema.Struct({
   message: Schema.String,
@@ -862,6 +874,6 @@ function providerErrorMessage(error) {
   const prefix = error.statusCode === undefined ? "Provider request failed" : `Provider request failed with HTTP ${error.statusCode}`;
   return error.message.trim() !== "" ? error.message : message ?? (code === undefined ? prefix : `${prefix}: ${code}`);
 }
-var node70 = makeLocationNode({ service: Service66, layer: locationLayer2, deps: [] });
+var node78 = makeLocationNode({ service: Service74, layer: locationLayer2, deps: [] });
 
-export { InitError2, Service66, locationLayer2, node70, exports_aisdk };
+export { InitError2, Service74, locationLayer2, node78, exports_aisdk };

package/dist/chunks/{job-gd4qta3r.js → generate-gd4qta3r.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./job-9rqn6x4v.js";
+} from "./generate-9rqn6x4v.js";
 
 // src/file-retention.ts
 var exports_file_retention = {};