@akagilnc/pi-workflow-roles 0.1.1857 → 0.1.1876

package/dist/sitian-record-entry.js

@@ -1,4 +1,5 @@
 import { createHash } from "node:crypto";
+import { existsSync, writeFileSync } from "node:fs";
 import { dirname, resolve, join } from "node:path";
 import { SessionManager } from "@earendil-works/pi-coding-agent";
 import { resolveBookKeyFromGit } from "./activation-ledger-git.js";
@@ -12,31 +13,54 @@ import {
   resolveActivationLedgerHome
 } from "./activation-ledger-topology.js";
 const { findMostRecentSession } = await import(new URL("./core/session-manager.js", import.meta.resolve("@earendil-works/pi-coding-agent")).href);
+const WORKER_SUBMISSION_GATE_KIND = "worker-submission-gate";
 function createRecordSession(options) {
   const cwd = options.cwd;
   const parentFile = options.parent?.getSessionFile();
   const ledgerHome = resolveActivationLedgerHome();
+  let sessionDir;
+  let parentSession;
   if (options.subject !== void 0) {
     const digest = createHash("sha256").update(options.subject).digest("hex").slice(0, 32);
-    const sessionDir2 = join(
+    sessionDir = join(
       activationBookDirectory(ledgerHome, resolveBookKeyFromGit(cwd)),
       options.kind,
       digest
     );
-    ensureRealDirectoryTree(ledgerHome, sessionDir2);
-    const recentFile = findMostRecentSession(sessionDir2, cwd);
-    if (recentFile !== null) return SessionManager.open(recentFile, sessionDir2, cwd);
-    return SessionManager.create(cwd, sessionDir2, parentFile ? { parentSession: parentFile } : void 0);
-  }
-  if (parentFile === void 0 || parentFile.length === 0) {
+    parentSession = parentFile && parentFile.length > 0 ? parentFile : void 0;
+  } else if (parentFile === void 0 || parentFile.length === 0) {
     return SessionManager.inMemory(cwd);
+  } else {
+    const parentResolved = resolve(parentFile);
+    sessionDir = physicallyContainedIn(ledgerHome, parentResolved) ? join(dirname(parentResolved), options.kind) : join(activationBookDirectory(ledgerHome, resolveBookKeyFromGit(cwd)), options.kind);
+    parentSession = parentFile;
   }
-  const parentResolved = resolve(parentFile);
-  const sessionDir = physicallyContainedIn(ledgerHome, parentResolved) ? join(dirname(parentResolved), options.kind) : join(activationBookDirectory(ledgerHome, resolveBookKeyFromGit(cwd)), options.kind);
   ensureRealDirectoryTree(ledgerHome, sessionDir);
-  return SessionManager.create(cwd, sessionDir, { parentSession: parentFile });
+  const mayResumeSameNest = options.subject !== void 0 || options.kind === WORKER_SUBMISSION_GATE_KIND;
+  if (mayResumeSameNest) {
+    const recentFile = findMostRecentSession(sessionDir, cwd);
+    if (recentFile !== null) return SessionManager.open(recentFile, sessionDir, cwd);
+  }
+  const session = SessionManager.create(
+    cwd,
+    sessionDir,
+    parentSession === void 0 ? void 0 : { parentSession }
+  );
+  if (session.isPersisted()) {
+    const file = session.getSessionFile();
+    if (file !== void 0 && !existsSync(file)) {
+      const header = session.getHeader();
+      if (header !== null && header.type === "session") {
+        writeFileSync(file, `${JSON.stringify(header)}
+`, { flag: "wx" });
+        session.setSessionFile(file);
+      }
+    }
+  }
+  return session;
 }
 export {
+  WORKER_SUBMISSION_GATE_KIND,
   createRecordSession,
   roleRunSessionCoordinates
 };

package/package.json

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

package/src/role-runtime.ts

@@ -673,6 +673,7 @@ export function createRoleRuntimeExtension(
           return dependencies.loadFixPacket(path);
         },
       },
+      hostActions,
     );
     const coder = createCoderRoleRuntime(
       pi,

package/src/sitian-record-entry.ts

@@ -4,6 +4,7 @@
  * 「谁调了谁」复用 Pi parentSession + ADR 0047 correlation，不新增 caller 字段。
  */
 import { createHash } from "node:crypto";
+import { existsSync, writeFileSync } from "node:fs";
 import { dirname, resolve, join } from "node:path";
 import { SessionManager } from "@earendil-works/pi-coding-agent";
 
@@ -42,48 +43,79 @@ export type CreateRecordSessionOptions = {
   readonly subject?: string;
 };
 
+/** Authorized no-subject kind that may resume the most recent same-nest peer (ADR 0066). Sole string true source for gate resume identity. */
+export const WORKER_SUBMISSION_GATE_KIND = "worker-submission-gate";
+
 /**
  * Sole package entry that constructs a durable Pi session record (ADR 0065).
  * No destination/path parameters — location is computed from ledger topology only.
+ * Resume via Pi findMostRecentSession is limited to subject-keyed identity and the
+ * authorized worker-submission-gate durable path. Ordinary no-subject children
+ * (evidence-children, auditor-roles, …) always mint a fresh session — never reopen
+ * a sibling volume selected only by kind/cwd/mtime.
+ * New persisted principals materialize their deferred session header before return so
+ * custom-entry-only writers do not need a parallel delayed-header helper.
  */
 export function createRecordSession(options: CreateRecordSessionOptions): SessionManager {
   const cwd = options.cwd;
   const parentFile = options.parent?.getSessionFile();
   const ledgerHome = resolveActivationLedgerHome();
 
+  let sessionDir: string;
+  let parentSession: string | undefined;
+
   if (options.subject !== undefined) {
     const digest = createHash("sha256").update(options.subject).digest("hex").slice(0, 32);
-    const sessionDir = join(
+    sessionDir = join(
       activationBookDirectory(ledgerHome, resolveBookKeyFromGit(cwd)),
       options.kind,
       digest,
     );
-    ensureRealDirectoryTree(ledgerHome, sessionDir);
-    // Delegate discovery to Pi so custom-directory continuation retains its
-    // mtime ordering, valid-header scan, and cwd filtering semantics.
-    const recentFile = findMostRecentSession(sessionDir, cwd);
-    if (recentFile !== null) return SessionManager.open(recentFile, sessionDir, cwd);
-    return SessionManager.create(cwd, sessionDir, parentFile
-      ? { parentSession: parentFile }
-      : undefined);
-  }
-
-  if (parentFile === undefined || parentFile.length === 0) {
+    parentSession = parentFile && parentFile.length > 0 ? parentFile : undefined;
+  } else if (parentFile === undefined || parentFile.length === 0) {
     // No durable parent principal — preserve prior in-memory child behavior.
     return SessionManager.inMemory(cwd);
+  } else {
+    const parentResolved = resolve(parentFile);
+    // Nest under parent only when the parent record already lives under the package home.
+    // Nest base is dirname(parent file) — the durable principal's directory — never a
+    // separate getSessionDir() that can diverge (empty in-memory dir + durable file).
+    // Otherwise the book is resolved from cwd (ADR 0048) and the kind sits under that book —
+    // workspace / foreign parents cannot drag records out of home.
+    sessionDir = physicallyContainedIn(ledgerHome, parentResolved)
+      ? join(dirname(parentResolved), options.kind)
+      : join(activationBookDirectory(ledgerHome, resolveBookKeyFromGit(cwd)), options.kind);
+    parentSession = parentFile;
   }
 
-  const parentResolved = resolve(parentFile);
-
-  // Nest under parent only when the parent record already lives under the package home.
-  // Nest base is dirname(parent file) — the durable principal's directory — never a
-  // separate getSessionDir() that can diverge (empty in-memory dir + durable file).
-  // Otherwise the book is resolved from cwd (ADR 0048) and the kind sits under that book —
-  // workspace / foreign parents cannot drag records out of home.
-  const sessionDir = physicallyContainedIn(ledgerHome, parentResolved)
-    ? join(dirname(parentResolved), options.kind)
-    : join(activationBookDirectory(ledgerHome, resolveBookKeyFromGit(cwd)), options.kind);
-
   ensureRealDirectoryTree(ledgerHome, sessionDir);
-  return SessionManager.create(cwd, sessionDir, { parentSession: parentFile });
+  // Subject-keyed nests continue by subject digest; gate durable resume is the only
+  // authorized no-subject same-nest continuation. All other kinds mint fresh.
+  const mayResumeSameNest =
+    options.subject !== undefined || options.kind === WORKER_SUBMISSION_GATE_KIND;
+  if (mayResumeSameNest) {
+    const recentFile = findMostRecentSession(sessionDir, cwd);
+    if (recentFile !== null) return SessionManager.open(recentFile, sessionDir, cwd);
+  }
+
+  const session = SessionManager.create(
+    cwd,
+    sessionDir,
+    parentSession === undefined ? undefined : { parentSession },
+  );
+  // Pi defers session-file create until the first assistant message. Custom-entry-only
+  // records never get that turn, so the sole record entry materializes the in-memory
+  // header onto the UUIDv7 path before returning. Existing path → early return.
+  if (session.isPersisted()) {
+    const file = session.getSessionFile();
+    if (file !== undefined && !existsSync(file)) {
+      const header = session.getHeader();
+      if (header !== null && header.type === "session") {
+        writeFileSync(file, `${JSON.stringify(header)}\n`, { flag: "wx" });
+        // Rebind so subsequent appendCustomEntry uses O_APPEND (flushed=true).
+        session.setSessionFile(file);
+      }
+    }
+  }
+  return session;
 }

package/src/worker-role.ts

@@ -26,7 +26,11 @@ import {
   parseFixerPrerequisites,
   type FixerInvocationInput,
 } from "./package-contracts/fixer-packet.ts";
-import { createWorkerSubmissionGate } from "./worker-submission-gates.ts";
+import {
+  createWorkerSubmissionGate,
+  WorkerCommitReminderError,
+  WorkerUnfinishedReasonReminderError,
+} from "./worker-submission-gates.ts";
 
 export {
   CODER_OUTPUT_TOOL_NAME,
@@ -171,9 +175,32 @@ function requireSingletonSubmissionCall(
   }
 }
 
+/** Reminder bounces stay typed rejects; IO/infrastructure keep identity via host failInfrastructure. */
+function assertAcceptableThroughHost(
+  submissionGate: { assertAcceptable(status: string, details?: unknown): void },
+  status: string,
+  details: unknown,
+  hostActions: WorkerRoleHostActions,
+  ctx: ExtensionContext,
+  toolCallId: string,
+): void {
+  try {
+    submissionGate.assertAcceptable(status, details);
+  } catch (error) {
+    if (
+      error instanceof WorkerCommitReminderError ||
+      error instanceof WorkerUnfinishedReasonReminderError
+    ) {
+      throw error;
+    }
+    hostActions.failInfrastructure(error, ctx, toolCallId);
+  }
+}
+
 export function createFixerRoleRuntime(
   pi: ExtensionAPI,
   dependencies: FixerRoleDependencies,
+  hostActions: WorkerRoleHostActions,
 ): WorkerRoleRuntime {
   let soul: string | undefined;
   let packet: FixerInvocationInput | undefined;
@@ -251,7 +278,14 @@ export function createFixerRoleRuntime(
               ctx,
             );
             const output = deepFreeze(validateFixerOutputForPacket(parameters, phase, packet));
-            submissionGate.assertAcceptable(output.status, output);
+            assertAcceptableThroughHost(
+              submissionGate,
+              output.status,
+              output,
+              hostActions,
+              ctx,
+              toolCallId,
+            );
             return {
               content: [{ type: "text" as const, text: "Fixer report accepted" }],
               details: output,
@@ -383,7 +417,14 @@ export function createCoderRoleRuntime(
                 "Coder completed requires the Matt tdd skill to be expanded through Pi /skill:tdd",
               );
             }
-            submissionGate.assertAcceptable(output.status, output);
+            assertAcceptableThroughHost(
+              submissionGate,
+              output.status,
+              output,
+              hostActions,
+              ctx,
+              toolCallId,
+            );
             return {
               content: [{ type: "text" as const, text: "Coder report accepted" }],
               details: output,

package/src/worker-submission-gates.ts

@@ -1,17 +1,24 @@
 /** #242 worker gates ①②④. ① durability: ADR 0065/#216 createRecordSession only — no appendCustomEntry bypass / parallel ledger. */
 import { execFileSync } from "node:child_process";
-import { chmodSync, existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import {
+  chmodSync,
+  existsSync,
+  mkdirSync,
+  readFileSync,
+  writeFileSync,
+} from "node:fs";
 import { resolve } from "node:path";
 import { SessionManager } from "@earendil-works/pi-coding-agent";
 
 import {
   createRecordSession,
   type RecordSessionParent,
+  WORKER_SUBMISSION_GATE_KIND,
 } from "./sitian-record-entry.ts";
 
 export const WORKER_COMMIT_SUBJECT_PREFIX = "ak-roles:";
 /** Sitian kind for gate ① durable baseline / bounce records (single path segment, not a destination). */
-export const WORKER_SUBMISSION_GATE_RECORD_KIND = "worker-submission-gate";
+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";
 
@@ -163,34 +170,15 @@ function isRecord(value: unknown): value is Record<string, unknown> {
 }
 
 /**
- * Pi defers session-file create until the first assistant message. Gate records are
- * custom-entry only (no LLM turn), so materialize the header first — same shape as
- * activation-ledger-session materializeDeferredSessionFile — then custom entries append.
+ * Open gate ① record via sitian entry only — resume/lifecycle live in createRecordSession.
+ * Gate consumes the returned session; no nest scan, unlink, or peer reopen.
  */
-function materializeSessionHeader(session: SessionManager): void {
-  if (!session.isPersisted()) return;
-  const file = session.getSessionFile();
-  if (file === undefined || existsSync(file)) return;
-  const header = session.getHeader();
-  if (header === null || header.type !== "session") return;
-  writeFileSync(file, `${JSON.stringify(header)}\n`, { flag: "wx" });
-  // Rebind so subsequent appendCustomEntry uses O_APPEND (flushed=true).
-  session.setSessionFile(file);
-}
-
-/** Open gate ① record via sitian entry; resume continues the nest the entry resolved (no self-computed destination). */
 function openGateRecord(cwd: string, parent?: WorkerSubmissionGateParent): SessionManager {
-  const discovered = createRecordSession({
+  return createRecordSession({
     cwd,
     kind: WORKER_SUBMISSION_GATE_RECORD_KIND,
     ...(parent === undefined ? {} : { parent }),
   });
-  // No durable parent principal → in-memory only (same-process bounce still works).
-  if (!discovered.isPersisted()) return discovered;
-  // Destination came from createRecordSession; continueRecent only picks the latest file in that nest.
-  const session = SessionManager.continueRecent(cwd, discovered.getSessionDir());
-  materializeSessionHeader(session);
-  return session;
 }
 
 function readGateState(session: SessionManager): {