@akagilnc/pi-workflow-roles 0.1.4489 → 0.1.4503

package/dist/public-cli/countersign-run.js

@@ -1,10 +1,10 @@
-import { engineSessionMaterialFromOptions, pickEngineAxis } from "../package-resources/engine-material.js";
+import { engineSessionMaterialFromOptions, pickEngineAxis, } from "../package-resources/engine-material.js";
 import { CliUsageError } from "./cli-errors.js";
-import { projectCourtTicketNumbers, } from "../diarist-contracts.js";
+import { projectCourtTicketNumbers } from "../diarist-contracts.js";
 import { isSafePositiveTicketNumber } from "../run-ticket-number.js";
-import { admitCountersignInvocation, bindAdmittedTicketNumber, bindCourtTicketNumbersOnAdmitted, buildCountersignTransportPrompt, relocateAdmittedRunToTicket, } from "./invocation.js";
+import { admitCountersignInvocation, bindAdmittedTicketNumber, bindCourtTicketNumbersOnAdmitted, buildCountersignTransportPrompt, freezePreparedAttachmentsIntoRun, materializeCountersignInvocation, relocateAdmittedRunToTicket, withPreparedAttachments, } from "./invocation.js";
 import { prepareSummonsResumeMaterials, presentControlledFailure, runPostAdmissionOneShot, runPostAdmissionSeatResume, resumeTurnRequestProjectionOptions, StationChildExhaustedError, } from "./post-admission.js";
-import { loadResumableCountersignRun, markRunAdmitted, markRunTerminal, } from "./run-lifecycle.js";
+import { loadResumableCountersignRun, markRunAdmitted, } from "./run-lifecycle.js";
 import { tryResumeSameTicketSeatRun } from "./seat-ticket-binding.js";
 import { presentStructuralRejection, trySettleCountersignTerminalResult, } from "./settlement.js";
 import { projectRoleTurnRequest, } from "./turn-request.js";
@@ -36,11 +36,13 @@ function courtTicketNumbersFromOutcome(roleOutcome, principalTicket) {
     const payloads = roleOutcome.kind === "accepted" ||
         roleOutcome.kind === "audit_escalation" ||
         roleOutcome.kind === "failure"
-        ? roleOutcome.payloads ?? []
+        ? (roleOutcome.payloads ?? [])
         : [];
     let latest;
     for (const payload of payloads) {
-        if (typeof payload !== "object" || payload === null || Array.isArray(payload)) {
+        if (typeof payload !== "object" ||
+            payload === null ||
+            Array.isArray(payload)) {
             continue;
         }
         const record = payload;
@@ -57,12 +59,12 @@ function courtTicketNumbersFromOutcome(roleOutcome, principalTicket) {
         if (members.length === 0) {
             // Literal [] is the intentional principal-only replace; non-empty garbage is not.
             if (raw.length === 0) {
-                latest = projectCourtTicketNumbers([], { principalTicket }) ?? undefined;
+                latest =
+                    projectCourtTicketNumbers([], { principalTicket }) ?? undefined;
             }
             continue;
         }
-        latest =
-            projectCourtTicketNumbers(raw, { principalTicket }) ?? undefined;
+        latest = projectCourtTicketNumbers(raw, { principalTicket }) ?? undefined;
     }
     return latest;
 }
@@ -75,10 +77,12 @@ function courtDiaristEscalated(roleOutcome) {
     if (roleOutcome.kind !== "accepted")
         return false;
     return (roleOutcome.payloads ?? []).some((payload) => {
-        if (typeof payload !== "object" || payload === null || Array.isArray(payload))
+        if (typeof payload !== "object" ||
+            payload === null ||
+            Array.isArray(payload))
             return false;
         const record = payload;
-        return record.status === "escalate" || record.countersignStatus === "escalate";
+        return (record.status === "escalate" || record.countersignStatus === "escalate");
     });
 }
 /**
@@ -116,13 +120,17 @@ export async function invokeCourtDiarist(input, env, io) {
         io: quietIo,
         ...(env.credentials === undefined ? {} : { credentials: env.credentials }),
         ...(env.signal === undefined ? {} : { signal: env.signal }),
-        ...(input.correlationId === undefined ? {} : { correlationId: input.correlationId }),
+        ...(input.correlationId === undefined
+            ? {}
+            : { correlationId: input.correlationId }),
         ...(input.boundTicketNumber === undefined
             ? {}
             : { boundTicketNumber: input.boundTicketNumber }),
         // Child seat selects from the composition-root table. Do not pass the
         // already-selected parent adapter (#840 / ADR 0082: --host 旗标>席位配置>缺省 pi).
-        ...(env.hostAdapters === undefined ? {} : { hostAdapters: env.hostAdapters }),
+        ...(env.hostAdapters === undefined
+            ? {}
+            : { hostAdapters: env.hostAdapters }),
     });
     const roleOutcome = result.terminal?.roleOutcome;
     // Escalate routing is a boolean over the preserved sequence (#881). Reasons and
@@ -143,7 +151,8 @@ export async function invokeCourtDiarist(input, env, io) {
             },
         };
     }
-    const asserted = result.admitted?.ticketNumber;
+    const asserted = result.admitted
+        ?.ticketNumber;
     if (isSafePositiveTicketNumber(asserted)) {
         const courtTicketNumbers = courtTicketNumbersFromOutcome(roleOutcome, asserted);
         return {
@@ -230,9 +239,14 @@ export async function runPublicCountersign(argv, env, io, parseCountersignArgv)
             instruction: parsed.instruction,
             attachmentPaths: parsed.attachmentPaths,
             ...(parsed.project === undefined ? {} : { project: parsed.project }),
-            ...(env.createRunId === undefined ? {} : { createRunId: env.createRunId }),
+            ...(env.createRunId === undefined
+                ? {}
+                : { createRunId: env.createRunId }),
             ...(env.model === undefined ? {} : { model: env.model }),
-            ...(env.correlationId === undefined ? {} : { correlationId: env.correlationId }),
+            ...(env.correlationId === undefined
+                ? {}
+                : { correlationId: env.correlationId }),
+            deferPersistence: true,
         });
     }
     catch (error) {
@@ -242,152 +256,197 @@ export async function runPublicCountersign(argv, env, io, parseCountersignArgv)
         }
         throw error;
     }
-    await markRunAdmitted(admitted, env.principalAuthority);
-    // #637 / #771 / ADR 0079: ticket identity is the 起居郎 LLM typed assertion
-    // (never mechanical matching of summons text). Resolve that typed key after
-    // admit so the countersign run page exists first; same-ticket re-summons
-    // resume the prior run on the typed key (unused mint is abandoned). The test
-    // seam `runCourtDiaristStation` defers identity to beforeDispatch; generic
-    // hook failures stay on the parent call-local budget, exhausted nested
-    // station children still skip parent auto-resume (#840 父子不层叠).
-    let typedTicket;
-    let typedCourtTicketNumbers;
-    let identityDiaristRan = false;
-    if (env.runCourtDiaristStation === undefined) {
-        const outcome = await invokeCourtDiarist({
-            instruction: parsed.instruction,
-            projectRoot: admitted.projectRoot,
-            failureLabel: "unbound summons",
-            correlationId: admitted.runId,
-        }, env, io);
-        identityDiaristRan = true;
-        if (outcome.identity.kind === "escalate") {
-            // 御批: 识别不了就上抛 — settle on the admitted countersign run.
-            return await presentControlledFailure(admitted, {
-                timedOut: false,
-                code: null,
-                stderr: "",
-                thrown: new Error("court diarist station escalated (cannot identify court target)"),
-            }, countersignAdapters(), env.principalAuthority, io);
-        }
-        // Typed failure terminal (verification / infra / non-zero without escalate)
-        // is not 真无票 — settle controlled failure on the admitted run (失败诚实).
-        // Only a true missing lawful typed terminal keeps the r5 unbound-continue.
-        if (outcome.failedWithoutEscalate !== undefined) {
-            return await presentControlledFailure(admitted, {
-                timedOut: false,
-                code: null,
-                stderr: "",
-                thrown: new Error(outcome.failedWithoutEscalate.diagnostic),
-            }, countersignAdapters(), env.principalAuthority, io);
-        }
-        // Missing lawful 起居郎 terminal is not countersign body failure: leave
-        // unbound and continue (true-unbound face). Escalate / typed failure above;
-        // bound refresh still fails honest via runCountersignCourtDiaristStation.
-        if (outcome.identity.kind === "ticket") {
-            const assertedTicket = outcome.identity.ticketNumber;
-            typedTicket = assertedTicket;
-            // #871: identity may hand a co-review set; absent field defaults to [main].
-            typedCourtTicketNumbers = outcome.identity.courtTicketNumbers;
-            const summons = {
-                instruction: parsed.instruction,
-                instructionEmpty: parsed.instruction.trim() === "",
-                attachmentPaths: parsed.attachmentPaths,
+    // One owner spans prepare, lookup/load/resume or new-run materialization.
+    // It preserves both causes when its final cleanup also fails.
+    try {
+        return await withPreparedAttachments(parsed.attachmentPaths, async (preparedAttachments) => {
+            const materializeAdmission = async () => {
+                await materializeCountersignInvocation(admitted, {
+                    home: env.home,
+                    principalAuthority: env.principalAuthority,
+                    preparedAttachments,
+                    ...(env.model === undefined ? {} : { model: env.model }),
+                });
             };
-            const resumed = await tryResumeSameTicketSeatRun({
-                home: env.home,
-                projectRoot: admitted.projectRoot,
-                role: "countersign",
-                ticketNumber: typedTicket,
-                freshSummons: env.freshSummons,
-                summons,
-                resume: async (runId, materials) => {
-                    // Resume selected: file the provisional run under the asserted ticket
-                    // before abandoning it, so typed identity never leaves an unbound row.
-                    await bindAdmittedTicketNumber(admitted, assertedTicket);
+            // #637 / #771 / ADR 0079: ticket identity is the 起居郎 LLM typed assertion
+            // (never mechanical matching of summons text). Resolve that typed key before
+            // materializing a run: same-ticket re-summons write only to the retained run.
+            // Controlled failures materialize below so they still have a durable page. The test
+            // seam `runCourtDiaristStation` defers identity to beforeDispatch; generic
+            // hook failures stay on the parent call-local budget, exhausted nested
+            // station children still skip parent auto-resume (#840 父子不层叠).
+            let typedTicket;
+            let typedCourtTicketNumbers;
+            let identityDiaristRan = false;
+            if (env.runCourtDiaristStation === undefined) {
+                let outcome;
+                try {
+                    // The identity child cannot name the newly minted countersign id as parent:
+                    // same-ticket lookup may intentionally never materialize that run. A selected
+                    // retained run receives its normally correlated refresh child during resume.
+                    outcome = await invokeCourtDiarist({
+                        instruction: parsed.instruction,
+                        projectRoot: admitted.projectRoot,
+                        failureLabel: "unbound summons",
+                    }, env, io);
+                }
+                catch (error) {
+                    await materializeAdmission();
+                    await markRunAdmitted(admitted, env.principalAuthority);
+                    return await presentControlledFailure(admitted, { timedOut: false, code: null, stderr: "", thrown: error }, countersignAdapters(), env.principalAuthority, io);
+                }
+                identityDiaristRan = true;
+                if (outcome.identity.kind === "escalate") {
+                    // 御批: 识别不了就上抛 — materialize and settle this countersign run.
+                    await materializeAdmission();
+                    await markRunAdmitted(admitted, env.principalAuthority);
+                    return await presentControlledFailure(admitted, {
+                        timedOut: false,
+                        code: null,
+                        stderr: "",
+                        thrown: new Error("court diarist station escalated (cannot identify court target)"),
+                    }, countersignAdapters(), env.principalAuthority, io);
+                }
+                // Typed failure terminal (verification / infra / non-zero without escalate)
+                // is not 真无票 — settle controlled failure on the admitted run (失败诚实).
+                // Only a true missing lawful typed terminal keeps the r5 unbound-continue.
+                if (outcome.failedWithoutEscalate !== undefined) {
+                    await materializeAdmission();
+                    await markRunAdmitted(admitted, env.principalAuthority);
+                    return await presentControlledFailure(admitted, {
+                        timedOut: false,
+                        code: null,
+                        stderr: "",
+                        thrown: new Error(outcome.failedWithoutEscalate.diagnostic),
+                    }, countersignAdapters(), env.principalAuthority, io);
+                }
+                // Missing lawful 起居郎 terminal is not countersign body failure: leave
+                // unbound and continue (true-unbound face). Escalate / typed failure above;
+                // bound refresh still fails honest via runCountersignCourtDiaristStation.
+                if (outcome.identity.kind === "ticket") {
+                    const assertedTicket = outcome.identity.ticketNumber;
+                    typedTicket = assertedTicket;
+                    // #871: identity may hand a co-review set; absent field defaults to [main].
+                    typedCourtTicketNumbers = outcome.identity.courtTicketNumbers;
+                    const summons = {
+                        instruction: parsed.instruction,
+                        instructionEmpty: parsed.instruction.trim() === "",
+                    };
+                    const resumed = await tryResumeSameTicketSeatRun({
+                        home: env.home,
+                        projectRoot: admitted.projectRoot,
+                        role: "countersign",
+                        ticketNumber: typedTicket,
+                        freshSummons: env.freshSummons,
+                        summons,
+                        resume: async (runId, materials) => {
+                            // Consume the same pre-identity snapshot into the retained run; never
+                            // reopen caller paths after identity has run.
+                            const retained = await loadResumableCountersignRun(env.home, runId, env.principalAuthority);
+                            if (retained.admitted === undefined) {
+                                throw new Error(`retained countersign run disappeared before resume: ${runId}`);
+                            }
+                            const frozenPaths = (await freezePreparedAttachmentsIntoRun(preparedAttachments, retained.admitted.runDirectory, `s-${Date.now().toString(36)}`)).map((attachment) => attachment.frozenPath);
+                            const preparedMaterials = {
+                                ...(materials ?? {}),
+                                ...(frozenPaths.length === 0
+                                    ? {}
+                                    : { attachmentPaths: frozenPaths }),
+                            };
+                            // Identity 起居郎 asserted unbound (no issue face). Resume still runs
+                            // the bound refresh station under the typed key (ADR 0075: 每次过庭都跑是调用者用法).
+                            // #871: hand the identity set so resume can whole-replace the run fact
+                            // when this summons produced a new typed set (never union).
+                            return await runPublicCountersignResume({
+                                runId,
+                                summons: preparedMaterials,
+                            }, {
+                                ...env,
+                                ...(typedCourtTicketNumbers === undefined
+                                    ? {}
+                                    : { pendingCourtTicketNumbers: typedCourtTicketNumbers }),
+                            }, io);
+                        },
+                    });
+                    if (resumed !== undefined) {
+                        return resumed;
+                    }
+                }
+            }
+            // No prior run was selected. Materialize this invocation now; true-unbound,
+            // first-ticket and deferred test-seam paths all retain their own durable page.
+            await materializeAdmission();
+            await markRunAdmitted(admitted, env.principalAuthority);
+            if (identityDiaristRan && typedTicket !== undefined) {
+                try {
+                    await bindAdmittedTicketNumber(admitted, typedTicket);
                     await relocateAdmittedRunToTicket(admitted, env.principalAuthority);
-                    await markRunTerminal(admitted.runDirectory);
-                    // Identity 起居郎 asserted unbound (no issue face). Resume still runs
-                    // the bound refresh station under the typed key (ADR 0075: 每次过庭都跑是调用者用法).
-                    // #871: hand the identity set so resume can whole-replace the run fact
-                    // when this summons produced a new typed set (never union).
-                    return await runPublicCountersignResume({
-                        runId,
-                        ...(materials === undefined ? {} : { summons: materials }),
-                    }, {
-                        ...env,
-                        ...(typedCourtTicketNumbers === undefined
-                            ? {}
-                            : { pendingCourtTicketNumbers: typedCourtTicketNumbers }),
-                    }, io);
+                    // First court: explicit set wins; omitted field → single-ticket face [main].
+                    // Set persistence is outside beforeDispatch — route write failures into the
+                    // same controlled-failure settlement as station children (#871 B7).
+                    await bindCourtTicketNumbersOnAdmitted(admitted, typedCourtTicketNumbers ?? [typedTicket]);
+                }
+                catch (error) {
+                    return await presentControlledFailure(admitted, {
+                        timedOut: false,
+                        code: null,
+                        stderr: "",
+                        thrown: error,
+                    }, countersignAdapters(), env.principalAuthority, io);
+                }
+            }
+            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 }),
+                ...(env.correlationId === undefined || env.correlationId.trim() === ""
+                    ? {}
+                    : { correlationId: env.correlationId }),
+                continuation: {
+                    kind: "initial",
+                    prompt: buildCountersignTransportPrompt(admitted, engineSessionMaterialFromOptions({
+                        ...pickEngineAxis(env),
+                        packageRoot: env.packageRoot,
+                    })),
                 },
+            };
+            // Mutable shell: ticket bind re-projects activation before executeTurn.
+            const turnRequest = buildCountersignTurnRequest(admitted, turnProjection);
+            const result = await runPostAdmissionOneShot({
+                admitted,
+                env,
+                io,
+                request: turnRequest,
+                adapters: countersignAdapters({
+                    beforeDispatch: async (admittedSeat, lease) => {
+                        // Dossier pointer delivery rides post-admission after this hook (#709).
+                        if (!identityDiaristRan) {
+                            // Test seam (or any deferred identity): station owns assert + bind.
+                            await runCountersignCourtDiaristStation(admittedSeat, env, io);
+                        }
+                        else if (typedTicket !== undefined) {
+                            await runCountersignCourtDiaristStation(admittedSeat, env, io);
+                        }
+                        await relocateAdmittedRunToTicket(admittedSeat, env.principalAuthority, lease);
+                        Object.assign(turnRequest, buildCountersignTurnRequest(admittedSeat, turnProjection));
+                    },
+                }),
+                ...(env.engine === undefined ? {} : { effectiveEngine: env.engine }),
             });
-            if (resumed !== undefined) {
-                return resumed;
-            }
-        }
-    }
-    if (identityDiaristRan && typedTicket !== undefined) {
-        try {
-            await bindAdmittedTicketNumber(admitted, typedTicket);
             await relocateAdmittedRunToTicket(admitted, env.principalAuthority);
-            // First court: explicit set wins; omitted field → single-ticket face [main].
-            // Set persistence is outside beforeDispatch — route write failures into the
-            // same controlled-failure settlement as station children (#871 B7).
-            await bindCourtTicketNumbersOnAdmitted(admitted, typedCourtTicketNumbers ?? [typedTicket]);
-        }
-        catch (error) {
-            return await presentControlledFailure(admitted, {
-                timedOut: false,
-                code: null,
-                stderr: "",
-                thrown: error,
-            }, countersignAdapters(), env.principalAuthority, io);
+            return result;
+        });
+    }
+    catch (error) {
+        if (error instanceof CliUsageError) {
+            presentStructuralRejection(error, io);
+            return { exitCode: 2 };
         }
+        throw error;
     }
-    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 }),
-        ...(env.correlationId === undefined || env.correlationId.trim() === ""
-            ? {}
-            : { correlationId: env.correlationId }),
-        continuation: {
-            kind: "initial",
-            prompt: buildCountersignTransportPrompt(admitted, engineSessionMaterialFromOptions({
-                ...pickEngineAxis(env),
-                packageRoot: env.packageRoot,
-            })),
-        },
-    };
-    // Mutable shell: ticket bind re-projects activation before executeTurn.
-    const turnRequest = buildCountersignTurnRequest(admitted, turnProjection);
-    const result = await runPostAdmissionOneShot({
-        admitted,
-        env,
-        io,
-        request: turnRequest,
-        adapters: countersignAdapters({
-            beforeDispatch: async (admittedSeat, lease) => {
-                // Dossier pointer delivery rides post-admission after this hook (#709).
-                if (!identityDiaristRan) {
-                    // Test seam (or any deferred identity): station owns assert + bind.
-                    await runCountersignCourtDiaristStation(admittedSeat, env, io);
-                }
-                else if (typedTicket !== undefined) {
-                    await runCountersignCourtDiaristStation(admittedSeat, env, io);
-                }
-                await relocateAdmittedRunToTicket(admittedSeat, env.principalAuthority, lease);
-                Object.assign(turnRequest, buildCountersignTurnRequest(admittedSeat, turnProjection));
-            },
-        }),
-        ...(env.engine === undefined ? {} : { effectiveEngine: env.engine }),
-    });
-    await relocateAdmittedRunToTicket(admitted, env.principalAuthority);
-    return result;
 }
 function countersignAdapters(options) {
     return {

package/dist/public-cli/diarist-run.js

@@ -1,6 +1,6 @@
 import { engineSessionMaterialFromOptions, pickEngineAxis } from "../package-resources/engine-material.js";
 import { CliUsageError } from "./cli-errors.js";
-import { admitDiaristInvocation, bindAdmittedTicketNumber, buildInstructionTransportPrompt, relocateAdmittedRunToTicket, } from "./invocation.js";
+import { admitDiaristInvocation, bindAdmittedTicketNumber, buildInstructionTransportPrompt, relocateAdmittedRunToTicket, recordAdmittedCorrelation, } from "./invocation.js";
 import { prepareSummonsResumeMaterials, runPostAdmissionOneShot, runPostAdmissionSeatResume, resumeTurnRequestProjectionOptions, } from "./post-admission.js";
 import { loadResumableDiaristRun, markRunAdmitted, } from "./run-lifecycle.js";
 import { tryResumeSameTicketSeatRun } from "./seat-ticket-binding.js";
@@ -30,6 +30,9 @@ function diaristAdapters(env) {
         shouldPresentSettled: () => true,
         // Resume interrupted state: board ticket already on pages, run still under unbound/.
         beforeDispatch: async (admitted, lease) => {
+            if (env.correlationId !== undefined && env.correlationId.trim() !== "") {
+                await recordAdmittedCorrelation(admitted, env.correlationId);
+            }
             await bindAndRelocateDiaristIfBoardBound(admitted, env.principalAuthority, lease);
         },
         // First post-turn assert: accept hook wrote board pages; relocate before lease release.