@opencode/client 2.0.23 → 2.0.24

package/dist/effect/rpc.js

@@ -1,11 +1,11 @@
 import {
-  make4,
+  make6,
   aborted2,
   exports_rpc
-} from "../chunks/service-version-z6qdwcsf.js";
-import"../chunks/service-version-t1xa31vm.js";
+} from "../chunks/pty-handoff-w1w809zr.js";
+import"../chunks/pty-handoff-t1xa31vm.js";
 export {
   exports_rpc as RpcClientRuntime,
   aborted2 as aborted,
-  make4 as make
+  make6 as make
 };

package/dist/effect/service.d.ts

@@ -1,6 +1,8 @@
 import { Effect, FileSystem, Schema } from "effect";
-import type { DiscoverOptions, Endpoint, EnsureOptions, StopOptions } from "../service.js";
+import type { DiscoverOptions, EnsureOptions, StopOptions } from "../service.js";
+import { headers } from "../service-probe.js";
 export * from "../service.js";
+export { headers };
 /** Contents of the local service registration file. */
 export type Info = import("../service.js").Info;
 /** Discover a healthy, compatible local service without starting one. */
@@ -27,13 +29,9 @@ export declare const incumbent: (options: DiscoverOptions & {
     state: "failed" | "ready" | "waiting";
 } | undefined, never, FileSystem.FileSystem>;
 /** Ensure a healthy, compatible local service is running. */
-export declare const ensure: (options?: EnsureOptions | undefined) => Effect.Effect<Endpoint, Error, FileSystem.FileSystem>;
+export declare const ensure: (options?: EnsureOptions | undefined) => Effect.Effect<import("./service.js").Endpoint, Error, FileSystem.FileSystem>;
 /** Stop the registered local service. */
 export declare const stop: (options?: StopOptions | undefined) => Effect.Effect<void, Error, FileSystem.FileSystem>;
-/** Create HTTP authentication headers for a service endpoint. */
-export declare function headers(endpoint: Endpoint): {
-    authorization: string;
-} | undefined;
 /** Schema for the local service registration file. */
 export declare const Info: Schema.Struct<{
     readonly id: Schema.optional<Schema.String>;
@@ -65,7 +63,7 @@ export declare const Service: {
         };
         state: "failed" | "ready" | "waiting";
     } | undefined, never, FileSystem.FileSystem>;
-    ensure: (options?: EnsureOptions | undefined) => Effect.Effect<Endpoint, Error, FileSystem.FileSystem>;
+    ensure: (options?: EnsureOptions | undefined) => Effect.Effect<import("./service.js").Endpoint, Error, FileSystem.FileSystem>;
     stop: (options?: StopOptions | undefined) => Effect.Effect<void, Error, FileSystem.FileSystem>;
     headers: typeof headers;
     Info: Schema.Struct<{

package/dist/effect/service.js

@@ -1,27 +1,30 @@
 import {
   spawnServiceContender2,
-  contenderFailure2,
-  contenderFinished2
-} from "../chunks/service-version-6f43cgzz.js";
+  contenderPool2
+} from "../chunks/pty-handoff-ve4aws36.js";
 import {
   defaultEnsureTiming2,
   ensureTiming2
-} from "../chunks/service-version-xgnj2w4v.js";
+} from "../chunks/pty-handoff-xgnj2w4v.js";
 import {
   matchesVersion2
-} from "../chunks/service-version-sxt88q69.js";
+} from "../chunks/pty-handoff-sxt88q69.js";
 import {
   prepare2,
   environment2,
   complete2,
   clear2
-} from "../chunks/service-version-02j88w0z.js";
-import"../chunks/service-version-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/effect/service.ts
 import { Effect, FileSystem, Option, Schedule, Schema } from "effect";
-import { homedir } from "node:os";
-import { join } from "node:path";
 var discover = Effect.fn("service.discover")(function* (options = {}) {
   const found = (yield* registered(options.file)).service;
   if (found?.state !== "ready")
@@ -34,10 +37,10 @@ var discover = Effect.fn("service.discover")(function* (options = {}) {
 });
 var incumbent = Effect.fn("service.incumbent")(function* (options) {
   const info = yield* read(options.file);
-  const found = info === undefined ? undefined : yield* probe({ ...info, url: options.url });
-  if (found === undefined)
+  if (info === undefined)
     return;
-  if (!found.compatible)
+  const found = (yield* Effect.promise(() => probeResult2({ ...info, url: options.url }))).service;
+  if (!found?.compatible)
     return;
   if (!matchesVersion2(found.version, options))
     return;
@@ -45,12 +48,9 @@ var incumbent = Effect.fn("service.incumbent")(function* (options) {
 });
 var ensure = Effect.fn("service.ensure")(function* (options = {}) {
   const timing = ensureTiming2(options);
-  const contenders = new Set;
+  const pool = contenderPool2(timing);
   let timeouts;
   let announced = false;
-  let lastSpawn = 0;
-  let spawnDelay = timing.spawnDelay;
-  let failure;
   const announce = (reason, previousVersion) => Effect.sync(() => {
     if (announced)
       return;
@@ -61,7 +61,7 @@ var ensure = Effect.fn("service.ensure")(function* (options = {}) {
     const [command, ...args] = options.command ?? ["opencode", "serve", "--service"];
     if (command === undefined)
       return yield* Effect.fail(new Error("Missing service command"));
-    const env = yield* Effect.tryPromise(() => environment2(options.file ?? fallback(), options.env));
+    const env = yield* Effect.tryPromise(() => environment2(options.file ?? fallback2(), options.env));
     return yield* Effect.try({
       try: () => {
         return spawnServiceContender2(command, args, env);
@@ -76,33 +76,27 @@ var ensure = Effect.fn("service.ensure")(function* (options = {}) {
     if (registration.timedOut && info !== undefined) {
       timeouts = {
         info,
-        count: timeouts !== undefined && same(timeouts.info, info) ? timeouts.count + 1 : 1
+        count: timeouts !== undefined && same2(timeouts.info, info) ? timeouts.count + 1 : 1
       };
       if (timeouts.count >= 3) {
         yield* announce("missing");
         yield* Effect.logWarning("Background service is unresponsive; recovery cannot preserve persistent terminals");
-        yield* Effect.tryPromise(() => clear2(options.file ?? fallback()));
+        yield* Effect.tryPromise(() => clear2(options.file ?? fallback2()));
         yield* terminate(info, options, timing);
-        for (const item of contenders) {
-          if (item.child.pid === info.pid || contenderFinished2(item)) {
-            item.release();
-            contenders.delete(item);
-          }
-        }
-        failure = undefined;
+        pool.evict(info.pid);
+        pool.recruitNow();
         timeouts = undefined;
-        lastSpawn = Date.now() - spawnDelay;
       }
     } else
       timeouts = undefined;
     if (service2 !== undefined) {
-      spawnDelay = timing.spawnDelay;
+      pool.serviceAnswered();
       const versionMatches = matchesVersion2(service2.version, options);
       const compatible = service2.compatible && versionMatches;
       if (!service2.compatible && versionMatches)
         return yield* Effect.fail(new Error("Background service uses an incompatible health protocol. Update this client or explicitly restart the service."));
       if (compatible && service2.state === "ready") {
-        yield* Effect.tryPromise(() => complete2(options.file ?? fallback(), service2.info));
+        yield* Effect.tryPromise(() => complete2(options.file ?? fallback2(), service2.info));
         return Option.some(service2);
       }
       if (compatible && service2.state === "failed")
@@ -116,54 +110,31 @@ var ensure = Effect.fn("service.ensure")(function* (options = {}) {
         file: options.file,
         pty: service2.state === "ready" ? "handoff" : "clear"
       }).pipe(Effect.ignore);
-      for (const item of contenders) {
-        if (item.child.pid === service2.info.pid || contenderFinished2(item)) {
-          item.release();
-          contenders.delete(item);
-        }
-      }
-      failure = undefined;
-      lastSpawn = 0;
+      pool.evict(service2.info.pid);
       return Option.none();
-    } else if (lastSpawn === 0 && info !== undefined)
-      lastSpawn = Date.now();
-    const finished = [...contenders].filter(contenderFinished2);
-    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)
-      return yield* Effect.fail(failure);
-    if (failure === undefined && contenders.size < 2 && Date.now() - lastSpawn >= spawnDelay) {
+    const failed = pool.reap();
+    if (failed !== undefined)
+      return yield* Effect.fail(failed);
+    if (pool.shouldRecruit(info !== undefined)) {
       yield* announce("missing");
-      contenders.add(yield* spawnContender);
-      lastSpawn = Date.now();
+      pool.add(yield* spawnContender);
     }
     return Option.none();
   }).pipe(Effect.repeat({
     until: Option.isSome,
     schedule: Schedule.spaced(timing.pollInterval).pipe(Schedule.upTo({ duration: timing.promiseTimeout }))
-  }), Effect.ensuring(Effect.sync(() => contenders.forEach((contender) => contender.release()))));
+  }), Effect.ensuring(Effect.sync(() => pool.releaseAll())));
   if (Option.isNone(found))
-    return yield* Effect.fail(failure ?? new Error("Timed out waiting for the background service to start"));
+    return yield* Effect.fail(pool.failure() ?? new Error("Timed out waiting for the background service to start"));
   return found.value.endpoint;
 });
 var stop = Effect.fn("service.stop")(function* (options = {}) {
   const info = yield* read(options.file);
-  yield* Effect.tryPromise(() => options.pty === "handoff" && info !== undefined ? prepare2(options.file ?? fallback(), info, defaultEnsureTiming2.requestTimeout) : clear2(options.file ?? fallback())).pipe(Effect.catch((cause) => Effect.logWarning("Failed to prepare persistent terminals for replacement", cause)));
+  yield* Effect.tryPromise(() => options.pty === "handoff" && info !== undefined ? prepare2(options.file ?? fallback2(), info, defaultEnsureTiming2.requestTimeout) : clear2(options.file ?? fallback2())).pipe(Effect.catch((cause) => Effect.logWarning("Failed to prepare persistent terminals for replacement", cause)));
   if (info !== undefined)
     yield* terminate(info, options, ensureTiming2(options));
 });
-function fallback() {
-  const state = process.env["XDG_STATE_HOME"] ?? join(homedir(), ".local", "state");
-  return join(state, "opencode", "service.json");
-}
-function headers(endpoint) {
-  if (endpoint.auth === undefined)
-    return;
-  return { authorization: "Basic " + btoa(endpoint.auth.username + ":" + endpoint.auth.password) };
-}
 var Info = Schema.Struct({
   id: Schema.optional(Schema.String),
   version: Schema.optional(Schema.String),
@@ -172,69 +143,18 @@ var Info = Schema.Struct({
   password: Schema.optional(Schema.String)
 });
 var decode = Schema.decodeUnknownEffect(Schema.fromJsonString(Info));
-var decodeInfo = Schema.decodeUnknownOption(Schema.Struct({
-  version: Schema.String,
-  pid: Schema.Int.check(Schema.isGreaterThanOrEqualTo(0))
-}));
 var read = Effect.fnUntraced(function* (file) {
   const fs = yield* FileSystem.FileSystem;
-  const text = yield* fs.readFileString(file ?? fallback()).pipe(Effect.option);
+  const text = yield* fs.readFileString(file ?? fallback2()).pipe(Effect.option);
   if (Option.isNone(text))
     return;
   return yield* decode(text.value).pipe(Effect.option, Effect.map(Option.getOrUndefined));
 });
-var probe = Effect.fnUntraced(function* (info) {
-  return (yield* probeResult(info)).service;
-});
-var probeResult = Effect.fnUntraced(function* (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 = yield* Effect.promise(() => 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 body = result.value.body;
-  const serverInfo = decodeInfo(body);
-  if (Option.isSome(serverInfo)) {
-    if (serverInfo.value.pid !== info.pid)
-      return { service: undefined, timedOut: false };
-    if (info.version !== undefined && serverInfo.value.version !== info.version)
-      return { service: undefined, timedOut: false };
-    return {
-      service: {
-        info,
-        endpoint,
-        version: serverInfo.value.version,
-        state: response.ok ? "ready" : response.status === 500 ? "failed" : "waiting",
-        compatible: true
-      },
-      timedOut: false
-    };
-  }
-  return { service: undefined, timedOut: false };
-});
 var registered = Effect.fnUntraced(function* (file, timeout) {
   const info = yield* read(file);
   if (info === undefined)
     return { info: undefined, service: undefined, timedOut: false };
-  return { info, ...yield* probeResult(info, timeout) };
+  return { info, ...yield* Effect.promise(() => probeResult2(info, timeout)) };
 });
 var poll = (timing) => Schedule.max([Schedule.spaced(timing.stopPollInterval), Schedule.recurs(timing.stopPollAttempts)]);
 var signal = (pid, name) => Effect.try({ try: () => process.kill(pid, name), catch: (cause) => cause }).pipe(Effect.ignore);
@@ -244,12 +164,9 @@ var stopped = Effect.fnUntraced(function* (pid) {
     return true;
   return yield* Effect.fail(new Error(`Server process ${pid} is still running`));
 });
-function same(left, right) {
-  return left.id === right.id && left.version === right.version && left.url === right.url && left.pid === right.pid;
-}
 var terminate = Effect.fnUntraced(function* (info, options, timing) {
   const current = yield* read(options.file);
-  if (current === undefined || !same(current, info))
+  if (current === undefined || !same2(current, info))
     return;
   yield* signal(info.pid, "SIGTERM");
   const done = yield* stopped(info.pid).pipe(Effect.retry(poll(timing)), Effect.option);
@@ -258,18 +175,18 @@ var terminate = Effect.fnUntraced(function* (info, options, timing) {
     yield* stopped(info.pid).pipe(Effect.retry(poll(timing)));
   }
   const latest = yield* read(options.file);
-  if (latest === undefined || !same(latest, info))
+  if (latest === undefined || !same2(latest, info))
     return;
   const fs = yield* FileSystem.FileSystem;
-  yield* fs.remove(options.file ?? fallback()).pipe(Effect.ignore);
+  yield* fs.remove(options.file ?? fallback2()).pipe(Effect.ignore);
 });
-var Service = { discover, incumbent, ensure, stop, headers, Info };
+var Service = { discover, incumbent, ensure, stop, headers: headers2, Info };
 export {
   Info,
   Service,
   discover,
   ensure,
-  headers,
+  headers2 as headers,
   incumbent,
   stop
 };

package/dist/promise/client.js

@@ -1,14 +1,14 @@
 import {
-  make5,
-  exports_client3
-} from "../chunks/service-version-gah0fg5v.js";
-import"../chunks/service-version-vyas3vgt.js";
-import"../chunks/service-version-nyqggzs9.js";
-import"../chunks/service-version-nwcpakzx.js";
-import"../chunks/service-version-1y4a697q.js";
-import"../chunks/service-version-vt9jbch8.js";
-import"../chunks/service-version-frbwqjmf.js";
+  make2,
+  exports_client
+} from "../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 {
-  exports_client3 as OpenCode,
-  make5 as make
+  exports_client as OpenCode,
+  make2 as make
 };

package/dist/promise/generated/client-error.js

@@ -1,6 +1,6 @@
 import {
-  ClientError3
-} from "../../chunks/service-version-nwcpakzx.js";
+  ClientError2
+} from "../../chunks/pty-handoff-js54wxgp.js";
 export {
-  ClientError3 as ClientError
+  ClientError2 as ClientError
 };

package/dist/promise/generated/client.js

@@ -1,7 +1,7 @@
 import {
-  make6
-} from "../../chunks/service-version-nyqggzs9.js";
-import"../../chunks/service-version-nwcpakzx.js";
+  make3
+} from "../../chunks/pty-handoff-qzsnm4q8.js";
+import"../../chunks/pty-handoff-js54wxgp.js";
 export {
-  make6 as make
+  make3 as make
 };

package/dist/promise/generated/index.js

@@ -1,10 +1,10 @@
-import"../../chunks/service-version-vyas3vgt.js";
+import"../../chunks/pty-handoff-vyas3vgt.js";
 import {
-  exports_client4
-} from "../../chunks/service-version-nyqggzs9.js";
+  exports_client2
+} from "../../chunks/pty-handoff-qzsnm4q8.js";
 import {
-  ClientError3
-} from "../../chunks/service-version-nwcpakzx.js";
+  ClientError2
+} from "../../chunks/pty-handoff-js54wxgp.js";
 import {
   isInvalidRequestError2,
   isUnauthorizedError2,
@@ -39,10 +39,10 @@ import {
   isShellNotFoundError2,
   isWorktreeError2,
   isVcsInitNotSupportedError2
-} from "../../chunks/service-version-vt9jbch8.js";
+} from "../../chunks/pty-handoff-vt9jbch8.js";
 export {
-  ClientError3 as ClientError,
-  exports_client4 as OpenCode,
+  ClientError2 as ClientError,
+  exports_client2 as OpenCode,
   isAgentNotFoundError2 as isAgentNotFoundError,
   isCommandExecutionError2 as isCommandExecutionError,
   isCommandNotFoundError2 as isCommandNotFoundError,

package/dist/promise/generated/types.js

@@ -32,7 +32,7 @@ import {
   isShellNotFoundError2,
   isWorktreeError2,
   isVcsInitNotSupportedError2
-} from "../../chunks/service-version-vt9jbch8.js";
+} from "../../chunks/pty-handoff-vt9jbch8.js";
 export {
   isAgentNotFoundError2 as isAgentNotFoundError,
   isCommandExecutionError2 as isCommandExecutionError,

package/dist/promise/index.js

@@ -1,13 +1,13 @@
-import"../chunks/service-version-m2eywc8w.js";
+import"../chunks/pty-handoff-m2eywc8w.js";
 import {
-  exports_client3
-} from "../chunks/service-version-gah0fg5v.js";
-import"../chunks/service-version-vyas3vgt.js";
-import"../chunks/service-version-nyqggzs9.js";
+  exports_client
+} from "../chunks/pty-handoff-cqfz2qxq.js";
+import"../chunks/pty-handoff-vyas3vgt.js";
+import"../chunks/pty-handoff-qzsnm4q8.js";
 import {
-  ClientError3
-} from "../chunks/service-version-nwcpakzx.js";
-import"../chunks/service-version-1y4a697q.js";
+  ClientError2
+} from "../chunks/pty-handoff-js54wxgp.js";
+import"../chunks/pty-handoff-1y4a697q.js";
 import {
   isInvalidRequestError2,
   isUnauthorizedError2,
@@ -42,11 +42,11 @@ import {
   isShellNotFoundError2,
   isWorktreeError2,
   isVcsInitNotSupportedError2
-} from "../chunks/service-version-vt9jbch8.js";
-import"../chunks/service-version-frbwqjmf.js";
+} from "../chunks/pty-handoff-vt9jbch8.js";
+import"../chunks/pty-handoff-frbwqjmf.js";
 export {
-  ClientError3 as ClientError,
-  exports_client3 as OpenCode,
+  ClientError2 as ClientError,
+  exports_client as OpenCode,
   isAgentNotFoundError2 as isAgentNotFoundError,
   isCommandExecutionError2 as isCommandExecutionError,
   isCommandNotFoundError2 as isCommandNotFoundError,

package/dist/promise/rpc.js

@@ -1,7 +1,7 @@
 import {
   makeRpc2
-} from "../chunks/service-version-1y4a697q.js";
-import"../chunks/service-version-vt9jbch8.js";
+} from "../chunks/pty-handoff-1y4a697q.js";
+import"../chunks/pty-handoff-vt9jbch8.js";
 export {
   makeRpc2 as makeRpc
 };

package/dist/promise/service.d.ts

@@ -1,5 +1,7 @@
 import type { DiscoverOptions, Endpoint, EnsureOptions, StopOptions } from "../service.js";
+import { headers } from "../service-probe.js";
 export * from "../service.js";
+export { headers };
 /** Discover a healthy, compatible local service without starting one. */
 export declare function discover(options?: DiscoverOptions): Promise<{
     url: string;
@@ -13,10 +15,6 @@ export declare function discover(options?: DiscoverOptions): Promise<{
 export declare function ensure(options?: EnsureOptions): Promise<Endpoint>;
 /** Stop the registered local service. */
 export declare function stop(options?: StopOptions): Promise<void>;
-/** Create HTTP authentication headers for a service endpoint. */
-export declare function headers(endpoint: Endpoint): {
-    authorization: string;
-} | undefined;
 /** Promise-based local service lifecycle operations. */
 export declare const Service: {
     discover: typeof discover;