@akagilnc/pi-workflow-roles 0.1.1893 → 0.1.1941

package/dist/reviewer-construction.js

@@ -11,6 +11,21 @@ export const REVIEWER_AXIS_OUTPUT_ADAPTER = Object.freeze({
     version: 1,
     implementationSha256: sha256Hex("reviewer-axis-output:v1:single-axis-verbatim-report+standards-three-priorities"),
 });
+/**
+ * Package-owned #1185 review verification cadence.
+ * Single true source consumed by two real actor carriers: parent Reviewer system-prompt injection
+ * and evidence-child system prompt. Not part of axis-adapter identity or axis leg prompts.
+ * Graded guidance only: focused tests allowed; full suite not forbidden but avoid frequent every-round reruns.
+ * Does not narrow ADR 0064 tools and adds no command ban, allowlist, or runtime block.
+ */
+export const REVIEWER_VERIFICATION_BOUNDARY = [
+    "Verification-Boundary: you may run focused product tests during this review turn when independent verification needs them.",
+    "A full repository test suite is not forbidden, but do not re-run it every review round;",
+    "prefer once at family wrap-up unless this review specifically requires a broader run.",
+    "Slice and review work should not trigger frequent full-suite reruns.",
+    "Independently discover test facts (including existing coder/fixer receipts and any tests you run);",
+    "do not treat caller prose as the source of those facts.",
+].join(" ");
 /** Typed Standards conclusion keys owned by reviewer construction (presentation labels are not the contract). */
 export const REVIEWER_STANDARDS_CONCLUSION_KEYS = Object.freeze([
     "constitutionality",
@@ -63,8 +78,22 @@ export function reviewerAxisMethodAdapter(axis) {
         "The returned report is the complete output envelope and its UTF-8 bytes are preserved verbatim; no heading parser, sanitizer, section splitter, rewrite, aggregation, or replacement leg follows.",
     ].join("\n");
 }
-/** Deterministic compiler: fixed target/range plus packaged Skill in, dispatch text out. */
+/**
+ * Spec-only evidence-child material carrier for durable authority references.
+ * Exact values preserved; no prose extraction and no Standards/parent injection.
+ */
+export function reviewerAuthorityRefsMaterial(authorityRefs) {
+    return [
+        "Authority-Refs:",
+        JSON.stringify(Object.freeze([...authorityRefs])),
+        "These are durable authority references only. Read them as Spec grounding materials; do not invent Spec prose from caller instruction.",
+    ].join("\n");
+}
+/** Deterministic compiler: fixed target/range plus discovery product in, dispatch text out. */
 export function constructReviewerDispatch(input) {
+    const launchSpec = input.specAuthority.status === "available";
+    const authorityRefs = Object.freeze(input.specAuthority.status === "available" ? [...input.specAuthority.refs] : []);
+    const specDisposition = launchSpec ? "launched" : "skipped-missing";
     const common = [
         `Target: ${input.range.target}`,
         `Base: ${input.range.base}`,
@@ -76,11 +105,20 @@ export function constructReviewerDispatch(input) {
         "Fixed-Range:",
         JSON.stringify(input.range, null, 2),
     ].join("\n");
-    const axes = [{ axis: "standards" }, { axis: "spec" }];
-    const legs = axes.map((x) => Object.freeze({
-        axis: x.axis,
-        prompt: `${common}\n${reviewerAxisMethodAdapter(x.axis)}\n`,
-    }));
+    const axes = launchSpec
+        ? [{ axis: "standards" }, { axis: "spec" }]
+        : [{ axis: "standards" }];
+    const legs = axes.map((x) => {
+        const parts = [common, reviewerAxisMethodAdapter(x.axis)];
+        // Spec evidence-child only — never Standards or a parent replacement Spec leg.
+        if (x.axis === "spec" && authorityRefs.length > 0) {
+            parts.push(reviewerAuthorityRefsMaterial(authorityRefs));
+        }
+        return Object.freeze({
+            axis: x.axis,
+            prompt: `${parts.join("\n")}\n`,
+        });
+    });
     return Object.freeze({
         identity: input.identity,
         recipe: "reviewer-common-bundle-v1",
@@ -90,6 +128,8 @@ export function constructReviewerDispatch(input) {
         }),
         targetSnapshot: input.target,
         range: input.range,
+        authorityRefs,
+        specDisposition,
         legs: Object.freeze(legs),
     });
 }

package/dist/reviewer-dispatch.js

@@ -3,10 +3,67 @@ import { immutableReviewerPin } from "./reviewer-pinned-git.js";
 export { createReviewerPinnedGitReader, immutableReviewerPin } from "./reviewer-pinned-git.js";
 import { isReviewerPromptText, sameReviewerPromptText } from "./reviewer-prompt-identity.js";
 import { sha256Hex } from "./sha256.js";
-import { constructReviewerDispatch } from "./reviewer-construction.js";
+import { constructReviewerDispatch, } from "./reviewer-construction.js";
+export {} from "./reviewer-construction.js";
 import { ReviewerCorrectablePreflightError } from "./reviewer-preflight-error.js";
 export { sha256Hex } from "./sha256.js";
 export { isReviewerPromptText as isReviewerPromptIdentity, sameReviewerPromptText as sameReviewerPromptIdentity } from "./reviewer-prompt-identity.js";
+const GENERIC_FEATURE_TOKENS = new Set(["", "head", "main", "master", "trunk", "develop", "development"]);
+/** Conventional branch shells that must not hide the feature token (feat/login → login). */
+const BRANCH_SHELL_PREFIX = /^(?:feat|feature|fix|bugfix|hotfix|chore|docs|refactor)-/;
+function normalizeFeatureToken(value) {
+    return value.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
+}
+/** Expand one branch/ref name into matchable tokens, stripping conventional shells. */
+function expandFeatureTokens(raw) {
+    const normalized = normalizeFeatureToken(raw);
+    if (normalized.length === 0)
+        return Object.freeze([]);
+    const tokens = new Set([normalized]);
+    const stripped = normalized.replace(BRANCH_SHELL_PREFIX, "");
+    if (stripped.length > 0 && stripped !== normalized)
+        tokens.add(stripped);
+    return Object.freeze([...tokens]);
+}
+/**
+ * Unique production owner of code-review Skill step 2 Spec discovery.
+ * Directly yields durable refs Spec child can read, or confirmed missing.
+ * - Supplied authorityRefs ⇒ available with those refs as material.
+ * - Matching pinned-target docs/specs/.scratch paths ⇒ available with those paths as material.
+ * - Commit message bare #N without durable source ⇒ missing (not available).
+ * Only confirmed absence yields missing; other Git/I-O failures keep true cause for preflight.
+ * Construction builds Standards/Spec solely from this product.
+ */
+export async function discoverReviewerSpecAuthority(input) {
+    if (input.authorityRefs.length > 0) {
+        return Object.freeze({
+            status: "available",
+            refs: Object.freeze([...input.authorityRefs]),
+        });
+    }
+    const featureTokens = await input.reader.featureTokens();
+    const tokens = [
+        ...new Set(featureTokens
+            .flatMap((raw) => expandFeatureTokens(raw))
+            .filter((token) => token.length >= 3 && !GENERIC_FEATURE_TOKENS.has(token))),
+    ];
+    if (tokens.length === 0) {
+        return Object.freeze({ status: "missing" });
+    }
+    // Pinned target tree only — Spec child cannot read live-worktree or gitignored paths.
+    const candidates = await input.reader.listSpecCandidatePaths();
+    const matched = candidates.filter((relativePath) => {
+        const normalizedPath = normalizeFeatureToken(relativePath);
+        return tokens.some((token) => normalizedPath.includes(token));
+    });
+    if (matched.length === 0) {
+        return Object.freeze({ status: "missing" });
+    }
+    return Object.freeze({
+        status: "available",
+        refs: Object.freeze(matched),
+    });
+}
 export const REVIEWER_PREFLIGHT_VIOLATIONS = ["base-invalid", "range-invalid", "prompt-identity-invalid", "target-drift"];
 export class ReviewerPreflightError extends Error {
     code;
@@ -49,12 +106,18 @@ export function createReviewerDispatcher(d) {
             try {
                 const base = await d.reader.resolve(baseRevision);
                 const range = await d.reader.range(base);
+                const authorityRefs = Object.freeze([...(d.authorityRefs ?? [])]);
+                const specAuthority = await discoverReviewerSpecAuthority({
+                    authorityRefs,
+                    reader: d.reader,
+                });
                 dispatch = constructReviewerDispatch({
                     identity,
                     canonicalSkill: d.canonicalSkill,
                     target,
                     range,
                     ...(d.reviewScopeKeys === undefined ? {} : { reviewScopeKeys: d.reviewScopeKeys }),
+                    specAuthority,
                 });
                 if (!sameReviewerPinnedTarget(await d.reader.snapshot(), target)) {
                     throw new ReviewerPreflightError("target-drift", "pinned target snapshot changed before child execution");

package/dist/reviewer-execution-ledger.js

@@ -5,7 +5,8 @@ export function projectAcceptedDispatch(dispatch) {
     return {
         source: "reviewer-dispatch", type: "accepted", identity: dispatch.identity,
         recipe: dispatch.recipe, input: dispatch.input, target: dispatch.targetSnapshot,
-        range: dispatch.range, legs: dispatch.legs,
+        range: dispatch.range, authorityRefs: dispatch.authorityRefs,
+        specDisposition: dispatch.specDisposition, legs: dispatch.legs,
     };
 }
 export function projectReviewerDispatchOutcome(ledger, dispatch, result) {

package/dist/reviewer-pinned-git.js

@@ -142,5 +142,38 @@ export async function createReviewerPinnedGitReader(root = process.cwd()) {
                 invalid("range-invalid", "review range must contain a non-empty diff between base and pinned target");
             return Object.freeze({ base: mergeBase, target: targetHead, diffCommand, diffSha256: sha256Hex(Uint8Array.from(diff)), commits: Object.freeze(commitsText ? commitsText.split("\n") : []) });
         },
+        async featureTokens() {
+            // Pinned ref snapshot is the target-tree fact — no live branch/symbolic-ref walk,
+            // no catch-to-empty. Detached/remote-only tips surface via refs/remotes/* entries.
+            const names = new Set();
+            for (const [refName, entry] of Object.entries(pin.refs)) {
+                if (entry.peeledCommitId !== targetHead)
+                    continue;
+                const short = refName.startsWith("refs/heads/")
+                    ? refName.slice("refs/heads/".length)
+                    : refName.startsWith("refs/tags/")
+                        ? refName.slice("refs/tags/".length)
+                        : refName.startsWith("refs/remotes/")
+                            ? refName.slice("refs/remotes/".length).replace(/^[^/]+\//, "")
+                            : refName;
+                if (short.trim() !== "")
+                    names.add(short.trim());
+            }
+            return Object.freeze([...names]);
+        },
+        async listSpecCandidatePaths() {
+            const roots = ["docs", "specs", ".scratch"];
+            // git ls-tree exits 0 with empty stdout when none of the roots exist at targetHead.
+            // Other Git/I-O failures keep their true cause for the dispatch preflight path.
+            const text = await gitText(repositoryRoot, [
+                "ls-tree",
+                "-r",
+                "--name-only",
+                targetHead,
+                "--",
+                ...roots,
+            ]);
+            return Object.freeze(text === "" ? [] : text.split("\n").filter((line) => line.length > 0));
+        },
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akagilnc/pi-workflow-roles",
-  "version": "0.1.1893",
+  "version": "0.1.1941",
   "description": "Soul-bound workflow roles for Pi",
   "type": "module",
   "license": "Apache-2.0",

package/src/evidence-child-executor.ts

@@ -30,15 +30,26 @@ import {
   type AuditorParentAttemptBinding,
 } from "./compliance-transport.ts";
 import { wrapPackageOwnedToolDefinition } from "./package-owned-tool-idle.ts";
+import { createReceiptDeliveryPolicy, NO_RECEIPT_LIFECYCLE_ENTRY_TYPE, RECEIPT_DELIVERY_PROMPT, type NoReceiptLifecycleFacts } from "./receipt-delivery-policy.ts";
+import { REVIEWER_VERIFICATION_BOUNDARY } from "./reviewer-construction.ts";
 import type { ReviewerPromptText } from "./reviewer-prompt-identity.ts";
 import { createStreamIdleGuard, isStreamIdleTimeoutError } from "./stream-idle-guard.ts";
-import { createReceiptDeliveryPolicy, NO_RECEIPT_LIFECYCLE_ENTRY_TYPE, RECEIPT_DELIVERY_PROMPT, type NoReceiptLifecycleFacts } from "./receipt-delivery-policy.ts";
 import {
   hasUpstreamErrorTestimony,
   isNonSuccessHttpStatus,
   projectConfirmedRemotePayload,
 } from "./upstream-error-testimony.ts";
 
+/** Package-owned system prompt for Reviewer Standards/Spec evidence children (private carrier). */
+function buildEvidenceChildSystemPrompt(): string {
+  return [
+    "Work only in the supplied workspace.",
+    "Use the available evidence tools to investigate. Do not commit, push, or mutate remotes.",
+    REVIEWER_VERIFICATION_BOUNDARY,
+    "Return one substantive non-blank report.",
+  ].join("\n");
+}
+
 // ── shared constants / types ──────────────────────────────────────────────
 
 export const AUDITOR_TURN_LIMIT = 32;
@@ -561,11 +572,7 @@ export async function executeEvidenceChild(
         model: inherited.model,
         thinkingLevel: context.thinkingLevel ?? "off",
         modelRuntime: inherited.runtime,
-        systemPrompt: [
-          "Work only in the supplied workspace.",
-          "Use the available evidence tools to investigate. Do not commit, push, or mutate remotes.",
-          "Return one substantive non-blank report.",
-        ].join("\n"),
+        systemPrompt: buildEvidenceChildSystemPrompt(),
         sessionManager: createRecordSession({
           cwd: workspace,
           kind: "evidence-children",

package/src/factory-board.ts

@@ -28,14 +28,19 @@ import {
 } from "./human-format.ts";
 import {
   DEFAULT_REFRESH_BOUNDARY_SECONDS,
+  buildTicketTrajectoryBookIndex,
   loadTicketTrajectoryRuns,
+  loadUnboundTrajectoryRuns,
   renderTicketTrajectoryStationHtml,
+  type TicketTrajectoryBookIndex,
   type TicketTrajectoryRun,
   type TrajectoryClock,
   type TrajectoryScheduler,
+  type UnboundTrajectoryRun,
 } from "./ticket-trajectory.ts";
 import type { BoardSnapshot, SnapshotTicket, TicketIssueState } from "./ticket-snapshot.ts";
 
+
 /** Unaccepted latest-run mtime bands (page-visible thresholds). */
 export const UNACCEPTED_FLYING_MS = 2 * 60 * 1000;
 export const UNACCEPTED_WATCH_MS = 15 * 60 * 1000;
@@ -403,6 +408,40 @@ function latestKnownStation(runs: readonly TicketTrajectoryRun[]): string | unde
   return latest.station;
 }
 
+/**
+ * Unbound activation card for the existing unknown-set presentation seam.
+ * Not a ticket: no issue number, never placed in a yamen column.
+ */
+function renderUnboundRunCard(input: {
+  bookKey: string;
+  unbound: UnboundTrajectoryRun;
+}): string {
+  const { run, role, observedAt } = input.unbound;
+  const correlationId = input.unbound.correlationId;
+  const stationLabel =
+    run.station === "unknown" ? "未知站" : (YAMEN_LABELS[run.station] ?? run.station);
+  const corrAttr = correlationId === undefined ? "" : ` data-correlation="${attr(correlationId)}"`;
+  const corrMeta =
+    correlationId === undefined ? "" : ` · corr ${escapeHtml(correlationId)}`;
+  return [
+    `<article class="ticket unbound-run"`,
+    ` data-unbound-run="true"`,
+    ` data-book="${attr(input.bookKey)}"`,
+    ` data-run-id="${attr(run.runId)}"`,
+    corrAttr,
+    ` data-placement="unknown"`,
+    `>`,
+    `<header class="ticket-header">`,
+    `<span class="ticket-title">未绑定 · ${escapeHtml(run.runId)}</span>`,
+    `<span class="yamen-tag yamen-unknown" data-yamen="unknown">${escapeHtml(stationLabel)}</span>`,
+    `</header>`,
+    `<p class="unbound-meta" data-unbound-meta="true">`,
+    `role ${escapeHtml(role)}${corrMeta} · ${escapeHtml(observedAt)}`,
+    `</p>`,
+    `</article>`,
+  ].join("");
+}
+
 function renderTicketArticle(input: {
   bookKey: string;
   prepared: PreparedTicket;
@@ -681,8 +720,9 @@ async function prepareTicket(
   ledgerDir: string,
   ticket: SnapshotTicket,
   now: Date,
+  bookIndex?: TicketTrajectoryBookIndex,
 ): Promise<PreparedTicket> {
-  const runs = await loadTicketTrajectoryRuns(ledgerDir, ticket.issueNumber);
+  const runs = await loadTicketTrajectoryRuns(ledgerDir, ticket.issueNumber, bookIndex);
   const pending = ticket.state !== "closed" && runs.length === 0;
   const currentState = decideTicketCurrentState({
     ticketState: ticket.state,
@@ -862,9 +902,11 @@ async function renderLaneHtml(
   now: Date,
   options?: { hidden?: boolean },
 ): Promise<RenderedLane> {
+  // One book-level flat-run index shared by every ticket in this lane.
+  const bookIndex = await buildTicketTrajectoryBookIndex(ledgerDir);
   const prepared = new Map<number, PreparedTicket>();
   for (const ticket of tickets) {
-    prepared.set(ticket.issueNumber, await prepareTicket(ledgerDir, ticket, now));
+    prepared.set(ticket.issueNumber, await prepareTicket(ledgerDir, ticket, now, bookIndex));
   }
 
   const childrenByParent = buildDirectChildrenByParent(prepared);
@@ -980,6 +1022,20 @@ async function renderLaneHtml(
     list.push(entry);
     byPlacement.set(entry.placement, list);
   }
+
+  // Unbound flat runs: isolated from every ticket, honest on the unknown seam.
+  const unboundRuns = await loadUnboundTrajectoryRuns(ledgerDir, bookIndex);
+  for (const unbound of unboundRuns) {
+    unknownEntries.push({
+      placement: "unknown",
+      band: 0,
+      activityMs: unbound.run.mtimeMs,
+      // Sort after real tickets; no issue identity (unbound is not a ticket).
+      issueNumber: Number.MAX_SAFE_INTEGER,
+      html: renderUnboundRunCard({ bookKey, unbound }),
+    });
+  }
+
   unknownEntries.sort(entryCompare);
   unknownTickets.sort((a, b) => a.issueNumber - b.issueNumber);
 
@@ -1469,7 +1525,8 @@ export async function renderFactoryBoardHtml(
         generatedAt,
       );
     }
-    const lane = await renderLaneHtml(
+    let lane: RenderedLane;
+    lane = await renderLaneHtml(
       book.bookKey,
       resolve(book.ledgerDir),
       bookSnap.tickets,

package/src/package-contracts/reviewer-output.ts

@@ -26,11 +26,15 @@ export type RuntimeReviewerAcceptedBatch = Readonly<{
   identity: string;
   legs: readonly Readonly<{ axis: "standards" | "spec"; prompt: ReviewerReceiptPrompt }>[];
 }>;
+/** Honest Spec-child disposition on the receipt face. */
+export type RuntimeReviewerSpecDisposition = "launched" | "skipped-missing";
 export type RuntimeReviewerReceiptV2 = Readonly<{
   version: 2;
   status: "completed" | "refused";
   diagnostic?: string;
   acceptedBatch?: RuntimeReviewerAcceptedBatch;
+  /** Present on accepted batches: launched Spec child, or skipped after confirmed missing Spec. */
+  specDisposition?: RuntimeReviewerSpecDisposition;
   reports: Readonly<Partial<Record<"standards" | "spec", VerbatimChildReport>>>;
   outcomes: Readonly<Partial<Record<"standards" | "spec", RuntimeReviewerOutcome>>>;
   identities: Readonly<{
@@ -100,6 +104,21 @@ export function validateRuntimeReviewerReceipt(output: unknown): RuntimeReviewer
         throw new Error("Successful Reviewer outcome lacks report");
       if (status === "failed" && report !== undefined) throw new Error("Failed Reviewer outcome cannot bind a report");
     }
+
+    // One read inside the existing accepted-leg consistency cycle — not a second validator.
+    // launched ⇔ Standards+Spec; skipped-missing ⇔ Standards only.
+    const specDisposition = read(output, "specDisposition");
+    if (specDisposition === "launched") {
+      if (expectedAxes.length !== 2 || expectedAxes[0] !== "standards" || expectedAxes[1] !== "spec") {
+        throw new Error("Reviewer specDisposition launched requires Standards+Spec accepted legs");
+      }
+    } else if (specDisposition === "skipped-missing") {
+      if (expectedAxes.length !== 1 || expectedAxes[0] !== "standards") {
+        throw new Error("Reviewer specDisposition skipped-missing requires Standards-only accepted legs");
+      }
+    } else if (specDisposition !== undefined) {
+      throw new Error("Invalid Reviewer specDisposition");
+    }
   }
   return output as RuntimeReviewerReceiptV2;
 }

package/src/public-cli/cli.ts

@@ -61,6 +61,69 @@ export {
 export { CliUsageError } from "./cli-errors.ts";
 export type { CliIo } from "./cli-io.ts";
 
+/**
+ * Sole production map: public role command → argv parser.
+ * cli handlers consume this table; no parallel set.
+ */
+export const PUBLIC_ROLE_ARGV = {
+  judge: { parse: parseJudgeArgv },
+  coder: { parse: parseCoderArgv },
+  fixer: { parse: parseFixerArgv },
+  collector: { parse: parseCollectorArgv },
+  doctor: { parse: parseDoctorArgv },
+  merger: { parse: parseMergerArgv },
+  reviewer: { parse: parseReviewerArgv },
+} as const;
+
+type TakenPublicGlobalFlag =
+  | { flag: "help"; consume: 1 }
+  | { flag: "model"; consume: 1 | 2; value: string | undefined }
+  | { flag: "thinking"; consume: 1 | 2; raw: string | undefined };
+
+/**
+ * If `argv[index]` is a public global flag, describe its span and payload.
+ * Sole global-flag grammar for parseArgv.
+ */
+function takePublicGlobalFlag(
+  argv: readonly string[],
+  index: number,
+): TakenPublicGlobalFlag | undefined {
+  const token = argv[index];
+  if (token === undefined) return undefined;
+  if (token === "--help" || token === "-h") {
+    return { flag: "help", consume: 1 };
+  }
+  if (token === "--model") {
+    const value = argv[index + 1];
+    if (value === undefined) {
+      return { flag: "model", consume: 1, value: undefined };
+    }
+    return { flag: "model", consume: 2, value };
+  }
+  if (token.startsWith("--model=")) {
+    return {
+      flag: "model",
+      consume: 1,
+      value: token.slice("--model=".length),
+    };
+  }
+  if (token === "--thinking") {
+    const raw = argv[index + 1];
+    if (raw === undefined) {
+      return { flag: "thinking", consume: 1, raw: undefined };
+    }
+    return { flag: "thinking", consume: 2, raw };
+  }
+  if (token.startsWith("--thinking=")) {
+    return {
+      flag: "thinking",
+      consume: 1,
+      raw: token.slice("--thinking=".length),
+    };
+  }
+  return undefined;
+}
+
 export type CliEnv = {
   home?: string;
   agentDir?: string;
@@ -167,44 +230,38 @@ function parseArgv(argv: readonly string[]): ParsedGlobal {
 
   // Global flags may appear before or after the subcommand
   // (`ak-role --model x roles` and `ak-role roles --model x`).
+  // Grammar authority: takePublicGlobalFlag above.
   while (args.length > 0) {
-    const token = args.shift()!;
-    if (token === "--") {
+    if (args[0] === "--") {
+      args.shift();
       positional.push(...args);
       break;
     }
-    if (token === "--help" || token === "-h") {
-      help = true;
-      continue;
-    }
-    if (token === "--model") {
-      const value = args.shift();
-      if (value === undefined) throw new CliUsageError("--model requires a value");
-      model = value;
-      continue;
-    }
-    if (token.startsWith("--model=")) {
-      model = token.slice("--model=".length);
-      continue;
-    }
-    if (token === "--thinking") {
-      const value = args.shift();
-      if (value === undefined) throw new CliUsageError("--thinking requires a value");
-      thinking = parseThinking(value);
-      continue;
-    }
-    if (token.startsWith("--thinking=")) {
-      thinking = parseThinking(token.slice("--thinking=".length));
-      continue;
-    }
-    if (token.startsWith("-") && token !== "-") {
-      // Subcommands may own additional flags later; only reject unknowns at the
-      // top level when they appear before any positional command is collected
-      // and the command is one that does not accept free flags (enforced below).
-      positional.push(token);
+    const taken = takePublicGlobalFlag(args, 0);
+    if (taken !== undefined) {
+      if (taken.flag === "help") {
+        help = true;
+        args.splice(0, taken.consume);
+        continue;
+      }
+      if (taken.flag === "model") {
+        if (taken.value === undefined) {
+          throw new CliUsageError("--model requires a value");
+        }
+        model = taken.value;
+        args.splice(0, taken.consume);
+        continue;
+      }
+      if (taken.raw === undefined) {
+        throw new CliUsageError("--thinking requires a value");
+      }
+      thinking = parseThinking(taken.raw);
+      args.splice(0, taken.consume);
       continue;
     }
-    positional.push(token);
+    // Subcommands may own additional flags later; unknown dashed tokens stay
+    // positional here (same as pre-unification parseArgv).
+    positional.push(args.shift()!);
   }
 
   const [command, ...rest] = positional;
@@ -626,7 +683,7 @@ export async function runAkRole(
           ...(env.createRunId === undefined ? {} : { createRunId: env.createRunId }),
         },
         io,
-        parseJudgeArgv,
+        PUBLIC_ROLE_ARGV.judge.parse,
       );
       return {
         exitCode: result.exitCode,
@@ -669,7 +726,7 @@ export async function runAkRole(
           ...(env.createRunId === undefined ? {} : { createRunId: env.createRunId }),
         },
         io,
-        parseCoderArgv,
+        PUBLIC_ROLE_ARGV.coder.parse,
       );
       return {
         exitCode: result.exitCode,
@@ -712,7 +769,7 @@ export async function runAkRole(
           ...(env.createRunId === undefined ? {} : { createRunId: env.createRunId }),
         },
         io,
-        parseFixerArgv,
+        PUBLIC_ROLE_ARGV.fixer.parse,
       );
       return {
         exitCode: result.exitCode,
@@ -755,7 +812,7 @@ export async function runAkRole(
           ...(env.createRunId === undefined ? {} : { createRunId: env.createRunId }),
         },
         io,
-        parseCollectorArgv,
+        PUBLIC_ROLE_ARGV.collector.parse,
       );
       return {
         exitCode: result.exitCode,
@@ -798,7 +855,7 @@ export async function runAkRole(
           ...(env.createRunId === undefined ? {} : { createRunId: env.createRunId }),
         },
         io,
-        parseReviewerArgv,
+        PUBLIC_ROLE_ARGV.reviewer.parse,
       );
       return {
         exitCode: result.exitCode,
@@ -841,7 +898,7 @@ export async function runAkRole(
           ...(env.createRunId === undefined ? {} : { createRunId: env.createRunId }),
         },
         io,
-        parseDoctorArgv,
+        PUBLIC_ROLE_ARGV.doctor.parse,
       );
       return {
         exitCode: result.exitCode,
@@ -884,7 +941,7 @@ export async function runAkRole(
           ...(env.createRunId === undefined ? {} : { createRunId: env.createRunId }),
         },
         io,
-        parseMergerArgv,
+        PUBLIC_ROLE_ARGV.merger.parse,
       );
       return {
         exitCode: result.exitCode,

package/src/public-cli/coder-run.ts

@@ -313,8 +313,9 @@ async function dispatchAdmittedCoder(input: {
       PI_CODING_AGENT_DIR: env.agentDir,
       AK_ROLE_RUN_DIR: admitted.runDirectory,
     };
-    if (env.correlationId !== undefined && env.correlationId.trim() !== "") {
-      childEnv.AK_CORRELATION_ID = env.correlationId;
+    const correlationId = admitted.correlationId ?? env.correlationId;
+    if (correlationId !== undefined && correlationId.trim() !== "") {
+      childEnv.AK_CORRELATION_ID = correlationId;
     }
 
     let result: ExplicitInternalPiResult;
@@ -487,7 +488,10 @@ export async function runPublicCoder(
 
   return await dispatchAdmittedCoder({
     admitted,
-    env,
+    env: {
+      ...env,
+      ...(admitted.correlationId === undefined ? {} : { correlationId: admitted.correlationId }),
+    },
     io,
     extraArgs,
     lease,
@@ -581,7 +585,10 @@ export async function runPublicCoderResume(
 
   return await dispatchAdmittedCoder({
     admitted,
-    env,
+    env: {
+      ...env,
+      ...(admitted.correlationId === undefined ? {} : { correlationId: admitted.correlationId }),
+    },
     io,
     extraArgs,
     lease,