@akagilnc/pi-workflow-roles 0.1.5365 → 0.1.5375

package/dist/public-cli/instruction-seat-run.js

@@ -3,7 +3,8 @@
  * Seat differences are composition-root fields. An omitted reviewer lens
  * starts two ordinary single-axis runs here.
  */
-import { dirname, resolve, sep } from "node:path";
+import { dirname, resolve } from "node:path";
+import { isUnboundRunDirectory } from "../role-run-placement.js";
 import { AUDITOR_DOSSIER_PROMPT } from "../compliance-transport.js";
 import { bookDirectOfficerRunPointer } from "../archivist-record-pointer.js";
 import { createPiDoctorAuditor } from "../doctor-auditor.js";
@@ -22,7 +23,7 @@ import { isSafePositiveTicketNumber, readBoardTicketNumber } from "../run-ticket
 import { NotarySourceRunError, resolveNotarySourceRunLocator } from "../notary-source-run.js";
 import { engineSessionMaterialFromOptions, pickEngineAxis } from "../package-resources/engine-material.js";
 import { packagedAdmitsCountersign, packagedBindsBoardTicket, packagedRebindSourceOnResume, packagedRoleMetadata, } from "../packaged-role-registry.js";
-import { isAuditorSoulRole, readAuditorResumeBinding } from "../auditor-soul.js";
+import { readAuditorResumeBinding } from "../auditor-soul.js";
 import { CliUsageError } from "./cli-errors.js";
 import { admitPublicRole, bindAdmittedTicketNumber, buildInstructionTransportPrompt, materializeCountersignInvocation, persistAdmittedSourceRunPath, recordAdmittedCorrelation, recordChildDiaristRun, relocateAdmittedRunToTicket, withPreparedAttachments, } from "./invocation.js";
 import { presentControlledFailure, prepareSummonsResumeMaterials, roleTurnOptions, runPostAdmissionOneShot, runPostAdmissionResumable, runPostAdmissionSeatResume, showResumeErrorPointer, resumeTurnRequestProjectionOptions, } from "./post-admission.js";
@@ -31,8 +32,9 @@ import { tryResumeSameTicketSeatRun } from "./seat-ticket-binding.js";
 import { presentStructuralRejection, readBoundSessionEntries, seatKnownFailureResolver, attachPostAuditProjection, trySettlePublicSeat, } from "./settlement.js";
 import { warnMissingMethodSkills } from "./machine-method-skills.js";
 import { formatTerminalResult, isLawfulTypedTerminalOutcome, } from "./terminal.js";
-import { admittedSeatTurnDetails, projectRoleTurnRequest, requiredMethodSkills, } from "./turn-request.js";
+import { admittedSeatTurnDetails, projectPublicTurnAxes, projectRoleTurnRequest, requiredMethodSkills, } from "./turn-request.js";
 import { invokeCourtDiarist, latestPayloadEscalated, } from "./countersign-run.js";
+import { isRecord, errorText } from "../unknown-value.js";
 const AUDITED_ROLES = new Set(["judge", "fixer", "coder", "secretariat", "countersign", "doctor"]);
 const SECRETARIAT_STATUS_REASK = "secretariatStatus 不是 converged、escalate 之一。请重新交卷，secretariatStatus 写明其一。";
 const COUNTERSIGN_STATUS_REASK = "status 不是 converged、continue、escalate 三态之一。请重新交卷，status 写明其一。";
@@ -73,7 +75,7 @@ function unreadablePostSubmissionStatus(admitted, terminal) {
     if (route === undefined)
         return undefined;
     const payload = terminal.roleOutcome.payloads?.at(-1);
-    const status = payload !== null && typeof payload === "object" && !Array.isArray(payload)
+    const status = isRecord(payload)
         ? payload.status
         : undefined;
     return typeof status === "string" && route.statuses.has(status)
@@ -309,6 +311,29 @@ async function runOmittedLensBatch(argv, parsed, env, io) {
     io.stdout(formatTerminalResult(terminal));
     return { exitCode: failed ? 1 : 0, terminal };
 }
+/**
+ * One same-parent lookup. Seat branches still build their own summons.
+ * A found child resumes that child; no prior run returns undefined so the caller mints.
+ */
+function resumeSameParentInstructionSeat(input) {
+    return tryResumeSameTicketSeatRun({
+        home: input.env.home,
+        projectRoot: input.projectRoot,
+        role: input.role,
+        parentRunPath: input.parentRunPath,
+        ...(input.ticketNumber === undefined ? {} : { ticketNumber: input.ticketNumber }),
+        freshSummons: input.env.freshSummons,
+        summons: input.summons,
+        resume: (runId, materials) => runPublicInstructionSeatResume({ runId, ...(materials === undefined ? {} : { summons: materials }) }, input.env, input.io),
+    });
+}
+/** Re-ask words when the parent supplied them; otherwise the caller's own instruction. */
+function sameParentInstruction(env, fallback) {
+    const resumeInstruction = env.reviewReask ?? env.gateReviewInstruction;
+    if (resumeInstruction === undefined)
+        return fallback;
+    return { instruction: resumeInstruction, instructionEmpty: false };
+}
 /**
  * Countersign on the shared entry: gate parent resume, deferred materialization,
  * then the same one-shot settlement as every other seat.
@@ -319,19 +344,20 @@ async function runCountersignBody(parsed, env, io) {
         : undefined;
     if (gateParentRunPath !== undefined) {
         const resumeInstruction = env.reviewReask ?? env.gateReviewInstruction ?? parsed.instruction ?? "";
-        const resumed = await tryResumeSameTicketSeatRun({
-            home: env.home,
+        const resumed = await resumeSameParentInstructionSeat({
+            env,
+            io,
             projectRoot: resolve(parsed.project ?? env.cwd),
             role: "countersign",
             parentRunPath: gateParentRunPath,
-            ...(isSafePositiveTicketNumber(env.boundTicketNumber) ? { ticketNumber: env.boundTicketNumber } : {}),
-            freshSummons: env.freshSummons,
+            ...(isSafePositiveTicketNumber(env.boundTicketNumber)
+                ? { ticketNumber: env.boundTicketNumber }
+                : {}),
             summons: {
                 sourceRunPath: gateParentRunPath,
                 instruction: resumeInstruction,
                 instructionEmpty: resumeInstruction.trim() === "",
             },
-            resume: (runId, materials) => runPublicInstructionSeatResume({ runId, ...(materials === undefined ? {} : { summons: materials }) }, env, io),
         });
         if (resumed != null)
             return resumed;
@@ -364,12 +390,7 @@ async function runCountersignBody(parsed, env, io) {
                 admitted = { ...admitted, sourceRunPath: gateParentRunPath };
             }
             const turnProjection = {
-                packageRoot: env.packageRoot,
-                home: env.home,
-                agentDir: env.agentDir,
-                ...(env.model === undefined ? {} : { model: env.model }),
-                ...pickEngineAxis(env),
-                ...(env.timeoutMs === undefined ? {} : { timeoutMs: env.timeoutMs }),
+                ...projectPublicTurnAxes(env),
                 ...(env.correlationId === undefined || env.correlationId.trim() === ""
                     ? {}
                     : { correlationId: env.correlationId }),
@@ -446,47 +467,47 @@ export async function runPublicInstructionSeat(argv, env, io, role, parseArgv) {
     let auditorSubject;
     let auditorSource;
     let auditorTicket;
+    let resolvedNotarySource;
     if (record.sameParent === "subject-source") {
-        if (!isAuditorSoulRole(parsed.subject)) {
+        if (parsed.subject === undefined) {
             presentStructuralRejection(new CliUsageError("auditor --subject requires judge|doctor"), io);
             return { exitCode: 2 };
         }
         auditorSubject = parsed.subject;
-        const source = typeof parsed.sourceRun === "string" ? parsed.sourceRun.trim() : "";
-        if (source === "") {
+        if (parsed.sourceRun === undefined) {
             presentStructuralRejection(new CliUsageError("auditor --source-run requires a run locator"), io);
             return { exitCode: 2 };
         }
+        const source = parsed.sourceRun;
         try {
             const resolved = await resolveNotarySourceRunLocator({ projectRoot, sourceRun: source, home: env.home });
             auditorSource = resolved.runDirectory;
             auditorTicket = await readBoardTicketNumber(resolved.runDirectory);
         }
         catch (error) {
-            presentStructuralRejection(new CliUsageError(error instanceof Error ? error.message : String(error)), io);
+            presentStructuralRejection(new CliUsageError(errorText(error)), io);
             return { exitCode: 2 };
         }
         if (auditorSource === undefined)
             return { exitCode: 2 };
         const sourceDirectory = auditorSource;
-        const resumeInstruction = env.reviewReask ?? env.gateReviewInstruction;
         const summons = {
-            ...(resumeInstruction === undefined
-                ? { instruction: parsed.instruction ?? "", instructionEmpty: (parsed.instruction ?? "").trim() === "" }
-                : { instruction: resumeInstruction, instructionEmpty: false }),
+            ...sameParentInstruction(env, {
+                instruction: parsed.instruction ?? "",
+                instructionEmpty: (parsed.instruction ?? "").trim() === "",
+            }),
             attachmentPaths: parsed.attachmentPaths ?? [],
         };
         const resumed = await withAuditorSoulEnv({
             subject: auditorSubject,
             sourceRunDirectory: auditorSource,
-            run: () => tryResumeSameTicketSeatRun({
-                home: env.home,
+            run: () => resumeSameParentInstructionSeat({
+                env,
+                io,
                 projectRoot,
                 role,
                 parentRunPath: sourceDirectory,
-                freshSummons: env.freshSummons,
                 summons,
-                resume: (runId, materials) => runPublicInstructionSeatResume({ runId, ...(materials === undefined ? {} : { summons: materials }) }, env, io),
             }),
         });
         if (resumed != null)
@@ -495,22 +516,21 @@ export async function runPublicInstructionSeat(argv, env, io, role, parseArgv) {
     if (record.sameParent === "gate-pointer") {
         const parentRunPath = parentRunPathFromGatePointerInstruction(parsed.instruction ?? "");
         if (parentRunPath !== undefined) {
-            const resumeInstruction = env.reviewReask ?? env.gateReviewInstruction;
             const summons = {
                 sourceRunPath: parentRunPath,
-                ...(resumeInstruction === undefined
-                    ? { instruction: parsed.instruction ?? "", instructionEmpty: (parsed.instruction ?? "").trim() === "" }
-                    : { instruction: resumeInstruction, instructionEmpty: false }),
+                ...sameParentInstruction(env, {
+                    instruction: parsed.instruction ?? "",
+                    instructionEmpty: (parsed.instruction ?? "").trim() === "",
+                }),
                 attachmentPaths: parsed.attachmentPaths ?? [],
             };
-            const resumed = await tryResumeSameTicketSeatRun({
-                home: env.home,
+            const resumed = await resumeSameParentInstructionSeat({
+                env,
+                io,
                 projectRoot,
                 role,
                 parentRunPath,
-                freshSummons: env.freshSummons,
                 summons,
-                resume: (runId, materials) => runPublicInstructionSeatResume({ runId, ...(materials === undefined ? {} : { summons: materials }) }, env, io),
             });
             if (resumed != null)
                 return resumed;
@@ -536,23 +556,29 @@ export async function runPublicInstructionSeat(argv, env, io, role, parseArgv) {
         const summons = {
             sourceRunPath: source.runDirectory,
             sourceRun: source,
-            ...(resumeInstruction === undefined ? {} : { instruction: resumeInstruction, instructionEmpty: false }),
+            ...(resumeInstruction === undefined
+                ? {}
+                : { instruction: resumeInstruction, instructionEmpty: false }),
         };
-        const resumed = await tryResumeSameTicketSeatRun({
-            home: env.home,
+        resolvedNotarySource = source;
+        const resumed = await resumeSameParentInstructionSeat({
+            env,
+            io,
             projectRoot,
             role,
             parentRunPath: source.runDirectory,
-            freshSummons: env.freshSummons,
             summons,
-            resume: (runId, materials) => runPublicInstructionSeatResume({ runId, ...(materials === undefined ? {} : { summons: materials }) }, env, io),
         });
         if (resumed != null)
             return resumed;
     }
     let admitted;
     try {
-        admitted = await admitPublicRole(role, parsed, env, auditorTicket === undefined ? undefined : { assertedTicketNumber: auditorTicket });
+        const admissionOverride = {
+            ...(auditorTicket === undefined ? {} : { assertedTicketNumber: auditorTicket }),
+            ...(resolvedNotarySource === undefined ? {} : { resolvedSourceRun: resolvedNotarySource }),
+        };
+        admitted = await admitPublicRole(role, parsed, env, auditorTicket === undefined && resolvedNotarySource === undefined ? undefined : admissionOverride);
     }
     catch (error) {
         const rejected = usageExit(error, io);
@@ -589,7 +615,7 @@ export async function runPublicInstructionSeat(argv, env, io, role, parseArgv) {
                     timedOut: false, code: null, stderr: "", thrown: error,
                 }, seatAdapters(admitted, env), env.principalAuthority, io);
             }
-            if (outcome.admitted?.runDirectory.includes(`${sep}unbound${sep}runs${sep}`)) {
+            if (outcome.admitted !== undefined && isUnboundRunDirectory(outcome.admitted.runDirectory)) {
                 await recordChildDiaristRun(admitted, outcome.admitted.runId);
             }
             if (outcome.failedWithoutEscalate !== undefined) {
@@ -760,7 +786,7 @@ async function auditSubmittedRole(turn, env, io, passedOfficer, passedReceipt, p
     const accepted = turn.terminal.roleOutcome.payloads?.at(-1);
     if (accepted === undefined)
         throw new Error("accepted submission has no payload");
-    const record = accepted !== null && typeof accepted === "object" && !Array.isArray(accepted)
+    const record = isRecord(accepted)
         ? accepted : undefined;
     const status = admitted.role === "secretariat" ? record?.secretariatStatus : record?.status;
     if (admitted.role === "secretariat" && status !== "converged" && status !== "escalate") {