@afokapu/atdd-flow 0.3.79 → 0.3.81

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@afokapu/atdd-flow",
-  "version": "0.3.79",
+  "version": "0.3.81",
   "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";
 
@@ -30,6 +31,7 @@ export type StaleMainRecovery = {
   relocation?: Relocation;
 };
 
+const LAUNCH_RECEIPT_SCHEMA = "atdd-flow/pi-runtime-launch-receipt/v1";
 export const MANUAL_REBINDING_SCHEMA = "atdd-flow/manual-pi-runtime-rebinding-receipt/v1";
 export const MANUAL_REBINDING_MODE = "operator-authorized-manual-in-place-adoption";
 
@@ -47,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 };
@@ -84,7 +87,7 @@ export function receiptProvesCanonical(receipt: PriorReceipt, seat: string, cano
 }
 
 function launchReceiptProvesCanonical(receipt: PriorReceipt, seat: string, canonical: StaleMainRecovery["canonical_source"]) {
-  return receipt.schema === "atdd-flow/pi-runtime-launch-receipt/v1" && receipt.seat === seat
+  return receipt.schema === LAUNCH_RECEIPT_SCHEMA && receipt.seat === seat
     && receipt.pi_session === canonical.pi_session && receipt.pi_session_path === canonical.pi_session_path
     && receipt.herdr_session === canonical.herdr_session && receipt.pane === canonical.pane;
 }
@@ -264,12 +267,18 @@ export async function buildStaleMainRecovery(root: string, seat: string, intent:
 
 const refuse = (reason: string) => new Error(`Stale main relocation receipt recovery refused: ${reason}.`);
 
-/** True when the seat records a manual binding_mode or its launch receipt is a manual rebinding receipt, rather than a launcher receipt. */
+/** The recorded receipt, or undefined when it is unreadable or malformed. */
+async function readReceipt(path: string) {
+  try { return yaml.parse<PriorReceipt>(await readFile(path, "utf8")); } catch { return undefined; }
+}
+
+/** A launcher receipt is never manual, even if the seat retains a binding_mode; any other receipt is manual when it has the manual schema or the seat records a binding_mode. */
 export async function isManualRebindingReceipt(record: Seat) {
   const path = record.runtime?.launch_receipt;
   if (!path) return false;
-  if (record.runtime?.binding_mode !== undefined) return true;
-  try { return yaml.parse<PriorReceipt>(await readFile(path, "utf8")).schema === MANUAL_REBINDING_SCHEMA; } catch { return false; }
+  const schema = (await readReceipt(path))?.schema;
+  if (schema === LAUNCH_RECEIPT_SCHEMA) return false;
+  return record.runtime?.binding_mode !== undefined || schema === MANUAL_REBINDING_SCHEMA;
 }
 
 /** A backup file must hash to its recorded digest (and size, when recorded) and be the exact byte prefix of the adopted session transcript. */
@@ -281,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; }
 }
 
@@ -390,10 +407,8 @@ export async function relocationFor(record: Seat, source: Source, target: Target
 }
 
 async function readLauncherReceipt(path: string) {
-  try {
-    const receipt = yaml.parse<PriorReceipt>(await readFile(path, "utf8"));
-    return receipt.schema === "atdd-flow/pi-runtime-launch-receipt/v1" ? receipt : undefined;
-  } catch { return undefined; }
+  const receipt = await readReceipt(path);
+  return receipt?.schema === LAUNCH_RECEIPT_SCHEMA ? receipt : undefined;
 }
 
 /** The launcher receipt names this seat's exact recorded Pi at a pane other than the seat's current locator. */