oh-my-opencode 5.0.0-beta.80 → 5.0.0-beta.82

package/packages/lsp-daemon/dist/client.js

@@ -6,6 +6,7 @@ import { isAbsolute as isAbsolute6 } from "node:path";
 import { connect } from "node:net";
 import { homedir as homedir3 } from "node:os";
 import { join as join8 } from "node:path";
+import { setTimeout as delay } from "node:timers/promises";
 
 // ../lsp-core/src/request-context.ts
 import { AsyncLocalStorage } from "node:async_hooks";
@@ -645,9 +646,11 @@ function createLineDecoder(onMessage, onParseError) {
 }
 
 // src/ensure-daemon.ts
-var PROBE_TIMEOUT_MS = 500;
+var PROBE_TIMEOUT_MS = 2000;
 var DEFAULT_READY_TIMEOUT_MS = 5000;
 var DEFAULT_POLL_INTERVAL_MS = 100;
+var FAILED_SPAWN_COOLDOWN_MS = 5000;
+var failedSpawnUntil = new Map;
 
 class DaemonUnreachableError extends Error {
   constructor(socketPath) {
@@ -660,11 +663,22 @@ async function ensureDaemonRunning(paths, deps = defaultEnsureDaemonDeps(), opti
   const pollIntervalMs = options.pollIntervalMs ?? DEFAULT_POLL_INTERVAL_MS;
   const signal = options.signal;
   throwIfAborted(signal);
-  if (await awaitWithSignal(deps.probe(paths, signal), signal))
+  if (await awaitWithSignal(deps.probe(paths, signal), signal)) {
+    failedSpawnUntil.delete(paths.socket);
     return;
+  }
   throwIfAborted(signal);
+  const retryAt = failedSpawnUntil.get(paths.socket);
+  if (retryAt !== undefined && deps.now() < retryAt)
+    throw new DaemonUnreachableError(paths.socket);
+  failedSpawnUntil.delete(paths.socket);
   deps.spawnDaemon(paths);
-  await waitUntilReachable(paths, deps, readyTimeoutMs, pollIntervalMs, signal);
+  try {
+    await waitUntilReachable(paths, deps, readyTimeoutMs, pollIntervalMs, signal);
+  } catch (error) {
+    failedSpawnUntil.set(paths.socket, deps.now() + FAILED_SPAWN_COOLDOWN_MS);
+    throw error;
+  }
 }
 async function waitUntilReachable(paths, deps, readyTimeoutMs, pollIntervalMs, signal) {
   const deadline = deps.now() + readyTimeoutMs;
@@ -6332,6 +6346,7 @@ function parseContext(value) {
 
 // src/daemon-client.ts
 var DEFAULT_REQUEST_TIMEOUT_MS = 30000;
+var STARTUP_BACKOFF_MS = [0, 100, 300];
 var nextProxyRequestId = 1;
 async function callToolViaDaemon(name, args, options) {
   const context = requireContext(options.context);
@@ -6339,17 +6354,31 @@ async function callToolViaDaemon(name, args, options) {
   const ensure = options.ensure ?? ((ensurePaths, signal) => ensureDaemonRunning(ensurePaths, undefined, signal === undefined ? {} : { signal }));
   const timeoutMs = options.requestTimeoutMs ?? DEFAULT_REQUEST_TIMEOUT_MS;
   const requestArgs = withContext(args, context);
+  const probe = options.probe ?? ((probePaths, signal) => probeDaemon(probePaths, undefined, signal));
+  const sleep = options.sleep ?? ((ms, signal) => delay(ms, undefined, { signal }));
   let lastError;
   let authRefreshUsed = false;
-  for (let attempt = 0;attempt < 3; attempt += 1) {
+  for (const [attempt, backoffMs] of STARTUP_BACKOFF_MS.entries()) {
     try {
-      await ensureDaemonAvailable(paths, ensure, options.signal);
+      if (backoffMs > 0)
+        await sleep(backoffMs, options.signal);
+      if (options.signal?.aborted)
+        throw new DaemonRequestCancelledError(false);
+      if (attempt === 0) {
+        await ensureDaemonAvailable(paths, ensure, options.signal);
+      } else if (!await probe(paths, options.signal)) {
+        throw new DaemonUnreachableError(paths.socket);
+      }
       const token = readAuthToken(paths);
       if (!token)
         throw new DaemonRequestError("daemon auth token missing", false);
       const sendOptions = options.signal === undefined ? { timeoutMs } : { timeoutMs, signal: options.signal };
       return await sendToolCall(paths, token, name, requestArgs, sendOptions);
     } catch (error) {
+      if (options.signal?.aborted) {
+        lastError = new DaemonRequestCancelledError(false);
+        break;
+      }
       lastError = error;
       if (error instanceof DaemonAuthenticationRejectedError && !authRefreshUsed) {
         authRefreshUsed = true;

package/packages/lsp-daemon/dist/daemon-client.d.ts

@@ -8,6 +8,8 @@ export interface CallToolOptions {
     requestTimeoutMs?: number;
     signal?: AbortSignal;
     ensure?: (paths: DaemonPaths, signal?: AbortSignal) => Promise<void>;
+    probe?: (paths: DaemonPaths, signal?: AbortSignal) => Promise<boolean>;
+    sleep?: (ms: number, signal?: AbortSignal) => Promise<void>;
 }
 export declare function callToolViaDaemon(name: string, args: Record<string, unknown>, options: CallToolOptions): Promise<ToolExecutionResult>;
 export declare function callDiagnosticsViaDaemon(filePath: string, options: CallToolOptions): Promise<ToolExecutionResult>;

package/packages/lsp-daemon/dist/daemon-client.js

@@ -1,16 +1,18 @@
 import { connect } from "node:net";
 import { homedir } from "node:os";
 import { join } from "node:path";
+import { setTimeout as delay } from "node:timers/promises";
 import { parseLspRequestContext } from "@oh-my-opencode/lsp-core/request-context";
 import { isPlainRecord } from "@oh-my-opencode/mcp-stdio-core/record";
 import { daemonFailureResult } from "./daemon-failure-result.js";
 import { DaemonAuthenticationRejectedError, DaemonRequestCancelledError, DaemonRequestError, DaemonRequestTimedOutError, } from "./daemon-request-error.js";
-import { ensureDaemonRunning } from "./ensure-daemon.js";
+import { DaemonUnreachableError, ensureDaemonRunning, probeDaemon } from "./ensure-daemon.js";
 import { authEnvelope, isAuthErrorResponse, readAuthToken } from "./ipc-protocol.js";
 import { daemonPaths } from "./paths.js";
 import { CONTEXT_KEY } from "./request-routing.js";
 import { createLineDecoder, encodeJsonLine } from "./socket-jsonrpc.js";
 const DEFAULT_REQUEST_TIMEOUT_MS = 30_000;
+const STARTUP_BACKOFF_MS = [0, 100, 300];
 let nextProxyRequestId = 1;
 export async function callToolViaDaemon(name, args, options) {
     const context = requireContext(options.context);
@@ -19,11 +21,22 @@ export async function callToolViaDaemon(name, args, options) {
         ((ensurePaths, signal) => ensureDaemonRunning(ensurePaths, undefined, signal === undefined ? {} : { signal }));
     const timeoutMs = options.requestTimeoutMs ?? DEFAULT_REQUEST_TIMEOUT_MS;
     const requestArgs = withContext(args, context);
+    const probe = options.probe ?? ((probePaths, signal) => probeDaemon(probePaths, undefined, signal));
+    const sleep = options.sleep ?? ((ms, signal) => delay(ms, undefined, { signal }));
     let lastError;
     let authRefreshUsed = false;
-    for (let attempt = 0; attempt < 3; attempt += 1) {
+    for (const [attempt, backoffMs] of STARTUP_BACKOFF_MS.entries()) {
         try {
-            await ensureDaemonAvailable(paths, ensure, options.signal);
+            if (backoffMs > 0)
+                await sleep(backoffMs, options.signal);
+            if (options.signal?.aborted)
+                throw new DaemonRequestCancelledError(false);
+            if (attempt === 0) {
+                await ensureDaemonAvailable(paths, ensure, options.signal);
+            }
+            else if (!(await probe(paths, options.signal))) {
+                throw new DaemonUnreachableError(paths.socket);
+            }
             const token = readAuthToken(paths);
             if (!token)
                 throw new DaemonRequestError("daemon auth token missing", false);
@@ -31,6 +44,10 @@ export async function callToolViaDaemon(name, args, options) {
             return await sendToolCall(paths, token, name, requestArgs, sendOptions);
         }
         catch (error) {
+            if (options.signal?.aborted) {
+                lastError = new DaemonRequestCancelledError(false);
+                break;
+            }
             lastError = error;
             if (error instanceof DaemonAuthenticationRejectedError && !authRefreshUsed) {
                 authRefreshUsed = true;

package/packages/lsp-daemon/dist/ensure-daemon.js

@@ -8,9 +8,11 @@ import { packagedRuntimeDefaults } from "./paths.js";
 import { resolveDaemonRuntime } from "./runtime-contract.js";
 import { createLineDecoder, encodeJsonLine } from "./socket-jsonrpc.js";
 export { InvalidRuntimeOverrideError, OMO_LSP_DAEMON_CLI, resolveDaemonRuntime } from "./runtime-contract.js";
-const PROBE_TIMEOUT_MS = 500;
+const PROBE_TIMEOUT_MS = 2_000;
 const DEFAULT_READY_TIMEOUT_MS = 5_000;
 const DEFAULT_POLL_INTERVAL_MS = 100;
+const FAILED_SPAWN_COOLDOWN_MS = 5_000;
+const failedSpawnUntil = new Map();
 export class DaemonUnreachableError extends Error {
     constructor(socketPath) {
         super(`LSP daemon did not become reachable at ${socketPath}`);
@@ -22,11 +24,23 @@ export async function ensureDaemonRunning(paths, deps = defaultEnsureDaemonDeps(
     const pollIntervalMs = options.pollIntervalMs ?? DEFAULT_POLL_INTERVAL_MS;
     const signal = options.signal;
     throwIfAborted(signal);
-    if (await awaitWithSignal(deps.probe(paths, signal), signal))
+    if (await awaitWithSignal(deps.probe(paths, signal), signal)) {
+        failedSpawnUntil.delete(paths.socket);
         return;
+    }
     throwIfAborted(signal);
+    const retryAt = failedSpawnUntil.get(paths.socket);
+    if (retryAt !== undefined && deps.now() < retryAt)
+        throw new DaemonUnreachableError(paths.socket);
+    failedSpawnUntil.delete(paths.socket);
     deps.spawnDaemon(paths);
-    await waitUntilReachable(paths, deps, readyTimeoutMs, pollIntervalMs, signal);
+    try {
+        await waitUntilReachable(paths, deps, readyTimeoutMs, pollIntervalMs, signal);
+    }
+    catch (error) {
+        failedSpawnUntil.set(paths.socket, deps.now() + FAILED_SPAWN_COOLDOWN_MS);
+        throw error;
+    }
 }
 async function waitUntilReachable(paths, deps, readyTimeoutMs, pollIntervalMs, signal) {
     const deadline = deps.now() + readyTimeoutMs;

package/packages/lsp-daemon/dist/index.js

@@ -3150,6 +3150,7 @@ async function disposeDefaultLspManager() {
 import { connect } from "node:net";
 import { homedir as homedir3 } from "node:os";
 import { join as join8 } from "node:path";
+import { setTimeout as delay } from "node:timers/promises";
 
 // ../lsp-core/src/request-context.ts
 import { AsyncLocalStorage } from "node:async_hooks";
@@ -3789,9 +3790,11 @@ function createLineDecoder(onMessage, onParseError) {
 }
 
 // src/ensure-daemon.ts
-var PROBE_TIMEOUT_MS = 500;
+var PROBE_TIMEOUT_MS = 2000;
 var DEFAULT_READY_TIMEOUT_MS = 5000;
 var DEFAULT_POLL_INTERVAL_MS = 100;
+var FAILED_SPAWN_COOLDOWN_MS = 5000;
+var failedSpawnUntil = new Map;
 
 class DaemonUnreachableError extends Error {
   constructor(socketPath) {
@@ -3804,11 +3807,22 @@ async function ensureDaemonRunning(paths, deps = defaultEnsureDaemonDeps(), opti
   const pollIntervalMs = options.pollIntervalMs ?? DEFAULT_POLL_INTERVAL_MS;
   const signal = options.signal;
   throwIfAborted(signal);
-  if (await awaitWithSignal2(deps.probe(paths, signal), signal))
+  if (await awaitWithSignal2(deps.probe(paths, signal), signal)) {
+    failedSpawnUntil.delete(paths.socket);
     return;
+  }
   throwIfAborted(signal);
+  const retryAt = failedSpawnUntil.get(paths.socket);
+  if (retryAt !== undefined && deps.now() < retryAt)
+    throw new DaemonUnreachableError(paths.socket);
+  failedSpawnUntil.delete(paths.socket);
   deps.spawnDaemon(paths);
-  await waitUntilReachable(paths, deps, readyTimeoutMs, pollIntervalMs, signal);
+  try {
+    await waitUntilReachable(paths, deps, readyTimeoutMs, pollIntervalMs, signal);
+  } catch (error) {
+    failedSpawnUntil.set(paths.socket, deps.now() + FAILED_SPAWN_COOLDOWN_MS);
+    throw error;
+  }
 }
 async function waitUntilReachable(paths, deps, readyTimeoutMs, pollIntervalMs, signal) {
   const deadline = deps.now() + readyTimeoutMs;
@@ -6327,6 +6341,7 @@ function parseContext(value) {
 
 // src/daemon-client.ts
 var DEFAULT_REQUEST_TIMEOUT_MS = 30000;
+var STARTUP_BACKOFF_MS = [0, 100, 300];
 var nextProxyRequestId = 1;
 async function callToolViaDaemon(name, args, options) {
   const context = requireContext(options.context);
@@ -6334,17 +6349,31 @@ async function callToolViaDaemon(name, args, options) {
   const ensure = options.ensure ?? ((ensurePaths, signal) => ensureDaemonRunning(ensurePaths, undefined, signal === undefined ? {} : { signal }));
   const timeoutMs = options.requestTimeoutMs ?? DEFAULT_REQUEST_TIMEOUT_MS;
   const requestArgs = withContext(args, context);
+  const probe = options.probe ?? ((probePaths, signal) => probeDaemon(probePaths, undefined, signal));
+  const sleep = options.sleep ?? ((ms, signal) => delay(ms, undefined, { signal }));
   let lastError;
   let authRefreshUsed = false;
-  for (let attempt = 0;attempt < 3; attempt += 1) {
+  for (const [attempt, backoffMs] of STARTUP_BACKOFF_MS.entries()) {
     try {
-      await ensureDaemonAvailable(paths, ensure, options.signal);
+      if (backoffMs > 0)
+        await sleep(backoffMs, options.signal);
+      if (options.signal?.aborted)
+        throw new DaemonRequestCancelledError(false);
+      if (attempt === 0) {
+        await ensureDaemonAvailable(paths, ensure, options.signal);
+      } else if (!await probe(paths, options.signal)) {
+        throw new DaemonUnreachableError(paths.socket);
+      }
       const token = readAuthToken(paths);
       if (!token)
         throw new DaemonRequestError("daemon auth token missing", false);
       const sendOptions = options.signal === undefined ? { timeoutMs } : { timeoutMs, signal: options.signal };
       return await sendToolCall(paths, token, name, requestArgs, sendOptions);
     } catch (error) {
+      if (options.signal?.aborted) {
+        lastError = new DaemonRequestCancelledError(false);
+        break;
+      }
       lastError = error;
       if (error instanceof DaemonAuthenticationRejectedError && !authRefreshUsed) {
         authRefreshUsed = true;

package/packages/lsp-daemon/package.json

@@ -35,12 +35,13 @@
 		"check": "tsc --noEmit && biome check . && npm run build"
 	},
 	"devDependencies": {
-		"@biomejs/biome": "2.4.16",
+		"@vitest/coverage-v8": "5.0.1",
+		"@biomejs/biome": "2.5.14",
 		"@oh-my-opencode/lsp-core": "file:../lsp-core",
 		"@oh-my-opencode/mcp-stdio-core": "file:../mcp-stdio-core",
-		"@types/node": "^25.9.2",
+		"@types/node": "^26.6.2",
 		"typescript": "^6.0.3",
-		"vitest": "^4.1.8"
+		"vitest": "5.0.1"
 	},
 	"engines": {
 		"node": ">=20.0.0"

package/packages/lsp-tools-mcp/package.json

@@ -41,12 +41,13 @@
 		"check": "tsc --noEmit && biome check . && npm run build"
 	},
 	"devDependencies": {
+		"@vitest/coverage-v8": "5.0.1",
 		"@oh-my-opencode/lsp-core": "file:../lsp-core",
 		"@oh-my-opencode/mcp-stdio-core": "file:../mcp-stdio-core",
-		"@biomejs/biome": "2.4.16",
-		"@types/node": "^25.9.2",
+		"@biomejs/biome": "2.5.14",
+		"@types/node": "^26.6.2",
 		"typescript": "^6.0.3",
-		"vitest": "^4.1.8"
+		"vitest": "5.0.1"
 	},
 	"engines": {
 		"node": ">=20.0.0"

package/packages/omo-codex/plugin/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "omo",
-  "version": "5.0.0-beta.80",
+  "version": "5.0.0-beta.82",
   "description": "One Codex plugin namespace for Yeongyu's local Codex components.",
   "author": {
     "name": "Yeongyu Kim",