@afokapu/atdd-flow 0.3.80 → 0.3.82

package/extensions/pi/index.ts

@@ -1,6 +1,7 @@
 import * as fs from "node:fs";
 import { mkdir, readFile, rename, rm, stat, unlink, writeFile } from "node:fs/promises";
 import { basename, dirname, join } from "node:path";
+import { isDeepStrictEqual } from "node:util";
 import { parse, stringify } from "yaml";
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { clearStaleRuntimeState, clearRuntimeState, heartbeatRuntimeState, ownsRuntimeState, recordMailActivation, registerRuntimeState, runtimeOwnerToken, withOwnedRuntimeState } from "../../src/runtime-state";
@@ -413,6 +414,23 @@ function unmatchedWakeRequest(branch: TranscriptEntry[], identity: WakeIdentity)
 /** The recovery bundle is advisory; any failure falls back to the plain prompt. */
 const recovery = (root: string, seat: string, mode: RecoveryMode, session?: string) => recoveryFor(root, seat, mode, session).catch(() => undefined);
 
+type ReceiptWithLaunchRequest = { handover_replacement?: { request?: unknown } };
+
+/** The request recorded in this seat's own launcher receipt, or undefined when the seat, receipt or embed is absent or unreadable. */
+async function embeddedLaunchRequest(root: string, seat: string) {
+  try {
+    const receiptPath = (await readYaml<Seat>(paths(root).seatFile(seat))).runtime?.launch_receipt;
+    if (!receiptPath) return undefined;
+    return (parse(await readFile(receiptPath, "utf8")) as ReceiptWithLaunchRequest | null)?.handover_replacement?.request;
+  } catch { return undefined; }
+}
+
+/** True when this Pi was launched by the active request: its own receipt embeds exactly that request, so it is the consumed successor, not a source to shut down. */
+async function launchedByRequest(root: string, seat: string, request: unknown) {
+  const embedded = await embeddedLaunchRequest(root, seat);
+  return embedded !== undefined && isDeepStrictEqual(embedded, request);
+}
+
 /** Desk mail is authoritative; the queue is a bounded delivery index and fs.watch only shortens latency. */
 export default function (pi: ExtensionAPI, environment: NodeJS.ProcessEnv = process.env) {
   const root = environment.ATDD_WORKFLOW_ROOT;
@@ -456,7 +474,7 @@ export default function (pi: ExtensionAPI, environment: NodeJS.ProcessEnv = proc
     if (!sourceSession) return;
     try {
       const request = await readHandoverReplacement(root, seat);
-      if (request.source.pi_session !== sourceSession) return;
+      if (request.source.pi_session !== sourceSession || await launchedByRequest(root, seat, request)) return;
       pi.sendMessage({
         customType: "atdd-flow-context-handover-replacement",
         content: `SYSTEM: Validated Path-A request for ${seat} observed. The successor must not start until this Pi has shut down and Herdr reports the exact source pane released.`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@afokapu/atdd-flow",
-  "version": "0.3.80",
+  "version": "0.3.82",
   "description": "Filesystem-first Desk registry for projects, seats, tasks, threads, and handoffs.",
   "type": "module",
   "bin": {

package/src/stale-main-recovery.ts

@@ -11,6 +11,7 @@
 import { createHash } from "node:crypto";
 import { mkdir, readFile, rename, rm, writeFile } from "node:fs/promises";
 import { basename, dirname, join, resolve } from "node:path";
+import { isDeepStrictEqual } from "node:util";
 import { type Runtime, type Seat, runOutput, yaml } from "./core";
 import type { HandoverReplacementRequest, LiveSourceProof } from "./handover";
 
@@ -48,6 +49,7 @@ type Recorded = { session: string; sessionPath: string; locator: { session: stri
 type Source = HandoverReplacementRequest["source"];
 type Target = HandoverReplacementRequest["target"];
 type PriorReceipt = {
+  handover_replacement?: { request?: unknown };
   schema?: string; seat?: string; pi_session?: string; pi_session_path?: string; herdr_session?: string; pane?: string;
   mode?: string; authorized_by?: string; authorization?: string;
   target?: { cwd?: string; pi_session?: string; pi_session_path?: string; herdr_session?: string; pane?: string };
@@ -288,14 +290,22 @@ export async function backupIsTranscriptPrefix(backup: { path?: string; sha256?:
   } catch { return false; }
 }
 
-/** An existing stale active request must retain exactly the retired placement of the recorded Pi. */
+const atReceiptPlacement = (placement: { herdr_session: string; pane: string }, receipt: PriorReceipt) =>
+  placement.herdr_session === receipt.herdr_session && placement.pane === receipt.pane;
+
+/** A launcher receipt's own launch request: the active request is exactly the request embedded in the receipt and targets the receipt placement. */
+function isEmbeddedLaunchRequest(request: HandoverReplacementRequest, receipt: PriorReceipt) {
+  return receipt.schema === LAUNCH_RECEIPT_SCHEMA && isDeepStrictEqual(request, receipt.handover_replacement?.request) && atReceiptPlacement(request.target, receipt);
+}
+
+/** An existing stale active request must be for the recorded Pi and retain the retired placement: both ends at it, or the launch request embedded in the launcher receipt. */
 async function priorRequestIsRetiredLineage(file: string, receipt: PriorReceipt) {
   let bytes: string;
   try { bytes = await readFile(file, "utf8"); } catch { return true; }
   try {
-    const { source, target } = yaml.parse<HandoverReplacementRequest>(bytes);
-    return source.pi_session === receipt.pi_session && source.pi_session_path === receipt.pi_session_path
-      && [source, target].every((placement) => placement.herdr_session === receipt.herdr_session && placement.pane === receipt.pane);
+    const request = yaml.parse<HandoverReplacementRequest>(bytes), { source, target } = request;
+    const samePi = source.pi_session === receipt.pi_session && source.pi_session_path === receipt.pi_session_path;
+    return samePi && ((atReceiptPlacement(source, receipt) && atReceiptPlacement(target, receipt)) || isEmbeddedLaunchRequest(request, receipt));
   } catch { return false; }
 }