oh-my-opencode 5.0.0-beta.34 → 5.0.0-beta.36

package/packages/omo-codex/plugin/shared/test/config-loader.test.ts

@@ -78,9 +78,9 @@ describe("getCodexOmoConfig", () => {
 		writeOmoConfig(
 			homeDir,
 			JSON.stringify({
-				codegraph: { enabled: true, install_dir: "/base" },
-				"[codex]": { codegraph: { enabled: false } },
-				"[opencode]": { codegraph: { install_dir: "/opencode-only" } },
+				telemetry: { enabled: true },
+				"[codex]": { telemetry: { enabled: false } },
+				"[opencode]": { telemetry: { enabled: true } },
 			}),
 		)
 
@@ -88,120 +88,36 @@ describe("getCodexOmoConfig", () => {
 		const result = getCodexOmoConfig({ cwd, homeDir, env: {} })
 
 		// then
-		expect(result.codegraph).toEqual({
-			auto_provision: true,
-			daemon: true,
-			enabled: false,
-			install_dir: "/base",
-			telemetry: false,
-		})
-		expect(result.trustedCodegraphInstallDir).toBe("/base")
-	})
-
-	it("#given project SOT sets install_dir #when loading config #then only the effective value changes while trusted install root stays global", () => {
-		// given
-		const homeDir = createTemporaryDirectory("omo-codex-shared-trusted-home-")
-		const cwd = createTemporaryDirectory("omo-codex-shared-trusted-project-")
-		writeOmoConfig(homeDir, JSON.stringify({ codegraph: { enabled: true, install_dir: "/global-codegraph" } }))
-		writeOmoConfig(cwd, JSON.stringify({ codegraph: { install_dir: "/project-codegraph" } }))
-
-		// when
-		const result = getCodexOmoConfig({ cwd, homeDir, env: {} })
-
-		// then
-		expect(result.codegraph?.install_dir).toBe("/project-codegraph")
-		expect(result.trustedCodegraphInstallDir).toBe("/global-codegraph")
-	})
-
-	it("#given codex SOT sets CodeGraph excluded roots #when loading config #then roots are returned to hooks", () => {
-		// given
-		const homeDir = createTemporaryDirectory("omo-codex-shared-excluded-home-")
-		const cwd = createTemporaryDirectory("omo-codex-shared-excluded-project-")
-		writeOmoConfig(
-			homeDir,
-			JSON.stringify({
-				"[codex]": { codegraph: { excluded_roots: ["/tmp/omo-research", "/private/tmp/omo-research"] } },
-			}),
-		)
-
-		// when
-		const result = getCodexOmoConfig({ cwd, homeDir, env: {} })
-
-		// then
-		expect(result.codegraph?.excluded_roots).toEqual(["/tmp/omo-research", "/private/tmp/omo-research"])
-	})
-
-	it("#given codex SOT sets the SessionStart cooldown #when loading config #then the configured base interval is returned", () => {
-		// given
-		const homeDir = createTemporaryDirectory("omo-codex-shared-cooldown-home-")
-		const cwd = createTemporaryDirectory("omo-codex-shared-cooldown-project-")
-		writeOmoConfig(homeDir, JSON.stringify({ "[codex]": { codegraph: { session_start_cooldown_ms: 900_000 } } }))
-
-		// when
-		const result = getCodexOmoConfig({ cwd, homeDir, env: {} })
-
-		// then
-		expect(result.codegraph?.session_start_cooldown_ms).toBe(900_000)
+		expect(result.telemetry?.enabled).toBe(false)
 		expect(result.warnings).toEqual([])
 	})
 
-	it("#given no codegraph.daemon key #when loading config #then daemon defaults to on", () => {
+	it("#given a project SOT layer #when loading config #then the project value overrides the user layer", () => {
 		// given
-		const homeDir = createTemporaryDirectory("omo-codex-shared-daemon-default-home-")
-		const cwd = createTemporaryDirectory("omo-codex-shared-daemon-default-project-")
-		writeOmoConfig(homeDir, JSON.stringify({ codegraph: { enabled: true } }))
+		const homeDir = createTemporaryDirectory("omo-codex-shared-project-home-")
+		const cwd = createTemporaryDirectory("omo-codex-shared-project-project-")
+		writeOmoConfig(homeDir, JSON.stringify({ task: { default_concurrency: 3 } }))
+		writeOmoConfig(cwd, JSON.stringify({ task: { default_concurrency: 7 } }))
 
 		// when
 		const result = getCodexOmoConfig({ cwd, homeDir, env: {} })
 
 		// then
-		expect(result.codegraph?.daemon).toBe(true)
-		expect(result.warnings).toEqual([])
+		expect(result.task?.default_concurrency).toBe(7)
 	})
 
-	it("#given codex SOT sets codegraph.daemon=false #when loading config #then daemon opt-out is returned", () => {
+	it("#given a codex SOT setting with the wrong type #when loading config #then the value is rejected with a warning", () => {
 		// given
-		const homeDir = createTemporaryDirectory("omo-codex-shared-daemon-off-home-")
-		const cwd = createTemporaryDirectory("omo-codex-shared-daemon-off-project-")
-		writeOmoConfig(homeDir, JSON.stringify({ "[codex]": { codegraph: { daemon: false } } }))
+		const homeDir = createTemporaryDirectory("omo-codex-shared-invalid-home-")
+		const cwd = createTemporaryDirectory("omo-codex-shared-invalid-project-")
+		writeOmoConfig(homeDir, JSON.stringify({ telemetry: { enabled: true }, "[codex]": { telemetry: { enabled: "yes" } } }))
 
 		// when
 		const result = getCodexOmoConfig({ cwd, homeDir, env: {} })
 
 		// then
-		expect(result.codegraph?.daemon).toBe(false)
-		expect(result.warnings).toEqual([])
-	})
-
-	it("#given codex SOT sets codegraph.daemon to a non-boolean #when loading config #then the value is rejected with a warning", () => {
-		// given
-		const homeDir = createTemporaryDirectory("omo-codex-shared-daemon-invalid-home-")
-		const cwd = createTemporaryDirectory("omo-codex-shared-daemon-invalid-project-")
-		writeOmoConfig(homeDir, JSON.stringify({ "[codex]": { codegraph: { daemon: "yes" } } }))
-
-		// when
-		const result = getCodexOmoConfig({ cwd, homeDir, env: {} })
-
-		// then
-		expect(result.codegraph?.daemon).toBe(true)
-		expect(result.warnings).toContain(`Invalid omo config at ${join(homeDir, ".omo", "omo.jsonc")}: [codex].codegraph.daemon`)
-	})
-
-	it("#given legacy env override and SOT value #when loading config #then env wins over the SOT", () => {
-		// given
-		const homeDir = createTemporaryDirectory("omo-codex-shared-env-")
-		const cwd = createTemporaryDirectory("omo-codex-project-env-")
-		writeOmoConfig(homeDir, JSON.stringify({ codegraph: { enabled: false } }))
-
-		// when
-		const result = getCodexOmoConfig({
-			cwd,
-			homeDir,
-			env: { CODEX_CODEGRAPH_ENABLED: "1" },
-		})
-
-		// then
-		expect(result.codegraph?.enabled).toBe(true)
+		expect(result.telemetry).toBeUndefined()
+		expect(result.warnings).toContain(`Invalid omo config at ${join(homeDir, ".omo", "omo.jsonc")}: [codex].telemetry.enabled`)
 	})
 
 	it("#given no SOT files #when loading config #then returns built-in defaults and missing global source", () => {
@@ -213,12 +129,8 @@ describe("getCodexOmoConfig", () => {
 		const result = getCodexOmoConfig({ cwd, homeDir, env: {} })
 
 		// then
-		expect(result.codegraph).toEqual({
-			auto_provision: true,
-			daemon: true,
-			enabled: true,
-			telemetry: false,
-		})
+		expect(result.telemetry).toBeUndefined()
+		expect(result.warnings).toEqual([])
 		expect(result.sources).toContainEqual({
 			exists: false,
 			loaded: false,
@@ -227,23 +139,10 @@ describe("getCodexOmoConfig", () => {
 		})
 	})
 
-	it("#given codex-unsupported codegraph setting #when loading config #then returns loader warnings", () => {
-		// given
-		const homeDir = createTemporaryDirectory("omo-codex-shared-warnings-")
-		const cwd = createTemporaryDirectory("omo-codex-project-warnings-")
-		writeOmoConfig(homeDir, JSON.stringify({ "[codex]": { codegraph: { watch_debounce_ms: 42 } } }))
-
-		// when
-		const result = getCodexOmoConfig({ cwd, homeDir, env: {} })
-
-		// then
-		expect(result.warnings).toContain("codegraph.watch_debounce_ms is not supported for harness codex")
-	})
-
 	it("#given only legacy config.jsonc #when codex starts #then migrates once with a backup before loading the unified codex view", () => {
 		// given
 		const homeDir = createTemporaryDirectory("omo-codex-legacy-upgrade-")
-		writeLegacyOmoConfig(homeDir, JSON.stringify({ "[codex]": { codegraph: { daemon: false } } }))
+		writeLegacyOmoConfig(homeDir, JSON.stringify({ "[codex]": { telemetry: { enabled: false } } }))
 		const legacyPath = join(homeDir, ".omo", "config.jsonc")
 
 		// when
@@ -252,7 +151,7 @@ describe("getCodexOmoConfig", () => {
 		const second = getCodexOmoConfig({ cwd: homeDir, homeDir, env: {} })
 
 		// then
-		expect(first.codegraph?.daemon).toBe(false)
+		expect(first.telemetry?.enabled).toBe(false)
 		expect(first.warnings.some((warning) => warning.startsWith("omo-codex: migrated legacy configuration from ")
 			&& warning.endsWith("/.omo/config.jsonc"))).toBe(true)
 		expect(readOmoJson(homeDir)["_migrations"]).toEqual(["2026-07-codex-config-jsonc"])
@@ -266,8 +165,8 @@ describe("getCodexOmoConfig", () => {
 	it("#given a legacy migration conflict #when codex starts #then exposes the migration summary and conflict through loader warnings", () => {
 		// given
 		const homeDir = createTemporaryDirectory("omo-codex-legacy-conflict-")
-		writeOmoConfig(homeDir, JSON.stringify({ codegraph: { enabled: true } }))
-		writeLegacyOmoConfig(homeDir, JSON.stringify({ codegraph: { enabled: false } }))
+		writeOmoConfig(homeDir, JSON.stringify({ "[codex]": { telemetry: { enabled: true } } }))
+		writeLegacyOmoConfig(homeDir, JSON.stringify({ "[codex]": { telemetry: { enabled: false } } }))
 
 		// when
 		const result = getCodexOmoConfig({ cwd: homeDir, homeDir, env: {} })
@@ -275,7 +174,7 @@ describe("getCodexOmoConfig", () => {
 		// then
 		expect(result.warnings.some((warning) => warning.startsWith("omo-codex: migrated legacy configuration from ")
 			&& warning.endsWith("/.omo/config.jsonc"))).toBe(true)
-		expect(result.warnings).toContain("omo-codex: configuration migration: skipped: codegraph.enabled legacy=false kept=true")
+		expect(result.warnings).toContain("omo-codex: configuration migration: skipped: [codex].telemetry.enabled legacy=false kept=true")
 	})
 
 	it("#given overlapping [omo] and [senpi] blocks in legacy config #when Codex migrates #then the transform conflict is reported", () => {
@@ -310,7 +209,7 @@ describe("getCodexOmoConfig", () => {
 	it("#given codex starts before opencode #when both legacy source groups exist #then each distinct migration id is applied once", () => {
 		// given
 		const homeDir = createTemporaryDirectory("omo-codex-order-codex-first-")
-		writeLegacyOmoConfig(homeDir, JSON.stringify({ "[codex]": { codegraph: { daemon: false } } }))
+		writeLegacyOmoConfig(homeDir, JSON.stringify({ "[codex]": { telemetry: { enabled: false } } }))
 		writeOpenCodeConfig(homeDir)
 		const openCodeSource = join(homeDir, ".config", "opencode", "oh-my-openagent.jsonc")
 
@@ -322,13 +221,17 @@ describe("getCodexOmoConfig", () => {
 		// then
 		expect(remainsAfterCodexStartup).toBe(true)
 		expect(existsSync(openCodeSource)).toBe(false)
-		expect(migrationIds(homeDir)).toEqual(["2026-07-codex-config-jsonc", "2026-07-opencode-config-unification"])
+		expect(migrationIds(homeDir)).toEqual([
+			"2026-07-codex-config-jsonc",
+			"2026-07-opencode-config-unification",
+			"2026-08-reasoning-unification",
+		])
 	})
 
 	it("#given opencode starts before codex #when both legacy source groups exist #then each distinct migration id is applied once", () => {
 		// given
 		const homeDir = createTemporaryDirectory("omo-codex-order-opencode-first-")
-		writeLegacyOmoConfig(homeDir, JSON.stringify({ "[codex]": { codegraph: { daemon: false } } }))
+		writeLegacyOmoConfig(homeDir, JSON.stringify({ "[codex]": { telemetry: { enabled: false } } }))
 		writeOpenCodeConfig(homeDir)
 
 		// when
@@ -336,13 +239,17 @@ describe("getCodexOmoConfig", () => {
 		getCodexOmoConfig({ cwd: homeDir, homeDir, env: {} })
 
 		// then
-		expect(migrationIds(homeDir)).toEqual(["2026-07-opencode-config-unification", "2026-07-codex-config-jsonc"])
+		expect(migrationIds(homeDir)).toEqual([
+			"2026-07-opencode-config-unification",
+			"2026-07-codex-config-jsonc",
+			"2026-08-reasoning-unification",
+		])
 	})
 
 	it("#given concurrent codex and opencode starts #when opencode owns the shared lock #then both migration ids are applied exactly once", () => {
 		// given
 		const homeDir = createTemporaryDirectory("omo-codex-order-concurrent-")
-		writeLegacyOmoConfig(homeDir, JSON.stringify({ "[codex]": { codegraph: { daemon: false } } }))
+		writeLegacyOmoConfig(homeDir, JSON.stringify({ "[codex]": { telemetry: { enabled: false } } }))
 		writeOpenCodeConfig(homeDir)
 		let codexResult: ReturnType<typeof runCodexStartupMigration> | undefined
 
@@ -355,6 +262,10 @@ describe("getCodexOmoConfig", () => {
 		// then
 		if (codexResult === undefined) throw new Error("Expected concurrent Codex migration attempt")
 		expect(codexResult.error).toBe("Configuration migration is already running")
-		expect(migrationIds(homeDir)).toEqual(["2026-07-opencode-config-unification", "2026-07-codex-config-jsonc"])
+		expect(migrationIds(homeDir)).toEqual([
+			"2026-07-opencode-config-unification",
+			"2026-07-codex-config-jsonc",
+			"2026-08-reasoning-unification",
+		])
 	})
 })

package/packages/omo-codex/plugin/skills/init-deep/SKILL.md

@@ -42,7 +42,7 @@ Generate hierarchical AGENTS.md files. Root + complexity-scored subdirectories.
 
 1. **Discovery + Analysis** (concurrent)
    - Fire background explore agents immediately
-   - Main session: bash structure + LSP/codegraph code map + read existing AGENTS.md
+   - Main session: bash structure + LSP/ast-grep code map + read existing AGENTS.md
 2. **Score & Decide** - Determine AGENTS.md locations from merged findings
 3. **Generate** - Root first, then subdirs in parallel
 4. **Review** - Deduplicate, trim, validate
@@ -51,7 +51,7 @@ Generate hierarchical AGENTS.md files. Root + complexity-scored subdirectories.
 **TodoWrite ALL phases. Mark in_progress → completed in real-time.**
 ```
 TodoWrite([
-  { id: "discovery", content: "Fire explore agents + LSP/codegraph map + read existing", status: "pending", priority: "high" },
+  { id: "discovery", content: "Fire explore agents + LSP/ast-grep map + read existing", status: "pending", priority: "high" },
   { id: "scoring", content: "Score directories, determine locations", status: "pending", priority: "high" },
   { id: "generate", content: "Generate AGENTS.md files (root + subdirs)", status: "pending", priority: "high" },
   { id: "review", content: "Deduplicate, validate, trim", status: "pending", priority: "medium" }
@@ -67,16 +67,16 @@ TodoWrite([
 
 ### Fire Background Explore Agents IMMEDIATELY
 
-Don't wait-these run async while main session works. **Equip every agent with the code graph**: any task touching structure, entry points, dependencies, or hotspots MUST query `codegraph_*` (explore/search/callers/callees/impact) and `lsp_symbols` when present, and ground its claims in that data instead of guessing from conventions. Richer real-graph context per agent = a more accurate project map.
+Don't wait-these run async while main session works. **Ground every agent in real symbol data**: any task touching structure, entry points, dependencies, or hotspots MUST query `lsp_symbols`/`lsp_find_references` and the ast-grep skill (`sg`) when present, and ground its claims in that data instead of guessing from conventions. Richer real context per agent = a more accurate project map.
 
 ```
 // Fire all at once, collect results later
-task(subagent_type="explore", load_skills=[], description="Explore project structure", run_in_background=true, prompt="Project structure: map real layout via codegraph_explore/codegraph_files → REPORT deviations from standard patterns")
-task(subagent_type="explore", load_skills=[], description="Find entry points", run_in_background=true, prompt="Entry points: FIND main files, trace reach via codegraph_callees + lsp_symbols → REPORT non-standard organization")
+task(subagent_type="explore", load_skills=[], description="Explore project structure", run_in_background=true, prompt="Project structure: map real layout via glob + lsp_symbols scope=workspace → REPORT deviations from standard patterns")
+task(subagent_type="explore", load_skills=[], description="Find entry points", run_in_background=true, prompt="Entry points: FIND main files, trace reach via lsp_symbols + lsp_find_references → REPORT non-standard organization")
 task(subagent_type="explore", load_skills=[], description="Find conventions", run_in_background=true, prompt="Conventions: FIND config files (.eslintrc, pyproject.toml, .editorconfig) → REPORT project-specific rules")
 task(subagent_type="explore", load_skills=[], description="Find anti-patterns", run_in_background=true, prompt="Anti-patterns: FIND 'DO NOT', 'NEVER', 'ALWAYS', 'DEPRECATED' comments → LIST forbidden patterns")
 task(subagent_type="explore", load_skills=[], description="Explore build/CI", run_in_background=true, prompt="Build/CI: FIND .github/workflows, Makefile → REPORT non-standard patterns")
-task(subagent_type="explore", load_skills=[], description="Find test patterns", run_in_background=true, prompt="Test patterns: FIND test configs/structure; codegraph_callers on core modules to see what is covered → REPORT unique conventions")
+task(subagent_type="explore", load_skills=[], description="Find test patterns", run_in_background=true, prompt="Test patterns: FIND test configs/structure; lsp_find_references on core modules to see what is covered → REPORT unique conventions")
 ```
 
 <dynamic-agents>
@@ -138,7 +138,7 @@ For each existing file found:
 
 If `--create-new`: Read all existing first (preserve context) → then delete all → regenerate.
 
-#### 3. Code Map - drive LSP AND codegraph (do NOT skip)
+#### 3. Code Map - drive LSP AND ast-grep (do NOT skip)
 
 Highest-signal source for the CODE MAP and the Symbol/Export/Reference scoring rows. Complementary, not alternatives - run BOTH when present, alongside the explore agents.
 
@@ -147,10 +147,10 @@ Highest-signal source for the CODE MAP and the Symbol/Export/Reference scoring r
 - `lsp_symbols` scope="workspace", query by kind (class/interface/function) -> symbol inventory.
 - `lsp_find_references` on top exports (line/character from the symbols result) -> reference centrality.
 
-**codegraph** - when `codegraph_*` tools exist (check `codegraph_status`); a first-class peer to LSP, NOT a last resort:
-- `codegraph_explore` -> overview; `codegraph_callers`/`codegraph_callees`/`codegraph_impact` -> centrality + blast radius for the scoring matrix; `codegraph_search`/`codegraph_files` -> symbol/file inventory.
+**ast-grep** - load the ast-grep skill; a first-class peer to LSP, NOT a last resort:
+- `sg --pattern 'export $$$' --lang <lang>` -> export inventory; `sg --pattern 'import $$$ from "$MOD"'` -> dependency edges between modules for the scoring matrix.
 
-Only if NEITHER exists: explore agents + the ast-grep skill (`sg`), and mark centrality unmeasured in the CODE MAP.
+Only if LSP is unavailable: explore agents + ast-grep alone, and mark reference centrality unmeasured in the CODE MAP.
 
 ### Collect Background Results
 
@@ -159,7 +159,7 @@ Only if NEITHER exists: explore agents + the ast-grep skill (`sg`), and mark cen
 for each background task ID (`bg_...`): background_output(task_id="bg_...")
 ```
 
-**Merge: bash + LSP/codegraph + existing + explore findings. Mark "discovery" as completed.**
+**Merge: bash + LSP/ast-grep + existing + explore findings. Mark "discovery" as completed.**
 
 ---
 
@@ -235,7 +235,7 @@ NEVER use Write to overwrite an existing file. ALWAYS check existence first via
 |------|----------|-------|
 
 ## CODE MAP
-{From LSP/codegraph - skip only if neither exists or project <10 files}
+{From LSP/ast-grep - skip only if neither exists or project <10 files}
 
 | Symbol | Type | Location | Refs | Role |
 |--------|------|----------|------|------|
@@ -318,7 +318,7 @@ Hierarchy:
 ## Anti-Patterns
 
 - **Static agent count**: MUST vary agents based on project size/depth
-- **Sequential execution**: MUST parallel (explore + LSP + codegraph concurrent)
+- **Sequential execution**: MUST parallel (explore + LSP + ast-grep concurrent)
 - **Ignoring existing**: ALWAYS read existing first, even with --create-new
 - **Over-documenting**: Not every dir needs AGENTS.md
 - **Redundancy**: Child never repeats parent

package/packages/omo-codex/plugin/skills/lcx-doctor/SKILL.md

@@ -70,7 +70,7 @@ sync_latest_source openai/codex "$LAZYCODEX_SOURCE_ROOT/openai-codex-source"
    - `$CODEX_HOME/config.toml` exists and parses; LazyCodex-managed entries match what the latest installer would write.
    - Plugin payload present and non-empty: read `.codex-plugin/plugin.json`; when that manifest declares a `hooks` array, validate every direct hook path declared by the manifest; require `hooks/hooks.json` only when the manifest declares it; do not require retired paths such as `components/workflow-selector` or `hooks/user-prompt-submit-selecting-lazycodex-workflow.json` unless the current manifest declares them.
    - Verify the manifest-declared runtime payload, not a remembered source tree. Current payload includes `skills/`, `.mcp.json`, root CLI runtimes such as `dist/cli/index.js` and `dist/cli-node/index.js`, and every hook/MCP `components/*/dist/*.js` target referenced by installed manifests.
-   - Treat install-time materialization rewrites as expected when the rewritten target exists and is non-empty. For example, `.mcp.json` may use plugin-local or absolute installed paths for CodeGraph/MCP runtimes; that is PASS/WARN context, not payload drift. Missing or zero-byte rewritten targets are FAIL.
+   - Treat install-time materialization rewrites as expected when the rewritten target exists and is non-empty. For example, `.mcp.json` may use plugin-local or absolute installed paths for MCP runtimes; that is PASS/WARN context, not payload drift. Missing or zero-byte rewritten targets are FAIL.
    - Stale project-local leftovers the installer now removes (e.g. `.codex/hooks.json`, `.codex/skills` in the project) are flagged, not deleted.
 4. Probe the real surface. Do not invoke `lazycodex doctor`; this skill is already running inside that doctor workflow, so calling it would recurse. Instead run non-recursive probes directly: `codex --version`, `command -v codex`, the bin-link checks above, config/plugin payload inspections, and a trivial non-interactive Codex invocation that loads the plugin. Use the configured Codex default model for the runtime probe unless the user explicitly passed a model override to the doctor surface; never force a guessed/rejected model such as `gpt-5.5-codex-mini`. Capture stderr verbatim; a clean exit with warnings is WARN, not PASS.
 5. Compare for drift. Where installed manifest-declared bundled files differ from the same files at the installed version, or the latest source removed or renamed something the local config still references, record it with both paths. Do not report expected materialization differences, such as absolute `.mcp.json` runtime paths, as drift when their targets exist and are non-empty.

package/packages/omo-codex/plugin/skills/ultrawork/SKILL.md

@@ -236,8 +236,8 @@ and utility functions to batch commands and reduce output. Keep direct calls
 when one result chooses the next action, outputs are already small, semantic
 judgment is required between calls, approval or side effects are involved,
 or native artifacts / citations must be preserved.
-- Architecture / flow / blast radius → `codegraph_explore` first when
-  `codegraph_*` exists; if unavailable, continue with repo tools and LSP.
+- Architecture / flow / blast radius → explore agents plus LSP references
+  and impact; do not guess from conventions.
 - **SYMBOLS REQUIRE LSP** — definitions, references, rename impact,
   workspace symbols, and diagnostics use the available `lsp_*` tools, not
   text search. Run diagnostics after edits and treat errors as blocking.

package/packages/omo-codex/plugin/skills/ulw-execute/SKILL.md

@@ -49,17 +49,17 @@ $ulw-execute [plan-name] [--worktree <absolute-path>] [--make-pr] [--ship]
 ```
 
 - `plan-name` (optional): a full or partial file stem under `.omo/plans/`.
-- `--worktree` (required for PR/branch work; otherwise optional): the task-owned git worktree path.
-- `--make-pr` (optional): deliver the work as a pull request. IMPLIES worktree mode: when `--worktree` is absent, create a task-owned worktree (`git worktree add <absolute-path> <base-branch>`) before implementation and record it as `worktree_path`. On completion, push the branch and open a reviewer-readable PR, then hand off with the PR URL - merge only if the user asks.
+- `--worktree` (optional): reuse an existing task-owned worktree for the first phase instead of creating one; every phase runs in a task-owned worktree regardless.
+- `--make-pr` (optional): deliver each phase's worktree as a pull request — push the branch, open a reviewer-readable PR, hand off with the URL, and merge only if the user asks.
 - `--ship` (optional): full delivery lifecycle; implies `--make-pr`. After the PR opens, stay on the job until it is MERGED: watch CI and review gates, fix failures and address feedback from the worktree (fresh QA evidence for behavior changes), merge per the repository's merge policy, then remove the worktree and sync `.omo/` state back.
 
 ## Goal and todo discipline (MANDATORY)
 
 Do ALL of this immediately after the plan is selected, BEFORE the first implementation dispatch. Skipping any step is a defect.
 
-1. **Set the goal, in detail.** When a goal tool is available (`create_goal`), call it with a DETAILED objective: the plan name and path, the concrete end state, the phase and task counts, the delivery mode (direct, `--make-pr`, or `--ship`), and how completion will be verified. One work session = one goal. No goal tool -> record the same objective as the first ledger entry.
+1. **Set the goal, in detail.** When a goal tool is available (`create_goal`), call it with a DETAILED objective: the plan name and path, the concrete end state, the phase and task counts, the delivery mode (direct, `--make-pr`, or `--ship`), and how completion will be verified. One work session = one registered goal (the goal tool holds one active goal); each phase then carries its own concrete goal — the ledger entry Phase 2 records before the wave's first dispatch, defined from the previous phase's landed and verified evidence. No goal tool -> record the same objective as the first ledger entry.
 2. **Register every phase and task as todos.** Mirror the plan into the todo/plan tool of your harness: one phase per plan wave, one todo per column-zero checkbox (including the final verification wave). Register ALL of them up front - never keep tasks in memory only.
-3. **Keep them current at every moment.** Mark a todo in_progress when its work dispatches and done immediately after its verification passes. Never batch-complete at the end, never execute work that is not a registered todo; discovered work is appended as a todo before it runs. The todo list, Boulder state, and plan checkboxes must always tell the same story.
+3. **Keep them current at every moment.** Mark a todo in_progress when its work dispatches and done immediately after its verification passes. Never batch-complete at the end, never execute work that is not a registered todo; discovered work — a pre-existing bug, failing test, stale doc, or wrong guidance — is appended to the plan as a checkbox, mirrored as a todo before it runs, and fixed to the ideal state, never deferred as a follow-up. A worker that meets a defect outside its assigned files reports it instead of fixing it; only the orchestrator appends the checkbox and dispatches it to a correctly scoped unit. The todo list, Boulder state, and plan checkboxes must always tell the same story.
 
 ## Phase 1: Select the plan
 
@@ -102,14 +102,14 @@ Write `.omo/boulder.json` before implementation starts. Prefix session ids with
 }
 ```
 
-For PR/branch work, a task-owned worktree is mandatory before implementation starts: pass `--worktree`, or use `--make-pr`/`--ship`, which auto-create one. Verify the path with `git worktree list --porcelain` or create it with `git worktree add <path> <branch-or-HEAD>`, then store the absolute path as `worktree_path`. All edits, commands, tests, and evidence capture must run inside that worktree.
+Every phase (plan wave) runs in its own task-owned worktree with its own goal: before the wave's first dispatch, record the wave's goal — its checkboxes and their acceptance criteria — as a ledger entry, then `git worktree add <repo>-wt/<plan>-<wave> <branch off the integration base>` (or verify a `--worktree` path with `git worktree list --porcelain`), store the absolute path as `worktree_path`, run every edit, command, test, and evidence capture inside it; the wave lands on the integration base once its checkboxes are verified (direct merge, or the PR under `--make-pr`/`--ship`), and the next wave branches from that landed base.
 
 ## Parallel delivery lanes (teams and worktrees)
 
 Solo orchestration with parallel background workers is the default topology. Decide once, when the wave's lanes are known, and record the verdict in the ledger:
 
 - **Independent lanes -> parallel workers.** Separate files, no shared contract: one parallel spawn burst; no team.
-- **Dependency-ordered lanes -> a dag run.** Sub-tasks with real ordering between them (C needs A and B finished first) and a harness with a native `dag` tool: dispatch the wave as ONE dag run — one producer node per lane plus a verification node — instead of a spawn burst, and watch the run's lifecycle instead of arming per-lane watchers. Read the `mass-ulw` skill's `SKILL.md` and `references/planning.md` IN FULL before defining any graph.
+- **Dependency-ordered lanes -> one `workflow` run per wave.** Sub-tasks with real ordering between them (C needs A and B finished first) and a harness with a native `workflow` tool: dispatch the wave as ONE run (one producer node per lane plus a verification node); recover inside it with `retry`/`amend`/`send`; let node completions wake you instead of arming per-lane watchers; the next wave is a NEW run (or `amend` when only the definition changed) — never one graph for the whole plan. Read the `mass-ulw` skill's `SKILL.md` and `references/planning.md` IN FULL before defining any graph.
 - **Overlapping lanes -> a team.** The lanes touch the same module or contract AND running them concurrently actually finishes sooner: stand up a team (where the harness has one) so one lane's discoveries relay through you mid-flight.
 - **PR-mode independent lanes -> a worktree per lane.** Under `--make-pr`/`--ship`, when a wave holds independent checkboxes, give each lane its own branch and task-owned worktree, delivered as its own PR.
 
@@ -169,7 +169,7 @@ Each sub-task message must include:
    - Terminal / TUI: drive a real pty; `tmux send-keys` is fine for a boot/behavior smoke, but color/layout/CJK evidence goes through the xterm.js web terminal below, NEVER `tmux capture-pane`.
    - Browser use: prefer the harness's in-app browser control when available and the scenario does not need an authenticated or persistent user browser profile; otherwise drive the real page with Chrome, or agent-browser (https://github.com/vercel-labs/agent-browser) when Chrome is unavailable.
    - Computer use: OS-level GUI automation against the running desktop app when the surface is not a page.
-   - TUI visual evidence: when a TUI claim needs visual QA or PR proof, run `node script/qa/web-terminal-visual-qa.mjs --command "<cmd>" --input "{Enter}" --evidence-dir <dir>` (real pty rendered through xterm.js in Chrome) and attach `terminal.png` plus `metadata.json`.
+   - TUI visual evidence: when a TUI claim needs visual QA or PR proof, run `bun script/qa/web-terminal-visual-qa.mjs --command "<cmd>" --input "{Enter}" --evidence-dir <dir>` (real pty rendered through xterm.js in Chrome) and attach `terminal.png` plus `metadata.json`.
 6. The adversarial classes that apply to this sub-task (from the 9 ultraqa classes) and how each is probed.
 7. Required artifact path and cleanup receipt.
 8. Tool-use expectations: batch independent tool calls in parallel; when the harness exposes a code-execution surface (eval), use it for multi-call steps instead of one-by-one calls.
@@ -232,16 +232,9 @@ Only after verification passes:
 When all top-level checkboxes in `## TODOs` and `## Final Verification Wave` are complete:
 
 1. Run the plan's final verification commands.
-2. Complete the **Global Review and Debugging Gate** before any completion claim, PR creation, PR handoff, branch handoff, or merge:
-   - Invoke the `review-work` skill with the final diff, changed files, user goal, constraints, run command, and verification evidence. All five review lanes must return PASS. A timeout, missing deliverable, ack-only child, `BLOCKED:`, or inconclusive lane is a gate failure, not approval.
-   - Each passing review lane binds to the exact full commit SHA it reviewed. Immediately append a durable record to `.omo/ulw-execute/ledger.jsonl` with the lane name, full SHA, PASS verdict, and report artifact/source. Before same-SHA reuse after any continuation or compaction, re-read the ledger record and require the exact lane/SHA pair; memory, chat history, or an unstamped report is not coverage. New commits require fresh applicable lane coverage.
-   - Run a debugging-oriented runtime audit even when the review passes: name at least three plausible failure hypotheses for the changed surface, run the distinguishing checks against the actual artifact, and append a separate durable record with the audit name, exact full SHA, verdict, and evidence artifact/source to `.omo/ulw-execute/ledger.jsonl`. Reuse it only after re-reading an exact audit/SHA match.
-   - If any review lane or debugging hypothesis fails, invoke the `debugging` skill, confirm root cause with runtime evidence, add the minimal failing test or reproduction, fix it, rerun the affected verification, then rerun the Global Review and Debugging Gate.
-   - Evidence hygiene is mandatory: redact or mask secrets and sensitive user data before writing `.omo/ulw-execute/ledger.jsonl`, a PR body, or a handoff. Never include raw tokens, credentials, auth headers, cookies, API keys, env dumps, private logs, or PII; use concise summaries, lengths, hashes, or short non-sensitive prefixes instead.
-   - If the work includes creating, updating, or handing off a PR, refresh `git status` and the PR/branch state from the task-owned worktree after the gate, and include only redacted review/debugging evidence in the PR body or handoff.
-3. Finish the PR/branch lifecycle from its task-owned worktree: sync `.omo/` state back to the main repo, create or update the PR when requested, wait for CI/review/Cubic gates, merge by default unless explicitly opted out, and remove the worktree only after successful merge or explicit handoff.
-4. Remove or mark the Boulder work as completed.
-5. Print an `ORCHESTRATION COMPLETE` block with the plan path, verification commands, Global Review and Debugging Gate verdict, artifacts, and cleanup receipts.
+2. For PR/branch work, finish the lifecycle from the last phase's worktree: sync `.omo/` state back to the main repo, create or update the PR, wait for review/verification gates, merge by default unless explicitly opted out, and remove the worktree only after successful merge or explicit handoff.
+3. Remove or mark the Boulder work as completed.
+4. Print an `ORCHESTRATION COMPLETE` block with the plan path, verification commands, artifacts, and cleanup receipts.
 
 ## Hard rules
 
@@ -250,7 +243,6 @@ When all top-level checkboxes in `## TODOs` and `## Final Verification Wave` are
 - No tests-only completion claim. A Manual-QA artifact is required.
 - **NO DIRECT IMPLEMENTATION BY THE ORCHESTRATOR.** Root NEVER edits product files, writes tests, or runs QA itself — a spawned worker does.
 - No completion claim while an applicable ultraqa adversarial class was never probed. Each applicable class needs a captured observable result; each skipped class needs a one-line not-applicable reason in the ledger.
-- No `ORCHESTRATION COMPLETE`, final response, PR creation, PR handoff, or merge before the Global Review and Debugging Gate passes with recorded evidence.
-- No PR/branch implementation or review in the main worktree; create or use a task-owned git worktree first.
+- No implementation, review, or merge in the main checkout; every phase works in its task-owned worktree.
 - No unprefixed session ids in Boulder state. Sessions are always recorded as `codex:<session_id>`.
 - No stale-memory execution. The plan and ledger are the durable source of truth.

package/packages/omo-codex/plugin/skills/ulw-loop/references/full-workflow.md

@@ -190,6 +190,7 @@ omo-agent-toolkit ulw-loop record-evidence --goal-id <g> --criterion-id <c> --st
 # Then use the harness update_goal tool with status complete.
 omo-agent-toolkit ulw-loop checkpoint --goal-id <g> --print-template --json
 # Fill the printed template: replace every placeholder and use real artifact paths under currentAttemptDir.
+# codex-goal-json.goal.objective must equal the plan's codexObjective verbatim.
 omo-agent-toolkit ulw-loop checkpoint --goal-id <g> --status complete --evidence "..." --codex-goal-json <path> --quality-gate-json <path>
 omo-agent-toolkit ulw-loop complete-goals
 ```
@@ -214,7 +215,7 @@ omo-agent-toolkit ulw-loop checkpoint --goal-id <id> --status complete --evidenc
 {
   "codeReview":{"by":"lazycodex-code-reviewer","recommendation":"APPROVE","codeQualityStatus":"CLEAR","reportPath":"test/fixtures/artifacts/code-review.md","evidence":"Diff review passed.","blockers":[]},
   "manualQa":{"by":"lazycodex-qa-executor","status":"passed","evidence":"CLI and data surfaces passed.","surfaceEvidence":[{"id":"surface-cli-pass","criterionRef":"C1","surface":"cli","invocation":"omo-agent-toolkit ulw-loop checkpoint --quality-gate-json sample-quality-gate.json --json","verdict":"passed","artifactRefs":["artifact-cli-pass"]},{"id":"surface-data-pass","criterionRef":"C2","surface":"data","invocation":"diff -u before-ledger.json after-ledger.json","verdict":"passed","artifactRefs":["artifact-data-diff"]}],"adversarialCases":[{"id":"adv-malformed-input","criterionRef":"C3","scenario":"malformed gate input omits manual QA evidence","expectedBehavior":"validator rejects ULW_LOOP_QUALITY_GATE_INVALID","verdict":"passed","artifactRefs":["artifact-cli-reject"]}],"artifactRefs":[{"id":"artifact-cli-pass","kind":"cli-transcript","description":"CLI pass artifact.","path":"test/fixtures/artifacts/cli-pass.txt"},{"id":"artifact-cli-reject","kind":"log","description":"Reject log artifact.","path":"test/fixtures/artifacts/rejection.txt"},{"id":"artifact-data-diff","kind":"data-diff","description":"Data diff artifact.","path":"test/fixtures/artifacts/data-diff.txt"}]},
-  "gateReview":{"by":"lazycodex-gate-reviewer","recommendation":"APPROVE","reportPath":"test/fixtures/artifacts/gate-review.md","evidence":"Gate review passed.","blockers":[]},
+  "gateReview":{"by":"lazycodex-gate-reviewer","recommendation":"APPROVE","reportPath":"test/fixtures/artifacts/gate-review.md","evidence":"Gate review passed.","blockers":[],"notes":[]},
   "iteration":{"fullRerun":true,"status":"passed","rerunCommands":["bunx vitest run packages/omo-codex/plugin/components/ulw-loop/test/quality-gate-doc.test.ts"],"evidence":"Focused rerun passed."},
   "criteriaCoverage":{"totalCriteria":3,"passCount":3,"originalIntent":"User wanted artifact-backed completion.","desiredOutcome":"Behavior ships with review and QA evidence.","userOutcomeReview":"Result matches brief and goals.","adversarialClassesCovered":["malformed_input","stale_state"]}
 }

package/packages/omo-codex/plugin/skills/ulw-plan/SKILL.md

@@ -71,7 +71,6 @@ When producing the plan, encode every executable item as a column-zero Markdown
 - **Decision-complete is the north star.** The executor has NO interview context - spell out exact paths, "every X in Y", and an explicit Must-NOT-Have. Leave the implementer ZERO judgment calls.
 - **Full scope is the default.** Plan the ENTIRE request; "MVP", "v1", "phase 1", or any reduced subset is never an option you invent or ask about - it exists only if the user introduces it. Scope OUT / Must-NOT-Have entries are guardrails against unrequested additions, never reductions of the request.
 - **Explore before asking.** Discoverable facts (repo/system/docs truth) -> research and cite, never ask. Preferences/tradeoffs -> the only things you bring to the user. When unsure which, treat it as a user-decision.
-- **CodeGraph first when present.** Use `codegraph_explore` for repo how/where/what/flow questions before wider reads; if codegraph_* tools are absent, inactive/uninitialized, or cold-start unavailable, continue with Read/Grep/Glob/LSP and the ast-grep skill.
 - **Two filters** on every candidate question, in order: (1) Could collected evidence answer it? -> explore instead. (2) Could the user's stated intent plus a defensible default answer it? -> adopt the default, record it, do not ask - UNLESS it is an owner-decision, which always survives as a question even when a default exists: anything irreversible / destructive / safety-critical, or a cross-cutting product choice the user lives with (public config surface, distribution / packaging, external dependency or pinned SHA, data / schema shape, real budget / paid-service spend, expected scale or capacity target, target-audience / compliance limits). Extrinsic constraints (budget, mandated stack, scale, audience) leave no repo evidence, so exploration can never surface them - sweep those axes explicitly once per plan and classify each as explored, defaulted (ledger), or asked. Default the reversible internals; surface the owner-decisions.
 - **Explore to sufficiency, then STOP.** One research wave per open question; stop when the clearance check is answerable; never re-explore to double-check.
 - **Parallel-dispatch** independent research in ONE turn and keep working while it runs. Subagent outputs are CLAIMS until you independently verify them.

package/packages/omo-codex/plugin/test/AGENTS.md

@@ -23,10 +23,10 @@
 | Aggregate wiring | `aggregate-{manifest,hooks,build,mcp,agents,model-catalog}.test.mjs` |
 | Bootstrap | `bootstrap-{hooks,setup,binlinks,orchestration,ps-guard}.test.mjs` |
 | Update flow | `auto-update{,-state-persistence,-restart-notice,-release-notes}.test.mjs` |
-| Migration | `migrate-codex-config.test.mjs` (1,242 LOC — densest), `migrate-omo-sot`, `multi-agent-v2-regression`, `subagent-limit-migration` |
+| Migration | `migrate-codex-config.test.mjs` (1,242 LOC — densest), `multi-agent-v2-regression`, `subagent-limit-migration` |
 | Skills sync | `sync-skills{,-codex-compatibility}.test.mjs`, `ulw-plan`/`ulw-research`/`ulw-loop` skill contracts |
 | Teammode | `teammode-{transport,communication,worktree,safety,thread-links,thread-title,archive-ambiguity}.test.mjs` |
-| Component CLIs | `component-{bundled-cli,bin-names,codegraph-mcp-smoke}.test.mjs`, `lsp-prebuild-layouts` |
+| Component CLIs | `component-{bundled-cli,bin-names}.test.mjs`, `lsp-prebuild-layouts` |
 
 ## CONVENTIONS
 

package/packages/omo-codex/plugin/test/aggregate-hooks.test.mjs

@@ -30,7 +30,6 @@ test("#given isolated components #when hooks are inspected #then commands stay i
 	const componentMarkers = [
 		"components/comment-checker/dist/cli.js",
 		"components/lsp/dist/cli.js",
-		"components/codegraph/dist/cli.js",
 		"components/rules/dist/cli.js",
 		"components/ulw-execute-continuation/dist/cli.js",
 		"components/telemetry/dist/cli.js",
@@ -220,34 +219,16 @@ test("#given aggregate SessionStart hooks #when inspected #then cold-start-prone
 	const coldStartHooks = sessionStartHooks.filter(
 		({ command }) =>
 			command.includes("components/telemetry/dist/cli.js") ||
-			command.includes("scripts/auto-update.mjs") ||
-			command.includes("components/codegraph/dist/cli.js"),
+			command.includes("scripts/auto-update.mjs"),
 	);
 
 	// then
-	assert.equal(coldStartHooks.length, 3);
+	assert.equal(coldStartHooks.length, 2);
 	for (const hook of coldStartHooks) {
 		assert.equal(hook.timeout, 15, `${hook.source} must carry timeout 15 for cold-start headroom`);
 	}
 });
 
-test("#given aggregate PostToolUse hooks #when inspected #then CodeGraph init guidance is registered for CodeGraph tools", async () => {
-	// given
-	const commandHooks = await readAggregateCommandHooks();
-
-	// when
-	const codegraphPostToolUseHooks = commandHooks.filter(
-		(hook) =>
-			hook.eventName === "PostToolUse" &&
-			hook.handler.command === 'node "${PLUGIN_ROOT}/components/codegraph/dist/cli.js" hook post-tool-use',
-	);
-
-	// then
-	assert.equal(codegraphPostToolUseHooks.length, 1);
-	assert.equal(codegraphPostToolUseHooks[0]?.matcher, "^(codegraph[._].*|mcp__codegraph__.*)$");
-	assert.match(codegraphPostToolUseHooks[0]?.handler.statusMessage ?? "", /\S/);
-});
-
 test("#given aggregate PostToolUse hooks #when inspected #then thread title hygiene is registered for created Codex threads", async () => {
 	// given
 	const commandHooks = await readAggregateCommandHooks();

package/packages/omo-codex/plugin/test/aggregate-manifest.test.mjs

@@ -17,7 +17,7 @@ test("#given aggregate plugin manifest #when inspected #then it owns the omo nam
 	// then
 	assert.equal(manifest.name, "omo");
 	assert(Array.isArray(hookPaths));
-	assert.equal(hookPaths.length, 23);
+	assert.equal(hookPaths.length, 21);
 	assert(hookPaths.every((hookPath) => typeof hookPath === "string" && hookPath.startsWith("./hooks/")));
 	assert(!hookPaths.includes("./hooks/hooks.json"));
 	assert(!hookPaths.includes("./hooks/user-prompt-submit-selecting-lazycodex-workflow.json"));
@@ -54,7 +54,6 @@ test("#given component directories #when scanned #then only intentional resource
 	// then
 	assert.deepEqual(componentNames, [
 		"bootstrap",
-		"codegraph",
 		"comment-checker",
 		"git-bash",
 		"lazycodex-executor-verify",

package/packages/omo-codex/plugin/test/aggregate-mcp.test.mjs

@@ -18,14 +18,13 @@ test("#given aggregate MCP config #when inspected #then code MCPs reference pack
 	// when
 	const lspServer = mcp.mcpServers.lsp;
 	const gitBashServer = mcp.mcpServers.git_bash;
-	const codegraphServer = mcp.mcpServers.codegraph;
 	const codeMcpNames = Object.keys(mcp.mcpServers)
-		.filter((name) => name === "lsp" || name === "git_bash" || name === "codegraph")
+		.filter((name) => name === "lsp" || name === "git_bash")
 		.sort();
 	const componentLocalMcpSources = lspSources.filter((name) => name.startsWith("lazy-mcp") || name === "lazy-lsp-mcp.ts");
 
 	// then
-	assert.deepEqual(codeMcpNames, ["codegraph", "git_bash", "lsp"]);
+	assert.deepEqual(codeMcpNames, ["git_bash", "lsp"]);
 	assert.equal(packageJson.workspaces.includes("components/lsp/packages/lsp-tools-mcp"), false);
 	assert.deepEqual(packageJson.dependencies, { "@oh-my-opencode/shared-skills": "file:../../shared-skills" });
 	assert.doesNotMatch(bundledMcpBuildScript, new RegExp(["ast", "grep", "mcp"].join("-")));
@@ -38,10 +37,6 @@ test("#given aggregate MCP config #when inspected #then code MCPs reference pack
 	assert.equal(gitBashServer.command, "node");
 	assert.deepEqual(gitBashServer.args, ["../../git-bash-mcp/dist/cli.js", "mcp"]);
 	assert.equal(gitBashServer.cwd, ".");
-	assert.equal(codegraphServer.command, "node");
-	assert.deepEqual(codegraphServer.args, ["components/codegraph/dist/serve.js"]);
-	assert.equal(codegraphServer.cwd, ".");
-	assert.equal(codegraphServer.required, false);
 	assert.deepEqual(componentLocalMcpSources, []);
 });