oh-my-opencode 4.5.12 → 4.6.0

package/dist/cli/index.js

@@ -51711,7 +51711,7 @@ async function withDispatchTimeout(operation, dispatchTimeoutMs, operationName)
     }
   }
 }
-var DEFAULT_PROMPT_ASYNC_POST_DISPATCH_HOLD_MS = 2000, 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_QUEUE_RETRY_MS = 250, promptGateMessagesFetchTimeoutMsForTesting;
 
 // src/shared/prompt-async-gate/pending-tool-turn.ts
 function getPromptQuery(input) {
@@ -51808,6 +51808,42 @@ var init_pending_tool_turn = __esm(() => {
   init_message_inspection_error();
 });
 
+// src/shared/prompt-async-gate/recent-dispatches.ts
+function recentDispatchKey(sessionID, dedupeKey) {
+  return `${sessionID}\x00${dedupeKey}`;
+}
+function pruneRecentPromptDispatches(now = Date.now()) {
+  for (const [key, dispatch] of recentPromptDispatches) {
+    if (dispatch.expiresAt <= now) {
+      recentPromptDispatches.delete(key);
+    }
+  }
+}
+function getRecentPromptDispatch(sessionID, dedupeKey) {
+  pruneRecentPromptDispatches();
+  return recentPromptDispatches.get(recentDispatchKey(sessionID, dedupeKey));
+}
+function rememberRecentPromptDispatch(args) {
+  pruneRecentPromptDispatches();
+  if (args.holdMs <= 0) {
+    return;
+  }
+  recentPromptDispatches.set(recentDispatchKey(args.sessionID, args.dedupeKey), {
+    source: args.source,
+    expiresAt: Date.now() + args.holdMs
+  });
+  log("[prompt-async-gate] remembered semantic prompt dispatch", {
+    sessionID: args.sessionID,
+    source: args.source,
+    holdMs: args.holdMs
+  });
+}
+var recentPromptDispatches;
+var init_recent_dispatches = __esm(() => {
+  init_logger();
+  recentPromptDispatches = new Map;
+});
+
 // src/shared/prompt-async-gate/reservations.ts
 function setExpiredReservationHandler(handler) {
   expiredReservationHandler = handler;
@@ -51869,6 +51905,7 @@ async function dispatchAfterSessionIdle(args) {
     dedupeKey,
     settleMs,
     postDispatchHoldMs,
+    semanticDedupeHoldMs,
     dispatchTimeoutMs,
     checkStatus,
     checkToolState,
@@ -51926,10 +51963,25 @@ async function dispatchAfterSessionIdle(args) {
     log(`[prompt-async-gate] ${sessionName} dispatching`, { sessionID, source });
     dispatchAttempted = true;
     const response = await withDispatchTimeout(dispatch(input), dispatchTimeoutMs, `[prompt-async-gate] ${sessionName} dispatch`);
+    rememberRecentPromptDispatch({
+      sessionID,
+      dedupeKey,
+      source,
+      holdMs: semanticDedupeHoldMs
+    });
     log(`[prompt-async-gate] ${sessionName} dispatched`, { sessionID, source });
     return { status: "dispatched", response };
   } catch (error) {
-    log(`[prompt-async-gate] ${sessionName} failed`, { sessionID, source, error: String(error) });
+    if (dispatchAttempted) {
+      rememberRecentPromptDispatch({
+        sessionID,
+        dedupeKey,
+        source,
+        holdMs: semanticDedupeHoldMs
+      });
+    }
+    const errorText = error instanceof Error ? `${error.name}: ${error.message}` : String(error);
+    log(`[prompt-async-gate] ${sessionName} failed`, { sessionID, source, error: errorText });
     return { status: "failed", error, dispatchAttempted };
   } finally {
     finishPromptReservation(sessionID, reservation, dispatchAttempted, postDispatchHoldMs);
@@ -51939,6 +51991,7 @@ var init_session_idle_dispatch = __esm(() => {
   init_logger();
   init_session_idle_settle();
   init_pending_tool_turn();
+  init_recent_dispatches();
   init_reservations();
 });
 
@@ -52038,6 +52091,7 @@ async function drainPromptQueue(sessionID, awaitedEntry) {
         dedupeKey: entry.dedupeKey,
         settleMs: entry.settleMs,
         postDispatchHoldMs: entry.postDispatchHoldMs,
+        semanticDedupeHoldMs: entry.semanticDedupeHoldMs,
         dispatchTimeoutMs: entry.dispatchTimeoutMs,
         checkStatus: entry.checkStatus,
         checkToolState: entry.checkToolState,
@@ -52121,27 +52175,119 @@ var init_queue = __esm(() => {
   });
 });
 
-// src/shared/prompt-async-gate.ts
+// src/shared/prompt-async-gate/semantic-dedupe.ts
+import { createHash } from "crypto";
+function isPlainRecord(value) {
+  if (typeof value !== "object" || value === null || Array.isArray(value)) {
+    return false;
+  }
+  const prototype = Object.getPrototypeOf(value);
+  return prototype === Object.prototype || prototype === null;
+}
+function canonicalizePromptInputForDedupe(key, value, seen = new WeakSet, depth = 0) {
+  if (key === "signal") {
+    return "[AbortSignal]";
+  }
+  if (typeof value === "function") {
+    return `[Function:${value.name}]`;
+  }
+  if (depth > MAX_PROMPT_DEDUPE_DEPTH) {
+    return "[MaxDepth]";
+  }
+  if (Array.isArray(value)) {
+    if (seen.has(value)) {
+      return "[Circular]";
+    }
+    seen.add(value);
+    try {
+      return value.map((entry) => canonicalizePromptInputForDedupe("", entry, seen, depth + 1));
+    } finally {
+      seen.delete(value);
+    }
+  }
+  if (!isPlainRecord(value)) {
+    return value;
+  }
+  if (seen.has(value)) {
+    return "[Circular]";
+  }
+  seen.add(value);
+  try {
+    const canonicalEntries = [];
+    for (const entryKey of Object.keys(value).sort()) {
+      canonicalEntries.push([
+        entryKey,
+        canonicalizePromptInputForDedupe(entryKey, value[entryKey], seen, depth + 1)
+      ]);
+    }
+    return Object.fromEntries(canonicalEntries);
+  } finally {
+    seen.delete(value);
+  }
+}
+function isContinuationTextPartLike(value) {
+  if (!isPlainRecord(value)) {
+    return false;
+  }
+  if (value.type !== "text" || typeof value.text !== "string") {
+    return false;
+  }
+  if (!hasInternalInitiatorMarker(value.text)) {
+    return false;
+  }
+  if (!isPlainRecord(value.metadata)) {
+    return false;
+  }
+  return value.metadata.compaction_continue === true;
+}
+function hasContinuationPromptIntent(input) {
+  if (!isPlainRecord(input) || !isPlainRecord(input.body) || !Array.isArray(input.body.parts)) {
+    return false;
+  }
+  return input.body.parts.some((part) => isContinuationTextPartLike(part));
+}
+function normalizePromptInputForSemanticDedupe(input) {
+  if (hasContinuationPromptIntent(input)) {
+    return {
+      __omo_internal_intent: "continuation"
+    };
+  }
+  return canonicalizePromptInputForDedupe("", input);
+}
 function stringifyPromptInputForDedupe(input) {
   try {
-    const serialized = JSON.stringify(input, (key, value) => {
-      if (key === "signal") {
-        return "[AbortSignal]";
-      }
-      if (typeof value === "function") {
-        return `[Function:${value.name}]`;
-      }
-      return value;
-    });
+    const serialized = JSON.stringify(normalizePromptInputForSemanticDedupe(input));
     return serialized ?? String(input);
-  } catch {
-    return String(input);
+  } catch (error) {
+    const errorTag = error instanceof Error ? error.name : String(error);
+    return `${String(input)}:[unserializable:${errorTag}]`;
   }
 }
-function createDefaultDedupeKey(source, input) {
+function createSemanticPromptDedupeKey(input) {
   const fingerprint = stringifyPromptInputForDedupe(input);
-  return `${source}:${fingerprint.length}:${fingerprint.slice(0, 8192)}`;
+  const digest = createHash("sha256").update(fingerprint, "utf8").digest("hex");
+  return `semantic:${digest}`;
+}
+function coalesceRecentSemanticPromptDispatch(args) {
+  const recentDispatch = getRecentPromptDispatch(args.sessionID, args.dedupeKey);
+  if (!recentDispatch) {
+    return;
+  }
+  log("[prompt-async-gate] prompt coalesced with recent semantic dispatch", {
+    sessionID: args.sessionID,
+    source: args.source,
+    queuedBy: recentDispatch.source
+  });
+  return { status: "queued", queuedBy: recentDispatch.source, position: 0 };
 }
+var MAX_PROMPT_DEDUPE_DEPTH = 64;
+var init_semantic_dedupe = __esm(() => {
+  init_internal_initiator_marker();
+  init_logger();
+  init_recent_dispatches();
+});
+
+// src/shared/prompt-async-gate.ts
 function hasObjectSessionPath(input) {
   return typeof input === "object" && input !== null && "path" in input && typeof input.path === "object" && input.path !== null && "id" in input.path && typeof input.path.id === "string";
 }
@@ -52171,9 +52317,10 @@ async function dispatchInternalPrompt(args) {
     source,
     settleMs = DEFAULT_SESSION_IDLE_SETTLE_MS
   } = args;
-  const dedupeKey = args.dedupeKey ?? createDefaultDedupeKey(source, input);
+  const dedupeKey = args.dedupeKey ?? createSemanticPromptDedupeKey(input);
   const queueRetryMs = args.queueRetryMs ?? DEFAULT_PROMPT_QUEUE_RETRY_MS;
   const postDispatchHoldMs = args.postDispatchHoldMs ?? DEFAULT_PROMPT_ASYNC_POST_DISPATCH_HOLD_MS;
+  const semanticDedupeHoldMs = args.semanticDedupeHoldMs ?? (postDispatchHoldMs > 0 ? DEFAULT_PROMPT_SEMANTIC_DEDUPE_HOLD_MS : 0);
   const dispatchTimeoutMs = args.dispatchTimeoutMs ?? DEFAULT_PROMPT_DISPATCH_TIMEOUT_MS;
   const sessionName = args.mode === "async" ? "promptAsync" : "prompt";
   const dispatch = (() => {
@@ -52206,6 +52353,10 @@ async function dispatchInternalPrompt(args) {
     if (queuedBy !== undefined || isPromptQueueDraining(sessionID)) {
       return { status: "reserved", reservedBy: queuedBy ?? source };
     }
+    const recentDispatchResult2 = coalesceRecentSemanticPromptDispatch({ sessionID, dedupeKey, source });
+    if (recentDispatchResult2) {
+      return recentDispatchResult2;
+    }
     return dispatchAfterSessionIdle({
       sessionName,
       client,
@@ -52215,6 +52366,7 @@ async function dispatchInternalPrompt(args) {
       dedupeKey,
       settleMs,
       postDispatchHoldMs,
+      semanticDedupeHoldMs,
       dispatchTimeoutMs,
       checkStatus: args.checkStatus !== false,
       checkToolState: args.checkToolState !== false,
@@ -52222,6 +52374,10 @@ async function dispatchInternalPrompt(args) {
     });
   }
   if (args.queue !== false) {
+    const recentDispatchResult2 = coalesceRecentSemanticPromptDispatch({ sessionID, dedupeKey, source });
+    if (recentDispatchResult2) {
+      return recentDispatchResult2;
+    }
     return enqueueInternalPrompt({
       id: nextPromptQueueID(),
       sessionID,
@@ -52232,6 +52388,7 @@ async function dispatchInternalPrompt(args) {
       dedupeKey,
       settleMs,
       postDispatchHoldMs,
+      semanticDedupeHoldMs,
       dispatchTimeoutMs,
       queueRetryMs,
       checkStatus: args.checkStatus !== false,
@@ -52239,6 +52396,10 @@ async function dispatchInternalPrompt(args) {
       dispatch: async (_dispatchInput) => dispatchWithPathCompatibility(dispatch, input)
     });
   }
+  const recentDispatchResult = coalesceRecentSemanticPromptDispatch({ sessionID, dedupeKey, source });
+  if (recentDispatchResult) {
+    return recentDispatchResult;
+  }
   return dispatchAfterSessionIdle({
     sessionName,
     client,
@@ -52248,6 +52409,7 @@ async function dispatchInternalPrompt(args) {
     dedupeKey,
     settleMs,
     postDispatchHoldMs,
+    semanticDedupeHoldMs,
     dispatchTimeoutMs,
     checkStatus: args.checkStatus !== false,
     checkToolState: args.checkToolState !== false,
@@ -52261,8 +52423,10 @@ var init_prompt_async_gate = __esm(() => {
   init_logger();
   init_session_idle_settle();
   init_queue();
+  init_recent_dispatches();
   init_reservations();
   init_session_idle_dispatch();
+  init_semantic_dedupe();
 });
 
 // src/shared/prompt-failure-classifier.ts
@@ -54105,7 +54269,7 @@ var init_config_manager = __esm(() => {
 });
 
 // node_modules/.bun/posthog-node@5.35.3/node_modules/posthog-node/dist/extensions/error-tracking/modifiers/module.node.mjs
-import { dirname as dirname13, posix, sep as sep3 } from "path";
+import { dirname as dirname14, posix, sep as sep3 } from "path";
 function createModulerModifier() {
   const getModuleFromFileName = createGetModuleFromFilename();
   return async (frames) => {
@@ -54114,7 +54278,7 @@ function createModulerModifier() {
     return frames;
   };
 }
-function createGetModuleFromFilename(basePath = process.argv[1] ? dirname13(process.argv[1]) : process.cwd(), isWindows = sep3 === "\\") {
+function createGetModuleFromFilename(basePath = process.argv[1] ? dirname14(process.argv[1]) : process.cwd(), isWindows = sep3 === "\\") {
   const normalizedBase = isWindows ? normalizeWindowsPath(basePath) : basePath;
   return (filename) => {
     if (!filename)
@@ -56919,14 +57083,14 @@ async function addSourceContext(frames) {
   return frames;
 }
 function getContextLinesFromFile(path6, ranges, output) {
-  return new Promise((resolve8) => {
+  return new Promise((resolve9) => {
     const stream = createReadStream(path6);
     const lineReaded = createInterface({
       input: stream
     });
     function destroyStreamAndResolve() {
       stream.destroy();
-      resolve8();
+      resolve9();
     }
     let lineNumber = 0;
     let currentRangeIndex = 0;
@@ -58398,9 +58562,9 @@ var init_client = __esm(() => {
       if (this.disabled || this.optedOut)
         return;
       if (!this._waitUntilCycle) {
-        let resolve8;
+        let resolve9;
         const promise = new Promise((r) => {
-          resolve8 = r;
+          resolve9 = r;
         });
         try {
           waitUntil(promise);
@@ -58408,7 +58572,7 @@ var init_client = __esm(() => {
           return;
         }
         this._waitUntilCycle = {
-          resolve: resolve8,
+          resolve: resolve9,
           startedAt: Date.now(),
           timer: undefined
         };
@@ -58434,11 +58598,11 @@ var init_client = __esm(() => {
       return cycle?.resolve;
     }
     async resolveWaitUntilFlush() {
-      const resolve8 = this._consumeWaitUntilCycle();
+      const resolve9 = this._consumeWaitUntilCycle();
       try {
         await super.flush();
       } catch {} finally {
-        resolve8?.();
+        resolve9?.();
       }
     }
     getPersistedProperty(key) {
@@ -58538,15 +58702,15 @@ var init_client = __esm(() => {
         return true;
       if (this.featureFlagsPoller === undefined)
         return false;
-      return new Promise((resolve8) => {
+      return new Promise((resolve9) => {
         const timeout = setTimeout(() => {
           cleanup();
-          resolve8(false);
+          resolve9(false);
         }, timeoutMs);
         const cleanup = this._events.on("localEvaluationFlagsLoaded", (count) => {
           clearTimeout(timeout);
           cleanup();
-          resolve8(count > 0);
+          resolve9(count > 0);
         });
       });
     }
@@ -59033,13 +59197,13 @@ var init_client = __esm(() => {
       this.context?.enter(data, options);
     }
     async _shutdown(shutdownTimeoutMs) {
-      const resolve8 = this._consumeWaitUntilCycle();
+      const resolve9 = this._consumeWaitUntilCycle();
       await this.featureFlagsPoller?.stopPoller(shutdownTimeoutMs);
       this.errorTracking.shutdown();
       try {
         return await super._shutdown(shutdownTimeoutMs);
       } finally {
-        resolve8?.();
+        resolve9?.();
       }
     }
     async _requestRemoteConfigPayload(flagKey) {
@@ -59435,7 +59599,10 @@ var init_package = __esm(() => {
         types: "./index.d.ts",
         import: "./src/index.ts"
       },
-      "./telemetry": "./src/telemetry/index.ts",
+      "./telemetry": {
+        types: "./src/telemetry/index.ts",
+        import: "./src/telemetry/index.ts"
+      },
       "./marketplace.json": "./marketplace.json"
     },
     types: "./index.d.ts",
@@ -59543,10 +59710,10 @@ var init_data_path2 = __esm(() => {
 });
 
 // packages/omo-codex/src/telemetry/posthog-activity-state.ts
-import { existsSync as existsSync22, mkdirSync as mkdirSync8, readFileSync as readFileSync13 } from "fs";
-import { join as join27 } from "path";
+import { existsSync as existsSync24, mkdirSync as mkdirSync8, readFileSync as readFileSync13 } from "fs";
+import { join as join29 } from "path";
 function getPostHogActivityStateFilePath() {
-  return join27(getActivityStateDir(), POSTHOG_ACTIVITY_STATE_FILE);
+  return join29(getActivityStateDir(), POSTHOG_ACTIVITY_STATE_FILE);
 }
 function getUtcDayString(date) {
   return date.toISOString().slice(0, 10);
@@ -59556,7 +59723,7 @@ function isPostHogActivityState(value) {
 }
 function readPostHogActivityState() {
   const stateFilePath = getPostHogActivityStateFilePath();
-  if (!existsSync22(stateFilePath)) {
+  if (!existsSync24(stateFilePath)) {
     return {};
   }
   try {
@@ -59603,7 +59770,7 @@ var init_posthog_activity_state = __esm(() => {
 });
 
 // packages/omo-codex/src/telemetry/posthog.ts
-import { createHash as createHash2 } from "crypto";
+import { createHash as createHash3 } from "crypto";
 import os4 from "os";
 function resolveOsProvider() {
   return osProviderOverride2 ?? os4;
@@ -59686,7 +59853,7 @@ function createPostHogClient(source, options) {
   };
 }
 function getPostHogDistinctId() {
-  return createHash2("sha256").update(`omo-codex:${resolveOsProvider().hostname()}`).digest("hex");
+  return createHash3("sha256").update(`omo-codex:${resolveOsProvider().hostname()}`).digest("hex");
 }
 function createCliPostHog() {
   return createPostHogClient("cli", {
@@ -59910,12 +60077,12 @@ var require_isexe = __commonJS((exports2, module) => {
       if (typeof Promise !== "function") {
         throw new TypeError("callback not provided");
       }
-      return new Promise(function(resolve9, reject) {
+      return new Promise(function(resolve11, reject) {
         isexe(path8, options || {}, function(er, is) {
           if (er) {
             reject(er);
           } else {
-            resolve9(is);
+            resolve11(is);
           }
         });
       });
@@ -59977,27 +60144,27 @@ var require_which = __commonJS((exports2, module) => {
       opt = {};
     const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt);
     const found = [];
-    const step = (i2) => new Promise((resolve9, reject) => {
+    const step = (i2) => new Promise((resolve11, reject) => {
       if (i2 === pathEnv.length)
-        return opt.all && found.length ? resolve9(found) : reject(getNotFoundError(cmd));
+        return opt.all && found.length ? resolve11(found) : reject(getNotFoundError(cmd));
       const ppRaw = pathEnv[i2];
       const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
       const pCmd = path8.join(pathPart, cmd);
       const p2 = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd;
-      resolve9(subStep(p2, i2, 0));
+      resolve11(subStep(p2, i2, 0));
     });
-    const subStep = (p2, i2, ii) => new Promise((resolve9, reject) => {
+    const subStep = (p2, i2, ii) => new Promise((resolve11, reject) => {
       if (ii === pathExt.length)
-        return resolve9(step(i2 + 1));
+        return resolve11(step(i2 + 1));
       const ext = pathExt[ii];
       isexe(p2 + ext, { pathExt: pathExtExe }, (er, is) => {
         if (!er && is) {
           if (opt.all)
             found.push(p2 + ext);
           else
-            return resolve9(p2 + ext);
+            return resolve11(p2 + ext);
         }
-        return resolve9(subStep(p2, i2, ii + 1));
+        return resolve11(subStep(p2, i2, ii + 1));
       });
     });
     return cb ? step(0).then((res) => cb(null, res), cb) : step(0);
@@ -60894,8 +61061,8 @@ var init_update_toasts = __esm(() => {
 });
 
 // src/hooks/auto-update-checker/hook/background-update-check.ts
-import { existsSync as existsSync38 } from "fs";
-import { join as join41 } from "path";
+import { existsSync as existsSync41 } from "fs";
+import { join as join46 } from "path";
 function getCacheWorkspaceDir(deps) {
   return deps.join(deps.getOpenCodeCacheDir(), "packages");
 }
@@ -61013,8 +61180,8 @@ var init_background_update_check = __esm(() => {
   init_checker();
   init_update_toasts();
   defaultDeps3 = {
-    existsSync: existsSync38,
-    join: join41,
+    existsSync: existsSync41,
+    join: join46,
     runBunInstallWithDetails,
     log,
     getOpenCodeCacheDir,
@@ -61173,7 +61340,7 @@ async function showSpinnerToast(ctx, version3, message) {
         duration: frameInterval + 50
       }
     }).catch(() => {});
-    await new Promise((resolve10) => setTimeout(resolve10, frameInterval));
+    await new Promise((resolve12) => setTimeout(resolve12, frameInterval));
   }
 }
 var SISYPHUS_SPINNER;
@@ -61256,13 +61423,13 @@ v${latestVersion} available. Restart OpenCode to apply.` : "OpenCode is now on S
     }
   };
 }
-var defaultDeps4, isRecord13 = (value) => {
+var defaultDeps4, isRecord15 = (value) => {
   return typeof value === "object" && value !== null;
 }, getParentID = (properties) => {
-  if (!isRecord13(properties))
+  if (!isRecord15(properties))
     return;
   const { info } = properties;
-  if (!isRecord13(info))
+  if (!isRecord15(info))
     return;
   const { parentID } = info;
   return typeof parentID === "string" && parentID.length > 0 ? parentID : undefined;
@@ -61326,7 +61493,7 @@ var {
 // package.json
 var package_default = {
   name: "oh-my-opencode",
-  version: "4.5.12",
+  version: "4.6.0",
   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",
@@ -61335,6 +61502,7 @@ var package_default = {
     "packages/rules-engine",
     "packages/ast-grep-core",
     "packages/ast-grep-mcp",
+    "packages/git-bash-mcp",
     "packages/utils",
     "packages/model-core",
     "packages/prompts-core",
@@ -61349,7 +61517,8 @@ var package_default = {
     "oh-my-opencode": "bin/oh-my-opencode.js",
     "oh-my-openagent": "bin/oh-my-opencode.js",
     omo: "bin/oh-my-opencode.js",
-    lazycodex: "bin/oh-my-opencode.js"
+    lazycodex: "bin/oh-my-opencode.js",
+    "lazycodex-ai": "bin/oh-my-opencode.js"
   },
   files: [
     "dist",
@@ -61361,6 +61530,7 @@ var package_default = {
     ".agents/skills",
     "packages/lsp-tools-mcp/dist",
     "packages/ast-grep-mcp/dist",
+    "packages/git-bash-mcp/dist",
     "packages/shared-skills/package.json",
     "packages/shared-skills/index.mjs",
     "packages/shared-skills/skills",
@@ -61378,7 +61548,7 @@ var package_default = {
     "./schema.json": "./dist/oh-my-opencode.schema.json"
   },
   scripts: {
-    build: "bun run build:ast-grep-mcp && bun build src/index.ts --outdir dist --target bun --format esm --external @ast-grep/napi --external zod && bun run build:node-require-shim && tsc --emitDeclarationOnly && bun build src/cli/index.ts --outdir dist/cli --target bun --format esm --external @ast-grep/napi && bun run build:schema",
+    build: "bun run build:ast-grep-mcp && bun run build:git-bash-mcp && bun build src/index.ts --outdir dist --target bun --format esm --external @ast-grep/napi --external zod && bun run build:node-require-shim && tsc --emitDeclarationOnly && bun build src/cli/index.ts --outdir dist/cli --target bun --format esm --external @ast-grep/napi && bun run build:schema",
     "build:lsp-tools-mcp": "npm --prefix packages/lsp-tools-mcp ci && npm --prefix packages/lsp-tools-mcp run build",
     "build:node-require-shim": "bun run script/patch-node-require-shim.ts",
     "build:all": "bun run build && bun run build:binaries",
@@ -61391,12 +61561,13 @@ var package_default = {
     prepublishOnly: "bun run clean && bun run build:lsp-tools-mcp && bun run build",
     "test:model-capabilities": "bun test src/shared/model-capability-aliases.test.ts src/shared/model-capability-guardrails.test.ts src/shared/model-capabilities.test.ts src/cli/doctor/checks/model-resolution.test.ts --bail",
     typecheck: "tsgo --noEmit && bun run typecheck:packages",
-    "typecheck:packages": "tsgo --noEmit -p packages/rules-engine/tsconfig.json && tsgo --noEmit -p packages/ast-grep-core/tsconfig.json && tsgo --noEmit -p packages/ast-grep-mcp/tsconfig.json && tsgo --noEmit -p packages/utils/tsconfig.json && tsgo --noEmit -p packages/model-core/tsconfig.json && tsgo --noEmit -p packages/prompts-core/tsconfig.json && tsgo --noEmit -p packages/comment-checker-core/tsconfig.json && tsgo --noEmit -p packages/hashline-core/tsconfig.json && tsgo --noEmit -p packages/boulder-state/tsconfig.json && tsgo --noEmit -p packages/agents-md-core/tsconfig.json && tsgo --noEmit -p packages/omo-codex/tsconfig.json",
+    "typecheck:packages": "tsgo --noEmit -p packages/rules-engine/tsconfig.json && tsgo --noEmit -p packages/ast-grep-core/tsconfig.json && tsgo --noEmit -p packages/ast-grep-mcp/tsconfig.json && tsgo --noEmit -p packages/git-bash-mcp/tsconfig.json && tsgo --noEmit -p packages/utils/tsconfig.json && tsgo --noEmit -p packages/model-core/tsconfig.json && tsgo --noEmit -p packages/prompts-core/tsconfig.json && tsgo --noEmit -p packages/comment-checker-core/tsconfig.json && tsgo --noEmit -p packages/hashline-core/tsconfig.json && tsgo --noEmit -p packages/boulder-state/tsconfig.json && tsgo --noEmit -p packages/agents-md-core/tsconfig.json && tsgo --noEmit -p packages/omo-codex/tsconfig.json",
     "typecheck:script": "tsgo --noEmit -p script/tsconfig.json",
     test: "bun test",
-    "test:codex": "bun run build:ast-grep-mcp && bun run build:lsp-tools-mcp && npm --prefix packages/omo-codex/plugin ci && bun run --cwd packages/omo-codex/plugin build && bun test src/cli/cli-installer.platform.test.ts src/cli/install-codex/codex-cache.test.ts src/cli/install-codex/codex-config-agent-cleanup.test.ts src/cli/install-codex/codex-config-toml.test.ts src/cli/install-codex/install-codex.test.ts src/cli/install-codex/link-cached-plugin-agents.test.ts packages/omo-codex/src/**/*.test.ts packages/utils/src/jsonc-parser.test.ts packages/utils/src/frontmatter.test.ts packages/hashline-core/src/hash-computation.test.ts packages/hashline-core/src/smoke-untested-modules.test.ts packages/rules-engine/src/index.test.ts packages/rules-engine/src/security-boundary.test.ts packages/agents-md-core/src/injector.test.ts packages/omo-codex/plugin/components/lsp/test/package-smoke.test.ts && node --test packages/omo-codex/plugin/test/*.test.mjs packages/omo-codex/scripts/install-cache-copy.test.mjs packages/omo-codex/scripts/install-config.test.mjs packages/omo-codex/scripts/install-local.test.mjs packages/omo-codex/scripts/install-mcp-runtime.test.mjs packages/omo-codex/scripts/install-agent-links.test.mjs packages/omo-codex/scripts/install-bin-links.test.mjs packages/omo-codex/scripts/sync-telemetry-component.test.mjs",
+    "test:codex": "bun run build:ast-grep-mcp && bun run build:lsp-tools-mcp && npm --prefix packages/omo-codex/plugin ci && bun run --cwd packages/omo-codex/plugin build && bun test src/cli/cli-installer.platform.test.ts src/cli/install-codex/codex-cache.test.ts src/cli/install-codex/codex-cleanup.test.ts src/cli/install-codex/codex-config-agent-cleanup.test.ts src/cli/install-codex/codex-config-reasoning.test.ts src/cli/install-codex/codex-config-toml.test.ts src/cli/install-codex/codex-project-local-cleanup.test.ts src/cli/install-codex/install-codex-project-local-cleanup.test.ts src/cli/install-codex/install-codex.test.ts src/cli/install-codex/install-codex-packaged.test.ts src/cli/install-codex/link-cached-plugin-agents.test.ts packages/omo-codex/src/**/*.test.ts packages/utils/src/jsonc-parser.test.ts packages/utils/src/frontmatter.test.ts packages/hashline-core/src/hash-computation.test.ts packages/hashline-core/src/smoke-untested-modules.test.ts packages/rules-engine/src/index.test.ts packages/rules-engine/src/security-boundary.test.ts packages/agents-md-core/src/injector.test.ts packages/omo-codex/plugin/components/lsp/test/package-smoke.test.ts && node --test packages/omo-codex/plugin/test/*.test.mjs packages/omo-codex/scripts/install-cache-copy.test.mjs packages/omo-codex/scripts/install-cli-args.test.mjs packages/omo-codex/scripts/install-config-autonomous.test.mjs packages/omo-codex/scripts/install-config-reasoning.test.mjs packages/omo-codex/scripts/install-config.test.mjs packages/omo-codex/scripts/install-project-local-cleanup.test.mjs packages/omo-codex/scripts/install-local-entrypoint.test.mjs packages/omo-codex/scripts/install-local-git-bash-preflight.test.mjs packages/omo-codex/scripts/install-local.test.mjs packages/omo-codex/scripts/install-mcp-runtime.test.mjs packages/omo-codex/scripts/install-packaged-local.test.mjs packages/omo-codex/scripts/install/git-bash.test.mjs packages/omo-codex/scripts/install-agent-links.test.mjs packages/omo-codex/scripts/install-bin-links.test.mjs packages/omo-codex/scripts/sync-telemetry-component.test.mjs",
     "test:windows-codex": "bun run test:codex",
-    "build:ast-grep-mcp": "bun run --cwd packages/ast-grep-mcp build"
+    "build:ast-grep-mcp": "bun run --cwd packages/ast-grep-mcp build",
+    "build:git-bash-mcp": "bun run --cwd packages/git-bash-mcp build"
   },
   keywords: [
     "opencode",
@@ -61439,6 +61610,7 @@ var package_default = {
   devDependencies: {
     "@oh-my-opencode/ast-grep-core": "workspace:*",
     "@oh-my-opencode/ast-grep-mcp": "workspace:*",
+    "@oh-my-opencode/git-bash-mcp": "workspace:*",
     "@oh-my-opencode/agents-md-core": "workspace:*",
     "@oh-my-opencode/boulder-state": "workspace:*",
     "@oh-my-opencode/comment-checker-core": "workspace:*",
@@ -61457,17 +61629,17 @@ var package_default = {
     zod: "^4.4.3"
   },
   optionalDependencies: {
-    "oh-my-opencode-darwin-arm64": "4.5.12",
-    "oh-my-opencode-darwin-x64": "4.5.12",
-    "oh-my-opencode-darwin-x64-baseline": "4.5.12",
-    "oh-my-opencode-linux-arm64": "4.5.12",
-    "oh-my-opencode-linux-arm64-musl": "4.5.12",
-    "oh-my-opencode-linux-x64": "4.5.12",
-    "oh-my-opencode-linux-x64-baseline": "4.5.12",
-    "oh-my-opencode-linux-x64-musl": "4.5.12",
-    "oh-my-opencode-linux-x64-musl-baseline": "4.5.12",
-    "oh-my-opencode-windows-x64": "4.5.12",
-    "oh-my-opencode-windows-x64-baseline": "4.5.12"
+    "oh-my-opencode-darwin-arm64": "4.6.0",
+    "oh-my-opencode-darwin-x64": "4.6.0",
+    "oh-my-opencode-darwin-x64-baseline": "4.6.0",
+    "oh-my-opencode-linux-arm64": "4.6.0",
+    "oh-my-opencode-linux-arm64-musl": "4.6.0",
+    "oh-my-opencode-linux-x64": "4.6.0",
+    "oh-my-opencode-linux-x64-baseline": "4.6.0",
+    "oh-my-opencode-linux-x64-musl": "4.6.0",
+    "oh-my-opencode-linux-x64-musl-baseline": "4.6.0",
+    "oh-my-opencode-windows-x64": "4.6.0",
+    "oh-my-opencode-windows-x64-baseline": "4.6.0"
   },
   overrides: {
     hono: "^4.12.18",
@@ -61490,6 +61662,7 @@ var package_default = {
 init_shared();
 init_config_manager();
 var import_picocolors3 = __toESM(require_picocolors(), 1);
+import { createInterface as createInterface2 } from "readline/promises";
 
 // src/cli/install-validators.ts
 var import_picocolors = __toESM(require_picocolors(), 1);
@@ -61517,6 +61690,9 @@ function formatConfigSummary(config) {
   if (config.hasCodex) {
     lines.push(`  ${SYMBOLS.info} Codex autonomous mode: ${config.codexAutonomous ? "enabled" : "disabled"}`);
   }
+  if (!config.hasOpenCode)
+    return lines.join(`
+`);
   lines.push("");
   const claudeDetail = config.hasClaude ? config.isMax20 ? "max20" : "standard" : undefined;
   lines.push(formatProvider("Claude", config.hasClaude, claudeDetail));
@@ -61742,9 +61918,9 @@ function getUnsupportedOpenCodeVersionMessage(openCodeVersion) {
 
 // src/cli/install-codex/install-codex.ts
 import { homedir as homedir5 } from "os";
-import { join as join28, resolve as resolve8 } from "path";
-import { existsSync as existsSync23 } from "fs";
-import { mkdir as mkdir6, writeFile as writeFile6 } from "fs/promises";
+import { join as join30, resolve as resolve9 } from "path";
+import { existsSync as existsSync25 } from "fs";
+import { mkdir as mkdir6, writeFile as writeFile7 } from "fs/promises";
 
 // src/cli/install-codex/codex-cache.ts
 import { cp as cp2, lstat as lstat2, mkdir as mkdir2, readFile as readFile4, readdir as readdir2, readlink as readlink2, rename, rm as rm2, symlink, writeFile as writeFile2 } from "fs/promises";
@@ -61761,6 +61937,13 @@ var BUNDLED_MCP_RUNTIMES = [
     destinationArg: "./components/ast-grep-mcp/dist/cli.js",
     destinationDistFromPlugin: "components/ast-grep-mcp/dist"
   },
+  {
+    label: "Git Bash MCP",
+    sourceArg: "../../git-bash-mcp/dist/cli.js",
+    sourceDistFromPlugin: "../../git-bash-mcp/dist",
+    destinationArg: "./components/git-bash-mcp/dist/cli.js",
+    destinationDistFromPlugin: "components/git-bash-mcp/dist"
+  },
   {
     label: "LSP MCP",
     sourceArg: "../../lsp-tools-mcp/dist/cli.js",
@@ -61956,8 +62139,10 @@ function isRecord9(value) {
 
 // src/cli/install-codex/codex-cache.ts
 async function installCachedPlugin(input) {
-  await maybeRunNpmInstall(input.sourcePath, input.runCommand);
-  await maybeRunNpmBuild(input.sourcePath, input.runCommand);
+  if (input.buildSource !== false) {
+    await maybeRunNpmInstall(input.sourcePath, input.runCommand);
+    await maybeRunNpmBuild(input.sourcePath, input.runCommand);
+  }
   const targetPath = join22(input.codexHome, "plugins", "cache", input.marketplaceName, input.name, input.version);
   await replaceDirectory(input.sourcePath, targetPath);
   await rewriteCachedPackageLocalFileDependencies(targetPath, input.sourcePath);
@@ -62178,8 +62363,35 @@ function isRecord10(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
+// src/cli/install-codex/codex-package-layout.ts
+import { existsSync as existsSync22 } from "fs";
+import { readFile as readFile5 } from "fs/promises";
+import { join as join23 } from "path";
+var PACKAGED_CODEX_INSTALLER_NAMES = new Set([
+  "@code-yeongyu/lazycodex",
+  "@code-yeongyu/lazycodex-ai",
+  "lazycodex",
+  "lazycodex-ai",
+  "oh-my-opencode",
+  "oh-my-openagent"
+]);
+async function shouldBuildSourcePackages(repoRoot) {
+  if (existsSync22(join23(repoRoot, "src", "index.ts")))
+    return true;
+  const packageJsonPath = join23(repoRoot, "package.json");
+  if (!existsSync22(packageJsonPath))
+    return true;
+  const packageJson = JSON.parse(await readFile5(packageJsonPath, "utf8"));
+  if (!isRecord11(packageJson) || typeof packageJson.name !== "string")
+    return true;
+  return !PACKAGED_CODEX_INSTALLER_NAMES.has(packageJson.name);
+}
+function isRecord11(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
 // src/cli/install-codex/codex-config-toml.ts
-import { mkdir as mkdir3, readFile as readFile5, writeFile as writeFile3 } from "fs/promises";
+import { mkdir as mkdir3, readFile as readFile6, writeFile as writeFile3 } from "fs/promises";
 import { dirname as dirname12 } from "path";
 
 // src/cli/install-codex/toml-section-editor.ts
@@ -62210,10 +62422,24 @@ function replaceOrInsertSetting(config, section, key, value) {
   return config.slice(0, section.start) + replacement + config.slice(section.end);
 }
 function removeSetting(config, section, key) {
-  const linePattern = new RegExp(`^${escapeRegExp(key)}\\s*=.*(?:\\n|$)`, "m");
+  const linePattern = new RegExp(`^\\s*${escapeRegExp(key)}\\s*=.*(?:\\n|$)`, "m");
   const replacement = section.text.replace(linePattern, "");
   return config.slice(0, section.start) + replacement + config.slice(section.end);
 }
+function replaceOrInsertRootSetting(config, key, value) {
+  const sectionStart = findFirstTableStart(config);
+  const root = config.slice(0, sectionStart);
+  const suffix = config.slice(sectionStart);
+  const linePattern = new RegExp(`^${escapeRegExp(key)}\\s*=.*$`, "m");
+  const replacement = linePattern.test(root) ? root.replace(linePattern, `${key} = ${value}`) : `${root.trimEnd()}${root.trimEnd().length > 0 ? `
+` : ""}${key} = ${value}
+`;
+  if (suffix.length === 0)
+    return replacement;
+  return `${replacement.trimEnd()}
+
+${suffix.trimStart()}`;
+}
 function appendBlock(config, block) {
   const prefix = config.trimEnd();
   return `${prefix}${prefix.length > 0 ? `
@@ -62221,6 +62447,10 @@ function appendBlock(config, block) {
 ` : ""}${block.trimEnd()}
 `;
 }
+function findFirstTableStart(config) {
+  const match = config.match(/^[[].*$/m);
+  return match?.index ?? config.length;
+}
 function insertSetting(sectionText, key, value) {
   const lines = sectionText.split(`
 `);
@@ -62232,11 +62462,130 @@ function escapeRegExp(value) {
   return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 
+// src/cli/install-codex/codex-config-mcp.ts
+var CONTEXT7_MCP_SERVER_HEADER = "mcp_servers.context7";
+var CONTEXT7_MCP_SERVER_BLOCK = [
+  `[${CONTEXT7_MCP_SERVER_HEADER}]`,
+  'command = "npx"',
+  'args = ["-y", "@upstash/context7-mcp", "--api-key", "YOUR_API_KEY"]',
+  "startup_timeout_sec = 20",
+  ""
+].join(`
+`);
+function ensureContext7McpServer(config) {
+  if (findTomlSection(config, CONTEXT7_MCP_SERVER_HEADER))
+    return config;
+  return appendBlock(config, CONTEXT7_MCP_SERVER_BLOCK);
+}
+
+// packages/omo-codex/scripts/install/toml-editor.mjs
+function findTomlSection2(config, header) {
+  const headerLine = `[${header}]`;
+  const lines = config.match(/[^\n]*\n?|$/g) ?? [];
+  let offset = 0;
+  let start = -1;
+  for (const line of lines) {
+    if (line.length === 0)
+      break;
+    const trimmed = line.trim();
+    if (start === -1) {
+      if (trimmed === headerLine)
+        start = offset;
+    } else if (trimmed.startsWith("[") && trimmed.endsWith("]")) {
+      return { start, end: offset, text: config.slice(start, offset) };
+    }
+    offset += line.length;
+  }
+  if (start === -1)
+    return null;
+  return { start, end: config.length, text: config.slice(start) };
+}
+function replaceOrInsertSetting2(config, section, key, value) {
+  const linePattern = new RegExp(`^${escapeRegExp2(key)}\\s*=.*$`, "m");
+  const replacement = linePattern.test(section.text) ? section.text.replace(linePattern, `${key} = ${value}`) : insertSetting2(section.text, key, value);
+  return config.slice(0, section.start) + replacement + config.slice(section.end);
+}
+function removeSetting2(config, section, key) {
+  const linePattern = new RegExp(`^\\s*${escapeRegExp2(key)}\\s*=.*(?:\\n|$)`, "m");
+  const replacement = section.text.replace(linePattern, "");
+  return config.slice(0, section.start) + replacement + config.slice(section.end);
+}
+function replaceOrInsertRootSetting2(config, key, value) {
+  const sectionStart = findFirstTableStart2(config);
+  const root = config.slice(0, sectionStart);
+  const suffix = config.slice(sectionStart);
+  const linePattern = new RegExp(`^${escapeRegExp2(key)}\\s*=.*$`, "m");
+  const replacement = linePattern.test(root) ? root.replace(linePattern, `${key} = ${value}`) : `${root.trimEnd()}${root.trimEnd().length > 0 ? `
+` : ""}${key} = ${value}
+`;
+  if (suffix.length === 0)
+    return replacement;
+  return `${replacement.trimEnd()}
+
+${suffix.trimStart()}`;
+}
+function appendBlock2(config, block) {
+  const prefix = config.trimEnd();
+  return `${prefix}${prefix.length > 0 ? `
+
+` : ""}${block.trimEnd()}
+`;
+}
+function findFirstTableStart2(config) {
+  const match = config.match(/^[[].*$/m);
+  return match?.index ?? config.length;
+}
+function insertSetting2(sectionText, key, value) {
+  const lines = sectionText.split(`
+`);
+  lines.splice(1, 0, `${key} = ${value}`);
+  return lines.join(`
+`);
+}
+function escapeRegExp2(value) {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+
+// packages/omo-codex/scripts/install/permissions.mjs
+function ensureAutonomousPermissions(config) {
+  let next = replaceOrInsertRootSetting2(config, "approval_policy", JSON.stringify("never"));
+  next = replaceOrInsertRootSetting2(next, "sandbox_mode", JSON.stringify("danger-full-access"));
+  next = replaceOrInsertRootSetting2(next, "network_access", JSON.stringify("enabled"));
+  next = removeWindowsSandboxSetting(next);
+  next = ensureNoticeEnabled(next, "hide_full_access_warning");
+  return ensureNoticeEnabled(next, "hide_world_writable_warning");
+}
+function removeWindowsSandboxSetting(config) {
+  const section = findTomlSection2(config, "windows");
+  if (!section)
+    return config;
+  return removeSetting2(config, section, "sandbox");
+}
+function ensureNoticeEnabled(config, key) {
+  const section = findTomlSection2(config, "notice");
+  if (!section)
+    return appendNoticeBlock(config, key);
+  return replaceOrInsertSetting2(config, section, key, "true");
+}
+function appendNoticeBlock(config, key) {
+  return appendBlock2(config, `[notice]
+${key} = true
+`);
+}
+// src/cli/install-codex/codex-config-reasoning.ts
+var DEFAULT_MODE_REASONING_EFFORT = "high";
+var PLAN_MODE_REASONING_EFFORT = "xhigh";
+function ensureCodexReasoningConfig(config) {
+  let next = replaceOrInsertRootSetting(config, "model_reasoning_effort", JSON.stringify(DEFAULT_MODE_REASONING_EFFORT));
+  next = replaceOrInsertRootSetting(next, "plan_mode_reasoning_effort", JSON.stringify(PLAN_MODE_REASONING_EFFORT));
+  return next;
+}
+
 // src/cli/install-codex/codex-multi-agent-v2-config.ts
 var CODEX_MULTI_AGENT_V2_HEADER = "features.multi_agent_v2";
 var CODEX_MULTI_AGENT_V2_MAX_CONCURRENT_THREADS_PER_SESSION = 1e4;
 function ensureCodexMultiAgentV2Config(config) {
-  const normalizedConfig = removeFeatureFlagSetting(config, "multi_agent_v2");
+  const normalizedConfig = removeLegacyAgentsMaxThreadsSetting(removeFeatureFlagSetting(config, "multi_agent_v2"));
   const section = findTomlSection(normalizedConfig, CODEX_MULTI_AGENT_V2_HEADER);
   const maxThreadsValue = CODEX_MULTI_AGENT_V2_MAX_CONCURRENT_THREADS_PER_SESSION.toString();
   if (!section) {
@@ -62261,6 +62610,12 @@ function removeFeatureFlagSetting(config, featureName) {
     return config;
   return removeSetting(config, section, featureName);
 }
+function removeLegacyAgentsMaxThreadsSetting(config) {
+  const section = findTomlSection(config, "agents");
+  if (!section)
+    return config;
+  return removeSetting(config, section, "max_threads");
+}
 
 // src/cli/install-codex/codex-config-toml.ts
 var SISYPHUS_LEGACY_MARKETPLACES = ["lazycodex", "code-yeongyu-codex-plugins"];
@@ -62276,7 +62631,7 @@ async function updateCodexConfig(input) {
   await mkdir3(dirname12(input.configPath), { recursive: true });
   let config = "";
   if (await exists2(input.configPath))
-    config = await readFile5(input.configPath, "utf8");
+    config = await readFile6(input.configPath, "utf8");
   const pluginSet = new Set(input.pluginNames);
   for (const legacyMarketplaceName of legacyMarketplaceNames(input.marketplaceName)) {
     config = removeMarketplaceBlock(config, legacyMarketplaceName);
@@ -62288,13 +62643,16 @@ async function updateCodexConfig(input) {
   config = removeStaleManagedAgentBlocks(config, new Set((input.agentConfigs ?? []).map((agentConfig) => agentConfig.name)));
   config = ensureFeatureEnabled(config, "plugins");
   config = ensureFeatureEnabled(config, "plugin_hooks");
+  config = ensureCodexReasoningConfig(config);
   config = ensureCodexMultiAgentV2Config(config);
+  config = ensureContext7McpServer(config);
   if (input.autonomousPermissions === true)
     config = ensureAutonomousPermissions(config);
   config = ensureMarketplaceBlock(config, input.marketplaceName, input.marketplaceSource);
   for (const pluginName of input.pluginNames) {
     config = ensurePluginEnabled(config, `${pluginName}@${input.marketplaceName}`);
   }
+  config = ensureOmoGitBashMcpPolicy(config, input);
   for (const state of input.trustedHookStates ?? []) {
     config = ensureHookTrusted(config, state.key, state.trustedHash);
   }
@@ -62360,42 +62718,6 @@ ${featureName} = true
 `);
   return replaceOrInsertSetting(config, section, featureName, "true");
 }
-function ensureAutonomousPermissions(config) {
-  let next = replaceOrInsertRootSetting(config, "approval_policy", JSON.stringify("never"));
-  next = replaceOrInsertRootSetting(next, "sandbox_mode", JSON.stringify("danger-full-access"));
-  next = replaceOrInsertRootSetting(next, "network_access", JSON.stringify("enabled"));
-  next = ensureNoticeEnabled(next, "hide_full_access_warning");
-  return ensureNoticeEnabled(next, "hide_world_writable_warning");
-}
-function ensureNoticeEnabled(config, key) {
-  const section = findTomlSection(config, "notice");
-  if (!section)
-    return appendBlock(config, `[notice]
-${key} = true
-`);
-  return replaceOrInsertSetting(config, section, key, "true");
-}
-function replaceOrInsertRootSetting(config, key, value) {
-  const sectionStart = findFirstTableStart(config);
-  const root = config.slice(0, sectionStart);
-  const suffix = config.slice(sectionStart);
-  const linePattern = new RegExp(`^${escapeRegExp2(key)}\\s*=.*$`, "m");
-  const replacement = linePattern.test(root) ? root.replace(linePattern, `${key} = ${value}`) : `${root.trimEnd()}${root.trimEnd().length > 0 ? `
-` : ""}${key} = ${value}
-`;
-  if (suffix.length === 0)
-    return replacement;
-  return `${replacement.trimEnd()}
-
-${suffix.trimStart()}`;
-}
-function findFirstTableStart(config) {
-  const match = config.match(/^[[].*$/m);
-  return match?.index ?? config.length;
-}
-function escapeRegExp2(value) {
-  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
 function ensureMarketplaceBlock(config, marketplaceName, source) {
   const header = `marketplaces.${marketplaceName}`;
   const lines = [
@@ -62424,6 +62746,22 @@ enabled = true
 `);
   return replaceOrInsertSetting(config, section, "enabled", "true");
 }
+function ensurePluginMcpEnabled(config, pluginKey, serverName, enabled) {
+  const header = `plugins.${JSON.stringify(pluginKey)}.mcp_servers.${serverName}`;
+  const section = findTomlSection(config, header);
+  const enabledValue = enabled ? "true" : "false";
+  if (!section)
+    return appendBlock(config, `[${header}]
+enabled = ${enabledValue}
+`);
+  return replaceOrInsertSetting(config, section, "enabled", enabledValue);
+}
+function ensureOmoGitBashMcpPolicy(config, input) {
+  if (input.marketplaceName !== "sisyphuslabs" || !input.pluginNames.includes("omo"))
+    return config;
+  const enabled = (input.platform ?? process.platform) === "win32";
+  return ensurePluginMcpEnabled(config, "omo@sisyphuslabs", "git_bash", enabled);
+}
 function ensureHookTrusted(config, key, trustedHash) {
   const header = `hooks.state.${JSON.stringify(key)}`;
   const section = findTomlSection(config, header);
@@ -62521,7 +62859,7 @@ function parseJsonString(value) {
 }
 async function exists2(path6) {
   try {
-    await readFile5(path6, "utf8");
+    await readFile6(path6, "utf8");
     return true;
   } catch (error) {
     if (error instanceof Error)
@@ -62531,9 +62869,9 @@ async function exists2(path6) {
 }
 
 // src/cli/install-codex/codex-hook-trust.ts
-import { createHash } from "crypto";
-import { readFile as readFile6 } from "fs/promises";
-import { join as join23 } from "path";
+import { createHash as createHash2 } from "crypto";
+import { readFile as readFile7 } from "fs/promises";
+import { join as join24 } from "path";
 var EVENT_LABELS = new Map([
   ["PreToolUse", "pre_tool_use"],
   ["PermissionRequest", "permission_request"],
@@ -62547,17 +62885,17 @@ var EVENT_LABELS = new Map([
   ["Stop", "stop"]
 ]);
 async function trustedHookStatesForPlugin(input) {
-  const manifestPath = join23(input.pluginRoot, ".codex-plugin", "plugin.json");
+  const manifestPath = join24(input.pluginRoot, ".codex-plugin", "plugin.json");
   if (!await exists3(manifestPath))
     return [];
-  const manifest = JSON.parse(await readFile6(manifestPath, "utf8"));
-  if (!isRecord11(manifest) || typeof manifest.hooks !== "string")
+  const manifest = JSON.parse(await readFile7(manifestPath, "utf8"));
+  if (!isRecord12(manifest) || typeof manifest.hooks !== "string")
     return [];
-  const hooksPath = join23(input.pluginRoot, manifest.hooks);
+  const hooksPath = join24(input.pluginRoot, manifest.hooks);
   if (!await exists3(hooksPath))
     return [];
-  const parsed = JSON.parse(await readFile6(hooksPath, "utf8"));
-  if (!isRecord11(parsed) || !isRecord11(parsed.hooks))
+  const parsed = JSON.parse(await readFile7(hooksPath, "utf8"));
+  if (!isRecord12(parsed) || !isRecord12(parsed.hooks))
     return [];
   const keySource = `${input.pluginName}@${input.marketplaceName}:${stripDotSlash(manifest.hooks)}`;
   const states = [];
@@ -62568,10 +62906,10 @@ async function trustedHookStatesForPlugin(input) {
     if (eventLabel === undefined)
       continue;
     for (const [groupIndex, group] of groups.entries()) {
-      if (!isRecord11(group) || !Array.isArray(group.hooks))
+      if (!isRecord12(group) || !Array.isArray(group.hooks))
         continue;
       for (const [handlerIndex, handler] of group.hooks.entries()) {
-        if (!isRecord11(handler) || handler.type !== "command")
+        if (!isRecord12(handler) || handler.type !== "command")
           continue;
         if (handler.async === true)
           continue;
@@ -62598,12 +62936,12 @@ function commandHookHash(eventName, matcher, handler) {
   if (typeof matcher === "string")
     identity.matcher = matcher;
   const canonical = JSON.stringify(canonicalJson(identity));
-  return `sha256:${createHash("sha256").update(canonical).digest("hex")}`;
+  return `sha256:${createHash2("sha256").update(canonical).digest("hex")}`;
 }
 function canonicalJson(value) {
   if (Array.isArray(value))
     return value.map(canonicalJson);
-  if (!isRecord11(value))
+  if (!isRecord12(value))
     return value;
   const result = {};
   for (const key of Object.keys(value).sort()) {
@@ -62616,19 +62954,113 @@ function stripDotSlash(value) {
 }
 async function exists3(path6) {
   try {
-    await readFile6(path6, "utf8");
+    await readFile7(path6, "utf8");
     return true;
   } catch {
     return false;
   }
 }
-function isRecord11(value) {
+function isRecord12(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
+// src/cli/install-codex/git-bash.ts
+import { execFileSync } from "child_process";
+import { existsSync as existsSync23 } from "fs";
+var GIT_BASH_ENV_KEY = "OMO_CODEX_GIT_BASH_PATH";
+var SKIP_GIT_BASH_AUTO_INSTALL_ENV_KEY = "OMO_CODEX_SKIP_GIT_BASH_AUTO_INSTALL";
+var PROGRAM_FILES_GIT_BASH = "C:\\Program Files\\Git\\bin\\bash.exe";
+var PROGRAM_FILES_X86_GIT_BASH = "C:\\Program Files (x86)\\Git\\bin\\bash.exe";
+var WINGET_INSTALL_ARGS = ["install", "--id", "Git.Git", "-e", "--source", "winget"];
+function resolveGitBash(input) {
+  if (input.platform !== "win32")
+    return { found: true, path: null, source: "not-required" };
+  const checkedPaths = [];
+  const envPath = nonEmptyEnvValue(input.env, GIT_BASH_ENV_KEY);
+  if (envPath !== undefined) {
+    checkedPaths.push(envPath);
+    if (isBashExePath(envPath) && input.exists(envPath))
+      return { found: true, path: envPath, source: "env" };
+    return missingGitBash(checkedPaths);
+  }
+  for (const candidate of [
+    { path: PROGRAM_FILES_GIT_BASH, source: "program-files" },
+    { path: PROGRAM_FILES_X86_GIT_BASH, source: "program-files-x86" }
+  ]) {
+    checkedPaths.push(candidate.path);
+    if (input.exists(candidate.path))
+      return { found: true, path: candidate.path, source: candidate.source };
+  }
+  for (const pathCandidate of input.where("bash")) {
+    const candidate = pathCandidate.trim();
+    if (candidate.length === 0)
+      continue;
+    checkedPaths.push(candidate);
+    if (isBashExePath(candidate) && input.exists(candidate))
+      return { found: true, path: candidate, source: "path" };
+  }
+  return missingGitBash(checkedPaths);
+}
+function resolveGitBashForCurrentProcess(input = {}) {
+  return resolveGitBash({
+    platform: input.platform ?? process.platform,
+    env: input.env ?? process.env,
+    exists: existsSync23,
+    where: whereCommand
+  });
+}
+async function prepareGitBashForInstall(input) {
+  const resolve8 = input.resolveGitBash ?? (() => resolveGitBashForCurrentProcess({ platform: input.platform, env: input.env }));
+  const initialResolution = resolve8();
+  if (input.platform !== "win32" || initialResolution.found)
+    return initialResolution;
+  if (input.env[SKIP_GIT_BASH_AUTO_INSTALL_ENV_KEY] === "1")
+    return initialResolution;
+  try {
+    await input.runCommand("winget", WINGET_INSTALL_ARGS, { cwd: input.cwd });
+  } catch (error) {
+    if (!(error instanceof Error))
+      throw error;
+    return initialResolution;
+  }
+  return resolve8();
+}
+function missingGitBash(checkedPaths) {
+  return {
+    found: false,
+    checkedPaths,
+    installHint: [
+      "Git Bash is required for native Windows Codex profile installs.",
+      "Install it with: winget install --id Git.Git -e --source winget",
+      `For a custom install, set ${GIT_BASH_ENV_KEY}=C:\\path\\to\\bash.exe`,
+      "Then rerun `npx lazycodex-ai install`."
+    ].join(`
+`)
+  };
+}
+function nonEmptyEnvValue(env, key) {
+  const value = env[key];
+  if (value === undefined)
+    return;
+  const trimmed = value.trim();
+  return trimmed.length === 0 ? undefined : trimmed;
+}
+function isBashExePath(path6) {
+  return path6.toLowerCase().endsWith("bash.exe");
+}
+function whereCommand(command) {
+  try {
+    return execFileSync("where", [command], { encoding: "utf8" }).split(/\r?\n/).map((line) => line.trim()).filter((line) => line.length > 0);
+  } catch (error) {
+    if (error instanceof Error)
+      return [];
+    throw error;
+  }
+}
+
 // src/cli/install-codex/link-cached-plugin-agents.ts
 import { copyFile, lstat as lstat3, mkdir as mkdir4, readdir as readdir3, rm as rm3, symlink as symlink2, writeFile as writeFile4 } from "fs/promises";
-import { basename as basename6, join as join24 } from "path";
+import { basename as basename6, join as join25 } from "path";
 var MANIFEST_FILE = ".installed-agents.json";
 async function linkCachedPluginAgents(input) {
   const platform = input.platform ?? process.platform;
@@ -62637,11 +63069,11 @@ async function linkCachedPluginAgents(input) {
     await writeManifest(input.pluginRoot, []);
     return [];
   }
-  const agentsDir = join24(input.codexHome, "agents");
+  const agentsDir = join25(input.codexHome, "agents");
   await mkdir4(agentsDir, { recursive: true });
   const linked = [];
   for (const agentPath of bundledAgents) {
-    const linkPath = join24(agentsDir, basename6(agentPath));
+    const linkPath = join25(agentsDir, basename6(agentPath));
     if (platform === "win32") {
       await replaceWithCopy(linkPath, agentPath);
     } else {
@@ -62653,7 +63085,7 @@ async function linkCachedPluginAgents(input) {
   return linked;
 }
 async function discoverBundledAgents(pluginRoot) {
-  const componentsRoot = join24(pluginRoot, "components");
+  const componentsRoot = join25(pluginRoot, "components");
   if (!await exists4(componentsRoot))
     return [];
   const componentEntries = await readdir3(componentsRoot, { withFileTypes: true });
@@ -62661,14 +63093,14 @@ async function discoverBundledAgents(pluginRoot) {
   for (const entry of componentEntries) {
     if (!entry.isDirectory())
       continue;
-    const agentsRoot = join24(componentsRoot, entry.name, "agents");
+    const agentsRoot = join25(componentsRoot, entry.name, "agents");
     if (!await exists4(agentsRoot))
       continue;
     const agentEntries = await readdir3(agentsRoot, { withFileTypes: true });
     for (const file of agentEntries) {
       if (!file.isFile() || !file.name.endsWith(".toml"))
         continue;
-      agents.push(join24(agentsRoot, file.name));
+      agents.push(join25(agentsRoot, file.name));
     }
   }
   agents.sort();
@@ -62692,7 +63124,7 @@ async function prepareReplacement(linkPath) {
   await rm3(linkPath, { force: true });
 }
 async function writeManifest(pluginRoot, agentPaths) {
-  const manifestPath = join24(pluginRoot, MANIFEST_FILE);
+  const manifestPath = join25(pluginRoot, MANIFEST_FILE);
   const payload = { agents: [...agentPaths].sort() };
   await writeFile4(manifestPath, `${JSON.stringify(payload, null, "\t")}
 `);
@@ -62707,14 +63139,14 @@ async function exists4(path6) {
 }
 
 // src/cli/install-codex/codex-marketplace.ts
-import { readFile as readFile7 } from "fs/promises";
-import { join as join25 } from "path";
+import { readFile as readFile8 } from "fs/promises";
+import { join as join26 } from "path";
 var DEFAULT_MARKETPLACE_PATH = "packages/omo-codex/marketplace.json";
 async function readMarketplace(repoRoot, options) {
-  const marketplacePath = options?.marketplacePath ?? join25(repoRoot, DEFAULT_MARKETPLACE_PATH);
-  const raw = await readFile7(marketplacePath, "utf8");
+  const marketplacePath = options?.marketplacePath ?? join26(repoRoot, DEFAULT_MARKETPLACE_PATH);
+  const raw = await readFile8(marketplacePath, "utf8");
   const parsed = JSON.parse(raw);
-  if (!isRecord12(parsed))
+  if (!isRecord13(parsed))
     throw new Error("marketplace.json must be an object");
   if (typeof parsed.name !== "string" || parsed.name.trim() === "") {
     throw new Error("marketplace.json name must be a non-empty string");
@@ -62730,12 +63162,12 @@ async function readMarketplace(repoRoot, options) {
 function resolvePluginSource(repoRoot, plugin, options) {
   const sourcePath = localSourcePath(options?.pathOverride ?? plugin.source);
   const relativePath = sourcePath.slice(2);
-  return join25(repoRoot, ...relativePath.split(/[\\/]/));
+  return join26(repoRoot, ...relativePath.split(/[\\/]/));
 }
 async function readPluginManifest(pluginRoot) {
-  const raw = await readFile7(join25(pluginRoot, ".codex-plugin", "plugin.json"), "utf8");
+  const raw = await readFile8(join26(pluginRoot, ".codex-plugin", "plugin.json"), "utf8");
   const parsed = JSON.parse(raw);
-  if (!isRecord12(parsed))
+  if (!isRecord13(parsed))
     throw new Error(`${pluginRoot} plugin.json must be an object`);
   if (typeof parsed.name !== "string" || parsed.name.trim() === "") {
     throw new Error(`${pluginRoot} plugin.json name must be a non-empty string`);
@@ -62761,7 +63193,7 @@ function validatePathSegment(value, label) {
   }
 }
 function normalizeMarketplacePlugin(plugin, index) {
-  if (!isRecord12(plugin))
+  if (!isRecord13(plugin))
     throw new Error(`marketplace plugin ${index} must be an object`);
   if (typeof plugin.name !== "string" || plugin.name.trim() === "") {
     throw new Error(`marketplace plugin ${index} name must be a non-empty string`);
@@ -62773,7 +63205,7 @@ function normalizeMarketplacePlugin(plugin, index) {
     }
     return { name: plugin.name, source: plugin.source };
   }
-  if (isRecord12(plugin.source) && plugin.source.source === "local" && typeof plugin.source.path === "string") {
+  if (isRecord13(plugin.source) && plugin.source.source === "local" && typeof plugin.source.path === "string") {
     validateLocalSourcePath(plugin.source.path);
     const local = { source: "local", path: plugin.source.path };
     return { name: plugin.name, source: local };
@@ -62800,13 +63232,13 @@ function validateLocalSourcePath(path6) {
   }
   return path6;
 }
-function isRecord12(value) {
+function isRecord13(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
 // src/cli/install-codex/codex-marketplace-snapshot.ts
 import { cp as cp3, mkdir as mkdir5, rename as rename2, rm as rm4, writeFile as writeFile5 } from "fs/promises";
-import { join as join26, sep as sep2 } from "path";
+import { join as join27, sep as sep2 } from "path";
 var INSTALLED_MARKETPLACES_DIR = ".tmp/marketplaces";
 async function writeInstalledMarketplaceSnapshot(input) {
   const marketplaceRoot = installedMarketplaceRoot(input.codexHome, input.marketplace.name);
@@ -62819,21 +63251,21 @@ async function writeInstalledMarketplaceSnapshot(input) {
   return snapshotPlugins;
 }
 function installedMarketplaceRoot(codexHome, marketplaceName) {
-  return join26(codexHome, INSTALLED_MARKETPLACES_DIR, marketplaceName);
+  return join27(codexHome, INSTALLED_MARKETPLACES_DIR, marketplaceName);
 }
 async function writeMarketplaceManifest(marketplaceRoot, marketplace) {
-  const manifestDir = join26(marketplaceRoot, ".agents", "plugins");
+  const manifestDir = join27(marketplaceRoot, ".agents", "plugins");
   await mkdir5(manifestDir, { recursive: true });
-  const tempPath = join26(manifestDir, `.marketplace-${process.pid}-${Date.now()}.json.tmp`);
+  const tempPath = join27(manifestDir, `.marketplace-${process.pid}-${Date.now()}.json.tmp`);
   await writeFile5(tempPath, `${JSON.stringify(marketplace, null, "\t")}
 `);
-  await rename2(tempPath, join26(manifestDir, "marketplace.json"));
+  await rename2(tempPath, join27(manifestDir, "marketplace.json"));
 }
 async function writeSnapshotPlugin(marketplaceRoot, plugin) {
-  const pluginsDir = join26(marketplaceRoot, "plugins");
+  const pluginsDir = join27(marketplaceRoot, "plugins");
   await mkdir5(pluginsDir, { recursive: true });
-  const targetPath = join26(pluginsDir, plugin.name);
-  const tempPath = join26(pluginsDir, `.tmp-${plugin.name}-${process.pid}-${Date.now()}`);
+  const targetPath = join27(pluginsDir, plugin.name);
+  const tempPath = join27(pluginsDir, `.tmp-${plugin.name}-${process.pid}-${Date.now()}`);
   await rm4(tempPath, { recursive: true, force: true });
   await cp3(plugin.sourcePath, tempPath, {
     recursive: true,
@@ -62871,19 +63303,260 @@ var defaultRunCommand = async (command, args, options) => {
   }
 };
 
+// src/cli/install-codex/codex-project-local-cleanup.ts
+import { copyFile as copyFile2, lstat as lstat4, readFile as readFile9, writeFile as writeFile6 } from "fs/promises";
+import { dirname as dirname13, join as join28, resolve as resolve8 } from "path";
+var LEGACY_AGENT_CONFLICT_KEYS = ["max_threads"];
+var PROJECT_LOCAL_ARTIFACT_PATHS = [
+  ".omx",
+  ".codex/hooks.json",
+  ".codex/agents",
+  ".codex/prompts",
+  ".codex/skills"
+];
+async function repairNearestProjectLocalCodexArtifacts(input) {
+  const project = await findProjectLocalCodexConfigs(input.startDirectory, input.codexHome);
+  if (project === null) {
+    return emptyProjectLocalCodexCleanupResult();
+  }
+  const artifacts = await collectProjectLocalArtifacts(project.artifactRoots);
+  const configs = [];
+  for (const configPath of project.configPaths) {
+    const original = await readFile9(configPath, "utf8");
+    const repair = repairProjectLocalCodexConfigText(original);
+    if (!repair.changed) {
+      configs.push({
+        projectRoot: project.projectRoot,
+        configPath,
+        changed: false,
+        removedKeys: repair.removedKeys
+      });
+      continue;
+    }
+    const backupPath = `${configPath}.backup-${formatBackupTimestamp(input.now?.() ?? new Date)}`;
+    await copyFile2(configPath, backupPath);
+    await writeFile6(configPath, `${repair.config.trimEnd()}
+`);
+    configs.push({
+      projectRoot: project.projectRoot,
+      configPath,
+      changed: true,
+      removedKeys: repair.removedKeys,
+      backupPath
+    });
+  }
+  const changedConfigs = configs.filter((config) => config.changed);
+  const nearestChangedConfig = lastValue(changedConfigs);
+  const nearestConfig = lastValue(configs);
+  return {
+    projectRoot: project.projectRoot,
+    configPath: nearestChangedConfig?.configPath ?? nearestConfig?.configPath ?? null,
+    changed: changedConfigs.length > 0,
+    removedKeys: uniqueRemovedKeys(changedConfigs),
+    backupPath: nearestChangedConfig?.backupPath,
+    configs,
+    artifacts
+  };
+}
+function emptyProjectLocalCodexCleanupResult() {
+  return {
+    projectRoot: null,
+    configPath: null,
+    changed: false,
+    removedKeys: [],
+    configs: [],
+    artifacts: []
+  };
+}
+function uniqueRemovedKeys(configs) {
+  const keys = [];
+  for (const config of configs) {
+    for (const key of config.removedKeys) {
+      if (!keys.includes(key))
+        keys.push(key);
+    }
+  }
+  return keys;
+}
+function lastValue(values) {
+  return values.length > 0 ? values[values.length - 1] ?? null : null;
+}
+function repairProjectLocalCodexConfigText(config) {
+  if (!isMultiAgentV2Enabled(config))
+    return { config, changed: false, removedKeys: [] };
+  let nextConfig = config;
+  const removedKeys = [];
+  for (const key of LEGACY_AGENT_CONFLICT_KEYS) {
+    const section = findTomlSection(nextConfig, "agents");
+    if (section === null || !hasSetting(section.text, key))
+      continue;
+    nextConfig = removeSetting(nextConfig, section, key);
+    removedKeys.push(key);
+  }
+  return {
+    config: nextConfig,
+    changed: removedKeys.length > 0,
+    removedKeys
+  };
+}
+async function findProjectLocalCodexConfigs(startDirectory, codexHome) {
+  if (startDirectory.includes("\x00"))
+    return null;
+  const startDirectoryStat = await maybeLstat(startDirectory);
+  if (startDirectoryStat !== null && !startDirectoryStat.isDirectory()) {
+    throw new ProjectLocalCleanupStartDirectoryError(startDirectory);
+  }
+  const codexHomeConfigPath = codexHome === undefined ? null : join28(resolve8(codexHome), "config.toml");
+  let current = resolve8(startDirectory);
+  const configPathsFromCwd = [];
+  while (true) {
+    const configPath = join28(current, ".codex", "config.toml");
+    if (await isRegularProjectLocalConfig(current, configPath)) {
+      if (codexHomeConfigPath === null || resolve8(configPath) !== codexHomeConfigPath) {
+        configPathsFromCwd.push(configPath);
+      }
+    }
+    if (await exists5(join28(current, ".git"))) {
+      return configPathsFromCwd.length === 0 ? null : {
+        projectRoot: current,
+        configPaths: [...configPathsFromCwd].reverse(),
+        artifactRoots: artifactRootsForConfigPaths(configPathsFromCwd)
+      };
+    }
+    const parent = dirname13(current);
+    if (parent === current) {
+      const nearestConfigPath = configPathsFromCwd[0];
+      return nearestConfigPath === undefined ? null : {
+        projectRoot: dirname13(dirname13(nearestConfigPath)),
+        configPaths: [nearestConfigPath],
+        artifactRoots: [dirname13(dirname13(nearestConfigPath))]
+      };
+    }
+    current = parent;
+  }
+}
+async function isRegularProjectLocalConfig(directory, configPath) {
+  const codexDirStat = await maybeLstat(join28(directory, ".codex"));
+  if (codexDirStat === null || !codexDirStat.isDirectory() || codexDirStat.isSymbolicLink())
+    return false;
+  const configStat = await maybeLstat(configPath);
+  return configStat !== null && configStat.isFile() && !configStat.isSymbolicLink();
+}
+function artifactRootsForConfigPaths(configPaths) {
+  const roots = [];
+  for (const configPath of configPaths) {
+    const root = dirname13(dirname13(configPath));
+    if (!roots.includes(root))
+      roots.push(root);
+  }
+  return roots.reverse();
+}
+async function collectProjectLocalArtifacts(projectRoots) {
+  const artifacts = [];
+  const seenPaths = new Set;
+  for (const projectRoot of projectRoots) {
+    for (const relativePath of PROJECT_LOCAL_ARTIFACT_PATHS) {
+      const artifactPath = join28(projectRoot, relativePath);
+      if (seenPaths.has(artifactPath))
+        continue;
+      const entryStat = await maybeLstat(artifactPath);
+      if (entryStat === null)
+        continue;
+      seenPaths.add(artifactPath);
+      artifacts.push({
+        relativePath,
+        path: artifactPath,
+        kind: entryStat.isDirectory() ? "directory" : entryStat.isFile() ? "file" : "other"
+      });
+    }
+  }
+  return artifacts;
+}
+function isMultiAgentV2Enabled(config) {
+  const featuresSection = findTomlSection(config, "features");
+  if (featuresSection !== null && settingIsBooleanTrue(featuresSection.text, "multi_agent_v2"))
+    return true;
+  const multiAgentSection = findTomlSection(config, "features.multi_agent_v2");
+  return multiAgentSection !== null && settingIsBooleanTrue(multiAgentSection.text, "enabled");
+}
+function settingIsBooleanTrue(sectionText, key) {
+  return new RegExp(`^\\s*${escapeRegExp(key)}\\s*=\\s*true\\s*(?:#.*)?$`, "m").test(sectionText);
+}
+function hasSetting(sectionText, key) {
+  return new RegExp(`^\\s*${escapeRegExp(key)}\\s*=`, "m").test(sectionText);
+}
+function formatBackupTimestamp(date) {
+  return date.toISOString().replace(/[:.]/g, "-");
+}
+async function maybeLstat(path6) {
+  try {
+    return await lstat4(path6);
+  } catch (error) {
+    if (nodeErrorCode(error) === "ENOENT")
+      return null;
+    throw error;
+  }
+}
+async function exists5(path6) {
+  return await maybeLstat(path6) !== null;
+}
+function nodeErrorCode(error) {
+  if (!(error instanceof Error) || !("code" in error))
+    return null;
+  return typeof error.code === "string" ? error.code : null;
+}
+
+class ProjectLocalCleanupStartDirectoryError extends Error {
+  constructor(startDirectory) {
+    super(`Project-local Codex cleanup start path is not a directory: ${startDirectory}`);
+    this.name = "ProjectLocalCleanupStartDirectoryError";
+  }
+}
+
+// src/cli/install-codex/codex-project-local-cleanup-best-effort.ts
+async function repairProjectLocalCodexArtifactsBestEffort(input) {
+  try {
+    return await repairNearestProjectLocalCodexArtifacts({
+      startDirectory: input.startDirectory,
+      codexHome: input.codexHome,
+      now: input.now
+    });
+  } catch (error) {
+    input.log(`Skipped project-local Codex cleanup: ${formatUnknownError(error)}`);
+    return emptyProjectLocalCodexCleanupResult();
+  }
+}
+function formatUnknownError(error) {
+  return error instanceof Error ? error.message : String(error);
+}
+
 // src/cli/install-codex/install-codex.ts
 var SISYPHUS_LEGACY_CACHE_MARKETPLACES = ["lazycodex", "code-yeongyu-codex-plugins"];
 async function runCodexInstaller(options = {}) {
-  const repoRoot = resolve8(options.repoRoot ?? findRepoRoot({ importerDir: import.meta.dir, env: process.env }));
-  const codexHome = resolve8(options.codexHome ?? process.env.CODEX_HOME ?? join28(homedir5(), ".codex"));
-  const binDir = resolveCodexInstallerBinDir({ binDir: options.binDir, codexHome, env: process.env });
+  const env = options.env ?? process.env;
+  const platform = options.platform ?? process.platform;
+  const repoRoot = resolve9(options.repoRoot ?? findRepoRoot({ importerDir: import.meta.dir, env }));
+  const codexHome = resolve9(options.codexHome ?? env.CODEX_HOME ?? join30(homedir5(), ".codex"));
+  const projectDirectory = resolve9(options.projectDirectory ?? env.OMO_CODEX_PROJECT ?? process.cwd());
+  const binDir = resolveCodexInstallerBinDir({ binDir: options.binDir, codexHome, env });
   const runCommand = options.runCommand ?? defaultRunCommand;
   const log2 = options.log ?? (() => {
     return;
   });
-  const codexPackageRoot = join28(repoRoot, "packages", "omo-codex");
+  const buildSource = await shouldBuildSourcePackages(repoRoot);
+  const gitBashResolution = await prepareGitBashForInstall({
+    platform,
+    env,
+    cwd: repoRoot,
+    runCommand,
+    resolveGitBash: platform === "win32" ? options.gitBashResolver ?? (() => resolveGitBashForCurrentProcess({ platform, env })) : undefined
+  });
+  if (!gitBashResolution.found) {
+    throw new Error(gitBashResolution.installHint);
+  }
+  const codexPackageRoot = join30(repoRoot, "packages", "omo-codex");
   const marketplace = await readMarketplace(repoRoot, {
-    marketplacePath: join28(codexPackageRoot, "marketplace.json")
+    marketplacePath: join30(codexPackageRoot, "marketplace.json")
   });
   const installed = [];
   const pluginSources = [];
@@ -62898,6 +63571,7 @@ async function runCodexInstaller(options = {}) {
     validatePathSegment(version2, "plugin version");
     log2(`Building ${entry.name}@${version2}`);
     const plugin = await installCachedPlugin({
+      buildSource,
       codexHome,
       marketplaceName: marketplace.name,
       name: entry.name,
@@ -62905,7 +63579,7 @@ async function runCodexInstaller(options = {}) {
       sourcePath,
       version: version2
     });
-    const links = await linkCachedPluginBins({ binDir, pluginRoot: plugin.path });
+    const links = await linkCachedPluginBins({ binDir, pluginRoot: plugin.path, platform });
     for (const link of links) {
       log2(`Linked ${link.name} -> ${link.target}`);
     }
@@ -62920,7 +63594,7 @@ async function runCodexInstaller(options = {}) {
   });
   for (const plugin of installed) {
     const pluginRoot = agentSourceRoots.get(plugin.name) ?? plugin.path;
-    const agentLinks = await linkCachedPluginAgents({ codexHome, pluginRoot });
+    const agentLinks = await linkCachedPluginAgents({ codexHome, pluginRoot, platform });
     for (const link of agentLinks) {
       log2(`Linked agent ${link.name} -> ${link.target}`);
       const agentName = agentNameFromToml(link.name);
@@ -62944,41 +63618,57 @@ async function runCodexInstaller(options = {}) {
       pluginNames: marketplace.plugins.map((plugin) => plugin.name)
     });
   }
-  const marketplaceRoot = join28(codexHome, "plugins", "cache", marketplace.name);
+  const marketplaceRoot = join30(codexHome, "plugins", "cache", marketplace.name);
   await writeCachedMarketplaceManifest({
     marketplaceName: marketplace.name,
     marketplaceRoot,
     plugins: installed
   });
-  const configPath = join28(codexHome, "config.toml");
+  const configPath = join30(codexHome, "config.toml");
   await updateCodexConfig({
     configPath,
     repoRoot: codexPackageRoot,
     marketplaceName: marketplace.name,
     marketplaceSource: codexMarketplaceSource(marketplaceRoot),
     pluginNames: marketplace.plugins.map((plugin) => plugin.name),
+    platform,
     trustedHookStates,
     agentConfigs: [...agentConfigs.values()].sort((left, right) => left.name.localeCompare(right.name)),
     autonomousPermissions: options.autonomousPermissions === true
   });
+  const projectCleanup = await repairProjectLocalCodexArtifactsBestEffort({
+    startDirectory: projectDirectory,
+    codexHome,
+    log: log2
+  });
+  for (const configCleanup of projectCleanup.configs) {
+    if (!configCleanup.changed)
+      continue;
+    log2(`Repaired project Codex config ${configCleanup.configPath} (backup: ${configCleanup.backupPath})`);
+  }
+  for (const artifact of projectCleanup.artifacts) {
+    log2(`Found project-local legacy artifact ${artifact.path}; left in place`);
+  }
   await trackCodexInstallTelemetry();
   return {
     marketplaceName: marketplace.name,
     installed,
     configPath,
-    codexHome
+    codexHome,
+    gitBashPath: gitBashResolution.path,
+    projectCleanup
   };
 }
 function resolveCodexInstallerBinDir(input) {
   const explicitBinDir = input.binDir ?? input.env?.CODEX_LOCAL_BIN_DIR;
   if (explicitBinDir !== undefined && explicitBinDir.trim().length > 0)
-    return resolve8(explicitBinDir);
+    return resolve9(explicitBinDir);
   const homeDir = input.homeDir ?? homedir5();
-  const defaultCodexHome = resolve8(homeDir, ".codex");
-  const resolvedCodexHome = resolve8(input.codexHome);
+  const defaultCodexHome = resolve9(homeDir, ".codex");
+  const resolvedCodexHome = resolve9(input.codexHome);
   if (resolvedCodexHome !== defaultCodexHome)
-    return join28(resolvedCodexHome, "bin");
-  return resolve8(homeDir, ".local", "bin");
+    return join30(resolvedCodexHome, "bin");
+  return resolve9(homeDir, ".local", "bin");
 }
 function agentNameFromToml(fileName) {
   return fileName.endsWith(".toml") ? fileName.slice(0, -".toml".length) : fileName;
@@ -62995,9 +63685,9 @@ async function agentSourceRootsForInstall(input) {
   return new Map(snapshotPlugins.map((plugin) => [plugin.name, plugin.path]));
 }
 async function writeCachedMarketplaceManifest(input) {
-  const marketplaceDir = join28(input.marketplaceRoot, ".agents", "plugins");
+  const marketplaceDir = join30(input.marketplaceRoot, ".agents", "plugins");
   await mkdir6(marketplaceDir, { recursive: true });
-  await writeFile6(join28(marketplaceDir, "marketplace.json"), `${JSON.stringify({
+  await writeFile7(join30(marketplaceDir, "marketplace.json"), `${JSON.stringify({
     name: input.marketplaceName,
     plugins: input.plugins.map((plugin) => ({
       name: plugin.name,
@@ -63009,36 +63699,33 @@ async function writeCachedMarketplaceManifest(input) {
 function legacyCacheMarketplaces(marketplaceName) {
   return marketplaceName === "sisyphuslabs" ? SISYPHUS_LEGACY_CACHE_MARKETPLACES : [];
 }
-function codexMarketplaceSource(marketplaceRoot) {
-  return { sourceType: "local", source: marketplaceRoot };
-}
 function findRepoRootFromImporter(importerDir) {
   let current = importerDir;
   for (let depth = 0;depth <= 5; depth += 1) {
     if (isRepoRootWithCodexPlugin(current))
       return current;
-    for (const wrapperPackageRoot of [join28(current, "node_modules", "oh-my-openagent"), join28(current, "oh-my-openagent")]) {
+    for (const wrapperPackageRoot of [join30(current, "node_modules", "oh-my-openagent"), join30(current, "oh-my-openagent")]) {
       if (isRepoRootWithCodexPlugin(wrapperPackageRoot))
         return wrapperPackageRoot;
     }
-    current = resolve8(current, "..");
+    current = resolve9(current, "..");
   }
   throw new Error("Unable to locate vendored Codex plugin: expected packages/omo-codex/plugin/.codex-plugin/plugin.json in this package or sibling oh-my-openagent package within 5 parent levels");
 }
 function findRepoRoot(input) {
   const wrapperPackageRoot = input.env?.OMO_WRAPPER_PACKAGE_ROOT;
   if (wrapperPackageRoot !== undefined && wrapperPackageRoot.trim().length > 0) {
-    const resolvedWrapperPackageRoot = resolve8(wrapperPackageRoot);
+    const resolvedWrapperPackageRoot = resolve9(wrapperPackageRoot);
     if (isRepoRootWithCodexPlugin(resolvedWrapperPackageRoot))
       return resolvedWrapperPackageRoot;
   }
   return findRepoRootFromImporter(input.importerDir);
 }
 function isRepoRootWithCodexPlugin(repoRoot) {
-  return existsSyncLike(join28(repoRoot, "packages", "omo-codex", "plugin", ".codex-plugin", "plugin.json"));
+  return existsSync25(join30(repoRoot, "packages", "omo-codex", "plugin", ".codex-plugin", "plugin.json"));
 }
-function existsSyncLike(path7) {
-  return existsSync23(path7);
+function codexMarketplaceSource(marketplaceRoot) {
+  return { sourceType: "local", source: marketplaceRoot };
 }
 async function trackCodexInstallTelemetry() {
   try {
@@ -63052,13 +63739,507 @@ async function trackCodexInstallTelemetry() {
     return;
   }
 }
+// src/cli/install-codex/codex-installation-detection.ts
+import { execFile } from "child_process";
+import { existsSync as existsSync26 } from "fs";
+import { homedir as homedir6 } from "os";
+import { join as join32, win32 as win322 } from "path";
+
+// src/shared/bun-which-shim.ts
+import { accessSync as accessSync3, constants as constants4 } from "fs";
+import { delimiter, join as join31 } from "path";
+var runtime3 = globalThis;
+var IS_BUN2 = typeof runtime3.Bun !== "undefined";
+function isUnsafeCommandName(commandName) {
+  if (commandName.includes("/") || commandName.includes("\\"))
+    return true;
+  if (commandName === "." || commandName === ".." || commandName.includes(".."))
+    return true;
+  if (/^[a-zA-Z]:/.test(commandName))
+    return true;
+  if (commandName.includes("\x00"))
+    return true;
+  return false;
+}
+function isExecutable(filePath) {
+  try {
+    accessSync3(filePath, constants4.X_OK);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function resolvePathValue() {
+  if (process.platform === "win32")
+    return process.env.Path ?? process.env.PATH;
+  return process.env.PATH;
+}
+function getWindowsCandidates(commandName) {
+  if (process.platform !== "win32")
+    return [commandName];
+  return [commandName, `${commandName}.exe`, `${commandName}.cmd`, `${commandName}.bat`, `${commandName}.com`];
+}
+function bunWhich(commandName) {
+  if (!commandName)
+    return null;
+  if (isUnsafeCommandName(commandName))
+    return null;
+  if (IS_BUN2)
+    return runtime3.Bun?.which(commandName) ?? null;
+  const pathValue = resolvePathValue();
+  if (!pathValue)
+    return null;
+  const pathEntries = pathValue.split(delimiter).filter((pathEntry) => pathEntry.length > 0);
+  if (pathEntries.length === 0)
+    return null;
+  const candidateNames = getWindowsCandidates(commandName);
+  for (const pathEntry of pathEntries) {
+    for (const candidateName of candidateNames) {
+      const candidatePath = join31(pathEntry, candidateName);
+      if (isExecutable(candidatePath))
+        return candidatePath;
+    }
+  }
+  return null;
+}
+
+// src/cli/install-codex/codex-installation-detection.ts
+var CODEX_PATH_CHECK_LABEL = "codex (PATH)";
+var WINDOWS_START_APPS_ARGS = [
+  "-NoProfile",
+  "-Command",
+  "Get-StartApps -Name 'Codex' | Select-Object -First 1 -ExpandProperty AppID"
+];
+async function detectCodexInstallation(input = {}) {
+  const platform = input.platform ?? process.platform;
+  const env = input.env ?? process.env;
+  const homeDir = input.homeDir ?? homedir6();
+  const exists6 = input.exists ?? existsSync26;
+  const which = input.which ?? bunWhich;
+  const checkedPaths = [CODEX_PATH_CHECK_LABEL];
+  const cliPath = nonEmptyValue(which("codex"));
+  if (cliPath !== undefined)
+    return { found: true, source: "cli", path: cliPath };
+  if (platform === "darwin") {
+    return detectMacCodexInstallation({ homeDir, exists: exists6, checkedPaths });
+  }
+  if (platform === "win32") {
+    return detectWindowsCodexInstallation({
+      env,
+      exists: exists6,
+      checkedPaths,
+      runCommand: input.runCommand ?? defaultRunCommand2
+    });
+  }
+  return missingCodexInstallation(checkedPaths, "Install OpenAI Codex CLI and make sure `codex` is on PATH.");
+}
+function formatCodexInstallationWarning(detection) {
+  return [
+    "Codex CLI or desktop app was not detected. LazyCodex will still install the Codex plugin, but Codex itself must be installed to use it.",
+    detection.hint,
+    `Checked: ${detection.checkedPaths.join(", ")}`
+  ].join(`
+`);
+}
+function detectMacCodexInstallation(input) {
+  for (const appPath of macCodexAppPaths(input.homeDir)) {
+    input.checkedPaths.push(appPath);
+    if (input.exists(appPath))
+      return { found: true, source: "mac-app", path: appPath };
+  }
+  for (const dmgPath of macCodexDmgPaths(input.homeDir)) {
+    input.checkedPaths.push(dmgPath);
+    if (input.exists(dmgPath)) {
+      return missingCodexInstallation(input.checkedPaths, `Open ${dmgPath} to install Codex Desktop, or install OpenAI Codex CLI and make sure \`codex\` is on PATH.`, dmgPath);
+    }
+  }
+  return missingCodexInstallation(input.checkedPaths, "Install OpenAI Codex CLI, or install Codex Desktop for macOS.");
+}
+async function detectWindowsCodexInstallation(input) {
+  for (const candidate of windowsCodexCliPaths(input.env)) {
+    input.checkedPaths.push(candidate);
+    if (input.exists(candidate))
+      return { found: true, source: "windows-standard-cli", path: candidate };
+  }
+  input.checkedPaths.push("Windows Start Apps: Codex");
+  const appId = await findWindowsCodexStartApp(input.runCommand);
+  if (appId !== null)
+    return { found: true, source: "windows-start-app", appId };
+  return missingCodexInstallation(input.checkedPaths, "Install OpenAI Codex CLI, or install Codex Desktop from Microsoft Store.");
+}
+async function findWindowsCodexStartApp(runCommand) {
+  try {
+    const result = await runCommand("powershell.exe", WINDOWS_START_APPS_ARGS);
+    if (!result.success)
+      return null;
+    return nonEmptyValue(result.stdout.trim()) ?? null;
+  } catch (error) {
+    if (error instanceof Error)
+      return null;
+    throw error;
+  }
+}
+function macCodexAppPaths(homeDir) {
+  return ["/Applications/Codex.app", join32(homeDir, "Applications", "Codex.app")];
+}
+function macCodexDmgPaths(homeDir) {
+  const downloads = join32(homeDir, "Downloads");
+  return [join32(downloads, "codex.dmg"), join32(downloads, "Codex.dmg")];
+}
+function windowsCodexCliPaths(env) {
+  const candidates = [];
+  const explicitInstallDir = nonEmptyValue(env.CODEX_INSTALL_DIR);
+  if (explicitInstallDir !== undefined)
+    candidates.push(win322.join(explicitInstallDir, "codex.exe"));
+  const localAppData = nonEmptyValue(env.LOCALAPPDATA) ?? nonEmptyValue(env.LocalAppData);
+  if (localAppData !== undefined) {
+    candidates.push(win322.join(localAppData, "Programs", "OpenAI", "Codex", "bin", "codex.exe"));
+  }
+  return dedupe(candidates);
+}
+function missingCodexInstallation(checkedPaths, hint, downloadedInstallerPath) {
+  if (downloadedInstallerPath !== undefined) {
+    return { found: false, checkedPaths, hint, downloadedInstallerPath };
+  }
+  return { found: false, checkedPaths, hint };
+}
+function nonEmptyValue(value) {
+  if (value === null || value === undefined)
+    return;
+  const trimmed = value.trim();
+  return trimmed.length > 0 ? trimmed : undefined;
+}
+function dedupe(values) {
+  const seen = new Set;
+  const deduped = [];
+  for (const value of values) {
+    if (seen.has(value))
+      continue;
+    seen.add(value);
+    deduped.push(value);
+  }
+  return deduped;
+}
+function defaultRunCommand2(command, args) {
+  return new Promise((resolve10) => {
+    execFile(command, [...args], { encoding: "utf8", windowsHide: true }, (error, stdout) => {
+      resolve10({ success: error === null, stdout });
+    });
+  });
+}
+// src/cli/install-codex/codex-cleanup.ts
+import { lstat as lstat6, readFile as readFile11, readdir as readdir4, rm as rm5 } from "fs/promises";
+import { homedir as homedir7 } from "os";
+import { isAbsolute as isAbsolute6, join as join33, relative as relative5, resolve as resolve10 } from "path";
+
+// src/cli/install-codex/codex-cleanup-config.ts
+import { lstat as lstat5, mkdir as mkdir7, readFile as readFile10, writeFile as writeFile8 } from "fs/promises";
+import { dirname as dirname15 } from "path";
+var MANAGED_MARKETPLACES = ["sisyphuslabs", "lazycodex", "code-yeongyu-codex-plugins"];
+var MANAGED_CODEX_AGENT_NAMES2 = [
+  "codex-ultrawork-reviewer",
+  "explorer",
+  "librarian",
+  "metis",
+  "momus",
+  "plan"
+];
+function cleanupCodexLightConfigText(config) {
+  let nextConfig = config;
+  for (const marketplace of MANAGED_MARKETPLACES) {
+    nextConfig = removeTomlSections2(nextConfig, (header) => header === `marketplaces.${marketplace}`);
+    nextConfig = removeTomlSections2(nextConfig, (header) => isManagedPluginHeader(header, marketplace));
+    nextConfig = removeTomlSections2(nextConfig, (header) => isManagedHookStateHeader(header, marketplace));
+  }
+  nextConfig = removeManagedAgentBlocks(nextConfig);
+  return nextConfig.replace(/\n{3,}/g, `
+
+`);
+}
+async function cleanupCodexConfig(configPath, now) {
+  if (!await configExists(configPath))
+    return { changed: false };
+  const original = await readFile10(configPath, "utf8");
+  const next = cleanupCodexLightConfigText(original);
+  if (next === original)
+    return { changed: false };
+  const backupPath = `${configPath}.backup-${formatBackupTimestamp2(now?.() ?? new Date)}`;
+  await mkdir7(dirname15(configPath), { recursive: true });
+  await writeFile8(backupPath, original);
+  await writeFile8(configPath, `${next.trimEnd()}
+`);
+  return { changed: true, backupPath };
+}
+function removeManagedAgentBlocks(config) {
+  const managedAgentNames = new Set(MANAGED_CODEX_AGENT_NAMES2);
+  return splitTomlSections2(config).filter((section) => {
+    if (section.header === null)
+      return true;
+    const agentName = parseAgentHeaderName2(section.header);
+    if (agentName === null || !managedAgentNames.has(agentName))
+      return true;
+    return !section.text.includes(`config_file = ${JSON.stringify(`./agents/${agentName}.toml`)}`);
+  }).map((section) => section.text).join("");
+}
+function isManagedPluginHeader(header, marketplace) {
+  const pluginKey = parsePluginHeaderKey2(header);
+  return pluginKey !== null && pluginKey.endsWith(`@${marketplace}`);
+}
+function isManagedHookStateHeader(header, marketplace) {
+  const prefix = "hooks.state.";
+  if (!header.startsWith(prefix))
+    return false;
+  const hookKey = parseJsonString2(header.slice(prefix.length));
+  if (hookKey === null)
+    return false;
+  const separator = hookKey.indexOf(":");
+  if (separator === -1)
+    return false;
+  return hookKey.slice(0, separator).endsWith(`@${marketplace}`);
+}
+function removeTomlSections2(config, shouldRemove) {
+  return splitTomlSections2(config).filter((section) => section.header === null || !shouldRemove(section.header)).map((section) => section.text).join("");
+}
+function splitTomlSections2(config) {
+  const lines = config.match(/[^\n]*\n?|$/g) ?? [];
+  const sections = [];
+  let current = { header: null, text: "" };
+  for (const line of lines) {
+    if (line.length === 0)
+      break;
+    const header = parseTomlHeader2(line);
+    if (header !== null) {
+      if (current.text.length > 0)
+        sections.push(current);
+      current = { header, text: line };
+    } else {
+      current.text += line;
+    }
+  }
+  if (current.text.length > 0)
+    sections.push(current);
+  return sections;
+}
+function parseTomlHeader2(line) {
+  const trimmed = line.trim();
+  if (!trimmed.startsWith("[") || !trimmed.endsWith("]") || trimmed.startsWith("[["))
+    return null;
+  return trimmed.slice(1, -1);
+}
+function parsePluginHeaderKey2(header) {
+  const prefix = "plugins.";
+  if (!header.startsWith(prefix))
+    return null;
+  return parseLeadingJsonString2(header.slice(prefix.length));
+}
+function parseAgentHeaderName2(header) {
+  const prefix = "agents.";
+  if (!header.startsWith(prefix))
+    return null;
+  const key = header.slice(prefix.length);
+  return key.startsWith('"') ? parseLeadingJsonString2(key) : key;
+}
+function parseLeadingJsonString2(value) {
+  if (!value.startsWith('"'))
+    return parseJsonString2(value);
+  let escaped = false;
+  for (let index = 1;index < value.length; index += 1) {
+    const char = value[index];
+    if (escaped) {
+      escaped = false;
+      continue;
+    }
+    if (char === "\\") {
+      escaped = true;
+      continue;
+    }
+    if (char === '"')
+      return parseJsonString2(value.slice(0, index + 1));
+  }
+  return null;
+}
+function parseJsonString2(value) {
+  try {
+    const parsed = JSON.parse(value);
+    return typeof parsed === "string" ? parsed : null;
+  } catch (error) {
+    if (error instanceof Error)
+      return null;
+    return null;
+  }
+}
+function formatBackupTimestamp2(date) {
+  return date.toISOString().replace(/[:.]/g, "-");
+}
+async function configExists(path7) {
+  try {
+    await lstat5(path7);
+    return true;
+  } catch (error) {
+    if (nodeErrorCode2(error) === "ENOENT")
+      return false;
+    throw error;
+  }
+}
+function nodeErrorCode2(error) {
+  if (!(error instanceof Error) || !("code" in error))
+    return null;
+  return typeof error.code === "string" ? error.code : null;
+}
+
+// src/cli/install-codex/codex-cleanup.ts
+var INSTALLED_AGENTS_MANIFEST = ".installed-agents.json";
+async function cleanupCodexLight(input = {}) {
+  const env = input.env ?? process.env;
+  const codexHome = resolve10(input.codexHome ?? env.CODEX_HOME ?? join33(homedir7(), ".codex"));
+  const configPath = join33(codexHome, "config.toml");
+  const agentPaths = await collectInstalledAgentPaths(codexHome);
+  const configCleanup = await cleanupCodexConfig(configPath, input.now);
+  const agentCleanup = await removeManifestListedAgentLinks(codexHome, agentPaths);
+  const removedPaths = [];
+  for (const path7 of managedGlobalStatePaths(codexHome)) {
+    if (await removePathIfExists(path7))
+      removedPaths.push(path7);
+  }
+  const projectDirectory = input.projectDirectory ?? env.OMO_CODEX_PROJECT ?? process.cwd();
+  const projectCleanup = await repairProjectLocalCodexArtifactsBestEffort({
+    startDirectory: projectDirectory,
+    codexHome,
+    now: input.now,
+    log: () => {
+      return;
+    }
+  });
+  return {
+    codexHome,
+    configPath,
+    configChanged: configCleanup.changed,
+    configBackupPath: configCleanup.backupPath,
+    removedPaths,
+    removedAgentLinks: agentCleanup.removed,
+    skippedAgentLinks: agentCleanup.skipped,
+    projectCleanup
+  };
+}
+function managedGlobalStatePaths(codexHome) {
+  return [
+    join33(codexHome, "plugins", "cache", "sisyphuslabs"),
+    join33(codexHome, ".tmp", "marketplaces", "sisyphuslabs")
+  ];
+}
+async function collectInstalledAgentPaths(codexHome) {
+  const manifestPaths = [
+    join33(codexHome, ".tmp", "marketplaces", "sisyphuslabs", "plugins", "omo", INSTALLED_AGENTS_MANIFEST)
+  ];
+  const versionRoot = join33(codexHome, "plugins", "cache", "sisyphuslabs", "omo");
+  if (await exists6(versionRoot)) {
+    const entries = await readdir4(versionRoot, { withFileTypes: true });
+    for (const entry of entries) {
+      if (entry.isDirectory())
+        manifestPaths.push(join33(versionRoot, entry.name, INSTALLED_AGENTS_MANIFEST));
+    }
+  }
+  const paths = new Set;
+  for (const manifestPath of manifestPaths) {
+    for (const path7 of await readInstalledAgentManifest(manifestPath)) {
+      paths.add(path7);
+    }
+  }
+  return [...paths].sort();
+}
+async function readInstalledAgentManifest(manifestPath) {
+  if (!await exists6(manifestPath))
+    return [];
+  const parsed = JSON.parse(await readFile11(manifestPath, "utf8"));
+  if (!isRecord14(parsed) || !Array.isArray(parsed.agents))
+    return [];
+  return parsed.agents.filter((path7) => typeof path7 === "string");
+}
+async function removeManifestListedAgentLinks(codexHome, paths) {
+  const agentsDir = join33(codexHome, "agents");
+  const removed = [];
+  const skipped = [];
+  for (const path7 of paths) {
+    if (!isSafeManagedAgentPath(agentsDir, path7)) {
+      skipped.push(path7);
+      continue;
+    }
+    const entryStat = await maybeLstat2(path7);
+    if (entryStat === null)
+      continue;
+    if (entryStat.isDirectory() && !entryStat.isSymbolicLink()) {
+      skipped.push(path7);
+      continue;
+    }
+    await rm5(path7, { force: true });
+    removed.push(path7);
+  }
+  return { removed, skipped };
+}
+function isSafeManagedAgentPath(agentsDir, path7) {
+  if (!isAbsolute6(path7))
+    return false;
+  const relativePath = relative5(agentsDir, path7);
+  if (relativePath === "" || relativePath.startsWith("..") || isAbsolute6(relativePath))
+    return false;
+  const fileName = relativePath.split(/[\\/]/).pop();
+  if (fileName === undefined)
+    return false;
+  return MANAGED_CODEX_AGENT_NAMES2.some((agentName) => fileName === `${agentName}.toml`);
+}
+async function removePathIfExists(path7) {
+  if (!await exists6(path7))
+    return false;
+  await rm5(path7, { recursive: true, force: true });
+  return true;
+}
+async function exists6(path7) {
+  return await maybeLstat2(path7) !== null;
+}
+async function maybeLstat2(path7) {
+  try {
+    return await lstat6(path7);
+  } catch (error) {
+    if (nodeErrorCode3(error) === "ENOENT")
+      return null;
+    throw error;
+  }
+}
+function nodeErrorCode3(error) {
+  if (!(error instanceof Error) || !("code" in error))
+    return null;
+  return typeof error.code === "string" ? error.code : null;
+}
+function isRecord14(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
 // src/cli/star-request.ts
+import { execFile as execFile2 } from "child_process";
+import { promisify as promisify2 } from "util";
 var STAR_REPOSITORIES = [
   "code-yeongyu/oh-my-openagent",
   "code-yeongyu/lazycodex"
 ];
-function formatGitHubStarCommand(repository) {
-  return `gh api --silent --method PUT /user/starred/${repository} >/dev/null 2>&1 || true`;
+var PLATFORM_REPOSITORIES = {
+  opencode: ["code-yeongyu/oh-my-openagent"],
+  codex: STAR_REPOSITORIES,
+  both: STAR_REPOSITORIES
+};
+var execFileAsync = promisify2(execFile2);
+async function runGitHubStarCommand(repository) {
+  await execFileAsync("gh", ["api", "--silent", "--method", "PUT", `/user/starred/${repository}`]);
+}
+async function starGitHubRepositories(platform = "both", runCommand = runGitHubStarCommand) {
+  const results = [];
+  for (const repository of PLATFORM_REPOSITORIES[platform]) {
+    try {
+      await runCommand(repository);
+      results.push({ repository, ok: true });
+    } catch (error) {
+      results.push({ repository, ok: false, error: error instanceof Error ? error.message : String(error) });
+    }
+  }
+  return results;
 }
 
 // src/cli/cli-installer.ts
@@ -63133,10 +64314,10 @@ async function runCliInstaller(args, version2) {
     printSuccess(`Config written ${SYMBOLS.arrow} ${import_picocolors3.default.dim(omoResult.configPath)}`);
   }
   printBox(formatConfigSummary(config), isUpdate ? "Updated Configuration" : "Installation Complete");
-  if (!config.hasClaude) {
+  if (config.hasOpenCode && !config.hasClaude) {
     printInfo("Note: Sisyphus agent performs best with Claude Opus 4.5+. " + "Other models work but may have reduced orchestration quality.");
   }
-  if (!config.hasClaude && !config.hasOpenAI && !config.hasGemini && !config.hasCopilot && !config.hasOpencodeZen && !config.hasVercelAiGateway) {
+  if (config.hasOpenCode && !config.hasClaude && !config.hasOpenAI && !config.hasGemini && !config.hasCopilot && !config.hasOpencodeZen && !config.hasVercelAiGateway) {
     printWarning("No model providers configured. Using opencode/big-pickle as fallback.");
   }
   console.log(`${SYMBOLS.star} ${import_picocolors3.default.bold(import_picocolors3.default.green(isUpdate ? "Configuration updated!" : "Installation complete!"))}`);
@@ -63165,11 +64346,7 @@ async function runCliInstaller(args, version2) {
   printBox(`${import_picocolors3.default.bold("Pro Tip:")} Include ${import_picocolors3.default.cyan("ultrawork")} (or ${import_picocolors3.default.cyan("ulw")}) in your prompt.
 ` + `All features work like magic-parallel agents, background tasks,
 ` + `deep exploration, and relentless execution until completion.`, "The Magic Word");
-  console.log(`${SYMBOLS.star} ${import_picocolors3.default.yellow("If you found this helpful, consider starring the repo!")}`);
-  for (const repository of STAR_REPOSITORIES) {
-    console.log(`  ${import_picocolors3.default.dim(formatGitHubStarCommand(repository))}`);
-  }
-  console.log();
+  await maybePromptForGitHubStars(config.platform);
   console.log(import_picocolors3.default.dim("oMoMoMoMo... Enjoy!"));
   console.log();
   if (hasOpenCode && (config.hasClaude || config.hasGemini || config.hasCopilot) && !args.skipAuth) {
@@ -63180,6 +64357,34 @@ async function runCliInstaller(args, version2) {
   }
   return 0;
 }
+async function maybePromptForGitHubStars(platform) {
+  if (!process.stdin.isTTY || !process.stdout.isTTY)
+    return;
+  const readline = createInterface2({ input: process.stdin, output: process.stdout });
+  try {
+    const answer = await readline.question(`${SYMBOLS.star} ${import_picocolors3.default.yellow("Star the repos on GitHub?")} ${import_picocolors3.default.dim("[y/N]")} `);
+    if (!isYes(answer))
+      return;
+  } finally {
+    readline.close();
+  }
+  const results = await starGitHubRepositories(platform);
+  const failed = results.filter((result) => !result.ok);
+  if (failed.length === 0) {
+    printSuccess("Starred GitHub repositories");
+    console.log();
+    return;
+  }
+  printWarning("Could not star every repository. Make sure GitHub CLI is installed and authenticated.");
+  for (const result of failed) {
+    console.log(`  ${SYMBOLS.bullet} ${result.repository}`);
+  }
+  console.log();
+}
+function isYes(value) {
+  const normalized = value.trim().toLowerCase();
+  return normalized === "y" || normalized === "yes";
+}
 
 // node_modules/.bun/@clack+core@1.3.1/node_modules/@clack/core/dist/index.mjs
 import { styleText as v } from "util";
@@ -63828,6 +65033,24 @@ var Q = class extends m {
     }
   }
 };
+
+class X extends m {
+  get cursor() {
+    return this.value ? 0 : 1;
+  }
+  get _value() {
+    return this.cursor === 0;
+  }
+  constructor(t) {
+    super(t, false), this.value = !!t.initialValue, this.on("userInput", () => {
+      this.value = this._value;
+    }), this.on("confirm", (s) => {
+      this.output.write(import_sisteransi.cursor.move(0, -1)), this.value = s, this.state = "submit", this.close();
+    }), this.on("cursor", () => {
+      this.value = !this.value;
+    });
+  }
+}
 var Z = { Y: { type: "year", len: 4 }, M: { type: "month", len: 2 }, D: { type: "day", len: 2 } };
 function P(r) {
   return [...r].map((t) => Z[t]);
@@ -64265,6 +65488,33 @@ var F2 = ({ cursor: t, options: i2, style: s, output: r = process.stdout, maxIte
       S2.push(G2);
   return h2 && S2.push(l), S2;
 };
+var ue = (t) => {
+  const i2 = t.active ?? "Yes", s = t.inactive ?? "No";
+  return new X({ active: i2, inactive: s, signal: t.signal, input: t.input, output: t.output, initialValue: t.initialValue ?? true, render() {
+    const r = t.withGuide ?? h.withGuide, u = `${P2(this.state)}  `, n = r ? `${e("gray", $2)}  ` : "", a = W(t.output, t.message, n, u), c = `${r ? `${e("gray", $2)}
+` : ""}${a}
+`, o = this.value ? i2 : s;
+    switch (this.state) {
+      case "submit": {
+        const l = r ? `${e("gray", $2)}  ` : "";
+        return `${c}${l}${e("dim", o)}`;
+      }
+      case "cancel": {
+        const l = r ? `${e("gray", $2)}  ` : "";
+        return `${c}${l}${e(["strikethrough", "dim"], o)}${r ? `
+${e("gray", $2)}` : ""}`;
+      }
+      default: {
+        const l = r ? `${e("cyan", $2)}  ` : "", d = r ? e("cyan", x2) : "";
+        return `${c}${l}${this.value ? `${e("green", z2)} ${i2}` : `${e("dim", U2)} ${e("dim", i2)}`}${t.vertical ? r ? `
+${e("cyan", $2)}  ` : `
+` : ` ${e("dim", "/")} `}${this.value ? `${e("dim", U2)} ${e("dim", s)}` : `${e("green", z2)} ${s}`}
+${d}
+`;
+      }
+    }
+  } }).prompt();
+};
 var R2 = { message: (t = [], { symbol: i2 = e("gray", $2), secondarySymbol: s = e("gray", $2), output: r = process.stdout, spacing: u = 1, withGuide: n } = {}) => {
   const a = [], c = n ?? h.withGuide, o = c ? s : "", l = c ? `${i2}  ` : "", d = c ? `${s}  ` : "";
   for (let p2 = 0;p2 < u; p2++)
@@ -64687,15 +65937,19 @@ async function runTuiInstaller(args, version2) {
     }
     spinner.stop(`Config written to ${import_picocolors4.default.cyan(omoResult.configPath)}`);
   }
-  if (!config.hasClaude) {
+  if (config.hasOpenCode && !config.hasClaude) {
     R2.info(`${import_picocolors4.default.bold("Note:")} Sisyphus agent performs best with Claude Opus 4.5+.
 ` + `Other models work but may have reduced orchestration quality.`);
   }
-  if (!config.hasClaude && !config.hasOpenAI && !config.hasGemini && !config.hasCopilot && !config.hasOpencodeZen && !config.hasVercelAiGateway) {
+  if (config.hasOpenCode && !config.hasClaude && !config.hasOpenAI && !config.hasGemini && !config.hasCopilot && !config.hasOpencodeZen && !config.hasVercelAiGateway) {
     R2.warn("No model providers configured. Using opencode/big-pickle as fallback.");
   }
   Se(formatConfigSummary(config), isUpdate ? "Updated Configuration" : "Installation Complete");
   if (config.hasCodex) {
+    const codexInstallation = await detectCodexInstallation();
+    if (!codexInstallation.found) {
+      R2.warn(formatCodexInstallationWarning(codexInstallation));
+    }
     spinner.start("Installing Codex harness adapter");
     try {
       const codexResult = await runCodexInstaller({ autonomousPermissions: config.codexAutonomous });
@@ -64720,9 +65974,20 @@ async function runTuiInstaller(args, version2) {
   Se(`Include ${import_picocolors4.default.cyan("ultrawork")} (or ${import_picocolors4.default.cyan("ulw")}) in your prompt.
 ` + `All features work like magic-parallel agents, background tasks,
 ` + `deep exploration, and relentless execution until completion.`, "The Magic Word");
-  R2.message(`${import_picocolors4.default.yellow("\u2605")} If you found this helpful, consider starring the repo!`);
-  for (const repository of STAR_REPOSITORIES) {
-    R2.message(`  ${import_picocolors4.default.dim(formatGitHubStarCommand(repository))}`);
+  const shouldStar = await ue({
+    message: "Star the repos on GitHub?",
+    initialValue: false
+  });
+  if (!q(shouldStar) && shouldStar) {
+    spinner.start("Starring GitHub repositories");
+    const results = await starGitHubRepositories(selectedPlatform);
+    const failed = results.filter((result) => !result.ok);
+    if (failed.length === 0) {
+      spinner.stop("GitHub repositories starred");
+    } else {
+      spinner.stop("Could not star every repository");
+      R2.warn("Make sure GitHub CLI is installed and authenticated.");
+    }
   }
   ye(import_picocolors4.default.green("oMoMoMoMo... Enjoy!"));
   if (config.hasOpenCode && (config.hasClaude || config.hasGemini || config.hasCopilot) && !args.skipAuth) {
@@ -64751,6 +66016,71 @@ async function install(args) {
   return args.tui ? runTuiInstaller(args, VERSION) : runCliInstaller(args, VERSION);
 }
 
+// src/cli/cleanup.ts
+function resolveCleanupPlatform(options, invocationName = process.env.OMO_INVOCATION_NAME) {
+  if (options.platform !== undefined)
+    return options.platform;
+  return invocationName === "lazycodex" || invocationName === "lazycodex-ai" ? "codex" : undefined;
+}
+async function cleanup(options) {
+  if (options.platform !== "codex") {
+    console.error("Error: cleanup currently supports only --platform=codex");
+    return 1;
+  }
+  const result = await cleanupCodexLight({
+    codexHome: options.codexHome,
+    projectDirectory: options.project
+  });
+  if (options.json === true) {
+    console.log(JSON.stringify(result, null, 2));
+    return 0;
+  }
+  console.log(`Codex Light cleanup complete: ${result.codexHome}`);
+  if (result.configChanged) {
+    console.log(`- Updated ${result.configPath}`);
+    if (result.configBackupPath !== undefined)
+      console.log(`- Backup ${result.configBackupPath}`);
+  } else {
+    console.log(`- No managed Codex config blocks found in ${result.configPath}`);
+  }
+  for (const path7 of result.removedPaths) {
+    console.log(`- Removed ${path7}`);
+  }
+  for (const path7 of result.removedAgentLinks) {
+    console.log(`- Removed managed agent link ${path7}`);
+  }
+  for (const path7 of result.skippedAgentLinks) {
+    console.log(`- Skipped agent path outside managed scope ${path7}`);
+  }
+  if (result.projectCleanup.changed) {
+    console.log(`- Repaired project-local Codex config ${result.projectCleanup.configPath}`);
+  }
+  for (const artifact of result.projectCleanup.artifacts) {
+    console.log(`- Left project-local artifact in place ${artifact.path}`);
+  }
+  return 0;
+}
+
+// src/cli/cleanup-command.ts
+function configureCleanupCommand(program2) {
+  program2.command("cleanup").description("Clean managed Codex Light state and repair project-local legacy Codex artifacts").addOption(new Option("--platform <platform>", "Cleanup target platform: codex").choices(["codex"])).option("--codex-home <path>", "Codex home to clean (defaults to CODEX_HOME or ~/.codex)").option("--project <path>", "Project directory to inspect for project-local .codex/.omx artifacts").option("--json", "Output structured JSON result").addHelpText("after", `
+Examples:
+  $ npx lazycodex-ai cleanup
+  $ omo cleanup --platform=codex
+  $ omo cleanup --platform=codex --project /path/to/project
+`).action(async (options) => {
+    const rootOptions = program2.opts();
+    const platform = resolveCleanupPlatform({ platform: options.platform ?? rootOptions.platform });
+    const exitCode = await cleanup({
+      platform,
+      codexHome: options.codexHome,
+      project: options.project,
+      json: options.json ?? false
+    });
+    process.exit(exitCode);
+  });
+}
+
 // src/cli/run/runner.ts
 var import_picocolors14 = __toESM(require_picocolors(), 1);
 
@@ -64758,6 +66088,7 @@ var import_picocolors14 = __toESM(require_picocolors(), 1);
 function createEventState() {
   return {
     mainSessionIdle: false,
+    mainSessionStarted: false,
     mainSessionError: false,
     lastError: null,
     lastOutput: "",
@@ -65173,10 +66504,12 @@ function handleSessionStatus(ctx, payload, state) {
     return;
   if (props?.status?.type === "busy") {
     state.mainSessionIdle = false;
+    state.mainSessionStarted = true;
   } else if (props?.status?.type === "idle") {
     state.mainSessionIdle = true;
   } else if (props?.status?.type === "retry") {
     state.mainSessionIdle = false;
+    state.mainSessionStarted = true;
   }
 }
 function handleSessionError(ctx, payload, state) {
@@ -65216,6 +66549,7 @@ function handleMessagePartUpdated(ctx, payload, state) {
       const padded = writePaddedText(newText, state.thinkingAtLineStart);
       process.stdout.write(import_picocolors7.default.dim(padded.output));
       state.thinkingAtLineStart = padded.atLineStart;
+      state.mainSessionStarted = true;
       state.hasReceivedMeaningfulWork = true;
     }
     state.lastReasoningText = reasoningText;
@@ -65228,6 +66562,7 @@ function handleMessagePartUpdated(ctx, payload, state) {
       const padded = writePaddedText(newText, state.textAtLineStart);
       process.stdout.write(padded.output);
       state.textAtLineStart = padded.atLineStart;
+      state.mainSessionStarted = true;
       state.hasReceivedMeaningfulWork = true;
     }
     state.lastPartText = part.text;
@@ -65239,6 +66574,7 @@ function handleMessagePartUpdated(ctx, payload, state) {
     }
   }
   if (part.type === "tool") {
+    state.mainSessionStarted = true;
     handleToolPart(ctx, part, state);
   }
 }
@@ -65264,6 +66600,7 @@ function handleMessagePartDelta(ctx, payload, state) {
     process.stdout.write(import_picocolors7.default.dim(padded2.output));
     state.thinkingAtLineStart = padded2.atLineStart;
     state.lastReasoningText += delta;
+    state.mainSessionStarted = true;
     state.hasReceivedMeaningfulWork = true;
     return;
   }
@@ -65272,6 +66609,7 @@ function handleMessagePartDelta(ctx, payload, state) {
   process.stdout.write(padded.output);
   state.textAtLineStart = padded.atLineStart;
   state.lastPartText += delta;
+  state.mainSessionStarted = true;
   state.hasReceivedMeaningfulWork = true;
 }
 function handleToolPart(_ctx, part, state) {
@@ -65317,11 +66655,15 @@ function handleMessageUpdated(ctx, payload, state) {
   if (messageID && role) {
     state.messageRoleById[messageID] = role;
   }
+  if (messageID) {
+    state.mainSessionStarted = true;
+  }
   if (props?.info?.role !== "assistant")
     return;
   const isNewMessage = !messageID || messageID !== state.currentMessageId;
   if (isNewMessage) {
     state.currentMessageId = messageID;
+    state.mainSessionStarted = true;
     state.hasReceivedMeaningfulWork = true;
     state.messageCount++;
     state.lastPartText = "";
@@ -65357,6 +66699,7 @@ function handleToolExecute(ctx, payload, state) {
     return;
   const toolName = props?.name || "unknown";
   state.currentTool = toolName;
+  state.mainSessionStarted = true;
   const header = formatToolHeader(toolName, props?.input ?? {});
   const suffix = header.description ? ` ${import_picocolors7.default.dim(header.description)}` : "";
   state.hasReceivedMeaningfulWork = true;
@@ -65451,7 +66794,7 @@ async function processEvents(ctx, stream, state) {
 }
 // src/plugin-config.ts
 import * as fs4 from "fs";
-import { homedir as homedir6 } from "os";
+import { homedir as homedir8 } from "os";
 import * as path7 from "path";
 
 // node_modules/.bun/zod@4.4.3/node_modules/zod/v4/classic/external.js
@@ -67065,8 +68408,8 @@ function emoji() {
 }
 var ipv4 = /^(?:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\.){3}(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])$/;
 var ipv6 = /^(([0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:))$/;
-var mac = (delimiter) => {
-  const escapedDelim = escapeRegex(delimiter ?? ":");
+var mac = (delimiter2) => {
+  const escapedDelim = escapeRegex(delimiter2 ?? ":");
   return new RegExp(`^(?:[0-9A-F]{2}${escapedDelim}){5}[0-9A-F]{2}$|^(?:[0-9a-f]{2}${escapedDelim}){5}[0-9a-f]{2}$`);
 };
 var cidrv4 = /^((25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\.){3}(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\/([0-9]|[1-2][0-9]|3[0-2])$/;
@@ -71813,9 +73156,9 @@ var error17 = () => {
         if (issue2.values.length === 2) {
           return `\u05E2\u05E8\u05DA \u05DC\u05D0 \u05EA\u05E7\u05D9\u05DF: \u05D4\u05D0\u05E4\u05E9\u05E8\u05D5\u05D9\u05D5\u05EA \u05D4\u05DE\u05EA\u05D0\u05D9\u05DE\u05D5\u05EA \u05D4\u05DF ${stringified[0]} \u05D0\u05D5 ${stringified[1]}`;
         }
-        const lastValue = stringified[stringified.length - 1];
+        const lastValue2 = stringified[stringified.length - 1];
         const restValues = stringified.slice(0, -1).join(", ");
-        return `\u05E2\u05E8\u05DA \u05DC\u05D0 \u05EA\u05E7\u05D9\u05DF: \u05D4\u05D0\u05E4\u05E9\u05E8\u05D5\u05D9\u05D5\u05EA \u05D4\u05DE\u05EA\u05D0\u05D9\u05DE\u05D5\u05EA \u05D4\u05DF ${restValues} \u05D0\u05D5 ${lastValue}`;
+        return `\u05E2\u05E8\u05DA \u05DC\u05D0 \u05EA\u05E7\u05D9\u05DF: \u05D4\u05D0\u05E4\u05E9\u05E8\u05D5\u05D9\u05D5\u05EA \u05D4\u05DE\u05EA\u05D0\u05D9\u05DE\u05D5\u05EA \u05D4\u05DF ${restValues} \u05D0\u05D5 ${lastValue2}`;
       }
       case "too_big": {
         const sizing = getSizing(issue2.origin);
@@ -80025,7 +81368,6 @@ var GitMasterConfigSchema = exports_external.object({
 // src/config/schema/hooks.ts
 var HookNameSchema = exports_external.enum([
   "todo-continuation-enforcer",
-  "context-window-monitor",
   "session-recovery",
   "session-notification",
   "comment-checker",
@@ -80480,7 +81822,7 @@ function addAgentOrderWarnings(configPath, agentOrder) {
   });
 }
 function resolveHomeDirectory() {
-  return process.env.HOME ?? process.env.USERPROFILE ?? homedir6();
+  return process.env.HOME ?? process.env.USERPROFILE ?? homedir8();
 }
 function resolveConfigPathAfterLegacyMigration(detectedPath) {
   if (!path7.basename(detectedPath).startsWith(LEGACY_CONFIG_BASENAME)) {
@@ -80776,7 +82118,7 @@ function loadPluginConfig(directory, ctx) {
 // node_modules/.bun/@opencode-ai+sdk@1.15.10/node_modules/@opencode-ai/sdk/dist/gen/core/serverSentEvents.gen.js
 var createSseClient = ({ onSseError, onSseEvent, responseTransformer, responseValidator, sseDefaultRetryDelay, sseMaxRetryAttempts, sseMaxRetryDelay, sseSleepFn, url: url2, ...options }) => {
   let lastEventId;
-  const sleep = sseSleepFn ?? ((ms) => new Promise((resolve9) => setTimeout(resolve9, ms)));
+  const sleep = sseSleepFn ?? ((ms) => new Promise((resolve11) => setTimeout(resolve11, ms)));
   const createStream = async function* () {
     let retryDelay = sseDefaultRetryDelay ?? 3000;
     let attempt = 0;
@@ -82239,7 +83581,7 @@ async function createOpencodeServer(options) {
     }
   });
   let clear = () => {};
-  const url2 = await new Promise((resolve9, reject) => {
+  const url2 = await new Promise((resolve11, reject) => {
     const id = setTimeout(() => {
       clear();
       stop(proc);
@@ -82265,7 +83607,7 @@ async function createOpencodeServer(options) {
           }
           clearTimeout(id);
           resolved = true;
-          resolve9(match[1]);
+          resolve11(match[1]);
           return;
         }
       }
@@ -82320,7 +83662,7 @@ var import_picocolors9 = __toESM(require_picocolors(), 1);
 
 // src/cli/run/opencode-binary-resolver.ts
 init_spawn_with_windows_hide();
-import { delimiter, dirname as dirname15, join as join30 } from "path";
+import { delimiter as delimiter2, dirname as dirname17, join as join35 } from "path";
 var OPENCODE_COMMANDS = ["opencode", "opencode-desktop"];
 var WINDOWS_SUFFIXES = ["", ".exe", ".cmd", ".bat", ".ps1"];
 function getCommandCandidates(platform) {
@@ -82341,9 +83683,9 @@ function collectCandidateBinaryPaths(pathEnv, which = Bun.which, platform = proc
   for (const command of commandCandidates) {
     addCandidate(which(command));
   }
-  for (const entry of (pathEnv ?? "").split(delimiter).filter(Boolean)) {
+  for (const entry of (pathEnv ?? "").split(delimiter2).filter(Boolean)) {
     for (const command of commandCandidates) {
-      addCandidate(join30(entry, command));
+      addCandidate(join35(entry, command));
     }
   }
   return candidates;
@@ -82370,9 +83712,9 @@ async function findWorkingOpencodeBinary(pathEnv = process.env.PATH, probe = can
   return null;
 }
 function buildPathWithBinaryFirst(pathEnv, binaryPath) {
-  const preferredDir = dirname15(binaryPath);
-  const existing = (pathEnv ?? "").split(delimiter).filter((entry) => entry.length > 0 && entry !== preferredDir);
-  return [preferredDir, ...existing].join(delimiter);
+  const preferredDir = dirname17(binaryPath);
+  const existing = (pathEnv ?? "").split(delimiter2).filter((entry) => entry.length > 0 && entry !== preferredDir);
+  return [preferredDir, ...existing].join(delimiter2);
 }
 async function withWorkingOpencodePath(startServer, finder = findWorkingOpencodeBinary) {
   const originalPath = process.env.PATH;
@@ -82534,7 +83876,7 @@ async function resolveSession(options) {
       if (attempt < SESSION_CREATE_MAX_RETRIES) {
         const delay = SESSION_CREATE_RETRY_DELAY_MS * attempt;
         console.log(import_picocolors10.default.dim(`  Retrying in ${delay}ms...`));
-        await new Promise((resolve9) => setTimeout(resolve9, delay));
+        await new Promise((resolve11) => setTimeout(resolve11, delay));
       }
       continue;
     }
@@ -82545,7 +83887,7 @@ async function resolveSession(options) {
     if (attempt < SESSION_CREATE_MAX_RETRIES) {
       const delay = SESSION_CREATE_RETRY_DELAY_MS * attempt;
       console.log(import_picocolors10.default.dim(`  Retrying in ${delay}ms...`));
-      await new Promise((resolve9) => setTimeout(resolve9, delay));
+      await new Promise((resolve11) => setTimeout(resolve11, delay));
     }
   }
   throw new Error("Failed to create session after all retries");
@@ -82756,7 +84098,7 @@ var BOULDER_STATE_PATH = `${BOULDER_DIR}/${BOULDER_FILE}`;
 var NOTEPAD_DIR = "notepads";
 var NOTEPAD_BASE_PATH = `${BOULDER_DIR}/${NOTEPAD_DIR}`;
 // packages/boulder-state/src/top-level-task.ts
-import { existsSync as existsSync25, readFileSync as readFileSync15 } from "fs";
+import { existsSync as existsSync28, readFileSync as readFileSync15 } from "fs";
 var TODO_HEADING_PATTERN = /^##\s+TODOs\b/i;
 var FINAL_VERIFICATION_HEADING_PATTERN = /^##\s+Final Verification Wave\b/i;
 var SECOND_LEVEL_HEADING_PATTERN = /^##\s+/;
@@ -82779,7 +84121,7 @@ function buildTaskRef(section, taskLabel) {
   };
 }
 function readCurrentTopLevelTask(planPath) {
-  if (!existsSync25(planPath)) {
+  if (!existsSync28(planPath)) {
     return null;
   }
   try {
@@ -82808,13 +84150,13 @@ function readCurrentTopLevelTask(planPath) {
   }
 }
 // packages/boulder-state/src/storage/path.ts
-import { existsSync as existsSync26 } from "fs";
-import { isAbsolute as isAbsolute6, join as join31, relative as relative5, resolve as resolve9 } from "path";
+import { existsSync as existsSync29 } from "fs";
+import { isAbsolute as isAbsolute7, join as join36, relative as relative6, resolve as resolve11 } from "path";
 function getBoulderFilePath(directory) {
-  return join31(directory, BOULDER_DIR, BOULDER_FILE);
+  return join36(directory, BOULDER_DIR, BOULDER_FILE);
 }
 function resolveTrackedPath(baseDirectory, trackedPath) {
-  return isAbsolute6(trackedPath) ? resolve9(trackedPath) : resolve9(baseDirectory, trackedPath);
+  return isAbsolute7(trackedPath) ? resolve11(trackedPath) : resolve11(baseDirectory, trackedPath);
 }
 function resolveBoulderPlanPath(directory, state) {
   const absolutePlanPath = resolveTrackedPath(directory, state.active_plan);
@@ -82822,20 +84164,20 @@ function resolveBoulderPlanPath(directory, state) {
   if (!worktreePath) {
     return absolutePlanPath;
   }
-  const absoluteDirectory = resolve9(directory);
-  const relativePlanPath = relative5(absoluteDirectory, absolutePlanPath);
-  if (relativePlanPath.length === 0 || relativePlanPath.startsWith("..") || isAbsolute6(relativePlanPath)) {
+  const absoluteDirectory = resolve11(directory);
+  const relativePlanPath = relative6(absoluteDirectory, absolutePlanPath);
+  if (relativePlanPath.length === 0 || relativePlanPath.startsWith("..") || isAbsolute7(relativePlanPath)) {
     return absolutePlanPath;
   }
   const absoluteWorktreePath = resolveTrackedPath(directory, worktreePath);
-  const worktreePlanPath = resolve9(absoluteWorktreePath, relativePlanPath);
-  return existsSync26(worktreePlanPath) ? worktreePlanPath : absolutePlanPath;
+  const worktreePlanPath = resolve11(absoluteWorktreePath, relativePlanPath);
+  return existsSync29(worktreePlanPath) ? worktreePlanPath : absolutePlanPath;
 }
 function resolveBoulderPlanPathForWork(directory, work) {
   return resolveBoulderPlanPath(directory, work);
 }
 // packages/boulder-state/src/storage/plan-progress.ts
-import { existsSync as existsSync27, readFileSync as readFileSync16, readdirSync as readdirSync4, statSync as statSync4 } from "fs";
+import { existsSync as existsSync30, readFileSync as readFileSync16, readdirSync as readdirSync4, statSync as statSync4 } from "fs";
 var TODO_HEADING_PATTERN2 = /^##\s+TODOs\b/i;
 var FINAL_VERIFICATION_HEADING_PATTERN2 = /^##\s+Final Verification Wave\b/i;
 var SECOND_LEVEL_HEADING_PATTERN2 = /^##\s+/;
@@ -82844,7 +84186,7 @@ var CHECKED_CHECKBOX_PATTERN = /^(\s*)[-*]\s*\[[xX]\]\s*(.+)$/;
 var TODO_TASK_PATTERN2 = /^\d+\.\s+/;
 var FINAL_WAVE_TASK_PATTERN2 = /^F\d+\.\s+/i;
 function getPlanProgress(planPath) {
-  if (!existsSync27(planPath)) {
+  if (!existsSync30(planPath)) {
     return { total: 0, completed: 0, isComplete: false };
   }
   try {
@@ -82964,10 +84306,10 @@ function selectMirrorWork(state) {
   return sorted[0] ?? null;
 }
 // packages/boulder-state/src/storage/read-state.ts
-import { existsSync as existsSync28, readFileSync as readFileSync17 } from "fs";
+import { existsSync as existsSync31, readFileSync as readFileSync17 } from "fs";
 function readBoulderState(directory) {
   const filePath = getBoulderFilePath(directory);
-  if (!existsSync28(filePath)) {
+  if (!existsSync31(filePath)) {
     return null;
   }
   try {
@@ -83047,14 +84389,14 @@ function getSessionAgent(sessionID) {
 // src/features/run-continuation-state/constants.ts
 var CONTINUATION_MARKER_DIR = ".omo/run-continuation";
 // src/features/run-continuation-state/storage.ts
-import { existsSync as existsSync29, mkdirSync as mkdirSync9, readFileSync as readFileSync18, rmSync as rmSync2, writeFileSync as writeFileSync6 } from "fs";
-import { join as join32 } from "path";
+import { existsSync as existsSync32, mkdirSync as mkdirSync9, readFileSync as readFileSync18, rmSync as rmSync2, writeFileSync as writeFileSync6 } from "fs";
+import { join as join37 } from "path";
 function getMarkerPath(directory, sessionID) {
-  return join32(directory, CONTINUATION_MARKER_DIR, `${sessionID}.json`);
+  return join37(directory, CONTINUATION_MARKER_DIR, `${sessionID}.json`);
 }
 function readContinuationMarker(directory, sessionID) {
   const markerPath = getMarkerPath(directory, sessionID);
-  if (!existsSync29(markerPath))
+  if (!existsSync32(markerPath))
     return null;
   try {
     const raw = readFileSync18(markerPath, "utf-8");
@@ -83120,7 +84462,7 @@ async function isSessionInBoulderLineage(input) {
 init_shared();
 init_compaction_marker();
 import { readFileSync as readFileSync19, readdirSync as readdirSync5 } from "fs";
-import { join as join33 } from "path";
+import { join as join38 } from "path";
 var defaultSessionLastAgentDeps = {
   getMessageDir,
   isSqliteBackend,
@@ -83174,7 +84516,7 @@ async function getLastAgentFromSession(sessionID, client3, deps = {}) {
   try {
     const messages = readdirSync5(messageDir).filter((fileName) => fileName.endsWith(".json")).map((fileName) => {
       try {
-        const content = readFileSync19(join33(messageDir, fileName), "utf-8");
+        const content = readFileSync19(join38(messageDir, fileName), "utf-8");
         const parsed = JSON.parse(content);
         return {
           fileName,
@@ -83210,8 +84552,8 @@ init_agent_display_names();
 
 // src/hooks/ralph-loop/storage.ts
 init_frontmatter2();
-import { existsSync as existsSync30, readFileSync as readFileSync20, writeFileSync as writeFileSync7, unlinkSync as unlinkSync5, mkdirSync as mkdirSync10 } from "fs";
-import { dirname as dirname16, join as join34 } from "path";
+import { existsSync as existsSync33, readFileSync as readFileSync20, writeFileSync as writeFileSync7, unlinkSync as unlinkSync5, mkdirSync as mkdirSync10 } from "fs";
+import { dirname as dirname18, join as join39 } from "path";
 
 // src/hooks/ralph-loop/constants.ts
 var DEFAULT_STATE_FILE = ".omo/ralph-loop.local.md";
@@ -83220,11 +84562,11 @@ var DEFAULT_COMPLETION_PROMISE = "DONE";
 
 // src/hooks/ralph-loop/storage.ts
 function getStateFilePath(directory, customPath) {
-  return customPath ? join34(directory, customPath) : join34(directory, DEFAULT_STATE_FILE);
+  return customPath ? join39(directory, customPath) : join39(directory, DEFAULT_STATE_FILE);
 }
 function readState(directory, customPath) {
   const filePath = getStateFilePath(directory, customPath);
-  if (!existsSync30(filePath)) {
+  if (!existsSync33(filePath)) {
     return null;
   }
   try {
@@ -83449,13 +84791,14 @@ async function pollForCompletion(ctx, eventState, abortController, options = {})
   const minStabilizationMs = rawMinStabilizationMs > 0 ? rawMinStabilizationMs : MIN_STABILIZATION_MS;
   const eventWatchdogMs = options.eventWatchdogMs ?? DEFAULT_EVENT_WATCHDOG_MS;
   const secondaryMeaningfulWorkTimeoutMs = options.secondaryMeaningfulWorkTimeoutMs ?? DEFAULT_SECONDARY_MEANINGFUL_WORK_TIMEOUT_MS;
+  const requireMeaningfulWork = options.requireMeaningfulWork ?? false;
   let consecutiveCompleteChecks = 0;
   let errorCycleCount = 0;
   let firstWorkTimestamp = null;
   let secondaryTimeoutChecked = false;
   const pollStartTimestamp = Date.now();
   while (!abortController.signal.aborted) {
-    await new Promise((resolve10) => setTimeout(resolve10, pollIntervalMs));
+    await new Promise((resolve12) => setTimeout(resolve12, pollIntervalMs));
     if (abortController.signal.aborted) {
       return 130;
     }
@@ -83508,21 +84851,24 @@ Session ended with error: ${eventState.lastError}`));
         consecutiveCompleteChecks = 0;
         continue;
       }
+      if (requireMeaningfulWork) {
+        if (Date.now() - pollStartTimestamp <= secondaryMeaningfulWorkTimeoutMs) {
+          consecutiveCompleteChecks = 0;
+          continue;
+        }
+        const hasActiveWork = await hasActiveSessionWork(ctx);
+        if (hasActiveWork) {
+          consecutiveCompleteChecks = 0;
+          continue;
+        }
+        console.error(import_picocolors13.default.red(`
+
+Session never produced assistant output, tool activity, or reasoning after the prompt started.`));
+        return 1;
+      }
       if (Date.now() - pollStartTimestamp > secondaryMeaningfulWorkTimeoutMs && !secondaryTimeoutChecked) {
         secondaryTimeoutChecked = true;
-        const childrenRes = await ctx.client.session.children({
-          path: { id: ctx.sessionID },
-          query: { directory: ctx.directory }
-        });
-        const children = normalizeSDKResponse(childrenRes, []);
-        const todosRes = await ctx.client.session.todo({
-          path: { id: ctx.sessionID },
-          query: { directory: ctx.directory }
-        });
-        const todos = normalizeSDKResponse(todosRes, []);
-        const hasActiveChildren = Array.isArray(children) && children.length > 0;
-        const hasActiveTodos = Array.isArray(todos) && todos.some(isIncompleteTodo);
-        const hasActiveWork = hasActiveChildren || hasActiveTodos;
+        const hasActiveWork = await hasActiveSessionWork(ctx);
         if (hasActiveWork) {
           eventState.hasReceivedMeaningfulWork = true;
           console.log(import_picocolors13.default.yellow(`
@@ -83556,6 +84902,21 @@ All tasks completed.`));
   }
   return 130;
 }
+async function hasActiveSessionWork(ctx) {
+  const childrenRes = await ctx.client.session.children({
+    path: { id: ctx.sessionID },
+    query: { directory: ctx.directory }
+  });
+  const children = normalizeSDKResponse(childrenRes, []);
+  const todosRes = await ctx.client.session.todo({
+    path: { id: ctx.sessionID },
+    query: { directory: ctx.directory }
+  });
+  const todos = normalizeSDKResponse(todosRes, []);
+  const hasActiveChildren = Array.isArray(children) && children.length > 0;
+  const hasActiveTodos = Array.isArray(todos) && todos.some(isIncompleteTodo);
+  return hasActiveChildren || hasActiveTodos;
+}
 async function getMainSessionStatus(ctx) {
   try {
     const statusesRes = await ctx.client.session.status({
@@ -83575,6 +84936,88 @@ async function getMainSessionStatus(ctx) {
   }
 }
 
+// src/cli/run/prompt-start.ts
+init_shared();
+var DEFAULT_PROMPT_START_TIMEOUT_MS = 30000;
+var DEFAULT_PROMPT_START_POLL_INTERVAL_MS = 100;
+function createAbortError() {
+  const error51 = new Error("Prompt start wait aborted");
+  error51.name = "AbortError";
+  return error51;
+}
+function sleep(delayMs) {
+  return new Promise((resolve12) => setTimeout(resolve12, delayMs));
+}
+function hasPromptStartEvidence(eventState) {
+  return eventState.mainSessionStarted || eventState.hasReceivedMeaningfulWork || eventState.messageCount > 0 || eventState.currentTool !== null;
+}
+async function readMainSessionStatus(ctx) {
+  if (typeof ctx.client.session.status !== "function") {
+    return null;
+  }
+  try {
+    const statusRes = await ctx.client.session.status({
+      query: { directory: ctx.directory }
+    });
+    const statuses = normalizeSDKResponse(statusRes, {});
+    return statuses[ctx.sessionID]?.type ?? "idle";
+  } catch (error51) {
+    if (ctx.verbose) {
+      console.error(`[run] failed to read session status while waiting for prompt start: ${String(error51)}`);
+    }
+    return null;
+  }
+}
+async function hasPersistedMessages(ctx) {
+  if (typeof ctx.client.session.messages !== "function") {
+    return false;
+  }
+  try {
+    const messagesRes = await ctx.client.session.messages({
+      path: { id: ctx.sessionID },
+      query: { directory: ctx.directory }
+    });
+    const messages = normalizeSDKResponse(messagesRes, []);
+    return messages.length > 0;
+  } catch (error51) {
+    if (ctx.verbose) {
+      console.error(`[run] failed to read session messages while waiting for prompt start: ${String(error51)}`);
+    }
+    return false;
+  }
+}
+async function waitForPromptStart(ctx, eventState, abortController, options = {}) {
+  const timeoutMs = options.timeoutMs ?? DEFAULT_PROMPT_START_TIMEOUT_MS;
+  const pollIntervalMs = options.pollIntervalMs ?? DEFAULT_PROMPT_START_POLL_INTERVAL_MS;
+  const startedAt = Date.now();
+  while (!abortController.signal.aborted) {
+    if (hasPromptStartEvidence(eventState)) {
+      return;
+    }
+    if (eventState.mainSessionError) {
+      throw new Error(`Session errored before prompt started: ${eventState.lastError ?? "unknown error"}`);
+    }
+    const status = await readMainSessionStatus(ctx);
+    if (status === "busy" || status === "retry") {
+      eventState.mainSessionStarted = true;
+      eventState.mainSessionIdle = false;
+      return;
+    }
+    if (status === "idle") {
+      eventState.mainSessionIdle = true;
+    }
+    if (await hasPersistedMessages(ctx)) {
+      eventState.mainSessionStarted = true;
+      return;
+    }
+    if (Date.now() - startedAt >= timeoutMs) {
+      throw new Error(`Prompt did not start within ${timeoutMs}ms; no busy status, message event, or persisted message was observed.`);
+    }
+    await sleep(pollIntervalMs);
+  }
+  throw createAbortError();
+}
+
 // src/cli/run/agent-profile-colors.ts
 init_shared();
 async function loadAgentProfileColors(client3) {
@@ -83684,7 +85127,7 @@ function createTimestampedStdoutController(stdout = process.stdout) {
 // src/shared/posthog.ts
 init_index_node();
 import os5 from "os";
-import { createHash as createHash3 } from "crypto";
+import { createHash as createHash4 } from "crypto";
 init_plugin_identity();
 
 // src/shared/posthog-activity-state.ts
@@ -83692,11 +85135,11 @@ init_data_path();
 init_logger();
 init_plugin_identity();
 init_write_file_atomically();
-import { existsSync as existsSync31, mkdirSync as mkdirSync11, readFileSync as readFileSync21 } from "fs";
-import { join as join35 } from "path";
+import { existsSync as existsSync34, mkdirSync as mkdirSync11, readFileSync as readFileSync21 } from "fs";
+import { join as join40 } from "path";
 var POSTHOG_ACTIVITY_STATE_FILE2 = "posthog-activity.json";
 function getPostHogActivityStateFilePath2() {
-  return join35(getDataDir(), CACHE_DIR_NAME, POSTHOG_ACTIVITY_STATE_FILE2);
+  return join40(getDataDir(), CACHE_DIR_NAME, POSTHOG_ACTIVITY_STATE_FILE2);
 }
 function getUtcDayString2(date5) {
   return date5.toISOString().slice(0, 10);
@@ -83706,7 +85149,7 @@ function isPostHogActivityState2(value) {
 }
 function readPostHogActivityState2() {
   const stateFilePath = getPostHogActivityStateFilePath2();
-  if (!existsSync31(stateFilePath)) {
+  if (!existsSync34(stateFilePath)) {
     return {};
   }
   try {
@@ -83727,7 +85170,7 @@ function readPostHogActivityState2() {
 function writePostHogActivityState2(nextState) {
   const stateFilePath = getPostHogActivityStateFilePath2();
   try {
-    mkdirSync11(join35(getDataDir(), CACHE_DIR_NAME), { recursive: true });
+    mkdirSync11(join40(getDataDir(), CACHE_DIR_NAME), { recursive: true });
     writeFileAtomically(stateFilePath, `${JSON.stringify(nextState, null, 2)}
 `);
   } catch (error51) {
@@ -83858,7 +85301,7 @@ function createPostHogClient2(source, options) {
   };
 }
 function getPostHogDistinctId2() {
-  return createHash3("sha256").update(`${PUBLISHED_PACKAGE_NAME}:${resolveOsProvider2().hostname()}`).digest("hex");
+  return createHash4("sha256").update(`${PUBLISHED_PACKAGE_NAME}:${resolveOsProvider2().hostname()}`).digest("hex");
 }
 function createCliPostHog2() {
   return createPostHogClient2("cli", {
@@ -83877,7 +85320,7 @@ var EVENT_PROCESSOR_SHUTDOWN_TIMEOUT_MS = 2000;
 async function waitForEventProcessorShutdown(eventProcessor, timeoutMs = EVENT_PROCESSOR_SHUTDOWN_TIMEOUT_MS) {
   const completed = await Promise.race([
     eventProcessor.then(() => true),
-    new Promise((resolve10) => setTimeout(() => resolve10(false), timeoutMs))
+    new Promise((resolve12) => setTimeout(() => resolve12(false), timeoutMs))
   ]);
 }
 async function run(options) {
@@ -83908,7 +85351,7 @@ async function run(options) {
       attach: options.attach,
       signal: abortController.signal
     });
-    const cleanup = () => {
+    const cleanup2 = () => {
       serverCleanup();
     };
     const restoreInput = suppressRunInput();
@@ -83916,7 +85359,7 @@ async function run(options) {
       console.log(import_picocolors14.default.yellow(`
 Interrupted. Shutting down...`));
       restoreInput();
-      cleanup();
+      cleanup2();
       process.exit(130);
     };
     process.on("SIGINT", handleSigint);
@@ -83974,10 +85417,13 @@ Interrupted. Shutting down...`));
       if (!promptMayHaveBeenAccepted && !isInternalPromptDispatchAccepted(promptResult)) {
         throw new Error(`Session ${sessionID} is not idle; promptAsync skipped by gate: ${promptResult.status}`);
       }
-      const exitCode = await pollForCompletion(ctx, eventState, abortController);
+      await waitForPromptStart(ctx, eventState, abortController);
+      const exitCode = await pollForCompletion(ctx, eventState, abortController, {
+        requireMeaningfulWork: true
+      });
       abortController.abort();
       await waitForEventProcessorShutdown(eventProcessor);
-      cleanup();
+      cleanup2();
       const durationMs = Date.now() - startTime;
       if (options.onComplete) {
         await executeOnCompleteHook({
@@ -83999,7 +85445,7 @@ Interrupted. Shutting down...`));
       }
       return exitCode;
     } catch (err) {
-      cleanup();
+      cleanup2();
       throw err;
     } finally {
       process.removeListener("SIGINT", handleSigint);
@@ -84172,13 +85618,13 @@ async function getLocalVersion(options = {}) {
   }
 }
 // src/cli/doctor/checks/system.ts
-import { existsSync as existsSync42, readFileSync as readFileSync31 } from "fs";
+import { existsSync as existsSync45, readFileSync as readFileSync31 } from "fs";
 
 // src/cli/doctor/checks/system-binary.ts
 init_extract_semver();
-import { existsSync as existsSync39, accessSync as accessSync3, constants as constants6 } from "fs";
-import { homedir as homedir9 } from "os";
-import { join as join42 } from "path";
+import { existsSync as existsSync42, accessSync as accessSync4, constants as constants7 } from "fs";
+import { homedir as homedir11 } from "os";
+import { join as join47 } from "path";
 
 // src/cli/doctor/spawn-with-timeout.ts
 init_spawn_with_windows_hide();
@@ -84191,8 +85637,8 @@ async function spawnWithTimeout(command, options, timeoutMs = DEFAULT_SPAWN_TIME
     return { stdout: "", stderr: "", exitCode: 1, timedOut: false };
   }
   let timer;
-  const timeoutPromise = new Promise((resolve10) => {
-    timer = setTimeout(() => resolve10("timeout"), timeoutMs);
+  const timeoutPromise = new Promise((resolve12) => {
+    timer = setTimeout(() => resolve12("timeout"), timeoutMs);
   });
   const processPromise = (async () => {
     await proc.exited;
@@ -84212,31 +85658,31 @@ async function spawnWithTimeout(command, options, timeoutMs = DEFAULT_SPAWN_TIME
 
 // src/cli/doctor/checks/system-binary.ts
 var WINDOWS_EXECUTABLE_EXTS = [".exe", ".cmd", ".bat", ".ps1"];
-function isExecutable(path14) {
+function isExecutable2(path14) {
   try {
-    accessSync3(path14, constants6.X_OK);
+    accessSync4(path14, constants7.X_OK);
     return true;
   } catch {
     return false;
   }
 }
 function getDesktopAppPaths(platform) {
-  const home = homedir9();
+  const home = homedir11();
   switch (platform) {
     case "darwin":
       return [
         "/Applications/OpenCode.app/Contents/MacOS/OpenCode",
-        join42(home, "Applications", "OpenCode.app", "Contents", "MacOS", "OpenCode")
+        join47(home, "Applications", "OpenCode.app", "Contents", "MacOS", "OpenCode")
       ];
     case "win32": {
       const programFiles = process.env.ProgramFiles;
       const localAppData = process.env.LOCALAPPDATA;
       const paths = [];
       if (programFiles) {
-        paths.push(join42(programFiles, "OpenCode", "OpenCode.exe"));
+        paths.push(join47(programFiles, "OpenCode", "OpenCode.exe"));
       }
       if (localAppData) {
-        paths.push(join42(localAppData, "OpenCode", "OpenCode.exe"));
+        paths.push(join47(localAppData, "OpenCode", "OpenCode.exe"));
       }
       return paths;
     }
@@ -84244,8 +85690,8 @@ function getDesktopAppPaths(platform) {
       return [
         "/usr/bin/opencode",
         "/usr/lib/opencode/opencode",
-        join42(home, "Applications", "opencode-desktop-linux-x86_64.AppImage"),
-        join42(home, "Applications", "opencode-desktop-linux-aarch64.AppImage")
+        join47(home, "Applications", "opencode-desktop-linux-x86_64.AppImage"),
+        join47(home, "Applications", "opencode-desktop-linux-aarch64.AppImage")
       ];
     default:
       return [];
@@ -84257,7 +85703,7 @@ function buildVersionCommand(binaryPath, platform) {
   }
   return [binaryPath, "--version"];
 }
-function findDesktopBinary(platform = process.platform, checkExists = existsSync39) {
+function findDesktopBinary(platform = process.platform, checkExists = existsSync42) {
   for (const desktopPath of getDesktopAppPaths(platform)) {
     if (checkExists(desktopPath)) {
       return { binary: "opencode", path: desktopPath };
@@ -84265,7 +85711,7 @@ function findDesktopBinary(platform = process.platform, checkExists = existsSync
   }
   return null;
 }
-async function findOpenCodeBinary(platform = process.platform, checkExists = existsSync39) {
+async function findOpenCodeBinary(platform = process.platform, checkExists = existsSync42) {
   for (const binary2 of OPENCODE_BINARIES2) {
     const path14 = Bun.which(binary2);
     if (path14 && checkExists(path14)) {
@@ -84273,12 +85719,12 @@ async function findOpenCodeBinary(platform = process.platform, checkExists = exi
     }
   }
   const pathEnv = process.env.PATH ?? "";
-  const delimiter2 = platform === "win32" ? ";" : ":";
+  const delimiter3 = platform === "win32" ? ";" : ":";
   const candidates = getCommandCandidates2(platform);
-  for (const entry of pathEnv.split(delimiter2).filter(Boolean)) {
+  for (const entry of pathEnv.split(delimiter3).filter(Boolean)) {
     for (const command of candidates) {
-      const fullPath = join42(entry, command);
-      if (checkExists(fullPath) && isExecutable(fullPath)) {
+      const fullPath = join47(entry, command);
+      if (checkExists(fullPath) && isExecutable2(fullPath)) {
         return { binary: command, path: fullPath };
       }
     }
@@ -84320,12 +85766,12 @@ function compareVersions3(current, minimum) {
 
 // src/cli/doctor/checks/system-plugin.ts
 init_shared();
-import { existsSync as existsSync40, readFileSync as readFileSync29 } from "fs";
+import { existsSync as existsSync43, readFileSync as readFileSync29 } from "fs";
 function detectConfigPath() {
   const paths = getOpenCodeConfigPaths({ binary: "opencode", version: null });
-  if (existsSync40(paths.configJsonc))
+  if (existsSync43(paths.configJsonc))
     return paths.configJsonc;
-  if (existsSync40(paths.configJson))
+  if (existsSync43(paths.configJson))
     return paths.configJson;
   return null;
 }
@@ -84409,35 +85855,35 @@ function getPluginInfo() {
 init_file_utils2();
 init_checker();
 init_auto_update_checker();
-import { existsSync as existsSync41, readFileSync as readFileSync30 } from "fs";
+import { existsSync as existsSync44, readFileSync as readFileSync30 } from "fs";
 import { createRequire } from "module";
-import { homedir as homedir10 } from "os";
-import { join as join43 } from "path";
+import { homedir as homedir12 } from "os";
+import { join as join48 } from "path";
 init_shared();
 function getPlatformDefaultCacheDir(platform = process.platform) {
   if (platform === "darwin")
-    return join43(homedir10(), "Library", "Caches");
+    return join48(homedir12(), "Library", "Caches");
   if (platform === "win32")
-    return process.env.LOCALAPPDATA ?? join43(homedir10(), "AppData", "Local");
-  return join43(homedir10(), ".cache");
+    return process.env.LOCALAPPDATA ?? join48(homedir12(), "AppData", "Local");
+  return join48(homedir12(), ".cache");
 }
 function resolveOpenCodeCacheDir() {
   const xdgCacheHome = process.env.XDG_CACHE_HOME;
   if (xdgCacheHome)
-    return join43(xdgCacheHome, "opencode");
+    return join48(xdgCacheHome, "opencode");
   const fromShared = getOpenCodeCacheDir();
-  const platformDefault = join43(getPlatformDefaultCacheDir(), "opencode");
-  if (existsSync41(fromShared) || !existsSync41(platformDefault))
+  const platformDefault = join48(getPlatformDefaultCacheDir(), "opencode");
+  if (existsSync44(fromShared) || !existsSync44(platformDefault))
     return fromShared;
   return platformDefault;
 }
 function resolveExistingDir(dirPath) {
-  if (!existsSync41(dirPath))
+  if (!existsSync44(dirPath))
     return dirPath;
   return resolveSymlink(dirPath);
 }
 function readPackageJson(filePath) {
-  if (!existsSync41(filePath))
+  if (!existsSync44(filePath))
     return null;
   try {
     const content = readFileSync30(filePath, "utf-8");
@@ -84455,11 +85901,11 @@ function normalizeVersion(value) {
 function createPackageCandidates(rootDir) {
   return ACCEPTED_PACKAGE_NAMES.map((packageName) => ({
     packageName,
-    installedPackagePath: join43(rootDir, "node_modules", packageName, "package.json")
+    installedPackagePath: join48(rootDir, "node_modules", packageName, "package.json")
   }));
 }
 function selectInstalledPackage(candidate) {
-  return candidate.packageCandidates.find((packageCandidate) => existsSync41(packageCandidate.installedPackagePath)) ?? candidate.packageCandidates[0];
+  return candidate.packageCandidates.find((packageCandidate) => existsSync44(packageCandidate.installedPackagePath)) ?? candidate.packageCandidates[0];
 }
 function getExpectedVersion(cachePackage, packageName) {
   return normalizeVersion(cachePackage?.dependencies?.[packageName]) ?? normalizeVersion(cachePackage?.dependencies?.[PACKAGE_NAME]);
@@ -84470,7 +85916,7 @@ function resolveInstalledPackageJsonPath() {
     for (const packageName of ACCEPTED_PACKAGE_NAMES) {
       try {
         const packageJsonPath = require2.resolve(`${packageName}/package.json`);
-        if (existsSync41(packageJsonPath)) {
+        if (existsSync44(packageJsonPath)) {
           return { packageName, packageJsonPath };
         }
       } catch {
@@ -84489,20 +85935,20 @@ function getLoadedPluginVersion() {
   const candidates = [
     {
       cacheDir: configDir,
-      cachePackagePath: join43(configDir, "package.json"),
+      cachePackagePath: join48(configDir, "package.json"),
       packageCandidates: createPackageCandidates(configDir)
     },
     {
       cacheDir,
-      cachePackagePath: join43(cacheDir, "package.json"),
+      cachePackagePath: join48(cacheDir, "package.json"),
       packageCandidates: createPackageCandidates(cacheDir)
     }
   ];
-  const selectedCandidate = candidates.find((candidate) => candidate.packageCandidates.some((packageCandidate) => existsSync41(packageCandidate.installedPackagePath))) ?? candidates[0];
+  const selectedCandidate = candidates.find((candidate) => candidate.packageCandidates.some((packageCandidate) => existsSync44(packageCandidate.installedPackagePath))) ?? candidates[0];
   const { cacheDir: selectedDir, cachePackagePath } = selectedCandidate;
   const selectedPackage = selectInstalledPackage(selectedCandidate);
   const candidateInstalledPath = selectedPackage.installedPackagePath;
-  const candidateExists = existsSync41(candidateInstalledPath);
+  const candidateExists = existsSync44(candidateInstalledPath);
   const resolvedFallback = candidateExists ? null : resolveInstalledPackageJsonPath();
   const installedPackagePath = resolvedFallback?.packageJsonPath ?? candidateInstalledPath;
   const resolvedPackageName = resolvedFallback?.packageName ?? selectedPackage.packageName;
@@ -84541,7 +85987,7 @@ var defaultDeps5 = {
 function isConfigValid(configPath) {
   if (!configPath)
     return true;
-  if (!existsSync42(configPath))
+  if (!existsSync45(configPath))
     return false;
   try {
     parseJsonc(readFileSync31(configPath, "utf-8"));
@@ -84667,29 +86113,29 @@ async function checkSystem(deps = defaultDeps5) {
 
 // src/cli/doctor/checks/config.ts
 import { readFileSync as readFileSync34 } from "fs";
-import { join as join47 } from "path";
+import { join as join52 } from "path";
 init_shared();
 init_plugin_identity();
 
 // src/cli/doctor/checks/model-resolution-cache.ts
 init_shared();
-import { existsSync as existsSync43, readFileSync as readFileSync32 } from "fs";
-import { homedir as homedir11 } from "os";
-import { join as join44 } from "path";
+import { existsSync as existsSync46, readFileSync as readFileSync32 } from "fs";
+import { homedir as homedir13 } from "os";
+import { join as join49 } from "path";
 function getUserConfigDir2() {
   const xdgConfig = process.env.XDG_CONFIG_HOME;
   if (xdgConfig)
-    return join44(xdgConfig, "opencode");
-  return join44(homedir11(), ".config", "opencode");
+    return join49(xdgConfig, "opencode");
+  return join49(homedir13(), ".config", "opencode");
 }
 function loadCustomProviderNames() {
   const configDir = getUserConfigDir2();
   const candidatePaths = [
-    join44(configDir, "opencode.json"),
-    join44(configDir, "opencode.jsonc")
+    join49(configDir, "opencode.json"),
+    join49(configDir, "opencode.jsonc")
   ];
   for (const configPath of candidatePaths) {
-    if (!existsSync43(configPath))
+    if (!existsSync46(configPath))
       continue;
     try {
       const content = readFileSync32(configPath, "utf-8");
@@ -84702,9 +86148,9 @@ function loadCustomProviderNames() {
   return [];
 }
 function loadAvailableModelsFromCache() {
-  const cacheFile = join44(getOpenCodeCacheDir(), "models.json");
+  const cacheFile = join49(getOpenCodeCacheDir(), "models.json");
   const customProviders = loadCustomProviderNames();
-  if (!existsSync43(cacheFile)) {
+  if (!existsSync46(cacheFile)) {
     if (customProviders.length > 0) {
       return { providers: customProviders, modelCount: 0, cacheExists: true };
     }
@@ -84736,8 +86182,8 @@ init_model_capabilities2();
 init_shared();
 init_plugin_identity();
 import { readFileSync as readFileSync33 } from "fs";
-import { join as join45 } from "path";
-var PROJECT_CONFIG_DIR = join45(process.cwd(), ".opencode");
+import { join as join50 } from "path";
+var PROJECT_CONFIG_DIR = join50(process.cwd(), ".opencode");
 function loadOmoConfig() {
   const projectDetected = detectPluginConfigFile(PROJECT_CONFIG_DIR, {
     basenames: [CONFIG_BASENAME],
@@ -84769,7 +86215,7 @@ function loadOmoConfig() {
 
 // src/cli/doctor/checks/model-resolution-details.ts
 init_shared();
-import { join as join46 } from "path";
+import { join as join51 } from "path";
 
 // src/cli/doctor/checks/model-resolution-variant.ts
 function formatModelWithVariant(model, variant) {
@@ -84811,7 +86257,7 @@ function formatCapabilityResolutionLabel(mode) {
 }
 function buildModelResolutionDetails(options) {
   const details = [];
-  const cacheFile = join46(getOpenCodeCacheDir(), "models.json");
+  const cacheFile = join51(getOpenCodeCacheDir(), "models.json");
   details.push("\u2550\u2550\u2550 Available Models (from cache) \u2550\u2550\u2550");
   details.push("");
   if (options.available.cacheExists) {
@@ -84966,7 +86412,7 @@ async function checkModels() {
 }
 
 // src/cli/doctor/checks/config.ts
-var PROJECT_CONFIG_DIR2 = join47(process.cwd(), ".opencode");
+var PROJECT_CONFIG_DIR2 = join52(process.cwd(), ".opencode");
 function findConfigPath() {
   const projectConfig = detectPluginConfigFile(PROJECT_CONFIG_DIR2, {
     basenames: [CONFIG_BASENAME],
@@ -85092,27 +86538,27 @@ async function checkConfig() {
 }
 
 // src/cli/doctor/checks/dependencies.ts
-import { existsSync as existsSync44 } from "fs";
+import { existsSync as existsSync47 } from "fs";
 import { createRequire as createRequire2 } from "module";
-import { dirname as dirname20, join as join49 } from "path";
+import { dirname as dirname22, join as join54 } from "path";
 
 // src/hooks/comment-checker/downloader.ts
-import { join as join48 } from "path";
-import { homedir as homedir12, tmpdir as tmpdir3 } from "os";
+import { join as join53 } from "path";
+import { homedir as homedir14, tmpdir as tmpdir3 } from "os";
 init_binary_downloader();
 init_logger();
 init_plugin_identity();
 var DEBUG = process.env.COMMENT_CHECKER_DEBUG === "1";
-var DEBUG_FILE = join48(tmpdir3(), "comment-checker-debug.log");
+var DEBUG_FILE = join53(tmpdir3(), "comment-checker-debug.log");
 function getCacheDir2() {
   if (process.platform === "win32") {
     const localAppData = process.env.LOCALAPPDATA || process.env.APPDATA;
-    const base2 = localAppData || join48(homedir12(), "AppData", "Local");
-    return join48(base2, CACHE_DIR_NAME, "bin");
+    const base2 = localAppData || join53(homedir14(), "AppData", "Local");
+    return join53(base2, CACHE_DIR_NAME, "bin");
   }
   const xdgCache = process.env.XDG_CACHE_HOME;
-  const base = xdgCache || join48(homedir12(), ".cache");
-  return join48(base, CACHE_DIR_NAME, "bin");
+  const base = xdgCache || join53(homedir14(), ".cache");
+  return join53(base, CACHE_DIR_NAME, "bin");
 }
 function getBinaryName() {
   return process.platform === "win32" ? "comment-checker.exe" : "comment-checker";
@@ -85176,15 +86622,15 @@ async function checkAstGrepNapi() {
       path: null
     };
   } catch {
-    const { existsSync: existsSync45 } = await import("fs");
-    const { join: join50 } = await import("path");
-    const { homedir: homedir13 } = await import("os");
+    const { existsSync: existsSync48 } = await import("fs");
+    const { join: join55 } = await import("path");
+    const { homedir: homedir15 } = await import("os");
     const pathsToCheck = [
-      join50(homedir13(), ".config", "opencode", "node_modules", "@ast-grep", "napi"),
-      join50(process.cwd(), "node_modules", "@ast-grep", "napi")
+      join55(homedir15(), ".config", "opencode", "node_modules", "@ast-grep", "napi"),
+      join55(process.cwd(), "node_modules", "@ast-grep", "napi")
     ];
     for (const napiPath of pathsToCheck) {
-      if (existsSync45(napiPath)) {
+      if (existsSync48(napiPath)) {
         return {
           name: "AST-Grep NAPI",
           required: false,
@@ -85209,8 +86655,8 @@ function findCommentCheckerPackageBinary() {
   try {
     const require2 = createRequire2(import.meta.url);
     const pkgPath = require2.resolve("@code-yeongyu/comment-checker/package.json");
-    const binaryPath = join49(dirname20(pkgPath), "bin", binaryName);
-    if (existsSync44(binaryPath))
+    const binaryPath = join54(dirname22(pkgPath), "bin", binaryName);
+    if (existsSync47(binaryPath))
       return binaryPath;
   } catch {}
   return null;
@@ -85343,11 +86789,11 @@ async function getGhCliInfo() {
 
 // src/cli/doctor/checks/tools-lsp.ts
 import { readFileSync as readFileSync35 } from "fs";
-import { join as join51 } from "path";
+import { join as join55 } from "path";
 
 // src/mcp/lsp.ts
-import { existsSync as existsSync45 } from "fs";
-import { dirname as dirname21, resolve as resolve10 } from "path";
+import { existsSync as existsSync48 } from "fs";
+import { dirname as dirname23, resolve as resolve12 } from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 
 // src/mcp/cli-suffix.ts
@@ -85360,66 +86806,6 @@ function hasCliSuffix(candidatePath, suffix) {
 
 // src/mcp/runtime-executable.ts
 import { basename as basename8 } from "path";
-
-// src/shared/bun-which-shim.ts
-import { accessSync as accessSync4, constants as constants7 } from "fs";
-import { delimiter as delimiter2, join as join50 } from "path";
-var runtime3 = globalThis;
-var IS_BUN2 = typeof runtime3.Bun !== "undefined";
-function isUnsafeCommandName(commandName) {
-  if (commandName.includes("/") || commandName.includes("\\"))
-    return true;
-  if (commandName === "." || commandName === ".." || commandName.includes(".."))
-    return true;
-  if (/^[a-zA-Z]:/.test(commandName))
-    return true;
-  if (commandName.includes("\x00"))
-    return true;
-  return false;
-}
-function isExecutable2(filePath) {
-  try {
-    accessSync4(filePath, constants7.X_OK);
-    return true;
-  } catch {
-    return false;
-  }
-}
-function resolvePathValue() {
-  if (process.platform === "win32")
-    return process.env.Path ?? process.env.PATH;
-  return process.env.PATH;
-}
-function getWindowsCandidates(commandName) {
-  if (process.platform !== "win32")
-    return [commandName];
-  return [commandName, `${commandName}.exe`, `${commandName}.cmd`, `${commandName}.bat`, `${commandName}.com`];
-}
-function bunWhich(commandName) {
-  if (!commandName)
-    return null;
-  if (isUnsafeCommandName(commandName))
-    return null;
-  if (IS_BUN2)
-    return runtime3.Bun?.which(commandName) ?? null;
-  const pathValue = resolvePathValue();
-  if (!pathValue)
-    return null;
-  const pathEntries = pathValue.split(delimiter2).filter((pathEntry) => pathEntry.length > 0);
-  if (pathEntries.length === 0)
-    return null;
-  const candidateNames = getWindowsCandidates(commandName);
-  for (const pathEntry of pathEntries) {
-    for (const candidateName of candidateNames) {
-      const candidatePath = join50(pathEntry, candidateName);
-      if (isExecutable2(candidatePath))
-        return candidatePath;
-    }
-  }
-  return null;
-}
-
-// src/mcp/runtime-executable.ts
 var NODE_EXECUTABLE_NAMES = new Set(["node", "node.exe"]);
 function isUnsafeCommandName2(commandName) {
   if (commandName.length === 0)
@@ -85481,9 +86867,9 @@ var LSP_BOOTSTRAP_SCRIPT = [
   "finish(run(process.execPath, [dist, 'mcp'], 'inherit'))"
 ].join(";");
 function addAncestorCommandCandidates(startDirectory, target, seenPaths, pathExists, resolveExecutable) {
-  let currentDirectory = resolve10(startDirectory);
+  let currentDirectory = resolve12(startDirectory);
   while (true) {
-    const distCliPath = resolve10(currentDirectory, SUBMODULE_REL, DIST_CLI_REL);
+    const distCliPath = resolve12(currentDirectory, SUBMODULE_REL, DIST_CLI_REL);
     if (!seenPaths.has(distCliPath)) {
       const runtime4 = resolveJavaScriptRuntime(resolveExecutable);
       seenPaths.add(distCliPath);
@@ -85494,7 +86880,7 @@ function addAncestorCommandCandidates(startDirectory, target, seenPaths, pathExi
         exists: runtime4.available && pathExists(distCliPath)
       });
     }
-    const sourceCliPath = resolve10(currentDirectory, SUBMODULE_REL, SOURCE_CLI_REL);
+    const sourceCliPath = resolve12(currentDirectory, SUBMODULE_REL, SOURCE_CLI_REL);
     if (!seenPaths.has(sourceCliPath)) {
       const runtime4 = resolveExecutable("bun");
       seenPaths.add(sourceCliPath);
@@ -85505,7 +86891,7 @@ function addAncestorCommandCandidates(startDirectory, target, seenPaths, pathExi
         exists: runtime4.available && pathExists(sourceCliPath)
       });
     }
-    const parentDirectory = resolve10(currentDirectory, "..");
+    const parentDirectory = resolve12(currentDirectory, "..");
     if (parentDirectory === currentDirectory) {
       return;
     }
@@ -85514,13 +86900,13 @@ function addAncestorCommandCandidates(startDirectory, target, seenPaths, pathExi
 }
 function getModuleDirectory(moduleUrl) {
   try {
-    return dirname21(fileURLToPath3(moduleUrl));
+    return dirname23(fileURLToPath3(moduleUrl));
   } catch {
     return null;
   }
 }
 function findBootstrapRoot(candidates, pathExists) {
-  return candidates.find((candidate) => pathExists(resolve10(candidate.root, "package.json")))?.root ?? process.cwd();
+  return candidates.find((candidate) => pathExists(resolve12(candidate.root, "package.json")))?.root ?? process.cwd();
 }
 function resolveJavaScriptRuntime(resolveExecutable) {
   const node = resolveExecutable("node");
@@ -85534,12 +86920,12 @@ function createBootstrapCandidate(root, resolveExecutable) {
   return {
     command: [runtime4.command, "-e", LSP_BOOTSTRAP_SCRIPT, root, git.command, npm.command, bun.command],
     root,
-    path: resolve10(root, SUBMODULE_REL, DIST_CLI_REL),
+    path: resolve12(root, SUBMODULE_REL, DIST_CLI_REL),
     exists: runtime4.available && git.available && npm.available
   };
 }
 function resolveLspCommand(options = {}) {
-  const pathExists = options.exists ?? existsSync45;
+  const pathExists = options.exists ?? existsSync48;
   const resolveExecutable = options.resolveExecutable ?? resolveRuntimeExecutable;
   const candidates = [];
   const seenPaths = new Set;
@@ -85589,7 +86975,7 @@ function readOmoConfig(configDirectory) {
 }
 function isLspMcpDisabled(options) {
   const userConfigDirectory = options.configDirectory ?? getOpenCodeConfigDir({ binary: "opencode" });
-  const projectConfigDirectory = join51(options.cwd ?? process.cwd(), ".opencode");
+  const projectConfigDirectory = join55(options.cwd ?? process.cwd(), ".opencode");
   const userConfig = readOmoConfig(userConfigDirectory);
   const projectConfig = readOmoConfig(projectConfigDirectory);
   const disabledMcps = new Set([
@@ -85608,21 +86994,21 @@ function getInstalledLspServers(options = {}) {
 
 // src/cli/doctor/checks/tools-mcp.ts
 init_shared();
-import { existsSync as existsSync46, readFileSync as readFileSync36 } from "fs";
-import { homedir as homedir13 } from "os";
-import { join as join52 } from "path";
+import { existsSync as existsSync49, readFileSync as readFileSync36 } from "fs";
+import { homedir as homedir15 } from "os";
+import { join as join56 } from "path";
 var BUILTIN_MCP_SERVERS = ["websearch", "context7", "grep_app", "lsp", "ast_grep"];
 function getMcpConfigPaths() {
   return [
-    join52(homedir13(), ".claude", ".mcp.json"),
-    join52(process.cwd(), ".mcp.json"),
-    join52(process.cwd(), ".claude", ".mcp.json")
+    join56(homedir15(), ".claude", ".mcp.json"),
+    join56(process.cwd(), ".mcp.json"),
+    join56(process.cwd(), ".claude", ".mcp.json")
   ];
 }
 function loadUserMcpConfig() {
   const servers = {};
   for (const configPath of getMcpConfigPaths()) {
-    if (!existsSync46(configPath))
+    if (!existsSync49(configPath))
       continue;
     try {
       const content = readFileSync36(configPath, "utf-8");
@@ -85779,10 +87165,10 @@ async function probeBinary(cmd, args) {
 
 // src/features/team-mode/team-registry/paths.ts
 init_logger();
-import { homedir as homedir14 } from "os";
+import { homedir as homedir16 } from "os";
 import path14 from "path";
 function resolveBaseDir(config2) {
-  return config2.base_dir ?? path14.join(homedir14(), ".omo");
+  return config2.base_dir ?? path14.join(homedir16(), ".omo");
 }
 
 // src/cli/doctor/checks/team-mode.ts
@@ -85849,8 +87235,8 @@ async function pathExists(dir) {
 
 // src/cli/doctor/checks/tui-plugin-config.ts
 init_shared();
-import { existsSync as existsSync47, readFileSync as readFileSync38 } from "fs";
-import { join as join53 } from "path";
+import { existsSync as existsSync50, readFileSync as readFileSync38 } from "fs";
+import { join as join57 } from "path";
 var TUI_SUBPATH = "tui";
 function isOurFilePluginEntry(entry) {
   if (!entry.startsWith("file:"))
@@ -85859,8 +87245,8 @@ function isOurFilePluginEntry(entry) {
   if (path16.startsWith("//"))
     path16 = path16.slice(2);
   try {
-    const pkgJsonPath = join53(path16, "package.json");
-    if (!existsSync47(pkgJsonPath))
+    const pkgJsonPath = join57(path16, "package.json");
+    if (!existsSync50(pkgJsonPath))
       return false;
     const parsed = JSON.parse(readFileSync38(pkgJsonPath, "utf-8"));
     return typeof parsed.name === "string" && ACCEPTED_PACKAGE_NAMES.includes(parsed.name);
@@ -85890,7 +87276,7 @@ function isTuiPluginEntry(entry) {
 }
 function detectServerPluginRegistration() {
   const paths = getOpenCodeConfigPaths({ binary: "opencode", version: null });
-  const configPath = existsSync47(paths.configJsonc) ? paths.configJsonc : existsSync47(paths.configJson) ? paths.configJson : null;
+  const configPath = existsSync50(paths.configJsonc) ? paths.configJsonc : existsSync50(paths.configJson) ? paths.configJson : null;
   if (!configPath) {
     return { registered: false, configPath: null };
   }
@@ -85903,8 +87289,8 @@ function detectServerPluginRegistration() {
   }
 }
 function detectTuiPluginRegistration() {
-  const tuiJsonPath = join53(getOpenCodeConfigDir({ binary: "opencode" }), "tui.json");
-  if (!existsSync47(tuiJsonPath)) {
+  const tuiJsonPath = join57(getOpenCodeConfigDir({ binary: "opencode" }), "tui.json");
+  if (!existsSync50(tuiJsonPath)) {
     return { registered: false, configPath: tuiJsonPath, exists: false };
   }
   try {
@@ -86361,11 +87747,11 @@ async function refreshModelCapabilities(options, deps = {}) {
 
 // src/features/mcp-oauth/storage.ts
 init_shared();
-import { chmodSync as chmodSync2, existsSync as existsSync48, mkdirSync as mkdirSync13, readFileSync as readFileSync39, renameSync as renameSync6, unlinkSync as unlinkSync8, writeFileSync as writeFileSync10 } from "fs";
-import { dirname as dirname22, join as join54 } from "path";
+import { chmodSync as chmodSync2, existsSync as existsSync51, mkdirSync as mkdirSync13, readFileSync as readFileSync39, renameSync as renameSync6, unlinkSync as unlinkSync8, writeFileSync as writeFileSync10 } from "fs";
+import { dirname as dirname24, join as join58 } from "path";
 var STORAGE_FILE_NAME = "mcp-oauth.json";
 function getMcpOauthStoragePath() {
-  return join54(getOpenCodeConfigDir({ binary: "opencode" }), STORAGE_FILE_NAME);
+  return join58(getOpenCodeConfigDir({ binary: "opencode" }), STORAGE_FILE_NAME);
 }
 function normalizeHost2(serverHost) {
   let host = serverHost.trim();
@@ -86402,7 +87788,7 @@ function buildKey(serverHost, resource) {
 }
 function readStore() {
   const filePath = getMcpOauthStoragePath();
-  if (!existsSync48(filePath)) {
+  if (!existsSync51(filePath)) {
     return null;
   }
   try {
@@ -86415,8 +87801,8 @@ function readStore() {
 function writeStore(store2) {
   const filePath = getMcpOauthStoragePath();
   try {
-    const dir = dirname22(filePath);
-    if (!existsSync48(dir)) {
+    const dir = dirname24(filePath);
+    if (!existsSync51(dir)) {
       mkdirSync13(dir, { recursive: true });
     }
     const tempPath = `${filePath}.tmp.${Date.now()}`;
@@ -86453,7 +87839,7 @@ function deleteToken(serverHost, resource) {
   if (Object.keys(store2).length === 0) {
     try {
       const filePath = getMcpOauthStoragePath();
-      if (existsSync48(filePath)) {
+      if (existsSync51(filePath)) {
         unlinkSync8(filePath);
       }
       return true;
@@ -86622,7 +88008,7 @@ async function getOrRegisterClient(options) {
   }
 }
 function parseRegistrationResponse(data) {
-  if (!isRecord14(data))
+  if (!isRecord16(data))
     return null;
   const clientId = data.client_id;
   if (typeof clientId !== "string" || clientId.length === 0)
@@ -86633,7 +88019,7 @@ function parseRegistrationResponse(data) {
   }
   return { clientId };
 }
-function isRecord14(value) {
+function isRecord16(value) {
   return typeof value === "object" && value !== null;
 }
 
@@ -86647,13 +88033,13 @@ async function findAvailablePort2(startPort = DEFAULT_PORT) {
 
 // src/features/mcp-oauth/oauth-authorization-flow.ts
 import { spawn as spawn2 } from "child_process";
-import { createHash as createHash4, randomBytes as randomBytes2 } from "crypto";
+import { createHash as createHash5, randomBytes as randomBytes2 } from "crypto";
 import { createServer as createServer2 } from "http";
 function generateCodeVerifier() {
   return randomBytes2(32).toString("base64url");
 }
 function generateCodeChallenge(verifier) {
-  return createHash4("sha256").update(verifier).digest("base64url");
+  return createHash5("sha256").update(verifier).digest("base64url");
 }
 function buildAuthorizationUrl(authorizationEndpoint, options) {
   const url2 = new URL(authorizationEndpoint);
@@ -86673,7 +88059,7 @@ function buildAuthorizationUrl(authorizationEndpoint, options) {
 }
 var CALLBACK_TIMEOUT_MS = 5 * 60 * 1000;
 function startCallbackServer(port) {
-  return new Promise((resolve11, reject) => {
+  return new Promise((resolve13, reject) => {
     let timeoutId;
     const server2 = createServer2((request, response) => {
       clearTimeout(timeoutId);
@@ -86699,7 +88085,7 @@ function startCallbackServer(port) {
       response.writeHead(200, { "content-type": "text/html" });
       response.end("<html><body><h1>Authorization successful. You can close this tab.</h1></body></html>");
       server2.close();
-      resolve11({ code, state: state2 });
+      resolve13({ code, state: state2 });
     });
     timeoutId = setTimeout(() => {
       server2.close();
@@ -87033,7 +88419,7 @@ function createMcpOAuthCommand() {
 }
 
 // src/cli/boulder/boulder.ts
-import { existsSync as existsSync49 } from "fs";
+import { existsSync as existsSync52 } from "fs";
 
 // src/cli/boulder/formatter.ts
 var import_picocolors20 = __toESM(require_picocolors(), 1);
@@ -87170,10 +88556,10 @@ async function boulder(options) {
   const boulderFilePath = getBoulderFilePath(directory);
   const state2 = readBoulderState(directory);
   if (!state2) {
-    const message = existsSync49(boulderFilePath) ? formatReadErrorMessage(options.json) : formatNoBoulderMessage(options.json);
+    const message = existsSync52(boulderFilePath) ? formatReadErrorMessage(options.json) : formatNoBoulderMessage(options.json);
     process.stderr.write(`${message}
 `);
-    return existsSync49(boulderFilePath) ? 2 : 1;
+    return existsSync52(boulderFilePath) ? 2 : 1;
   }
   const works = getBoulderWorks(state2);
   const filteredWorks = options.workId ? works.filter((work) => work.work_id === options.workId) : works;
@@ -87193,7 +88579,7 @@ async function boulder(options) {
 var VERSION2 = package_default.version;
 var program2 = new Command;
 function resolveInstallArgs(options, invocationName = process.env.OMO_INVOCATION_NAME) {
-  const defaultPlatform = invocationName === "lazycodex" ? "codex" : undefined;
+  const defaultPlatform = invocationName === "lazycodex" || invocationName === "lazycodex-ai" ? "codex" : undefined;
   return {
     tui: options.tui !== false,
     claude: options.claude,
@@ -87214,7 +88600,7 @@ program2.name("oh-my-opencode").description("The ultimate OpenCode plugin - mult
 program2.command("install").alias("setup").description("Install and configure oh-my-opencode with interactive setup").option("--no-tui", "Run in non-interactive mode (requires all options)").option("--claude <value>", "Claude subscription: no, yes, max20").option("--openai <value>", "OpenAI/ChatGPT subscription: no, yes (default: no)").option("--gemini <value>", "Gemini integration: no, yes").option("--copilot <value>", "GitHub Copilot subscription: no, yes").addOption(new Option("--platform <platform>", "Install target platform: opencode, codex, both").choices(["opencode", "codex", "both"])).option("--opencode-zen <value>", "OpenCode Zen access: no, yes (default: no)").option("--zai-coding-plan <value>", "Z.ai Coding Plan subscription: no, yes (default: no)").option("--kimi-for-coding <value>", "Kimi For Coding subscription: no, yes (default: no)").option("--opencode-go <value>", "OpenCode Go subscription: no, yes (default: no)").option("--vercel-ai-gateway <value>", "Vercel AI Gateway: no, yes (default: no)").option("--codex-autonomous", "Configure Codex with approval never, full filesystem access, and network enabled").option("--no-codex-autonomous", "Leave existing Codex permission settings unchanged").option("--skip-auth", "Skip authentication setup hints").addHelpText("after", `
 Examples:
   $ bunx oh-my-opencode install
-  $ bunx lazycodex install --no-tui
+  $ npx lazycodex-ai install --no-tui
   $ bunx oh-my-opencode install --no-tui --platform=both --claude=max20 --openai=yes --gemini=yes --copilot=no
   $ omo install --platform=codex --codex-autonomous
   $ bunx oh-my-opencode install --no-tui --claude=no --gemini=no --copilot=yes --opencode-zen=yes
@@ -87234,6 +88620,7 @@ Model Providers (Priority: Native > Copilot > OpenCode Zen > Z.ai > Kimi > Verce
   const exitCode = await install(args);
   process.exit(exitCode);
 });
+configureCleanupCommand(program2);
 program2.command("run <message>").allowUnknownOption().passThroughOptions().description("Run opencode with todo/background task completion enforcement").option("-a, --agent <name>", "Agent to use (default: from CLI/env/config, fallback: Sisyphus)").option("-m, --model <provider/model>", "Model override (e.g., anthropic/claude-sonnet-4)").option("-d, --directory <path>", "Working directory").option("-p, --port <port>", "Server port (attaches if port already in use)", parseInt).option("--attach <url>", "Attach to existing opencode server URL").option("--on-complete <command>", "Shell command to run after completion").option("--json", "Output structured JSON result to stdout").option("--no-timestamp", "Disable timestamp prefix in run output").option("--verbose", "Show full event stream (default: messages/tools only)").option("--session-id <id>", "Resume existing session instead of creating new one").addHelpText("after", `
 Examples:
   $ bunx oh-my-opencode run "Fix the bug in index.ts"