@opencode-ai/core 0.0.0-beta-17823 → 0.0.0-beta-17887

package/dist/chunks/{bus-dyz5q1tb.js → schema-bh1wr8rq.js}

@@ -1,9 +1,9 @@
 import {
   exports_app
-} from "./bus-50jxp3hw.js";
+} from "./schema-50jxp3hw.js";
 import {
   __export
-} from "./bus-rvfvac9x.js";
+} from "./schema-rvfvac9x.js";
 
 // src/plugin/websearch/tavily.ts
 var exports_tavily = {};
@@ -61,10 +61,7 @@ var Plugin = define({
             chunks_per_source: 3,
             max_results: 8
           }));
-          const response = yield* Effect.gen(function* () {
-            const httpResponse = yield* HttpClient.filterStatusOk(http).execute(request);
-            return yield* HttpClientResponse.schemaBodyJson(SearchResponse)(httpResponse);
-          }).pipe(Effect.timeoutOrElse({
+          const response = yield* HttpClient.filterStatusOk(http).execute(request).pipe(Effect.flatMap(HttpClientResponse.schemaBodyJson(SearchResponse)), Effect.timeoutOrElse({
             duration: Duration.seconds(25),
             orElse: () => Effect.fail(new Error("Tavily web search request timed out"))
           }));

package/dist/chunks/{bus-xd2xkk7n.js → schema-bj25ggyd.js}

@@ -1,12 +1,12 @@
 import {
   exports_skill
-} from "./bus-704hbswx.js";
+} from "./schema-fx6gxcwx.js";
 import {
   exports_instructions
-} from "./bus-ec8vrfw5.js";
+} from "./schema-ec8vrfw5.js";
 import {
   __export
-} from "./bus-rvfvac9x.js";
+} from "./schema-rvfvac9x.js";
 
 // src/skill/instructions.ts
 var exports_instructions2 = {};
@@ -62,8 +62,7 @@ var layer = Layer.effect(Service, Effect.gen(function* () {
       const agent = selection.info;
       if (!agent)
         return exports_instructions.empty;
-      const permitted = exports_skill.available(yield* skills.list(), agent);
-      const available = permitted.flatMap((skill) => skill.description === undefined || skill.autoinvoke === false ? [] : [{ id: skill.id, name: skill.name, description: skill.description }]).toSorted((a, b) => a.id.localeCompare(b.id));
+      const available = exports_skill.available(yield* skills.list(), agent).flatMap((skill) => skill.description === undefined || skill.autoinvoke === false ? [] : [{ id: skill.id, name: skill.name, description: skill.description }]).toSorted((a, b) => a.id.localeCompare(b.id));
       return exports_instructions.make({
         key: exports_instructions.Key.make("core/skill-guidance"),
         codec: Schema.toCodecJson(Schema.Array(Summary)),

package/dist/chunks/{bus-byab506k.js → schema-byab506k.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./bus-rvfvac9x.js";
+} from "./schema-rvfvac9x.js";
 
 // src/database/v1-migration.ts
 var exports_v1_migration = {};

package/dist/chunks/{bus-1c00jchy.js → schema-c4wcb9vc.js}

@@ -1,9 +1,9 @@
 import {
   collectBoundedResponseBody
-} from "./bus-jve7t217.js";
+} from "./schema-jve7t217.js";
 import {
   __export
-} from "./bus-rvfvac9x.js";
+} from "./schema-rvfvac9x.js";
 
 // src/plugin/websearch/mcp.ts
 var exports_mcp = {};
@@ -21,7 +21,7 @@ var parseResponse = (body, result) => {
   const parse = (payload) => {
     const trimmed = payload.trim();
     if (!trimmed.startsWith("{"))
-      return Effect.succeed(undefined);
+      return Effect.undefined;
     return decode(trimmed).pipe(Effect.map((response) => response.result));
   };
   return Effect.gen(function* () {

package/dist/chunks/{bus-e24rm1tf.js → schema-c6gknnhe.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./bus-rvfvac9x.js";
+} from "./schema-rvfvac9x.js";
 
 // src/session/run-coordinator.ts
 var exports_run_coordinator = {};
@@ -12,7 +12,7 @@ import { Deferred, Effect, Exit, Fiber, FiberSet } from "effect";
 var make = (options) => Effect.gen(function* () {
   const executions = new Map;
   const fork = yield* FiberSet.makeRuntime();
-  const loop = (key, execution, force) => Effect.suspend(() => options.drain(key, force, execution.scope)).pipe(Effect.flatMap(() => Effect.suspend(() => {
+  const loop = (key, execution, force) => Effect.suspend(() => options.drain(key, force, execution.scope)).pipe(Effect.andThen(Effect.suspend(() => {
     if (execution.stopping || execution.pendingWake === undefined)
       return Effect.void;
     execution.scope = execution.pendingWake;

package/dist/chunks/{bus-fk3tzmrv.js → schema-c6h4bynb.js}

@@ -1,21 +1,21 @@
-import {
-  exports_runtime
-} from "./bus-3r3ecpec.js";
 import {
   exports_config
-} from "./bus-6dssp8bm.js";
+} from "./schema-53xdmpnb.js";
+import {
+  exports_runtime
+} from "./schema-3x0rbcme.js";
 import {
   exports_permission
-} from "./bus-6k923qe9.js";
+} from "./schema-gpj6jen2.js";
 import {
   exports_agent
-} from "./bus-n11z769x.js";
+} from "./schema-kcbd8yt0.js";
 import {
   exports_schema
-} from "./bus-y8rs54ne.js";
+} from "./schema-y8rs54ne.js";
 import {
   __export
-} from "./bus-rvfvac9x.js";
+} from "./schema-rvfvac9x.js";
 
 // src/tool/plugin/subagent.ts
 var exports_subagent = {};
@@ -31,12 +31,16 @@ import { ToolFailure } from "@opencode-ai/ai";
 import { Effect, Schema, Scope } from "effect";
 var name = "subagent";
 var NO_TEXT = "Subagent completed without a text response.";
-var backgroundStarted = (sessionID) => [
-  `The subagent is working in the background (sessionID: ${sessionID}). You will be notified automatically when it finishes.`,
-  "DO NOT sleep, poll for progress, ask the subagent for status, or duplicate this subagent's work; avoid working with the same files or topics it is using.",
-  "Work on non-overlapping tasks, or briefly tell the user what you launched and end your response."
-].join(`
-`);
+var backgroundResult = (sessionID) => ({
+  sessionID,
+  status: "running",
+  output: [
+    `The subagent is working in the background (sessionID: ${sessionID}). You will be notified automatically when it finishes.`,
+    "DO NOT sleep, poll for progress, ask the subagent for status, or duplicate this subagent's work; avoid working with the same files or topics it is using.",
+    "Work on non-overlapping tasks, or briefly tell the user what you launched and end your response."
+  ].join(`
+`)
+});
 var Input = Schema.Struct({
   agent: Schema.String.annotate({ description: "The type of specialized agent to use for this task" }),
   description: Schema.String.annotate({ description: "A short 3-5 word label for the task, displayed to the user" }),
@@ -176,22 +180,14 @@ ${text}
         if (background) {
           yield* runtime.job.background(info.id);
           yield* notifyWhenDone(context.sessionID, child.id, agent.name, input.description, info.started_at);
-          return {
-            sessionID: child.id,
-            status: "running",
-            output: backgroundStarted(child.id)
-          };
+          return backgroundResult(child.id);
         }
         const result = yield* runtime.job.block({ id: child.id, sessionID: context.sessionID }).pipe(Effect.onInterrupt(() => Effect.all([runtime.session.interrupt(child.id), runtime.job.cancel(child.id)], {
           discard: true
         })));
         if (result?.type === "backgrounded") {
           yield* notifyWhenDone(context.sessionID, child.id, agent.name, input.description, result.info.started_at);
-          return {
-            sessionID: child.id,
-            status: "running",
-            output: backgroundStarted(child.id)
-          };
+          return backgroundResult(child.id);
         }
         if (result?.info.status === "error")
           return yield* new ToolFailure({

package/dist/chunks/{bus-0b6ye7sf.js → schema-c9tk9ghs.js}

@@ -1,9 +1,9 @@
 import {
   exports_provider
-} from "./bus-sfbv6a2b.js";
+} from "./schema-djkt4gex.js";
 import {
   __require
-} from "./bus-rvfvac9x.js";
+} from "./schema-rvfvac9x.js";
 
 // src/plugin/provider/snowflake-cortex.ts
 import { Effect } from "effect";
@@ -21,7 +21,7 @@ function cortexFetch(upstream = fetch) {
       } catch {}
     }
     const response = await upstream(url, init);
-    if (!response.ok && response.status === 400) {
+    if (response.status === 400) {
       try {
         const errorData = await response.clone().json();
         if (String(errorData.message || errorData.error || "").toLowerCase().includes("conversation complete")) {

package/dist/chunks/{bus-gwj8nfkp.js → schema-chrmmjkk.js}

@@ -1,19 +1,19 @@
 import {
   exports_location
-} from "./bus-19qgjfzv.js";
+} from "./schema-j3ethsxz.js";
 import {
   exports_git
-} from "./bus-zjvgdt9p.js";
+} from "./schema-b7hsw5bk.js";
 import {
   AbsolutePath,
   RelativePath
-} from "./bus-j07kk359.js";
+} from "./schema-j07kk359.js";
 import {
   exports_state
-} from "./bus-f2kz495y.js";
+} from "./schema-qhdqjp31.js";
 import {
   __export
-} from "./bus-rvfvac9x.js";
+} from "./schema-rvfvac9x.js";
 
 // src/snapshot.ts
 var exports_snapshot = {};
@@ -139,7 +139,7 @@ var node = makeLocationNode({
 var noopLayer = Layer.succeed(Service, Service.of({
   transform: () => Effect.succeed({ dispose: Effect.void }),
   reload: () => Effect.void,
-  capture: () => Effect.succeed(undefined),
+  capture: () => Effect.undefined,
   files: () => Effect.succeed([]),
   diff: () => Effect.succeed([]),
   restore: () => Effect.void

package/dist/chunks/{bus-qw06pdhp.js → schema-ck5pgha0.js}

@@ -9,6 +9,7 @@ var bypassesProxy = (url, value) => {
   if (!value)
     return false;
   const port = url.port || (url.protocol === "wss:" ? "443" : "80");
+  const hostname = url.hostname.toLowerCase();
   return value.split(/[\s,]+/).some((entry) => {
     if (!entry)
       return false;
@@ -18,7 +19,6 @@ var bypassesProxy = (url, value) => {
     if (match?.[2] && match[2] !== port)
       return false;
     const host = (match?.[1] ?? entry).toLowerCase().replace(/^\*/, "");
-    const hostname = url.hostname.toLowerCase();
     return host.startsWith(".") ? hostname.endsWith(host) : hostname === host;
   });
 };

package/dist/chunks/{bus-19e1vard.js → schema-cke3skfe.js}

@@ -1,12 +1,12 @@
 import {
   which
-} from "./bus-g7k9te92.js";
+} from "./schema-k3e42drn.js";
 import {
   exports_state
-} from "./bus-f2kz495y.js";
+} from "./schema-qhdqjp31.js";
 import {
   __export
-} from "./bus-rvfvac9x.js";
+} from "./schema-rvfvac9x.js";
 
 // src/shell/select.ts
 var exports_select = {};
@@ -153,10 +153,6 @@ function info(file, options, bin) {
 }
 function args(file, command) {
   const n = name(file);
-  if (n === "nu" || n === "fish")
-    return ["-c", command];
-  if (n === "zsh" || n === "bash")
-    return ["-c", command];
   if (n === "cmd")
     return ["/c", command];
   if (ps(file))

package/dist/chunks/{bus-4tmgtgw2.js → schema-cmm1dbz2.js}

@@ -1,12 +1,12 @@
-import {
-  exports_location
-} from "./bus-19qgjfzv.js";
 import {
   exports_instructions
-} from "./bus-ec8vrfw5.js";
+} from "./schema-ec8vrfw5.js";
+import {
+  exports_location
+} from "./schema-j3ethsxz.js";
 import {
   __export
-} from "./bus-rvfvac9x.js";
+} from "./schema-rvfvac9x.js";
 
 // src/instructions/builtins.ts
 var exports_builtins = {};

package/dist/chunks/{bus-3jcy51m6.js → schema-cqrnepgy.js}

@@ -1,48 +1,51 @@
+import {
+  exports_instruction_entry
+} from "./schema-r7qg3fv7.js";
 import {
   exports_message_updater
-} from "./bus-dman5pj0.js";
+} from "./schema-swj2q685.js";
 import {
   exports_inbox
-} from "./bus-e93xz9yp.js";
+} from "./schema-6gz8qpj3.js";
 import {
   Slug
-} from "./bus-df3v2q6j.js";
+} from "./schema-df3v2q6j.js";
 import {
   exports_instruction_state
-} from "./bus-n744begs.js";
+} from "./schema-0vem89v9.js";
 import {
   SessionEvent
-} from "./bus-a83yvq99.js";
+} from "./schema-a83yvq99.js";
 import {
   SessionInboxTable,
   SessionMessageTable,
   SessionTable
-} from "./bus-9d2xhdr4.js";
+} from "./schema-ygy0xbqa.js";
 import {
   exports_message
-} from "./bus-25pxtba7.js";
+} from "./schema-25pxtba7.js";
 import {
   exports_agent
-} from "./bus-n11z769x.js";
+} from "./schema-kcbd8yt0.js";
 import {
   exports_workspace
-} from "./bus-qyzajttf.js";
+} from "./schema-nbfw6jpr.js";
+import {
+  exports_model
+} from "./schema-1a3a2s70.js";
 import {
   AbsolutePath,
   RelativePath
-} from "./bus-j07kk359.js";
+} from "./schema-j07kk359.js";
 import {
   exports_bus
-} from "./bus-ded9e5ma.js";
+} from "./schema-vmvzq9kn.js";
 import {
   exports_database
-} from "./bus-kyy2az1w.js";
-import {
-  exports_model
-} from "./bus-wh0zhxcg.js";
+} from "./schema-fbe8wd9q.js";
 import {
   __export
-} from "./bus-rvfvac9x.js";
+} from "./schema-rvfvac9x.js";
 
 // src/session/projector.ts
 var exports_projector = {};
@@ -140,13 +143,15 @@ var projectFork = Effect.fn("SessionProjector.projectFork")(function* (db, event
   }).onConflictDoNothing().returning({ sessionID: SessionTable.id }).get().pipe(Effect.orDie);
   if (!stored)
     return yield* Effect.die(new SessionAlreadyProjected);
+  if (event.data.instructionEntries)
+    yield* exports_instruction_entry.initialize(db, event.data.sessionID, event.data.instructionEntries, event.created);
   let cursor = -1;
   while (copiedSeq !== undefined) {
-    const rows = yield* db.select().from(SessionMessageTable).where(and(eq(SessionMessageTable.session_id, event.data.parentID), gt(SessionMessageTable.seq, cursor), lt(SessionMessageTable.seq, copiedSeq + 1), sql`${SessionMessageTable.type} != 'compaction' or json_extract(${SessionMessageTable.data}, '$.status') != 'running'`)).orderBy(asc(SessionMessageTable.seq)).limit(ForkBatchSize).all().pipe(Effect.orDie);
+    const rows = yield* db.select().from(SessionMessageTable).where(and(eq(SessionMessageTable.session_id, event.data.parentID), gt(SessionMessageTable.seq, cursor), lt(SessionMessageTable.seq, copiedSeq + 1), sql`${SessionMessageTable.type} != 'assistant' or json_extract(${SessionMessageTable.data}, '$.time.completed') is not null`, sql`${SessionMessageTable.type} != 'shell' or json_extract(${SessionMessageTable.data}, '$.status') != 'running'`, sql`${SessionMessageTable.type} != 'compaction' or json_extract(${SessionMessageTable.data}, '$.status') != 'running'`)).orderBy(asc(SessionMessageTable.seq)).limit(ForkBatchSize).all().pipe(Effect.orDie);
     if (rows.length === 0)
       break;
     yield* db.insert(SessionMessageTable).values(rows.map((row) => ({
-      id: exports_message.ID.create(),
+      id: exports_message.ID.make(`${exports_message.ID.fromEvent(event.id)}_${row.seq}`),
       session_id: event.data.sessionID,
       type: row.type,
       seq: row.seq,
@@ -165,8 +170,6 @@ function run(db, event) {
   return Effect.gen(function* () {
     const decodeRow = (row) => decodeMessage({ ...row.data, id: row.id, type: row.type });
     const updateMessage = (message) => {
-      if (event.durable === undefined)
-        return Effect.die(new Error("Durable Session event is missing aggregate sequence"));
       const encoded = encodeMessage(message);
       const { id, type, ...data } = encoded;
       return db.update(SessionMessageTable).set({ type, time_created: DateTime.toEpochMillis(message.time.created), data }).where(and(eq(SessionMessageTable.id, exports_message.ID.make(id)), eq(SessionMessageTable.session_id, event.data.sessionID))).run().pipe(Effect.orDie);
@@ -239,8 +242,6 @@ function run(db, event) {
   });
 }
 function insertMessage(db, event, message) {
-  if (event.durable === undefined)
-    return Effect.die(new Error("Durable Session event is missing aggregate sequence"));
   const encoded = encodeMessage(message);
   const { id, type, ...data } = encoded;
   return db.insert(SessionMessageTable).values({
@@ -252,6 +253,20 @@ function insertMessage(db, event, message) {
     data
   }).run().pipe(Effect.orDie);
 }
+function projectIdle(db, event) {
+  return Effect.gen(function* () {
+    yield* run(db, event);
+    if (event.type === SessionEvent.Execution.Interrupted.type && event.data.reason === "shutdown")
+      return;
+    const time = event.created;
+    const outcome = event.type === SessionEvent.Execution.Succeeded.type ? "succeeded" : event.type === SessionEvent.Execution.Failed.type ? "failed" : "interrupted";
+    yield* db.update(SessionTable).set({
+      time_idle: sql`max(${time}, coalesce(${SessionTable.time_idle} + 1, ${time}))`,
+      idle_outcome: outcome,
+      time_updated: sql`${SessionTable.time_updated}`
+    }).where(eq(SessionTable.id, event.data.sessionID)).run().pipe(Effect.orDie);
+  });
+}
 var layer = Layer.effectDiscard(Effect.gen(function* () {
   const bus = yield* exports_bus.Service;
   const db = (yield* exports_database.Service).db;
@@ -309,11 +324,16 @@ var layer = Layer.effectDiscard(Effect.gen(function* () {
     yield* db.update(SessionTable).set({ model: event.data.model, time_updated: event.created }).where(eq(SessionTable.id, event.data.sessionID)).run().pipe(Effect.orDie);
   }));
   yield* bus.project(SessionEvent.Renamed, (event) => db.update(SessionTable).set({ title: event.data.title, time_updated: event.created }).where(eq(SessionTable.id, event.data.sessionID)).run().pipe(Effect.orDie));
+  yield* bus.project(SessionEvent.Viewed, (event) => {
+    const idle = event.data.idle;
+    return db.update(SessionTable).set({
+      time_viewed: sql`max(${idle}, coalesce(${SessionTable.time_viewed}, ${idle}))`,
+      time_updated: sql`${SessionTable.time_updated}`
+    }).where(eq(SessionTable.id, event.data.sessionID)).run().pipe(Effect.orDie);
+  });
   yield* bus.project(SessionEvent.UsageRecorded, (event) => applyUsage(db, event.data.sessionID, event.data));
   yield* bus.project(SessionEvent.Forked, (event) => projectFork(db, event));
   yield* bus.project(SessionEvent.InboxDelivered, (event) => Effect.gen(function* () {
-    if (event.durable === undefined)
-      return yield* Effect.die(new Error("Durable Session event is missing aggregate sequence"));
     const input = yield* exports_inbox.projectDelivered(db, {
       id: event.data.inboxID,
       sessionID: event.data.sessionID
@@ -339,8 +359,6 @@ var layer = Layer.effectDiscard(Effect.gen(function* () {
     });
   }));
   yield* bus.project(SessionEvent.InboxEnqueued, (event) => Effect.gen(function* () {
-    if (event.durable === undefined)
-      return yield* Effect.die(new Error("Durable Session event is missing aggregate sequence"));
     yield* exports_inbox.projectAdmitted(db, {
       enqueuedSeq: event.durable.seq,
       id: event.data.inboxID,
@@ -359,9 +377,9 @@ var layer = Layer.effectDiscard(Effect.gen(function* () {
     sessionID: event.data.sessionID,
     delivery: event.data.delivery
   }));
-  yield* bus.project(SessionEvent.Execution.Succeeded, (event) => run(db, event));
-  yield* bus.project(SessionEvent.Execution.Failed, (event) => run(db, event));
-  yield* bus.project(SessionEvent.Execution.Interrupted, (event) => run(db, event));
+  yield* bus.project(SessionEvent.Execution.Succeeded, (event) => projectIdle(db, event));
+  yield* bus.project(SessionEvent.Execution.Failed, (event) => projectIdle(db, event));
+  yield* bus.project(SessionEvent.Execution.Interrupted, (event) => projectIdle(db, event));
   yield* bus.project(SessionEvent.InstructionsUpdated, (event) => Effect.gen(function* () {
     yield* run(db, event);
     yield* exports_instruction_state.apply(db, event.data.sessionID, event.durable.seq, event.data.delta);
@@ -394,14 +412,8 @@ var layer = Layer.effectDiscard(Effect.gen(function* () {
   yield* bus.project(SessionEvent.Compaction.Ended, (event) => Effect.gen(function* () {
     yield* run(db, event);
     yield* exports_instruction_state.advanceEpoch(db, event.data.sessionID, event.durable.seq);
-    if (event.durable === undefined)
-      return yield* Effect.die(new Error("Durable Session event is missing aggregate sequence"));
-  }));
-  yield* bus.project(SessionEvent.Compaction.Failed, (event) => Effect.gen(function* () {
-    yield* run(db, event);
-    if (event.durable === undefined)
-      return yield* Effect.die(new Error("Durable Session event is missing aggregate sequence"));
   }));
+  yield* bus.project(SessionEvent.Compaction.Failed, (event) => run(db, event));
   yield* bus.project(SessionEvent.RevertEvent.Staged, (event) => Effect.gen(function* () {
     const revert = event.data.revert;
     yield* db.update(SessionTable).set({

package/dist/chunks/{bus-nk6yb8jk.js → schema-cve546b2.js}

@@ -1,9 +1,9 @@
 import {
   exports_provider
-} from "./bus-sfbv6a2b.js";
+} from "./schema-djkt4gex.js";
 import {
   __require
-} from "./bus-rvfvac9x.js";
+} from "./schema-rvfvac9x.js";
 
 // src/plugin/provider/anthropic.ts
 import { Effect } from "effect";

package/dist/chunks/{bus-cz3dkvcz.js → schema-cz3dkvcz.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./bus-rvfvac9x.js";
+} from "./schema-rvfvac9x.js";
 
 // src/session/runner/index.ts
 var exports_runner = {};

package/dist/chunks/{bus-eyk9wdct.js → schema-d2gk9vpf.js}

@@ -1,9 +1,9 @@
 import {
   InvalidError
-} from "./bus-nr76rjj3.js";
+} from "./schema-nr76rjj3.js";
 import {
   __export
-} from "./bus-rvfvac9x.js";
+} from "./schema-rvfvac9x.js";
 
 // src/config/variable.ts
 var exports_variable = {};
@@ -25,10 +25,9 @@ var substituteFiles = Effect.fnUntraced(function* (input, text) {
   const fs = yield* FSUtil.Service;
   const configDir = input.type === "path" ? path.dirname(input.path) : input.dir;
   const configSource = input.type === "path" ? input.path : input.source;
-  const matches = Array.from(text.matchAll(/\{file:[^}]+\}/g));
   let out = "";
   let cursor = 0;
-  for (const match of matches) {
+  for (const match of text.matchAll(/\{file:[^}]+\}/g)) {
     const token = match[0];
     const index = match.index;
     out += text.slice(cursor, index);
@@ -40,7 +39,7 @@ var substituteFiles = Effect.fnUntraced(function* (input, text) {
       cursor = index + token.length;
       continue;
     }
-    const filePath = token.replace(/^\{file:/, "").replace(/\}$/, "");
+    const filePath = token.slice("{file:".length, -1);
     const expandedPath = filePath.startsWith("~/") ? path.join(os.homedir(), filePath.slice(2)) : filePath;
     const resolvedPath = path.isAbsolute(expandedPath) ? expandedPath : path.resolve(configDir, expandedPath);
     const fileContent = yield* fs.readFileString(resolvedPath).pipe(Effect.catch((error) => {

package/dist/chunks/{bus-rcvvhx6c.js → schema-dc6p8rz8.js}

@@ -1,31 +1,31 @@
 import {
   exports_integration
-} from "./bus-md8xze4k.js";
-import {
-  exports_form
-} from "./bus-ftqx1cne.js";
+} from "./schema-ej9r6fs2.js";
 import {
   exports_credential
-} from "./bus-4qce6znw.js";
+} from "./schema-y4vhttwz.js";
+import {
+  exports_form
+} from "./schema-r14kbnc4.js";
 import {
   exports_environment1 as exports_environment
-} from "./bus-v332cd3m.js";
+} from "./schema-eyrg1yjb.js";
 import {
   exports_location
-} from "./bus-19qgjfzv.js";
+} from "./schema-j3ethsxz.js";
 import {
   exports_state
-} from "./bus-f2kz495y.js";
+} from "./schema-qhdqjp31.js";
 import {
   exports_bus
-} from "./bus-ded9e5ma.js";
+} from "./schema-vmvzq9kn.js";
 import {
   exports_keyed_mutex
-} from "./bus-0kvmztkf.js";
+} from "./schema-0kvmztkf.js";
 import {
   __export,
   __require
-} from "./bus-rvfvac9x.js";
+} from "./schema-rvfvac9x.js";
 
 // src/mcp/index.ts
 var exports_mcp = {};
@@ -334,7 +334,7 @@ var layer = (options) => Layer.effect(Service, Effect.gen(function* () {
   const refreshTools = (name, entry, connection) => connection.tools().pipe(Effect.map((defs) => {
     entry.tools = defs.map((def) => toTool(name, entry, def));
   }));
-  const refreshPrompts = (name, entry, connection) => connection.prompts().pipe(Effect.catch(() => Effect.succeed([])), Effect.map((defs) => {
+  const refreshPrompts = (name, entry, connection) => connection.prompts().pipe(Effect.orElseSucceed(() => []), Effect.map((defs) => {
     entry.prompts = defs.map((def) => toPrompt(name, def));
   }), Effect.andThen(bus.publish(Command.Event.Updated, {})));
   const whenLive = (name, entry, connection) => (effect) => fork(Effect.suspend(() => entry.client === connection ? effect : Effect.void).pipe(locks.withLock(name), Effect.ignore));
@@ -600,7 +600,9 @@ var layer = (options) => Layer.effect(Service, Effect.gen(function* () {
       yield* target.entry.startup.await;
       if (!target.entry.client)
         return;
-      const result = yield* target.entry.client.prompt({ name: input.name, args: input.args }).pipe(Effect.catch(() => Effect.succeed(undefined)));
+      const result = yield* target.entry.client.prompt({ name: input.name, args: input.args }).pipe(Effect.orElseSucceed(() => {
+        return;
+      }));
       if (!result)
         return;
       return new PromptResult({
@@ -615,8 +617,8 @@ var layer = (options) => Layer.effect(Service, Effect.gen(function* () {
         if (!entry.client)
           return Effect.succeed({ resources: [], templates: [] });
         return Effect.all({
-          resources: entry.client.resources().pipe(Effect.catch(() => Effect.succeed([]))),
-          templates: entry.client.resourceTemplates().pipe(Effect.catch(() => Effect.succeed([])))
+          resources: entry.client.resources().pipe(Effect.orElseSucceed(() => [])),
+          templates: entry.client.resourceTemplates().pipe(Effect.orElseSucceed(() => []))
         }, { concurrency: "unbounded" }).pipe(Effect.map((catalog) => ({
           resources: catalog.resources.map((def) => toResource(name, def)),
           templates: catalog.templates.map((def) => toResourceTemplate(name, def))
@@ -632,7 +634,9 @@ var layer = (options) => Layer.effect(Service, Effect.gen(function* () {
       yield* target.entry.startup.await;
       if (!target.entry.client)
         return;
-      const result = yield* target.entry.client.readResource({ uri: input.uri }).pipe(Effect.catch(() => Effect.succeed(undefined)));
+      const result = yield* target.entry.client.readResource({ uri: input.uri }).pipe(Effect.orElseSucceed(() => {
+        return;
+      }));
       if (!result)
         return;
       return ResourceContent.make({

package/dist/chunks/{bus-dhphtf1x.js → schema-dhphtf1x.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./bus-rvfvac9x.js";
+} from "./schema-rvfvac9x.js";
 
 // src/mime.ts
 var exports_mime = {};

package/dist/chunks/{bus-sfbv6a2b.js → schema-djkt4gex.js}

@@ -1,7 +1,7 @@
 import {
   __export,
   __require
-} from "./bus-rvfvac9x.js";
+} from "./schema-rvfvac9x.js";
 
 // src/provider.ts
 var exports_provider = {};
@@ -22,6 +22,7 @@ __export(exports_provider, {
 });
 import { Effect, Schema } from "effect";
 import { Provider } from "@opencode-ai/schema/provider";
+import { isRecord } from "@opencode-ai/ai/utils/record";
 import { importModule, resolveModule } from "@opencode-ai/util/runtime-import";
 var ID = Provider.ID;
 var AISDK_PREFIX = "aisdk:";
@@ -115,11 +116,8 @@ function mergeOverlay(base, overlay) {
     const right = overlay[key];
     if (right === undefined)
       return [key, left];
-    if (typeof left === "object" && left !== null && !Array.isArray(left) && typeof right === "object" && right !== null && !Array.isArray(right))
-      return [
-        key,
-        mergeOverlay(left, right) ?? {}
-      ];
+    if (isRecord(left) && isRecord(right))
+      return [key, mergeOverlay(left, right) ?? {}];
     return [key, right];
   })));
 }