oh-my-opencode 5.0.0-beta.25 → 5.0.0-beta.28

package/dist/cli-node/index.js

@@ -55,7 +55,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "oh-my-opencode",
-    version: "5.0.0-beta.25",
+    version: "5.0.0-beta.28",
     description: "The Best AI Agent Harness - Batteries-Included OpenCode Plugin with Multi-Model Orchestration, Parallel Background Agents, and Crafted LSP/AST Tools",
     main: "./dist/index.js",
     types: "dist/index.d.ts",
@@ -236,7 +236,7 @@ var init_package = __esm(() => {
       zod: "^4.4.3"
     },
     devDependencies: {
-      "@code-yeongyu/senpi": "2026.8.26-2",
+      "@code-yeongyu/senpi": "2026.8.30",
       "@oh-my-opencode/agents-md-core": "workspace:*",
       "@oh-my-opencode/ast-grep-mcp": "workspace:*",
       "@oh-my-opencode/boulder-state": "workspace:*",
@@ -277,18 +277,18 @@ var init_package = __esm(() => {
       typescript: "^7.0.2"
     },
     optionalDependencies: {
-      "oh-my-opencode-darwin-arm64": "5.0.0-beta.25",
-      "oh-my-opencode-darwin-x64": "5.0.0-beta.25",
-      "oh-my-opencode-darwin-x64-baseline": "5.0.0-beta.25",
-      "oh-my-opencode-linux-arm64": "5.0.0-beta.25",
-      "oh-my-opencode-linux-arm64-musl": "5.0.0-beta.25",
-      "oh-my-opencode-linux-x64": "5.0.0-beta.25",
-      "oh-my-opencode-linux-x64-baseline": "5.0.0-beta.25",
-      "oh-my-opencode-linux-x64-musl": "5.0.0-beta.25",
-      "oh-my-opencode-linux-x64-musl-baseline": "5.0.0-beta.25",
-      "oh-my-opencode-windows-arm64": "5.0.0-beta.25",
-      "oh-my-opencode-windows-x64": "5.0.0-beta.25",
-      "oh-my-opencode-windows-x64-baseline": "5.0.0-beta.25"
+      "oh-my-opencode-darwin-arm64": "5.0.0-beta.28",
+      "oh-my-opencode-darwin-x64": "5.0.0-beta.28",
+      "oh-my-opencode-darwin-x64-baseline": "5.0.0-beta.28",
+      "oh-my-opencode-linux-arm64": "5.0.0-beta.28",
+      "oh-my-opencode-linux-arm64-musl": "5.0.0-beta.28",
+      "oh-my-opencode-linux-x64": "5.0.0-beta.28",
+      "oh-my-opencode-linux-x64-baseline": "5.0.0-beta.28",
+      "oh-my-opencode-linux-x64-musl": "5.0.0-beta.28",
+      "oh-my-opencode-linux-x64-musl-baseline": "5.0.0-beta.28",
+      "oh-my-opencode-windows-arm64": "5.0.0-beta.28",
+      "oh-my-opencode-windows-x64": "5.0.0-beta.28",
+      "oh-my-opencode-windows-x64-baseline": "5.0.0-beta.28"
     },
     overrides: {
       "@earendil-works/pi-agent-core": "0.84.2",
@@ -304,7 +304,10 @@ var init_package = __esm(() => {
     },
     trustedDependencies: [
       "@code-yeongyu/comment-checker"
-    ]
+    ],
+    patchedDependencies: {
+      "@code-yeongyu/senpi@2026.8.30": "patches/@code-yeongyu%2Fsenpi@2026.8.30.patch"
+    }
   };
 });
 
@@ -4814,9 +4817,12 @@ import {
   fsyncSync,
   openSync,
   renameSync,
+  rmSync,
   unlinkSync,
   writeFileSync
 } from "node:fs";
+import { randomUUID } from "node:crypto";
+import { dirname } from "node:path";
 function isToleratedFsyncError(error) {
   if (!(error instanceof Error))
     return false;
@@ -4832,24 +4838,36 @@ function tolerantFsyncSync(fileDescriptor, fsyncImpl) {
   }
 }
 function writeFileAtomically(filePath, content, options = {}) {
-  const tempPath = `${filePath}.tmp`;
-  writeFileSync(tempPath, content, "utf-8");
-  const tempFileDescriptor = openSync(tempPath, "r+");
-  try {
-    tolerantFsyncSync(tempFileDescriptor, options.fsyncSync ?? fsyncSync);
-  } finally {
-    closeSync(tempFileDescriptor);
-  }
+  const platform = options.platform ?? process.platform;
+  const fsyncImpl = options.fsyncSync ?? fsyncSync;
+  const tempPath = `${filePath}.${process.pid}.${randomUUID()}.tmp`;
   try {
-    renameSync(tempPath, filePath);
-  } catch (error) {
-    const isPermissionError = error instanceof Error && (error.message.includes("EPERM") || error.message.includes("EACCES"));
-    if ((options.platform ?? process.platform) === "win32" && isPermissionError) {
+    writeFileSync(tempPath, content, "utf-8");
+    const tempFileDescriptor = openSync(tempPath, "r+");
+    try {
+      tolerantFsyncSync(tempFileDescriptor, fsyncImpl);
+    } finally {
+      closeSync(tempFileDescriptor);
+    }
+    try {
+      renameSync(tempPath, filePath);
+    } catch (error) {
+      const isPermissionError = error instanceof Error && (error.message.includes("EPERM") || error.message.includes("EACCES"));
+      if (platform !== "win32" || !isPermissionError)
+        throw error;
       unlinkSync(filePath);
       renameSync(tempPath, filePath);
+    }
+    if (platform === "win32")
       return;
+    const directoryFileDescriptor = openSync(dirname(filePath), "r");
+    try {
+      tolerantFsyncSync(directoryFileDescriptor, fsyncImpl);
+    } finally {
+      closeSync(directoryFileDescriptor);
     }
-    throw error;
+  } finally {
+    rmSync(tempPath, { force: true });
   }
 }
 var TOLERATED_FSYNC_CODES;
@@ -20555,6 +20573,25 @@ var init_telemetry = __esm(() => {
   }).strict();
 });
 
+// packages/omo-config-core/src/schema/format-on-mutation.ts
+var mode, languages, OmoFormatOnMutationLayerSchema, OmoFormatOnMutationSchema;
+var init_format_on_mutation = __esm(() => {
+  init_zod();
+  mode = _enum2(["off", "best-effort", "required"]);
+  languages = record(string2(), boolean2()).optional();
+  OmoFormatOnMutationLayerSchema = object({
+    mode: mode.optional(),
+    languages,
+    maxFileBytes: number2().int().positive().optional(),
+    timeoutMs: number2().int().positive().optional()
+  }).strict();
+  OmoFormatOnMutationSchema = OmoFormatOnMutationLayerSchema.extend({
+    mode: mode.default("best-effort"),
+    maxFileBytes: number2().int().positive().default(1048576),
+    timeoutMs: number2().int().positive().default(3000)
+  }).strict();
+});
+
 // packages/omo-config-core/src/schema/config.ts
 var OmoOpenCodeHarnessConfigSchema, OmoTypedHarnessConfigSchema, OmoConfigProfileSchema, OmoConfigSchema, OmoConfigLayerSchema;
 var init_config = __esm(() => {
@@ -20568,8 +20605,10 @@ var init_config = __esm(() => {
   init_task();
   init_team();
   init_telemetry();
+  init_format_on_mutation();
   OmoOpenCodeHarnessConfigSchema = record(string2(), unknown());
   OmoTypedHarnessConfigSchema = object({
+    formatOnMutation: OmoFormatOnMutationLayerSchema.optional(),
     categories: OmoCategoriesConfigSchema.optional(),
     agents: OmoAgentsConfigSchema.optional(),
     codegraph: OmoCodegraphSettingsLayerSchema.optional(),
@@ -20581,6 +20620,7 @@ var init_config = __esm(() => {
     telemetry: OmoTelemetrySettingsLayerSchema.optional()
   }).strict();
   OmoConfigProfileSchema = object({
+    formatOnMutation: OmoFormatOnMutationLayerSchema.optional(),
     categories: OmoCategoriesConfigSchema.optional(),
     agents: OmoAgentsConfigSchema.optional(),
     codegraph: OmoCodegraphSettingsLayerSchema.optional(),
@@ -20595,6 +20635,7 @@ var init_config = __esm(() => {
     "[codex]": OmoTypedHarnessConfigSchema.optional()
   }).strict();
   OmoConfigSchema = object({
+    formatOnMutation: OmoFormatOnMutationSchema.optional(),
     $schema: string2().optional(),
     categories: OmoCategoriesConfigSchema.optional(),
     agents: OmoAgentsConfigSchema.optional(),
@@ -20613,6 +20654,7 @@ var init_config = __esm(() => {
     legacy_migrations: record(string2(), unknown()).optional()
   }).strict();
   OmoConfigLayerSchema = object({
+    formatOnMutation: OmoFormatOnMutationLayerSchema.optional(),
     $schema: string2().optional(),
     categories: OmoCategoriesConfigSchema.optional(),
     agents: OmoAgentsConfigSchema.optional(),
@@ -20639,6 +20681,7 @@ var init_schema = __esm(() => {
   init_codegraph();
   init_config();
   init_fallback_models();
+  init_format_on_mutation();
   init_git_master();
   init_harness();
   init_memory();
@@ -20708,7 +20751,7 @@ var init_types = __esm(() => {
 
 // packages/omo-config-core/src/loader/paths.ts
 import { userInfo } from "node:os";
-import { dirname, join as join3, posix, resolve } from "node:path";
+import { dirname as dirname2, join as join3, posix, resolve } from "node:path";
 function resolveHomeDir(env = process.env) {
   const homeDir = env.HOME ?? env.USERPROFILE ?? process.cwd();
   return homeDir.startsWith("/") ? posix.resolve(homeDir) : toPosixPath(resolve(homeDir));
@@ -20773,7 +20816,7 @@ function findProjectConfigPathsFarthestFirst(cwd, homeDir, fileSystem, accountHo
       nearestFirst.push(configPath);
     if (isHomeDir)
       break;
-    const parentDir = dirname(currentDir);
+    const parentDir = dirname2(currentDir);
     if (parentDir === currentDir)
       break;
     currentDir = parentDir;
@@ -21213,8 +21256,8 @@ var init_jsonc_parse = __esm(() => {
 });
 
 // packages/omo-config-core/src/writer/writer.ts
-import { randomUUID } from "node:crypto";
-import { dirname as dirname2, join as join4, posix as posix2 } from "node:path";
+import { randomUUID as randomUUID2 } from "node:crypto";
+import { dirname as dirname3, join as join4, posix as posix2 } from "node:path";
 function backupSuffix() {
   return new Date().toISOString().replace(/[:.]/g, "-");
 }
@@ -21247,20 +21290,20 @@ function resolveWritePath(options) {
     const jsoncPath2 = resolveUserOmoConfigPath(options.env);
     if (fileSystem.existsSync(jsoncPath2))
       return jsoncPath2;
-    const jsonPath2 = join4(dirname2(jsoncPath2), "omo.json");
+    const jsonPath2 = join4(dirname3(jsoncPath2), "omo.json");
     return fileSystem.existsSync(jsonPath2) ? jsonPath2 : jsoncPath2;
   }
   const jsoncPath = join4(options.projectDir ?? process.cwd(), ".omo", "omo.jsonc");
   if (fileSystem.existsSync(jsoncPath))
     return jsoncPath;
-  const jsonPath = join4(dirname2(jsoncPath), "omo.json");
+  const jsonPath = join4(dirname3(jsoncPath), "omo.json");
   return fileSystem.existsSync(jsonPath) ? jsonPath : jsoncPath;
 }
 function directoryPath(path4) {
-  return path4.startsWith("/") ? posix2.dirname(path4) : dirname2(path4);
+  return path4.startsWith("/") ? posix2.dirname(path4) : dirname3(path4);
 }
 function writeAtomically(path4, content, fileSystem) {
-  const tempPath = `${path4}.${randomUUID()}.tmp`;
+  const tempPath = `${path4}.${randomUUID2()}.tmp`;
   let tempCreated = false;
   try {
     fileSystem.writeFileExclusiveSync(tempPath, content);
@@ -21543,7 +21586,7 @@ var init_types3 = __esm(() => {
 });
 
 // packages/omo-config-core/src/migration/commit.ts
-import { basename, dirname as dirname3, join as join5, resolve as resolve2 } from "node:path";
+import { basename, dirname as dirname4, join as join5, resolve as resolve2 } from "node:path";
 function parseDocument(path4, content) {
   const parsed = parseJsoncSafe2(content);
   if (parsed.errors.length > 0 || !isPlainObject5(parsed.data)) {
@@ -21577,11 +21620,11 @@ function writerInput(targetPath, env) {
   const homeDir = resolveHomeDir(env);
   const userDirectory = toPosixPath(join5(homeDir, ".omo"));
   const fileName = basename(targetPath);
-  if (toPosixPath(dirname3(targetPath)) === userDirectory && (fileName === "omo.json" || fileName === "omo.jsonc")) {
+  if (toPosixPath(dirname4(targetPath)) === userDirectory && (fileName === "omo.json" || fileName === "omo.jsonc")) {
     return { scope: "user" };
   }
-  if (basename(dirname3(targetPath)) === ".omo" && (fileName === "omo.json" || fileName === "omo.jsonc")) {
-    return { projectDir: dirname3(dirname3(targetPath)), scope: "project" };
+  if (basename(dirname4(targetPath)) === ".omo" && (fileName === "omo.json" || fileName === "omo.jsonc")) {
+    return { projectDir: dirname4(dirname4(targetPath)), scope: "project" };
   }
   throw new MigrationTransactionError(`Migration target is not an omo config path: ${targetPath}`);
 }
@@ -21944,7 +21987,7 @@ var init_recovery = __esm(() => {
 });
 
 // packages/omo-config-core/src/migration/batch.ts
-import { dirname as dirname4, posix as posix3 } from "node:path";
+import { dirname as dirname5, posix as posix3 } from "node:path";
 function parseSource(path4, content) {
   const parsed = parseJsoncSafe2(content);
   if (parsed.errors.length > 0) {
@@ -21993,7 +22036,7 @@ function assertSafeSourcePaths(sources, protectedPaths) {
   }
 }
 function directoryPath2(path4) {
-  return path4.startsWith("/") ? posix3.dirname(path4) : dirname4(path4);
+  return path4.startsWith("/") ? posix3.dirname(path4) : dirname5(path4);
 }
 function ensureBackupDirectories(moves, fileSystem) {
   for (const move of moves)
@@ -22624,7 +22667,7 @@ var init_process_sweep = () => {};
 // packages/utils/src/codegraph/resolve.ts
 import { existsSync as existsSync7 } from "node:fs";
 import { spawnSync } from "node:child_process";
-import { basename as basename2, dirname as dirname5, join as join10 } from "node:path";
+import { basename as basename2, dirname as dirname6, join as join10 } from "node:path";
 import { createRequire as createRequire2 } from "node:module";
 function defaultNodeVersion(nodePath) {
   if (nodePath === process.execPath && isNodeExecutableName(nodePath))
@@ -23058,6 +23101,9 @@ var init_message_inspection_error = () => {};
 function getPromptGateMessagesFetchTimeoutMs() {
   return promptGateMessagesFetchTimeoutMsForTesting ?? DEFAULT_PROMPT_GATE_MESSAGES_FETCH_TIMEOUT_MS;
 }
+function getPromptGateRevalidationTimeoutMs() {
+  return promptGateRevalidationTimeoutMsForTesting ?? DEFAULT_PROMPT_REVALIDATION_TIMEOUT_MS;
+}
 async function withDispatchTimeout(operation, dispatchTimeoutMs, operationName) {
   if (dispatchTimeoutMs <= 0) {
     return operation;
@@ -23076,7 +23122,7 @@ async function withDispatchTimeout(operation, dispatchTimeoutMs, operationName)
     }
   }
 }
-var DEFAULT_PROMPT_ASYNC_POST_DISPATCH_HOLD_MS = 2000, DEFAULT_PROMPT_SEMANTIC_DEDUPE_HOLD_MS = 15000, DEFAULT_PROMPT_DISPATCH_TIMEOUT_MS = 30000, DEFAULT_PROMPT_GATE_MESSAGES_FETCH_TIMEOUT_MS = 5000, DEFAULT_PROMPT_QUEUE_RETRY_MS = 250, promptGateMessagesFetchTimeoutMsForTesting;
+var DEFAULT_PROMPT_ASYNC_POST_DISPATCH_HOLD_MS = 2000, DEFAULT_PROMPT_SEMANTIC_DEDUPE_HOLD_MS = 15000, DEFAULT_PROMPT_DISPATCH_TIMEOUT_MS = 30000, DEFAULT_PROMPT_GATE_MESSAGES_FETCH_TIMEOUT_MS = 5000, DEFAULT_PROMPT_REVALIDATION_TIMEOUT_MS = 5000, DEFAULT_PROMPT_QUEUE_RETRY_MS = 250, promptGateMessagesFetchTimeoutMsForTesting, promptGateRevalidationTimeoutMsForTesting;
 
 // packages/utils/src/prompt-async-gate/pending-tool-turn.ts
 function getPromptQuery(input) {
@@ -23277,6 +23323,7 @@ async function dispatchAfterSessionIdle(args) {
     checkStatus,
     checkToolState,
     shouldDispatch,
+    retryDispatchFailure,
     dispatch
   } = args;
   const existing = getActiveReservation(sessionID);
@@ -23331,7 +23378,9 @@ async function dispatchAfterSessionIdle(args) {
       });
       return { status: "active" };
     }
-    if (shouldDispatch?.() === false) {
+    const dispatchDecision = shouldDispatch?.();
+    const resolvedDispatchDecision = dispatchDecision !== undefined && typeof dispatchDecision !== "boolean" ? await withDispatchTimeout(dispatchDecision, Math.min(dispatchTimeoutMs, getPromptGateRevalidationTimeoutMs()), `[prompt-async-gate] ${sessionName} shouldDispatch`) : dispatchDecision;
+    if (resolvedDispatchDecision === false) {
       log(`[prompt-async-gate] ${sessionName} cancelled before dispatch`, { sessionID, source });
       return { status: "cancelled" };
     }
@@ -23347,6 +23396,7 @@ async function dispatchAfterSessionIdle(args) {
     log(`[prompt-async-gate] ${sessionName} dispatched`, { sessionID, source });
     return { status: "dispatched", response };
   } catch (error51) {
+    const queueRetryable = dispatchAttempted && retryDispatchFailure?.(error51) === true;
     if (dispatchAttempted) {
       rememberRecentPromptDispatch({
         sessionID,
@@ -23357,7 +23407,12 @@ async function dispatchAfterSessionIdle(args) {
     }
     const errorText = error51 instanceof Error ? `${error51.name}: ${error51.message}` : String(error51);
     log(`[prompt-async-gate] ${sessionName} failed`, { sessionID, source, error: errorText });
-    return { status: "failed", error: error51, dispatchAttempted };
+    return {
+      status: "failed",
+      error: error51,
+      dispatchAttempted,
+      ...queueRetryable ? { queueRetryable: true } : {}
+    };
   } finally {
     finishPromptReservation(sessionID, reservation, dispatchAttempted, postDispatchHoldMs);
   }
@@ -23419,6 +23474,7 @@ function schedulePromptQueueDrain(sessionID, delayMs) {
   promptQueueTimers.set(sessionID, timer);
 }
 function removePromptQueueEntry(sessionID, entry) {
+  promptQueueRetryStates.delete(entry.id);
   const queue = promptQueues.get(sessionID);
   if (!queue) {
     return;
@@ -23448,6 +23504,7 @@ async function drainPromptQueue(sessionID, awaitedEntry) {
   promptQueueDraining.add(sessionID);
   clearPromptQueueTimer(sessionID);
   let awaitedResult;
+  const deferredRetryIds = new Set;
   try {
     while (true) {
       const queue = promptQueues.get(sessionID);
@@ -23455,6 +23512,20 @@ async function drainPromptQueue(sessionID, awaitedEntry) {
       if (!entry) {
         break;
       }
+      const retryState = promptQueueRetryStates.get(entry.id);
+      if (entry.durableRetry && retryState?.retryAfter !== undefined && retryState.retryAfter > Date.now()) {
+        if (deferredRetryIds.has(entry.id)) {
+          const nextRetryAt = Math.min(...queue.flatMap((queued) => {
+            const retryAfter = promptQueueRetryStates.get(queued.id)?.retryAfter;
+            return retryAfter === undefined ? [] : [retryAfter];
+          }));
+          schedulePromptQueueDrain(sessionID, nextRetryAt - Date.now());
+          break;
+        }
+        deferredRetryIds.add(entry.id);
+        setPromptQueue(sessionID, [...queue.slice(1), entry]);
+        continue;
+      }
       promptQueueInFlight.set(sessionID, entry);
       const result = await dispatchAfterSessionIdle({
         sessionName: entry.sessionName,
@@ -23470,12 +23541,45 @@ async function drainPromptQueue(sessionID, awaitedEntry) {
         checkStatus: entry.checkStatus,
         checkToolState: entry.checkToolState,
         shouldDispatch: entry.shouldDispatch,
+        retryDispatchFailure: entry.retryDispatchFailure,
         dispatch: entry.dispatch
       });
       if (promptQueueInFlight.get(sessionID)?.id === entry.id) {
         promptQueueInFlight.delete(sessionID);
       }
-      if (result.status === "active" || result.status === "reserved") {
+      const retryableQueuedFailure = result.status === "failed" && (!result.dispatchAttempted || result.queueRetryable === true);
+      if (retryableQueuedFailure) {
+        const failureCount = (promptQueueRetryStates.get(entry.id)?.failureCount ?? 0) + 1;
+        if (entry.durableRetry) {
+          const exponentialBackoffMs = entry.queueRetryMs * 2 ** Math.min(failureCount, 7);
+          const retryDelayMs = Math.max(entry.postDispatchHoldMs, Math.min(exponentialBackoffMs, MAX_DURABLE_RETRY_BACKOFF_MS));
+          promptQueueRetryStates.set(entry.id, {
+            failureCount,
+            retryAfter: Date.now() + retryDelayMs
+          });
+          const currentQueue = promptQueues.get(sessionID);
+          if (currentQueue && currentQueue.length > 1) {
+            setPromptQueue(sessionID, [...currentQueue.slice(1), entry]);
+            continue;
+          }
+          schedulePromptQueueDrain(sessionID, retryDelayMs);
+          break;
+        }
+        if (failureCount >= MAX_QUEUED_RETRYABLE_FAILURES) {
+          log("[prompt-async-gate] dropping queued prompt after repeated retryable failures", {
+            sessionID,
+            source: entry.source,
+            failureCount
+          });
+          removePromptQueueEntry(sessionID, entry);
+          if (awaitedEntry?.id === entry.id) {
+            awaitedResult = result;
+          }
+          continue;
+        }
+        promptQueueRetryStates.set(entry.id, { failureCount });
+      }
+      if (result.status === "active" || result.status === "reserved" || retryableQueuedFailure) {
         const queued = queuedResult(entry, 1, result.status === "reserved" ? result.reservedBy : entry.source);
         if (awaitedEntry?.id === entry.id) {
           awaitedResult = queued;
@@ -23536,7 +23640,7 @@ async function enqueueInternalPrompt(entry) {
   const result = await drainPromptQueue(entry.sessionID, entry);
   return result ?? queuedResult(entry, 1);
 }
-var promptQueues, promptQueueDraining, promptQueueInFlight, promptQueueTimers, promptQueueSequence = 0;
+var promptQueues, promptQueueDraining, promptQueueInFlight, promptQueueTimers, promptQueueRetryStates, MAX_QUEUED_RETRYABLE_FAILURES = 3, MAX_DURABLE_RETRY_BACKOFF_MS = 30000, promptQueueSequence = 0;
 var init_queue = __esm(() => {
   init_session_idle_dispatch();
   init_reservations();
@@ -23544,6 +23648,7 @@ var init_queue = __esm(() => {
   promptQueueDraining = new Set;
   promptQueueInFlight = new Map;
   promptQueueTimers = new Map;
+  promptQueueRetryStates = new Map;
   setExpiredReservationHandler((sessionID) => {
     schedulePromptQueueDrain(sessionID, 0);
   });
@@ -23791,6 +23896,7 @@ async function dispatchInternalPrompt(args) {
       checkStatus: args.checkStatus !== false,
       checkToolState: args.checkToolState !== false,
       shouldDispatch: args.shouldDispatch,
+      retryDispatchFailure: args.retryDispatchFailure,
       dispatch: (dispatchInput) => dispatchWithPathCompatibility(dispatch, dispatchInput)
     });
     if (deferResult.status === "failed" && resolved.route === "live" && deferResult.error instanceof Error && deferResult.error.message.startsWith(dispatchTimeoutPrefix)) {
@@ -23818,7 +23924,9 @@ async function dispatchInternalPrompt(args) {
       queueRetryMs,
       checkStatus: args.checkStatus !== false,
       checkToolState: args.checkToolState !== false,
+      durableRetry: args.durableRetry === true,
       shouldDispatch: args.shouldDispatch,
+      retryDispatchFailure: args.retryDispatchFailure,
       dispatch: async (_dispatchInput) => dispatchWithPathCompatibility(dispatch, input)
     });
   }
@@ -23840,6 +23948,7 @@ async function dispatchInternalPrompt(args) {
     checkStatus: args.checkStatus !== false,
     checkToolState: args.checkToolState !== false,
     shouldDispatch: args.shouldDispatch,
+    retryDispatchFailure: args.retryDispatchFailure,
     dispatch: (dispatchInput) => dispatchWithPathCompatibility(dispatch, dispatchInput)
   });
   if (directResult.status === "failed" && resolved.route === "live" && directResult.error instanceof Error && directResult.error.message.startsWith(dispatchTimeoutPrefix)) {
@@ -26052,7 +26161,7 @@ var init_resolve_agent_definition_paths = __esm(() => {
 // packages/omo-opencode/src/shared/opencode-version.ts
 import { execSync } from "child_process";
 import { existsSync as existsSync9, readFileSync as readFileSync3, realpathSync as realpathSync4 } from "fs";
-import { dirname as dirname6, join as join13 } from "path";
+import { dirname as dirname7, join as join13 } from "path";
 function parseVersion(version2) {
   const cleaned = version2.replace(/^v/, "").split("-")[0];
   return cleaned.split(".").map((n) => parseInt(n, 10) || 0);
@@ -26093,7 +26202,7 @@ function parsePackageVersion(content) {
 function getPackageVersionFromBinary(binaryPath, deps) {
   try {
     const realBinaryPath = deps.realpath(binaryPath);
-    const packagePath = join13(dirname6(dirname6(realBinaryPath)), "package.json");
+    const packagePath = join13(dirname7(dirname7(realBinaryPath)), "package.json");
     if (!deps.exists(packagePath))
       return null;
     return parsePackageVersion(deps.readText(packagePath));
@@ -26331,10 +26440,10 @@ import {
 } from "node:fs";
 function writeFileAtomically2(filePath, content, deps = {}) {
   const tempPath = `${filePath}.tmp`;
-  const mode = deps.mode;
-  writeFileSync3(tempPath, content, { encoding: "utf-8", mode });
-  if (mode !== undefined) {
-    chmodSync2(tempPath, mode);
+  const mode2 = deps.mode;
+  writeFileSync3(tempPath, content, { encoding: "utf-8", mode: mode2 });
+  if (mode2 !== undefined) {
+    chmodSync2(tempPath, mode2);
   }
   const tempFileDescriptor = openSync2(tempPath, "r+");
   try {
@@ -26355,8 +26464,8 @@ function writeFileAtomically2(filePath, content, deps = {}) {
       throw error51;
     }
   }
-  if (mode !== undefined) {
-    chmodSync2(filePath, mode);
+  if (mode2 !== undefined) {
+    chmodSync2(filePath, mode2);
   }
 }
 var init_write_file_atomically = __esm(() => {
@@ -83748,7 +83857,17 @@ function isPreSendConnectionFailure2(error51) {
   if (error51.name === "AbortError") {
     return false;
   }
-  const CONNECTION_CODES = new Set(["ECONNREFUSED", "ENOTFOUND", "EAI_AGAIN"]);
+  const CONNECTION_CODES = new Set([
+    "ECONNREFUSED",
+    "ENOTFOUND",
+    "EAI_AGAIN",
+    "ENETUNREACH",
+    "EHOSTUNREACH",
+    "ENETDOWN",
+    "EHOSTDOWN",
+    "EADDRNOTAVAIL",
+    "UND_ERR_CONNECT_TIMEOUT"
+  ]);
   const self = error51;
   if (self.code && CONNECTION_CODES.has(self.code)) {
     return true;
@@ -83760,12 +83879,6 @@ function isPreSendConnectionFailure2(error51) {
       return true;
     }
   }
-  if (error51 instanceof TypeError) {
-    const msg = error51.message;
-    if (msg.includes("fetch failed") || msg.includes("Unable to connect")) {
-      return true;
-    }
-  }
   return false;
 }
 function markLiveRouteUnavailable2(reason) {
@@ -84092,6 +84205,17 @@ var init_session_category_registry = __esm(() => {
   sessionCategoryMap = new Map;
 });
 
+// packages/omo-opencode/src/shared/plugin-entry-shape.ts
+function isPluginTupleEntry(entry) {
+  return Array.isArray(entry) && typeof entry[0] === "string";
+}
+function getPluginEntryName(entry) {
+  return isPluginTupleEntry(entry) ? entry[0] : entry;
+}
+function withPluginEntryName(entry, name) {
+  return isPluginTupleEntry(entry) ? [name, entry[1]] : name;
+}
+
 // packages/omo-opencode/src/shared/legacy-plugin-warning.ts
 var init_legacy_plugin_warning = __esm(() => {
   init_jsonc_parser2();
@@ -84100,6 +84224,29 @@ var init_legacy_plugin_warning = __esm(() => {
 });
 
 // node_modules/jsonc-parser/lib/esm/main.js
+function modify2(text, path7, value, options) {
+  return setProperty(text, path7, value, options);
+}
+function applyEdits2(text, edits) {
+  let sortedEdits = edits.slice(0).sort((a, b) => {
+    const diff = a.offset - b.offset;
+    if (diff === 0) {
+      return a.length - b.length;
+    }
+    return diff;
+  });
+  let lastModifiedOffset = text.length;
+  for (let i = sortedEdits.length - 1;i >= 0; i--) {
+    let e = sortedEdits[i];
+    if (e.offset + e.length <= lastModifiedOffset) {
+      text = applyEdit(text, e);
+    } else {
+      throw new Error("Overlapping edit");
+    }
+    lastModifiedOffset = e.offset;
+  }
+  return text;
+}
 var ScanError2, SyntaxKind2, ParseErrorCode2;
 var init_main2 = __esm(() => {
   init_format();
@@ -84363,7 +84510,7 @@ var init_plugin_name_with_version = __esm(() => {
 
 // packages/omo-opencode/src/cli/config-manager/backup-config.ts
 import { copyFileSync as copyFileSync2, existsSync as existsSync16, mkdirSync as mkdirSync6 } from "node:fs";
-import { dirname as dirname7 } from "node:path";
+import { dirname as dirname8 } from "node:path";
 function backupConfigFile(configPath) {
   if (!existsSync16(configPath)) {
     return { success: true };
@@ -84371,7 +84518,7 @@ function backupConfigFile(configPath) {
   const timestamp = new Date().toISOString().replace(/[:.]/g, "-");
   const backupPath = `${configPath}.backup-${timestamp}`;
   try {
-    const dir = dirname7(backupPath);
+    const dir = dirname8(backupPath);
     if (!existsSync16(dir)) {
       mkdirSync6(dir, { recursive: true });
     }
@@ -84569,7 +84716,7 @@ function extractVersionFromPluginEntry(entry) {
 
 // packages/omo-opencode/src/cli/config-manager/add-plugin-to-opencode-config.ts
 import { existsSync as existsSync19, readdirSync as readdirSync4, readFileSync as readFileSync8, writeFileSync as writeFileSync5 } from "node:fs";
-import { basename as basename3, dirname as dirname8, join as join21 } from "node:path";
+import { basename as basename3, dirname as dirname9, join as join21 } from "node:path";
 function detectConfigFormatInDir(configDir) {
   const configJsonc = join21(configDir, "opencode.jsonc");
   const configJson = join21(configDir, "opencode.json");
@@ -84582,10 +84729,10 @@ function detectConfigFormatInDir(configDir) {
   return { format: "none", path: configJson };
 }
 function getParentConfigDirForProfile(configDir) {
-  const parentDir = dirname8(configDir);
+  const parentDir = dirname9(configDir);
   if (basename3(parentDir) !== "profiles")
     return null;
-  return dirname8(parentDir);
+  return dirname9(parentDir);
 }
 function listProfileConfigDirs(rootConfigDir) {
   const profilesDir = join21(rootConfigDir, "profiles");
@@ -84612,13 +84759,14 @@ function getConfigTargets() {
   });
 }
 function isSourceOmoPluginEntry(plugin) {
-  const normalized = plugin.toLowerCase().replaceAll("\\", "/");
+  const normalized = getPluginEntryName(plugin).toLowerCase().replaceAll("\\", "/");
   if (!normalized.startsWith("file://"))
     return false;
   return /\/(omo(?:-[^/]*)?|oh-my-opencode|oh-my-openagent)\/(src|dist)\/index\.(ts|js)$/.test(normalized);
 }
 function isPackageOmoPluginEntry(plugin) {
-  return plugin === PLUGIN_NAME || plugin.startsWith(`${PLUGIN_NAME}@`) || plugin === LEGACY_PLUGIN_NAME || plugin.startsWith(`${LEGACY_PLUGIN_NAME}@`);
+  const name = getPluginEntryName(plugin);
+  return name === PLUGIN_NAME || name.startsWith(`${PLUGIN_NAME}@`) || name === LEGACY_PLUGIN_NAME || name.startsWith(`${LEGACY_PLUGIN_NAME}@`);
 }
 function isOurPlugin(plugin) {
   return isPackageOmoPluginEntry(plugin) || isSourceOmoPluginEntry(plugin);
@@ -84640,6 +84788,9 @@ function choosePluginEntry(params) {
   if (params.preferredSourceEntry) {
     return params.preferredSourceEntry;
   }
+  if (params.existingEntry) {
+    return withPluginEntryName(params.existingEntry, params.fallbackEntry);
+  }
   return params.fallbackEntry;
 }
 function writePluginEntryToTarget(params) {
@@ -84673,7 +84824,7 @@ function writePluginEntryToTarget(params) {
       preferredSourceEntry
     });
     if (existingEntry && !preferredSourceEntry) {
-      const installedVersion = extractVersionFromPluginEntry(existingEntry);
+      const installedVersion = extractVersionFromPluginEntry(getPluginEntryName(existingEntry));
       const compatibility = checkVersionCompatibility(installedVersion, currentVersion);
       if (!compatibility.canUpgrade) {
         return {
@@ -84696,20 +84847,12 @@ function writePluginEntryToTarget(params) {
     config3.plugin = normalizedPlugins;
     if (target.format === "jsonc") {
       const content = readFileSync8(target.path, "utf-8");
-      const pluginArrayRegex = /((?:"plugin"|plugin)\s*:\s*)\[([\s\S]*?)\]/;
-      const match = content.match(pluginArrayRegex);
-      if (match) {
-        const formattedPlugins = normalizedPlugins.map((p) => `"${p}"`).join(`,
-    `);
-        const newContent = content.replace(pluginArrayRegex, `$1[
-    ${formattedPlugins}
-  ]`);
-        writeFileSync5(target.path, newContent);
-      } else {
-        const newContent = content.replace(/(\{)/, `$1
-  "plugin": ["${nextPluginEntry}"],`);
-        writeFileSync5(target.path, newContent);
-      }
+      const edits = modify2(content, ["plugin"], normalizedPlugins, {
+        formattingOptions: { insertSpaces: true, tabSize: 2, eol: `
+` },
+        getInsertionIndex: () => 0
+      });
+      writeFileSync5(target.path, applyEdits2(content, edits));
     } else {
       writeFileSync5(target.path, JSON.stringify(config3, null, 2) + `
 `);
@@ -84754,6 +84897,7 @@ async function addPluginToOpenCodeConfig(currentVersion) {
   return primaryResult ?? { success: true, configPath: primaryTarget.path };
 }
 var init_add_plugin_to_opencode_config = __esm(() => {
+  init_main2();
   init_shared();
   init_backup_config();
   init_config_context();
@@ -86283,10 +86427,12 @@ function detectProvidersFromOmoConfig() {
   }
 }
 function isOurPlugin2(plugin) {
-  return plugin === PLUGIN_NAME || plugin.startsWith(`${PLUGIN_NAME}@`) || plugin === LEGACY_PLUGIN_NAME || plugin.startsWith(`${LEGACY_PLUGIN_NAME}@`);
+  const name = getPluginEntryName(plugin);
+  return name === PLUGIN_NAME || name.startsWith(`${PLUGIN_NAME}@`) || name === LEGACY_PLUGIN_NAME || name.startsWith(`${LEGACY_PLUGIN_NAME}@`);
 }
 function findOurPluginEntry2(plugins) {
-  return plugins.find(isOurPlugin2) ?? null;
+  const entry = plugins.find(isOurPlugin2);
+  return entry === undefined ? null : getPluginEntryName(entry);
 }
 function detectCurrentConfig() {
   const result = {
@@ -86719,7 +86865,7 @@ var init_env2 = __esm(() => {
 });
 
 // node_modules/.bun/posthog-node@5.51.1/node_modules/posthog-node/dist/extensions/error-tracking/modifiers/module.node.mjs
-import { dirname as dirname17, posix as posix7, sep as sep7 } from "path";
+import { dirname as dirname18, posix as posix7, sep as sep7 } from "path";
 function createModulerModifier() {
   const getModuleFromFileName = createGetModuleFromFilename();
   return async (frames) => {
@@ -86728,7 +86874,7 @@ function createModulerModifier() {
     return frames;
   };
 }
-function createGetModuleFromFilename(basePath = process.argv[1] ? dirname17(process.argv[1]) : process.cwd(), isWindows = sep7 === "\\") {
+function createGetModuleFromFilename(basePath = process.argv[1] ? dirname18(process.argv[1]) : process.cwd(), isWindows = sep7 === "\\") {
   const normalizedBase = isWindows ? normalizeWindowsPath(basePath) : basePath;
   return (filename) => {
     if (!filename)
@@ -92062,7 +92208,7 @@ function splitNodeOptions(nodeOptions) {
   return args;
 }
 function findUnhandledRejectionMode(args) {
-  let mode;
+  let mode2;
   for (let index = 0;index < args.length; index++) {
     const argument = args[index];
     const optionName = UNHANDLED_REJECTION_OPTION_NAMES.find((name) => argument === name || argument.startsWith(`${name}=`));
@@ -92070,9 +92216,9 @@ function findUnhandledRejectionMode(args) {
       continue;
     const value = argument === optionName ? args[++index] : argument.slice(optionName.length + 1);
     if (UNHANDLED_REJECTION_MODES.has(value))
-      mode = value;
+      mode2 = value;
   }
-  return mode;
+  return mode2;
 }
 function getUnhandledRejectionMode(execArgv = STARTUP_EXEC_ARGV, nodeOptions = STARTUP_NODE_OPTIONS) {
   return findUnhandledRejectionMode(execArgv) ?? findUnhandledRejectionMode(splitNodeOptions(nodeOptions ?? "")) ?? "throw";
@@ -92098,17 +92244,17 @@ function makeUncaughtExceptionHandler(captureFn, onFatalFn) {
     _posthogErrorHandler: true
   });
 }
-function addUncaughtExceptionListener(captureFn, onFatalFn, mode = STARTUP_UNHANDLED_REJECTION_MODE) {
+function addUncaughtExceptionListener(captureFn, onFatalFn, mode2 = STARTUP_UNHANDLED_REJECTION_MODE) {
   const process4 = globalThis.process;
   if (!process4)
     return;
-  if (mode === "strict")
+  if (mode2 === "strict")
     return void process4.on("uncaughtExceptionMonitor", (error51, origin) => captureUncaughtException(captureFn, error51, origin));
   process4.on("uncaughtException", makeUncaughtExceptionHandler(captureFn, onFatalFn));
 }
-function addUnhandledRejectionListener(captureFn, mode = STARTUP_UNHANDLED_REJECTION_MODE) {
+function addUnhandledRejectionListener(captureFn, mode2 = STARTUP_UNHANDLED_REJECTION_MODE) {
   const process4 = globalThis.process;
-  if (!process4 || mode === "throw" || mode === "strict" || mode === "warn-with-error-code")
+  if (!process4 || mode2 === "throw" || mode2 === "strict" || mode2 === "warn-with-error-code")
     return;
   process4.on("unhandledRejection", (reason) => {
     captureFn(reason, {
@@ -94333,7 +94479,7 @@ var package_default2;
 var init_package2 = __esm(() => {
   package_default2 = {
     name: "@oh-my-opencode/omo-codex",
-    version: "5.0.0-beta.25",
+    version: "5.0.0-beta.28",
     type: "module",
     private: true,
     description: "Codex harness adapter for oh-my-openagent. Vendored Codex plugin namespace (omo) + TypeScript installer + telemetry.",
@@ -95303,19 +95449,19 @@ var init_update_toasts = __esm(() => {
 
 // packages/omo-opencode/src/hooks/auto-update-checker/hook/background-update-check.ts
 import { existsSync as existsSync48 } from "node:fs";
-import { dirname as dirname30, join as join76 } from "node:path";
+import { dirname as dirname31, join as join76 } from "node:path";
 import { fileURLToPath as fileURLToPath5 } from "node:url";
 function defaultGetModuleHostingWorkspace() {
   try {
-    const currentDir = dirname30(fileURLToPath5(import.meta.url));
+    const currentDir = dirname31(fileURLToPath5(import.meta.url));
     const pkgJsonPath = findPackageJsonUp(currentDir);
     if (!pkgJsonPath)
       return null;
-    const pkgDir = dirname30(pkgJsonPath);
-    const nodeModulesDir = dirname30(pkgDir);
+    const pkgDir = dirname31(pkgJsonPath);
+    const nodeModulesDir = dirname31(pkgDir);
     if (nodeModulesDir.split(/[\\/]/).pop() !== "node_modules")
       return null;
-    return dirname30(nodeModulesDir);
+    return dirname31(nodeModulesDir);
   } catch (error51) {
     if (error51 instanceof Error) {
       return null;
@@ -97864,9 +98010,9 @@ function formatConfigSummary(config3) {
 `);
 }
 function printHeader(isUpdate) {
-  const mode = isUpdate ? "Update" : "Install";
+  const mode2 = isUpdate ? "Update" : "Install";
   console.log();
-  console.log(import_picocolors.default.bgMagenta(import_picocolors.default.white(` oMoMoMoMo... ${mode} `)));
+  console.log(import_picocolors.default.bgMagenta(import_picocolors.default.white(` oMoMoMoMo... ${mode2} `)));
   console.log();
 }
 function printStep(step, total, message) {
@@ -98145,7 +98291,7 @@ function windowsCommandShim(targetPath) {
 
 // packages/omo-codex/src/install/codex-cache-dangling-bins.ts
 import { lstat as lstat2, readFile, readdir, readlink, rm, stat } from "node:fs/promises";
-import { dirname as dirname9, isAbsolute, join as join23, resolve as resolve5 } from "node:path";
+import { dirname as dirname10, isAbsolute, join as join23, resolve as resolve5 } from "node:path";
 
 // packages/omo-codex/src/install/codex-cache-fs.ts
 import { lstat } from "node:fs/promises";
@@ -98192,7 +98338,7 @@ async function removeDanglingManagedSymlink(linkPath) {
     if (!linkStat.isSymbolicLink())
       return;
     const linkTarget = await readlink(linkPath);
-    const target = isAbsolute(linkTarget) ? linkTarget : resolve5(dirname9(linkPath), linkTarget);
+    const target = isAbsolute(linkTarget) ? linkTarget : resolve5(dirname10(linkPath), linkTarget);
     if (!await isFileSystemEntry(target) && isManagedComponentBinTarget(target))
       await rm(linkPath, { force: true });
   } catch (error51) {
@@ -98654,11 +98800,11 @@ async function existingNonSymlink(path7) {
 }
 // packages/omo-codex/src/install/codex-cache-install.ts
 import { cp as cp2, mkdir as mkdir3, readFile as readFile8, readdir as readdir4, rename, rm as rm4 } from "node:fs/promises";
-import { basename as basename5, dirname as dirname12, join as join32, sep as sep5 } from "node:path";
+import { basename as basename5, dirname as dirname13, join as join32, sep as sep5 } from "node:path";
 
 // packages/omo-codex/src/install/codex-cache-bundled-mcps.ts
 import { cp, mkdir as mkdir2, readFile as readFile4, stat as stat3 } from "node:fs/promises";
-import { dirname as dirname10, join as join27, resolve as resolve7 } from "node:path";
+import { dirname as dirname11, join as join27, resolve as resolve7 } from "node:path";
 var BUNDLED_MCP_RUNTIMES = [
   {
     label: "Git Bash MCP",
@@ -98693,7 +98839,7 @@ async function copyBundledMcpRuntimeDist(pluginRoot, sourceRoot, runtime4) {
     throw new Error(`missing built ${runtime4.label} dist at ${sourcePath}`);
   }
   const destinationPath = join27(pluginRoot, runtime4.destinationDistFromPlugin);
-  await mkdir2(dirname10(destinationPath), { recursive: true });
+  await mkdir2(dirname11(destinationPath), { recursive: true });
   await cp(sourcePath, destinationPath, { recursive: true });
 }
 async function readSourceMcpArgs(path7) {
@@ -98731,7 +98877,7 @@ async function isDirectory(path7) {
 // packages/omo-codex/src/install/codex-cache-local-dependencies.ts
 import { realpathSync as realpathSync6 } from "node:fs";
 import { readFile as readFile5, readdir as readdir3, writeFile as writeFile2 } from "node:fs/promises";
-import { dirname as dirname11, isAbsolute as isAbsolute4, join as join29, relative as relative3, resolve as resolve9, sep as sep2 } from "node:path";
+import { dirname as dirname12, isAbsolute as isAbsolute4, join as join29, relative as relative3, resolve as resolve9, sep as sep2 } from "node:path";
 
 // packages/omo-codex/src/install/codex-cache-paths.ts
 import { existsSync as existsSync24, readdirSync as readdirSync6 } from "node:fs";
@@ -98800,7 +98946,7 @@ async function rewriteCachedPackageLocalFileDependencies(pluginRoot, sourceRoot)
     const parsed = JSON.parse(raw);
     if (!isPlainRecord4(parsed))
       continue;
-    const packageDir = dirname11(packageJsonPath);
+    const packageDir = dirname12(packageJsonPath);
     const sourcePackageDir = join29(sourceRoot, relative3(pluginRoot, packageDir));
     let changed = false;
     for (const field of ["dependencies", "optionalDependencies", "peerDependencies"]) {
@@ -99195,13 +99341,13 @@ function sanitizeNpmInstallEnv(env2) {
   return Object.fromEntries(Object.entries(env2).filter(([key]) => key.toLowerCase() !== "npm_config_allow_scripts"));
 }
 function createTempSiblingPath(targetPath) {
-  return join32(dirname12(targetPath), `.tmp-${basename5(targetPath)}-${process.pid}-${Date.now()}`);
+  return join32(dirname13(targetPath), `.tmp-${basename5(targetPath)}-${process.pid}-${Date.now()}`);
 }
 function createBackupSiblingPath(targetPath) {
-  return join32(dirname12(targetPath), `.backup-${basename5(targetPath)}-${process.pid}-${Date.now()}`);
+  return join32(dirname13(targetPath), `.backup-${basename5(targetPath)}-${process.pid}-${Date.now()}`);
 }
 async function copyDirectory(sourcePath, targetPath) {
-  await mkdir3(dirname12(targetPath), { recursive: true });
+  await mkdir3(dirname13(targetPath), { recursive: true });
   await cp2(sourcePath, targetPath, { recursive: true, filter: (source) => shouldCopyPluginPath(source, sourcePath) });
 }
 async function promoteDirectory(tempPath, targetPath, renameDirectory) {
@@ -99300,20 +99446,20 @@ async function copyRootRuntimeDists(input) {
     const sourcePath = join32(repoRoot, runtimePath);
     if (!await fileExistsStrict(join32(sourcePath, "index.js")))
       continue;
-    await mkdir3(dirname12(join32(input.pluginRoot, runtimePath)), { recursive: true });
+    await mkdir3(dirname13(join32(input.pluginRoot, runtimePath)), { recursive: true });
     await cp2(sourcePath, join32(input.pluginRoot, runtimePath), { recursive: true });
   }
 }
 function repoRootForCodexPluginSource(sourcePath) {
-  const codexPackageRoot = dirname12(sourcePath);
-  const packagesRoot = dirname12(codexPackageRoot);
+  const codexPackageRoot = dirname13(sourcePath);
+  const packagesRoot = dirname13(codexPackageRoot);
   if (basename5(sourcePath) !== "plugin")
     return null;
   if (basename5(codexPackageRoot) !== "omo-codex")
     return null;
   if (basename5(packagesRoot) !== "packages")
     return null;
-  return dirname12(packagesRoot);
+  return dirname13(packagesRoot);
 }
 // packages/omo-codex/src/install/codex-cache-prune.ts
 import { lstat as lstat5, readdir as readdir5, rm as rm5, stat as stat4 } from "node:fs/promises";
@@ -99444,7 +99590,7 @@ async function shouldBuildSourcePackages(repoRoot) {
 
 // packages/omo-codex/src/install/codex-config-toml.ts
 import { mkdir as mkdir5, readFile as readFile11 } from "node:fs/promises";
-import { dirname as dirname15 } from "node:path";
+import { dirname as dirname16 } from "node:path";
 
 // packages/omo-codex/src/install/toml-section-editor.ts
 function findTomlSection(config3, header) {
@@ -100026,12 +100172,12 @@ function tomlKeySegment(value) {
 
 // packages/omo-codex/src/install/codex-config-atomic-write.ts
 import { lstat as lstat6, readlink as readlink4, realpath, rename as rename3, unlink, writeFile as writeFile5 } from "node:fs/promises";
-import { basename as basename6, dirname as dirname13, isAbsolute as isAbsolute5, join as join36, resolve as resolve10 } from "node:path";
+import { basename as basename6, dirname as dirname14, isAbsolute as isAbsolute5, join as join36, resolve as resolve10 } from "node:path";
 var RENAME_RETRY_DELAYS_MS = [10, 25, 50];
 var RETRIABLE_RENAME_CODES = new Set(["EPERM", "EBUSY"]);
 async function writeFileAtomic(targetPath, data) {
   const writeTarget = await resolveSymlinkTarget(targetPath);
-  const temporaryPath = join36(dirname13(writeTarget), `.tmp-${basename6(writeTarget)}-${process.pid}-${Date.now()}`);
+  const temporaryPath = join36(dirname14(writeTarget), `.tmp-${basename6(writeTarget)}-${process.pid}-${Date.now()}`);
   await writeFile5(temporaryPath, data);
   try {
     await renameWithRetry(temporaryPath, writeTarget);
@@ -100060,7 +100206,7 @@ async function resolveSymlinkTarget(targetPath) {
     if (!(error51 instanceof Error))
       throw error51;
     const linkValue = await readlink4(targetPath);
-    return isAbsolute5(linkValue) ? linkValue : resolve10(dirname13(targetPath), linkValue);
+    return isAbsolute5(linkValue) ? linkValue : resolve10(dirname14(targetPath), linkValue);
   }
 }
 async function renameWithRetry(fromPath, toPath) {
@@ -100540,14 +100686,14 @@ import { join as join37 } from "node:path";
 var FALLBACK_CODEX_MODEL_CATALOG = {
   current: {
     model: "gpt-5.6-sol",
-    modelContextWindow: 372000,
+    modelContextWindow: 650000,
     modelReasoningEffort: "high",
     planModeReasoningEffort: "xhigh"
   },
   managedProfiles: [
     {
       model: "gpt-5.5",
-      modelContextWindow: 400000,
+      modelContextWindow: 650000,
       modelReasoningEffort: "high",
       planModeReasoningEffort: "xhigh"
     },
@@ -100645,7 +100791,7 @@ function isRootSetting2(line, key) {
 
 // packages/omo-codex/src/install/codex-multi-agent-v2-config.ts
 import { readFileSync as readFileSync11 } from "node:fs";
-import { dirname as dirname14, isAbsolute as isAbsolute6, join as join38 } from "node:path";
+import { dirname as dirname15, isAbsolute as isAbsolute6, join as join38 } from "node:path";
 var CODEX_AGENTS_HEADER = "agents";
 var CODEX_MULTI_AGENT_V2_HEADER = "features.multi_agent_v2";
 var CODEX_MULTI_AGENT_V2_THREAD_LIMIT_KEY = `${CODEX_MULTI_AGENT_V2_HEADER}.max_concurrent_threads_per_session`;
@@ -100682,8 +100828,8 @@ function resolveCodexMultiAgentVersion(config3, configPath) {
 }
 function resolveCatalogPath(configuredPath, configPath) {
   if (configuredPath === null)
-    return join38(dirname14(configPath), "models_cache.json");
-  return isAbsolute6(configuredPath) ? configuredPath : join38(dirname14(configPath), configuredPath);
+    return join38(dirname15(configPath), "models_cache.json");
+  return isAbsolute6(configuredPath) ? configuredPath : join38(dirname15(configPath), configuredPath);
 }
 function readCatalogMultiAgentVersion(model, cachePath) {
   let raw;
@@ -100787,7 +100933,7 @@ function readBooleanSetting(sectionText, key) {
 
 // packages/omo-codex/src/install/codex-config-toml.ts
 async function updateCodexConfig(input) {
-  await mkdir5(dirname15(input.configPath), { recursive: true });
+  await mkdir5(dirname16(input.configPath), { recursive: true });
   let config3;
   try {
     config3 = await readFile11(input.configPath, "utf8");
@@ -101760,7 +101906,7 @@ var defaultRunCommand = async (command, args, options) => {
 
 // packages/omo-codex/src/install/codex-project-local-cleanup.ts
 import { copyFile as copyFile2, lstat as lstat10, readFile as readFile17, writeFile as writeFile10 } from "node:fs/promises";
-import { dirname as dirname16, join as join46, resolve as resolve11 } from "node:path";
+import { dirname as dirname17, join as join46, resolve as resolve11 } from "node:path";
 var LEGACY_AGENT_CONFLICT_KEYS = ["max_threads"];
 var PROJECT_LOCAL_ARTIFACT_PATHS = [
   ".codex/hooks.json",
@@ -101880,13 +102026,13 @@ async function findProjectLocalCodexConfigs(startDirectory, codexHome) {
         artifactRoots: artifactRootsForConfigPaths(configPathsFromCwd)
       };
     }
-    const parent = dirname16(current);
+    const parent = dirname17(current);
     if (parent === current) {
       const nearestConfigPath = configPathsFromCwd[0];
       return nearestConfigPath === undefined ? null : {
-        projectRoot: dirname16(dirname16(nearestConfigPath)),
+        projectRoot: dirname17(dirname17(nearestConfigPath)),
         configPaths: [nearestConfigPath],
-        artifactRoots: [dirname16(dirname16(nearestConfigPath))]
+        artifactRoots: [dirname17(dirname17(nearestConfigPath))]
       };
     }
     current = parent;
@@ -101902,7 +102048,7 @@ async function isRegularProjectLocalConfig(directory, configPath) {
 function artifactRootsForConfigPaths(configPaths2) {
   const roots = [];
   for (const configPath of configPaths2) {
-    const root = dirname16(dirname16(configPath));
+    const root = dirname17(dirname17(configPath));
     if (!roots.includes(root))
       roots.push(root);
   }
@@ -102812,7 +102958,7 @@ import { isAbsolute as isAbsolute11, join as join58, relative as relative6, reso
 
 // packages/omo-codex/src/install/codex-cleanup-bins.ts
 import { lstat as lstat12, readFile as readFile22, readdir as readdir12, readlink as readlink6, rm as rm11 } from "node:fs/promises";
-import { dirname as dirname18, isAbsolute as isAbsolute9, join as join56, resolve as resolve14 } from "node:path";
+import { dirname as dirname19, isAbsolute as isAbsolute9, join as join56, resolve as resolve14 } from "node:path";
 var ROOT_RUNTIME_BIN_NAME = "omo";
 var MANAGED_CODEX_BIN_NAMES = new Set([
   ROOT_RUNTIME_BIN_NAME,
@@ -102869,7 +103015,7 @@ async function isManagedCodexBin(linkPath, platform, binName) {
     if (platform === "win32")
       return false;
     const linkTarget = await readlink6(linkPath);
-    const target = isAbsolute9(linkTarget) ? linkTarget : resolve14(dirname18(linkPath), linkTarget);
+    const target = isAbsolute9(linkTarget) ? linkTarget : resolve14(dirname19(linkPath), linkTarget);
     return isManagedComponentBinTarget(target) || isLegacyCodexBinTarget(binName, target);
   }
   if (!entryStat.isFile())
@@ -102880,7 +103026,7 @@ async function isManagedCodexBin(linkPath, platform, binName) {
 
 // packages/omo-codex/src/install/codex-cleanup-config.ts
 import { lstat as lstat13, mkdir as mkdir8, readFile as readFile23, writeFile as writeFile13 } from "node:fs/promises";
-import { dirname as dirname19 } from "node:path";
+import { dirname as dirname20 } from "node:path";
 var MANAGED_MARKETPLACES = ["sisyphuslabs", "lazycodex", "code-yeongyu-codex-plugins"];
 var LEGACY_MANAGED_CODEX_AGENT_NAMES_TO_PURGE2 = ["codex-ultrawork-reviewer"];
 var CURRENT_MANAGED_CODEX_AGENT_NAMES2 = [
@@ -102917,7 +103063,7 @@ async function cleanupCodexConfig(configPath, now) {
   if (next === original)
     return { changed: false };
   const backupPath = `${configPath}.backup-${formatBackupTimestamp2(now?.() ?? new Date)}`;
-  await mkdir8(dirname19(configPath), { recursive: true });
+  await mkdir8(dirname20(configPath), { recursive: true });
   await writeFile13(backupPath, original);
   await writeFile13(configPath, `${next.trimEnd()}
 `);
@@ -102996,10 +103142,10 @@ function nodeErrorCode5(error51) {
 }
 
 // packages/omo-codex/src/install/codex-cleanup-safety.ts
-import { dirname as dirname20, isAbsolute as isAbsolute10, join as join57, relative as relative5, resolve as resolve15 } from "node:path";
+import { dirname as dirname21, isAbsolute as isAbsolute10, join as join57, relative as relative5, resolve as resolve15 } from "node:path";
 function codexHomeResolvesToFilesystemRoot(codexHome) {
   const resolved = resolve15(codexHome);
-  return dirname20(resolved) === resolved;
+  return dirname21(resolved) === resolved;
 }
 function validateManagedCleanupTarget(input) {
   if (!isAbsolute10(input.path))
@@ -103262,7 +103408,7 @@ var CODEGRAPH_RELATIVE_ARGS2 = new Set(["components/codegraph/dist/serve.js", ".
 import { execFile as execFile4 } from "node:child_process";
 import { existsSync as existsSync32 } from "node:fs";
 import { homedir as homedir11 } from "node:os";
-import { dirname as dirname24, join as join63, resolve as resolve20 } from "node:path";
+import { dirname as dirname25, join as join63, resolve as resolve20 } from "node:path";
 import { fileURLToPath } from "node:url";
 import { promisify as promisify3 } from "node:util";
 
@@ -103293,9 +103439,9 @@ function resolveAgentHome(options) {
 }
 
 // packages/omo-senpi/src/install/local-launcher.ts
-import { chmodSync as chmodSync3, existsSync as existsSync31, mkdirSync as mkdirSync10, readFileSync as readFileSync14, rmSync, writeFileSync as writeFileSync6 } from "node:fs";
+import { chmodSync as chmodSync3, existsSync as existsSync31, mkdirSync as mkdirSync10, readFileSync as readFileSync14, rmSync as rmSync2, writeFileSync as writeFileSync6 } from "node:fs";
 import { homedir as homedir10 } from "node:os";
-import { dirname as dirname21, join as join60, resolve as resolve18 } from "node:path";
+import { dirname as dirname22, join as join60, resolve as resolve18 } from "node:path";
 var MARKER = "omo-local-launcher";
 function localLauncherPath(homeDir = homedir10()) {
   return join60(homeDir, ".local", "bin", "omo");
@@ -103366,7 +103512,7 @@ function installLocalLauncher(options) {
   const path7 = localLauncherPath(options.homeDir);
   if (existsSync31(path7) && !readFileSync14(path7, "utf8").includes(MARKER))
     return;
-  mkdirSync10(dirname21(path7), { recursive: true });
+  mkdirSync10(dirname22(path7), { recursive: true });
   writeFileSync6(path7, renderLocalLauncher(options));
   chmodSync3(path7, 493);
   if ((options.platform ?? process.platform) === "win32") {
@@ -103381,12 +103527,12 @@ node "%~dp0omo" %*\r
 import { createHash as createHash5 } from "node:crypto";
 import { constants as constants9 } from "node:fs";
 import { access as access2, readFile as readFile26, stat as stat6 } from "node:fs/promises";
-import { dirname as dirname23, join as join62 } from "node:path";
+import { dirname as dirname24, join as join62 } from "node:path";
 
 // packages/omo-senpi/src/install/senpi-settings.ts
 import { constants as constants8 } from "node:fs";
 import { access, copyFile as copyFile3, mkdir as mkdir9, readFile as readFile25, rename as rename5, writeFile as writeFile14 } from "node:fs/promises";
-import { dirname as dirname22, join as join61, resolve as resolve19 } from "node:path";
+import { dirname as dirname23, join as join61, resolve as resolve19 } from "node:path";
 var OMO_SENPI_PACKAGE_NAME = "@code-yeongyu/omo-senpi";
 var LEGACY_BUILTIN_SHADOW_PACKAGES = [
   join61("packages", "pi-goal"),
@@ -103433,7 +103579,7 @@ async function removeSupersededOmoPackages(packages, currentPluginPath, agentDir
   return entries.filter((entry) => entry !== undefined);
 }
 async function writeSettingsAtomically(settingsPath, settings) {
-  await mkdir9(dirname22(settingsPath), { recursive: true });
+  await mkdir9(dirname23(settingsPath), { recursive: true });
   const backupPath = await nextBackupPath(settingsPath);
   if (await fileExists(settingsPath)) {
     await copyFile3(settingsPath, backupPath);
@@ -103553,7 +103699,7 @@ async function hasMissingPluginArtifact(pluginPath) {
 }
 async function verifyAstGrepRuntimeIntegrity(pluginPath, platform) {
   const runtimeEntry = join62(pluginPath, "runtime", "ast-grep-mcp", "cli.js");
-  const manifestPath = join62(dirname23(runtimeEntry), "manifest.json");
+  const manifestPath = join62(dirname24(runtimeEntry), "manifest.json");
   let runtimeStat;
   try {
     runtimeStat = await stat6(runtimeEntry);
@@ -103643,7 +103789,7 @@ async function runSenpiInstaller(options = {}) {
 function resolveInstallContext(options) {
   const env3 = options.env ?? process.env;
   const allowBuild = options.pluginPath === undefined;
-  const repoRoot = resolve20(options.repoRoot ?? (allowBuild ? findRepoRoot2(dirname24(fileURLToPath(import.meta.url))) : dirname24(resolve20(options.pluginPath))));
+  const repoRoot = resolve20(options.repoRoot ?? (allowBuild ? findRepoRoot2(dirname25(fileURLToPath(import.meta.url))) : dirname25(resolve20(options.pluginPath))));
   const agentDir = resolve20(options.agentDir ?? resolveAgentHome({ env: env3, homeDir: env3.HOME ?? homedir11() }));
   const pluginPath = resolve20(options.pluginPath ?? join63(repoRoot, "packages", "omo-senpi", "plugin"));
   return {
@@ -107647,7 +107793,7 @@ var import_picocolors11 = __toESM(require_picocolors(), 1);
 // packages/omo-opencode/src/cli/run/opencode-binary-resolver.ts
 init_bun_which_shim();
 init_spawn_with_windows_hide();
-import { delimiter as delimiter2, dirname as dirname25, posix as posix9, win32 as win325 } from "node:path";
+import { delimiter as delimiter2, dirname as dirname26, posix as posix9, win32 as win325 } from "node:path";
 var OPENCODE_COMMANDS = ["opencode", "opencode-desktop"];
 var WINDOWS_SUFFIXES = ["", ".exe", ".cmd", ".bat", ".ps1"];
 function getCommandCandidates(platform) {
@@ -107705,7 +107851,7 @@ async function findWorkingOpencodeBinary(pathEnv = process.env.PATH, probe2 = ca
   return null;
 }
 function buildPathWithBinaryFirst(pathEnv, binaryPath) {
-  const preferredDir = dirname25(binaryPath);
+  const preferredDir = dirname26(binaryPath);
   const existing = (pathEnv ?? "").split(delimiter2).filter((entry) => entry.length > 0 && entry !== preferredDir);
   return [preferredDir, ...existing].join(delimiter2);
 }
@@ -108483,7 +108629,7 @@ init_state();
 // packages/omo-opencode/src/features/run-continuation-state/constants.ts
 var CONTINUATION_MARKER_DIR = ".omo/run-continuation";
 // packages/omo-opencode/src/features/run-continuation-state/storage.ts
-import { existsSync as existsSync40, mkdirSync as mkdirSync12, readFileSync as readFileSync20, rmSync as rmSync2, writeFileSync as writeFileSync7 } from "node:fs";
+import { existsSync as existsSync40, mkdirSync as mkdirSync12, readFileSync as readFileSync20, rmSync as rmSync3, writeFileSync as writeFileSync7 } from "node:fs";
 import { join as join68 } from "node:path";
 function getMarkerPath(directory, sessionID) {
   return join68(directory, CONTINUATION_MARKER_DIR, `${sessionID}.json`);
@@ -108663,7 +108809,7 @@ init_agent_display_names();
 // packages/omo-opencode/src/hooks/ralph-loop/storage.ts
 init_frontmatter2();
 import { existsSync as existsSync41, readFileSync as readFileSync22, writeFileSync as writeFileSync8, unlinkSync as unlinkSync6, mkdirSync as mkdirSync13 } from "node:fs";
-import { dirname as dirname26, join as join70 } from "node:path";
+import { dirname as dirname27, join as join70 } from "node:path";
 
 // packages/omo-opencode/src/hooks/ralph-loop/constants.ts
 var DEFAULT_STATE_FILE = ".omo/ralph-loop.local.md";
@@ -109978,14 +110124,15 @@ function detectConfigPath() {
   return null;
 }
 function parsePluginVersion(entry) {
-  if (entry.startsWith(`${PLUGIN_NAME}@`)) {
-    const value = entry.slice(PLUGIN_NAME.length + 1);
+  const name = getPluginEntryName(entry);
+  if (name.startsWith(`${PLUGIN_NAME}@`)) {
+    const value = name.slice(PLUGIN_NAME.length + 1);
     if (!value || value === "latest")
       return null;
     return value;
   }
-  if (entry.startsWith(`${LEGACY_PLUGIN_NAME}@`)) {
-    const value = entry.slice(LEGACY_PLUGIN_NAME.length + 1);
+  if (name.startsWith(`${LEGACY_PLUGIN_NAME}@`)) {
+    const value = name.slice(LEGACY_PLUGIN_NAME.length + 1);
     if (!value || value === "latest")
       return null;
     return value;
@@ -109994,13 +110141,14 @@ function parsePluginVersion(entry) {
 }
 function findPluginEntry2(entries) {
   for (const entry of entries) {
-    if (entry === PLUGIN_NAME || entry.startsWith(`${PLUGIN_NAME}@`)) {
+    const name = getPluginEntryName(entry);
+    if (name === PLUGIN_NAME || name.startsWith(`${PLUGIN_NAME}@`)) {
       return { entry, isLocalDev: false };
     }
-    if (entry === LEGACY_PLUGIN_NAME || entry.startsWith(`${LEGACY_PLUGIN_NAME}@`)) {
+    if (name === LEGACY_PLUGIN_NAME || name.startsWith(`${LEGACY_PLUGIN_NAME}@`)) {
       return { entry, isLocalDev: false };
     }
-    if (entry.startsWith("file://") && (entry.includes(PLUGIN_NAME) || entry.includes(LEGACY_PLUGIN_NAME))) {
+    if (name.startsWith("file://") && (name.includes(PLUGIN_NAME) || name.includes(LEGACY_PLUGIN_NAME))) {
       return { entry, isLocalDev: true };
     }
   }
@@ -110322,13 +110470,14 @@ async function checkSystem(deps = defaultDeps6) {
     });
   }
   if (pluginInfo.entry && !pluginInfo.isLocalDev) {
-    const isLegacyName = pluginInfo.entry === LEGACY_PLUGIN_NAME || pluginInfo.entry.startsWith(`${LEGACY_PLUGIN_NAME}@`);
+    const entryName = getPluginEntryName(pluginInfo.entry);
+    const isLegacyName = entryName === LEGACY_PLUGIN_NAME || entryName.startsWith(`${LEGACY_PLUGIN_NAME}@`);
     if (isLegacyName) {
-      const suggestedEntry = pluginInfo.entry.replace(LEGACY_PLUGIN_NAME, PLUGIN_NAME);
+      const suggestedEntry = entryName.replace(LEGACY_PLUGIN_NAME, PLUGIN_NAME);
       issues.push({
         title: "Using legacy package name",
         description: `Your opencode.json references "${LEGACY_PLUGIN_NAME}" which has been renamed to "${PLUGIN_NAME}". The old name may stop working in a future release.`,
-        fix: `Update your opencode.json plugin entry: "${pluginInfo.entry}" → "${suggestedEntry}"`,
+        fix: `Update your opencode.json plugin entry: "${entryName}" → "${suggestedEntry}"`,
         severity: "warning",
         affects: ["plugin loading"]
       });
@@ -110505,8 +110654,8 @@ function getCategoryEffectiveVariant(categoryName, requirement, config4) {
 }
 
 // packages/omo-opencode/src/cli/doctor/checks/model-resolution-details.ts
-function formatCapabilityResolutionLabel(mode) {
-  return mode ?? "unknown";
+function formatCapabilityResolutionLabel(mode2) {
+  return mode2 ?? "unknown";
 }
 function buildModelResolutionDetails(options) {
   const details = [];
@@ -110624,8 +110773,8 @@ function collectCapabilityResolutionIssues(info) {
   const issues = [];
   const allEntries = [...info.agents, ...info.categories];
   const fallbackEntries = allEntries.filter((entry) => {
-    const mode = entry.capabilityDiagnostics?.resolutionMode;
-    return mode === "unknown";
+    const mode2 = entry.capabilityDiagnostics?.resolutionMode;
+    return mode2 === "unknown";
   });
   if (fallbackEntries.length === 0) {
     return issues;
@@ -110901,7 +111050,7 @@ init_src2();
 import { existsSync as existsSync55 } from "node:fs";
 import { createRequire as createRequire4 } from "node:module";
 import { homedir as homedir19 } from "node:os";
-import { dirname as dirname31, join as join83 } from "node:path";
+import { dirname as dirname32, join as join83 } from "node:path";
 
 // packages/omo-opencode/src/hooks/comment-checker/downloader.ts
 import { join as join82 } from "path";
@@ -110998,7 +111147,7 @@ function findCommentCheckerPackageBinary(baseDirOverride, resolvePackageJsonPath
   const binaryName = process.platform === "win32" ? "comment-checker.exe" : "comment-checker";
   const platformKey = `${process.platform}-${process.arch === "x64" ? "x64" : process.arch}`;
   try {
-    const packageDir = baseDirOverride ?? dirname31(resolvePackageJsonPath());
+    const packageDir = baseDirOverride ?? dirname32(resolvePackageJsonPath());
     const vendorPath = join83(packageDir, "vendor", platformKey, binaryName);
     if (existsSync55(vendorPath))
       return vendorPath;
@@ -111150,7 +111299,7 @@ async function getGhCliInfo(dependencies = {}) {
 init_zod();
 init_opencode_config_dir();
 import { existsSync as existsSync56, readFileSync as readFileSync35 } from "node:fs";
-import { delimiter as delimiter3, dirname as dirname32, resolve as resolve23 } from "node:path";
+import { delimiter as delimiter3, dirname as dirname33, resolve as resolve23 } from "node:path";
 import { fileURLToPath as fileURLToPath7 } from "node:url";
 
 // packages/omo-opencode/src/mcp/cli-suffix.ts
@@ -111281,7 +111430,7 @@ var LSP_BOOTSTRAP_SCRIPT = [
 ].join(";");
 function getModuleDirectory(moduleUrl) {
   try {
-    return dirname32(fileURLToPath7(moduleUrl));
+    return dirname33(fileURLToPath7(moduleUrl));
   } catch (error51) {
     if (!(error51 instanceof Error))
       throw error51;
@@ -111348,6 +111497,7 @@ function createLspMcpConfig(options = {}) {
     enabled: resolvedCommand.exists,
     cwd,
     environment: {
+      LSP_TOOLS_MCP_CWD: cwd,
       LSP_TOOLS_MCP_PROJECT_CONFIG: PROJECT_LSP_CONFIGS.map((configPath) => resolve23(cwd, configPath)).join(delimiter3),
       LSP_TOOLS_MCP_USER_CONFIG: resolve23(configDir, "lsp.json"),
       LSP_TOOLS_MCP_INSTALL_DECISIONS: resolve23(configDir, "lsp-install-decisions.json"),
@@ -112014,7 +112164,7 @@ async function pathExists2(path15) {
 init_src2();
 import { readdir as readdir15, readFile as readFile28, stat as stat7 } from "node:fs/promises";
 import { homedir as homedir23 } from "node:os";
-import { dirname as dirname33, isAbsolute as isAbsolute13, join as join86, relative as relative9, resolve as resolve25, sep as sep9 } from "node:path";
+import { dirname as dirname34, isAbsolute as isAbsolute13, join as join86, relative as relative9, resolve as resolve25, sep as sep9 } from "node:path";
 var CODEX_COMPONENTS_CHECK_ID = "codex-components";
 var CODEX_COMPONENTS_CHECK_NAME = "codex-components";
 var PLUGIN_DATA_DIR_NAME = "omo-sisyphuslabs";
@@ -112088,7 +112238,7 @@ async function auditBundleTargets(pluginRoot) {
     const manifest2 = await readJson2(manifestPath);
     if (manifest2 === null || !isRecord13(manifest2["mcpServers"]))
       continue;
-    const manifestRoot = dirname33(manifestPath);
+    const manifestRoot = dirname34(manifestPath);
     const isRootManifest = resolve25(manifestRoot) === resolve25(pluginRoot);
     for (const server2 of Object.values(manifest2["mcpServers"])) {
       if (!isRecord13(server2) || !Array.isArray(server2["args"]))
@@ -112109,7 +112259,7 @@ async function auditBundleTargets(pluginRoot) {
       continue;
     const commands2 = [];
     collectHookCommands(manifest2, commands2);
-    const hookPluginRoot = dirname33(dirname33(hookManifestPath));
+    const hookPluginRoot = dirname34(dirname34(hookManifestPath));
     for (const command of commands2) {
       for (const relativePath of extractPluginRootPaths(command)) {
         referencedCount += 1;
@@ -112148,7 +112298,7 @@ async function classifyBundleTarget(bundleRoot, baseRoot, relativePath, allowEsc
 }
 async function findHookManifestPaths(root) {
   const paths3 = await findManifestPaths(root, "hooks.json");
-  return paths3.filter((path15) => dirname33(path15).endsWith(`${sep9}hooks`));
+  return paths3.filter((path15) => dirname34(path15).endsWith(`${sep9}hooks`));
 }
 async function findManifestPaths(root, manifestName) {
   let entries;
@@ -112667,8 +112817,8 @@ function formatVerbose(result) {
 }
 
 // packages/omo-opencode/src/cli/doctor/framework/formatter.ts
-function formatDoctorOutput(result, mode) {
-  switch (mode) {
+function formatDoctorOutput(result, mode2) {
+  switch (mode2) {
     case "default":
       return formatDefault(result);
     case "status":
@@ -112832,7 +112982,7 @@ import {
   unlinkSync as unlinkSync9,
   writeFileSync as writeFileSync12
 } from "node:fs";
-import { basename as basename12, dirname as dirname34, join as join90 } from "node:path";
+import { basename as basename12, dirname as dirname35, join as join90 } from "node:path";
 
 // packages/mcp-client-core/src/config-dir.ts
 import { existsSync as existsSync61, realpathSync as realpathSync8 } from "node:fs";
@@ -113016,7 +113166,7 @@ function readLegacyStore() {
 }
 function writeTokenFile(filePath, token) {
   try {
-    const dir = dirname34(filePath);
+    const dir = dirname35(filePath);
     if (!existsSync63(dir)) {
       mkdirSync15(dir, { recursive: true });
     }
@@ -113988,10 +114138,10 @@ function formatClassification(classification) {
   return classification.ref.length > 0 ? `${head} ${classification.path} ${classification.ref}` : `${head} ${classification.path}`;
 }
 function formatSummary(result) {
-  const mode = result.apply ? "apply" : "dry-run";
+  const mode2 = result.apply ? "apply" : "dry-run";
   const removed2 = result.repos.reduce((total, repo) => total + repo.removed.length, 0);
   const failed = result.repos.reduce((total, repo) => total + repo.failed.length, 0);
-  return `SUMMARY mode=${mode} repos=${result.repos.length} sweep=${result.sweepCount} keep=${result.keepCount} prune=${result.pruneCount} removed=${removed2} failed=${failed}`;
+  return `SUMMARY mode=${mode2} repos=${result.repos.length} sweep=${result.sweepCount} keep=${result.keepCount} prune=${result.pruneCount} removed=${removed2} failed=${failed}`;
 }
 function formatResult(result) {
   const lines = [];
@@ -114513,9 +114663,9 @@ Examples:
 `).action(async (options) => {
   const rootOptions = program2.opts();
   const rootDoctorPlatform = rootOptions.platform === "opencode" || rootOptions.platform === "codex" ? rootOptions.platform : undefined;
-  const mode = options.status ? "status" : options.verbose ? "verbose" : "default";
+  const mode2 = options.status ? "status" : options.verbose ? "verbose" : "default";
   const doctorOptions = {
-    mode,
+    mode: mode2,
     json: options.json ?? false,
     target: resolveDoctorTarget(process.env.OMO_INVOCATION_NAME, options.platform ?? rootDoctorPlatform)
   };