@akagilnc/pi-workflow-roles 0.1.2521 → 0.1.2653-next.71811ca

package/src/public-cli/terminal.ts

@@ -8,6 +8,9 @@
 import { renderPublicAkRoleCommand } from "./command-renderer.ts";
 import type { NavigatorPhase } from "../navigator-attendance.ts";
 import type { NoReceiptLifecycleFacts } from "../receipt-delivery-policy.ts";
+import type { ControlledFailureCause } from "../host-contracts.ts";
+
+export type { ControlledFailureCause } from "../host-contracts.ts";
 
 /** Encode one free-text Terminal cell. JSON string form cannot embed raw tab/newline. */
 export function encodeTerminalField(value: string): string {
@@ -20,15 +23,6 @@ export type TerminalArtifactRef = {
   path: string;
 };
 
-/** Controlled post-admission failure classes (ADR 0052 / #107). */
-export type ControlledFailureCause =
-  | "activation"
-  | "provider"
-  | "session"
-  | "output"
-  | "timeout"
-  | "unrecognized";
-
 /** Public callable roles that currently produce Terminal outcomes. */
 export type TerminalRoleName =
   | "judge"

package/src/public-cli/turn-request.ts

@@ -0,0 +1,87 @@
+/**
+ * Single-owner host-neutral TurnRequest projection (#526 / standards-3).
+ * Collapses common principal, cwd, runDirectory, model, engine, continuation,
+ * and correlationId assembly across all public roles.
+ */
+import type {
+  DurablePrincipal,
+  MethodBinding,
+  RoleTurnActivation,
+  RoleTurnModelConfig,
+  RoleTurnRequest,
+} from "../host-contracts.ts";
+import type { SeatModelConfig } from "./config.ts";
+import type { PublicThinkingLevel } from "./registry.ts";
+
+/**
+ * Single authority for resume model precedence: an explicit CLI/env model wins;
+ * otherwise the admitted (originally recorded) model is restored, including its
+ * thinking level. `undefined` when neither source carries a model.
+ */
+export function resolveResumeModel(
+  explicitModel: ResumeModelConfig | undefined,
+  admittedModel: ResumeModelConfig | undefined,
+): ResumeModelConfig | undefined {
+  return explicitModel ?? admittedModel;
+}
+
+/** Structural model shape shared by the seam so both config sources fit. */
+export type ResumeModelConfig = {
+  readonly provider: string;
+  readonly model: string;
+  readonly thinking?: PublicThinkingLevel;
+};
+
+export type RoleTurnRequestProjectionOptions = {
+  packageRoot: string;
+  home: string;
+  agentDir: string;
+  model?: SeatModelConfig;
+  engine?: string;
+  timeoutMs?: number;
+  correlationId?: string;
+  continuation: RoleTurnRequest["continuation"];
+};
+
+export type AdmittedTurnInvocation = {
+  principal?: DurablePrincipal;
+  projectRoot?: string;
+  repoRoot?: string;
+  cwd?: string;
+  runDirectory: string;
+  /** Effective model restored on resume; fallback when no CLI/env model is given. */
+  model?: ResumeModelConfig;
+};
+
+export function projectRoleTurnRequest(
+  admitted: AdmittedTurnInvocation,
+  roleDetails: {
+    activation: RoleTurnActivation;
+    methods?: readonly MethodBinding[];
+  },
+  options: RoleTurnRequestProjectionOptions,
+): RoleTurnRequest {
+  const cwd = admitted.projectRoot ?? admitted.repoRoot ?? admitted.cwd;
+  if (cwd === undefined) throw new Error("admitted invocation missing working directory");
+  if (admitted.principal === undefined) throw new Error("admitted invocation missing principal");
+  // Explicit CLI/env model wins on resume; admitted model is the fallback so a
+  // model-less resume restores the originally recorded effective model instead of
+  // silently dropping to the current env default.
+  const effectiveModel = resolveResumeModel(options.model, admitted.model);
+  return {
+    principal: admitted.principal,
+    activation: roleDetails.activation,
+    methods: roleDetails.methods ?? [],
+    continuation: options.continuation,
+    ...(effectiveModel === undefined ? {} : { model: effectiveModel }),
+    ...(options.engine === undefined ? {} : { engine: options.engine }),
+    cwd,
+    home: options.home,
+    agentDir: options.agentDir,
+    runDirectory: admitted.runDirectory,
+    ...(options.correlationId === undefined || options.correlationId.trim() === ""
+      ? {}
+      : { correlationId: options.correlationId }),
+    ...(options.timeoutMs === undefined ? {} : { timeoutMs: options.timeoutMs }),
+  };
+}

package/src/reviewer-child-executor.ts

@@ -5,6 +5,9 @@ import type { AcceptedReviewerLeg } from "./reviewer-dispatch.ts";
 export type ReviewerChildExecuteOptions = Readonly<{
   signal?: AbortSignal;
   credentialScratchParent?: string;
+  /** Run directory carrying the institutional resolution page (#518). Derives
+   * from context when absent. */
+  runDirectory?: string;
   /** Package root for optional engine method-material on legs (#378). */
   packageRoot?: string;
 }>;
@@ -26,7 +29,12 @@ export function projectSharedChildFailure(error: unknown): unknown {
 /** Reviewer policy adapter over the shared evidence-child lifecycle seam. */
 export async function executeReviewerChild(workspace: string, leg: AcceptedReviewerLeg, context: ExtensionContext, options: ReviewerChildExecuteOptions = {}) {
   try {
-    return await executeEvidenceChild(workspace, leg.prompt, context, options);
+    return await executeEvidenceChild(workspace, leg.prompt, context, {
+      ...(options.signal === undefined ? {} : { signal: options.signal }),
+      ...(options.credentialScratchParent === undefined ? {} : { credentialScratchParent: options.credentialScratchParent }),
+      ...(options.runDirectory === undefined ? {} : { runDirectory: options.runDirectory }),
+      ...(options.packageRoot === undefined ? {} : { packageRoot: options.packageRoot }),
+    });
   } catch (error) {
     throw projectSharedChildFailure(error);
   }

package/src/reviewer-role.ts

@@ -1,4 +1,4 @@
-import type { AgentToolResult, ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
+import type { RoleHost, HostContext, HostToolResult } from "./host-contracts.ts";
 import { Type } from "typebox";
 import { openToolObjectFromUnion } from "./open-tool-schema.ts";
 
@@ -10,10 +10,6 @@ import { ReviewerDispatchExecutionError, type ReviewerDispatchRunResult } from "
 import { createReviewerExecutionLedger, projectAcceptedDispatch, projectReviewerDispatchOutcome, type ReviewerExecutionRecord } from "./reviewer-execution-ledger.ts";
 import { assembleRuntimeReviewerReceipt } from "./reviewer-settlement.ts";
 import { REVIEWER_ACCEPTED_TEXT, REVIEWER_OUTPUT_TOOL_NAME, validateReviewerIntent, type ReviewerIntent } from "./package-contracts/reviewer-output.ts";
-import {
-  failOnInfrastructureFailureDeclaration,
-  withInfrastructureFailureDeclaration,
-} from "./package-contracts/terminating-infrastructure.ts";
 
 export { REVIEWER_OUTPUT_TOOL_NAME };
 export type { ReviewerIntent };
@@ -43,24 +39,22 @@ const reviewerOutputVariants = Type.Union([
     amendments: Type.Optional(reviewerAmendmentsSchema),
   }, { additionalProperties: false }),
 ]);
-export const reviewerOutputSchema = withInfrastructureFailureDeclaration(
-  openToolObjectFromUnion(reviewerOutputVariants),
-);
+const reviewerOutputSchema = openToolObjectFromUnion(reviewerOutputVariants);
 export type ReviewerRoleDependencies = {
   loadSoul(): Promise<string>;
   loadCanonicalSkillBinding(name: "code-review"): Promise<AnyCanonicalSkillBinding>;
   createPinnedGitReader(): Promise<ReviewerPinnedGitReader>;
   /** Injected issue-fetch capability; shared seam owns gh lifecycle. */
   fetchIssue?: ReviewerIssueFetcher;
-  runDispatch(execution: AcceptedReviewerExecution, options: { context: ExtensionContext; signal?: AbortSignal }): Promise<ReviewerDispatchRunResult>;
+  runDispatch(execution: AcceptedReviewerExecution, options: { context: HostContext; signal?: AbortSignal }): Promise<ReviewerDispatchRunResult>;
   shutdownAgent?(): Promise<void>;
 };
-export type ReviewerRoleHostActions = { failInfrastructure(error: unknown, ctx: ExtensionContext, toolCallId?: string): never };
+export type ReviewerRoleHostActions = { failInfrastructure(error: unknown, ctx: HostContext, toolCallId?: string): never };
 
-function requireSoleReviewerOutputCall(id: string, ctx: ExtensionContext): void {
+function requireSoleReviewerOutputCall(id: string, ctx: HostContext): void {
   const leaf = ctx.sessionManager.getLeafEntry();
-  if (leaf?.type !== "message" || leaf.message.role !== "assistant") throw new Error("御史台回执非唯一终局工具调用");
-  const calls = leaf.message.content.filter((part) => part.type === "toolCall");
+  if (leaf?.type !== "message" || leaf.message === undefined || leaf.message.role !== "assistant" || !Array.isArray(leaf.message.content)) throw new Error("御史台回执非唯一终局工具调用");
+  const calls = leaf.message.content.filter((part): part is Extract<typeof part, { type: "toolCall" }> => part.type === "toolCall");
   if (calls.length !== 1 || calls[0]?.id !== id || calls[0]?.name !== REVIEWER_OUTPUT_TOOL_NAME) throw new Error("御史台回执非唯一终局工具调用");
 }
 
@@ -80,11 +74,11 @@ export type ReviewerActivation = Readonly<{
  * Reviewer-side 审刑院 gate retired (#495 S6 / 风闻奏事); accept on typed validate only.
  */
 export function createReviewerRoleRuntime(
-  pi: ExtensionAPI,
+  pi: RoleHost,
   dependencies: ReviewerRoleDependencies,
   hostActions: ReviewerRoleHostActions,
 ): {
-  activate(ctx: ExtensionContext | undefined, admitted: ReviewerAdmittedInputs): Promise<ReviewerActivation>;
+  activate(ctx: HostContext | undefined, admitted: ReviewerAdmittedInputs): Promise<ReviewerActivation>;
 } {
   let soul: string | undefined;
   let binding: CanonicalSkillBinding<"code-review"> | undefined;
@@ -113,7 +107,7 @@ export function createReviewerRoleRuntime(
       const executeAndProjectDispatch = async (execution: AcceptedReviewerExecution, invocation: unknown): Promise<ReviewerDispatchRunResult> => {
         const dispatch = acceptedDispatch;
         if (dispatch === undefined || dispatch.identity !== execution.identity) throw new Error("Reviewer execution lacks accepted construction evidence");
-        const { context, signal } = invocation as { context: ExtensionContext; signal?: AbortSignal };
+        const { context, signal } = invocation as { context: HostContext; signal?: AbortSignal };
         ledger.append({ source: "reviewer-agent", type: "dispatch-started", dispatchIdentity: execution.identity, cardinality: execution.legs.length as 1 | 2 });
         try {
           const result = await dependencies.runDispatch(execution, { context, ...(signal === undefined ? {} : { signal }) });
@@ -151,11 +145,8 @@ export function createReviewerRoleRuntime(
       if (!registered) {
         registered = true;
         pi.registerTool({ name: REVIEWER_OUTPUT_TOOL_NAME, label: "御史台输出", description: "Standards/Spec 评审腿由 runtime 以取证子会话代跑，本席收腿报告后交薄回执。", promptSnippet: "提交御史台终局回执", parameters: reviewerOutputSchema,
-          async execute(id, parameters, _signal, _update, toolCtx): Promise<AgentToolResult<unknown>> {
+          async execute(id: string, parameters: unknown, _signal: AbortSignal | undefined, _update: unknown, toolCtx: HostContext): Promise<HostToolResult<unknown>> {
             if (!soul || !binding) throw new Error("御史台输入未装载");
-            // #541: infra declaration fails via the shared host seam before the
-            // ledger audit record / receipt assembly / shutdown.
-            failOnInfrastructureFailureDeclaration(parameters, hostActions, toolCtx, id);
             requireSoleReviewerOutputCall(id, toolCtx);
             const output = validateReviewerIntent(parameters);
             let record: ReviewerExecutionRecord;