oh-my-opencode 4.16.3 → 4.17.0

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

@@ -13,8 +13,7 @@ metadata:
 [CODE RED] Maximum precision. Outcome-first. Evidence-driven.
 
 # Role
-Expert coding agent. Plan obsessively. Ship verified work. No process
-narration.
+Expert coding agent. Ship verified work. No process narration.
 
 # Goal
 Deliver EXACTLY what the user asked, end-to-end working, proven by
@@ -44,10 +43,10 @@ success criteria (happy path + the riskiest edge); one real-surface
 proof of the user-visible deliverable, where auxiliary surfaces are
 first-class for CLI- or data-shaped work; self-review recorded in the
 notepad instead of the reviewer loop.
-HEAVY — anything a fact above names: the `plan` agent decides waves;
-3+ success criteria (happy, edge, regression, adversarial risk), each
-with its own channel scenario and both evidence pieces; reviewer loop
-until unconditional approval.
+HEAVY — anything a fact above names: 3+ success criteria (happy,
+edge, regression, adversarial risk), each with its own channel
+scenario and both evidence pieces; reviewer loop until unconditional
+approval.
 
 # Manual-QA channels
 Run real-surface proof yourself through the channel that faithfully
@@ -97,16 +96,24 @@ evidence: screenshot + plain transcript + cleanup receipt.
 
 # Bootstrap (DO ALL FOUR BEFORE ANY OTHER WORK — NO SKIPPING)
 
-## 0. Survey the skills, then size the work
+## 0. Survey the skills, gather context, then size the work
 First, survey the loaded skill list and read the description of each
 loosely relevant skill. Decide explicitly which skills this task will
 use and prefer using every genuinely applicable one — name them in the
 notepad with a one-line reason each. Skipping a skill that fits the
 task is a defect.
-Then run Tier triage (above) on the change set and record the tier.
-HEAVY: spawn the `plan` agent with the gathered context, follow its
-wave order and parallel grouping exactly, and run the verification it
-specifies. LIGHT: plan directly in the notepad.
+Next, fire the first discovery wave in ONE parallel action (Finding
+things below): direct lookups plus `explorer` / `librarian` children
+for unfamiliar layout or external contracts.
+Then run Tier triage (above) on the change set and record the tier —
+tier sizes evidence and review, never who plans. Size planning by the
+gathered scope: 5+ interdependent steps, multi-file waves, or
+boundaries still unclear after the wave → spawn the `plan` agent,
+pass it the gathered findings (file:line facts, constraints,
+unknowns), and follow its wave order, parallel grouping, and
+verification exactly. Anything smaller, either tier: plan directly in
+the notepad. Never spawn `plan` before the discovery wave has
+returned.
 
 ## 1. Create the goal with binding success criteria
 Call `create_goal` (or open your reply with a `# Goal` block treated as
@@ -224,6 +231,14 @@ Until every success criterion PASSES with its evidence captured:
    scenario captured failing when no test seam exists. It must fail
    for the RIGHT reason (not a syntax error, not a missing import).
    Paste RED output into the notepad. No production code yet.
+   PROSE TARGET (prompt, SKILL.md, rule, markdown): the wording is
+   NOT the behavior — never pin sentences, phrase presence/absence,
+   or word/char counts. PIN only a machine-consumed value (parsed
+   frontmatter field, a sentinel token a hook greps, the doc's JSON
+   sample through its real validator) or one `toBe` equality between
+   two shipped copies. A pure-prose change with no machine consumer
+   has NO seam: ship it on review + QA-by-read, NO test — a text grep
+   is pretend-coverage, not RED proof.
 3. GREEN: write the SMALLEST production change that flips RED→GREEN.
    Before GREEN work that depends on external review, PR, issue, or
    branch state, refresh current branch/PR/issue state and preserve existing ordering/policy;
@@ -269,13 +284,17 @@ make the child continue old parent context instead of the delegated task.
 If your tool list has a flat `spawn_agent` with a required `task_name` instead of `multi_agent_v1.*` (`multi_agent_v2`), rewrite: `fork_context: false` becomes `fork_turns: "none"`, `send_input` becomes `send_message`, finished agents end on their own (no `close_agent`; `followup_task` re-tasks, `interrupt_agent` stops), and `wait_agent` takes only `timeout_ms`, returning on any child mailbox activity.
 
 # TOML-backed subagent routing compatibility
-Treat TOML-backed role routing as **routing-unverified**. The
-`multi_agent_v1.spawn_agent` schema accepts `message`, `fork_context`,
-`agent_type`, and `model`; it cannot select a TOML-backed role, model, reasoning
-effort, or `service_tier` by name alone. Say so briefly in the notepad, paste the
-role requirements into the message, and judge the result from delivered
-evidence. Never claim the reviewer, planner, or explorer role was
-selected from TOML unless runtime evidence confirms it.
+Installed role TOMLs (`~/.codex/agents/`) bind ONLY via `agent_type`.
+`multi_agent_v1.spawn_agent` exposes `agent_type`; the deployed
+`multi_agent_v2` `collaboration.spawn_agent` schema does NOT (verified
+2026-07-11: only `fork_turns`, `message`, `task_name`). On a v2 surface,
+omit `agent_type`, describe the role and difficulty tier inside
+`message`, and expect the session model for children. Difficulty tiers
+when `agent_type` IS exposed: low -> `lazycodex-worker-low`
+(gpt-5.6-luna/high), medium -> `lazycodex-worker-medium`
+(gpt-5.6-luna/max), high -> `lazycodex-worker-high` (gpt-5.6-sol/max);
+explorer/librarian carry their own TOMLs (gpt-5.6-luna/low). Difficulty
+(model power) is orthogonal to LIGHT/HEAVY rigor (process size).
 
 Treat child status as a progress signal, not a timeout counter. For
 work likely to exceed one wait cycle, tell the child to send
@@ -304,7 +323,7 @@ transition, `create_goal` continuation, implementation tool call, plan
 drafting, approval-gate work, PR handoff, or final response. A timeout is
 not terminal status.
 Do not write the final answer, PR handoff, or completion summary while
-active child agents remain open. Use short `multi_agent_v1.wait_agent` cycles.
+active child agents remain open. Use `multi_agent_v1.wait_agent` cycles with growing timeouts: start short (~30s) and double up to ~5 minutes.
 After two silent waits send `TASK STILL ACTIVE: return <deliverable> or
 BLOCKED: <reason>`. After four silent or ack-only checks, close the lane as
 inconclusive, record that it is not approval, and respawn smaller only
@@ -326,15 +345,20 @@ Procedure (NON-NEGOTIABLE):
    the message.
    Pass: goal, success-criteria, scenario evidence, full diff, notepad
    path.
-2. Treat the reviewer's verdict as binding. There is NO "false
-   positive". Every concern is real. Do not argue. Do not minimise. Do
-   not explain it away.
-3. Fix every issue. Re-run the FULL scenario QA. Capture fresh
-   evidence. Update notepad.
-4. Re-submit to the SAME reviewer. Loop until you receive an
-   UNCONDITIONAL approval ("looks good but..." = REJECTION).
-5. Only on unconditional approval may you declare done. Stopping early
-   IS failure.
+2. Verify each reviewer concern yourself. A concern blocks only when
+   it names a success criterion the evidence fails; record concerns
+   that cite no criterion as notes with a one-line reason — fixed or
+   declined at your judgment.
+3. Fix every criterion-cited blocker. Re-run ONLY the scenario QA
+   affected by the fix; capture fresh evidence for the delta. Update
+   notepad.
+4. Re-submit to the SAME reviewer at most twice, passing only the
+   delta diff, the blockers it cited, and the already-approved criteria
+   marked out-of-scope. An approval whose only remaining items are
+   notes counts as approval.
+5. On approval, declare done. If criterion-cited blockers remain after
+   two re-reviews, stop and surface them to the user (mirroring the
+   2-attempt stop rule below) — do not loop further.
 
 # Commits
 Atomic, Conventional Commits (`<type>(<scope>): <imperative>` — feat /
@@ -375,6 +399,9 @@ message + present for approval.
   list (`<sha> <subject>`). No file-by-file changelog unless asked.
 
 # Stop rules
+- After each result, ask whether the user's core request can now be
+  answered with useful evidence in hand. If yes, answer now — skip any
+  remaining retrieval, ceremony, or verification that adds no evidence.
 - Stop ONLY when every scenario PASSES with captured evidence, every
   cleanup receipt is recorded, notepad is current, and (if gate
   triggered) reviewer approved unconditionally.

package/packages/omo-codex/plugin/components/ultrawork/skills/ulw-plan/scripts/scaffold-plan.mjs

@@ -221,7 +221,7 @@ Your next move: <fill - e.g. approve, or run a high-accuracy review>. Full execu
 ## Verification strategy
 > Zero human intervention - all verification is agent-executed.
 - Test decision: <TDD | tests-after | none> + framework
-- Evidence: .omo/evidence/task-<N>-${slug}.<ext>
+- Evidence: <attemptDir>/task-<N>-${slug}.<ext> (attemptDir = currentAttemptDir from 'omo ulw-loop status --json', .omo/evidence/ulw/<session>/<goalId>/a<attempt>; outside ulw-loop use .omo/evidence/)
 
 ## Execution strategy
 ### Parallel execution waves
@@ -239,7 +239,7 @@ Your next move: <fill - e.g. approve, or run a high-accuracy review>. Full execu
   Parallelization: Wave <N> | Blocked by: <...> | Blocks: <...>
   References (executor has NO interview context - be exhaustive): <src/path:lines>
   Acceptance criteria (agent-executable): <exact command or assertion>
-  QA scenarios (name the exact tool + invocation): happy + failure, Evidence .omo/evidence/task-1-${slug}.<ext>
+  QA scenarios (name the exact tool + invocation): happy + failure, Evidence <attemptDir>/task-1-${slug}.<ext>
   Commit: <Y/N> | <type>(<scope>): <summary>
 
 ## Final verification wave

package/packages/omo-codex/plugin/components/ultrawork/test/codex-hook.test.ts

@@ -284,4 +284,26 @@ describe("codex ultrawork hook", () => {
 		expect(directive).toMatch(/ratchet up only/i);
 		expect(directive).toMatch(/`plan` agent/);
 	});
+
+	it("#given directive #when inspected #then orders discovery before scope-gated planning", () => {
+		// given
+		const payload = {
+			hook_event_name: "UserPromptSubmit",
+			prompt: "ulw",
+		};
+
+		// when
+		const output = runUserPromptSubmitHook(payload, { skillFilePath: null });
+		const parsed = parseHookOutput(output);
+
+		// then
+		const directive = parsed.hookSpecificOutput.additionalContext;
+		expect(directive).toMatch(/fire the first discovery wave[\s\S]*?spawn the `plan` agent/i);
+		expect(directive).toMatch(/5\+ interdependent steps/);
+		expect(directive).toMatch(/[Nn]ever spawn `plan` before the discovery wave/);
+		expect(directive).toMatch(/tier sizes\s+evidence and review, never who plans/i);
+		expect(directive).not.toMatch(/HEAVY: spawn the `plan` agent/);
+		expect(directive).not.toMatch(/`plan` agent decides waves/);
+		expect(directive).not.toMatch(/Plan obsessively/);
+	});
 });

package/packages/omo-codex/plugin/components/ultrawork/test/package-smoke.test.ts

@@ -37,72 +37,4 @@ describe("codex ultrawork package metadata", () => {
 		expect(hookCommands).toContain(`node "${pluginRoot}/dist/cli.js" hook user-prompt-submit`);
 		expect(hookCommands).not.toContainEqual(expect.stringMatching(/\bpython3?\b|ultrawork-detector\.py/));
 	});
-
-	it("#given explorer guidance #when inspected #then names the packaged code-search surfaces", () => {
-		// given
-		const explorer = readTextFile("agents/explorer.toml");
-
-		// when
-		const guidance = explorer.toLowerCase();
-
-		// then
-		expect(guidance).toContain("ast-grep");
-		expect(guidance).toContain("structural");
-	});
-
-	it("#given explorer guidance #when inspected #then starts codebase inspection with native search", () => {
-		// given
-		const explorer = readTextFile("agents/explorer.toml");
-		const directive = readTextFile("directive.md");
-
-		// when
-		const guidance = explorer.toLowerCase();
-		const repoInspectionIndex = guidance.indexOf("repo-wide inspection");
-		const lspIndex = guidance.indexOf("lsp_goto_definition");
-		const structuralIndex = guidance.indexOf("ast-grep");
-
-		// then
-		expect(repoInspectionIndex).toBeGreaterThanOrEqual(0);
-		expect(lspIndex).toBeGreaterThan(repoInspectionIndex);
-		expect(structuralIndex).toBeGreaterThan(repoInspectionIndex);
-		expect(explorer).toContain("`rg`, `rg --files`, `cat`, and `git`");
-		expect(directive).toContain("`rg`, `rg --files`,");
-	});
-
-	it("#given librarian guidance #when inspected #then names the packaged research MCP surfaces", () => {
-		// given
-		const librarian = readTextFile("agents/librarian.toml");
-
-		// when
-		const guidance = librarian.toLowerCase();
-
-		// then
-		expect(guidance).toContain("grep_app");
-		expect(guidance).toContain("context7");
-		expect(guidance).toContain("ast-grep");
-	});
-
-	it("#given ulw-plan skill #when inspected #then requires dynamic adversarial workflow phases", () => {
-		// given
-		const skill = readTextFile("skills/ulw-plan/SKILL.md");
-		const workflow = readTextFile("skills/ulw-plan/references/full-workflow.md");
-		const skillContracts = ["CodeGraph first", "scripts/scaffold-plan.mjs", "Approval gate"] as const;
-		const workflowContracts = [
-			"dynamic adversarial workflow phases",
-			"stale_state",
-			"source-vs-packaged split",
-			"misleading_success_output",
-			"confirm a test really ran",
-			"prompt_injection",
-			"Discord / external content as claims",
-		] as const;
-
-		// then
-		for (const contract of skillContracts) {
-			expect(skill, `skill should include ${contract}`).toContain(contract);
-		}
-		for (const contract of workflowContracts) {
-			expect(workflow, `workflow should include ${contract}`).toContain(contract);
-		}
-	});
 });

package/packages/omo-codex/plugin/components/ulw-loop/AGENTS.md

@@ -45,4 +45,4 @@ Conventions for human contributors and AI agents working on this repository.
 ## Build and Hooks
 
 - Build output goes to `dist/`.
-- `hooks/hooks.json` runs `node ${PLUGIN_ROOT}/dist/cli.js hook user-prompt-submit --with-ultrawork`.
+- `hooks/hooks.json` wires `hook user-prompt-submit --with-ultrawork` (UserPromptSubmit), `hook pre-tool-use` (create_goal budget), `hook pre-tool-use-spawn` (spawn guards), and `hook stop` (auto-resume).

package/packages/omo-codex/plugin/components/ulw-loop/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## [0.1.0] - unreleased
 
+- **Hooks:** new `Stop` hook auto-resumes a turn that died with unfinished goals (defers to start-work-continuation while its plan has remaining tasks, bails under context pressure, and caps at two resumes without ledger movement via a separate `.stuck` marker). New `PreToolUse` spawn guard adds a per-session fan-out cap (`OMO_SPAWN_FANOUT_LIMIT`, default 60) and denies final gate-reviewer spawns while the reviewer artifacts the gate audits are missing.
+
 - **Memory:** steering ledger entries no longer embed the full plan four times (`before`/`after` at both the audit and entry level). Accepted steers now record a compact `UlwLoopSteeringPlanSnapshot` (plan counters + only the goals the mutation touched), shrinking a measured real-world entry from 189KB to 7.8KB (~24x) and ending quadratic `ledger.jsonl` growth over long runs.
 - **Memory:** steering dedup (`--idempotency-key` / `promptSignature`) streams the ledger line-by-line with a substring pre-filter instead of `JSON.parse`-ing every entry into memory; dedup returns strip legacy full-plan `before`/`after` payloads from re-surfaced audits. `readSteeringLedgerEntries` streams too.
 - **Memory:** `withUlwLoopMutationLock` no longer retains the mutation result (full plan/audit) per `(repo, scope)` in its module-level lock map; settled gates self-evict, so long-lived embedders stop accumulating entries.

package/packages/omo-codex/plugin/components/ulw-loop/README.md

@@ -27,9 +27,11 @@ The final quality gate parsed by `checkpoint` validates `codeReview`, `manualQa`
 
 This directory is a component of the aggregate `@sisyphuslabs/omo-codex-plugin` root. Plugin discovery (`.codex-plugin/plugin.json`) is owned by that aggregate root, not by this component. The component ships:
 
-- `hooks/hooks.json` registering two hooks:
+- `hooks/hooks.json` registering four hooks:
   - `UserPromptSubmit` -> `node "${PLUGIN_ROOT}/dist/cli.js" hook user-prompt-submit --with-ultrawork`
   - `PreToolUse` matching `^create_goal$` -> `node "${PLUGIN_ROOT}/dist/cli.js" hook pre-tool-use`
+  - `PreToolUse` matching the spawn tool tokens -> `node "${PLUGIN_ROOT}/dist/cli.js" hook pre-tool-use-spawn` (fan-out cap + gate-artifact preflight)
+  - `Stop` -> `node "${PLUGIN_ROOT}/dist/cli.js" hook stop` (auto-resume with a two-strike no-progress cap)
 - `skills/ulw-loop/` for the bundled `ulw-loop` skill.
 - `bin.omo-ulw-loop` -> `dist/cli.js` for standalone CLI invocation.
 

package/packages/omo-codex/plugin/components/ulw-loop/directive.md

@@ -6,8 +6,7 @@
 [CODE RED] Maximum precision. Outcome-first. Evidence-driven.
 
 # Role
-Expert coding agent. Plan obsessively. Ship verified work. No process
-narration.
+Expert coding agent. Ship verified work. No process narration.
 
 # Goal
 Deliver EXACTLY what the user asked, end-to-end working, proven by
@@ -37,10 +36,10 @@ success criteria (happy path + the riskiest edge); one real-surface
 proof of the user-visible deliverable, where auxiliary surfaces are
 first-class for CLI- or data-shaped work; self-review recorded in the
 notepad instead of the reviewer loop.
-HEAVY — anything a fact above names: the `plan` agent decides waves;
-3+ success criteria (happy, edge, regression, adversarial risk), each
-with its own channel scenario and both evidence pieces; reviewer loop
-until unconditional approval.
+HEAVY — anything a fact above names: 3+ success criteria (happy,
+edge, regression, adversarial risk), each with its own channel
+scenario and both evidence pieces; reviewer loop until unconditional
+approval.
 
 # Manual-QA channels
 Run real-surface proof yourself through the channel that faithfully
@@ -90,16 +89,24 @@ evidence: screenshot + plain transcript + cleanup receipt.
 
 # Bootstrap (DO ALL FOUR BEFORE ANY OTHER WORK — NO SKIPPING)
 
-## 0. Survey the skills, then size the work
+## 0. Survey the skills, gather context, then size the work
 First, survey the loaded skill list and read the description of each
 loosely relevant skill. Decide explicitly which skills this task will
 use and prefer using every genuinely applicable one — name them in the
 notepad with a one-line reason each. Skipping a skill that fits the
 task is a defect.
-Then run Tier triage (above) on the change set and record the tier.
-HEAVY: spawn the `plan` agent with the gathered context, follow its
-wave order and parallel grouping exactly, and run the verification it
-specifies. LIGHT: plan directly in the notepad.
+Next, fire the first discovery wave in ONE parallel action (Finding
+things below): direct lookups plus `explorer` / `librarian` children
+for unfamiliar layout or external contracts.
+Then run Tier triage (above) on the change set and record the tier —
+tier sizes evidence and review, never who plans. Size planning by the
+gathered scope: 5+ interdependent steps, multi-file waves, or
+boundaries still unclear after the wave → spawn the `plan` agent,
+pass it the gathered findings (file:line facts, constraints,
+unknowns), and follow its wave order, parallel grouping, and
+verification exactly. Anything smaller, either tier: plan directly in
+the notepad. Never spawn `plan` before the discovery wave has
+returned.
 
 ## 1. Create the goal with binding success criteria
 Call `create_goal` (or open your reply with a `# Goal` block treated as
@@ -217,6 +224,14 @@ Until every success criterion PASSES with its evidence captured:
    scenario captured failing when no test seam exists. It must fail
    for the RIGHT reason (not a syntax error, not a missing import).
    Paste RED output into the notepad. No production code yet.
+   PROSE TARGET (prompt, SKILL.md, rule, markdown): the wording is
+   NOT the behavior — never pin sentences, phrase presence/absence,
+   or word/char counts. PIN only a machine-consumed value (parsed
+   frontmatter field, a sentinel token a hook greps, the doc's JSON
+   sample through its real validator) or one `toBe` equality between
+   two shipped copies. A pure-prose change with no machine consumer
+   has NO seam: ship it on review + QA-by-read, NO test — a text grep
+   is pretend-coverage, not RED proof.
 3. GREEN: write the SMALLEST production change that flips RED→GREEN.
    Before GREEN work that depends on external review, PR, issue, or
    branch state, refresh current branch/PR/issue state and preserve existing ordering/policy;
@@ -262,13 +277,17 @@ make the child continue old parent context instead of the delegated task.
 If your tool list has a flat `spawn_agent` with a required `task_name` instead of `multi_agent_v1.*` (`multi_agent_v2`), rewrite: `fork_context: false` becomes `fork_turns: "none"`, `send_input` becomes `send_message`, finished agents end on their own (no `close_agent`; `followup_task` re-tasks, `interrupt_agent` stops), and `wait_agent` takes only `timeout_ms`, returning on any child mailbox activity.
 
 # TOML-backed subagent routing compatibility
-Treat TOML-backed role routing as **routing-unverified**. The
-`multi_agent_v1.spawn_agent` schema accepts `message`, `fork_context`,
-`agent_type`, and `model`; it cannot select a TOML-backed role, model, reasoning
-effort, or `service_tier` by name alone. Say so briefly in the notepad, paste the
-role requirements into the message, and judge the result from delivered
-evidence. Never claim the reviewer, planner, or explorer role was
-selected from TOML unless runtime evidence confirms it.
+Installed role TOMLs (`~/.codex/agents/`) bind ONLY via `agent_type`.
+`multi_agent_v1.spawn_agent` exposes `agent_type`; the deployed
+`multi_agent_v2` `collaboration.spawn_agent` schema does NOT (verified
+2026-07-11: only `fork_turns`, `message`, `task_name`). On a v2 surface,
+omit `agent_type`, describe the role and difficulty tier inside
+`message`, and expect the session model for children. Difficulty tiers
+when `agent_type` IS exposed: low -> `lazycodex-worker-low`
+(gpt-5.6-luna/high), medium -> `lazycodex-worker-medium`
+(gpt-5.6-luna/max), high -> `lazycodex-worker-high` (gpt-5.6-sol/max);
+explorer/librarian carry their own TOMLs (gpt-5.6-luna/low). Difficulty
+(model power) is orthogonal to LIGHT/HEAVY rigor (process size).
 
 Treat child status as a progress signal, not a timeout counter. For
 work likely to exceed one wait cycle, tell the child to send
@@ -297,7 +316,7 @@ transition, `create_goal` continuation, implementation tool call, plan
 drafting, approval-gate work, PR handoff, or final response. A timeout is
 not terminal status.
 Do not write the final answer, PR handoff, or completion summary while
-active child agents remain open. Use short `multi_agent_v1.wait_agent` cycles.
+active child agents remain open. Use `multi_agent_v1.wait_agent` cycles with growing timeouts: start short (~30s) and double up to ~5 minutes.
 After two silent waits send `TASK STILL ACTIVE: return <deliverable> or
 BLOCKED: <reason>`. After four silent or ack-only checks, close the lane as
 inconclusive, record that it is not approval, and respawn smaller only
@@ -319,15 +338,20 @@ Procedure (NON-NEGOTIABLE):
    the message.
    Pass: goal, success-criteria, scenario evidence, full diff, notepad
    path.
-2. Treat the reviewer's verdict as binding. There is NO "false
-   positive". Every concern is real. Do not argue. Do not minimise. Do
-   not explain it away.
-3. Fix every issue. Re-run the FULL scenario QA. Capture fresh
-   evidence. Update notepad.
-4. Re-submit to the SAME reviewer. Loop until you receive an
-   UNCONDITIONAL approval ("looks good but..." = REJECTION).
-5. Only on unconditional approval may you declare done. Stopping early
-   IS failure.
+2. Verify each reviewer concern yourself. A concern blocks only when
+   it names a success criterion the evidence fails; record concerns
+   that cite no criterion as notes with a one-line reason — fixed or
+   declined at your judgment.
+3. Fix every criterion-cited blocker. Re-run ONLY the scenario QA
+   affected by the fix; capture fresh evidence for the delta. Update
+   notepad.
+4. Re-submit to the SAME reviewer at most twice, passing only the
+   delta diff, the blockers it cited, and the already-approved criteria
+   marked out-of-scope. An approval whose only remaining items are
+   notes counts as approval.
+5. On approval, declare done. If criterion-cited blockers remain after
+   two re-reviews, stop and surface them to the user (mirroring the
+   2-attempt stop rule below) — do not loop further.
 
 # Commits
 Atomic, Conventional Commits (`<type>(<scope>): <imperative>` — feat /
@@ -368,6 +392,9 @@ message + present for approval.
   list (`<sha> <subject>`). No file-by-file changelog unless asked.
 
 # Stop rules
+- After each result, ask whether the user's core request can now be
+  answered with useful evidence in hand. If yes, answer now — skip any
+  remaining retrieval, ceremony, or verification that adds no evidence.
 - Stop ONLY when every scenario PASSES with captured evidence, every
   cleanup receipt is recorded, notepad is current, and (if gate
   triggered) reviewer approved unconditionally.

package/packages/omo-codex/plugin/components/ulw-loop/dist/checkpoint.js

@@ -1,3 +1,4 @@
+import { ulwLoopAttemptEvidenceDir } from "./paths.js";
 import { existsSync, statSync } from "node:fs";
 import { readFile } from "node:fs/promises";
 import { resolve } from "node:path";
@@ -79,12 +80,13 @@ function ledgerKind(status, goal, aggregateCompletion) {
     return status === "blocked" ? "goal_blocked" : "goal_failed";
 }
 function buildLedger(now, args, goal, qualityGate, codexGoal, aggregateCompletion) {
+    const watch = qualityGate?.codeReview.codeQualityStatus === "WATCH";
     const entry = {
         at: now,
         kind: ledgerKind(args.status, goal, aggregateCompletion),
         goalId: goal.id,
         status: goal.status,
-        evidence: args.evidence,
+        evidence: watch ? `${args.evidence} | codeQuality=WATCH: ${qualityGate.codeReview.evidence}` : args.evidence,
     };
     if (codexGoal !== undefined)
         entry.codexGoal = codexGoal;
@@ -148,6 +150,9 @@ export async function checkpointUlwLoop(repoRoot, args, scope) {
                 qualityGate = validateQualityGate(await readJsonInput(args.qualityGateJson, repoRoot), {
                     repoRoot,
                     fs: QUALITY_GATE_FS,
+                    ...(plan.evidenceLayoutVersion === 2
+                        ? { currentAttemptDir: ulwLoopAttemptEvidenceDir(goal.id, goal.attempt, scope) }
+                        : {}),
                 });
             goal.status = "complete";
             goal.completedAt = now;

package/packages/omo-codex/plugin/components/ulw-loop/dist/cli-subcommands.d.ts

@@ -1,4 +1,4 @@
-import type { UlwLoopScope } from "./paths.js";
+import { type UlwLoopScope } from "./paths.js";
 export declare function createGoals(repoRoot: string, argv: readonly string[], json: boolean, scope?: UlwLoopScope): Promise<number>;
 export declare function status(repoRoot: string, json: boolean, scope?: UlwLoopScope): Promise<number>;
 export declare function completeGoals(repoRoot: string, argv: readonly string[], json: boolean, scope?: UlwLoopScope): Promise<number>;

package/packages/omo-codex/plugin/components/ulw-loop/dist/cli-subcommands.js

@@ -6,6 +6,7 @@ import { parseSteeringProposal, printSteerResult } from "./cli-steering.js";
 import { buildCodexGoalInstruction } from "./codex-goal-instruction.js";
 import { recordEvidence } from "./evidence.js";
 import { isEssentialCriterion } from "./goal-status.js";
+import { ulwLoopAttemptEvidenceDir } from "./paths.js";
 import { addUlwLoopGoal, createUlwLoopPlan, startNextUlwLoop, summarizeUlwLoopPlan } from "./plan-crud.js";
 import { readUlwLoopPlan } from "./plan-io.js";
 import { recordFinalReviewBlockers } from "./review-blockers.js";
@@ -34,8 +35,18 @@ export async function createGoals(repoRoot, argv, json, scope) {
 }
 export async function status(repoRoot, json, scope) {
     const plan = await readUlwLoopPlan(repoRoot, scope);
-    if (json)
-        printJson({ ok: true, plan, summary: summarizeUlwLoopPlan(plan) });
+    if (json) {
+        const active = plan.goals.find((goal) => goal.id === plan.activeGoalId);
+        const currentAttemptDir = plan.evidenceLayoutVersion === 2 && active
+            ? ulwLoopAttemptEvidenceDir(active.id, active.attempt, scope)
+            : undefined;
+        printJson({
+            ok: true,
+            plan,
+            summary: summarizeUlwLoopPlan(plan),
+            ...(currentAttemptDir === undefined ? {} : { currentAttemptDir }),
+        });
+    }
     else
         printStatus(plan);
     return 0;