@opencode-ai/core 0.0.0-beta-17728 → 0.0.0-beta-17793

package/dist/chunks/{workspace-fvfr1h9h.js → workspace-sphyh08q.js}

@@ -1,21 +1,21 @@
 import {
   exports_location_mutation
-} from "./workspace-f1mxyn57.js";
+} from "./workspace-thrqaz0e.js";
+import {
+  exports_permission
+} from "./workspace-dfspp6r4.js";
 import {
   exports_filesystem
-} from "./workspace-dy7dh4rb.js";
+} from "./workspace-bd453e9f.js";
 import {
   exports_ripgrep
-} from "./workspace-y3mwbphg.js";
+} from "./workspace-hwx2w7zf.js";
 import {
   exports_environment1 as exports_environment
-} from "./workspace-c6137mdz.js";
-import {
-  exports_permission
-} from "./workspace-kj1ajs9d.js";
+} from "./workspace-y44ckmk4.js";
 import {
   exports_location
-} from "./workspace-d6d2y6z3.js";
+} from "./workspace-kwbvxbjz.js";
 import {
   RelativePath
 } from "./workspace-j07kk359.js";

package/dist/chunks/{workspace-awt1vy08.js → workspace-st1tmxxz.js}

@@ -1,9 +1,9 @@
 import {
   exports_source
-} from "./workspace-vjshw6kw.js";
+} from "./workspace-vq4xdzwy.js";
 import {
   exports_skill
-} from "./workspace-q1dc5e6j.js";
+} from "./workspace-rgk2vntt.js";
 import {
   AbsolutePath
 } from "./workspace-j07kk359.js";

package/dist/chunks/{workspace-bffjrazf.js → workspace-swnnf7jm.js}

@@ -1,6 +1,6 @@
 import {
   exports_config
-} from "./workspace-mh4qv5pj.js";
+} from "./workspace-ghg83jvf.js";
 import {
   exports_model
 } from "./workspace-wh0zhxcg.js";

package/dist/chunks/{workspace-23pmvn2v.js → workspace-t2ccr6s6.js}

@@ -97,16 +97,6 @@ function prepareOptions(model, pkg) {
       opts.signal = abortSignals[0];
     if (abortSignals.length > 1)
       opts.signal = AbortSignal.any(abortSignals);
-    if ((pkg === "@ai-sdk/openai" || pkg === "@ai-sdk/azure" || pkg === "@ai-sdk/amazon-bedrock/mantle") && opts.body && opts.method === "POST") {
-      const body = JSON.parse(opts.body);
-      if (body.store !== true && Array.isArray(body.input)) {
-        for (const item of body.input) {
-          if ("id" in item)
-            delete item.id;
-        }
-        opts.body = JSON.stringify(body);
-      }
-    }
     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)) {

package/dist/chunks/{workspace-5v0jvcad.js → workspace-thrfs9vw.js}

@@ -1,12 +1,12 @@
-import {
-  exports_driver
-} from "./workspace-t14kykx1.js";
 import {
   WorkspaceTable
 } from "./workspace-3c4nztf9.js";
+import {
+  exports_driver
+} from "./workspace-t14kykx1.js";
 import {
   exports_database
-} from "./workspace-mvg5hf3w.js";
+} from "./workspace-s7pbx90j.js";
 import {
   exports_keyed_mutex
 } from "./workspace-0kvmztkf.js";

package/dist/chunks/{workspace-f1mxyn57.js → workspace-thrqaz0e.js}

@@ -1,9 +1,9 @@
 import {
   exports_location
-} from "./workspace-d6d2y6z3.js";
+} from "./workspace-kwbvxbjz.js";
 import {
   exports_project
-} from "./workspace-90gmgs4x.js";
+} from "./workspace-37d718jr.js";
 import {
   AbsolutePath
 } from "./workspace-j07kk359.js";

package/dist/chunks/{workspace-trb4b12r.js → workspace-tk479mxv.js}

@@ -9,10 +9,10 @@ import {
 } from "./workspace-19e1vard.js";
 import {
   exports_location
-} from "./workspace-d6d2y6z3.js";
+} from "./workspace-kwbvxbjz.js";
 import {
   exports_bus
-} from "./workspace-6v05w4qg.js";
+} from "./workspace-njrg7yr8.js";
 import {
   __export,
   __require

package/dist/chunks/{workspace-zjcjb8a1.js → workspace-tsj2cygv.js}

@@ -1,24 +1,24 @@
-import {
-  exports_environment1 as exports_environment
-} from "./workspace-c6137mdz.js";
-import {
-  exports_location
-} from "./workspace-d6d2y6z3.js";
 import {
   exports_integration
-} from "./workspace-p5fvt5wk.js";
+} from "./workspace-b2csa971.js";
+import {
+  exports_form
+} from "./workspace-vgjwjeca.js";
 import {
   exports_credential
-} from "./workspace-67w1s9dj.js";
+} from "./workspace-vzsgyrq1.js";
 import {
-  exports_form
-} from "./workspace-4d67s52a.js";
+  exports_environment1 as exports_environment
+} from "./workspace-y44ckmk4.js";
+import {
+  exports_location
+} from "./workspace-kwbvxbjz.js";
 import {
   exports_state
 } from "./workspace-f2kz495y.js";
 import {
   exports_bus
-} from "./workspace-6v05w4qg.js";
+} from "./workspace-njrg7yr8.js";
 import {
   exports_keyed_mutex
 } from "./workspace-0kvmztkf.js";
@@ -60,7 +60,7 @@ import { McpEvent } from "@opencode-ai/schema/mcp-event";
 import { Command } from "@opencode-ai/schema/command";
 import { createHash } from "node:crypto";
 import { isDeepStrictEqual } from "node:util";
-import { Cause, Context, Deferred, Effect, Exit, FiberSet, Layer, Schema, Scope, Stream } from "effect";
+import { Cause, Context, Effect, Exit, FiberSet, Latch, Layer, Schema, Scope, Stream } from "effect";
 import { makeLocationNode } from "@opencode-ai/util/effect/app-node";
 import { waitForAbort } from "@opencode-ai/util/process";
 var ServerName = Schema.String.pipe(Schema.brand("MCP.ServerName"));
@@ -394,7 +394,7 @@ var layer = (options) => Layer.effect(Service, Effect.gen(function* () {
     entry.status = error instanceof MCPClient.NeedsAuthError ? { status: "needs_auth" } : { status: "failed", error: error instanceof Error ? error.message : String(error) };
     yield* Effect.logWarning("mcp connect failed", { server: name, status: entry.status });
     yield* bus.publish(McpEvent.StatusChanged, { server: name }).pipe(Effect.ignore);
-  }).pipe(Effect.ensuring(Deferred.succeed(entry.startup, undefined)));
+  }).pipe(Effect.ensuring(entry.startup.open));
   const stopServer = Effect.fnUntraced(function* (name, entry) {
     const scope = entry.scope;
     if (!scope)
@@ -422,7 +422,7 @@ var layer = (options) => Layer.effect(Service, Effect.gen(function* () {
     const entry = {
       config: serverConfig,
       status: { status: "pending" },
-      startup: Deferred.makeUnsafe()
+      startup: Latch.makeUnsafe()
     };
     entries.set(name, entry);
     yield* Effect.gen(function* () {
@@ -433,7 +433,7 @@ var layer = (options) => Layer.effect(Service, Effect.gen(function* () {
         return;
       }
       yield* startServer(name, entry);
-    }).pipe(Effect.ensuring(Effect.sync(() => Deferred.doneUnsafe(entry.startup, Exit.void))));
+    }).pipe(Effect.ensuring(entry.startup.open));
   });
   const removeServer = Effect.fnUntraced(function* (name) {
     const entry = entries.get(name);
@@ -452,7 +452,7 @@ var layer = (options) => Layer.effect(Service, Effect.gen(function* () {
         entries.set(name, {
           config: server,
           status: { status: "pending" },
-          startup: Deferred.makeUnsafe()
+          startup: Latch.makeUnsafe()
         });
       }
       yield* Effect.forEach(entries, ([name, entry]) => register(name, entry), { discard: true });
@@ -460,7 +460,7 @@ var layer = (options) => Layer.effect(Service, Effect.gen(function* () {
       for (const [name, entry] of entries) {
         if (entry.config.disabled) {
           entry.status = { status: "disabled" };
-          Deferred.doneUnsafe(entry.startup, Exit.void);
+          entry.startup.openUnsafe();
           yield* bus.publish(McpEvent.StatusChanged, { server: name }).pipe(Effect.ignore);
           continue;
         }
@@ -523,7 +523,7 @@ var layer = (options) => Layer.effect(Service, Effect.gen(function* () {
     }),
     finalize: reconcile
   });
-  const whenAllReady = Effect.suspend(() => Effect.forEach(Array.from(entries.values()), (entry) => Deferred.await(entry.startup), {
+  const whenAllReady = Effect.suspend(() => Effect.forEach(Array.from(entries.values()), (entry) => entry.startup.await, {
     concurrency: "unbounded",
     discard: true
   }));
@@ -567,7 +567,7 @@ var layer = (options) => Layer.effect(Service, Effect.gen(function* () {
     }),
     callTool: Effect.fn("MCP.callTool")(function* (input) {
       const target = yield* requireServer(input.server);
-      yield* Deferred.await(target.entry.startup);
+      yield* target.entry.startup.await;
       if (!target.entry.client)
         return yield* new ToolCallError({
           server: target.name,
@@ -597,7 +597,7 @@ var layer = (options) => Layer.effect(Service, Effect.gen(function* () {
     }),
     prompt: Effect.fn("MCP.prompt")(function* (input) {
       const target = yield* requireServer(input.server);
-      yield* Deferred.await(target.entry.startup);
+      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)));
@@ -629,7 +629,7 @@ var layer = (options) => Layer.effect(Service, Effect.gen(function* () {
     }),
     readResource: Effect.fn("MCP.readResource")(function* (input) {
       const target = yield* requireServer(input.server);
-      yield* Deferred.await(target.entry.startup);
+      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)));

package/dist/chunks/{workspace-vpv9n6y4.js → workspace-v4xjagz7.js}

@@ -1,20 +1,20 @@
 import {
   exports_tool
-} from "./workspace-yz0wm9s3.js";
+} from "./workspace-e9yfe4g9.js";
 import {
   definition,
   execute,
   normalizeContent
-} from "./workspace-d6s8p2vk.js";
+} from "./workspace-aqg9wnx6.js";
+import {
+  exports_wildcard
+} from "./workspace-y67x6rf6.js";
 import {
   exports_image
-} from "./workspace-bk2c2kb7.js";
+} from "./workspace-b7wyyjhh.js";
 import {
   exports_hooks
 } from "./workspace-v2wshkax.js";
-import {
-  exports_wildcard
-} from "./workspace-y67x6rf6.js";
 import {
   __export
 } from "./workspace-rvfvac9x.js";

package/dist/chunks/{workspace-y1gjwkyb.js → workspace-vfekzexe.js}

@@ -1,6 +1,6 @@
 import {
   exports_config
-} from "./workspace-mh4qv5pj.js";
+} from "./workspace-ghg83jvf.js";
 import {
   exports_model
 } from "./workspace-wh0zhxcg.js";

package/dist/chunks/{workspace-4d67s52a.js → workspace-vgjwjeca.js}

@@ -1,6 +1,6 @@
 import {
   exports_bus
-} from "./workspace-6v05w4qg.js";
+} from "./workspace-njrg7yr8.js";
 import {
   __export
 } from "./workspace-rvfvac9x.js";

package/dist/chunks/{workspace-bfkpqtqx.js → workspace-vptxxpwc.js}

@@ -1,12 +1,12 @@
 import {
   exports_mcp as exports_mcp2
-} from "./workspace-3zpfm7cp.js";
+} from "./workspace-29g7zza5.js";
 import {
   exports_mcp
-} from "./workspace-zjcjb8a1.js";
+} from "./workspace-tsj2cygv.js";
 import {
   exports_permission
-} from "./workspace-kj1ajs9d.js";
+} from "./workspace-dfspp6r4.js";
 import {
   exports_instructions
 } from "./workspace-ec8vrfw5.js";

package/dist/chunks/{workspace-vjshw6kw.js → workspace-vq4xdzwy.js}

@@ -1,12 +1,12 @@
 import {
   exports_config
-} from "./workspace-mh4qv5pj.js";
+} from "./workspace-ghg83jvf.js";
 import {
   exports_watcher
 } from "./workspace-y980s7ka.js";
 import {
   exports_location
-} from "./workspace-d6d2y6z3.js";
+} from "./workspace-kwbvxbjz.js";
 import {
   __export
 } from "./workspace-rvfvac9x.js";

package/dist/chunks/{workspace-gvgy736b.js → workspace-vxayaa8z.js}

@@ -1,6 +1,6 @@
 import {
   exports_config
-} from "./workspace-mh4qv5pj.js";
+} from "./workspace-ghg83jvf.js";
 import {
   exports_select
 } from "./workspace-19e1vard.js";

package/dist/chunks/{workspace-67w1s9dj.js → workspace-vzsgyrq1.js}

@@ -3,7 +3,7 @@ import {
 } from "./workspace-mf0hyk7z.js";
 import {
   exports_database
-} from "./workspace-mvg5hf3w.js";
+} from "./workspace-s7pbx90j.js";
 import {
   __export
 } from "./workspace-rvfvac9x.js";

package/dist/chunks/{workspace-azfr4z12.js → workspace-wwkgmt0p.js}

@@ -1,9 +1,9 @@
-import {
-  exports_history
-} from "./workspace-fs1q3vja.js";
 import {
   fromRow
-} from "./workspace-mjat1551.js";
+} from "./workspace-5qqhchyw.js";
+import {
+  exports_history
+} from "./workspace-ra765m8n.js";
 import {
   SessionMessageTable,
   SessionTable
@@ -13,7 +13,7 @@ import {
 } from "./workspace-25pxtba7.js";
 import {
   exports_database
-} from "./workspace-mvg5hf3w.js";
+} from "./workspace-s7pbx90j.js";
 import {
   __export
 } from "./workspace-rvfvac9x.js";

package/dist/chunks/{workspace-xf8gwdhy.js → workspace-x6bsrrkz.js}

@@ -1,21 +1,21 @@
 import {
   exports_location_mutation
-} from "./workspace-f1mxyn57.js";
+} from "./workspace-thrqaz0e.js";
+import {
+  exports_permission
+} from "./workspace-dfspp6r4.js";
 import {
   exports_filesystem
-} from "./workspace-dy7dh4rb.js";
+} from "./workspace-bd453e9f.js";
 import {
   exports_ripgrep
-} from "./workspace-y3mwbphg.js";
+} from "./workspace-hwx2w7zf.js";
 import {
   exports_environment1 as exports_environment
-} from "./workspace-c6137mdz.js";
-import {
-  exports_permission
-} from "./workspace-kj1ajs9d.js";
+} from "./workspace-y44ckmk4.js";
 import {
   exports_location
-} from "./workspace-d6d2y6z3.js";
+} from "./workspace-kwbvxbjz.js";
 import {
   RelativePath
 } from "./workspace-j07kk359.js";

package/dist/chunks/{workspace-yw66mecz.js → workspace-x7z5vctn.js}

@@ -3,10 +3,10 @@ import {
 } from "./workspace-nesb2rcz.js";
 import {
   exports_project
-} from "./workspace-90gmgs4x.js";
+} from "./workspace-37d718jr.js";
 import {
   exports_database
-} from "./workspace-mvg5hf3w.js";
+} from "./workspace-s7pbx90j.js";
 import {
   __export
 } from "./workspace-rvfvac9x.js";

package/dist/chunks/{workspace-pxa9b4s7.js → workspace-xaf8phze.js}

@@ -1,27 +1,27 @@
 import {
   exports_parse
 } from "./workspace-fjtxtbhx.js";
+import {
+  exports_config
+} from "./workspace-ghg83jvf.js";
+import {
+  exports_tool_output
+} from "./workspace-81wsrtjr.js";
 import {
   exports_runtime
-} from "./workspace-r6fg1hkq.js";
+} from "./workspace-0bxpjz5v.js";
 import {
   exports_location_mutation
-} from "./workspace-f1mxyn57.js";
-import {
-  exports_config
-} from "./workspace-mh4qv5pj.js";
+} from "./workspace-thrqaz0e.js";
 import {
   exports_shell
-} from "./workspace-6e6yzfbs.js";
-import {
-  exports_environment1 as exports_environment
-} from "./workspace-c6137mdz.js";
-import {
-  exports_tool_output
-} from "./workspace-81wsrtjr.js";
+} from "./workspace-nxs45nrs.js";
 import {
   exports_permission
-} from "./workspace-kj1ajs9d.js";
+} from "./workspace-dfspp6r4.js";
+import {
+  exports_environment1 as exports_environment
+} from "./workspace-y44ckmk4.js";
 import {
   NonNegativeInt
 } from "./workspace-j07kk359.js";
@@ -79,12 +79,29 @@ var Output = Schema.Struct({
   output: Schema.String,
   status: Schema.optionalKey(Schema.Literals(["completed", "running"]))
 });
-var modelOutput = (output) => {
-  if (output.status === "running")
-    return BACKGROUND_INSTRUCTION;
-  if (output.timeout)
-    return "Command timed out before completion.";
-  return `Command exited with code ${output.exit}.`;
+var resultMessages = (output) => {
+  const notice = (() => {
+    if (output.status === "running")
+      return BACKGROUND_INSTRUCTION;
+    if (output.timeout)
+      return "Command timed out before completion.";
+    if (output.exit !== undefined)
+      return `Command exited with code ${output.exit}.`;
+  })();
+  return [output.output, ...notice ? [notice] : []];
+};
+var toolResult = (output) => {
+  return {
+    output,
+    content: resultMessages(output).map((text) => ({ type: "text", text })),
+    metadata: {
+      status: output.status,
+      truncated: output.truncated,
+      ...output.exit !== undefined ? { exit: output.exit } : {},
+      ...output.shellID !== undefined ? { shellID: output.shellID } : {},
+      ...output.timeout !== undefined ? { timeout: output.timeout } : {}
+    }
+  };
 };
 var Plugin = {
   id: "opencode.tool.shell",
@@ -96,21 +113,37 @@ var Plugin = {
     const shell = yield* exports_shell.Service;
     const permission = yield* exports_permission.Service;
     const config = yield* exports_config.Service;
-    const notifyWhenDone = Effect.fn("ShellTool.notifyWhenDone")(function* (sessionID, id, command) {
-      yield* runtime.job.wait({ id }).pipe(Effect.flatMap((result) => {
-        const state = result.info?.status === "completed" ? "completed" : result.info?.status === "error" ? "error" : result.info?.status === "cancelled" ? "cancelled" : undefined;
+    const notifyWhenDone = Effect.fn("ShellTool.notifyWhenDone")(function* (sessionID, id, shellID, command, settled) {
+      yield* runtime.job.wait({ id }).pipe(Effect.flatMap((result) => Effect.gen(function* () {
+        const info = result.info;
+        if (!info)
+          return;
+        const state = info.status === "completed" ? "completed" : info.status === "error" ? "error" : info.status === "cancelled" ? "cancelled" : undefined;
         if (state === undefined)
-          return Effect.void;
-        const text = state === "completed" ? result.info.output ?? "" : state === "error" ? result.info.error ?? "Command failed" : "Command cancelled";
-        return runtime.session.synthetic({
+          return;
+        const output = state === "completed" ? yield* Deferred.await(settled) : undefined;
+        const text = output ? resultMessages(output).join(`
+
+`) : state === "error" ? info.error ?? "Command failed" : "Command cancelled";
+        yield* runtime.session.synthetic({
           sessionID,
           text: `<shell id="${id}" state="${state}" command="${command}">
 ${text}
 </shell>`,
           description: command,
-          metadata: { source: "shell", jobID: id, state }
+          metadata: {
+            source: "shell",
+            jobID: id,
+            shellID,
+            state,
+            ...output ? {
+              truncated: output.truncated,
+              ...output.exit !== undefined ? { exit: output.exit } : {},
+              ...output.timeout !== undefined ? { timeout: output.timeout } : {}
+            } : {}
+          }
         });
-      }), Effect.forkIn(scope, { startImmediately: true }));
+      })), Effect.forkIn(scope, { startImmediately: true }));
     });
     yield* ctx.tool.transform((draft) => draft.add({
       name,
@@ -232,7 +265,7 @@ Command exceeded timeout of ${finalTimeout} ms. Retry with a larger timeout if t
         });
         if (input.background === true) {
           yield* runtime.job.background(job.id);
-          yield* notifyWhenDone(context.sessionID, context.id, info.command);
+          yield* notifyWhenDone(context.sessionID, context.id, info.id, info.command, settled);
           return {
             output: BACKGROUND_STARTED,
             shellID: info.id,
@@ -243,7 +276,7 @@ Command exceeded timeout of ${finalTimeout} ms. Retry with a larger timeout if t
         const result = yield* runtime.job.block({ id: job.id, sessionID: context.sessionID }).pipe(Effect.onInterrupt(() => runtime.job.cancel(job.id).pipe(Effect.ignore)));
         if (result?.type === "backgrounded") {
           yield* shell.timeout(info.id, 0);
-          yield* notifyWhenDone(context.sessionID, context.id, info.command);
+          yield* notifyWhenDone(context.sessionID, context.id, info.id, info.command, settled);
           return {
             output: BACKGROUND_STARTED,
             shellID: info.id,
@@ -256,23 +289,7 @@ Command exceeded timeout of ${finalTimeout} ms. Retry with a larger timeout if t
         if (result?.info.status === "cancelled")
           return yield* Effect.fail(new Error("Command cancelled"));
         return yield* Deferred.await(settled);
-      }).pipe(Effect.map((output) => {
-        const content = [{ type: "text", text: output.output }];
-        const model = modelOutput(output);
-        if (model)
-          content.push({ type: "text", text: model });
-        return {
-          output,
-          content,
-          metadata: {
-            status: output.status,
-            truncated: output.truncated,
-            ..."exit" in output && output.exit !== undefined ? { exit: output.exit } : {},
-            ..."shellID" in output && output.shellID !== undefined ? { shellID: output.shellID } : {},
-            ..."timeout" in output && output.timeout !== undefined ? { timeout: output.timeout } : {}
-          }
-        };
-      }), Effect.mapError((error) => new ToolFailure({ message: `Unable to execute command: ${input.command}`, error })))
+      }).pipe(Effect.map(toolResult), Effect.mapError((error) => new ToolFailure({ message: `Unable to execute command: ${input.command}`, error })))
     })).pipe(Effect.orDie);
     yield* ctx.session.hook("context", (event) => Effect.gen(function* () {
       const tool = event.tools[name];