@akagilnc/pi-workflow-roles 0.1.4802 → 0.1.4874

package/dist/public-cli/option-definitions.js

@@ -11,6 +11,7 @@
  * tokens or add parallel repeatability / requiredness branches.
  */
 import { CliUsageError } from "./cli-errors.js";
+import { PUBLIC_CALLABLE_ROLES } from "./registry.js";
 /**
  * Cross-field at-least-one rules for analyst modes.
  * #399: issue bare call is lawful (whole book from cwd) — no require-any-of on issue.
@@ -281,10 +282,28 @@ const SHARED_ATTACH_SEMANTICS = {
 function bindOwner(owner, semantics) {
     return { ...semantics, owner };
 }
-const JUDGE_OPTIONS = [
-    bindOwner("judge", SHARED_PROJECT_SEMANTICS),
-    bindOwner("judge", SHARED_ATTACH_SEMANTICS),
-];
+/** Seats whose public face is only project + attach. Unique rows stay explicit. */
+function projectAndAttach(owner) {
+    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。",
+    },
+};
 const GLEANER_LEFT_OPTIONS = [
     bindOwner("gleaner-left", SHARED_PROJECT_SEMANTICS),
     // Unanchored seat: no --attach face (self-fetches the merge-candidate diff).
@@ -303,21 +322,8 @@ const GLEANER_LEFT_OPTIONS = [
         },
     },
 ];
-const INSPECTOR_OPTIONS = [
-    bindOwner("inspector", SHARED_PROJECT_SEMANTICS),
-    bindOwner("inspector", SHARED_ATTACH_SEMANTICS),
-];
-const GATEKEEPER_OPTIONS = [
-    bindOwner("gatekeeper", SHARED_PROJECT_SEMANTICS),
-    bindOwner("gatekeeper", SHARED_ATTACH_SEMANTICS),
-];
-const NAVIGATOR_OPTIONS = [
-    bindOwner("navigator", SHARED_PROJECT_SEMANTICS),
-    bindOwner("navigator", SHARED_ATTACH_SEMANTICS),
-];
 const AUDITOR_OPTIONS = [
-    bindOwner("auditor", SHARED_PROJECT_SEMANTICS),
-    bindOwner("auditor", SHARED_ATTACH_SEMANTICS),
+    ...projectAndAttach("auditor"),
     {
         id: "subject",
         owner: "auditor",
@@ -347,57 +353,13 @@ const AUDITOR_OPTIONS = [
         },
     },
 ];
-const COUNTERSIGN_OPTIONS = [
-    bindOwner("countersign", SHARED_PROJECT_SEMANTICS),
-    bindOwner("countersign", SHARED_ATTACH_SEMANTICS),
-];
-const DIARIST_OPTIONS = [
-    bindOwner("diarist", SHARED_PROJECT_SEMANTICS),
-    bindOwner("diarist", SHARED_ATTACH_SEMANTICS),
-];
-const SECRETARIAT_OPTIONS = [
-    bindOwner("secretariat", SHARED_PROJECT_SEMANTICS),
-    bindOwner("secretariat", SHARED_ATTACH_SEMANTICS),
-];
 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"),
 ];
 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",
@@ -460,8 +422,7 @@ const REVIEWER_OPTIONS = [
     },
 ];
 const COLLECTOR_OPTIONS = [
-    bindOwner("collector", SHARED_PROJECT_SEMANTICS),
-    bindOwner("collector", SHARED_ATTACH_SEMANTICS),
+    ...projectAndAttach("collector"),
     {
         id: "pr",
         owner: "collector",
@@ -521,8 +482,7 @@ const COLLECTOR_OPTIONS = [
     },
 ];
 const DOCTOR_OPTIONS = [
-    bindOwner("doctor", SHARED_PROJECT_SEMANTICS),
-    bindOwner("doctor", SHARED_ATTACH_SEMANTICS),
+    ...projectAndAttach("doctor"),
     {
         id: "issue",
         owner: "doctor",
@@ -719,13 +679,10 @@ const ANALYST_OPTIONS = [
     },
 ];
 /**
- * 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 = {
     "gleaner-left": GLEANER_LEFT_OPTIONS,
     coder: CODER_OPTIONS,
     fixer: FIXER_OPTIONS,
@@ -734,32 +691,27 @@ 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,
 };
-/** Role/deterministic owners that appear on PUBLIC_ROLE_ARGV. */
+function seatOptionRows(role) {
+    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() {
+    const roles = {};
+    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();
+/** 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 = [
-    "judge",
-    "countersign",
-    "gleaner-left",
-    "coder",
-    "fixer",
-    "reviewer",
-    "collector",
-    "doctor",
-    "merger",
-    "notary",
-    "inspector",
-    "gatekeeper",
-    "navigator",
-    "auditor",
-    "diarist",
-    "secretariat",
+    ...PUBLIC_CALLABLE_ROLES,
     "analyst",
 ];
 export function optionsForOwner(owner) {

package/dist/public-cli/post-admission.js

@@ -14,9 +14,9 @@ import { bindAdmittedTicketNumber, buildInstructionTransportPrompt, freezeAttach
 import { readRecordedSubmissionRows } from "../submission-ledger.js";
 import { pathContainedIn } from "../activation-ledger-topology.js";
 import { pickEngineAxis } from "../package-resources/engine-material.js";
-import { resolveHostAwareSessionAvailability } from "../session-identity.js";
+import { readStoredHostSessionId, resolveHostAwareSessionAvailability } from "../session-identity.js";
 import { rewriteRunDirectoryPathValue } from "../role-run-relocation.js";
-import { isOfficerReviewSeat } from "../host-contracts.js";
+import { isOfficerReviewSeat } from "../packaged-role-registry.js";
 import { deliverCaseDossierAsAttachment } from "./case-dossier-delivery.js";
 /** Original error bytes, never relabeled — a secondary fact riding beside a classified cause. */
 function describeCaughtError(error) {
@@ -875,6 +875,24 @@ export function resumeTurnRequestProjectionOptions(admitted, request, env, summo
         ...(env.stationChild === undefined ? {} : { stationChild: env.stationChild }),
     };
 }
+/** Shared new-turn and in-call auto-resume projection. Seat code supplies prompt and activation. */
+export function roleTurnOptions(env, admitted, continuation, extra) {
+    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
@@ -994,6 +1012,16 @@ export async function runPostAdmissionSeatResume(input) {
             }
         }
         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.
         if (openCourtAttemptId !== undefined ||