@opencode/core 2.0.15 → 2.0.17

package/dist/chunks/{location-r99pq75w.js → schema-9cjj4wa1.js}

@@ -3,34 +3,34 @@ import {
   WrongKind2,
   Failed2,
   typeFollowing2
-} from "./location-2a5m3afh.js";
+} from "./schema-2a5m3afh.js";
 import {
   execDefaults2
-} from "./location-1dazxqgg.js";
+} from "./schema-1dazxqgg.js";
 import {
   makeLocalDriver2
-} from "./location-b6gygkdw.js";
+} from "./schema-b6gygkdw.js";
 import {
   makeMemoryDriver2
-} from "./location-aaet6srn.js";
+} from "./schema-aaet6srn.js";
 import {
-  Service78,
-  node82
-} from "./location-8s04dv6n.js";
+  Service79,
+  node83
+} from "./schema-wxnc2egh.js";
 import {
-  Service58,
-  node60
-} from "./location-8ffpk8ek.js";
+  Service61,
+  node63
+} from "./schema-habj5avf.js";
 import {
   __export
-} from "./location-9rqn6x4v.js";
+} from "./schema-9rqn6x4v.js";
 
 // src/environment/environment.ts
 var exports_environment2 = {};
 __export(exports_environment2, {
   EnvironmentService: () => exports_environment2,
-  Service: () => Service57,
-  node: () => node59
+  Service: () => Service60,
+  node: () => node62
 });
 import { CrossSpawnSpawner } from "@opencode/util/cross-spawn-spawner";
 import { makeLocationNode } from "@opencode/util/effect/app-node";
@@ -43,13 +43,13 @@ __export(exports_environment3, {
   Environment: () => exports_environment3,
   Failed: () => Failed2,
   NotFound: () => NotFound2,
-  Service: () => Service57,
+  Service: () => Service60,
   WrongKind: () => WrongKind2,
   execDefaults: () => execDefaults2,
   makeFiles: () => makeFiles2,
   makeLocalDriver: () => makeLocalDriver2,
   makeMemoryDriver: () => makeMemoryDriver2,
-  node: () => node59,
+  node: () => node62,
   typeFollowing: () => typeFollowing2
 });
 var makeFiles2 = (driver) => ({
@@ -58,19 +58,19 @@ var makeFiles2 = (driver) => ({
 });
 
 // src/environment/environment.ts
-class Service57 extends Context.Service()("@opencode/Environment") {
+class Service60 extends Context.Service()("@opencode/Environment") {
 }
-var layer = Layer.effect(Service57, Effect.gen(function* () {
+var layer = Layer.effect(Service60, Effect.gen(function* () {
   const spawner = yield* ChildProcessSpawner;
-  const location = yield* Service78;
-  const workspace = yield* Service58;
+  const location = yield* Service79;
+  const workspace = yield* Service61;
   const driver = location.workspaceID ? yield* workspace.connect(location.workspaceID).pipe(Effect.mapError((cause) => new Error(`Failed to bind Environment to workspace ${location.workspaceID}`, { cause })), Effect.orDie) : makeLocalDriver2(spawner);
-  return Service57.of({ files: makeFiles2(driver), spawner: driver.spawner });
+  return Service60.of({ files: makeFiles2(driver), spawner: driver.spawner });
 }));
-var node59 = makeLocationNode({
-  service: Service57,
+var node62 = makeLocationNode({
+  service: Service60,
   layer,
-  deps: [CrossSpawnSpawner.node, node82, node60]
+  deps: [CrossSpawnSpawner.node, node83, node63]
 });
 
-export { Service57, node59, exports_environment2, makeFiles2, exports_environment3 };
+export { Service60, node62, exports_environment2, makeFiles2, exports_environment3 };

package/dist/chunks/{location-e6asg1wm.js → schema-9f1sykhs.js}

@@ -1,57 +1,57 @@
 import {
-  Service81,
-  node85
-} from "./location-2ys44scz.js";
+  Service82,
+  node86
+} from "./schema-cmsm0fmq.js";
 import {
-  Service78,
-  node82
-} from "./location-8s04dv6n.js";
+  Service79,
+  node83
+} from "./schema-wxnc2egh.js";
 import {
-  Service57,
-  node59
-} from "./location-r99pq75w.js";
+  Service60,
+  node62
+} from "./schema-9cjj4wa1.js";
 import {
   cleanup3
-} from "./location-gd4qta3r.js";
+} from "./schema-gd4qta3r.js";
 import {
-  Service52,
+  Service50,
   args2,
-  node54
-} from "./location-np8489tv.js";
+  node52
+} from "./schema-5atn9wfq.js";
 import {
-  Service67,
+  Service68,
   node71
-} from "./location-g1sxm558.js";
+} from "./schema-4a0nv7mx.js";
 import {
-  Service43,
-  node46
-} from "./location-yvvvp4gn.js";
+  Service31,
+  node34
+} from "./schema-tk9ew89t.js";
 import {
   SessionSchema2
-} from "./location-256nx13v.js";
+} from "./schema-k6yq57aq.js";
 import {
   latest2,
-  Service70,
-  node74
-} from "./location-c6rpq5f1.js";
+  Service47,
+  node49
+} from "./schema-d8hz1vnp.js";
 import {
   MAX_LINES2,
   MAX_BYTES2
-} from "./location-h6awxmcx.js";
+} from "./schema-9vhpts05.js";
 import {
   __export
-} from "./location-9rqn6x4v.js";
+} from "./schema-9rqn6x4v.js";
 
 // src/shell.ts
 var exports_shell4 = {};
 __export(exports_shell4, {
   DIRECTORY: () => DIRECTORY2,
-  NotFoundError: () => NotFoundError6,
+  NotFoundError: () => NotFoundError4,
   RETENTION: () => RETENTION2,
-  Service: () => Service42,
+  Service: () => Service30,
   Shell: () => exports_shell4,
   cleanup: () => cleanup2,
-  node: () => node45
+  node: () => node33
 });
 import path from "path";
 import { Context, Deferred, Duration, Effect, Fiber, Latch, Layer, Schema, Schedule, Stream } from "effect";
@@ -59,10 +59,11 @@ import { ChildProcess } from "effect/unstable/process";
 import { produce } from "immer";
 import { Shell } from "@opencode/schema/shell";
 import { AppProcess } from "@opencode/util/process";
+import { CrossSpawnSpawner } from "@opencode/util/cross-spawn-spawner";
 import { makeGlobalNode, makeLocationNode } from "@opencode/util/effect/app-node";
 import { FSUtil } from "@opencode/util/fs-util";
 import { Global } from "@opencode/util/global";
-class NotFoundError6 extends Schema.TaggedError()("Shell.NotFoundError", {
+class NotFoundError4 extends Schema.TaggedError()("Shell.NotFoundError", {
   id: Shell.ID
 }) {
 }
@@ -70,7 +71,7 @@ var EXITED_LIMIT = 25;
 var RETENTION2 = Duration.days(7);
 var DIRECTORY2 = "shell";
 
-class Service42 extends Context.Service()("@opencode/Shell") {
+class Service30 extends Context.Service()("@opencode/Shell") {
 }
 var cleanup2 = Effect.fn("Shell.cleanup")(function* () {
   const fs = yield* FSUtil.Service;
@@ -86,15 +87,15 @@ var cleanupNode = makeGlobalNode({
   layer: cleanupLayer,
   deps: [FSUtil.node, Global.node]
 });
-var layer = () => Layer.effect(Service42, Effect.gen(function* () {
-  const bus = yield* Service81;
-  const location = yield* Service78;
+var layer = () => Layer.effect(Service30, Effect.gen(function* () {
+  const bus = yield* Service82;
+  const location = yield* Service79;
   const global = yield* Global.Service;
-  const shell = yield* Service52;
-  const environment = yield* Service57;
-  const hooks = yield* Service67;
-  const environments = yield* Service43;
-  const config = yield* Service70;
+  const shell = yield* Service50;
+  const environment = yield* Service60;
+  const hooks = yield* Service68;
+  const environments = yield* Service31;
+  const config = yield* Service47;
   const context = yield* Effect.context();
   const runFork = Effect.runForkWith(context);
   const commands = new Map;
@@ -115,7 +116,7 @@ var layer = () => Layer.effect(Service42, Effect.gen(function* () {
   const require2 = Effect.fnUntraced(function* (id) {
     const command = commands.get(id);
     if (!command)
-      return yield* new NotFoundError6({ id });
+      return yield* new NotFoundError4({ id });
     return command;
   });
   const removeCommand = Effect.fnUntraced(function* (id) {
@@ -128,7 +129,7 @@ var layer = () => Layer.effect(Service42, Effect.gen(function* () {
     commands.delete(id);
     if (command.timeoutFiber)
       yield* Fiber.interrupt(command.timeoutFiber);
-    yield* Deferred.fail(command.done, new NotFoundError6({ id }));
+    yield* Deferred.fail(command.done, new NotFoundError4({ id }));
     yield* Effect.promise(() => unlink(command.file).catch(() => {}));
     yield* bus.publish(Shell.Event.Deleted, { id });
   });
@@ -195,10 +196,13 @@ var layer = () => Layer.effect(Service42, Effect.gen(function* () {
       const truncated = latest.size > maxBytes || lines.length > maxLines;
       const text = lines.length > maxLines ? lines.slice(-maxLines).join(`
 `) : page.output;
-      const notice = truncated ? `${text ? `
+      const total = (yield* require2(info.id)).newlines + (page.output.endsWith(`
+`) ? 0 : 1);
+      const shown = Math.min(lines.length, maxLines);
+      const notice = truncated ? `
 
-` : ""}[full output saved to ${info.file}]` : "";
-      return { output: `${text}${notice}`, truncated };
+[showing lines ${total - shown + 1}-${total} of ${total}; full output saved to ${info.file}]` : "";
+      return { output: `${text || "(no output)"}${notice}`, truncated };
     }).pipe(Effect.catchTag("Shell.NotFoundError", () => Effect.succeed(undefined)));
     return { info, capture };
   });
@@ -247,6 +251,7 @@ var layer = () => Layer.effect(Service42, Effect.gen(function* () {
         }),
         file,
         size: 0,
+        newlines: 0,
         done: Deferred.makeUnsafe()
       };
       commands.set(id, command);
@@ -255,6 +260,8 @@ var layer = () => Layer.effect(Service42, Effect.gen(function* () {
       const pump = handle.all.pipe(Stream.runForEach((chunk) => Effect.sync(() => {
         stream.write(chunk);
         command.size += chunk.length;
+        for (let index = chunk.indexOf(10);index !== -1; index = chunk.indexOf(10, index + 1))
+          command.newlines++;
       })));
       runFork(Effect.gen(function* () {
         yield* pump.pipe(Effect.catch(() => Effect.void));
@@ -267,13 +274,15 @@ var layer = () => Layer.effect(Service42, Effect.gen(function* () {
         stream.once("open", () => resolve());
         stream.once("error", () => resolve());
       }));
-      const finish = (status, exit, beforeWait = Effect.void) => Effect.gen(function* () {
+      const finish = (status, exit, beforeWait = Effect.void, signal) => Effect.gen(function* () {
         if (command.info.status !== "running")
           return;
         command.info = produce(command.info, (draft) => {
           draft.status = status;
           if (exit !== undefined)
             draft.exit = exit;
+          if (signal !== undefined)
+            draft.signal = signal;
           draft.time.completed = Date.now();
         });
         yield* beforeWait;
@@ -306,7 +315,7 @@ var layer = () => Layer.effect(Service42, Effect.gen(function* () {
         command.timeoutFiber = runFork(Effect.sleep(Duration.millis(duration)).pipe(Effect.flatMap(() => finish("timeout", undefined, handle.kill({ forceKillAfter: Duration.seconds(3) }).pipe(Effect.catch(() => Effect.void))))));
       });
       yield* command.timeout(invocation.timeout);
-      runFork(handle.exitCode.pipe(Effect.flatMap((code) => finish("exited", code)), Effect.catch(() => finish("exited"))));
+      runFork(handle.exitCode.pipe(Effect.flatMap((code) => finish("exited", code)), Effect.catch((error) => finish("exited", undefined, Effect.void, error.cause instanceof CrossSpawnSpawner.KilledBySignal ? error.cause.signal : undefined))));
       yield* bus.publish(Shell.Event.Created, { info });
       yield* Deferred.succeed(ready, command);
       yield* Deferred.await(command.done).pipe(Effect.catch(() => Effect.void));
@@ -314,22 +323,22 @@ var layer = () => Layer.effect(Service42, Effect.gen(function* () {
     const command = yield* Deferred.await(ready);
     return command.info;
   });
-  return Service42.of({ create, list, get, wait, result, timeout, output, remove });
+  return Service30.of({ create, list, get, wait, result, timeout, output, remove });
 }));
-var node45 = makeLocationNode({
-  service: Service42,
+var node33 = makeLocationNode({
+  service: Service30,
   layer: layer(),
   deps: [
-    node85,
-    node82,
+    node86,
+    node83,
     Global.node,
-    node54,
-    node59,
+    node52,
+    node62,
     node71,
-    node46,
-    node74,
+    node34,
+    node49,
     cleanupNode
   ]
 });
 
-export { NotFoundError6, RETENTION2, DIRECTORY2, Service42, cleanup2, node45, exports_shell4 };
+export { NotFoundError4, RETENTION2, DIRECTORY2, Service30, cleanup2, node33, exports_shell4 };

package/dist/chunks/{location-512dnrra.js → schema-9m6r901m.js}

@@ -1,17 +1,17 @@
 import {
   useragent2
-} from "./location-apd0xxcy.js";
+} from "./schema-21fjxxq6.js";
 import {
   call2
-} from "./location-33w4ejhs.js";
+} from "./schema-mfqp6xfm.js";
 import {
   __export
-} from "./location-9rqn6x4v.js";
+} from "./schema-9rqn6x4v.js";
 
 // src/plugin/websearch/tinyfish.ts
 var exports_tinyfish = {};
 __export(exports_tinyfish, {
-  Plugin: () => Plugin18,
+  Plugin: () => Plugin21,
   WebSearchTinyFish: () => exports_tinyfish,
   endpoint: () => endpoint3
 });
@@ -33,7 +33,7 @@ var SearchResponse = Schema.fromJsonString(Schema.Struct({
   }))
 }));
 var decodeSearchResponse = Schema.decodeUnknownOption(SearchResponse);
-var Plugin18 = define({
+var Plugin21 = define({
   id: "opencode.websearch.tinyfish",
   effect: Effect.fn("WebSearchTinyFish.Plugin")(function* (ctx) {
     const http = yield* HttpClient.HttpClient;
@@ -73,4 +73,4 @@ var Plugin18 = define({
   })
 });
 
-export { endpoint3, Plugin18, exports_tinyfish };
+export { endpoint3, Plugin21, exports_tinyfish };

package/dist/chunks/{location-saawvakp.js → schema-9ncpcp0p.js}

@@ -1,31 +1,31 @@
 import {
-  Service70
-} from "./location-c6rpq5f1.js";
+  Service47
+} from "./schema-d8hz1vnp.js";
 import {
-  Service34
-} from "./location-xq3yw8dy.js";
+  Service27
+} from "./schema-vmnfmpbz.js";
 import {
   __export
-} from "./location-9rqn6x4v.js";
+} from "./schema-9rqn6x4v.js";
 
 // src/config/plugin/mcp.ts
-var exports_mcp2 = {};
-__export(exports_mcp2, {
-  ConfigMcpPlugin: () => exports_mcp2,
-  Plugin: () => Plugin39,
+var exports_mcp = {};
+__export(exports_mcp, {
+  ConfigMcpPlugin: () => exports_mcp,
+  Plugin: () => Plugin17,
   register: () => register2
 });
 import { define } from "@opencode/plugin/effect/plugin";
 import { Effect, Stream } from "effect";
-var Plugin39 = define({
+var Plugin17 = define({
   id: "opencode.config.mcp",
   effect: Effect.fn(function* (ctx) {
     yield* register2(ctx.event.subscribe());
   })
 });
 var register2 = Effect.fn("ConfigMCPPlugin.register")(function* (events) {
-  const config = yield* Service70;
-  const mcp = yield* Service34;
+  const config = yield* Service47;
+  const mcp = yield* Service27;
   const loaded = { entries: [] };
   yield* events.pipe(Stream.filter((event) => event.type === "config.updated"), Stream.runForEach(() => config.entries().pipe(Effect.tap((entries) => Effect.sync(() => loaded.entries = entries)), Effect.andThen(mcp.reload()), Effect.catchCause((cause) => Effect.logError("failed to reload MCP config", { cause })))), Effect.ignore, Effect.forkScoped({ startImmediately: true }));
   loaded.entries = yield* config.entries();
@@ -46,4 +46,4 @@ var register2 = Effect.fn("ConfigMCPPlugin.register")(function* (events) {
   });
 });
 
-export { Plugin39, register2, exports_mcp2 };
+export { Plugin17, register2, exports_mcp };

package/dist/chunks/{location-qnqm58w1.js → schema-9tkzcje5.js}

@@ -1,23 +1,23 @@
 import {
-  Service63,
+  Service64,
   node67,
   canonical3
-} from "./location-npk9ncrr.js";
+} from "./schema-7mm032py.js";
 import {
-  Service49,
-  node51
-} from "./location-c8bydgjz.js";
+  Service41,
+  node43
+} from "./schema-vqfzq50h.js";
 import {
-  Service61
-} from "./location-0tmnpbjy.js";
+  Service62
+} from "./schema-wzhdnf6z.js";
 import {
   layer2
-} from "./location-ce7bf4ce.js";
+} from "./schema-5dggn2va.js";
 
 // src/location-services.ts
 import { Context, Duration, Effect, Exit, Layer, LayerMap, MutableHashMap, Option } from "effect";
 function buildLocationServiceMap2(replacements = []) {
-  return Layer.effect(Service63, Effect.gen(function* () {
+  return Layer.effect(Service64, Effect.gen(function* () {
     const owner = yield* Effect.scope;
     const builds = MutableHashMap.empty();
     const inner = yield* LayerMap.make((ref) => {
@@ -27,7 +27,7 @@ function buildLocationServiceMap2(replacements = []) {
         const finish = Effect.suspend(() => {
           if (Exit.isSuccess(exit)) {
             return Effect.gen(function* () {
-              const lifecycle = Context.get(exit.value, Service61);
+              const lifecycle = Context.get(exit.value, Service62);
               if (Option.getOrUndefined(MutableHashMap.get(builds, ref)) !== build)
                 return yield* lifecycle.shutdown;
               build.close = lifecycle.shutdown;
@@ -54,11 +54,11 @@ function buildLocationServiceMap2(replacements = []) {
       }).pipe(Effect.uninterruptible)
     };
     const bindings = [
-      node51.replace(Layer.succeed(Service49, {
+      node43.replace(Layer.succeed(Service41, {
         provide: (session) => Effect.provide(map.get(session.location))
       })),
       ...replacements,
-      node67.replace(Layer.succeed(Service63, map))
+      node67.replace(Layer.succeed(Service64, map))
     ];
     return map;
   }));

package/dist/chunks/{location-h6awxmcx.js → schema-9vhpts05.js}

@@ -1,15 +1,15 @@
 import {
   cleanup3
-} from "./location-gd4qta3r.js";
+} from "./schema-gd4qta3r.js";
 import {
   ascending2
-} from "./location-tvtrv512.js";
+} from "./schema-tvtrv512.js";
 import {
   create3
-} from "./location-rdw6cm16.js";
+} from "./schema-rdw6cm16.js";
 import {
   __export
-} from "./location-9rqn6x4v.js";
+} from "./schema-9rqn6x4v.js";
 
 // src/tool-output.ts
 var exports_tool_output2 = {};
@@ -18,9 +18,9 @@ __export(exports_tool_output2, {
   MAX_BYTES: () => MAX_BYTES2,
   MAX_LINES: () => MAX_LINES2,
   RETENTION: () => RETENTION3,
-  Service: () => Service44,
+  Service: () => Service36,
   ToolOutput: () => exports_tool_output2,
-  node: () => node47
+  node: () => node39
 });
 import path from "path";
 import { Context, Duration, Effect, Layer, Schedule } from "effect";
@@ -32,13 +32,13 @@ var MAX_BYTES2 = 50 * 1024;
 var RETENTION3 = Duration.days(7);
 var DIRECTORY3 = "tool-output";
 
-class Service44 extends Context.Service()("@opencode/ToolOutput") {
+class Service36 extends Context.Service()("@opencode/ToolOutput") {
 }
 var cleanup = Effect.fn("ToolOutput.cleanup")(function* (fs, directory) {
   const entries = yield* fs.readDirectory(directory).pipe(Effect.map((entries) => entries.filter((entry) => /^tool_[0-9a-f]{12}/.test(entry))), Effect.orElseSucceed(() => []));
   yield* cleanup3(fs, entries.map((entry) => path.join(directory, entry)), RETENTION3);
 });
-var layer = Layer.effect(Service44, Effect.gen(function* () {
+var layer = Layer.effect(Service36, Effect.gen(function* () {
   const fs = yield* FSUtil.Service;
   const global = yield* Global.Service;
   const directory = path.join(global.data, DIRECTORY3);
@@ -71,24 +71,18 @@ var layer = Layer.effect(Service44, Effect.gen(function* () {
       return { ...result, metadata: { ...result.metadata, truncated: false } };
     const kept = [];
     let bytes = 0;
-    let hitBytes = false;
     for (const line of lines.slice(0, limits.maxLines)) {
       const size = Buffer.byteLength(line, "utf-8") + (kept.length > 0 ? 1 : 0);
-      if (bytes + size > limits.maxBytes) {
-        hitBytes = true;
+      if (bytes + size > limits.maxBytes)
         break;
-      }
       kept.push(line);
       bytes += size;
     }
-    if (!hitBytes && kept.length === lines.length && totalBytes > bytes)
-      hitBytes = true;
-    const removed = hitBytes ? totalBytes - bytes : lines.length - kept.length;
-    const unit = hitBytes ? removed === 1 ? "byte" : "bytes" : removed === 1 ? "line" : "lines";
     const file = path.join(directory, ascending2("tool"));
     yield* fs.ensureDir(directory).pipe(Effect.orDie);
     yield* fs.writeFileString(file, text).pipe(Effect.orDie);
-    const marker = `... ${removed} ${unit} truncated; full content saved to ${file} ...`;
+    const shown = kept.length > 0 ? `lines 1-${kept.length}` : "0 lines";
+    const marker = `[showing ${shown} of ${lines.length}; full output saved to ${file}]`;
     const bounded = [];
     let remaining = kept.join(`
 `).length;
@@ -122,7 +116,7 @@ var layer = Layer.effect(Service44, Effect.gen(function* () {
       metadata: { ...result.metadata, truncated: true, outputPath: file }
     };
   });
-  return Service44.of({
+  return Service36.of({
     transform: state.transform,
     reload: state.reload,
     truncate,
@@ -139,10 +133,10 @@ var cleanupNode = makeGlobalNode({
   layer: cleanupLayer,
   deps: [FSUtil.node, Global.node]
 });
-var node47 = makeLocationNode({
-  service: Service44,
+var node39 = makeLocationNode({
+  service: Service36,
   layer,
   deps: [FSUtil.node, Global.node, cleanupNode]
 });
 
-export { MAX_LINES2, MAX_BYTES2, RETENTION3, DIRECTORY3, Service44, node47, exports_tool_output2 };
+export { MAX_LINES2, MAX_BYTES2, RETENTION3, DIRECTORY3, Service36, node39, exports_tool_output2 };