@akagilnc/pi-workflow-roles 0.1.4528 → 0.1.4620

package/src/public-cli/terminal.ts

@@ -5,11 +5,6 @@
  * Free-text cells are JSON-string encoded so legitimate newlines/tabs cannot forge
  * extra rows or shift column boundaries (note / fix.summary / decision question / reason).
  */
-import {
-  isPublicCallableRole,
-  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";
 
@@ -102,12 +97,9 @@ export function exitCodeForTerminalOutcome(
 
 export type TerminalNavigatorFact =
   | {
-      disposition: "recommendation";
-      next: { role: string; phase: NavigatorPhase };
-      reason: string;
-      /** Present only when role/phase is sufficient for a truthful public command. */
-      command?: string;
-      route?: ReadonlyArray<{ role: string; phase: NavigatorPhase }>;
+      /** #959: navigator speaks prose; code does not parse or rank the advice. */
+      disposition: "advice";
+      prose: string;
       advisoryDiagnostic?: string;
     }
   | {
@@ -182,6 +174,16 @@ export function roleResultPayloads(outcome: TerminalRoleOutcome): readonly unkno
 
 export type TerminalResult = {
   roleOutcome: TerminalRoleOutcome;
+  /** Default Reviewer parent: original child Terminals, keyed by frozen axis. */
+  reviewerChildren?: Readonly<{
+    completeness?: TerminalResult;
+    correctness?: TerminalResult;
+  }>;
+  /** Per-axis summons facts retained even when no child Terminal exists. */
+  reviewerChildOutcomes?: Readonly<{
+    completeness: { exitCode: number; stderr?: string };
+    correctness: { exitCode: number; stderr?: string };
+  }>;
   navigator: TerminalNavigatorFact;
   artifacts: readonly TerminalArtifactRef[];
   /**
@@ -201,36 +203,32 @@ export type TerminalResult = {
       /** Resumable failure: run ID appears only inside resume.command. */
       resume: TerminalResume;
       runId?: undefined;
+      batch?: undefined;
     }
   | {
       runId: string;
       resume?: undefined;
+      batch?: undefined;
+    }
+  | {
+      /** Deterministic public batch projection; no parent Role run exists. */
+      batch: "reviewer";
+      runId?: undefined;
+      resume?: undefined;
     }
 );
 
 /**
- * Build a recommendation navigator fact. Model command is kept when present;
- * registry render is fallback only. Unknown seats stay recommendations (#836 B4.1).
+ * Build an advice navigator fact (#959). Prose is presented as submitted;
+ * code does not parse route/next or judge usability.
  */
-export function recommendationNavigatorFact(input: {
-  next: { role: string; phase: NavigatorPhase };
-  reason: string;
-  route?: ReadonlyArray<{ role: string; phase: NavigatorPhase }>;
+export function adviceNavigatorFact(input: {
+  prose: string;
   advisoryDiagnostic?: string;
-  modelCommand?: string;
 }): TerminalNavigatorFact {
-  const command =
-    typeof input.modelCommand === "string" && input.modelCommand.trim() !== ""
-      ? input.modelCommand
-      : isPublicCallableRole(input.next.role)
-        ? renderPublicAkRoleCommand(input.next)
-        : undefined;
   return {
-    disposition: "recommendation",
-    next: input.next,
-    reason: input.reason,
-    ...(command === undefined ? {} : { command }),
-    ...(input.route === undefined ? {} : { route: input.route }),
+    disposition: "advice",
+    prose: input.prose,
     ...(input.advisoryDiagnostic === undefined ? {} : { advisoryDiagnostic: input.advisoryDiagnostic }),
   };
 }
@@ -270,14 +268,9 @@ export function formatTerminalResult(result: TerminalResult): string {
   if (result.navigator.advisoryDiagnostic !== undefined) {
     lines.push(`navigator-advisory\t${encodeTerminalField(result.navigator.advisoryDiagnostic)}`);
   }
-  if (result.navigator.disposition === "recommendation") {
-    lines.push(
-      `next\t${result.navigator.next.role}\t${result.navigator.next.phase ?? "none"}`,
-    );
-    lines.push(`reason\t${encodeTerminalField(result.navigator.reason)}`);
-    if (result.navigator.command !== undefined) {
-      lines.push(`command\t${encodeTerminalField(result.navigator.command)}`);
-    }
+  if (result.navigator.disposition === "advice") {
+    // #959: present navigator prose as-is — no next/reason/command parsing.
+    lines.push(`prose\t${encodeTerminalField(result.navigator.prose)}`);
   } else if (result.navigator.disposition === "unavailable") {
     lines.push(
       `unavailable\t${result.navigator.source}\t${encodeTerminalField(result.navigator.reason)}`,
@@ -303,6 +296,15 @@ export function formatTerminalResult(result: TerminalResult): string {
       );
     }
   }
+  if (result.reviewerChildOutcomes !== undefined) {
+    for (const axis of ["completeness", "correctness"] as const) {
+      const child = result.reviewerChildOutcomes[axis];
+      lines.push(`reviewer-child\t${axis}\t${child.exitCode}`);
+      if (child.stderr !== undefined && child.stderr !== "") {
+        lines.push(`reviewer-child-diagnostic\t${axis}\t${encodeTerminalField(child.stderr)}`);
+      }
+    }
+  }
   if (result.resume !== undefined) {
     // Resumable failure: run ID is revealed only inside the complete resume command.
     lines.push(`resume\t${encodeTerminalField(result.resume.command)}`);

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

@@ -38,6 +38,12 @@ export type RoleTurnRequestProjectionOptions = {
   invocationScopeId?: string;
   /** Station child role run (#840): omit automatic navigator attendance. */
   stationChild?: boolean;
+  /**
+   * Optional host-turn cwd override. Durable admitted projectRoot stays the
+   * identity source; Reviewer fresh-copy sandboxes (explicit --lens, dual-lens
+   * legs, resume) inject the ephemeral worktree here (#946 统一新副本).
+   */
+  cwd?: string;
 };
 
 export type AdmittedTurnInvocation = {
@@ -58,7 +64,7 @@ export function projectRoleTurnRequest(
   },
   options: RoleTurnRequestProjectionOptions,
 ): RoleTurnRequest {
-  const cwd = admitted.projectRoot ?? admitted.repoRoot ?? admitted.cwd;
+  const cwd = options.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");
   // #617 DK-3: turn model is the live seat/env model only — never the admitted