@bastani/atomic 0.9.12 → 0.9.13-alpha.2

package/dist/builtin/workflows/src/durable/resume-runtime.ts

@@ -206,6 +206,7 @@ export async function resumeDurableWorkflow(
 	const resumeRunOpts: RunOpts = {
 		...deps.baseRunOpts,
 		...(handle.invocationCwd !== undefined ? { cwd: handle.invocationCwd } : {}),
+		...(handle.origin !== undefined ? { origin: handle.origin } : {}),
 		runId: resolved.workflowId,
 		durableBackend: backend,
 	};

package/dist/builtin/workflows/src/durable/tool-primitive.ts

@@ -16,6 +16,7 @@
  */
 
 import { runCallback } from "@bastani/atomic";
+import { sleepOrAbort } from "../runs/shared/retry.js";
 import { flattenTruncatedString } from "../shared/flat-string.js";
 import type { ToolNodeSnapshot } from "../shared/store-types.js";
 import type {
@@ -26,6 +27,9 @@ import type {
 	WorkflowToolPrimitive,
 } from "../shared/types.js";
 import { field, hasProcessFailureEvidence, normalizeCode } from "../shared/workflow-failures-signals.js";
+
+export { sleepOrAbort } from "../runs/shared/retry.js";
+
 import type { DurableWorkflowBackend } from "./backend.js";
 import { durableHash } from "./backend.js";
 import { recordThrowingToolFailure } from "./tool-failure-checkpoint.js";
@@ -660,34 +664,6 @@ async function executeWithRetries<T>(
 	throw lastError ?? new Error("ctx.tool: retries exhausted");
 }
 
-export function sleepOrAbort(ms: number, signal?: AbortSignal): Promise<void> {
-	if (signal?.aborted)
-		return Promise.reject(
-			signal.reason instanceof Error ? signal.reason : new Error("atomic-workflows: workflow cancelled"),
-		);
-	return new Promise((resolve, reject) => {
-		let settled = false;
-		const cleanup = (): void => signal?.removeEventListener("abort", onAbort);
-		const finish = (): void => {
-			if (settled) return;
-			settled = true;
-			cleanup();
-			resolve();
-		};
-		const fail = (err: Error): void => {
-			if (settled) return;
-			settled = true;
-			clearTimeout(timer);
-			cleanup();
-			reject(err);
-		};
-		const timer = setTimeout(finish, ms);
-		const onAbort = (): void =>
-			fail(signal?.reason instanceof Error ? signal.reason : new Error("atomic-workflows: workflow cancelled"));
-		signal?.addEventListener("abort", onAbort, { once: true });
-	});
-}
-
 /**
  * Create a monotonic checkpoint id generator for a workflow.
  */

package/dist/builtin/workflows/src/durable/types.ts

@@ -10,6 +10,7 @@
  */
 
 import type {
+	WorkflowActor,
 	WorkflowFailureCode,
 	WorkflowFailureDisposition,
 	WorkflowFailureKind,
@@ -40,6 +41,8 @@ export interface DurableWorkflowHandle {
 	readonly status: DurableWorkflowStatus;
 	/** Original invocation cwd used to resolve repo-relative workflow defaults on resume. */
 	readonly invocationCwd?: string;
+	/** Who launched this workflow, when the launcher was attributable. */
+	readonly origin?: WorkflowActor;
 	/** Resolved workflow cwd when an input-bound reusable worktree was set up. */
 	readonly workflowCwd?: string;
 	/** Invoking repository root used for reusable worktree validation. */
@@ -58,6 +61,10 @@ export interface DurableWorkflowHandle {
 	readonly rootWorkflowId?: string;
 	/** Explicit resumability flag for failed/blocked runs. */
 	readonly resumable?: boolean;
+	/** True when the terminal status came from an author-selected ctx.exit(). */
+	readonly exited?: boolean;
+	/** Author-supplied reason from ctx.exit(), when present. */
+	readonly exitReason?: string;
 	readonly error?: string;
 	readonly failureKind?: WorkflowFailureKind;
 	readonly failureCode?: WorkflowFailureCode;
@@ -275,7 +282,12 @@ export interface DurableWorkflowMetadata {
 	readonly failedToolNodeId?: string;
 	readonly rootWorkflowId?: string;
 	readonly resumable?: boolean;
+	/** True when the terminal status came from an author-selected ctx.exit(). */
+	readonly exited?: boolean;
+	/** Author-supplied reason from ctx.exit(), when present. */
+	readonly exitReason?: string;
 	readonly invocationCwd?: string;
+	readonly origin?: WorkflowActor;
 	readonly workflowCwd?: string;
 	readonly repositoryRoot?: string;
 	readonly gitWorktreeRoot?: string;
@@ -300,7 +312,12 @@ export interface ResumableWorkflowEntry {
 	readonly failedToolNodeId?: string;
 	readonly rootWorkflowId?: string;
 	readonly resumable?: boolean;
+	/** True when the terminal status came from an author-selected ctx.exit(). */
+	readonly exited?: boolean;
+	/** Author-supplied reason from ctx.exit(), when present. */
+	readonly exitReason?: string;
 	readonly invocationCwd?: string;
+	readonly origin?: WorkflowActor;
 	readonly workflowCwd?: string;
 	readonly repositoryRoot?: string;
 	readonly gitWorktreeRoot?: string;
@@ -309,7 +326,11 @@ export interface ResumableWorkflowEntry {
 }
 
 export interface DurableWorkflowFailureMetadata {
-	readonly error: string;
+	readonly error?: string;
+	/** True when the terminal status came from an author-selected ctx.exit(). */
+	readonly exited?: boolean;
+	/** Author-supplied reason from ctx.exit(), when present. */
+	readonly exitReason?: string;
 	readonly failureKind?: WorkflowFailureKind;
 	readonly failureCode?: WorkflowFailureCode;
 	readonly failureRecoverability?: WorkflowFailureRecoverability;

package/dist/builtin/workflows/src/durable/workflow-child-result.ts

@@ -49,7 +49,9 @@ export function isWorkflowChildResult(
 }
 
 function isWorkflowExitStatus(value: WorkflowSerializableValue | undefined): value is WorkflowExitStatus {
-	return value === "completed" || value === "skipped" || value === "cancelled" || value === "blocked";
+	return (
+		value === "completed" || value === "skipped" || value === "cancelled" || value === "blocked" || value === "failed"
+	);
 }
 
 function isOrdinaryObject(

package/dist/builtin/workflows/src/engine/primitives/workflow.ts

@@ -143,7 +143,7 @@ export function createChildWorkflowRunner(input: {
 			) {
 				throw new WorkflowGracefulQuitError(childRunId, `child workflow "${childName}" (${child.name})`);
 			}
-			if (!isWorkflowExitStatus(childRun.status)) {
+			if (!isWorkflowExitStatus(childRun.status) || (childRun.status === "failed" && childRun.exited !== true)) {
 				const failedChildStage = childRun.stages.find((stage) => stage.failureKind !== undefined);
 				throw new Error(
 					`atomic-workflows: child workflow "${childName}" (${child.name}) failed with status ${childRun.status}${childRun.error !== undefined ? `: ${childRun.error}` : ""}`,

package/dist/builtin/workflows/src/engine/run-durable-finalize.ts

@@ -40,9 +40,17 @@ export async function finalizeDurableTerminalStatus(input: DurableTerminalFinali
 			recordRunTimingCheckpoint(input.durableBackend, input.runSnapshot);
 		}
 		const failure =
-			durableStatus === "failed" && input.runSnapshot.error !== undefined
+			durableStatus === "failed"
 				? {
-						error: input.runSnapshot.error,
+						...(input.runSnapshot.error !== undefined ? { error: input.runSnapshot.error } : {}),
+						...(input.runSnapshot.exited === true
+							? {
+									exited: true,
+									...(input.runSnapshot.exitReason !== undefined
+										? { exitReason: input.runSnapshot.exitReason }
+										: {}),
+								}
+							: {}),
 						...(input.runSnapshot.failureKind !== undefined
 							? { failureKind: input.runSnapshot.failureKind }
 							: {}),

package/dist/builtin/workflows/src/engine/run-durable-topology.ts

@@ -238,6 +238,7 @@ export function reconcileCachedDirectChildParentStage(input: {
 	readonly boundary: StageSnapshot;
 }): boolean {
 	const existingRun = input.store.runs().find((run) => run.id === input.checkpointChildRunId);
+	if (existingRun === undefined) return false;
 	const runById = new Map(input.store.runs().map((run) => [run.id, run]));
 	const storedParentRun = runById.get(input.parentRun.id);
 	if (
@@ -250,6 +251,13 @@ export function reconcileCachedDirectChildParentStage(input: {
 	const expectedRootRunId = reciprocalWorkflowRootRunId(runById, input.parentRun.id);
 	if (expectedRootRunId === undefined) return false;
 	const storedBoundary = storedParentRun?.stages.find((stage) => stage.id === input.boundary.id);
+	const cachedChildStatusMatches =
+		(existingRun?.status === "completed" && input.catalogRun.status === "completed") ||
+		(input.boundary.workflowChild?.exited === true &&
+			input.boundary.workflowChild.runId === input.checkpointChildRunId &&
+			existingRun?.status === input.catalogRun.status &&
+			input.boundary.workflowChild.status === input.catalogRun.status);
+
 	if (
 		!rootMatches(input.parentRun.rootRunId, expectedRootRunId) ||
 		!rootMatches(storedParentRun?.rootRunId, expectedRootRunId) ||
@@ -257,8 +265,7 @@ export function reconcileCachedDirectChildParentStage(input: {
 		(storedParentRun !== undefined &&
 			authoritativeWorkflowChildRunId(storedBoundary) !== input.checkpointChildRunId) ||
 		input.catalogRun.id !== input.checkpointChildRunId ||
-		existingRun?.status !== "completed" ||
-		input.catalogRun.status !== "completed" ||
+		!cachedChildStatusMatches ||
 		existingRun.parentRunId !== input.parentRun.id ||
 		input.catalogRun.parentRunId !== input.parentRun.id ||
 		input.catalogRun.parentStageId === undefined ||

package/dist/builtin/workflows/src/engine/run.ts

@@ -164,6 +164,7 @@ export async function run<TInputs extends WorkflowInputValues, TRunInputs extend
 		opts.parentRun === undefined
 			? inheritedRunElapsedMs({ backend: durableBackend, runId, continuationSource: opts.continuation?.source })
 			: undefined;
+	const continuationOrigin = opts.continuation !== undefined ? opts.continuation.source.origin : opts.origin;
 	const runSnapshot: RunSnapshot = {
 		id: runId,
 		name: def.name,
@@ -185,6 +186,15 @@ export async function run<TInputs extends WorkflowInputValues, TRunInputs extend
 					resumeFromStageId: opts.continuation.resumeFromStageId,
 				}
 			: {}),
+		// A continuation keeps the attribution of the run it continues rather than
+		// recomputing it, so resuming an agent-started run still reads as one the
+		// agent started. Only the resume itself is attributed to its requester.
+		...(continuationOrigin !== undefined ? { origin: continuationOrigin } : {}),
+		// A resumed run reports the resume that produced it, never a fresh start —
+		// whether it continues under a new id or reclaims the original one.
+		...(opts.resumeActor !== undefined
+			? { resumeActor: opts.resumeActor, resumeSource: "run_control" as const }
+			: {}),
 		...(inheritedElapsedMs !== undefined ? { accumulatedDurationMs: inheritedElapsedMs } : {}),
 	};
 	const classifiedFailures = new Map<unknown, WorkflowFailure>();
@@ -216,6 +226,7 @@ export async function run<TInputs extends WorkflowInputValues, TRunInputs extend
 			...(runSnapshot.parentStageId !== undefined ? { parentStageId: runSnapshot.parentStageId } : {}),
 			...(runSnapshot.rootRunId !== undefined ? { rootRunId: runSnapshot.rootRunId } : {}),
 			...(runSnapshot.resumedFromRunId !== undefined ? { resumedFromRunId: runSnapshot.resumedFromRunId } : {}),
+			...(runSnapshot.origin !== undefined ? { origin: runSnapshot.origin } : {}),
 			...(runSnapshot.resumeFromStageId !== undefined ? { resumeFromStageId: runSnapshot.resumeFromStageId } : {}),
 			...(runSnapshot.accumulatedDurationMs !== undefined
 				? { accumulatedDurationMs: runSnapshot.accumulatedDurationMs }
@@ -550,7 +561,12 @@ export async function run<TInputs extends WorkflowInputValues, TRunInputs extend
 					? undefined
 					: {
 							...durableRootRegistration,
-							...workflowInvocationMetadata(inputRuntimeDefaults, workflowInvocationCwd, gitWorktreeSetupCache),
+							...workflowInvocationMetadata(
+								inputRuntimeDefaults,
+								workflowInvocationCwd,
+								gitWorktreeSetupCache,
+								runSnapshot.origin,
+							),
 						},
 		});
 		if (opts.deferWorkflowStart === true) opts.onWorkflowStartReady?.();

package/dist/builtin/workflows/src/extension/atomic-stage-session.ts

@@ -3,11 +3,13 @@ import type {
 	CreateAgentSessionOptions,
 	DefaultResourceLoaderInheritanceSnapshot,
 	PackageSource,
+	SubagentChildPolicy,
 } from "@bastani/atomic";
 import type { StageSessionRuntime } from "../runs/foreground/stage-runner.js";
 
 export interface PiSdkSettingsManager {
 	getCodexFastModeSettings(): { readonly chat: boolean; readonly workflow: boolean };
+	getRetrySettings?(): { readonly enabled: boolean; readonly maxRetries: number; readonly baseDelayMs: number };
 }
 
 export interface PiSdkResourceLoader {
@@ -45,8 +47,20 @@ export type AtomicCreateAgentSessionOptions = Omit<
 
 export interface PrepareAtomicStageSessionOptions {
 	resourceLoaderInheritanceSnapshot?: DefaultResourceLoaderInheritanceSnapshot;
+	onSettingsManager?: (settingsManager: PiSdkSettingsManager) => void;
 }
-
+/**
+ * Workflow stages are top-level sessions that carry a policy object; they are
+ * not subagent children. They keep full management and are authorized to
+ * delegate, as `packages/coding-agent/docs/workflows.md` documents. Nesting
+ * stays bounded by the depth guard in the subagent executor.
+ */
+const WORKFLOW_STAGE_SUBAGENT_POLICY: SubagentChildPolicy = {
+	managementActions: "full",
+	fanoutAuthorized: true,
+	inheritProjectContext: true,
+	inheritSkills: true,
+};
 function resolveSessionCwd(options: AtomicCreateAgentSessionOptions | undefined): string {
 	return options?.cwd ?? options?.sessionManager?.getCwd() ?? process.cwd();
 }
@@ -87,6 +101,7 @@ export async function prepareAtomicStageSessionOptions(
 				? undefined
 				: { projectTrusted: inheritanceSnapshot.projectTrusted },
 		);
+	prepareOptions.onSettingsManager?.(settingsManager);
 	const inheritedBuiltinPackagePaths = inheritanceSnapshot?.builtinPackagePaths;
 	const builtinPackagePaths =
 		inheritedBuiltinPackagePaths === undefined
@@ -107,6 +122,7 @@ export async function prepareAtomicStageSessionOptions(
 		...(hasAgentDirOverride ? { agentDir } : {}),
 		settingsManager,
 		resourceLoader,
+		subagentPolicy: WORKFLOW_STAGE_SUBAGENT_POLICY,
 	};
 }
 
@@ -143,47 +159,10 @@ function stageBuiltinPackagePaths(paths: readonly PackageSource[]): PackageSourc
 	});
 }
 
-const SUBAGENT_CHILD_EXTENSION_ENV_KEYS = [
-	"ATOMIC_SUBAGENT_CHILD",
-	"ATOMIC_SUBAGENT_FANOUT_CHILD",
-	"PI_SUBAGENT_CHILD",
-	"PI_SUBAGENT_FANOUT_CHILD",
-] as const;
-
 let workflowStageResourceReloadQueue: Promise<void> = Promise.resolve();
 
 async function reloadWorkflowStageResources(resourceLoader: PiSdkResourceLoader): Promise<void> {
-	const queuedReload = workflowStageResourceReloadQueue.then(() =>
-		reloadWorkflowStageResourcesWithEnvIsolation(resourceLoader),
-	);
+	const queuedReload = workflowStageResourceReloadQueue.then(() => resourceLoader.reload());
 	workflowStageResourceReloadQueue = queuedReload.catch(() => undefined);
 	return queuedReload;
 }
-
-async function reloadWorkflowStageResourcesWithEnvIsolation(resourceLoader: PiSdkResourceLoader): Promise<void> {
-	// Workflow stage sessions are already governed by an orchestration context
-	// that disables recursive workflow tools and caps nested subagent depth. When
-	// a workflow itself runs inside a subagent child process, inherited subagent
-	// child env flags would otherwise make the bundled subagents extension skip
-	// registering its `subagent` tool before the stage session exists. Isolate
-	// extension discovery from those parent-process flags so an explicit
-	// `tools: ["subagent"]` allowlist works the same in workflow stages everywhere.
-	// The isolation mutates process-global env, so serialize the full
-	// save/delete/reload/restore section. Without this queue, overlapping workflow
-	// stage session creation can snapshot an already-cleared env and restore that
-	// stale snapshot after another reload restores the real parent values.
-	const previousValues = new Map<string, string | undefined>();
-	for (const key of SUBAGENT_CHILD_EXTENSION_ENV_KEYS) {
-		previousValues.set(key, process.env[key]);
-		delete process.env[key];
-	}
-	try {
-		await resourceLoader.reload();
-	} finally {
-		for (const key of SUBAGENT_CHILD_EXTENSION_ENV_KEYS) {
-			const previousValue = previousValues.get(key);
-			if (previousValue === undefined) delete process.env[key];
-			else process.env[key] = previousValue;
-		}
-	}
-}

package/dist/builtin/workflows/src/extension/companions.ts

@@ -65,7 +65,7 @@ export const COMPANIONS: readonly CompanionSpec[] = [
 		installSpec: "npm:pi-subagents",
 		purpose: "delegate stages to focused child agents",
 		pathHints: ["/pi-subagents/", "/pi-subagents-", "/pi-subagents."],
-		commandHints: ["subagents-doctor", "run", "chain", "parallel", "run-chain"],
+		commandHints: ["subagents-doctor", "run", "parallel"],
 		toolHints: ["subagent"],
 	},
 	{

package/dist/builtin/workflows/src/extension/config-file-loader.ts

@@ -2,6 +2,15 @@ import type { ConfigDiagnostic, WorkflowExtensionConfig } from "./config-loader.
 import { WORKFLOW_LIFECYCLE_NOTICE_KINDS, type WorkflowLifecycleNoticeKind } from "./lifecycle-notifications.js";
 
 const WORKFLOW_LIFECYCLE_NOTICE_KIND_SET = new Set<string>(WORKFLOW_LIFECYCLE_NOTICE_KINDS);
+/**
+ * Every accepted lifecycle kind, quoted for the rejection message, so adding a
+ * kind can never leave the error naming a stale subset of what validates.
+ */
+const WORKFLOW_LIFECYCLE_NOTICE_KIND_LIST = ((): string => {
+	const quoted = WORKFLOW_LIFECYCLE_NOTICE_KINDS.map((kind) => JSON.stringify(kind));
+	const last = quoted[quoted.length - 1] ?? "";
+	return quoted.length <= 1 ? last : `${quoted.slice(0, -1).join(", ")}, or ${last}`;
+})();
 
 async function tryReadFile(filePath: string): Promise<string | null> {
 	const { readFile } = await import("node:fs/promises");
@@ -73,7 +82,7 @@ function validateConfig(value: unknown): string | null {
 			}
 			for (const item of notifyOn) {
 				if (!isWorkflowLifecycleNoticeKind(item)) {
-					return `"workflowNotifications.notifyOn" entries must be "completed", "failed", "blocked", or "awaiting_input", got ${JSON.stringify(item)}`;
+					return `"workflowNotifications.notifyOn" entries must be ${WORKFLOW_LIFECYCLE_NOTICE_KIND_LIST}, got ${JSON.stringify(item)}`;
 				}
 			}
 		}

package/dist/builtin/workflows/src/extension/config-loader.ts

@@ -186,7 +186,7 @@ export const WORKFLOW_CONFIG_DEFAULTS = {
 	resumeInFlight: "ask" as const,
 	workflowNotifications: {
 		enabled: true,
-		notifyOn: ["completed", "failed", "blocked", "awaiting_input"] as const,
+		notifyOn: ["started", "completed", "failed", "blocked", "awaiting_input", "paused", "quit", "resumed"] as const,
 	},
 	worktree: {
 		symlinkDirectories: ["node_modules"] as readonly string[],

package/dist/builtin/workflows/src/extension/dispatcher.ts

@@ -16,6 +16,7 @@ import type { StageAdapters } from "../runs/foreground/stage-runner.js";
 import { effectiveRunStatus } from "../shared/returned-run-status.js";
 import { deriveInputFields, schemaIsRequired } from "../shared/schema-introspection.js";
 import { store as defaultStore, type Store } from "../shared/store.js";
+import type { WorkflowActor } from "../shared/store-types.js";
 import {
 	INTERACTIVE_WORKFLOW_POLICY,
 	type WorkflowExecutionPolicy,
@@ -82,6 +83,8 @@ export interface DispatcherOpts {
 	models?: WorkflowModelCatalogPort;
 	/** Runtime-derived interaction policy for this dispatch. */
 	policy?: WorkflowExecutionPolicy;
+	/** Who launched this run. Omitted when the launcher is not attributable. */
+	origin?: WorkflowActor;
 	/** Invocation cwd used for workflow execution. */
 	cwd?: string;
 	/** Host-resolved non-default session directory inherited by stages without explicit sessionDir. */
@@ -187,6 +190,7 @@ export async function dispatch(args: WorkflowToolArgs, opts: DispatcherOpts): Pr
 					executionMode: policy.mode,
 					cwd: opts.cwd,
 					defaultSessionDir: opts.defaultSessionDir,
+					...(opts.origin === undefined ? {} : { origin: opts.origin }),
 					runId,
 				});
 			} catch (error) {