@opencode/client 2.0.22 → 2.0.24

package/dist/promise/service.js

@@ -1,27 +1,30 @@
 import {
   spawnServiceContender2,
-  contenderFailure2,
-  contenderFinished2
-} from "../chunks/service-contender-txckps9j.js";
+  contenderPool2
+} from "../chunks/pty-handoff-ve4aws36.js";
 import {
   defaultEnsureTiming2,
   ensureTiming2
-} from "../chunks/service-contender-xgnj2w4v.js";
+} from "../chunks/pty-handoff-xgnj2w4v.js";
 import {
   matchesVersion2
-} from "../chunks/service-contender-sxt88q69.js";
+} from "../chunks/pty-handoff-sxt88q69.js";
 import {
   prepare2,
   environment2,
   complete2,
   clear2
-} from "../chunks/service-contender-1kn39gq3.js";
-import"../chunks/service-contender-qav6mfdz.js";
+} from "../chunks/pty-handoff-71wkqa80.js";
+import {
+  fallback2,
+  same2,
+  probeResult2,
+  headers2
+} from "../chunks/pty-handoff-ank0d71z.js";
+import"../chunks/pty-handoff-qav6mfdz.js";
 
 // src/promise/service.ts
 import { readFile, rm } from "node:fs/promises";
-import { homedir } from "node:os";
-import { join } from "node:path";
 async function discover(options = {}) {
   const found = (await registered(options.file)).service;
   if (found?.state !== "ready")
@@ -35,11 +38,9 @@ async function discover(options = {}) {
 async function ensure(options = {}) {
   const timing = ensureTiming2(options);
   const deadline = Date.now() + timing.promiseTimeout;
-  const contenders = new Set;
+  const pool = contenderPool2(timing);
   let timeouts;
   let announced = false;
-  let lastSpawn = 0;
-  let spawnDelay = timing.spawnDelay;
   const announce = (reason, previousVersion) => {
     if (announced)
       return;
@@ -51,7 +52,7 @@ async function ensure(options = {}) {
     if (command === undefined)
       throw new Error("Missing service command");
     try {
-      return spawnServiceContender2(command, args, await environment2(options.file ?? fallback(), options.env));
+      return spawnServiceContender2(command, args, await environment2(options.file ?? fallback2(), options.env));
     } catch (cause) {
       throw new Error("Failed to start server", { cause });
     }
@@ -59,29 +60,33 @@ async function ensure(options = {}) {
   try {
     while (true) {
       if (Date.now() >= deadline)
-        throw new Error("Timed out waiting for the background service to start");
+        throw pool.failure() ?? new Error("Timed out waiting for the background service to start");
       const registration = await registered(options.file, timing.requestTimeout);
       if (registration.timedOut && registration.info !== undefined) {
         timeouts = {
           info: registration.info,
-          count: timeouts !== undefined && same(timeouts.info, registration.info) ? timeouts.count + 1 : 1
+          count: timeouts !== undefined && same2(timeouts.info, registration.info) ? timeouts.count + 1 : 1
         };
         if (timeouts.count >= 3) {
           announce("missing");
           console.warn("Background service is unresponsive; recovery cannot preserve persistent terminals");
-          await clear2(options.file ?? fallback());
+          await clear2(options.file ?? fallback2());
           await terminate(registration.info, options, timing);
+          pool.evict(registration.info.pid);
+          pool.recruitNow();
           timeouts = undefined;
-          lastSpawn = Date.now() - spawnDelay;
         }
       } else
         timeouts = undefined;
       if (registration.service !== undefined) {
-        spawnDelay = timing.spawnDelay;
+        pool.serviceAnswered();
         const service2 = registration.service;
-        const compatible = service2.compatible && matchesVersion2(service2.version, options);
+        const versionMatches = matchesVersion2(service2.version, options);
+        const compatible = service2.compatible && versionMatches;
+        if (!service2.compatible && versionMatches)
+          throw new Error("Background service uses an incompatible health protocol. Update this client or explicitly restart the service.");
         if (compatible && service2.state === "ready") {
-          await complete2(options.file ?? fallback(), service2.info);
+          await complete2(options.file ?? fallback2(), service2.info);
           return service2.endpoint;
         }
         if (compatible && service2.state === "failed")
@@ -96,52 +101,31 @@ async function ensure(options = {}) {
           }).catch(() => {
             return;
           });
-          lastSpawn = 0;
+          pool.evict(service2.info.pid);
         }
       } else {
-        if (lastSpawn === 0 && registration.info !== undefined)
-          lastSpawn = Date.now();
-        const finished = [...contenders].filter(contenderFinished2);
-        const failure = finished.map(contenderFailure2).find((error) => error !== undefined);
-        if (finished.some((item) => item.child.exitCode === 0)) {
-          spawnDelay = Math.min(spawnDelay * 2, timing.maxSpawnDelay);
-        }
-        finished.forEach((item) => contenders.delete(item));
-        if (failure !== undefined && contenders.size === 0)
-          throw failure;
-        if (contenders.size < 2 && Date.now() - lastSpawn >= spawnDelay) {
+        const failed = pool.reap();
+        if (failed !== undefined)
+          throw failed;
+        if (pool.shouldRecruit(registration.info !== undefined)) {
           announce("missing");
-          contenders.add(await spawnContender());
-          lastSpawn = Date.now();
+          pool.add(await spawnContender());
         }
       }
       await delay(timing.pollInterval);
     }
   } finally {
-    contenders.forEach((contender) => contender.release());
+    pool.releaseAll();
   }
 }
 async function stop(options = {}) {
   const info = await read(options.file);
-  if (options.pty === "handoff" && info !== undefined)
-    await prepare2(options.file ?? fallback(), info, defaultEnsureTiming2.requestTimeout);
-  else
-    await clear2(options.file ?? fallback());
+  await (options.pty === "handoff" && info !== undefined ? prepare2(options.file ?? fallback2(), info, defaultEnsureTiming2.requestTimeout) : clear2(options.file ?? fallback2())).catch((cause) => console.warn("Failed to prepare persistent terminals for replacement", cause));
   if (info !== undefined)
-    await terminate(info, options, defaultEnsureTiming2);
-}
-function fallback() {
-  return join(process.env["XDG_STATE_HOME"] ?? join(homedir(), ".local", "state"), "opencode", "service.json");
-}
-function headers(endpoint) {
-  if (endpoint.auth === undefined)
-    return;
-  return {
-    authorization: "Basic " + Buffer.from(endpoint.auth.username + ":" + endpoint.auth.password).toString("base64")
-  };
+    await terminate(info, options, ensureTiming2(options));
 }
 async function read(file) {
-  const text = await readFile(file ?? fallback(), "utf8").catch(() => {
+  const text = await readFile(file ?? fallback2(), "utf8").catch(() => {
     return;
   });
   if (text === undefined)
@@ -152,63 +136,11 @@ async function read(file) {
     return;
   }
 }
-async function probeResult(info, timeout = defaultEnsureTiming2.requestTimeout) {
-  const endpoint = {
-    url: info.url,
-    auth: info.password === undefined ? undefined : { type: "basic", username: "opencode", password: info.password }
-  };
-  const signal = AbortSignal.timeout(timeout);
-  const result = await fetch(new URL("/api/info", info.url), { headers: headers(endpoint), signal }).then(async (response) => ({
-    response,
-    body: response.status === 404 ? undefined : await response.json()
-  })).then((value) => ({ value }), (cause) => ({ cause }));
-  if ("cause" in result)
-    return { service: undefined, timedOut: signal.aborted };
-  const response = result.value.response;
-  if (response.status === 404)
-    return {
-      service: {
-        info,
-        endpoint,
-        version: info.version,
-        state: "ready",
-        compatible: false
-      },
-      timedOut: false
-    };
-  const serverInfo = decodeInfo(result.value.body);
-  if (serverInfo !== undefined) {
-    if (serverInfo.pid !== info.pid)
-      return { service: undefined, timedOut: false };
-    if (info.version !== undefined && serverInfo.version !== info.version)
-      return { service: undefined, timedOut: false };
-    return {
-      service: {
-        info,
-        endpoint,
-        version: serverInfo.version,
-        state: response.ok ? "ready" : response.status === 500 ? "failed" : "waiting",
-        compatible: true
-      },
-      timedOut: false
-    };
-  }
-  return { service: undefined, timedOut: false };
-}
-function decodeInfo(input) {
-  if (typeof input !== "object" || input === null)
-    return;
-  if (!("version" in input) || typeof input.version !== "string")
-    return;
-  if (!("pid" in input) || typeof input.pid !== "number" || !Number.isInteger(input.pid) || input.pid < 0)
-    return;
-  return { version: input.version, pid: input.pid };
-}
 async function registered(file, timeout) {
   const info = await read(file);
   if (info === undefined)
     return { info: undefined, service: undefined, timedOut: false };
-  return { info, ...await probeResult(info, timeout) };
+  return { info, ...await probeResult2(info, timeout) };
 }
 function signal(pid, name) {
   try {
@@ -232,35 +164,29 @@ async function waitUntilStopped(pid, timing) {
   }
   return false;
 }
-function same(left, right) {
-  return left.id === right.id && left.version === right.version && left.url === right.url && left.pid === right.pid;
-}
 async function terminate(info, options, timing) {
   const current = await read(options.file);
-  if (current === undefined || !same(current, info))
+  if (current === undefined || !same2(current, info))
     return;
   signal(info.pid, "SIGTERM");
   if (!await waitUntilStopped(info.pid, timing)) {
-    const latest = await read(options.file);
-    if (latest === undefined || !same(latest, info))
-      return;
     signal(info.pid, "SIGKILL");
     if (!await waitUntilStopped(info.pid, timing))
       throw new Error(`Server process ${info.pid} is still running`);
   }
   const latest = await read(options.file);
-  if (latest === undefined || !same(latest, info))
+  if (latest === undefined || !same2(latest, info))
     return;
-  await rm(options.file ?? fallback(), { force: true });
+  await rm(options.file ?? fallback2(), { force: true });
 }
 function delay(milliseconds) {
   return new Promise((resolve) => setTimeout(resolve, milliseconds));
 }
-var Service = { discover, ensure, stop, headers };
+var Service = { discover, ensure, stop, headers: headers2 };
 export {
   Service,
   discover,
   ensure,
-  headers,
+  headers2 as headers,
   stop
 };

package/dist/pty-handoff.d.ts

@@ -1,6 +1,9 @@
 export * as PtyHandoff from "./pty-handoff.js";
 import type { Info } from "./service.js";
-/** Publish the ticket before stopping its owner so every replacement contender can adopt it. */
+/**
+ * Publish the ticket before stopping its owner so every replacement contender can adopt it.
+ * Never throws: terminals are best-effort, so any failure replaces the service without a handoff.
+ */
 export declare function prepare(file: string, info: Info, timeout: number): Promise<void>;
 export declare function environment(file: string, env?: Readonly<Record<string, string>>): Promise<{
     OPENCODE_PTY_HANDOFF: string | undefined;

package/dist/pty-handoff.js

@@ -4,7 +4,7 @@ import {
   complete2,
   clear2,
   exports_pty_handoff
-} from "./chunks/service-contender-1kn39gq3.js";
+} from "./chunks/pty-handoff-71wkqa80.js";
 export {
   exports_pty_handoff as PtyHandoff,
   clear2 as clear,

package/dist/rpc-runtime.js

@@ -4,7 +4,7 @@ import {
   event2,
   eventType2,
   exports_rpc_runtime
-} from "./chunks/service-contender-t1xa31vm.js";
+} from "./chunks/pty-handoff-t1xa31vm.js";
 export {
   exports_rpc_runtime as RpcRuntime,
   event2 as event,

package/dist/service-contender.d.ts

@@ -1,4 +1,5 @@
 import { type ChildProcess } from "node:child_process";
+import type { EnsureTiming } from "./service-timing.js";
 export type ServiceContender = {
     readonly child: ChildProcess;
     readonly error: () => Error | undefined;
@@ -7,5 +8,30 @@ export type ServiceContender = {
     readonly release: () => void;
 };
 export declare function spawnServiceContender(command: string, args: ReadonlyArray<string>, env?: Readonly<Record<string, string | undefined>>): ServiceContender;
-export declare function contenderFailure(contender: ServiceContender): Error | undefined;
+/**
+ * The startup attempts of one `ensure()` call. It keeps at most two attempts alive, remembers
+ * the first startup failure, and backs off when attempts exit cleanly because another one won.
+ */
+export declare function contenderPool(timing: EnsureTiming): {
+    /** The first startup failure seen since the last eviction. */
+    failure: () => Error | undefined;
+    /** A registered service answered, so the next attempt waits the base delay again. */
+    serviceAnswered(): void;
+    /**
+     * The owner `pid` was replaced. Drop its attempt and any finished ones, forget their
+     * failure, and restart the spawn clock.
+     */
+    evict(pid: number): void;
+    /** Let the next attempt start without waiting a spawn delay. */
+    recruitNow(): void;
+    /** Collect finished attempts. Returns the startup failure once no attempt is left alive. */
+    reap(): Error | undefined;
+    /**
+     * Whether to start another attempt now. A registration that has not answered yet gets one
+     * spawn delay before an attempt competes with it.
+     */
+    shouldRecruit(registered: boolean): boolean;
+    add(contender: ServiceContender): void;
+    releaseAll(): void;
+};
 export declare function contenderFinished(contender: ServiceContender): boolean;

package/dist/service-contender.js

@@ -1,10 +1,10 @@
 import {
   spawnServiceContender2,
-  contenderFailure2,
+  contenderPool2,
   contenderFinished2
-} from "./chunks/service-contender-txckps9j.js";
+} from "./chunks/pty-handoff-ve4aws36.js";
 export {
-  contenderFailure2 as contenderFailure,
   contenderFinished2 as contenderFinished,
+  contenderPool2 as contenderPool,
   spawnServiceContender2 as spawnServiceContender
 };

package/dist/service-probe.d.ts

@@ -0,0 +1,53 @@
+import type { Endpoint, Info } from "./service.js";
+export type LocalService = {
+    readonly info: Info;
+    readonly endpoint: Endpoint;
+    readonly version?: string;
+    readonly state: "ready" | "waiting" | "failed";
+    readonly compatible: boolean;
+};
+/** The default registration file. */
+export declare function fallback(): string;
+/** Whether two registrations describe the same service instance. */
+export declare function same(left: Info, right: Info): boolean;
+/** Ask a registered owner for its health and classify the answer. */
+export declare function probeResult(info: Info, timeout?: number): Promise<{
+    service: undefined;
+    timedOut: boolean;
+} | {
+    service: {
+        info: Info;
+        endpoint: {
+            url: string;
+            auth: {
+                type: "basic";
+                username: string;
+                password: string;
+            } | undefined;
+        };
+        version: string | undefined;
+        state: "ready";
+        compatible: false;
+    };
+    timedOut: boolean;
+} | {
+    service: {
+        info: Info;
+        endpoint: {
+            url: string;
+            auth: {
+                type: "basic";
+                username: string;
+                password: string;
+            } | undefined;
+        };
+        version: string;
+        state: "failed" | "ready" | "waiting";
+        compatible: true;
+    };
+    timedOut: boolean;
+}>;
+/** Create HTTP authentication headers for a service endpoint. */
+export declare function headers(endpoint: Endpoint): {
+    authorization: string;
+} | undefined;

package/dist/service-probe.js

@@ -0,0 +1,13 @@
+import {
+  fallback2,
+  same2,
+  probeResult2,
+  headers2
+} from "./chunks/pty-handoff-ank0d71z.js";
+import"./chunks/pty-handoff-xgnj2w4v.js";
+export {
+  fallback2 as fallback,
+  headers2 as headers,
+  probeResult2 as probeResult,
+  same2 as same
+};

package/dist/service-timing.js

@@ -2,7 +2,7 @@ import {
   defaultEnsureTiming2,
   ensureTiming2,
   withEnsureTiming2
-} from "./chunks/service-contender-xgnj2w4v.js";
+} from "./chunks/pty-handoff-xgnj2w4v.js";
 export {
   defaultEnsureTiming2 as defaultEnsureTiming,
   ensureTiming2 as ensureTiming,

package/dist/service-version.js

@@ -1,6 +1,6 @@
 import {
   matchesVersion2
-} from "./chunks/service-contender-sxt88q69.js";
+} from "./chunks/pty-handoff-sxt88q69.js";
 export {
   matchesVersion2 as matchesVersion
 };

package/dist/service.js

@@ -1 +1 @@
-import"./chunks/service-contender-qav6mfdz.js";
+import"./chunks/pty-handoff-qav6mfdz.js";

package/dist/shared-events.js

@@ -1,7 +1,7 @@
 import {
   make7,
   exports_shared_events
-} from "./chunks/service-contender-frbwqjmf.js";
+} from "./chunks/pty-handoff-frbwqjmf.js";
 export {
   exports_shared_events as SharedEvents,
   make7 as make

package/dist/solid/connection.js

@@ -2,7 +2,7 @@ import {
   defaultIdleTimeout2,
   foregroundIdleThreshold2,
   createClientConnection2
-} from "../chunks/service-contender-ydhz1zrh.js";
+} from "../chunks/pty-handoff-ydhz1zrh.js";
 export {
   createClientConnection2 as createClientConnection,
   defaultIdleTimeout2 as defaultIdleTimeout,

package/dist/solid/data.d.ts

@@ -50,6 +50,7 @@ export declare function createData(config: CreateDataInput): {
         evict(sessionID: string): void;
         cost(sessionID: string): number;
         status(sessionID: string): DataSessionStatus;
+        active(): string[];
         input: {
             list(sessionID: string): string[];
             has(sessionID: string, inboxID: string): boolean;
@@ -98,12 +99,14 @@ export declare function createData(config: CreateDataInput): {
         };
         permission: {
             list(sessionID: string): PermissionRequest[];
+            sessions(): string[];
             sync(sessionID: string): Promise<void>;
             invalidate(sessionID: string): void;
             reply(input: PermissionReplyInput): Promise<void>;
         };
         form: {
             list(sessionID: string, ref?: LocationRef): FormWithLocation[] | undefined;
+            sessions(): string[];
             sync(sessionID: string, ref?: LocationRef): Promise<void>;
             invalidate(sessionID: string, ref?: LocationRef): void;
             reply(input: SessionFormReplyInput, ref?: LocationRef): Promise<void>;

package/dist/solid/data.js

@@ -2,15 +2,15 @@ import {
   settleMs2,
   locationKey2,
   createData2
-} from "../chunks/service-contender-h11j9btw.js";
-import"../chunks/service-contender-m2eywc8w.js";
-import"../chunks/service-contender-992ffpa9.js";
-import"../chunks/service-contender-vyas3vgt.js";
-import"../chunks/service-contender-50fct660.js";
-import"../chunks/service-contender-nwcpakzx.js";
-import"../chunks/service-contender-1tbj6z39.js";
-import"../chunks/service-contender-4tveyqeh.js";
-import"../chunks/service-contender-frbwqjmf.js";
+} from "../chunks/pty-handoff-src6by76.js";
+import"../chunks/pty-handoff-m2eywc8w.js";
+import"../chunks/pty-handoff-cqfz2qxq.js";
+import"../chunks/pty-handoff-vyas3vgt.js";
+import"../chunks/pty-handoff-qzsnm4q8.js";
+import"../chunks/pty-handoff-js54wxgp.js";
+import"../chunks/pty-handoff-1y4a697q.js";
+import"../chunks/pty-handoff-vt9jbch8.js";
+import"../chunks/pty-handoff-frbwqjmf.js";
 export {
   createData2 as createData,
   locationKey2 as locationKey,

package/dist/solid/index.js

@@ -1,25 +1,25 @@
-import"../chunks/service-contender-nwcpakzx.js";
-import"../chunks/service-contender-50fct660.js";
-import"../chunks/service-contender-4tveyqeh.js";
-import"../chunks/service-contender-vyas3vgt.js";
-import"../chunks/service-contender-frbwqjmf.js";
-import"../chunks/service-contender-1tbj6z39.js";
-import"../chunks/service-contender-992ffpa9.js";
-import"../chunks/service-contender-m2eywc8w.js";
+import"../chunks/pty-handoff-js54wxgp.js";
+import"../chunks/pty-handoff-qzsnm4q8.js";
+import"../chunks/pty-handoff-vt9jbch8.js";
+import"../chunks/pty-handoff-vyas3vgt.js";
+import"../chunks/pty-handoff-frbwqjmf.js";
+import"../chunks/pty-handoff-1y4a697q.js";
+import"../chunks/pty-handoff-cqfz2qxq.js";
+import"../chunks/pty-handoff-m2eywc8w.js";
 import {
   settleMs2,
   locationKey2,
   createData2
-} from "../chunks/service-contender-h11j9btw.js";
+} from "../chunks/pty-handoff-src6by76.js";
 import {
   defaultIdleTimeout2,
   foregroundIdleThreshold2,
   createClientConnection2
-} from "../chunks/service-contender-ydhz1zrh.js";
+} from "../chunks/pty-handoff-ydhz1zrh.js";
 import {
   createPtyClient2,
   createPersistentPtyClient2
-} from "../chunks/service-contender-gne7h7mq.js";
+} from "../chunks/pty-handoff-gne7h7mq.js";
 export {
   createClientConnection2 as createClientConnection,
   createData2 as createData,

package/dist/solid/pty.js

@@ -1,7 +1,7 @@
 import {
   createPtyClient2,
   createPersistentPtyClient2
-} from "../chunks/service-contender-gne7h7mq.js";
+} from "../chunks/pty-handoff-gne7h7mq.js";
 export {
   createPersistentPtyClient2 as createPersistentPtyClient,
   createPtyClient2 as createPtyClient

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode/client",
-  "version": "2.0.22",
+  "version": "2.0.24",
   "type": "module",
   "license": "MIT",
   "repository": {
@@ -57,8 +57,8 @@
     "typecheck": "tsgo --noEmit"
   },
   "dependencies": {
-    "@opencode/schema": "2.0.22",
-    "@opencode/protocol": "2.0.22"
+    "@opencode/schema": "2.0.24",
+    "@opencode/protocol": "2.0.24"
   },
   "peerDependencies": {
     "effect": "4.0.0-rc.112",
@@ -74,7 +74,7 @@
   },
   "devDependencies": {
     "@effect/platform-node": "4.0.0-rc.112",
-    "@opencode/httpapi-codegen": "2.0.22",
+    "@opencode/httpapi-codegen": "2.0.24",
     "@tsconfig/bun": "1.0.9",
     "@types/bun": "1.4.0",
     "@typescript/native-preview": "7.0.0-dev.20251207.1",

package/dist/chunks/service-contender-992ffpa9.js

@@ -1,30 +0,0 @@
-import {
-  make7
-} from "./service-contender-frbwqjmf.js";
-import {
-  make6
-} from "./service-contender-50fct660.js";
-import {
-  makeRpc2
-} from "./service-contender-1tbj6z39.js";
-import {
-  __export
-} from "./service-contender-9rqn6x4v.js";
-
-// src/promise/client.ts
-var exports_client3 = {};
-__export(exports_client3, {
-  OpenCode: () => exports_client3,
-  make: () => make5
-});
-function make5(options) {
-  const raw = make6(options);
-  const events = make7((signal, onActivity) => raw.event.subscribe({ signal, onActivity }));
-  return {
-    ...raw,
-    rpc: Object.assign(makeRpc2(raw, events), raw.rpc),
-    event: events
-  };
-}
-
-export { make5, exports_client3 };