@akagilnc/pi-workflow-roles 0.1.5153 → 0.1.5196

package/src/submission-gate.ts

@@ -3,18 +3,18 @@
  * Owns officer-pointer book + host abort/non-pass faces + review queue loop.
  * Role modules only project via projectGatekeeperRun / runGatekeeper — no book, no catch.
  *
- * Queue guarantee only (#753 / #756 / #750):
- *   parent submit → summon officer → read conclusion field
- *   converged → accept end
- *   continue → raw officer receipt as a nonterminal result; parent may resubmit
- *   escalate → audit_escalation terminal, without binding a correctable parent submission
+ * Public continuation after submission settlement (#753 / #756 / #750):
+ *   accepted submission → summon officer → read conclusion field
+ *   converged → continue remaining review and settle
+ *   continue → raw officer receipt; caller resumes the submitted seat for revision
+ *   escalate → return the officer run so the caller can resume that officer directly
  *   unrecognized status → resume officer with plain-language re-ask (no round cap)
  *   transport / no_receipt → present honestly
  * Four pairs: countersign↔notary, judge↔auditor, worker↔inspector, secretariat↔countersign (#969).
  * Code does not judge content, map next-step for parent, or label unreadable/unusable.
  */
 import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
-import { bookDirectOfficerRunPointer } from "./archivist-record-entry.ts";
+import { bookDirectOfficerRunPointer } from "./archivist-record-pointer.ts";
 import type { HostContext, RoleTurnHost } from "./host-contracts.ts";
 import {
   GatekeeperDecisionError,
@@ -27,7 +27,31 @@ import {
   type GateOfficerSummon,
 } from "./gatekeeper-role.ts";
 import type { PublicSummonResult } from "./public-role-summons.ts";
+import type { TerminalResult } from "./public-cli/terminal.ts";
 
+/** Queue word of the latest this-terminal payload. History does not outrank it. */
+export function latestQueueStatus(terminal: TerminalResult | undefined): string | undefined {
+  const outcome = terminal?.roleOutcome;
+  if (outcome === undefined) return undefined;
+  if (outcome.kind === "audit_escalation") return "escalate";
+  if (outcome.kind !== "accepted") return undefined;
+  const latest = outcome.payloads?.[outcome.payloads.length - 1];
+  if (latest !== null && typeof latest === "object" && !Array.isArray(latest)) {
+    const status = (latest as { status?: unknown }).status;
+    if (typeof status === "string" && status.trim() !== "") return status;
+  }
+  return typeof outcome.status === "string" && outcome.status.trim() !== ""
+    ? outcome.status
+    : undefined;
+}
+
+export function latestQueuePayload(terminal: TerminalResult | undefined): unknown {
+  const outcome = terminal?.roleOutcome;
+  if (outcome === undefined) return undefined;
+  if (outcome.kind !== "accepted" && outcome.kind !== "audit_escalation") return undefined;
+  const payloads = outcome.payloads ?? [];
+  return payloads.length === 0 ? undefined : payloads[payloads.length - 1];
+}
 import { sessionFileFromPublicSummon } from "./session-assistant-usage.ts";
 
 /**
@@ -38,6 +62,7 @@ export function createDefaultGateOfficerSummon(options: {
   readonly cwd: string;
   readonly home?: string;
   readonly packageRoot?: string;
+  readonly io?: import("./public-cli/cli-io.ts").CliIo;
   readonly roleTurnHost?: RoleTurnHost;
   /** Composition-root adapters for nested court stations (tests / #969). */
   readonly hostAdapters?: readonly import("./public-cli/role-turn-host-resolution.ts").NamedRoleTurnHostAdapter[];
@@ -54,6 +79,7 @@ export function createDefaultGateOfficerSummon(options: {
       ...(submission === undefined ? {} : { submission }),
       ...(options.home === undefined ? {} : { home: options.home }),
       ...(options.packageRoot === undefined ? {} : { packageRoot: options.packageRoot }),
+      ...(options.io === undefined ? {} : { io: options.io }),
       ...(options.roleTurnHost === undefined ? {} : { roleTurnHost: options.roleTurnHost }),
       ...(options.hostAdapters === undefined ? {} : { hostAdapters: options.hostAdapters }),
       ...(options.createRunId === undefined ? {} : { createRunId: options.createRunId }),
@@ -103,10 +129,11 @@ function bookDirectOfficerPointer(
  * public terminal without a second authority.
  */
 export type SubmissionGateOutcome = {
-  readonly status: "converged" | "continue";
+  readonly status: "converged" | "continue" | "escalate";
   readonly officer: GateOfficer;
   readonly receipt: unknown;
   readonly runId?: string;
+  readonly runDirectory?: string;
 };
 
 /**
@@ -189,10 +216,19 @@ export async function requireSubmissionGate(options: {
       });
       options.hostActions.failInfrastructure(failure, options.context, options.toolCallId);
     }
-    // Escalation ends the parent without a correctable tool error or resubmission.
-    // Each caller projects the existing audit_escalation terminal.
     if (gatekeeper.status === "escalate") {
-      throw new GatekeeperDecisionError(gatekeeper);
+      return {
+        status: "escalate",
+        officer: projected.officer,
+        receipt: gatekeeper.receipt,
+        ...(typeof gatekeeper.runId === "string" && gatekeeper.runId.trim() !== ""
+          ? { runId: gatekeeper.runId }
+          : {}),
+        ...(typeof projected.summoned?.runDirectory === "string"
+          && projected.summoned.runDirectory.trim() !== ""
+          ? { runDirectory: projected.summoned.runDirectory }
+          : {}),
+      };
     }
     // no_receipt: keep the lifecycle failure channel; continue is an ordinary
     // nonterminal tool result above, not an exception or correctable rejection.

package/src/submission-ledger.ts

@@ -11,7 +11,6 @@ import {
   type HostToolResult,
   type RoleHost,
 } from "./host-contracts.ts";
-import { isAuditEscalationProjection } from "./audit-escalation.ts";
 
 
 import { runIdFromRunDirectory } from "./run-terminal-artifacts.ts";
@@ -730,32 +729,6 @@ export function createSubmissionLedgerHost(
           }
           // #836: ledger authority is the LLM tool-call params as-is (角色原话), never result.details.
           // Machine facts on result.details stay on the tool-result face returned to the model.
-          if (isAuditEscalationProjection(result.details) || isAuditEscalationProjection(params)) {
-            const audit = isAuditEscalationProjection(result.details)
-              && typeof result.details.audit === "object"
-              && result.details.audit !== null
-              ? result.details.audit as Record<string, unknown>
-              : undefined;
-            const closed: ClosedSubmission = {
-              role,
-              kind: "audit_escalation",
-              accepted: params,
-            };
-            append({
-              type: "outcome",
-              attemptId,
-              toolCallId,
-              outcome: "audit-escalation",
-              role,
-              accepted: params,
-              ...(audit !== undefined && (Object.hasOwn(audit, "receipt") || Object.hasOwn(audit, "conflicts"))
-                ? { auditReceipt: Object.hasOwn(audit, "receipt") ? audit.receipt : audit.conflicts }
-                : {}),
-              ...(audit !== undefined && Object.hasOwn(audit, "officer") ? { auditOfficer: audit.officer } : {}),
-            });
-            await projectClosure(closed, context);
-            return result;
-          }
           // A continuing gate leaves the candidate recorded but has not accepted it.
           if (result.terminate === false) return result;
           const closed: ClosedSubmission = {

package/src/worker-role.ts

@@ -3,9 +3,6 @@ import { Type, type Static } from "typebox";
 import { openToolObjectFromUnion } from "./open-tool-schema.ts";
 import { withTerminatingOutputDeclarations } from "./package-contracts/terminating-infrastructure.ts";
 
-import { readableGateItem } from "./readable-gate-item.ts";
-import { projectGatekeeperEscalation } from "./audit-escalation.ts";
-import { GatekeeperDecisionError, ParentQueueReaskError, unreadableDiscriminatorNotice } from "./submission-errors.ts";
 import {
   CODER_OUTPUT_TOOL_NAME,
   FIXER_OUTPUT_TOOL_NAME,
@@ -23,7 +20,6 @@ import {
 } from "./package-contracts/fixer-packet.ts";
 import {
   createWorkerSubmissionGate,
-  WORKER_DONE_STATUSES,
   WorkerCommitReminderError,
   WorkerPrefixReminderError,
   WorkerUnfinishedReasonReminderError,
@@ -127,15 +123,6 @@ function isRecord(value: unknown): value is Record<string, unknown> {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
-/** Routing words shared by Coder and Fixer; provider schemas remain open. */
-const WORKER_ROUTING_STATUSES = new Set([
-  "planned",
-  "completed",
-  "refused",
-  "partially_completed",
-  "unfinished",
-]);
-
 /** Read only the field that selects the worker's next package-owned path. */
 function workerStatusOf(output: WorkerOutput): string | undefined {
   return isRecord(output) && typeof output.status === "string"
@@ -143,14 +130,6 @@ function workerStatusOf(output: WorkerOutput): string | undefined {
     : undefined;
 }
 
-function requireReadableWorkerStatus(output: WorkerOutput): string {
-  const status = workerStatusOf(output);
-  if (status === undefined || !WORKER_ROUTING_STATUSES.has(status)) {
-    throw new ParentQueueReaskError(unreadableDiscriminatorNotice("status", isRecord(output) ? output.status : undefined));
-  }
-  return status;
-}
-
 function deepFreeze<T>(value: T): T {
   if (typeof value !== "object" || value === null || Object.isFrozen(value)) return value;
   for (const child of Object.values(value)) deepFreeze(child);
@@ -262,47 +241,18 @@ export function createFixerRoleRuntime(
               throw new Error("修内司修理包与阶段未装载");
             }
             const output = deepFreeze(validateFixerOutput(parameters, phase));
-            const status = requireReadableWorkerStatus(output);
-            assertAcceptableThroughHost(
-              submissionGate,
-              status,
-              output,
-              hostActions,
-              ctx,
-              toolCallId,
-            );
-            let pass;
-            try {
-              pass = WORKER_DONE_STATUSES.has(status)
-                ? await pi.requireSubmissionGate!({
-                    context: ctx,
-                    subject: { kind: "worker_completion" },
-                    ...(_signal === undefined ? {} : { signal: _signal }),
-                    hostActions,
-                    toolCallId,
-                    // #879: this-turn typed payload — identity-bound at submit site.
-                    submission: output,
-                  })
-                : undefined;
-            } catch (error) {
-              if (error instanceof GatekeeperDecisionError && error.result.status === "escalate") {
-                return projectGatekeeperEscalation(error.result, output);
-              }
-              throw error;
-            }
-            if (pass?.status === "continue") {
-              return {
-                content: [{ type: "text" as const, text: readableGateItem(pass.receipt) }],
-                details: output,
-                terminate: false,
-              };
+            const status = workerStatusOf(output);
+            if (status !== undefined) {
+              assertAcceptableThroughHost(
+                submissionGate,
+                status,
+                output,
+                hostActions,
+                ctx,
+                toolCallId,
+              );
             }
-            const acceptedDetails = output;
-            return {
-              content: pass === undefined ? [] : [{ type: "text" as const, text: readableGateItem(pass.receipt) }],
-              details: acceptedDetails,
-              terminate: true as const,
-            };
+            return { content: [], details: output, terminate: true as const };
           },
         });
         pi.on("tool_call", (event) => {
@@ -389,49 +339,20 @@ export function createCoderRoleRuntime(
               throw new Error("将作监任务与阶段未装载");
             }
             const output = validateWorkerOutput(parameters, phase, "Coder");
-            const status = requireReadableWorkerStatus(output);
+            const status = workerStatusOf(output);
             // #836: skill-expansion evidence rejection deleted (陛下「2.4/5 删」).
-            // Missing method Skills do not reject a receipt.
-            assertAcceptableThroughHost(
-              submissionGate,
-              status,
-              output,
-              hostActions,
-              ctx,
-              toolCallId,
-            );
-            let pass;
-            try {
-              pass = WORKER_DONE_STATUSES.has(status)
-                ? await pi.requireSubmissionGate!({
-                    context: ctx,
-                    subject: { kind: "worker_completion" },
-                    ...(_signal === undefined ? {} : { signal: _signal }),
-                    hostActions,
-                    toolCallId,
-                    // #879: this-turn typed payload — identity-bound at submit site.
-                    submission: output,
-                  })
-                : undefined;
-            } catch (error) {
-              if (error instanceof GatekeeperDecisionError && error.result.status === "escalate") {
-                return projectGatekeeperEscalation(error.result, output);
-              }
-              throw error;
-            }
-            if (pass?.status === "continue") {
-              return {
-                content: [{ type: "text" as const, text: readableGateItem(pass.receipt) }],
-                details: output,
-                terminate: false,
-              };
+            // Skill still ships with the package (ADR 0052); code no longer refuses on it.
+            if (status !== undefined) {
+              assertAcceptableThroughHost(
+                submissionGate,
+                status,
+                output,
+                hostActions,
+                ctx,
+                toolCallId,
+              );
             }
-            const acceptedDetails = output;
-            return {
-              content: pass === undefined ? [] : [{ type: "text" as const, text: readableGateItem(pass.receipt) }],
-              details: acceptedDetails,
-              terminate: true as const,
-            };
+            return { content: [], details: output, terminate: true as const };
           },
         });
         pi.on("before_agent_start", (event, ctx) => {

package/src/worker-submission-contracts.ts

@@ -0,0 +1,8 @@
+/**
+ * Statuses that enter the worker officer submission gate (ADR 0066):
+ * completed/partially_completed enter gate ①; planned/refused/unfinished do not.
+ */
+export const WORKER_DONE_STATUSES: ReadonlySet<string> = new Set([
+  "completed",
+  "partially_completed",
+]);

package/src/worker-submission-gates.ts

@@ -15,16 +15,16 @@ import {
   WorkerPrefixReminderError,
   WorkerUnfinishedReasonReminderError,
 } from "./submission-errors.ts";
+import { WORKER_DONE_STATUSES } from "./worker-submission-contracts.ts";
 
 export { WorkerCommitReminderError, WorkerPrefixReminderError, WorkerUnfinishedReasonReminderError } from "./submission-errors.ts";
+export { WORKER_DONE_STATUSES } from "./worker-submission-contracts.ts";
 
 export const WORKER_SUBMISSION_GATE_RECORD_KIND = WORKER_SUBMISSION_GATE_KIND;
 export const WORKER_COMMIT_BASELINE_ENTRY_TYPE = "commit-baseline";
 export const WORKER_COMMIT_REMINDER_BOUNCE_ENTRY_TYPE = "commit-reminder-bounce";
 export const WORKER_PREFIX_REMINDER_BOUNCE_ENTRY_TYPE = "prefix-reminder-bounce";
 
-/** Statuses that enter the officer submission gate (ADR 0066: completed/partially_completed 进闸①；planned/refused/unfinished 零 commit 合法). */
-export const WORKER_DONE_STATUSES: ReadonlySet<string> = new Set(["completed", "partially_completed"]);
 /** Historical package hook ownership marker — uninstall criterion only. */
 const HOOK_MARKER = "ak-roles: worker-submission-gates reference-transaction";
 const HOOKS_DIR = "ak-roles-hooks";