oh-my-opencode 5.0.0-beta.30 → 5.0.0-beta.31

package/packages/lsp-tools-mcp/dist/tools.js

@@ -253,6 +253,16 @@ class LspProcessSpawnError extends Error {
     this.name = "LspProcessSpawnError";
   }
 }
+
+class LspClientRespawnBudgetExceededError extends Error {
+  constructor(serverId, root, retryLimit) {
+    super(`LSP server ${serverId} at ${root} failed to stay alive; respawn budget exhausted ` + `(${retryLimit} consecutive dead generations). Retrying after the cooldown may succeed.`);
+    this.serverId = serverId;
+    this.root = root;
+    this.retryLimit = retryLimit;
+    this.name = "LspClientRespawnBudgetExceededError";
+  }
+}
 function isLspDeadConnectionError(err) {
   return err instanceof LspConnectionClosedError || err instanceof LspProcessExitedError;
 }
@@ -286,6 +296,8 @@ var MAX_RESIDENT_CLIENTS = 6;
 var REAPER_INTERVAL_MS = 60000;
 var STOP_HARD_KILL_TIMEOUT_MS = 5000;
 var STOP_SIGKILL_GRACE_MS = 1000;
+var CLIENT_RESPAWN_RETRY_LIMIT = 2;
+var CLIENT_RESPAWN_COOLDOWN_MS = 60000;
 
 // ../lsp-core/src/lsp/json-rpc-connection.ts
 var HEADER_SEPARATOR = `\r
@@ -2959,6 +2971,8 @@ function awaitWithSignal(promise, signal) {
 class LspManager {
   constructor(options = {}) {
     this.clients = new Map;
+    this.pendingStops = new Map;
+    this.respawnBudgets = new Map;
     this.reaperHandle = null;
     this.signalDisposer = null;
     this.disposed = false;
@@ -2984,17 +2998,52 @@ class LspManager {
   getKey(root, serverId) {
     return `${root}::${serverId}`;
   }
+  tombstoneStop(key, client) {
+    const stop = stopClientBestEffort(client);
+    this.pendingStops.set(key, stop);
+    stop.finally(() => {
+      if (this.pendingStops.get(key) === stop) {
+        this.pendingStops.delete(key);
+      }
+    });
+    return stop;
+  }
+  recordDeadGeneration(key) {
+    let budget = this.respawnBudgets.get(key);
+    if (budget === undefined) {
+      budget = { deadGenerations: 0, exhaustedAt: null };
+      this.respawnBudgets.set(key, budget);
+    }
+    budget.deadGenerations += 1;
+  }
+  markHealthyGeneration(key) {
+    this.respawnBudgets.delete(key);
+  }
+  ensureRespawnAllowed(key, root, serverId) {
+    const budget = this.respawnBudgets.get(key);
+    if (budget === undefined || budget.deadGenerations < CLIENT_RESPAWN_RETRY_LIMIT)
+      return;
+    if (budget.exhaustedAt === null) {
+      budget.exhaustedAt = this.now();
+      throw new LspClientRespawnBudgetExceededError(serverId, root, CLIENT_RESPAWN_RETRY_LIMIT);
+    }
+    if (this.now() - budget.exhaustedAt < CLIENT_RESPAWN_COOLDOWN_MS) {
+      throw new LspClientRespawnBudgetExceededError(serverId, root, CLIENT_RESPAWN_RETRY_LIMIT);
+    }
+    budget.deadGenerations = 0;
+    budget.exhaustedAt = null;
+  }
   reapStale() {
     const t = this.now();
     for (const [key, managed] of this.clients) {
       if (managed.isInitializing && managed.initializingSince !== null && t - managed.initializingSince > this.initTimeoutMs) {
-        stopClientBestEffort(managed.client);
         this.clients.delete(key);
+        this.tombstoneStop(key, managed.client);
         continue;
       }
       if (!managed.isInitializing && managed.refCount === 0 && managed.pendingWaiters === 0 && t - managed.lastUsedAt > this.idleTimeoutMs) {
-        stopClientBestEffort(managed.client);
         this.clients.delete(key);
+        this.tombstoneStop(key, managed.client);
       }
     }
   }
@@ -3004,7 +3053,7 @@ class LspManager {
       if (!victim)
         return;
       this.clients.delete(victim.key);
-      stopClientBestEffort(victim.managed.client);
+      this.tombstoneStop(victim.key, victim.managed.client);
     }
   }
   leastRecentlyUsedIdleClient() {
@@ -3021,7 +3070,7 @@ class LspManager {
   async tryDeleteIfOrphaned(key, managed) {
     if (managed.refCount === 0 && managed.pendingWaiters === 0 && !managed.isInitializing && this.clients.get(key) === managed) {
       this.clients.delete(key);
-      await stopClientBestEffort(managed.client);
+      await this.tombstoneStop(key, managed.client);
     }
   }
   async getClient(root, server, signal) {
@@ -3030,12 +3079,22 @@ class LspManager {
     }
     signal?.throwIfAborted();
     const key = this.getKey(root, server.id);
+    for (;; ) {
+      const pendingStop = this.pendingStops.get(key);
+      if (pendingStop === undefined)
+        break;
+      await awaitWithSignal(pendingStop, signal);
+      signal?.throwIfAborted();
+    }
+    if (this.disposed) {
+      throw new Error("LspManager has been disposed");
+    }
     let managed = this.clients.get(key);
     if (managed) {
       const t = this.now();
       if (managed.isInitializing && managed.initializingSince !== null && t - managed.initializingSince > this.initTimeoutMs) {
-        await stopClientBestEffort(managed.client);
         this.clients.delete(key);
+        await this.tombstoneStop(key, managed.client);
         managed = undefined;
       }
     }
@@ -3056,15 +3115,20 @@ class LspManager {
         signal.throwIfAborted();
       }
       if (!managed.client.isAlive()) {
-        await stopClientBestEffort(managed.client);
-        this.clients.delete(key);
+        this.recordDeadGeneration(key);
+        if (this.clients.get(key) === managed) {
+          this.clients.delete(key);
+        }
+        await this.tombstoneStop(key, managed.client);
         return this.getClient(root, server, signal);
       }
+      this.markHealthyGeneration(key);
       managed.refCount++;
       managed.lastUsedAt = this.now();
       return managed.client;
     }
     this.evictForAdmission();
+    this.ensureRespawnAllowed(key, root, server.id);
     const client = this.clientFactory(root, server);
     const initStartedAt = this.now();
     const initPromise = (async () => {
@@ -3088,7 +3152,7 @@ class LspManager {
       if (this.clients.get(key) === newManaged) {
         this.clients.delete(key);
       }
-      await stopClientBestEffort(client);
+      await this.tombstoneStop(key, client);
       throw err;
     }
     newManaged.pendingWaiters--;
@@ -3099,6 +3163,15 @@ class LspManager {
       await this.tryDeleteIfOrphaned(key, newManaged);
       signal.throwIfAborted();
     }
+    if (!client.isAlive()) {
+      this.recordDeadGeneration(key);
+      if (this.clients.get(key) === newManaged) {
+        this.clients.delete(key);
+      }
+      await this.tombstoneStop(key, client);
+      return this.getClient(root, server, signal);
+    }
+    this.markHealthyGeneration(key);
     newManaged.refCount++;
     newManaged.lastUsedAt = this.now();
     return client;
@@ -3119,15 +3192,20 @@ class LspManager {
     if (client && managed.client !== client)
       return;
     this.clients.delete(key);
-    stopClientBestEffort(managed.client);
+    this.tombstoneStop(key, managed.client);
   }
   warmupClient(root, server) {
     if (this.disposed)
       return;
     const key = this.getKey(root, server.id);
-    if (this.clients.has(key))
+    if (this.clients.has(key) || this.pendingStops.has(key))
       return;
     this.evictForAdmission();
+    try {
+      this.ensureRespawnAllowed(key, root, server.id);
+    } catch {
+      return;
+    }
     const client = this.clientFactory(root, server);
     const initStartedAt = this.now();
     const initPromise = (async () => {
@@ -3153,7 +3231,7 @@ class LspManager {
       if (this.clients.get(key) === managed) {
         this.clients.delete(key);
       }
-      stopClientBestEffort(client);
+      this.tombstoneStop(key, client);
     });
   }
   isServerInitializing(root, serverId) {
@@ -3197,8 +3275,11 @@ class LspManager {
     for (const managed of this.clients.values()) {
       stopPromises.push(stopClientBestEffort(managed.client));
     }
+    const tombstonedStops = [...this.pendingStops.values()];
     this.clients.clear();
-    await Promise.allSettled(stopPromises);
+    this.respawnBudgets.clear();
+    await Promise.allSettled([...stopPromises, ...tombstonedStops]);
+    this.pendingStops.clear();
   }
 }
 var _defaultInstance = null;
@@ -3221,7 +3302,16 @@ import { existsSync as existsSync6, realpathSync as realpathSync4 } from "node:f
 import { dirname as dirname5, join as join3 } from "node:path";
 
 // ../lsp-core/src/lsp/workspace-markers.ts
-var WORKSPACE_MARKERS = [".git", "package.json", "pyproject.toml", "Cargo.toml", "go.mod", "pom.xml", "build.gradle"];
+var GIT_WORKSPACE_MARKER = ".git";
+var PROJECT_WORKSPACE_MARKERS = [
+  "package.json",
+  "pyproject.toml",
+  "Cargo.toml",
+  "go.mod",
+  "pom.xml",
+  "build.gradle"
+];
+var WORKSPACE_MARKERS = [GIT_WORKSPACE_MARKER, ...PROJECT_WORKSPACE_MARKERS];
 
 // ../lsp-core/src/lsp/outside-context-workspace.ts
 function findWorkspaceRootOutsideContext(directory) {
@@ -3910,20 +4000,25 @@ function findWorkspaceRoot(filePath) {
   if (!isPathInside(cwd, abs))
     return findWorkspaceRootOutsideContext(dir);
   const fallbackRoot = nearestExistingDirectoryInsideContext(dir, cwd) ?? cwd;
+  let nearestPackageRoot;
   while (isPathInside(cwd, dir)) {
     const canonicalDir = existingDirectoryInsideContext(dir, cwd);
     if (canonicalDir !== undefined) {
-      for (const marker of WORKSPACE_MARKERS) {
-        if (existsSync10(join5(dir, marker))) {
-          return canonicalDir;
-        }
+      if (existsSync10(join5(dir, GIT_WORKSPACE_MARKER))) {
+        return canonicalDir;
+      }
+      if (nearestPackageRoot === undefined && hasProjectWorkspaceMarker(dir)) {
+        nearestPackageRoot = canonicalDir;
       }
     }
     if (dir === cwd)
       break;
     dir = dirname8(dir);
   }
-  return fallbackRoot;
+  return nearestPackageRoot ?? fallbackRoot;
+}
+function hasProjectWorkspaceMarker(directory) {
+  return PROJECT_WORKSPACE_MARKERS.some((marker) => existsSync10(join5(directory, marker)));
 }
 function resolveReadablePathInsideContext(filePath) {
   const cwd = contextCwd();

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

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

package/packages/omo-codex/plugin/components/bootstrap/hooks/hooks.json

@@ -8,7 +8,7 @@
 						"command": "node \"${PLUGIN_ROOT}/components/bootstrap/dist/cli.js\" hook session-start",
 						"commandWindows": "powershell -NoProfile -ExecutionPolicy Bypass -File \"${PLUGIN_ROOT}\\components\\bootstrap\\scripts\\bootstrap.ps1\"",
 						"timeout": 30,
-						"statusMessage": "(OmO 5.0.0-beta.30) Checking Bootstrap Provisioning"
+						"statusMessage": "(OmO 5.0.0-beta.31) Checking Bootstrap Provisioning"
 					}
 				]
 			}

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

@@ -1,6 +1,6 @@
 {
 	"name": "@sisyphuslabs/codex-bootstrap",
-	"version": "5.0.0-beta.30",
+	"version": "5.0.0-beta.31",
 	"description": "Codex SessionStart bootstrap component that provisions LazyCodex runtime dependencies from a detached worker.",
 	"type": "module",
 	"private": true,

package/packages/omo-codex/plugin/components/codegraph/dist/cli.js

@@ -5580,6 +5580,14 @@ var OmoMemorySyncSchema = object({
 var OmoMemorySearchSchema = object({
   enabled: boolean2().default(true)
 }).strict();
+var OmoMemoryRecallSchema = object({
+  enabled: boolean2().default(true),
+  max_items: number2().int().min(1).max(5).default(2),
+  budget_tokens: number2().int().positive().default(600),
+  excerpt_chars: number2().int().positive().default(200),
+  min_score: number2().optional(),
+  exclude: array(string2()).default([])
+}).strict();
 var OmoMemoryNudgeSchema = object({
   enabled: boolean2().default(true),
   every_user_turns: number2().int().min(1).default(10)
@@ -5626,6 +5634,14 @@ var OmoMemorySyncLayerSchema = object({
 var OmoMemorySearchLayerSchema = object({
   enabled: boolean2().optional()
 }).strict();
+var OmoMemoryRecallLayerSchema = object({
+  enabled: boolean2().optional(),
+  max_items: number2().int().min(1).max(5).optional(),
+  budget_tokens: number2().int().positive().optional(),
+  excerpt_chars: number2().int().positive().optional(),
+  min_score: number2().optional(),
+  exclude: array(string2()).optional()
+}).strict();
 var OmoMemoryNudgeLayerSchema = object({
   enabled: boolean2().optional(),
   every_user_turns: number2().int().min(1).optional()
@@ -5665,6 +5681,7 @@ var OmoMemoryAgentOverridesSchema = object({
   write_notice: OmoMemoryWriteNoticeLayerSchema.optional(),
   sync: OmoMemorySyncLayerSchema.optional(),
   search: OmoMemorySearchLayerSchema.optional(),
+  recall: OmoMemoryRecallLayerSchema.optional(),
   compile_warn_tokens: number2().int().positive().optional()
 }).strict();
 var OmoMemorySettingsSchema = object({
@@ -5694,6 +5711,13 @@ var OmoMemorySettingsSchema = object({
   write_notice: OmoMemoryWriteNoticeSchema.default({ enabled: true }),
   sync: OmoMemorySyncSchema.default({ enabled: true }),
   search: OmoMemorySearchSchema.default({ enabled: true }),
+  recall: OmoMemoryRecallSchema.default({
+    enabled: true,
+    max_items: 2,
+    budget_tokens: 600,
+    excerpt_chars: 200,
+    exclude: []
+  }),
   compile_warn_tokens: number2().int().positive().default(30000),
   agents: record(string2(), OmoMemoryAgentOverridesSchema).default({})
 }).strict();
@@ -5710,6 +5734,7 @@ var OmoMemorySettingsLayerSchema = object({
   write_notice: OmoMemoryWriteNoticeLayerSchema.optional(),
   sync: OmoMemorySyncLayerSchema.optional(),
   search: OmoMemorySearchLayerSchema.optional(),
+  recall: OmoMemoryRecallLayerSchema.optional(),
   compile_warn_tokens: number2().int().positive().optional(),
   agents: record(string2(), OmoMemoryAgentOverridesSchema).optional()
 }).strict();
@@ -5732,6 +5757,7 @@ var OmoModelCatalogLayerSchema = record(string2(), OmoModelCatalogEntryLayerSche
 
 // ../../omo-config-core/src/schema/task.ts
 import { availableParallelism } from "node:os";
+var DEFAULT_RESIDENCY_MAX_CHILDREN = 16;
 var ResidencyMaxChildrenInputSchema = union([number2().int().nonnegative(), literal("unlimited")]);
 var OmoTaskWaitSchema = object({
   min_ms: number2().int().positive().default(5000),
@@ -5821,7 +5847,7 @@ function resolveOmoTaskSettings(input, resolveParallelism = availableParallelism
   const record2 = record(string2(), unknown()).parse(input);
   return OmoTaskSettingsSchema.parse({
     ...record2,
-    residency_max_children: record2["residency_max_children"] ?? Math.max(8, resolveParallelism() * 3),
+    residency_max_children: record2["residency_max_children"] ?? Math.min(DEFAULT_RESIDENCY_MAX_CHILDREN, Math.max(8, resolveParallelism() * 2)),
     global_concurrency: record2["global_concurrency"] ?? Math.max(8, resolveParallelism() * 2)
   });
 }
@@ -11608,6 +11634,7 @@ async function runJsonRpcStdioServer(config2) {
   const idleTimer = createIdleTimer(idleTimeoutMs, log, () => {
     isClosed = true;
     config2.onIdleTimeout?.();
+    config2.input.destroy();
   });
   const watchdog = createParentWatchdog(config2.parentWatchdog, (parentPid, pollIntervalMs) => {
     isClosed = true;
@@ -12001,7 +12028,9 @@ async function runUnavailableCodegraphMcpServer(options) {
     },
     input: options.input,
     output: options.output,
-    parentWatchdog: options.parentWatchdog ?? {}
+    idleTimeoutMs: 0,
+    parentWatchdog: options.parentWatchdog ?? {},
+    ...options.lifecycleLog === undefined ? {} : { log: options.lifecycleLog }
   });
 }
 async function handleUnavailableCodegraphMcpRequest(input, options) {

package/packages/omo-codex/plugin/components/codegraph/dist/serve.js

@@ -5846,6 +5846,14 @@ var OmoMemorySyncSchema = object({
 var OmoMemorySearchSchema = object({
   enabled: boolean2().default(true)
 }).strict();
+var OmoMemoryRecallSchema = object({
+  enabled: boolean2().default(true),
+  max_items: number2().int().min(1).max(5).default(2),
+  budget_tokens: number2().int().positive().default(600),
+  excerpt_chars: number2().int().positive().default(200),
+  min_score: number2().optional(),
+  exclude: array(string2()).default([])
+}).strict();
 var OmoMemoryNudgeSchema = object({
   enabled: boolean2().default(true),
   every_user_turns: number2().int().min(1).default(10)
@@ -5892,6 +5900,14 @@ var OmoMemorySyncLayerSchema = object({
 var OmoMemorySearchLayerSchema = object({
   enabled: boolean2().optional()
 }).strict();
+var OmoMemoryRecallLayerSchema = object({
+  enabled: boolean2().optional(),
+  max_items: number2().int().min(1).max(5).optional(),
+  budget_tokens: number2().int().positive().optional(),
+  excerpt_chars: number2().int().positive().optional(),
+  min_score: number2().optional(),
+  exclude: array(string2()).optional()
+}).strict();
 var OmoMemoryNudgeLayerSchema = object({
   enabled: boolean2().optional(),
   every_user_turns: number2().int().min(1).optional()
@@ -5931,6 +5947,7 @@ var OmoMemoryAgentOverridesSchema = object({
   write_notice: OmoMemoryWriteNoticeLayerSchema.optional(),
   sync: OmoMemorySyncLayerSchema.optional(),
   search: OmoMemorySearchLayerSchema.optional(),
+  recall: OmoMemoryRecallLayerSchema.optional(),
   compile_warn_tokens: number2().int().positive().optional()
 }).strict();
 var OmoMemorySettingsSchema = object({
@@ -5960,6 +5977,13 @@ var OmoMemorySettingsSchema = object({
   write_notice: OmoMemoryWriteNoticeSchema.default({ enabled: true }),
   sync: OmoMemorySyncSchema.default({ enabled: true }),
   search: OmoMemorySearchSchema.default({ enabled: true }),
+  recall: OmoMemoryRecallSchema.default({
+    enabled: true,
+    max_items: 2,
+    budget_tokens: 600,
+    excerpt_chars: 200,
+    exclude: []
+  }),
   compile_warn_tokens: number2().int().positive().default(30000),
   agents: record(string2(), OmoMemoryAgentOverridesSchema).default({})
 }).strict();
@@ -5976,6 +6000,7 @@ var OmoMemorySettingsLayerSchema = object({
   write_notice: OmoMemoryWriteNoticeLayerSchema.optional(),
   sync: OmoMemorySyncLayerSchema.optional(),
   search: OmoMemorySearchLayerSchema.optional(),
+  recall: OmoMemoryRecallLayerSchema.optional(),
   compile_warn_tokens: number2().int().positive().optional(),
   agents: record(string2(), OmoMemoryAgentOverridesSchema).optional()
 }).strict();
@@ -5998,6 +6023,7 @@ var OmoModelCatalogLayerSchema = record(string2(), OmoModelCatalogEntryLayerSche
 
 // ../../../../omo-config-core/src/schema/task.ts
 import { availableParallelism } from "node:os";
+var DEFAULT_RESIDENCY_MAX_CHILDREN = 16;
 var ResidencyMaxChildrenInputSchema = union([number2().int().nonnegative(), literal("unlimited")]);
 var OmoTaskWaitSchema = object({
   min_ms: number2().int().positive().default(5000),
@@ -6087,7 +6113,7 @@ function resolveOmoTaskSettings(input, resolveParallelism = availableParallelism
   const record2 = record(string2(), unknown()).parse(input);
   return OmoTaskSettingsSchema.parse({
     ...record2,
-    residency_max_children: record2["residency_max_children"] ?? Math.max(8, resolveParallelism() * 3),
+    residency_max_children: record2["residency_max_children"] ?? Math.min(DEFAULT_RESIDENCY_MAX_CHILDREN, Math.max(8, resolveParallelism() * 2)),
     global_concurrency: record2["global_concurrency"] ?? Math.max(8, resolveParallelism() * 2)
   });
 }
@@ -9274,6 +9300,7 @@ async function runJsonRpcStdioServer(config2) {
   const idleTimer = createIdleTimer(idleTimeoutMs, log, () => {
     isClosed = true;
     config2.onIdleTimeout?.();
+    config2.input.destroy();
   });
   const watchdog = createParentWatchdog(config2.parentWatchdog, (parentPid, pollIntervalMs) => {
     isClosed = true;
@@ -9685,7 +9712,9 @@ async function runUnavailableCodegraphMcpServer(options) {
     },
     input: options.input,
     output: options.output,
-    parentWatchdog: options.parentWatchdog ?? {}
+    idleTimeoutMs: 0,
+    parentWatchdog: options.parentWatchdog ?? {},
+    ...options.lifecycleLog === undefined ? {} : { log: options.lifecycleLog }
   });
 }
 async function handleUnavailableCodegraphMcpRequest(input, options) {

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

@@ -1,6 +1,6 @@
 {
 	"name": "@sisyphuslabs/codex-codegraph",
-	"version": "5.0.0-beta.30",
+	"version": "5.0.0-beta.31",
 	"description": "Codex plugin MCP wrapper for CodeGraph.",
 	"type": "module",
 	"private": true,

package/packages/omo-codex/plugin/components/codegraph/src/mcp-unavailable.ts

@@ -7,6 +7,7 @@ import {
 	runJsonRpcStdioServer,
 	successResponse,
 	type JsonRpcResponse,
+	type McpLifecycleLog,
 	type ParentWatchdogConfig,
 } from "../../../../../mcp-stdio-core/src/index.ts";
 
@@ -18,6 +19,9 @@ export interface UnavailableCodegraphMcpOptions {
 	// Test seam: production callers leave this unset so the watchdog uses its
 	// defaults (parentPid = process.ppid, 30s poll).
 	readonly parentWatchdog?: ParentWatchdogConfig;
+	// Test seam: surfaces the mcp-stdio-core lifecycle log so tests can pin the
+	// resolved idle timeout without waiting a real timeout out.
+	readonly lifecycleLog?: McpLifecycleLog;
 }
 
 interface UnavailableCodegraphMcpHandlerOptions {
@@ -36,7 +40,15 @@ export async function runUnavailableCodegraphMcpServer(
 		},
 		input: options.input,
 		output: options.output,
+		// Idle stays disabled: the codex host never respawns an exited stdio
+		// MCP server (codex-rs auto-reconnects only its own codex_apps server),
+		// and since #6548 the default idle timer actually destroys stdin — so an
+		// inherited 10-minute default would silently kill this stub mid-session
+		// and turn later codegraph tool calls into dead-connection errors.
+		idleTimeoutMs: 0,
 		parentWatchdog: options.parentWatchdog ?? {},
+		// Conditional spread keeps this assignable under exactOptionalPropertyTypes.
+		...(options.lifecycleLog === undefined ? {} : { log: options.lifecycleLog }),
 	});
 }
 

package/packages/omo-codex/plugin/components/codegraph/test/serve-unavailable-idle.test.ts

@@ -0,0 +1,47 @@
+import { describe, expect, it } from "bun:test";
+import { PassThrough } from "node:stream";
+
+import { runUnavailableCodegraphMcpServer } from "../src/mcp-unavailable.ts";
+
+describe("unavailable codegraph MCP idle teardown", () => {
+	it("#given the codex host (no respawn for exited stdio servers) #when the unavailable stub starts #then the idle timeout is disabled", async () => {
+		// given — codex never respawns a user-configured stdio MCP server
+		// (codex-rs reconnects only its own codex_apps server), so if the stub
+		// inherited the mcp-stdio-core default idle timeout it would destroy its
+		// own stdin after 10 idle minutes and every later codegraph tool call in
+		// a long-lived session would fail on a dead connection instead of
+		// answering with the skip reason.
+		const stdin = new PassThrough();
+		const stdout = new PassThrough();
+		stdout.resume();
+		const lifecycle: Array<{ readonly event: string; readonly data?: unknown }> = [];
+
+		try {
+			// when
+			const served = runUnavailableCodegraphMcpServer({
+				input: stdin,
+				output: stdout,
+				reason: "CodeGraph MCP skipped: test reason",
+				serverVersion: "0.0.0-test",
+				lifecycleLog: (event, data) => {
+					lifecycle.push({ event, data });
+				},
+			});
+			const outcome = await Promise.race([
+				served.then(() => "settled" as const),
+				Bun.sleep(500).then(() => "parked" as const),
+			]);
+
+			// then — the server must park on the held-open pipe (no idle timer
+			// tore it down) and must have started with the timeout disabled.
+			expect(outcome).toBe("parked");
+			expect(lifecycle).toContainEqual({
+				event: "stdio_started",
+				data: expect.objectContaining({ idle_timeout_ms: 0 }),
+			});
+		} finally {
+			stdin.destroy();
+			stdout.destroy();
+		}
+	});
+});

package/packages/omo-codex/plugin/components/comment-checker/hooks/hooks.json

@@ -8,7 +8,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/dist/cli.js\" hook post-tool-use",
 						"timeout": 30,
-						"statusMessage": "(OmO 5.0.0-beta.30) Checking Comments"
+						"statusMessage": "(OmO 5.0.0-beta.31) Checking Comments"
 					}
 				]
 			}

package/packages/omo-codex/plugin/components/comment-checker/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@code-yeongyu/codex-comment-checker",
-	"version": "5.0.0-beta.30",
+	"version": "5.0.0-beta.31",
 	"description": "Codex plugin that runs comment-checker after edit-like PostToolUse hooks.",
 	"type": "module",
 	"packageManager": "npm@11.12.1",

package/packages/omo-codex/plugin/components/git-bash/hooks/hooks.json

@@ -8,7 +8,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/dist/cli.js\" hook pre-tool-use",
 						"timeout": 5,
-						"statusMessage": "(OmO 5.0.0-beta.30) Recommending Git Bash MCP"
+						"statusMessage": "(OmO 5.0.0-beta.31) Recommending Git Bash MCP"
 					}
 				]
 			}
@@ -20,7 +20,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/dist/cli.js\" hook post-compact",
 						"timeout": 5,
-						"statusMessage": "(OmO 5.0.0-beta.30) Resetting Git Bash MCP Reminder"
+						"statusMessage": "(OmO 5.0.0-beta.31) Resetting Git Bash MCP Reminder"
 					}
 				]
 			}

package/packages/omo-codex/plugin/components/git-bash/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sisyphuslabs/codex-git-bash-hook",
-	"version": "5.0.0-beta.30",
+	"version": "5.0.0-beta.31",
 	"description": "Codex hook component that reminds Windows sessions to prefer the OMO git_bash MCP.",
 	"type": "module",
 	"private": true,

package/packages/omo-codex/plugin/components/lazycodex-executor-verify/hooks/hooks.json

@@ -8,7 +8,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/components/lazycodex-executor-verify/dist/cli.js\" hook subagent-stop",
 						"timeout": 10,
-						"statusMessage": "(OmO 5.0.0-beta.30) Verifying LazyCodex Executor Evidence"
+						"statusMessage": "(OmO 5.0.0-beta.31) Verifying LazyCodex Executor Evidence"
 					}
 				]
 			}

package/packages/omo-codex/plugin/components/lazycodex-executor-verify/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@code-yeongyu/codex-lazycodex-executor-verify",
-	"version": "5.0.0-beta.30",
+	"version": "5.0.0-beta.31",
 	"description": "Codex SubagentStop evidence verifier for LazyCodex executor completions.",
 	"type": "module",
 	"packageManager": "npm@11.12.1",

package/packages/omo-codex/plugin/components/lsp/dist/.omo-runtime-manifest.json

@@ -1,7 +1,7 @@
 {
   "schemaVersion": 1,
-  "version": "5.0.0-beta.30",
-  "inputDigest": "sha256:e51c462bed771b67810446ab27ee35a6009800cb9e3869f41234c80ca6818caa",
+  "version": "5.0.0-beta.31",
+  "inputDigest": "sha256:858b6dbf85523225a57282289db35b4a82d608613a4a5930ce1d85a86b4296b4",
   "outputs": [
     {
       "path": "cli.d.ts",
@@ -9,7 +9,7 @@
     },
     {
       "path": "cli.js",
-      "sha256": "5e3645a0299f523876c758e645e70f7a122a46da6ec7d3994473ec19f9048430"
+      "sha256": "d20c513dadc159abf9ecbc16198769b6b872a77472ac64a78d137e6c73c5debb"
     },
     {
       "path": "codex-hook-cli.d.ts",