oh-my-opencode 5.0.0-beta.3 → 5.0.0-beta.31

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

@@ -1,5 +1,6 @@
 import type { UlwLoopCodexGoalMode, UlwLoopPlan } from "./types.js";
-export declare const ULW_LOOP_HELP = "Usage:\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 --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\nAll subcommands accept [--session-id <id>] to isolate state under .omo/ulw-loop/<id>/; without it, Codex session env is used when present.";
+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 --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\nAll subcommands accept [--session-id <id>] to isolate state under .omo/ulw-loop/<id>/; without it, Codex session env is used when present.\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;
 export declare function printStatus(plan: UlwLoopPlan): void;

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

@@ -1,5 +1,8 @@
 import { UlwLoopError } from "./types.js";
 export const ULW_LOOP_HELP = `Usage:
+  omo-agent-toolkit hook user-prompt-submit [--with-ultrawork]  (Codex UserPromptSubmit hook)
+  omo-agent-toolkit help | --help | -h                          (this message)
+  omo-agent-toolkit ulw-loop help
   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]
   omo-agent-toolkit ulw-loop status [--json]
   omo-agent-toolkit ulw-loop complete-goals [--retry-failed] [--json]
@@ -10,7 +13,14 @@ 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]
 
-All subcommands accept [--session-id <id>] to isolate state under .omo/ulw-loop/<id>/; without it, Codex session env is used when present.`;
+All subcommands accept [--session-id <id>] to isolate state under .omo/ulw-loop/<id>/; without it, Codex session env is used when present.
+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}`));
+    if (lines.length === 0)
+        return ULW_LOOP_HELP;
+    return ["Usage:", ...lines].join("\n");
+}
 export function printJson(value) {
     process.stdout.write(`${JSON.stringify(value, null, 2)}\n`);
 }

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

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 // packages/omo-codex/plugin/components/ulw-loop/src/checkpoint.ts
-import { existsSync as existsSync3, statSync } from "node:fs";
+import { existsSync as existsSync4, statSync } from "node:fs";
 import { readFile as readFile5 } from "node:fs/promises";
 import { resolve as resolve3 } from "node:path";
 
@@ -33,8 +33,6 @@ var ULW_LOOP_SUCCESS_CRITERION_USER_MODELS = [
 ];
 // packages/omo-codex/plugin/components/ulw-loop/src/runtime.ts
 class UlwLoopError extends Error {
-  code;
-  details;
   constructor(message, code, opts) {
     super(message, opts?.cause === undefined ? undefined : { cause: opts.cause });
     this.name = "UlwLoopError";
@@ -48,7 +46,7 @@ function iso() {
   return new Date().toISOString();
 }
 // packages/omo-codex/plugin/components/ulw-loop/src/paths.ts
-var SESSION_ENV_KEYS = ["OMO_ULW_LOOP_SESSION_ID", "CODEX_SESSION_ID", "CODEX_THREAD_ID"];
+var SESSION_ENV_KEYS = ["OMO_ULW_LOOP_SESSION_ID", "CODEX_SESSION_ID", "CODEX_THREAD_ID", "PI_SESSION_ID"];
 function normalizeUlwLoopSessionId(sessionId) {
   const trimmed = sessionId?.trim();
   if (!trimmed)
@@ -302,7 +300,7 @@ function parseCodexGoalSnapshot(value) {
     return { available: false, raw: value };
   }
   const goal = safeObject(goalValue);
-  const objective = safeString(goal["objective"] ?? goal["goal"] ?? goal["description"] ?? root["objective"]);
+  const objective = safeString(goal["objective"] ?? goal["goal"] ?? goal["description"] ?? goal["title"] ?? root["objective"] ?? root["title"]);
   const status = normalizeStatus(goal["status"] ?? root["status"]);
   return {
     available: Boolean(objective || status !== "unknown"),
@@ -650,6 +648,53 @@ function adversarialVerdict(row, field) {
   invalid(`${field} must be passed or not_applicable with a reason.`, field);
 }
 
+// packages/omo-codex/plugin/components/ulw-loop/src/surface.ts
+import { existsSync as existsSync3, readFileSync } from "node:fs";
+import { dirname, join as join2 } from "node:path";
+import { fileURLToPath } from "node:url";
+var REVIEWER_ROLES_BY_SURFACE = {
+  lazycodex: {
+    codeReview: "lazycodex-code-reviewer",
+    manualQa: "lazycodex-qa-executor",
+    gateReview: "lazycodex-gate-reviewer"
+  },
+  "omo-senpi": {
+    codeReview: "omo-senpi-code-reviewer",
+    manualQa: "omo-senpi-qa-executor",
+    gateReview: "omo-senpi-gate-reviewer"
+  }
+};
+var GATE_REVIEWER_AGENT_NAMES = new Set(Object.values(REVIEWER_ROLES_BY_SURFACE).map((roles) => roles.gateReview));
+function reviewerRolesFor(surface) {
+  return REVIEWER_ROLES_BY_SURFACE[surface];
+}
+var SURFACE_MARKER_FILENAME = "surface.json";
+var SURFACE_ENV_KEY = "OMO_AGENT_TOOLKIT_SURFACE";
+function parseSurface(value) {
+  return value === "lazycodex" || value === "omo-senpi" ? value : null;
+}
+function resolveToolkitSurface(options) {
+  const env = options?.env ?? process.env;
+  const fromEnv = parseSurface(env[SURFACE_ENV_KEY]);
+  if (fromEnv !== null)
+    return fromEnv;
+  const entryDir = options?.entryDir ?? dirname(fileURLToPath(import.meta.url));
+  const markerPath = join2(entryDir, SURFACE_MARKER_FILENAME);
+  return readMarkerSurface(markerPath) ?? "lazycodex";
+}
+function readMarkerSurface(markerPath) {
+  try {
+    if (!existsSync3(markerPath))
+      return null;
+    const parsed = JSON.parse(readFileSync(markerPath, "utf8"));
+    return parseSurface(parsed["surface"]);
+  } catch (error) {
+    if (error instanceof Error)
+      return null;
+    throw error;
+  }
+}
+
 // packages/omo-codex/plugin/components/ulw-loop/src/quality-gate-blockers.ts
 var BLOCKER_FIELD_KEYS = "blocker blockerSignature blockerEvidence blockerOccurrences blockedAt".split(" ");
 var URL_PATTERN = /https?:\/\/\S+/g;
@@ -693,11 +738,6 @@ function clearGoalBlockerFields(goal) {
 }
 
 // packages/omo-codex/plugin/components/ulw-loop/src/quality-gate.ts
-var REVIEWER_ROLES = {
-  codeReview: "lazycodex-code-reviewer",
-  manualQa: "lazycodex-qa-executor",
-  gateReview: "lazycodex-gate-reviewer"
-};
 function reviewerRoleField(value, expected, field) {
   const actual = textField(value, field);
   if (actual !== expected)
@@ -731,14 +771,14 @@ function artifactCompatible(surface, kind) {
   }
 }
 function checkFile(path, field, opts) {
-  if (opts === undefined)
+  if (opts?.repoRoot === undefined || opts.fs === undefined)
     return;
   const absolute = resolve2(opts.repoRoot, path);
   if (!opts.fs.existsSync(absolute))
     invalid(`${field} must point to an existing artifact.`, field);
   if (opts.fs.statSync(absolute).size <= 0)
     invalid(`${field} must point to a non-empty artifact.`, field);
-  if (opts.currentAttemptDir !== undefined) {
+  if (opts.currentAttemptDir !== undefined && opts.repoRoot !== undefined) {
     const attemptRoot = resolve2(opts.repoRoot, opts.currentAttemptDir);
     if (!isWithinAttemptDir(absolute, attemptRoot))
       invalid(`${field} (${path}) must point to an artifact from the current attempt (${opts.currentAttemptDir}).`, field);
@@ -777,6 +817,7 @@ function referencedArtifacts(value, field, byId) {
   });
 }
 function validateQualityGate(input, opts) {
+  const reviewerRoles = reviewerRolesFor(opts?.reviewerSurface ?? "lazycodex");
   const gate = section(input, "qualityGate");
   const codeReview = section(gate["codeReview"], "codeReview");
   const manualQa = section(gate["manualQa"], "manualQa");
@@ -797,7 +838,7 @@ function validateQualityGate(input, opts) {
   checkFile(gateReportPath, "gateReview.reportPath", opts);
   return {
     codeReview: {
-      by: reviewerRoleField(codeReview["by"], REVIEWER_ROLES.codeReview, "codeReview.by"),
+      by: reviewerRoleField(codeReview["by"], reviewerRoles.codeReview, "codeReview.by"),
       recommendation: literal(codeReview["recommendation"], "APPROVE", "codeReview.recommendation"),
       codeQualityStatus: codeQualityStatusField(codeReview["codeQualityStatus"], "codeReview.codeQualityStatus"),
       reportPath: codeReportPath,
@@ -805,7 +846,7 @@ function validateQualityGate(input, opts) {
       blockers: emptyBlockers(codeReview["blockers"], "codeReview.blockers")
     },
     manualQa: {
-      by: reviewerRoleField(manualQa["by"], REVIEWER_ROLES.manualQa, "manualQa.by"),
+      by: reviewerRoleField(manualQa["by"], reviewerRoles.manualQa, "manualQa.by"),
       status: literal(manualQa["status"], "passed", "manualQa.status"),
       evidence: textField(manualQa["evidence"], "manualQa.evidence"),
       surfaceEvidence,
@@ -813,7 +854,7 @@ function validateQualityGate(input, opts) {
       artifactRefs
     },
     gateReview: {
-      by: reviewerRoleField(gateReview["by"], REVIEWER_ROLES.gateReview, "gateReview.by"),
+      by: reviewerRoleField(gateReview["by"], reviewerRoles.gateReview, "gateReview.by"),
       recommendation: literal(gateReview["recommendation"], "APPROVE", "gateReview.recommendation"),
       reportPath: gateReportPath,
       evidence: textField(gateReview["evidence"], "gateReview.evidence"),
@@ -1086,7 +1127,7 @@ function fail(message, code = "ULW_LOOP_VALIDATION_BATCH_INVALID") {
 }
 
 // packages/omo-codex/plugin/components/ulw-loop/src/checkpoint.ts
-var QUALITY_GATE_FS = { existsSync: existsSync3, statSync };
+var QUALITY_GATE_FS = { existsSync: existsSync4, statSync };
 function ulwLoopFail2(message, code) {
   throw new UlwLoopError(message, code);
 }
@@ -1112,7 +1153,7 @@ async function readJsonInput2(raw, repoRoot) {
       throw error;
   }
   const path = resolve3(repoRoot, trimmed);
-  if (!existsSync3(path))
+  if (!existsSync4(path))
     return ulwLoopFail2("Quality gate JSON is neither valid JSON nor a readable path.", "ulw_loop_json_input_invalid");
   try {
     return JSON.parse(await readFile5(path, "utf8"));
@@ -1224,6 +1265,7 @@ async function checkpointUlwLoop(repoRoot, args, scope) {
         qualityGate = validateQualityGate(await readJsonInput2(args.qualityGateJson, repoRoot), {
           repoRoot,
           fs: QUALITY_GATE_FS,
+          reviewerSurface: resolveToolkitSurface(),
           ...plan.evidenceLayoutVersion === 2 ? { currentAttemptDir: ulwLoopAttemptEvidenceDir(goal.id, goal.attempt, scope) } : {}
         });
         requireBatchGate(plan, goal, qualityGate);
@@ -1254,6 +1296,9 @@ async function checkpointUlwLoop(repoRoot, args, scope) {
 
 // packages/omo-codex/plugin/components/ulw-loop/src/cli-output.ts
 var ULW_LOOP_HELP = `Usage:
+  omo-agent-toolkit hook user-prompt-submit [--with-ultrawork]  (Codex UserPromptSubmit hook)
+  omo-agent-toolkit help | --help | -h                          (this message)
+  omo-agent-toolkit ulw-loop help
   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]
   omo-agent-toolkit ulw-loop status [--json]
   omo-agent-toolkit ulw-loop complete-goals [--retry-failed] [--json]
@@ -1264,7 +1309,16 @@ 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]
 
-All subcommands accept [--session-id <id>] to isolate state under .omo/ulw-loop/<id>/; without it, Codex session env is used when present.`;
+All subcommands accept [--session-id <id>] to isolate state under .omo/ulw-loop/<id>/; without it, Codex session env is used when present.
+Every subcommand accepts --help | -h to print its own usage line.`;
+function subcommandHelp(subcommand) {
+  const lines = ULW_LOOP_HELP.split(`
+`).filter((line) => line.trimStart().startsWith(`omo-agent-toolkit ulw-loop ${subcommand}`));
+  if (lines.length === 0)
+    return ULW_LOOP_HELP;
+  return ["Usage:", ...lines].join(`
+`);
+}
 function printJson(value) {
   process.stdout.write(`${JSON.stringify(value, null, 2)}
 `);
@@ -1335,12 +1389,13 @@ function buildCodexGoalInstruction(args) {
   const mode = codexGoalMode(args.plan);
   const createGoal = buildCreateGoalPayload(args.plan, args.goal);
   const isFinal = args.isFinal ?? isFinalRunCompletionCandidate(args.plan, args.goal);
-  return { text: buildText(mode, args.plan, args.goal, createGoal, isFinal), json: createGoal };
+  const surface = args.surface ?? resolveToolkitSurface();
+  return { text: buildText(mode, args.plan, args.goal, createGoal, isFinal, surface), json: createGoal };
 }
 function buildCreateGoalPayload(plan, goal) {
   return { objective: expectedCodexObjective(plan, goal) };
 }
-function buildText(mode, plan, goal, createGoal, isFinal) {
+function buildText(mode, plan, goal, createGoal, isFinal, surface) {
   return joinLines([
     mode === "aggregate" ? "UlwLoop aggregate-goal handoff" : "UlwLoop active-goal handoff",
     `Mode: ${mode}`,
@@ -1357,7 +1412,7 @@ function buildText(mode, plan, goal, createGoal, isFinal) {
     "- Goals are unlimited. Do not add numeric limits.",
     ...modeConstraintLines(mode, isFinal),
     ...evidenceLayoutLines(plan),
-    finalSection(plan, goal, isFinal, mode === "aggregate"),
+    finalSection(plan, goal, isFinal, mode === "aggregate", surface),
     ...checkpointLines(plan, mode),
     "",
     "create_goal payload:",
@@ -1409,7 +1464,8 @@ function evidenceLayoutLines(plan) {
     "- Evidence layout v2: write every artifact for the active goal (QA matrix, review reports, receipts) under the current attempt directory — read currentAttemptDir from `omo-agent-toolkit ulw-loop status --json` (.omo/evidence/ulw/<session>/<goalId>/a<attempt>). The final checkpoint rejects quality-gate artifacts outside that directory."
   ];
 }
-function finalSection(plan, goal, isFinal, aggregate) {
+function finalSection(plan, goal, isFinal, aggregate, surface) {
+  const roles = reviewerRolesFor(surface);
   if (!isFinal)
     return "- This is not the final ulw-loop story; do not run the final reviewer/manual-QA/gate-review quality gate yet.";
   const option = sessionOption(plan);
@@ -1419,8 +1475,8 @@ function finalSection(plan, goal, isFinal, aggregate) {
     "Final story — run mandatory quality gate before update_goal:",
     "- Run targeted verification for changed behavior.",
     "- Confirm every manualQa artifact path exists and has non-zero size.",
-    '- First spawn lazycodex-code-reviewer and lazycodex-qa-executor 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 lazycodex-gate-reviewer (same fork settings), passing those artifact paths.",
+    `- 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.",
     "- 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.",
@@ -1444,7 +1500,7 @@ function joinLines(lines) {
 }
 
 // packages/omo-codex/plugin/components/ulw-loop/src/plan-crud.ts
-import { existsSync as existsSync4 } from "node:fs";
+import { existsSync as existsSync5 } from "node:fs";
 import { mkdir as mkdir2, writeFile as writeFile2 } from "node:fs/promises";
 
 // packages/omo-codex/plugin/components/ulw-loop/src/plan-goal-factory.ts
@@ -1554,7 +1610,7 @@ function clearGoalBlockerFields2(goal) {
 }
 async function createUlwLoopPlan(repoRoot, args, scope) {
   return withUlwLoopMutationLock(repoRoot, scope, async () => {
-    if (!args.force && existsSync4(ulwLoopGoalsPath(repoRoot, scope))) {
+    if (!args.force && existsSync5(ulwLoopGoalsPath(repoRoot, scope))) {
       const existing = await readUlwLoopPlan(repoRoot, scope);
       if (isUlwLoopDone(existing))
         throw completedPlanExistsError(scope);
@@ -2722,6 +2778,11 @@ async function ulwLoopCommand(argv) {
 `);
       return 1;
     }
+    if (command !== "help" && (hasFlag(rest, "--help") || hasFlag(rest, "-h"))) {
+      process.stdout.write(`${subcommandHelp(command)}
+`);
+      return 0;
+    }
     switch (command) {
       case "help":
         process.stdout.write(`${ULW_LOOP_HELP}
@@ -2787,11 +2848,11 @@ function commandScope(argv) {
 }
 
 // packages/omo-codex/plugin/components/ulw-loop/src/ultrawork-directive.ts
-import { readFileSync as readFileSync2 } from "node:fs";
+import { readFileSync as readFileSync3 } from "node:fs";
 
 // packages/omo-codex/plugin/components/ulw-loop/src/ultrawork-skill-pointer.ts
-import { existsSync as existsSync5, readFileSync } from "node:fs";
-import { fileURLToPath } from "node:url";
+import { existsSync as existsSync6, readFileSync as readFileSync2 } from "node:fs";
+import { fileURLToPath as fileURLToPath2 } from "node:url";
 var ULTRAWORK_SKILL_POINTER_TEMPLATE = `<ultrawork-mode>
 ULTRAWORK MODE IS ACTIVE FOR THIS TASK.
 
@@ -2822,16 +2883,16 @@ Do not start the requested work until all three steps are complete.
 `;
 var ULTRAWORK_SKILL_PATH_PLACEHOLDER = "{{ULTRAWORK_SKILL_PATH}}";
 var ULTRAWORK_SKILL_FILE_URL = new URL("../../../skills/ultrawork/SKILL.md", import.meta.url);
-var ULTRAWORK_DIRECTIVE = readFileSync(new URL("../directive.md", import.meta.url), "utf8");
+var ULTRAWORK_DIRECTIVE = readFileSync2(new URL("../directive.md", import.meta.url), "utf8");
 function resolveUltraworkSkillFilePath() {
-  return fileURLToPath(ULTRAWORK_SKILL_FILE_URL);
+  return fileURLToPath2(ULTRAWORK_SKILL_FILE_URL);
 }
 function buildUltraworkSkillPointer(skillFilePath) {
   return ULTRAWORK_SKILL_POINTER_TEMPLATE.replace(ULTRAWORK_SKILL_PATH_PLACEHOLDER, skillFilePath);
 }
 function buildUltraworkAdditionalContext(options = {}) {
   const skillFilePath = options.skillFilePath === undefined ? resolveUltraworkSkillFilePath() : options.skillFilePath;
-  if (skillFilePath !== null && existsSync5(skillFilePath)) {
+  if (skillFilePath !== null && existsSync6(skillFilePath)) {
     return buildUltraworkSkillPointer(skillFilePath);
   }
   return ULTRAWORK_DIRECTIVE;
@@ -2885,7 +2946,7 @@ function hasUltraworkDirectiveAlreadyInTranscript(transcriptPath) {
   return false;
 }
 function readTranscriptTail(transcriptPath) {
-  const rawTranscript = readFileSync2(transcriptPath);
+  const rawTranscript = readFileSync3(transcriptPath);
   return rawTranscript.subarray(Math.max(0, rawTranscript.byteLength - TRANSCRIPT_SEARCH_BYTES)).toString("utf8");
 }
 function isUltraworkPrompt(prompt) {
@@ -3078,16 +3139,16 @@ function readAll(stdin) {
 }
 
 // packages/omo-codex/plugin/components/ulw-loop/src/spawn-guard.ts
-import { existsSync as existsSync6, readdirSync, readFileSync as readFileSync3, statSync as statSync2, writeFileSync } from "node:fs";
-import { join as join2 } from "node:path";
+import { existsSync as existsSync7, readdirSync, readFileSync as readFileSync4, statSync as statSync2, writeFileSync } from "node:fs";
+import { 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 GATE_MESSAGE_PATTERN = /lazycodex-gate-reviewer|final gate review/i;
+var GATE_MESSAGE_PATTERN = /lazycodex-gate-reviewer|omo-senpi-gate-reviewer|final gate review/i;
 function applySpawnGuards(payload) {
   if (payload.hook_event_name !== "PreToolUse" || !SPAWN_TOOL_TOKENS.has(payload.tool_name))
     return "";
   const stateDir = ulwLoopDir(payload.cwd, { sessionId: payload.session_id });
-  const plan = readPlan(join2(stateDir, "goals.json"));
+  const plan = readPlan(join3(stateDir, "goals.json"));
   if (plan === null)
     return "";
   const fanOutDenial = consumeFanOutBudget(stateDir);
@@ -3115,7 +3176,7 @@ async function runSpawnGuardCli(stdin, stdout) {
   }
 }
 function consumeFanOutBudget(stateDir) {
-  const counterPath = join2(stateDir, "spawn-count.json");
+  const counterPath = join3(stateDir, "spawn-count.json");
   const count = readCount(counterPath) + 1;
   writeFileSync(counterPath, JSON.stringify({ count }));
   const limit = fanOutLimit();
@@ -3136,15 +3197,15 @@ function missingGateArtifact(payload, plan) {
     const attemptDir = ulwLoopAttemptEvidenceDir(goal3.id, goal3.attempt, scope);
     for (const name of [`${goal3.id}-code-review.md`, `${goal3.id}-manual-qa.md`]) {
       const relative2 = `${attemptDir}/${name}`;
-      if (!isNonEmptyFile(join2(payload.cwd, relative2)))
+      if (!isNonEmptyFile(join3(payload.cwd, relative2)))
         return relative2;
     }
     return null;
   }
   const flatReport = `.omo/evidence/${goal3.id}-code-review.md`;
-  if (!isNonEmptyFile(join2(payload.cwd, flatReport)))
+  if (!isNonEmptyFile(join3(payload.cwd, flatReport)))
     return flatReport;
-  if (!hasOtherEvidenceFile(join2(payload.cwd, ".omo", "evidence"), `${goal3.id}-code-review.md`))
+  if (!hasOtherEvidenceFile(join3(payload.cwd, ".omo", "evidence"), `${goal3.id}-code-review.md`))
     return `.omo/evidence/<any manual-QA artifact besides ${goal3.id}-code-review.md>`;
   return null;
 }
@@ -3154,7 +3215,7 @@ function isGateReviewerSpawn(toolInput) {
   const record = toolInput;
   const agentType = record["agent_type"];
   if (typeof agentType === "string")
-    return agentType === "lazycodex-gate-reviewer";
+    return GATE_REVIEWER_AGENT_NAMES.has(agentType);
   const message = record["message"];
   return typeof message === "string" && GATE_MESSAGE_PATTERN.test(message);
 }
@@ -3178,7 +3239,7 @@ function fanOutLimit() {
 }
 function isNonEmptyFile(path) {
   try {
-    return existsSync6(path) && statSync2(path).size > 0;
+    return existsSync7(path) && statSync2(path).size > 0;
   } catch (error) {
     if (error instanceof Error)
       return false;
@@ -3187,7 +3248,7 @@ function isNonEmptyFile(path) {
 }
 function hasOtherEvidenceFile(evidenceDir, excludedName) {
   try {
-    return readdirSync(evidenceDir).some((name) => name !== excludedName && isNonEmptyFile(join2(evidenceDir, name)));
+    return readdirSync(evidenceDir).some((name) => name !== excludedName && isNonEmptyFile(join3(evidenceDir, name)));
   } catch (error) {
     if (error instanceof Error)
       return false;
@@ -3196,7 +3257,7 @@ function hasOtherEvidenceFile(evidenceDir, excludedName) {
 }
 function readCount(counterPath) {
   try {
-    const parsed = JSON.parse(readFileSync3(counterPath, "utf8"));
+    const parsed = JSON.parse(readFileSync4(counterPath, "utf8"));
     return typeof parsed["count"] === "number" && parsed["count"] >= 0 ? parsed["count"] : 0;
   } catch (error) {
     if (error instanceof Error)
@@ -3206,7 +3267,7 @@ function readCount(counterPath) {
 }
 function readPlan(goalsPath) {
   try {
-    return JSON.parse(readFileSync3(goalsPath, "utf8"));
+    return JSON.parse(readFileSync4(goalsPath, "utf8"));
   } catch (error) {
     if (error instanceof Error)
       return null;
@@ -3215,8 +3276,8 @@ function readPlan(goalsPath) {
 }
 
 // packages/omo-codex/plugin/components/ulw-loop/src/stop-resume-hook.ts
-import { existsSync as existsSync7, readFileSync as readFileSync4, writeFileSync as writeFileSync2 } from "node:fs";
-import { isAbsolute as isAbsolute2, join as join3, resolve as resolve4, sep as sep2 } from "node:path";
+import { existsSync as existsSync8, readFileSync as readFileSync5, writeFileSync as writeFileSync2 } from "node:fs";
+import { isAbsolute as isAbsolute2, join as join4, resolve as resolve4, sep as sep2 } from "node:path";
 var RESUME_CAP = 2;
 var CONTEXT_PRESSURE_MARKERS2 = [
   "context compacted",
@@ -3236,7 +3297,7 @@ function runStopResumeHook(input) {
   if (boulderContinuationWillFire(payload.cwd, payload.session_id))
     return "";
   const stateDir = ulwLoopDir(payload.cwd, { sessionId: payload.session_id });
-  const plan = readPlan2(join3(stateDir, "goals.json"));
+  const plan = readPlan2(join4(stateDir, "goals.json"));
   if (plan === null || plan.aggregateCompletion?.status === "complete")
     return "";
   const goal3 = resumableGoal(plan);
@@ -3273,7 +3334,7 @@ function isResumableStatus(status2) {
   return status2 === "pending" || status2 === "in_progress";
 }
 function consumeResumeBudget(stateDir, goalId) {
-  const ledgerLineCount = countLedgerLines(join3(stateDir, "ledger.jsonl"));
+  const ledgerLineCount = countLedgerLines(join4(stateDir, "ledger.jsonl"));
   const counterPath = resolve4(stateDir, `auto-resume-${goalId}.json`);
   const stuckPath = resolve4(stateDir, `auto-resume-${goalId}.stuck`);
   if (!isInsideDir(stateDir, counterPath) || !isInsideDir(stateDir, stuckPath))
@@ -3306,7 +3367,7 @@ function renderResumeDirective(plan, goal3, sessionId) {
 }
 function readPlan2(goalsPath) {
   try {
-    return JSON.parse(readFileSync4(goalsPath, "utf8"));
+    return JSON.parse(readFileSync5(goalsPath, "utf8"));
   } catch (error) {
     if (error instanceof Error)
       return null;
@@ -3315,7 +3376,7 @@ function readPlan2(goalsPath) {
 }
 function countLedgerLines(ledgerPath) {
   try {
-    return readFileSync4(ledgerPath, "utf8").split(`
+    return readFileSync5(ledgerPath, "utf8").split(`
 `).filter(Boolean).length;
   } catch (error) {
     if (error instanceof Error)
@@ -3325,9 +3386,9 @@ function countLedgerLines(ledgerPath) {
 }
 function readCounter(counterPath) {
   try {
-    if (!existsSync7(counterPath))
+    if (!existsSync8(counterPath))
       return null;
-    const parsed = JSON.parse(readFileSync4(counterPath, "utf8"));
+    const parsed = JSON.parse(readFileSync5(counterPath, "utf8"));
     if (typeof parsed["count"] !== "number" || typeof parsed["ledgerLineCount"] !== "number")
       return null;
     return { count: parsed["count"], ledgerLineCount: parsed["ledgerLineCount"] };
@@ -3339,7 +3400,7 @@ function readCounter(counterPath) {
 }
 function boulderContinuationWillFire(cwd, sessionId) {
   try {
-    const raw = JSON.parse(readFileSync4(join3(cwd, ".omo", "boulder.json"), "utf8"));
+    const raw = JSON.parse(readFileSync5(join4(cwd, ".omo", "boulder.json"), "utf8"));
     const works = raw["works"];
     const entries = typeof works === "object" && works !== null ? Object.values(works) : [raw];
     return entries.some((work) => {
@@ -3358,7 +3419,7 @@ function boulderContinuationWillFire(cwd, sessionId) {
 }
 function transcriptShowsContextPressure(transcriptPath) {
   try {
-    const transcript = readFileSync4(transcriptPath, "utf8").toLowerCase();
+    const transcript = readFileSync5(transcriptPath, "utf8").toLowerCase();
     return CONTEXT_PRESSURE_MARKERS2.some((marker) => transcript.includes(marker));
   } catch (error) {
     if (error instanceof Error)
@@ -3370,12 +3431,12 @@ function boulderPlanHasChecklist(cwd, entry) {
   const activePlan = entry["active_plan"];
   if (typeof activePlan !== "string" || activePlan.trim().length === 0)
     return false;
-  const planPath = isAbsolute2(activePlan) ? activePlan : join3(cwd, activePlan);
+  const planPath = isAbsolute2(activePlan) ? activePlan : join4(cwd, activePlan);
   const worktree = entry["worktree_path"];
-  const candidates = typeof worktree === "string" && worktree.trim().length > 0 && !isAbsolute2(activePlan) ? [join3(isAbsolute2(worktree) ? worktree : join3(cwd, worktree), activePlan), planPath] : [planPath];
+  const candidates = typeof worktree === "string" && worktree.trim().length > 0 && !isAbsolute2(activePlan) ? [join4(isAbsolute2(worktree) ? worktree : join4(cwd, worktree), activePlan), planPath] : [planPath];
   for (const candidate of candidates) {
     try {
-      return readFileSync4(candidate, "utf8").split(/\r?\n/).some((line) => line.startsWith("- [ ] ") || line.startsWith("- [x] ") || line.startsWith("- [X] "));
+      return readFileSync5(candidate, "utf8").split(/\r?\n/).some((line) => line.startsWith("- [ ] ") || line.startsWith("- [x] ") || line.startsWith("- [X] "));
     } catch (error) {
       if (!(error instanceof Error))
         throw error;
@@ -3400,18 +3461,12 @@ function parseStopPayload(value) {
 }
 
 // packages/omo-codex/plugin/components/ulw-loop/src/cli.ts
-var TOP_LEVEL_HELP = `Usage:
-  omo-agent-toolkit ulw-loop <subcommand> [args]
-  omo-agent-toolkit hook user-prompt-submit [--with-ultrawork]  (Codex UserPromptSubmit hook)
-  omo-agent-toolkit help | --help | -h                          (this message)
-
-Run \`omo-agent-toolkit ulw-loop help\` for ulw-loop subcommands.
-`;
 async function main() {
   const argv = process.argv.slice(2);
   const command = argv[0];
   if (command === undefined || command === "help" || command === "--help" || command === "-h") {
-    process.stdout.write(TOP_LEVEL_HELP);
+    process.stdout.write(`${ULW_LOOP_HELP}
+`);
     return 0;
   }
   if (command === "ulw-loop")
@@ -3443,7 +3498,8 @@ async function main() {
   if (isUlwLoopSubcommand(command))
     return ulwLoopCommand(argv);
   process.stderr.write(`[omo] unknown command: ${command}
-${TOP_LEVEL_HELP}`);
+${ULW_LOOP_HELP}
+`);
   return 1;
 }
 main().then((code) => {

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

@@ -1,3 +1,4 @@
+import { type UlwLoopToolkitSurface } from "./surface.js";
 import type { UlwLoopItem, UlwLoopPlan } from "./types.js";
 export interface CodexCreateGoalPayload {
     readonly objective: string;
@@ -10,4 +11,5 @@ export declare function buildCodexGoalInstruction(args: {
     readonly plan: UlwLoopPlan;
     readonly goal: UlwLoopItem;
     readonly isFinal?: boolean;
+    readonly surface?: UlwLoopToolkitSurface;
 }): UlwLoopGoalInstruction;

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

@@ -1,15 +1,17 @@
 // biome-ignore-all format: long agent-facing instruction strings are intentionally stable.
 import { codexGoalMode, expectedCodexObjective, isEssentialCriterion, isFinalRunCompletionCandidate, } from "./goal-status.js";
+import { resolveToolkitSurface, reviewerRolesFor } from "./surface.js";
 export function buildCodexGoalInstruction(args) {
     const mode = codexGoalMode(args.plan);
     const createGoal = buildCreateGoalPayload(args.plan, args.goal);
     const isFinal = args.isFinal ?? isFinalRunCompletionCandidate(args.plan, args.goal);
-    return { text: buildText(mode, args.plan, args.goal, createGoal, isFinal), json: createGoal };
+    const surface = args.surface ?? resolveToolkitSurface();
+    return { text: buildText(mode, args.plan, args.goal, createGoal, isFinal, surface), json: createGoal };
 }
 function buildCreateGoalPayload(plan, goal) {
     return { objective: expectedCodexObjective(plan, goal) };
 }
-function buildText(mode, plan, goal, createGoal, isFinal) {
+function buildText(mode, plan, goal, createGoal, isFinal, surface) {
     return joinLines([
         mode === "aggregate" ? "UlwLoop aggregate-goal handoff" : "UlwLoop active-goal handoff",
         `Mode: ${mode}`,
@@ -26,7 +28,7 @@ function buildText(mode, plan, goal, createGoal, isFinal) {
         "- Goals are unlimited. Do not add numeric limits.",
         ...modeConstraintLines(mode, isFinal),
         ...evidenceLayoutLines(plan),
-        finalSection(plan, goal, isFinal, mode === "aggregate"),
+        finalSection(plan, goal, isFinal, mode === "aggregate", surface),
         ...checkpointLines(plan, mode),
         "",
         "create_goal payload:",
@@ -80,7 +82,8 @@ function evidenceLayoutLines(plan) {
         "- Evidence layout v2: write every artifact for the active goal (QA matrix, review reports, receipts) under the current attempt directory — read currentAttemptDir from `omo-agent-toolkit ulw-loop status --json` (.omo/evidence/ulw/<session>/<goalId>/a<attempt>). The final checkpoint rejects quality-gate artifacts outside that directory.",
     ];
 }
-function finalSection(plan, goal, isFinal, aggregate) {
+function finalSection(plan, goal, isFinal, aggregate, surface) {
+    const roles = reviewerRolesFor(surface);
     if (!isFinal)
         return "- This is not the final ulw-loop story; do not run the final reviewer/manual-QA/gate-review quality gate yet.";
     const option = sessionOption(plan);
@@ -90,8 +93,8 @@ function finalSection(plan, goal, isFinal, aggregate) {
         "Final story — run mandatory quality gate before update_goal:",
         "- Run targeted verification for changed behavior.",
         "- Confirm every manualQa artifact path exists and has non-zero size.",
-        "- First spawn lazycodex-code-reviewer and lazycodex-qa-executor 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 lazycodex-gate-reviewer (same fork settings), passing those artifact paths.",
+        `- 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.",
         "- 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.",

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

@@ -31,7 +31,7 @@ export function parseCodexGoalSnapshot(value) {
         return { available: false, raw: value };
     }
     const goal = safeObject(goalValue);
-    const objective = safeString(goal["objective"] ?? goal["goal"] ?? goal["description"] ?? root["objective"]);
+    const objective = safeString(goal["objective"] ?? goal["goal"] ?? goal["description"] ?? goal["title"] ?? root["objective"] ?? root["title"]);
     const status = normalizeStatus(goal["status"] ?? root["status"]);
     return {
         available: Boolean(objective || status !== "unknown"),