@akagilnc/pi-workflow-roles 0.1.4403 → 0.1.4419

package/src/public-cli/option-definitions.ts

@@ -546,18 +546,32 @@ const REVIEWER_OPTIONS = [
       zh: "必填；钉住审查目标的 fixed-point revision。",
     },
   },
+  {
+    id: "lens",
+    owner: "reviewer",
+    canonical: "--lens",
+    aliases: [],
+    valueMetavar: "completeness|correctness",
+    required: true,
+    repeatable: false,
+    form: "option",
+    description: {
+      en: "Required single review lens: completeness or correctness (no default).",
+      zh: "必填单 lens：completeness 或 correctness（无默认值）。",
+    },
+  },
   {
     id: "authority-ref",
     owner: "reviewer",
     canonical: "--authority-ref",
     aliases: [],
     valueMetavar: "ref",
-    required: false,
+    required: true,
     repeatable: true,
     form: "option",
     description: {
-      en: "Durable authority reference/URL (repeatable; refs only, not inline prose).",
-      zh: "持久 authority 引用/URL（可重复；仅 ref，非内联散文）。",
+      en: "Required durable authority reference/URL (repeatable; refs only, not inline prose).",
+      zh: "必填持久 authority 引用/URL（可重复；仅 ref，非内联散文）。",
     },
   },
 ] as const satisfies readonly PublicOptionDefinition[];
@@ -1213,10 +1227,13 @@ const ROLE_COMMAND_HELP = {
   },
   reviewer: {
     command: "reviewer",
-    summary: "Fixed-target two-axis review (Standards + Spec).",
-    usage: ["ak-role reviewer --base <revision> [options] <instruction>"],
+    summary: "Fixed-target single-lens review (completeness or correctness).",
+    usage: [
+      "ak-role reviewer --base <revision> --lens completeness|correctness --authority-ref <ref> [options] <instruction>",
+    ],
     examples: [
-      'ak-role reviewer --base main "Review the branch against the governing issue and repository authority."',
+      'ak-role reviewer --base main --lens completeness --authority-ref docs/adr/0001.md "Review the branch."',
+      'ak-role reviewer --base main --lens correctness --authority-ref CLAUDE.md --authority-ref docs/adr/0001.md',
     ],
   },
   collector: {

package/src/public-cli/post-admission.ts

@@ -87,7 +87,6 @@ import {
   type WriterLeaseDiagnosticKind,
 } from "./run-lifecycle.ts";
 import { homeFromRunDirectory } from "../activation-ledger-topology.ts";
-import { clearReviewerDispatchRejection } from "./reviewer-dispatch-rejection.ts";
 import {
   attemptProducedFreshSubmission,
   classifyPostAdmissionFailure,
@@ -698,9 +697,6 @@ export async function dispatchPostAdmissionTurn<
     }
 
     await clearTypedProviderHttpObservation(admitted.runDirectory);
-    // Per-attempt hygiene: stale Reviewer rejection pages must not ride into
-    // auto-resume. ENOENT-safe for every seat.
-    await clearReviewerDispatchRejection(admitted.runDirectory);
     // The authoritative host write (markRunRunning) is delayed to just before
     // executeTurn — not merely past beforeDispatch (#840 r9 判词 class 2). Any
     // pre-turn retry (beforeDispatch, dossier projection, continuation

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

@@ -1,6 +1,6 @@
 /**
- * Public Reviewer Role run: admit → post-admission coordinator → settle Terminal result (#111 / #517).
- * Package-owned adapted code-review method is forced; users never submit
+ * Public Reviewer Role run: admit → post-admission coordinator → settle Terminal result (#917 / #517).
+ * Package-owned ak-cross-m-review method is forced; users never submit
  * extra packets. Controlled-failure settlement reuses #107.
  * #526: execution via RoleTurnHost; argv is Pi adapter internal.
  */
@@ -10,7 +10,11 @@ import type {
   RoleTurnKnownFailure,
   RoleTurnRequest,
 } from "../host-contracts.ts";
-import { engineSessionMaterialFromOptions, pickEngineAxis } from "../package-resources/engine-material.ts";
+import {
+  appendEngineSessionMaterial,
+  engineSessionMaterialFromOptions,
+  pickEngineAxis,
+} from "../package-resources/engine-material.ts";
 import {
   loadPackagedMethodSkillMaterial,
   resolvePackagedMethodSkillPath,
@@ -22,11 +26,12 @@ import {
   admitReviewerInvocation,
   buildReviewerTransportPrompt,
   type AdmittedReviewerInvocation,
+  type ReviewerLens,
 } from "./invocation.ts";
 import {
   loadResumableReviewerRun,
   markRunAdmitted,
-  buildResumeContinuationPrompt,
+  RESUME_TRANSPORT_ENVELOPE,
   type PublicResumeRequest,
 } from "./run-lifecycle.ts";
 import {
@@ -55,7 +60,7 @@ export type ReviewerRunEnv = PostAdmissionEnv & {
 };
 
 function reviewerMethods(packageRoot: string): readonly MethodBinding[] {
-  return [{ kind: "skill", path: resolvePackagedMethodSkillPath(packageRoot, "code-review") }];
+  return [{ kind: "skill", path: resolvePackagedMethodSkillPath(packageRoot, "ak-cross-m-review") }];
 }
 
 /** Project admitted Reviewer invocation onto the host-neutral turn request. */
@@ -69,6 +74,7 @@ export function buildReviewerTurnRequest(
       activation: {
         role: "reviewer",
         baseRevision: admitted.baseRevision,
+        lens: admitted.lens,
         authorityRefs: admitted.authorityRefs,
         ...(admitted.ticketNumber === undefined ? {} : { ticketNumber: admitted.ticketNumber }),
       },
@@ -94,7 +100,7 @@ function reviewerAdapters(
               methodSkillPath: methodMaterial.skillPath,
               methodSkillConfiguredPath: resolvePackagedMethodSkillPath(
                 packageRoot,
-                "code-review",
+                "ak-cross-m-review",
               ),
             },
             scope,
@@ -119,7 +125,20 @@ function reviewerAdapters(
 async function loadReviewerMethodMaterial(
   packageRoot: string,
 ): Promise<PackagedMethodSkillMaterial> {
-  return await loadPackagedMethodSkillMaterial(packageRoot, "code-review");
+  return await loadPackagedMethodSkillMaterial(packageRoot, "ak-cross-m-review");
+}
+
+/** Continue the existing method turn; frozen axes remain on typed activation fields. */
+function reviewerResumePrompt(env: ReviewerRunEnv, message?: string): string {
+  const lines: string[] = [RESUME_TRANSPORT_ENVELOPE];
+  if (message !== undefined) lines.push("", message);
+  return appendEngineSessionMaterial(
+    lines,
+    engineSessionMaterialFromOptions({
+      ...pickEngineAxis(env),
+      packageRoot: env.packageRoot,
+    }),
+  ).join("\n");
 }
 
 export async function runPublicReviewer(
@@ -130,6 +149,7 @@ export async function runPublicReviewer(
     instruction: string;
     attachmentPaths: string[];
     baseRevision: string;
+    lens: ReviewerLens;
     authorityRefs: string[];
     project?: string;
   },
@@ -148,6 +168,7 @@ export async function runPublicReviewer(
       instruction: parsed.instruction,
       attachmentPaths: parsed.attachmentPaths,
       baseRevision: parsed.baseRevision,
+      lens: parsed.lens,
       authorityRefs: parsed.authorityRefs,
       ...(parsed.project === undefined ? {} : { project: parsed.project }),
       ...(env.createRunId === undefined ? {} : { createRunId: env.createRunId }),
@@ -220,10 +241,7 @@ export async function runPublicReviewer(
           : { correlationId: admitted.correlationId ?? env.correlationId }),
         continuation: {
           kind: "resume",
-          prompt: buildResumeContinuationPrompt({
-            packageRoot: env.packageRoot,
-            ...pickEngineAxis(env),
-          }),
+          prompt: reviewerResumePrompt(env),
         },
       }),
     adapters: reviewerAdapters(env.packageRoot, methodMaterial),
@@ -250,11 +268,16 @@ export async function runPublicReviewerResume(
     io,
     load: (effective) =>
       loadResumableReviewerRun(env.home, effective.runId, env.principalAuthority),
-    buildTurnRequest: (admitted, effective) =>
-      buildReviewerTurnRequest(
-        admitted,
-        resumeTurnRequestProjectionOptions(admitted, effective, env),
-      ),
+    buildTurnRequest: (admitted, effective) => {
+      const base = resumeTurnRequestProjectionOptions(admitted, effective, env);
+      return buildReviewerTurnRequest(admitted, {
+        ...base,
+        continuation: {
+          kind: "resume",
+          prompt: reviewerResumePrompt(env, effective.message),
+        },
+      });
+    },
     adapters: reviewerAdapters(env.packageRoot),
     afterAdmittedLoad: (admitted) =>
       resolveResumeMethodMaterialAdapters({

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

@@ -50,6 +50,7 @@ import type { PublicThinkingLevel } from "./registry.ts";
 import {
   recordEffectiveInvocationModel,
   requireAuthorityRef,
+  isReviewerLens,
   type AdmittedCoderInvocation,
   type AdmittedCountersignInvocation,
   type AdmittedCollectorInvocation,
@@ -69,6 +70,7 @@ import {
   type DerivedMergerEnvelope,
   type FrozenAttachment,
   type InvocationEffectiveModel,
+  type ReviewerLens,
 } from "./invocation.ts";
 
 /** Providers eligible for v1 typed-429 resume (Codex / xAI only).
@@ -1194,6 +1196,7 @@ type LoadedAdmittedRequestFields = {
   readonly prerequisitesPath?: string;
   readonly prerequisites?: readonly FixerPrerequisite[];
   readonly baseRevision?: string;
+  readonly lens?: ReviewerLens;
   readonly authorityRefs?: readonly string[];
   readonly mergerInputPath?: string;
   readonly derived?: DerivedMergerEnvelope;
@@ -1373,6 +1376,7 @@ async function loadResumableRunRecord(
   let prerequisitesPath: string | undefined;
   let prerequisites: readonly FixerPrerequisite[] | undefined;
   let baseRevision: string | undefined;
+  let lens: ReviewerLens | undefined;
   let authorityRefs: readonly string[] | undefined;
   let mergerInputPath: string | undefined;
   let derived: DerivedMergerEnvelope | undefined;
@@ -1432,6 +1436,9 @@ async function loadResumableRunRecord(
       ) {
         baseRevision = record.baseRevision;
       }
+      if (isReviewerLens(record.lens)) {
+        lens = record.lens;
+      }
       // Collector — admitted repository/PR identity (#633 resume).
       if (typeof record.prNumber === "number" && Number.isSafeInteger(record.prNumber) && record.prNumber >= 1) {
         prNumber = record.prNumber;
@@ -1626,6 +1633,7 @@ async function loadResumableRunRecord(
       ...(prerequisitesPath === undefined ? {} : { prerequisitesPath }),
       ...(prerequisites === undefined ? {} : { prerequisites }),
       ...(baseRevision === undefined ? {} : { baseRevision }),
+      ...(lens === undefined ? {} : { lens }),
       ...(authorityRefs === undefined ? {} : { authorityRefs }),
       ...(mergerInputPath === undefined ? {} : { mergerInputPath }),
       ...(derived === undefined ? {} : { derived }),
@@ -1879,17 +1887,39 @@ export async function loadResumableReviewerRun(
       `role run ${runId} belongs to ${loaded.run.role}, not reviewer`,
     );
   }
-  const baseRevision = loaded.admittedFields.baseRevision;
-  if (baseRevision === undefined || baseRevision.trim() === "") {
+  // Durable restore keeps run identity — never rebrand record damage as fresh --base/--lens.
+  const rawBase = loaded.admittedFields.baseRevision;
+  if (rawBase === undefined || rawBase.trim() === "") {
     throw new CliUsageError(
       `role run admitted reviewer base revision is missing: ${runId}`,
     );
   }
+  if (/\s/.test(rawBase) || rawBase.startsWith("-")) {
+    throw new CliUsageError(
+      `role run admitted reviewer base revision is damaged: ${runId}`,
+    );
+  }
+  const baseRevision = rawBase;
+  const lens = loaded.admittedFields.lens;
+  if (!isReviewerLens(lens)) {
+    throw new CliUsageError(
+      `role run admitted reviewer lens is missing: ${runId}`,
+    );
+  }
+  const authorityRefs = Object.freeze([
+    ...(loaded.admittedFields.authorityRefs ?? []),
+  ]);
+  if (authorityRefs.length === 0) {
+    throw new CliUsageError(
+      `role run admitted reviewer authority refs are missing: ${runId}`,
+    );
+  }
   const admitted: AdmittedReviewerInvocation = {
     role: "reviewer",
     ...resumedBaseAdmitted(loaded),
     baseRevision,
-    authorityRefs: Object.freeze([...(loaded.admittedFields.authorityRefs ?? [])]),
+    lens,
+    authorityRefs,
   };
   return seatLoadedResult(loaded, admitted);
 }

package/src/public-cli/settlement.ts

@@ -26,7 +26,6 @@ import { DOCTOR_AUDIT_TOOL_NAME } from "../doctor-auditor.ts";
 import { JUDGE_AUDIT_TOOL_NAME } from "../judge-auditor.ts";
 import type { RoleTurnKnownFailure } from "../host-contracts.ts";
 import { knownFailureFromProviderStop } from "../pi/known-failure.ts";
-import { readReviewerDispatchRejection } from "./reviewer-dispatch-rejection.ts";
 import {
   isV1ResumableProvider,
   readLatestTypedProviderHttpObservation,
@@ -978,7 +977,7 @@ export function extractSessionProviderStop(
     if (entry?.type !== "message") continue;
     const message = entry.message;
     if (message?.role !== "assistant") continue;
-    // Latest assistant in the current attempt only (reviewer-child-executor lastAssistant pattern).
+    // Latest assistant in the current attempt only.
     return sessionProviderStopFromAssistant(message);
   }
   return undefined;
@@ -1032,45 +1031,6 @@ export async function readSessionProviderStop(
   }
 }
 
-/**
- * Recover a provider stop from Reviewer fixed-axis evidence children bound to this parent.
- * Dispatch runs during activation before the parent model turn; leg failures leave durable
- * stops under session/evidence-children/ and must not wash into generic activation.
- */
-export async function readBoundEvidenceChildKnownFailure(
-  sessionFile: string,
-): Promise<RoleTurnKnownFailure | undefined> {
-  const childDirectory = join(dirname(sessionFile), "evidence-children");
-  let names: string[];
-  try {
-    names = await readdir(childDirectory);
-  } catch (error) {
-    if (isMissingPathError(error)) return undefined;
-    throw sessionReadFailure(error, "failed to read bound evidence-child session directory");
-  }
-  for (const file of names.filter((name) => name.endsWith(".jsonl")).sort().reverse()) {
-    let entries: SessionEntry[];
-    try {
-      entries = await readBoundSessionEntries(join(childDirectory, file));
-    } catch (error) {
-      throw sessionReadFailure(error, "failed to read discovered evidence-child session");
-    }
-    const header = entries.find((entry) => entry.type === "session");
-    if (!isRecord(header) || header.parentSession !== sessionFile) continue;
-    const stop = extractSessionProviderStop(entries);
-    if (stop === undefined) continue;
-    const primary = knownFailureFromProviderStop(stop)!;
-    return {
-      ...primary,
-      details: {
-        ...(primary.details ?? {}),
-        secondaryEvidence: "evidence-child",
-      },
-    };
-  }
-  return undefined;
-}
-
 type BoundAuditorVolume = {
   readonly entries: SessionEntry[];
   readonly attemptEntryId?: string;
@@ -1309,23 +1269,10 @@ export async function resolveAuditedRunnerFailureResolution(input: {
   runner: RoleTurnKnownFailure | undefined;
   sessionFile: string;
   credential: RoleTurnKnownFailure | undefined;
-  /** Reviewer only: recover child-written rejection page into knownFailure.details. */
+  /** Optional run directory for typed provider HTTP observation (resume/429). */
   runDirectory?: string;
 }): Promise<AuditedRunnerFailureResolution> {
   if (input.runner !== undefined) return resolutionOf(input.runner);
-  if (input.runDirectory !== undefined) {
-    try {
-      const rejection = await readReviewerDispatchRejection(input.runDirectory);
-      if (rejection !== undefined) return resolutionOf(rejection);
-    } catch (error) {
-      const failure = error instanceof Error ? error : new Error(String(error));
-      return resolutionOf({
-        cause: "activation",
-        identity: thrownIdentity(failure),
-        diagnostic: failure.message || failure.name,
-      });
-    }
-  }
   // Bound auditor compliance-failure retention outranks a parent failure that the
   // auditor path itself caused (retention EISDIR race). A typed terminating-tool
   // host failure is next — it outranks weaker auditor provider-stop fallback so
@@ -1367,20 +1314,7 @@ export async function resolveAuditedRunnerFailureResolution(input: {
       diagnostic: failure.message || failure.name,
     });
   }
-  // Reviewer axis evidence-children are next: fixed two-axis dispatch fails
-  // during activation with only child stops durable. Parent stop remains the
-  // fallback; credential is last.
-  try {
-    const evidenceChildFailure = await readBoundEvidenceChildKnownFailure(input.sessionFile);
-    if (evidenceChildFailure !== undefined) return resolutionOf(evidenceChildFailure);
-  } catch (error) {
-    const failure = sessionReadFailure(error, "failed to recover bound evidence-child failure");
-    return resolutionOf({
-      cause: "session",
-      identity: thrownIdentity(failure),
-      diagnostic: failure.message || failure.name,
-    });
-  }
+  // Parent session provider-stop is next; credential is last.
   const parentStop = await readSessionProviderStop(input.sessionFile);
   // Typed HTTP observation: ENOENT=absence; other read/parse/shape failures keep real cause.
   // This is the single sidecar read for both knownFailure projection and v1 resume.
@@ -1437,7 +1371,7 @@ export async function resolveAuditedRunnerKnownFailure(input: {
   runner: RoleTurnKnownFailure | undefined;
   sessionFile: string;
   credential: RoleTurnKnownFailure | undefined;
-  /** Reviewer only: recover child-written rejection page into knownFailure.details. */
+  /** Optional run directory for typed provider HTTP observation (resume/429). */
   runDirectory?: string;
 }): Promise<RoleTurnKnownFailure | undefined> {
   return (await resolveAuditedRunnerFailureResolution(input)).knownFailure;
@@ -3527,7 +3461,7 @@ export async function trySettleFixerTerminalResult(
 }
 
 /**
- * Observe forced Reviewer code-review Skill expansions from the session.
+ * Observe forced Reviewer ak-cross-m-review Skill expansions from the session.
  * Expansion evidence is package-path only; ambient home locations never count.
  */
 export function extractReviewerMethodInvocations(
@@ -3544,7 +3478,7 @@ export function extractReviewerMethodInvocations(
     const text = sessionMessageText(message);
     if (text.length === 0) continue;
     const hit = observePackagedMethodSkillInvocation(text, {
-      name: "code-review",
+      name: "ak-cross-m-review",
       allowedLocations: options.allowedLocations,
     });
     if (hit !== undefined) observed.push(hit);
@@ -3554,7 +3488,7 @@ export function extractReviewerMethodInvocations(
 
 /**
  * Publish lawful Reviewer success Artifacts on the shared #106 success interface.
- * Evidence records package code-review provenance and typed expansion
+ * Evidence records package ak-cross-m-review provenance and typed expansion
  * observation without ambient home Skill paths.
  */
 export async function publishReviewerArtifacts(
@@ -3593,6 +3527,7 @@ export async function publishReviewerArtifacts(
         sessionFile: coordinates.sessionFile,
         admittedRequestPath: admitted.admittedRequestPath,
         baseRevision: admitted.baseRevision,
+        lens: admitted.lens,
         authorityRefs: [...admitted.authorityRefs],
         ...(admitted.instructionEmpty
           ? {}

package/src/reviewer-role.ts

@@ -5,33 +5,45 @@ import { withTerminatingOutputDeclarations } from "./package-contracts/terminati
 
 import type { AnyCanonicalSkillBinding, CanonicalSkillBinding } from "./canonical-skill-binding.ts";
 export type { CanonicalSkillBinding };
-import { type ReviewerPinnedGitReader } from "./reviewer-pinned-git.ts";
 import { REVIEWER_ACCEPTED_TEXT, REVIEWER_OUTPUT_TOOL_NAME, type ReviewerIntent } from "./package-contracts/reviewer-output.ts";
 
 export { REVIEWER_OUTPUT_TOOL_NAME };
 export type { ReviewerIntent };
-export const AGENT_TOOL_NAME = "Agent";
 
 /** Frozen admitted inputs the behavior layer may consume — no flag surface. */
 export type ReviewerAdmittedInputs = Readonly<{
   baseRevision: string;
-  reviewScopeKeys?: readonly string[];
+  /** Caller-selected single lens; required, no default. */
+  lens: "completeness" | "correctness";
   authorityRefs?: readonly string[];
   /** Typed #176 ticketNumber from admitted invocation (Spec self-fetch primary). */
   ticketNumber?: number;
 }>;
 
 const reviewerAmendmentsSchema = Type.Object({
-  standards: Type.Optional(Type.String({ description: "标准轴弹章正文" })),
-  spec: Type.Optional(Type.String({ description: "规格轴弹章正文" })),
-}, { additionalProperties: true, description: "逐轴弹章正文；无弹章的轴可省略。" });
+  completeness: Type.Optional(Type.String({
+    description:
+      "completeness lens 完整报告：candidates、逐条处置与 verdict；非仅 verdict 一行。hard-stop／usage error 为 refused 时，若已产出报告仍照录于此",
+  })),
+  correctness: Type.Optional(Type.String({
+    description:
+      "correctness lens 完整报告：candidates、逐条处置与 verdict；非仅 verdict 一行。hard-stop／usage error 为 refused 时，若已产出报告仍照录于此",
+  })),
+}, {
+  additionalProperties: true,
+  description:
+    "所选 lens 的 amendments 承载 candidates、逐条处置与 verdict 的完整报告（非仅 verdict 行）；未选 lens 可省略。hard-stop／usage error 为 refused 时，已产出报告仍照录进所选 lens 字段。形状指引，非 schema 闸。",
+});
 // #836 r16 class 1: diagnostic is LLM/human-read narrative content — no code
 // branches on its length (src/reviewer-role.ts consumer: reviewer content is
 // returned as submitted, ADR 0057).
 // #836 (ADR 0003 Amendment): status kept open like countersignStatus
 // (src/countersign-role.ts) — one shared description across both variants
 // so openToolObjectFromUnion's identical-declaration collapse drops none of it.
-const REVIEWER_STATUS_DESCRIPTION = "completed | refused — 形状指引，非 schema 闸" as const;
+// #917 §6: both normal lens verdicts → completed; hard-stop/usage error → refused
+// (report already produced still lands in selected-lens amendments).
+const REVIEWER_STATUS_DESCRIPTION =
+  "completed | refused — 形状指引，非 schema 闸。两种正常 lens verdict（completeness / correctness）均 completed；hard-stop 与 usage error 为 refused（已产出报告仍照录进所选 lens amendments）。" as const;
 const reviewerOutputVariants = Type.Union([
   Type.Object({
     status: Type.Unknown({ description: REVIEWER_STATUS_DESCRIPTION }),
@@ -39,7 +51,7 @@ const reviewerOutputVariants = Type.Union([
   }, { additionalProperties: false }),
   Type.Object({
     status: Type.Unknown({ description: REVIEWER_STATUS_DESCRIPTION }),
-    diagnostic: Type.String({ description: "拒绝诊断说明" }),
+    diagnostic: Type.String({ description: "拒绝诊断说明；hard-stop／usage error 原因进此字段，已产出报告另照录 amendments" }),
     amendments: Type.Optional(reviewerAmendmentsSchema),
   }, { additionalProperties: false }),
 ]);
@@ -48,8 +60,7 @@ export const reviewerOutputSchema = withTerminatingOutputDeclarations(
 );
 export type ReviewerRoleDependencies = {
   loadSoul(): Promise<string>;
-  loadCanonicalSkillBinding(name: "code-review"): Promise<AnyCanonicalSkillBinding>;
-  createPinnedGitReader(): Promise<ReviewerPinnedGitReader>;
+  loadCanonicalSkillBinding(name: "ak-cross-m-review"): Promise<AnyCanonicalSkillBinding>;
 };
 export type ReviewerRoleHostActions = { failInfrastructure(error: unknown, ctx: HostContext, toolCallId?: string): never };
 
@@ -57,8 +68,8 @@ export type ReviewerRoleHostActions = { failInfrastructure(error: unknown, ctx:
 export type ReviewerActivation = Readonly<{
   fixedBaseRevision: string;
   soul: string;
-  /** Frozen code-review binding — envelope owns expansion capture against this data. */
-  skillBinding: CanonicalSkillBinding<"code-review">;
+  /** Frozen ak-cross-m-review binding — envelope owns expansion capture against this data. */
+  skillBinding: CanonicalSkillBinding<"ak-cross-m-review">;
 }>;
 
 /**
@@ -74,7 +85,7 @@ export function createReviewerRoleRuntime(
   activate(ctx: HostContext | undefined, admitted: ReviewerAdmittedInputs): Promise<ReviewerActivation>;
 } {
   let soul: string | undefined;
-  let binding: CanonicalSkillBinding<"code-review"> | undefined;
+  let binding: CanonicalSkillBinding<"ak-cross-m-review"> | undefined;
   let registered = false;
   let fixedBaseRevision: string | undefined;
 
@@ -83,13 +94,13 @@ export function createReviewerRoleRuntime(
       soul = (await dependencies.loadSoul()).trim();
       if (!soul) throw new Error("Reviewer soul is empty");
       fixedBaseRevision = admitted.baseRevision;
-      const loaded = await dependencies.loadCanonicalSkillBinding("code-review");
-      if (loaded.name !== "code-review") throw new Error("Canonical Skill binding loader returned tdd for code-review");
+      const loaded = await dependencies.loadCanonicalSkillBinding("ak-cross-m-review");
+      if (loaded.name !== "ak-cross-m-review") throw new Error("Canonical Skill binding loader returned tdd for ak-cross-m-review");
       binding = loaded;
 
       if (!registered) {
         registered = true;
-        pi.registerTool({ name: REVIEWER_OUTPUT_TOOL_NAME, label: "御史台输出", description: "提交御史台终局回执。本席自调 code-review skill。", promptSnippet: "提交御史台终局回执", parameters: reviewerOutputSchema,
+        pi.registerTool({ name: REVIEWER_OUTPUT_TOOL_NAME, label: "御史台输出", description: "提交御史台终局回执。本席自调 ak-cross-m-review skill。", promptSnippet: "提交御史台终局回执", parameters: reviewerOutputSchema,
           async execute(_id: string, parameters: unknown): Promise<HostToolResult<unknown>> {
             if (!soul || !binding) throw new Error("御史台输入未装载");
             return {

package/src/role-activation-flags.ts

@@ -30,6 +30,7 @@ export function projectActivationFlags(request: RoleTurnRequest): Map<string, bo
   }
   if (activation.role === "reviewer") {
     flags.set("ak-review-base", activation.baseRevision);
+    flags.set("ak-review-lens", activation.lens);
     flags.set("ak-review-authority-refs", JSON.stringify(activation.authorityRefs));
     if (activation.ticketNumber !== undefined) {
       flags.set("ak-review-ticket-number", String(activation.ticketNumber));

package/src/role-runtime-dependencies.ts

@@ -10,7 +10,6 @@ import { loadNavigatorWorkContext } from "./navigator-work-context.ts";
 import { loadNotarySourceRunLocator } from "./notary-source-run.ts";
 import { loadPackagedCanonicalSkillBinding } from "./package-resources/method-skill-binding.ts";
 import { formatNavigatorRoleHelp, type RoleRuntimeDependencies } from "./role-runtime.ts";
-import { createReviewerPinnedGitReader } from "./reviewer-pinned-git.ts";
 import { loadAuditorSoulFromSubjectInput } from "./auditor-soul.ts";
 import { loadGatekeeperSessionMaterials, loadMainRoleSessionMaterials } from "./session-opening-materials.ts";
 
@@ -33,7 +32,6 @@ export function createRoleRuntimeDependencies(packageRoot: string): RoleRuntimeD
     loadCoderSoul: () => loadMainRoleSessionMaterials("coder"),
     loadCoderTask: (path) => readFile(path, "utf8"),
     loadReviewerSoul: () => loadMainRoleSessionMaterials("reviewer"),
-    createReviewerPinnedGitReader: () => createReviewerPinnedGitReader(),
     loadCollectorSoul: () => loadMainRoleSessionMaterials("collector"),
     loadCollectorHandbookSeed: () => readFile(collectorHandbookSeedPath, "utf8"),
     createCollectorTransport: () => createGhCollectorGitHubTransport(),
@@ -55,8 +53,8 @@ export function createRoleRuntimeDependencies(packageRoot: string): RoleRuntimeD
       if (name === "tdd") {
         return loadPackagedCanonicalSkillBinding(packageRoot, "tdd");
       }
-      if (name === "code-review") {
-        return loadPackagedCanonicalSkillBinding(packageRoot, "code-review");
+      if (name === "ak-cross-m-review") {
+        return loadPackagedCanonicalSkillBinding(packageRoot, "ak-cross-m-review");
       }
       return loadHomeCanonicalSkillBinding(name);
     },