oh-my-opencode 4.19.4 → 5.0.0-beta.2

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.19.4",
+    version: "5.0.0-beta.2",
     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",
@@ -2154,6 +2154,7 @@ var init_package = __esm(() => {
     workspaces: [
       "packages/rules-engine",
       "packages/delegate-core",
+      "packages/ast-grep-mcp",
       "packages/git-bash-mcp",
       "packages/mcp-stdio-core",
       "packages/mcp-client-core",
@@ -2168,6 +2169,7 @@ var init_package = __esm(() => {
       "packages/team-core",
       "packages/openclaw-core",
       "packages/boulder-state",
+      "packages/memory-core",
       "packages/telemetry-core",
       "packages/claude-code-compat-core",
       "packages/skills-loader-core",
@@ -2178,12 +2180,13 @@ var init_package = __esm(() => {
       "packages/senpi-task",
       "packages/pi-goal",
       "packages/pi-webfetch",
-      "packages/omo-opencode"
+      "packages/omo-opencode",
+      "packages/omo-native"
     ],
     bin: {
       "oh-my-opencode": "bin/oh-my-opencode.js",
       "oh-my-openagent": "bin/oh-my-opencode.js",
-      omo: "bin/oh-my-opencode.js",
+      "omo-agent-toolkit": "bin/oh-my-opencode.js",
       lazycodex: "bin/oh-my-opencode.js",
       "lazycodex-ai": "bin/oh-my-opencode.js"
     },
@@ -2255,8 +2258,8 @@ var init_package = __esm(() => {
       "build:codex-install": "bun run script/build-codex-install.ts",
       "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": "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:senpi-plugin": "bun run build:lsp-daemon && bun run build:ast-grep-mcp && bun run build:senpi-plugin:stage",
+      "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/stage-ast-grep-mcp-runtime.mjs && node packages/omo-senpi/plugin/scripts/stage-agent-toolkit.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",
@@ -2265,6 +2268,7 @@ var init_package = __esm(() => {
       "build:all": "bun run build && bun run build:binaries",
       "build:binaries": "bun run script/build-binaries.ts",
       "build:schema": "bun run script/build-schema.ts",
+      "build:omo-native": "bun run script/build-omo-native.ts",
       "build:omo-schema": "bun run script/build-omo-schema.ts",
       "build:model-capabilities": "bun run script/build-model-capabilities.ts",
       clean: "rm -rf dist",
@@ -2274,13 +2278,14 @@ var init_package = __esm(() => {
       prepublishOnly: "bun run clean && bun run build:lsp-tools-mcp && bun run build:lsp-daemon && bun run build",
       "test:model-capabilities": "bun test packages/model-core/src/model-capability-aliases.test.ts packages/model-core/src/model-capability-guardrails.test.ts packages/model-core/src/model-capabilities.test.ts packages/omo-opencode/src/cli/doctor/checks/model-resolution.test.ts --bail",
       typecheck: "tsgo --noEmit && bun run typecheck:script && bun run typecheck:packages",
-      "typecheck:packages": "tsgo --noEmit -p packages/rules-engine/tsconfig.json && tsgo --noEmit -p packages/delegate-core/tsconfig.json && tsgo --noEmit -p packages/mcp-stdio-core/tsconfig.json && tsgo --noEmit -p packages/mcp-client-core/tsconfig.json && tsgo --noEmit -p packages/git-bash-mcp/tsconfig.json && tsgo --noEmit -p packages/lsp-core/tsconfig.json && tsgo --noEmit -p packages/utils/tsconfig.json && tsgo --noEmit -p packages/model-core/tsconfig.json && tsgo --noEmit -p packages/omo-config-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/tmux-core/tsconfig.json && tsgo --noEmit -p packages/team-core/tsconfig.json && tsgo --noEmit -p packages/openclaw-core/tsconfig.json && tsgo --noEmit -p packages/boulder-state/tsconfig.json && tsgo --noEmit -p packages/telemetry-core/tsconfig.json && tsgo --noEmit -p packages/claude-code-compat-core/tsconfig.json && tsgo --noEmit -p packages/skills-loader-core/tsconfig.json && tsgo --noEmit -p packages/agents-md-core/tsconfig.json && tsgo --noEmit -p packages/omo-codex/plugin/shared/tsconfig.json && tsgo --noEmit -p packages/omo-codex/tsconfig.json && tsgo --noEmit -p packages/omo-senpi/tsconfig.json && tsgo --noEmit -p packages/senpi-task/tsconfig.json && tsgo --noEmit -p packages/pi-goal/tsconfig.json && tsgo --noEmit -p packages/pi-webfetch/tsconfig.json && tsgo --noEmit -p packages/omo-opencode/tsconfig.json",
+      "typecheck:packages": "tsgo --noEmit -p packages/rules-engine/tsconfig.json && tsgo --noEmit -p packages/delegate-core/tsconfig.json && tsgo --noEmit -p packages/mcp-stdio-core/tsconfig.json && tsgo --noEmit -p packages/mcp-client-core/tsconfig.json && tsgo --noEmit -p packages/git-bash-mcp/tsconfig.json && tsgo --noEmit -p packages/ast-grep-mcp/tsconfig.json && tsgo --noEmit -p packages/lsp-core/tsconfig.json && tsgo --noEmit -p packages/utils/tsconfig.json && tsgo --noEmit -p packages/model-core/tsconfig.json && tsgo --noEmit -p packages/omo-config-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/tmux-core/tsconfig.json && tsgo --noEmit -p packages/team-core/tsconfig.json && tsgo --noEmit -p packages/openclaw-core/tsconfig.json && tsgo --noEmit -p packages/boulder-state/tsconfig.json && tsgo --noEmit -p packages/memory-core/tsconfig.json && tsgo --noEmit -p packages/telemetry-core/tsconfig.json && tsgo --noEmit -p packages/claude-code-compat-core/tsconfig.json && tsgo --noEmit -p packages/skills-loader-core/tsconfig.json && tsgo --noEmit -p packages/agents-md-core/tsconfig.json && tsgo --noEmit -p packages/omo-codex/plugin/shared/tsconfig.json && tsgo --noEmit -p packages/omo-codex/tsconfig.json && tsgo --noEmit -p packages/omo-senpi/tsconfig.json && tsgo --noEmit -p packages/senpi-task/tsconfig.json && tsgo --noEmit -p packages/pi-goal/tsconfig.json && tsgo --noEmit -p packages/pi-webfetch/tsconfig.json && tsgo --noEmit -p packages/omo-opencode/tsconfig.json && tsgo --noEmit -p packages/omo-native/tsconfig.json",
       "typecheck:script": "tsgo --noEmit -p script/tsconfig.json",
       test: "bun test",
       "test:codex": "bun run build:codex-install && bun run build:git-bash-mcp && bun run build:lsp-tools-mcp && bun run build:lsp-daemon && npm --prefix packages/lsp-tools-mcp test && npm --prefix packages/omo-codex/plugin ci && npm --prefix packages/omo-codex/plugin/components/ulw-loop test && bun run --cwd packages/omo-codex/plugin build && npm --prefix packages/omo-codex/plugin/components/codegraph run typecheck && npm --prefix packages/omo-codex/plugin/components/codegraph test && node scripts/check-third-party-notices.mjs --ship && bun test packages/omo-opencode/src/cli/cli-installer.platform.test.ts packages/omo-codex/src/install/codex-cache.test.ts packages/omo-codex/src/install/codex-cleanup.test.ts packages/omo-codex/src/install/codex-config-agent-cleanup.test.ts packages/omo-codex/src/install/codex-config-autonomous-features.test.ts packages/omo-codex/src/install/codex-config-reasoning.test.ts packages/omo-codex/src/install/codex-config-toml.test.ts packages/omo-codex/src/install/codex-project-local-cleanup.test.ts packages/omo-codex/src/install/install-codex-project-local-cleanup.test.ts packages/omo-codex/src/install/install-codex.test.ts packages/omo-codex/src/install/install-codex-packaged.test.ts packages/omo-codex/src/install/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-delegated-command.test.mjs packages/omo-codex/scripts/install-config-autonomous-features.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-hook-targets.test.mjs packages/omo-codex/scripts/install-project-local-cleanup.test.mjs packages/omo-codex/scripts/install-lazycodex-version-stamp.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-marketplace-cache.test.mjs packages/omo-codex/scripts/install-mcp-context7-runtime.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-generated-bundle.test.mjs packages/omo-codex/scripts/install-agent-links.test.mjs packages/omo-codex/scripts/install-bin-links.test.mjs",
       "test:senpi": "bun run build:senpi-plugin && tsgo --noEmit -p packages/omo-senpi/tsconfig.json && bun test packages/omo-senpi",
       "test:windows-codex": "bun run test:codex",
-      "build:git-bash-mcp": "bun run --cwd packages/git-bash-mcp build"
+      "build:git-bash-mcp": "bun run --cwd packages/git-bash-mcp build",
+      "build:ast-grep-mcp": "bun run --cwd packages/ast-grep-mcp build"
     },
     keywords: [
       "opencode",
@@ -2321,7 +2326,9 @@ var init_package = __esm(() => {
       zod: "^4.4.3"
     },
     devDependencies: {
+      "@code-yeongyu/senpi": "2026.8.9-2",
       "@oh-my-opencode/agents-md-core": "workspace:*",
+      "@oh-my-opencode/ast-grep-mcp": "workspace:*",
       "@oh-my-opencode/boulder-state": "workspace:*",
       "@oh-my-opencode/claude-code-compat-core": "workspace:*",
       "@oh-my-opencode/comment-checker-core": "workspace:*",
@@ -2329,6 +2336,7 @@ var init_package = __esm(() => {
       "@oh-my-opencode/git-bash-mcp": "workspace:*",
       "@oh-my-opencode/hashline-core": "workspace:*",
       "@oh-my-opencode/lsp-core": "workspace:*",
+      "@oh-my-opencode/memory-core": "workspace:*",
       "@oh-my-opencode/mcp-client-core": "workspace:*",
       "@oh-my-opencode/mcp-stdio-core": "workspace:*",
       "@oh-my-opencode/model-core": "workspace:*",
@@ -2358,18 +2366,18 @@ var init_package = __esm(() => {
       typescript: "^7.0.2"
     },
     optionalDependencies: {
-      "oh-my-opencode-darwin-arm64": "4.19.4",
-      "oh-my-opencode-darwin-x64": "4.19.4",
-      "oh-my-opencode-darwin-x64-baseline": "4.19.4",
-      "oh-my-opencode-linux-arm64": "4.19.4",
-      "oh-my-opencode-linux-arm64-musl": "4.19.4",
-      "oh-my-opencode-linux-x64": "4.19.4",
-      "oh-my-opencode-linux-x64-baseline": "4.19.4",
-      "oh-my-opencode-linux-x64-musl": "4.19.4",
-      "oh-my-opencode-linux-x64-musl-baseline": "4.19.4",
-      "oh-my-opencode-windows-arm64": "4.19.4",
-      "oh-my-opencode-windows-x64": "4.19.4",
-      "oh-my-opencode-windows-x64-baseline": "4.19.4"
+      "oh-my-opencode-darwin-arm64": "5.0.0-beta.2",
+      "oh-my-opencode-darwin-x64": "5.0.0-beta.2",
+      "oh-my-opencode-darwin-x64-baseline": "5.0.0-beta.2",
+      "oh-my-opencode-linux-arm64": "5.0.0-beta.2",
+      "oh-my-opencode-linux-arm64-musl": "5.0.0-beta.2",
+      "oh-my-opencode-linux-x64": "5.0.0-beta.2",
+      "oh-my-opencode-linux-x64-baseline": "5.0.0-beta.2",
+      "oh-my-opencode-linux-x64-musl": "5.0.0-beta.2",
+      "oh-my-opencode-linux-x64-musl-baseline": "5.0.0-beta.2",
+      "oh-my-opencode-windows-arm64": "5.0.0-beta.2",
+      "oh-my-opencode-windows-x64": "5.0.0-beta.2",
+      "oh-my-opencode-windows-x64-baseline": "5.0.0-beta.2"
     },
     overrides: {
       "@earendil-works/pi-agent-core": "0.80.3",
@@ -22396,6 +22404,80 @@ var init_codegraph = __esm(() => {
   }).strict();
 });
 
+// packages/omo-config-core/src/schema/memory.ts
+var OmoMemoryReflectionTriggerSchema, OmoMemoryReflectionSchema, OmoMemorySyncSchema, OmoMemorySearchSchema, OmoMemoryReflectionTriggerLayerSchema, OmoMemoryReflectionLayerSchema, OmoMemorySyncLayerSchema, OmoMemorySearchLayerSchema, OmoMemoryAgentOverridesSchema, OmoMemorySettingsSchema, OmoMemorySettingsLayerSchema;
+var init_memory = __esm(() => {
+  init_zod();
+  OmoMemoryReflectionTriggerSchema = object({
+    step_count: number2().int().nonnegative().default(0),
+    on_compaction: boolean2().default(true)
+  }).strict();
+  OmoMemoryReflectionSchema = object({
+    trigger: OmoMemoryReflectionTriggerSchema.default({ step_count: 0, on_compaction: true }),
+    merge: _enum2(["auto", "integration"]).default("auto"),
+    category: string2().min(1).default("quick"),
+    timeout_minutes: number2().int().positive().default(15),
+    sandbox: _enum2(["auto", "required", "off"]).default("auto")
+  }).strict();
+  OmoMemorySyncSchema = object({
+    remote: string2().min(1).optional(),
+    enabled: boolean2().default(true)
+  }).strict();
+  OmoMemorySearchSchema = object({
+    enabled: boolean2().default(true)
+  }).strict();
+  OmoMemoryReflectionTriggerLayerSchema = object({
+    step_count: number2().int().nonnegative().optional(),
+    on_compaction: boolean2().optional()
+  }).strict();
+  OmoMemoryReflectionLayerSchema = object({
+    trigger: OmoMemoryReflectionTriggerLayerSchema.optional(),
+    merge: _enum2(["auto", "integration"]).optional(),
+    category: string2().min(1).optional(),
+    timeout_minutes: number2().int().positive().optional(),
+    sandbox: _enum2(["auto", "required", "off"]).optional()
+  }).strict();
+  OmoMemorySyncLayerSchema = object({
+    remote: string2().min(1).optional(),
+    enabled: boolean2().optional()
+  }).strict();
+  OmoMemorySearchLayerSchema = object({
+    enabled: boolean2().optional()
+  }).strict();
+  OmoMemoryAgentOverridesSchema = object({
+    enabled: boolean2().optional(),
+    agent: string2().min(1).optional(),
+    reflection: OmoMemoryReflectionLayerSchema.optional(),
+    sync: OmoMemorySyncLayerSchema.optional(),
+    search: OmoMemorySearchLayerSchema.optional(),
+    compile_warn_tokens: number2().int().positive().optional()
+  }).strict();
+  OmoMemorySettingsSchema = object({
+    enabled: boolean2().default(true),
+    agent: string2().min(1).default("auto"),
+    reflection: OmoMemoryReflectionSchema.default({
+      trigger: { step_count: 0, on_compaction: true },
+      merge: "auto",
+      category: "quick",
+      timeout_minutes: 15,
+      sandbox: "auto"
+    }),
+    sync: OmoMemorySyncSchema.default({ enabled: true }),
+    search: OmoMemorySearchSchema.default({ enabled: true }),
+    compile_warn_tokens: number2().int().positive().default(30000),
+    agents: record(string2(), OmoMemoryAgentOverridesSchema).default({})
+  }).strict();
+  OmoMemorySettingsLayerSchema = object({
+    enabled: boolean2().optional(),
+    agent: string2().min(1).optional(),
+    reflection: OmoMemoryReflectionLayerSchema.optional(),
+    sync: OmoMemorySyncLayerSchema.optional(),
+    search: OmoMemorySearchLayerSchema.optional(),
+    compile_warn_tokens: number2().int().positive().optional(),
+    agents: record(string2(), OmoMemoryAgentOverridesSchema).optional()
+  }).strict();
+});
+
 // packages/omo-config-core/src/schema/model-catalog.ts
 function isRecord5(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
@@ -22419,9 +22501,18 @@ var init_model_catalog = __esm(() => {
 });
 
 // packages/omo-config-core/src/schema/task.ts
-var OmoTaskWaitSchema, OmoTaskTeamSettingsSchema, OmoTaskWarningsSchema, OmoTaskSettingsSchema, OmoTaskWaitLayerSchema, OmoTaskTeamSettingsLayerSchema, OmoTaskWarningsLayerSchema, OmoTaskSettingsLayerSchema;
+import { availableParallelism } from "node:os";
+function resolveOmoTaskSettings(input, resolveParallelism = availableParallelism) {
+  const record2 = record(string2(), unknown()).parse(input);
+  return OmoTaskSettingsSchema.parse({
+    ...record2,
+    residency_max_children: record2["residency_max_children"] ?? Math.max(8, resolveParallelism() * 3)
+  });
+}
+var ResidencyMaxChildrenInputSchema, OmoTaskWaitSchema, OmoTaskTeamSettingsSchema, OmoTaskWarningsSchema, OmoTaskSettingsSchema, OmoTaskWaitLayerSchema, OmoTaskTeamSettingsLayerSchema, OmoTaskWarningsLayerSchema, OmoTaskSettingsLayerSchema;
 var init_task = __esm(() => {
   init_zod();
+  ResidencyMaxChildrenInputSchema = union([number2().int().positive(), literal("unlimited")]);
   OmoTaskWaitSchema = object({
     min_ms: number2().int().positive().default(5000),
     default_ms: number2().int().positive().default(60000),
@@ -22441,10 +22532,11 @@ var init_task = __esm(() => {
     provider_concurrency: record(string2(), number2().int().positive()).optional(),
     model_concurrency: record(string2(), number2().int().positive()).optional(),
     max_depth: number2().int().nonnegative().default(1),
-    residency_max_children: number2().int().positive().default(8),
+    residency_max_children: ResidencyMaxChildrenInputSchema.default(8),
     ttl_ms: number2().int().positive().default(86400000),
     state_dir: string2().optional(),
     reattach_on_reconcile: boolean2().optional(),
+    resume_children: boolean2().default(true),
     warnings: OmoTaskWarningsSchema.default({ unavailable_categories: true }),
     wait: OmoTaskWaitSchema.default({ min_ms: 5000, default_ms: 60000, max_ms: 600000 }),
     team: OmoTaskTeamSettingsSchema.default({
@@ -22472,10 +22564,11 @@ var init_task = __esm(() => {
     provider_concurrency: record(string2(), number2().int().positive()).optional(),
     model_concurrency: record(string2(), number2().int().positive()).optional(),
     max_depth: number2().int().nonnegative().optional(),
-    residency_max_children: number2().int().positive().optional(),
+    residency_max_children: ResidencyMaxChildrenInputSchema.optional(),
     ttl_ms: number2().int().positive().optional(),
     state_dir: string2().optional(),
     reattach_on_reconcile: boolean2().optional(),
+    resume_children: boolean2().optional(),
     warnings: OmoTaskWarningsLayerSchema.optional(),
     wait: OmoTaskWaitLayerSchema.optional(),
     team: OmoTaskTeamSettingsLayerSchema.optional()
@@ -22540,6 +22633,7 @@ var init_config = __esm(() => {
   init_agent();
   init_category();
   init_codegraph();
+  init_memory();
   init_model_catalog();
   init_task();
   init_team();
@@ -22550,7 +22644,8 @@ var init_config = __esm(() => {
     codegraph: OmoCodegraphSettingsLayerSchema.optional(),
     task: OmoTaskSettingsLayerSchema.optional(),
     teams: OmoTeamsConfigLayerSchema.optional(),
-    models: OmoModelCatalogLayerSchema.optional()
+    models: OmoModelCatalogLayerSchema.optional(),
+    memory: OmoMemorySettingsLayerSchema.optional()
   }).strict();
   OmoConfigProfileSchema = object({
     categories: OmoCategoriesConfigSchema.optional(),
@@ -22559,6 +22654,7 @@ var init_config = __esm(() => {
     task: OmoTaskSettingsLayerSchema.optional(),
     teams: OmoTeamsConfigLayerSchema.optional(),
     models: OmoModelCatalogLayerSchema.optional(),
+    memory: OmoMemorySettingsLayerSchema.optional(),
     "[opencode]": OmoOpenCodeHarnessConfigSchema.optional(),
     "[senpi]": OmoTypedHarnessConfigSchema.optional(),
     "[codex]": OmoTypedHarnessConfigSchema.optional()
@@ -22571,6 +22667,7 @@ var init_config = __esm(() => {
     task: OmoTaskSettingsSchema.optional(),
     teams: OmoTeamsConfigSchema.optional(),
     models: OmoModelCatalogSchema.optional(),
+    memory: OmoMemorySettingsSchema.optional(),
     "[opencode]": OmoOpenCodeHarnessConfigSchema.optional(),
     "[senpi]": OmoTypedHarnessConfigSchema.optional(),
     "[codex]": OmoTypedHarnessConfigSchema.optional(),
@@ -22586,6 +22683,7 @@ var init_config = __esm(() => {
     task: OmoTaskSettingsLayerSchema.optional(),
     teams: OmoTeamsConfigLayerSchema.optional(),
     models: OmoModelCatalogLayerSchema.optional(),
+    memory: OmoMemorySettingsLayerSchema.optional(),
     "[opencode]": OmoOpenCodeHarnessConfigSchema.optional(),
     "[senpi]": OmoTypedHarnessConfigSchema.optional(),
     "[codex]": OmoTypedHarnessConfigSchema.optional(),
@@ -22603,6 +22701,7 @@ var init_schema = __esm(() => {
   init_config();
   init_fallback_models();
   init_harness();
+  init_memory();
   init_model_catalog();
   init_model_ref();
   init_task();
@@ -22967,7 +23066,7 @@ var init_loader = __esm(() => {
     agents: {},
     categories: {},
     codegraph: OmoCodegraphSettingsSchema.parse({}),
-    task: OmoTaskSettingsSchema.parse({}),
+    task: resolveOmoTaskSettings({}),
     teams: {}
   };
 });
@@ -23339,6 +23438,21 @@ var init_plain_object = __esm(() => {
   DANGEROUS_KEYS3 = new Set(["__proto__", "constructor", "prototype"]);
 });
 
+// packages/omo-config-core/src/migration/backup-move.ts
+function isCrossDeviceError(error51) {
+  return error51 instanceof Error && Reflect.get(error51, "code") === "EXDEV";
+}
+function moveMigrationBackup(fileSystem, sourcePath, backupPath) {
+  try {
+    fileSystem.renameSync(sourcePath, backupPath);
+  } catch (error51) {
+    if (!isCrossDeviceError(error51))
+      throw error51;
+    fileSystem.copyFileSync(sourcePath, backupPath);
+    fileSystem.unlinkSync(sourcePath);
+  }
+}
+
 // packages/omo-config-core/src/migration/merge.ts
 function displayValue(value) {
   const encoded = JSON.stringify(value);
@@ -23872,7 +23986,7 @@ function resumeMigrationJournal(input) {
       if (input.fileSystem.existsSync(move.to)) {
         throw new MigrationTransactionError(`Migration backup path already exists: ${move.to}`);
       }
-      input.fileSystem.renameSync(move.from, move.to);
+      moveMigrationBackup(input.fileSystem, move.from, move.to);
     } else if (!input.fileSystem.existsSync(move.to)) {
       throw new MigrationTransactionError(`Migration source and backup are both missing: ${move.from}`);
     }
@@ -24000,7 +24114,7 @@ function executePlan(input) {
     input.renewLock();
     if (fileSystem.existsSync(move.to))
       throw new MigrationTransactionError(`Migration backup path already exists: ${move.to}`);
-    fileSystem.renameSync(move.from, move.to);
+    moveMigrationBackup(fileSystem, move.from, move.to);
     input.onBoundary?.("source-moved");
     Object.assign(targetRecorded, { completedMoves: [...targetRecorded.completedMoves, move.from] });
     writeMigrationJournal(targetRecorded, fileSystem, env, input.process, input.clock);
@@ -24100,94 +24214,12 @@ function sgBinaryName(platform = process.platform) {
 }
 var init_sg_manifest = () => {};
 
-// packages/utils/src/ast-grep/sg-provisioner.ts
-var init_sg_provisioner = () => {};
-
-// packages/utils/src/ast-grep/types.ts
-var SG_PATH_ENV_KEY = "OMO_AST_GREP_SG_PATH";
-
-// packages/utils/src/ast-grep/sg-resolver.ts
-import { execFileSync as execFileSync2 } from "node:child_process";
-import { existsSync as existsSync5, statSync as statSync2 } from "node:fs";
-import { join as join8 } from "node:path";
-function nonEmptyValue(value) {
-  const trimmed = value?.trim();
-  return trimmed === undefined || trimmed.length === 0 ? null : trimmed;
-}
-function defaultFileExists(filePath) {
-  if (!existsSync5(filePath))
-    return false;
-  try {
-    const stats = statSync2(filePath);
-    return stats.isFile() && stats.size > 0;
-  } catch (error51) {
-    if (error51 instanceof Error)
-      return false;
-    return false;
-  }
-}
-function defaultVersionProbe(binaryPath) {
-  return String(execFileSync2(binaryPath, ["--version"], {
-    encoding: "utf8",
-    stdio: ["ignore", "pipe", "ignore"],
-    timeout: 5000
-  }));
-}
-function isAstGrepVersionOutput(output) {
-  return output.toLowerCase().includes("ast-grep");
-}
-function hasAstGrepVersion(binaryPath, runVersionProbeSync) {
-  try {
-    return isAstGrepVersionOutput(runVersionProbeSync(binaryPath));
-  } catch (error51) {
-    if (error51 instanceof Error)
-      return false;
-    return false;
-  }
-}
-function pathCommandCandidates() {
-  return ["ast-grep", "sg"];
-}
-function findSgBinarySync(options = {}) {
-  const env = options.env ?? process.env;
-  const platform = options.platform ?? process.platform;
-  const fileExists = options.fileExists ?? defaultFileExists;
-  const runVersionProbeSync = options.runVersionProbeSync ?? defaultVersionProbe;
-  const which2 = options.which ?? bunWhich;
-  try {
-    const envOverride = nonEmptyValue(env[SG_PATH_ENV_KEY]);
-    if (envOverride !== null && fileExists(envOverride))
-      return envOverride;
-    if (options.runtimeDir !== undefined) {
-      const runtimeCandidate = join8(options.runtimeDir, sgBinaryName(platform));
-      if (fileExists(runtimeCandidate))
-        return runtimeCandidate;
-    }
-    for (const commandName of pathCommandCandidates()) {
-      const pathCandidate = which2(commandName);
-      if (pathCandidate === null || !fileExists(pathCandidate))
-        continue;
-      if (commandName !== "sg" || hasAstGrepVersion(pathCandidate, runVersionProbeSync))
-        return pathCandidate;
-    }
-    return null;
-  } catch (error51) {
-    if (error51 instanceof Error)
-      return null;
-    return null;
-  }
-}
-var init_sg_resolver = __esm(() => {
-  init_which();
-  init_sg_manifest();
-});
-
 // packages/utils/src/ast-grep/install-script.ts
 import { spawn as spawn3 } from "node:child_process";
-import { existsSync as existsSync6 } from "node:fs";
-import { join as join9 } from "node:path";
+import { existsSync as existsSync5 } from "node:fs";
+import { join as join8 } from "node:path";
 function astGrepRuntimeDir(baseDir, platform = process.platform, arch = process.arch) {
-  return join9(baseDir, "runtime", "ast-grep", runtimeSlug(platform, arch));
+  return join8(baseDir, "runtime", "ast-grep", runtimeSlug(platform, arch));
 }
 function isMissingExecutable(error51) {
   if (!("code" in error51))
@@ -24225,7 +24257,7 @@ function defaultSpawnProcess(command, args, options) {
   };
 }
 function scriptPathForPlatform(skillDir, platform) {
-  return join9(skillDir, platform === "win32" ? "install.ps1" : "install.sh");
+  return join8(skillDir, platform === "win32" ? "install.ps1" : "install.sh");
 }
 function invocationsForPlatform(scriptPath, platform) {
   if (platform !== "win32")
@@ -24253,7 +24285,7 @@ function failedReason(outcome) {
 }
 async function runAstGrepSkillInstall(options) {
   const platform = options.platform ?? process.platform;
-  const fileExists = options.fileExists ?? existsSync6;
+  const fileExists = options.fileExists ?? existsSync5;
   const scriptPath = scriptPathForPlatform(options.skillDir, platform);
   if (!fileExists(scriptPath))
     return { kind: "skipped", reason: `missing ${scriptPath}` };
@@ -24287,8 +24319,225 @@ var init_install_script = __esm(() => {
   init_sg_manifest();
 });
 
+// packages/utils/src/ast-grep/types.ts
+var SG_PATH_ENV_KEY = "OMO_AST_GREP_SG_PATH", SG_BINARY_NOT_FOUND = "BINARY_NOT_FOUND";
+
+// packages/utils/src/ast-grep/sg-candidates.ts
+import { homedir } from "node:os";
+import { join as join9 } from "node:path";
+function nonEmptyValue(value) {
+  const trimmed = value?.trim();
+  return trimmed === undefined || trimmed.length === 0 ? null : trimmed;
+}
+function astGrepBinaryName(platform) {
+  return platform === "win32" ? "ast-grep.exe" : "ast-grep";
+}
+function candidate(tier, path3) {
+  return { path: path3, tier };
+}
+function envOverrideCandidates(env) {
+  const override = nonEmptyValue(env[SG_PATH_ENV_KEY]);
+  return override === null ? [] : [candidate("env-override", override)];
+}
+function omoRuntimeCandidates(options) {
+  const binaryName = sgBinaryName(options.platform);
+  const slug = runtimeSlug(options.platform, options.arch);
+  const paths2 = [];
+  if (options.runtimeDir !== undefined)
+    paths2.push(join9(options.runtimeDir, binaryName));
+  const codexHome = nonEmptyValue(options.env["CODEX_HOME"]);
+  if (codexHome !== null)
+    paths2.push(join9(codexHome, "runtime", "ast-grep", slug, binaryName));
+  paths2.push(join9(options.homeDir, ".omo", "runtime", "ast-grep", slug, binaryName));
+  return paths2.map((path3) => candidate("omo-runtime", path3));
+}
+function skillBinCandidates(options) {
+  const names = [astGrepBinaryName(options.platform), sgBinaryName(options.platform)];
+  const directories = [];
+  const cacheDir = nonEmptyValue(options.env[AST_GREP_BIN_DIR_ENV_KEY]);
+  if (cacheDir !== null)
+    directories.push(cacheDir);
+  if (options.packageDir !== undefined)
+    directories.push(join9(options.packageDir, "bin"));
+  return directories.flatMap((directory) => names.map((name) => candidate("skill-bin", join9(directory, name))));
+}
+function homebrewCandidates(platform) {
+  const prefixes = platform === "darwin" || platform === "linux" || platform === "win32" ? HOMEBREW_PREFIXES[platform] : [];
+  const names = [astGrepBinaryName(platform), sgBinaryName(platform)];
+  return prefixes.flatMap((prefix) => names.map((name) => candidate("homebrew", join9(prefix, name))));
+}
+function planSgCandidates(options) {
+  const env = options.env ?? process.env;
+  const platform = options.platform ?? process.platform;
+  const arch = options.arch ?? process.arch;
+  const homeDir = options.homeDir ?? homedir();
+  return {
+    afterPath: homebrewCandidates(platform),
+    beforePath: [
+      ...envOverrideCandidates(env),
+      ...omoRuntimeCandidates({ arch, env, homeDir, platform, runtimeDir: options.runtimeDir }),
+      ...skillBinCandidates({ env, packageDir: options.packageDir, platform })
+    ],
+    pathCommands: ["ast-grep", "sg"]
+  };
+}
+var HOMEBREW_PREFIXES;
+var init_sg_candidates = __esm(() => {
+  init_install_script();
+  init_sg_manifest();
+  HOMEBREW_PREFIXES = {
+    darwin: ["/opt/homebrew/bin", "/usr/local/bin"],
+    linux: ["/home/linuxbrew/.linuxbrew/bin", "/usr/local/bin"],
+    win32: []
+  };
+});
+
+// packages/utils/src/ast-grep/sg-install-hints.ts
+function platformHints(platform) {
+  if (platform === "darwin")
+    return DARWIN_HINTS;
+  if (platform === "win32")
+    return WIN32_HINTS;
+  return LINUX_HINTS;
+}
+function sgInstallHints(platform = process.platform) {
+  return [...platformHints(platform), OMO_PROVISION_HINT, ENV_OVERRIDE_HINT];
+}
+function sgBinaryNotFoundMessage(platform = process.platform) {
+  return `ast-grep binary not found for ${platform}: no candidate passed the --version probe across the env override, OMO runtime, skill bin cache, PATH, or Homebrew prefixes.`;
+}
+var OMO_PROVISION_HINT = "Start an OMO session so the bundled ast-grep skill provisions the pinned runtime automatically", ENV_OVERRIDE_HINT, DARWIN_HINTS, LINUX_HINTS, WIN32_HINTS;
+var init_sg_install_hints = __esm(() => {
+  ENV_OVERRIDE_HINT = `Or point ${SG_PATH_ENV_KEY} at an existing ast-grep binary`;
+  DARWIN_HINTS = [
+    "brew install ast-grep",
+    "npm install -g @ast-grep/cli",
+    "cargo install ast-grep --locked"
+  ];
+  LINUX_HINTS = [
+    "npm install -g @ast-grep/cli",
+    "cargo install ast-grep --locked",
+    "brew install ast-grep  # linuxbrew"
+  ];
+  WIN32_HINTS = [
+    "scoop install main/ast-grep",
+    "winget install ast-grep",
+    "choco install ast-grep",
+    "npm install -g @ast-grep/cli"
+  ];
+});
+
+// packages/utils/src/ast-grep/sg-provisioner.ts
+var init_sg_provisioner = () => {};
+
+// packages/utils/src/ast-grep/sg-resolver.ts
+import { execFileSync as execFileSync2 } from "node:child_process";
+import { existsSync as existsSync6, statSync as statSync2 } from "node:fs";
+function cacheFingerprint(options, plan) {
+  return JSON.stringify([
+    options.platform ?? process.platform,
+    options.arch ?? process.arch,
+    plan.beforePath.map((candidate2) => candidate2.path)
+  ]);
+}
+function defaultFileExists(filePath) {
+  if (!existsSync6(filePath))
+    return false;
+  try {
+    const stats = statSync2(filePath);
+    return stats.isFile() && stats.size > 0;
+  } catch {
+    return false;
+  }
+}
+function defaultVersionProbe(binaryPath) {
+  return String(execFileSync2(binaryPath, ["--version"], {
+    encoding: "utf8",
+    stdio: ["ignore", "pipe", "ignore"],
+    timeout: SG_VERSION_PROBE_TIMEOUT_MS
+  }));
+}
+function probePasses(binaryPath, deps) {
+  try {
+    return deps.runVersionProbeSync(binaryPath).toLowerCase().includes("ast-grep");
+  } catch {
+    return false;
+  }
+}
+function acceptsCandidate(binaryPath, deps) {
+  return deps.fileExists(binaryPath) && probePasses(binaryPath, deps);
+}
+function firstAccepted(candidates, deps) {
+  for (const candidate2 of candidates) {
+    if (acceptsCandidate(candidate2.path, deps))
+      return { found: true, path: candidate2.path, tier: candidate2.tier };
+  }
+  return null;
+}
+function pathCandidates(commands, deps) {
+  const resolved = [];
+  for (const commandName of commands) {
+    const found = deps.which(commandName);
+    if (found !== null)
+      resolved.push({ path: found, tier: "path" });
+  }
+  return resolved;
+}
+function notFound(platform) {
+  return {
+    error: { code: SG_BINARY_NOT_FOUND, hints: sgInstallHints(platform), message: sgBinaryNotFoundMessage(platform) },
+    found: false
+  };
+}
+function cacheIsStillValid(resolution2, deps, revalidate) {
+  if (!resolution2.found)
+    return false;
+  if (!deps.fileExists(resolution2.path))
+    return false;
+  return !revalidate || probePasses(resolution2.path, deps);
+}
+function resolverDeps(options) {
+  return {
+    fileExists: options.fileExists ?? defaultFileExists,
+    platform: options.platform ?? process.platform,
+    runVersionProbeSync: options.runVersionProbeSync ?? defaultVersionProbe,
+    which: options.which ?? bunWhich
+  };
+}
+function resolveSgBinarySync(options = {}) {
+  const deps = resolverDeps(options);
+  const useCache = options.cache ?? true;
+  try {
+    const plan = planSgCandidates(options);
+    const fingerprint = cacheFingerprint(options, plan);
+    if (useCache && cacheEntry !== null && cacheEntry.fingerprint === fingerprint) {
+      if (cacheIsStillValid(cacheEntry.resolution, deps, options.revalidate ?? false))
+        return cacheEntry.resolution;
+      cacheEntry = null;
+    }
+    const resolution2 = firstAccepted(plan.beforePath, deps) ?? firstAccepted(pathCandidates(plan.pathCommands, deps), deps) ?? firstAccepted(plan.afterPath, deps) ?? notFound(deps.platform);
+    if (useCache && resolution2.found)
+      cacheEntry = { fingerprint, resolution: resolution2 };
+    return resolution2;
+  } catch {
+    return notFound(deps.platform);
+  }
+}
+function findSgBinarySync(options = {}) {
+  const resolution2 = resolveSgBinarySync(options);
+  return resolution2.found ? resolution2.path : null;
+}
+var SG_VERSION_PROBE_TIMEOUT_MS = 5000, cacheEntry = null;
+var init_sg_resolver = __esm(() => {
+  init_which();
+  init_sg_candidates();
+  init_sg_install_hints();
+});
+
 // packages/utils/src/ast-grep/index.ts
 var init_ast_grep = __esm(() => {
+  init_sg_candidates();
+  init_sg_install_hints();
   init_sg_manifest();
   init_sg_provisioner();
   init_sg_resolver();
@@ -24296,7 +24545,7 @@ var init_ast_grep = __esm(() => {
 });
 
 // packages/utils/src/classify-path-environment.ts
-import { homedir } from "node:os";
+import { homedir as homedir2 } from "node:os";
 import path3 from "node:path";
 function normalizeInputPath(absolutePath) {
   return absolutePath.replaceAll("\\", "/");
@@ -24321,7 +24570,7 @@ function classifyPathEnvironment(absolutePath) {
   if (normalizedPath.startsWith("/Users/") && (normalizedPath.includes("/Desktop/") || normalizedPath.endsWith("/Desktop") || normalizedPath.includes("/Documents/") || normalizedPath.endsWith("/Documents"))) {
     return "desktop-sync";
   }
-  const normalizedHome = normalizeInputPath(homedir());
+  const normalizedHome = normalizeInputPath(homedir2());
   const desktopPath = normalizeInputPath(path3.join(normalizedHome, "Desktop"));
   const documentsPath = normalizeInputPath(path3.join(normalizedHome, "Documents"));
   if (isUnderPath(normalizedPath, desktopPath) || isUnderPath(normalizedPath, documentsPath)) {
@@ -24468,16 +24717,16 @@ function defaultNodeRuntime(env, fileExists, which2, nodeVersion) {
   }
   const candidates = [
     ...isNodeExecutableName(process.execPath) ? [process.execPath] : [],
-    ...CODEGRAPH_NODE_CANDIDATES.map((commandName) => which2(commandName)).filter((candidate) => candidate !== null),
-    ...CODEGRAPH_NODE_PATH_CANDIDATES.filter((candidate) => fileExists(candidate))
+    ...CODEGRAPH_NODE_CANDIDATES.map((commandName) => which2(commandName)).filter((candidate2) => candidate2 !== null),
+    ...CODEGRAPH_NODE_PATH_CANDIDATES.filter((candidate2) => fileExists(candidate2))
   ];
   const seen = new Set;
-  for (const candidate of candidates) {
-    if (seen.has(candidate))
+  for (const candidate2 of candidates) {
+    if (seen.has(candidate2))
       continue;
-    seen.add(candidate);
-    if (supportsCodegraphNodeRuntime(candidate, env, nodeVersion))
-      return candidate;
+    seen.add(candidate2);
+    if (supportsCodegraphNodeRuntime(candidate2, env, nodeVersion))
+      return candidate2;
   }
   return null;
 }
@@ -25574,7 +25823,7 @@ function hasObjectSessionPath(input) {
 }
 function isObjectPathTypeError(error51) {
   const message = error51 instanceof Error ? error51.message : typeof error51 === "string" ? error51 : "";
-  return message.includes('The "path" property must be of type string') && message.includes("got object");
+  return message.includes('The "path" property must be of type string') && (message.includes("got object") || message.includes("got undefined"));
 }
 async function dispatchWithPathCompatibility(dispatch, input) {
   try {
@@ -26221,7 +26470,26 @@ var init_model_requirements = __esm(() => {
 });
 
 // packages/model-core/src/model-family-detectors.ts
-var init_model_family_detectors = () => {};
+function extractModelName(model) {
+  return model.includes("/") ? model.split("/").pop() ?? model : model;
+}
+function isClaudeOpus47OrLaterModel(model) {
+  const modelName = extractModelName(model).toLowerCase().replaceAll(".", "-");
+  if (modelName.includes("claude-fable"))
+    return true;
+  const match = CLAUDE_OPUS_VERSION_RE.exec(modelName);
+  if (!match)
+    return false;
+  const major = Number(match[1]);
+  const minor = match[2] === undefined ? 0 : Number(match[2]);
+  if (Number.isNaN(major) || Number.isNaN(minor))
+    return false;
+  return major > 4 || major === 4 && minor >= 7;
+}
+var CLAUDE_OPUS_VERSION_RE;
+var init_model_family_detectors = __esm(() => {
+  CLAUDE_OPUS_VERSION_RE = /claude-opus-(\d+)(?:-(\d+))?/;
+});
 
 // packages/model-core/src/model-capability-aliases.ts
 function normalizeLookupModelID(modelID) {
@@ -26319,9 +26587,83 @@ function normalizeModelID(modelID) {
   return modelID.replace(/\.(\d+)/g, "-$1");
 }
 
+// packages/model-core/src/reasoning-level.ts
+function isReasoningLevelOrAuto(value) {
+  return REASONING_LEVEL_OR_AUTO_SET2.has(value);
+}
+function clampReasoningLevel(value, allowed) {
+  const ladder = REASONING_LEVELS2;
+  const requestedIndex = ladder.indexOf(value);
+  if (requestedIndex === -1)
+    return;
+  for (let index = requestedIndex;index >= 0; index -= 1) {
+    const candidate2 = REASONING_LEVELS2[index];
+    if (candidate2 !== undefined && allowed.includes(candidate2))
+      return candidate2;
+  }
+  return;
+}
+function splitReasoningSuffix2(model, options) {
+  if (typeof model !== "string")
+    return { base: "" };
+  const trimmed = model.trim();
+  if (!trimmed)
+    return { base: "" };
+  const separatorIndex = trimmed.lastIndexOf(":");
+  if (separatorIndex === -1)
+    return { base: trimmed };
+  const base = trimmed.slice(0, separatorIndex).trim();
+  const token = trimmed.slice(separatorIndex + 1).trim().toLowerCase();
+  if (!base || !isReasoningLevelOrAuto(token))
+    return { base: trimmed };
+  if (token === "max" && !(options?.allowMaxSuffix ?? base.includes("/")))
+    return { base: trimmed };
+  return { base, level: token };
+}
+var REASONING_LEVELS2, REASONING_AUTO2 = "auto", REASONING_LEVEL_SET2, REASONING_LEVEL_OR_AUTO_SET2;
+var init_reasoning_level = __esm(() => {
+  REASONING_LEVELS2 = ["off", "minimal", "low", "medium", "high", "xhigh", "max"];
+  REASONING_LEVEL_SET2 = new Set(REASONING_LEVELS2);
+  REASONING_LEVEL_OR_AUTO_SET2 = new Set([...REASONING_LEVELS2, REASONING_AUTO2]);
+});
+
+// packages/model-core/src/model-string-parser.ts
+function parseVariantFromModelID(rawModelID, options) {
+  if (typeof rawModelID !== "string") {
+    return { modelID: "" };
+  }
+  const trimmedModelID = rawModelID.trim();
+  if (!trimmedModelID) {
+    return { modelID: "" };
+  }
+  const parenthesizedVariant = trimmedModelID.match(/^(.*)\(([^()]+)\)\s*$/);
+  if (parenthesizedVariant) {
+    const modelID = parenthesizedVariant[1]?.trim() ?? "";
+    const variant = parenthesizedVariant[2]?.trim();
+    return variant ? { modelID, variant } : { modelID };
+  }
+  const suffixedModel = splitReasoningSuffix2(trimmedModelID, options);
+  if (suffixedModel.level) {
+    return { modelID: suffixedModel.base, variant: suffixedModel.level };
+  }
+  const spaceVariant = trimmedModelID.match(/^(.*\S)\s+([a-z][a-z0-9_-]*)$/i);
+  if (spaceVariant) {
+    const modelID = spaceVariant[1]?.trim() ?? "";
+    const variant = spaceVariant[2]?.trim().toLowerCase();
+    if (variant) {
+      return { modelID, variant };
+    }
+  }
+  return { modelID: trimmedModelID };
+}
+var init_model_string_parser = __esm(() => {
+  init_reasoning_level();
+});
+
 // packages/model-core/src/model-capability-heuristics.ts
 function detectHeuristicModelFamily(modelID) {
-  const normalizedModelID = normalizeModelID(modelID).toLowerCase();
+  const parsedModel = parseVariantFromModelID(modelID, { allowMaxSuffix: true });
+  const normalizedModelID = normalizeModelID(parsedModel.modelID).toLowerCase();
   for (const definition of HEURISTIC_MODEL_FAMILY_REGISTRY) {
     if (definition.pattern?.test(normalizedModelID)) {
       return definition;
@@ -26334,6 +26676,7 @@ function detectHeuristicModelFamily(modelID) {
 }
 var HEURISTIC_MODEL_FAMILY_REGISTRY;
 var init_model_capability_heuristics = __esm(() => {
+  init_model_string_parser();
   HEURISTIC_MODEL_FAMILY_REGISTRY = [
     {
       family: "claude-opus",
@@ -26347,11 +26690,19 @@ var init_model_capability_heuristics = __esm(() => {
       variants: ["low", "medium", "high"],
       supportsThinking: true
     },
+    {
+      family: "openai-deep-research",
+      includes: ["o3-deep-research", "o4-mini-deep-research"],
+      variants: ["low", "medium", "high"],
+      reasoningEfforts: ["none", "minimal", "low", "medium", "high"],
+      supportsTemperature: true
+    },
     {
       family: "openai-reasoning",
       pattern: /(?:^|\/)o\d(?:$|-)/,
       variants: ["low", "medium", "high"],
-      reasoningEfforts: ["none", "minimal", "low", "medium", "high"]
+      reasoningEfforts: ["none", "minimal", "low", "medium", "high"],
+      supportsTemperature: false
     },
     {
       family: "gpt-5",
@@ -26395,7 +26746,13 @@ var init_model_capability_heuristics = __esm(() => {
     {
       family: "glm",
       includes: ["glm"],
-      variants: ["low", "medium", "high"]
+      variants: ["low", "medium", "high", "max"],
+      reasoningEfforts: ["high", "max"],
+      reasoningEffortAliases: {
+        low: "high",
+        medium: "high",
+        xhigh: "max"
+      }
     },
     {
       family: "minimax",
@@ -26430,26 +26787,6 @@ var init_model_capability_heuristics = __esm(() => {
 // packages/model-core/src/model-capability-guardrails.ts
 var init_model_capability_guardrails = () => {};
 
-// packages/model-core/src/reasoning-level.ts
-function clampReasoningLevel(value, allowed) {
-  const ladder = REASONING_LEVELS2;
-  const requestedIndex = ladder.indexOf(value);
-  if (requestedIndex === -1)
-    return;
-  for (let index = requestedIndex;index >= 0; index -= 1) {
-    const candidate = REASONING_LEVELS2[index];
-    if (candidate !== undefined && allowed.includes(candidate))
-      return candidate;
-  }
-  return;
-}
-var REASONING_LEVELS2, REASONING_AUTO2 = "auto", REASONING_LEVEL_SET2, REASONING_LEVEL_OR_AUTO_SET2;
-var init_reasoning_level = __esm(() => {
-  REASONING_LEVELS2 = ["off", "minimal", "low", "medium", "high", "xhigh", "max"];
-  REASONING_LEVEL_SET2 = new Set(REASONING_LEVELS2);
-  REASONING_LEVEL_OR_AUTO_SET2 = new Set([...REASONING_LEVELS2, REASONING_AUTO2]);
-});
-
 // packages/model-core/src/model-settings-compatibility.ts
 function downgradeWithinLadder(value, allowed) {
   return clampReasoningLevel(value, allowed);
@@ -26517,12 +26854,14 @@ function resolveCompatibleModelSettings(input) {
     reasoningEffort = resolved.value;
   }
   let temperature = input.desired.temperature;
-  if (temperature !== undefined && input.capabilities?.supportsTemperature === false) {
+  const metadataSupportsTemperature = input.capabilities?.supportsTemperature;
+  const familyDisallowsTemperature = metadataSupportsTemperature === undefined && (isClaudeOpus47OrLaterModel(input.modelID) || family?.supportsTemperature === false);
+  if (temperature !== undefined && (metadataSupportsTemperature === false || familyDisallowsTemperature)) {
     changes.push({
       field: "temperature",
       from: String(temperature),
       to: undefined,
-      reason: "unsupported-by-model-metadata"
+      reason: metadataSupportsTemperature === false ? "unsupported-by-model-metadata" : "unsupported-by-model-family"
     });
     temperature = undefined;
   }
@@ -26571,6 +26910,7 @@ function resolveCompatibleModelSettings(input) {
 }
 var init_model_settings_compatibility = __esm(() => {
   init_model_capability_heuristics();
+  init_model_family_detectors();
   init_reasoning_level();
 });
 
@@ -26651,9 +26991,6 @@ function normalizeFallbackModels(models2) {
 }
 var init_model_resolver = () => {};
 
-// packages/model-core/src/model-string-parser.ts
-var init_model_string_parser = () => {};
-
 // packages/model-core/src/fallback-chain-from-models.ts
 var init_fallback_chain_from_models = () => {};
 
@@ -26969,14 +27306,89 @@ function getProviderOverride(providerID, modelID) {
     return;
   return GITHUB_COPILOT_GPT5_MODEL.test(normalizeLookupModelID2(modelID)) ? GITHUB_COPILOT_GPT5_OVERRIDE : undefined;
 }
+function stripSameProviderPrefix(providerID, modelID) {
+  const prefix = `${providerID.trim()}/`;
+  return prefix !== "/" && modelID.slice(0, prefix.length).toLowerCase() === prefix.toLowerCase() ? modelID.slice(prefix.length) : undefined;
+}
+function buildLookupCandidates(providerID, modelID) {
+  const bareModelID = parseVariantFromModelID(modelID, { allowMaxSuffix: true }).modelID;
+  const candidates = [
+    modelID,
+    stripSameProviderPrefix(providerID, modelID),
+    bareModelID,
+    stripSameProviderPrefix(providerID, bareModelID)
+  ];
+  const uniqueCandidates = [];
+  const seen = new Set;
+  for (const candidate2 of candidates) {
+    if (!candidate2 || seen.has(candidate2))
+      continue;
+    seen.add(candidate2);
+    uniqueCandidates.push(candidate2);
+  }
+  return uniqueCandidates;
+}
+function findProviderMetadata(providerCache, providerID, modelID) {
+  if (!providerCache)
+    return;
+  for (const candidate2 of buildLookupCandidates(providerID, modelID)) {
+    const match = providerCache.findProviderModelMetadata(providerID, candidate2);
+    if (match)
+      return match;
+  }
+  return;
+}
+function findSnapshotEntry(snapshot, providerID, modelIDs) {
+  if (!snapshot)
+    return;
+  const normalizedProviderID = providerID.trim();
+  const providerSpecificCandidates = [];
+  const generalCandidates = [];
+  for (const modelID of modelIDs) {
+    const strippedModelID = stripSameProviderPrefix(providerID, modelID);
+    const unqualifiedModelID = strippedModelID ?? (modelID.includes("/") ? undefined : modelID);
+    if (!unqualifiedModelID) {
+      generalCandidates.push(...buildLookupCandidates(providerID, modelID));
+      continue;
+    }
+    const bareModelID = parseVariantFromModelID(unqualifiedModelID, { allowMaxSuffix: true }).modelID;
+    if (normalizedProviderID) {
+      providerSpecificCandidates.push(`${normalizedProviderID}/${unqualifiedModelID}`, `${normalizedProviderID}/${bareModelID}`);
+    }
+    generalCandidates.push(unqualifiedModelID, bareModelID);
+  }
+  const seen = new Set;
+  for (const candidate2 of [...providerSpecificCandidates, ...generalCandidates]) {
+    if (seen.has(candidate2))
+      continue;
+    seen.add(candidate2);
+    const entry = snapshot.models[candidate2];
+    if (entry)
+      return entry;
+  }
+  return;
+}
+function resolveCapabilityModelAlias(modelID, providerID) {
+  const direct = resolveModelIDAlias(modelID, providerID);
+  if (direct.source !== "canonical")
+    return direct;
+  const bareModelID = parseVariantFromModelID(modelID, { allowMaxSuffix: true }).modelID;
+  if (bareModelID === modelID)
+    return direct;
+  const bareAlias = resolveModelIDAlias(bareModelID, providerID);
+  return bareAlias.source === "canonical" ? direct : { ...bareAlias, requestedModelID: modelID };
+}
 function getModelCapabilities(input) {
-  const canonicalization = resolveModelIDAlias(input.modelID, input.providerID);
+  const canonicalization = resolveCapabilityModelAlias(input.modelID, input.providerID);
   const override = getOverride(input.modelID);
   const providerOverride = getProviderOverride(input.providerID, canonicalization.canonicalModelID);
-  const runtimeModel = readRuntimeModel(input.runtimeModel ?? input.providerCache?.findProviderModelMetadata(input.providerID, input.modelID));
+  const runtimeModel = readRuntimeModel(input.runtimeModel ?? findProviderMetadata(input.providerCache, input.providerID, input.modelID));
   const runtimeSnapshot = input.runtimeSnapshot;
   const bundledSnapshot = input.bundledSnapshot;
-  const snapshotEntry = runtimeSnapshot?.models?.[canonicalization.canonicalModelID] ?? bundledSnapshot?.models?.[canonicalization.canonicalModelID];
+  const snapshotModelIDs = canonicalization.source === "canonical" ? [input.modelID, canonicalization.canonicalModelID] : [canonicalization.canonicalModelID, input.modelID];
+  const runtimeSnapshotEntry = findSnapshotEntry(runtimeSnapshot, input.providerID, snapshotModelIDs);
+  const bundledSnapshotEntry = findSnapshotEntry(bundledSnapshot, input.providerID, snapshotModelIDs);
+  const snapshotEntry = runtimeSnapshotEntry ?? bundledSnapshotEntry;
   const heuristicFamily = detectHeuristicModelFamily(canonicalization.canonicalModelID);
   const runtimeVariants = readRuntimeModelVariants(runtimeModel);
   const runtimeReasoning = readRuntimeModelReasoningSupport(runtimeModel);
@@ -26986,7 +27398,7 @@ function getModelCapabilities(input) {
   const runtimeMaxOutputTokens = readRuntimeModelLimitOutput(runtimeModel);
   const runtimeToolCall = readRuntimeModelToolCallSupport(runtimeModel);
   const runtimeModalities = readRuntimeModelModalities(runtimeModel);
-  const snapshotSource = runtimeSnapshot?.models?.[canonicalization.canonicalModelID] ? "runtime-snapshot" : bundledSnapshot?.models?.[canonicalization.canonicalModelID] ? "bundled-snapshot" : "none";
+  const snapshotSource = runtimeSnapshotEntry ? "runtime-snapshot" : bundledSnapshotEntry ? "bundled-snapshot" : "none";
   const familySource = snapshotEntry?.family ? "snapshot" : heuristicFamily?.family ? "heuristic" : "none";
   const variantsSource = runtimeVariants ? "runtime" : providerOverride?.variants ? "override" : override?.variants ? "override" : heuristicFamily?.variants ? "heuristic" : "none";
   const reasoningEffortsSource = providerOverride?.reasoningEfforts ? "override" : override?.reasoningEfforts ? "override" : heuristicFamily?.reasoningEfforts ? "heuristic" : "none";
@@ -27035,6 +27447,7 @@ var MODEL_ID_OVERRIDES, GITHUB_COPILOT_GPT5_MODEL, GITHUB_COPILOT_GPT5_OVERRIDE;
 var init_get_model_capabilities = __esm(() => {
   init_model_capability_aliases();
   init_model_capability_heuristics();
+  init_model_string_parser();
   MODEL_ID_OVERRIDES = {};
   GITHUB_COPILOT_GPT5_MODEL = /(?:^|\/)gpt-5(?:[.-]|$)/;
   GITHUB_COPILOT_GPT5_OVERRIDE = {
@@ -27570,15 +27983,15 @@ var init_kimi_categories = __esm(() => {
 });
 
 // packages/omo-opencode/src/agents/types.ts
-function extractModelName(model) {
+function extractModelName2(model) {
   return model.includes("/") ? model.split("/").pop() ?? model : model;
 }
 function isGpt5_5Model(model) {
-  const modelName = extractModelName(model).toLowerCase();
+  const modelName = extractModelName2(model).toLowerCase();
   return modelName.includes("gpt-5.5") || modelName.includes("gpt-5-5");
 }
 function isGpt5_6Model(model) {
-  const modelName = extractModelName(model).toLowerCase();
+  const modelName = extractModelName2(model).toLowerCase();
   return modelName.includes("gpt-5.6") || modelName.includes("gpt-5-6");
 }
 var init_types4 = () => {};
@@ -27790,7 +28203,7 @@ var init_migration3 = __esm(() => {
 
 // packages/omo-opencode/src/shared/opencode-config-dir.ts
 import { existsSync as existsSync8, realpathSync as realpathSync3 } from "node:fs";
-import { homedir as homedir3 } from "node:os";
+import { homedir as homedir4 } from "node:os";
 import { join as join12, posix as posix4, resolve as resolve4, win32 } from "node:path";
 function isDevBuild(version2) {
   if (!version2)
@@ -27801,14 +28214,14 @@ function getTauriConfigDir(identifier) {
   const platform = process.platform;
   switch (platform) {
     case "darwin":
-      return join12(homedir3(), "Library", "Application Support", identifier);
+      return join12(homedir4(), "Library", "Application Support", identifier);
     case "win32": {
-      const appData = process.env.APPDATA || join12(homedir3(), "AppData", "Roaming");
+      const appData = process.env.APPDATA || join12(homedir4(), "AppData", "Roaming");
       return win32.join(appData, identifier);
     }
     case "linux":
     default: {
-      const xdgConfig = process.env.XDG_CONFIG_HOME || join12(homedir3(), ".config");
+      const xdgConfig = process.env.XDG_CONFIG_HOME || join12(homedir4(), ".config");
       return join12(xdgConfig, identifier);
     }
   }
@@ -27852,7 +28265,7 @@ function getWslLinuxHomeDir(windowsConfigRoot) {
 function getCliDefaultConfigDir() {
   const envXdgConfig = process.env.XDG_CONFIG_HOME?.trim();
   const shouldIgnoreWindowsXdg = envXdgConfig !== undefined && envXdgConfig.length > 0 && isWslEnvironment() && isWindowsUserConfigRoot(envXdgConfig);
-  const xdgConfig = shouldIgnoreWindowsXdg ? posix4.join(getWslLinuxHomeDir(envXdgConfig) ?? "/home", ".config") : envXdgConfig || join12(homedir3(), ".config");
+  const xdgConfig = shouldIgnoreWindowsXdg ? posix4.join(getWslLinuxHomeDir(envXdgConfig) ?? "/home", ".config") : envXdgConfig || join12(homedir4(), ".config");
   const configDir = isWslEnvironment() ? posix4.join(xdgConfig, "opencode") : join12(xdgConfig, "opencode");
   return resolveConfigPath(configDir);
 }
@@ -86726,7 +87139,7 @@ function toFallbackModelObject(entry, provider) {
 }
 function collectAvailableFallbacks(fallbackChain, availability) {
   const expandedFallbacks = fallbackChain.flatMap((entry) => entry.providers.filter((provider) => isProviderAvailable(provider, availability)).map((provider) => toFallbackModelObject(entry, provider)));
-  return expandedFallbacks.filter((entry, index, allEntries) => allEntries.findIndex((candidate) => candidate.model === entry.model && candidate.variant === entry.variant) === index);
+  return expandedFallbacks.filter((entry, index, allEntries) => allEntries.findIndex((candidate2) => candidate2.model === entry.model && candidate2.variant === entry.variant) === index);
 }
 function attachFallbackModels(config3, fallbackChain, availability) {
   const uniqueFallbacks = collectAvailableFallbacks(fallbackChain, availability);
@@ -87016,12 +87429,12 @@ function configRoots(options) {
   ];
   const seen = new Set;
   const result = [];
-  for (const candidate of candidates) {
-    const key = pathKey(candidate.path, options);
+  for (const candidate2 of candidates) {
+    const key = pathKey(candidate2.path, options);
     if (seen.has(key))
       continue;
     seen.add(key);
-    result.push({ ...candidate, path: canonicalPath(candidate.path, options) });
+    result.push({ ...candidate2, path: canonicalPath(candidate2.path, options) });
   }
   return result;
 }
@@ -87165,10 +87578,10 @@ function historyValues(value) {
     return [];
   const values = [];
   for (const key of ["_migrations", "appliedMigrations"]) {
-    const candidate = value[key];
-    if (!Array.isArray(candidate))
+    const candidate2 = value[key];
+    if (!Array.isArray(candidate2))
       continue;
-    for (const item of candidate) {
+    for (const item of candidate2) {
       if (typeof item === "string" && !values.includes(item))
         values.push(item);
     }
@@ -88275,20 +88688,20 @@ var init_config_manager = __esm(() => {
 
 // packages/telemetry-core/src/activity-state.ts
 import { existsSync as existsSync26, mkdirSync as mkdirSync8, readFileSync as readFileSync12 } from "node:fs";
-import { basename as basename9, join as join52 } from "node:path";
+import { basename as basename9, join as join53 } from "node:path";
 function resolveTelemetryStateDir(product, options = {}) {
   const dataDir = resolveXdgDataDir(product.cacheDirName, {
     env: options.env,
     osProvider: options.osProvider
   });
-  const xdgStateDir = options.env?.XDG_DATA_HOME === undefined ? undefined : join52(options.env.XDG_DATA_HOME, product.cacheDirName);
+  const xdgStateDir = options.env?.XDG_DATA_HOME === undefined ? undefined : join53(options.env.XDG_DATA_HOME, product.cacheDirName);
   if (dataDir === xdgStateDir || xdgStateDir === undefined && basename9(dataDir) === product.cacheDirName) {
     return dataDir;
   }
-  return join52(dataDir, product.cacheDirName);
+  return join53(dataDir, product.cacheDirName);
 }
 function getTelemetryActivityStateFilePath(stateDir) {
-  return join52(stateDir, POSTHOG_ACTIVITY_STATE_FILE);
+  return join53(stateDir, POSTHOG_ACTIVITY_STATE_FILE);
 }
 function getDailyActiveCaptureState(input) {
   const state = readPostHogActivityState(input.stateDir, input.diagnostics);
@@ -88359,9 +88772,9 @@ var DEFAULT_POSTHOG_HOST = "https://us.i.posthog.com", DEFAULT_POSTHOG_API_KEY =
 
 // packages/telemetry-core/src/diagnostics.ts
 import { appendFileSync as appendFileSync2, existsSync as existsSync27, mkdirSync as mkdirSync9, readFileSync as readFileSync13 } from "node:fs";
-import { join as join53 } from "node:path";
+import { join as join54 } from "node:path";
 function getTelemetryDiagnosticsFilePath(diagnosticsDir) {
-  return join53(diagnosticsDir, DIAGNOSTICS_FILE_NAME);
+  return join54(diagnosticsDir, DIAGNOSTICS_FILE_NAME);
 }
 function writeTelemetryDiagnostic(input, options) {
   const now = options.now ?? new Date;
@@ -88835,21 +89248,21 @@ var init_string_utils = () => {};
 function isPrimitive(value) {
   return value === null || typeof value != "object";
 }
-function isBuiltin(candidate, className) {
-  return Object.prototype.toString.call(candidate) === `[object ${className}]`;
+function isBuiltin(candidate2, className) {
+  return Object.prototype.toString.call(candidate2) === `[object ${className}]`;
 }
 function isErrorEvent(event) {
   return isBuiltin(event, "ErrorEvent");
 }
-function isEvent(candidate) {
-  return typeof Event != "undefined" && isInstanceOf(candidate, Event);
+function isEvent(candidate2) {
+  return typeof Event != "undefined" && isInstanceOf(candidate2, Event);
 }
-function isPlainObject5(candidate) {
-  return isBuiltin(candidate, "Object");
+function isPlainObject5(candidate2) {
+  return isBuiltin(candidate2, "Object");
 }
-function isInstanceOf(candidate, base) {
+function isInstanceOf(candidate2, base) {
   try {
-    return candidate instanceof base;
+    return candidate2 instanceof base;
   } catch {
     return false;
   }
@@ -89994,8 +90407,8 @@ class DOMExceptionCoercer {
       synthetic: false
     };
   }
-  getType(candidate) {
-    return this.isDOMError(candidate) ? "DOMError" : "DOMException";
+  getType(candidate2) {
+    return this.isDOMError(candidate2) ? "DOMError" : "DOMException";
   }
   getValue(err) {
     const name = err.name || (this.isDOMError(err) ? "DOMError" : "DOMException");
@@ -90080,10 +90493,10 @@ class StringCoercer {
       synthetic: true
     };
   }
-  getInfos(candidate) {
+  getInfos(candidate2) {
     let type = "Error";
-    let value = candidate;
-    const groups = candidate.match(ERROR_TYPES_PATTERN);
+    let value = candidate2;
+    const groups = candidate2.match(ERROR_TYPES_PATTERN);
     if (groups) {
       type = groups[1];
       value = groups[2];
@@ -90132,18 +90545,18 @@ var init_utils2 = () => {};
 
 // node_modules/.bun/@posthog+core@1.30.3/node_modules/@posthog/core/dist/error-tracking/coercers/object-coercer.mjs
 class ObjectCoercer {
-  match(candidate) {
-    return typeof candidate == "object" && candidate !== null;
+  match(candidate2) {
+    return typeof candidate2 == "object" && candidate2 !== null;
   }
-  coerce(candidate, ctx) {
-    const errorProperty = this.getErrorPropertyFromObject(candidate);
+  coerce(candidate2, ctx) {
+    const errorProperty = this.getErrorPropertyFromObject(candidate2);
     if (errorProperty)
       return ctx.apply(errorProperty);
     return {
-      type: this.getType(candidate),
-      value: this.getValue(candidate),
+      type: this.getType(candidate2),
+      value: this.getValue(candidate2),
       stack: ctx.syntheticException?.stack,
-      level: this.isSeverityLevel(candidate.level) ? candidate.level : "error",
+      level: this.isSeverityLevel(candidate2.level) ? candidate2.level : "error",
       synthetic: true
     };
   }
@@ -90211,8 +90624,8 @@ var init_event_coercer = __esm(() => {
 
 // node_modules/.bun/@posthog+core@1.30.3/node_modules/@posthog/core/dist/error-tracking/coercers/primitive-coercer.mjs
 class PrimitiveCoercer {
-  match(candidate) {
-    return isPrimitive(candidate);
+  match(candidate2) {
+    return isPrimitive(candidate2);
   }
   coerce(value, ctx) {
     return {
@@ -94082,7 +94495,7 @@ var package_default2;
 var init_package2 = __esm(() => {
   package_default2 = {
     name: "@oh-my-opencode/omo-codex",
-    version: "4.19.4",
+    version: "5.0.0-beta.2",
     type: "module",
     private: true,
     description: "Codex harness adapter for oh-my-openagent. Vendored Codex plugin namespace (omo) + TypeScript installer + telemetry.",
@@ -94474,8 +94887,8 @@ import * as fs3 from "node:fs";
 import * as path8 from "node:path";
 function findPackageJsonUp(startPath) {
   try {
-    const stat6 = fs3.statSync(startPath);
-    let dir = stat6.isDirectory() ? startPath : path8.dirname(startPath);
+    const stat7 = fs3.statSync(startPath);
+    let dir = stat7.isDirectory() ? startPath : path8.dirname(startPath);
     for (let i = 0;i < 10; i++) {
       const pkgPath = path8.join(dir, "package.json");
       if (fs3.existsSync(pkgPath)) {
@@ -94596,10 +95009,10 @@ function getCachedVersion(options = {}) {
       log2("[auto-update-checker] Failed to resolve version from current directory:", err);
     }
   }
-  for (const candidate of packageJsonCandidates) {
+  for (const candidate2 of packageJsonCandidates) {
     try {
-      if (fs6.existsSync(candidate)) {
-        return readPackageVersion(candidate);
+      if (fs6.existsSync(candidate2)) {
+        return readPackageVersion(candidate2);
       }
     } catch (err) {
       if (err instanceof Error) {
@@ -95051,20 +95464,20 @@ var init_update_toasts = __esm(() => {
 });
 
 // packages/omo-opencode/src/hooks/auto-update-checker/hook/background-update-check.ts
-import { existsSync as existsSync45 } from "node:fs";
-import { dirname as dirname26, join as join70 } from "node:path";
+import { existsSync as existsSync46 } from "node:fs";
+import { dirname as dirname28, join as join73 } from "node:path";
 import { fileURLToPath as fileURLToPath5 } from "node:url";
 function defaultGetModuleHostingWorkspace() {
   try {
-    const currentDir = dirname26(fileURLToPath5(import.meta.url));
+    const currentDir = dirname28(fileURLToPath5(import.meta.url));
     const pkgJsonPath = findPackageJsonUp(currentDir);
     if (!pkgJsonPath)
       return null;
-    const pkgDir = dirname26(pkgJsonPath);
-    const nodeModulesDir = dirname26(pkgDir);
+    const pkgDir = dirname28(pkgJsonPath);
+    const nodeModulesDir = dirname28(pkgDir);
     if (nodeModulesDir.split(/[\\/]/).pop() !== "node_modules")
       return null;
-    return dirname26(nodeModulesDir);
+    return dirname28(nodeModulesDir);
   } catch (error51) {
     if (error51 instanceof Error) {
       return null;
@@ -95205,8 +95618,8 @@ var init_background_update_check = __esm(() => {
   init_package_json_locator();
   init_update_toasts();
   defaultDeps4 = {
-    existsSync: existsSync45,
-    join: join70,
+    existsSync: existsSync46,
+    join: join73,
     runBunInstallWithDetails,
     log: log2,
     getOpenCodeCacheDir,
@@ -95369,7 +95782,7 @@ async function showSpinnerToast(ctx, version3, message) {
         duration: frameInterval + 50
       }
     }).catch(ignoreToastError);
-    await new Promise((resolve18) => setTimeout(resolve18, frameInterval));
+    await new Promise((resolve20) => setTimeout(resolve20, frameInterval));
   }
 }
 var SISYPHUS_SPINNER;
@@ -95815,9 +96228,9 @@ function getUnsupportedOpenCodeVersionMessage(openCodeVersion) {
 }
 
 // packages/omo-codex/src/install/install-codex.ts
-import { join as join54, resolve as resolve13 } from "node:path";
+import { join as join55, resolve as resolve13 } from "node:path";
 import { existsSync as existsSync28 } from "node:fs";
-import { homedir as homedir5 } from "node:os";
+import { homedir as homedir6 } from "node:os";
 
 // packages/omo-codex/src/install/codex-cache-bins.ts
 import { chmod, lstat as lstat4, mkdir, readFile as readFile3, readdir as readdir2, readlink as readlink3, rm as rm3, stat as stat2, symlink, writeFile } from "node:fs/promises";
@@ -95986,6 +96399,11 @@ var LEGACY_CODEX_COMPONENT_BINS = [
   { name: "codex-telemetry", component: "telemetry" },
   { name: "codex-ultrawork", component: "ultrawork" }
 ];
+var LEGACY_CODEX_COMPONENT_BIN_NAMES = LEGACY_CODEX_COMPONENT_BINS.map((entry) => entry.name);
+function isLegacyCodexBinTarget(binName, target) {
+  const entry = LEGACY_CODEX_COMPONENT_BINS.find((candidate2) => candidate2.name === binName);
+  return entry !== undefined && isManagedLegacyComponentTarget(target, entry.component);
+}
 async function removeLegacyCodexComponentBins(binDir, platform) {
   for (const entry of LEGACY_CODEX_COMPONENT_BINS) {
     const linkPath = join24(binDir, platform === "win32" ? `${entry.name}.cmd` : entry.name);
@@ -96041,7 +96459,7 @@ function isNodeErrorWithCode2(error51) {
 // packages/omo-codex/src/install/codex-cache-runtime-wrapper.ts
 import { join as join25 } from "node:path";
 var RUNTIME_WRAPPER_MARKER = "OMO_GENERATED_RUNTIME_WRAPPER";
-function posixRuntimeWrapper(cliPath, codexHome, binDir, nodeCliPath) {
+function posixRuntimeWrapper(binName, cliPath, codexHome, binDir, nodeCliPath) {
   const ulwLoopBin = toPosixPath2(join25(binDir, "omo-ulw-loop"));
   const nodeCli = escapePosixDoubleQuoted(toPosixPath2(nodeCliPath));
   const escapedCliPath = escapePosixDoubleQuoted(toPosixPath2(cliPath));
@@ -96051,6 +96469,8 @@ function posixRuntimeWrapper(cliPath, codexHome, binDir, nodeCliPath) {
     "#!/bin/sh",
     `# ${RUNTIME_WRAPPER_MARKER}`,
     `export CODEX_HOME="\${CODEX_HOME:-${escapedCodexHome}}"`,
+    `export OMO_INVOCATION_NAME=${binName}`,
+    "export OMO_EDITION=codex",
     'if [ "$1" = "ulw-loop" ] && [ -x "' + escapedUlwLoopBin + '" ]; then',
     "  shift",
     '  exec "' + escapedUlwLoopBin + '" ulw-loop "$@"',
@@ -96074,11 +96494,11 @@ function posixRuntimeWrapper(cliPath, codexHome, binDir, nodeCliPath) {
     `  if [ -f "${nodeCli}" ] && command -v node >/dev/null 2>&1; then`,
     `    exec node "${nodeCli}" "$@"`,
     "  fi",
-    `  echo "omo: bun runtime not found (checked PATH, ~/.bun/bin, /opt/homebrew/bin, /usr/local/bin) and the node fallback CLI is missing at ${nodeCli}; install bun from https://bun.sh, or reinstall omo and force the fallback with OMO_RUNTIME=node" >&2`,
+    `  echo "${binName}: bun runtime not found (checked PATH, ~/.bun/bin, /opt/homebrew/bin, /usr/local/bin) and the node fallback CLI is missing at ${nodeCli}; install bun from https://bun.sh, or reinstall ${binName} and force the fallback with OMO_RUNTIME=node" >&2`,
     "  exit 127",
     "fi",
     `if [ ! -f "${escapedCliPath}" ]; then`,
-    `  echo "omo: runtime target missing at ${escapedCliPath}; reinstall with: npx --yes lazycodex-ai@latest install --no-tui" >&2`,
+    `  echo "${binName}: runtime target missing at ${escapedCliPath}; reinstall with: npx --yes lazycodex-ai@latest install --no-tui" >&2`,
     "  exit 1",
     "fi",
     `exec "$BUN_BINARY" "${escapedCliPath}" "$@"`,
@@ -96086,12 +96506,14 @@ function posixRuntimeWrapper(cliPath, codexHome, binDir, nodeCliPath) {
   ].join(`
 `);
 }
-function windowsRuntimeWrapper(cliPath, codexHome, binDir, nodeCliPath) {
+function windowsRuntimeWrapper(binName, cliPath, codexHome, binDir, nodeCliPath) {
   const ulwLoopBin = join25(binDir, "omo-ulw-loop.cmd");
   return [
     "@echo off",
     `rem ${RUNTIME_WRAPPER_MARKER}`,
     `if not defined CODEX_HOME set "CODEX_HOME=${codexHome}"`,
+    `set "OMO_INVOCATION_NAME=${binName}"`,
+    'set "OMO_EDITION=codex"',
     ...windowsNodeDiscoveryLines(),
     `if "%~1"=="ulw-loop" if exist "${ulwLoopBin}" (`,
     "  shift /1",
@@ -96109,11 +96531,11 @@ function windowsRuntimeWrapper(cliPath, codexHome, binDir, nodeCliPath) {
     `    "%OMO_NODE_BINARY%" "${nodeCliPath}" %*`,
     "    exit /b %ERRORLEVEL%",
     "  )",
-    `  echo omo: bun runtime not found, no Node runtime was discovered from NODE_REPL_NODE_PATH or PATH, or the node fallback CLI is missing at ${nodeCliPath}; install bun from https://bun.sh or rerun LazyCodex install from Codex Desktop 1>&2`,
+    `  echo ${binName}: bun runtime not found, no Node runtime was discovered from NODE_REPL_NODE_PATH or PATH, or the node fallback CLI is missing at ${nodeCliPath}; install bun from https://bun.sh or rerun LazyCodex install from Codex Desktop 1>&2`,
     "  exit /b 127",
     ")",
     `if not exist "${cliPath}" (`,
-    `  echo omo: runtime target missing at ${cliPath}; reinstall with: npx --yes lazycodex-ai@latest install --no-tui 1>&2`,
+    `  echo ${binName}: runtime target missing at ${cliPath}; reinstall with: npx --yes lazycodex-ai@latest install --no-tui 1>&2`,
     "  exit /b 1",
     ")",
     `"%BUN_BINARY%" "${cliPath}" %*`,
@@ -96129,7 +96551,14 @@ function escapePosixDoubleQuoted(value) {
 }
 
 // packages/omo-codex/src/install/codex-cache-bins.ts
-var RESERVED_NESTED_BIN_NAMES = new Set(["omo", "lazycodex", "lazycodex-ai", "oh-my-opencode", "oh-my-openagent"]);
+var RESERVED_NESTED_BIN_NAMES = new Set([
+  "omo",
+  "omo-agent-toolkit",
+  "lazycodex",
+  "lazycodex-ai",
+  "oh-my-opencode",
+  "oh-my-openagent"
+]);
 async function linkCachedPluginBins(input) {
   const binLinks = await discoverPackageBins(input.pluginRoot);
   const platform = input.platform ?? process.platform;
@@ -96159,20 +96588,26 @@ async function removeCachedManagedNpmBinShims(pluginRoot) {
 }
 async function linkRootRuntimeBin(input) {
   const cliPath = join26(input.repoRoot, "dist", "cli", "index.js");
-  if (!await isFile(cliPath))
+  const platform = input.platform ?? process.platform;
+  const legacyPath = join26(input.binDir, platform === "win32" ? "omo.cmd" : "omo");
+  if (!await isFile(cliPath)) {
+    await removeGeneratedRuntimeWrapper(legacyPath);
     return null;
+  }
+  const binName = "omo-agent-toolkit";
   const nodeCliPath = join26(input.repoRoot, "dist", "cli-node", "index.js");
-  const platform = input.platform ?? process.platform;
   await mkdir(input.binDir, { recursive: true });
   if (platform === "win32") {
-    const linkPath2 = join26(input.binDir, "omo.cmd");
-    await replaceRuntimeWrapper(linkPath2, windowsRuntimeWrapper(cliPath, input.codexHome, input.binDir, nodeCliPath));
-    return { name: "omo", path: linkPath2, target: cliPath };
+    const linkPath2 = join26(input.binDir, `${binName}.cmd`);
+    await replaceRuntimeWrapper(linkPath2, windowsRuntimeWrapper(binName, cliPath, input.codexHome, input.binDir, nodeCliPath));
+    await removeGeneratedRuntimeWrapper(legacyPath);
+    return { name: binName, path: linkPath2, target: cliPath };
   }
-  const linkPath = join26(input.binDir, "omo");
-  await replaceRuntimeWrapper(linkPath, posixRuntimeWrapper(cliPath, input.codexHome, input.binDir, nodeCliPath));
+  const linkPath = join26(input.binDir, binName);
+  await replaceRuntimeWrapper(linkPath, posixRuntimeWrapper(binName, cliPath, input.codexHome, input.binDir, nodeCliPath));
   await chmod(linkPath, 493);
-  return { name: "omo", path: linkPath, target: cliPath };
+  await removeGeneratedRuntimeWrapper(legacyPath);
+  return { name: binName, path: linkPath, target: cliPath };
 }
 async function linkCachedPluginBin(binDir, link, platform) {
   if (platform === "win32") {
@@ -96285,6 +96720,29 @@ async function replaceRuntimeWrapper(linkPath, content) {
   await rm3(linkPath, { force: true });
   await writeFile(linkPath, content);
 }
+async function removeGeneratedRuntimeWrapper(path6) {
+  try {
+    const entry = await lstat4(path6);
+    if (!entry.isFile() && !entry.isSymbolicLink())
+      return;
+    const content = await readGeneratedWrapperContent(path6);
+    if (content.includes(RUNTIME_WRAPPER_MARKER))
+      await rm3(path6, { force: true });
+  } catch (error51) {
+    if (isNodeErrorWithCode(error51) && error51.code === "ENOENT")
+      return;
+    throw error51;
+  }
+}
+async function readGeneratedWrapperContent(path6) {
+  try {
+    return await readFile3(path6, "utf8");
+  } catch (error51) {
+    if (isNodeErrorWithCode(error51) && (error51.code === "ENOENT" || error51.code === "EISDIR"))
+      return "";
+    throw error51;
+  }
+}
 async function existingNonRuntimeWrapper(path6) {
   try {
     const stat3 = await lstat4(path6);
@@ -96360,7 +96818,7 @@ async function copyBundledMcpRuntimeDists(input) {
   }
 }
 function resolveBundledMcpRuntimeArg(pluginRoot, arg) {
-  const runtime4 = BUNDLED_MCP_RUNTIMES.find((candidate) => candidate.sourceArg === arg);
+  const runtime4 = BUNDLED_MCP_RUNTIMES.find((candidate2) => candidate2.sourceArg === arg);
   return runtime4 ? join27(pluginRoot, runtime4.destinationArg) : null;
 }
 async function copyBundledMcpRuntimeDist(pluginRoot, sourceRoot, runtime4) {
@@ -96436,9 +96894,9 @@ function findNewestCachedCodexComponentCli(input) {
     return null;
   const versions2 = readdirSync6(versionsRoot, { withFileTypes: true }).filter((entry) => entry.isDirectory()).map((entry) => entry.name).sort(compareVersionNames).reverse();
   for (const version2 of versions2) {
-    const candidate = resolveCachedCodexComponentCliPath(join28(versionsRoot, version2), input.componentName);
-    if (existsSync24(candidate))
-      return candidate;
+    const candidate2 = resolveCachedCodexComponentCliPath(join28(versionsRoot, version2), input.componentName);
+    if (existsSync24(candidate2))
+      return candidate2;
   }
   return null;
 }
@@ -97404,8 +97862,8 @@ function findUnquotedCharacter(line, target, startIndex) {
   }
   return -1;
 }
-function tomlPathMatches(candidate, target) {
-  return candidate.length === target.length && candidate.every((part, index) => part === target[index]);
+function tomlPathMatches(candidate2, target) {
+  return candidate2.length === target.length && candidate2.every((part, index) => part === target[index]);
 }
 function replaceTomlAssignmentValue(line, assignmentIndex, value) {
   const newline = line.endsWith(`
@@ -99984,13 +100442,13 @@ function processIsRunning(pid) {
 }
 
 // packages/omo-codex/src/install/codex-installer-bin-dir.ts
-import { homedir as homedir4 } from "node:os";
+import { homedir as homedir5 } from "node:os";
 import { join as join48, resolve as resolve12 } from "node:path";
 function resolveCodexInstallerBinDir(input) {
   const explicitBinDir = input.binDir ?? input.env?.CODEX_LOCAL_BIN_DIR;
   if (explicitBinDir !== undefined && explicitBinDir.trim().length > 0)
     return resolve12(explicitBinDir.trim());
-  const homeDir = input.homeDir ?? homedir4();
+  const homeDir = input.homeDir ?? homedir5();
   const defaultCodexHome = resolve12(homeDir, ".codex");
   const resolvedCodexHome = resolve12(input.codexHome);
   if (resolvedCodexHome !== defaultCodexHome)
@@ -99998,9 +100456,57 @@ function resolveCodexInstallerBinDir(input) {
   return resolve12(homeDir, ".local", "bin");
 }
 
-// packages/omo-codex/src/install/codex-git-bash-hooks.ts
-import { readFile as readFile20, writeFile as writeFile11 } from "node:fs/promises";
+// packages/omo-codex/src/install/codex-installed-bin-dir.ts
+import { readFile as readFile20, readdir as readdir11, writeFile as writeFile11 } from "node:fs/promises";
 import { join as join49 } from "node:path";
+var INSTALLED_BIN_DIR_MANIFEST = ".installed-bin-dir.json";
+async function writeInstalledCodexBinDir(input) {
+  await writeFile11(join49(input.pluginRoot, INSTALLED_BIN_DIR_MANIFEST), `${JSON.stringify({ binDir: input.binDir }, null, 2)}
+`);
+}
+async function readInstalledCodexBinDir(codexHome) {
+  for (const manifestPath of await installedBinDirManifestPaths(codexHome)) {
+    const binDir = await readBinDirFromManifest(manifestPath);
+    if (binDir !== null)
+      return binDir;
+  }
+  return null;
+}
+async function installedBinDirManifestPaths(codexHome) {
+  const paths2 = [
+    join49(codexHome, ".tmp", "marketplaces", "sisyphuslabs", "plugins", "omo", INSTALLED_BIN_DIR_MANIFEST)
+  ];
+  const versionRoot = join49(codexHome, "plugins", "cache", "sisyphuslabs", "omo");
+  const entries = await readdir11(versionRoot, { withFileTypes: true }).catch(() => null);
+  if (entries !== null) {
+    for (const entry of entries) {
+      if (entry.isDirectory())
+        paths2.push(join49(versionRoot, entry.name, INSTALLED_BIN_DIR_MANIFEST));
+    }
+  }
+  return paths2;
+}
+async function readBinDirFromManifest(manifestPath) {
+  const raw = await readFile20(manifestPath, "utf8").catch(() => null);
+  if (raw === null)
+    return null;
+  let parsed;
+  try {
+    parsed = JSON.parse(raw);
+  } catch {
+    return null;
+  }
+  if (!isPlainRecord4(parsed))
+    return null;
+  const binDir = parsed.binDir;
+  if (typeof binDir !== "string" || binDir.trim().length === 0)
+    return null;
+  return binDir.trim();
+}
+
+// packages/omo-codex/src/install/codex-git-bash-hooks.ts
+import { readFile as readFile21, writeFile as writeFile12 } from "node:fs/promises";
+import { join as join50 } from "node:path";
 var WINDOWS_ONLY_GIT_BASH_HOOKS = new Set([
   "./hooks/pre-tool-use-recommending-git-bash-mcp.json",
   "./hooks/post-compact-resetting-git-bash-mcp-reminder.json"
@@ -100008,22 +100514,22 @@ var WINDOWS_ONLY_GIT_BASH_HOOKS = new Set([
 async function removeGitBashHooksOffWindows(input) {
   if (input.platform === "win32")
     return;
-  const manifestPath = join49(input.pluginRoot, ".codex-plugin", "plugin.json");
-  const parsed = JSON.parse(await readFile20(manifestPath, "utf8"));
+  const manifestPath = join50(input.pluginRoot, ".codex-plugin", "plugin.json");
+  const parsed = JSON.parse(await readFile21(manifestPath, "utf8"));
   if (!isPlainRecord4(parsed) || !Array.isArray(parsed.hooks))
     return;
   const hooks = parsed.hooks.filter((hook) => typeof hook !== "string" || !WINDOWS_ONLY_GIT_BASH_HOOKS.has(hook));
   if (hooks.length === parsed.hooks.length)
     return;
-  await writeFile11(manifestPath, `${JSON.stringify({ ...parsed, hooks }, null, "\t")}
+  await writeFile12(manifestPath, `${JSON.stringify({ ...parsed, hooks }, null, "\t")}
 `);
 }
 
 // packages/omo-codex/src/install/omo-sot-migration.ts
-import { join as join50 } from "node:path";
+import { join as join51 } from "node:path";
 async function seedAndMigrateOmoSot(input) {
   const commandEnv = { ...input.env };
-  const scriptPath = join50(input.repoRoot, "packages", "omo-codex", "plugin", "scripts", "migrate-omo-sot.mjs");
+  const scriptPath = join51(input.repoRoot, "packages", "omo-codex", "plugin", "scripts", "migrate-omo-sot.mjs");
   try {
     await input.runCommand(process.execPath, [scriptPath, "--seed"], {
       cwd: input.repoRoot,
@@ -100038,7 +100544,7 @@ async function seedAndMigrateOmoSot(input) {
 
 // packages/omo-codex/src/install/install-ast-grep-sg.ts
 init_src2();
-import { join as join51 } from "node:path";
+import { join as join52 } from "node:path";
 function describeResult(result) {
   if (result.kind === "succeeded")
     return null;
@@ -100052,7 +100558,7 @@ async function installAstGrepForCodex(options) {
     return;
   const platform = options.platform ?? process.platform;
   const targetDir = astGrepRuntimeDir(options.codexHome, platform, options.arch ?? process.arch);
-  const skillDir = join51(plugin.path, "skills", "ast-grep");
+  const skillDir = join52(plugin.path, "skills", "ast-grep");
   const installer = options.installer ?? runAstGrepSkillInstall;
   try {
     const result = await installer({ platform, skillDir, targetDir });
@@ -100086,7 +100592,7 @@ async function runCodexInstaller(options = {}) {
   const env3 = options.env ?? process.env;
   const platform = options.platform ?? process.platform;
   const repoRoot = resolve13(options.repoRoot ?? findRepoRoot({ importerDir: import.meta.dir, env: env3 }));
-  const codexHome = resolve13(options.codexHome ?? env3.CODEX_HOME ?? join54(homedir5(), ".codex"));
+  const codexHome = resolve13(options.codexHome ?? env3.CODEX_HOME ?? join55(homedir6(), ".codex"));
   const projectDirectory = resolve13(options.projectDirectory ?? env3.OMO_CODEX_PROJECT ?? process.cwd());
   const binDir = resolveCodexInstallerBinDir({ binDir: options.binDir, codexHome, env: env3 });
   const runCommand = options.runCommand ?? defaultRunCommand;
@@ -100103,9 +100609,9 @@ async function runCodexInstaller(options = {}) {
   if (!gitBashResolution.found) {
     throw new Error(gitBashResolution.installHint);
   }
-  const codexPackageRoot = join54(repoRoot, "packages", "omo-codex");
+  const codexPackageRoot = join55(repoRoot, "packages", "omo-codex");
   const marketplace = await readMarketplace(repoRoot, {
-    marketplacePath: join54(codexPackageRoot, "marketplace.json")
+    marketplacePath: join55(codexPackageRoot, "marketplace.json")
   });
   const distributionManifest = await readDistributionManifest(repoRoot);
   const installed = [];
@@ -100139,6 +100645,7 @@ async function runCodexInstaller(options = {}) {
     if (marketplace.name === "sisyphuslabs" && plugin.name === "omo") {
       await stampLazyCodexPluginVersion({ pluginRoot: plugin.path, version: version3 });
       await writeLazyCodexInstallSnapshot({ pluginRoot: plugin.path, distributionManifest });
+      await writeInstalledCodexBinDir({ pluginRoot: plugin.path, binDir });
       await removeGitBashHooksOffWindows({ platform, pluginRoot: plugin.path });
     }
     const links = await linkCachedPluginBins({ binDir, pluginRoot: plugin.path, platform });
@@ -100150,7 +100657,7 @@ async function runCodexInstaller(options = {}) {
       if (runtimeLink !== null)
         log4(`Linked ${runtimeLink.name} -> ${runtimeLink.target}`);
       else
-        log4(`Warning: skipped the omo runtime wrapper because ${join54(repoRoot, "dist", "cli", "index.js")} is missing; omo ulw-loop commands will be unavailable until a package shipping dist/cli is installed`);
+        log4(`Warning: skipped the omo-agent-toolkit runtime wrapper because ${join55(repoRoot, "dist", "cli", "index.js")} is missing; omo-agent-toolkit ulw-loop commands will be unavailable until a package shipping dist/cli is installed`);
     }
     pluginSources.push({ name: entry.name, sourcePath });
     installed.push(plugin);
@@ -100213,13 +100720,13 @@ async function runCodexInstaller(options = {}) {
       continue;
     log4(`Warning: deferred legacy Codex LSP daemon cleanup for v${cleanup.version}: ${cleanup.reason}`);
   }
-  const marketplaceRoot = join54(codexHome, "plugins", "cache", marketplace.name);
+  const marketplaceRoot = join55(codexHome, "plugins", "cache", marketplace.name);
   await writeCachedMarketplaceManifest({
     marketplaceName: marketplace.name,
     marketplaceRoot,
     plugins: installed
   });
-  const configPath = join54(codexHome, "config.toml");
+  const configPath = join55(codexHome, "config.toml");
   await updateCodexConfig({
     configPath,
     repoRoot: codexPackageRoot,
@@ -100280,7 +100787,7 @@ function findRepoRootFromImporter(importerDir) {
   for (let depth = 0;depth <= 7; depth += 1) {
     if (isRepoRootWithCodexPlugin(current))
       return current;
-    for (const wrapperPackageRoot of [join54(current, "node_modules", "oh-my-openagent"), join54(current, "oh-my-openagent")]) {
+    for (const wrapperPackageRoot of [join55(current, "node_modules", "oh-my-openagent"), join55(current, "oh-my-openagent")]) {
       if (isRepoRootWithCodexPlugin(wrapperPackageRoot))
         return wrapperPackageRoot;
     }
@@ -100298,7 +100805,7 @@ function findRepoRoot(input) {
   return findRepoRootFromImporter(input.importerDir);
 }
 function isRepoRootWithCodexPlugin(repoRoot) {
-  return existsSync28(join54(repoRoot, "packages", "omo-codex", "plugin", ".codex-plugin", "plugin.json"));
+  return existsSync28(join55(repoRoot, "packages", "omo-codex", "plugin", ".codex-plugin", "plugin.json"));
 }
 function codexMarketplaceSource(marketplaceRoot) {
   return { sourceType: "local", source: marketplaceRoot };
@@ -100307,7 +100814,7 @@ function codexMarketplaceSource(marketplaceRoot) {
 init_bun_which_shim();
 import { execFile as execFile3 } from "node:child_process";
 import { existsSync as existsSync29 } from "node:fs";
-import { homedir as homedir6 } from "node:os";
+import { homedir as homedir7 } from "node:os";
 import { posix as posix8, win32 as win324 } from "node:path";
 var CODEX_PATH_CHECK_LABEL = "codex (PATH)";
 var WINDOWS_START_APPS_ARGS = [
@@ -100318,7 +100825,7 @@ var WINDOWS_START_APPS_ARGS = [
 async function detectCodexInstallation(input = {}) {
   const platform = input.platform ?? process.platform;
   const env3 = input.env ?? process.env;
-  const homeDir = input.homeDir ?? homedir6();
+  const homeDir = input.homeDir ?? homedir7();
   const exists6 = input.exists ?? existsSync29;
   const which2 = input.which ?? bunWhich;
   const checkedPaths = [CODEX_PATH_CHECK_LABEL];
@@ -100361,10 +100868,10 @@ function detectMacCodexInstallation(input) {
   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 };
+  for (const candidate2 of windowsCodexCliPaths(input.env)) {
+    input.checkedPaths.push(candidate2);
+    if (input.exists(candidate2))
+      return { found: true, source: "windows-standard-cli", path: candidate2 };
   }
   input.checkedPaths.push("Windows Start Apps: Codex");
   const appId = await findWindowsCodexStartApp(input.runCommand);
@@ -100433,13 +100940,81 @@ function defaultRunCommand2(command, args) {
   });
 }
 // packages/omo-codex/src/install/codex-cleanup.ts
-import { lstat as lstat13, readFile as readFile22, readdir as readdir11, rm as rm11, rmdir } from "node:fs/promises";
-import { homedir as homedir7 } from "node:os";
-import { isAbsolute as isAbsolute9, join as join56, relative as relative6, resolve as resolve15 } from "node:path";
+import { lstat as lstat14, readFile as readFile24, readdir as readdir13, rm as rm12, rmdir } from "node:fs/promises";
+import { homedir as homedir8 } from "node:os";
+import { isAbsolute as isAbsolute10, join as join58, relative as relative6, resolve as resolve16 } from "node:path";
+
+// packages/omo-codex/src/install/codex-cleanup-bins.ts
+import { lstat as lstat12, readFile as readFile22, readdir as readdir12, readlink as readlink6, rm as rm11 } from "node:fs/promises";
+import { dirname as dirname18, isAbsolute as isAbsolute8, join as join56, resolve as resolve14 } from "node:path";
+var ROOT_RUNTIME_BIN_NAME = "omo";
+var MANAGED_CODEX_BIN_NAMES = new Set([
+  ROOT_RUNTIME_BIN_NAME,
+  "omo-codegraph",
+  "omo-comment-checker",
+  "omo-git-bash-hook",
+  "omo-lsp",
+  "omo-rules",
+  "omo-start-work-continuation",
+  "omo-telemetry",
+  "omo-ultrawork",
+  "omo-ulw-loop",
+  "lazycodex-executor-verify",
+  "ulw",
+  "ulw-loop",
+  ...LEGACY_CODEX_COMPONENT_BIN_NAMES
+]);
+async function removeManagedCodexBins(binDir, platform) {
+  const entries = await readdir12(binDir, { withFileTypes: true }).catch((error51) => {
+    if (isNodeErrorWithCode(error51) && error51.code === "ENOENT")
+      return null;
+    throw error51;
+  });
+  if (entries === null)
+    return [];
+  const removed2 = [];
+  for (const entry of entries) {
+    const binName = managedBinNameForEntry2(entry.name, platform);
+    if (binName === null || !MANAGED_CODEX_BIN_NAMES.has(binName))
+      continue;
+    const linkPath = join56(binDir, entry.name);
+    if (await isManagedCodexBin(linkPath, platform, binName)) {
+      await rm11(linkPath, { force: true });
+      removed2.push(linkPath);
+    }
+  }
+  return removed2;
+}
+function managedBinNameForEntry2(entryName, platform) {
+  if (platform !== "win32")
+    return entryName;
+  const normalizedEntryName = entryName.toLowerCase();
+  return normalizedEntryName.endsWith(".cmd") ? normalizedEntryName.slice(0, -".cmd".length) : null;
+}
+async function isManagedCodexBin(linkPath, platform, binName) {
+  const entryStat = await lstat12(linkPath).catch((error51) => {
+    if (isNodeErrorWithCode(error51) && error51.code === "ENOENT")
+      return null;
+    throw error51;
+  });
+  if (entryStat === null)
+    return false;
+  if (entryStat.isSymbolicLink()) {
+    if (platform === "win32")
+      return false;
+    const linkTarget = await readlink6(linkPath);
+    const target = isAbsolute8(linkTarget) ? linkTarget : resolve14(dirname18(linkPath), linkTarget);
+    return isManagedComponentBinTarget(target) || isLegacyCodexBinTarget(binName, target);
+  }
+  if (!entryStat.isFile())
+    return false;
+  const content = await readFile22(linkPath, "utf8");
+  return content.includes(RUNTIME_WRAPPER_MARKER) || content.includes(COMMAND_SHIM_MARKER);
+}
 
 // packages/omo-codex/src/install/codex-cleanup-config.ts
-import { lstat as lstat12, mkdir as mkdir8, readFile as readFile21, writeFile as writeFile12 } from "node:fs/promises";
-import { dirname as dirname18 } from "node:path";
+import { lstat as lstat13, mkdir as mkdir8, readFile as readFile23, writeFile as writeFile13 } from "node:fs/promises";
+import { dirname as dirname19 } from "node:path";
 var MANAGED_MARKETPLACES = ["sisyphuslabs", "lazycodex", "code-yeongyu-codex-plugins"];
 var LEGACY_MANAGED_CODEX_AGENT_NAMES_TO_PURGE2 = ["codex-ultrawork-reviewer"];
 var CURRENT_MANAGED_CODEX_AGENT_NAMES2 = [
@@ -100471,14 +101046,14 @@ function cleanupCodexLightConfigText(config3) {
 async function cleanupCodexConfig(configPath, now) {
   if (!await configExists(configPath))
     return { changed: false };
-  const original = await readFile21(configPath, "utf8");
+  const original = await readFile23(configPath, "utf8");
   const next = cleanupCodexLightConfigText(original);
   if (next === original)
     return { changed: false };
   const backupPath = `${configPath}.backup-${formatBackupTimestamp2(now?.() ?? new Date)}`;
-  await mkdir8(dirname18(configPath), { recursive: true });
-  await writeFile12(backupPath, original);
-  await writeFile12(configPath, `${next.trimEnd()}
+  await mkdir8(dirname19(configPath), { recursive: true });
+  await writeFile13(backupPath, original);
+  await writeFile13(configPath, `${next.trimEnd()}
 `);
   return { changed: true, backupPath };
 }
@@ -100540,7 +101115,7 @@ function formatBackupTimestamp2(date5) {
 }
 async function configExists(path6) {
   try {
-    await lstat12(path6);
+    await lstat13(path6);
     return true;
   } catch (error51) {
     if (nodeErrorCode5(error51) === "ENOENT")
@@ -100555,24 +101130,28 @@ function nodeErrorCode5(error51) {
 }
 
 // packages/omo-codex/src/install/codex-cleanup-safety.ts
-import { dirname as dirname19, isAbsolute as isAbsolute8, join as join55, relative as relative5, resolve as resolve14 } from "node:path";
+import { dirname as dirname20, isAbsolute as isAbsolute9, join as join57, relative as relative5, resolve as resolve15 } from "node:path";
+function codexHomeResolvesToFilesystemRoot(codexHome) {
+  const resolved = resolve15(codexHome);
+  return dirname20(resolved) === resolved;
+}
 function validateManagedCleanupTarget(input) {
-  if (!isAbsolute8(input.path))
+  if (!isAbsolute9(input.path))
     return skipped(input.path, "outside managed Codex cleanup scope");
-  const codexHome = resolve14(input.codexHome);
-  if (dirname19(codexHome) === codexHome)
+  const codexHome = resolve15(input.codexHome);
+  if (codexHomeResolvesToFilesystemRoot(codexHome))
     return skipped(input.path, "Codex home resolves to a filesystem root");
-  const target = resolve14(input.path);
+  const target = resolve15(input.path);
   if (!isWithinDirectory(codexHome, target))
     return skipped(input.path, "outside managed Codex cleanup scope");
   if (target === codexHome)
     return skipped(input.path, "outside managed Codex cleanup scope");
   const exactManagedRoots = new Set([
-    resolve14(join55(codexHome, "plugins", "cache", "sisyphuslabs")),
-    resolve14(join55(codexHome, ".tmp", "marketplaces", "sisyphuslabs")),
-    resolve14(join55(codexHome, "runtime", "ast-grep")),
-    resolve14(join55(codexHome, "runtime", "node")),
-    resolve14(join55(codexHome, "plugins", "data", "omo-sisyphuslabs", "bootstrap"))
+    resolve15(join57(codexHome, "plugins", "cache", "sisyphuslabs")),
+    resolve15(join57(codexHome, ".tmp", "marketplaces", "sisyphuslabs")),
+    resolve15(join57(codexHome, "runtime", "ast-grep")),
+    resolve15(join57(codexHome, "runtime", "node")),
+    resolve15(join57(codexHome, "plugins", "data", "omo-sisyphuslabs", "bootstrap"))
   ]);
   if (exactManagedRoots.has(target))
     return null;
@@ -100582,7 +101161,7 @@ function validateManagedCleanupTarget(input) {
 }
 function isWithinDirectory(parent, child) {
   const relativePath = relative5(parent, child);
-  return relativePath === "" || !relativePath.startsWith("..") && !isAbsolute8(relativePath);
+  return relativePath === "" || !relativePath.startsWith("..") && !isAbsolute9(relativePath);
 }
 function isManagedBootstrapDriftPath(codexHome, target) {
   const relativePath = relative5(codexHome, target);
@@ -100602,8 +101181,9 @@ function skipped(path6, reason) {
 var INSTALLED_AGENTS_MANIFEST = ".installed-agents.json";
 async function cleanupCodexLight(input = {}) {
   const env3 = input.env ?? process.env;
-  const codexHome = resolve15(input.codexHome ?? env3.CODEX_HOME ?? join56(homedir7(), ".codex"));
-  const configPath = join56(codexHome, "config.toml");
+  const codexHome = resolve16(input.codexHome ?? env3.CODEX_HOME ?? join58(homedir8(), ".codex"));
+  const configPath = join58(codexHome, "config.toml");
+  const installedBinDir = await readInstalledCodexBinDir(codexHome);
   const agentPaths = await collectInstalledAgentPaths(codexHome, configPath);
   const configCleanup = await cleanupCodexConfig(configPath, input.now);
   const agentCleanup = await removeManifestListedAgentLinks(codexHome, agentPaths);
@@ -100619,6 +101199,12 @@ async function cleanupCodexLight(input = {}) {
     }
   }
   await pruneEmptyRuntimeDirBestEffort(codexHome);
+  const binDir = resolveCodexInstallerBinDir({
+    binDir: firstConfiguredPath(input.binDir, env3.CODEX_LOCAL_BIN_DIR, installedBinDir),
+    codexHome,
+    env: env3
+  });
+  const removedBinLinks = codexHomeResolvesToFilesystemRoot(codexHome) ? [] : await removeManagedCodexBins(binDir, input.platform ?? process.platform);
   const projectDirectory = input.projectDirectory ?? env3.OMO_CODEX_PROJECT ?? process.cwd();
   const projectCleanup = await repairProjectLocalCodexArtifactsBestEffort({
     startDirectory: projectDirectory,
@@ -100637,36 +101223,44 @@ async function cleanupCodexLight(input = {}) {
     skippedPaths,
     removedAgentLinks: agentCleanup.removed,
     skippedAgentLinks: agentCleanup.skipped,
+    removedBinLinks,
     projectCleanup
   };
 }
+function firstConfiguredPath(...values) {
+  for (const value of values) {
+    if (typeof value === "string" && value.trim().length > 0)
+      return value;
+  }
+  return;
+}
 function managedGlobalStatePaths(codexHome) {
   return [
-    join56(codexHome, "plugins", "cache", "sisyphuslabs"),
-    join56(codexHome, ".tmp", "marketplaces", "sisyphuslabs"),
-    join56(codexHome, "runtime", "ast-grep"),
-    join56(codexHome, "runtime", "node"),
-    join56(codexHome, "plugins", "data", "omo-sisyphuslabs", "bootstrap")
+    join58(codexHome, "plugins", "cache", "sisyphuslabs"),
+    join58(codexHome, ".tmp", "marketplaces", "sisyphuslabs"),
+    join58(codexHome, "runtime", "ast-grep"),
+    join58(codexHome, "runtime", "node"),
+    join58(codexHome, "plugins", "data", "omo-sisyphuslabs", "bootstrap")
   ];
 }
 var BOOTSTRAP_DATA_GLOB_MAX_DEPTH = 5;
 async function collectBootstrapDataDirsByGlob(codexHome) {
   const results = [];
-  await walkForManagedBootstrapDirs(join56(codexHome, "plugins"), 0, results);
+  await walkForManagedBootstrapDirs(join58(codexHome, "plugins"), 0, results);
   return results;
 }
 async function walkForManagedBootstrapDirs(directory, depth, results) {
   if (depth > BOOTSTRAP_DATA_GLOB_MAX_DEPTH)
     return;
-  const entries = await readdir11(directory, { withFileTypes: true }).catch(() => null);
+  const entries = await readdir13(directory, { withFileTypes: true }).catch(() => null);
   if (entries === null)
     return;
   for (const entry of entries) {
     if (!entry.isDirectory())
       continue;
-    const childPath = join56(directory, entry.name);
+    const childPath = join58(directory, entry.name);
     if (isManagedBootstrapOwnerName(entry.name)) {
-      const bootstrapDir = join56(childPath, "bootstrap");
+      const bootstrapDir = join58(childPath, "bootstrap");
       if (await exists6(bootstrapDir))
         results.push(bootstrapDir);
       continue;
@@ -100690,9 +101284,9 @@ async function removeManagedPathBestEffort(path6, seams) {
 }
 async function attemptRemove(path6) {
   try {
-    if (await lstat13(path6).catch(() => null) === null)
+    if (await lstat14(path6).catch(() => null) === null)
       return false;
-    await rm11(path6, { recursive: true, force: true });
+    await rm12(path6, { recursive: true, force: true });
     return true;
   } catch {
     return false;
@@ -100700,7 +101294,7 @@ async function attemptRemove(path6) {
 }
 async function pruneEmptyRuntimeDirBestEffort(codexHome) {
   try {
-    await rmdir(join56(codexHome, "runtime"));
+    await rmdir(join58(codexHome, "runtime"));
   } catch (error51) {
     if (isExpectedRuntimePruneFailure(error51))
       return;
@@ -100712,14 +101306,14 @@ function isExpectedRuntimePruneFailure(error51) {
 }
 async function collectInstalledAgentPaths(codexHome, configPath) {
   const manifestPaths = [
-    join56(codexHome, ".tmp", "marketplaces", "sisyphuslabs", "plugins", "omo", INSTALLED_AGENTS_MANIFEST)
+    join58(codexHome, ".tmp", "marketplaces", "sisyphuslabs", "plugins", "omo", INSTALLED_AGENTS_MANIFEST)
   ];
-  const versionRoot = join56(codexHome, "plugins", "cache", "sisyphuslabs", "omo");
+  const versionRoot = join58(codexHome, "plugins", "cache", "sisyphuslabs", "omo");
   if (await exists6(versionRoot)) {
-    const entries = await readdir11(versionRoot, { withFileTypes: true });
+    const entries = await readdir13(versionRoot, { withFileTypes: true });
     for (const entry of entries) {
       if (entry.isDirectory())
-        manifestPaths.push(join56(versionRoot, entry.name, INSTALLED_AGENTS_MANIFEST));
+        manifestPaths.push(join58(versionRoot, entry.name, INSTALLED_AGENTS_MANIFEST));
     }
   }
   const paths2 = new Set;
@@ -100736,19 +101330,19 @@ async function collectInstalledAgentPaths(codexHome, configPath) {
 async function readManagedAgentPathsFromConfig(codexHome, configPath) {
   if (!await exists6(configPath))
     return [];
-  const config3 = await readFile22(configPath, "utf8");
-  return MANAGED_CODEX_AGENT_NAMES2.filter((agentName) => config3.includes(`config_file = ${JSON.stringify(`./agents/${agentName}.toml`)}`)).map((agentName) => join56(codexHome, "agents", `${agentName}.toml`));
+  const config3 = await readFile24(configPath, "utf8");
+  return MANAGED_CODEX_AGENT_NAMES2.filter((agentName) => config3.includes(`config_file = ${JSON.stringify(`./agents/${agentName}.toml`)}`)).map((agentName) => join58(codexHome, "agents", `${agentName}.toml`));
 }
 async function readInstalledAgentManifest(manifestPath) {
   if (!await exists6(manifestPath))
     return [];
-  const parsed = JSON.parse(await readFile22(manifestPath, "utf8"));
+  const parsed = JSON.parse(await readFile24(manifestPath, "utf8"));
   if (!isPlainRecord4(parsed) || !Array.isArray(parsed.agents))
     return [];
   return parsed.agents.filter((path6) => typeof path6 === "string");
 }
 async function removeManifestListedAgentLinks(codexHome, paths2) {
-  const agentsDir = join56(codexHome, "agents");
+  const agentsDir = join58(codexHome, "agents");
   const removed2 = [];
   const skipped2 = [];
   for (const path6 of paths2) {
@@ -100763,16 +101357,16 @@ async function removeManifestListedAgentLinks(codexHome, paths2) {
       skipped2.push(path6);
       continue;
     }
-    await rm11(path6, { force: true });
+    await rm12(path6, { force: true });
     removed2.push(path6);
   }
   return { removed: removed2, skipped: skipped2 };
 }
 function isSafeManagedAgentPath(agentsDir, path6) {
-  if (!isAbsolute9(path6))
+  if (!isAbsolute10(path6))
     return false;
   const relativePath = relative6(agentsDir, path6);
-  if (relativePath === "" || relativePath.startsWith("..") || isAbsolute9(relativePath))
+  if (relativePath === "" || relativePath.startsWith("..") || isAbsolute10(relativePath))
     return false;
   const fileName = relativePath.split(/[\\/]/).pop();
   if (fileName === undefined)
@@ -100784,7 +101378,7 @@ async function exists6(path6) {
 }
 async function maybeLstat2(path6) {
   try {
-    return await lstat13(path6);
+    return await lstat14(path6);
   } catch (error51) {
     if (nodeErrorCode6(error51) === "ENOENT")
       return null;
@@ -100800,52 +101394,162 @@ function nodeErrorCode6(error51) {
 var CODEGRAPH_RELATIVE_ARGS2 = new Set(["components/codegraph/dist/serve.js", "./components/codegraph/dist/serve.js"]);
 // packages/omo-senpi/src/install/install-senpi.ts
 import { execFile as execFile4 } from "node:child_process";
-import { constants as constants7, existsSync as existsSync30 } from "node:fs";
-import { access, copyFile as copyFile3, mkdir as mkdir9, readFile as readFile23, rename as rename5, writeFile as writeFile13 } from "node:fs/promises";
-import { homedir as homedir8 } from "node:os";
-import { dirname as dirname20, join as join57, resolve as resolve16 } from "node:path";
+import { createHash as createHash5 } from "node:crypto";
+import { constants as constants8, existsSync as existsSync30 } from "node:fs";
+import { access as access2, readFile as readFile26, stat as stat6 } from "node:fs/promises";
+import { homedir as homedir9 } from "node:os";
+import { dirname as dirname22, join as join60, resolve as resolve18 } from "node:path";
 import { fileURLToPath } from "node:url";
 import { promisify as promisify2 } from "node:util";
+
+// packages/omo-senpi/src/install/senpi-settings.ts
+import { constants as constants7 } from "node:fs";
+import { access, copyFile as copyFile3, mkdir as mkdir9, readFile as readFile25, rename as rename5, writeFile as writeFile14 } from "node:fs/promises";
+import { dirname as dirname21, join as join59, resolve as resolve17 } from "node:path";
+var OMO_SENPI_PACKAGE_NAME = "@code-yeongyu/omo-senpi";
+var LEGACY_BUILTIN_SHADOW_PACKAGES = [
+  join59("packages", "pi-goal"),
+  join59("packages", "pi-webfetch")
+];
+async function readSettings(settingsPath) {
+  let raw;
+  try {
+    raw = await readFile25(settingsPath, "utf8");
+  } catch (error51) {
+    if (isErrno(error51, "ENOENT"))
+      return {};
+    throw error51;
+  }
+  const parsed = JSON.parse(raw);
+  if (!isRecord10(parsed))
+    throw new Error(`${settingsPath} must contain a JSON object`);
+  return parsed;
+}
+function readPackages(settings) {
+  const packages = settings.packages;
+  if (packages === undefined)
+    return [];
+  if (!Array.isArray(packages) || !packages.every((entry) => typeof entry === "string")) {
+    throw new Error("Senpi settings packages must be an array of strings");
+  }
+  return packages;
+}
+function dedupePackages(packages) {
+  return [...new Set(packages)];
+}
+function removeLegacyBuiltinShadows(packages, repoRoot, agentDir) {
+  const shadowPaths = new Set(LEGACY_BUILTIN_SHADOW_PACKAGES.map((path6) => resolve17(repoRoot, path6)));
+  return packages.filter((entry) => !shadowPaths.has(resolve17(agentDir, entry)));
+}
+async function removeSupersededOmoPackages(packages, currentPluginPath, agentDir) {
+  const currentPath = resolve17(currentPluginPath);
+  const entries = await Promise.all(packages.map(async (entry) => {
+    const packagePath = resolve17(agentDir, entry);
+    if (packagePath === currentPath)
+      return currentPath;
+    return await readPackageName(packagePath) === OMO_SENPI_PACKAGE_NAME ? undefined : entry;
+  }));
+  return entries.filter((entry) => entry !== undefined);
+}
+async function writeSettingsAtomically(settingsPath, settings) {
+  await mkdir9(dirname21(settingsPath), { recursive: true });
+  const backupPath = await nextBackupPath(settingsPath);
+  if (await fileExists(settingsPath)) {
+    await copyFile3(settingsPath, backupPath);
+  } else {
+    await writeFile14(backupPath, `{}
+`, "utf8");
+  }
+  const tempPath = `${settingsPath}.${process.pid}.${Date.now()}.tmp`;
+  await writeFile14(tempPath, `${JSON.stringify(settings, null, 2)}
+`, "utf8");
+  await rename5(tempPath, settingsPath);
+  return backupPath;
+}
+async function nextBackupPath(settingsPath) {
+  for (let index = 0;index < 1000; index += 1) {
+    const suffix = index === 0 ? "" : `-${index}`;
+    const candidate2 = `${settingsPath}.${timestampForBackup()}${suffix}.backup`;
+    if (!await fileExists(candidate2))
+      return candidate2;
+  }
+  throw new Error(`Unable to allocate backup path for ${settingsPath}`);
+}
+function timestampForBackup() {
+  return new Date().toISOString().replace(/[-:.]/g, "");
+}
+function isRecord10(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+async function readPackageName(packagePath) {
+  let raw;
+  try {
+    raw = await readFile25(join59(packagePath, "package.json"), "utf8");
+  } catch (error51) {
+    if (isErrno(error51, "ENOENT") || isErrno(error51, "ENOTDIR"))
+      return;
+    throw error51;
+  }
+  const parsed = JSON.parse(raw);
+  return isRecord10(parsed) && typeof parsed.name === "string" ? parsed.name : undefined;
+}
+async function fileExists(path6) {
+  try {
+    await access(path6, constants7.F_OK);
+    return true;
+  } catch (error51) {
+    if (isErrno(error51, "ENOENT"))
+      return false;
+    throw error51;
+  }
+}
+function isErrno(error51, code) {
+  return error51 instanceof Error && "code" in error51 && error51.code === code;
+}
+
+// packages/omo-senpi/src/install/install-senpi.ts
 var execFileAsync2 = promisify2(execFile4);
 var REQUIRED_PLUGIN_ARTIFACTS = [
-  join57("extensions", "omo.js"),
-  join57("skills", "ast-grep", "SKILL.md"),
-  join57("skills", "coding-agent-sessions", "SKILL.md"),
-  join57("skills", "debugging", "SKILL.md"),
-  join57("skills", "frontend", "SKILL.md"),
-  join57("skills", "git-master", "SKILL.md"),
-  join57("skills", "init-deep", "SKILL.md"),
-  join57("skills", "lsp-setup", "SKILL.md"),
-  join57("skills", "programming", "SKILL.md"),
-  join57("skills", "refactor", "SKILL.md"),
-  join57("skills", "remove-ai-slops", "SKILL.md"),
-  join57("skills", "review-work", "SKILL.md"),
-  join57("skills", "start-work", "SKILL.md"),
-  join57("skills", "ultimate-browsing", "SKILL.md"),
-  join57("skills", "ultrawork", "SKILL.md"),
-  join57("skills", "ulw-loop", "SKILL.md"),
-  join57("skills", "ulw-plan", "SKILL.md"),
-  join57("skills", "ulw-research", "SKILL.md"),
-  join57("skills", "visual-qa", "SKILL.md"),
-  join57("runtime", "lsp-daemon", "dist", "cli.js"),
-  join57("runtime", "lsp-daemon", "dist", "index.js"),
-  join57("runtime", "lsp-daemon", "dist", "index.d.ts"),
-  join57("runtime", "lsp-daemon", "dist", "daemon-client.js"),
-  join57("runtime", "lsp-daemon", "dist", "daemon-client.d.ts"),
-  join57("runtime", "lsp-daemon", "dist", "package.json"),
-  join57("runtime", "lsp-daemon", "dist", ".omo-runtime-manifest.json"),
-  join57("scripts", "install.mjs")
-];
-var LEGACY_BUILTIN_SHADOW_PACKAGES = [
-  join57("packages", "pi-goal"),
-  join57("packages", "pi-webfetch")
+  join60("extensions", "omo.js"),
+  join60("extensions", "reflection-persona.md"),
+  join60("skills", "ast-grep", "SKILL.md"),
+  join60("skills", "coding-agent-sessions", "SKILL.md"),
+  join60("skills", "debugging", "SKILL.md"),
+  join60("skills", "frontend", "SKILL.md"),
+  join60("skills", "git-master", "SKILL.md"),
+  join60("skills", "init-deep", "SKILL.md"),
+  join60("skills", "lsp-setup", "SKILL.md"),
+  join60("skills", "programming", "SKILL.md"),
+  join60("skills", "refactor", "SKILL.md"),
+  join60("skills", "remove-ai-slops", "SKILL.md"),
+  join60("skills", "review-work", "SKILL.md"),
+  join60("skills", "start-work", "SKILL.md"),
+  join60("skills", "ultimate-browsing", "SKILL.md"),
+  join60("skills", "ultrawork", "SKILL.md"),
+  join60("skills", "ulw-loop", "SKILL.md"),
+  join60("skills", "ulw-plan", "SKILL.md"),
+  join60("skills", "ulw-research", "SKILL.md"),
+  join60("skills", "visual-qa", "SKILL.md"),
+  join60("runtime", "ast-grep-mcp", "cli.js"),
+  join60("runtime", "agent-toolkit", "cli.js"),
+  join60("runtime", "agent-toolkit", "ulw-loop", "cli.js"),
+  join60("runtime", "agent-toolkit", "omo-agent-toolkit"),
+  join60("runtime", "agent-toolkit", "omo-agent-toolkit.cmd"),
+  join60("runtime", "lsp-daemon", "dist", "cli.js"),
+  join60("runtime", "lsp-daemon", "dist", "index.js"),
+  join60("runtime", "lsp-daemon", "dist", "index.d.ts"),
+  join60("runtime", "lsp-daemon", "dist", "daemon-client.js"),
+  join60("runtime", "lsp-daemon", "dist", "daemon-client.d.ts"),
+  join60("runtime", "lsp-daemon", "dist", "package.json"),
+  join60("runtime", "lsp-daemon", "dist", ".omo-runtime-manifest.json"),
+  join60("scripts", "install.mjs")
 ];
 async function runSenpiInstaller(options = {}) {
   const context = resolveInstallContext(options);
   await ensurePluginArtifacts(context);
   const settings = await readSettings(context.settingsPath);
   const before = JSON.stringify(settings);
-  const packages = removeLegacyBuiltinShadows(dedupePackages(readPackages(settings)), context.repoRoot, context.agentDir);
+  const packages = dedupePackages(await removeSupersededOmoPackages(removeLegacyBuiltinShadows(dedupePackages(readPackages(settings)), context.repoRoot, context.agentDir), context.pluginPath, context.agentDir));
   if (!packages.includes(context.pluginPath))
     packages.push(context.pluginPath);
   settings.packages = packages;
@@ -100863,121 +101567,113 @@ async function runSenpiInstaller(options = {}) {
 function resolveInstallContext(options) {
   const env3 = options.env ?? process.env;
   const allowBuild = options.pluginPath === undefined;
-  const repoRoot = resolve16(options.repoRoot ?? (allowBuild ? findRepoRoot2(dirname20(fileURLToPath(import.meta.url))) : dirname20(resolve16(options.pluginPath))));
-  const agentDir = resolve16(options.agentDir ?? env3.SENPI_CODING_AGENT_DIR ?? join57(homedir8(), ".senpi", "agent"));
-  const pluginPath = resolve16(options.pluginPath ?? join57(repoRoot, "packages", "omo-senpi", "plugin"));
+  const repoRoot = resolve18(options.repoRoot ?? (allowBuild ? findRepoRoot2(dirname22(fileURLToPath(import.meta.url))) : dirname22(resolve18(options.pluginPath))));
+  const agentDir = resolve18(options.agentDir ?? env3.SENPI_CODING_AGENT_DIR ?? join60(homedir9(), ".senpi", "agent"));
+  const pluginPath = resolve18(options.pluginPath ?? join60(repoRoot, "packages", "omo-senpi", "plugin"));
   return {
     env: env3,
     repoRoot,
     agentDir,
-    settingsPath: join57(agentDir, "settings.json"),
+    settingsPath: join60(agentDir, "settings.json"),
     pluginPath,
+    platform: options.platform ?? process.platform,
     allowBuild,
     runCommand: options.runCommand ?? defaultRunCommand3
   };
 }
 async function ensurePluginArtifacts(context) {
-  const missing = await hasMissingPluginArtifact(context.pluginPath);
-  if (!missing)
-    return;
-  if (!context.allowBuild) {
+  if (context.allowBuild) {
+    await context.runCommand("node", [join60(context.pluginPath, "scripts", "build-extension.mjs")], { cwd: context.repoRoot });
+    await context.runCommand("node", [join60("packages", "omo-codex", "plugin", "scripts", "materialize-shared-upstreams.mjs")], { cwd: context.repoRoot });
+    await context.runCommand("node", [join60(context.pluginPath, "scripts", "sync-skills.mjs")], { cwd: context.repoRoot });
+    await context.runCommand("node", [join60(context.pluginPath, "scripts", "build-install.mjs")], { cwd: context.repoRoot });
+    await context.runCommand("node", [join60(context.pluginPath, "scripts", "stage-lsp-daemon-runtime.mjs")], { cwd: context.repoRoot });
+    await context.runCommand("node", [join60(context.pluginPath, "scripts", "stage-ast-grep-mcp-runtime.mjs")], { cwd: context.repoRoot });
+    await context.runCommand("node", [join60(context.pluginPath, "scripts", "stage-agent-toolkit.mjs")], { cwd: context.repoRoot });
+  }
+  if (await hasMissingPluginArtifact(context.pluginPath)) {
     throw new Error(`Packed omo-senpi plugin is missing required runtime artifacts at ${context.pluginPath}`);
   }
-  await context.runCommand("node", [join57(context.pluginPath, "scripts", "build-extension.mjs")], { cwd: context.repoRoot });
-  await context.runCommand("node", [join57("packages", "omo-codex", "plugin", "scripts", "materialize-shared-upstreams.mjs")], { cwd: context.repoRoot });
-  await context.runCommand("node", [join57(context.pluginPath, "scripts", "sync-skills.mjs")], { cwd: context.repoRoot });
-  await context.runCommand("node", [join57(context.pluginPath, "scripts", "build-install.mjs")], { cwd: context.repoRoot });
-  await context.runCommand("node", [join57(context.pluginPath, "scripts", "stage-lsp-daemon-runtime.mjs")], { cwd: context.repoRoot });
+  await verifyAstGrepRuntimeIntegrity(context.pluginPath, context.platform);
 }
 async function hasMissingPluginArtifact(pluginPath) {
   for (const artifact of REQUIRED_PLUGIN_ARTIFACTS) {
-    if (!await fileExists(join57(pluginPath, artifact)))
+    if (!await fileExists2(join60(pluginPath, artifact)))
       return true;
   }
   return false;
 }
-async function defaultRunCommand3(command, args, options) {
-  const result = await execFileAsync2(command, [...args], { cwd: options.cwd });
-  if (result.stderr.trim().length > 0)
-    process.stderr.write(result.stderr);
-  if (result.stdout.trim().length > 0)
-    process.stdout.write(result.stdout);
-}
-async function readSettings(settingsPath) {
-  let raw;
+async function verifyAstGrepRuntimeIntegrity(pluginPath, platform) {
+  const runtimeEntry = join60(pluginPath, "runtime", "ast-grep-mcp", "cli.js");
+  const manifestPath = join60(dirname22(runtimeEntry), "manifest.json");
+  let runtimeStat;
   try {
-    raw = await readFile23(settingsPath, "utf8");
+    runtimeStat = await stat6(runtimeEntry);
+    if (!runtimeStat.isFile())
+      throw new Error("runtime is not a file");
+    await access2(runtimeEntry, constants8.R_OK | constants8.X_OK);
   } catch (error51) {
-    if (isErrno(error51, "ENOENT"))
-      return {};
-    throw error51;
+    throw astGrepIntegrityError(runtimeEntry, `runtime is unreadable or non-executable: ${messageOf(error51)}`);
   }
-  const parsed = JSON.parse(raw);
-  if (!isPlainObject6(parsed))
-    throw new Error(`${settingsPath} must contain a JSON object`);
-  return parsed;
-}
-function readPackages(settings) {
-  const packages = settings.packages;
-  if (packages === undefined)
-    return [];
-  if (!Array.isArray(packages) || !packages.every((entry) => typeof entry === "string")) {
-    throw new Error("Senpi settings packages must be an array of strings");
+  if (!await fileExists2(manifestPath)) {
+    throw astGrepIntegrityError(runtimeEntry, `manifest is missing: ${manifestPath}`);
+  }
+  let manifest2;
+  try {
+    manifest2 = JSON.parse(await readFile26(manifestPath, "utf8"));
+  } catch (error51) {
+    throw astGrepIntegrityError(runtimeEntry, `manifest is unreadable or invalid JSON: ${messageOf(error51)}`);
+  }
+  if (!isAstGrepRuntimeManifest(manifest2)) {
+    throw astGrepIntegrityError(runtimeEntry, `manifest is malformed: ${manifestPath}`);
+  }
+  let actualSha256;
+  try {
+    actualSha256 = createHash5("sha256").update(await readFile26(runtimeEntry)).digest("hex");
+  } catch (error51) {
+    throw astGrepIntegrityError(runtimeEntry, `runtime hash could not be computed: ${messageOf(error51)}`);
+  }
+  if (actualSha256 !== manifest2.sha256) {
+    throw astGrepIntegrityError(runtimeEntry, `sha256 mismatch: manifest=${manifest2.sha256} actual=${actualSha256}`);
+  }
+  const actualMode = runtimeStat.mode & 511;
+  if (platform !== "win32" && actualMode !== manifest2.mode) {
+    throw astGrepIntegrityError(runtimeEntry, `mode mismatch: manifest=${manifest2.mode} actual=${actualMode}`);
   }
-  return packages;
-}
-function dedupePackages(packages) {
-  return [...new Set(packages)];
 }
-function removeLegacyBuiltinShadows(packages, repoRoot, agentDir) {
-  const shadowPaths = new Set(LEGACY_BUILTIN_SHADOW_PACKAGES.map((path6) => resolve16(repoRoot, path6)));
-  return packages.filter((entry) => !shadowPaths.has(resolve16(agentDir, entry)));
+function isAstGrepRuntimeManifest(value) {
+  if (!isRecord10(value))
+    return false;
+  return typeof value.sha256 === "string" && /^[a-f0-9]{64}$/.test(value.sha256) && typeof value.mode === "number" && Number.isInteger(value.mode) && typeof value.stagedAtUtc === "string" && !Number.isNaN(Date.parse(value.stagedAtUtc));
 }
-async function writeSettingsAtomically(settingsPath, settings) {
-  await mkdir9(dirname20(settingsPath), { recursive: true });
-  const backupPath = await nextBackupPath(settingsPath);
-  if (await fileExists(settingsPath)) {
-    await copyFile3(settingsPath, backupPath);
-  } else {
-    await writeFile13(backupPath, `{}
-`, "utf8");
-  }
-  const tempPath = `${settingsPath}.${process.pid}.${Date.now()}.tmp`;
-  await writeFile13(tempPath, `${JSON.stringify(settings, null, 2)}
-`, "utf8");
-  await rename5(tempPath, settingsPath);
-  return backupPath;
+function astGrepIntegrityError(runtimeEntry, reason) {
+  return new Error(`Packed omo-senpi plugin ast-grep MCP runtime integrity error at ${runtimeEntry}: ${reason}`);
 }
-async function nextBackupPath(settingsPath) {
-  for (let index = 0;index < 1000; index += 1) {
-    const suffix = index === 0 ? "" : `-${index}`;
-    const candidate = `${settingsPath}.${timestampForBackup()}${suffix}.backup`;
-    if (!await fileExists(candidate))
-      return candidate;
-  }
-  throw new Error(`Unable to allocate backup path for ${settingsPath}`);
+function messageOf(error51) {
+  return error51 instanceof Error ? error51.message : String(error51);
 }
-function timestampForBackup() {
-  return new Date().toISOString().replace(/[-:.]/g, "");
+async function defaultRunCommand3(command, args, options) {
+  const result = await execFileAsync2(command, [...args], { cwd: options.cwd });
+  if (result.stderr.trim().length > 0)
+    process.stderr.write(result.stderr);
+  if (result.stdout.trim().length > 0)
+    process.stdout.write(result.stdout);
 }
 function findRepoRoot2(importerDir) {
   let current = importerDir;
   for (let depth = 0;depth <= 7; depth += 1) {
-    if (fileExistsSync(join57(current, "packages", "omo-senpi", "plugin", "package.json")))
+    if (fileExistsSync(join60(current, "packages", "omo-senpi", "plugin", "package.json")))
       return current;
-    current = resolve16(current, "..");
+    current = resolve18(current, "..");
   }
   throw new Error("Unable to locate packages/omo-senpi/plugin/package.json from installer module");
 }
-function isPlainObject6(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-async function fileExists(path6) {
+async function fileExists2(path6) {
   try {
-    await access(path6, constants7.F_OK);
+    await access2(path6, constants8.F_OK);
     return true;
   } catch (error51) {
-    if (isErrno(error51, "ENOENT"))
+    if (isErrno2(error51, "ENOENT"))
       return false;
     throw error51;
   }
@@ -100985,7 +101681,7 @@ async function fileExists(path6) {
 function fileExistsSync(path6) {
   return existsSync30(path6);
 }
-function isErrno(error51, code) {
+function isErrno2(error51, code) {
   return error51 instanceof Error && "code" in error51 && error51.code === code;
 }
 // packages/omo-opencode/src/cli/star-request.ts
@@ -101023,19 +101719,19 @@ init_provider_availability();
 
 // packages/omo-opencode/src/cli/config-manager/add-tui-plugin-to-tui-config.ts
 import { existsSync as existsSync32, mkdirSync as mkdirSync10, readFileSync as readFileSync15 } from "node:fs";
-import { join as join59 } from "node:path";
+import { join as join62 } from "node:path";
 
 // packages/omo-opencode/src/cli/doctor/checks/tui-plugin-config.ts
 init_shared();
 import { existsSync as existsSync31, readFileSync as readFileSync14 } from "node:fs";
-import { join as join58 } from "node:path";
+import { join as join61 } from "node:path";
 var TUI_SUBPATH = "tui";
 var TUI_EXPORT_SUBPATH = `./${TUI_SUBPATH}`;
 function fileEntryPackageJsonPath(entry) {
   let path6 = entry.slice("file:".length);
   if (path6.startsWith("//"))
     path6 = path6.slice(2);
-  return join58(path6, "package.json");
+  return join61(path6, "package.json");
 }
 function packageJsonExportsTui(pkgJsonPath) {
   if (!existsSync31(pkgJsonPath))
@@ -101073,7 +101769,7 @@ function packageExportsTuiForServerEntry(entry) {
   const packageName = packageNameFromServerEntry(entry);
   if (packageName === null)
     return null;
-  return packageJsonExportsTui(join58(getOpenCodeConfigDir({ binary: "opencode" }), "node_modules", packageName, "package.json"));
+  return packageJsonExportsTui(join61(getOpenCodeConfigDir({ binary: "opencode" }), "node_modules", packageName, "package.json"));
 }
 function isOurFilePluginEntry(entry) {
   if (typeof entry !== "string" || !entry.startsWith("file:"))
@@ -101138,7 +101834,7 @@ function detectServerPluginRegistration() {
   }
 }
 function detectTuiPluginRegistration() {
-  const tuiJsonPath = join58(getOpenCodeConfigDir({ binary: "opencode" }), "tui.json");
+  const tuiJsonPath = join61(getOpenCodeConfigDir({ binary: "opencode" }), "tui.json");
   if (!existsSync31(tuiJsonPath)) {
     return {
       registered: false,
@@ -101294,10 +101990,10 @@ function readConfig(path6) {
   return null;
 }
 function readServerConfig(configDir) {
-  const jsoncPath = join59(configDir, "opencode.jsonc");
+  const jsoncPath = join62(configDir, "opencode.jsonc");
   if (existsSync32(jsoncPath))
     return readConfig(jsoncPath);
-  const jsonPath = join59(configDir, "opencode.json");
+  const jsonPath = join62(configDir, "opencode.json");
   if (existsSync32(jsonPath))
     return readConfig(jsonPath);
   return null;
@@ -101339,7 +102035,7 @@ function ensureTuiPluginEntry(opts = {}) {
   if (!desiredEntry) {
     return { changed: false, reason: "no-server-entry" };
   }
-  const tuiJsonPath = join59(configDir, "tui.json");
+  const tuiJsonPath = join62(configDir, "tui.json");
   const { config: config3, malformed } = readTuiConfig(tuiJsonPath);
   if (malformed) {
     return { changed: false, reason: "malformed" };
@@ -101354,13 +102050,16 @@ function ensureTuiPluginEntry(opts = {}) {
 }
 
 // packages/omo-opencode/src/cli/install-ast-grep-sg.ts
-import { homedir as homedir9 } from "node:os";
-import { join as join60 } from "node:path";
+import { homedir as homedir10 } from "node:os";
+import { join as join63 } from "node:path";
 
 // packages/shared-skills/index.mjs
+import { existsSync as existsSync33 } from "node:fs";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
+var SKILLS_PROBE_SPECIFIERS = ["./skills/", "../skills/", "../../skills/"];
 function sharedSkillsRootPath() {
-  return fileURLToPath2(new URL("./skills/", import.meta.url));
+  const candidates = SKILLS_PROBE_SPECIFIERS.map((specifier) => fileURLToPath2(new URL(specifier, import.meta.url)));
+  return candidates.find((candidate2) => existsSync33(candidate2)) ?? candidates[0];
 }
 
 // packages/omo-opencode/src/cli/install-ast-grep-sg.ts
@@ -101374,9 +102073,9 @@ function describeResult2(result) {
 }
 async function installAstGrepForOpenCode(options = {}) {
   const platform = options.platform ?? process.platform;
-  const baseDir = join60(options.homeDir ?? homedir9(), ".omo");
+  const baseDir = join63(options.homeDir ?? homedir10(), ".omo");
   const targetDir = astGrepRuntimeDir(baseDir, platform, options.arch ?? process.arch);
-  const skillDir = join60(options.sharedSkillsRoot ?? sharedSkillsRootPath(), "ast-grep");
+  const skillDir = join63(options.sharedSkillsRoot ?? sharedSkillsRootPath(), "ast-grep");
   const installer = options.installer ?? runAstGrepSkillInstall;
   try {
     const result = await installer({ platform, skillDir, targetDir });
@@ -103324,10 +104023,10 @@ function configureCleanupCommand(program2) {
   program2.command("cleanup").alias("uninstall").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 artifacts").option("--json", "Output structured JSON result").addHelpText("after", `
 Examples:
   $ npx lazycodex-ai uninstall
-  $ omo uninstall --platform=codex
+  $ omo-agent-toolkit uninstall --platform=codex
   $ npx lazycodex-ai cleanup
-  $ omo cleanup --platform=codex
-  $ omo uninstall --platform=codex --project /path/to/project
+  $ omo-agent-toolkit cleanup --platform=codex
+  $ omo-agent-toolkit uninstall --platform=codex --project /path/to/project
 `).action(async (options) => {
     const rootOptions = program2.opts();
     const platform = resolveCleanupPlatform({ platform: options.platform ?? rootOptions.platform });
@@ -104209,7 +104908,7 @@ function recordFields(value, fields) {
 }
 function modelInput(view) {
   const agents = isPlainRecord(view.agents) ? Object.fromEntries(Object.entries(view.agents).flatMap(([name, definition]) => {
-    const fields = recordFields(definition, ["description", "prompt", "model", "variant", "reasoningEffort", "tools", "temperature", "disable"]);
+    const fields = recordFields(definition, ["description", "prompt", "model", "models", "variant", "reasoningEffort", "tools", "temperature", "disable"]);
     return fields === undefined ? [] : [[name, fields]];
   })) : undefined;
   const categories = isPlainRecord(view.categories) ? Object.fromEntries(Object.entries(view.categories).flatMap(([name, definition]) => {
@@ -104366,7 +105065,7 @@ function unknownPaths(schema2, value, path6) {
   }
   if (def.type === "union") {
     const candidates = (def.options ?? []).filter((option) => matchesShape(option, value)).map((option) => unknownPaths(option, value, path6));
-    return candidates.reduce((best, candidate) => best === undefined || candidate.length < best.length ? candidate : best, undefined) ?? [];
+    return candidates.reduce((best, candidate2) => best === undefined || candidate2.length < best.length ? candidate2 : best, undefined) ?? [];
   }
   if (def.type === "intersection" && def.left !== undefined && def.right !== undefined) {
     return [...unknownPaths(def.left, value, path6), ...unknownPaths(def.right, value, path6)];
@@ -104472,6 +105171,7 @@ var AgentPermissionSchema = exports_external.object({
 // packages/omo-opencode/src/config/schema/agent-overrides.ts
 var AgentOverrideConfigSchema = exports_external.object({
   model: exports_external.string().optional(),
+  models: exports_external.array(exports_external.union([exports_external.string(), FallbackModelObjectSchema])).optional(),
   fallback_models: FallbackModelsSchema.optional(),
   reasoning: OmoReasoningSchema.optional(),
   variant: exports_external.string().optional(),
@@ -105043,8 +105743,8 @@ var OhMyOpenCodeConfigSchema = exports_external.object({
 });
 // packages/omo-opencode/src/config/validate.ts
 function shortPath(configPath) {
-  const candidate = relative7(process.cwd(), configPath);
-  return candidate.length > 0 ? candidate : configPath;
+  const candidate2 = relative7(process.cwd(), configPath);
+  return candidate2.length > 0 ? candidate2 : configPath;
 }
 function formatIssuePath(path6) {
   const formatted = path6.map((segment) => String(segment)).join(".");
@@ -105097,6 +105797,37 @@ function protectUserFields(config4, userConfig) {
     }
   };
 }
+function materializeAgentModelChains(config4) {
+  if (config4.agents === undefined)
+    return config4;
+  let changed = false;
+  const agents = Object.fromEntries(Object.entries(config4.agents).map(([name, agent2]) => {
+    if (agent2?.models === undefined)
+      return [name, agent2];
+    const [primary, ...fallbacks] = agent2.models;
+    const {
+      models: _models,
+      model: _model,
+      fallback_models: _fallbackModels,
+      reasoning: _reasoning,
+      variant: _variant,
+      reasoningEffort: _reasoningEffort,
+      temperature: _temperature,
+      top_p: _topP,
+      maxTokens: _maxTokens,
+      thinking: _thinking,
+      ...rest
+    } = agent2;
+    const primarySettings = primary === undefined ? {} : typeof primary === "string" ? { model: primary } : primary;
+    changed = true;
+    return [name, {
+      ...rest,
+      ...primarySettings,
+      fallback_models: fallbacks
+    }];
+  }));
+  return changed ? { ...config4, agents } : config4;
+}
 function migrateRalphLoopConfig(config4) {
   const legacy = config4.ralph_loop;
   if (legacy === undefined)
@@ -105124,7 +105855,7 @@ function validatePluginConfig(directory, environment2 = process.env) {
   const firstFailingView = views.find((view) => view.messages.length > 0);
   const firstView = views[0];
   const userConfig = parseConfig(chain.protectedUserView);
-  const config4 = applyDisabledProviders(protectUserFields(mergeViews(views), userConfig));
+  const config4 = applyDisabledProviders(materializeAgentModelChains(protectUserFields(mergeViews(views), userConfig)));
   return {
     valid: messages.length === 0,
     messages,
@@ -105147,7 +105878,7 @@ var import_picocolors11 = __toESM(require_picocolors(), 1);
 // packages/omo-opencode/src/cli/run/opencode-binary-resolver.ts
 init_bun_which_shim();
 init_spawn_with_windows_hide();
-import { delimiter as delimiter2, dirname as dirname21, posix as posix9, win32 as win325 } from "node:path";
+import { delimiter as delimiter2, dirname as dirname23, posix as posix9, win32 as win325 } from "node:path";
 var OPENCODE_COMMANDS = ["opencode", "opencode-desktop"];
 var WINDOWS_SUFFIXES = ["", ".exe", ".cmd", ".bat", ".ps1"];
 function getCommandCandidates(platform) {
@@ -105197,15 +105928,15 @@ async function canExecuteBinary(binaryPath, spawn4 = spawnWithWindowsHide) {
 }
 async function findWorkingOpencodeBinary(pathEnv = process.env.PATH, probe2 = canExecuteBinary, which2 = bunWhich, platform = process.platform) {
   const candidates = collectCandidateBinaryPaths(pathEnv, which2, platform);
-  for (const candidate of candidates) {
-    if (await probe2(candidate)) {
-      return candidate;
+  for (const candidate2 of candidates) {
+    if (await probe2(candidate2)) {
+      return candidate2;
     }
   }
   return null;
 }
 function buildPathWithBinaryFirst(pathEnv, binaryPath) {
-  const preferredDir = dirname21(binaryPath);
+  const preferredDir = dirname23(binaryPath);
   const existing = (pathEnv ?? "").split(delimiter2).filter((entry) => entry.length > 0 && entry !== preferredDir);
   return [preferredDir, ...existing].join(delimiter2);
 }
@@ -105374,7 +106105,7 @@ async function resolveSession(options) {
       if (attempt < SESSION_CREATE_MAX_RETRIES) {
         const delay2 = retryDelayMs * attempt;
         console.log(import_picocolors12.default.dim(`  Retrying in ${delay2}ms...`));
-        await new Promise((resolve17) => setTimeout(resolve17, delay2));
+        await new Promise((resolve19) => setTimeout(resolve19, delay2));
       }
       continue;
     }
@@ -105385,7 +106116,7 @@ async function resolveSession(options) {
     if (attempt < SESSION_CREATE_MAX_RETRIES) {
       const delay2 = retryDelayMs * attempt;
       console.log(import_picocolors12.default.dim(`  Retrying in ${delay2}ms...`));
-      await new Promise((resolve17) => setTimeout(resolve17, delay2));
+      await new Promise((resolve19) => setTimeout(resolve19, delay2));
     }
   }
   throw new Error("Failed to create session after all retries");
@@ -105783,9 +106514,9 @@ function isClosingFence(line, fence) {
   return run?.charAt(0) === fence.marker && run.length >= fence.length;
 }
 // packages/boulder-state/src/top-level-task.ts
-import { existsSync as existsSync33, readFileSync as readFileSync16 } from "node:fs";
+import { existsSync as existsSync34, readFileSync as readFileSync16 } from "node:fs";
 function readCurrentTopLevelTask(planPath) {
-  if (!existsSync33(planPath)) {
+  if (!existsSync34(planPath)) {
     return null;
   }
   try {
@@ -105796,13 +106527,13 @@ function readCurrentTopLevelTask(planPath) {
   }
 }
 // packages/boulder-state/src/storage/path.ts
-import { existsSync as existsSync34 } from "node:fs";
-import { isAbsolute as isAbsolute10, join as join61, relative as relative8, resolve as resolve17 } from "node:path";
+import { existsSync as existsSync35 } from "node:fs";
+import { isAbsolute as isAbsolute11, join as join64, relative as relative8, resolve as resolve19 } from "node:path";
 function getBoulderFilePath(directory) {
-  return join61(directory, BOULDER_DIR, BOULDER_FILE);
+  return join64(directory, BOULDER_DIR, BOULDER_FILE);
 }
 function resolveTrackedPath(baseDirectory, trackedPath) {
-  return isAbsolute10(trackedPath) ? resolve17(trackedPath) : resolve17(baseDirectory, trackedPath);
+  return isAbsolute11(trackedPath) ? resolve19(trackedPath) : resolve19(baseDirectory, trackedPath);
 }
 function resolveBoulderPlanPath(directory, state) {
   const absolutePlanPath = resolveTrackedPath(directory, state.active_plan);
@@ -105810,22 +106541,22 @@ function resolveBoulderPlanPath(directory, state) {
   if (!worktreePath) {
     return absolutePlanPath;
   }
-  const absoluteDirectory = resolve17(directory);
+  const absoluteDirectory = resolve19(directory);
   const relativePlanPath = relative8(absoluteDirectory, absolutePlanPath);
-  if (relativePlanPath.length === 0 || relativePlanPath.startsWith("..") || isAbsolute10(relativePlanPath)) {
+  if (relativePlanPath.length === 0 || relativePlanPath.startsWith("..") || isAbsolute11(relativePlanPath)) {
     return absolutePlanPath;
   }
   const absoluteWorktreePath = resolveTrackedPath(directory, worktreePath);
-  const worktreePlanPath = resolve17(absoluteWorktreePath, relativePlanPath);
-  return existsSync34(worktreePlanPath) ? worktreePlanPath : absolutePlanPath;
+  const worktreePlanPath = resolve19(absoluteWorktreePath, relativePlanPath);
+  return existsSync35(worktreePlanPath) ? worktreePlanPath : absolutePlanPath;
 }
 function resolveBoulderPlanPathForWork(directory, work) {
   return resolveBoulderPlanPath(directory, work);
 }
 // packages/boulder-state/src/storage/plan-progress.ts
-import { existsSync as existsSync35, readFileSync as readFileSync17, readdirSync as readdirSync7, statSync as statSync4 } from "node:fs";
+import { existsSync as existsSync36, readFileSync as readFileSync17, readdirSync as readdirSync7, statSync as statSync4 } from "node:fs";
 function getPlanProgress(planPath) {
-  if (!existsSync35(planPath)) {
+  if (!existsSync36(planPath)) {
     return { total: 0, completed: 0, isComplete: false };
   }
   try {
@@ -105908,10 +106639,10 @@ function selectMirrorWork(state) {
   return sorted[0] ?? null;
 }
 // packages/boulder-state/src/storage/read-state.ts
-import { existsSync as existsSync36, readFileSync as readFileSync18 } from "node:fs";
+import { existsSync as existsSync37, readFileSync as readFileSync18 } from "node:fs";
 function readBoulderState(directory) {
   const filePath = getBoulderFilePath(directory);
-  if (!existsSync36(filePath)) {
+  if (!existsSync37(filePath)) {
     return null;
   }
   try {
@@ -105981,14 +106712,14 @@ init_state();
 // packages/omo-opencode/src/features/run-continuation-state/constants.ts
 var CONTINUATION_MARKER_DIR = ".omo/run-continuation";
 // packages/omo-opencode/src/features/run-continuation-state/storage.ts
-import { existsSync as existsSync37, mkdirSync as mkdirSync11, readFileSync as readFileSync19, rmSync, writeFileSync as writeFileSync6 } from "node:fs";
-import { join as join62 } from "node:path";
+import { existsSync as existsSync38, mkdirSync as mkdirSync11, readFileSync as readFileSync19, rmSync, writeFileSync as writeFileSync6 } from "node:fs";
+import { join as join65 } from "node:path";
 function getMarkerPath(directory, sessionID) {
-  return join62(directory, CONTINUATION_MARKER_DIR, `${sessionID}.json`);
+  return join65(directory, CONTINUATION_MARKER_DIR, `${sessionID}.json`);
 }
 function readContinuationMarker(directory, sessionID) {
   const markerPath = getMarkerPath(directory, sessionID);
-  if (!existsSync37(markerPath))
+  if (!existsSync38(markerPath))
     return null;
   try {
     const raw = readFileSync19(markerPath, "utf-8");
@@ -106057,7 +106788,7 @@ async function isSessionInBoulderLineage(input) {
 init_shared();
 init_compaction_marker();
 import { readFileSync as readFileSync20, readdirSync as readdirSync8 } from "node:fs";
-import { join as join63 } from "node:path";
+import { join as join66 } from "node:path";
 var defaultSessionLastAgentDeps = {
   getMessageDir,
   isSqliteBackend,
@@ -106117,7 +106848,7 @@ async function getLastAgentFromSession(sessionID, client3, deps = {}) {
   try {
     const messages = readdirSync8(messageDir).filter((fileName) => fileName.endsWith(".json")).map((fileName) => {
       try {
-        const content = readFileSync20(join63(messageDir, fileName), "utf-8");
+        const content = readFileSync20(join66(messageDir, fileName), "utf-8");
         const parsed = JSON.parse(content);
         return {
           fileName,
@@ -106160,8 +106891,8 @@ init_agent_display_names();
 
 // packages/omo-opencode/src/hooks/ralph-loop/storage.ts
 init_frontmatter2();
-import { existsSync as existsSync38, readFileSync as readFileSync21, writeFileSync as writeFileSync7, unlinkSync as unlinkSync6, mkdirSync as mkdirSync12 } from "node:fs";
-import { dirname as dirname22, join as join64 } from "node:path";
+import { existsSync as existsSync39, readFileSync as readFileSync21, writeFileSync as writeFileSync7, unlinkSync as unlinkSync6, mkdirSync as mkdirSync12 } from "node:fs";
+import { dirname as dirname24, join as join67 } from "node:path";
 
 // packages/omo-opencode/src/hooks/ralph-loop/constants.ts
 var DEFAULT_STATE_FILE = ".omo/ralph-loop.local.md";
@@ -106170,11 +106901,11 @@ var DEFAULT_COMPLETION_PROMISE = "DONE";
 
 // packages/omo-opencode/src/hooks/ralph-loop/storage.ts
 function getStateFilePath(directory, customPath) {
-  return customPath ? join64(directory, customPath) : join64(directory, DEFAULT_STATE_FILE);
+  return customPath ? join67(directory, customPath) : join67(directory, DEFAULT_STATE_FILE);
 }
 function readState(directory, customPath) {
   const filePath = getStateFilePath(directory, customPath);
-  if (!existsSync38(filePath)) {
+  if (!existsSync39(filePath)) {
     return null;
   }
   try {
@@ -106404,7 +107135,7 @@ async function pollForCompletion(ctx, eventState, abortController, options = {})
   const secondaryMeaningfulWorkTimeoutMs = options.secondaryMeaningfulWorkTimeoutMs ?? DEFAULT_SECONDARY_MEANINGFUL_WORK_TIMEOUT_MS;
   const requireMeaningfulWork = options.requireMeaningfulWork ?? false;
   const now = options.now ?? Date.now;
-  const sleep = options.sleep ?? ((ms) => new Promise((resolve18) => setTimeout(resolve18, ms)));
+  const sleep = options.sleep ?? ((ms) => new Promise((resolve20) => setTimeout(resolve20, ms)));
   let consecutiveCompleteChecks = 0;
   let errorCycleCount = 0;
   let firstWorkTimestamp = null;
@@ -106569,7 +107300,7 @@ function createAbortError() {
   return error51;
 }
 function sleep(delayMs) {
-  return new Promise((resolve18) => setTimeout(resolve18, delayMs));
+  return new Promise((resolve20) => setTimeout(resolve20, delayMs));
 }
 function hasPromptStartEvidence(eventState) {
   return eventState.mainSessionStarted || eventState.hasReceivedMeaningfulWork || eventState.messageCount > 0 || eventState.currentTool !== null;
@@ -106944,7 +107675,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((resolve18) => setTimeout(() => resolve18(false), timeoutMs))
+    new Promise((resolve20) => setTimeout(() => resolve20(false), timeoutMs))
   ]);
 }
 async function run(options) {
@@ -107270,14 +108001,14 @@ async function getLocalVersion(options = {}) {
   }
 }
 // packages/omo-opencode/src/cli/doctor/checks/system.ts
-import { existsSync as existsSync49, readFileSync as readFileSync31 } from "node:fs";
+import { existsSync as existsSync50, readFileSync as readFileSync31 } from "node:fs";
 
 // packages/omo-opencode/src/cli/doctor/checks/system-binary.ts
 init_extract_semver();
 init_bun_which_shim();
-import { existsSync as existsSync46, accessSync as accessSync4, constants as constants10 } from "node:fs";
-import { homedir as homedir12 } from "node:os";
-import { join as join71 } from "node:path";
+import { existsSync as existsSync47, accessSync as accessSync4, constants as constants11 } from "node:fs";
+import { homedir as homedir13 } from "node:os";
+import { join as join74 } from "node:path";
 
 // packages/omo-opencode/src/cli/doctor/framework/spawn-with-timeout.ts
 init_spawn_with_windows_hide();
@@ -107316,8 +108047,8 @@ async function spawnWithTimeout(command, options, timeoutMs = DEFAULT_SPAWN_TIME
   const stdoutPromise = readSpawnStream(proc.stdout);
   const stderrPromise = readSpawnStream(proc.stderr);
   let timer;
-  const timeoutPromise = new Promise((resolve18) => {
-    timer = setTimeout(() => resolve18("timeout"), timeoutMs);
+  const timeoutPromise = new Promise((resolve20) => {
+    timer = setTimeout(() => resolve20("timeout"), timeoutMs);
   });
   const processPromise = (async () => {
     await proc.exited;
@@ -107354,7 +108085,7 @@ async function spawnWithTimeout(command, options, timeoutMs = DEFAULT_SPAWN_TIME
 var WINDOWS_EXECUTABLE_EXTS = [".exe", ".cmd", ".bat", ".ps1"];
 function isExecutable2(path12) {
   try {
-    accessSync4(path12, constants10.X_OK);
+    accessSync4(path12, constants11.X_OK);
     return true;
   } catch (error51) {
     if (error51 instanceof Error) {
@@ -107364,22 +108095,22 @@ function isExecutable2(path12) {
   }
 }
 function getDesktopAppPaths(platform) {
-  const home = homedir12();
+  const home = homedir13();
   switch (platform) {
     case "darwin":
       return [
         "/Applications/OpenCode.app/Contents/MacOS/OpenCode",
-        join71(home, "Applications", "OpenCode.app", "Contents", "MacOS", "OpenCode")
+        join74(home, "Applications", "OpenCode.app", "Contents", "MacOS", "OpenCode")
       ];
     case "win32": {
       const programFiles = process.env.ProgramFiles;
       const localAppData = process.env.LOCALAPPDATA;
       const paths2 = [];
       if (programFiles) {
-        paths2.push(join71(programFiles, "OpenCode", "OpenCode.exe"));
+        paths2.push(join74(programFiles, "OpenCode", "OpenCode.exe"));
       }
       if (localAppData) {
-        paths2.push(join71(localAppData, "OpenCode", "OpenCode.exe"));
+        paths2.push(join74(localAppData, "OpenCode", "OpenCode.exe"));
       }
       return paths2;
     }
@@ -107387,8 +108118,8 @@ function getDesktopAppPaths(platform) {
       return [
         "/usr/bin/opencode",
         "/usr/lib/opencode/opencode",
-        join71(home, "Applications", "opencode-desktop-linux-x86_64.AppImage"),
-        join71(home, "Applications", "opencode-desktop-linux-aarch64.AppImage")
+        join74(home, "Applications", "opencode-desktop-linux-x86_64.AppImage"),
+        join74(home, "Applications", "opencode-desktop-linux-aarch64.AppImage")
       ];
     default:
       return [];
@@ -107400,7 +108131,7 @@ function buildVersionCommand(binaryPath, platform) {
   }
   return [binaryPath, "--version"];
 }
-function findDesktopBinary(platform = process.platform, checkExists = existsSync46) {
+function findDesktopBinary(platform = process.platform, checkExists = existsSync47) {
   for (const desktopPath of getDesktopAppPaths(platform)) {
     if (checkExists(desktopPath)) {
       return { binary: "opencode", path: desktopPath };
@@ -107408,7 +108139,7 @@ function findDesktopBinary(platform = process.platform, checkExists = existsSync
   }
   return null;
 }
-async function findOpenCodeBinary(platform = process.platform, checkExists = existsSync46) {
+async function findOpenCodeBinary(platform = process.platform, checkExists = existsSync47) {
   for (const binary of OPENCODE_BINARIES2) {
     const path12 = bunWhich(binary);
     if (path12 && checkExists(path12)) {
@@ -107420,7 +108151,7 @@ async function findOpenCodeBinary(platform = process.platform, checkExists = exi
   const candidates = getCommandCandidates2(platform);
   for (const entry of pathEnv.split(delimiter3).filter(Boolean)) {
     for (const command of candidates) {
-      const fullPath = join71(entry, command);
+      const fullPath = join74(entry, command);
       if (checkExists(fullPath) && isExecutable2(fullPath)) {
         return { binary: command, path: fullPath };
       }
@@ -107466,12 +108197,12 @@ function compareVersions3(current, minimum) {
 
 // packages/omo-opencode/src/cli/doctor/checks/system-plugin.ts
 init_shared();
-import { existsSync as existsSync47, readFileSync as readFileSync29 } from "node:fs";
+import { existsSync as existsSync48, readFileSync as readFileSync29 } from "node:fs";
 function detectConfigPath() {
   const paths2 = getOpenCodeConfigPaths({ binary: "opencode", version: null });
-  if (existsSync47(paths2.configJsonc))
+  if (existsSync48(paths2.configJsonc))
     return paths2.configJsonc;
-  if (existsSync47(paths2.configJson))
+  if (existsSync48(paths2.configJson))
     return paths2.configJson;
   return null;
 }
@@ -107559,36 +108290,36 @@ init_file_utils2();
 init_checker();
 init_auto_update_checker();
 init_package_json_locator();
-import { existsSync as existsSync48, readFileSync as readFileSync30, readdirSync as readdirSync10 } from "node:fs";
+import { existsSync as existsSync49, readFileSync as readFileSync30, readdirSync as readdirSync10 } from "node:fs";
 import { createRequire as createRequire3 } from "node:module";
-import { homedir as homedir13 } from "node:os";
-import { join as join72 } from "node:path";
+import { homedir as homedir14 } from "node:os";
+import { join as join75 } from "node:path";
 import { fileURLToPath as fileURLToPath6 } from "node:url";
 init_shared();
 function getPlatformDefaultCacheDir(platform = process.platform) {
   if (platform === "darwin")
-    return join72(homedir13(), "Library", "Caches");
+    return join75(homedir14(), "Library", "Caches");
   if (platform === "win32")
-    return process.env.LOCALAPPDATA ?? join72(homedir13(), "AppData", "Local");
-  return join72(homedir13(), ".cache");
+    return process.env.LOCALAPPDATA ?? join75(homedir14(), "AppData", "Local");
+  return join75(homedir14(), ".cache");
 }
 function resolveOpenCodeCacheDir() {
   const xdgCacheHome = process.env.XDG_CACHE_HOME;
   if (xdgCacheHome)
-    return join72(xdgCacheHome, "opencode");
+    return join75(xdgCacheHome, "opencode");
   const fromShared = getOpenCodeCacheDir();
-  const platformDefault = join72(getPlatformDefaultCacheDir(), "opencode");
-  if (existsSync48(fromShared) || !existsSync48(platformDefault))
+  const platformDefault = join75(getPlatformDefaultCacheDir(), "opencode");
+  if (existsSync49(fromShared) || !existsSync49(platformDefault))
     return fromShared;
   return platformDefault;
 }
 function resolveExistingDir(dirPath) {
-  if (!existsSync48(dirPath))
+  if (!existsSync49(dirPath))
     return dirPath;
   return resolveSymlink(dirPath);
 }
 function readPackageJson(filePath) {
-  if (!existsSync48(filePath))
+  if (!existsSync49(filePath))
     return null;
   try {
     const content = readFileSync30(filePath, "utf-8");
@@ -107609,34 +108340,34 @@ function normalizeVersion(value) {
 function createPackageCandidates(rootDir) {
   return ACCEPTED_PACKAGE_NAMES.map((packageName) => ({
     packageName,
-    installedPackagePath: join72(rootDir, "node_modules", packageName, "package.json")
+    installedPackagePath: join75(rootDir, "node_modules", packageName, "package.json")
   }));
 }
 function createTaggedInstallCandidates(rootDir) {
-  const packagesDir = join72(rootDir, "packages");
-  if (!existsSync48(packagesDir))
+  const packagesDir = join75(rootDir, "packages");
+  if (!existsSync49(packagesDir))
     return [];
   const candidates = [];
   for (const entryName of readdirSync10(packagesDir).sort()) {
     const packageName = ACCEPTED_PACKAGE_NAMES.find((name) => entryName.startsWith(`${name}@`));
     if (packageName === undefined)
       continue;
-    const installDir = join72(packagesDir, entryName);
+    const installDir = join75(packagesDir, entryName);
     candidates.push({
       cacheDir: installDir,
-      cachePackagePath: join72(installDir, "package.json"),
+      cachePackagePath: join75(installDir, "package.json"),
       packageCandidates: [
         {
           packageName,
-          installedPackagePath: join72(installDir, "node_modules", packageName, "package.json")
+          installedPackagePath: join75(installDir, "node_modules", packageName, "package.json")
         }
       ]
     });
   }
   return candidates;
 }
-function selectInstalledPackage(candidate) {
-  return candidate.packageCandidates.find((packageCandidate) => existsSync48(packageCandidate.installedPackagePath)) ?? candidate.packageCandidates[0];
+function selectInstalledPackage(candidate2) {
+  return candidate2.packageCandidates.find((packageCandidate) => existsSync49(packageCandidate.installedPackagePath)) ?? candidate2.packageCandidates[0];
 }
 function getExpectedVersion(cachePackage, packageName) {
   return normalizeVersion(cachePackage?.dependencies?.[packageName]) ?? normalizeVersion(cachePackage?.dependencies?.[PACKAGE_NAME]);
@@ -107647,7 +108378,7 @@ function resolveInstalledPackageJsonPath() {
     for (const packageName of ACCEPTED_PACKAGE_NAMES) {
       try {
         const packageJsonPath = require2.resolve(`${packageName}/package.json`);
-        if (existsSync48(packageJsonPath)) {
+        if (existsSync49(packageJsonPath)) {
           return { packageName, packageJsonPath };
         }
       } catch {
@@ -107673,22 +108404,22 @@ function getLoadedPluginVersion() {
   const candidates = [
     {
       cacheDir: configDir,
-      cachePackagePath: join72(configDir, "package.json"),
+      cachePackagePath: join75(configDir, "package.json"),
       packageCandidates: createPackageCandidates(configDir)
     },
     ...createTaggedInstallCandidates(configDir),
     {
       cacheDir,
-      cachePackagePath: join72(cacheDir, "package.json"),
+      cachePackagePath: join75(cacheDir, "package.json"),
       packageCandidates: createPackageCandidates(cacheDir)
     },
     ...createTaggedInstallCandidates(cacheDir)
   ];
-  const selectedCandidate = candidates.find((candidate) => candidate.packageCandidates.some((packageCandidate) => existsSync48(packageCandidate.installedPackagePath))) ?? candidates[0];
+  const selectedCandidate = candidates.find((candidate2) => candidate2.packageCandidates.some((packageCandidate) => existsSync49(packageCandidate.installedPackagePath))) ?? candidates[0];
   const { cacheDir: selectedDir, cachePackagePath } = selectedCandidate;
   const selectedPackage = selectInstalledPackage(selectedCandidate);
   const candidateInstalledPath = selectedPackage.installedPackagePath;
-  const candidateExists = existsSync48(candidateInstalledPath);
+  const candidateExists = existsSync49(candidateInstalledPath);
   const resolvedFallback = candidateExists ? null : resolveInstalledPackageJsonPath();
   const installedPackagePath = resolvedFallback?.packageJsonPath ?? candidateInstalledPath;
   const resolvedPackageName = resolvedFallback?.packageName ?? selectedPackage.packageName;
@@ -107724,7 +108455,7 @@ var defaultDeps6 = {
   getLoadedPluginVersion,
   getLatestPluginVersion,
   getSuggestedInstallTag,
-  configExists: existsSync49,
+  configExists: existsSync50,
   readConfigFile: (path12) => readFileSync31(path12, "utf-8"),
   parseConfigContent: (content) => parseJsonc(content)
 };
@@ -107870,23 +108601,23 @@ async function checkSystem(deps = defaultDeps6) {
 
 // packages/omo-opencode/src/cli/doctor/checks/model-resolution-cache.ts
 init_shared();
-import { existsSync as existsSync50, readFileSync as readFileSync32 } from "node:fs";
-import { homedir as homedir14 } from "node:os";
-import { join as join73 } from "node:path";
+import { existsSync as existsSync51, readFileSync as readFileSync32 } from "node:fs";
+import { homedir as homedir15 } from "node:os";
+import { join as join76 } from "node:path";
 function getUserConfigDir2() {
   const xdgConfig = process.env.XDG_CONFIG_HOME;
   if (xdgConfig)
-    return join73(xdgConfig, "opencode");
-  return join73(homedir14(), ".config", "opencode");
+    return join76(xdgConfig, "opencode");
+  return join76(homedir15(), ".config", "opencode");
 }
 function loadCustomProviderNames() {
   const configDir = getUserConfigDir2();
   const candidatePaths = [
-    join73(configDir, "opencode.json"),
-    join73(configDir, "opencode.jsonc")
+    join76(configDir, "opencode.json"),
+    join76(configDir, "opencode.jsonc")
   ];
   for (const configPath of candidatePaths) {
-    if (!existsSync50(configPath))
+    if (!existsSync51(configPath))
       continue;
     try {
       const content = readFileSync32(configPath, "utf-8");
@@ -107904,9 +108635,9 @@ function loadCustomProviderNames() {
   return [];
 }
 function loadAvailableModelsFromCache() {
-  const cacheFile = join73(getOpenCodeCacheDir(), "models.json");
+  const cacheFile = join76(getOpenCodeCacheDir(), "models.json");
   const customProviders = loadCustomProviderNames();
-  if (!existsSync50(cacheFile)) {
+  if (!existsSync51(cacheFile)) {
     if (customProviders.length > 0) {
       return { providers: customProviders, modelCount: 0, cacheExists: true };
     }
@@ -107966,7 +108697,7 @@ function loadOmoConfig2() {
 
 // packages/omo-opencode/src/cli/doctor/checks/model-resolution-details.ts
 init_shared();
-import { join as join74 } from "node:path";
+import { join as join77 } from "node:path";
 
 // packages/omo-opencode/src/cli/doctor/checks/model-resolution-variant.ts
 function formatModelWithVariant(model, variant) {
@@ -108008,7 +108739,7 @@ function formatCapabilityResolutionLabel(mode) {
 }
 function buildModelResolutionDetails(options) {
   const details = [];
-  const cacheFile = join74(getOpenCodeCacheDir(), "models.json");
+  const cacheFile = join77(getOpenCodeCacheDir(), "models.json");
   details.push("═══ Available Models (from cache) ═══");
   details.push("");
   if (options.available.cacheExists) {
@@ -108317,24 +109048,25 @@ async function checkConfig() {
 
 // packages/omo-opencode/src/cli/doctor/checks/deprecated-reasoning-keys.ts
 init_main();
-import { existsSync as existsSync51, readFileSync as readFileSync33 } from "node:fs";
-import { join as join75 } from "node:path";
+import { existsSync as existsSync52, readFileSync as readFileSync33 } from "node:fs";
+import { join as join78 } from "node:path";
 var CANONICAL_REPLACEMENT = new Map([
   ["variant", "reasoning"],
   ["reasoningEffort", "reasoning"],
-  ["thinking", "reasoning"],
+  ["thinking", 'reasoning: "off" or provider_options.thinking'],
   ["textVerbosity", "provider_options.textVerbosity"],
   ["fallback_models", "models"]
 ]);
 var TUNING_CONTAINERS = new Set(["agents", "categories", "models"]);
-function isRecord10(value) {
+var PASSTHROUGH_CONTAINERS = new Set(["provider_options", "providerOptions"]);
+function isRecord11(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
 function isHarnessBlock(key) {
   return key.startsWith("[") && key.endsWith("]");
 }
 function collectIssues(configPath, value, prefix) {
-  if (!isRecord10(value))
+  if (!isRecord11(value))
     return [];
   const issues = [];
   for (const [key, child] of Object.entries(value)) {
@@ -108342,7 +109074,7 @@ function collectIssues(configPath, value, prefix) {
     const replacement = CANONICAL_REPLACEMENT.get(key);
     if (replacement !== undefined) {
       issues.push({
-        title: "Deprecated reasoning config key",
+        title: "Deprecated config key",
         description: `${configPath}: ${path12}`,
         fix: `Replace ${key} with ${replacement}, or run: oh-my-openagent config migrate`,
         severity: "warning",
@@ -108350,7 +109082,9 @@ function collectIssues(configPath, value, prefix) {
       });
       continue;
     }
-    if (!isRecord10(child))
+    if (!isRecord11(child))
+      continue;
+    if (PASSTHROUGH_CONTAINERS.has(key))
       continue;
     if (prefix.length === 0 && key === "profiles") {
       for (const profile2 of Object.values(child)) {
@@ -108358,6 +109092,8 @@ function collectIssues(configPath, value, prefix) {
       }
       continue;
     }
+    if (key === "[opencode]")
+      continue;
     if (TUNING_CONTAINERS.has(key) || isHarnessBlock(key) || prefix.length > 0) {
       issues.push(...collectIssues(configPath, child, path12));
     }
@@ -108368,13 +109104,13 @@ function userConfigPaths() {
   const home = process.env.HOME ?? process.env.USERPROFILE;
   if (home === undefined || home.length === 0)
     return [];
-  return [join75(home, ".omo", "omo.jsonc"), join75(home, ".omo", "omo.json")];
+  return [join78(home, ".omo", "omo.jsonc"), join78(home, ".omo", "omo.json")];
 }
 async function checkDeprecatedReasoningKeys() {
   const issues = [];
   const scanned = [];
   for (const configPath of userConfigPaths()) {
-    if (!existsSync51(configPath))
+    if (!existsSync52(configPath))
       continue;
     scanned.push(configPath);
     const parsed = parse2(readFileSync33(configPath, "utf-8"));
@@ -108383,7 +109119,7 @@ async function checkDeprecatedReasoningKeys() {
   return {
     name: CHECK_NAMES[CHECK_IDS.CONFIG],
     status: issues.length > 0 ? "warn" : "pass",
-    message: issues.length > 0 ? `${issues.length} deprecated reasoning key(s) found` : "No deprecated reasoning keys found",
+    message: issues.length > 0 ? `${issues.length} deprecated config key(s) found` : "No deprecated config keys found",
     ...scanned.length > 0 ? { details: scanned.map((path12) => `Scanned: ${path12}`) } : {},
     issues
   };
@@ -108391,28 +109127,28 @@ async function checkDeprecatedReasoningKeys() {
 
 // packages/omo-opencode/src/cli/doctor/checks/dependencies.ts
 init_src2();
-import { existsSync as existsSync52 } from "node:fs";
+import { existsSync as existsSync53 } from "node:fs";
 import { createRequire as createRequire4 } from "node:module";
-import { homedir as homedir16 } from "node:os";
-import { dirname as dirname27, join as join77 } from "node:path";
+import { homedir as homedir17 } from "node:os";
+import { dirname as dirname29, join as join80 } from "node:path";
 
 // packages/omo-opencode/src/hooks/comment-checker/downloader.ts
-import { join as join76 } from "path";
-import { homedir as homedir15, tmpdir as tmpdir4 } from "os";
+import { join as join79 } from "path";
+import { homedir as homedir16, tmpdir as tmpdir4 } from "os";
 init_binary_downloader();
 init_logger2();
 init_plugin_identity();
 var DEBUG = process.env.COMMENT_CHECKER_DEBUG === "1";
-var DEBUG_FILE = join76(tmpdir4(), "comment-checker-debug.log");
+var DEBUG_FILE = join79(tmpdir4(), "comment-checker-debug.log");
 function getCacheDir2() {
   if (process.platform === "win32") {
     const localAppData = process.env.LOCALAPPDATA || process.env.APPDATA;
-    const base2 = localAppData || join76(homedir15(), "AppData", "Local");
-    return join76(base2, CACHE_DIR_NAME, "bin");
+    const base2 = localAppData || join79(homedir16(), "AppData", "Local");
+    return join79(base2, CACHE_DIR_NAME, "bin");
   }
   const xdgCache = process.env.XDG_CACHE_HOME;
-  const base = xdgCache || join76(homedir15(), ".cache");
-  return join76(base, CACHE_DIR_NAME, "bin");
+  const base = xdgCache || join79(homedir16(), ".cache");
+  return join79(base, CACHE_DIR_NAME, "bin");
 }
 function getBinaryName() {
   return process.platform === "win32" ? "comment-checker.exe" : "comment-checker";
@@ -108462,7 +109198,7 @@ async function getBinaryVersion(binary) {
   }
 }
 async function checkAstGrepCli() {
-  const runtimeDir = astGrepRuntimeDir(join77(homedir16(), ".omo"));
+  const runtimeDir = astGrepRuntimeDir(join80(homedir17(), ".omo"));
   const sgPath = findSgBinarySync({ runtimeDir });
   if (sgPath === null) {
     return {
@@ -108491,12 +109227,12 @@ function findCommentCheckerPackageBinary(baseDirOverride, resolvePackageJsonPath
   const binaryName = process.platform === "win32" ? "comment-checker.exe" : "comment-checker";
   const platformKey = `${process.platform}-${process.arch === "x64" ? "x64" : process.arch}`;
   try {
-    const packageDir = baseDirOverride ?? dirname27(resolvePackageJsonPath());
-    const vendorPath = join77(packageDir, "vendor", platformKey, binaryName);
-    if (existsSync52(vendorPath))
+    const packageDir = baseDirOverride ?? dirname29(resolvePackageJsonPath());
+    const vendorPath = join80(packageDir, "vendor", platformKey, binaryName);
+    if (existsSync53(vendorPath))
       return vendorPath;
-    const binPath = join77(packageDir, "bin", binaryName);
-    if (existsSync52(binPath))
+    const binPath = join80(packageDir, "bin", binaryName);
+    if (existsSync53(binPath))
       return binPath;
   } catch (error51) {
     if (!(error51 instanceof Error) && !isModuleResolutionFailure(error51))
@@ -108642,8 +109378,8 @@ async function getGhCliInfo(dependencies = {}) {
 // packages/omo-opencode/src/mcp/lsp.ts
 init_zod();
 init_opencode_config_dir();
-import { existsSync as existsSync53, readFileSync as readFileSync34 } from "node:fs";
-import { delimiter as delimiter3, dirname as dirname28, resolve as resolve19 } from "node:path";
+import { existsSync as existsSync54, readFileSync as readFileSync34 } from "node:fs";
+import { delimiter as delimiter3, dirname as dirname30, resolve as resolve21 } from "node:path";
 import { fileURLToPath as fileURLToPath7 } from "node:url";
 
 // packages/omo-opencode/src/mcp/cli-suffix.ts
@@ -108690,7 +109426,7 @@ function resolveRuntimeExecutable(commandName, options = {}) {
 }
 
 // packages/omo-opencode/src/mcp/shared/ancestor-cli-resolver.ts
-import { resolve as resolve18 } from "node:path";
+import { resolve as resolve20 } from "node:path";
 function resolveJavaScriptRuntime(resolveExecutable) {
   const node = resolveExecutable("node");
   return node.available ? node : resolveExecutable("bun");
@@ -108698,9 +109434,9 @@ function resolveJavaScriptRuntime(resolveExecutable) {
 function createAncestorCliCandidates(options) {
   const candidates = [];
   const seenPaths = new Set;
-  let currentDirectory = resolve18(options.startDirectory);
+  let currentDirectory = resolve20(options.startDirectory);
   while (true) {
-    const distCliPath = resolve18(currentDirectory, options.packageRel, options.distCliRel);
+    const distCliPath = resolve20(currentDirectory, options.packageRel, options.distCliRel);
     if (!seenPaths.has(distCliPath)) {
       const runtime5 = resolveJavaScriptRuntime(options.resolveExecutable);
       seenPaths.add(distCliPath);
@@ -108712,7 +109448,7 @@ function createAncestorCliCandidates(options) {
         runtimeAvailable: runtime5.available
       });
     }
-    const sourceCliPath = resolve18(currentDirectory, options.packageRel, options.sourceCliRel);
+    const sourceCliPath = resolve20(currentDirectory, options.packageRel, options.sourceCliRel);
     if (!seenPaths.has(sourceCliPath)) {
       const runtime5 = options.resolveExecutable("bun");
       const sourceCandidateAvailable = options.isSourceCandidateAvailable?.({
@@ -108729,7 +109465,7 @@ function createAncestorCliCandidates(options) {
         runtimeAvailable: runtime5.available
       });
     }
-    const parentDirectory = resolve18(currentDirectory, "..");
+    const parentDirectory = resolve20(currentDirectory, "..");
     if (parentDirectory === currentDirectory)
       return candidates;
     currentDirectory = parentDirectory;
@@ -108774,7 +109510,7 @@ var LSP_BOOTSTRAP_SCRIPT = [
 ].join(";");
 function getModuleDirectory(moduleUrl) {
   try {
-    return dirname28(fileURLToPath7(moduleUrl));
+    return dirname30(fileURLToPath7(moduleUrl));
   } catch (error51) {
     if (!(error51 instanceof Error))
       throw error51;
@@ -108782,11 +109518,11 @@ function getModuleDirectory(moduleUrl) {
   }
 }
 function findBootstrapRoot(candidates, pathExists) {
-  return candidates.find((candidate) => pathExists(resolve19(candidate.root, "package.json")))?.root ?? process.cwd();
+  return candidates.find((candidate2) => pathExists(resolve21(candidate2.root, "package.json")))?.root ?? process.cwd();
 }
 function readDaemonPackageVersion(root) {
   try {
-    const packageJson = JSON.parse(readFileSync34(resolve19(root, PACKAGE_REL, "package.json"), "utf-8"));
+    const packageJson = JSON.parse(readFileSync34(resolve21(root, PACKAGE_REL, "package.json"), "utf-8"));
     return DaemonPackageSchema.parse(packageJson).version;
   } catch (error51) {
     if (!(error51 instanceof Error))
@@ -108798,17 +109534,17 @@ function createBootstrapCandidate(root, pathExists, resolveExecutable) {
   const runtime5 = resolveJavaScriptRuntime(resolveExecutable);
   const bun = resolveExecutable("bun");
   const npm = resolveExecutable("npm");
-  const packageManifestPath = resolve19(root, PACKAGE_REL, "package.json");
+  const packageManifestPath = resolve21(root, PACKAGE_REL, "package.json");
   return {
     command: [runtime5.command, "-e", LSP_BOOTSTRAP_SCRIPT, root, npm.command, bun.command],
     root,
-    path: resolve19(root, PACKAGE_REL, DIST_CLI_REL),
+    path: resolve21(root, PACKAGE_REL, DIST_CLI_REL),
     exists: runtime5.available && npm.available && pathExists(packageManifestPath),
     runtimeAvailable: runtime5.available
   };
 }
 function resolveLspCommand(options = {}) {
-  const pathExists = options.exists ?? existsSync53;
+  const pathExists = options.exists ?? existsSync54;
   const resolveExecutable = options.resolveExecutable ?? resolveRuntimeExecutable;
   const moduleDirectory = getModuleDirectory(options.moduleUrl ?? import.meta.url);
   const candidates = moduleDirectory ? createAncestorCliCandidates({
@@ -108818,13 +109554,13 @@ function resolveLspCommand(options = {}) {
     sourceCliRel: SOURCE_CLI_REL,
     pathExists,
     resolveExecutable,
-    isSourceCandidateAvailable: ({ root }) => pathExists(resolve19(root, LSP_TOOLS_PACKAGE_REL, DIST_CLI_REL)) && readDaemonPackageVersion(root) !== null
+    isSourceCandidateAvailable: ({ root }) => pathExists(resolve21(root, LSP_TOOLS_PACKAGE_REL, DIST_CLI_REL)) && readDaemonPackageVersion(root) !== null
   }) : [];
-  const distCandidate = candidates.find((candidate) => hasCliSuffix(candidate.path, DIST_CLI_REL) && candidate.exists);
+  const distCandidate = candidates.find((candidate2) => hasCliSuffix(candidate2.path, DIST_CLI_REL) && candidate2.exists);
   if (distCandidate) {
     return distCandidate;
   }
-  const sourceCandidate = candidates.find((candidate) => hasCliSuffix(candidate.path, SOURCE_CLI_REL) && candidate.exists);
+  const sourceCandidate = candidates.find((candidate2) => hasCliSuffix(candidate2.path, SOURCE_CLI_REL) && candidate2.exists);
   if (sourceCandidate) {
     return sourceCandidate;
   }
@@ -108832,17 +109568,18 @@ function resolveLspCommand(options = {}) {
 }
 function createLspMcpConfig(options = {}) {
   const resolvedCommand = resolveLspCommand(options);
-  const cwd = resolve19(options.cwd ?? process.cwd());
+  const cwd = resolve21(options.cwd ?? process.cwd());
   const configDir = getOpenCodeConfigDir({ binary: "opencode" });
   const sourceVersion = hasCliSuffix(resolvedCommand.path, SOURCE_CLI_REL) ? readDaemonPackageVersion(resolvedCommand.root) : null;
   return {
     type: "local",
     command: resolvedCommand.command,
     enabled: resolvedCommand.exists,
+    cwd,
     environment: {
-      LSP_TOOLS_MCP_PROJECT_CONFIG: PROJECT_LSP_CONFIGS.map((configPath) => resolve19(cwd, configPath)).join(delimiter3),
-      LSP_TOOLS_MCP_USER_CONFIG: resolve19(configDir, "lsp.json"),
-      LSP_TOOLS_MCP_INSTALL_DECISIONS: resolve19(configDir, "lsp-install-decisions.json"),
+      LSP_TOOLS_MCP_PROJECT_CONFIG: PROJECT_LSP_CONFIGS.map((configPath) => resolve21(cwd, configPath)).join(delimiter3),
+      LSP_TOOLS_MCP_USER_CONFIG: resolve21(configDir, "lsp.json"),
+      LSP_TOOLS_MCP_INSTALL_DECISIONS: resolve21(configDir, "lsp-install-decisions.json"),
       ...sourceVersion ? {
         [OMO_LSP_DAEMON_CLI]: resolvedCommand.path,
         [OMO_LSP_DAEMON_VERSION]: sourceVersion
@@ -108867,21 +109604,21 @@ function getInstalledLspServers(options = {}) {
 
 // packages/omo-opencode/src/cli/doctor/checks/tools-mcp.ts
 init_shared();
-import { existsSync as existsSync54, readFileSync as readFileSync35 } from "node:fs";
-import { homedir as homedir17 } from "node:os";
-import { join as join78 } from "node:path";
+import { existsSync as existsSync55, readFileSync as readFileSync35 } from "node:fs";
+import { homedir as homedir18 } from "node:os";
+import { join as join81 } from "node:path";
 var BUILTIN_MCP_SERVERS = ["websearch", "context7", "grep_app", "lsp"];
 function getMcpConfigPaths() {
   return [
-    join78(homedir17(), ".claude", ".mcp.json"),
-    join78(process.cwd(), ".mcp.json"),
-    join78(process.cwd(), ".claude", ".mcp.json")
+    join81(homedir18(), ".claude", ".mcp.json"),
+    join81(process.cwd(), ".mcp.json"),
+    join81(process.cwd(), ".claude", ".mcp.json")
   ];
 }
 function loadUserMcpConfig() {
   const servers = {};
   for (const configPath of getMcpConfigPaths()) {
-    if (!existsSync54(configPath))
+    if (!existsSync55(configPath))
       continue;
     try {
       const content = readFileSync35(configPath, "utf-8");
@@ -109019,12 +109756,12 @@ async function checkTools() {
 
 // packages/omo-opencode/src/cli/doctor/checks/telemetry.ts
 init_src5();
-import { existsSync as existsSync55, readFileSync as readFileSync36 } from "node:fs";
+import { existsSync as existsSync56, readFileSync as readFileSync36 } from "node:fs";
 function isTelemetryState(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value);
 }
 function readLastActiveDay(stateFilePath) {
-  if (!existsSync55(stateFilePath)) {
+  if (!existsSync56(stateFilePath)) {
     return "never";
   }
   let parsed;
@@ -109087,17 +109824,17 @@ async function probeBinary(cmd, args, spawnImpl) {
 }
 
 // packages/team-core/src/team-registry/paths.ts
-import { homedir as homedir18 } from "node:os";
+import { homedir as homedir19 } from "node:os";
 import path12 from "node:path";
 function resolveBaseDir(config4) {
-  return expandHomeDirectory(config4.base_dir ?? path12.join(homedir18(), ".omo"));
+  return expandHomeDirectory(config4.base_dir ?? path12.join(homedir19(), ".omo"));
 }
 function expandHomeDirectory(directoryPath3) {
   if (directoryPath3 === "~") {
-    return homedir18();
+    return homedir19();
   }
   if (directoryPath3.startsWith("~/") || directoryPath3.startsWith("~\\")) {
-    return path12.join(homedir18(), directoryPath3.slice(2));
+    return path12.join(homedir19(), directoryPath3.slice(2));
   }
   return directoryPath3;
 }
@@ -109154,10 +109891,10 @@ async function pathExists(dir) {
 
 // packages/omo-opencode/src/cli/doctor/checks/codex.ts
 init_src2();
-import { existsSync as existsSync56 } from "node:fs";
-import { lstat as lstat14, readdir as readdir12, readFile as readFile24 } from "node:fs/promises";
-import { homedir as homedir19 } from "node:os";
-import { basename as basename11, join as join79, resolve as resolve20 } from "node:path";
+import { existsSync as existsSync57 } from "node:fs";
+import { lstat as lstat15, readdir as readdir14, readFile as readFile27 } from "node:fs/promises";
+import { homedir as homedir20 } from "node:os";
+import { basename as basename11, join as join82, resolve as resolve22 } from "node:path";
 // packages/omo-opencode/package.json
 var package_default3 = {
   name: "@oh-my-opencode/omo-opencode",
@@ -109212,7 +109949,7 @@ var COMPANION_PLUGIN_KEY = "codex@openai-codex";
 var DEFAULT_PLUGIN_VERSION = "0.1.0";
 var COMPANION_LIFECYCLE_EVENTS = new Set(["session_start", "stop"]);
 var CODEX_BIN_NAMES = [
-  "omo",
+  "omo-agent-toolkit",
   "omo-rules",
   "omo-lsp",
   "omo-comment-checker",
@@ -109222,13 +109959,13 @@ var CODEX_BIN_NAMES = [
   "omo-git-bash-hook"
 ];
 async function gatherCodexSummary(deps = {}) {
-  const codexHome = resolve20(deps.codexHome ?? process.env.CODEX_HOME ?? join79(homedir19(), ".codex"));
+  const codexHome = resolve22(deps.codexHome ?? process.env.CODEX_HOME ?? join82(homedir20(), ".codex"));
   const binDir = resolveCodexInstallerBinDir({ binDir: deps.binDir, codexHome, env: process.env });
   const detection = await (deps.detectCodexInstallation ?? detectCodexInstallation)();
   const pluginRoot = await resolveInstalledPluginRoot(codexHome);
-  const manifest2 = pluginRoot === null ? null : await readJson(join79(pluginRoot, ".codex-plugin", "plugin.json"));
-  const installSnapshot = pluginRoot === null ? null : await readJson(join79(pluginRoot, "lazycodex-install.json"));
-  const configPath = join79(codexHome, "config.toml");
+  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(manifest2, "version");
   return {
     codexPath: detection.found && "path" in detection ? detection.path : null,
@@ -109285,7 +110022,7 @@ function buildCodexIssues(summary) {
   if (summary.pluginRoot === null) {
     issues.push({
       title: "OMO Codex plugin is not installed",
-      description: `Expected cached plugin at ${join79("plugins", "cache", MARKETPLACE_NAME, PLUGIN_NAME2, DEFAULT_PLUGIN_VERSION)} under CODEX_HOME.`,
+      description: `Expected cached plugin at ${join82("plugins", "cache", MARKETPLACE_NAME, PLUGIN_NAME2, DEFAULT_PLUGIN_VERSION)} under CODEX_HOME.`,
       fix: "Run: npx lazycodex-ai install",
       severity: "error",
       affects: ["plugin loading"]
@@ -109299,10 +110036,10 @@ function buildCodexIssues(summary) {
       affects: ["version reporting"]
     });
   }
-  if (summary.pluginRoot !== null && !summary.linkedBins.includes("omo")) {
+  if (summary.pluginRoot !== null && !summary.linkedBins.includes("omo-agent-toolkit")) {
     issues.push({
-      title: "omo runtime command is not linked",
-      description: "The omo runtime wrapper is missing from the installer bin directory, so `omo ulw-loop` fails in Codex sessions. lazycodex-ai 4.8.0/4.8.1 installs removed the legacy omo bin without writing a replacement.",
+      title: "omo-agent-toolkit runtime command is not linked",
+      description: "The omo-agent-toolkit runtime wrapper is missing from the installer bin directory, so `omo-agent-toolkit ulw-loop` fails in Codex sessions. Reinstall LazyCodex to write the canonical wrapper.",
       fix: "Run: npx lazycodex-ai@latest install",
       severity: "error",
       affects: ["ulw-loop"]
@@ -109350,15 +110087,15 @@ function buildCodexIssues(summary) {
   return issues;
 }
 async function resolveInstalledPluginRoot(codexHome) {
-  const pluginRoot = join79(codexHome, "plugins", "cache", MARKETPLACE_NAME, PLUGIN_NAME2);
-  if (!existsSync56(pluginRoot))
+  const pluginRoot = join82(codexHome, "plugins", "cache", MARKETPLACE_NAME, PLUGIN_NAME2);
+  if (!existsSync57(pluginRoot))
     return null;
-  const versions2 = await readdir12(pluginRoot, { withFileTypes: true });
+  const versions2 = await readdir14(pluginRoot, { withFileTypes: true });
   const candidates = versions2.filter((entry) => entry.isDirectory()).map((entry) => entry.name).sort(compareVersionsDescending);
-  return candidates.length === 0 ? null : join79(pluginRoot, candidates[0] ?? DEFAULT_PLUGIN_VERSION);
+  return candidates.length === 0 ? null : join82(pluginRoot, candidates[0] ?? DEFAULT_PLUGIN_VERSION);
 }
 async function readCodexConfigSummary(configPath) {
-  if (!existsSync56(configPath)) {
+  if (!existsSync57(configPath)) {
     return {
       exists: false,
       marketplaceConfigured: false,
@@ -109369,7 +110106,7 @@ async function readCodexConfigSummary(configPath) {
       companionLifecycleHookStateEvents: []
     };
   }
-  const content = await readFile24(configPath, "utf8");
+  const content = await readFile27(configPath, "utf8");
   return {
     exists: true,
     marketplaceConfigured: content.includes("[marketplaces.sisyphuslabs]"),
@@ -109383,21 +110120,21 @@ async function readCodexConfigSummary(configPath) {
 async function readLinkedBins(binDir) {
   const linked = [];
   for (const name of CODEX_BIN_NAMES) {
-    if (await pathExists2(join79(binDir, process.platform === "win32" ? `${name}.cmd` : name)))
+    if (await pathExists2(join82(binDir, process.platform === "win32" ? `${name}.cmd` : name)))
       linked.push(name);
   }
   return linked;
 }
 async function readLinkedAgents(codexHome) {
-  const agentsDir = join79(codexHome, "agents");
-  if (!existsSync56(agentsDir))
+  const agentsDir = join82(codexHome, "agents");
+  if (!existsSync57(agentsDir))
     return [];
-  const entries = await readdir12(agentsDir, { withFileTypes: true });
+  const entries = await readdir14(agentsDir, { withFileTypes: true });
   return entries.filter((entry) => entry.isFile() || entry.isSymbolicLink()).map((entry) => basename11(entry.name, ".toml")).sort();
 }
 async function readJson(path14) {
   try {
-    const parsed = JSON.parse(await readFile24(path14, "utf8"));
+    const parsed = JSON.parse(await readFile27(path14, "utf8"));
     return isPlainRecord(parsed) ? parsed : null;
   } catch (error51) {
     if (error51 instanceof Error)
@@ -109492,7 +110229,7 @@ function compareVersionsDescending(left, right) {
 }
 async function pathExists2(path14) {
   try {
-    await lstat14(path14);
+    await lstat15(path14);
     return true;
   } catch (error51) {
     if (error51 instanceof Error)
@@ -109503,9 +110240,9 @@ async function pathExists2(path14) {
 
 // packages/omo-opencode/src/cli/doctor/checks/codex-components.ts
 init_src2();
-import { readdir as readdir13, readFile as readFile25, stat as stat6 } from "node:fs/promises";
-import { homedir as homedir20 } from "node:os";
-import { dirname as dirname29, isAbsolute as isAbsolute11, join as join80, relative as relative9, resolve as resolve21, sep as sep9 } from "node:path";
+import { readdir as readdir15, readFile as readFile28, stat as stat7 } from "node:fs/promises";
+import { homedir as homedir21 } from "node:os";
+import { dirname as dirname31, isAbsolute as isAbsolute12, join as join83, relative as relative9, resolve as resolve23, sep as sep9 } from "node:path";
 var CODEX_COMPONENTS_CHECK_ID = "codex-components";
 var CODEX_COMPONENTS_CHECK_NAME = "codex-components";
 var PLUGIN_DATA_DIR_NAME = "omo-sisyphuslabs";
@@ -109515,7 +110252,7 @@ async function checkCodexComponents(deps = {}) {
   const env3 = deps.env ?? process.env;
   const platform = deps.platform ?? process.platform;
   const arch = deps.arch ?? process.arch;
-  const codexHome = resolve21(deps.codexHome ?? env3["CODEX_HOME"] ?? join80(homedir20(), ".codex"));
+  const codexHome = resolve23(deps.codexHome ?? env3["CODEX_HOME"] ?? join83(homedir21(), ".codex"));
   const summary = await gatherCodexSummary({ ...deps, codexHome });
   if (summary.pluginRoot === null) {
     return {
@@ -109540,7 +110277,7 @@ async function checkCodexComponents(deps = {}) {
     });
   }
   const runtimeSgDir = runtimeSgDirectory(codexHome, platform, arch);
-  const runtimeSgPath = join80(runtimeSgDir, sgBinaryName(platform));
+  const runtimeSgPath = join83(runtimeSgDir, sgBinaryName(platform));
   const sg = findSgBinarySync({
     arch,
     env: env3,
@@ -109577,12 +110314,12 @@ async function auditBundleTargets(pluginRoot) {
   let referencedCount = 0;
   for (const manifestPath of await findManifestPaths(pluginRoot, ".mcp.json")) {
     const manifest2 = await readJson2(manifestPath);
-    if (manifest2 === null || !isRecord11(manifest2["mcpServers"]))
+    if (manifest2 === null || !isRecord12(manifest2["mcpServers"]))
       continue;
-    const manifestRoot = dirname29(manifestPath);
-    const isRootManifest = resolve21(manifestRoot) === resolve21(pluginRoot);
+    const manifestRoot = dirname31(manifestPath);
+    const isRootManifest = resolve23(manifestRoot) === resolve23(pluginRoot);
     for (const server2 of Object.values(manifest2["mcpServers"])) {
-      if (!isRecord11(server2) || !Array.isArray(server2["args"]))
+      if (!isRecord12(server2) || !Array.isArray(server2["args"]))
         continue;
       for (const arg of server2["args"]) {
         if (typeof arg !== "string" || !isPluginRuntimePathArg(arg))
@@ -109600,7 +110337,7 @@ async function auditBundleTargets(pluginRoot) {
       continue;
     const commands2 = [];
     collectHookCommands(manifest2, commands2);
-    const hookPluginRoot = dirname29(dirname29(hookManifestPath));
+    const hookPluginRoot = dirname31(dirname31(hookManifestPath));
     for (const command of commands2) {
       for (const relativePath of extractPluginRootPaths(command)) {
         referencedCount += 1;
@@ -109622,8 +110359,8 @@ function recordBrokenTarget(broken, classified, origin) {
   broken.push(entry);
 }
 async function classifyBundleTarget(bundleRoot, baseRoot, relativePath, allowEscape) {
-  const targetPath = resolve21(baseRoot, relativePath);
-  const bundleRootPath = resolve21(bundleRoot);
+  const targetPath = resolve23(baseRoot, relativePath);
+  const bundleRootPath = resolve23(bundleRoot);
   const bundleRootPrefix = bundleRootPath.endsWith(sep9) ? bundleRootPath : `${bundleRootPath}${sep9}`;
   if (targetPath !== bundleRootPath && !targetPath.startsWith(bundleRootPrefix)) {
     if (allowEscape)
@@ -109639,12 +110376,12 @@ async function classifyBundleTarget(bundleRoot, baseRoot, relativePath, allowEsc
 }
 async function findHookManifestPaths(root) {
   const paths3 = await findManifestPaths(root, "hooks.json");
-  return paths3.filter((path14) => dirname29(path14).endsWith(`${sep9}hooks`));
+  return paths3.filter((path14) => dirname31(path14).endsWith(`${sep9}hooks`));
 }
 async function findManifestPaths(root, manifestName) {
   let entries;
   try {
-    entries = await readdir13(root, { withFileTypes: true });
+    entries = await readdir15(root, { withFileTypes: true });
   } catch {
     return [];
   }
@@ -109652,7 +110389,7 @@ async function findManifestPaths(root, manifestName) {
   for (const entry of entries) {
     if (entry.name === "node_modules" || entry.name === ".git")
       continue;
-    const entryPath = join80(root, entry.name);
+    const entryPath = join83(root, entry.name);
     if (entry.isDirectory()) {
       paths3.push(...await findManifestPaths(entryPath, manifestName));
       continue;
@@ -109668,7 +110405,7 @@ function collectHookCommands(value, commands2) {
       collectHookCommands(item, commands2);
     return;
   }
-  if (!isRecord11(value))
+  if (!isRecord12(value))
     return;
   if (value["type"] === "command") {
     if (typeof value["command"] === "string")
@@ -109693,21 +110430,21 @@ function extractPluginRootPaths(command) {
 }
 function isPluginRuntimePathArg(arg) {
   const normalized = normalizePathSeparators(arg);
-  return normalized.endsWith(".js") && normalized.includes("/dist/") && (normalized.startsWith("./") || normalized.startsWith("../") || normalized.startsWith("components/") || normalized.startsWith("/") || isAbsolute11(arg));
+  return normalized.endsWith(".js") && normalized.includes("/dist/") && (normalized.startsWith("./") || normalized.startsWith("../") || normalized.startsWith("components/") || normalized.startsWith("/") || isAbsolute12(arg));
 }
 function runtimeSgDirectory(codexHome, platform, arch) {
-  return join80(codexHome, "runtime", "ast-grep", runtimeSlug(platform, arch));
+  return join83(codexHome, "runtime", "ast-grep", runtimeSlug(platform, arch));
 }
 function describeSgSource(sgPath, env3, runtimeSgDir, platform) {
   const override = env3[SG_PATH_ENV_KEY]?.trim();
   if (override !== undefined && override.length > 0 && sgPath === override)
     return `env override ${SG_PATH_ENV_KEY}`;
-  if (sgPath === join80(runtimeSgDir, sgBinaryName(platform)))
+  if (sgPath === join83(runtimeSgDir, sgBinaryName(platform)))
     return "runtime dir";
   return "PATH";
 }
 async function readBootstrapStateSummary(codexHome) {
-  const statePath = join80(codexHome, "plugins", "data", PLUGIN_DATA_DIR_NAME, "bootstrap", "state.json");
+  const statePath = join83(codexHome, "plugins", "data", PLUGIN_DATA_DIR_NAME, "bootstrap", "state.json");
   const raw = await readJson2(statePath);
   if (raw === null)
     return null;
@@ -109723,7 +110460,7 @@ function parseDegradedEntries(value) {
     return [];
   const entries = [];
   for (const item of value) {
-    if (!isRecord11(item))
+    if (!isRecord12(item))
       continue;
     if (typeof item["component"] !== "string" || typeof item["reason"] !== "string")
       continue;
@@ -109756,8 +110493,8 @@ function degradedDetailLines(entries) {
 }
 async function readJson2(path14) {
   try {
-    const parsed = JSON.parse(await readFile25(path14, "utf8"));
-    return isRecord11(parsed) ? parsed : null;
+    const parsed = JSON.parse(await readFile28(path14, "utf8"));
+    return isRecord12(parsed) ? parsed : null;
   } catch (error51) {
     if (error51 instanceof Error)
       return null;
@@ -109766,7 +110503,7 @@ async function readJson2(path14) {
 }
 async function fileSize(path14) {
   try {
-    const stats = await stat6(path14);
+    const stats = await stat7(path14);
     return stats.isFile() ? stats.size : undefined;
   } catch {
     return;
@@ -109778,37 +110515,47 @@ function normalizeRelative(root, target) {
 function normalizePathSeparators(path14) {
   return path14.split("\\").join("/");
 }
-function isRecord11(value) {
+function isRecord12(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
 // packages/omo-opencode/src/cli/doctor/checks/codex-runtime-wrapper.ts
-import { existsSync as existsSync57 } from "node:fs";
-import { readFile as readFile26 } from "node:fs/promises";
-import { homedir as homedir21 } from "node:os";
-import { join as join81, resolve as resolve22 } from "node:path";
+import { existsSync as existsSync58 } from "node:fs";
+import { readFile as readFile29 } from "node:fs/promises";
+import { homedir as homedir22 } from "node:os";
+import { join as join84, resolve as resolve24 } from "node:path";
 var RUNTIME_WRAPPER_MARKER2 = "OMO_GENERATED_RUNTIME_WRAPPER";
 var CHECK_NAME = "codex-runtime-wrapper";
 var REINSTALL_COMMAND = "npx --yes lazycodex-ai@latest install --no-tui";
 async function checkCodexRuntimeWrapper(deps = {}) {
-  const codexHome = resolve22(deps.codexHome ?? process.env.CODEX_HOME ?? join81(homedir21(), ".codex"));
+  const codexHome = resolve24(deps.codexHome ?? process.env.CODEX_HOME ?? join84(homedir22(), ".codex"));
   const binDir = resolveCodexInstallerBinDir({ binDir: deps.binDir, codexHome, env: process.env });
   const platform = deps.platform ?? process.platform;
-  const wrapperPath = join81(binDir, platform === "win32" ? "omo.cmd" : "omo");
-  const wrapper = await readRuntimeWrapper(wrapperPath);
+  const wrapperPath = join84(binDir, platform === "win32" ? "omo-agent-toolkit.cmd" : "omo-agent-toolkit");
+  const legacyWrapperPath = join84(binDir, platform === "win32" ? "omo.cmd" : "omo");
+  const [wrapper, legacyWrapper] = await Promise.all([readRuntimeWrapper(wrapperPath), readRuntimeWrapper(legacyWrapperPath)]);
   const issues = [];
   if (wrapper?.includes(RUNTIME_WRAPPER_MARKER2) === true) {
     const targetPath = parseRuntimeTargetPath(wrapper);
-    if (targetPath !== null && !existsSync57(targetPath)) {
+    if (targetPath !== null && !existsSync58(targetPath)) {
       issues.push({
-        title: "omo runtime wrapper target is missing",
-        description: `Generated omo runtime wrapper at ${wrapperPath} points to missing target ${targetPath}.`,
+        title: "omo-agent-toolkit runtime wrapper target is missing",
+        description: `Generated omo-agent-toolkit runtime wrapper at ${wrapperPath} points to missing target ${targetPath}.`,
         fix: `Run: ${REINSTALL_COMMAND}`,
         severity: "warning",
         affects: ["ulw-loop"]
       });
     }
   }
+  if (legacyWrapper?.includes(RUNTIME_WRAPPER_MARKER2) === true) {
+    issues.push({
+      title: "Legacy omo runtime wrapper is still installed",
+      description: `Generated legacy omo runtime wrapper remains at ${legacyWrapperPath} and may execute an outdated cached CLI.`,
+      fix: `Run: ${REINSTALL_COMMAND}`,
+      severity: "warning",
+      affects: ["version routing"]
+    });
+  }
   return {
     name: CHECK_NAME,
     status: issues.length > 0 ? "warn" : "pass",
@@ -109819,7 +110566,7 @@ async function checkCodexRuntimeWrapper(deps = {}) {
 }
 async function readRuntimeWrapper(path14) {
   try {
-    return await readFile26(path14, "utf8");
+    return await readFile29(path14, "utf8");
   } catch (error51) {
     if (error51 instanceof Error)
       return null;
@@ -110272,6 +111019,8 @@ init_shared();
 function resolveDoctorTarget(invocationName, platform) {
   if (platform !== undefined)
     return platform;
+  if (process.env.OMO_EDITION === "codex")
+    return "codex";
   return invocationName === "lazycodex" || invocationName === "lazycodex-ai" ? "codex" : "opencode";
 }
 
@@ -110300,10 +111049,10 @@ Doctor failed unexpectedly: ${message}`];
 }
 
 // packages/mcp-client-core/src/mcp-oauth/storage.ts
-import { createHash as createHash5 } from "node:crypto";
+import { createHash as createHash6 } from "node:crypto";
 import {
   chmodSync as chmodSync4,
-  existsSync as existsSync60,
+  existsSync as existsSync61,
   mkdirSync as mkdirSync14,
   readdirSync as readdirSync11,
   readFileSync as readFileSync38,
@@ -110311,15 +111060,15 @@ import {
   unlinkSync as unlinkSync9,
   writeFileSync as writeFileSync11
 } from "node:fs";
-import { basename as basename12, dirname as dirname30, join as join84 } from "node:path";
+import { basename as basename12, dirname as dirname32, join as join87 } from "node:path";
 
 // packages/mcp-client-core/src/config-dir.ts
-import { existsSync as existsSync58, realpathSync as realpathSync8 } from "node:fs";
-import { homedir as homedir22 } from "node:os";
-import { join as join82, resolve as resolve23 } from "node:path";
+import { existsSync as existsSync59, realpathSync as realpathSync8 } from "node:fs";
+import { homedir as homedir23 } from "node:os";
+import { join as join85, resolve as resolve25 } from "node:path";
 function resolveConfigPath2(pathValue) {
-  const resolvedPath = resolve23(pathValue);
-  if (!existsSync58(resolvedPath))
+  const resolvedPath = resolve25(pathValue);
+  if (!existsSync59(resolvedPath))
     return resolvedPath;
   try {
     return realpathSync8(resolvedPath);
@@ -110334,13 +111083,13 @@ function getOpenCodeCliConfigDir(env3 = process.env) {
   if (customConfigDir) {
     return resolveConfigPath2(customConfigDir);
   }
-  const xdgConfigDir = env3["XDG_CONFIG_HOME"]?.trim() || join82(homedir22(), ".config");
-  return resolveConfigPath2(join82(xdgConfigDir, "opencode"));
+  const xdgConfigDir = env3["XDG_CONFIG_HOME"]?.trim() || join85(homedir23(), ".config");
+  return resolveConfigPath2(join85(xdgConfigDir, "opencode"));
 }
 
 // packages/mcp-client-core/src/mcp-oauth/storage-index.ts
-import { chmodSync as chmodSync3, existsSync as existsSync59, readFileSync as readFileSync37, renameSync as renameSync6, writeFileSync as writeFileSync10 } from "node:fs";
-import { join as join83 } from "node:path";
+import { chmodSync as chmodSync3, existsSync as existsSync60, readFileSync as readFileSync37, renameSync as renameSync6, writeFileSync as writeFileSync10 } from "node:fs";
+import { join as join86 } from "node:path";
 var INDEX_FILE_NAME = "index.json";
 function isTokenIndex(value) {
   if (typeof value !== "object" || value === null || Array.isArray(value))
@@ -110348,11 +111097,11 @@ function isTokenIndex(value) {
   return Object.values(value).every((entry) => typeof entry === "string");
 }
 function getIndexPath(storageDir) {
-  return join83(storageDir, INDEX_FILE_NAME);
+  return join86(storageDir, INDEX_FILE_NAME);
 }
 function readTokenIndex(storageDir) {
   const indexPath = getIndexPath(storageDir);
-  if (!existsSync59(indexPath))
+  if (!existsSync60(indexPath))
     return {};
   try {
     const parsed = JSON.parse(readFileSync37(indexPath, "utf-8"));
@@ -110392,16 +111141,16 @@ function deleteTokenIndexEntry(storageDir, hash2) {
 var STORAGE_DIR_NAME = "mcp-oauth";
 var LEGACY_STORAGE_FILE_NAME = "mcp-oauth.json";
 function getMcpOauthStorageDir() {
-  return join84(getOpenCodeCliConfigDir(), STORAGE_DIR_NAME);
+  return join87(getOpenCodeCliConfigDir(), STORAGE_DIR_NAME);
 }
 function getMcpOauthServerHash(serverHost, resource) {
-  return createHash5("sha256").update(buildKey(serverHost, resource)).digest("hex").slice(0, 32);
+  return createHash6("sha256").update(buildKey(serverHost, resource)).digest("hex").slice(0, 32);
 }
 function getMcpOauthStoragePath(serverHost, resource) {
-  return join84(getMcpOauthStorageDir(), `${getMcpOauthServerHash(serverHost, resource)}.json`);
+  return join87(getMcpOauthStorageDir(), `${getMcpOauthServerHash(serverHost, resource)}.json`);
 }
 function getLegacyStoragePath() {
-  return join84(getOpenCodeCliConfigDir(), LEGACY_STORAGE_FILE_NAME);
+  return join87(getOpenCodeCliConfigDir(), LEGACY_STORAGE_FILE_NAME);
 }
 function normalizeHost2(serverHost) {
   let host = serverHost.trim();
@@ -110462,7 +111211,7 @@ function isOAuthTokenData(value) {
   return clientSecret === undefined || typeof clientSecret === "string";
 }
 function readTokenFile(filePath) {
-  if (!existsSync60(filePath))
+  if (!existsSync61(filePath))
     return null;
   try {
     const parsed = JSON.parse(readFileSync38(filePath, "utf-8"));
@@ -110475,7 +111224,7 @@ function readTokenFile(filePath) {
 }
 function readLegacyStore() {
   const filePath = getLegacyStoragePath();
-  if (!existsSync60(filePath))
+  if (!existsSync61(filePath))
     return null;
   try {
     const parsed = JSON.parse(readFileSync38(filePath, "utf-8"));
@@ -110495,8 +111244,8 @@ function readLegacyStore() {
 }
 function writeTokenFile(filePath, token) {
   try {
-    const dir = dirname30(filePath);
-    if (!existsSync60(dir)) {
+    const dir = dirname32(filePath);
+    if (!existsSync61(dir)) {
       mkdirSync14(dir, { recursive: true });
     }
     const tempPath = `${filePath}.tmp.${Date.now()}`;
@@ -110520,7 +111269,7 @@ function saveToken(serverHost, resource, token) {
 }
 function deleteToken(serverHost, resource) {
   const filePath = getMcpOauthStoragePath(serverHost, resource);
-  if (!existsSync60(filePath))
+  if (!existsSync61(filePath))
     return deleteLegacyToken(serverHost, resource);
   try {
     unlinkSync9(filePath);
@@ -110542,7 +111291,7 @@ function deleteLegacyToken(serverHost, resource) {
   if (Object.keys(store2).length === 0) {
     try {
       const filePath = getLegacyStoragePath();
-      if (existsSync60(filePath))
+      if (existsSync61(filePath))
         unlinkSync9(filePath);
       return true;
     } catch (deleteError) {
@@ -110580,7 +111329,7 @@ function listTokensByHost(serverHost) {
   for (const [hash2, indexedKey] of Object.entries(index)) {
     if (!indexedKey.startsWith(prefix))
       continue;
-    const indexedToken = readTokenFile(join84(getMcpOauthStorageDir(), `${hash2}.json`));
+    const indexedToken = readTokenFile(join87(getMcpOauthStorageDir(), `${hash2}.json`));
     if (indexedToken)
       result[indexedKey] = indexedToken;
   }
@@ -110589,13 +111338,13 @@ function listTokensByHost(serverHost) {
 function listAllTokens() {
   const result = { ...readLegacyStore() ?? {} };
   const dir = getMcpOauthStorageDir();
-  if (!existsSync60(dir))
+  if (!existsSync61(dir))
     return result;
   const index = readTokenIndex(dir);
   for (const entry of readdirSync11(dir, { withFileTypes: true })) {
     if (!entry.isFile() || !entry.name.endsWith(".json") || entry.name === "index.json")
       continue;
-    const token = readTokenFile(join84(dir, entry.name));
+    const token = readTokenFile(join87(dir, entry.name));
     const hash2 = basename12(entry.name, ".json");
     if (token)
       result[index[hash2] ?? hash2] = token;
@@ -110769,13 +111518,13 @@ async function findAvailablePort2(startPort = DEFAULT_PORT) {
 
 // packages/mcp-client-core/src/mcp-oauth/oauth-authorization-flow.ts
 import { spawn as spawn4 } from "node:child_process";
-import { createHash as createHash6, randomBytes as randomBytes2 } from "node:crypto";
+import { createHash as createHash7, randomBytes as randomBytes2 } from "node:crypto";
 import { createServer as createServer2 } from "node:http";
 function generateCodeVerifier() {
   return randomBytes2(32).toString("base64url");
 }
 function generateCodeChallenge(verifier) {
-  return createHash6("sha256").update(verifier).digest("base64url");
+  return createHash7("sha256").update(verifier).digest("base64url");
 }
 function buildAuthorizationUrl(authorizationEndpoint, options) {
   const url2 = new URL(authorizationEndpoint);
@@ -110795,7 +111544,7 @@ function buildAuthorizationUrl(authorizationEndpoint, options) {
 }
 var CALLBACK_TIMEOUT_MS = 5 * 60 * 1000;
 function startCallbackServer(port) {
-  return new Promise((resolve24, reject) => {
+  return new Promise((resolve26, reject) => {
     let timeoutId;
     const server2 = createServer2((request, response) => {
       clearTimeout(timeoutId);
@@ -110821,7 +111570,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();
-      resolve24({ code, state: state2 });
+      resolve26({ code, state: state2 });
     });
     timeoutId = setTimeout(() => {
       server2.close();
@@ -111161,7 +111910,7 @@ function createMcpOAuthCommand() {
 }
 
 // packages/omo-opencode/src/cli/boulder/boulder.ts
-import { existsSync as existsSync61 } from "node:fs";
+import { existsSync as existsSync62 } from "node:fs";
 
 // packages/omo-opencode/src/cli/boulder/formatter.ts
 var import_picocolors22 = __toESM(require_picocolors(), 1);
@@ -111298,10 +112047,10 @@ async function boulder(options) {
   const boulderFilePath = getBoulderFilePath(directory);
   const state2 = readBoulderState(directory);
   if (!state2) {
-    const message = existsSync61(boulderFilePath) ? formatReadErrorMessage(options.json) : formatNoBoulderMessage(options.json);
+    const message = existsSync62(boulderFilePath) ? formatReadErrorMessage(options.json) : formatNoBoulderMessage(options.json);
     process.stderr.write(`${message}
 `);
-    return existsSync61(boulderFilePath) ? 2 : 1;
+    return existsSync62(boulderFilePath) ? 2 : 1;
   }
   const works = getBoulderWorks(state2);
   const filteredWorks = options.workId ? works.filter((work) => work.work_id === options.workId) : works;
@@ -111319,12 +112068,12 @@ async function boulder(options) {
 }
 // packages/omo-opencode/src/cli/codex-ulw-loop.ts
 import { spawn as spawn5 } from "node:child_process";
-import { existsSync as existsSync62, readFileSync as readFileSync39, realpathSync as realpathSync9 } from "node:fs";
-import { homedir as homedir23 } from "node:os";
+import { existsSync as existsSync63, readFileSync as readFileSync39, realpathSync as realpathSync9 } from "node:fs";
+import { homedir as homedir24 } from "node:os";
 var ULW_LOOP_DELEGATION_SENTINEL = "OMO_ULW_LOOP_DELEGATED";
 function resolveCodexUlwLoopCommand(input = {}) {
   const env3 = input.env ?? process.env;
-  const homeDir = input.homeDir ?? homedir23();
+  const homeDir = input.homeDir ?? homedir24();
   const localComponentBin = resolveLocalUlwLoopBin(env3, homeDir);
   if (localComponentBin !== null)
     return { executable: localComponentBin, argsPrefix: [] };
@@ -111347,37 +112096,37 @@ async function codexUlwLoop(args) {
     console.error("Codex ulw-loop is not installed. Run: npx lazycodex-ai@latest install --no-tui");
     return 1;
   }
-  const { promise: promise2, resolve: resolve24 } = Promise.withResolvers();
+  const { promise: promise2, resolve: resolve26 } = Promise.withResolvers();
   const child = spawn5(command.executable, [...command.argsPrefix, ...args], {
     stdio: "inherit",
     env: { ...process.env, [ULW_LOOP_DELEGATION_SENTINEL]: "1" }
   });
   child.on("error", (error51) => {
     console.error(error51.message);
-    resolve24(1);
+    resolve26(1);
   });
-  child.on("close", (code) => resolve24(code ?? 1));
+  child.on("close", (code) => resolve26(code ?? 1));
   return promise2;
 }
 function resolveLocalUlwLoopBin(env3, homeDir) {
   const candidates = resolveCodexComponentBinCandidates({ executableName: "omo-ulw-loop", env: env3, homeDir });
-  return candidates.find((candidate) => existsSync62(candidate)) ?? null;
+  return candidates.find((candidate2) => existsSync63(candidate2)) ?? null;
 }
 function resolveLegacyLocalOmoBin(env3, homeDir, currentExecutablePaths) {
   const candidates = resolveCodexComponentBinCandidates({ executableName: "omo", env: env3, homeDir });
-  return candidates.find((candidate) => existsSync62(candidate) && !isCurrentExecutable(candidate, currentExecutablePaths) && !isGeneratedRuntimeWrapper(candidate)) ?? null;
+  return candidates.find((candidate2) => existsSync63(candidate2) && !isCurrentExecutable(candidate2, currentExecutablePaths) && !isGeneratedRuntimeWrapper(candidate2)) ?? null;
 }
-function isGeneratedRuntimeWrapper(candidate) {
+function isGeneratedRuntimeWrapper(candidate2) {
   try {
-    return readFileSync39(candidate, "utf8").includes(RUNTIME_WRAPPER_MARKER);
+    return readFileSync39(candidate2, "utf8").includes(RUNTIME_WRAPPER_MARKER);
   } catch (error51) {
     if (error51 instanceof Error)
       return false;
     return false;
   }
 }
-function isCurrentExecutable(candidate, currentExecutablePaths) {
-  const candidateRealPath = realpathOrSelf2(candidate);
+function isCurrentExecutable(candidate2, currentExecutablePaths) {
+  const candidateRealPath = realpathOrSelf2(candidate2);
   return currentExecutablePaths.some((currentPath) => realpathOrSelf2(currentPath) === candidateRealPath);
 }
 function realpathOrSelf2(path14) {
@@ -111515,7 +112264,7 @@ init_package();
 var VERSION3 = package_default.version;
 var program2 = new Command;
 function resolveInstallArgs(options, invocationName = process.env.OMO_INVOCATION_NAME) {
-  const defaultPlatform = invocationName === "lazycodex" || invocationName === "lazycodex-ai" ? "codex" : undefined;
+  const defaultPlatform = process.env.OMO_EDITION === "codex" || invocationName === "lazycodex" || invocationName === "lazycodex-ai" ? "codex" : undefined;
   const platform = options.platform ?? defaultPlatform;
   if (platform === "senpi" && !isSenpiPlatformEnabled()) {
     throw new Error(`The senpi install platform is not available in this release. Set ${SENPI_PLATFORM_ENV_FLAG}=1 to enable it from a source checkout.`);
@@ -111545,7 +112294,7 @@ Examples:
   $ bunx oh-my-opencode install
   $ 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
+  $ omo-agent-toolkit install --platform=codex --codex-autonomous
   $ bunx oh-my-opencode install --no-tui --claude=no --gemini=no --copilot=yes --opencode-zen=yes
 
 Model Providers (Priority: Native > Copilot > OpenCode Zen > Z.ai > Kimi > Bailian > MiniMax > Vercel):
@@ -111637,7 +112386,7 @@ Examples:
   $ bunx oh-my-opencode doctor --status   # Compact dashboard
   $ bunx oh-my-opencode doctor --verbose  # Deep diagnostics
   $ bunx oh-my-opencode doctor --json     # JSON output
-  $ omo doctor --platform=codex           # Codex/LazyCodex diagnostics only
+  $ omo-agent-toolkit doctor --platform=codex   # Codex/LazyCodex diagnostics only
 `).action(async (options) => {
   const rootOptions = program2.opts();
   const rootDoctorPlatform = rootOptions.platform === "opencode" || rootOptions.platform === "codex" ? rootOptions.platform : undefined;