@akagilnc/pi-workflow-roles 0.1.4800 → 0.1.4870

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

@@ -12,6 +12,7 @@
  */
 
 import { CliUsageError } from "./cli-errors.ts";
+import { PUBLIC_CALLABLE_ROLES, type PublicCallableRole } from "./registry.ts";
 
 /** Analyst public query faces (#336/#337/#338/#399). model-groups CLI face disabled (library kernel retained). */
 export type AnalystMode = "issue" | "sweep" | "cohort";
@@ -19,25 +20,8 @@ export type AnalystMode = "issue" | "sweep" | "cohort";
 /** Coder/Fixer public phase tokens. */
 export type RolePhase = "plan" | "apply";
 
-export type OptionOwner =
-  | "global"
-  | "judge"
-  | "countersign"
-  | "coder"
-  | "fixer"
-  | "reviewer"
-  | "collector"
-  | "doctor"
-  | "merger"
-  | "notary"
-  | "gleaner-left"
-  | "inspector"
-  | "gatekeeper"
-  | "navigator"
-  | "auditor"
-  | "diarist"
-  | "secretariat"
-  | "analyst";
+/** global, every composition-root role, and the deterministic analyst command. */
+export type OptionOwner = "global" | PublicCallableRole | "analyst";
 
 /**
  * One public option (or positional mode/phase token) identity.
@@ -386,10 +370,29 @@ function bindOwner(
   return { ...semantics, owner };
 }
 
-const JUDGE_OPTIONS = [
-  bindOwner("judge", SHARED_PROJECT_SEMANTICS),
-  bindOwner("judge", SHARED_ATTACH_SEMANTICS),
-] as const satisfies readonly PublicOptionDefinition[];
+/** Seats whose public face is only project + attach. Unique rows stay explicit. */
+function projectAndAttach(owner: OptionOwner): readonly PublicOptionDefinition[] {
+  return [
+    bindOwner(owner, SHARED_PROJECT_SEMANTICS),
+    bindOwner(owner, SHARED_ATTACH_SEMANTICS),
+  ];
+}
+
+const SHARED_PHASE_SEMANTICS = {
+  id: "phase",
+  canonical: "plan|apply",
+  aliases: ["plan", "apply"],
+  valueMetavar: null,
+  required: false,
+  repeatable: false,
+  defaultValue: "apply",
+  form: "positional",
+  phases: ["plan", "apply"],
+  description: {
+    en: "Optional phase token before the instruction; defaults to apply.",
+    zh: "指令前可选 phase 词元；默认 apply。",
+  },
+} as const satisfies Omit<PublicOptionDefinition, "owner">;
 
 const GLEANER_LEFT_OPTIONS = [
   bindOwner("gleaner-left", SHARED_PROJECT_SEMANTICS),
@@ -410,24 +413,8 @@ const GLEANER_LEFT_OPTIONS = [
   },
 ] as const satisfies readonly PublicOptionDefinition[];
 
-const INSPECTOR_OPTIONS = [
-  bindOwner("inspector", SHARED_PROJECT_SEMANTICS),
-  bindOwner("inspector", SHARED_ATTACH_SEMANTICS),
-] as const satisfies readonly PublicOptionDefinition[];
-
-const GATEKEEPER_OPTIONS = [
-  bindOwner("gatekeeper", SHARED_PROJECT_SEMANTICS),
-  bindOwner("gatekeeper", SHARED_ATTACH_SEMANTICS),
-] as const satisfies readonly PublicOptionDefinition[];
-
-const NAVIGATOR_OPTIONS = [
-  bindOwner("navigator", SHARED_PROJECT_SEMANTICS),
-  bindOwner("navigator", SHARED_ATTACH_SEMANTICS),
-] as const satisfies readonly PublicOptionDefinition[];
-
 const AUDITOR_OPTIONS = [
-  bindOwner("auditor", SHARED_PROJECT_SEMANTICS),
-  bindOwner("auditor", SHARED_ATTACH_SEMANTICS),
+  ...projectAndAttach("auditor"),
   {
     id: "subject",
     owner: "auditor",
@@ -458,61 +445,14 @@ const AUDITOR_OPTIONS = [
   },
 ] as const satisfies readonly PublicOptionDefinition[];
 
-const COUNTERSIGN_OPTIONS = [
-  bindOwner("countersign", SHARED_PROJECT_SEMANTICS),
-  bindOwner("countersign", SHARED_ATTACH_SEMANTICS),
-] as const satisfies readonly PublicOptionDefinition[];
-
-const DIARIST_OPTIONS = [
-  bindOwner("diarist", SHARED_PROJECT_SEMANTICS),
-  bindOwner("diarist", SHARED_ATTACH_SEMANTICS),
-] as const satisfies readonly PublicOptionDefinition[];
-
-const SECRETARIAT_OPTIONS = [
-  bindOwner("secretariat", SHARED_PROJECT_SEMANTICS),
-  bindOwner("secretariat", SHARED_ATTACH_SEMANTICS),
-] as const satisfies readonly PublicOptionDefinition[];
-
 const CODER_OPTIONS = [
-  {
-    id: "phase",
-    owner: "coder",
-    canonical: "plan|apply",
-    aliases: ["plan", "apply"],
-    valueMetavar: null,
-    required: false,
-    repeatable: false,
-    defaultValue: "apply",
-    form: "positional",
-    phases: ["plan", "apply"],
-    description: {
-      en: "Optional phase token before the instruction; defaults to apply.",
-      zh: "指令前可选 phase 词元；默认 apply。",
-    },
-  },
-  bindOwner("coder", SHARED_PROJECT_SEMANTICS),
-  bindOwner("coder", SHARED_ATTACH_SEMANTICS),
+  bindOwner("coder", SHARED_PHASE_SEMANTICS),
+  ...projectAndAttach("coder"),
 ] as const satisfies readonly PublicOptionDefinition[];
 
 const FIXER_OPTIONS = [
-  {
-    id: "phase",
-    owner: "fixer",
-    canonical: "plan|apply",
-    aliases: ["plan", "apply"],
-    valueMetavar: null,
-    required: false,
-    repeatable: false,
-    defaultValue: "apply",
-    form: "positional",
-    phases: ["plan", "apply"],
-    description: {
-      en: "Optional phase token before the instruction; defaults to apply.",
-      zh: "指令前可选 phase 词元；默认 apply。",
-    },
-  },
-  bindOwner("fixer", SHARED_PROJECT_SEMANTICS),
-  bindOwner("fixer", SHARED_ATTACH_SEMANTICS),
+  bindOwner("fixer", SHARED_PHASE_SEMANTICS),
+  ...projectAndAttach("fixer"),
   {
     id: "prerequisites",
     owner: "fixer",
@@ -577,8 +517,7 @@ const REVIEWER_OPTIONS = [
 ] as const satisfies readonly PublicOptionDefinition[];
 
 const COLLECTOR_OPTIONS = [
-  bindOwner("collector", SHARED_PROJECT_SEMANTICS),
-  bindOwner("collector", SHARED_ATTACH_SEMANTICS),
+  ...projectAndAttach("collector"),
   {
     id: "pr",
     owner: "collector",
@@ -639,8 +578,7 @@ const COLLECTOR_OPTIONS = [
 ] as const satisfies readonly PublicOptionDefinition[];
 
 const DOCTOR_OPTIONS = [
-  bindOwner("doctor", SHARED_PROJECT_SEMANTICS),
-  bindOwner("doctor", SHARED_ATTACH_SEMANTICS),
+  ...projectAndAttach("doctor"),
   {
     id: "issue",
     owner: "doctor",
@@ -841,13 +779,12 @@ const ANALYST_OPTIONS = [
 ] as const satisfies readonly PublicOptionDefinition[];
 
 /**
- * Sole production option tables keyed by PUBLIC_ROLE_ARGV / global owner.
- * Rows are readonly definition lists — parsers look up spellings here.
+ * Seats whose public rows are not the shared project+attach face.
+ * A new project+attach seat needs no entry here.
  */
-export const PUBLIC_OPTION_TABLE = {
-  global: GLOBAL_OPTIONS,
-  judge: JUDGE_OPTIONS,
-  countersign: COUNTERSIGN_OPTIONS,
+const SEAT_OPTION_ROWS: Partial<
+  Record<PublicCallableRole, readonly PublicOptionDefinition[]>
+> = {
   "gleaner-left": GLEANER_LEFT_OPTIONS,
   coder: CODER_OPTIONS,
   fixer: FIXER_OPTIONS,
@@ -856,37 +793,35 @@ export const PUBLIC_OPTION_TABLE = {
   doctor: DOCTOR_OPTIONS,
   merger: MERGER_OPTIONS,
   notary: NOTARY_OPTIONS,
-  inspector: INSPECTOR_OPTIONS,
-  gatekeeper: GATEKEEPER_OPTIONS,
-  navigator: NAVIGATOR_OPTIONS,
   auditor: AUDITOR_OPTIONS,
-  diarist: DIARIST_OPTIONS,
-  secretariat: SECRETARIAT_OPTIONS,
-  analyst: ANALYST_OPTIONS,
-} as const satisfies Record<OptionOwner, readonly PublicOptionDefinition[]>;
+};
+
+function seatOptionRows(role: PublicCallableRole): readonly PublicOptionDefinition[] {
+  return SEAT_OPTION_ROWS[role] ?? projectAndAttach(role);
+}
+
+/**
+ * Sole production option tables keyed by PUBLIC_ROLE_ARGV / global owner.
+ * Rows are readonly definition lists — parsers look up spellings here.
+ * Callable seats come from the composition root; only a different face is listed above.
+ */
+function publicOptionTable(): Record<OptionOwner, readonly PublicOptionDefinition[]> {
+  const roles = {} as Record<PublicCallableRole, readonly PublicOptionDefinition[]>;
+  for (const role of PUBLIC_CALLABLE_ROLES) {
+    roles[role] = seatOptionRows(role);
+  }
+  return { global: GLOBAL_OPTIONS, ...roles, analyst: ANALYST_OPTIONS };
+}
+
+export const PUBLIC_OPTION_TABLE = publicOptionTable();
 
 export type PublicRoleOptionOwner = Exclude<OptionOwner, "global">;
 
-/** Role/deterministic owners that appear on PUBLIC_ROLE_ARGV. */
-export const PUBLIC_ROLE_OPTION_OWNERS = [
-  "judge",
-  "countersign",
-  "gleaner-left",
-  "coder",
-  "fixer",
-  "reviewer",
-  "collector",
-  "doctor",
-  "merger",
-  "notary",
-  "inspector",
-  "gatekeeper",
-  "navigator",
-  "auditor",
-  "diarist",
-  "secretariat",
+/** Role/deterministic owners that appear on PUBLIC_ROLE_ARGV. Roles follow the composition root; analyst is the deterministic command. */
+export const PUBLIC_ROLE_OPTION_OWNERS: readonly PublicRoleOptionOwner[] = [
+  ...PUBLIC_CALLABLE_ROLES,
   "analyst",
-] as const satisfies readonly PublicRoleOptionOwner[];
+];
 
 export function optionsForOwner(
   owner: OptionOwner,

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

@@ -26,7 +26,7 @@ import {
 import { readRecordedSubmissionRows } from "../submission-ledger.ts";
 import { pathContainedIn } from "../activation-ledger-topology.ts";
 import { pickEngineAxis } from "../package-resources/engine-material.ts";
-import { resolveHostAwareSessionAvailability } from "../session-identity.ts";
+import { readStoredHostSessionId, resolveHostAwareSessionAvailability } from "../session-identity.ts";
 import { rewriteRunDirectoryPathValue } from "../role-run-relocation.ts";
 
 import type {
@@ -39,7 +39,7 @@ import type {
   RoleTurnResult,
   SessionCustomEntryAppender,
 } from "../host-contracts.ts";
-import { isOfficerReviewSeat } from "../host-contracts.ts";
+import { isOfficerReviewSeat } from "../packaged-role-registry.ts";
 import { deliverCaseDossierAsAttachment } from "./case-dossier-delivery.ts";
 
 /** Original error bytes, never relabeled — a secondary fact riding beside a classified cause. */
@@ -323,6 +323,11 @@ export type PostAdmissionEnv = {
    * and mint a new run. Absent on ordinary role commands and on `ak-role resume`.
    */
   freshSummons?: true;
+  /**
+   * Typed ticket already carried into this summons (parent board / 起居录).
+   * Admission places the run under it. Not a public CLI flag.
+   */
+  boundTicketNumber?: number;
   /** Station child role run (#840): omit automatic navigator attendance. */
   stationChild?: boolean;
   /**
@@ -1380,6 +1385,30 @@ export function resumeTurnRequestProjectionOptions(
   };
 }
 
+/** Shared new-turn and in-call auto-resume projection. Seat code supplies prompt and activation. */
+export function roleTurnOptions(
+  env: PostAdmissionEnv,
+  admitted: { readonly correlationId?: string },
+  continuation: RoleTurnRequest["continuation"],
+  extra?: { readonly cwd?: string },
+): RoleTurnRequestProjectionOptions {
+  const correlationId = admitted.correlationId ?? env.correlationId;
+  return {
+    packageRoot: env.packageRoot,
+    home: env.home,
+    agentDir: env.agentDir,
+    ...(env.model === undefined ? {} : { model: env.model }),
+    ...pickEngineAxis(env),
+    ...(env.timeoutMs === undefined ? {} : { timeoutMs: env.timeoutMs }),
+    ...(correlationId === undefined || correlationId.trim() === ""
+      ? {}
+      : { correlationId }),
+    continuation,
+    ...(extra?.cwd === undefined ? {} : { cwd: extra.cwd }),
+    ...(env.stationChild === undefined ? {} : { stationChild: env.stationChild }),
+  };
+}
+
 /**
  * Build the turn request, then hand off to dispatch. When a writer lease is
  * held, release it if build throws before handoff — dispatch's finally only
@@ -1568,6 +1597,22 @@ export async function runPostAdmissionSeatResume<
         }
 
         let turnRequest = await input.buildTurnRequest(admittedForBuild, request);
+        if (
+          turnRequest.continuation.kind === "resume"
+          && turnRequest.continuation.hostSessionId === undefined
+        ) {
+          const hostSessionId = await readStoredHostSessionId(
+            env.host,
+            env.principalAuthority,
+            admittedForBuild.principal,
+          );
+          if (hostSessionId !== undefined) {
+            turnRequest = {
+              ...turnRequest,
+              continuation: { ...turnRequest.continuation, hostSessionId },
+            };
+          }
+        }
 
         // Open court continue, or new court for summons / message re-review
         // (clause 0 新庭可再交卷; #833). Bare resume without open court omits id.