@opencode/client 2.0.22 → 2.0.24

package/dist/chunks/{service-contender-1tbj6z39.js → pty-handoff-1y4a697q.js}

@@ -1,7 +1,7 @@
 import {
   isRpcError2,
   isRpcInternalError2
-} from "./service-contender-4tveyqeh.js";
+} from "./pty-handoff-vt9jbch8.js";
 
 // src/promise/rpc.ts
 function makeRpc2(raw, events) {

package/dist/chunks/{service-contender-mxz277s4.js → pty-handoff-5yf5aaev.js}

@@ -1,23 +1,23 @@
 import {
   ClientApi2
-} from "./service-contender-vmytr4q8.js";
+} from "./pty-handoff-vmytr4q8.js";
 import {
-  ClientError2
-} from "./service-contender-y2etg5bs.js";
+  ClientError3
+} from "./pty-handoff-7f0py9js.js";
 import {
   __export
-} from "./service-contender-9rqn6x4v.js";
+} from "./pty-handoff-9rqn6x4v.js";
 
 // src/effect/generated/client.ts
-var exports_client2 = {};
-__export(exports_client2, {
-  make: () => make3
+var exports_client4 = {};
+__export(exports_client4, {
+  make: () => make5
 });
 import { Effect, Stream, Schema } from "effect";
 import { Sse } from "effect/unstable/encoding";
 import { HttpClientError } from "effect/unstable/http";
 import { HttpApiClient } from "effect/unstable/httpapi";
-var mapClientError = (error) => HttpClientError.isHttpClientError(error) || Schema.isSchemaError(error) || Sse.Retry.is(error) ? new ClientError2({ cause: error }) : error;
+var mapClientError = (error) => HttpClientError.isHttpClientError(error) || Schema.isSchemaError(error) || Sse.Retry.is(error) ? new ClientError3({ cause: error }) : error;
 var preserveEffect = () => (effect) => effect;
 var preserveStream = () => (stream) => stream;
 var EndpointServerInfo = (raw) => () => preserveEffect()(raw["server.info"]({}).pipe(Effect.mapError(mapClientError)));
@@ -539,6 +539,7 @@ var adaptGroupWorktree = (raw) => ({
   remove: EndpointWorktreeRemove(raw),
   refresh: EndpointWorktreeRefresh(raw)
 });
+var EndpointVcsInit = (raw) => (input) => preserveEffect()(raw["vcs.init"]({ query: { location: input?.["location"], provider: input?.["provider"] } }).pipe(Effect.mapError(mapClientError)));
 var EndpointVcsGet = (raw) => (input) => preserveEffect()(raw["vcs.get"]({ query: { location: input?.["location"] } }).pipe(Effect.mapError(mapClientError)));
 var EndpointVcsBase = (raw) => (input) => preserveEffect()(raw["vcs.base"]({ query: { location: input?.["location"] } }).pipe(Effect.mapError(mapClientError)));
 var EndpointVcsStatus = (raw) => (input) => preserveEffect()(raw["vcs.status"]({ query: { location: input?.["location"] } }).pipe(Effect.mapError(mapClientError)));
@@ -549,6 +550,7 @@ var EndpointVcsDiff = (raw) => (input) => preserveEffect()(raw["vcs.diff"]({
   query: { location: input["location"], mode: input["mode"], base: input["base"], context: input["context"] }
 }).pipe(Effect.mapError(mapClientError)));
 var adaptGroupVcs = (raw) => ({
+  init: EndpointVcsInit(raw),
   get: EndpointVcsGet(raw),
   base: EndpointVcsBase(raw),
   status: EndpointVcsStatus(raw),
@@ -611,6 +613,6 @@ var adaptClient = (raw) => ({
   websearch: adaptGroupWebsearch(raw["server.websearch"]),
   config: adaptGroupConfig(raw["server.config"])
 });
-var make3 = (options) => HttpApiClient.make(ClientApi2, options).pipe(Effect.map(adaptClient));
+var make5 = (options) => HttpApiClient.make(ClientApi2, options).pipe(Effect.map(adaptClient));
 
-export { make3, exports_client2 };
+export { make5, exports_client4 };

package/dist/chunks/{service-contender-1kn39gq3.js → pty-handoff-71wkqa80.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./service-contender-9rqn6x4v.js";
+} from "./pty-handoff-9rqn6x4v.js";
 
 // src/pty-handoff.ts
 var exports_pty_handoff = {};
@@ -16,38 +16,31 @@ async function prepare2(file, info, timeout) {
   const existing = await read(file);
   if (existing !== undefined && existing.expiresAt > Date.now() && same(existing.source, info))
     return;
-  const { ClientError, OpenCode } = await import("../promise/index.js");
+  const { OpenCode } = await import("../promise/index.js");
   const client = OpenCode.make({
     baseUrl: info.url,
     headers: info.password === undefined ? undefined : { authorization: "Basic " + Buffer.from(`opencode:${info.password}`).toString("base64") }
   });
-  const missing = (error) => error instanceof ClientError && error.reason === "UnexpectedStatus" && typeof error.cause === "object" && error.cause !== null && ("status" in error.cause) && error.cause.status === 404;
-  const result = await client.experimental.persistentPty.handoff({ signal: AbortSignal.timeout(timeout) }).then((value) => ({ value }), (cause) => ({ cause }));
-  if ("cause" in result) {
+  const handoff = await client.experimental.persistentPty.handoff({ signal: AbortSignal.timeout(timeout) }).then(parse).catch(async (cause) => {
     const concurrent = await read(file);
     if (concurrent !== undefined && concurrent.expiresAt > Date.now() && same(concurrent.source, info))
       return;
-    if (!missing(result.cause))
-      throw new Error("Failed to prepare persistent terminals for service replacement", { cause: result.cause });
-    console.warn("Background service cannot hand off persistent terminals; shutting them down before replacement");
-    await client.experimental.persistentPty.shutdown({ signal: AbortSignal.timeout(timeout) }).catch((cause) => {
-      if (missing(cause))
-        return;
-      throw new Error("Failed to shut down persistent terminals before service replacement", { cause });
-    });
-    await publish(file, info, null);
+    console.warn("Background service cannot hand off persistent terminals; shutting them down before replacement", cause);
+    await client.experimental.persistentPty.shutdown({ signal: AbortSignal.timeout(timeout) }).catch(() => {});
+    return null;
+  });
+  if (handoff === undefined)
     return;
-  }
-  const body = result.value;
+  await publish(file, info, handoff).catch((cause) => console.warn("Failed to publish persistent terminal handoff", cause));
+}
+function parse(body) {
   if (typeof body !== "object" || body === null || !("handoff" in body))
     throw new Error("Invalid persistent terminal handoff response");
-  if (body.handoff === null) {
-    await publish(file, info, null);
-    return;
-  }
+  if (body.handoff === null)
+    return null;
   if (!isHandoff(body.handoff) || body.handoff.expiresAt <= Date.now())
     throw new Error("Invalid or expired persistent terminal handoff");
-  await publish(file, info, body.handoff);
+  return body.handoff;
 }
 async function publish(file, info, handoff) {
   const temporary = `${file}.pty-handoff.${crypto.randomUUID()}.tmp`;

package/dist/chunks/{service-contender-y2etg5bs.js → pty-handoff-7f0py9js.js}

@@ -1,9 +1,9 @@
 // src/effect/generated/client-error.ts
 import { Schema } from "effect";
 
-class ClientError2 extends Schema.TaggedError()("ClientError", {
+class ClientError3 extends Schema.TaggedError()("ClientError", {
   cause: Schema.Defect()
 }) {
 }
 
-export { ClientError2 };
+export { ClientError3 };

package/dist/chunks/pty-handoff-ank0d71z.js

@@ -0,0 +1,75 @@
+import {
+  defaultEnsureTiming2
+} from "./pty-handoff-xgnj2w4v.js";
+
+// src/service-probe.ts
+import { homedir } from "node:os";
+import { join } from "node:path";
+function fallback2() {
+  return join(process.env["XDG_STATE_HOME"] ?? join(homedir(), ".local", "state"), "opencode", "service.json");
+}
+function same2(left, right) {
+  return left.id === right.id && left.version === right.version && left.url === right.url && left.pid === right.pid;
+}
+async function probeResult2(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: headers2(endpoint), signal }).then(async (response) => ({
+    response,
+    body: response.status === 404 ? undefined : await response.json()
+  })).catch(() => {
+    return;
+  });
+  if (result === undefined)
+    return { service: undefined, timedOut: signal.aborted };
+  const response = result.response;
+  if (response.status === 404)
+    return {
+      service: {
+        info,
+        endpoint,
+        version: info.version,
+        state: "ready",
+        compatible: false
+      },
+      timedOut: false
+    };
+  const serverInfo = decodeInfo(result.body);
+  if (serverInfo === undefined)
+    return { service: undefined, timedOut: false };
+  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
+  };
+}
+function headers2(endpoint) {
+  if (endpoint.auth === undefined)
+    return;
+  return {
+    authorization: "Basic " + Buffer.from(endpoint.auth.username + ":" + endpoint.auth.password).toString("base64")
+  };
+}
+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 };
+}
+
+export { fallback2, same2, probeResult2, headers2 };

package/dist/chunks/pty-handoff-cqfz2qxq.js

@@ -0,0 +1,30 @@
+import {
+  make7
+} from "./pty-handoff-frbwqjmf.js";
+import {
+  make3
+} from "./pty-handoff-qzsnm4q8.js";
+import {
+  makeRpc2
+} from "./pty-handoff-1y4a697q.js";
+import {
+  __export
+} from "./pty-handoff-9rqn6x4v.js";
+
+// src/promise/client.ts
+var exports_client = {};
+__export(exports_client, {
+  OpenCode: () => exports_client,
+  make: () => make2
+});
+function make2(options) {
+  const raw = make3(options);
+  const events = make7((signal, onActivity) => raw.event.subscribe({ signal, onActivity }));
+  return {
+    ...raw,
+    rpc: Object.assign(makeRpc2(raw, events), raw.rpc),
+    event: events
+  };
+}
+
+export { make2, exports_client };

package/dist/chunks/{service-contender-frbwqjmf.js → pty-handoff-frbwqjmf.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./service-contender-9rqn6x4v.js";
+} from "./pty-handoff-9rqn6x4v.js";
 
 // src/shared-events.ts
 var exports_shared_events = {};

package/dist/chunks/{service-contender-nwcpakzx.js → pty-handoff-js54wxgp.js}

@@ -1,5 +1,5 @@
 // src/promise/generated/client-error.ts
-class ClientError3 extends Error {
+class ClientError2 extends Error {
   reason;
   name = "ClientError";
   constructor(reason, options) {
@@ -9,4 +9,4 @@ class ClientError3 extends Error {
   }
 }
 
-export { ClientError3 };
+export { ClientError2 };

package/dist/chunks/{service-contender-krgmp8b6.js → pty-handoff-myyn5x39.js}

@@ -1,25 +1,25 @@
 import {
   make7
-} from "./service-contender-frbwqjmf.js";
+} from "./pty-handoff-frbwqjmf.js";
 import {
-  ClientError2
-} from "./service-contender-y2etg5bs.js";
+  ClientError3
+} from "./pty-handoff-7f0py9js.js";
 import {
-  make3
-} from "./service-contender-mxz277s4.js";
+  make5
+} from "./pty-handoff-5yf5aaev.js";
 import {
-  make4,
+  make6,
   aborted2
-} from "./service-contender-z6qdwcsf.js";
+} from "./pty-handoff-w1w809zr.js";
 import {
   __export
-} from "./service-contender-9rqn6x4v.js";
+} from "./pty-handoff-9rqn6x4v.js";
 
 // src/effect/client.ts
-var exports_client = {};
-__export(exports_client, {
-  OpenCode: () => exports_client,
-  make: () => make2
+var exports_client3 = {};
+__export(exports_client3, {
+  OpenCode: () => exports_client3,
+  make: () => make4
 });
 import { Cause, Context, Effect, Stream } from "effect";
 import { HttpClient, HttpClientRequest } from "effect/unstable/http";
@@ -28,9 +28,9 @@ var CurrentHeaders = Context.Reference("@opencode/client/effect/rpc/headers", {
     return;
   }
 });
-var make2 = Effect.fn("OpenCode.make")(function* (options) {
+var make4 = Effect.fn("OpenCode.make")(function* (options) {
   const httpClient = yield* HttpClient.HttpClient;
-  const raw = yield* make3(options).pipe(Effect.provideService(HttpClient.HttpClient, HttpClient.mapRequestEffect(httpClient, (request) => Effect.map(CurrentHeaders, (headers) => headers ? HttpClientRequest.setHeaders(request, new Headers(headers)) : request))));
+  const raw = yield* make5(options).pipe(Effect.provideService(HttpClient.HttpClient, HttpClient.mapRequestEffect(httpClient, (request) => Effect.map(CurrentHeaders, (headers) => headers ? HttpClientRequest.setHeaders(request, new Headers(headers)) : request))));
   const context = yield* Effect.context();
   const native = raw.event.subscribe();
 
@@ -41,12 +41,12 @@ var make2 = Effect.fn("OpenCode.make")(function* (options) {
     }
   }
   const shared = make7((signal) => Stream.toAsyncIterableWith(native.pipe(Stream.interruptWhen(aborted2(signal)), Stream.catchCause((cause) => Stream.fail(new EventFailure(cause)))), context));
-  const subscribe = () => Stream.fromAsyncIterable(shared.subscribe(), (error) => error).pipe(Stream.catch((error) => Stream.failCause(error instanceof EventFailure ? error.cause : Cause.fail(new ClientError2({ cause: error })))));
+  const subscribe = () => Stream.fromAsyncIterable(shared.subscribe(), (error) => error).pipe(Stream.catch((error) => Stream.failCause(error instanceof EventFailure ? error.cause : Cause.fail(new ClientError3({ cause: error })))));
   return {
     ...raw,
     event: { ...raw.event, subscribe },
-    rpc: Object.assign(make4((input, options) => raw.rpc.call(input).pipe(Effect.provideService(CurrentHeaders, options?.headers)), subscribe), raw.rpc)
+    rpc: Object.assign(make6((input, options) => raw.rpc.call(input).pipe(Effect.provideService(CurrentHeaders, options?.headers)), subscribe), raw.rpc)
   };
 });
 
-export { make2, exports_client };
+export { make4, exports_client3 };