oh-my-opencode 4.18.2 → 4.19.1

package/dist/cli-node/index.js

@@ -2146,7 +2146,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "oh-my-opencode",
-    version: "4.18.2",
+    version: "4.19.1",
     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",
@@ -2256,7 +2256,7 @@ var init_package = __esm(() => {
       "install:codex-dev": "bun run script/build-codex-install.ts && bun run script/install-codex-dev.ts",
       "build:codex-plugin": "npm --prefix packages/omo-codex/plugin ci && bun run --cwd packages/omo-codex/plugin build",
       "build:senpi-plugin": "bun run build:lsp-daemon && bun run build:senpi-plugin:stage",
-      "build:senpi-plugin:stage": "node packages/omo-senpi/plugin/scripts/stage-lsp-daemon-runtime.mjs && node packages/omo-senpi/plugin/scripts/build-extension.mjs && node packages/omo-senpi/plugin/scripts/sync-skills.mjs && node packages/omo-senpi/plugin/scripts/embed-directive.mjs --check && node packages/omo-senpi/plugin/scripts/build-install.mjs",
+      "build:senpi-plugin:stage": "bun run build:materialize-frontend && node packages/omo-senpi/plugin/scripts/stage-lsp-daemon-runtime.mjs && node packages/omo-senpi/plugin/scripts/build-extension.mjs && node packages/omo-senpi/plugin/scripts/sync-skills.mjs && node packages/omo-senpi/plugin/scripts/embed-directive.mjs --check && node packages/omo-senpi/plugin/scripts/build-install.mjs",
       "build:materialize-frontend": "node packages/omo-codex/plugin/scripts/materialize-shared-upstreams.mjs --strict",
       "build:shared-skills-assets": "bun run build:materialize-frontend && rm -rf dist/skills && cp -R packages/shared-skills/skills dist/skills",
       "build:lsp-tools-mcp": "npm --prefix packages/lsp-tools-mcp ci && npm --prefix packages/lsp-tools-mcp run build",
@@ -2358,18 +2358,18 @@ var init_package = __esm(() => {
       typescript: "^6.0.3"
     },
     optionalDependencies: {
-      "oh-my-opencode-darwin-arm64": "4.18.2",
-      "oh-my-opencode-darwin-x64": "4.18.2",
-      "oh-my-opencode-darwin-x64-baseline": "4.18.2",
-      "oh-my-opencode-linux-arm64": "4.18.2",
-      "oh-my-opencode-linux-arm64-musl": "4.18.2",
-      "oh-my-opencode-linux-x64": "4.18.2",
-      "oh-my-opencode-linux-x64-baseline": "4.18.2",
-      "oh-my-opencode-linux-x64-musl": "4.18.2",
-      "oh-my-opencode-linux-x64-musl-baseline": "4.18.2",
-      "oh-my-opencode-windows-arm64": "4.18.2",
-      "oh-my-opencode-windows-x64": "4.18.2",
-      "oh-my-opencode-windows-x64-baseline": "4.18.2"
+      "oh-my-opencode-darwin-arm64": "4.19.1",
+      "oh-my-opencode-darwin-x64": "4.19.1",
+      "oh-my-opencode-darwin-x64-baseline": "4.19.1",
+      "oh-my-opencode-linux-arm64": "4.19.1",
+      "oh-my-opencode-linux-arm64-musl": "4.19.1",
+      "oh-my-opencode-linux-x64": "4.19.1",
+      "oh-my-opencode-linux-x64-baseline": "4.19.1",
+      "oh-my-opencode-linux-x64-musl": "4.19.1",
+      "oh-my-opencode-linux-x64-musl-baseline": "4.19.1",
+      "oh-my-opencode-windows-arm64": "4.19.1",
+      "oh-my-opencode-windows-x64": "4.19.1",
+      "oh-my-opencode-windows-x64-baseline": "4.19.1"
     },
     overrides: {
       "@earendil-works/pi-agent-core": "0.80.3",
@@ -7427,6 +7427,7 @@ var init_env = __esm(() => {
   SAFE_CODEGRAPH_RUNTIME_ENV_KEYS = new Set([
     "CODEGRAPH_ALLOW_UNSAFE_NODE",
     "CODEGRAPH_BIN",
+    "CODEGRAPH_DAEMON_IDLE_TIMEOUT_MS",
     "CODEGRAPH_FAKE_LOG",
     "CODEGRAPH_NO_DAEMON",
     "CODEGRAPH_NODE_BIN",
@@ -7442,6 +7443,9 @@ var init_workspace = () => {};
 // packages/utils/src/codegraph/guidance.ts
 var init_guidance = () => {};
 
+// packages/utils/src/codegraph/manifest.ts
+var init_manifest = () => {};
+
 // packages/utils/src/codegraph/node-support.ts
 function evaluateCodegraphNodeSupport(options = {}) {
   const nodeVersion = options.nodeVersion ?? process.versions.node;
@@ -7570,6 +7574,7 @@ var init_resolve2 = __esm(() => {
 var init_codegraph = __esm(() => {
   init_env();
   init_guidance();
+  init_manifest();
   init_provision();
   init_process_sweep();
   init_resolve2();
@@ -7748,7 +7753,7 @@ function migrateModelVersions(configs, appliedMigrations) {
 var MODEL_VERSION_MAP, CURRENT_USER_SELECTABLE_MODELS;
 var init_model_versions = __esm(() => {
   MODEL_VERSION_MAP = {
-    "anthropic/claude-opus-4-4": "anthropic/claude-opus-4-7"
+    "anthropic/claude-opus-4-4": "anthropic/claude-opus-4-8"
   };
   CURRENT_USER_SELECTABLE_MODELS = new Set([
     "anthropic/claude-opus-4-5",
@@ -9196,25 +9201,25 @@ var init_agent_model_requirements = __esm(() => {
       fallbackChain: [
         {
           providers: ["anthropic", "github-copilot", "opencode", "vercel"],
-          model: "claude-opus-4-7",
+          model: "claude-opus-4-8",
           variant: "max"
         },
-        { providers: ["opencode-go", "vercel"], model: "kimi-k2.6" },
-        { providers: ["kimi-for-coding"], model: "k2p5" },
         {
           providers: [
+            "opencode-go",
+            "kimi-for-coding",
+            "moonshotai",
             "opencode",
+            "vercel",
             "bailian-coding-plan",
-            "moonshotai",
             "moonshotai-cn",
             "firmware",
             "ollama-cloud",
-            "aihubmix",
-            "vercel"
+            "aihubmix"
           ],
-          model: "kimi-k2.5"
+          model: "kimi-k3"
         },
-        { providers: ["openai", "github-copilot", "opencode", "vercel"], model: "gpt-5.5", variant: "medium" },
+        { providers: ["openai", "github-copilot", "opencode", "vercel"], model: "gpt-5.6-sol", variant: "medium" },
         { providers: ["zai-coding-plan", "opencode", "bailian-coding-plan", "vercel"], model: "glm-5" },
         { providers: ["opencode"], model: "big-pickle" }
       ],
@@ -9223,13 +9228,8 @@ var init_agent_model_requirements = __esm(() => {
     hephaestus: {
       fallbackChain: [
         {
-          providers: ["openai", "github-copilot", "vercel"],
+          providers: ["openai", "github-copilot", "vercel", "opencode"],
           model: "gpt-5.6-sol",
-          variant: "high"
-        },
-        {
-          providers: ["openai", "github-copilot", "opencode", "vercel"],
-          model: "gpt-5.5",
           variant: "medium"
         }
       ],
@@ -9239,8 +9239,13 @@ var init_agent_model_requirements = __esm(() => {
     oracle: {
       fallbackChain: [
         {
-          providers: ["openai", "github-copilot", "opencode", "vercel"],
-          model: "gpt-5.5",
+          providers: ["openai", "opencode", "vercel"],
+          model: "gpt-5.6-sol",
+          variant: "xhigh"
+        },
+        {
+          providers: ["github-copilot"],
+          model: "gpt-5.6-sol",
           variant: "high"
         },
         {
@@ -9250,7 +9255,7 @@ var init_agent_model_requirements = __esm(() => {
         },
         {
           providers: ["anthropic", "github-copilot", "opencode", "vercel"],
-          model: "claude-opus-4-7",
+          model: "claude-opus-4-8",
           variant: "max"
         },
         { providers: ["opencode-go", "vercel"], model: "glm-5.2" }
@@ -9282,8 +9287,8 @@ var init_agent_model_requirements = __esm(() => {
     },
     "multimodal-looker": {
       fallbackChain: [
-        { providers: ["openai", "opencode", "vercel"], model: "gpt-5.5", variant: "medium" },
-        { providers: ["opencode-go", "vercel"], model: "kimi-k2.6" },
+        { providers: ["openai", "opencode", "vercel"], model: "gpt-5.6-sol", variant: "low" },
+        { providers: ["opencode-go", "vercel"], model: "kimi-k3" },
         { providers: ["zai-coding-plan", "vercel"], model: "glm-4.6v" },
         { providers: ["openai", "github-copilot", "opencode", "vercel"], model: "gpt-5-nano" }
       ]
@@ -9292,12 +9297,12 @@ var init_agent_model_requirements = __esm(() => {
       fallbackChain: [
         {
           providers: ["anthropic", "github-copilot", "opencode", "vercel"],
-          model: "claude-opus-4-7",
+          model: "claude-opus-4-8",
           variant: "max"
         },
         {
           providers: ["openai", "github-copilot", "opencode", "vercel"],
-          model: "gpt-5.5",
+          model: "gpt-5.6-sol",
           variant: "high"
         },
         { providers: ["opencode-go", "vercel"], model: "glm-5.2" },
@@ -9315,38 +9320,43 @@ var init_agent_model_requirements = __esm(() => {
         },
         {
           providers: ["anthropic", "github-copilot", "opencode", "vercel"],
-          model: "claude-opus-4-7",
+          model: "claude-opus-4-8",
           variant: "max"
         },
         {
           providers: ["openai", "github-copilot", "opencode", "vercel"],
-          model: "gpt-5.5",
-          variant: "high"
+          model: "gpt-5.6-sol",
+          variant: "medium"
         },
         { providers: ["opencode-go", "vercel"], model: "glm-5.2" },
-        { providers: ["kimi-for-coding"], model: "k2p5" }
+        { providers: ["kimi-for-coding"], model: "kimi-k3" }
       ]
     },
     momus: {
       fallbackChain: [
         {
           providers: ["openai", "vercel"],
-          model: "gpt-5.6-sol",
-          variant: "xhigh"
+          model: "gpt-5.6-terra",
+          variant: "high"
         },
         {
           providers: ["github-copilot"],
-          model: "gpt-5.6-sol",
+          model: "gpt-5.6-terra",
           variant: "high"
         },
         {
-          providers: ["openai", "github-copilot", "opencode", "vercel"],
-          model: "gpt-5.5",
+          providers: ["openai", "opencode", "vercel"],
+          model: "gpt-5.6-sol",
           variant: "xhigh"
         },
+        {
+          providers: ["github-copilot"],
+          model: "gpt-5.6-sol",
+          variant: "high"
+        },
         {
           providers: ["anthropic", "github-copilot", "opencode", "vercel"],
-          model: "claude-opus-4-7",
+          model: "claude-opus-4-8",
           variant: "max"
         },
         {
@@ -9360,10 +9370,10 @@ var init_agent_model_requirements = __esm(() => {
     atlas: {
       fallbackChain: [
         { providers: ["anthropic", "github-copilot", "opencode", "vercel"], model: "claude-sonnet-4-6" },
-        { providers: ["opencode-go", "vercel"], model: "kimi-k2.6" },
+        { providers: ["opencode-go", "vercel"], model: "kimi-k3" },
         {
           providers: ["openai", "github-copilot", "opencode", "vercel"],
-          model: "gpt-5.5",
+          model: "gpt-5.6-sol",
           variant: "medium"
         },
         { providers: ["opencode-go", "vercel"], model: "minimax-m3" },
@@ -9374,10 +9384,10 @@ var init_agent_model_requirements = __esm(() => {
     "sisyphus-junior": {
       fallbackChain: [
         { providers: ["anthropic", "github-copilot", "opencode", "vercel"], model: "claude-sonnet-4-6" },
-        { providers: ["opencode-go", "vercel"], model: "kimi-k2.6" },
+        { providers: ["opencode-go", "vercel"], model: "kimi-k3" },
         {
           providers: ["openai", "github-copilot", "opencode", "vercel"],
-          model: "gpt-5.5",
+          model: "gpt-5.6-sol",
           variant: "medium"
         },
         { providers: ["opencode-go", "vercel"], model: "minimax-m3" },
@@ -9403,11 +9413,11 @@ var init_category_model_requirements = __esm(() => {
         { providers: ["zai-coding-plan", "opencode", "bailian-coding-plan", "vercel"], model: "glm-5" },
         {
           providers: ["anthropic", "github-copilot", "opencode", "vercel"],
-          model: "claude-opus-4-7",
+          model: "claude-opus-4-8",
           variant: "max"
         },
         { providers: ["opencode-go", "vercel"], model: "glm-5.2" },
-        { providers: ["kimi-for-coding"], model: "k2p5" }
+        { providers: ["kimi-for-coding"], model: "kimi-k3" }
       ]
     },
     ultrabrain: {
@@ -9424,7 +9434,7 @@ var init_category_model_requirements = __esm(() => {
         },
         {
           providers: ["openai", "opencode", "vercel"],
-          model: "gpt-5.5",
+          model: "gpt-5.6-sol",
           variant: "xhigh"
         },
         {
@@ -9434,7 +9444,7 @@ var init_category_model_requirements = __esm(() => {
         },
         {
           providers: ["anthropic", "github-copilot", "opencode", "vercel"],
-          model: "claude-opus-4-7",
+          model: "claude-opus-4-8",
           variant: "max"
         },
         { providers: ["opencode-go", "vercel"], model: "glm-5.2" }
@@ -9459,12 +9469,12 @@ var init_category_model_requirements = __esm(() => {
         },
         {
           providers: ["openai", "github-copilot", "opencode", "vercel"],
-          model: "gpt-5.5",
+          model: "gpt-5.6-sol",
           variant: "medium"
         },
         {
           providers: ["anthropic", "github-copilot", "opencode", "vercel"],
-          model: "claude-opus-4-7",
+          model: "claude-opus-4-8",
           variant: "max"
         },
         {
@@ -9472,7 +9482,7 @@ var init_category_model_requirements = __esm(() => {
           model: "gemini-3.1-pro",
           variant: "high"
         },
-        { providers: ["opencode-go", "vercel"], model: "kimi-k2.6" },
+        { providers: ["opencode-go", "vercel"], model: "kimi-k3" },
         { providers: ["opencode-go", "vercel"], model: "glm-5.2" }
       ]
     },
@@ -9485,11 +9495,11 @@ var init_category_model_requirements = __esm(() => {
         },
         {
           providers: ["anthropic", "github-copilot", "opencode", "vercel"],
-          model: "claude-opus-4-7",
+          model: "claude-opus-4-8",
           variant: "max"
         },
-        { providers: ["openai", "github-copilot", "opencode", "vercel"], model: "gpt-5.5" },
-        { providers: ["opencode-go", "vercel"], model: "kimi-k2.6" },
+        { providers: ["openai", "github-copilot", "opencode", "vercel"], model: "gpt-5.6-sol", variant: "high" },
+        { providers: ["opencode-go", "vercel"], model: "kimi-k3" },
         { providers: ["opencode-go", "vercel"], model: "glm-5.2" }
       ]
     },
@@ -9531,10 +9541,10 @@ var init_category_model_requirements = __esm(() => {
         },
         {
           providers: ["openai", "opencode", "vercel"],
-          model: "gpt-5.5",
+          model: "gpt-5.6-sol",
           variant: "medium"
         },
-        { providers: ["opencode-go", "vercel"], model: "kimi-k2.6" },
+        { providers: ["opencode-go", "vercel"], model: "kimi-k3" },
         {
           providers: ["google", "github-copilot", "opencode", "vercel"],
           model: "gemini-3-flash"
@@ -9548,30 +9558,29 @@ var init_category_model_requirements = __esm(() => {
       fallbackChain: [
         {
           providers: ["anthropic", "github-copilot", "opencode", "vercel"],
-          model: "claude-opus-4-7",
+          model: "claude-opus-4-8",
           variant: "max"
         },
         {
           providers: ["openai", "github-copilot", "opencode", "vercel"],
-          model: "gpt-5.5",
+          model: "gpt-5.6-sol",
           variant: "high"
         },
         { providers: ["zai-coding-plan", "opencode", "bailian-coding-plan", "vercel"], model: "glm-5" },
-        { providers: ["kimi-for-coding"], model: "k2p5" },
+        { providers: ["kimi-for-coding"], model: "kimi-k3" },
         { providers: ["opencode-go", "vercel"], model: "glm-5.2" },
-        { providers: ["opencode", "bailian-coding-plan", "vercel"], model: "kimi-k2.5" },
         {
           providers: [
             "opencode",
             "bailian-coding-plan",
+            "vercel",
             "moonshotai",
             "moonshotai-cn",
             "firmware",
             "ollama-cloud",
-            "aihubmix",
-            "vercel"
+            "aihubmix"
           ],
-          model: "kimi-k2.5"
+          model: "kimi-k3"
         }
       ]
     },
@@ -9581,7 +9590,7 @@ var init_category_model_requirements = __esm(() => {
           providers: ["google", "github-copilot", "opencode", "vercel"],
           model: "gemini-3-flash"
         },
-        { providers: ["opencode-go", "vercel"], model: "kimi-k2.6" },
+        { providers: ["opencode-go", "vercel"], model: "kimi-k3" },
         {
           providers: ["anthropic", "github-copilot", "opencode", "vercel"],
           model: "claude-sonnet-4-6"
@@ -10006,7 +10015,7 @@ var CLAUDE_VERSION_DOT, GEMINI_31_PRO_PREVIEW, GEMINI_3_FLASH_PREVIEW;
 var init_provider_model_id_transform = __esm(() => {
   CLAUDE_VERSION_DOT = /claude-(\w+)-(\d+)-(\d+)/g;
   GEMINI_31_PRO_PREVIEW = /gemini-3\.1-pro(?!-)/g;
-  GEMINI_3_FLASH_PREVIEW = /gemini-3-flash(?!-)/g;
+  GEMINI_3_FLASH_PREVIEW = /(?<!antigravity-)gemini-3-flash(?!-)/g;
 });
 
 // packages/model-core/src/known-variants.ts
@@ -10099,6 +10108,21 @@ var init_runtime_fallback_model = () => {};
 var SUPPLEMENTAL_MODEL_CAPABILITIES;
 var init_supplemental_entries = __esm(() => {
   SUPPLEMENTAL_MODEL_CAPABILITIES = {
+    "kimi-k3": {
+      id: "kimi-k3",
+      family: "kimi",
+      reasoning: true,
+      temperature: true,
+      toolCall: true,
+      modalities: {
+        input: ["text", "image", "video"],
+        output: ["text"]
+      },
+      limit: {
+        context: 262144,
+        output: 262144
+      }
+    },
     "kimi-k2.6": {
       id: "kimi-k2.6",
       family: "kimi",
@@ -10786,7 +10810,7 @@ var init_anthropic_categories = __esm(() => {
   ANTHROPIC_CATEGORIES = [
     {
       name: "unspecified-high",
-      config: { model: "anthropic/claude-opus-4-7", variant: "max" },
+      config: { model: "anthropic/claude-opus-4-8", variant: "max" },
       description: "Tasks that don't fit other categories, high effort required",
       promptAppend: UNSPECIFIED_HIGH_CATEGORY_PROMPT_APPEND
     }
@@ -10944,7 +10968,7 @@ var init_kimi_categories = __esm(() => {
   KIMI_CATEGORIES = [
     {
       name: "writing",
-      config: { model: "kimi-for-coding/k2p5" },
+      config: { model: "kimi-for-coding/kimi-k3" },
       description: "Documentation, prose, technical writing",
       promptAppend: WRITING_CATEGORY_PROMPT_APPEND
     }
@@ -65173,7 +65197,7 @@ var init_claude_model_mapper = __esm(() => {
   init_model_normalization2();
   CLAUDE_CODE_ALIAS_MAP = new Map([
     ["sonnet", `${ANTHROPIC_PREFIX}claude-sonnet-4-6`],
-    ["opus", `${ANTHROPIC_PREFIX}claude-opus-4-7`],
+    ["opus", `${ANTHROPIC_PREFIX}claude-opus-4-8`],
     ["haiku", `${ANTHROPIC_PREFIX}claude-haiku-4-5`]
   ]);
 });
@@ -65980,10 +66004,10 @@ var init_openai_only_model_catalog = __esm(() => {
     librarian: { model: "openai/gpt-5.4-mini-fast" }
   };
   OPENAI_ONLY_CATEGORY_OVERRIDES = {
-    artistry: { model: "openai/gpt-5.5", variant: "xhigh" },
+    artistry: { model: "openai/gpt-5.6-sol", variant: "xhigh" },
     quick: { model: "openai/gpt-5.4-mini" },
-    "visual-engineering": { model: "openai/gpt-5.5", variant: "high" },
-    writing: { model: "openai/gpt-5.5", variant: "medium" }
+    "visual-engineering": { model: "openai/gpt-5.6-sol", variant: "high" },
+    writing: { model: "openai/gpt-5.6-sol", variant: "medium" }
   };
 });
 
@@ -72697,7 +72721,7 @@ var package_default2;
 var init_package2 = __esm(() => {
   package_default2 = {
     name: "@oh-my-opencode/omo-codex",
-    version: "4.18.2",
+    version: "4.19.1",
     type: "module",
     private: true,
     description: "Codex harness adapter for oh-my-openagent. Vendored Codex plugin namespace (omo) + TypeScript installer + telemetry.",
@@ -75085,6 +75109,7 @@ async function rewriteCachedPackageLocalFileDependencies(pluginRoot, sourceRoot)
   const packageJsonPaths = [];
   await collectPackageJsonPaths(pluginRoot, pluginRoot, packageJsonPaths);
   const packageLock = await readPackageLock(pluginRoot);
+  let rewroteAnyPackageJson = false;
   for (const packageJsonPath of packageJsonPaths) {
     const raw = await readFile5(packageJsonPath, "utf8");
     const parsed = JSON.parse(raw);
@@ -75120,13 +75145,16 @@ async function rewriteCachedPackageLocalFileDependencies(pluginRoot, sourceRoot)
         changed = true;
       }
     }
-    if (changed)
+    if (changed) {
       await writeFile2(packageJsonPath, `${JSON.stringify(parsed, null, "\t")}
 `);
+      rewroteAnyPackageJson = true;
+    }
   }
   if (packageLock.changed)
     await writeFile2(packageLock.path, `${JSON.stringify(packageLock.value, null, "\t")}
 `);
+  return rewroteAnyPackageJson;
 }
 async function readPackageLock(pluginRoot) {
   const path7 = join30(pluginRoot, "package-lock.json");
@@ -75432,10 +75460,11 @@ async function installCachedPlugin(input) {
   await rm4(tempPath, { recursive: true, force: true });
   try {
     await copyDirectory(input.sourcePath, tempPath);
-    await rewriteCachedPackageLocalFileDependencies(tempPath, input.sourcePath);
+    const rewroteLocalFileDependencies = await rewriteCachedPackageLocalFileDependencies(tempPath, input.sourcePath);
     await copyBundledMcpRuntimeDists({ pluginRoot: tempPath, sourceRoot: input.sourcePath });
     await copyRootRuntimeDists({ pluginRoot: tempPath, sourcePath: input.sourcePath });
-    await maybeRunNpmInstall(tempPath, input.runCommand, npmInstallEnv, ["ci", "--omit=dev"]);
+    const installArgs = rewroteLocalFileDependencies ? ["install", "--omit=dev", "--no-audit", "--no-fund"] : ["ci", "--omit=dev"];
+    await maybeRunNpmInstall(tempPath, input.runCommand, npmInstallEnv, installArgs);
     await removeCachedManagedNpmBinShims(tempPath);
     if (input.buildSource === false)
       await maybeRunNpmSyncSkills(tempPath, input.runCommand, env2);
@@ -75739,9 +75768,16 @@ function findTomlSection(config, header) {
   const lines = config.match(/[^\n]*\n?|$/g) ?? [];
   let offset = 0;
   let start = -1;
+  let multilineQuote = null;
   for (const line of lines) {
     if (line.length === 0)
       break;
+    const multilineScan = scanTomlMultilineLine(line, multilineQuote);
+    multilineQuote = multilineScan.nextQuote;
+    if (multilineScan.wasInside) {
+      offset += line.length;
+      continue;
+    }
     const trimmed = line.trim();
     if (start === -1) {
       if (tomlTableHeaderMatches(trimmed, headerLine, targetHeaderPath))
@@ -75756,8 +75792,37 @@ function findTomlSection(config, header) {
   return { start, end: config.length, text: config.slice(start) };
 }
 function replaceOrInsertSetting(config, section, key, value) {
-  const linePattern = new RegExp(`^[ \\t]*${escapeRegExp(key)}[ \\t]*=.*$`, "m");
-  const replacement = linePattern.test(section.text) ? section.text.replace(linePattern, `${key} = ${value}`) : insertSetting(section.text, key, value);
+  const targetPath = parseTomlDottedKey(key);
+  if (!targetPath)
+    return config;
+  const lines = section.text.match(/[^\n]*\n?|$/g) ?? [];
+  let offset = 0;
+  let multilineQuote = null;
+  for (const line of lines) {
+    if (line.length === 0)
+      break;
+    const multilineScan = scanTomlMultilineLine(line, multilineQuote);
+    multilineQuote = multilineScan.nextQuote;
+    if (multilineScan.wasInside) {
+      offset += line.length;
+      continue;
+    }
+    const assignmentIndex = findUnquotedAssignment(line);
+    if (assignmentIndex < 0) {
+      offset += line.length;
+      continue;
+    }
+    const settingPath = parseTomlDottedKey(line.slice(0, assignmentIndex).trim());
+    if (!settingPath || !tomlPathMatches(settingPath, targetPath)) {
+      offset += line.length;
+      continue;
+    }
+    const replacement2 = replaceTomlAssignmentValue(line, assignmentIndex, value);
+    const assignmentEnd = multilineScan.nextQuote ? findTomlMultilineValueEnd(section.text, offset + line.length, multilineScan.nextQuote) : offset + line.length;
+    const sectionReplacement = section.text.slice(0, offset) + replacement2 + section.text.slice(assignmentEnd);
+    return config.slice(0, section.start) + sectionReplacement + config.slice(section.end);
+  }
+  const replacement = insertSetting(section.text, key, value);
   return config.slice(0, section.start) + replacement + config.slice(section.end);
 }
 function removeSetting(config, section, key) {
@@ -75777,6 +75842,50 @@ function replaceOrInsertRootSetting(config, key, value) {
     return replacement;
   return `${replacement.trimEnd()}
 
+${suffix.trimStart()}`;
+}
+function replaceOrInsertRootDottedSetting(config, keyPath, value) {
+  const targetPath = parseTomlDottedKey(keyPath);
+  if (!targetPath)
+    return config;
+  const lines = config.match(/[^\n]*\n?|$/g) ?? [];
+  let offset = 0;
+  let multilineQuote = null;
+  for (const line of lines) {
+    if (line.length === 0)
+      break;
+    const multilineScan = scanTomlMultilineLine(line, multilineQuote);
+    multilineQuote = multilineScan.nextQuote;
+    if (multilineScan.wasInside) {
+      offset += line.length;
+      continue;
+    }
+    if (isTomlTableHeaderLine(line))
+      break;
+    const assignmentIndex = findUnquotedAssignment(line);
+    if (assignmentIndex < 0) {
+      offset += line.length;
+      continue;
+    }
+    const settingPath = parseTomlDottedKey(line.slice(0, assignmentIndex).trim());
+    if (!settingPath || !tomlPathMatches(settingPath, targetPath)) {
+      offset += line.length;
+      continue;
+    }
+    const replacement2 = replaceTomlAssignmentValue(line, assignmentIndex, value);
+    const assignmentEnd = multilineScan.nextQuote ? findTomlMultilineValueEnd(config, offset + line.length, multilineScan.nextQuote) : offset + line.length;
+    return config.slice(0, offset) + replacement2 + config.slice(assignmentEnd);
+  }
+  const sectionStart = findFirstTableStart(config);
+  const root = config.slice(0, sectionStart).trimEnd();
+  const suffix = config.slice(sectionStart);
+  const replacement = `${root}${root.length > 0 ? `
+` : ""}${keyPath} = ${value}
+`;
+  if (suffix.length === 0)
+    return replacement;
+  return `${replacement.trimEnd()}
+
 ${suffix.trimStart()}`;
 }
 function appendBlock(config, block) {
@@ -75789,9 +75898,16 @@ function appendBlock(config, block) {
 function findFirstTableStart(config) {
   const lines = config.match(/[^\n]*\n?|$/g) ?? [];
   let offset = 0;
+  let multilineQuote = null;
   for (const line of lines) {
     if (line.length === 0)
       break;
+    const multilineScan = scanTomlMultilineLine(line, multilineQuote);
+    multilineQuote = multilineScan.nextQuote;
+    if (multilineScan.wasInside) {
+      offset += line.length;
+      continue;
+    }
     if (isTomlTableHeaderLine(line))
       return offset;
     offset += line.length;
@@ -75829,6 +75945,131 @@ function isTomlTableHeaderLine(line) {
   const normalizedLine = stripUnquotedInlineComment(line).trim();
   return normalizedLine.startsWith("[") && normalizedLine.endsWith("]");
 }
+function scanTomlMultilineLine(line, currentQuote) {
+  if (currentQuote) {
+    return {
+      wasInside: true,
+      nextQuote: findTomlMultilineDelimiter(line, currentQuote, 0) === -1 ? currentQuote : null
+    };
+  }
+  let quote = null;
+  let index = 0;
+  while (index < line.length) {
+    const char = line[index];
+    if (quote === '"') {
+      if (char === "\\") {
+        index += 2;
+        continue;
+      }
+      if (char === '"')
+        quote = null;
+      index += 1;
+      continue;
+    }
+    if (quote === "'") {
+      if (char === "'")
+        quote = null;
+      index += 1;
+      continue;
+    }
+    if (char === "#")
+      break;
+    const delimiter2 = line.startsWith('"""', index) ? '"""' : line.startsWith("'''", index) ? "'''" : null;
+    if (delimiter2) {
+      const closingIndex = findTomlMultilineDelimiter(line, delimiter2, index + delimiter2.length);
+      return { wasInside: false, nextQuote: closingIndex === -1 ? delimiter2 : null };
+    }
+    if (char === '"' || char === "'")
+      quote = char;
+    index += 1;
+  }
+  return { wasInside: false, nextQuote: null };
+}
+function findTomlMultilineDelimiter(line, delimiter2, startIndex) {
+  let index = line.indexOf(delimiter2, startIndex);
+  while (index !== -1) {
+    if (delimiter2 === "'''" || countPrecedingBackslashes(line, index) % 2 === 0)
+      return index;
+    index = line.indexOf(delimiter2, index + 1);
+  }
+  return -1;
+}
+function countPrecedingBackslashes(line, index) {
+  let count = 0;
+  let cursor = index - 1;
+  while (cursor >= 0 && line[cursor] === "\\") {
+    count += 1;
+    cursor -= 1;
+  }
+  return count;
+}
+function findUnquotedAssignment(line) {
+  return findUnquotedCharacter(line, "=", 0);
+}
+function findUnquotedComment(line, startIndex) {
+  return findUnquotedCharacter(line, "#", startIndex);
+}
+function findUnquotedCharacter(line, target, startIndex) {
+  let quote = null;
+  let index = startIndex;
+  while (index < line.length) {
+    const char = line[index];
+    if (quote === '"') {
+      if (char === "\\") {
+        index += 2;
+        continue;
+      }
+      if (char === '"')
+        quote = null;
+      index += 1;
+      continue;
+    }
+    if (quote === "'") {
+      if (char === "'")
+        quote = null;
+      index += 1;
+      continue;
+    }
+    if (char === '"' || char === "'") {
+      quote = char;
+      index += 1;
+      continue;
+    }
+    if (char === target)
+      return index;
+    if (char === "#")
+      return -1;
+    index += 1;
+  }
+  return -1;
+}
+function tomlPathMatches(candidate, target) {
+  return candidate.length === target.length && candidate.every((part, index) => part === target[index]);
+}
+function replaceTomlAssignmentValue(line, assignmentIndex, value) {
+  const newline = line.endsWith(`
+`) ? `
+` : "";
+  const lineBody = newline ? line.slice(0, -1) : line;
+  const commentIndex = findUnquotedComment(lineBody, assignmentIndex + 1);
+  const comment = commentIndex === -1 ? "" : ` ${lineBody.slice(commentIndex).trimStart()}`;
+  return `${lineBody.slice(0, assignmentIndex + 1)} ${value}${comment}${newline}`;
+}
+function findTomlMultilineValueEnd(text, startOffset, quote) {
+  const lines = text.slice(startOffset).match(/[^\n]*\n?|$/g) ?? [];
+  let offset = startOffset;
+  let currentQuote = quote;
+  for (const line of lines) {
+    if (line.length === 0)
+      break;
+    const scan = scanTomlMultilineLine(line, currentQuote);
+    currentQuote = scan.nextQuote;
+    offset += line.length;
+    if (currentQuote === null)
+      return offset;
+  }
+  return text.length;
+}
 function stripUnquotedInlineComment(line) {
   let quote = null;
   let index = 0;
@@ -76159,13 +76400,137 @@ function delay(milliseconds) {
   return new Promise((resolveDelay) => setTimeout(resolveDelay, milliseconds));
 }
 
+// packages/omo-codex/src/install/toml-setting-reader.ts
+function hasTomlSetting(config, keyPath) {
+  const targetPath = parseTomlDottedKey(keyPath);
+  if (!targetPath)
+    return false;
+  return hasTomlAssignment(config, (tablePath, settingPath) => {
+    const fullPath = [...tablePath, ...settingPath];
+    return fullPath.length === targetPath.length && fullPath.every((part, index) => part === targetPath[index]);
+  });
+}
+function hasTomlRootDottedKeyPrefix(config, rootKey) {
+  return hasTomlAssignment(config, (tablePath, settingPath) => tablePath.length === 0 && settingPath.length > 1 && settingPath[0] === rootKey);
+}
+function hasTomlAssignment(config, predicate) {
+  let tablePath = [];
+  let multilineQuote = null;
+  for (const line of config.split(`
+`)) {
+    const multilineScan = scanTomlMultilineLine(line, multilineQuote);
+    multilineQuote = multilineScan.nextQuote;
+    if (multilineScan.wasInside)
+      continue;
+    const normalizedLine = stripUnquotedInlineComment2(line).trim();
+    if (normalizedLine.length === 0)
+      continue;
+    const headerPath = parseTomlTableHeader2(normalizedLine);
+    if (headerPath) {
+      tablePath = headerPath;
+      continue;
+    }
+    if (isTomlTableHeaderLine2(normalizedLine)) {
+      tablePath = null;
+      continue;
+    }
+    if (!tablePath)
+      continue;
+    const assignmentIndex = findUnquotedAssignment2(normalizedLine);
+    if (assignmentIndex < 0)
+      continue;
+    const settingPath = parseTomlDottedKey(normalizedLine.slice(0, assignmentIndex).trim());
+    if (!settingPath)
+      continue;
+    if (predicate(tablePath, settingPath))
+      return true;
+  }
+  return false;
+}
+function parseTomlTableHeader2(line) {
+  if (!line.startsWith("[") || !line.endsWith("]") || line.startsWith("[["))
+    return null;
+  return parseTomlDottedKey(line.slice(1, -1).trim());
+}
+function isTomlTableHeaderLine2(line) {
+  return line.startsWith("[") && line.endsWith("]");
+}
+function stripUnquotedInlineComment2(line) {
+  let quote = null;
+  let index = 0;
+  while (index < line.length) {
+    const char = line[index];
+    if (quote === '"') {
+      if (char === "\\") {
+        index += 2;
+        continue;
+      }
+      if (char === '"')
+        quote = null;
+      index += 1;
+      continue;
+    }
+    if (quote === "'") {
+      if (char === "'")
+        quote = null;
+      index += 1;
+      continue;
+    }
+    if (char === '"' || char === "'") {
+      quote = char;
+      index += 1;
+      continue;
+    }
+    if (char === "#")
+      return line.slice(0, index);
+    index += 1;
+  }
+  return line;
+}
+function findUnquotedAssignment2(line) {
+  let quote = null;
+  let index = 0;
+  while (index < line.length) {
+    const char = line[index];
+    if (quote === '"') {
+      if (char === "\\") {
+        index += 2;
+        continue;
+      }
+      if (char === '"')
+        quote = null;
+      index += 1;
+      continue;
+    }
+    if (quote === "'") {
+      if (char === "'")
+        quote = null;
+      index += 1;
+      continue;
+    }
+    if (char === '"' || char === "'") {
+      quote = char;
+      index += 1;
+      continue;
+    }
+    if (char === "=")
+      return index;
+    index += 1;
+  }
+  return -1;
+}
+
 // packages/omo-codex/src/install/codex-config-features.ts
 function ensureFeatureEnabled(config, featureName) {
   const section = findTomlSection(config, "features");
-  if (!section)
+  if (!section) {
+    if (hasTomlRootDottedKeyPrefix(config, "features")) {
+      return replaceOrInsertRootDottedSetting(config, `features.${featureName}`, "true");
+    }
     return appendBlock(config, `[features]
 ${featureName} = true
 `);
+  }
   return replaceOrInsertSetting(config, section, featureName, "true");
 }
 
@@ -76233,7 +76598,7 @@ function ensureAutonomousPermissions(config) {
   next = replaceOrInsertRootSetting(next, "sandbox_mode", JSON.stringify("danger-full-access"));
   next = replaceOrInsertRootSetting(next, "network_access", JSON.stringify("enabled"));
   for (const featureName of AUTONOMOUS_FEATURES) {
-    next = ensureFeatureEnabled2(next, featureName);
+    next = ensureFeatureEnabled(next, featureName);
   }
   next = removeWindowsSandboxSetting(next);
   next = ensureNoticeEnabled(next, "hide_full_access_warning");
@@ -76251,14 +76616,6 @@ function ensureNoticeEnabled(config, key) {
     return appendNoticeBlock(config, key);
   return replaceOrInsertSetting(config, section, key, "true");
 }
-function ensureFeatureEnabled2(config, key) {
-  const section = findTomlSection(config, "features");
-  if (section === null)
-    return appendBlock(config, `[features]
-${key} = true
-`);
-  return replaceOrInsertSetting(config, section, key, "true");
-}
 function appendNoticeBlock(config, key) {
   return appendBlock(config, `[notice]
 ${key} = true
@@ -76330,7 +76687,7 @@ function readStringArraySetting(sectionText, key) {
     const assignmentIndex = line.indexOf("=");
     if (assignmentIndex === -1)
       return null;
-    return parseTomlStringArray(stripUnquotedInlineComment2(line.slice(assignmentIndex + 1)).trim());
+    return parseTomlStringArray(stripUnquotedInlineComment3(line.slice(assignmentIndex + 1)).trim());
   }
   return null;
 }
@@ -76374,7 +76731,7 @@ function parseTomlString(input, startIndex) {
   }
   return null;
 }
-function stripUnquotedInlineComment2(line) {
+function stripUnquotedInlineComment3(line) {
   let quote = null;
   let index = 0;
   while (index < line.length) {
@@ -76588,24 +76945,27 @@ import { readFileSync as readFileSync13 } from "node:fs";
 import { dirname as dirname15, isAbsolute as isAbsolute8, join as join39 } from "node:path";
 var CODEX_AGENTS_HEADER = "agents";
 var CODEX_MULTI_AGENT_V2_HEADER = "features.multi_agent_v2";
+var CODEX_MULTI_AGENT_V2_THREAD_LIMIT_KEY = `${CODEX_MULTI_AGENT_V2_HEADER}.max_concurrent_threads_per_session`;
 var CODEX_SUBAGENT_THREAD_LIMIT = 1000;
+var CODEX_MULTI_AGENT_V2_THREAD_LIMIT = 16;
 function ensureCodexMultiAgentV2Config(config, options = {}) {
   const featureFlag = removeFeatureFlagSetting(config, "multi_agent_v2");
   const v2Preferred = options.multiAgentVersion === "v2";
   const modelKnown = options.multiAgentVersion != null || readRootModel(featureFlag.config) !== null;
   const agentsConfig = v2Preferred ? removeAgentsMaxThreads(featureFlag.config) : modelKnown ? ensureAgentsMaxThreads(featureFlag.config) : raiseExistingAgentsMaxThreads(featureFlag.config);
-  const maxThreadsValue = CODEX_SUBAGENT_THREAD_LIMIT.toString();
   const preserveDisable = featureFlag.value === false && !v2Preferred;
   const featureConfig = preserveDisable ? setMultiAgentV2Disable(agentsConfig) : v2Preferred ? removeMultiAgentV2Disable(agentsConfig) : agentsConfig;
+  if (hasTomlSetting(featureConfig, CODEX_MULTI_AGENT_V2_THREAD_LIMIT_KEY))
+    return featureConfig;
   const section = findTomlSection(featureConfig, CODEX_MULTI_AGENT_V2_HEADER);
   if (!section) {
     const enabledSetting = preserveDisable ? `enabled = false
 ` : "";
     return appendBlock(featureConfig, `[${CODEX_MULTI_AGENT_V2_HEADER}]
-${enabledSetting}max_concurrent_threads_per_session = ${maxThreadsValue}
+${enabledSetting}max_concurrent_threads_per_session = ${CODEX_MULTI_AGENT_V2_THREAD_LIMIT}
 `);
   }
-  return replaceOrInsertSetting(featureConfig, section, "max_concurrent_threads_per_session", maxThreadsValue);
+  return replaceOrInsertSetting(featureConfig, section, "max_concurrent_threads_per_session", CODEX_MULTI_AGENT_V2_THREAD_LIMIT.toString());
 }
 function resolveCodexMultiAgentVersion(config, configPath) {
   const model = readRootModel(config);
@@ -76792,11 +77152,11 @@ async function trustedHookStatesForPlugin(input) {
   const manifestPath = join40(input.pluginRoot, ".codex-plugin", "plugin.json");
   if (!await exists(manifestPath))
     return [];
-  const manifest = JSON.parse(await readFile12(manifestPath, "utf8"));
-  if (!isPlainRecord3(manifest))
+  const manifest2 = JSON.parse(await readFile12(manifestPath, "utf8"));
+  if (!isPlainRecord3(manifest2))
     return [];
   const states = [];
-  for (const hookPath of hookManifestPaths2(manifest.hooks)) {
+  for (const hookPath of hookManifestPaths2(manifest2.hooks)) {
     const hooksPath = join40(input.pluginRoot, hookPath);
     if (!await exists(hooksPath))
       continue;
@@ -76964,6 +77324,10 @@ var MANAGED_REASONING_DEFAULT_UPGRADES = new Map([
       {
         previous: { model: "gpt-5.5", effort: "xhigh" },
         current: { model: "gpt-5.6-sol", effort: "ultra" }
+      },
+      {
+        previous: { model: "gpt-5.6-sol", effort: "ultra" },
+        current: { model: "gpt-5.6-terra", effort: "high" }
       }
     ]
   ],
@@ -76973,6 +77337,10 @@ var MANAGED_REASONING_DEFAULT_UPGRADES = new Map([
       {
         previous: { model: "gpt-5.6-sol", effort: "xhigh" },
         current: { model: "gpt-5.6-sol", effort: "max" }
+      },
+      {
+        previous: { model: "gpt-5.6-sol", effort: "max" },
+        current: { model: "gpt-5.6-sol", effort: "high" }
       }
     ]
   ],
@@ -76982,6 +77350,37 @@ var MANAGED_REASONING_DEFAULT_UPGRADES = new Map([
       {
         previous: { model: "gpt-5.6-sol", effort: "high" },
         current: { model: "gpt-5.6-luna", effort: "max" }
+      },
+      {
+        previous: { model: "gpt-5.6-luna", effort: "max" },
+        current: { model: "gpt-5.6-terra", effort: "high" }
+      }
+    ]
+  ],
+  [
+    "lazycodex-worker-high",
+    [
+      {
+        previous: { model: "gpt-5.6-sol", effort: "max" },
+        current: { model: "gpt-5.6-sol", effort: "medium" }
+      }
+    ]
+  ],
+  [
+    "lazycodex-code-reviewer",
+    [
+      {
+        previous: { model: "gpt-5.6-sol", effort: "xhigh" },
+        current: { model: "gpt-5.6-terra", effort: "medium" }
+      }
+    ]
+  ],
+  [
+    "lazycodex-clone-fidelity-reviewer",
+    [
+      {
+        previous: { model: "gpt-5.6-sol", effort: "xhigh" },
+        current: { model: "gpt-5.6-terra", effort: "high" }
       }
     ]
   ],
@@ -77000,6 +77399,10 @@ var MANAGED_REASONING_DEFAULT_UPGRADES = new Map([
       {
         previous: { model: "gpt-5.6-sol", effort: "xhigh" },
         current: { model: "gpt-5.6-sol", effort: "high" }
+      },
+      {
+        previous: { model: "gpt-5.6-sol", effort: "high" },
+        current: { model: "gpt-5.6-sol", effort: "low" }
       }
     ]
   ]
@@ -77626,7 +78029,7 @@ function normalizeHookStatusVersion(version) {
 
 // packages/omo-codex/src/install/codex-process.ts
 init_bun_spawn_shim();
-var WINDOWS_CMD_SHIM_COMMANDS = new Set(["npm", "npx"]);
+var WINDOWS_CMD_SHIM_COMMANDS = new Set(["codex", "npm", "npx"]);
 function resolveRunCommandInvocation(command, args, platform = process.platform) {
   if (platform !== "win32" || !WINDOWS_CMD_SHIM_COMMANDS.has(command.toLowerCase())) {
     return { command, args: [...args] };
@@ -78331,12 +78734,12 @@ async function runCodexInstaller(options = {}) {
   const agentConfigs = new Map;
   for (const entry of marketplace.plugins) {
     const sourcePath = resolvePluginSource(codexPackageRoot, entry, { pathOverride: "./plugin" });
-    const manifest = await readPluginManifest(sourcePath);
-    if (manifest.name !== entry.name) {
-      throw new Error(`plugin manifest name ${JSON.stringify(manifest.name)} does not match marketplace name ${JSON.stringify(entry.name)}`);
+    const manifest2 = await readPluginManifest(sourcePath);
+    if (manifest2.name !== entry.name) {
+      throw new Error(`plugin manifest name ${JSON.stringify(manifest2.name)} does not match marketplace name ${JSON.stringify(entry.name)}`);
     }
     const version2 = resolveLazyCodexPluginVersion({
-      manifestVersion: manifest.version,
+      manifestVersion: manifest2.version,
       marketplaceName: marketplace.name,
       pluginName: entry.name,
       distributionManifest,
@@ -79026,8 +79429,24 @@ import { promisify as promisify2 } from "node:util";
 var execFileAsync2 = promisify2(execFile4);
 var REQUIRED_PLUGIN_ARTIFACTS = [
   join58("extensions", "omo.js"),
+  join58("skills", "ast-grep", "SKILL.md"),
+  join58("skills", "coding-agent-sessions", "SKILL.md"),
+  join58("skills", "debugging", "SKILL.md"),
+  join58("skills", "frontend", "SKILL.md"),
+  join58("skills", "git-master", "SKILL.md"),
+  join58("skills", "init-deep", "SKILL.md"),
+  join58("skills", "lsp-setup", "SKILL.md"),
+  join58("skills", "programming", "SKILL.md"),
+  join58("skills", "refactor", "SKILL.md"),
+  join58("skills", "remove-ai-slops", "SKILL.md"),
+  join58("skills", "review-work", "SKILL.md"),
+  join58("skills", "start-work", "SKILL.md"),
+  join58("skills", "ultimate-browsing", "SKILL.md"),
   join58("skills", "ultrawork", "SKILL.md"),
   join58("skills", "ulw-loop", "SKILL.md"),
+  join58("skills", "ulw-plan", "SKILL.md"),
+  join58("skills", "ulw-research", "SKILL.md"),
+  join58("skills", "visual-qa", "SKILL.md"),
   join58("runtime", "lsp-daemon", "dist", "cli.js"),
   join58("runtime", "lsp-daemon", "dist", "index.js"),
   join58("runtime", "lsp-daemon", "dist", "index.d.ts"),
@@ -79081,6 +79500,7 @@ async function ensurePluginArtifacts(context) {
     throw new Error(`Packed omo-senpi plugin is missing required runtime artifacts at ${context.pluginPath}`);
   }
   await context.runCommand("node", [join58(context.pluginPath, "scripts", "build-extension.mjs")], { cwd: context.repoRoot });
+  await context.runCommand("node", [join58("packages", "omo-codex", "plugin", "scripts", "materialize-shared-upstreams.mjs")], { cwd: context.repoRoot });
   await context.runCommand("node", [join58(context.pluginPath, "scripts", "sync-skills.mjs")], { cwd: context.repoRoot });
   await context.runCommand("node", [join58(context.pluginPath, "scripts", "build-install.mjs")], { cwd: context.repoRoot });
   await context.runCommand("node", [join58(context.pluginPath, "scripts", "stage-lsp-daemon-runtime.mjs")], { cwd: context.repoRoot });
@@ -96710,7 +97130,8 @@ var BrowserAutomationProviderSchema = exports_external.enum([
   "playwright-cli"
 ]);
 var BrowserAutomationConfigSchema = exports_external.object({
-  provider: BrowserAutomationProviderSchema.default("playwright")
+  provider: BrowserAutomationProviderSchema.default("playwright"),
+  playwright_mcp_args: exports_external.array(exports_external.string()).optional()
 });
 // packages/omo-opencode/src/config/schema/categories.ts
 var CategoryConfigSchema = exports_external.object({
@@ -96761,7 +97182,9 @@ var ClaudeCodeConfigSchema = exports_external.object({
 var CodegraphConfigSchema = exports_external.object({
   auto_init: exports_external.boolean().default(true),
   auto_provision: exports_external.boolean().default(true),
+  daemon: exports_external.boolean().default(false),
   enabled: exports_external.boolean().default(true),
+  excluded_roots: exports_external.array(exports_external.string()).optional(),
   install_dir: exports_external.string().optional(),
   telemetry: exports_external.boolean().optional(),
   watch_debounce_ms: exports_external.number().nonnegative().optional()
@@ -96772,9 +97195,7 @@ var CommentCheckerConfigSchema = exports_external.object({
 });
 // packages/omo-opencode/src/config/schema/commands.ts
 var BuiltinCommandNameSchema = exports_external.enum([
-  "ralph-loop",
-  "ulw-loop",
-  "cancel-ralph",
+  "goal",
   "refactor",
   "start-work",
   "stop-continuation",
@@ -96784,7 +97205,7 @@ var BuiltinCommandNameSchema = exports_external.enum([
 // packages/omo-opencode/src/config/schema/default-mode.ts
 var DefaultModeConfigSchema = exports_external.object({
   ultrawork: exports_external.boolean().default(false),
-  ralph_loop: exports_external.boolean().default(false)
+  goal: exports_external.boolean().default(false)
 });
 // packages/omo-opencode/src/config/schema/dynamic-context-pruning.ts
 var DynamicContextPruningConfigSchema = exports_external.object({
@@ -96832,6 +97253,12 @@ var ExperimentalConfigSchema = exports_external.object({
   max_tools: exports_external.number().int().min(1).optional(),
   disable_live_parent_wake_routing: exports_external.boolean().optional()
 });
+// packages/omo-opencode/src/config/schema/goal.ts
+var GoalConfigSchema = exports_external.object({
+  enabled: exports_external.boolean().default(false),
+  auto_start: exports_external.boolean().default(false),
+  default_max_iterations: exports_external.number().min(1).max(1000).default(100)
+});
 // packages/skills-loader-core/src/config/git-env-prefix.ts
 var GIT_ENV_ASSIGNMENT_PATTERN = /^(?:[A-Za-z_][A-Za-z0-9_]*=[A-Za-z0-9_-]*)(?: [A-Za-z_][A-Za-z0-9_]*=[A-Za-z0-9_-]*)*$/;
 var GIT_ENV_PREFIX_VALIDATION_MESSAGE = 'git_env_prefix must be empty or use shell-safe env assignments like "GIT_MASTER=1"';
@@ -96874,7 +97301,7 @@ var HookNameSchema = exports_external.enum([
   "interactive-bash-session",
   "tool-pair-validator",
   "monitor-status-injector",
-  "ralph-loop",
+  "goal",
   "category-skill-reminder",
   "compaction-context-injector",
   "compaction-todo-preserver",
@@ -96984,14 +97411,6 @@ var MonitorConfigSchema = exports_external.object({
   pattern_max_length: exports_external.number().int().min(1).default(512)
 });
 
-// packages/omo-opencode/src/config/schema/ralph-loop.ts
-var RalphLoopConfigSchema = exports_external.object({
-  enabled: exports_external.boolean().default(false),
-  default_max_iterations: exports_external.number().min(1).max(1000).default(100),
-  state_dir: exports_external.string().optional(),
-  default_strategy: exports_external.enum(["reset", "continue"]).default("continue")
-});
-
 // packages/omo-opencode/src/config/schema/runtime-fallback.ts
 var RuntimeFallbackConfigSchema = exports_external.object({
   enabled: exports_external.boolean().optional(),
@@ -97127,7 +97546,8 @@ var OhMyOpenCodeConfigSchema = exports_external.object({
   experimental: ExperimentalConfigSchema.optional(),
   auto_update: exports_external.boolean().optional(),
   skills: SkillsConfigSchema.optional(),
-  ralph_loop: RalphLoopConfigSchema.optional(),
+  goal: GoalConfigSchema.optional(),
+  ralph_loop: exports_external.record(exports_external.string(), exports_external.unknown()).optional(),
   runtime_fallback: exports_external.union([exports_external.boolean(), RuntimeFallbackConfigSchema]).optional(),
   background_task: BackgroundTaskConfigSchema.optional(),
   notification: NotificationConfigSchema.optional(),
@@ -97510,6 +97930,7 @@ function loadPluginConfig(directory, ctx) {
     }
   }
   const userMcpEnvAllowlist = config3.mcp_env_allowlist ?? [];
+  const userPlaywrightMcpArgs = config3.browser_automation_engine?.playwright_mcp_args;
   const canonicalAncestorPathsFarthestFirst = [...canonicalAncestorPathsNearestFirst].reverse();
   const defaultGitMaster = OhMyOpenCodeConfigSchema.parse({}).git_master;
   const ancestorGitMasterOverridesFarthestFirst = [];
@@ -97542,6 +97963,16 @@ function loadPluginConfig(directory, ctx) {
     ...config3,
     mcp_env_allowlist: userMcpEnvAllowlist
   };
+  if (config3.browser_automation_engine) {
+    const {
+      playwright_mcp_args: _ancestorPlaywrightMcpArgs,
+      ...browserAutomationEngine
+    } = config3.browser_automation_engine;
+    config3 = {
+      ...config3,
+      browser_automation_engine: userPlaywrightMcpArgs !== undefined ? { ...browserAutomationEngine, playwright_mcp_args: userPlaywrightMcpArgs } : browserAutomationEngine
+    };
+  }
   applyDisabledProviders(config3);
   log2("Final merged config", {
     agents: config3.agents,
@@ -98013,22 +98444,170 @@ var BOULDER_FILE = "boulder.json";
 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 existsSync37, readFileSync as readFileSync19 } from "node: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+/;
-var UNCHECKED_CHECKBOX_PATTERN = /^(\s*)[-*]\s*\[\s*\]\s*(.+)$/;
-var TODO_TASK_PATTERN = /^(\d+)\.\s+(.+)$/;
-var FINAL_WAVE_TASK_PATTERN = /^(F\d+)\.\s+(.+)$/i;
-function buildTaskRef(section, taskLabel) {
-  const pattern = section === "todo" ? TODO_TASK_PATTERN : FINAL_WAVE_TASK_PATTERN;
-  const match = taskLabel.match(pattern);
-  if (!match) {
+// packages/boulder-state/src/plan-checklist.ts
+var SIMPLE_CHECKBOX_PATTERN = /^[-*][ \t]*\[[ \t]*([xX]?)[ \t]*\][ \t]+(.+)$/;
+var TODO_HEADING_PATTERN = /^##[ \t]+TODOs(?:[ \t]+#+)?[ \t]*$/i;
+var FINAL_VERIFICATION_HEADING_PATTERN = /^##[ \t]+Final Verification Wave(?:[ \t]+#+)?[ \t]*$/i;
+var SECTION_BOUNDARY_HEADING_PATTERN = /^#{1,2}(?:[ \t]+|$)/;
+var FENCE_PATTERN = /^[ \t]{0,3}(`{3,}|~{3,})(.*)$/;
+var TODO_CHECKBOX_PATTERN = /^- \[([ xX])\] ([1-9]\d*\. .+)$/;
+var FINAL_WAVE_CHECKBOX_PATTERN = /^- \[([ xX])\] (F[1-9]\d*\. .+)$/i;
+function parsePlanChecklist(markdown) {
+  const lines = markdown.split(/\r?\n/);
+  if (!hasStructuredSection(lines)) {
+    return parseSimpleChecklist(lines);
+  }
+  return parseStructuredPlan(lines).checklist;
+}
+function parseCurrentTopLevelTask(markdown) {
+  const lines = markdown.split(/\r?\n/);
+  if (!hasStructuredSection(lines)) {
+    return null;
+  }
+  return parseStructuredPlan(lines).nextTask;
+}
+function parseStructuredPlan(lines) {
+  let remaining = 0;
+  let total = 0;
+  let nextTaskLabel = null;
+  let nextTask = null;
+  let section = "other";
+  let fence = null;
+  for (const line of lines) {
+    if (fence !== null) {
+      if (isClosingFence(line, fence)) {
+        fence = null;
+      }
+      continue;
+    }
+    const openingFence = parseOpeningFence(line);
+    if (openingFence !== null) {
+      fence = openingFence;
+      continue;
+    }
+    if (SECTION_BOUNDARY_HEADING_PATTERN.test(line)) {
+      section = parseStructuredSectionHeading(line);
+      continue;
+    }
+    if (section === "other") {
+      continue;
+    }
+    const checkbox = parseStructuredTopLevelCheckbox(line, section);
+    if (checkbox === null) {
+      continue;
+    }
+    total += 1;
+    if (checkbox.checked) {
+      continue;
+    }
+    remaining += 1;
+    if (nextTaskLabel === null) {
+      nextTaskLabel = checkbox.label;
+      nextTask = checkbox.task;
+    }
+  }
+  return {
+    checklist: {
+      completed: total - remaining,
+      remaining,
+      total,
+      nextTaskLabel
+    },
+    nextTask
+  };
+}
+function parseSimpleChecklist(lines) {
+  let remaining = 0;
+  let total = 0;
+  let nextTaskLabel = null;
+  let fence = null;
+  for (const line of lines) {
+    if (fence !== null) {
+      if (isClosingFence(line, fence)) {
+        fence = null;
+      }
+      continue;
+    }
+    const openingFence = parseOpeningFence(line);
+    if (openingFence !== null) {
+      fence = openingFence;
+      continue;
+    }
+    const checkbox = parseSimpleTopLevelCheckbox(line);
+    if (checkbox === null) {
+      continue;
+    }
+    total += 1;
+    if (checkbox.checked) {
+      continue;
+    }
+    remaining += 1;
+    if (nextTaskLabel === null) {
+      nextTaskLabel = checkbox.label;
+    }
+  }
+  return { completed: total - remaining, remaining, total, nextTaskLabel };
+}
+function parseSimpleTopLevelCheckbox(line) {
+  const match = line.match(SIMPLE_CHECKBOX_PATTERN);
+  const marker = match?.[1];
+  const label = match?.[2];
+  if (marker === undefined || label === undefined) {
+    return null;
+  }
+  return { checked: marker.toLowerCase() === "x", label };
+}
+function hasStructuredSection(lines) {
+  let fence = null;
+  for (const line of lines) {
+    if (fence !== null) {
+      if (isClosingFence(line, fence)) {
+        fence = null;
+      }
+      continue;
+    }
+    const openingFence = parseOpeningFence(line);
+    if (openingFence !== null) {
+      fence = openingFence;
+      continue;
+    }
+    if (parseStructuredSectionHeading(line) !== "other") {
+      return true;
+    }
+  }
+  return false;
+}
+function parseStructuredSectionHeading(line) {
+  if (TODO_HEADING_PATTERN.test(line)) {
+    return "todo";
+  }
+  if (FINAL_VERIFICATION_HEADING_PATTERN.test(line)) {
+    return "final-wave";
+  }
+  return "other";
+}
+function parseStructuredTopLevelCheckbox(line, section) {
+  const pattern = section === "todo" ? TODO_CHECKBOX_PATTERN : FINAL_WAVE_CHECKBOX_PATTERN;
+  const match = line.match(pattern);
+  const marker = match?.[1];
+  const label = match?.[2];
+  if (marker === undefined || label === undefined) {
+    return null;
+  }
+  const task = buildTaskRef(section, label);
+  if (task === null) {
+    return null;
+  }
+  return { checked: marker.toLowerCase() === "x", label, task };
+}
+function buildTaskRef(section, label) {
+  const pattern = section === "todo" ? /^([1-9]\d*)\. (.+)$/ : /^(F[1-9]\d*)\. (.+)$/i;
+  const match = label.match(pattern);
+  const rawLabel = match?.[1];
+  const title = match?.[2];
+  if (rawLabel === undefined || title === undefined) {
     return null;
   }
-  const rawLabel = match[1];
-  const title = match[2].trim();
   return {
     key: `${section}:${rawLabel.toLowerCase()}`,
     section,
@@ -98036,31 +98615,29 @@ function buildTaskRef(section, taskLabel) {
     title
   };
 }
+function parseOpeningFence(line) {
+  const match = line.match(FENCE_PATTERN);
+  const run = match?.[1];
+  const info = match?.[2];
+  const marker = run?.charAt(0);
+  if (run === undefined || info === undefined || marker !== "`" && marker !== "~" || marker === "`" && info.includes("`")) {
+    return null;
+  }
+  return { marker, length: run.length };
+}
+function isClosingFence(line, fence) {
+  const run = line.match(/^[ \t]{0,3}(`{3,}|~{3,})[ \t]*$/)?.[1];
+  return run?.charAt(0) === fence.marker && run.length >= fence.length;
+}
+// packages/boulder-state/src/top-level-task.ts
+import { existsSync as existsSync37, readFileSync as readFileSync19 } from "node:fs";
 function readCurrentTopLevelTask(planPath) {
   if (!existsSync37(planPath)) {
     return null;
   }
   try {
     const content = readFileSync19(planPath, "utf-8");
-    const lines = content.split(/\r?\n/);
-    let section = "other";
-    for (const line of lines) {
-      if (SECOND_LEVEL_HEADING_PATTERN.test(line)) {
-        section = TODO_HEADING_PATTERN.test(line) ? "todo" : FINAL_VERIFICATION_HEADING_PATTERN.test(line) ? "final-wave" : "other";
-      }
-      const uncheckedTaskMatch = line.match(UNCHECKED_CHECKBOX_PATTERN);
-      if (!uncheckedTaskMatch || uncheckedTaskMatch[1].length > 0) {
-        continue;
-      }
-      if (section !== "todo" && section !== "final-wave") {
-        continue;
-      }
-      const taskRef = buildTaskRef(section, uncheckedTaskMatch[2].trim());
-      if (taskRef) {
-        return taskRef;
-      }
-    }
-    return null;
+    return parseCurrentTopLevelTask(content);
   } catch {
     return null;
   }
@@ -98094,69 +98671,25 @@ function resolveBoulderPlanPathForWork(directory, work) {
 }
 // packages/boulder-state/src/storage/plan-progress.ts
 import { existsSync as existsSync39, readFileSync as readFileSync20, readdirSync as readdirSync5, statSync as statSync5 } from "node: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+/;
-var UNCHECKED_CHECKBOX_PATTERN2 = /^(\s*)[-*]\s*\[\s*\]\s*(.+)$/;
-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 (!existsSync39(planPath)) {
     return { total: 0, completed: 0, isComplete: false };
   }
   try {
     const content = readFileSync20(planPath, "utf-8");
-    const lines = content.split(/\r?\n/);
-    const hasStructuredSections = lines.some((line) => TODO_HEADING_PATTERN2.test(line) || FINAL_VERIFICATION_HEADING_PATTERN2.test(line));
-    if (hasStructuredSections) {
-      return getStructuredPlanProgress(lines);
-    }
-    return getSimplePlanProgress(content);
+    const checklist = parsePlanChecklist(content);
+    return {
+      total: checklist.total,
+      completed: checklist.completed,
+      isComplete: checklist.total > 0 && checklist.remaining === 0
+    };
   } catch {
     return { total: 0, completed: 0, isComplete: false };
   }
 }
-function getStructuredPlanProgress(lines) {
-  let section = "other";
-  let total = 0;
-  let completed = 0;
-  for (const line of lines) {
-    if (SECOND_LEVEL_HEADING_PATTERN2.test(line)) {
-      section = TODO_HEADING_PATTERN2.test(line) ? "todo" : FINAL_VERIFICATION_HEADING_PATTERN2.test(line) ? "final-wave" : "other";
-      continue;
-    }
-    if (section !== "todo" && section !== "final-wave") {
-      continue;
-    }
-    const checkedMatch = line.match(CHECKED_CHECKBOX_PATTERN);
-    const uncheckedMatch = checkedMatch ? null : line.match(UNCHECKED_CHECKBOX_PATTERN2);
-    const match = checkedMatch ?? uncheckedMatch;
-    if (!match || match[1].length > 0) {
-      continue;
-    }
-    const taskBody = match[2].trim();
-    const labelPattern = section === "todo" ? TODO_TASK_PATTERN2 : FINAL_WAVE_TASK_PATTERN2;
-    if (!labelPattern.test(taskBody)) {
-      continue;
-    }
-    total += 1;
-    if (checkedMatch) {
-      completed += 1;
-    }
-  }
-  return { total, completed, isComplete: total > 0 && completed === total };
-}
-function getSimplePlanProgress(content) {
-  const uncheckedMatches = content.match(/^[-*]\s*\[\s*\]/gm) ?? [];
-  const checkedMatches = content.match(/^[-*]\s*\[[xX]\]/gm) ?? [];
-  const total = uncheckedMatches.length + checkedMatches.length;
-  const completed = checkedMatches.length;
-  return { total, completed, isComplete: total > 0 && completed === total };
-}
 // packages/boulder-state/src/storage/shared.ts
 var RESERVED_KEYS = new Set(["__proto__", "prototype", "constructor"]);
-var SESSION_ID_PREFIX_PATTERN = /^(codex|opencode):/;
+var SESSION_ID_PREFIX_PATTERN = /^(codex|opencode|senpi):/;
 function normalizeSessionId(sessionId, platform = "opencode") {
   if (SESSION_ID_PREFIX_PATTERN.test(sessionId)) {
     return sessionId;
@@ -98231,7 +98764,7 @@ function readBoulderState(directory) {
   try {
     const content = readFileSync21(filePath, "utf-8");
     const parsed = JSON.parse(content);
-    if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+    if (!parsed || typeof parsed !== "object" || Array.isArray(parsed) || Object.keys(parsed).length === 0) {
       return null;
     }
     normalizeState(parsed);
@@ -100188,6 +100721,7 @@ import { readFileSync as readFileSync35 } from "node:fs";
 import { homedir as homedir16 } from "node:os";
 import { dirname as dirname29, relative as relative9 } from "node:path";
 init_shared();
+init_logger2();
 init_plugin_identity();
 function resolveHomeDirectory2() {
   return process.env.HOME ?? process.env.USERPROFILE ?? homedir16();
@@ -100276,13 +100810,45 @@ function mergeLoadedConfig(userLayersNearestFirst, projectLayersNearestFirst) {
       config3 = mergeConfigs2(config3, layer.config);
   }
   const userMcpEnvAllowlist = config3.mcp_env_allowlist ?? [];
+  const userPlaywrightMcpArgs = config3.browser_automation_engine?.playwright_mcp_args;
   for (const layer of [...projectLayersNearestFirst].reverse()) {
     if (layer.config)
       config3 = mergeConfigs2(config3, layer.config);
   }
   config3 = { ...config3, mcp_env_allowlist: userMcpEnvAllowlist };
+  if (config3.browser_automation_engine) {
+    const {
+      playwright_mcp_args: _projectPlaywrightMcpArgs,
+      ...browserAutomationEngine
+    } = config3.browser_automation_engine;
+    config3 = {
+      ...config3,
+      browser_automation_engine: userPlaywrightMcpArgs !== undefined ? { ...browserAutomationEngine, playwright_mcp_args: userPlaywrightMcpArgs } : browserAutomationEngine
+    };
+  }
   return applyDisabledProviders(config3);
 }
+function migrateRalphLoopConfig(config3) {
+  const legacy = config3.ralph_loop;
+  if (legacy === undefined) {
+    return config3;
+  }
+  const enabled = typeof legacy.enabled === "boolean" ? legacy.enabled : undefined;
+  const defaultMaxIterations = typeof legacy.default_max_iterations === "number" ? legacy.default_max_iterations : undefined;
+  if (enabled === undefined && defaultMaxIterations === undefined) {
+    return config3;
+  }
+  log2("[config] ralph_loop is deprecated and will be removed in a future release. Use goal instead.");
+  const existingGoal = config3.goal;
+  return {
+    ...config3,
+    goal: {
+      enabled: existingGoal?.enabled ?? enabled ?? false,
+      auto_start: existingGoal?.auto_start ?? false,
+      default_max_iterations: existingGoal?.default_max_iterations ?? defaultMaxIterations ?? 100
+    }
+  };
+}
 function validatePluginConfig(directory) {
   const userLayersNearestFirst = discoverUserLayers().map((layer) => parseLayerConfig(layer.path));
   const projectLayersNearestFirst = discoverProjectLayersNearestFirst(directory).map((layer) => parseLayerConfig(layer.path));
@@ -100292,7 +100858,7 @@ function validatePluginConfig(directory) {
     valid: messages.length === 0,
     messages,
     path: firstFailingPath(layers) ?? firstPath(layers),
-    config: mergeLoadedConfig(userLayersNearestFirst, projectLayersNearestFirst)
+    config: migrateRalphLoopConfig(mergeLoadedConfig(userLayersNearestFirst, projectLayersNearestFirst))
   };
 }
 
@@ -101603,10 +102169,10 @@ async function gatherCodexSummary(deps = {}) {
   const binDir = resolveCodexInstallerBinDir({ binDir: deps.binDir, codexHome, env: process.env });
   const detection = await (deps.detectCodexInstallation ?? detectCodexInstallation)();
   const pluginRoot = await resolveInstalledPluginRoot(codexHome);
-  const manifest = pluginRoot === null ? null : await readJson(join82(pluginRoot, ".codex-plugin", "plugin.json"));
+  const manifest2 = pluginRoot === null ? null : await readJson(join82(pluginRoot, ".codex-plugin", "plugin.json"));
   const installSnapshot = pluginRoot === null ? null : await readJson(join82(pluginRoot, "lazycodex-install.json"));
   const configPath = join82(codexHome, "config.toml");
-  const pluginVersion = stringField(manifest, "version");
+  const pluginVersion = stringField(manifest2, "version");
   return {
     codexPath: detection.found && "path" in detection ? detection.path : null,
     codexSource: detection.found ? detection.source : null,
@@ -101953,12 +102519,12 @@ async function auditBundleTargets(pluginRoot) {
   const broken = [];
   let referencedCount = 0;
   for (const manifestPath of await findManifestPaths(pluginRoot, ".mcp.json")) {
-    const manifest = await readJson2(manifestPath);
-    if (manifest === null || !isRecord6(manifest["mcpServers"]))
+    const manifest2 = await readJson2(manifestPath);
+    if (manifest2 === null || !isRecord6(manifest2["mcpServers"]))
       continue;
     const manifestRoot = dirname32(manifestPath);
     const isRootManifest = resolve23(manifestRoot) === resolve23(pluginRoot);
-    for (const server2 of Object.values(manifest["mcpServers"])) {
+    for (const server2 of Object.values(manifest2["mcpServers"])) {
       if (!isRecord6(server2) || !Array.isArray(server2["args"]))
         continue;
       for (const arg of server2["args"]) {
@@ -101972,11 +102538,11 @@ async function auditBundleTargets(pluginRoot) {
     }
   }
   for (const hookManifestPath of await findHookManifestPaths(pluginRoot)) {
-    const manifest = await readJson2(hookManifestPath);
-    if (manifest === null)
+    const manifest2 = await readJson2(hookManifestPath);
+    if (manifest2 === null)
       continue;
     const commands2 = [];
-    collectHookCommands(manifest, commands2);
+    collectHookCommands(manifest2, commands2);
     const hookPluginRoot = dirname32(dirname32(hookManifestPath));
     for (const command of commands2) {
       for (const relativePath of extractPluginRootPaths(command)) {