@akagilnc/pi-workflow-roles 0.1.3837 → 0.1.3873

package/dist/role-runtime.js

@@ -1090,7 +1090,12 @@ export function createRoleRuntimeExtension(dependencies) {
             async runDispatch(dispatch, options) {
                 if (dependencies.runReviewerDispatch === undefined)
                     throw new Error("Reviewer runtime dependencies are not configured");
-                return dependencies.runReviewerDispatch(dispatch, options);
+                // #818: request-scoped engine flag reaches axis sub-session via same RoleHost
+                // that parent registerEngineDetourTool reads — never ambient process.env.
+                return dependencies.runReviewerDispatch(dispatch, {
+                    ...options,
+                    getFlag: (name) => roleHost.getFlag(name),
+                });
             },
             ...(dependencies.shutdownReviewerAgent === undefined
                 ? {}
@@ -1567,8 +1572,8 @@ export function createRoleRuntimeExtension(dependencies) {
                     }
                 }
                 await executeActivationStage(entry.role, activationStage(entry.role, runtime), { clock, writeTrace });
-                // #357 T2 / #378 / #380 / #391: any role+engine activation registers the package detour tool once.
-                // Gate is env presence only — no per-engine execute branch; no role-module spawn.
+                // #357 T2 / #378 / #380 / #391 / #818: any role+engine activation registers the package detour tool once.
+                // Gate is resolveEngineName (RoleHost flag → env fallback) — no per-engine execute branch; no role-module spawn.
                 if (!engineDetourRegistered) {
                     engineDetourRegistered = registerEngineDetourTool(roleHost, hostActions);
                 }

package/package.json

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

package/scripts/build-package.mjs

@@ -109,7 +109,7 @@ export async function buildAcpProductionHost(
   });
   // role-envelope resolves ./mcp-relay.mjs from import.meta.url — keep it beside the bundle.
   await copyFile(
-    resolve("src/acp-host/mcp-relay.mjs"),
+    resolve("src/mcp-relay.mjs"),
     join(dirname(outfile), "mcp-relay.mjs"),
   );
 }
@@ -136,7 +136,7 @@ export async function buildHeadlessProductionHost(
   // Shared envelope resolves ./mcp-relay.mjs from import.meta.url of the bundle
   // (#645 headless reuses the ACP relay for AK tools under --mcp-config).
   await copyFile(
-    resolve("src/acp-host/mcp-relay.mjs"),
+    resolve("src/mcp-relay.mjs"),
     join(dirname(outfile), "mcp-relay.mjs"),
   );
 }

package/src/acp-host/production-host.ts

@@ -6,108 +6,44 @@
  * factory does not create a run-scoped agent home, does not rewrite HOME, and
  * does not copy or scrub credentials. Sitian records on the run are the dossier.
  */
-import { readFile } from "node:fs/promises";
-import { fileURLToPath } from "node:url";
+import { randomUUID } from "node:crypto";
 
-import { loadCanonicalSkillBinding as loadHomeCanonicalSkillBinding } from "../canonical-skill-binding.ts";
-import { createGhCollectorGitHubTransport, createGhIssueSoftFetcher } from "../collector-github.ts";
-import { createPiDoctorAuditor } from "../doctor-auditor.ts";
-import { loadDoctorCase } from "../doctor-evidence.ts";
-import type { DurablePrincipalAuthority, RoleTurnHost } from "../host-contracts.ts";
-import { createProductionMergerGitState } from "../merger-git-state.ts";
-import { createNativeNavigatorSessionFactory, createNavigatorAttendance } from "../navigator-attendance.ts";
-import { loadNavigatorWorkContext } from "../navigator-work-context.ts";
-import { loadNotarySourceRunLocator } from "../notary-source-run.ts";
-import { loadPackagedCanonicalSkillBinding } from "../package-resources/method-skill-binding.ts";
-import { createPerDispatchReviewerAgent } from "../reviewer-agent.ts";
-import { formatNavigatorRoleHelp, type RoleRuntimeDependencies } from "../role-runtime.ts";
-import { createReviewerPinnedGitReader } from "../reviewer-pinned-git.ts";
-import { loadAuditorSoulFromSubjectInput } from "../auditor-soul.ts";
-import { loadGatekeeperSessionMaterials, loadMainRoleSessionMaterials } from "../session-opening-materials.ts";
+import type { DurablePrincipalAuthority, RoleTurnHost, RoleTurnRequest } from "../host-contracts.ts";
+import { prepareRoleEnvelope } from "../role-envelope.ts";
+import type { RoleRuntimeDependencies } from "../role-runtime.ts";
+import { createRoleRuntimeDependencies } from "../role-runtime-dependencies.ts";
+import { createSessionIdentityAuthority } from "../session-identity.ts";
 import { acpStdioArgs, resolveAcpBinary, type AcpHostDescription } from "./description.ts";
-import { createComposedAcpRoleTurnHost } from "./role-envelope.ts";
-import { connectAcpStdio } from "./role-turn-host.ts";
+import {
+  connectAcpStdio,
+  createAcpRoleTurnHost,
+  type AcpRoleTurnHostConfig,
+} from "./role-turn-host.ts";
 import { ensureSeatProfileSoul } from "./seat-profile-soul.ts";
-import { createAcpSessionIdentityAuthority } from "./session-identity.ts";
 
 export type ProductionAcpHostOptions = Readonly<{
   packageRoot: string;
   principalAuthority: DurablePrincipalAuthority;
   description: AcpHostDescription;
+  /** Seat-table host key (e.g. grok-build). */
+  hostName: string;
 }>;
 
-const navigatorRoutePlaybookPath = fileURLToPath(
-  new URL("../../resources/navigator-route-playbook.md", import.meta.url),
-);
-const collectorHandbookSeedPath = fileURLToPath(
-  new URL("../../resources/collector-bot-handbook.md", import.meta.url),
-);
-
-/** Host-neutral packaged role runtime deps for the ACP parent-process envelope. */
-export function createAcpRoleRuntimeDependencies(packageRoot: string): RoleRuntimeDependencies {
-  const doctorAuditor = createPiDoctorAuditor();
-  const reviewerAgent = createPerDispatchReviewerAgent({ packageRoot });
-  const navigatorSessionFactory = createNativeNavigatorSessionFactory();
-  return {
-    loadJudgeSoul: () => loadMainRoleSessionMaterials("judge"),
-    loadFixerSoul: () => loadMainRoleSessionMaterials("fixer"),
-    loadFixPacket: (path) => readFile(path, "utf8"),
-    loadCoderSoul: () => loadMainRoleSessionMaterials("coder"),
-    loadCoderTask: (path) => readFile(path, "utf8"),
-    loadReviewerSoul: () => loadMainRoleSessionMaterials("reviewer"),
-    createReviewerPinnedGitReader: () => createReviewerPinnedGitReader(),
-    createReviewerIssueFetcher: () => createGhIssueSoftFetcher(),
-    loadCollectorSoul: () => loadMainRoleSessionMaterials("collector"),
-    loadCollectorHandbookSeed: () => readFile(collectorHandbookSeedPath, "utf8"),
-    createCollectorTransport: () => createGhCollectorGitHubTransport(),
-    loadDoctorSoul: () => loadMainRoleSessionMaterials("doctor"),
-    loadDoctorCase,
-    loadInspectorSoul: () => loadMainRoleSessionMaterials("inspector"),
-    loadGatekeeperSoul: () => loadGatekeeperSessionMaterials("gatekeeper"),
-    loadNavigatorSoul: () => loadMainRoleSessionMaterials("navigator"),
-    loadAuditorSoul: () => loadAuditorSoulFromSubjectInput(),
-    loadNotarySoul: () => loadMainRoleSessionMaterials("notary"),
-    loadCountersignSoul: () => loadMainRoleSessionMaterials("countersign"),
-    loadGleanerLeftSoul: () => loadMainRoleSessionMaterials("gleaner-left"),
-    loadDiaristSoul: () => loadMainRoleSessionMaterials("diarist"),
-    loadNotarySourceRun: loadNotarySourceRunLocator,
-    loadMergerSoul: () => loadMainRoleSessionMaterials("merger"),
-    loadMergerInput: async (path) => JSON.parse(await readFile(path, "utf8")),
-    createMergerGitState: (repositoryRoot) => createProductionMergerGitState(repositoryRoot),
-    async loadCanonicalSkillBinding(name) {
-      if (name === "tdd") {
-        return loadPackagedCanonicalSkillBinding(packageRoot, "tdd");
-      }
-      if (name === "code-review") {
-        return loadPackagedCanonicalSkillBinding(packageRoot, "code-review");
-      }
-      return loadHomeCanonicalSkillBinding(name);
-    },
-    // #590: doctor compliance still on disposeCompliance path; judge→auditor is gate queue (#756).
-    auditDoctorCompliance: (options) => doctorAuditor(options),
-    runReviewerDispatch: (dispatch, options) => reviewerAgent.run(dispatch, options),
-    shutdownReviewerAgent: () => reviewerAgent.shutdown(),
-    loadNavigatorWorkContext: (options) => loadNavigatorWorkContext({
-      context: options.context,
-      role: options.role,
-      ...(options.getFlag === undefined ? {} : { getFlag: options.getFlag }),
-    }),
-    createNavigatorAttendance: (options) => createNavigatorAttendance({
-      context: options.context,
-      role: options.role,
-      phase: options.phase,
-      subjectKey: options.subjectKey,
-      subject: options.subject,
-      authority: options.authority,
-      invocationId: options.invocationId,
-      loadSoul: () => loadMainRoleSessionMaterials("navigator"),
-      loadRoutePlaybook: () => readFile(navigatorRoutePlaybookPath, "utf8"),
-      loadRoleHelp: async (role) => formatNavigatorRoleHelp(role),
-      createSession: navigatorSessionFactory,
-      ...(options.contextError === undefined ? {} : { contextError: options.contextError }),
-      onEvent: options.onEvent,
+function createComposedAcpRoleTurnHost(
+  config: Omit<AcpRoleTurnHostConfig, "prepare"> & {
+    readonly roleRuntimeDependencies: RoleRuntimeDependencies;
+    readonly socketPath?: (request: RoleTurnRequest) => string;
+  },
+) {
+  return createAcpRoleTurnHost({
+    ...config,
+    prepare: (request) => prepareRoleEnvelope({
+      request,
+      dependencies: config.roleRuntimeDependencies,
+      sessionFile: config.sessionIdentity.resolveSessionFile(request.principal),
+      socketPath: config.socketPath?.(request) ?? `/tmp/ak-acp-mcp-${randomUUID()}.sock`,
     }),
-  };
+  });
 }
 
 /**
@@ -116,7 +52,7 @@ export function createAcpRoleRuntimeDependencies(packageRoot: string): RoleRunti
  * is sitian-only.
  */
 export function createProductionAcpRoleTurnHost(options: ProductionAcpHostOptions): RoleTurnHost {
-  const { packageRoot, principalAuthority, description } = options;
+  const { packageRoot, principalAuthority, description, hostName } = options;
   const env: NodeJS.ProcessEnv = {
     ...process.env,
     ...description.childEnv,
@@ -124,10 +60,11 @@ export function createProductionAcpRoleTurnHost(options: ProductionAcpHostOption
   };
 
   return createComposedAcpRoleTurnHost({
-    sessionIdentity: createAcpSessionIdentityAuthority(principalAuthority, description.sessionBindingFile),
+    hostName,
+    sessionIdentity: createSessionIdentityAuthority(principalAuthority, description.sessionBindingFile),
     boundResume: description.boundResume,
     modelPassing: description.modelPassing,
-    roleRuntimeDependencies: createAcpRoleRuntimeDependencies(packageRoot),
+    roleRuntimeDependencies: createRoleRuntimeDependencies(packageRoot),
     async connect(request) {
       const seatProfile = description.seatProfileSoul;
       const profileName = seatProfile === undefined