@opencode/client 2.0.22 → 2.0.23

package/dist/effect/service.js

@@ -2,21 +2,21 @@ import {
   spawnServiceContender2,
   contenderFailure2,
   contenderFinished2
-} from "../chunks/service-contender-txckps9j.js";
+} from "../chunks/service-version-6f43cgzz.js";
 import {
   defaultEnsureTiming2,
   ensureTiming2
-} from "../chunks/service-contender-xgnj2w4v.js";
+} from "../chunks/service-version-xgnj2w4v.js";
 import {
   matchesVersion2
-} from "../chunks/service-contender-sxt88q69.js";
+} from "../chunks/service-version-sxt88q69.js";
 import {
   prepare2,
   environment2,
   complete2,
   clear2
-} from "../chunks/service-contender-1kn39gq3.js";
-import"../chunks/service-contender-qav6mfdz.js";
+} from "../chunks/service-version-02j88w0z.js";
+import"../chunks/service-version-qav6mfdz.js";
 
 // src/effect/service.ts
 import { Effect, FileSystem, Option, Schedule, Schema } from "effect";
@@ -50,6 +50,7 @@ var ensure = Effect.fn("service.ensure")(function* (options = {}) {
   let announced = false;
   let lastSpawn = 0;
   let spawnDelay = timing.spawnDelay;
+  let failure;
   const announce = (reason, previousVersion) => Effect.sync(() => {
     if (announced)
       return;
@@ -82,6 +83,13 @@ var ensure = Effect.fn("service.ensure")(function* (options = {}) {
         yield* Effect.logWarning("Background service is unresponsive; recovery cannot preserve persistent terminals");
         yield* Effect.tryPromise(() => clear2(options.file ?? fallback()));
         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;
         timeouts = undefined;
         lastSpawn = Date.now() - spawnDelay;
       }
@@ -89,7 +97,10 @@ var ensure = Effect.fn("service.ensure")(function* (options = {}) {
       timeouts = undefined;
     if (service2 !== undefined) {
       spawnDelay = timing.spawnDelay;
-      const compatible = service2.compatible && matchesVersion2(service2.version, options);
+      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));
         return Option.some(service2);
@@ -105,19 +116,26 @@ 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;
       return Option.none();
     } else if (lastSpawn === 0 && info !== undefined)
       lastSpawn = Date.now();
     const finished = [...contenders].filter(contenderFinished2);
-    const failure = finished.map(contenderFailure2).find((error) => error !== undefined);
+    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 (contenders.size < 2 && Date.now() - lastSpawn >= spawnDelay) {
+    if (failure === undefined && contenders.size < 2 && Date.now() - lastSpawn >= spawnDelay) {
       yield* announce("missing");
       contenders.add(yield* spawnContender);
       lastSpawn = Date.now();
@@ -128,17 +146,14 @@ var ensure = Effect.fn("service.ensure")(function* (options = {}) {
     schedule: Schedule.spaced(timing.pollInterval).pipe(Schedule.upTo({ duration: timing.promiseTimeout }))
   }), Effect.ensuring(Effect.sync(() => contenders.forEach((contender) => contender.release()))));
   if (Option.isNone(found))
-    return yield* Effect.fail(new Error("Timed out waiting for the background service to start"));
+    return yield* Effect.fail(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);
-  if (options.pty === "handoff" && info !== undefined)
-    yield* Effect.tryPromise(() => prepare2(options.file ?? fallback(), info, defaultEnsureTiming2.requestTimeout));
-  else
-    yield* Effect.tryPromise(() => clear2(options.file ?? fallback()));
+  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)));
   if (info !== undefined)
-    yield* terminate(info, options, defaultEnsureTiming2);
+    yield* terminate(info, options, ensureTiming2(options));
 });
 function fallback() {
   const state = process.env["XDG_STATE_HOME"] ?? join(homedir(), ".local", "state");
@@ -239,9 +254,6 @@ var terminate = Effect.fnUntraced(function* (info, options, timing) {
   yield* signal(info.pid, "SIGTERM");
   const done = yield* stopped(info.pid).pipe(Effect.retry(poll(timing)), Effect.option);
   if (Option.isNone(done)) {
-    const latest = yield* read(options.file);
-    if (latest === undefined || !same(latest, info))
-      return;
     yield* signal(info.pid, "SIGKILL");
     yield* stopped(info.pid).pipe(Effect.retry(poll(timing)));
   }

package/dist/promise/client.d.ts

@@ -219,6 +219,7 @@ export declare function make(options: ClientOptions): {
         refresh: (input: import("./index.js").WorktreeRefreshInput, requestOptions?: OpenCode.RequestOptions) => Promise<void>;
     };
     vcs: {
+        init: (input?: import("./index.js").VcsInitInput, requestOptions?: OpenCode.RequestOptions) => Promise<void>;
         get: (input?: import("./index.js").VcsGetInput, requestOptions?: OpenCode.RequestOptions) => Promise<import("./index.js").VcsGetOutput>;
         base: (input?: import("./index.js").VcsBaseInput, requestOptions?: OpenCode.RequestOptions) => Promise<import("./index.js").VcsBaseOutput>;
         status: (input?: import("./index.js").VcsStatusInput, requestOptions?: OpenCode.RequestOptions) => Promise<import("./index.js").VcsStatusOutput>;

package/dist/promise/client.js

@@ -1,13 +1,13 @@
 import {
   make5,
   exports_client3
-} from "../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/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";
 export {
   exports_client3 as OpenCode,
   make5 as make

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

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

package/dist/promise/generated/client.d.ts

@@ -1,4 +1,4 @@
-import type { ServerConnectInput, LocationGetInput, AgentListInput, AgentListOutput, AgentGetInput, AgentGetOutput, PluginListInput, PluginListOutput, PluginCheckInput, PluginCheckOutput, PluginUpdateInput, SessionListInput, SessionStatsInput, SessionCreateInput, SessionImportInput, SessionExportInput, SessionGetInput, SessionRemoveInput, SessionForkInput, SessionSwitchAgentInput, SessionSwitchModelInput, SessionUpdateInput, SessionMoveInput, SessionPromptInput, SessionCommandInput, SessionSkillInput, SessionSyntheticInput, SessionShellInput, SessionCompactInput, SessionWaitInput, SessionRevertStageInput, SessionRevertClearInput, SessionRevertCommitInput, SessionContextInput, SessionDiffInput, SessionInboxListInput, SessionInboxCancelInput, SessionInboxUpdateInput, SessionInstructionsEntryListInput, SessionInstructionsEntryPutInput, SessionInstructionsEntryRemoveInput, SessionGenerateInput, SessionLogInput, SessionLogOutput, SessionInterruptInput, SessionBackgroundInput, SessionMessageGetInput, SessionFormListInput, SessionFormCreateInput, SessionFormGetInput, SessionFormReplyInput, SessionFormCancelInput, SessionEnvironmentInput, SessionViewInput, MessageListInput, ModelListInput, ModelListOutput, ModelDefaultInput, ModelDefaultOutput, GenerateTextInput, ProviderListInput, ProviderListOutput, ProviderGetInput, ProviderGetOutput, IntegrationListInput, IntegrationListOutput, IntegrationGetInput, IntegrationGetOutput, IntegrationWellknownAddInput, IntegrationConnectKeyInput, IntegrationOauthConnectInput, IntegrationOauthConnectOutput, IntegrationOauthStatusInput, IntegrationOauthStatusOutput, IntegrationOauthCompleteInput, IntegrationOauthCancelInput, IntegrationCommandConnectInput, IntegrationCommandConnectOutput, IntegrationCommandStatusInput, IntegrationCommandStatusOutput, IntegrationCommandCancelInput, McpListInput, McpListOutput, McpAddInput, McpRemoveInput, McpConnectInput, McpDisconnectInput, McpResourceCatalogInput, McpResourceCatalogOutput, CredentialCreateInput, CredentialUpdateInput, CredentialActivateInput, CredentialRemoveInput, ProjectListOutput, ProjectUpdateInput, FormListInput, FormListOutput, PermissionRequestListInput, PermissionRequestListOutput, PermissionSavedListInput, PermissionSavedRemoveInput, PermissionCreateInput, PermissionListInput, PermissionGetInput, PermissionReplyInput, FileReadInput, FileReadOutput, FileListInput, FileListOutput, FileFindInput, FileFindOutput, FileWriteInput, FileWriteOutput, CommandListInput, CommandListOutput, SkillListInput, SkillListOutput, RpcCallInput, EventSubscribeOutput, PtyListInput, PtyListOutput, PtyCreateInput, PtyCreateOutput, PtyGetInput, PtyGetOutput, PtyUpdateInput, PtyUpdateOutput, PtyRemoveInput, PtyConnectTokenInput, PtyConnectTokenOutput, ExperimentalPersistentPtyReadInput, ExperimentalPersistentPtyListInput, ExperimentalPersistentPtyCreateInput, ExperimentalPersistentPtyHandoffOutput, ExperimentalPersistentPtyGetInput, ExperimentalPersistentPtyUpdateInput, ExperimentalPersistentPtySnapshotInput, ExperimentalPersistentPtyRemoveInput, ExperimentalPersistentPtyConnectTokenInput, ShellListInput, ShellListOutput, ShellCreateInput, ShellCreateOutput, ShellGetInput, ShellGetOutput, ShellOutputInput, ShellOutputOutput, ShellRemoveInput, ReferenceListInput, ReferenceListOutput, WorktreeListInput, WorktreeCreateInput, WorktreeRemoveInput, WorktreeRefreshInput, VcsGetInput, VcsGetOutput, VcsBaseInput, VcsBaseOutput, VcsStatusInput, VcsStatusOutput, VcsBranchListInput, VcsBranchListOutput, VcsDiffInput, VcsDiffOutput, DebugLocationListOutput, DebugLocationEvictInput, MigrationV1StatusOutput, WebsearchProvidersInput, WebsearchProvidersOutput, WebsearchQueryInput, WebsearchQueryOutput, ConfigGetInput, ConfigGetOutput, ConfigShellsOutput, ConfigUpdateInput } from "./types.js";
+import type { ServerConnectInput, LocationGetInput, AgentListInput, AgentListOutput, AgentGetInput, AgentGetOutput, PluginListInput, PluginListOutput, PluginCheckInput, PluginCheckOutput, PluginUpdateInput, SessionListInput, SessionStatsInput, SessionCreateInput, SessionImportInput, SessionExportInput, SessionGetInput, SessionRemoveInput, SessionForkInput, SessionSwitchAgentInput, SessionSwitchModelInput, SessionUpdateInput, SessionMoveInput, SessionPromptInput, SessionCommandInput, SessionSkillInput, SessionSyntheticInput, SessionShellInput, SessionCompactInput, SessionWaitInput, SessionRevertStageInput, SessionRevertClearInput, SessionRevertCommitInput, SessionContextInput, SessionDiffInput, SessionInboxListInput, SessionInboxCancelInput, SessionInboxUpdateInput, SessionInstructionsEntryListInput, SessionInstructionsEntryPutInput, SessionInstructionsEntryRemoveInput, SessionGenerateInput, SessionLogInput, SessionLogOutput, SessionInterruptInput, SessionBackgroundInput, SessionMessageGetInput, SessionFormListInput, SessionFormCreateInput, SessionFormGetInput, SessionFormReplyInput, SessionFormCancelInput, SessionEnvironmentInput, SessionViewInput, MessageListInput, ModelListInput, ModelListOutput, ModelDefaultInput, ModelDefaultOutput, GenerateTextInput, ProviderListInput, ProviderListOutput, ProviderGetInput, ProviderGetOutput, IntegrationListInput, IntegrationListOutput, IntegrationGetInput, IntegrationGetOutput, IntegrationWellknownAddInput, IntegrationConnectKeyInput, IntegrationOauthConnectInput, IntegrationOauthConnectOutput, IntegrationOauthStatusInput, IntegrationOauthStatusOutput, IntegrationOauthCompleteInput, IntegrationOauthCancelInput, IntegrationCommandConnectInput, IntegrationCommandConnectOutput, IntegrationCommandStatusInput, IntegrationCommandStatusOutput, IntegrationCommandCancelInput, McpListInput, McpListOutput, McpAddInput, McpRemoveInput, McpConnectInput, McpDisconnectInput, McpResourceCatalogInput, McpResourceCatalogOutput, CredentialCreateInput, CredentialUpdateInput, CredentialActivateInput, CredentialRemoveInput, ProjectListOutput, ProjectUpdateInput, FormListInput, FormListOutput, PermissionRequestListInput, PermissionRequestListOutput, PermissionSavedListInput, PermissionSavedRemoveInput, PermissionCreateInput, PermissionListInput, PermissionGetInput, PermissionReplyInput, FileReadInput, FileReadOutput, FileListInput, FileListOutput, FileFindInput, FileFindOutput, FileWriteInput, FileWriteOutput, CommandListInput, CommandListOutput, SkillListInput, SkillListOutput, RpcCallInput, EventSubscribeOutput, PtyListInput, PtyListOutput, PtyCreateInput, PtyCreateOutput, PtyGetInput, PtyGetOutput, PtyUpdateInput, PtyUpdateOutput, PtyRemoveInput, PtyConnectTokenInput, PtyConnectTokenOutput, ExperimentalPersistentPtyReadInput, ExperimentalPersistentPtyListInput, ExperimentalPersistentPtyCreateInput, ExperimentalPersistentPtyHandoffOutput, ExperimentalPersistentPtyGetInput, ExperimentalPersistentPtyUpdateInput, ExperimentalPersistentPtySnapshotInput, ExperimentalPersistentPtyRemoveInput, ExperimentalPersistentPtyConnectTokenInput, ShellListInput, ShellListOutput, ShellCreateInput, ShellCreateOutput, ShellGetInput, ShellGetOutput, ShellOutputInput, ShellOutputOutput, ShellRemoveInput, ReferenceListInput, ReferenceListOutput, WorktreeListInput, WorktreeCreateInput, WorktreeRemoveInput, WorktreeRefreshInput, VcsInitInput, VcsGetInput, VcsGetOutput, VcsBaseInput, VcsBaseOutput, VcsStatusInput, VcsStatusOutput, VcsBranchListInput, VcsBranchListOutput, VcsDiffInput, VcsDiffOutput, DebugLocationListOutput, DebugLocationEvictInput, MigrationV1StatusOutput, WebsearchProvidersInput, WebsearchProvidersOutput, WebsearchQueryInput, WebsearchQueryOutput, ConfigGetInput, ConfigGetOutput, ConfigShellsOutput, ConfigUpdateInput } from "./types.js";
 export interface ClientOptions {
     readonly baseUrl: string;
     readonly fetch?: typeof globalThis.fetch;
@@ -226,6 +226,7 @@ export declare function make(options: ClientOptions): {
         refresh: (input: WorktreeRefreshInput, requestOptions?: RequestOptions) => Promise<void>;
     };
     vcs: {
+        init: (input?: VcsInitInput, requestOptions?: RequestOptions) => Promise<void>;
         get: (input?: VcsGetInput, requestOptions?: RequestOptions) => Promise<VcsGetOutput>;
         base: (input?: VcsBaseInput, requestOptions?: RequestOptions) => Promise<VcsBaseOutput>;
         status: (input?: VcsStatusInput, requestOptions?: RequestOptions) => Promise<VcsStatusOutput>;

package/dist/promise/generated/client.js

@@ -1,7 +1,7 @@
 import {
   make6
-} from "../../chunks/service-contender-50fct660.js";
-import"../../chunks/service-contender-nwcpakzx.js";
+} from "../../chunks/service-version-nyqggzs9.js";
+import"../../chunks/service-version-nwcpakzx.js";
 export {
   make6 as make
 };

package/dist/promise/generated/index.js

@@ -1,13 +1,14 @@
-import"../../chunks/service-contender-vyas3vgt.js";
+import"../../chunks/service-version-vyas3vgt.js";
 import {
   exports_client4
-} from "../../chunks/service-contender-50fct660.js";
+} from "../../chunks/service-version-nyqggzs9.js";
 import {
   ClientError3
-} from "../../chunks/service-contender-nwcpakzx.js";
+} from "../../chunks/service-version-nwcpakzx.js";
 import {
   isInvalidRequestError2,
   isUnauthorizedError2,
+  isLocationNotFoundError2,
   isServiceUnavailableError2,
   isAgentNotFoundError2,
   isInvalidCursorError2,
@@ -36,8 +37,9 @@ import {
   isPtyNotFoundError2,
   isForbiddenError2,
   isShellNotFoundError2,
-  isWorktreeError2
-} from "../../chunks/service-contender-4tveyqeh.js";
+  isWorktreeError2,
+  isVcsInitNotSupportedError2
+} from "../../chunks/service-version-vt9jbch8.js";
 export {
   ClientError3 as ClientError,
   exports_client4 as OpenCode,
@@ -56,6 +58,7 @@ export {
   isIntegrationNotFoundError2 as isIntegrationNotFoundError,
   isInvalidCursorError2 as isInvalidCursorError,
   isInvalidRequestError2 as isInvalidRequestError,
+  isLocationNotFoundError2 as isLocationNotFoundError,
   isMcpServerNotFoundError2 as isMcpServerNotFoundError,
   isMessageNotFoundError2 as isMessageNotFoundError,
   isPermissionNotFoundError2 as isPermissionNotFoundError,
@@ -71,5 +74,6 @@ export {
   isSkillNotFoundError2 as isSkillNotFoundError,
   isUnauthorizedError2 as isUnauthorizedError,
   isUnknownError2 as isUnknownError,
+  isVcsInitNotSupportedError2 as isVcsInitNotSupportedError,
   isWorktreeError2 as isWorktreeError
 };

package/dist/promise/generated/types.d.ts

@@ -8,6 +8,9 @@ export type ServerInfo = {
     paths: {
         tmp: string;
     };
+    capabilities?: {
+        persistentPty?: boolean | undefined;
+    } | undefined;
 };
 export type PairingCode = {
     code: string;
@@ -3365,6 +3368,14 @@ export type UnauthorizedError = {
     readonly message: string;
 };
 export declare const isUnauthorizedError: (value: unknown) => value is UnauthorizedError;
+export type LocationNotFoundError = {
+    readonly _tag: "LocationNotFoundError";
+    readonly location: {
+        readonly directory: string;
+    };
+    readonly message: string;
+};
+export declare const isLocationNotFoundError: (value: unknown) => value is LocationNotFoundError;
 export type ServiceUnavailableError = {
     readonly _tag: "ServiceUnavailableError";
     readonly message: string;
@@ -3538,6 +3549,7 @@ export type ShellNotFoundError = {
 };
 export declare const isShellNotFoundError: (value: unknown) => value is ShellNotFoundError;
 export type WorktreeError = {
+    readonly _tag: "WorktreeError";
     readonly name: "WorktreeError";
     readonly data: {
         readonly message: string;
@@ -3545,6 +3557,12 @@ export type WorktreeError = {
     };
 };
 export declare const isWorktreeError: (value: unknown) => value is WorktreeError;
+export type VcsInitNotSupportedError = {
+    readonly _tag: "VcsInitNotSupportedError";
+    readonly providerID: string;
+    readonly message: string;
+};
+export declare const isVcsInitNotSupportedError: (value: unknown) => value is VcsInitNotSupportedError;
 export type ServerInfoOutput = ServerInfo;
 export type ServerPairOutput = PairingCode;
 export type ServerConnectInput = {
@@ -8577,6 +8595,21 @@ export type WorktreeRefreshInput = {
     }["projectID"];
 };
 export type WorktreeRefreshOutput = void;
+export type VcsInitInput = {
+    readonly location?: {
+        readonly location?: {
+            readonly directory?: string | undefined;
+        } | undefined;
+        readonly provider?: string | undefined;
+    }["location"];
+    readonly provider?: {
+        readonly location?: {
+            readonly directory?: string | undefined;
+        } | undefined;
+        readonly provider?: string | undefined;
+    }["provider"];
+};
+export type VcsInitOutput = void;
 export type VcsGetInput = {
     readonly location?: {
         readonly location?: {

package/dist/promise/generated/types.js

@@ -1,6 +1,7 @@
 import {
   isInvalidRequestError2,
   isUnauthorizedError2,
+  isLocationNotFoundError2,
   isServiceUnavailableError2,
   isAgentNotFoundError2,
   isInvalidCursorError2,
@@ -29,8 +30,9 @@ import {
   isPtyNotFoundError2,
   isForbiddenError2,
   isShellNotFoundError2,
-  isWorktreeError2
-} from "../../chunks/service-contender-4tveyqeh.js";
+  isWorktreeError2,
+  isVcsInitNotSupportedError2
+} from "../../chunks/service-version-vt9jbch8.js";
 export {
   isAgentNotFoundError2 as isAgentNotFoundError,
   isCommandExecutionError2 as isCommandExecutionError,
@@ -47,6 +49,7 @@ export {
   isIntegrationNotFoundError2 as isIntegrationNotFoundError,
   isInvalidCursorError2 as isInvalidCursorError,
   isInvalidRequestError2 as isInvalidRequestError,
+  isLocationNotFoundError2 as isLocationNotFoundError,
   isMcpServerNotFoundError2 as isMcpServerNotFoundError,
   isMessageNotFoundError2 as isMessageNotFoundError,
   isPermissionNotFoundError2 as isPermissionNotFoundError,
@@ -62,5 +65,6 @@ export {
   isSkillNotFoundError2 as isSkillNotFoundError,
   isUnauthorizedError2 as isUnauthorizedError,
   isUnknownError2 as isUnknownError,
+  isVcsInitNotSupportedError2 as isVcsInitNotSupportedError,
   isWorktreeError2 as isWorktreeError
 };

package/dist/promise/index.js

@@ -1,16 +1,17 @@
-import"../chunks/service-contender-m2eywc8w.js";
+import"../chunks/service-version-m2eywc8w.js";
 import {
   exports_client3
-} from "../chunks/service-contender-992ffpa9.js";
-import"../chunks/service-contender-vyas3vgt.js";
-import"../chunks/service-contender-50fct660.js";
+} from "../chunks/service-version-gah0fg5v.js";
+import"../chunks/service-version-vyas3vgt.js";
+import"../chunks/service-version-nyqggzs9.js";
 import {
   ClientError3
-} from "../chunks/service-contender-nwcpakzx.js";
-import"../chunks/service-contender-1tbj6z39.js";
+} from "../chunks/service-version-nwcpakzx.js";
+import"../chunks/service-version-1y4a697q.js";
 import {
   isInvalidRequestError2,
   isUnauthorizedError2,
+  isLocationNotFoundError2,
   isServiceUnavailableError2,
   isAgentNotFoundError2,
   isInvalidCursorError2,
@@ -39,9 +40,10 @@ import {
   isPtyNotFoundError2,
   isForbiddenError2,
   isShellNotFoundError2,
-  isWorktreeError2
-} from "../chunks/service-contender-4tveyqeh.js";
-import"../chunks/service-contender-frbwqjmf.js";
+  isWorktreeError2,
+  isVcsInitNotSupportedError2
+} from "../chunks/service-version-vt9jbch8.js";
+import"../chunks/service-version-frbwqjmf.js";
 export {
   ClientError3 as ClientError,
   exports_client3 as OpenCode,
@@ -60,6 +62,7 @@ export {
   isIntegrationNotFoundError2 as isIntegrationNotFoundError,
   isInvalidCursorError2 as isInvalidCursorError,
   isInvalidRequestError2 as isInvalidRequestError,
+  isLocationNotFoundError2 as isLocationNotFoundError,
   isMcpServerNotFoundError2 as isMcpServerNotFoundError,
   isMessageNotFoundError2 as isMessageNotFoundError,
   isPermissionNotFoundError2 as isPermissionNotFoundError,
@@ -75,5 +78,6 @@ export {
   isSkillNotFoundError2 as isSkillNotFoundError,
   isUnauthorizedError2 as isUnauthorizedError,
   isUnknownError2 as isUnknownError,
+  isVcsInitNotSupportedError2 as isVcsInitNotSupportedError,
   isWorktreeError2 as isWorktreeError
 };

package/dist/promise/rpc.js

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

package/dist/promise/service.js

@@ -2,21 +2,21 @@ import {
   spawnServiceContender2,
   contenderFailure2,
   contenderFinished2
-} from "../chunks/service-contender-txckps9j.js";
+} from "../chunks/service-version-6f43cgzz.js";
 import {
   defaultEnsureTiming2,
   ensureTiming2
-} from "../chunks/service-contender-xgnj2w4v.js";
+} from "../chunks/service-version-xgnj2w4v.js";
 import {
   matchesVersion2
-} from "../chunks/service-contender-sxt88q69.js";
+} from "../chunks/service-version-sxt88q69.js";
 import {
   prepare2,
   environment2,
   complete2,
   clear2
-} from "../chunks/service-contender-1kn39gq3.js";
-import"../chunks/service-contender-qav6mfdz.js";
+} from "../chunks/service-version-02j88w0z.js";
+import"../chunks/service-version-qav6mfdz.js";
 
 // src/promise/service.ts
 import { readFile, rm } from "node:fs/promises";
@@ -40,6 +40,7 @@ async function ensure(options = {}) {
   let announced = false;
   let lastSpawn = 0;
   let spawnDelay = timing.spawnDelay;
+  let failure;
   const announce = (reason, previousVersion) => {
     if (announced)
       return;
@@ -59,7 +60,7 @@ async function ensure(options = {}) {
   try {
     while (true) {
       if (Date.now() >= deadline)
-        throw new Error("Timed out waiting for the background service to start");
+        throw 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 = {
@@ -71,6 +72,13 @@ async function ensure(options = {}) {
           console.warn("Background service is unresponsive; recovery cannot preserve persistent terminals");
           await clear2(options.file ?? fallback());
           await terminate(registration.info, options, timing);
+          for (const item of contenders) {
+            if (item.child.pid === registration.info.pid || contenderFinished2(item)) {
+              item.release();
+              contenders.delete(item);
+            }
+          }
+          failure = undefined;
           timeouts = undefined;
           lastSpawn = Date.now() - spawnDelay;
         }
@@ -79,7 +87,10 @@ async function ensure(options = {}) {
       if (registration.service !== undefined) {
         spawnDelay = timing.spawnDelay;
         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);
           return service2.endpoint;
@@ -96,20 +107,27 @@ async function ensure(options = {}) {
           }).catch(() => {
             return;
           });
+          for (const item of contenders) {
+            if (item.child.pid === service2.info.pid || contenderFinished2(item)) {
+              item.release();
+              contenders.delete(item);
+            }
+          }
+          failure = undefined;
           lastSpawn = 0;
         }
       } else {
         if (lastSpawn === 0 && registration.info !== undefined)
           lastSpawn = Date.now();
         const finished = [...contenders].filter(contenderFinished2);
-        const failure = finished.map(contenderFailure2).find((error) => error !== undefined);
+        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) {
+        if (failure === undefined && contenders.size < 2 && Date.now() - lastSpawn >= spawnDelay) {
           announce("missing");
           contenders.add(await spawnContender());
           lastSpawn = Date.now();
@@ -123,12 +141,9 @@ async function ensure(options = {}) {
 }
 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 ?? fallback(), info, defaultEnsureTiming2.requestTimeout) : clear2(options.file ?? fallback())).catch((cause) => console.warn("Failed to prepare persistent terminals for replacement", cause));
   if (info !== undefined)
-    await terminate(info, options, defaultEnsureTiming2);
+    await terminate(info, options, ensureTiming2(options));
 }
 function fallback() {
   return join(process.env["XDG_STATE_HOME"] ?? join(homedir(), ".local", "state"), "opencode", "service.json");
@@ -241,9 +256,6 @@ async function terminate(info, options, timing) {
     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`);

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/service-version-02j88w0z.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/service-version-t1xa31vm.js";
 export {
   exports_rpc_runtime as RpcRuntime,
   event2 as event,

package/dist/service-contender.js

@@ -2,7 +2,7 @@ import {
   spawnServiceContender2,
   contenderFailure2,
   contenderFinished2
-} from "./chunks/service-contender-txckps9j.js";
+} from "./chunks/service-version-6f43cgzz.js";
 export {
   contenderFailure2 as contenderFailure,
   contenderFinished2 as contenderFinished,

package/dist/service-timing.js

@@ -2,7 +2,7 @@ import {
   defaultEnsureTiming2,
   ensureTiming2,
   withEnsureTiming2
-} from "./chunks/service-contender-xgnj2w4v.js";
+} from "./chunks/service-version-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/service-version-sxt88q69.js";
 export {
   matchesVersion2 as matchesVersion
 };

package/dist/service.js

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

package/dist/shared-events.js

@@ -1,7 +1,7 @@
 import {
   make7,
   exports_shared_events
-} from "./chunks/service-contender-frbwqjmf.js";
+} from "./chunks/service-version-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/service-version-ydhz1zrh.js";
 export {
   createClientConnection2 as createClientConnection,
   defaultIdleTimeout2 as defaultIdleTimeout,

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/service-version-e5ea35j7.js";
+import"../chunks/service-version-m2eywc8w.js";
+import"../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";
 export {
   createData2 as createData,
   locationKey2 as locationKey,