@akagilnc/pi-workflow-roles 0.1.5575 → 0.1.5583

package/dist/public-cli/post-admission.js

@@ -15,7 +15,6 @@ import { bindAdmittedTicketNumber, buildInstructionTransportPrompt, freezeAttach
 import { readRecordedSubmissionRows } from "../submission-ledger.js";
 import { parseTicketNumber, readDeclaredTicketNumber } from "../run-ticket-number.js";
 import { pathContainedIn } from "../activation-ledger-topology.js";
-import { pickEngineAxis } from "../package-resources/engine-material.js";
 import { readStoredHostSessionId } from "../session-identity.js";
 import { reportRunRecord } from "../sitian-facade.js";
 import { createReceiptDeliveryPolicy, deliveryLimitFromConfig, } from "../receipt-delivery-policy.js";
@@ -1345,13 +1344,7 @@ export async function runPostAdmissionOneShot(input) {
             ...input.request,
             continuation: {
                 kind: "resume",
-                prompt: buildAutoResumeContinuationPrompt({
-                    packageRoot: input.env.packageRoot,
-                    ...pickEngineAxis({
-                        engine: input.effectiveEngine ?? input.env.engine,
-                        engineModel: input.env.engineModel,
-                    }),
-                }),
+                prompt: buildAutoResumeContinuationPrompt(),
             },
         }),
         adapters: input.adapters,

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

@@ -13,7 +13,6 @@ import { isSafePositiveTicketNumber } from "../run-ticket-number.js";
 import { CliUsageError } from "./cli-errors.js";
 import { parseCollectorRepository } from "../collector-config.js";
 import { retainedRunPathsMatch, rewriteAdmittedRoleRunPage, rewriteRunDirectoryPathValue, } from "../role-run-relocation.js";
-import { appendEngineSessionMaterial, engineSessionMaterialFromOptions, pickEngineAxis, } from "../package-resources/engine-material.js";
 import { packagedResumeSourcePath, packagedRoleMetadata, } from "../packaged-role-registry.js";
 import { admittedReviewerBaseFault, recordEffectiveInvocationModel, requireAuthorityRef, isReviewerLens, } from "./invocation.js";
 import { readPageSync, writeSectionSync } from "../run-dossier.js";
@@ -33,14 +32,12 @@ export const AUTO_RESUME_LIMIT = 2;
 export const RESUME_TRANSPORT_ENVELOPE = "继续。";
 /**
  * Auto-resume continuation only (#959 / ADR 0080).
- * Always non-empty: Chinese neutral envelope plus optional engine pointers.
+ * Always non-empty Chinese neutral envelope. Engine / outsourcing material
+ * rides startup readingMaterial (#1167), never this continuation.
  * Never call this from manual `ak-role resume`.
  */
-export function buildAutoResumeContinuationPrompt(options) {
-    return appendEngineSessionMaterial([RESUME_TRANSPORT_ENVELOPE], engineSessionMaterialFromOptions({
-        packageRoot: options.packageRoot,
-        ...pickEngineAxis(options),
-    })).join("\n");
+export function buildAutoResumeContinuationPrompt() {
+    return RESUME_TRANSPORT_ENVELOPE;
 }
 const WRITER_LOCK_FILE = "writer.lock";
 export async function writeRoleRunState(runDirectory, record) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akagilnc/pi-workflow-roles",
-  "version": "0.1.5575",
+  "version": "0.1.5583",
   "description": "Soul-bound workflow roles for Pi",
   "type": "module",
   "license": "Apache-2.0",

package/src/package-resources/engine-material.ts

@@ -1,23 +1,27 @@
 /**
- * Packaged engine method-material seam (#356 T1 / ADR 0069 / #376).
+ * Packaged engine method-material seam (#356 T1 / ADR 0069 / #376 / #1167).
  * Engine names are owner pool-directive labels — not a closed material catalog.
  * Material body is optional data for the LLM, not a code contract.
  * Only path-safety syntax is checked at real I/O seams.
+ * Delivery is startup readingMaterial (handbook bodies), never the transport prompt.
  */
-import { existsSync, readdirSync } from "node:fs";
+import { existsSync, readdirSync, readFileSync } from "node:fs";
 import { join } from "node:path";
 
 const ENGINE_MATERIAL_RELATIVE_ROOT = "resources/engines" as const;
+const ENGINE_DISPATCH_RELATIVE_PATH = "resources/engine-dispatch.md" as const;
 
 export type EngineSessionMaterial = Readonly<{
   name: string;
-  /** Present only when a packaged notes file exists for this name. */
-  materialPath?: string;
   /**
    * Optional owner pool-directive model id for multi-model engines (#883).
    * Opaque pass-through coordinate for the seat — not validated against a catalog.
    */
   model?: string;
+  /** Packaged per-engine handbook body when notes exist. */
+  handbook?: string;
+  /** Shared engine-dispatch.md body when the per-engine handbook exists. */
+  dispatchHandbook?: string;
 }>;
 
 /** Project engine name + optional model for env / request / material spreads. */
@@ -57,6 +61,10 @@ export function resolveEngineMaterialDirectory(packageRoot: string): string {
   return join(packageRoot, ENGINE_MATERIAL_RELATIVE_ROOT);
 }
 
+export function resolveEngineDispatchMaterialPath(packageRoot: string): string {
+  return join(packageRoot, ENGINE_DISPATCH_RELATIVE_PATH);
+}
+
 /**
  * Enumerate packaged engine notes stems (discovery only — not a legal-name gate).
  * Only `*.md` stems that pass name syntax are listed.
@@ -99,7 +107,7 @@ export function assertLegalEngineName(name: string): string {
 /**
  * Resolve optional engine options into session material coordinates.
  * No engine → undefined (caller keeps default prompt bytes).
- * Engine with packaged notes → name + absolute material path.
+ * Engine with packaged notes → name + handbook body + dispatch handbook body.
  * Engine without notes → name only (pass-through; no warning).
  */
 export function engineSessionMaterialFromOptions(options: {
@@ -119,41 +127,40 @@ export function engineSessionMaterialFromOptions(options: {
       : assertLegalEngineModel(options.engineModel);
   const materialPath = resolveEngineMaterialPath(options.packageRoot, name);
   const modelField = model === undefined ? {} : { model };
-  if (existsSync(materialPath)) {
-    return Object.freeze({ name, materialPath, ...modelField });
+  if (!existsSync(materialPath)) {
+    return Object.freeze({ name, ...modelField });
   }
-  return Object.freeze({ name, ...modelField });
+  const handbook = readFileSync(materialPath, "utf8");
+  const dispatchPath = resolveEngineDispatchMaterialPath(options.packageRoot);
+  const dispatchField = existsSync(dispatchPath)
+    ? { dispatchHandbook: readFileSync(dispatchPath, "utf8") }
+    : {};
+  return Object.freeze({ name, handbook, ...dispatchField, ...modelField });
 }
 
 /**
- * Append engine method-material delivery to session initial material lines.
- * No engine → identity copy (byte-stable when joined the same way).
- * With notes → Chinese neutral handbook header + engine name + absolute material path.
- * Name only → engine name coordinate only (no handbook header, no path, no warning).
- * Never delivers material body.
+ * Typed startup readingMaterial for a resolved engine session material.
+ * Undefined engine → undefined (no outsourcing segment).
  */
-export function appendEngineSessionMaterial(
-  lines: readonly string[],
+export function engineSessionReadingMaterial(
   engineMaterial?: EngineSessionMaterial,
-): string[] {
-  if (engineMaterial === undefined) {
-    return [...lines];
-  }
-  const out = [...lines];
-  out.push("");
-  if (engineMaterial.materialPath !== undefined) {
-    out.push("本次配置的劳务引擎及其手册：");
-    out.push(`- engine: ${engineMaterial.name}`);
-    if (engineMaterial.model !== undefined) {
-      out.push(`- engineModel: ${engineMaterial.model}`);
-    }
-    out.push(`- ${engineMaterial.materialPath}`);
-  } else {
-    // Name-only pass-through: no packaged bytes to claim as handbook.
-    out.push(`- engine: ${engineMaterial.name}`);
-    if (engineMaterial.model !== undefined) {
-      out.push(`- engineModel: ${engineMaterial.model}`);
+):
+  | {
+      readonly kind: "engine-session-material";
+      readonly name: string;
+      readonly model?: string;
+      readonly handbook?: string;
+      readonly dispatchHandbook?: string;
     }
-  }
-  return out;
+  | undefined {
+  if (engineMaterial === undefined) return undefined;
+  return {
+    kind: "engine-session-material" as const,
+    name: engineMaterial.name,
+    ...(engineMaterial.model === undefined ? {} : { model: engineMaterial.model }),
+    ...(engineMaterial.handbook === undefined ? {} : { handbook: engineMaterial.handbook }),
+    ...(engineMaterial.dispatchHandbook === undefined
+      ? {}
+      : { dispatchHandbook: engineMaterial.dispatchHandbook }),
+  };
 }

package/src/public-cli/instruction-seat-run.ts

@@ -30,7 +30,6 @@ import {
 import { isSafePositiveTicketNumber, readBoardTicketNumber } from "../run-ticket-number.ts";
 import type { NotarySourceRunLocator } from "../notary-contracts.ts";
 import { NotarySourceRunError, resolveNotarySourceRunLocator } from "../notary-source-run.ts";
-import { engineSessionMaterialFromOptions, pickEngineAxis } from "../package-resources/engine-material.ts";
 import type { PackagedRole } from "../packaged-role-registry.ts";
 import {
   packagedAdmitsCountersign,
@@ -302,13 +301,7 @@ function initialPrompt(
   if (reask !== undefined && "reaskPrompt" in record && record.reaskPrompt === true) {
     return reask;
   }
-  return buildInstructionTransportPrompt(
-    admitted,
-    engineSessionMaterialFromOptions({
-      ...pickEngineAxis(env),
-      packageRoot: env.packageRoot,
-    }),
-  );
+  return buildInstructionTransportPrompt(admitted);
 }
 
 function isBoardTicketSeat(
@@ -439,10 +432,7 @@ async function dispatchAdmitted(
           admitted,
           roleTurnOptions(activeEnv, admitted, {
             kind: "resume",
-            prompt: buildAutoResumeContinuationPrompt({
-              packageRoot: activeEnv.packageRoot,
-              ...pickEngineAxis(activeEnv),
-            }),
+            prompt: buildAutoResumeContinuationPrompt(),
           }),
         ),
         adapters,
@@ -666,13 +656,7 @@ async function runCountersignBody(
       const turnProjection = roleTurnOptions(env, admitted, {
         kind: "initial",
         prompt: (env.reviewReask ?? env.gateReviewInstruction)
-          ?? buildInstructionTransportPrompt(
-            admitted,
-            engineSessionMaterialFromOptions({
-              ...pickEngineAxis(env),
-              packageRoot: env.packageRoot,
-            }),
-          ),
+          ?? buildInstructionTransportPrompt(admitted),
       });
       const turnRequest = buildInstructionSeatTurnRequest(admitted, turnProjection);
       const result = await runPostAdmissionOneShot({

package/src/public-cli/invocation.ts

@@ -94,10 +94,6 @@ import {
   NotarySourceRunError,
   resolveNotarySourceRunLocator,
 } from "../notary-source-run.ts";
-import {
-  appendEngineSessionMaterial,
-  type EngineSessionMaterial,
-} from "../package-resources/engine-material.ts";
 import { CliUsageError } from "./cli-errors.ts";
 import {
   REJECTED_PUBLIC_SPELLINGS,
@@ -2074,17 +2070,17 @@ function admittedTransportPromptKind(
  * One initial prompt transport. The registry `transportPrompt` leaf selects
  * a fixed kickoff, a bound baseline, or frozen skill args. Absent means the
  * caller instruction plus frozen attachment paths.
+ * Engine / outsourcing material rides startup readingMaterial (#1167), not here.
  */
 export function buildInstructionTransportPrompt(
   admitted: InstructionTransportSource,
-  engineMaterial?: EngineSessionMaterial,
 ): string {
   const kind = admittedTransportPromptKind(admitted);
   if (kind === "fixed-kickoff") {
     if (admitted.sourceRunPath === undefined || admitted.sourceRunPath.trim() === "") {
       throw new Error("fixed-kickoff transport prompt is missing the source run pointer");
     }
-    return appendEngineSessionMaterial([admitted.sourceRunPath], engineMaterial).join("\n");
+    return admitted.sourceRunPath;
   }
   if (kind === "baseline") {
     if (admitted.baseRevision === undefined) {
@@ -2094,7 +2090,7 @@ export function buildInstructionTransportPrompt(
     if (!admitted.instructionEmpty) {
       lines.push("", admitted.instruction);
     }
-    return appendEngineSessionMaterial(lines, engineMaterial).join("\n");
+    return lines.join("\n");
   }
   if (kind === "skill-args") {
     if (
@@ -2112,7 +2108,7 @@ export function buildInstructionTransportPrompt(
     if (!admitted.instructionEmpty && admitted.instruction.trim() !== "") {
       lines.push("", admitted.instruction);
     }
-    return appendEngineSessionMaterial(lines, engineMaterial).join("\n");
+    return lines.join("\n");
   }
   const lines: string[] = [admitted.instructionEmpty ? "" : admitted.instruction];
   if (admitted.attachments.length > 0) {
@@ -2122,7 +2118,7 @@ export function buildInstructionTransportPrompt(
       lines.push(`- ${attachment.frozenPath}`);
     }
   }
-  return appendEngineSessionMaterial(lines, engineMaterial).join("\n");
+  return lines.join("\n");
 }
 
 export type AdmitCountersignInvocationOptions = {

package/src/public-cli/post-admission.ts

@@ -28,7 +28,6 @@ import {
 import { readRecordedSubmissionRows } from "../submission-ledger.ts";
 import { parseTicketNumber, readDeclaredTicketNumber } from "../run-ticket-number.ts";
 import { pathContainedIn } from "../activation-ledger-topology.ts";
-import { pickEngineAxis } from "../package-resources/engine-material.ts";
 import { readStoredHostSessionId } from "../session-identity.ts";
 import { reportRunRecord } from "../sitian-facade.ts";
 import {
@@ -2058,13 +2057,7 @@ export async function runPostAdmissionOneShot<
       ...input.request,
       continuation: {
         kind: "resume",
-        prompt: buildAutoResumeContinuationPrompt({
-          packageRoot: input.env.packageRoot,
-          ...pickEngineAxis({
-            engine: input.effectiveEngine ?? input.env.engine,
-            engineModel: input.env.engineModel,
-          }),
-        }),
+        prompt: buildAutoResumeContinuationPrompt(),
       },
     }),
     adapters: input.adapters,

package/src/public-cli/run-lifecycle.ts

@@ -29,11 +29,6 @@ import {
   rewriteAdmittedRoleRunPage,
   rewriteRunDirectoryPathValue,
 } from "../role-run-relocation.ts";
-import {
-  appendEngineSessionMaterial,
-  engineSessionMaterialFromOptions,
-  pickEngineAxis,
-} from "../package-resources/engine-material.ts";
 import type { PublicThinkingLevel } from "./registry.ts";
 import {
   packagedResumeSourcePath,
@@ -137,21 +132,12 @@ export type SameTicketSummonsMaterials = {
 
 /**
  * Auto-resume continuation only (#959 / ADR 0080).
- * Always non-empty: Chinese neutral envelope plus optional engine pointers.
+ * Always non-empty Chinese neutral envelope. Engine / outsourcing material
+ * rides startup readingMaterial (#1167), never this continuation.
  * Never call this from manual `ak-role resume`.
  */
-export function buildAutoResumeContinuationPrompt(options: {
-  packageRoot: string;
-  engine?: string;
-  engineModel?: string;
-}): string {
-  return appendEngineSessionMaterial(
-    [RESUME_TRANSPORT_ENVELOPE],
-    engineSessionMaterialFromOptions({
-      packageRoot: options.packageRoot,
-      ...pickEngineAxis(options),
-    }),
-  ).join("\n");
+export function buildAutoResumeContinuationPrompt(): string {
+  return RESUME_TRANSPORT_ENVELOPE;
 }
 
 const WRITER_LOCK_FILE = "writer.lock";

package/src/role-runtime.ts

@@ -33,7 +33,10 @@ import {
   resolveEngineModel,
   resolveEngineName,
 } from "./engine-detour.ts";
-import { engineSessionMaterialFromOptions } from "./package-resources/engine-material.ts";
+import {
+  engineSessionMaterialFromOptions,
+  engineSessionReadingMaterial,
+} from "./package-resources/engine-material.ts";
 import { registerEngineDetourTool } from "./engine-detour-tool.ts";
 import {
   createReceiptDeliveryPolicy,
@@ -114,7 +117,15 @@ import {
   resolveLifecycleInvocationPrincipal,
 } from "./navigator-invocation-identity.ts";
 import { NAVIGATOR_POST_ROLE_GRACE_MS, raceNavigatorGrace } from "./public-cli/settlement.ts";
-import { PACKAGED_ROLE_REGISTRY, isOfficerReviewSeat, packagedRoleActivationFlags, packagedRoleInputFlag, packagedRoleMetadata, packagedRoleOutputTool, packagedRolePhaseFlag, type PackagedRole } from "./packaged-role-registry.ts";
+import {
+  PACKAGED_ROLE_REGISTRY,
+  packagedRoleActivationFlags,
+  packagedRoleInputFlag,
+  packagedRoleMetadata,
+  packagedRoleOutputTool,
+  packagedRolePhaseFlag,
+  type PackagedRole,
+} from "./packaged-role-registry.ts";
 import {
   createJudgeRoleRuntime,
 } from "./judge-role.ts";
@@ -1198,12 +1209,9 @@ export function createRoleRuntimeExtension(
         };
       }
     });
-    // #879: engine coordinates ride readingMaterial only when station-child
-    // officer dialogue replaced the ordinary transport prompt (no double fold).
+    // #1167: engine / outsourcing coordinates ride startup readingMaterial for
+    // every seat (handbook bodies). Transport prompt stays dispatch-only.
     roleHost.on("before_agent_start", () => {
-      const role = selectedRole ?? roleHost.getFlag(ROLE_FLAG.name);
-      if (typeof role !== "string" || !isOfficerReviewSeat(role)) return;
-      if (roleHost.getFlag(STATION_CHILD_FLAG.name) !== true) return;
       const engine = resolveEngineName((name) => roleHost.getFlag(name));
       if (engine === undefined || dependencies.packageRoot === undefined) return;
       const engineModel = resolveEngineModel((name) => roleHost.getFlag(name));
@@ -1212,15 +1220,9 @@ export function createRoleRuntimeExtension(
         ...(engineModel === undefined ? {} : { engineModel }),
         packageRoot: dependencies.packageRoot,
       });
-      if (material === undefined) return;
-      return {
-        readingMaterial: {
-          kind: "engine-session-material" as const,
-          name: material.name,
-          ...(material.model === undefined ? {} : { model: material.model }),
-          ...(material.materialPath === undefined ? {} : { materialPath: material.materialPath }),
-        },
-      };
+      const reading = engineSessionReadingMaterial(material);
+      if (reading === undefined) return;
+      return { readingMaterial: reading };
     });
     roleHost.on("before_agent_start", () => {
       const path = roleHost.getFlag(INSPECTOR_SOURCE_RUN_FLAG.name);