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

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

@@ -1,17 +1,17 @@
 #!/usr/bin/env node
 
-// components/ulw-loop/src/checkpoint.ts
+// packages/omo-codex/plugin/components/ulw-loop/src/checkpoint.ts
 import { existsSync as existsSync3, statSync } from "node:fs";
 import { readFile as readFile5 } from "node:fs/promises";
 import { resolve as resolve3 } from "node:path";
 
-// components/ulw-loop/src/checkpoint-reconciliation.ts
+// packages/omo-codex/plugin/components/ulw-loop/src/checkpoint-reconciliation.ts
 import { existsSync } from "node:fs";
 import { readFile } from "node:fs/promises";
 
-// components/ulw-loop/src/paths.ts
+// packages/omo-codex/plugin/components/ulw-loop/src/paths.ts
 import { isAbsolute, join, relative, sep } from "node:path";
-// components/ulw-loop/src/constants.ts
+// packages/omo-codex/plugin/components/ulw-loop/src/constants.ts
 var ULW_LOOP_DIR = ".omo/ulw-loop";
 var ULW_LOOP_BRIEF = "brief.md";
 var ULW_LOOP_GOALS = "goals.json";
@@ -31,7 +31,7 @@ var ULW_LOOP_SUCCESS_CRITERION_USER_MODELS = [
   "regression",
   "adversarial"
 ];
-// components/ulw-loop/src/runtime.ts
+// packages/omo-codex/plugin/components/ulw-loop/src/runtime.ts
 class UlwLoopError extends Error {
   code;
   details;
@@ -47,7 +47,7 @@ class UlwLoopError extends Error {
 function iso() {
   return new Date().toISOString();
 }
-// components/ulw-loop/src/paths.ts
+// 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"];
 function normalizeUlwLoopSessionId(sessionId) {
   const trimmed = sessionId?.trim();
@@ -113,7 +113,7 @@ function isWithinAttemptDir(absolutePath, attemptRoot, pathApi = PLATFORM_PATH_A
   return !pathApi.isAbsolute(relativePath);
 }
 
-// components/ulw-loop/src/goal-status.ts
+// packages/omo-codex/plugin/components/ulw-loop/src/goal-status.ts
 var ULW_LOOP_AGGREGATE_CODEX_OBJECTIVE = aggregateCodexObjectiveForScope();
 function aggregateCodexObjectiveForScope(scope) {
   return `Complete the durable ulw-loop plan in ${ulwLoopGoalsRelativePath(scope)}, including later accepted/appended stories, under the original brief constraints; use ${ulwLoopLedgerRelativePath(scope)} as the audit trail.`;
@@ -196,7 +196,7 @@ function hasEssentialCriteriaPass(goal) {
   return criteria.length > 0 && criteria.every((criterion) => criterion.status === "pass");
 }
 
-// components/ulw-loop/src/checkpoint-reconciliation.ts
+// packages/omo-codex/plugin/components/ulw-loop/src/checkpoint-reconciliation.ts
 function normalizeObjective(value) {
   return value.replace(/\s+/g, " ").trim();
 }
@@ -256,7 +256,7 @@ async function canReconcileActiveFinalTaskScopedAggregateSnapshot(repoRoot, plan
 function buildCompletedLegacyGoalRemediation(goal) {
   return [
     "If get_goal returns a different completed legacy/thread objective, do not repeat --status complete in this thread.",
-    `Record a non-terminal blocker with: omo ulw-loop checkpoint --goal-id ${goal.id} --status blocked --evidence "<completed legacy Codex goal blocks create_goal in this thread>" --codex-goal-json "<different completed get_goal JSON or path>".`,
+    `Record a non-terminal blocker with: omo-agent-toolkit ulw-loop checkpoint --goal-id ${goal.id} --status blocked --evidence "<completed legacy Codex goal blocks create_goal in this thread>" --codex-goal-json "<different completed get_goal JSON or path>".`,
     "Then continue only from a Codex goal context with no active/completed conflicting goal, in the same repo/worktree, and create the intended goal there."
   ].join(" ");
 }
@@ -267,7 +267,7 @@ function buildTaskScopedAggregateReconciliationHint(goal, final) {
   return ` Completed task-scoped aggregate reconciliation requires the checkpoint goal to be the active in-progress OMO goal, evidence that names that active OMO goal id, names .omo/ulw-loop/goals.json or ledger.jsonl, includes completed implementation plus validation/review evidence, and a get_goal objective that maps to the ulw-loop brief/artifact. ${buildCompletedLegacyGoalRemediation(goal)}`;
 }
 
-// components/ulw-loop/src/codex-goal-snapshot.ts
+// packages/omo-codex/plugin/components/ulw-loop/src/codex-goal-snapshot.ts
 import { existsSync as existsSync2 } from "node:fs";
 import { readFile as readFile2 } from "node:fs/promises";
 import { resolve } from "node:path";
@@ -364,7 +364,7 @@ function formatCodexGoalReconciliation(reconciliation) {
   return parts.join(" ");
 }
 
-// components/ulw-loop/src/plan-io.ts
+// packages/omo-codex/plugin/components/ulw-loop/src/plan-io.ts
 import { createReadStream } from "node:fs";
 import { appendFile, mkdir, readFile as readFile3, rename, writeFile } from "node:fs/promises";
 import { createInterface } from "node:readline";
@@ -408,7 +408,7 @@ async function readUlwLoopPlan(repoRoot, scope) {
   } catch (error) {
     if (!hasCode(error, "ENOENT"))
       throw error;
-    throw new UlwLoopError(`No ulw-loop plan found at ${repoRelative(path, repoRoot)}. Run \`omo ulw-loop create-goals ...\` first.`, "ULW_LOOP_PLAN_MISSING", { cause: error });
+    throw new UlwLoopError(`No ulw-loop plan found at ${repoRelative(path, repoRoot)}. Run \`omo-agent-toolkit ulw-loop create-goals ...\` first.`, "ULW_LOOP_PLAN_MISSING", { cause: error });
   }
   const parsed = JSON.parse(raw);
   if (parsed.version !== 1 || !Array.isArray(parsed.goals)) {
@@ -482,7 +482,7 @@ async function findAcceptedSteeringLedgerEntry(repoRoot, key, scope) {
   return;
 }
 
-// components/ulw-loop/src/evidence.ts
+// packages/omo-codex/plugin/components/ulw-loop/src/evidence.ts
 function ulwLoopFail(message, code, details) {
   throw new UlwLoopError(message, code, { details });
 }
@@ -588,10 +588,10 @@ function requireEssentialCriteriaPass(goal) {
   });
 }
 
-// components/ulw-loop/src/quality-gate.ts
+// packages/omo-codex/plugin/components/ulw-loop/src/quality-gate.ts
 import { resolve as resolve2 } from "node:path";
 
-// components/ulw-loop/src/quality-gate-fields.ts
+// packages/omo-codex/plugin/components/ulw-loop/src/quality-gate-fields.ts
 var PLACEHOLDER_PATTERN = /^(?:placeholder|todo|tbd|n\/a|stub)$/i;
 function invalid(message, field) {
   throw new UlwLoopError(message, "ULW_LOOP_QUALITY_GATE_INVALID", { details: { field } });
@@ -629,7 +629,7 @@ function literal(value, expected, field) {
   invalid(`${field} must be ${String(expected)}.`, field);
 }
 
-// components/ulw-loop/src/quality-gate-verdicts.ts
+// packages/omo-codex/plugin/components/ulw-loop/src/quality-gate-verdicts.ts
 function passedVerdict(value, field) {
   if (value === "not_applicable")
     invalid(`${field} must not be not_applicable.`, field);
@@ -650,7 +650,7 @@ function adversarialVerdict(row, field) {
   invalid(`${field} must be passed or not_applicable with a reason.`, field);
 }
 
-// components/ulw-loop/src/quality-gate-blockers.ts
+// 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;
 var PUNCTUATION_PATTERN = /[`"'()[\]{}:,;]/g;
@@ -692,7 +692,7 @@ function clearGoalBlockerFields(goal) {
     Reflect.deleteProperty(goal, key);
 }
 
-// components/ulw-loop/src/quality-gate.ts
+// packages/omo-codex/plugin/components/ulw-loop/src/quality-gate.ts
 var REVIEWER_ROLES = {
   codeReview: "lazycodex-code-reviewer",
   manualQa: "lazycodex-qa-executor",
@@ -876,7 +876,7 @@ function parseAdversarialCases(value, byId) {
   });
 }
 
-// components/ulw-loop/src/cli-arg-parser.ts
+// packages/omo-codex/plugin/components/ulw-loop/src/cli-arg-parser.ts
 import { readFile as readFile4 } from "node:fs/promises";
 var VALUE_FLAGS = new Set("--brief --brief-file --session-id --codex-goal-mode --validation-batch-json --goal --goal-id --criterion-id --status --evidence --notes --codex-goal-json --quality-gate-json --kind --rationale --title --objective --target-goal-id --source --after-json --directive-json --directive-file --idempotency-key --proposals-json".split(" "));
 var SUBCOMMANDS = new Set("create-goals status complete-goals criteria record-evidence checkpoint steer add-goal record-review-blockers".split(" "));
@@ -967,7 +967,7 @@ function parseRecordEvidenceArgs(argv) {
   return notes ? { ...result, notes } : result;
 }
 
-// components/ulw-loop/src/validation-batch.ts
+// packages/omo-codex/plugin/components/ulw-loop/src/validation-batch.ts
 function isObject(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -1085,7 +1085,7 @@ function fail(message, code = "ULW_LOOP_VALIDATION_BATCH_INVALID") {
   throw new UlwLoopError(message, code);
 }
 
-// components/ulw-loop/src/checkpoint.ts
+// packages/omo-codex/plugin/components/ulw-loop/src/checkpoint.ts
 var QUALITY_GATE_FS = { existsSync: existsSync3, statSync };
 function ulwLoopFail2(message, code) {
   throw new UlwLoopError(message, code);
@@ -1252,17 +1252,17 @@ async function checkpointUlwLoop(repoRoot, args, scope) {
   });
 }
 
-// components/ulw-loop/src/cli-output.ts
+// packages/omo-codex/plugin/components/ulw-loop/src/cli-output.ts
 var ULW_LOOP_HELP = `Usage:
-  omo 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 ulw-loop status [--json]
-  omo ulw-loop complete-goals [--retry-failed] [--json]
-  omo ulw-loop criteria --goal-id <id> [--json]
-  omo ulw-loop record-evidence --goal-id <id> --criterion-id <id> --status pass|fail|blocked --evidence "..." [--notes "..."] [--json]
-  omo ulw-loop checkpoint --goal-id <id> --status complete|failed|blocked --evidence "..." --codex-goal-json <...> [--quality-gate-json <...>] [--no-advance] [--json]
-  omo ulw-loop steer --kind <kind> ... --evidence "..." --rationale "..." [--proposals-json <json-or-path>] [--json]
-  omo ulw-loop add-goal --title "..." --objective "..." [--json]
-  omo ulw-loop record-review-blockers --goal-id <id> --title "..." --objective "..." --evidence "..." --codex-goal-json <...> [--json]
+  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]
+  omo-agent-toolkit ulw-loop criteria --goal-id <id> [--json]
+  omo-agent-toolkit ulw-loop record-evidence --goal-id <id> --criterion-id <id> --status pass|fail|blocked --evidence "..." [--notes "..."] [--json]
+  omo-agent-toolkit ulw-loop checkpoint --goal-id <id> --status complete|failed|blocked --evidence "..." --codex-goal-json <...> [--quality-gate-json <...>] [--no-advance] [--json]
+  omo-agent-toolkit ulw-loop steer --kind <kind> ... --evidence "..." --rationale "..." [--proposals-json <json-or-path>] [--json]
+  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.`;
 function printJson(value) {
@@ -1330,7 +1330,7 @@ function normalizeCodexGoalMode(value) {
   throw new UlwLoopError("Invalid --codex-goal-mode; expected aggregate or per_story.", "ULW_LOOP_CODEX_GOAL_MODE_INVALID", { details: { value } });
 }
 
-// components/ulw-loop/src/codex-goal-instruction.ts
+// packages/omo-codex/plugin/components/ulw-loop/src/codex-goal-instruction.ts
 function buildCodexGoalInstruction(args) {
   const mode = codexGoalMode(args.plan);
   const createGoal = buildCreateGoalPayload(args.plan, args.goal);
@@ -1373,7 +1373,7 @@ function modeConstraintLines(mode, isFinal) {
     ];
   }
   return [
-    "- Codex goal = the whole omo ulw-loop run; OMO G001/G002/etc. = ledger stories.",
+    "- Codex goal = the whole omo-agent-toolkit ulw-loop run; OMO G001/G002/etc. = ledger stories.",
     "- First call get_goal. If no active goal exists, call create_goal with the aggregate payload below.",
     "- If get_goal reports the same aggregate objective as active, continue this OMO story without creating a new Codex goal.",
     "- If a different active or incomplete Codex goal exists, finish/checkpoint that goal before starting this ulw-loop.",
@@ -1406,15 +1406,15 @@ function evidenceLayoutLines(plan) {
   if (plan.evidenceLayoutVersion !== 2)
     return [];
   return [
-    "- Evidence layout v2: write every artifact for the active goal (QA matrix, review reports, receipts) under the current attempt directory — read currentAttemptDir from `omo ulw-loop status --json` (.omo/evidence/ulw/<session>/<goalId>/a<attempt>). The final checkpoint rejects quality-gate artifacts outside that directory."
+    "- 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) {
   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);
-  const blockerCommand = `omo 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 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>"`;
+  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:",
     "- Run targeted verification for changed behavior.",
@@ -1443,11 +1443,11 @@ function joinLines(lines) {
 `);
 }
 
-// components/ulw-loop/src/plan-crud.ts
+// packages/omo-codex/plugin/components/ulw-loop/src/plan-crud.ts
 import { existsSync as existsSync4 } from "node:fs";
 import { mkdir as mkdir2, writeFile as writeFile2 } from "node:fs/promises";
 
-// components/ulw-loop/src/plan-goal-factory.ts
+// packages/omo-codex/plugin/components/ulw-loop/src/plan-goal-factory.ts
 function cleanLine(line) {
   return line.replace(/^\s*(?:[-*+]\s+|\d+[.)]\s+)/, "").trim();
 }
@@ -1536,7 +1536,7 @@ function appendGoalToPlan(plan, title, objective, now) {
   return goal;
 }
 
-// components/ulw-loop/src/plan-crud.ts
+// packages/omo-codex/plugin/components/ulw-loop/src/plan-crud.ts
 function isScheduleEligible(goal) {
   return goal.steeringStatus !== "superseded" && goal.steeringStatus !== "blocked";
 }
@@ -1591,7 +1591,7 @@ async function createUlwLoopPlan(repoRoot, args, scope) {
 function completedPlanExistsError(scope) {
   return new UlwLoopError([
     `Existing ulw-loop aggregate is already complete at ${ulwLoopGoalsRelativePath(scope)}.`,
-    "Start a new run with `omo ulw-loop create-goals --session-id <new-id> ...` to isolate fresh state.",
+    "Start a new run with `omo-agent-toolkit ulw-loop create-goals --session-id <new-id> ...` to isolate fresh state.",
     "Use --force only when you intentionally want to overwrite the completed evidence."
   ].join(" "), "ULW_LOOP_PLAN_EXISTS_COMPLETE");
 }
@@ -1663,7 +1663,7 @@ function summarizeUlwLoopPlan(plan) {
   };
 }
 
-// components/ulw-loop/src/checkpoint-continuation.ts
+// packages/omo-codex/plugin/components/ulw-loop/src/checkpoint-continuation.ts
 async function checkpointAndContinue(repoRoot, args, scope) {
   const result = await checkpointUlwLoop(repoRoot, args, scope);
   if (args.status !== "complete" || result.aggregateCompletion !== undefined || !args.advance)
@@ -1726,10 +1726,10 @@ function checkpointStatus(value) {
   throw new UlwLoopError("Missing or invalid --status; expected complete, failed, or blocked.", "ULW_LOOP_STATUS_INVALID", { details: { status: value } });
 }
 
-// components/ulw-loop/src/cli-subcommands.ts
+// packages/omo-codex/plugin/components/ulw-loop/src/cli-subcommands.ts
 import { readFile as readFile6 } from "node:fs/promises";
 
-// components/ulw-loop/src/cli-steering.ts
+// packages/omo-codex/plugin/components/ulw-loop/src/cli-steering.ts
 var SOURCES = ["user_prompt_submit", "finding", "cli"];
 var STEERING_KIND_HELP = [
   `Allowed --kind values: ${ULW_LOOP_STEERING_MUTATION_KINDS.join(", ")}`,
@@ -1741,7 +1741,7 @@ var STEERING_KIND_HELP = [
   "  revise_criterion: --goal-id, --criterion-id, one of --scenario/--expected-evidence/--user-model, --evidence, --rationale",
   "  annotate_ledger: --evidence, --rationale",
   "  mark_blocked_superseded: --goal-id, optional --replacements, --evidence, --rationale",
-  'Example: omo ulw-loop steer --kind annotate_ledger --evidence "observed behavior" --rationale "why this changes the plan" --json'
+  'Example: omo-agent-toolkit ulw-loop steer --kind annotate_ledger --evidence "observed behavior" --rationale "why this changes the plan" --json'
 ].join(`
 `);
 function isKind(value) {
@@ -2036,7 +2036,7 @@ function printSteerBatchResult(result, json) {
   printStatus(result.plan);
 }
 
-// components/ulw-loop/src/review-blockers.ts
+// packages/omo-codex/plugin/components/ulw-loop/src/review-blockers.ts
 var BLOCKER_FIELDS = "blockedReason blockerSignature blockerOccurrenceCount requiredExternalDecision nonRetriable failedAt failureReason completedAt blocker blockerEvidence blockerOccurrences blockedAt".split(" ");
 function ulwLoopError(message, code) {
   throw new UlwLoopError(message, code);
@@ -2102,7 +2102,7 @@ async function recordFinalReviewBlockers(repoRoot, args, scope) {
   });
 }
 
-// components/ulw-loop/src/steering-mutations.ts
+// packages/omo-codex/plugin/components/ulw-loop/src/steering-mutations.ts
 var read2 = (value, key) => Object.entries(value).find(([name]) => name === key)?.[1];
 var isText = (value) => typeof value === "string" && value.trim().length > 0;
 var text3 = (value, key) => {
@@ -2189,7 +2189,7 @@ function reviseCriterion(plan, proposal, now) {
   target.updatedAt = now;
 }
 
-// components/ulw-loop/src/steering-snapshot.ts
+// packages/omo-codex/plugin/components/ulw-loop/src/steering-snapshot.ts
 function buildSteeringPlanSnapshot(plan, changedGoalIds) {
   const snapshot = {
     updatedAt: plan.updatedAt,
@@ -2213,7 +2213,7 @@ function changedGoalIdsBetween(before, after2) {
   return changed;
 }
 
-// components/ulw-loop/src/steering.ts
+// packages/omo-codex/plugin/components/ulw-loop/src/steering.ts
 var SOURCES2 = ["user_prompt_submit", "finding", "cli"];
 var PROTECTED = new Set(["aggregateCompletion", "codexObjective", "codexObjectiveAliases", "originalConstraints", "qualityGate", "status", "completedAt", "completionStatus"]);
 var isObject2 = (value) => typeof value === "object" && value !== null;
@@ -2398,7 +2398,7 @@ function isProposal(value) {
   return isPlain2(value) && isKind2(read3(value, "kind")) && isSource2(read3(value, "source")) && isText2(read3(value, "evidence")) && isText2(read3(value, "rationale"));
 }
 function parseUlwLoopSteeringDirective(text5) {
-  const match = /(?:^|\s)(?:OMO_ULW_LOOP_STEER|omo\.ulw-loop\.steer|omo ulw-loop steer):\s*([\s\S]+)$/u.exec(text5);
+  const match = /(?:^|\s)(?:OMO_ULW_LOOP_STEER|omo\.ulw-loop\.steer|omo ulw-loop steer|omo-agent-toolkit ulw-loop steer):\s*([\s\S]+)$/u.exec(text5);
   if (match?.[1] === undefined)
     return null;
   try {
@@ -2450,7 +2450,7 @@ function ledgerEntry(proposal, audit, at) {
   return entry;
 }
 
-// components/ulw-loop/src/steering-batch.ts
+// packages/omo-codex/plugin/components/ulw-loop/src/steering-batch.ts
 async function steerUlwLoopBatch(repoRoot, proposals, scope) {
   return withUlwLoopMutationLock(repoRoot, scope, async () => {
     const plan = await readUlwLoopPlan(repoRoot, scope);
@@ -2531,7 +2531,7 @@ function ledgerEntry2(proposal, audit, at) {
   return entry;
 }
 
-// components/ulw-loop/src/cli-subcommands.ts
+// packages/omo-codex/plugin/components/ulw-loop/src/cli-subcommands.ts
 async function createGoals(repoRoot, argv, json, scope) {
   const briefFile = readValue(argv, "--brief-file");
   const brief = readValue(argv, "--brief") ?? (briefFile === undefined ? undefined : await readFile6(briefFile, "utf8")) ?? (hasFlag(argv, "--from-stdin") ? await readStdin() : undefined) ?? positionalText(argv);
@@ -2687,7 +2687,7 @@ function findGoal3(plan, goalId) {
   throw new UlwLoopError(`Unknown ulw-loop id: ${goalId}.`, "ULW_LOOP_GOAL_NOT_FOUND", { details: { goalId } });
 }
 
-// components/ulw-loop/src/cli-commands.ts
+// packages/omo-codex/plugin/components/ulw-loop/src/cli-commands.ts
 var ULW_LOOP_SUBCOMMANDS = [
   "help",
   "create-goals",
@@ -2786,10 +2786,10 @@ function commandScope(argv) {
   return sessionId === null ? undefined : { sessionId };
 }
 
-// components/ulw-loop/src/ultrawork-directive.ts
+// packages/omo-codex/plugin/components/ulw-loop/src/ultrawork-directive.ts
 import { readFileSync as readFileSync2 } from "node:fs";
 
-// components/ulw-loop/src/ultrawork-skill-pointer.ts
+// 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";
 var ULTRAWORK_SKILL_POINTER_TEMPLATE = `<ultrawork-mode>
@@ -2837,7 +2837,7 @@ function buildUltraworkAdditionalContext(options = {}) {
   return ULTRAWORK_DIRECTIVE;
 }
 
-// components/ulw-loop/src/ultrawork-directive.ts
+// packages/omo-codex/plugin/components/ulw-loop/src/ultrawork-directive.ts
 var ULTRAWORK_CURRENT_PROMPT_PATTERN = /(?:ultrawork|ulw)/i;
 var ULTRAWORK_DIRECTIVE_MARKER = "<ultrawork-mode>";
 var TRANSCRIPT_SEARCH_BYTES = 512000;
@@ -2940,7 +2940,7 @@ function isRecord3(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
-// components/ulw-loop/src/codex-hook.ts
+// packages/omo-codex/plugin/components/ulw-loop/src/codex-hook.ts
 var CREATE_GOAL_TOOL_NAME = "create_goal";
 var CREATE_GOAL_PAYLOAD_WARNING = "Use create_goal with objective only. Omit token_budget so the goal stays unlimited, and put lifecycle status changes on update_goal.";
 function parseUserPromptSubmitPayload(raw) {
@@ -2995,7 +2995,7 @@ async function applyUserPromptUlwLoopSteering(payload, options = {}) {
   }
 }
 function hasSteeringDirectiveMarker(prompt) {
-  return /(?:^|\s)(?:OMO_ULW_LOOP_STEER|omo\.ulw-loop\.steer|omo ulw-loop steer):/u.test(prompt);
+  return /(?:^|\s)(?:OMO_ULW_LOOP_STEER|omo\.ulw-loop\.steer|omo ulw-loop steer|omo-agent-toolkit ulw-loop steer):/u.test(prompt);
 }
 function payloadScope(payload) {
   return { sessionId: payload.session_id };
@@ -3077,7 +3077,7 @@ function readAll(stdin) {
   });
 }
 
-// components/ulw-loop/src/spawn-guard.ts
+// 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";
 var SPAWN_TOOL_TOKENS = new Set(["spawn_agent", "collaborationspawn_agent", "collaboration.spawn_agent"]);
@@ -3214,7 +3214,7 @@ function readPlan(goalsPath) {
   }
 }
 
-// components/ulw-loop/src/stop-resume-hook.ts
+// 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";
 var RESUME_CAP = 2;
@@ -3297,9 +3297,9 @@ function renderResumeDirective(plan, goal3, sessionId) {
   return [
     `The ulw-loop run in this session still has unfinished goals (next: ${goal3.id} — ${goal3.title}).`,
     "The turn ended before the loop completed. Resume it now:",
-    `1. Run \`omo ulw-loop status${option} --json\` to reload the plan, the active goal, and currentAttemptDir.`,
+    `1. Run \`omo-agent-toolkit ulw-loop status${option} --json\` to reload the plan, the active goal, and currentAttemptDir.`,
     "2. Continue the active goal's remaining success criteria, recording evidence with record-evidence.",
-    `3. Checkpoint through \`omo ulw-loop checkpoint${option}\` when the goal's criteria are proven; a complete checkpoint prints the next goal instruction.`,
+    `3. Checkpoint through \`omo-agent-toolkit ulw-loop checkpoint${option}\` when the goal's criteria are proven; a complete checkpoint prints the next goal instruction.`,
     "If the loop is genuinely blocked on the user, checkpoint the goal as blocked with the reason instead."
   ].join(`
 `);
@@ -3399,13 +3399,13 @@ function parseStopPayload(value) {
   };
 }
 
-// components/ulw-loop/src/cli.ts
+// packages/omo-codex/plugin/components/ulw-loop/src/cli.ts
 var TOP_LEVEL_HELP = `Usage:
-  omo ulw-loop <subcommand> [args]
-  omo hook user-prompt-submit [--with-ultrawork]  (Codex UserPromptSubmit hook)
-  omo help | --help | -h                          (this message)
+  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 ulw-loop help\` for ulw-loop subcommands.
+Run \`omo-agent-toolkit ulw-loop help\` for ulw-loop subcommands.
 `;
 async function main() {
   const argv = process.argv.slice(2);

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

@@ -42,7 +42,7 @@ function modeConstraintLines(mode, isFinal) {
         ];
     }
     return [
-        "- Codex goal = the whole omo ulw-loop run; OMO G001/G002/etc. = ledger stories.",
+        "- Codex goal = the whole omo-agent-toolkit ulw-loop run; OMO G001/G002/etc. = ledger stories.",
         "- First call get_goal. If no active goal exists, call create_goal with the aggregate payload below.",
         "- If get_goal reports the same aggregate objective as active, continue this OMO story without creating a new Codex goal.",
         "- If a different active or incomplete Codex goal exists, finish/checkpoint that goal before starting this ulw-loop.",
@@ -77,15 +77,15 @@ function evidenceLayoutLines(plan) {
     if (plan.evidenceLayoutVersion !== 2)
         return [];
     return [
-        "- Evidence layout v2: write every artifact for the active goal (QA matrix, review reports, receipts) under the current attempt directory — read currentAttemptDir from `omo ulw-loop status --json` (.omo/evidence/ulw/<session>/<goalId>/a<attempt>). The final checkpoint rejects quality-gate artifacts outside that directory.",
+        "- 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) {
     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);
-    const blockerCommand = `omo 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 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>"`;
+    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:",
         "- Run targeted verification for changed behavior.",

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

@@ -59,7 +59,7 @@ export async function applyUserPromptUlwLoopSteering(payload, options = {}) {
     }
 }
 function hasSteeringDirectiveMarker(prompt) {
-    return /(?:^|\s)(?:OMO_ULW_LOOP_STEER|omo\.ulw-loop\.steer|omo ulw-loop steer):/u.test(prompt);
+    return /(?:^|\s)(?:OMO_ULW_LOOP_STEER|omo\.ulw-loop\.steer|omo ulw-loop steer|omo-agent-toolkit ulw-loop steer):/u.test(prompt);
 }
 function payloadScope(payload) {
     return { sessionId: payload.session_id };

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

@@ -59,7 +59,7 @@ export async function createUlwLoopPlan(repoRoot, args, scope) {
 function completedPlanExistsError(scope) {
     return new UlwLoopError([
         `Existing ulw-loop aggregate is already complete at ${ulwLoopGoalsRelativePath(scope)}.`,
-        "Start a new run with `omo ulw-loop create-goals --session-id <new-id> ...` to isolate fresh state.",
+        "Start a new run with `omo-agent-toolkit ulw-loop create-goals --session-id <new-id> ...` to isolate fresh state.",
         "Use --force only when you intentionally want to overwrite the completed evidence.",
     ].join(" "), "ULW_LOOP_PLAN_EXISTS_COMPLETE");
 }

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

@@ -47,7 +47,7 @@ export async function readUlwLoopPlan(repoRoot, scope) {
     catch (error) {
         if (!hasCode(error, "ENOENT"))
             throw error;
-        throw new UlwLoopError(`No ulw-loop plan found at ${repoRelative(path, repoRoot)}. Run \`omo ulw-loop create-goals ...\` first.`, "ULW_LOOP_PLAN_MISSING", { cause: error });
+        throw new UlwLoopError(`No ulw-loop plan found at ${repoRelative(path, repoRoot)}. Run \`omo-agent-toolkit ulw-loop create-goals ...\` first.`, "ULW_LOOP_PLAN_MISSING", { cause: error });
     }
     const parsed = JSON.parse(raw);
     if (parsed.version !== 1 || !Array.isArray(parsed.goals)) {

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

@@ -188,7 +188,7 @@ function isProposal(value) {
     return isPlain(value) && isKind(read(value, "kind")) && isSource(read(value, "source")) && isText(read(value, "evidence")) && isText(read(value, "rationale"));
 }
 export function parseUlwLoopSteeringDirective(text) {
-    const match = /(?:^|\s)(?:OMO_ULW_LOOP_STEER|omo\.ulw-loop\.steer|omo ulw-loop steer):\s*([\s\S]+)$/u.exec(text);
+    const match = /(?:^|\s)(?:OMO_ULW_LOOP_STEER|omo\.ulw-loop\.steer|omo ulw-loop steer|omo-agent-toolkit ulw-loop steer):\s*([\s\S]+)$/u.exec(text);
     if (match?.[1] === undefined)
         return null;
     try {

package/packages/omo-codex/plugin/components/ulw-loop/dist/stop-resume-hook.js

@@ -91,9 +91,9 @@ function renderResumeDirective(plan, goal, sessionId) {
     return [
         `The ulw-loop run in this session still has unfinished goals (next: ${goal.id} — ${goal.title}).`,
         "The turn ended before the loop completed. Resume it now:",
-        `1. Run \`omo ulw-loop status${option} --json\` to reload the plan, the active goal, and currentAttemptDir.`,
+        `1. Run \`omo-agent-toolkit ulw-loop status${option} --json\` to reload the plan, the active goal, and currentAttemptDir.`,
         "2. Continue the active goal's remaining success criteria, recording evidence with record-evidence.",
-        `3. Checkpoint through \`omo ulw-loop checkpoint${option}\` when the goal's criteria are proven; a complete checkpoint prints the next goal instruction.`,
+        `3. Checkpoint through \`omo-agent-toolkit ulw-loop checkpoint${option}\` when the goal's criteria are proven; a complete checkpoint prints the next goal instruction.`,
         "If the loop is genuinely blocked on the user, checkpoint the goal as blocked with the reason instead.",
     ].join("\n");
 }

package/packages/omo-codex/plugin/components/ulw-loop/hooks/hooks.json

@@ -7,7 +7,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/dist/cli.js\" hook user-prompt-submit --with-ultrawork",
 						"timeout": 10,
-						"statusMessage": "(OmO 4.19.4) Checking Ulw-Loop Steering"
+						"statusMessage": "(OmO 5.0.0-beta.2) Checking Ulw-Loop Steering"
 					}
 				]
 			}
@@ -20,7 +20,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/dist/cli.js\" hook pre-tool-use",
 						"timeout": 5,
-						"statusMessage": "(OmO 4.19.4) Enforcing Unlimited Ulw-Loop Budget"
+						"statusMessage": "(OmO 5.0.0-beta.2) Enforcing Unlimited Ulw-Loop Budget"
 					}
 				]
 			},
@@ -31,7 +31,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/dist/cli.js\" hook pre-tool-use-spawn",
 						"timeout": 5,
-						"statusMessage": "(OmO 4.19.4) Guarding Ulw-Loop Spawns"
+						"statusMessage": "(OmO 5.0.0-beta.2) Guarding Ulw-Loop Spawns"
 					}
 				]
 			}
@@ -43,7 +43,7 @@
 						"type": "command",
 						"command": "node \"${PLUGIN_ROOT}/dist/cli.js\" hook stop",
 						"timeout": 10,
-						"statusMessage": "(OmO 4.19.4) Checking Ulw-Loop Resume"
+						"statusMessage": "(OmO 5.0.0-beta.2) Checking Ulw-Loop Resume"
 					}
 				]
 			}

package/packages/omo-codex/plugin/components/ulw-loop/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@code-yeongyu/codex-ulw-loop",
-	"version": "4.19.4",
+	"version": "5.0.0-beta.2",
 	"description": "Codex plugin: durable repo-native multi-goal orchestration with embedded success criteria and observable evidence audit.",
 	"type": "module",
 	"packageManager": "npm@11.12.1",

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

@@ -20,9 +20,9 @@ This skill is intentionally compact. The full workflow lives in `references/full
 ## Non-Negotiables
 
 - Use the ulw-loop CLI state under `.omo/ulw-loop`; do not hand-edit goal state.
-- Register goals up front (`omo ulw-loop create-goals`, then `create_goal` from the printed handoff) and mirror every atomic step into the live `update_plan` checklist: one ultra-granular step per action, exactly one in_progress, transitions marked the instant they happen.
-- After any compaction or context loss, re-read brief + goals + ledger FIRST plus `omo ulw-loop status --json`, then resume; never re-plan from scratch.
-- If `omo ulw-loop create-goals` says the existing aggregate is already complete, start unrelated new work with a fresh `--session-id <new-id>` instead of steering or forcing the completed default state. Use `--force` only to intentionally overwrite completed evidence.
+- Register goals up front (`omo-agent-toolkit ulw-loop create-goals`, then `create_goal` from the printed handoff) and mirror every atomic step into the live `update_plan` checklist: one ultra-granular step per action, exactly one in_progress, transitions marked the instant they happen.
+- After any compaction or context loss, re-read brief + goals + ledger FIRST plus `omo-agent-toolkit ulw-loop status --json`, then resume; never re-plan from scratch.
+- If `omo-agent-toolkit ulw-loop create-goals` says the existing aggregate is already complete, start unrelated new work with a fresh `--session-id <new-id>` instead of steering or forcing the completed default state. Use `--force` only to intentionally overwrite completed evidence.
 - Every success criterion needs observable evidence from a real surface: a channel (terminal/TUI via the xterm.js web terminal, HTTP, browser, computer-use) or, for CLI- or data-shaped criteria, an auxiliary surface (CLI stdout, DB diff, parsed config dump).
 - Evidence is bound to the tree it was captured at (`git rev-parse --short "HEAD^{tree}"`); it goes stale only when tracked content changes — a rebase or amend that keeps the tree identical keeps it valid. When the tree differs, re-run at the current HEAD and re-record, never relabel or regenerate. Record only after cleanup receipts exist.
 - Delegate code edits, test writes, fixes, and QA execution to right-sized Codex subagents when the workflow requires it.