@bastani/atomic 0.8.29-alpha.4 → 0.8.30-alpha.1

package/dist/builtin/subagents/src/runs/shared/subagent-control.ts

@@ -163,16 +163,6 @@ function formatLongRunningFacts(event: ControlEvent): string | undefined {
 
 export function formatControlNoticeMessage(event: ControlEvent, childIntercomTarget?: string): string {
 	const runTarget = event.runId;
-	if (event.reason === "completion_guard") {
-		return [
-			`Subagent failed: ${event.agent}`,
-			`Run: ${runTarget}${event.index !== undefined ? ` step ${event.index + 1}` : ""}`,
-			`Signal: ${event.message}`,
-			"Next: read the output artifact or session from the subagent result, then retry with a more explicit implementation prompt or handle the fix directly.",
-			childIntercomTarget ? `Run intercom target (may be inactive): ${childIntercomTarget}` : undefined,
-		].filter((line): line is string => Boolean(line)).join("\n");
-	}
-
 	const nudgeCommand = childIntercomTarget
 		? `intercom({ action: "send", to: "${childIntercomTarget}", message: "What are you blocked on? Reply with the smallest next step or ask for a decision." })`
 		: undefined;
@@ -207,19 +197,15 @@ export function formatControlNoticeMessage(event: ControlEvent, childIntercomTar
 }
 
 export function formatControlIntercomMessage(event: ControlEvent, childIntercomTarget?: string): string {
-	const statusLabel = event.reason === "completion_guard"
-		? "subagent failed"
-		: event.type === "active_long_running"
-			? "subagent active but long-running"
-			: "subagent needs attention";
+	const statusLabel = event.type === "active_long_running"
+		? "subagent active but long-running"
+		: "subagent needs attention";
 	return [
 		statusLabel,
 		"",
-		event.reason === "completion_guard"
-			? `${event.agent} failed in run ${event.runId}.`
-			: event.type === "active_long_running"
-				? `${event.agent} is still active but long-running in run ${event.runId}.`
-				: `${event.agent} needs attention in run ${event.runId}.`,
+		event.type === "active_long_running"
+			? `${event.agent} is still active but long-running in run ${event.runId}.`
+			: `${event.agent} needs attention in run ${event.runId}.`,
 		"",
 		formatControlNoticeMessage(event, childIntercomTarget),
 	].join("\n");

package/dist/builtin/subagents/src/runs/shared/subagent-prompt-runtime.ts

@@ -21,7 +21,7 @@ export const CHILD_SUBAGENT_BOUNDARY_INSTRUCTIONS = [
 
 export const CHILD_FANOUT_BOUNDARY_INSTRUCTIONS = [
 	"You are a child subagent with explicit fanout responsibility for this assigned task.",
-	"The parent session owns final orchestration, acceptance, and follow-up implementation launches.",
+	"The parent session owns final orchestration, completion decisions, and follow-up implementation launches.",
 	"You may use the `subagent` tool only for the fanout work explicitly requested in this task.",
 	"Do not broaden yourself into general parent orchestration. Do not launch follow-up workers unless the task explicitly asks for that.",
 	"The maxSubagentDepth cap still applies and may block further fanout.",

package/dist/builtin/subagents/src/runs/shared/workflow-graph.ts

@@ -5,12 +5,12 @@ export interface WorkflowGraphBuildInput {
 	runId: string;
 	mode?: SubagentRunMode;
 	steps: ChainStep[];
-	results?: Array<Pick<SingleResult, "exitCode" | "detached" | "interrupted" | "error" | "acceptance">>;
+	results?: Array<Pick<SingleResult, "exitCode" | "detached" | "interrupted" | "error">>;
 	currentFlatIndex?: number;
 	currentStepIndex?: number;
 	stepStatuses?: Array<{ status?: string; error?: string }>;
 	dynamicChildren?: Record<number, Array<{ agent: string; label?: string; flatIndex: number; itemKey: string; outputName?: string; structured?: boolean; error?: string }>>;
-	dynamicGroupStatuses?: Record<number, { status: WorkflowNodeStatus; error?: string; acceptance?: SingleResult["acceptance"] }>;
+	dynamicGroupStatuses?: Record<number, { status: WorkflowNodeStatus; error?: string }>;
 }
 
 function normalizeStatus(status: string | undefined): WorkflowNodeStatus | undefined {
@@ -98,7 +98,6 @@ export function buildWorkflowGraphSnapshot(input: WorkflowGraphBuildInput): Work
 					stepIndex,
 					outputName: task.as,
 					structured: Boolean(task.outputSchema),
-					acceptanceStatus: input.results?.[flatIndex]?.acceptance?.status,
 					error: input.stepStatuses?.[flatIndex]?.error ?? input.results?.[flatIndex]?.error,
 				};
 				children.push(child);
@@ -142,7 +141,6 @@ export function buildWorkflowGraphSnapshot(input: WorkflowGraphBuildInput): Work
 					itemKey: task.itemKey,
 					outputName: task.outputName,
 					structured: task.structured,
-					acceptanceStatus: input.results?.[task.flatIndex]?.acceptance?.status,
 					error: input.stepStatuses?.[task.flatIndex]?.error ?? input.results?.[task.flatIndex]?.error ?? task.error,
 				};
 				children.push(child);
@@ -159,7 +157,6 @@ export function buildWorkflowGraphSnapshot(input: WorkflowGraphBuildInput): Work
 				stepIndex,
 				outputName: step.collect.as,
 				structured: Boolean(step.collect.outputSchema),
-				acceptanceStatus: groupOverride?.acceptance?.status,
 				error: groupOverride?.error,
 				dynamic: {
 					sourceOutput: step.expand.from.output,
@@ -188,7 +185,6 @@ export function buildWorkflowGraphSnapshot(input: WorkflowGraphBuildInput): Work
 			stepIndex,
 			outputName: seq.as,
 			structured: Boolean(seq.outputSchema),
-			acceptanceStatus: input.results?.[flatIndex]?.acceptance?.status,
 			error: input.stepStatuses?.[flatIndex]?.error ?? input.results?.[flatIndex]?.error,
 		});
 		pushPhase(phases, seq.phase, id);

package/dist/builtin/subagents/src/shared/settings.ts

@@ -6,7 +6,7 @@ import * as fs from "node:fs";
 import * as path from "node:path";
 import type { AgentConfig } from "../agents/agents.ts";
 import { normalizeSkillInput } from "../agents/skills.ts";
-import { CHAIN_RUNS_DIR, type AcceptanceInput, type JsonSchemaObject, type OutputMode } from "./types.ts";
+import { CHAIN_RUNS_DIR, type JsonSchemaObject, type OutputMode } from "./types.ts";
 const CHAIN_DIR_MAX_AGE_MS = 24 * 60 * 60 * 1000; // 24 hours
 const INITIAL_PROGRESS_CONTENT = "# Progress\n\n## Status\nIn Progress\n\n## Tasks\n\n## Files Changed\n\n## Notes\n";
 
@@ -55,7 +55,6 @@ export interface SequentialStep {
 	progress?: boolean;
 	skill?: string | string[] | false;
 	model?: string;
-	acceptance?: AcceptanceInput;
 }
 
 /** Parallel task item within a parallel step */
@@ -74,7 +73,6 @@ export interface ParallelTaskItem {
 	progress?: boolean;
 	skill?: string | string[] | false;
 	model?: string;
-	acceptance?: AcceptanceInput;
 }
 
 export interface DynamicExpandSpec {
@@ -103,7 +101,6 @@ export interface DynamicParallelStep {
 	failFast?: boolean;
 	phase?: string;
 	label?: string;
-	acceptance?: AcceptanceInput;
 }
 
 /** Parallel step: multiple agents running concurrently */

package/dist/builtin/subagents/src/shared/types.ts

@@ -59,7 +59,6 @@ export interface WorkflowGraphNode {
 	itemKey?: string;
 	outputName?: string;
 	structured?: boolean;
-	acceptanceStatus?: AcceptanceLedgerStatus;
 	error?: string;
 }
 
@@ -138,7 +137,7 @@ export interface ControlEvent {
 	nestedRunId?: string;
 	nestingPath?: NestedRunAddress["path"];
 	message: string;
-	reason?: "idle" | "completion_guard" | "active_long_running" | "tool_failures" | "time_threshold" | "turn_threshold" | "token_threshold";
+	reason?: "idle" | "active_long_running" | "tool_failures" | "time_threshold" | "turn_threshold" | "token_threshold";
 	turns?: number;
 	tokens?: number;
 	toolCount?: number;
@@ -247,151 +246,6 @@ export interface ModelAttempt {
 	usage?: Usage;
 }
 
-export type AcceptanceLevel = "auto" | "none" | "attested" | "checked" | "verified" | "reviewed";
-
-export type AcceptanceEvidenceKind =
-	| "changed-files"
-	| "tests-added"
-	| "commands-run"
-	| "validation-output"
-	| "residual-risks"
-	| "no-staged-files"
-	| "diff-summary"
-	| "review-findings"
-	| "manual-notes";
-
-export interface AcceptanceGate {
-	id: string;
-	must: string;
-	evidence?: AcceptanceEvidenceKind[];
-	severity?: "required" | "recommended";
-}
-
-export interface AcceptanceVerifyCommand {
-	id: string;
-	command: string;
-	timeoutMs?: number;
-	cwd?: string;
-	env?: Record<string, string>;
-	allowFailure?: boolean;
-}
-
-export interface AcceptanceReviewGate {
-	agent?: string;
-	focus?: string;
-	required?: boolean;
-}
-
-export interface AcceptanceConfig {
-	level?: AcceptanceLevel;
-	criteria?: Array<string | AcceptanceGate>;
-	evidence?: AcceptanceEvidenceKind[];
-	verify?: AcceptanceVerifyCommand[];
-	review?: AcceptanceReviewGate | false;
-	stopRules?: string[];
-	reason?: string;
-}
-
-export type AcceptanceInput = AcceptanceLevel | false | AcceptanceConfig;
-
-export interface ResolvedAcceptanceGate extends AcceptanceGate {
-	id: string;
-	must: string;
-	evidence: AcceptanceEvidenceKind[];
-	severity: "required" | "recommended";
-}
-
-export interface ResolvedAcceptanceConfig {
-	level: Exclude<AcceptanceLevel, "auto">;
-	explicit: boolean;
-	inferredReason: string[];
-	criteria: ResolvedAcceptanceGate[];
-	evidence: AcceptanceEvidenceKind[];
-	verify: AcceptanceVerifyCommand[];
-	review?: AcceptanceReviewGate | false;
-	stopRules: string[];
-	reason?: string;
-}
-
-export interface AcceptanceReport {
-	criteriaSatisfied?: Array<{
-		id?: string;
-		status: "satisfied" | "not-satisfied" | "not-applicable";
-		evidence: string;
-	}>;
-	changedFiles?: string[];
-	testsAddedOrUpdated?: string[];
-	commandsRun?: Array<{
-		command: string;
-		result: "passed" | "failed" | "not-run";
-		summary: string;
-	}>;
-	validationOutput?: string[];
-	residualRisks?: string[];
-	noStagedFiles?: boolean;
-	diffSummary?: string;
-	reviewFindings?: string[];
-	manualNotes?: string;
-	notes?: string;
-}
-
-export type AcceptanceRuntimeCheckStatus = "passed" | "failed" | "not-applicable";
-
-export interface AcceptanceRuntimeCheck {
-	id: string;
-	status: AcceptanceRuntimeCheckStatus;
-	message: string;
-}
-
-export interface AcceptanceVerifyResult {
-	id: string;
-	command: string;
-	cwd?: string;
-	exitCode: number | null;
-	status: "passed" | "failed" | "timed-out" | "allowed-failure";
-	stdout?: string;
-	stderr?: string;
-	durationMs: number;
-}
-
-export interface AcceptanceReviewResult {
-	status: "no-blockers" | "blockers" | "needs-parent-decision";
-	findings: Array<{
-		severity: "blocker" | "non-blocking";
-		file?: string;
-		issue: string;
-		rationale: string;
-	}>;
-}
-
-export type AcceptanceLedgerStatus =
-	| "not-required"
-	| "claimed"
-	| "attested"
-	| "checked"
-	| "verified"
-	| "reviewed"
-	| "accepted"
-	| "rejected";
-
-export interface AcceptanceLedger {
-	status: AcceptanceLedgerStatus;
-	explicit: boolean;
-	effectiveAcceptance: ResolvedAcceptanceConfig;
-	inferredReason: string[];
-	criteria: ResolvedAcceptanceGate[];
-	childReport?: AcceptanceReport;
-	childReportParseError?: string;
-	runtimeChecks: AcceptanceRuntimeCheck[];
-	verifyRuns: AcceptanceVerifyResult[];
-	reviewResult?: AcceptanceReviewResult;
-	parentDecision?: {
-		status: "accepted" | "rejected";
-		at: string;
-		reason?: string;
-	};
-}
-
 export interface SingleResult {
 	agent: string;
 	task: string;
@@ -423,7 +277,6 @@ export interface SingleResult {
 	structuredOutput?: unknown;
 	structuredOutputPath?: string;
 	structuredOutputSchemaPath?: string;
-	acceptance?: AcceptanceLedger;
 }
 
 export interface Details {
@@ -627,7 +480,6 @@ export interface AsyncStatus {
 		structuredOutput?: unknown;
 		structuredOutputPath?: string;
 		structuredOutputSchemaPath?: string;
-		acceptance?: AcceptanceLedger;
 	}>;
 	sessionDir?: string;
 	outputFile?: string;
@@ -804,13 +656,6 @@ export interface RunSyncOptions {
 		schemaPath: string;
 		outputPath: string;
 	};
-	acceptance?: AcceptanceInput;
-	acceptanceContext?: {
-		mode?: SubagentRunMode;
-		async?: boolean;
-		dynamic?: boolean;
-		dynamicGroup?: boolean;
-	};
 }
 
 export type IntercomBridgeMode = "off" | "fork-only" | "always";

package/dist/builtin/subagents/src/tui/render.ts

@@ -306,7 +306,6 @@ function resultStatusLine(result: Details["results"][number], output: string): s
 	if (result.detached) return result.detachedReason ? `Detached: ${result.detachedReason}` : "Detached";
 	if (result.interrupted) return "Paused";
 	if (result.exitCode !== 0) return `Error: ${result.error ?? (firstOutputLine(output) || `exit ${result.exitCode}`)}`;
-	if (result.acceptance?.status && result.acceptance.status !== "not-required") return `Done · acceptance: ${result.acceptance.status}`;
 	if (hasEmptyTextOutputWithoutOutputTarget(result.task, output)) return "Done (no text output)";
 	return "Done";
 }

package/dist/builtin/web-access/CHANGELOG.md

@@ -6,7 +6,13 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 
-- Published a synchronized Atomic 0.8.29-alpha.4 prerelease with the upstream pi TUI dependency aligned to `^0.79.3`; no functional changes were made in the web-access extension.
+- Aligned the web-access extension peer dependency with upstream pi TUI `^0.79.4`; no web-access extension code changes were made.
+
+## [0.8.29] - 2026-06-15
+
+### Changed
+
+- Published a synchronized Atomic 0.8.29 stable release with the upstream pi TUI dependency aligned to `^0.79.3`; no functional changes were made in the web-access extension.
 
 ## [0.8.28] - 2026-06-11
 

package/dist/builtin/web-access/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bastani/web-access",
-  "version": "0.8.29-alpha.4",
+  "version": "0.8.30-alpha.1",
   "private": true,
   "description": "Atomic extension for web search, URL fetching, GitHub repo cloning, PDF/video extraction. Fork of: https://github.com/nicobailon/pi-web-access",
   "contributors": [
@@ -30,7 +30,7 @@
   },
   "peerDependencies": {
     "@bastani/atomic": "*",
-    "@earendil-works/pi-tui": "^0.79.3"
+    "@earendil-works/pi-tui": "^0.79.4"
   },
   "peerDependenciesMeta": {
     "@bastani/atomic": {

package/dist/builtin/workflows/CHANGELOG.md

@@ -6,6 +6,19 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 
 ## [Unreleased]
 
+### Changed
+
+- Aligned the workflows extension peer dependency with upstream pi TUI `^0.79.4` so workflow graph, custom UI, and prompt-broker integrations consume the latest shared TUI fixes; no workflows extension code changes were made for this metadata sync.
+
+### Fixed
+
+- Fixed workflow stage sessions for workflows loaded through `atomic -e` to build fresh child resource loaders from the parent Atomic resource snapshot, preserving custom extensions/tools, subagents and agent definitions, skills, prompt templates, themes, packages, workflows, trusted borrowed project-local resources, explicit `resourceLoader` overrides, and recursive workflow-extension filtering.
+- Fixed schema-backed workflow stages to send up to three corrective follow-up prompts when a turn finishes without the required `structured_output` call or with an invalid `structured_output` call, echoing the concrete contract/validation error before failing the stage.
+- Fixed failed workflow stages to retain and persist SDK `sessionId`/`sessionFile` metadata, so post-error transcript inspection and follow-up messaging resume from the failed conversation instead of silently creating a fresh empty session.
+- Fixed schema-backed workflow stages with `noTools: "all"` to keep the restrictive allowlist while still exposing the required `structured_output` final-answer tool.
+
+## [0.8.29] - 2026-06-15
+
 ### Added
 
 - Added opt-in schema-backed workflow item results: `ctx.stage(..., { schema })`, `ctx.task(..., { schema })`, `ctx.chain` items, and `ctx.parallel` items now receive a schema-specific `structured_output` tool only for that item, return the captured value from `ctx.stage().prompt(...)`, and expose parsed task values as `result.structured` while preserving formatted JSON handoff text ([#1350](https://github.com/bastani-inc/atomic/issues/1350)).

package/dist/builtin/workflows/README.md

@@ -280,7 +280,7 @@ const decision = await ctx.stage("review-gate", { schema: Decision }).prompt(
 // decision.approved is typed from the schema.
 ```
 
-Atomic registers the canonical `structured_output` tool only for schema-enabled items and automatically adds it to explicit `tools` allowlists. The schema is used directly as the tool argument contract. A schema-backed `StageContext` supports one `prompt()` call because the final-answer tool is a single result contract; create another `ctx.stage(..., { schema })` for another structured prompt. `ctx.task`/`ctx.chain`/`ctx.parallel` results expose the captured value as `result.structured` and keep `result.text` as formatted JSON for handoffs.
+Atomic registers the canonical `structured_output` tool only for schema-enabled items and automatically adds it to explicit `tools` allowlists. The schema is used directly as the tool argument contract. A schema-backed `StageContext` supports one `prompt()` call because the final-answer tool is a single result contract; create another `ctx.stage(..., { schema })` for another structured prompt. If a turn completes without calling `structured_output`, or the tool call fails schema validation, Atomic sends up to three corrective follow-up prompts that include the exact contract/validation error before failing the item. `ctx.task`/`ctx.chain`/`ctx.parallel` results expose the captured value as `result.structured` and keep `result.text` as formatted JSON for handoffs.
 
 `subagent` is available as a default workflow-stage tool with the same default two-hop nesting budget as main chat: a stage can launch a subagent, and that child can launch one nested subagent before the guard blocks further delegation. `tools` allowlists apply to bundled extension tools as well as built-ins; if a stage sets `tools`, list every tool it should see. Workflow stages can explicitly list `subagent`, `web_search`, `fetch_content`, `intercom`, and other loaded extension tools, while `excludedTools` and `noTools: "all"` still win. Bundled `@bastani/subagents` agent definitions are available to the `subagent` tool in workflow stages, including workflows launched from a subagent child process.
 
@@ -529,7 +529,7 @@ Prompt answer replay is live-memory only. `StageSnapshot.promptAnswerState` repo
 - **`renderCall`** — renders a compact workflow call summary in the chat scroll.
 - **`renderResult`** — renders the result or dispatch banner; live progress continues through the widget and graph viewer. Named workflow runs are background-oriented.
 - **`transcript`** — path-only by default when a transcript file exists: use `status`, `stages`, or `stage` to identify the stage and its `sessionFile`/`transcriptPath`, quote the exact path without changing platform separators (for example, preserve Windows backslashes), then search that file with `rg`/`grep` for targeted terms and read only small surrounding ranges. Default text results include JSON-escaped `sessionFileJson`/`transcriptPathJson` lines for copy-safe path literals plus a `lazyReadPrompt`, with `entries: not inlined` so transcript bodies and tool outputs stay out of model context. Passing explicit `tail` or `limit` opts into a bounded inline preview for quick context checks. If no transcript path is available, the action falls back to a bounded preview of up to 5 recent entries with a `fallbackNote`. A registered live stage handle is used when one exists, even before live messages arrive; otherwise the action falls back to stored stage snapshots. Snapshot entries are ordered chronologically before `tail`/`limit` is applied, with terminal result/error entries kept after tool entries when timestamps are missing or tied. `includeToolOutput` applies only to inlined snapshot previews or no-path fallback previews; live session transcripts may not expose tool output.
-- **`send`** — answers pending primitive/structured stage prompts only when `text`, `response`, or `message` is present; an explicit empty string is a valid answer, while an omitted payload is a no-op. Arbitrary `ctx.ui.custom<T>` widget prompts require the interactive workflow graph and return a clear unsupported message when targeted through `send`. `delivery: "auto"` answers pending prompts first, then resumes paused stages, steers streaming stages, or queues a follow-up.
+- **`send`** — answers pending primitive/structured stage prompts only when `text`, `response`, or `message` is present; an explicit empty string is a valid answer, while an omitted payload is a no-op. Follow-ups to completed or failed stages reuse retained `sessionFile` metadata when available so the conversation resumes from the archived stage transcript instead of starting empty; if no session metadata was retained, the follow-up is refused instead of silently resetting. Arbitrary `ctx.ui.custom<T>` widget prompts require the interactive workflow graph and return a clear unsupported message when targeted through `send`. `delivery: "auto"` answers pending prompts first, then resumes paused stages, steers streaming stages, or queues a follow-up.
 - **`reload`** — refreshes workflow resources directly in-process instead of queuing a literal `/workflow reload` chat follow-up.
 
 ### F2 keyboard shortcut

package/dist/builtin/workflows/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bastani/workflows",
-  "version": "0.8.29-alpha.4",
+  "version": "0.8.30-alpha.1",
   "private": true,
   "description": "Atomic extension for multi-stage workflow authoring and execution.",
   "contributors": [
@@ -83,7 +83,7 @@
   },
   "peerDependencies": {
     "@bastani/atomic": "*",
-    "@earendil-works/pi-tui": "^0.79.3"
+    "@earendil-works/pi-tui": "^0.79.4"
   },
   "peerDependenciesMeta": {
     "@bastani/atomic": {

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

@@ -120,7 +120,12 @@ import {
   stageMatchesExpandedIdentifier,
 } from "../shared/expanded-workflow-graph.js";
 import { topLevelWorkflowRuns } from "../shared/run-visibility.js";
-import { WORKFLOW_STAGE_SUBAGENT_GUARD_ENV, getEnvValue, type CreateAgentSessionOptions } from "@bastani/atomic";
+import {
+  WORKFLOW_STAGE_SUBAGENT_GUARD_ENV,
+  getEnvValue,
+  type CreateAgentSessionOptions,
+  type DefaultResourceLoaderInheritanceSnapshot,
+} from "@bastani/atomic";
 
 export const WORKFLOW_TOOL_DESCRIPTION =
   "Run named workflows or direct one-off task/tasks/chain workflows; " +
@@ -377,6 +382,8 @@ export interface ExtensionAPI {
   getWorkflowResources?: () => readonly WorkflowResourceInfo[];
   /** Refresh package-provided workflow files before rediscovery, when supported by host. */
   refreshWorkflowResources?: () => Promise<readonly WorkflowResourceInfo[]>;
+  /** Return resource-loader options child Atomic workflow stages should inherit. */
+  getResourceLoaderInheritanceSnapshot?: () => DefaultResourceLoaderInheritanceSnapshot | undefined;
   /**
    * Register a keyboard shortcut.
    * Present on pi >= 1.x; absent on older runtimes.

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

@@ -22,7 +22,12 @@
  */
 
 import { basename } from "node:path";
-import type { ChatMessageRenderOptions, CreateAgentSessionOptions, PackageSource } from "@bastani/atomic";
+import type {
+  ChatMessageRenderOptions,
+  CreateAgentSessionOptions,
+  DefaultResourceLoaderInheritanceSnapshot,
+  PackageSource,
+} from "@bastani/atomic";
 import type { StageAdapters, StageSessionCreateResult, StageSessionRuntime } from "../runs/foreground/stage-runner.js";
 import type { StageExecutionMeta, StageOptions } from "../shared/types.js";
 import { stageUiBroker, type StageUiBroker } from "../shared/stage-ui-broker.js";
@@ -55,6 +60,8 @@ export interface PiExecOpts {
 export interface RuntimeWiringSurface {
   exec?: (command: string, args: string[], opts?: PiExecOpts) => Promise<PiExecResult>;
   ui?: PiUISurface;
+  /** Resource-loader inheritance snapshot supplied by Atomic's ExtensionAPI. */
+  getResourceLoaderInheritanceSnapshot?: () => DefaultResourceLoaderInheritanceSnapshot | undefined;
   /** Test seam: inject a stub session factory instead of importing the SDK. */
   createAgentSession?: (options?: CreateAgentSessionOptions) => Promise<StageSessionCreateResult>;
 }
@@ -103,13 +110,14 @@ export interface PiCodingAgentSdk {
   getAgentDir(): string;
   getBuiltinPackagePaths?: () => string[];
   SettingsManager: {
-    create(cwd?: string, agentDir?: string): PiSdkSettingsManager;
+    create(cwd?: string, agentDir?: string, options?: { projectTrusted?: boolean }): PiSdkSettingsManager;
   };
   DefaultResourceLoader: new (options: {
     cwd: string;
     agentDir: string;
     settingsManager?: PiSdkSettingsManager;
     builtinPackagePaths?: PackageSource[];
+    resourceLoaderInheritanceSnapshot?: DefaultResourceLoaderInheritanceSnapshot;
   }) => PiSdkResourceLoader;
   createAgentSession(options?: AtomicCreateAgentSessionOptions): Promise<{ session: StageSessionRuntime }>;
 }
@@ -119,6 +127,10 @@ type AtomicCreateAgentSessionOptions = Omit<CreateAgentSessionOptions, "settings
   sessionManager?: PiSdkSessionManager;
 };
 
+export interface PrepareAtomicStageSessionOptions {
+  resourceLoaderInheritanceSnapshot?: DefaultResourceLoaderInheritanceSnapshot;
+}
+
 function resolveSessionCwd(options: AtomicCreateAgentSessionOptions | undefined): string {
   return options?.cwd ?? options?.sessionManager?.getCwd() ?? process.cwd();
 }
@@ -141,20 +153,33 @@ function resolveSessionCwd(options: AtomicCreateAgentSessionOptions | undefined)
 export async function prepareAtomicStageSessionOptions(
   options: CreateAgentSessionOptions | undefined,
   sdk: PiCodingAgentSdk,
+  prepareOptions: PrepareAtomicStageSessionOptions = {},
 ): Promise<AtomicCreateAgentSessionOptions | undefined> {
   const atomicOptions = options as AtomicCreateAgentSessionOptions | undefined;
   if (atomicOptions?.resourceLoader !== undefined) return atomicOptions;
 
+  const inheritanceSnapshot = prepareOptions.resourceLoaderInheritanceSnapshot;
   const cwd = resolveSessionCwd(atomicOptions);
   const hasAgentDirOverride = atomicOptions?.agentDir !== undefined;
   const agentDir = atomicOptions?.agentDir ?? sdk.getAgentDir();
   const settingsManager =
-    atomicOptions?.settingsManager ?? sdk.SettingsManager.create(cwd, agentDir);
+    atomicOptions?.settingsManager ?? sdk.SettingsManager.create(
+      cwd,
+      agentDir,
+      inheritanceSnapshot?.projectTrusted === undefined
+        ? undefined
+        : { projectTrusted: inheritanceSnapshot.projectTrusted },
+    );
+  const inheritedBuiltinPackagePaths = inheritanceSnapshot?.builtinPackagePaths;
+  const builtinPackagePaths = inheritedBuiltinPackagePaths === undefined
+    ? sdk.getBuiltinPackagePaths?.() ?? []
+    : [...inheritedBuiltinPackagePaths];
   const resourceLoader = new sdk.DefaultResourceLoader({
     cwd,
     agentDir,
     settingsManager,
-    builtinPackagePaths: stageBuiltinPackagePaths(sdk.getBuiltinPackagePaths?.() ?? []),
+    resourceLoaderInheritanceSnapshot: inheritanceSnapshot,
+    builtinPackagePaths: stageBuiltinPackagePaths(builtinPackagePaths),
   });
   await reloadWorkflowStageResources(resourceLoader);
 
@@ -167,15 +192,39 @@ export async function prepareAtomicStageSessionOptions(
   };
 }
 
-function stageBuiltinPackagePaths(paths: readonly string[]): PackageSource[] {
+function clonePackageSource(source: PackageSource): PackageSource {
+  if (typeof source === "string") return source;
+  return {
+    source: source.source,
+    ...(source.extensions === undefined ? {} : { extensions: [...source.extensions] }),
+    ...(source.skills === undefined ? {} : { skills: [...source.skills] }),
+    ...(source.prompts === undefined ? {} : { prompts: [...source.prompts] }),
+    ...(source.themes === undefined ? {} : { themes: [...source.themes] }),
+    ...(source.workflows === undefined ? {} : { workflows: [...source.workflows] }),
+  };
+}
+
+function packageSourcePath(source: PackageSource): string {
+  return typeof source === "string" ? source : source.source;
+}
+
+function disablePackageExtensions(source: PackageSource): PackageSource {
+  if (typeof source === "string") return { source, extensions: [] };
+  return { ...source, extensions: [] };
+}
+
+function stageBuiltinPackagePaths(paths: readonly PackageSource[]): PackageSource[] {
   // Workflow stages are child AgentSessions owned by the workflow extension.
   // Loading the workflows extension again inside that child session replays its
   // `session_start` lifecycle and clears/kills the parent workflow store. Keep
   // the workflows package itself so its bundled skills/prompts/resources remain
   // available, but disable only its extension entry for stage sessions.
-  return paths.map((path) =>
-    basename(path) === "workflows" ? { source: path, extensions: [] } : path,
-  );
+  return paths.map((path) => {
+    const cloned = clonePackageSource(path);
+    return basename(packageSourcePath(cloned)) === "workflows"
+      ? disablePackageExtensions(cloned)
+      : cloned;
+  });
 }
 
 const SUBAGENT_CHILD_EXTENSION_ENV_KEYS = [
@@ -225,9 +274,10 @@ async function reloadWorkflowStageResourcesWithEnvIsolation(resourceLoader: PiSd
 
 async function createPiSdkAgentSession(
   options?: CreateAgentSessionOptions,
+  prepareOptions?: PrepareAtomicStageSessionOptions,
 ): Promise<StageSessionCreateResult> {
   const sdk = await import("@bastani/atomic") as PiCodingAgentSdk;
-  const sessionOptions = await prepareAtomicStageSessionOptions(options, sdk);
+  const sessionOptions = await prepareAtomicStageSessionOptions(options, sdk, prepareOptions);
   const result = await sdk.createAgentSession(sessionOptions);
   // `CreateAgentSessionResult` is `{ session, extensionsResult, modelFallbackMessage? }`;
   // workflow stages only consume `.session` (structurally an `AgentSession`,
@@ -275,6 +325,7 @@ async function createTestAgentSession(_options?: CreateAgentSessionOptions): Pro
     async compact(): ReturnType<StageSessionRuntime["compact"]> {
       return {
         promptVersion: 1,
+        parameters: { compression_ratio: 0.5, preserve_recent: 2, query: "auto-detected" },
         deletedTargets: [],
         protectedEntryIds: [],
         stats: {
@@ -419,7 +470,12 @@ export function buildRuntimeAdapters(
   const createSession =
     options.createAgentSession ??
     pi.createAgentSession ??
-    (isTestContext() ? createTestAgentSession : createPiSdkAgentSession);
+    (isTestContext()
+      ? createTestAgentSession
+      : (sessionOptions?: CreateAgentSessionOptions) =>
+        createPiSdkAgentSession(sessionOptions, {
+          resourceLoaderInheritanceSnapshot: pi.getResourceLoaderInheritanceSnapshot?.(),
+        }));
   const broker = options.stageUiBroker ?? stageUiBroker;
   const adapters: StageAdapters = {
     agentSession: {