@opencode-ai/core 0.0.0-beta-18387 → 0.0.0-beta-18414

package/dist/chunks/{project-ym31qssr.js → tool-3jshngxf.js}

@@ -1,27 +1,27 @@
+import {
+  makeLocalDriver
+} from "./tool-zxe9jjhn.js";
 import {
   makeMemoryDriver
-} from "./project-yf0knd5z.js";
+} from "./tool-yf0knd5z.js";
 import {
   execDefaults
-} from "./project-3g8vftxb.js";
-import {
-  makeLocalDriver
-} from "./project-zxe9jjhn.js";
+} from "./tool-3g8vftxb.js";
 import {
   Failed,
   NotFound,
   WrongKind,
   typeFollowing
-} from "./project-xczfw7dq.js";
+} from "./tool-xczfw7dq.js";
 import {
   exports_workspace
-} from "./project-4e7fkx2j.js";
+} from "./tool-n0eq3s1b.js";
 import {
   exports_location
-} from "./project-m9g7vbdc.js";
+} from "./tool-2y40pff2.js";
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./tool-rvfvac9x.js";
 
 // src/environment/environment.ts
 var exports_environment2 = {};

package/dist/chunks/{project-gqn2zsfg.js → tool-3p1bsa7m.js}

@@ -4,7 +4,7 @@ import { readFile } from "node:fs/promises";
 import net from "node:net";
 import path from "node:path";
 import { Data, Duration, Effect, Schema, Semaphore } from "effect";
-var ProtocolVersion = 6;
+var ProtocolVersion = 7;
 var MaxFrameBytes = 8 * 1024 * 1024;
 var Lifecycle = Schema.Union([
   Schema.Struct({ status: Schema.Literal("running") }),
@@ -42,6 +42,8 @@ var WireResponse = Schema.Union([
   Schema.Struct({ type: Schema.Literal("created"), terminal: WireTerminal }),
   Schema.Struct({ type: Schema.Literal("terminals"), terminals: Schema.Array(WireTerminal) }),
   Schema.Struct({ type: Schema.Literal("ok") }),
+  Schema.Struct({ type: Schema.Literal("owned") }),
+  Schema.Struct({ type: Schema.Literal("handoff"), ticket: Schema.String, expires_at: Schema.Number }),
   Schema.Struct({
     type: Schema.Literal("snapshot"),
     terminal: WireTerminal,
@@ -85,18 +87,42 @@ var WireResponse = Schema.Union([
 
 class DaemonError extends Data.TaggedError("PersistentPty.DaemonError") {
 }
-var makeDaemonTransport = Effect.fn("PersistentPty.makeDaemonTransport")(function* (directory, binary = () => Promise.resolve(process.env.OPENCODE_PTY_BIN || "opencode-pty")) {
+var makeDaemonTransport = Effect.fn("PersistentPty.makeDaemonTransport")(function* (directory, binary = () => Promise.resolve(process.env.OPENCODE_PTY_BIN || "opencode-pty"), inherited) {
   const startup = Semaphore.makeUnsafe(1);
   let registration;
+  let owner;
+  let closed = false;
+  yield* Effect.addFinalizer(() => Effect.sync(() => {
+    closed = true;
+    owner?.socket.destroy();
+  }));
+  const claim = (current, ticket) => Effect.tryPromise({
+    try: async (signal) => {
+      const connection = await openOwner(current, ticket, signal);
+      if (closed || signal.aborted) {
+        connection.socket.destroy();
+        throw new Error("PTY owner scope is closed");
+      }
+      owner = connection;
+      registration = current;
+      connection.socket.once("close", () => {
+        if (owner !== connection)
+          return;
+        owner = undefined;
+        registration = undefined;
+      });
+    },
+    catch: (cause) => failure("connect", cause)
+  }).pipe(Effect.timeoutOrElse({
+    duration: Duration.seconds(5),
+    orElse: () => Effect.fail(new DaemonError({ kind: "connect", message: "PTY ownership claim timed out" }))
+  }));
   const discover = Effect.fn("PersistentPty.daemon.discover")(function* () {
     const value = yield* Effect.tryPromise({
       try: () => readFile(path.join(directory, "service.json"), "utf8"),
       catch: (cause) => failure("connect", cause)
     });
-    const decoded = yield* Effect.try({
-      try: () => Schema.decodeUnknownSync(Registration)(JSON.parse(value)),
-      catch: (cause) => failure("protocol", cause)
-    });
+    const decoded = yield* Schema.decodeUnknownEffect(Schema.fromJsonString(Registration))(value).pipe(Effect.mapError((cause) => failure("protocol", cause)));
     if (decoded.protocol !== ProtocolVersion)
       return yield* Effect.fail(new DaemonError({
         kind: "protocol",
@@ -110,49 +136,55 @@ var makeDaemonTransport = Effect.fn("PersistentPty.makeDaemonTransport")(functio
   });
   const start = Effect.fn("PersistentPty.daemon.start")(function* () {
     const executable = yield* Effect.tryPromise({ try: binary, catch: (cause) => failure("spawn", cause) });
-    yield* Effect.tryPromise({
+    const child = yield* Effect.tryPromise({
       try: () => new Promise((resolve, reject) => {
-        const child = spawn(executable, ["daemon"], {
+        const child2 = spawn(executable, ["daemon"], {
           detached: true,
           stdio: "ignore",
           env: { ...process.env, OPENCODE_PTY_RUNTIME_DIR: directory }
         });
-        child.once("spawn", () => {
-          child.unref();
-          resolve();
+        child2.once("spawn", () => {
+          child2.unref();
+          resolve(child2);
         });
-        child.once("error", reject);
+        child2.once("error", reject);
       }),
       catch: (cause) => failure("spawn", cause)
     });
-    const deadline = Date.now() + 5000;
-    let last;
-    while (Date.now() < deadline) {
-      const found = yield* discover().pipe(Effect.map((value) => ({ value })), Effect.catch((error) => {
-        last = error;
-        return Effect.succeed(undefined);
-      }));
-      if (found)
-        return found.value;
-      yield* Effect.sleep(50);
-    }
-    return yield* Effect.fail(last ?? new DaemonError({ kind: "connect", message: "opencode-pty did not become ready" }));
+    return yield* Effect.gen(function* () {
+      const deadline = Date.now() + 5000;
+      let last;
+      while (Date.now() < deadline) {
+        const found = yield* discover().pipe(Effect.map((value) => ({ value })), Effect.catch((error) => {
+          last = error;
+          return Effect.succeed(undefined);
+        }));
+        if (found) {
+          yield* claim(found.value);
+          return found.value;
+        }
+        yield* Effect.sleep(50);
+      }
+      return yield* Effect.fail(last ?? new DaemonError({ kind: "connect", message: "opencode-pty did not become ready" }));
+    }).pipe(Effect.onError(() => Effect.sync(() => {
+      child.kill("SIGTERM");
+    })));
   });
   const connect = Effect.fn("PersistentPty.daemon.connect")(function* (shouldStart) {
+    if (closed)
+      return yield* Effect.fail(new DaemonError({ kind: "connect", message: "PTY owner scope is closed" }));
     if (registration)
       return registration;
     return yield* startup.withPermit(Effect.gen(function* () {
       if (registration)
         return registration;
       const found = yield* discover().pipe(Effect.catch((error) => {
-        if (!shouldStart)
-          return Effect.fail(error);
-        if (error.kind === "connect")
+        if (shouldStart && error.kind === "connect")
           return start();
-        if (error.kind !== "protocol" || error.pid === undefined)
-          return Effect.fail(error);
-        return terminate(error.pid).pipe(Effect.andThen(start()));
+        return Effect.fail(error);
       }));
+      if (!owner)
+        yield* claim(found);
       registration = found;
       return found;
     }));
@@ -192,6 +224,22 @@ var makeDaemonTransport = Effect.fn("PersistentPty.makeDaemonTransport")(functio
     }
     return yield* Effect.fail(new DaemonError({ kind: "connect", message: "opencode-pty did not stop" }));
   });
+  const handoff = startup.withPermit(Effect.gen(function* () {
+    const current = owner;
+    const registered = registration;
+    if (!current || !registered)
+      return null;
+    const response = yield* Effect.tryPromise({
+      try: (signal) => current.exchange({ op: "prepare_handoff" }, signal),
+      catch: (cause) => failure("response", cause)
+    }).pipe(Effect.timeoutOrElse({
+      duration: Duration.seconds(5),
+      orElse: () => Effect.fail(new DaemonError({ kind: "response", message: "PTY handoff preparation timed out" }))
+    }));
+    if (response.type !== "handoff")
+      return yield* Effect.fail(new DaemonError({ kind: "protocol", message: "Expected PTY handoff ticket" }));
+    return { directory, instanceID: registered.instance_id, ticket: response.ticket, expiresAt: response.expires_at };
+  }));
   const subscribe = Effect.fn("PersistentPty.daemon.subscribe")(function* (id, input) {
     const attempt2 = Effect.gen(function* () {
       const current = yield* connect(false);
@@ -206,8 +254,56 @@ var makeDaemonTransport = Effect.fn("PersistentPty.makeDaemonTransport")(functio
     });
     return yield* attempt2.pipe(Effect.catch((error) => error.kind === "registration" ? attempt2 : Effect.fail(error)));
   });
-  return { request, requestIfRunning, shutdown, subscribe };
+  if (inherited) {
+    if (inherited.expiresAt <= Date.now())
+      return yield* Effect.fail(new DaemonError({ kind: "registration", message: "PTY restart handoff expired" }));
+    const current = yield* discover();
+    if (current.instance_id !== inherited.instanceID)
+      return yield* Effect.fail(new DaemonError({ kind: "registration", message: "PTY restart daemon changed" }));
+    yield* claim(current, inherited.ticket);
+  }
+  return { request, requestIfRunning, shutdown, handoff, subscribe };
 });
+async function openOwner(registration, ticket, signal) {
+  const socket = net.createConnection({ path: registration.socket });
+  const frames = decoder(socket);
+  const abort = () => socket.destroy();
+  signal.addEventListener("abort", abort, { once: true });
+  const exchange = async (request, signal2) => {
+    if (signal2.aborted)
+      throw new Error("PTY ownership request interrupted");
+    signal2.addEventListener("abort", abort, { once: true });
+    try {
+      socket.write(encode({ token: registration.token, request }));
+      const frame = await frames.next();
+      if (frame.done)
+        throw new Error("PTY daemon closed its ownership connection");
+      const response = decode(frame.value);
+      if (response.type === "error")
+        throw new Error(response.message);
+      return response;
+    } finally {
+      signal2.removeEventListener("abort", abort);
+    }
+  };
+  try {
+    await new Promise((resolve, reject) => {
+      socket.once("connect", resolve);
+      socket.once("error", reject);
+      socket.once("close", () => reject(new Error("PTY ownership connection closed")));
+    });
+    const response = await exchange({ op: "own", instance_id: registration.instance_id, ticket }, signal);
+    if (response.type !== "owned")
+      throw new Error("PTY daemon does not support server ownership");
+    socket.unref();
+    return { socket, exchange };
+  } catch (error) {
+    socket.destroy();
+    throw error;
+  } finally {
+    signal.removeEventListener("abort", abort);
+  }
+}
 var oneShot = Effect.fn("PersistentPty.daemon.oneShot")(function* (registration, request) {
   const payload = yield* Effect.try({
     try: () => encode({ token: registration.token, request }),
@@ -404,26 +500,5 @@ function decode(payload) {
 function failure(kind, cause) {
   return new DaemonError({ kind, message: cause instanceof Error ? cause.message : String(cause) });
 }
-var terminate = Effect.fn("PersistentPty.daemon.terminate-incompatible")(function* (pid) {
-  yield* Effect.logWarning("replacing incompatible opencode-pty daemon", { pid });
-  yield* Effect.try({ try: () => process.kill(pid, "SIGTERM"), catch: (cause) => failure("spawn", cause) }).pipe(Effect.catch((error) => isMissingProcess(error) ? Effect.void : Effect.fail(error)));
-  const deadline = Date.now() + 2000;
-  while (Date.now() < deadline && processRunning(pid))
-    yield* Effect.sleep(25);
-  if (!processRunning(pid))
-    return;
-  yield* Effect.try({ try: () => process.kill(pid, "SIGKILL"), catch: (cause) => failure("spawn", cause) }).pipe(Effect.catch((error) => isMissingProcess(error) ? Effect.void : Effect.fail(error)));
-});
-function processRunning(pid) {
-  try {
-    process.kill(pid, 0);
-    return true;
-  } catch {
-    return false;
-  }
-}
-function isMissingProcess(error) {
-  return error.message.includes("ESRCH") || error.message.includes("no such process");
-}
 
 export { WireTerminal, WireResponse, DaemonError, makeDaemonTransport };

package/dist/chunks/{project-3qv8nf0b.js → tool-3qv8nf0b.js}

@@ -1,6 +1,6 @@
 import {
   exports_provider
-} from "./project-krsqcmnj.js";
+} from "./tool-krsqcmnj.js";
 
 // src/plugin/provider/nvidia.ts
 import { Effect } from "effect";

package/dist/chunks/{project-d3r4ps5n.js → tool-3s135gjm.js}

@@ -1,18 +1,18 @@
 import {
   iife
-} from "./project-ehj9csmv.js";
+} from "./tool-ehj9csmv.js";
 import {
   configuredSettings
-} from "./project-c3ca4w0m.js";
+} from "./tool-hd8q5g8p.js";
 import {
   exports_app
-} from "./project-50jxp3hw.js";
+} from "./tool-50jxp3hw.js";
 import {
   exports_provider
-} from "./project-krsqcmnj.js";
+} from "./tool-krsqcmnj.js";
 import {
   __require
-} from "./project-rvfvac9x.js";
+} from "./tool-rvfvac9x.js";
 
 // src/plugin/provider/cloudflare-workers-ai.ts
 import os from "os";

package/dist/chunks/{project-3thh6229.js → tool-3thh6229.js}

@@ -1,9 +1,9 @@
 import {
   createProviderPlugin
-} from "./project-0zz82cjq.js";
+} from "./tool-0zz82cjq.js";
 import {
   __require
-} from "./project-rvfvac9x.js";
+} from "./tool-rvfvac9x.js";
 
 // src/plugin/provider/mistral.ts
 var MistralPlugin = createProviderPlugin({

package/dist/chunks/{project-x33dyhcx.js → tool-400rk52g.js}

@@ -1,18 +1,18 @@
 import {
   exports_store
-} from "./project-mbbvc7tp.js";
+} from "./tool-53vhya9m.js";
 import {
   SessionEvent
-} from "./project-a83yvq99.js";
+} from "./tool-a83yvq99.js";
 import {
   exports_location
-} from "./project-m9g7vbdc.js";
+} from "./tool-2y40pff2.js";
 import {
   exports_bus
-} from "./project-5dkj9jex.js";
+} from "./tool-8dndtydw.js";
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./tool-rvfvac9x.js";
 
 // src/session/instructions.ts
 var exports_instructions = {};

package/dist/chunks/{project-sq000y3g.js → tool-4qk63h15.js}

@@ -1,12 +1,12 @@
 import {
   exports_permission
-} from "./project-rzd353vk.js";
+} from "./tool-6f8j85qb.js";
 import {
   exports_agent
-} from "./project-ehktr312.js";
+} from "./tool-kprre75d.js";
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./tool-rvfvac9x.js";
 
 // src/plugin/agent.ts
 var exports_agent2 = {};

package/dist/chunks/{project-4s2xwh5d.js → tool-4s2xwh5d.js}

@@ -1,12 +1,12 @@
 import {
   exports_permission
-} from "./project-v9bfv94f.js";
+} from "./tool-v9bfv94f.js";
 import {
   PositiveInt
-} from "./project-j07kk359.js";
+} from "./tool-j07kk359.js";
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./tool-rvfvac9x.js";
 
 // src/v1/config/agent.ts
 var exports_agent = {};

package/dist/chunks/{project-k4w3wsd5.js → tool-4ya343sq.js}

@@ -1,54 +1,54 @@
 import {
   exports_message_updater
-} from "./project-bmknfyv0.js";
+} from "./tool-bmknfyv0.js";
+import {
+  exports_inbox
+} from "./tool-se8395as.js";
 import {
   exports_instruction_entry
-} from "./project-0p8g4tc4.js";
+} from "./tool-z8gh2y42.js";
 import {
-  exports_inbox
-} from "./project-mkaeg0rc.js";
+  Slug
+} from "./tool-df3v2q6j.js";
 import {
   exports_instruction_state
-} from "./project-ztjk4rav.js";
+} from "./tool-f11jbhcb.js";
 import {
   SessionInboxTable,
   SessionMessageTable,
   SessionTable
-} from "./project-ygy0xbqa.js";
+} from "./tool-ygy0xbqa.js";
 import {
-  SessionEvent
-} from "./project-a83yvq99.js";
+  exports_agent
+} from "./tool-kprre75d.js";
 import {
   SessionMessage
-} from "./project-8rpfd2h6.js";
-import {
-  exports_agent
-} from "./project-ehktr312.js";
+} from "./tool-8rpfd2h6.js";
 import {
   exports_model
-} from "./project-r13w8t0w.js";
+} from "./tool-r13w8t0w.js";
 import {
   exports_workspace
-} from "./project-4e7fkx2j.js";
+} from "./tool-n0eq3s1b.js";
 import {
-  Slug
-} from "./project-df3v2q6j.js";
+  SessionEvent
+} from "./tool-a83yvq99.js";
 import {
   ProjectTable
-} from "./project-88jbfw8z.js";
+} from "./tool-88jbfw8z.js";
 import {
   AbsolutePath,
   RelativePath
-} from "./project-j07kk359.js";
+} from "./tool-j07kk359.js";
 import {
   exports_bus
-} from "./project-5dkj9jex.js";
+} from "./tool-8dndtydw.js";
 import {
   exports_database
-} from "./project-d55ah2nc.js";
+} from "./tool-merfm3fd.js";
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./tool-rvfvac9x.js";
 
 // src/session/projector.ts
 var exports_projector = {};

package/dist/chunks/{project-4zzdwbaz.js → tool-4zzdwbaz.js}

@@ -1,9 +1,9 @@
 import {
   createProviderPlugin
-} from "./project-0zz82cjq.js";
+} from "./tool-0zz82cjq.js";
 import {
   __require
-} from "./project-rvfvac9x.js";
+} from "./tool-rvfvac9x.js";
 
 // src/plugin/provider/alibaba.ts
 var AlibabaPlugin = createProviderPlugin({

package/dist/chunks/{project-50jxp3hw.js → tool-50jxp3hw.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./tool-rvfvac9x.js";
 
 // src/app.ts
 var exports_app = {};

package/dist/chunks/{project-mbbvc7tp.js → tool-53vhya9m.js}

@@ -1,19 +1,19 @@
-import {
-  exports_history
-} from "./project-dndvd0y6.js";
 import {
   fromRow
-} from "./project-zetp0g5z.js";
+} from "./tool-cb5zxvq2.js";
+import {
+  exports_history
+} from "./tool-q70gvhbx.js";
 import {
   SessionMessageTable,
   SessionTable
-} from "./project-ygy0xbqa.js";
+} from "./tool-ygy0xbqa.js";
 import {
   exports_database
-} from "./project-d55ah2nc.js";
+} from "./tool-merfm3fd.js";
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./tool-rvfvac9x.js";
 
 // src/session/store.ts
 var exports_store = {};

package/dist/chunks/{project-57tzwnz4.js → tool-57tzwnz4.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./tool-rvfvac9x.js";
 
 // src/codemode/catalog.ts
 var exports_catalog = {};

package/dist/chunks/{project-58xdvehb.js → tool-58xdvehb.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./tool-rvfvac9x.js";
 
 // src/id/id.ts
 var exports_id = {};

package/dist/chunks/{project-6fxwm8sg.js → tool-5aac0tby.js}

@@ -1,27 +1,27 @@
 import {
   exports_location_mutation
-} from "./project-fzp6ntht.js";
-import {
-  exports_filesystem
-} from "./project-hwf0phwc.js";
+} from "./tool-7yfz5d5r.js";
 import {
   exports_permission
-} from "./project-rzd353vk.js";
+} from "./tool-6f8j85qb.js";
+import {
+  exports_filesystem
+} from "./tool-s8xxtbar.js";
 import {
   exports_ripgrep
-} from "./project-akppyv5r.js";
+} from "./tool-yaw62s0n.js";
 import {
   exports_environment1 as exports_environment
-} from "./project-ym31qssr.js";
+} from "./tool-3jshngxf.js";
 import {
   exports_location
-} from "./project-m9g7vbdc.js";
+} from "./tool-2y40pff2.js";
 import {
   RelativePath
-} from "./project-j07kk359.js";
+} from "./tool-j07kk359.js";
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./tool-rvfvac9x.js";
 
 // src/tool/plugin/glob.ts
 var exports_glob = {};

package/dist/chunks/{project-5cdnkd94.js → tool-5cdnkd94.js}

@@ -1,12 +1,12 @@
 import {
   exports_model
-} from "./project-r13w8t0w.js";
+} from "./tool-r13w8t0w.js";
 import {
   exports_provider
-} from "./project-krsqcmnj.js";
+} from "./tool-krsqcmnj.js";
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./tool-rvfvac9x.js";
 
 // src/plugin/variant.ts
 var exports_variant = {};

package/dist/chunks/{project-qnrg9ptq.js → tool-5cmc2wkg.js}

@@ -1,27 +1,27 @@
-import {
-  exports_discovery
-} from "./project-ybhfpy64.js";
 import {
   exports_skill_file
-} from "./project-3qj9jcya.js";
+} from "./tool-y0a17w9d.js";
 import {
-  exports_skill
-} from "./project-e6atjbt4.js";
+  exports_discovery
+} from "./tool-ybhfpy64.js";
 import {
   exports_config
-} from "./project-v7mh9m05.js";
+} from "./tool-dcqm2659.js";
 import {
   exports_watcher
-} from "./project-y980s7ka.js";
+} from "./tool-y980s7ka.js";
+import {
+  exports_skill
+} from "./tool-sxpjdhga.js";
 import {
   exports_location
-} from "./project-m9g7vbdc.js";
+} from "./tool-2y40pff2.js";
 import {
   AbsolutePath
-} from "./project-j07kk359.js";
+} from "./tool-j07kk359.js";
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./tool-rvfvac9x.js";
 
 // src/config/plugin/skill.ts
 var exports_skill2 = {};