@bastani/atomic 0.9.11-alpha.9 → 0.9.11

package/dist/builtin/workflows/src/extension/workflow-tool-control.ts

@@ -1,4 +1,5 @@
 import { getDurableBackend } from "../durable/factory.js";
+import { isWorkflowRunResumable } from "../durable/resume-eligibility.js";
 import type { ResumableWorkflowEntry } from "../durable/types.js";
 import { quitAllRuns, quitRun } from "../runs/background/quit.js";
 import { abortToolNode } from "../runs/background/quit-tool-node.js";
@@ -7,6 +8,7 @@ import { workflowHasPausedStages, workflowHasPausedState } from "../runs/backgro
 import { store } from "../shared/store.js";
 import type { RunSnapshot } from "../shared/store-types.js";
 import type { WorkflowExecutionPolicy, WorkflowToolNodeIdentity } from "../shared/types.js";
+import { workflowRunResumeCandidate } from "../shared/workflow-artifacts.js";
 import type { WorkflowToolArgs } from "./public-types.js";
 import type { WorkflowToolResult } from "./render-result.js";
 import type { ExtensionRuntime } from "./runtime.js";
@@ -16,7 +18,6 @@ import { normalizeWorkflowReloadReport, type WorkflowReloadReport } from "./work
 import { classifyDurableResumeShadow } from "./workflow-resume-shadow.js";
 import {
 	allStageConflictMessage,
-	ambiguousRunMessage,
 	reloadFailureMessage,
 	resolveControlNodeTarget,
 	resolveToolRunTarget,
@@ -81,14 +82,8 @@ export async function workflowPauseAction(args: WorkflowToolArgs): Promise<Workf
 			return controlFailure(action, "--all", error);
 		}
 	}
-	if (target.kind === "ambiguous")
-		return {
-			action,
-			runId: target.target,
-			status: "noop",
-			message: ambiguousRunMessage(target.target, target.matches),
-		};
-	if (target.kind === "not_found") return { action, runId: target.target, status: "noop", message: target.message };
+	if (target.kind === "malformed" || target.kind === "not_found")
+		return { action, runId: target.target, status: "noop", message: target.message };
 	const controlNode = resolveControlNodeTarget(target.runId, args.stageId);
 	// Tool nodes have no turn boundary to stop at, so pause rejects them loudly
 	// instead of silently resolving to nothing.
@@ -111,7 +106,7 @@ export async function workflowPauseAction(args: WorkflowToolArgs): Promise<Workf
 					action,
 					runId: result.runId,
 					status: "paused",
-					message: `Paused ${result.paused.length} stage(s) on run ${result.runId.slice(0, 8)}.`,
+					message: `Paused ${result.paused.length} stage(s) on run ${result.runId}.`,
 				}
 			: {
 					action,
@@ -214,7 +209,7 @@ async function quitToolNodeAction(
 			action,
 			runId,
 			status: "noop",
-			message: `Tool node ${nodeId} is not running on run ${runId.slice(0, 8)}.`,
+			message: `Tool node ${nodeId} is not running on run ${runId}.`,
 		};
 	}
 	// Let the rejected tool promise reach workflow code before the run status is
@@ -232,7 +227,7 @@ async function quitToolNodeAction(
 		workflowStatus,
 		abandoned: aborted.abandoned,
 		message:
-			`Cancelled ctx.tool ${aborted.name} (${nodeId}) on run ${runId.slice(0, 8)}.${abandonedNote}` +
+			`Cancelled ctx.tool ${aborted.name} (${nodeId}) on run ${runId}.${abandonedNote}` +
 			` Sibling work was not aborted. Current workflow status: ${workflowStatus}.` +
 			" If workflow code awaited this call without catching cancellation, the workflow may fail." +
 			" A later resume re-runs this call.",
@@ -262,15 +257,9 @@ export async function workflowQuitAction(args: WorkflowToolArgs): Promise<Workfl
 						: "No in-flight runs to quit.",
 		};
 	}
-	if (target.kind === "ambiguous") {
-		return {
-			action,
-			runId: target.target,
-			status: "noop",
-			message: ambiguousRunMessage(target.target, target.matches),
-		};
+	if (target.kind === "malformed" || target.kind === "not_found") {
+		return { action, runId: target.target, status: "noop", message: target.message };
 	}
-	if (target.kind === "not_found") return { action, runId: target.target, status: "noop", message: target.message };
 	const controlNode = resolveControlNodeTarget(target.runId, args.stageId);
 	if (!controlNode.ok) return { action, runId: target.runId, status: "noop", message: controlNode.message };
 	if (controlNode.kind === "tool") return quitToolNodeAction(controlNode.runId, controlNode.nodeId, action);
@@ -290,9 +279,9 @@ export async function workflowQuitAction(args: WorkflowToolArgs): Promise<Workfl
 			status: "noop",
 			message:
 				result.reason === "already_ended"
-					? `Run ${target.runId.slice(0, 8)} already ended.`
+					? `Run ${target.runId} already ended.`
 					: result.reason === "no_active_stages"
-						? `No controllable stages on run ${target.runId.slice(0, 8)}; the run remains active.`
+						? `No controllable stages on run ${target.runId}; the run remains active.`
 						: `Run not found: ${target.runId}`,
 		};
 	} catch (error) {
@@ -320,14 +309,8 @@ export async function workflowInterruptAction(args: WorkflowToolArgs): Promise<W
 			return controlFailure(action, "--all", error);
 		}
 	}
-	if (target.kind === "ambiguous")
-		return {
-			action,
-			runId: target.target,
-			status: "noop",
-			message: ambiguousRunMessage(target.target, target.matches),
-		};
-	if (target.kind === "not_found") return { action, runId: target.target, status: "noop", message: target.message };
+	if (target.kind === "malformed" || target.kind === "not_found")
+		return { action, runId: target.target, status: "noop", message: target.message };
 	const controlNode = resolveControlNodeTarget(target.runId, args.stageId);
 	if (!controlNode.ok) return { action, runId: target.runId, status: "noop", message: controlNode.message };
 	if (controlNode.kind === "tool") return quitToolNodeAction(controlNode.runId, controlNode.nodeId, action);
@@ -412,14 +395,8 @@ async function resolveExplicitDurableTarget(
 		return controlFailure("resume", target, error);
 	}
 	const resolved = resolveWorkflowResumeTarget(target, liveRuns, durable, []);
-	if (resolved.kind === "ambiguous") {
-		const matches = resolved.matches.map((match) => match.workflowId);
-		return {
-			action: "resume",
-			runId: target,
-			status: "noop",
-			message: `Ambiguous run prefix "${target}" matches: ${matches.join(", ")}`,
-		};
+	if (resolved.kind === "malformed") {
+		return { action: "resume", runId: target, status: "noop", message: resolved.message };
 	}
 	if (resolved.kind === "durable") return resumePreparedDurableTarget(resolved.workflowId, deps);
 	if (resolved.kind === "live") {
@@ -458,9 +435,8 @@ export async function workflowResumeAction(
 	const target = resolveToolRunTarget(args, "No active run to resume.");
 	if (target.kind === "all")
 		return { action: "resume", runId: "--all", status: "noop", message: "Resume does not support --all." };
-	if (target.kind === "ambiguous") {
-		const liveMatches = store.runs().filter((run) => target.matches.includes(run.id));
-		return resolveExplicitDurableTarget(target.target, args, deps, liveMatches);
+	if (target.kind === "malformed") {
+		return { action: "resume", runId: target.target, status: "noop", message: target.message };
 	}
 	if (target.kind === "not_found") {
 		const explicitTarget = args.runId?.trim();
@@ -469,11 +445,8 @@ export async function workflowResumeAction(
 		}
 		return { action: "resume", runId: target.target, status: "noop", message: target.message };
 	}
-	const explicitTarget = args.runId?.trim();
-	if (explicitTarget !== undefined && explicitTarget.length > 0 && explicitTarget !== target.runId) {
-		const liveMatches = store.runs().filter((run) => run.id.startsWith(explicitTarget));
-		return resolveExplicitDurableTarget(explicitTarget, args, deps, liveMatches);
-	}
+	// An explicit target now resolves only by exact id, so it can never disagree
+	// with the resolved run; the old re-resolution branch here is unreachable.
 	const backend = getDurableBackend();
 	const exact = store.runs().find((run) => run.id === target.runId);
 	const shadow = exact === undefined ? "not_shadow" : classifyDurableResumeShadow(exact, store, { backend });
@@ -512,8 +485,8 @@ export async function workflowResumeAction(
 	const isResumableContinuation =
 		run !== undefined &&
 		!isPaused &&
-		((run.status === "failed" && run.endedAt !== undefined && run.resumable !== false) ||
-			(run.endedAt === undefined && run.resumable === true && run.failureRecoverability === "recoverable"));
+		run.exitReason !== "quit" &&
+		isWorkflowRunResumable(workflowRunResumeCandidate(run));
 	if (isResumableContinuation) {
 		try {
 			await deps.ensureWorkflowResourcesLoaded();
@@ -544,9 +517,9 @@ export async function workflowResumeAction(
 				(isPaused
 					? result.resumed.length === 0
 						? runLevelResumed
-							? `Resumed run ${result.runId.slice(0, 8)}.`
-							: `No paused stages on run ${result.runId.slice(0, 8)}.`
-						: `Resumed ${result.resumed.length} stage(s) on run ${result.runId.slice(0, 8)}${args.message ? ` with message: "${args.message}"` : ""}.`
+							? `Resumed run ${result.runId}.`
+							: `No paused stages on run ${result.runId}.`
+						: `Resumed ${result.resumed.length} stage(s) on run ${result.runId}${args.message ? ` with message: "${args.message}"` : ""}.`
 					: `Snapshot available: run ${result.runId} (${result.snapshot.name}) — status: ${result.snapshot.status}, stages: ${result.snapshot.stages.length}`);
 			const status = result.mode === "partial" ? "partial" : noPausedProgress ? "noop" : "ok";
 			return { action: "resume", runId: result.runId, status, message };

package/dist/builtin/workflows/src/extension/workflow-tool-inspection.ts

@@ -12,7 +12,7 @@ import {
 	summarizeStage,
 	transcriptEntryFromMessage,
 } from "./workflow-stage-results.js";
-import { ambiguousRunMessage, resolveToolRunTarget, resolveToolStageTarget } from "./workflow-targets.js";
+import { resolveToolRunTarget, resolveToolStageTarget } from "./workflow-targets.js";
 
 export function workflowStagesResult(args: WorkflowToolArgs): WorkflowToolResult {
 	const target = resolveToolRunTarget(args, "No active run to inspect.");
@@ -26,16 +26,7 @@ export function workflowStagesResult(args: WorkflowToolArgs): WorkflowToolResult
 			error: "Stage listing requires a single run.",
 		};
 	}
-	if (target.kind === "ambiguous") {
-		return {
-			action: "stages",
-			runId: target.target,
-			filter,
-			stages: [],
-			error: ambiguousRunMessage(target.target, target.matches),
-		};
-	}
-	if (target.kind === "not_found") {
+	if (target.kind === "malformed" || target.kind === "not_found") {
 		return {
 			action: "stages",
 			runId: target.target,
@@ -56,10 +47,7 @@ export function workflowStageResult(args: WorkflowToolArgs): WorkflowToolResult
 	if (target.kind === "all") {
 		return { action: "stage", runId: "--all", error: "Stage inspection requires a single run." };
 	}
-	if (target.kind === "ambiguous") {
-		return { action: "stage", runId: target.target, error: ambiguousRunMessage(target.target, target.matches) };
-	}
-	if (target.kind === "not_found") {
+	if (target.kind === "malformed" || target.kind === "not_found") {
 		return { action: "stage", runId: target.target, error: target.message };
 	}
 	const stage = resolveToolStageTarget(target.runId, args.stageId);
@@ -67,7 +55,7 @@ export function workflowStageResult(args: WorkflowToolArgs): WorkflowToolResult
 		return {
 			action: "stage",
 			runId: target.runId,
-			error: stage.ok ? "Stage id, prefix, or name is required." : stage.message,
+			error: stage.ok ? "Stage id or name is required." : stage.message,
 		};
 	}
 	const stageRunId = stage.runId ?? target.runId;
@@ -78,7 +66,7 @@ export function workflowStageResult(args: WorkflowToolArgs): WorkflowToolResult
 		: {
 				action: "stage",
 				runId: stageRunId,
-				error: `Stage not found in run ${stageRunId.slice(0, 8)}: ${stage.stageId}`,
+				error: `Stage not found in run ${stageRunId}: ${stage.stageId}`,
 			};
 }
 
@@ -94,17 +82,7 @@ export function workflowTranscriptResult(args: WorkflowToolArgs): WorkflowToolRe
 			truncated: false,
 		};
 	}
-	if (target.kind === "ambiguous") {
-		return {
-			action: "transcript",
-			runId: target.target,
-			stageId: "",
-			source: "error",
-			entries: [{ role: "notice", text: ambiguousRunMessage(target.target, target.matches) }],
-			truncated: false,
-		};
-	}
-	if (target.kind === "not_found") {
+	if (target.kind === "malformed" || target.kind === "not_found") {
 		return {
 			action: "transcript",
 			runId: target.target,
@@ -121,7 +99,7 @@ export function workflowTranscriptResult(args: WorkflowToolArgs): WorkflowToolRe
 			runId: target.runId,
 			stageId: "",
 			source: "error",
-			entries: [{ role: "notice", text: stage.ok ? "Stage id, prefix, or name is required." : stage.message }],
+			entries: [{ role: "notice", text: stage.ok ? "Stage id or name is required." : stage.message }],
 			truncated: false,
 		};
 	}

package/dist/builtin/workflows/src/extension/workflow-tool-send.ts

@@ -9,10 +9,11 @@ import { coerceStageInputAnswer, hasStageInputAnswerContent, type StageInputAnsw
 import { stageUiBroker } from "../shared/stage-ui-broker.js";
 import { store } from "../shared/store.js";
 import { isTerminalRunStatus } from "../shared/store-internal.js";
+import { subscribeStoreInvalidation } from "../shared/store-observation.js";
 import { reciprocalWorkflowRootRunId } from "../shared/workflow-run-ownership.js";
 import type { WorkflowToolArgs } from "./public-types.js";
 import type { WorkflowToolResult } from "./render-result.js";
-import { ambiguousRunMessage, resolveToolRunTarget, resolveToolStageTarget } from "./workflow-targets.js";
+import { resolveToolRunTarget, resolveToolStageTarget } from "./workflow-targets.js";
 
 /**
  * Optional dependencies enabling `workflow send` to revive an eligible
@@ -120,16 +121,7 @@ export async function workflowSendAction(
 	if (target.kind === "all") {
 		return workflowSendResult("--all", "", requestedDelivery, "noop", "Send requires a single run.");
 	}
-	if (target.kind === "ambiguous") {
-		return workflowSendResult(
-			target.target,
-			"",
-			requestedDelivery,
-			"noop",
-			ambiguousRunMessage(target.target, target.matches),
-		);
-	}
-	if (target.kind === "not_found") {
+	if (target.kind === "malformed" || target.kind === "not_found") {
 		return workflowSendResult(target.target, "", requestedDelivery, "noop", target.message);
 	}
 	const runs = store.runs();
@@ -146,7 +138,7 @@ export async function workflowSendAction(
 			"",
 			requestedDelivery,
 			"noop",
-			stage.ok ? "Stage id, prefix, or name is required." : stage.message,
+			stage.ok ? "Stage id or name is required." : stage.message,
 		);
 	}
 	const resolvedStageId = stage.stageId;
@@ -280,7 +272,7 @@ export async function workflowSendAction(
 		admitted = true;
 	};
 	const terminalPending = Promise.withResolvers<never>();
-	const unsubscribeTerminal = store.subscribe(() => {
+	const unsubscribeTerminal = subscribeStoreInvalidation(store, () => {
 		if (admitted) return;
 		const terminal = terminalWorkflowSendResultForRoot(rootRunId, args.stageId?.trim() ?? resolvedStageId);
 		if (terminal !== undefined) terminalPending.reject(new WorkflowSendAdmissionError(terminal));

package/dist/builtin/workflows/src/extension/workflow-tool.ts

@@ -8,12 +8,7 @@ import { formatWorkflowResourceLoadWarning } from "./workflow-command-surfaces.j
 import { workflowPolicyFromContext } from "./workflow-policy.js";
 import type { WorkflowReloadReport } from "./workflow-reload-report.js";
 import { buildWorkflowStatusListing } from "./workflow-status-summary.js";
-import {
-	ambiguousRunMessage,
-	isWorkflowStageToolContext,
-	resolveRunIdPrefix,
-	topLevelExpandedSnapshots,
-} from "./workflow-targets.js";
+import { isWorkflowStageToolContext, resolveRunId, topLevelExpandedSnapshots } from "./workflow-targets.js";
 import { workflowGetResult } from "./workflow-tool-content.js";
 import {
 	workflowInterruptAction,
@@ -84,13 +79,9 @@ export function makeExecuteWorkflowTool(
 			case "status": {
 				const target = args.runId;
 				if (target !== undefined) {
-					const resolved = resolveRunIdPrefix(target);
-					if (resolved.kind === "ambiguous") {
-						return {
-							action: "statusDetail",
-							runId: target,
-							error: ambiguousRunMessage(target, resolved.matches),
-						};
+					const resolved = resolveRunId(target);
+					if (resolved.kind === "malformed") {
+						return { action: "statusDetail", runId: target, error: resolved.message };
 					}
 					if (resolved.kind === "not_found") {
 						return { action: "statusDetail", runId: target, error: `run not found: ${target}` };

package/dist/builtin/workflows/src/runs/background/quit.ts

@@ -18,6 +18,7 @@ import { WorkflowGracefulQuitError } from "../../engine/workflow-tool-abort.js";
 import { expandWorkflowGraph } from "../../shared/expanded-workflow-graph.js";
 import { topLevelWorkflowRuns } from "../../shared/run-visibility.js";
 import { store as defaultStore } from "../../shared/store.js";
+import { readGraphStoreSnapshot } from "../../shared/store-observation.js";
 import type { Store } from "../../shared/store-public-types.js";
 import type { RunSnapshot, StageSnapshot } from "../../shared/store-types.js";
 import type { WorkflowCancelledToolNode, WorkflowToolNodeIdentity } from "../../shared/types.js";
@@ -100,7 +101,7 @@ export async function quitRun(
 	if (!run) return { ok: false, runId, reason: "not_found" };
 	if (run.endedAt !== undefined) return { ok: false, runId, reason: "already_ended" };
 
-	const graph = expandWorkflowGraph(activeStore.snapshot(), runId);
+	const graph = expandWorkflowGraph(readGraphStoreSnapshot(activeStore), runId);
 	const handles = controllableHandles(activeStore, registry, runId);
 	const admissionBoundaries = controllableAdmissionBoundaries(activeStore, toolControls, runId);
 	const promptStages = graph.stages.filter(
@@ -247,7 +248,7 @@ function controllableAdmissionBoundaries(
  */
 async function closeToolAdmission(boundaries: readonly ToolAdmissionBoundary[], runId: string): Promise<void> {
 	if (boundaries.length === 0) return;
-	const reason = new WorkflowGracefulQuitError(runId, `run ${runId.slice(0, 8)}`);
+	const reason = new WorkflowGracefulQuitError(runId, `run ${runId}`);
 	await Promise.all(boundaries.map((boundary) => boundary.closeForQuit(reason)));
 }
 
@@ -303,7 +304,7 @@ function controllableHandles(
 	registry: StageControlRegistry,
 	runId: string,
 ): Array<{ controlRunId: string; handle: StageControlHandle }> {
-	const graph = expandWorkflowGraph(activeStore.snapshot(), runId);
+	const graph = expandWorkflowGraph(readGraphStoreSnapshot(activeStore), runId);
 	const controlRunIds = new Set<string>([runId]);
 	for (const stage of graph.stages) controlRunIds.add(stage.workflowGraphTarget.runId);
 	return [...controlRunIds].flatMap((controlRunId) =>

package/dist/builtin/workflows/src/runs/background/run-inspect.ts

@@ -62,18 +62,18 @@ export type InspectRunResult =
 	| { ok: false; runId: string; reason: "not_found" };
 
 /**
- * Look up a single run by id (full UUID or unique prefix) and return a
- * normalised {@link RunDetail} for the per-run text/TUI surfaces.
+ * Look up a single run by its exact id and return a normalised
+ * {@link RunDetail} for the per-run text/TUI surfaces.
  *
- * Returns ok:false "not_found" when no run matches, "ambiguous" when a
- * prefix matches multiple. Read-only: does not mutate the store.
+ * Exact match only. Callers reach this with an id already resolved at the input
+ * boundary, where shape is validated; a second, looser prefix match here would
+ * only reintroduce the truncated targeting the resolvers now reject.
+ *
+ * Read-only: does not mutate the store.
  */
 export function inspectRun(runId: string, opts?: { store?: Store }): InspectRunResult {
 	const activeStore = opts?.store ?? defaultStore;
-	const runs = activeStore.runs();
-
-	const exact = runs.find((r) => r.id === runId);
-	const candidate = exact ?? (runs.length > 0 ? runs.find((r) => r.id.startsWith(runId)) : undefined);
+	const candidate = activeStore.runs().find((r) => r.id === runId);
 
 	if (!candidate) {
 		return { ok: false, runId, reason: "not_found" };

package/dist/builtin/workflows/src/runs/background/status.ts

@@ -15,6 +15,7 @@ import { effectiveRunStatus } from "../../shared/returned-run-status.js";
 import { topLevelWorkflowRuns } from "../../shared/run-visibility.js";
 import type { Store } from "../../shared/store.js";
 import { store as defaultStore } from "../../shared/store.js";
+import { readGraphStoreSnapshot } from "../../shared/store-observation.js";
 import type { RunSnapshot, RunStatus, StageSnapshot } from "../../shared/store-types.js";
 import type { WorkflowPersistencePort } from "../../shared/types.js";
 import type { StageControlRegistry } from "../foreground/stage-control-registry.js";
@@ -89,7 +90,7 @@ export { type InspectRunResult, inspectRun, type RunDetail } from "./run-inspect
 export function statusRuns(opts?: { all?: boolean; store?: Store }): RunStatusEntry[] {
 	const activeStore = opts?.store ?? defaultStore;
 
-	const snapshot = activeStore.snapshot();
+	const snapshot = readGraphStoreSnapshot(activeStore);
 	return topLevelWorkflowRuns(snapshot.runs).map((run) => {
 		const graph = expandWorkflowGraph(snapshot, run.id);
 		return {

package/dist/builtin/workflows/src/runs/background/workflow-lifecycle-aggregate.ts

@@ -1,10 +1,11 @@
 import { expandWorkflowGraph } from "../../shared/expanded-workflow-graph.js";
+import { readGraphStoreSnapshot } from "../../shared/store-observation.js";
 import type { Store } from "../../shared/store-public-types.js";
 import { reciprocalWorkflowRootRunId } from "../../shared/workflow-run-ownership.js";
 
 /** Control-run ids visible below one workflow boundary, in graph order. */
 export function expandedControlRunIds(store: Store, runId: string): string[] {
-	const graph = expandWorkflowGraph(store.snapshot(), runId);
+	const graph = expandWorkflowGraph(readGraphStoreSnapshot(store), runId);
 	const ids = new Set<string>([runId]);
 	for (const stage of graph.stages) ids.add(stage.workflowGraphTarget.runId);
 	// Tool-only nested runs own no stage, yet their in-flight ctx.tool nodes are

package/dist/builtin/workflows/src/runs/foreground/executor-direct-helpers.ts

@@ -1,7 +1,7 @@
-import { tmpdir } from "node:os";
 import { isAbsolute, join, resolve } from "node:path";
-import { APP_NAME, CONFIG_DIR_NAME, isCodexFastModeCandidateModelId } from "@bastani/atomic";
+import { CONFIG_DIR_NAME, isCodexFastModeCandidateModelId } from "@bastani/atomic";
 import type { StageOptions, WorkflowArtifact, WorkflowTaskOptions, WorkflowTaskStep } from "../../shared/types.js";
+import { workflowArtifactRunPath } from "../../shared/workflow-artifacts.js";
 import { buildModelCandidatesFromCatalog, workflowModelId } from "../shared/model-fallback.js";
 import {
 	cleanupWorktrees,
@@ -211,8 +211,8 @@ function resolvedTaskCwd(cwd: string | undefined, workflowInvocationCwd: string)
 	return isAbsolute(cwd) ? cwd : resolve(workflowInvocationCwd, cwd);
 }
 
-function taskWorktreeOutputsRoot(): string {
-	return join(tmpdir(), `${APP_NAME}-workflow-outputs`);
+function taskWorktreeOutputsRoot(runId: string): string {
+	return join(workflowArtifactRunPath(runId), "task-outputs");
 }
 
 export function prepareTaskWorktrees(
@@ -250,7 +250,7 @@ export function prepareTaskWorktrees(
 		baseBranch: options.baseBranch,
 		symlinkDirectories,
 	});
-	const trustedRoot = taskWorktreeOutputsRoot();
+	const trustedRoot = taskWorktreeOutputsRoot(runId);
 	return {
 		tasks: tasks.map((task, index) => ({ ...task, cwd: setup.worktrees[index]!.agentCwd })),
 		setup,

package/dist/builtin/workflows/src/runs/foreground/executor-lifecycle.ts

@@ -103,6 +103,10 @@ export interface RunFailureMetadata {
 	readonly retryAfterMs?: number;
 }
 
+/**
+ * Apply failure fields to a live stage. Executor callers invoke this next to
+ * a version-bumping stage store method, with no intervening asynchronous work.
+ */
 export function applyFailureToStage(stage: StageSnapshot, failure: WorkflowFailure): void {
 	stage.status = "failed";
 	stage.error = failure.userMessage;

package/dist/builtin/workflows/src/runs/foreground/executor-scheduler.ts

@@ -52,6 +52,8 @@ export function createStageScheduler(input: {
 		input.runSnapshot.stages.find((stage) => stage.id === stageId);
 
 	const setStageParentIds = (stage: StageSnapshot, parentIds: readonly string[]): void => {
+		// The tracked-stage caller invokes this next to the version-bumping
+		// `recordStageStart` method, with no intervening asynchronous work.
 		stage.parentIds = Object.freeze([...parentIds]);
 	};
 

package/dist/builtin/workflows/src/runs/foreground/executor-stage-call.ts

@@ -134,6 +134,7 @@ export function createTrackedStageCaller(input: {
 		}
 
 		const trackStageLifecycle = !runtime.state.stageFinalized;
+		let refreshedParentIds: readonly string[] | undefined;
 		if (
 			trackStageLifecycle &&
 			!input.hasContinuation &&
@@ -146,13 +147,11 @@ export function createTrackedStageCaller(input: {
 				actualParentIds.every((value) => runtime.stageSnapshot.parentIds.includes(value));
 			if (!sameParents) {
 				runtime.scheduler.tracker.replaceParents(runtime.stageId, actualParentIds);
-				runtime.scheduler.setStageParentIds(runtime.stageSnapshot, actualParentIds);
+				refreshedParentIds = actualParentIds;
 			}
 		}
 		if (trackStageLifecycle) {
 			const now = Date.now();
-			runtime.stageSnapshot.status = "running";
-			runtime.stageSnapshot.startedAt ??= rebasedStageStartedAt(input.options?.durableAccumulatedDurationMs, now);
 			const hasNoExplicitModelConfig =
 				input.options?.model === undefined && input.options?.fallbackModels === undefined;
 			const promptAdapterHandlesInitialPrompt = input.adapters.prompt !== undefined;
@@ -173,7 +172,13 @@ export function createTrackedStageCaller(input: {
 					if (!(err instanceof Error && err.message.includes("prompt adapter not configured"))) throw err;
 				}
 			}
+			if (refreshedParentIds !== undefined) {
+				runtime.scheduler.setStageParentIds(runtime.stageSnapshot, refreshedParentIds);
+			}
+			runtime.stageSnapshot.status = "running";
+			runtime.stageSnapshot.startedAt ??= rebasedStageStartedAt(input.options?.durableAccumulatedDurationMs, now);
 			runtime.applyModelFallbackMeta(runtime.innerCtx.__modelFallbackMeta());
+			// Publish every graph-visible live write before this task can yield.
 			runtime.activeStore.recordStageStart(runtime.runId, runtime.stageSnapshot);
 			runtime.appendStageStartOnce();
 		} else {
@@ -182,6 +187,7 @@ export function createTrackedStageCaller(input: {
 
 		runtime.mcpScope.apply();
 
+		let applyTerminalStageState: (() => void) | undefined;
 		try {
 			const abortSession = (): void => {
 				void runtime.innerCtx.abort().catch(() => {});
@@ -260,9 +266,11 @@ export function createTrackedStageCaller(input: {
 			}
 			if (trackStageLifecycle && runtime.state.stageFinalized) throw runtime.parallelFailFastError();
 			if (trackStageLifecycle) {
-				runtime.stageSnapshot.status = "completed";
 				const assistantText = runtime.innerCtx.__getLastAssistantText();
-				if (assistantText !== undefined) runtime.stageSnapshot.result = assistantText;
+				applyTerminalStageState = () => {
+					runtime.stageSnapshot.status = "completed";
+					if (assistantText !== undefined) runtime.stageSnapshot.result = assistantText;
+				};
 			}
 			return result;
 		} catch (err) {
@@ -270,11 +278,15 @@ export function createTrackedStageCaller(input: {
 			if (workflowExitAbort !== undefined && !runtime.state.skippedForParallelFailFast) {
 				runtime.state.stageClosedByWorkflowExit = true;
 				if (trackStageLifecycle && !isTerminalStage(runtime.stageSnapshot)) {
-					runtime.stageSnapshot.status = "skipped";
-					runtime.stageSnapshot.skippedReason = runtime.exit.workflowExitSkippedReason(workflowExitAbort.reason);
+					const skippedReason = runtime.exit.workflowExitSkippedReason(workflowExitAbort.reason);
+					applyTerminalStageState = () => {
+						runtime.stageSnapshot.status = "skipped";
+						runtime.stageSnapshot.skippedReason = skippedReason;
+					};
 				}
 			} else if (trackStageLifecycle && !runtime.signal.aborted && !runtime.state.skippedForParallelFailFast) {
-				applyFailureToStage(runtime.stageSnapshot, runtime.classifyExecutorFailure(err));
+				const failure = runtime.classifyExecutorFailure(err);
+				applyTerminalStageState = () => applyFailureToStage(runtime.stageSnapshot, failure);
 			}
 			throw err;
 		} finally {
@@ -291,6 +303,9 @@ export function createTrackedStageCaller(input: {
 				finalizationError = { thrown: true, error: err };
 			}
 			if (trackStageLifecycle) {
+				if (!runtime.state.stageFinalized) applyTerminalStageState?.();
+				// `finalizeStageSnapshot` calls the version-bumping `recordStageEnd`
+				// before its first yield, so the live write cannot outpace the cache.
 				try {
 					await runtime.finalizeStageSnapshot();
 				} catch (err) {

package/dist/builtin/workflows/src/runs/foreground/executor-stage-factory.ts

@@ -290,6 +290,10 @@ export function createWorkflowStageFactory(input: {
 				input.tracker.onSettle(stageId);
 				return false;
 			}
+			if (state.skippedForParallelFailFast) {
+				stageSnapshot.status = "skipped";
+				stageSnapshot.skippedReason = "fail-fast";
+			}
 			state.stageFinalized = true;
 			runtime.unregisterWorkflowExitCleanup();
 			stageSnapshot.endedAt = Date.now();
@@ -340,9 +344,9 @@ export function createWorkflowStageFactory(input: {
 		};
 
 		const markSkippedForParallelFailFast = (): void => {
+			// Defer graph-visible fields until `finalizeStageSnapshot`, directly
+			// before its version-bumping `recordStageEnd` call.
 			state.skippedForParallelFailFast = true;
-			stageSnapshot.status = "skipped";
-			stageSnapshot.skippedReason = "fail-fast";
 		};
 		const parallelFailFastError = (): unknown =>
 			stageFailFastScope?.firstFailure ?? new Error("atomic-workflows: skipped after parallel fail-fast");

package/dist/builtin/workflows/src/runs/foreground/executor-task-prompts.ts

@@ -1,3 +1,4 @@
+import { existsSync } from "node:fs";
 import { isAbsolute, resolve } from "node:path";
 import type {
 	StageOptions,
@@ -80,6 +81,10 @@ export function taskReadInstruction(options: WorkflowTaskExecutionOptions): stri
 	if (options.reads === false || options.reads === undefined || options.reads.length === 0) return "";
 	const baseDir = taskBaseDir(options);
 	const files = options.reads.map((file) => resolveWorkflowPath(file, baseDir));
+	const missing = files.find((file) => !existsSync(file));
+	if (missing !== undefined) {
+		throw new Error(`atomic-workflows: referenced artifact does not exist: ${missing}`);
+	}
 	return `[Read from: ${files.join(", ")}]\n\n`;
 }