lazycodex-ai 5.0.0-beta.48 → 5.0.0-beta.49

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

@@ -21,7 +21,7 @@ function gateTemplate(surface, base) {
         },
     ];
     const manualQa = {
-        by: surface === "omo-senpi" ? "main-session" : "lazycodex-qa-executor",
+        by: "main-session",
         status: "passed",
         evidence: "<replace:manual QA evidence>",
         surfaceEvidence: [
@@ -58,7 +58,7 @@ function gateTemplate(surface, base) {
     const common = {
         manualQa,
         gateReview: {
-            by: surface === "omo-senpi" ? "category:deep" : "lazycodex-gate-reviewer",
+            by: surface === "omo-senpi" ? "category:deep" : "main-session",
             recommendation: "APPROVE",
             reportPath: artifactPath(base, "gate-review.md"),
             evidence: "<replace:gate review evidence>",
@@ -80,19 +80,7 @@ function gateTemplate(surface, base) {
             adversarialClassesCovered: ["<replace:adversarial class>"],
         },
     };
-    if (surface === "omo-senpi")
-        return common;
-    return {
-        codeReview: {
-            by: "lazycodex-code-reviewer",
-            recommendation: "APPROVE",
-            codeQualityStatus: "CLEAR",
-            reportPath: artifactPath(base, "code-review.md"),
-            evidence: "<replace:code review evidence>",
-            blockers: [],
-        },
-        ...common,
-    };
+    return common;
 }
 export async function checkpointTemplate(repoRoot, scope, goalId) {
     const plan = await readUlwLoopPlan(repoRoot, scope);
@@ -107,6 +95,11 @@ export async function checkpointTemplate(repoRoot, scope, goalId) {
         "Fill every <replace:...> value with plausible non-empty evidence and use real, non-empty artifact files.",
         'Passing codex-goal-json example: {"goal":{"objective":"<plan codexObjective verbatim>","status":"complete"}}.',
         'Passing quality-gate-json example requires gateReview {"by":"category:deep","recommendation":"APPROVE","evidence":"review passed","reportPath":"<attemptDir>/gate-review.md","blockers":[],"notes":[]}, manualQa.artifactRefs objects, iteration, and criteriaCoverage.',
+        ...(resolveToolkitSurface() === "lazycodex"
+            ? [
+                "Self-review defaults: manualQa.by and gateReview.by are main-session. Alternatives: manualQa.by accepts lazycodex-qa-executor; gateReview.by accepts lazycodex-gate-reviewer, category:deep, category:unspecified-high, or category:unspecified-low. Optional codeReview.by accepts lazycodex-code-reviewer or main-session.",
+            ]
+            : []),
         ...(hasAttempt ? [] : ["This plan is evidence-layout v1; artifacts go under .omo/evidence/."]),
     ].join(" ");
     return {

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

@@ -79,14 +79,14 @@ function ledgerKind(status, goal, aggregateCompletion) {
     return status === "blocked" ? "goal_blocked" : "goal_failed";
 }
 function buildLedger(now, args, goal, qualityGate, codexGoal, aggregateCompletion) {
-    const watch = qualityGate?.surface === "lazycodex" && qualityGate.codeReview.codeQualityStatus === "WATCH";
+    const watch = qualityGate?.surface === "lazycodex" && qualityGate.codeReview?.codeQualityStatus === "WATCH";
     const entry = {
         at: now,
         kind: ledgerKind(args.status, goal, aggregateCompletion),
         goalId: goal.id,
         status: goal.status,
         evidence: watch && qualityGate.surface === "lazycodex"
-            ? `${args.evidence} | codeQuality=WATCH: ${qualityGate.codeReview.evidence}`
+            ? `${args.evidence} | codeQuality=WATCH: ${qualityGate.codeReview?.evidence ?? ""}`
             : args.evidence,
     };
     if (codexGoal !== undefined)

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

@@ -1,5 +1,5 @@
 import type { UlwLoopCodexGoalMode, UlwLoopPlan } from "./types.js";
-export declare const ULW_LOOP_HELP = "Usage:\n  omo-agent-toolkit hook user-prompt-submit [--with-ultrawork]  (Codex UserPromptSubmit hook)\n  omo-agent-toolkit help | --help | -h                          (this message)\n  omo-agent-toolkit ulw-loop help\n  omo-agent-toolkit ulw-loop create-goals --brief \"...\" [--brief-file <path>] [--from-stdin] [--codex-goal-mode aggregate|per_story] [--validation-batch-json <json-or-path>] [--force] [--json]\n  omo-agent-toolkit ulw-loop status [--json]\n  omo-agent-toolkit ulw-loop complete-goals [--retry-failed] [--json]\n  omo-agent-toolkit ulw-loop criteria --goal-id <id> [--json]\n  omo-agent-toolkit ulw-loop record-evidence --goal-id <id> --criterion-id <id> --status pass|fail|blocked --evidence \"...\" [--notes \"...\"] [--json]\n  omo-agent-toolkit ulw-loop checkpoint --print-template [--goal-id <id>] [--json]\n  omo-agent-toolkit ulw-loop checkpoint --goal-id <id> --status complete|failed|blocked --evidence \"...\" --codex-goal-json <...> [--quality-gate-json <...>] [--no-advance] [--json]\n  omo-agent-toolkit ulw-loop steer --kind <kind> ... --evidence \"...\" --rationale \"...\" [--proposals-json <json-or-path>] [--json]\n  omo-agent-toolkit ulw-loop add-goal --title \"...\" --objective \"...\" [--json]\n  omo-agent-toolkit ulw-loop record-review-blockers --goal-id <id> --title \"...\" --objective \"...\" --evidence \"...\" --codex-goal-json <...> [--json]\n\nEvery state subcommand needs a session scope: [--session-id <id>] or the session env (OMO_ULW_LOOP_SESSION_ID / CODEX_SESSION_ID / CODEX_THREAD_ID / PI_SESSION_ID); state lives under .omo/ulw-loop/<id>/ and the unscoped root is never used implicitly.\nEvery subcommand accepts --help | -h to print its own usage line.";
+export declare const ULW_LOOP_HELP = "Usage:\n  omo-agent-toolkit hook user-prompt-submit [--with-ultrawork]  (Codex UserPromptSubmit hook)\n  omo-agent-toolkit help | --help | -h                          (this message)\n  omo-agent-toolkit ulw-loop help\n  omo-agent-toolkit ulw-loop create-goals --brief \"...\" [--brief-file <path>] [--from-stdin] [--codex-goal-mode aggregate|per_story] [--validation-batch-json <json-or-path>] [--force] [--json]\n  omo-agent-toolkit ulw-loop status [--json]\n  omo-agent-toolkit ulw-loop complete-goals [--retry-failed] [--json]\n  omo-agent-toolkit ulw-loop criteria --goal-id <id> [--json]\n  omo-agent-toolkit ulw-loop record-evidence --goal-id <id> --criterion-id <id> --status pass|fail|blocked --evidence \"...\" [--notes \"...\"] [--json]\n  omo-agent-toolkit ulw-loop checkpoint --print-template [--goal-id <id>] [--json]\n  omo-agent-toolkit ulw-loop checkpoint --goal-id <id> --status complete|failed|blocked --evidence \"...\" --codex-goal-json <...> [--quality-gate-json <...>] [--no-advance] [--json]\n  omo-agent-toolkit ulw-loop steer --kind <kind> ... --evidence \"...\" --rationale \"...\" [--proposals-json <json-or-path>] [--json]\n  omo-agent-toolkit ulw-loop add-goal --title \"...\" --objective \"...\" [--json]\n  omo-agent-toolkit ulw-loop record-review-blockers --goal-id <id> --title \"...\" --objective \"...\" --evidence \"...\" --codex-goal-json <...> [--json]\n\nEvery state subcommand needs a session scope: [--session-id <id>] or the session env (OMO_ULW_LOOP_SESSION_ID / CODEX_SESSION_ID / CODEX_THREAD_ID / PI_SESSION_ID); state lives under .omo/ulw-loop/<id>/ and the unscoped root is never used implicitly. status --json exposes the currentAttemptDir; put all quality-gate artifacts under it.\nEvery subcommand accepts --help | -h to print its own usage line.";
 export declare function subcommandHelp(subcommand: string): string;
 export declare function printJson(value: unknown): void;
 export declare function printJsonError(error: unknown): void;

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

@@ -14,7 +14,7 @@ export const ULW_LOOP_HELP = `Usage:
   omo-agent-toolkit ulw-loop add-goal --title "..." --objective "..." [--json]
   omo-agent-toolkit ulw-loop record-review-blockers --goal-id <id> --title "..." --objective "..." --evidence "..." --codex-goal-json <...> [--json]
 
-Every state subcommand needs a session scope: [--session-id <id>] or the session env (OMO_ULW_LOOP_SESSION_ID / CODEX_SESSION_ID / CODEX_THREAD_ID / PI_SESSION_ID); state lives under .omo/ulw-loop/<id>/ and the unscoped root is never used implicitly.
+Every state subcommand needs a session scope: [--session-id <id>] or the session env (OMO_ULW_LOOP_SESSION_ID / CODEX_SESSION_ID / CODEX_THREAD_ID / PI_SESSION_ID); state lives under .omo/ulw-loop/<id>/ and the unscoped root is never used implicitly. status --json exposes the currentAttemptDir; put all quality-gate artifacts under it.
 Every subcommand accepts --help | -h to print its own usage line.`;
 export function subcommandHelp(subcommand) {
     const lines = ULW_LOOP_HELP.split("\n").filter((line) => line.trimStart().startsWith(`omo-agent-toolkit ulw-loop ${subcommand}`));

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

@@ -946,7 +946,7 @@ function isRecord(value) {
 function section(value, field) {
   if (isRecord(value))
     return value;
-  invalid(`Final quality gate is missing ${field} evidence.`, field);
+  invalid(`Final quality gate is missing ${field} evidence (accepted input: a bare object with manualQa/gateReview/iteration/criteriaCoverage and optional codeReview, or the same object under a top-level "qualityGate" key).`, field);
   return {};
 }
 function textField(value, field) {
@@ -1129,11 +1129,25 @@ var REVIEWER_ROLES_BY_SURFACE = {
   }
 };
 var GATE_REVIEWER_AGENT_NAMES = new Set(Object.values(REVIEWER_ROLES_BY_SURFACE).map((roles) => roles.gateReview));
+var REQUIRED_GATE_SECTIONS_BY_SURFACE = {
+  lazycodex: ["manualQa", "gateReview", "iteration", "criteriaCoverage"],
+  "omo-senpi": ["manualQa", "gateReview", "iteration", "criteriaCoverage"]
+};
+var OPTIONAL_GATE_SECTIONS_BY_SURFACE = {
+  lazycodex: ["codeReview"],
+  "omo-senpi": []
+};
 var GATE_SECTION_BY_ACCEPTOR = {
   lazycodex: {
-    codeReview: [REVIEWER_ROLES_BY_SURFACE.lazycodex.codeReview],
-    manualQa: [REVIEWER_ROLES_BY_SURFACE.lazycodex.manualQa],
-    gateReview: [REVIEWER_ROLES_BY_SURFACE.lazycodex.gateReview]
+    codeReview: [REVIEWER_ROLES_BY_SURFACE.lazycodex.codeReview, "main-session"],
+    manualQa: [REVIEWER_ROLES_BY_SURFACE.lazycodex.manualQa, "main-session"],
+    gateReview: [
+      REVIEWER_ROLES_BY_SURFACE.lazycodex.gateReview,
+      "category:deep",
+      "category:unspecified-high",
+      "category:unspecified-low",
+      "main-session"
+    ]
   },
   "omo-senpi": {
     manualQa: ["main-session"],
@@ -1213,16 +1227,6 @@ function clearGoalBlockerFields(goal) {
 }
 
 // components/ulw-loop/src/quality-gate.ts
-function reviewerRoleField(value, expected, field) {
-  if (typeof value !== "string" || value.trim() === "") {
-    textField(value, field);
-    return expected;
-  }
-  const actual = textField(value, field);
-  if (actual !== expected)
-    invalid(`${field} must be ${expected}.`, field);
-  return expected;
-}
 function reviewerAcceptorField(value, surface, sectionName) {
   const field = `${sectionName}.by`;
   const accepted = GATE_SECTION_BY_ACCEPTOR[surface][sectionName];
@@ -1240,20 +1244,25 @@ function validateQualityGate(input, opts) {
 }
 function validateQualityGateUncollected(input, opts) {
   const surface = opts?.reviewerSurface ?? "lazycodex";
-  const gate = section(input, "qualityGate");
+  const raw = input;
+  const gate = section(raw && typeof raw === "object" && "qualityGate" in raw ? raw["qualityGate"] : input, "qualityGate");
+  for (const name of REQUIRED_GATE_SECTIONS_BY_SURFACE[surface])
+    section(gate[name], name);
+  for (const name of Object.keys(gate)) {
+    if (name === "codeReview" && !OPTIONAL_GATE_SECTIONS_BY_SURFACE[surface].includes(name))
+      invalid("omo-senpi gate has no codeReview lane.", name);
+  }
   if (surface === "omo-senpi" && gate["codeReview"] !== undefined)
     invalid("omo-senpi gate has no codeReview lane.", "codeReview");
   const manualQa = section(gate["manualQa"], "manualQa");
   const gateReview = section(gate["gateReview"], "gateReview");
   const iteration = section(gate["iteration"], "iteration");
   const coverage = section(gate["criteriaCoverage"], "criteriaCoverage");
-  const codeReview = surface === "lazycodex" ? section(gate["codeReview"], "codeReview") : {};
+  const codeReview = gate["codeReview"] !== undefined ? section(gate["codeReview"], "codeReview") : undefined;
   const manualQaBy = reviewerAcceptorField(manualQa["by"], surface, "manualQa");
   const gateReviewBy = reviewerAcceptorField(gateReview["by"], surface, "gateReview");
   const manualQaEvidence = textField(manualQa["evidence"], "manualQa.evidence");
   const gateReviewEvidence = textField(gateReview["evidence"], "gateReview.evidence");
-  if (surface === "lazycodex")
-    reviewerRoleField(codeReview?.["by"], "lazycodex-code-reviewer", "codeReview.by");
   const totalCriteria = numberField(coverage["totalCriteria"], "criteriaCoverage.totalCriteria");
   const passCount = numberField(coverage["passCount"], "criteriaCoverage.passCount");
   if (!isPoisoned("criteriaCoverage.passCount") && passCount < totalCriteria)
@@ -1298,13 +1307,15 @@ function validateQualityGateUncollected(input, opts) {
   };
   if (surface === "omo-senpi")
     return { surface, ...common };
+  if (codeReview === undefined)
+    return { surface, ...common };
   const codeReportPath = textField(codeReview["reportPath"], "codeReview.reportPath");
   checkFile(codeReportPath, "codeReview.reportPath", opts);
   return {
     surface,
     ...common,
     codeReview: {
-      by: "lazycodex-code-reviewer",
+      by: reviewerAcceptorField(codeReview["by"], surface, "codeReview"),
       recommendation: literal(codeReview["recommendation"], "APPROVE", "codeReview.recommendation"),
       codeQualityStatus: codeQualityStatusField(codeReview["codeQualityStatus"], "codeReview.codeQualityStatus"),
       reportPath: codeReportPath,
@@ -1640,13 +1651,13 @@ function ledgerKind2(status, goal, aggregateCompletion) {
   return status === "blocked" ? "goal_blocked" : "goal_failed";
 }
 function buildLedger(now, args, goal, qualityGate, codexGoal, aggregateCompletion) {
-  const watch = qualityGate?.surface === "lazycodex" && qualityGate.codeReview.codeQualityStatus === "WATCH";
+  const watch = qualityGate?.surface === "lazycodex" && qualityGate.codeReview?.codeQualityStatus === "WATCH";
   const entry = {
     at: now,
     kind: ledgerKind2(args.status, goal, aggregateCompletion),
     goalId: goal.id,
     status: goal.status,
-    evidence: watch && qualityGate.surface === "lazycodex" ? `${args.evidence} | codeQuality=WATCH: ${qualityGate.codeReview.evidence}` : args.evidence
+    evidence: watch && qualityGate.surface === "lazycodex" ? `${args.evidence} | codeQuality=WATCH: ${qualityGate.codeReview?.evidence ?? ""}` : args.evidence
   };
   if (codexGoal !== undefined)
     entry.codexGoal = codexGoal;
@@ -1763,7 +1774,7 @@ function gateTemplate(surface, base) {
     }
   ];
   const manualQa = {
-    by: surface === "omo-senpi" ? "main-session" : "lazycodex-qa-executor",
+    by: "main-session",
     status: "passed",
     evidence: "<replace:manual QA evidence>",
     surfaceEvidence: [
@@ -1800,7 +1811,7 @@ function gateTemplate(surface, base) {
   const common = {
     manualQa,
     gateReview: {
-      by: surface === "omo-senpi" ? "category:deep" : "lazycodex-gate-reviewer",
+      by: surface === "omo-senpi" ? "category:deep" : "main-session",
       recommendation: "APPROVE",
       reportPath: artifactPath(base, "gate-review.md"),
       evidence: "<replace:gate review evidence>",
@@ -1822,19 +1833,7 @@ function gateTemplate(surface, base) {
       adversarialClassesCovered: ["<replace:adversarial class>"]
     }
   };
-  if (surface === "omo-senpi")
-    return common;
-  return {
-    codeReview: {
-      by: "lazycodex-code-reviewer",
-      recommendation: "APPROVE",
-      codeQualityStatus: "CLEAR",
-      reportPath: artifactPath(base, "code-review.md"),
-      evidence: "<replace:code review evidence>",
-      blockers: []
-    },
-    ...common
-  };
+  return common;
 }
 async function checkpointTemplate(repoRoot, scope, goalId) {
   const plan = await readUlwLoopPlan(repoRoot, scope);
@@ -1849,6 +1848,9 @@ async function checkpointTemplate(repoRoot, scope, goalId) {
     "Fill every <replace:...> value with plausible non-empty evidence and use real, non-empty artifact files.",
     'Passing codex-goal-json example: {"goal":{"objective":"<plan codexObjective verbatim>","status":"complete"}}.',
     'Passing quality-gate-json example requires gateReview {"by":"category:deep","recommendation":"APPROVE","evidence":"review passed","reportPath":"<attemptDir>/gate-review.md","blockers":[],"notes":[]}, manualQa.artifactRefs objects, iteration, and criteriaCoverage.',
+    ...resolveToolkitSurface() === "lazycodex" ? [
+      "Self-review defaults: manualQa.by and gateReview.by are main-session. Alternatives: manualQa.by accepts lazycodex-qa-executor; gateReview.by accepts lazycodex-gate-reviewer, category:deep, category:unspecified-high, or category:unspecified-low. Optional codeReview.by accepts lazycodex-code-reviewer or main-session."
+    ] : [],
     ...hasAttempt ? [] : ["This plan is evidence-layout v1; artifacts go under .omo/evidence/."]
   ].join(" ");
   return {
@@ -1877,7 +1879,7 @@ var ULW_LOOP_HELP = `Usage:
   omo-agent-toolkit ulw-loop add-goal --title "..." --objective "..." [--json]
   omo-agent-toolkit ulw-loop record-review-blockers --goal-id <id> --title "..." --objective "..." --evidence "..." --codex-goal-json <...> [--json]
 
-Every state subcommand needs a session scope: [--session-id <id>] or the session env (OMO_ULW_LOOP_SESSION_ID / CODEX_SESSION_ID / CODEX_THREAD_ID / PI_SESSION_ID); state lives under .omo/ulw-loop/<id>/ and the unscoped root is never used implicitly.
+Every state subcommand needs a session scope: [--session-id <id>] or the session env (OMO_ULW_LOOP_SESSION_ID / CODEX_SESSION_ID / CODEX_THREAD_ID / PI_SESSION_ID); state lives under .omo/ulw-loop/<id>/ and the unscoped root is never used implicitly. status --json exposes the currentAttemptDir; put all quality-gate artifacts under it.
 Every subcommand accepts --help | -h to print its own usage line.`;
 function subcommandHelp(subcommand) {
   const lines = ULW_LOOP_HELP.split(`
@@ -2042,12 +2044,11 @@ function finalSection(plan, goal, isFinal, aggregate, surface) {
   const blockerCommand = `omo-agent-toolkit ulw-loop record-review-blockers${option} --goal-id ${goal.id} --title "Resolve final code-review blockers" --objective "<blocker-resolution objective>" --evidence "<review findings>" --codex-goal-json "<active get_goal JSON or path>"`;
   const checkpointCommand = `omo-agent-toolkit ulw-loop checkpoint${option} --goal-id ${goal.id} --status complete --evidence "<targeted verification/manualQa/gateReview evidence>" --codex-goal-json "<fresh complete get_goal JSON or path>" --quality-gate-json "<quality gate JSON or path>"`;
   return joinLines([
-    "Final story — run mandatory quality gate before update_goal:",
+    "Final story — self-review and manual QA are the default; use the quality gate before update_goal:",
     "- Run targeted verification for changed behavior.",
     "- Confirm every manualQa artifact path exists and has non-zero size.",
-    `- First spawn ${roles.codeReview} and ${roles.manualQa} in parallel (fork_context: false on the v1 surface; fork_turns: "none" on v2). Include the original brief, goal objectives, desired user-visible outcome, diff, and evidence; wait for BOTH to return and confirm their report artifacts exist on disk (code-review report + manualQa matrix).`,
-    `- Only then spawn ${roles.gateReview} (same fork settings), passing those artifact paths.`,
-    "- Require clean codeReview, manualQa, gateReview, iteration, and criteriaCoverage. criteriaCoverage must summarize originalIntent, desiredOutcome, and userOutcomeReview; counts alone are not approval.",
+    `- Run manual QA yourself and write its artifact under currentAttemptDir. Only if the user explicitly demands strict, rigorous, or high-accuracy review, spawn ${roles.gateReview}, optionally also ${roles.codeReview} and ${roles.manualQa}; otherwise set manualQa.by and gateReview.by to "main-session".`,
+    "- Require passed manualQa, approved gateReview, passed iteration, and complete criteriaCoverage; include codeReview only when strict review was requested. criteriaCoverage must summarize originalIntent, desiredOutcome, and userOutcomeReview; counts alone are not approval.",
     "- On a reviewer REJECT, fix only the cited blockers, rerun the affected verification/Manual-QA, and re-review the delta at most TWICE; if blockers remain, record them and surface to the user.",
     "- If codeQualityStatus is WATCH, include the WATCH notes verbatim in your final user-facing message.",
     "- If any reviewer is blocked/inconclusive or the quality gate is not clean, do not call update_goal. Record blocker work first:",
@@ -2773,10 +2774,10 @@ function activeGoalActions(plan, active) {
     ];
   if (hasAllCriteriaPass(active) && isFinalRunCompletionCandidate(plan, active))
     return [
-      `${active.id} passes every criterion and is the final story: update_goal complete, then checkpoint --print-template to build the final quality gate.`
+      `${active.id} passes every criterion and is the final story: update_goal complete, then checkpoint --print-template to build the final quality gate. Use status --json's currentAttemptDir for all quality-gate artifacts.`
     ];
   return [
-    `${active.id} passes every criterion: close it with \`omo-agent-toolkit ulw-loop checkpoint --goal-id ${active.id} --status complete --evidence "<proof>" --codex-goal-json '<get_goal json>'\`.`
+    `${active.id} passes every criterion: close it with \`omo-agent-toolkit ulw-loop checkpoint --goal-id ${active.id} --status complete --evidence "<proof>" --codex-goal-json '<get_goal json>'\`. Put quality-gate artifacts under the currentAttemptDir shown by status --json.`
   ];
 }
 
@@ -3767,10 +3768,10 @@ function readAll(stdin) {
 
 // components/ulw-loop/src/spawn-guard.ts
 import { randomBytes } from "node:crypto";
-import { existsSync as existsSync7, readdirSync as readdirSync2, readFileSync as readFileSync5, renameSync, statSync as statSync3, writeFileSync } from "node:fs";
+import { existsSync as existsSync7, mkdirSync as mkdirSync2, readFileSync as readFileSync5, renameSync, statSync as statSync3, writeFileSync } from "node:fs";
 import { dirname as dirname3, join as join3 } from "node:path";
 var SPAWN_TOOL_TOKENS = new Set(["spawn_agent", "collaborationspawn_agent", "collaboration.spawn_agent"]);
-var DEFAULT_FANOUT_LIMIT = 60;
+var DEFAULT_FANOUT_LIMIT = 24;
 var DEFAULT_REVIEW_SPAWN_LIMIT = 3;
 var GATE_MESSAGE_PATTERN = /lazycodex-gate-reviewer|omo-senpi-gate-reviewer|final gate review/i;
 var REVIEW_AGENT_TYPES = [
@@ -3782,6 +3783,9 @@ var REVIEW_AGENT_TYPE_SET = new Set(REVIEW_AGENT_TYPES);
 function applySpawnGuards(payload, options = {}) {
   if (payload.hook_event_name !== "PreToolUse" || !SPAWN_TOOL_TOKENS.has(payload.tool_name))
     return "";
+  const breaker = readAdmissionBreaker(payload.session_id);
+  if (breaker !== null)
+    return deny(`Subagent admission failed earlier in this session (${breaker}). Do not spawn more workers or reviewers; report the capacity block and wait for the user.`);
   const scope = { sessionId: payload.session_id };
   const stateDir = ulwLoopDir(payload.cwd, scope);
   const plan = readPlan(join3(stateDir, "goals.json"));
@@ -3802,7 +3806,7 @@ function evaluateGuards(payload, plan, stateDir) {
     return deny(fanOutPeek);
   const missingArtifact = missingGateArtifact(payload, plan);
   if (missingArtifact !== null)
-    return deny(`spawn code-review + QA first; gate audits their artifacts: missing ${missingArtifact}`);
+    return deny(`record manual QA first; gate audits its artifacts: missing ${missingArtifact}`);
   const reviewDenial = consumeReviewSpawnBudget(payload, plan, stateDir);
   if (reviewDenial !== null)
     return deny(reviewDenial);
@@ -3811,6 +3815,26 @@ function evaluateGuards(payload, plan, stateDir) {
     return deny(fanOutDenial);
   return "";
 }
+async function runSpawnAdmissionRecorderCli(stdin, stdout) {
+  const chunks = [];
+  for await (const chunk of stdin)
+    chunks.push(Buffer.from(chunk));
+  try {
+    const payload = JSON.parse(Buffer.concat(chunks).toString("utf8"));
+    const response = typeof payload["tool_response"] === "string" ? payload["tool_response"] : JSON.stringify(payload["tool_response"] ?? "");
+    if (!/too many active cells|AgentLimitReached|max_threads|max_concurrent_threads_per_session/i.test(response))
+      return;
+    const dataDir = process.env["PLUGIN_DATA"];
+    if (typeof dataDir !== "string" || typeof payload["session_id"] !== "string")
+      return;
+    const markerDir = join3(dataDir, "spawn-breaker");
+    mkdirSync2(markerDir, { recursive: true });
+    atomicWriteJson(join3(markerDir, `${payload["session_id"]}.json`), {
+      reason: response,
+      at: new Date().toISOString()
+    });
+  } catch {}
+}
 async function runSpawnGuardCli(stdin, stdout) {
   try {
     const chunks = [];
@@ -3871,8 +3895,7 @@ function missingGateArtifact(payload, plan) {
   if (!goal3.successCriteria.every((criterion) => criterion.status === "pass"))
     return null;
   const scope = { sessionId: payload.session_id };
-  const surface = resolveToolkitSurface();
-  const requiredArtifacts = surface === "omo-senpi" ? [`${goal3.id}-manual-qa.md`] : [`${goal3.id}-code-review.md`, `${goal3.id}-manual-qa.md`];
+  const requiredArtifacts = [`${goal3.id}-manual-qa.md`];
   if (plan.evidenceLayoutVersion === 2) {
     const attemptDir = ulwLoopAttemptEvidenceDir(goal3.id, goal3.attempt, scope);
     for (const name of requiredArtifacts) {
@@ -3882,16 +3905,8 @@ function missingGateArtifact(payload, plan) {
     }
     return null;
   }
-  const flatReport = `.omo/evidence/${goal3.id}-code-review.md`;
-  if (surface !== "omo-senpi" && !isNonEmptyFile(join3(payload.cwd, flatReport)))
-    return flatReport;
-  if (surface === "omo-senpi") {
-    const manualQa = `.omo/evidence/${goal3.id}-manual-qa.md`;
-    return isNonEmptyFile(join3(payload.cwd, manualQa)) ? null : manualQa;
-  }
-  if (!hasOtherEvidenceFile(join3(payload.cwd, ".omo", "evidence"), `${goal3.id}-code-review.md`))
-    return `.omo/evidence/${goal3.id}-manual-qa.md`;
-  return null;
+  const manualQa = `.omo/evidence/${goal3.id}-manual-qa.md`;
+  return isNonEmptyFile(join3(payload.cwd, manualQa)) ? null : manualQa;
 }
 function isGateReviewerSpawn(toolInput) {
   const agentType = reviewAgentType(toolInput);
@@ -3954,6 +3969,17 @@ function deny(reason) {
   })}
 `;
 }
+function readAdmissionBreaker(sessionId) {
+  const dataDir = process.env["PLUGIN_DATA"];
+  if (typeof dataDir !== "string")
+    return null;
+  try {
+    const value = JSON.parse(readFileSync5(join3(dataDir, "spawn-breaker", `${sessionId}.json`), "utf8"));
+    return typeof value.reason === "string" ? value.reason : "capacity limit";
+  } catch {
+    return null;
+  }
+}
 function fanOutLimit() {
   const raw = process.env["OMO_SPAWN_FANOUT_LIMIT"];
   if (raw === undefined)
@@ -3977,15 +4003,6 @@ function isNonEmptyFile(path) {
     throw error;
   }
 }
-function hasOtherEvidenceFile(evidenceDir, excludedName) {
-  try {
-    return readdirSync2(evidenceDir).some((name) => name !== excludedName && isNonEmptyFile(join3(evidenceDir, name)));
-  } catch (error) {
-    if (error instanceof Error)
-      return false;
-    throw error;
-  }
-}
 function readCount(counterPath) {
   try {
     const parsed = JSON.parse(readFileSync5(counterPath, "utf8"));
@@ -4245,6 +4262,10 @@ async function main() {
       await runStopResumeHookCli(process.stdin, process.stdout);
       return 0;
     }
+    if (sub === "post-tool-use-spawn") {
+      await runSpawnAdmissionRecorderCli(process.stdin, process.stdout);
+      return 0;
+    }
     if (sub === "pre-tool-use-spawn") {
       await runSpawnGuardCli(process.stdin, process.stdout);
       return 0;

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

@@ -92,12 +92,11 @@ function finalSection(plan, goal, isFinal, aggregate, surface) {
     const blockerCommand = `omo-agent-toolkit ulw-loop record-review-blockers${option} --goal-id ${goal.id} --title "Resolve final code-review blockers" --objective "<blocker-resolution objective>" --evidence "<review findings>" --codex-goal-json "<active get_goal JSON or path>"`;
     const checkpointCommand = `omo-agent-toolkit ulw-loop checkpoint${option} --goal-id ${goal.id} --status complete --evidence "<targeted verification/manualQa/gateReview evidence>" --codex-goal-json "<fresh complete get_goal JSON or path>" --quality-gate-json "<quality gate JSON or path>"`;
     return joinLines([
-        "Final story — run mandatory quality gate before update_goal:",
+        "Final story — self-review and manual QA are the default; use the quality gate before update_goal:",
         "- Run targeted verification for changed behavior.",
         "- Confirm every manualQa artifact path exists and has non-zero size.",
-        `- First spawn ${roles.codeReview} and ${roles.manualQa} in parallel (fork_context: false on the v1 surface; fork_turns: "none" on v2). Include the original brief, goal objectives, desired user-visible outcome, diff, and evidence; wait for BOTH to return and confirm their report artifacts exist on disk (code-review report + manualQa matrix).`,
-        `- Only then spawn ${roles.gateReview} (same fork settings), passing those artifact paths.`,
-        "- Require clean codeReview, manualQa, gateReview, iteration, and criteriaCoverage. criteriaCoverage must summarize originalIntent, desiredOutcome, and userOutcomeReview; counts alone are not approval.",
+        `- Run manual QA yourself and write its artifact under currentAttemptDir. Only if the user explicitly demands strict, rigorous, or high-accuracy review, spawn ${roles.gateReview}, optionally also ${roles.codeReview} and ${roles.manualQa}; otherwise set manualQa.by and gateReview.by to "main-session".`,
+        "- Require passed manualQa, approved gateReview, passed iteration, and complete criteriaCoverage; include codeReview only when strict review was requested. criteriaCoverage must summarize originalIntent, desiredOutcome, and userOutcomeReview; counts alone are not approval.",
         "- On a reviewer REJECT, fix only the cited blockers, rerun the affected verification/Manual-QA, and re-review the delta at most TWICE; if blockers remain, record them and surface to the user.",
         "- If codeQualityStatus is WATCH, include the WATCH notes verbatim in your final user-facing message.",
         "- If any reviewer is blocked/inconclusive or the quality gate is not clean, do not call update_goal. Record blocker work first:",

package/packages/omo-codex/plugin/components/ulw-loop/dist/domain-types.d.ts

@@ -122,7 +122,7 @@ interface UlwLoopQualityGateCommon {
 }
 export interface UlwLoopQualityGateLazycodex extends UlwLoopQualityGateCommon {
     readonly surface: "lazycodex";
-    readonly codeReview: {
+    readonly codeReview?: {
         readonly by: string;
         readonly recommendation: "APPROVE";
         readonly codeQualityStatus: "CLEAR" | "WATCH";

package/packages/omo-codex/plugin/components/ulw-loop/dist/quality-gate-fields.js

@@ -55,7 +55,7 @@ export function isRecord(value) {
 export function section(value, field) {
     if (isRecord(value))
         return value;
-    invalid(`Final quality gate is missing ${field} evidence.`, field);
+    invalid(`Final quality gate is missing ${field} evidence (accepted input: a bare object with manualQa/gateReview/iteration/criteriaCoverage and optional codeReview, or the same object under a top-level "qualityGate" key).`, field);
     return {};
 }
 export function textField(value, field) {

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

@@ -1,18 +1,8 @@
 import { artifactCompatible, artifactMap, checkFile, compatibleKindsFor, parseArtifactRefs, referencedArtifacts, surfaceField, } from "./quality-gate-artifacts.js";
 import { emptyBlockers, invalid, isPoisoned, isPoisonedArtifactKind, literal, numberField, section, stringArray, textField, withQualityGateCollector, } from "./quality-gate-fields.js";
 import { adversarialVerdict, codeQualityStatusField, passedVerdict } from "./quality-gate-verdicts.js";
-import { GATE_SECTION_BY_ACCEPTOR } from "./surface.js";
+import { GATE_SECTION_BY_ACCEPTOR, OPTIONAL_GATE_SECTIONS_BY_SURFACE, REQUIRED_GATE_SECTIONS_BY_SURFACE, } from "./surface.js";
 export { classifyExternalAuthorizationBlocker, clearGoalBlockerFields, normalizeBlockerEvidence, sameBlockerOccurrences, } from "./quality-gate-blockers.js";
-function reviewerRoleField(value, expected, field) {
-    if (typeof value !== "string" || value.trim() === "") {
-        textField(value, field);
-        return expected;
-    }
-    const actual = textField(value, field);
-    if (actual !== expected)
-        invalid(`${field} must be ${expected}.`, field);
-    return expected;
-}
 function reviewerAcceptorField(value, surface, sectionName) {
     const field = `${sectionName}.by`;
     const accepted = GATE_SECTION_BY_ACCEPTOR[surface][sectionName];
@@ -30,20 +20,25 @@ export function validateQualityGate(input, opts) {
 }
 function validateQualityGateUncollected(input, opts) {
     const surface = opts?.reviewerSurface ?? "lazycodex";
-    const gate = section(input, "qualityGate");
+    const raw = input;
+    const gate = section(raw && typeof raw === "object" && "qualityGate" in raw ? raw["qualityGate"] : input, "qualityGate");
+    for (const name of REQUIRED_GATE_SECTIONS_BY_SURFACE[surface])
+        section(gate[name], name);
+    for (const name of Object.keys(gate)) {
+        if (name === "codeReview" && !OPTIONAL_GATE_SECTIONS_BY_SURFACE[surface].includes(name))
+            invalid("omo-senpi gate has no codeReview lane.", name);
+    }
     if (surface === "omo-senpi" && gate["codeReview"] !== undefined)
         invalid("omo-senpi gate has no codeReview lane.", "codeReview");
     const manualQa = section(gate["manualQa"], "manualQa");
     const gateReview = section(gate["gateReview"], "gateReview");
     const iteration = section(gate["iteration"], "iteration");
     const coverage = section(gate["criteriaCoverage"], "criteriaCoverage");
-    const codeReview = surface === "lazycodex" ? section(gate["codeReview"], "codeReview") : {};
+    const codeReview = gate["codeReview"] !== undefined ? section(gate["codeReview"], "codeReview") : undefined;
     const manualQaBy = reviewerAcceptorField(manualQa["by"], surface, "manualQa");
     const gateReviewBy = reviewerAcceptorField(gateReview["by"], surface, "gateReview");
     const manualQaEvidence = textField(manualQa["evidence"], "manualQa.evidence");
     const gateReviewEvidence = textField(gateReview["evidence"], "gateReview.evidence");
-    if (surface === "lazycodex")
-        reviewerRoleField(codeReview?.["by"], "lazycodex-code-reviewer", "codeReview.by");
     const totalCriteria = numberField(coverage["totalCriteria"], "criteriaCoverage.totalCriteria");
     const passCount = numberField(coverage["passCount"], "criteriaCoverage.passCount");
     if (!isPoisoned("criteriaCoverage.passCount") && passCount < totalCriteria)
@@ -88,13 +83,15 @@ function validateQualityGateUncollected(input, opts) {
     };
     if (surface === "omo-senpi")
         return { surface, ...common };
+    if (codeReview === undefined)
+        return { surface, ...common };
     const codeReportPath = textField(codeReview["reportPath"], "codeReview.reportPath");
     checkFile(codeReportPath, "codeReview.reportPath", opts);
     return {
         surface,
         ...common,
         codeReview: {
-            by: "lazycodex-code-reviewer",
+            by: reviewerAcceptorField(codeReview["by"], surface, "codeReview"),
             recommendation: literal(codeReview["recommendation"], "APPROVE", "codeReview.recommendation"),
             codeQualityStatus: codeQualityStatusField(codeReview["codeQualityStatus"], "codeReview.codeQualityStatus"),
             reportPath: codeReportPath,

package/packages/omo-codex/plugin/components/ulw-loop/dist/spawn-guard.d.ts

@@ -1,6 +1,8 @@
 import type { PreToolUsePayload } from "./codex-hook.js";
+export declare const DEFAULT_FANOUT_LIMIT = 24;
 export interface SpawnGuardOptions {
     readonly lockTimeoutMs?: number;
 }
 export declare function applySpawnGuards(payload: PreToolUsePayload, options?: SpawnGuardOptions): string;
+export declare function runSpawnAdmissionRecorderCli(stdin: NodeJS.ReadableStream, stdout: NodeJS.WritableStream): Promise<void>;
 export declare function runSpawnGuardCli(stdin: NodeJS.ReadableStream, stdout: NodeJS.WritableStream): Promise<void>;