@rivus/runtime 0.16.6 → 0.18.0

package/dist/pi.js

@@ -1,14 +1,16 @@
-import { a as requiresToolApproval, l as normalizeAgentInvocation, r as createToolInputDigest$1, s as createInvocationAuthority } from "./chunks/tool-input-digest.js";
-import { _ as createAgentLoopToolExecutionStart, d as createAgentLoopModelExecutionStart, f as createAgentLoopSkillExecutionEnd, g as createAgentLoopToolExecutionEnd, h as createAgentLoopThinkingDelta, l as toEffectAgentLoopInput, m as createAgentLoopTextDelta, o as fromEffectAgentLoop, p as createAgentLoopSkillExecutionStart, s as toCompatibilityAgentLoopInput, u as createAgentLoopModelExecutionEnd, v as createAgentLoopToolExecutionUpdate } from "./chunks/agent-loop.js";
+import { a as createInvocationAuthority, r as createToolInputDigest$1, s as normalizeAgentInvocation, t as requiresToolApproval } from "./chunks/tool-risk-policy.js";
+import { i as isAgentSteeringRequest, o as projectUserInputText } from "./chunks/agent-user-input.js";
+import { a as createAgentLoopSkillExecutionStart, c as createAgentLoopToolExecutionEnd, i as createAgentLoopSkillExecutionEnd, l as createAgentLoopToolExecutionStart, n as createAgentLoopModelExecutionEnd, o as createAgentLoopTextDelta, r as createAgentLoopModelExecutionStart, s as createAgentLoopThinkingDelta, t as prepareAgentModelInput, u as createAgentLoopToolExecutionUpdate } from "./chunks/user-input-xml.js";
 import { Effect, Stream } from "effect";
+import { unwrapExit } from "@rivus/platform/effect";
 import { createHash, randomUUID } from "node:crypto";
 import { readFile, realpath, stat } from "node:fs/promises";
 import { isAbsolute, join, relative } from "node:path";
 import { writeAtomicTextFile } from "@rivus/platform/persistence";
-import { createSha256Digest } from "@rivus/platform/identity";
 import { Type, Unsafe } from "typebox";
 import { DefaultResourceLoader, ModelRuntime, SessionManager, SettingsManager, createAgentSession, createBashToolDefinition, createReadToolDefinition, defineTool, estimateTokens } from "@earendil-works/pi-coding-agent";
 import { realpathSync, statSync } from "node:fs";
+import { createSha256Digest } from "@rivus/platform/identity";
 //#region src/adapters/pi/config/pi-model-overrides.ts
 async function mergePiProviderBaseUrlOverride(options) {
 	await updatePiProviderOverride(options.filePath, options.provider, (providerOverride) => ({
@@ -140,13 +142,38 @@ function readSkillId$1(input) {
 async function runPiSessionPrompts(options) {
 	const { input, handle } = options;
 	const { session } = handle;
-	const prepare = (text) => handle.preparePrompt?.({
-		...input,
-		text
-	}) ?? text;
+	const prepare = async (text, userInput, attachmentAccess, updateActiveInput = false) => {
+		const { attachmentAccess: _initialAccess, userInput: _initialUserInput, ...runInput } = input;
+		const preparedInput = {
+			...runInput,
+			text,
+			...attachmentAccess ? { attachmentAccess } : {},
+			...userInput ? { userInput } : {}
+		};
+		const prepared = await Effect.runPromise(prepareAgentModelInput(preparedInput, { allowImages: handle.supportsImages ?? session.model?.input?.includes("image") === true }));
+		if (updateActiveInput) await handle.updateInput?.(preparedInput);
+		if (!prepared.hasUsableContent || !handle.preparePrompt) return prepared;
+		return {
+			...prepared,
+			text: await handle.preparePrompt({
+				...preparedInput,
+				text: prepared.text,
+				...attachmentAccess ? { attachmentAccess } : {},
+				...userInput ? { userInput } : {}
+			})
+		};
+	};
+	const prepareInitial = async () => {
+		const prepared = await prepare(input.text, input.userInput, input.attachmentAccess);
+		if (input.abortSignal.aborted) return;
+		if (prepared.hasUsableContent) return { prepared };
+		return prepared.fallbackText === void 0 ? {} : { fallbackText: prepared.fallbackText };
+	};
 	if (!options.supportsSteering) {
-		const text = await prepare(input.text);
-		if (!input.abortSignal.aborted) await session.prompt(text);
+		const initial = await prepareInitial();
+		if (!initial) return;
+		if (!("prepared" in initial)) return initial.fallbackText;
+		await session.prompt(initial.prepared.text, toPromptOptions(initial.prepared.images));
 		return;
 	}
 	if (!session.steer || typeof session.isStreaming !== "boolean" || !session.clearQueue) throw new Error("Pi steering requires native steer, isStreaming and clearQueue capabilities");
@@ -155,17 +182,17 @@ async function runPiSessionPrompts(options) {
 	const onAbort = () => stop.abort();
 	input.abortSignal.addEventListener("abort", onAbort, { once: true });
 	if (input.abortSignal.aborted) stop.abort();
-	const close = () => Effect.runPromise(mailbox?.close?.() ?? Effect.succeed([]));
-	const take = () => Effect.runPromise(mailbox?.next() ?? Effect.never, { signal: stop.signal }).then((text) => ({
+	const close = () => Effect.runPromise(mailbox?.closeInput?.() ?? mailbox?.close?.() ?? Effect.succeed([]));
+	const take = () => Effect.runPromise(mailbox?.nextInput?.() ?? mailbox?.next() ?? Effect.never, { signal: stop.signal }).then((input) => ({
 		type: "steering",
-		text
+		input
 	}), (error) => {
 		if (stop.signal.aborted) return { type: "closed" };
 		throw error;
 	});
 	let prompt = Promise.resolve({ type: "completed" });
-	const startPrompt = (text) => {
-		prompt = session.prompt(text).then(() => ({ type: "completed" }), (error) => ({
+	const startPrompt = (text, images = []) => {
+		prompt = session.prompt(text, toPromptOptions(images)).then(() => ({ type: "completed" }), (error) => ({
 			type: "failed",
 			error
 		}));
@@ -175,11 +202,13 @@ async function runPiSessionPrompts(options) {
 		if (outcome.type === "failed") throw outcome.error;
 	};
 	let next;
+	const fallbackTexts = [];
 	let succeeded = false;
 	try {
-		const text = await prepare(input.text);
-		if (input.abortSignal.aborted) return;
-		startPrompt(text);
+		const initial = await prepareInitial();
+		if (!initial) return;
+		if (!("prepared" in initial)) return initial.fallbackText;
+		startPrompt(initial.prepared.text, initial.prepared.images);
 		next = take();
 		while (!input.abortSignal.aborted) {
 			const outcome = await Promise.race([next, prompt]);
@@ -189,23 +218,34 @@ async function runPiSessionPrompts(options) {
 				const remaining = await close();
 				stop.abort();
 				const claimed = await next;
-				const accepted = claimed.type === "steering" ? [claimed.text, ...remaining] : remaining;
-				for (const acceptedText of accepted) {
-					const prepared = await prepare(acceptedText);
+				const accepted = claimed.type === "steering" ? [claimed.input, ...remaining] : remaining;
+				for (const acceptedInput of accepted) {
+					const steering = toSteeringPrompt(acceptedInput);
+					const prepared = await prepare(steering.text, steering.userInput, steering.attachmentAccess, true);
 					if (input.abortSignal.aborted) return;
-					startPrompt(prepared);
+					if (!prepared.hasUsableContent) {
+						if (prepared.fallbackText) fallbackTexts.push(prepared.fallbackText);
+						continue;
+					}
+					startPrompt(prepared.text, prepared.images);
 					await settlePrompt();
 				}
 				succeeded = true;
-				return;
+				return formatSteeringFallback(fallbackTexts);
 			}
-			const prepared = await prepare(outcome.text);
+			const steering = toSteeringPrompt(outcome.input);
+			const prepared = await prepare(steering.text, steering.userInput, steering.attachmentAccess, true);
 			if (input.abortSignal.aborted) break;
-			if (session.isStreaming) await session.steer(prepared);
+			if (!prepared.hasUsableContent) {
+				if (prepared.fallbackText) fallbackTexts.push(prepared.fallbackText);
+				next = take();
+				continue;
+			}
+			if (session.isStreaming) await session.steer(prepared.text, prepared.images);
 			else {
 				await settlePrompt();
 				if (input.abortSignal.aborted) break;
-				startPrompt(prepared);
+				startPrompt(prepared.text, prepared.images);
 			}
 			next = take();
 		}
@@ -220,30 +260,62 @@ async function runPiSessionPrompts(options) {
 		if (cancelledOrFailed) session.clearQueue();
 	}
 }
+function formatSteeringFallback(fallbackTexts) {
+	return fallbackTexts.length === 0 ? void 0 : `\n\n${fallbackTexts.join("\n\n")}`;
+}
+function toPromptOptions(images) {
+	return images.length > 0 ? { images } : void 0;
+}
+function toSteeringPrompt(input) {
+	if (typeof input === "string") return { text: input };
+	if (isAgentSteeringRequest(input)) return {
+		...input.attachmentAccess ? { attachmentAccess: input.attachmentAccess } : {},
+		text: projectUserInputText(input.userInput),
+		userInput: input.userInput
+	};
+	return {
+		text: projectUserInputText(input),
+		userInput: input
+	};
+}
+//#endregion
+//#region src/adapters/pi/execution/pi-serializable-value.ts
+/** Copies plain Pi data, dropping functions and nested values that cannot be serialized. */
+function sanitizeSerializable(value) {
+	return copySerializable(value, true);
+}
+/** Copies plain Pi data like `sanitizeSerializable`, but keeps `undefined` where a nested value cannot be serialized. */
+function cloneSerializable(value) {
+	return copySerializable(value, false);
+}
+function copySerializable(value, dropUnserializable) {
+	if (value === null || typeof value === "string" || typeof value === "number" || typeof value === "boolean") return value;
+	if (Array.isArray(value)) {
+		const items = value.map((item) => copySerializable(item, dropUnserializable));
+		return dropUnserializable ? items.filter((item) => item !== void 0) : items;
+	}
+	if (!isRecord$5(value)) return;
+	const entries = Object.entries(value).filter(([, nested]) => typeof nested !== "function" && nested !== void 0).map(([key, nested]) => [key, copySerializable(nested, dropUnserializable)]);
+	return Object.fromEntries(dropUnserializable ? entries.filter(([, copied]) => copied !== void 0) : entries);
+}
+function isRecord$5(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
 //#endregion
 //#region src/adapters/pi/execution/pi-agent-loop.ts
-function createPiAgentLoop$1(options) {
+function createPiAgentLoop(options) {
 	return {
-		...options.supportsSteering ? { supportsSteering: true } : {},
+		...options.supportsSteering ? {
+			supportsSteering: true,
+			supportsStructuredSteering: true
+		} : {},
 		run: (input) => {
 			const stream = Stream.fromAsyncIterable(runPiSession(input, options), (error) => error);
 			if (!options.runBoundary) return stream;
-			return Stream.unwrapScoped(Effect.acquireRelease(options.runBoundary.acquireRun({ signal: input.abortSignal }), (lease) => Effect.sync(lease.release)).pipe(Effect.as(stream)));
+			return Stream.unwrap(Effect.acquireRelease(options.runBoundary.acquireRun({ signal: input.abortSignal }), (lease) => Effect.sync(lease.release)).pipe(Effect.as(stream)));
 		}
 	};
 }
-function createPiSdkAgentLoop$1(options) {
-	return createPiAgentLoop$1({
-		...options.supportsSteering ? { supportsSteering: true } : {},
-		resolveSession: async () => {
-			const result = await options.createAgentSession(options.sessionOptions);
-			return {
-				dispose: () => result.session.dispose?.(),
-				session: result.session
-			};
-		}
-	});
-}
 async function* runPiSession(input, options) {
 	const queue = createAsyncQueue();
 	let removeAbortListener;
@@ -299,12 +371,13 @@ async function* runPiSession(input, options) {
 					queue.offer(mapped);
 				}
 			});
-			await runPiSessionPrompts({
+			const fallbackText = await runPiSessionPrompts({
 				input,
 				handle,
 				supportsSteering: options.supportsSteering === true,
 				abort: abortSession
 			});
+			if (fallbackText && !input.abortSignal.aborted) queue.offer(createAgentLoopTextDelta(fallbackText));
 			complete(input.abortSignal.aborted || terminalErrorMessage === void 0 ? void 0 : new Error(terminalErrorMessage));
 		} catch (error) {
 			complete(input.abortSignal.aborted ? void 0 : error);
@@ -351,11 +424,11 @@ function observeModelContent(observer, session, event, runId, mapped) {
 	});
 }
 function snapshotModelInput(value) {
-	if (!isRecord$4(value)) return void 0;
+	if (!isRecord$4(value)) return;
 	const messages = Array.isArray(value.messages) ? value.messages.map(snapshotMessage).filter(isDefined) : void 0;
 	const systemPrompt = typeof value.systemPrompt === "string" ? value.systemPrompt : void 0;
 	const tools = Array.isArray(value.tools) ? value.tools.map(snapshotTool).filter(isDefined) : void 0;
-	if (!messages && systemPrompt === void 0 && !tools) return void 0;
+	if (!messages && systemPrompt === void 0 && !tools) return;
 	return {
 		...messages ? { messages } : {},
 		...systemPrompt === void 0 ? {} : { systemPrompt },
@@ -363,11 +436,11 @@ function snapshotModelInput(value) {
 	};
 }
 function snapshotAssistantOutput(value) {
-	if (!isRecord$4(value) || value.role !== "assistant") return void 0;
+	if (!isRecord$4(value) || value.role !== "assistant") return;
 	return snapshotMessage(value);
 }
 function snapshotMessage(value) {
-	if (!isRecord$4(value) || typeof value.role !== "string") return void 0;
+	if (!isRecord$4(value) || typeof value.role !== "string") return;
 	const content = sanitizeContent(value.content);
 	return {
 		...content === void 0 ? {} : { content },
@@ -377,7 +450,7 @@ function snapshotMessage(value) {
 	};
 }
 function snapshotTool(value) {
-	if (!isRecord$4(value) || typeof value.name !== "string") return void 0;
+	if (!isRecord$4(value) || typeof value.name !== "string") return;
 	return {
 		...typeof value.description === "string" ? { description: value.description } : {},
 		name: value.name,
@@ -388,12 +461,6 @@ function sanitizeContent(value) {
 	if (!Array.isArray(value)) return sanitizeSerializable(value);
 	return value.filter((item) => !isPrivateThinkingBlock(item)).map(sanitizeSerializable).filter(isDefined);
 }
-function sanitizeSerializable(value) {
-	if (value === null || typeof value === "string" || typeof value === "number" || typeof value === "boolean") return value;
-	if (Array.isArray(value)) return value.map(sanitizeSerializable).filter(isDefined);
-	if (!isRecord$4(value)) return void 0;
-	return Object.fromEntries(Object.entries(value).filter(([, nested]) => typeof nested !== "function" && nested !== void 0).map(([key, nested]) => [key, sanitizeSerializable(nested)]).filter((entry) => entry[1] !== void 0));
-}
 function isPrivateThinkingBlock(value) {
 	return isRecord$4(value) && (value.type === "thinking" || value.type === "redacted_thinking");
 }
@@ -447,7 +514,7 @@ function mapPiEvent(event, runId, state, resolveToolName) {
 	switch (event.type) {
 		case "message_start": {
 			const message = readAssistantMessage(event.message);
-			if (!message) return void 0;
+			if (!message) return;
 			state.modelCallCount += 1;
 			state.activeModelCallId = `${runId}:model:${state.modelCallCount}`;
 			return createAgentLoopModelExecutionStart({
@@ -465,7 +532,7 @@ function mapPiEvent(event, runId, state, resolveToolName) {
 			return createAgentLoopTextDelta(assistantEvent.delta);
 		case "message_end": {
 			const message = readAssistantMessage(event.message);
-			if (!message) return void 0;
+			if (!message) return;
 			if (!state.activeModelCallId) {
 				state.modelCallCount += 1;
 				state.activeModelCallId = `${runId}:model:${state.modelCallCount}`;
@@ -535,7 +602,7 @@ function readSkillId(value) {
 	return isRecord$4(value) && typeof value.skillId === "string" ? value.skillId : void 0;
 }
 function readSkillDetails(value) {
-	if (!isRecord$4(value) || !isRecord$4(value.details)) return void 0;
+	if (!isRecord$4(value) || !isRecord$4(value.details)) return;
 	const details = value.details;
 	if (typeof details.contentLength !== "number" || typeof details.digest !== "string" || typeof details.skillId !== "string" || typeof details.title !== "string" || typeof details.version !== "string") return;
 	return details;
@@ -562,7 +629,7 @@ function createAsyncQueue() {
 }
 //#endregion
 //#region src/adapters/pi/execution/pi-session-registry.ts
-function createPiSessionRegistry$1(options) {
+function createPiSessionRegistry(options) {
 	const sessions = /* @__PURE__ */ new Map();
 	const resolve = async (input) => {
 		const cached = sessions.get(input.sessionKey);
@@ -591,6 +658,233 @@ function createPiSessionRegistry$1(options) {
 	};
 }
 //#endregion
+//#region src/adapters/pi/model-management/pi-model-resolution.ts
+var PiModelResolutionError = class extends Error {
+	name = "PiModelResolutionError";
+	code;
+	resolutionCode;
+	constructor(resolutionCode, message) {
+		super(message);
+		this.code = resolutionCode === "provider-unknown" ? "model_change_provider_unsupported" : "model_change_target_unsupported";
+		this.resolutionCode = resolutionCode;
+	}
+};
+/**
+* Resolve one exact provider/model pair from the installed Pi model runtime.
+*
+* Model aliases and fuzzy matches are intentionally excluded here. Natural-language
+* interpretation belongs to the application/Agent; the activation boundary must bind
+* to the exact model that the SDK can actually construct.
+*/
+function resolvePiModel(options) {
+	const provider = options.target.provider.trim();
+	const modelId = options.target.model.trim();
+	if (!provider || !modelId || provider.includes("/") || modelId.includes("\n")) throw new PiModelResolutionError("invalid-reference", "Pi model target must contain a provider and model id without a provider separator in either component");
+	if (options.modelRuntime.getModels(provider).length === 0) {
+		if (!options.modelRuntime.getProvider(provider)) throw new PiModelResolutionError("provider-unknown", `Pi provider is not installed: ${provider}`);
+		throw new PiModelResolutionError("model-unknown", `Pi provider ${provider} has no known model metadata; configure a declarative model before activation`);
+	}
+	const model = options.modelRuntime.getModel(provider, modelId);
+	if (!model) throw new PiModelResolutionError("model-unknown", `Pi model ${provider}/${modelId} is not present in the installed model catalog`);
+	return model;
+}
+/**
+* Ensure metadata for an exact model id that is absent from the installed SDK
+* catalog, then recompose the provider from models.json. Phase 1 only ships the
+* verified DeepSeek declaration required by the management contract; all other
+* unknown ids fail closed and must be supplied by a future explicit catalog path.
+*/
+async function ensurePiModel(options) {
+	try {
+		return resolvePiModel(options);
+	} catch (error) {
+		if (!(error instanceof PiModelResolutionError) || error.resolutionCode !== "model-unknown") throw error;
+	}
+	const definition = knownPiDeclarativeModel(options.modelRuntime, options.target);
+	if (!definition) throw new PiModelResolutionError("model-unknown", `Pi model ${options.target.provider}/${options.target.model} is not present in the installed model catalog and has no approved declarative metadata`);
+	await mergePiProviderModelDeclaration({
+		filePath: options.modelsPath,
+		model: definition,
+		provider: options.target.provider
+	});
+	const refreshError = (await refreshPiModelCatalog(options.modelRuntime, {
+		allowNetwork: false,
+		provider: options.target.provider,
+		...options.signal ? { signal: options.signal } : {}
+	})).errors.get(options.target.provider);
+	if (refreshError) throw new PiModelResolutionError("model-unknown", `Pi provider ${options.target.provider} could not load declarative model metadata: ${refreshError.message}`);
+	return resolvePiModel(options);
+}
+/** Refresh installed SDK metadata, retaining the SDK's persisted declarative catalog. */
+async function refreshPiModelCatalog(modelRuntime, options = {}) {
+	const providers = options.provider === void 0 ? void 0 : [options.provider];
+	const result = await modelRuntime.refresh({
+		allowNetwork: options.allowNetwork ?? false,
+		...providers ? { providers } : {},
+		...options.signal ? { signal: options.signal } : {}
+	});
+	const refreshedProviders = providers ?? modelRuntime.getRegisteredProviderIds();
+	return Object.freeze({
+		errors: result.errors,
+		refreshedProviders: Object.freeze([...refreshedProviders])
+	});
+}
+function knownPiDeclarativeModel(modelRuntime, target) {
+	if (target.provider !== "deepseek" || target.model !== "deepseek-flash") return;
+	const source = modelRuntime.getModel("deepseek", "deepseek-v4-flash");
+	if (!source) return;
+	return {
+		api: source.api,
+		baseUrl: source.baseUrl,
+		...source.compat ? { compat: source.compat } : {},
+		contextWindow: 1e6,
+		cost: {
+			cacheRead: .006,
+			cacheWrite: 0,
+			input: .3,
+			output: 1.2
+		},
+		id: target.model,
+		input: ["text", "image"],
+		maxTokens: 384e3,
+		name: "DeepSeek V4.1 Flash",
+		reasoning: true,
+		...source.samplingParams ? { samplingParams: source.samplingParams } : {},
+		...source.thinkingLevelMap ? { thinkingLevelMap: source.thinkingLevelMap } : {}
+	};
+}
+//#endregion
+//#region src/adapters/pi/model-management/pi-history-compatibility.ts
+var PiHistoryCompatibilityError = class extends Error {
+	name = "PiHistoryCompatibilityError";
+	code = "model_change_history_incompatible";
+	messageIndex;
+	constructor(message, messageIndex) {
+		super(message);
+		this.messageIndex = messageIndex;
+	}
+};
+/**
+* Check the structural parts of a persisted Pi transcript that providers need for
+* the next request. The transcript is never returned or copied; only counts are
+* exposed for diagnostics. This deliberately rejects orphaned tool calls/results
+* instead of deleting or rewriting history during a model change.
+*/
+function inspectPiSessionHistory(sessionManager) {
+	const context = sessionManager.buildSessionContext();
+	const pendingToolCalls = /* @__PURE__ */ new Map();
+	let assistantThinkingBlocks = 0;
+	let assistantToolCalls = 0;
+	let imageBlocks = 0;
+	let toolResults = 0;
+	for (const [messageIndex, message] of context.messages.entries()) {
+		if (!isRecord$3(message) || typeof message.role !== "string") throw new PiHistoryCompatibilityError("Pi session history contains a malformed message", messageIndex);
+		if (message.role === "assistant") {
+			const content = message.content;
+			if (!Array.isArray(content)) throw new PiHistoryCompatibilityError("Pi assistant history message content must be an array", messageIndex);
+			for (const block of content) {
+				if (!isRecord$3(block) || typeof block.type !== "string") throw new PiHistoryCompatibilityError("Pi assistant history contains a malformed content block", messageIndex);
+				if (block.type === "thinking") {
+					if (typeof block.thinking !== "string") throw new PiHistoryCompatibilityError("Pi assistant thinking content is malformed", messageIndex);
+					assistantThinkingBlocks += 1;
+					continue;
+				}
+				if (block.type === "toolCall") {
+					if (typeof block.id !== "string" || !block.id || typeof block.name !== "string" || !block.name) throw new PiHistoryCompatibilityError("Pi assistant tool call is malformed", messageIndex);
+					if (!isRecord$3(block.arguments)) throw new PiHistoryCompatibilityError("Pi assistant tool call arguments are malformed", messageIndex);
+					pendingToolCalls.set(block.id, block.name);
+					assistantToolCalls += 1;
+					continue;
+				}
+				if (block.type === "text") {
+					if (typeof block.text !== "string") throw new PiHistoryCompatibilityError("Pi assistant text content is malformed", messageIndex);
+					continue;
+				}
+				if (block.type === "image") {
+					if (typeof block.data !== "string" || typeof block.mimeType !== "string") throw new PiHistoryCompatibilityError("Pi assistant image content is malformed", messageIndex);
+					imageBlocks += 1;
+					continue;
+				}
+				throw new PiHistoryCompatibilityError(`Pi assistant content type is unsupported: ${String(block.type)}`, messageIndex);
+			}
+			continue;
+		}
+		if (message.role === "toolResult") {
+			const content = message.content;
+			if (!Array.isArray(content)) throw new PiHistoryCompatibilityError("Pi tool result content must be an array", messageIndex);
+			if (typeof message.toolCallId !== "string" || !pendingToolCalls.has(message.toolCallId)) throw new PiHistoryCompatibilityError("Pi tool result has no preceding assistant tool call", messageIndex);
+			if (typeof message.toolName !== "string" || !message.toolName) throw new PiHistoryCompatibilityError("Pi tool result is missing its tool name", messageIndex);
+			if (pendingToolCalls.get(message.toolCallId) !== message.toolName) throw new PiHistoryCompatibilityError("Pi tool result tool name does not match its assistant tool call", messageIndex);
+			imageBlocks += countImageBlocks(content);
+			validatePlainContent(content, messageIndex, "tool result");
+			pendingToolCalls.delete(message.toolCallId);
+			toolResults += 1;
+			continue;
+		}
+		if (message.role === "user") {
+			if (typeof message.content !== "string") {
+				if (!Array.isArray(message.content)) throw new PiHistoryCompatibilityError("Pi user history content must be text or an array", messageIndex);
+				imageBlocks += countImageBlocks(message.content);
+				validatePlainContent(message.content, messageIndex, "user");
+			}
+			continue;
+		}
+		if (message.role === "custom") {
+			if (typeof message.customType !== "string" || typeof message.display !== "boolean") throw new PiHistoryCompatibilityError("Pi custom history message metadata is malformed", messageIndex);
+			if (typeof message.content === "string") continue;
+			if (!Array.isArray(message.content)) throw new PiHistoryCompatibilityError("Pi custom history content must be text or an array", messageIndex);
+			imageBlocks += countImageBlocks(message.content);
+			validatePlainContent(message.content, messageIndex, "custom");
+			continue;
+		}
+		if (message.role === "bashExecution") {
+			if (typeof message.command !== "string" || typeof message.output !== "string" || typeof message.cancelled !== "boolean" || typeof message.truncated !== "boolean" || message.exitCode !== void 0 && message.exitCode !== null && typeof message.exitCode !== "number" || message.fullOutputPath !== void 0 && typeof message.fullOutputPath !== "string" || message.excludeFromContext !== void 0 && typeof message.excludeFromContext !== "boolean") throw new PiHistoryCompatibilityError("Pi bash history message is malformed", messageIndex);
+			continue;
+		}
+		if (message.role === "branchSummary") {
+			if (typeof message.summary !== "string" || typeof message.fromId !== "string") throw new PiHistoryCompatibilityError("Pi branch summary history message is malformed", messageIndex);
+			continue;
+		}
+		if (message.role === "compactionSummary") {
+			if (typeof message.summary !== "string" || typeof message.tokensBefore !== "number" || !Number.isFinite(message.tokensBefore) || message.tokensBefore < 0) throw new PiHistoryCompatibilityError("Pi compaction summary history message is malformed", messageIndex);
+			continue;
+		}
+		throw new PiHistoryCompatibilityError(`Pi history role is unsupported: ${String(message.role)}`, messageIndex);
+	}
+	if (pendingToolCalls.size > 0) throw new PiHistoryCompatibilityError("Pi session history contains an assistant tool call without a result", context.messages.length);
+	return Object.freeze({
+		assistantThinkingBlocks,
+		assistantToolCalls,
+		compatible: true,
+		imageBlocks,
+		messageCount: context.messages.length,
+		toolResults
+	});
+}
+function countImageBlocks(content) {
+	return content.filter((block) => isRecord$3(block) && block.type === "image").length;
+}
+function assertPiSessionHistoryCompatible(sessionManager) {
+	return inspectPiSessionHistory(sessionManager);
+}
+function validatePlainContent(content, messageIndex, role) {
+	for (const block of content) {
+		if (!isRecord$3(block) || typeof block.type !== "string") throw new PiHistoryCompatibilityError(`Pi ${role} history contains a malformed content block`, messageIndex);
+		if (block.type === "text") {
+			if (typeof block.text !== "string") throw new PiHistoryCompatibilityError(`Pi ${role} text content is malformed`, messageIndex);
+			continue;
+		}
+		if (block.type === "image") {
+			if (typeof block.data !== "string" || typeof block.mimeType !== "string") throw new PiHistoryCompatibilityError(`Pi ${role} image content is malformed`, messageIndex);
+			continue;
+		}
+		throw new PiHistoryCompatibilityError(`Pi ${role} content type is unsupported: ${block.type}`, messageIndex);
+	}
+}
+function isRecord$3(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+//#endregion
 //#region src/adapters/pi/model-management/pi-model-call-deadline.ts
 var PiModelCallDeadlineExceeded = class extends Error {
 	name = "PiModelCallDeadlineExceeded";
@@ -634,7 +928,6 @@ async function awaitPiModelCall(promise, options = {}) {
 //#region src/adapters/pi/model-management/pi-model-probe.ts
 const PI_MODEL_PROBE_TOOL_NAME = "rivus_model_management_probe";
 const PI_MODEL_PROBE_TOOL_RESULT = "RIVUS_MODEL_PROBE_TOOL_OK";
-const PI_MODEL_PROBE_FOLLOWUP_RESULT = "RIVUS_MODEL_PROBE_FOLLOWUP_OK";
 const probeToolParameters = Type.Object({ probe: Type.String() });
 var PiModelProbeError = class extends Error {
 	name = "PiModelProbeError";
@@ -709,7 +1002,7 @@ function probePiModel(options) {
 		if (findToolCalls(followup.message).length > 0) return yield* Effect.fail(new PiModelProbeError("candidate requested a Tool during the probe follow-up", "known"));
 		const followupText = readText(followup.message);
 		if (!followupText.includes("RIVUS_MODEL_PROBE_FOLLOWUP_OK")) return yield* Effect.fail(new PiModelProbeError("candidate did not produce the fixed probe follow-up response", "known"));
-		const assistantThinkingBlocks = transcript.reduce((count, turn) => count + turn.assistant.content.filter((content) => isRecord$3(content) && content.type === "thinking").length, 0);
+		const assistantThinkingBlocks = transcript.reduce((count, turn) => count + turn.assistant.content.filter((content) => isRecord$2(content) && content.type === "thinking").length, 0);
 		const outputTokens = transcript.reduce((sum, turn) => sum + readOutputTokens(turn.assistant.usage), 0);
 		return Object.freeze({
 			assistantThinkingBlocks,
@@ -815,13 +1108,13 @@ function streamPaidProbeCall(options) {
 					});
 				},
 				catch: (error) => error
-			}).pipe(Effect.catchAll((error) => {
+			}).pipe(Effect.catch((error) => {
 				const deadlineExceeded = callSignal.isDeadlineExceeded() || error instanceof PiModelCallDeadlineExceeded;
 				const probeError = new PiModelProbeError(deadlineExceeded ? `${options.description} stream exceeded the model change deadline` : `${options.description} stream failed: ${error instanceof Error ? error.message : String(error)}`, "unknown", { cause: error }, deadlineExceeded ? "model_change_deadline_exceeded" : "model_change_probe_failed");
 				return settle({
 					outcome: "unknown",
 					outputTokens: reservation.maxOutputTokens
-				}).pipe(Effect.zipRight(Effect.fail(probeError)));
+				}).pipe(Effect.andThen(Effect.fail(probeError)));
 			}));
 			const outputTokens = readOutputTokens(message.usage);
 			yield* settle({
@@ -833,330 +1126,85 @@ function streamPaidProbeCall(options) {
 				catch: (error) => error
 			});
 			return {
-				message,
-				outputTokens,
-				reservation
-			};
-		}).pipe(Effect.ensuring(Effect.uninterruptible(Effect.suspend(() => settled ? Effect.void : settle({
-			outcome: "unknown",
-			outputTokens: reservation.maxOutputTokens
-		})).pipe(Effect.orDie))), Effect.ensuring(Effect.sync(callSignal.dispose)));
-	});
-}
-function createPaidCallSignal(parent, deadlineAt) {
-	const controller = new AbortController();
-	const deadlineMs = Date.parse(deadlineAt);
-	const remainingMs = deadlineMs - Date.now();
-	let deadlineExceeded = !Number.isFinite(deadlineMs) || remainingMs <= 0;
-	let timer;
-	const onParentAbort = () => controller.abort(parent?.reason);
-	if (parent) if (parent.aborted) controller.abort(parent.reason);
-	else parent.addEventListener("abort", onParentAbort, { once: true });
-	if (remainingMs > 0 && !controller.signal.aborted) timer = setTimeout(() => {
-		deadlineExceeded = true;
-		controller.abort(/* @__PURE__ */ new Error("model change deadline elapsed"));
-	}, Math.min(remainingMs, 2147483647));
-	return {
-		expired: deadlineExceeded,
-		isDeadlineExceeded: () => deadlineExceeded || Number.isFinite(deadlineMs) && Date.now() >= deadlineMs,
-		signal: controller.signal,
-		dispose: () => {
-			if (timer) clearTimeout(timer);
-			parent?.removeEventListener("abort", onParentAbort);
-			if (!controller.signal.aborted) controller.abort(/* @__PURE__ */ new Error("model probe cancelled"));
-		}
-	};
-}
-function assertProbeStopReason(message, kind) {
-	if (message.stopReason === "error" || message.stopReason === "aborted") throw new PiModelProbeError(`candidate streamed an ${message.stopReason} response: ${message.errorMessage ?? "unknown provider error"}`, "known");
-	if (message.stopReason === "length" || message.stopReason === "deferred") throw new PiModelProbeError(`candidate response was truncated or deferred during ${kind}`, "known");
-	if (kind !== "initial" && message.stopReason !== "stop") throw new PiModelProbeError(`candidate used unsupported stop reason ${message.stopReason} during ${kind}`, "known");
-}
-function assertCanaryStopReason(message) {
-	if (message.stopReason === "error" || message.stopReason === "aborted") throw new PiModelProbeError(`model canary streamed an ${message.stopReason} response: ${message.errorMessage ?? "unknown provider error"}`, "known");
-	if (message.stopReason === "length" || message.stopReason === "deferred" || message.stopReason !== "stop") throw new PiModelProbeError(`model canary used unsupported stop reason ${message.stopReason}`, "known");
-}
-function findSingleProbeToolCall(message) {
-	const calls = findToolCalls(message);
-	if (calls.length !== 1 || calls[0]?.name !== "rivus_model_management_probe") return void 0;
-	const call = calls[0];
-	return {
-		arguments: call.arguments,
-		id: call.id
-	};
-}
-function findToolCalls(message) {
-	return message.content.flatMap((content) => {
-		if (!isRecord$3(content) || content.type !== "toolCall") return [];
-		return [{
-			arguments: isRecord$3(content.arguments) ? content.arguments : {},
-			id: typeof content.id === "string" ? content.id : "",
-			name: typeof content.name === "string" ? content.name : ""
-		}];
-	});
-}
-function readText(message) {
-	return message.content.filter((content) => isRecord$3(content) && content.type === "text" && typeof content.text === "string").map((content) => content.text).join("");
-}
-function snapshotAssistant(message) {
-	return Object.freeze({
-		content: Object.freeze(message.content.map((content) => cloneSerializable(content))),
-		model: message.model,
-		provider: message.provider,
-		stopReason: message.stopReason,
-		usage: Object.freeze(cloneSerializable(message.usage))
-	});
-}
-function readOutputTokens(usage) {
-	if (isRecord$3(usage) && typeof usage.output === "number" && Number.isSafeInteger(usage.output) && usage.output >= 0) return usage.output;
-	return 0;
-}
-function cloneSerializable(value) {
-	if (value === null || typeof value === "string" || typeof value === "number" || typeof value === "boolean") return value;
-	if (Array.isArray(value)) return value.map(cloneSerializable);
-	if (!isRecord$3(value)) return void 0;
-	return Object.fromEntries(Object.entries(value).filter(([, nested]) => typeof nested !== "function" && nested !== void 0).map(([key, nested]) => [key, cloneSerializable(nested)]));
-}
-function isRecord$3(value) {
-	return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-//#endregion
-//#region src/adapters/pi/model-management/pi-model-resolution.ts
-var PiModelResolutionError = class extends Error {
-	name = "PiModelResolutionError";
-	code;
-	resolutionCode;
-	constructor(resolutionCode, message) {
-		super(message);
-		this.code = resolutionCode === "provider-unknown" ? "model_change_provider_unsupported" : "model_change_target_unsupported";
-		this.resolutionCode = resolutionCode;
-	}
-};
-/**
-* Resolve one exact provider/model pair from the installed Pi model runtime.
-*
-* Model aliases and fuzzy matches are intentionally excluded here. Natural-language
-* interpretation belongs to the application/Agent; the activation boundary must bind
-* to the exact model that the SDK can actually construct.
-*/
-function resolvePiModel(options) {
-	const provider = options.target.provider.trim();
-	const modelId = options.target.model.trim();
-	if (!provider || !modelId || provider.includes("/") || modelId.includes("\n")) throw new PiModelResolutionError("invalid-reference", "Pi model target must contain a provider and model id without a provider separator in either component");
-	if (options.modelRuntime.getModels(provider).length === 0) {
-		if (!options.modelRuntime.getProvider(provider)) throw new PiModelResolutionError("provider-unknown", `Pi provider is not installed: ${provider}`);
-		throw new PiModelResolutionError("model-unknown", `Pi provider ${provider} has no known model metadata; configure a declarative model before activation`);
-	}
-	const model = options.modelRuntime.getModel(provider, modelId);
-	if (!model) throw new PiModelResolutionError("model-unknown", `Pi model ${provider}/${modelId} is not present in the installed model catalog`);
-	return model;
-}
-/**
-* Ensure metadata for an exact model id that is absent from the installed SDK
-* catalog, then recompose the provider from models.json. Phase 1 only ships the
-* verified DeepSeek declaration required by the management contract; all other
-* unknown ids fail closed and must be supplied by a future explicit catalog path.
-*/
-async function ensurePiModel(options) {
-	try {
-		return resolvePiModel(options);
-	} catch (error) {
-		if (!(error instanceof PiModelResolutionError) || error.resolutionCode !== "model-unknown") throw error;
-	}
-	const definition = knownPiDeclarativeModel(options.modelRuntime, options.target);
-	if (!definition) throw new PiModelResolutionError("model-unknown", `Pi model ${options.target.provider}/${options.target.model} is not present in the installed model catalog and has no approved declarative metadata`);
-	await mergePiProviderModelDeclaration({
-		filePath: options.modelsPath,
-		model: definition,
-		provider: options.target.provider
-	});
-	const refreshError = (await refreshPiModelCatalog(options.modelRuntime, {
-		allowNetwork: false,
-		provider: options.target.provider,
-		...options.signal ? { signal: options.signal } : {}
-	})).errors.get(options.target.provider);
-	if (refreshError) throw new PiModelResolutionError("model-unknown", `Pi provider ${options.target.provider} could not load declarative model metadata: ${refreshError.message}`);
-	return resolvePiModel(options);
-}
-function resolvePiModelBinding(options) {
-	const model = resolvePiModel(options);
-	return Object.freeze({
-		binding: Object.freeze({
-			bindingRevision: options.bindingRevision,
-			model: model.id,
-			provider: model.provider
-		}),
-		model
-	});
-}
-/** Refresh installed SDK metadata, retaining the SDK's persisted declarative catalog. */
-async function refreshPiModelCatalog(modelRuntime, options = {}) {
-	const providers = options.provider === void 0 ? void 0 : [options.provider];
-	const result = await modelRuntime.refresh({
-		allowNetwork: options.allowNetwork ?? false,
-		...providers ? { providers } : {},
-		...options.signal ? { signal: options.signal } : {}
-	});
-	const refreshedProviders = providers ?? modelRuntime.getRegisteredProviderIds();
-	return Object.freeze({
-		errors: result.errors,
-		refreshedProviders: Object.freeze([...refreshedProviders])
+				message,
+				outputTokens,
+				reservation
+			};
+		}).pipe(Effect.ensuring(Effect.uninterruptible(Effect.suspend(() => settled ? Effect.void : settle({
+			outcome: "unknown",
+			outputTokens: reservation.maxOutputTokens
+		})).pipe(Effect.orDie))), Effect.ensuring(Effect.sync(callSignal.dispose)));
 	});
 }
-function samePiProvider(left, right) {
-	return left.provider.trim() === right.provider.trim();
+function createPaidCallSignal(parent, deadlineAt) {
+	const controller = new AbortController();
+	const deadlineMs = Date.parse(deadlineAt);
+	const remainingMs = deadlineMs - Date.now();
+	let deadlineExceeded = !Number.isFinite(deadlineMs) || remainingMs <= 0;
+	let timer;
+	const onParentAbort = () => controller.abort(parent?.reason);
+	if (parent) {
+		if (parent.aborted) controller.abort(parent.reason);
+		else parent.addEventListener("abort", onParentAbort, { once: true });
+	}
+	if (remainingMs > 0 && !controller.signal.aborted) timer = setTimeout(() => {
+		deadlineExceeded = true;
+		controller.abort(/* @__PURE__ */ new Error("model change deadline elapsed"));
+	}, Math.min(remainingMs, 2147483647));
+	return {
+		expired: deadlineExceeded,
+		isDeadlineExceeded: () => deadlineExceeded || Number.isFinite(deadlineMs) && Date.now() >= deadlineMs,
+		signal: controller.signal,
+		dispose: () => {
+			if (timer) clearTimeout(timer);
+			parent?.removeEventListener("abort", onParentAbort);
+			if (!controller.signal.aborted) controller.abort(/* @__PURE__ */ new Error("model probe cancelled"));
+		}
+	};
 }
-function knownPiDeclarativeModel(modelRuntime, target) {
-	if (target.provider !== "deepseek" || target.model !== "deepseek-flash") return void 0;
-	const source = modelRuntime.getModel("deepseek", "deepseek-v4-flash");
-	if (!source) return void 0;
+function assertProbeStopReason(message, kind) {
+	if (message.stopReason === "error" || message.stopReason === "aborted") throw new PiModelProbeError(`candidate streamed an ${message.stopReason} response: ${message.errorMessage ?? "unknown provider error"}`, "known");
+	if (message.stopReason === "length" || message.stopReason === "deferred") throw new PiModelProbeError(`candidate response was truncated or deferred during ${kind}`, "known");
+	if (kind !== "initial" && message.stopReason !== "stop") throw new PiModelProbeError(`candidate used unsupported stop reason ${message.stopReason} during ${kind}`, "known");
+}
+function assertCanaryStopReason(message) {
+	if (message.stopReason === "error" || message.stopReason === "aborted") throw new PiModelProbeError(`model canary streamed an ${message.stopReason} response: ${message.errorMessage ?? "unknown provider error"}`, "known");
+	if (message.stopReason === "length" || message.stopReason === "deferred" || message.stopReason !== "stop") throw new PiModelProbeError(`model canary used unsupported stop reason ${message.stopReason}`, "known");
+}
+function findSingleProbeToolCall(message) {
+	const calls = findToolCalls(message);
+	if (calls.length !== 1 || calls[0]?.name !== "rivus_model_management_probe") return;
+	const call = calls[0];
 	return {
-		api: source.api,
-		baseUrl: source.baseUrl,
-		...source.compat ? { compat: source.compat } : {},
-		contextWindow: 1e6,
-		cost: {
-			cacheRead: .006,
-			cacheWrite: 0,
-			input: .3,
-			output: 1.2
-		},
-		id: target.model,
-		input: ["text", "image"],
-		maxTokens: 384e3,
-		name: "DeepSeek V4.1 Flash",
-		reasoning: true,
-		...source.samplingParams ? { samplingParams: source.samplingParams } : {},
-		...source.thinkingLevelMap ? { thinkingLevelMap: source.thinkingLevelMap } : {}
+		arguments: call.arguments,
+		id: call.id
 	};
 }
-//#endregion
-//#region src/adapters/pi/model-management/pi-history-compatibility.ts
-var PiHistoryCompatibilityError = class extends Error {
-	name = "PiHistoryCompatibilityError";
-	code = "model_change_history_incompatible";
-	messageIndex;
-	constructor(message, messageIndex) {
-		super(message);
-		this.messageIndex = messageIndex;
-	}
-};
-/**
-* Check the structural parts of a persisted Pi transcript that providers need for
-* the next request. The transcript is never returned or copied; only counts are
-* exposed for diagnostics. This deliberately rejects orphaned tool calls/results
-* instead of deleting or rewriting history during a model change.
-*/
-function inspectPiSessionHistory(sessionManager) {
-	const context = sessionManager.buildSessionContext();
-	const pendingToolCalls = /* @__PURE__ */ new Map();
-	let assistantThinkingBlocks = 0;
-	let assistantToolCalls = 0;
-	let imageBlocks = 0;
-	let toolResults = 0;
-	for (const [messageIndex, message] of context.messages.entries()) {
-		if (!isRecord$2(message) || typeof message.role !== "string") throw new PiHistoryCompatibilityError("Pi session history contains a malformed message", messageIndex);
-		if (message.role === "assistant") {
-			const content = message.content;
-			if (!Array.isArray(content)) throw new PiHistoryCompatibilityError("Pi assistant history message content must be an array", messageIndex);
-			for (const block of content) {
-				if (!isRecord$2(block) || typeof block.type !== "string") throw new PiHistoryCompatibilityError("Pi assistant history contains a malformed content block", messageIndex);
-				if (block.type === "thinking") {
-					if (typeof block.thinking !== "string") throw new PiHistoryCompatibilityError("Pi assistant thinking content is malformed", messageIndex);
-					assistantThinkingBlocks += 1;
-					continue;
-				}
-				if (block.type === "toolCall") {
-					if (typeof block.id !== "string" || !block.id || typeof block.name !== "string" || !block.name) throw new PiHistoryCompatibilityError("Pi assistant tool call is malformed", messageIndex);
-					if (!isRecord$2(block.arguments)) throw new PiHistoryCompatibilityError("Pi assistant tool call arguments are malformed", messageIndex);
-					pendingToolCalls.set(block.id, block.name);
-					assistantToolCalls += 1;
-					continue;
-				}
-				if (block.type === "text") {
-					if (typeof block.text !== "string") throw new PiHistoryCompatibilityError("Pi assistant text content is malformed", messageIndex);
-					continue;
-				}
-				if (block.type === "image") {
-					if (typeof block.data !== "string" || typeof block.mimeType !== "string") throw new PiHistoryCompatibilityError("Pi assistant image content is malformed", messageIndex);
-					imageBlocks += 1;
-					continue;
-				}
-				throw new PiHistoryCompatibilityError(`Pi assistant content type is unsupported: ${String(block.type)}`, messageIndex);
-			}
-			continue;
-		}
-		if (message.role === "toolResult") {
-			const content = message.content;
-			if (!Array.isArray(content)) throw new PiHistoryCompatibilityError("Pi tool result content must be an array", messageIndex);
-			if (typeof message.toolCallId !== "string" || !pendingToolCalls.has(message.toolCallId)) throw new PiHistoryCompatibilityError("Pi tool result has no preceding assistant tool call", messageIndex);
-			if (typeof message.toolName !== "string" || !message.toolName) throw new PiHistoryCompatibilityError("Pi tool result is missing its tool name", messageIndex);
-			if (pendingToolCalls.get(message.toolCallId) !== message.toolName) throw new PiHistoryCompatibilityError("Pi tool result tool name does not match its assistant tool call", messageIndex);
-			imageBlocks += countImageBlocks(content);
-			validatePlainContent(content, messageIndex, "tool result");
-			pendingToolCalls.delete(message.toolCallId);
-			toolResults += 1;
-			continue;
-		}
-		if (message.role === "user") {
-			if (typeof message.content !== "string") {
-				if (!Array.isArray(message.content)) throw new PiHistoryCompatibilityError("Pi user history content must be text or an array", messageIndex);
-				imageBlocks += countImageBlocks(message.content);
-				validatePlainContent(message.content, messageIndex, "user");
-			}
-			continue;
-		}
-		if (message.role === "custom") {
-			if (typeof message.customType !== "string" || typeof message.display !== "boolean") throw new PiHistoryCompatibilityError("Pi custom history message metadata is malformed", messageIndex);
-			if (typeof message.content === "string") continue;
-			if (!Array.isArray(message.content)) throw new PiHistoryCompatibilityError("Pi custom history content must be text or an array", messageIndex);
-			imageBlocks += countImageBlocks(message.content);
-			validatePlainContent(message.content, messageIndex, "custom");
-			continue;
-		}
-		if (message.role === "bashExecution") {
-			if (typeof message.command !== "string" || typeof message.output !== "string" || typeof message.cancelled !== "boolean" || typeof message.truncated !== "boolean" || message.exitCode !== void 0 && message.exitCode !== null && typeof message.exitCode !== "number" || message.fullOutputPath !== void 0 && typeof message.fullOutputPath !== "string" || message.excludeFromContext !== void 0 && typeof message.excludeFromContext !== "boolean") throw new PiHistoryCompatibilityError("Pi bash history message is malformed", messageIndex);
-			continue;
-		}
-		if (message.role === "branchSummary") {
-			if (typeof message.summary !== "string" || typeof message.fromId !== "string") throw new PiHistoryCompatibilityError("Pi branch summary history message is malformed", messageIndex);
-			continue;
-		}
-		if (message.role === "compactionSummary") {
-			if (typeof message.summary !== "string" || typeof message.tokensBefore !== "number" || !Number.isFinite(message.tokensBefore) || message.tokensBefore < 0) throw new PiHistoryCompatibilityError("Pi compaction summary history message is malformed", messageIndex);
-			continue;
-		}
-		throw new PiHistoryCompatibilityError(`Pi history role is unsupported: ${String(message.role)}`, messageIndex);
-	}
-	if (pendingToolCalls.size > 0) throw new PiHistoryCompatibilityError("Pi session history contains an assistant tool call without a result", context.messages.length);
-	return Object.freeze({
-		assistantThinkingBlocks,
-		assistantToolCalls,
-		compatible: true,
-		imageBlocks,
-		messageCount: context.messages.length,
-		toolResults
+function findToolCalls(message) {
+	return message.content.flatMap((content) => {
+		if (!isRecord$2(content) || content.type !== "toolCall") return [];
+		return [{
+			arguments: isRecord$2(content.arguments) ? content.arguments : {},
+			id: typeof content.id === "string" ? content.id : "",
+			name: typeof content.name === "string" ? content.name : ""
+		}];
 	});
 }
-function countImageBlocks(content) {
-	return content.filter((block) => isRecord$2(block) && block.type === "image").length;
+function readText(message) {
+	return message.content.filter((content) => isRecord$2(content) && content.type === "text" && typeof content.text === "string").map((content) => content.text).join("");
 }
-function assertPiSessionHistoryCompatible(sessionManager) {
-	return inspectPiSessionHistory(sessionManager);
+function snapshotAssistant(message) {
+	return Object.freeze({
+		content: Object.freeze(message.content.map((content) => cloneSerializable(content))),
+		model: message.model,
+		provider: message.provider,
+		stopReason: message.stopReason,
+		usage: Object.freeze(cloneSerializable(message.usage))
+	});
 }
-function validatePlainContent(content, messageIndex, role) {
-	for (const block of content) {
-		if (!isRecord$2(block) || typeof block.type !== "string") throw new PiHistoryCompatibilityError(`Pi ${role} history contains a malformed content block`, messageIndex);
-		if (block.type === "text") {
-			if (typeof block.text !== "string") throw new PiHistoryCompatibilityError(`Pi ${role} text content is malformed`, messageIndex);
-			continue;
-		}
-		if (block.type === "image") {
-			if (typeof block.data !== "string" || typeof block.mimeType !== "string") throw new PiHistoryCompatibilityError(`Pi ${role} image content is malformed`, messageIndex);
-			continue;
-		}
-		throw new PiHistoryCompatibilityError(`Pi ${role} content type is unsupported: ${block.type}`, messageIndex);
-	}
+function readOutputTokens(usage) {
+	if (isRecord$2(usage) && typeof usage.output === "number" && Number.isSafeInteger(usage.output) && usage.output >= 0) return usage.output;
+	return 0;
 }
 function isRecord$2(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
@@ -1554,8 +1602,10 @@ function createOperationSignal(deadlineAt, parent) {
 	const controller = new AbortController();
 	let timer;
 	const onParentAbort = () => controller.abort(parent?.reason);
-	if (parent) if (parent.aborted) onParentAbort();
-	else parent.addEventListener("abort", onParentAbort, { once: true });
+	if (parent) {
+		if (parent.aborted) onParentAbort();
+		else parent.addEventListener("abort", onParentAbort, { once: true });
+	}
 	if (deadlineAt !== void 0) {
 		const remaining = Date.parse(deadlineAt) - Date.now();
 		if (!Number.isFinite(remaining) || remaining <= 0) controller.abort(/* @__PURE__ */ new Error("Pi model management deadline elapsed"));
@@ -1583,6 +1633,14 @@ function assertOperationActive(operation) {
 	}
 }
 //#endregion
+//#region src/adapters/pi/skills/skill-command.ts
+const SKILL_COMMAND_PREFIX = "/skill:";
+/** Returns the Skill named by a `/skill:<name>` command, or undefined when the text is not a Skill command. */
+function skillCommandName(text) {
+	if (!text.startsWith(SKILL_COMMAND_PREFIX)) return;
+	return text.slice(7).split(/\s/, 1)[0];
+}
+//#endregion
 //#region src/adapters/pi/skills/pi-skill-catalog.ts
 var InvalidPiSkillCatalog = class extends Error {
 	name = "InvalidPiSkillCatalog";
@@ -1602,9 +1660,8 @@ function validateSkillName(name) {
 	if (typeof name !== "string" || name.length === 0 || name.length > 64 || !/^[a-z0-9][a-z0-9-]*[a-z0-9]$|^[a-z0-9]$/.test(name) || name.includes("--")) throw new InvalidPiSkillCatalog(`Pi Skill discovery contains unsafe name: ${String(name)}`);
 }
 function validatePiSkillCommand(text, skillNames) {
-	if (!text.startsWith("/skill:")) return;
-	const name = text.slice(7).split(/\s/, 1)[0];
-	if (!skillNames.has(name)) throw new InvalidPiSkillCatalog(`Unknown Pi Skill: ${name}`);
+	const name = skillCommandName(text);
+	if (name !== void 0 && !skillNames.has(name)) throw new InvalidPiSkillCatalog(`Unknown Pi Skill: ${name}`);
 }
 //#endregion
 //#region src/adapters/pi/skills/pi-skill-sources.ts
@@ -1626,7 +1683,7 @@ async function optionalDirectory(path) {
 	try {
 		canonical = await realpath(path);
 	} catch (error) {
-		if (isMissingPath(error)) return void 0;
+		if (isMissingPath(error)) return;
 		throw new InvalidPiSkillSource(`failed to resolve optional user Skill directory: ${path}`, { cause: error });
 	}
 	if (!(await stat(canonical)).isDirectory()) throw new InvalidPiSkillSource(`user Skill source must be a directory: ${path}`);
@@ -1795,8 +1852,8 @@ async function createPiAssembly(options) {
 			const { model, sessionCwd, sessionDirectory, thinkingLevel, resources, ...restOptions } = sessionOptions;
 			const activeResources = resources ?? await createResources();
 			const effectiveThinkingLevel = thinkingLevel ?? options.defaultThinkingLevel;
-			const nativeSessionManager = sessionDirectory ? SessionManager.create(sessionCwd ?? options.cwd, sessionDirectory) : void 0;
-			const sessionResult = await createAgentSession(activeResources.withSessionOptions({
+			const nativeSessionManager = sessionDirectory !== void 0 || sessionCwd !== void 0 ? SessionManager.create(sessionCwd ?? options.cwd, sessionDirectory) : void 0;
+			const nativeOptions = activeResources.withSessionOptions({
 				modelRuntime: nativeModelRuntime,
 				...restOptions.noTools === void 0 ? {} : { noTools: restOptions.noTools },
 				...restOptions.tools === void 0 ? {} : { tools: [...restOptions.tools] },
@@ -1809,7 +1866,8 @@ async function createPiAssembly(options) {
 				...model ? { model } : {},
 				...effectiveThinkingLevel ? { thinkingLevel: effectiveThinkingLevel } : {},
 				...nativeSessionManager ? { sessionManager: nativeSessionManager } : {}
-			}));
+			});
+			const sessionResult = await createAgentSession(nativeOptions);
 			return {
 				...sessionResult,
 				session: sessionResult.session,
@@ -1839,12 +1897,12 @@ function createPiSkillReadTool(options) {
 	});
 	return createReadToolDefinition(options.cwd, { operations: {
 		access: async (absolutePath) => {
-			await stat(await authorize(absolutePath, allowedSources));
+			const path = await authorize(absolutePath, allowedSources);
+			await stat(path);
 		},
 		readFile: async (absolutePath) => readFile(await authorize(absolutePath, allowedSources))
 	} });
 }
-const createPiProjectSkillReadTool = createPiSkillReadTool;
 function createPiSkillReadTools(options) {
 	if (options.skillPaths.length === 0 || options.runtimeToolIds.includes("read")) return [];
 	return [createPiSkillReadTool(options)];
@@ -1862,26 +1920,11 @@ async function authorize(path, sources) {
 	throw new ProjectSkillReadDenied("read is restricted to the bound Pi Skill sources");
 }
 //#endregion
-//#region src/adapters/pi/skills/project-skill-catalog.ts
-var InvalidProjectSkillCatalog = class extends Error {
-	name = "InvalidProjectSkillCatalog";
-};
-function validateProjectSkillCatalog(input) {
-	const diagnostic = input.diagnostics.find(({ type }) => type === "error" || type === "collision");
-	if (diagnostic) throw new InvalidProjectSkillCatalog(`Project Skill discovery failed: ${diagnostic.message}${diagnostic.path ? ` (${diagnostic.path})` : ""}`);
-	return new Set(input.skills.map(({ name }) => name));
-}
-function validateProjectSkillCommand(text, skillNames) {
-	if (!text.startsWith("/skill:")) return;
-	const name = text.slice(7).split(/\s/, 1)[0];
-	if (!skillNames.has(name)) throw new InvalidProjectSkillCatalog(`Unknown or ungranted Project Skill: ${name}`);
-}
-//#endregion
 //#region src/adapters/pi/tool-execution/pi-bash-tool.ts
 const DEFAULT_TIMEOUT_SECONDS = 120;
 /** Keep Pi's native execution, rendering and abort cleanup with a bounded default. */
 function createPiBashTool(cwd, options) {
-	const { commandPrefix, shellPath, spawnHook } = options ?? {};
+	const { commandPrefix, recovery, shellPath, spawnHook } = options ?? {};
 	const tool = createBashToolDefinition(cwd, {
 		...commandPrefix === void 0 ? {} : { commandPrefix },
 		...shellPath === void 0 ? {} : { shellPath },
@@ -1900,15 +1943,29 @@ function createPiBashTool(cwd, options) {
 				}
 			}
 		},
-		execute: (id, args, signal, onUpdate, context) => tool.execute(id, {
-			...args,
-			timeout: args.timeout === void 0 ? DEFAULT_TIMEOUT_SECONDS : args.timeout
-		}, signal, onUpdate, context)
+		execute: async (id, args, signal, onUpdate, context) => {
+			if (recovery) {
+				const recoveryResult = await recovery({
+					args: {
+						...args,
+						timeout: args.timeout === void 0 ? DEFAULT_TIMEOUT_SECONDS : args.timeout
+					},
+					...context === void 0 ? {} : { context },
+					...signal === void 0 ? {} : { signal }
+				});
+				if (recoveryResult !== void 0) return recoveryResult;
+			}
+			if (args.command.includes("rivus-attachment-recover")) throw new Error("Attachment recovery action is not authorized for this Run");
+			return tool.execute(id, {
+				...args,
+				timeout: args.timeout === void 0 ? DEFAULT_TIMEOUT_SECONDS : args.timeout
+			}, signal, onUpdate, context);
+		}
 	});
 }
 //#endregion
 //#region src/adapters/pi/tool-execution/pi-tool-proxy.ts
-function createPiToolProxyDefinitions$1(options) {
+function createPiToolProxyDefinitions(options) {
 	const names = /* @__PURE__ */ new Set();
 	return options.tools.map((tool) => {
 		const name = toPiToolName(tool.id);
@@ -1918,28 +1975,42 @@ function createPiToolProxyDefinitions$1(options) {
 			description: tool.description,
 			execute: async (callId, input, signal) => {
 				const activeInput = options.getActiveInput();
-				const origin = activeInput?.invocation;
-				if (!activeInput || !origin) throw new Error(`tool ${tool.id} requires an active agent run with a trusted invocation`);
-				const invocation = normalizeAgentInvocation(origin);
-				if (!invocation.tenantKey) throw new Error(`tool ${tool.id} requires a trusted tenant identity`);
-				throwIfAborted(signal ?? activeInput.abortSignal);
-				const inputDigest = createToolInputDigest(input);
-				const operationId = createBoundId("operation", {
-					agentId: options.agentId,
-					inputDigest,
-					instanceId: options.instanceId,
-					sourceMessageId: invocation.sourceMessageId,
-					toolId: tool.id,
-					toolVersion: tool.version
-				});
-				const approvalId = createBoundId("approval", {
-					callId,
-					operationId,
-					runId: activeInput.runId
-				});
-				if (requiresToolApproval(tool.risk)) {
-					if (invocation.allowedActorOpenIds.length === 0) throw new Error(`tool ${tool.id} requires at least one trusted approval actor`);
-					await options.approvals.requestApproval({
+				const abortSignal = signal ?? activeInput?.abortSignal;
+				const execution = Effect.gen(function* () {
+					const prepared = yield* Effect.try({
+						catch: (error) => error,
+						try: () => {
+							const origin = activeInput?.invocation;
+							if (!activeInput || !origin) throw new Error(`tool ${tool.id} requires an active agent run with a trusted invocation`);
+							const invocation = normalizeAgentInvocation(origin);
+							if (!invocation.tenantKey) throw new Error(`tool ${tool.id} requires a trusted tenant identity`);
+							throwIfAborted(abortSignal ?? activeInput.abortSignal);
+							const inputDigest = createToolInputDigest(input);
+							const operationId = createBoundId("operation", {
+								agentId: options.agentId,
+								inputDigest,
+								instanceId: options.instanceId,
+								sourceMessageId: invocation.sourceMessageId,
+								toolId: tool.id,
+								toolVersion: tool.version
+							});
+							const approvalId = createBoundId("approval", {
+								callId,
+								operationId,
+								runId: activeInput.runId
+							});
+							if (requiresToolApproval(tool.risk) && invocation.allowedActorOpenIds.length === 0) throw new Error(`tool ${tool.id} requires at least one trusted approval actor`);
+							return {
+								activeInput,
+								approvalId,
+								inputDigest,
+								invocation,
+								operationId
+							};
+						}
+					});
+					const { approvalId, inputDigest, invocation, operationId } = prepared;
+					if (requiresToolApproval(tool.risk)) yield* options.approvals.requestApproval({
 						agentId: options.agentId,
 						allowedActorOpenIds: invocation.allowedActorOpenIds,
 						approvalId,
@@ -1949,47 +2020,57 @@ function createPiToolProxyDefinitions$1(options) {
 						instanceId: options.instanceId,
 						operationId,
 						risk: tool.risk,
-						runId: activeInput.runId,
-						sessionKey: activeInput.sessionKey,
-						signal: signal ?? activeInput.abortSignal,
+						runId: prepared.activeInput.runId,
+						sessionKey: prepared.activeInput.sessionKey,
+						signal: abortSignal,
 						sourceMessageId: invocation.sourceMessageId,
 						tenantKey: invocation.tenantKey,
 						toolId: tool.id,
 						toolVersion: tool.version
 					});
-					throwIfAborted(signal ?? activeInput.abortSignal);
-				}
-				const result = await options.broker.execute({
-					authority: createInvocationAuthority({
-						agentId: options.agentId,
-						allowedActorOpenIds: invocation.allowedActorOpenIds,
-						...invocation.conversationId ? { conversationId: invocation.conversationId } : {},
-						endpointId: invocation.endpointId,
-						instanceId: options.instanceId,
-						...invocation.memory ? { memory: {
-							...invocation.memory,
-							scopes: options.memoryScopes ?? []
-						} } : {},
-						runId: activeInput.runId,
-						sessionKey: activeInput.sessionKey,
-						sourceMessageId: invocation.sourceMessageId,
-						tenantKey: invocation.tenantKey,
-						toolGrantSet: options.toolGrantSet
-					}),
-					callId,
-					input,
-					operationId,
-					...requiresToolApproval(tool.risk) ? { approvalId } : {},
-					toolId: tool.id,
-					version: tool.version
+					const authority = yield* Effect.try({
+						catch: (error) => error,
+						try: () => {
+							throwIfAborted(abortSignal ?? prepared.activeInput.abortSignal);
+							return createInvocationAuthority({
+								agentId: options.agentId,
+								allowedActorOpenIds: invocation.allowedActorOpenIds,
+								...invocation.conversationId ? { conversationId: invocation.conversationId } : {},
+								endpointId: invocation.endpointId,
+								instanceId: options.instanceId,
+								...invocation.memory ? { memory: {
+									...invocation.memory,
+									scopes: options.memoryScopes ?? []
+								} } : {},
+								runId: prepared.activeInput.runId,
+								sessionKey: prepared.activeInput.sessionKey,
+								sourceMessageId: invocation.sourceMessageId,
+								tenantKey: invocation.tenantKey,
+								toolGrantSet: options.toolGrantSet
+							});
+						}
+					});
+					const result = yield* options.broker.execute({
+						authority,
+						callId,
+						input,
+						operationId,
+						...requiresToolApproval(tool.risk) ? { approvalId } : {},
+						toolId: tool.id,
+						version: tool.version
+					});
+					return yield* Effect.try({
+						catch: (error) => error,
+						try: () => ({
+							content: [{
+								text: stringifyToolResult(result),
+								type: "text"
+							}],
+							details: result
+						})
+					});
 				});
-				return {
-					content: [{
-						text: stringifyToolResult(result),
-						type: "text"
-					}],
-					details: result
-				};
+				return Effect.runPromiseExit(execution, { signal: abortSignal }).then(unwrapExit);
 			},
 			executionMode: "sequential",
 			label: tool.id,
@@ -2002,7 +2083,7 @@ function createPiToolProxyDefinitions$1(options) {
 function createToolInputDigest(input) {
 	return createToolInputDigest$1(input, createSha256Digest);
 }
-function createPiToolNameResolver$1(tools) {
+function createPiToolNameResolver(tools) {
 	const toolIdsByPiName = new Map(tools.map((tool) => [toPiToolName(tool.id), tool.id]));
 	return (toolName) => toolIdsByPiName.get(toolName) ?? toolName;
 }
@@ -2059,85 +2140,5 @@ function createPiManagedRunBinding(options) {
 	});
 }
 //#endregion
-//#region src/adapters/compatibility/agent-execution/pi/pi-agent-loop.ts
-function createPiAgentLoop(options) {
-	return fromEffectAgentLoop(createPiAgentLoop$1({
-		...options.supportsSteering ? { supportsSteering: true } : {},
-		...options.disposeSessionAfterRun === void 0 ? {} : { disposeSessionAfterRun: options.disposeSessionAfterRun },
-		...options.modelContentObserver ? { modelContentObserver: options.modelContentObserver } : {},
-		...options.runBoundary ? { runBoundary: options.runBoundary } : {},
-		resolveSession: async (input) => toEffectPiAgentSessionHandle(await options.resolveSession(toCompatibilityAgentLoopInput(input)))
-	}));
-}
-function createPiSdkAgentLoop(options) {
-	return fromEffectAgentLoop(createPiSdkAgentLoop$1(options));
-}
-function toEffectPiAgentSessionHandle(handle) {
-	return {
-		...handle.activate ? { activate: (input) => handle.activate(toCompatibilityAgentLoopInput(input)) } : {},
-		...handle.dispose ? { dispose: handle.dispose } : {},
-		...handle.deactivate ? { deactivate: handle.deactivate } : {},
-		...handle.preparePrompt ? { preparePrompt: (input) => handle.preparePrompt(toCompatibilityAgentLoopInput(input)) } : {},
-		...handle.resolveToolName ? { resolveToolName: handle.resolveToolName } : {},
-		...handle.refreshResources ? { refreshResources: handle.refreshResources } : {},
-		session: handle.session
-	};
-}
-function fromEffectPiAgentSessionHandle(handle) {
-	return {
-		...handle.activate ? { activate: (input) => handle.activate(toEffectAgentLoopInput(input)) } : {},
-		...handle.dispose ? { dispose: handle.dispose } : {},
-		...handle.deactivate ? { deactivate: handle.deactivate } : {},
-		...handle.preparePrompt ? { preparePrompt: (input) => handle.preparePrompt(toEffectAgentLoopInput(input)) } : {},
-		...handle.resolveToolName ? { resolveToolName: handle.resolveToolName } : {},
-		...handle.refreshResources ? { refreshResources: handle.refreshResources } : {},
-		session: handle.session
-	};
-}
-//#endregion
-//#region src/adapters/compatibility/agent-execution/pi/pi-session-registry.ts
-function createPiSessionRegistry(options) {
-	const compatibilityHandles = /* @__PURE__ */ new WeakMap();
-	const registry = createPiSessionRegistry$1({ createSession: async (input) => {
-		const handle = await options.createSession(toCompatibilityAgentLoopInput(input));
-		const effectHandle = toEffectPiAgentSessionHandle(handle);
-		compatibilityHandles.set(effectHandle, handle);
-		return effectHandle;
-	} });
-	return {
-		dispose: (sessionKey) => registry.dispose(sessionKey),
-		disposeAll: () => registry.disposeAll(),
-		list: async () => (await registry.list()).map((effectHandle) => {
-			const cached = compatibilityHandles.get(effectHandle);
-			if (cached) return cached;
-			const handle = fromEffectPiAgentSessionHandle(effectHandle);
-			compatibilityHandles.set(effectHandle, handle);
-			return handle;
-		}),
-		resolve: async (input) => {
-			const effectHandle = await registry.resolve(toEffectAgentLoopInput(input));
-			const cached = compatibilityHandles.get(effectHandle);
-			if (cached) return cached;
-			const handle = fromEffectPiAgentSessionHandle(effectHandle);
-			compatibilityHandles.set(effectHandle, handle);
-			return handle;
-		},
-		size: () => registry.size()
-	};
-}
-//#endregion
-//#region src/adapters/compatibility/agent-execution/pi/pi-tool-proxy.ts
-function createPiToolProxyDefinitions(options) {
-	return createPiToolProxyDefinitions$1({
-		...options,
-		getActiveInput: () => {
-			const input = options.getActiveInput();
-			return input ? toEffectAgentLoopInput(input) : void 0;
-		}
-	});
-}
-function createPiToolNameResolver(tools) {
-	return createPiToolNameResolver$1(tools);
-}
-//#endregion
-export { InvalidPiSkillCatalog, InvalidPiSkillSource, InvalidProjectSkillCatalog, PI_MODEL_PROBE_FOLLOWUP_RESULT, PI_MODEL_PROBE_TOOL_NAME, PI_MODEL_PROBE_TOOL_RESULT, PI_SKILL_READER_TOOL_NAME, PiHistoryCompatibilityError, PiModelProbeError, PiModelResolutionError, PiModelRuntimeMutationUnknownError, PiModelTargetCompatibilityError, ProjectSkillReadDenied, assertPiSessionHistoryCompatible, createPiAgentLoop as createLegacyPiAgentLoop, createPiSdkAgentLoop as createLegacyPiSdkAgentLoop, createPiSessionRegistry as createLegacyPiSessionRegistry, createPiToolNameResolver as createLegacyPiToolNameResolver, createPiToolProxyDefinitions as createLegacyPiToolProxyDefinitions, createPiAgentLoop$1 as createPiAgentLoop, createPiAssembly, createPiBashTool, createPiManagedRunBinding, createPiModelRuntime, createPiProjectSkillReadTool, createPiSdkAgentLoop$1 as createPiSdkAgentLoop, createPiSessionRegistry$1 as createPiSessionRegistry, createPiSessionResources, createPiSkillReadTool, createPiSkillReadTools, createPiSkillRuntime, createPiToolNameResolver$1 as createPiToolNameResolver, createPiToolProxyDefinitions$1 as createPiToolProxyDefinitions, ensurePiModel, fromEffectPiAgentSessionHandle as fromEffectLegacyPiAgentSessionHandle, inspectPiSessionHistory, mergePiProviderBaseUrlOverride, mergePiProviderModelDeclaration, probePiModel, refreshPiModelCatalog, resolvePiModel, resolvePiModelBinding, resolvePiSessionToolNames, resolvePiSkillSources, runPiModelCanary, runPiSessionPrompts, samePiProvider, toEffectPiAgentSessionHandle as toEffectLegacyPiAgentSessionHandle, validatePiSkillCatalog, validatePiSkillCommand, validateProjectSkillCatalog, validateProjectSkillCommand };
+export { createPiAgentLoop, createPiAssembly, createPiBashTool, createPiManagedRunBinding, createPiModelRuntime, createPiSessionRegistry, createPiSessionResources, createPiSkillReadTools, createPiSkillRuntime, createPiToolNameResolver, createPiToolProxyDefinitions, ensurePiModel, mergePiProviderBaseUrlOverride, resolvePiSessionToolNames, validatePiSkillCommand };
+