@patronage/software-factory 1.0.0-alpha.5 → 1.0.0-alpha.6

package/dist/index.d.ts

@@ -145,8 +145,6 @@ interface HqIngestDependencies {
    * `timeoutMs`: see the note there.
    */
   journalFlushBudgetMs?: number;
-  /** @deprecated Legacy sidecars are now streamed directly; retained for API compatibility. */
-  sidecarReclaimMs?: number;
   /**
    * Setup budget for callers that own the process lifetime — honored AS GIVEN,
    * above the `DEFAULT_HQ_INGEST_TIMEOUT_MS` ceiling that clamps `timeoutMs`.
@@ -184,12 +182,6 @@ interface HqSpoolEntryOutcome {
   kind: string;
   spool: string;
   /**
-   * `migrated` belongs to the legacy JSONL journal only: the row was moved
-   * into the current spool without being delivered. The spool pass that runs
-   * after it in the same drain supersedes that line with a real outcome when
-   * it gets to the row; a `migrated` line that survives the run means the row
-   * is still waiting.
-   *
    * `undeliverable` is the one terminal verdict (#445). Every other status
    * describes a moment: HQ was unreachable, HQ refused this content today, the
    * row moved. Retrying is meaningful for all of them. A wrong-origin entry is
@@ -198,13 +190,11 @@ interface HqSpoolEntryOutcome {
    * run. Leaving it spooled asks the operator to retry something that provably
    * cannot succeed, and the count it inflates is the one doctor goes red on.
    */
-  status: "delivered" | "duplicate" | "migrated" | "rejected" | "undeliverable" | "unreachable";
+  status: "delivered" | "duplicate" | "rejected" | "undeliverable" | "unreachable";
 }
 interface HqSpoolFlushInput {
   clientId: string;
   clientSecret: string;
-  /** Repository root whose legacy `.factory-memory` spool is also drained. */
-  cwd: string;
   /** The profile's HQ origin; entries recorded against another are refused. */
   endpoint: string;
   /** Operator-named spool directories; replaces the default two locations. */
@@ -239,13 +229,13 @@ interface HqSpoolFlushSummary {
 interface HqSpoolWorkCount {
   /**
    * The earliest moment learned across pending spool files (their own write
-   * time) and legacy journal rows (their own `failedAt`). Absent only when
+   * time). Absent only when
    * `pending` is `0`, or when every timestamp source was unreadable within
    * budget — an estimate for doctor's remediation message (#394), never a
    * precise audit trail.
    */
   oldestQueuedAt?: string;
-  /** Spooled events and replayable journals waiting in the locations below. */
+  /** Spooled events waiting in the locations below. */
   pending: number;
   /** Locations that exist and hold spooled work. */
   spools: string[];
@@ -266,7 +256,7 @@ interface HqSpoolWorkCount {
  * same locations `flushHqSpool` drains are inspected here, read-only: no
  * directory is created, nothing is secured, and nothing is delivered.
  */
-declare function countHqSpoolWork(input: Pick<HqSpoolFlushInput, "cwd" | "explicitDirectories" | "repository">, dependencies?: {
+declare function countHqSpoolWork(input: Pick<HqSpoolFlushInput, "explicitDirectories" | "repository">, dependencies?: {
   budgetMs?: number;
   env?: NodeJS.ProcessEnv;
 }): Promise<HqSpoolWorkCount>;
@@ -275,7 +265,7 @@ interface HqSpoolOrphan {
   /** The `hq-retry-spool` directory itself, ready to pass to `--dir`. */
   directory: string;
   oldestQueuedAt?: string;
-  /** Spooled events and journal rows waiting there. */
+  /** Spooled events waiting there. */
   pending: number;
   /**
    * The location exists but could not be listed. As everywhere else in this
@@ -753,8 +743,8 @@ declare const mergeFreezeStateSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
   generationId: z.ZodNumber;
   headSha: z.ZodString;
   outcome: z.ZodEnum<{
-    active: "active";
     stale: "stale";
+    active: "active";
   }>;
   reason: z.ZodString;
   recordedAt: z.ZodISODateTime;
@@ -1234,8 +1224,8 @@ declare const managedReadinessLedgerSchema: z.ZodObject<{
       "run-interior-cycle": "run-interior-cycle";
     }>;
     stage: z.ZodEnum<{
-      gate: "gate";
       interior: "interior";
+      gate: "gate";
       "interior-complete": "interior-complete";
     }>;
   }, z.core.$strip>>;
@@ -1251,10 +1241,10 @@ declare const managedReadinessLedgerSchema: z.ZodObject<{
       reviewedHeadSha: z.ZodOptional<z.ZodString>;
       reviewedPatchId: z.ZodOptional<z.ZodString>;
       status: z.ZodEnum<{
-        blocked: "blocked";
         "not-required": "not-required";
-        stale: "stale";
+        blocked: "blocked";
         current: "current";
+        stale: "stale";
         missing: "missing";
       }>;
     }, z.core.$strip>;
@@ -1263,10 +1253,10 @@ declare const managedReadinessLedgerSchema: z.ZodObject<{
       reviewedHeadSha: z.ZodOptional<z.ZodString>;
       reviewedPatchId: z.ZodOptional<z.ZodString>;
       status: z.ZodEnum<{
-        blocked: "blocked";
         "not-required": "not-required";
-        stale: "stale";
+        blocked: "blocked";
         current: "current";
+        stale: "stale";
         missing: "missing";
       }>;
     }, z.core.$strip>>;
@@ -1277,8 +1267,8 @@ declare const managedReadinessLedgerSchema: z.ZodObject<{
     docsOnlyDeltaAccepted: z.ZodOptional<z.ZodBoolean>;
     docsOnlyVerifiedHeadSha: z.ZodOptional<z.ZodString>;
     prVerify: z.ZodEnum<{
-      stale: "stale";
       passed: "passed";
+      stale: "stale";
       missing: "missing";
     }>;
     trivialDeltaAccepted: z.ZodOptional<z.ZodBoolean>;
@@ -1778,10 +1768,10 @@ declare const loadEvidenceEnvelopes: (cwd: string) => LoadedEvidenceEnvelope[];
 //#region src/review-proof-applicability.d.ts
 declare const REVIEW_STATUS_VALUES: readonly ["not-required", "current", "stale", "missing", "blocked"];
 declare const reviewStatusSchema: z.ZodEnum<{
-  blocked: "blocked";
   "not-required": "not-required";
-  stale: "stale";
+  blocked: "blocked";
   current: "current";
+  stale: "stale";
   missing: "missing";
 }>;
 type ReviewStatus = z.infer<typeof reviewStatusSchema>;
@@ -2187,9 +2177,9 @@ declare const retroEnvelopeV1Schema: z.ZodObject<{
   kind: z.ZodLiteral<"retro-envelope">;
   outcome: z.ZodOptional<z.ZodObject<{
     status: z.ZodEnum<{
-      blocked: "blocked";
       success: "success";
       fail: "fail";
+      blocked: "blocked";
       "ship-with-followups": "ship-with-followups";
     }>;
     verdict: z.ZodOptional<z.ZodString>;
@@ -2949,8 +2939,8 @@ declare const FACTORY_TRACE_EVENT_DEFINITIONS: readonly [DefinedTraceEvent<"revi
     sessionId: z.ZodOptional<z.ZodString>;
   }, z.core.$strict>>;
   stage: z.ZodEnum<{
-    gate: "gate";
     interior: "interior";
+    gate: "gate";
   }>;
   usage: z.ZodOptional<z.ZodObject<{
     estimatedCostUsd: z.ZodOptional<z.ZodNumber>;
@@ -3002,8 +2992,8 @@ declare const FACTORY_TRACE_EVENT_DEFINITIONS: readonly [DefinedTraceEvent<"revi
     sessionId: z.ZodOptional<z.ZodString>;
   }, z.core.$strict>>;
   stage: z.ZodEnum<{
-    gate: "gate";
     interior: "interior";
+    gate: "gate";
   }>;
   usage: z.ZodOptional<z.ZodObject<{
     estimatedCostUsd: z.ZodOptional<z.ZodNumber>;
@@ -3046,8 +3036,8 @@ declare const FACTORY_TRACE_EVENT_DEFINITIONS: readonly [DefinedTraceEvent<"revi
       sessionId: z.ZodOptional<z.ZodString>;
     }, z.core.$strict>>;
     stage: z.ZodEnum<{
-      gate: "gate";
       interior: "interior";
+      gate: "gate";
     }>;
     usage: z.ZodOptional<z.ZodObject<{
       estimatedCostUsd: z.ZodOptional<z.ZodNumber>;
@@ -3077,7 +3067,7 @@ declare const FACTORY_TRACE_EVENT_DEFINITIONS: readonly [DefinedTraceEvent<"revi
     staleRepeats: number;
   };
   observedAt: string;
-  stage: "gate" | "interior";
+  stage: "interior" | "gate";
   issue?: number | undefined;
   pr?: number | undefined;
   threadId?: string | undefined;
@@ -3333,8 +3323,8 @@ declare const FACTORY_TRACE_EVENT_DEFINITIONS: readonly [DefinedTraceEvent<"revi
   interiorCycle: z.ZodOptional<z.ZodNumber>;
   observedAt: z.ZodString;
   purpose: z.ZodEnum<{
-    review: "review";
     code: "code";
+    review: "review";
   }>;
   slotResolution: z.ZodObject<{
     effort: z.ZodEnum<{
@@ -3412,8 +3402,8 @@ declare const FACTORY_TRACE_EVENT_DEFINITIONS: readonly [DefinedTraceEvent<"revi
   interiorCycle: z.ZodOptional<z.ZodNumber>;
   observedAt: z.ZodString;
   purpose: z.ZodEnum<{
-    review: "review";
     code: "code";
+    review: "review";
   }>;
   slotResolution: z.ZodObject<{
     effort: z.ZodEnum<{
@@ -3482,8 +3472,8 @@ declare const FACTORY_TRACE_EVENT_DEFINITIONS: readonly [DefinedTraceEvent<"revi
     interiorCycle: z.ZodOptional<z.ZodNumber>;
     observedAt: z.ZodString;
     purpose: z.ZodEnum<{
-      review: "review";
       code: "code";
+      review: "review";
     }>;
     slotResolution: z.ZodObject<{
       effort: z.ZodEnum<{
@@ -3555,7 +3545,7 @@ declare const FACTORY_TRACE_EVENT_DEFINITIONS: readonly [DefinedTraceEvent<"revi
   exitCode: number | null;
   harness: string;
   observedAt: string;
-  purpose: "review" | "code";
+  purpose: "code" | "review";
   slotResolution: {
     effort: "high" | "low" | "medium" | "xhigh";
     engine: string;
@@ -4076,13 +4066,13 @@ declare const evaluateReadiness: (input: EvaluationInput) => {
     reviews: {
       correctness: {
         required: boolean;
-        status: "blocked" | "not-required" | "stale" | "current" | "missing";
+        status: "not-required" | "blocked" | "current" | "stale" | "missing";
         reviewedHeadSha?: string | undefined;
         reviewedPatchId?: string | undefined;
       };
       security?: {
         required: boolean;
-        status: "blocked" | "not-required" | "stale" | "current" | "missing";
+        status: "not-required" | "blocked" | "current" | "stale" | "missing";
         reviewedHeadSha?: string | undefined;
         reviewedPatchId?: string | undefined;
       } | undefined;
@@ -4090,7 +4080,7 @@ declare const evaluateReadiness: (input: EvaluationInput) => {
     schemaVersion: 1;
     verification: {
       command: "patronage-factory pr:verify";
-      prVerify: "stale" | "passed" | "missing";
+      prVerify: "passed" | "stale" | "missing";
       docsOnlyDeltaAccepted?: boolean | undefined;
       docsOnlyVerifiedHeadSha?: string | undefined;
       trivialDeltaAccepted?: boolean | undefined;
@@ -4133,7 +4123,7 @@ declare const evaluateReadiness: (input: EvaluationInput) => {
         interior: number;
       };
       nextAction: "run-gate-cycle" | "accept-nonblocking-findings" | "escalate-to-triage" | "ready-for-human" | "advance-to-gate" | "run-interior-cycle";
-      stage: "gate" | "interior" | "interior-complete";
+      stage: "interior" | "gate" | "interior-complete";
       forcedTransition?: "gate-cap-exhausted" | "interior-cap-reached" | undefined;
     } | undefined;
     reviewRuns?: PrReviewResult[] | undefined;

package/dist/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { t as __exportAll } from "./chunk-pbuEa-1d.js";
-import { appendFileSync, constants, cpSync, createReadStream, existsSync, mkdirSync, mkdtempSync, readFileSync, readdirSync, realpathSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";
+import { appendFileSync, constants, cpSync, existsSync, mkdirSync, mkdtempSync, readFileSync, readdirSync, realpathSync, renameSync, rmSync, statSync, writeFileSync } from "node:fs";
 import { pathToFileURL } from "node:url";
 import { Command, InvalidArgumentError } from "commander";
 import path from "node:path";
@@ -9,7 +9,6 @@ import { z } from "zod";
 import { execFileSync, spawnSync } from "node:child_process";
 import { link, lstat, mkdir, open, readFile, readdir, realpath, rename, stat, unlink } from "node:fs/promises";
 import os, { homedir } from "node:os";
-import { createInterface } from "node:readline";
 import { setImmediate } from "node:timers";
 import { setImmediate as setImmediate$1, setTimeout as setTimeout$1 } from "node:timers/promises";
 import { Worker } from "node:worker_threads";
@@ -18,7 +17,7 @@ import { parse } from "yaml";
 import { promisify } from "node:util";
 import { GitHubApiError, mintInstallationToken } from "@patronage/factory-ci";
 //#region package.json
-var version = "1.0.0-alpha.5";
+var version = "1.0.0-alpha.6";
 //#endregion
 //#region src/review-rungs.ts
 const EVIDENCE_REVIEW_RUNGS$1 = [
@@ -1348,7 +1347,6 @@ function formatUserConfigError(configPath, error) {
 }
 const DEFAULT_HQ_TRANSPORT_TIMEOUT_MS = 2500;
 const HQ_RETRY_SPOOL_DIRNAME = "hq-retry-spool";
-const HQ_RETRY_JOURNAL_BASENAME = "hq-retry-journal.jsonl";
 /**
 * Appended to a spooled event that can never be delivered (#445).
 *
@@ -1389,9 +1387,6 @@ const SPOOL_REPOSITORY_MARKER = ".repository-identity";
 * and the extra level is slack for a key scheme that nests one deeper.
 */
 const HQ_SPOOL_SWEEP_MAX_DEPTH = 4;
-`${HQ_RETRY_JOURNAL_BASENAME}`;
-`${HQ_RETRY_SPOOL_DIRNAME}`;
-const LEGACY_FACTORY_MEMORY_DIRNAME = ".factory-memory";
 const HQ_SPOOL_STATE_SEGMENTS = ["patronage-factory", "hq-spool"];
 const MAX_HQ_CONFIG_BYTES = 1024 * 1024;
 const MAX_HQ_INGEST_PAYLOAD_BYTES = 256 * 1024;
@@ -1503,12 +1498,6 @@ const repositorySpoolLayout = (repository, env = process.env) => ({
 		HQ_RETRY_SPOOL_DIRNAME
 	]
 });
-/** Read-only drain source for spools written before the relocation. */
-const legacySpoolLayout = (cwd) => ({
-	create: false,
-	root: cwd,
-	segments: [LEGACY_FACTORY_MEMORY_DIRNAME, HQ_RETRY_SPOOL_DIRNAME]
-});
 /**
 * An operator-named directory (`hq:flush --dir`). Accepts either the spool
 * itself or the directory holding it, so a `.factory-memory` path and a
@@ -1580,30 +1569,10 @@ const secureSpoolLayout = async (layout, deadline) => {
 	const memoryIdentity = identities.at(-2);
 	if (spool === void 0 || memory === void 0 || spoolIdentity === void 0 || memoryIdentity === void 0 || !await directoryIdentityMatches(memory, memoryIdentity, deadline) || !await directoryIdentityMatches(spool, spoolIdentity, deadline)) return;
 	return {
-		memory,
-		memoryIdentity,
 		spool,
 		spoolIdentity
 	};
 };
-/**
-* The legacy JSONL journal lives one level above the spool. Securing it on its
-* own lets a pre-spool `.factory-memory` (journal but no spool directory)
-* drain without the read path creating anything inside the worktree.
-*/
-const secureJournalDirectory = async (layout, deadline) => {
-	const segments = layout.segments.slice(0, -1);
-	if (segments.length === 0) return;
-	const chain = await secureChain(layout, segments, deadline);
-	if (chain === void 0) return;
-	const directory = chain.directories.at(-1);
-	const identity = chain.identities.at(-1);
-	if (directory === void 0 || identity === void 0 || !await directoryIdentityMatches(directory, identity, deadline)) return;
-	return {
-		directory,
-		identity
-	};
-};
 const readDirectoryIdentity = async (directory, deadline) => {
 	const opened = await openWithin(directory, constants.O_RDONLY + constants.O_DIRECTORY + constants.O_NOFOLLOW, remainingMs(deadline));
 	if (opened.status !== "fulfilled") return;
@@ -2333,225 +2302,6 @@ const replayCloseoutSpool = async (layout, endpoint, clientId, clientSecret, req
 		if (!await mutateBoundDirectory(spool, spoolIdentity, performance.now() + flushBudgetMs, () => outcome.ok ? unlink(claimPath) : rename(claimPath, eventPath))) return;
 	}
 };
-const writeLegacyCursor = async (directory, directoryIdentity, cursorPath, offset, deadline) => {
-	if (path.dirname(cursorPath) !== directory || !await directoryIdentityMatches(directory, directoryIdentity, deadline)) return false;
-	const temporary = `${cursorPath}.${randomUUID()}.tmp`;
-	const opened = await openWithin(temporary, constants.O_CREAT + constants.O_EXCL + constants.O_WRONLY + constants.O_NOFOLLOW, remainingMs(deadline), 384);
-	if (opened.status !== "fulfilled") return false;
-	const wrote = await settleWithin((async () => {
-		await opened.value.writeFile(String(offset), "utf-8");
-		await opened.value.sync();
-	})(), remainingMs(deadline));
-	const closed = await settleWithin(opened.value.close(), remainingMs(deadline));
-	if (wrote.status !== "fulfilled" || closed.status !== "fulfilled") {
-		await mutateBoundDirectory(directory, directoryIdentity, deadline, async () => unlink(temporary));
-		return false;
-	}
-	if (!await mutateBoundDirectory(directory, directoryIdentity, deadline, async () => rename(temporary, cursorPath))) {
-		await mutateBoundDirectory(directory, directoryIdentity, deadline, async () => unlink(temporary));
-		return false;
-	}
-	return await syncBoundDirectory(directory, directoryIdentity, deadline);
-};
-const readLegacyCursor = async (cursorPath, deadline) => {
-	const file = await readBoundedTextFileNoFollow(cursorPath, deadline, 128);
-	if (file === void 0) return 0;
-	const offset = Number(file.contents);
-	return Number.isSafeInteger(offset) && offset >= 0 ? offset : 0;
-};
-const claimLegacySource = async (sourcePath, target, directory, directoryIdentity, deadline) => {
-	if (path.dirname(sourcePath) !== directory || !await directoryIdentityMatches(directory, directoryIdentity, deadline)) return;
-	const metadata = await settleWithin(lstat(sourcePath), remainingMs(deadline));
-	if (metadata.status !== "fulfilled" || !metadata.value.isFile() || metadata.value.isSymbolicLink()) return;
-	const claimPath = `${target}.legacy-claim-${randomUUID()}`;
-	if (!await mutateBoundDirectory(directory, directoryIdentity, deadline, async () => rename(sourcePath, claimPath))) return;
-	return claimPath;
-};
-const releaseLegacyClaim = async (claimPath, target, directory, directoryIdentity, deadline) => {
-	if (path.dirname(claimPath) !== directory) return false;
-	const readyPath = `${target}.legacy-ready-${randomUUID()}`;
-	return mutateBoundDirectory(directory, directoryIdentity, deadline, async () => rename(claimPath, readyPath));
-};
-async function replayRetryJournal(layout, writeLayout, endpoint, clientId, clientSecret, request, dependencies, transportBudgetMs, setupDeadline, replayDeadline, options = {}) {
-	const maxEntries = options.maxEntries ?? MAX_HQ_REPLAY_ENTRIES;
-	const { report } = options;
-	const secured = await settleWithin(secureJournalDirectory(layout, setupDeadline), remainingMs(setupDeadline));
-	if (secured.status !== "fulfilled" || secured.value === void 0) return;
-	const { directory, identity: directoryIdentity } = secured.value;
-	const target = path.join(directory, HQ_RETRY_JOURNAL_BASENAME);
-	const baseName = path.basename(target);
-	const listing = await settleWithin(readdir(directory), remainingMs(setupDeadline));
-	if (listing.status !== "fulfilled") return;
-	let delivered = 0;
-	let corruptDropped = 0;
-	const sources = listing.value.filter((name) => name === baseName || name.startsWith(`${baseName}.legacy-ready-`) || name.startsWith(`${baseName}.draining-`) || name.startsWith(`${baseName}.legacy-claim-`)).filter((name) => !name.includes(".cursor")).toSorted();
-	for (const name of sources) {
-		if (delivered >= maxEntries || remainingMs(replayDeadline) <= 0) break;
-		const sourcePath = path.join(directory, name);
-		if (name.startsWith(`${baseName}.draining-`) || name.startsWith(`${baseName}.legacy-claim-`)) {
-			const metadata = await settleWithin(lstat(sourcePath), remainingMs(setupDeadline));
-			if (metadata.status !== "fulfilled" || !metadata.value.isFile() || metadata.value.isSymbolicLink() || Date.now() - Math.max(metadata.value.mtimeMs, metadata.value.ctimeMs) < STALE_SPOOL_ARTIFACT_MS) continue;
-		}
-		const claimPath = await claimLegacySource(sourcePath, target, directory, directoryIdentity, setupDeadline);
-		if (claimPath === void 0) continue;
-		const opened = await openWithin(claimPath, constants.O_RDONLY + constants.O_NOFOLLOW, remainingMs(setupDeadline));
-		if (opened.status !== "fulfilled") {
-			await releaseLegacyClaim(claimPath, target, directory, directoryIdentity, setupDeadline);
-			continue;
-		}
-		const sourceMetadata = await settleWithin(opened.value.stat(), remainingMs(setupDeadline));
-		if (sourceMetadata.status !== "fulfilled" || !sourceMetadata.value.isFile()) {
-			await settleWithin(opened.value.close(), remainingMs(setupDeadline));
-			await releaseLegacyClaim(claimPath, target, directory, directoryIdentity, setupDeadline);
-			continue;
-		}
-		const cursorPath = `${target}.legacy-cursor-${String(sourceMetadata.value.dev)}-${String(sourceMetadata.value.ino)}`;
-		let offset = await readLegacyCursor(cursorPath, setupDeadline);
-		if (offset >= sourceMetadata.value.size) {
-			await settleWithin(opened.value.close(), remainingMs(setupDeadline));
-			const current = await settleWithin(lstat(claimPath), remainingMs(setupDeadline));
-			if (current.status === "fulfilled" && current.value.isFile() && !current.value.isSymbolicLink() && current.value.dev === sourceMetadata.value.dev && current.value.ino === sourceMetadata.value.ino && current.value.size === sourceMetadata.value.size) {
-				await mutateBoundDirectory(directory, directoryIdentity, setupDeadline, async () => unlink(claimPath));
-				await mutateBoundDirectory(directory, directoryIdentity, setupDeadline, async () => unlink(cursorPath));
-			}
-			continue;
-		}
-		const abort = new AbortController();
-		const streamBudget = Math.min(remainingMs(setupDeadline), remainingMs(replayDeadline));
-		const abortTimer = setTimeout(() => abort.abort(), Math.max(0, streamBudget));
-		abortTimer.unref();
-		const stream = createReadStream(claimPath, {
-			autoClose: false,
-			encoding: "utf-8",
-			fd: opened.value.fd,
-			signal: abort.signal,
-			start: offset
-		});
-		const lines = createInterface({
-			crlfDelay: Infinity,
-			input: stream
-		});
-		let reachedEof = true;
-		try {
-			for await (const line of lines) {
-				if (delivered >= maxEntries || remainingMs(replayDeadline) <= 0 || remainingMs(setupDeadline) <= 0) {
-					reachedEof = false;
-					break;
-				}
-				const nextOffset = Math.min(sourceMetadata.value.size, offset + Buffer.byteLength(line, "utf-8") + 1);
-				if (line.trim().length === 0) {
-					offset = nextOffset;
-					if (!await writeLegacyCursor(directory, directoryIdentity, cursorPath, offset, setupDeadline)) {
-						reachedEof = false;
-						break;
-					}
-					continue;
-				}
-				let parsed;
-				try {
-					parsed = JSON.parse(line);
-				} catch {
-					corruptDropped += 1;
-					offset = nextOffset;
-					if (!await writeLegacyCursor(directory, directoryIdentity, cursorPath, offset, setupDeadline)) {
-						reachedEof = false;
-						break;
-					}
-					continue;
-				}
-				if (!isReplayableEntry(parsed)) {
-					offset = nextOffset;
-					if (!await writeLegacyCursor(directory, directoryIdentity, cursorPath, offset, setupDeadline)) {
-						reachedEof = false;
-						break;
-					}
-					continue;
-				}
-				const entryEndpoint = validatedEndpoint(parsed.endpoint);
-				let handled = false;
-				const row = {
-					eventId: parsed.event.eventId,
-					kind: parsed.event.kind
-				};
-				let rowOutcome = {
-					detail: `recorded endpoint ${entryEndpoint?.origin ?? "(unusable)"} is not this repository's authorized HQ origin ${endpoint.origin}`,
-					...row,
-					spool: directory,
-					status: "migrated"
-				};
-				if (entryEndpoint?.origin === endpoint.origin) {
-					rowOutcome = {
-						...rowOutcome,
-						detail: "event could not be serialized for delivery"
-					};
-					let body;
-					try {
-						body = JSON.stringify(parsed.event);
-					} catch {
-						body = void 0;
-					}
-					if (body !== void 0) {
-						const outcome = await attemptTransport(request, endpoint, clientId, clientSecret, body, Math.min(transportBudgetMs, remainingMs(replayDeadline)), report !== void 0);
-						handled = outcome.ok;
-						if (handled) delivered += 1;
-						rowOutcome = outcome.ok ? {
-							...row,
-							spool: directory,
-							status: outcome.duplicate === true ? "duplicate" : "delivered"
-						} : {
-							...row,
-							detail: outcome.detail === void 0 ? outcome.reason : `${outcome.reason}: ${outcome.detail}`,
-							spool: directory,
-							status: drainFailureStatus(outcome.reason)
-						};
-					}
-				}
-				if (!handled) {
-					const retained = await appendCloseoutSpool(writeLayout, parsed, performance.now() + journalFlushBudgetFor(dependencies));
-					if (retained === void 0) options.onMigrate?.();
-					if (retained !== void 0) {
-						report?.({
-							...rowOutcome,
-							detail: `${rowOutcome.detail ?? rowOutcome.status}; migration into the current spool ${retained}`,
-							status: "unreachable"
-						});
-						reachedEof = false;
-						break;
-					}
-				}
-				report?.(rowOutcome);
-				offset = nextOffset;
-				if (!await writeLegacyCursor(directory, directoryIdentity, cursorPath, offset, setupDeadline)) {
-					reachedEof = false;
-					break;
-				}
-			}
-		} catch {
-			reachedEof = false;
-		} finally {
-			clearTimeout(abortTimer);
-			abort.abort();
-			lines.close();
-			stream.destroy();
-			await settleWithin(opened.value.close(), remainingMs(setupDeadline));
-		}
-		if (reachedEof && offset >= sourceMetadata.value.size) {
-			const current = await settleWithin(lstat(claimPath), remainingMs(setupDeadline));
-			if (current.status === "fulfilled" && current.value.isFile() && !current.value.isSymbolicLink() && current.value.dev === sourceMetadata.value.dev && current.value.ino === sourceMetadata.value.ino && current.value.size === sourceMetadata.value.size && await directoryIdentityMatches(directory, directoryIdentity, setupDeadline)) {
-				await mutateBoundDirectory(directory, directoryIdentity, setupDeadline, async () => unlink(claimPath));
-				await mutateBoundDirectory(directory, directoryIdentity, setupDeadline, async () => unlink(cursorPath));
-			}
-		} else await releaseLegacyClaim(claimPath, target, directory, directoryIdentity, setupDeadline);
-	}
-	await reportReplayOutcome(dependencies, delivered, corruptDropped);
-}
-async function reportReplayOutcome(dependencies, delivered, corruptDropped) {
-	if (delivered <= 0 && corruptDropped <= 0) return;
-	const parts = [];
-	if (delivered > 0) parts.push(`${delivered} queued event(s) delivered from the retry journal`);
-	if (corruptDropped > 0) parts.push(`${corruptDropped} unparseable journal line(s) dropped (partial write recovered, #120)`);
-	await reportDiagnostic(dependencies, performance.now() + journalFlushBudgetFor(dependencies), parts.join("; "), delivered > 0 ? "HQ ingest confirmed" : "HQ ingest recovered");
-}
 async function deliverHqIngest(input, dependencies, setupDeadline, timeoutMs, transportBudgetMs) {
 	let config;
 	try {
@@ -2595,7 +2345,6 @@ async function deliverHqIngest(input, dependencies, setupDeadline, timeoutMs, tr
 		owner: input.profile.repository.owner,
 		repo: input.profile.repository.name
 	}, env);
-	const readLayouts = [writeLayout, legacySpoolLayout(input.cwd)];
 	const now = dependencies.now ?? (() => /* @__PURE__ */ new Date());
 	const makeEventId = dependencies.randomUUID ?? randomUUID;
 	let event;
@@ -2666,10 +2415,7 @@ async function deliverHqIngest(input, dependencies, setupDeadline, timeoutMs, tr
 			throw new Error(reason);
 		}
 		const replayDeadline = performance.now() + timeoutMs;
-		for (const readLayout of readLayouts) {
-			await replayCloseoutSpool(readLayout, endpoint, clientId, clientSecret, request, transportBudgetMs, replayDeadline, replayDeadline, journalFlushBudgetFor(dependencies), persistedEventPath);
-			await replayRetryJournal(readLayout, writeLayout, endpoint, clientId, clientSecret, request, dependencies, transportBudgetMs, replayDeadline, replayDeadline);
-		}
+		await replayCloseoutSpool(writeLayout, endpoint, clientId, clientSecret, request, transportBudgetMs, replayDeadline, replayDeadline, journalFlushBudgetFor(dependencies), persistedEventPath);
 		const outcome = await attemptTransport(request, endpoint, clientId, clientSecret, body, transportBudgetMs);
 		if (!outcome.ok) {
 			({reason, unconfirmed} = outcome);
@@ -2748,20 +2494,7 @@ async function awaitPendingHqIngest() {
 const DEFAULT_HQ_FLUSH_BUDGET_MS = 600 * 1e3;
 /** ENOENT is the only filesystem answer that means "this location is absent". */
 const isMissingEntryError = (error) => typeof error === "object" && error !== null && error.code === "ENOENT";
-const journalRowCount = (contents) => contents.split("\n").filter((line) => line.trim() !== "").length;
-const journalLineTimestamps = (contents) => {
-	const timestamps = [];
-	for (const line of contents.split("\n")) {
-		const trimmed = line.trim();
-		if (trimmed === "") continue;
-		try {
-			const parsed = JSON.parse(trimmed);
-			if (typeof parsed.failedAt === "string") timestamps.push(parsed.failedAt);
-		} catch {}
-	}
-	return timestamps;
-};
-const countRemainingSpoolWork = async (spools, drainLayouts, deadline) => {
+const countRemainingSpoolWork = async (spools, deadline) => {
 	let remaining = 0;
 	let unlistableScans = 0;
 	let oldestMs;
@@ -2790,27 +2523,6 @@ const countRemainingSpoolWork = async (spools, drainLayouts, deadline) => {
 			if (probed.status === "fulfilled") noteTimestamp(probed.value.mtime.toISOString());
 		}
 	}
-	for (const layout of drainLayouts) {
-		const journalDir = path.dirname(layoutPath(layout));
-		const journalListing = await settleWithin(readdir(journalDir), remainingMs(deadline));
-		if (journalListing.status !== "fulfilled") {
-			await countUnlistable(journalDir);
-			continue;
-		}
-		const journalNames = journalListing.value.filter((name) => name === "hq-retry-journal.jsonl" || name.startsWith(`hq-retry-journal.jsonl.legacy-ready-`) || name.startsWith(`hq-retry-journal.jsonl.legacy-claim-`) || name.startsWith(`hq-retry-journal.jsonl.draining-`));
-		for (const name of journalNames) {
-			const journalFilePath = path.join(journalDir, name);
-			const read = await settleWithin(readFile(journalFilePath, "utf-8"), remainingMs(deadline));
-			if (read.status === "fulfilled") {
-				remaining += journalRowCount(read.value);
-				for (const timestamp of journalLineTimestamps(read.value)) noteTimestamp(timestamp);
-				continue;
-			}
-			remaining += 1;
-			const probed = await settleWithin(lstat(journalFilePath), remainingMs(deadline));
-			if (probed.status === "fulfilled") noteTimestamp(probed.value.mtime.toISOString());
-		}
-	}
 	return {
 		...oldestMs === void 0 ? {} : { oldestQueuedAt: new Date(oldestMs).toISOString() },
 		remaining,
@@ -2831,10 +2543,10 @@ const DEFAULT_HQ_SPOOL_INSPECT_BUDGET_MS = 5e3;
 */
 async function countHqSpoolWork(input, dependencies = {}) {
 	const env = dependencies.env ?? process.env;
-	const layouts = input.explicitDirectories && input.explicitDirectories.length > 0 ? input.explicitDirectories.map(explicitSpoolLayout) : [repositorySpoolLayout(input.repository, env), legacySpoolLayout(input.cwd)];
+	const layouts = input.explicitDirectories && input.explicitDirectories.length > 0 ? input.explicitDirectories.map(explicitSpoolLayout) : [repositorySpoolLayout(input.repository, env)];
 	const deadline = performance.now() + (dependencies.budgetMs ?? DEFAULT_HQ_SPOOL_INSPECT_BUDGET_MS);
 	const paths = layouts.map((layout) => layoutPath(layout));
-	const { oldestQueuedAt, remaining, unlistableScans } = await countRemainingSpoolWork(paths, layouts, deadline);
+	const { oldestQueuedAt, remaining, unlistableScans } = await countRemainingSpoolWork(paths, deadline);
 	const existing = await Promise.all(paths.map(async (spool) => {
 		return (await settleWithin(lstat(spool), remainingMs(deadline))).status === "fulfilled" ? spool : void 0;
 	}));
@@ -3002,7 +2714,7 @@ async function sweepHqSpoolOrphans(input, dependencies = {}) {
 			});
 			continue;
 		}
-		const counted = await countRemainingSpoolWork([spool], [explicitSpoolLayout(spool)], deadline);
+		const counted = await countRemainingSpoolWork([spool], deadline);
 		if (counted.remaining === 0 && counted.unlistableScans === 0) continue;
 		orphans.push({
 			directory: spool,
@@ -3022,7 +2734,7 @@ async function sweepHqSpoolOrphans(input, dependencies = {}) {
 			});
 			continue;
 		}
-		const counted = await countRemainingSpoolWork([spool], [explicitSpoolLayout(spool)], deadline);
+		const counted = await countRemainingSpoolWork([spool], deadline);
 		if (counted.remaining === 0 && counted.unlistableScans === 0) continue;
 		orphans.push({
 			directory: spool,
@@ -3042,8 +2754,8 @@ async function sweepHqSpoolOrphans(input, dependencies = {}) {
 * This is the deliberate counterpart to the sink's advisory emit path: the
 * caller has already resolved credentials explicitly, so there is no cap, no
 * daemon, and no background retry — one pass, bounded, over the repo-keyed
-* location plus the legacy cwd location (or the operator's `--dir`). Delivery
-* itself is the sink's own replay, so there is exactly one POST path.
+* location (or the operator's `--dir`). Delivery itself is the sink's own
+* replay, so there is exactly one POST path.
 */
 async function flushHqSpool(input, dependencies = {}) {
 	const endpoint = validatedIngestEndpoint(input.endpoint);
@@ -3056,8 +2768,7 @@ async function flushHqSpool(input, dependencies = {}) {
 		journalFlushBudgetMs: dependencies.journalFlushBudgetMs
 	});
 	const deadline = performance.now() + (dependencies.budgetMs ?? DEFAULT_HQ_FLUSH_BUDGET_MS);
-	const writeLayout = repositorySpoolLayout(input.repository, env);
-	const layouts = input.explicitDirectories && input.explicitDirectories.length > 0 ? input.explicitDirectories.map(explicitSpoolLayout) : [writeLayout, legacySpoolLayout(input.cwd)];
+	const layouts = input.explicitDirectories && input.explicitDirectories.length > 0 ? input.explicitDirectories.map(explicitSpoolLayout) : [repositorySpoolLayout(input.repository, env)];
 	const outcomeById = /* @__PURE__ */ new Map();
 	let rejectedFiles = 0;
 	let unreachableFiles = 0;
@@ -3066,31 +2777,13 @@ async function flushHqSpool(input, dependencies = {}) {
 		outcomeById.set(outcome.eventId, outcome);
 		dependencies.report?.(outcome);
 	};
-	const journalReport = (outcome) => {
-		if (outcome.status === "unreachable" && outcome.detail?.includes("migration into the current spool")) unreachableFiles += 1;
-		record(outcome);
-	};
 	const spoolReport = (outcome) => {
 		if (outcome.status === "rejected") rejectedFiles += 1;
 		if (outcome.status === "unreachable") unreachableFiles += 1;
 		record(outcome);
 	};
 	const spools = [];
-	let migratedIntoWriteLayout = false;
-	const journalDrainOptions = {
-		maxEntries: Number.POSITIVE_INFINITY,
-		onMigrate: () => {
-			migratedIntoWriteLayout = true;
-		},
-		report: journalReport
-	};
-	for (const layout of layouts) await replayRetryJournal(layout, writeLayout, endpoint, input.clientId, input.clientSecret, request, {
-		env,
-		fetch: request,
-		journalFlushBudgetMs: flushBudgetMs
-	}, transportBudgetMs, deadline, deadline, journalDrainOptions);
-	const drainLayouts = migratedIntoWriteLayout && !layouts.some((layout) => layoutPath(layout) === layoutPath(writeLayout)) ? [...layouts, writeLayout] : layouts;
-	for (const layout of drainLayouts) {
+	for (const layout of layouts) {
 		await replayCloseoutSpool(layout, endpoint, input.clientId, input.clientSecret, request, transportBudgetMs, deadline, deadline, flushBudgetMs, void 0, {
 			maxEntries: Number.POSITIVE_INFINITY,
 			report: spoolReport
@@ -3100,7 +2793,7 @@ async function flushHqSpool(input, dependencies = {}) {
 			if ((await settleWithin(lstat(layoutPath(layout)), remainingMs(deadline))).status === "fulfilled") unsecurableSpools += 1;
 		} else spools.push(secured.spool);
 	}
-	const { remaining, unlistableScans } = await countRemainingSpoolWork(spools, drainLayouts, deadline);
+	const { remaining, unlistableScans } = await countRemainingSpoolWork(spools, deadline);
 	const outcomes = [...outcomeById.values()];
 	const count = (status) => outcomes.filter((outcome) => outcome.status === status).length;
 	const rejected = count("rejected");
@@ -12128,10 +11821,10 @@ const describeOrphans = (orphans) => {
 	return ` ${orphans.length} spool location(s) hold this repository's evidence under an earlier key it no longer resolves to — a key-format change strands evidence there where no drain looks: ${described}. Drain each with \`psf hq:flush --dir <path>\`.`;
 };
 /**
-* Red when HQ evidence is waiting for this repository: its own spool or legacy
-* journal, or a sibling location written under an earlier key of its own that
-* it no longer resolves to (#420). Another repository's spool under the shared
-* root is that repository's business, never this check's (#446).
+* Red when HQ evidence is waiting for this repository: its own spool or a
+* sibling location written under an earlier key of its own that it no longer
+* resolves to (#420). Another repository's spool under the shared root is that
+* repository's business, never this check's (#446).
 *
 * Reuses `countHqSpoolWork` (#414) — the same read-only, credential-free
 * inspection `hq:flush` itself consults before ever resolving a secret — so
@@ -12147,13 +11840,10 @@ const describeOrphans = (orphans) => {
 async function hqSpoolDoctorCheck(input, dependencies = {}) {
 	const countSpool = dependencies.countSpool ?? countHqSpoolWork;
 	const sweepOrphans = dependencies.sweepOrphans ?? sweepHqSpoolOrphans;
-	const [counted, swept] = await Promise.all([countSpool({
-		cwd: input.cwd,
-		repository: input.repository
-	}, { env: input.env }), sweepOrphans({ repository: input.repository }, { env: input.env })]);
+	const [counted, swept] = await Promise.all([countSpool({ repository: input.repository }, { env: input.env }), sweepOrphans({ repository: input.repository }, { env: input.env })]);
 	const orphanNote = swept.orphans.length === 0 ? "" : describeOrphans(swept.orphans);
 	if (counted.pending === 0 && counted.unlistable === 0 && swept.orphans.length === 0) return {
-		message: "HQ spool and journal are empty; no evidence is waiting to be drained.",
+		message: "HQ spool is empty; no evidence is waiting to be drained.",
 		name: HQ_SPOOL_CHECK_NAME,
 		status: "ok"
 	};
@@ -12357,7 +12047,6 @@ async function doctorProjectProfile(input = {}) {
 	const cwd = input.cwd ?? process.cwd();
 	const userConfig = resolveDoctorUserConfig(env, input.userConfig);
 	const [hqSpoolCheck, hqRetroReadbackCheck] = await Promise.all([hqSpoolDoctorCheck({
-		cwd,
 		env,
 		repository: {
 			owner: profile.repository.owner,
@@ -13035,7 +12724,6 @@ async function runHqFlush(args, dependencies = {}) {
 	};
 	const explicitDirectories = args.dir && args.dir.length > 0 ? { explicitDirectories: args.dir } : {};
 	const pending = await (dependencies.countSpool ?? countHqSpoolWork)({
-		cwd: args.cwd,
 		...explicitDirectories,
 		repository
 	}, { env });
@@ -13080,7 +12768,6 @@ async function runHqFlush(args, dependencies = {}) {
 		...await (dependencies.flush ?? flushHqSpool)({
 			clientId: resolution.credentials.clientId,
 			clientSecret: resolution.credentials.clientSecret,
-			cwd: args.cwd,
 			endpoint: profile.hq.endpoint,
 			...explicitDirectories,
 			repository
@@ -13107,7 +12794,7 @@ function renderHqFlush(result) {
 		`hq:flush ${result.endpoint}`,
 		...result.spools.length === 0 ? ["no spool directory found"] : result.spools.map((spool) => `spool: ${spool}`),
 		...result.outcomes.map(outcomeLine),
-		`delivered ${result.delivered}, duplicate ${result.duplicate}, rejected ${result.rejected}, undeliverable ${result.undeliverable}, unreachable ${result.unreachable}, migrated ${result.outcomes.filter((outcome) => outcome.status === "migrated").length}`,
+		`delivered ${result.delivered}, duplicate ${result.duplicate}, rejected ${result.rejected}, undeliverable ${result.undeliverable}, unreachable ${result.unreachable}`,
 		...result.undeliverable > 0 ? [`${result.undeliverable} event(s) can never be delivered and were dispositioned in place, renamed with \`.undeliverable\` and left readable; they no longer count as work waiting.`] : [],
 		result.incomplete ? `INCOMPLETE: ${result.remaining} event(s) still spooled; the drain did not finish. Run hq:flush again.` : `spool drained: ${result.remaining} event(s) remain (rejections stay until HQ accepts them)`,
 		...orphanLines(result.orphans)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@patronage/software-factory",
-  "version": "1.0.0-alpha.5",
+  "version": "1.0.0-alpha.6",
   "description": "Shared Patronage software factory CLI and project-profile validation tools",
   "license": "MIT",
   "repository": {
@@ -37,7 +37,7 @@
     "picomatch": "^4.0.5",
     "yaml": "^2.9.0",
     "zod": "4.4.3",
-    "@patronage/factory-ci": "1.0.0-alpha.5"
+    "@patronage/factory-ci": "1.0.0-alpha.6"
   },
   "devDependencies": {
     "@types/node": "24.13.3",
@@ -77,6 +77,8 @@
     "profile:schema": "tsx scripts/generate-profile-schema.ts",
     "pretest": "bash ../scripts/ensure-worktree-bootstrap.sh",
     "test": "vitest run",
+    "pretest:profile": "bash ../scripts/ensure-worktree-bootstrap.sh",
+    "test:profile": "tsx scripts/vitest-profile.ts",
     "pretest:stress": "bash ../scripts/ensure-worktree-bootstrap.sh",
     "test:stress": "node scripts/stress-tests.mjs",
     "pretypecheck": "bash ../scripts/ensure-worktree-bootstrap.sh",