pi2dsh 0.23.0 → 0.25.0

package/dist/{runtime-Dnk9mhrc.mjs → runtime-B3N7s93Q.mjs}

@@ -1,27 +1,193 @@
 
-import { Dn as PiCapabilityError, En as CapabilityLedger, F as generateBranchSummary, b as Theme, d as ExtensionRunner, w as __runWithSubagentSessionFactory } from "./pi-coding-agent-CPXFo0UO.mjs";
+import { Dn as CapabilityLedger, F as generateBranchSummary, On as PiCapabilityError, b as Theme, d as ExtensionRunner, fn as getDefaultSessionDir, w as __runWithSubagentSessionFactory } from "./pi-coding-agent-lcNs9Wos.mjs";
 import { t as getAgentDir } from "./pi-config-shim-CZ1wFzqM.mjs";
-import { $ as AssistantMessageEventStream, S as getSupportedThinkingLevels, c as builtinProviders, et as isContextOverflow, o as __runWithPiAiRuntime, r as __createPiAiRuntimeRegistry } from "./pi-ai-DQPHUR9S.mjs";
+import { C as getSupportedThinkingLevels, c as builtinProviders, nt as isContextOverflow, o as __runWithPiAiRuntime, r as __createPiAiRuntimeRegistry, tt as AssistantMessageEventStream } from "./pi-ai-Cy_BRMmd.mjs";
 import { W as getKeybindings, _t as stripTerminalSequences } from "./pi-tui-DruSeKmd.mjs";
 import { r as piMcpConfigPaths, t as collectPiMcpServers } from "./mcp-config-C1K-IzzB.mjs";
 import { c as resolvePiProviderAuth, i as oauthCredentialRef, l as storedOAuthCredential, n as joinSignals, o as providerSupportsOAuth, r as loginPiProvider, t as FileCredentialStore } from "./oauth-bridge-C_MAPMGA.mjs";
 import { createRequire } from "node:module";
-import { access, mkdir, readFile, writeFile } from "node:fs/promises";
-import { appendFileSync, existsSync, mkdirSync, readFileSync, unlinkSync } from "node:fs";
-import { basename, dirname, join, resolve } from "node:path";
+import { access, chmod, mkdir, mkdtemp, readFile, realpath, rm, stat, writeFile } from "node:fs/promises";
+import { appendFileSync, existsSync, mkdirSync, readFileSync, readdirSync, renameSync, unlinkSync, writeFileSync } from "node:fs";
+import { basename, dirname, join, relative, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
+import { createServer } from "node:net";
+import { randomBytes, randomUUID, timingSafeEqual } from "node:crypto";
 import { homedir, tmpdir } from "node:os";
 import { EventEmitter } from "node:events";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { createJiti } from "jiti";
+import * as llm from "@deepseek-ai/dsh-llm";
 import { CONTEXT_WINDOW_EXCEEDED_CODE, EMPTY_RESPONSE_CODE, LlmAdapter, LlmError, QUOTA_EXCEEDED_CODE, createUserMessage, isContextWindowExceededError, isQuotaExceededError } from "@deepseek-ai/dsh-llm";
 import { scopeOf } from "@deepseek-ai/dsh-scope";
 import { renderPrompt } from "@deepseek-ai/dsh-system-prompt";
-import { randomUUID } from "node:crypto";
 import { foldSurface } from "@deepseek-ai/dsh-session";
 import { spawn } from "node:child_process";
 import { Compile } from "typebox/compile";
 import { Value } from "typebox/value";
+//#region src/session-events.ts
+function readSessionEvents(session) {
+	if (typeof session !== "object" || session === null) return [];
+	const value = session;
+	const events = typeof value.snapshotEvents === "function" ? value.snapshotEvents.call(session) : typeof value.events === "function" ? value.events.call(session) : value.events;
+	if (!Array.isArray(events)) throw new Error("pi2dsh: the DSH session exposes no supported synchronous history reader");
+	return events;
+}
+/** Host-authored context is not a human turn; relay messages intentionally are. */
+function isPiUserMessage(data) {
+	const source = data.source;
+	return source?.kind === void 0 || source.kind === "user" || source.form === "relay";
+}
+/** The existing native descriptor convention for Pi in-memory side sessions. */
+function isPiEphemeralSession(session) {
+	return readSessionEvents(session).some((event) => {
+		const data = event.data;
+		return event.type === "subagent/descriptor" && data?.provider === "pi2dsh" && data.label?.startsWith("Side: ") === true;
+	});
+}
+//#endregion
+//#region src/pi-cli-bridge.ts
+async function parsePiPrintArgs(args, cwd) {
+	const parsed = {
+		cwd,
+		prompt: "",
+		extensions: [],
+		noExtensions: false,
+		noSession: false
+	};
+	let print = false;
+	const prompts = [];
+	const value = (index) => {
+		const found = args[index + 1];
+		if (found === void 0) throw new Error(`pi2dsh CLI: ${args[index]} needs a value`);
+		return found;
+	};
+	for (let i = 0; i < args.length; i++) {
+		const arg = args[i];
+		if (arg === "-p" || arg === "--print") print = true;
+		else if (arg === "--no-session") parsed.noSession = true;
+		else if (arg === "--no-extensions") parsed.noExtensions = true;
+		else if (arg === "--no-tools") parsed.tools = [];
+		else if (arg === "-e" || arg === "--extension") parsed.extensions.push(await realpath(resolve(cwd, value(i++))));
+		else if (arg === "--model") parsed.model = value(i++);
+		else if (arg === "--provider") parsed.provider = value(i++);
+		else if (arg === "--thinking") parsed.thinking = value(i++);
+		else if (arg === "--tools") parsed.tools = value(i++).split(",").filter(Boolean);
+		else if (arg === "--system-prompt") parsed.systemPrompt = value(i++);
+		else if (arg === "--append-system-prompt") parsed.appendSystemPrompt = value(i++);
+		else if (arg === "--mode") {
+			if (value(i++) !== "text") throw new Error("pi2dsh CLI: only non-interactive text output is supported");
+		} else if (arg.startsWith("-")) throw new Error(`pi2dsh CLI: unsupported option ${arg}`);
+		else if (arg.startsWith("@")) {
+			const path = resolve(cwd, arg.slice(1));
+			prompts.push(`<file name=${JSON.stringify(path)}>\n${await readFile(path, "utf8")}\n</file>`);
+		} else prompts.push(arg);
+	}
+	if (!print) throw new Error("pi2dsh CLI: only pi -p/--print is supported; use the DSH surface for interactive work");
+	if (prompts.length === 0) throw new Error("pi2dsh CLI: a prompt or @file is required");
+	parsed.prompt = prompts.join("\n\n");
+	return parsed;
+}
+async function withPiPrintTransport(invoke, execute) {
+	if (process.platform === "win32") return execute({});
+	const directory = await mkdtemp(join(tmpdir(), "p2cli-"));
+	await chmod(directory, 448);
+	const socketPath = join(directory, "s");
+	const token = randomBytes(32).toString("hex");
+	const sockets = /* @__PURE__ */ new Set();
+	const work = /* @__PURE__ */ new Set();
+	const controllers = /* @__PURE__ */ new Set();
+	const server = createServer((socket) => {
+		sockets.add(socket);
+		const controller = new AbortController();
+		controllers.add(controller);
+		let input = "";
+		let claimed = false;
+		let finished = false;
+		socket.setEncoding("utf8");
+		socket.on("error", () => controller.abort());
+		socket.on("close", () => {
+			sockets.delete(socket);
+			controllers.delete(controller);
+			if (!finished) controller.abort(/* @__PURE__ */ new Error("Pi print subprocess disconnected"));
+		});
+		socket.on("data", (chunk) => {
+			if (claimed) return;
+			input += chunk;
+			if (input.length > 4194304) {
+				socket.destroy();
+				return;
+			}
+			if (!input.includes("\n")) return;
+			claimed = true;
+			const task = (async () => {
+				try {
+					const request = JSON.parse(input.slice(0, input.indexOf("\n")));
+					const supplied = typeof request.token === "string" ? Buffer.from(request.token) : Buffer.alloc(0);
+					const expected = Buffer.from(token);
+					if (supplied.length !== expected.length || !timingSafeEqual(supplied, expected)) throw new Error("pi2dsh CLI: invalid execution capability");
+					if (!Array.isArray(request.args) || request.args.some((arg) => typeof arg !== "string") || typeof request.cwd !== "string") throw new Error("pi2dsh CLI: invalid request");
+					const parsed = await parsePiPrintArgs(request.args, request.cwd);
+					controller.signal.throwIfAborted();
+					const result = await invoke(parsed, controller.signal);
+					finished = true;
+					socket.end(`${JSON.stringify(result)}\n`);
+				} catch (error) {
+					finished = true;
+					console.warn("[pi2dsh CLI]", error instanceof Error ? error.message : String(error));
+					socket.end(`${JSON.stringify({
+						code: 1,
+						stdout: "",
+						stderr: error instanceof Error ? error.message : String(error)
+					})}\n`);
+				}
+			})();
+			work.add(task);
+			task.finally(() => work.delete(task));
+		});
+	});
+	try {
+		await new Promise((resolveListen, reject) => {
+			server.once("error", reject);
+			server.listen(socketPath, resolveListen);
+		});
+		await chmod(socketPath, 384);
+		const quote = (text) => `'${text.replaceAll("'", "'\\''")}'`;
+		const client = fileURLToPath(new URL("./pi-cli-client.mjs", import.meta.url));
+		await writeFile(join(directory, "pi"), `#!/bin/sh\nexec ${quote(process.execPath)} ${quote(client)} "$@"\n`, { mode: 448 });
+		return await execute({
+			PATH: `${directory}:${process.env.PATH ?? ""}`,
+			PI2DSH_CLI_SOCKET: socketPath,
+			PI2DSH_CLI_TOKEN: token
+		});
+	} finally {
+		for (const controller of controllers) controller.abort(/* @__PURE__ */ new Error("Pi exec completed"));
+		for (const socket of sockets) socket.destroy();
+		await Promise.allSettled(work);
+		await new Promise((resolveClose) => server.close(() => resolveClose()));
+		await rm(directory, {
+			recursive: true,
+			force: true
+		});
+	}
+}
+//#endregion
+//#region src/dsh-content.ts
+/** A file is text on the Pi side, using the host's own execution-world locator. */
+function fileContentForPi(attachment, ctx) {
+	const format = llm.fileHandleText;
+	if (format === void 0) throw new Error("pi2dsh: this DSH host cannot project file attachments");
+	let path;
+	try {
+		const hostPath = (ctx?.get("attachments"))?.fileHostPath?.(attachment);
+		const fs = ctx?.get("fs");
+		if (hostPath !== void 0) path = fs?.processPathFromHostPath(hostPath);
+	} catch {}
+	return {
+		type: "text",
+		text: format(attachment, path)
+	};
+}
+//#endregion
 //#region src/session-bridge.ts
 /** The durable seq behind a projected entry id (`dsh-<seq>`), when it has one. */
 function entrySeq(id) {
@@ -107,10 +273,9 @@ function sidecarDir() {
 	return join(getAgentDir(), "session-entries");
 }
 function sessionEvents(session) {
-	const events = session.events;
-	return typeof events === "function" ? events.call(session) : events ?? [];
+	return readSessionEvents(session);
 }
-function dshToPiContent$1(content) {
+function dshToPiContent$1(content, fileContent = fileContentForPi) {
 	if (!Array.isArray(content)) return [{
 		type: "text",
 		text: String(content ?? "")
@@ -121,6 +286,7 @@ function dshToPiContent$1(content) {
 			text: String(block)
 		};
 		const record = block;
+		if (record.type === "file") return fileContent(record.attachment);
 		if (record.type === "text") return {
 			type: "text",
 			text: String(record.text ?? "")
@@ -139,8 +305,90 @@ function dshToPiContent$1(content) {
 	});
 }
 var PiSessionBridge = class {
+	fileContent;
+	constructor(fileContent = fileContentForPi) {
+		this.fileContent = fileContent;
+	}
 	records = /* @__PURE__ */ new Map();
 	loaded = /* @__PURE__ */ new Set();
+	exportedSessions = /* @__PURE__ */ new Map();
+	async exportStoredSessions(persistence) {
+		const priorExports = [];
+		const root = join(getAgentDir(), "sessions");
+		if (existsSync(root)) for (const directory of readdirSync(root, { withFileTypes: true })) {
+			if (!directory.isDirectory()) continue;
+			for (const entry of readdirSync(join(root, directory.name), { withFileTypes: true })) {
+				if (!entry.isFile() || !entry.name.startsWith("dsh-")) continue;
+				const path = join(root, directory.name, entry.name);
+				const id = this.sessionIdOfArchiveFile(path);
+				if (id !== void 0) priorExports.push({
+					path,
+					id
+				});
+			}
+		}
+		const snapshots = await persistence.list();
+		const present = /* @__PURE__ */ new Set();
+		const hidden = /* @__PURE__ */ new Set();
+		for (const snapshot of snapshots) {
+			const header = snapshot.header ?? snapshot;
+			if (typeof header.id !== "string") continue;
+			present.add(header.id);
+			if (typeof header.cwd !== "string") continue;
+			if (typeof persistence.open === "function") {
+				const handle = await persistence.open(header.id, "read");
+				try {
+					const { events } = await handle.read();
+					const session = {
+						id: header.id,
+						header: handle.header,
+						events
+					};
+					if (isPiEphemeralSession(session)) hidden.add(header.id);
+					else this.exportSessionFile(session, header.cwd);
+				} finally {
+					await handle.close();
+				}
+			} else if (typeof persistence.inspect === "function") {
+				const { meta, events } = await persistence.inspect(header.id);
+				const session = {
+					id: header.id,
+					header: meta,
+					events
+				};
+				if (isPiEphemeralSession(session)) hidden.add(header.id);
+				else this.exportSessionFile(session, header.cwd);
+			}
+			this.exportedSessions.delete(header.id);
+		}
+		for (const exported of priorExports) if ((!present.has(exported.id) || hidden.has(exported.id)) && existsSync(exported.path)) unlinkSync(exported.path);
+	}
+	/** Materialize the public Pi file contract from the native session, never vice versa. */
+	exportSessionFile(session, cwd) {
+		this.exportedSessions.set(session.id, {
+			session,
+			cwd
+		});
+		const safe = session.id.replace(/[^a-zA-Z0-9._-]+/gu, "_");
+		const path = join(getDefaultSessionDir(cwd, getAgentDir()), `dsh-${safe}.jsonl`);
+		const text = `${[{
+			type: "session",
+			version: 3,
+			id: session.id,
+			cwd,
+			timestamp: new Date(Number(session.header?.createdAt ?? sessionEvents(session)[0]?.time ?? Date.now())).toISOString(),
+			pi2dshExport: { nativeSessionId: session.id }
+		}, ...this.projectEntries(session)].map((value) => JSON.stringify(value)).join("\n")}\n`;
+		if (existsSync(path) && readFileSync(path, "utf8") === text) return path;
+		const temporary = `${path}.${randomUUID()}.tmp`;
+		try {
+			writeFileSync(temporary, text, { mode: 384 });
+			renameSync(temporary, path);
+		} finally {
+			if (existsSync(temporary)) unlinkSync(temporary);
+		}
+		return path;
+	}
 	sidecarPath(sessionId) {
 		const safe = sessionId.replace(/[^a-zA-Z0-9._-]+/gu, "_");
 		return join(sidecarDir(), `${safe}.jsonl`);
@@ -179,9 +427,16 @@ var PiSessionBridge = class {
 	sessionIdOfArchiveFile(path) {
 		if (typeof path !== "string" || path.length === 0) return void 0;
 		const resolved = resolve(path);
-		if (resolve(dirname(resolved)) !== resolve(sidecarDir())) return void 0;
 		const base = basename(resolved);
-		return base.endsWith(".jsonl") ? base.slice(0, -6) : void 0;
+		if (resolve(dirname(resolved)) === resolve(sidecarDir())) return base.endsWith(".jsonl") ? base.slice(0, -6) : void 0;
+		if (relative(join(getAgentDir(), "sessions"), resolved).startsWith("..") || !base.startsWith("dsh-") || !base.endsWith(".jsonl")) return void 0;
+		try {
+			const header = JSON.parse(readFileSync(resolved, "utf8").split("\n")[0]);
+			const marker = header.pi2dshExport;
+			return typeof marker?.nativeSessionId === "string" && marker.nativeSessionId === header.id ? marker.nativeSessionId : void 0;
+		} catch {
+			return;
+		}
 	}
 	/**
 	* Retire one archive this bridge minted: the file whose existence tells Pi
@@ -195,6 +450,13 @@ var PiSessionBridge = class {
 		} catch {}
 		this.records.delete(sessionId);
 		this.loaded.delete(sessionId);
+		this.exportedSessions.delete(sessionId);
+		const root = join(getAgentDir(), "sessions");
+		if (existsSync(root)) for (const directory of readdirSync(root, { withFileTypes: true })) {
+			if (!directory.isDirectory()) continue;
+			const file = join(root, directory.name, `dsh-${sessionId.replace(/[^a-zA-Z0-9._-]+/gu, "_")}.jsonl`);
+			if (this.sessionIdOfArchiveFile(file) === sessionId) unlinkSync(file);
+		}
 	}
 	load(sessionId) {
 		if (this.loaded.has(sessionId)) return;
@@ -221,6 +483,8 @@ var PiSessionBridge = class {
 		this.records.set(sessionId, list);
 		this.archiveFileFor(sessionId);
 		appendFileSync(this.sidecarPath(sessionId), `${piEntryLineOf(record)}\n`);
+		const exported = this.exportedSessions.get(sessionId);
+		if (exported !== void 0) this.exportSessionFile(exported.session, exported.cwd);
 	}
 	appendCustomEntry(sessionId, customType, data) {
 		const id = randomUUID();
@@ -330,12 +594,19 @@ var PiSessionBridge = class {
 			if (type === "user/message") merged.push({
 				time,
 				entry: {
-					type: "message",
 					id: `dsh-${seq}`,
 					timestamp: new Date(time).toISOString(),
-					message: {
-						role: "user",
-						content: dshToPiContent$1(data.content)
+					...isPiUserMessage(data) ? {
+						type: "message",
+						message: {
+							role: "user",
+							content: dshToPiContent$1(data.content, this.fileContent)
+						}
+					} : {
+						type: "custom_message",
+						customType: String(data.source?.piCustomType ?? data.source?.kind ?? "context"),
+						content: dshToPiContent$1(data.content, this.fileContent),
+						display: false
 					}
 				}
 			});
@@ -349,7 +620,7 @@ var PiSessionBridge = class {
 						timestamp: new Date(time).toISOString(),
 						message: {
 							role: "assistant",
-							content: dshToPiContent$1(message.content)
+							content: dshToPiContent$1(message.content, this.fileContent)
 						}
 					}
 				});
@@ -433,9 +704,9 @@ var PiSessionBridge = class {
 		const leafOf = () => entriesOf().at(-1);
 		return {
 			getCwd: () => cwd,
-			getSessionDir: () => sidecarDir(),
+			getSessionDir: () => getDefaultSessionDir(cwd, getAgentDir()),
 			getSessionId: () => session.id,
-			getSessionFile: () => this.archiveFileFor(session.id, cwd),
+			getSessionFile: () => isPiEphemeralSession(session) ? void 0 : this.exportSessionFile(session, cwd),
 			getLeafId: () => leafOf()?.id ?? null,
 			getLeafEntry: () => leafOf(),
 			getEntry: (id) => entriesOf().find((entry) => entry.id === id),
@@ -500,9 +771,9 @@ function nativeToolNameOf(name) {
 * roster-owned surfaces the preset tools live above the global layer, so the
 * scoped read is the one that sees them.
 */
-function childSchemas(toolsService, childCtx) {
+function childSchemas(toolsService, childAgent) {
 	try {
-		if (childCtx.agent !== void 0) return toolsService.schemas(childCtx.agent);
+		if (childAgent !== void 0) return toolsService.schemas(childAgent);
 	} catch {}
 	return toolsService.schemas();
 }
@@ -561,6 +832,8 @@ var PiBridgedAgentSession = class {
 	/** Keeps message projections (which await attachment reads) in log order. */
 	#messageProjection = Promise.resolve();
 	#aborted = false;
+	#liveStreamAttempt;
+	#streamingText = "";
 	constructor(host, handle, tools, thinkingLevel) {
 		this.#thinkingLevel = typeof thinkingLevel === "string" && thinkingLevel.length > 0 ? thinkingLevel : "off";
 		this.#host = host;
@@ -572,8 +845,32 @@ var PiBridgedAgentSession = class {
 		const cordis = unscopedEventContext(host.cordis);
 		const offEvents = cordis.on("session/event", (session, event) => {
 			if (session !== this.#session) return;
+			if (event.type === "assistant/chunk" && this.#liveStreamAttempt !== void 0) return;
 			this.#project(event);
 		});
+		const offStream = cordis.on("agent/assistant-stream", (payload) => {
+			if (payload.agent !== this.#handle.agent) return;
+			const frame = payload.frame;
+			if (frame.type === "start") {
+				this.#liveStreamAttempt = {
+					id: frame.attemptId,
+					index: -1,
+					ended: false
+				};
+				this.#streamingText = "";
+			} else {
+				const active = this.#liveStreamAttempt;
+				if (active === void 0 || active.ended || active.id !== frame.attemptId) return;
+				if (frame.type === "end") active.ended = true;
+				if (frame.type === "chunk" && Number(frame.index) > active.index) {
+					active.index = Number(frame.index);
+					this.#project({
+						type: "assistant/chunk",
+						data: { chunk: frame.chunk }
+					});
+				}
+			}
+		});
 		const offPre = cordis.on("tools/pre-execute", async (exec, next) => {
 			if (exec.agent !== this.#handle.agent || this.agent.beforeToolCall === void 0) return next();
 			const decision = await this.agent.beforeToolCall({ toolCall: {
@@ -587,7 +884,7 @@ var PiBridgedAgentSession = class {
 			};
 			return next();
 		});
-		this.#disposers.push(offEvents, offPre);
+		this.#disposers.push(offEvents, offStream, offPre);
 		const session = this;
 		this.#state = {
 			get systemPrompt() {
@@ -712,22 +1009,26 @@ var PiBridgedAgentSession = class {
 				args
 			});
 		}
+		if (type === "assistant/message") this.#streamingText = "";
 		if (type === "assistant/chunk") {
 			const chunk = event.data.chunk ?? {};
+			if (chunk.type !== void 0 && chunk.type !== "text-delta") return;
 			const delta = typeof chunk.text === "string" ? chunk.text : typeof chunk.delta === "string" ? chunk.delta : "";
+			const message = {
+				role: "assistant",
+				content: [{
+					type: "text",
+					text: this.#streamingText += delta
+				}]
+			};
 			emit({
 				type: "message_update",
-				message: {
-					role: "assistant",
-					content: [{
-						type: "text",
-						text: delta
-					}]
-				},
+				message,
 				assistantMessageEvent: {
 					type: "text_delta",
+					contentIndex: 0,
 					delta,
-					...chunk
+					partial: message
 				}
 			});
 		}
@@ -809,7 +1110,8 @@ var PiBridgedAgentSession = class {
 			content: blocks,
 			source: {
 				kind: "plugin",
-				plugin: this.#host.messageSource
+				plugin: this.#host.messageSource,
+				form: "relay"
 			}
 		}), "followup");
 		await completed;
@@ -964,6 +1266,9 @@ async function createBridgedAgentSession(host, options) {
 	const archiveFile = typeof providedManager?.getSessionFile === "function" ? providedManager.getSessionFile() : void 0;
 	const resumeSessionId = host.resumeSessionIdFor?.(archiveFile);
 	const sideline = providedManager !== void 0 && archiveFile === void 0;
+	const parentId = host.parentSessionId();
+	const parentAgent = host.parentAgent?.() ?? (parentId === void 0 ? void 0 : agents.get?.(parentId));
+	const parentOwnership = parentAgent === void 0 ? {} : { parentAgent };
 	subagentSerial += 1;
 	const sessionId = `pi2dsh-sub-${Date.now().toString(36)}-${subagentSerial}`;
 	let handle;
@@ -986,8 +1291,9 @@ async function createBridgedAgentSession(host, options) {
 			...typeof requestedModel.provider === "string" && requestedModel.provider.length > 0 ? { provider: requestedModel.provider } : {}
 		} : host.parentModelRoute?.();
 		const agentOptionsFragment = typeof route?.model === "string" && route.model.length > 0 ? { agentOptions: route } : {};
-		const setup = async (childCtx) => {
-			const childSession = childCtx.agent?.session;
+		const setup = async (childCtx, agent) => {
+			const childAgent = agent ?? childCtx.agent;
+			const childSession = childAgent?.session;
 			if (typeof childSession?.append === "function") {
 				if (delegated.sandboxMode !== void 0) childSession.append("sandbox/mode", {
 					mode: delegated.sandboxMode,
@@ -1017,7 +1323,7 @@ async function createBridgedAgentSession(host, options) {
 			if (restriction !== void 0) {
 				const toolsService = typeof childCtx.get === "function" ? childCtx.get("tools") : void 0;
 				if (toolsService !== void 0) {
-					const known = new Set(childSchemas(toolsService, childCtx).map((schema) => schema.name));
+					const known = new Set(childSchemas(toolsService, childAgent).map((schema) => schema.name));
 					initialRestrictionDispose = toolsService.restrict({ allow: restriction.filter((name) => known.has(name)) });
 				}
 			}
@@ -1025,7 +1331,7 @@ async function createBridgedAgentSession(host, options) {
 			if (excluded.length > 0) {
 				const toolsService = typeof childCtx.get === "function" ? childCtx.get("tools") : void 0;
 				if (toolsService !== void 0) {
-					const known = new Set(childSchemas(toolsService, childCtx).map((schema) => schema.name));
+					const known = new Set(childSchemas(toolsService, childAgent).map((schema) => schema.name));
 					toolsService.restrict({ deny: excluded.map(nativeToolNameOf).filter((name) => known.has(name)) });
 				}
 			}
@@ -1045,11 +1351,14 @@ async function createBridgedAgentSession(host, options) {
 			if (typeof agents.resume !== "function") throw new Error("pi2dsh: reopening a child conversation needs the DSH agent registry's persisted-resume seam, which this composition does not provide");
 			handle = await agents.resume({
 				resumeSessionId,
+				...parentOwnership,
 				...agentOptionsFragment,
-				setup
+				setup,
+				...options.signal === void 0 ? {} : { signal: options.signal }
 			});
 		} else handle = await agents.create({
 			sessionId,
+			...parentOwnership,
 			meta: {
 				cwd: typeof options.cwd === "string" ? options.cwd : host.cwd(),
 				origin: "subagent",
@@ -1058,7 +1367,8 @@ async function createBridgedAgentSession(host, options) {
 				...typeof composedPreset === "string" && composedPreset.length > 0 ? { agentPreset: composedPreset } : {}
 			},
 			...agentOptionsFragment,
-			setup
+			setup,
+			...options.signal === void 0 ? {} : { signal: options.signal }
 		});
 	} catch (error) {
 		if (resumeSessionId !== void 0) {
@@ -1068,7 +1378,7 @@ async function createBridgedAgentSession(host, options) {
 			}
 			throw new Error(`pi2dsh: reopening child session ${JSON.stringify(resumeSessionId)} failed — this composition may lack session persistence (${error instanceof Error ? error.message : String(error)})`);
 		}
-		throw new Error(`pi2dsh: subagent creation needs the DSH host loop (model runtime) to provide the agent factory; this composition cannot run one (${error instanceof Error ? error.message : String(error)})`);
+		throw new Error(`pi2dsh: native subagent creation failed (${error instanceof Error ? error.message : String(error)})`, { cause: error });
 	}
 	const tools = [...Array.isArray(options.tools) ? options.tools : [], ...Array.isArray(options.customTools) ? options.customTools : []];
 	const childSession = handle.agent.session;
@@ -1165,102 +1475,6 @@ var BrowserSurfaces = class {
 	imageToolNames() {
 		return [...this.#imageToolNames];
 	}
-	#scene;
-	#sceneRevision = 0;
-	#sceneWidth = 100;
-	openScene(packageName, factory, theme, keybindings, options) {
-		this.#finishScene(void 0);
-		return new Promise((resolve, reject) => {
-			const run = {
-				package: packageName,
-				component: void 0,
-				options,
-				resolve,
-				reject
-			};
-			this.#scene = run;
-			const driver = { requestRender: () => this.#invalidateScene() };
-			const done = (value) => {
-				if (this.#scene !== run) return;
-				this.#finishScene(value);
-			};
-			Promise.resolve().then(() => factory(driver, theme, keybindings, done)).then((component) => {
-				if (this.#scene !== run) {
-					component.dispose?.();
-					return;
-				}
-				if (typeof component?.render !== "function") {
-					this.#scene = void 0;
-					this.#invalidateScene();
-					console.warn(`[pi2dsh] web scene for ${packageName}: component lacks render(width)`);
-					reject(/* @__PURE__ */ new TypeError("Pi custom component must implement render(width)"));
-					return;
-				}
-				run.component = component;
-				this.#invalidateScene();
-			}, (error) => {
-				if (this.#scene !== run) return;
-				this.#scene = void 0;
-				this.#invalidateScene();
-				console.warn(`[pi2dsh] web scene for ${packageName}: component factory failed: ${error instanceof Error ? error.stack ?? error.message : String(error)}`);
-				reject(error);
-			});
-		});
-	}
-	/** What the browser paints: the live component's frame, or a closed marker. */
-	sceneSnapshot() {
-		const scene = this.#scene;
-		if (scene?.component === void 0) return {
-			open: false,
-			revision: this.#sceneRevision
-		};
-		const requested = (typeof scene.options?.overlayOptions === "function" ? scene.options.overlayOptions() : scene.options?.overlayOptions)?.width;
-		const width = typeof requested === "number" && Number.isFinite(requested) && requested > 0 ? Math.min(this.#sceneWidth, Math.floor(requested)) : this.#sceneWidth;
-		let lines;
-		try {
-			lines = scene.component.render(width);
-		} catch (error) {
-			const failed = this.#scene;
-			this.#scene = void 0;
-			this.#invalidateScene();
-			console.warn(`[pi2dsh] web scene for ${scene.package}: render(width) failed: ${error instanceof Error ? error.stack ?? error.message : String(error)}`);
-			failed?.reject(error);
-			return {
-				open: false,
-				revision: this.#sceneRevision
-			};
-		}
-		return {
-			open: true,
-			package: scene.package,
-			revision: this.#sceneRevision,
-			lines
-		};
-	}
-	/** Raw terminal input from the browser keyboard, verbatim into the component. */
-	sceneInput(sequence, width) {
-		if (typeof width === "number" && Number.isFinite(width)) this.#sceneWidth = Math.max(20, Math.min(400, Math.floor(width)));
-		const component = this.#scene?.component;
-		if (component === void 0 || sequence.length === 0) return;
-		component.handleInput?.(sequence);
-		component.invalidate?.();
-		this.#invalidateScene();
-	}
-	/** The browser dismissed the overlay: resolve the Pi caller with undefined. */
-	closeScene() {
-		this.#finishScene(void 0);
-	}
-	#finishScene(value) {
-		const scene = this.#scene;
-		if (scene === void 0) return;
-		this.#scene = void 0;
-		scene.component?.dispose?.();
-		this.#invalidateScene();
-		scene.resolve(value);
-	}
-	#invalidateScene() {
-		this.#sceneRevision += 1;
-	}
 	/**
 	* Track one child session under its parent.
 	* @param parentSessionId - the session the panel floats over.
@@ -1300,9 +1514,20 @@ var BrowserSurfaces = class {
 			if (live.size === 0) this.#commandRunners.delete(sessionId);
 		};
 	}
-	/** The registered runner for (session, package), when one is mounted. */
+	/**
+	* The registered runner for (session, package), when one is mounted.
+	*
+	* An empty sessionId means "any session where the package is mounted":
+	* session-free product UI (a Settings page) invoking a package command
+	* whose effect is global state — the handler itself is the package's own
+	* either way, and every mounted copy routes to the same package storage.
+	*/
 	commandRunner(sessionId, packageName) {
-		return this.#commandRunners.get(sessionId)?.get(packageName);
+		if (sessionId !== "") return this.#commandRunners.get(sessionId)?.get(packageName);
+		for (const runners of this.#commandRunners.values()) {
+			const runner = runners.get(packageName);
+			if (runner !== void 0) return runner;
+		}
 	}
 	/**
 	* The panel's view of one parent session.
@@ -1718,6 +1943,46 @@ function registerBrowserSurfaceRoute(ctx, registry, hooks) {
 				response.end(JSON.stringify(outcome ?? { ok: true }));
 				return;
 			}
+			if (url.pathname === "/pi2dsh/login-state" && (method === "GET" || method === "HEAD")) {
+				if (hooks?.loginState === void 0) {
+					response.writeHead(404);
+					response.end();
+					return;
+				}
+				const body = JSON.stringify(await hooks.loginState());
+				response.writeHead(200, {
+					"content-type": "application/json; charset=utf-8",
+					"cache-control": "no-store"
+				});
+				response.end(method === "HEAD" ? void 0 : body);
+				return;
+			}
+			if (url.pathname === "/pi2dsh/login-action" && method === "POST") {
+				if (hooks?.loginAction === void 0) {
+					response.writeHead(404);
+					response.end();
+					return;
+				}
+				const chunks = [];
+				const raw = await new Promise((settle) => {
+					const stream = req;
+					stream.on("data", (chunk) => chunks.push(Buffer.from(chunk)));
+					stream.on("end", () => settle(Buffer.concat(chunks).toString("utf8")));
+				});
+				let outcome;
+				try {
+					const payload = JSON.parse(raw || "{}");
+					if (typeof payload.action !== "string") throw new TypeError("login-action needs { action }");
+					outcome = await hooks.loginAction(payload.action, typeof payload.provider === "string" ? payload.provider : "", typeof payload.value === "string" ? payload.value : "");
+				} catch (error) {
+					response.writeHead(400, { "content-type": "application/json; charset=utf-8" });
+					response.end(JSON.stringify({ error: error instanceof Error ? error.message : String(error) }));
+					return;
+				}
+				response.writeHead(200, { "content-type": "application/json; charset=utf-8" });
+				response.end(JSON.stringify(outcome ?? { ok: true }));
+				return;
+			}
 			if (url.pathname === "/pi2dsh/pi-command" && method === "POST") {
 				const chunks = [];
 				const raw = await new Promise((settle) => {
@@ -1746,22 +2011,6 @@ function registerBrowserSurfaceRoute(ctx, registry, hooks) {
 				}
 				return;
 			}
-			if (method === "POST" && (url.pathname === "/pi2dsh/scene-input" || url.pathname === "/pi2dsh/scene-close")) {
-				const chunks = [];
-				const body = await new Promise((settle) => {
-					const stream = req;
-					stream.on("data", (chunk) => chunks.push(Buffer.from(chunk)));
-					stream.on("end", () => settle(Buffer.concat(chunks).toString("utf8")));
-				});
-				if (url.pathname === "/pi2dsh/scene-close") registry.closeScene();
-				else try {
-					const payload = JSON.parse(body || "{}");
-					if (typeof payload.sequence === "string") registry.sceneInput(payload.sequence, typeof payload.width === "number" ? payload.width : void 0);
-				} catch {}
-				response.writeHead(204);
-				response.end();
-				return;
-			}
 			if (method !== "GET" && method !== "HEAD") {
 				response.writeHead(405);
 				response.end();
@@ -1807,13 +2056,11 @@ function registerBrowserSurfaceRoute(ctx, registry, hooks) {
 			const body = JSON.stringify(session === "" ? {
 				threads: [],
 				surfaces: [],
-				entries: [],
-				scene: registry.sceneSnapshot()
+				entries: []
 			} : {
 				threads: registry.snapshot(session),
 				surfaces: registry.surfaces(session),
 				entries: registry.entries(session),
-				scene: registry.sceneSnapshot(),
 				...registry.draftRequest(session) === void 0 ? {} : { draft: registry.draftRequest(session) }
 			});
 			response.writeHead(200, {
@@ -2084,6 +2331,7 @@ var ModelCatalog = class {
 			if (exact.contextWindow !== void 0) model.contextWindow = exact.contextWindow;
 			if (exact.maxTokens !== void 0) model.maxTokens = exact.maxTokens;
 			model.reasoning = exact.reasoning;
+			if (exact.thinkingLevelMap !== void 0) model.thinkingLevelMap = exact.thinkingLevelMap;
 			resolved.set(`${model.provider}${model.id}`, model);
 		}));
 		this.#models = next;
@@ -2109,7 +2357,17 @@ var ModelCatalog = class {
 			const defaultMaxTokens = info.defaultMaxTokens;
 			if (typeof defaultMaxTokens === "number") model.maxTokens = defaultMaxTokens;
 			const reasoning = info.reasoning;
-			model.reasoning = Array.isArray(reasoning?.efforts) && reasoning.efforts.length > 0;
+			const efforts = new Set((reasoning?.efforts ?? []).map((effort) => String(effort?.id ?? "")));
+			model.reasoning = [...efforts].some((effort) => effort !== "" && effort !== "off");
+			if (efforts.size > 0) model.thinkingLevelMap = Object.fromEntries([
+				"off",
+				"minimal",
+				"low",
+				"medium",
+				"high",
+				"xhigh",
+				"max"
+			].map((level) => [level, efforts.has(level) ? level : null]));
 			return model;
 		} catch {
 			return;
@@ -2234,6 +2492,7 @@ function streamViaDshLlm(llm, request) {
 		...Array.isArray(request.context.tools) ? { tools: normalizeToolSchemas(request.context.tools) } : {},
 		...typeof options.maxTokens === "number" ? { maxTokens: options.maxTokens } : {},
 		...typeof options.temperature === "number" ? { temperature: options.temperature } : {},
+		...typeof options.reasoning === "string" ? { reasoningEffort: options.reasoning } : {},
 		...options.signal instanceof AbortSignal ? { signal: options.signal } : {}
 	};
 	(async () => {
@@ -2441,15 +2700,21 @@ function normalizeToolSchemas(tools) {
 /** DSH GenerateOptions parts → the Pi request context a provider.stream expects. */
 async function dshRequestToPiContext(options, attachments) {
 	const piMessages = [];
+	const messages = Array.isArray(options.messages) ? options.messages : [];
+	const first = messages[0];
+	const hasExplicitSystem = typeof options.system === "string";
+	const systemPrompt = hasExplicitSystem ? options.system : first?.role === "system" ? (Array.isArray(first.content) ? first.content : []).filter((block) => block.type === "text").map((block) => String(block.text ?? "")).join("\n") : void 0;
+	const history = !hasExplicitSystem && first?.role === "system" ? messages.slice(1) : messages;
 	const toolNamesById = /* @__PURE__ */ new Map();
-	for (const message of Array.isArray(options.messages) ? options.messages : []) {
+	for (const message of history) {
 		if (message.role !== "assistant") continue;
 		for (const block of Array.isArray(message.content) ? message.content : []) if (block.type === "tool-call" && typeof block.id === "string" && typeof block.name === "string") toolNamesById.set(block.id, block.name);
 	}
-	for (const message of Array.isArray(options.messages) ? options.messages : []) {
+	for (const message of history) {
 		const content = Array.isArray(message.content) ? message.content : [];
 		const source = message.source;
-		if (message.role === "user" && source?.kind === "tool") {
+		if (message.role === "system") throw new Error("pi2dsh: this Pi provider cannot represent an in-history system prompt update");
+		else if (message.role === "user" && source?.kind === "tool") {
 			const result = content[0];
 			const toolCallId = String(result?.toolCallId ?? "");
 			const toolName = toolNamesById.get(toolCallId);
@@ -2470,7 +2735,7 @@ async function dshRequestToPiContext(options, attachments) {
 		});
 	}
 	return {
-		...typeof options.system === "string" && options.system.length > 0 ? { systemPrompt: options.system } : {},
+		...systemPrompt !== void 0 && systemPrompt.length > 0 ? { systemPrompt } : {},
 		messages: piMessages,
 		...Array.isArray(options.tools) ? { tools: options.tools } : {}
 	};
@@ -4103,9 +4368,10 @@ function isSubagentOrigin(subject) {
 function currentPiModel(state, agent) {
 	const override = state.modelOverrides.get(agent);
 	const options = agent.options;
-	const selectedProvider = String(override?.provider ?? options?.provider ?? "");
+	const durable = lastRequestRouteOf(agentSession(agent));
+	const selectedProvider = String(override?.provider ?? durable?.provider ?? options?.provider ?? "");
 	const provider = state.companionRoutes.get(selectedProvider) ?? selectedProvider;
-	const id = String(override?.model ?? options?.model ?? "");
+	const id = String(override?.model ?? durable?.model ?? options?.model ?? "");
 	if (id.length === 0) return override;
 	return (provider.length > 0 ? state.modelCatalog?.find(provider, id) : void 0) ?? {
 		id,
@@ -4156,9 +4422,7 @@ function resolveCallerRoute(override, durable, snapshot) {
 }
 /** A session's durable events, whether the store exposes them as value or method. */
 function eventsOf(session) {
-	const events = session.events;
-	if (typeof events === "function") return events.call(session) ?? [];
-	return Array.isArray(events) ? events : [];
+	return readSessionEvents(session);
 }
 /** The session id a presentation call belongs to, or '' outside a session. */
 function sessionIdOf(state, agent) {
@@ -4358,8 +4622,16 @@ function contextFor(ctx, state, agent, signal, command = false, sessionOverride,
 			if (headlessUi) return void 0;
 			const surfaces = state.tuiSurfaces;
 			if (surfaces !== void 0) return surfaces.custom(factory, state.theme, getKeybindings(), options);
-			const browser = state.shared.browserSurfaces;
-			if (browser !== void 0 && state.shared.browserSurfacesRouted === true) return browser.openScene(state.packageName, factory, state.theme, getKeybindings(), options);
+			if (humanAnswererAvailable(userQuestions, agent, state.shared)) {
+				const gap = {
+					capability: "ui.custom",
+					reason: "native dialogs are available, but this surface has no terminal-component renderer.",
+					guidance: "Use the package's non-terminal fallback or a DSH terminal surface.",
+					packageName: state.packageName
+				};
+				capabilityLedgerOf(ctx, state).reportDegraded(gap);
+				throw new PiCapabilityError(gap);
+			}
 		},
 		pasteToEditor(text) {
 			const surfaces = state.shared.browserSurfaces;
@@ -4556,8 +4828,7 @@ function contextFor(ctx, state, agent, signal, command = false, sessionOverride,
 		},
 		ui,
 		get mode() {
-			if (state.tuiSurfaces?.available === true) return "tui";
-			return state.shared.browserSurfaces !== void 0 && state.shared.browserSurfacesRouted === true ? "tui" : "rpc";
+			return state.tuiSurfaces?.available === true ? "tui" : "rpc";
 		},
 		get hasUI() {
 			return state.tuiSurfaces?.available === true || humanAnswererAvailable(userQuestions, agent, state.shared);
@@ -4582,7 +4853,10 @@ function contextFor(ctx, state, agent, signal, command = false, sessionOverride,
 				reason: "pi2dsh: aborted by migrated Pi extension"
 			});
 		},
-		hasPendingMessages: () => agent?.inbox?.hasPending === true,
+		hasPendingMessages: () => {
+			const inbox = agent?.inbox;
+			return inbox?.nextStep !== void 0 || inbox?.nextTurn !== void 0 ? (inbox.nextStep?.length ?? 0) + (inbox.nextTurn?.length ?? 0) > 0 : inbox?.hasPending === true;
+		},
 		shutdown: () => {
 			capabilityLedgerOf(ctx, state).reportHostDecision({
 				capability: "ctx.shutdown",
@@ -4683,7 +4957,7 @@ function contextFor(ctx, state, agent, signal, command = false, sessionOverride,
 			const seq = durableSeqOf(String(entryId));
 			if (seq === void 0) throw new Error(`pi2dsh: ctx.fork(${JSON.stringify(String(entryId))}) — only durable-log entries (projected ids "dsh-<seq>") can anchor a fork; package-appended sidecar entries are not part of the DSH durable log`);
 			const position = options?.position ?? "before";
-			const events = source.events ?? [];
+			const events = readSessionEvents(source);
 			const requested = Math.min(position === "at" ? seq : seq - 1, events.length - 1);
 			const boundary = requested < 0 ? -1 : shrinkToTurnBoundary(events, requested);
 			const child = boundary < 0 ? sessions.create(void 0, { meta: {
@@ -4714,7 +4988,7 @@ function contextFor(ctx, state, agent, signal, command = false, sessionOverride,
 			}
 			const seq = durableSeqOf(String(targetId));
 			if (seq === void 0) throw new Error(`pi2dsh: ctx.navigateTree(${JSON.stringify(String(targetId))}) — only durable-log entries (projected ids "dsh-<seq>") can be navigation targets; package-appended sidecar entries are not part of the DSH durable log`);
-			const events = source.events ?? [];
+			const events = readSessionEvents(source);
 			const capped = Math.min(seq, events.length - 1);
 			const boundary = capped < 0 ? -1 : shrinkToTurnBoundary(events, capped);
 			const child = boundary < 0 ? sessions.create(void 0, { meta: {
@@ -4747,7 +5021,7 @@ function contextFor(ctx, state, agent, signal, command = false, sessionOverride,
 			}
 			const raw = String(sessionPath);
 			const base = raw.replace(/\\/g, "/").split("/").pop() ?? raw;
-			const candidate = base.endsWith(".jsonl") ? base.slice(0, -6) : base;
+			const candidate = state.bridge.sessionIdOfArchiveFile(raw) ?? (base.endsWith(".jsonl") ? base.slice(0, -6) : base);
 			const target = sessions.get(candidate) ?? sessions.list().find((entry) => String(entry.id) === candidate);
 			if (target === void 0) throw new Error(`pi2dsh: ctx.switchSession(${JSON.stringify(raw)}) — no live DSH session ${JSON.stringify(candidate)}; switching to persisted sessions is host-owned (resume them from the DSH surface first)`);
 			const withSession = options?.withSession;
@@ -4784,6 +5058,20 @@ async function dispatch(state, eventName, event, eventContext) {
 	for (const handler of state.handlers.get(eventName) ?? []) results.push(await runInPiRuntime(state, agent, () => handler(event, eventContext)));
 	return results;
 }
+function shutdownPiSession(ctx, state, agent, reason, signal) {
+	const existing = state.shutdownTasks.get(agent);
+	if (existing !== void 0) return existing;
+	if (state.piShutdownAgents.has(agent)) return Promise.resolve();
+	state.piShutdownAgents.add(agent);
+	const task = dispatch(state, "session_shutdown", {
+		type: "session_shutdown",
+		reason
+	}, contextFor(ctx, state, agent, signal)).then(() => {});
+	state.shutdownTasks.set(agent, task);
+	state.pendingShutdowns.add(task);
+	task.then(() => state.pendingShutdowns.delete(task), () => state.pendingShutdowns.delete(task));
+	return task;
+}
 /**
 * Bind every compatibility singleton to this exact Agent runtime for the
 * duration of extension-owned work. AsyncLocalStorage follows promises and
@@ -4875,7 +5163,8 @@ async function dshToPiContent(ctx, content) {
 	else if (block.type === "image") {
 		const image = await piImageBlock(ctx, block.attachment);
 		if (image !== void 0) out.push(image);
-	} else out.push({ type: block.type });
+	} else if (block.type === "file") out.push(fileContentForPi(block.attachment, ctx));
+	else out.push({ type: block.type });
 	return out;
 }
 /**
@@ -4905,7 +5194,11 @@ async function messageFromSessionEvent(ctx, event) {
 	if (typeof data !== "object" || data === null) return void 0;
 	const record = data;
 	if (type === "user/message") return {
-		role: "user",
+		role: isPiUserMessage(record) ? "user" : "custom",
+		...!isPiUserMessage(record) ? {
+			customType: String(record.source?.piCustomType ?? record.source?.kind ?? "context"),
+			display: false
+		} : {},
 		content: await dshToPiContent(ctx, record.content ?? [])
 	};
 	if (type === "assistant/message") {
@@ -5003,6 +5296,20 @@ function untrackRuntimeSession(state, agent) {
 	states?.delete(state);
 	if (states?.size === 0) state.shared.runtimeStatesBySession.delete(id);
 }
+const sessionExportTasks = /* @__PURE__ */ new WeakMap();
+async function prepareSessionFileExports(ctx, state) {
+	const persistence = optionalService(ctx, "sessionPersistence");
+	if (typeof persistence?.list !== "function" || typeof persistence.open !== "function" && typeof persistence.inspect !== "function") return;
+	let task = sessionExportTasks.get(ctx.root);
+	if (task === void 0) {
+		task = state.bridge.exportStoredSessions(persistence);
+		sessionExportTasks.set(ctx.root, task);
+		task.catch(() => {
+			sessionExportTasks.delete(ctx.root);
+		});
+	}
+	await task;
+}
 /** Dispatch or join the one in-flight Pi session_start for this session. */
 async function startPiSession(ctx, state, agent, reason, signal) {
 	if (!acceptsAgent(state, agent)) return;
@@ -5015,24 +5322,24 @@ async function startPiSession(ctx, state, agent, reason, signal) {
 		const previous = state.hostAgent;
 		const replacing = typeof previous === "object" && previous !== null && previous !== agent;
 		const transitionReason = replacing ? replacementReason(reason) : reason;
-		if (replacing && !state.piShutdownAgents.has(previous)) {
-			state.piShutdownAgents.add(previous);
+		if (replacing) {
 			releasePiSessionClaim(state, previous);
-			await runInPiRuntime(state, previous, () => dispatch(state, "session_shutdown", {
-				type: "session_shutdown",
-				reason: replacementReason(reason)
-			}, contextFor(ctx, state, previous, signal)));
+			await shutdownPiSession(ctx, state, previous, replacementReason(reason), signal);
 		}
 		if (typeof agent === "object" && agent !== null) {
 			state.hostAgent = agent;
 			state.piShutdownAgents.delete(agent);
+			state.shutdownTasks.delete(agent);
 		}
 		if (!claimPiSessionStart(state, agent)) return;
 		try {
+			await prepareSessionFileExports(ctx, state);
 			await dispatch(state, "session_start", {
 				type: "session_start",
 				reason: transitionReason
 			}, contextFor(ctx, state, agent, signal));
+			await discoverPiResources(ctx, state, agent, transitionReason, signal);
+			await refreshNativeSkillCommands(ctx, state, agent, signal);
 		} catch (error) {
 			releasePiSessionClaim(state, agent);
 			throw error;
@@ -5077,15 +5384,65 @@ function subscribeLifecycle(ctx, state) {
 			state.disposedAgents.add(agent);
 			releasePiSessionClaim(state, agent);
 			if (ownsHostSession && !state.piShutdownAgents.has(agent)) {
-				state.piShutdownAgents.add(agent);
 				state.hostAgent = void 0;
-				dispatch(state, "session_shutdown", {
-					type: "session_shutdown",
-					reason: "quit"
-				}, contextFor(ctx, state, agent, void 0)).catch((error) => warn("session_shutdown", error));
+				shutdownPiSession(ctx, state, agent, "quit").catch((error) => warn("session_shutdown", error));
 			}
 		}
 	});
+	const liveStreams = /* @__PURE__ */ new WeakMap();
+	const projectAssistantChunk = (session, data, chunk, eventContext) => {
+		if ((state.handlers.get("message_update")?.length ?? 0) === 0) return;
+		if (chunk.type !== void 0 && chunk.type !== "text-delta") return;
+		const key = `${String(session.id ?? "")}:${String(data.turn ?? 0)}:${String(data.step ?? 0)}`;
+		const delta = typeof chunk.text === "string" ? chunk.text : typeof chunk.delta === "string" ? chunk.delta : "";
+		const accumulated = (state.streamingTexts.get(key) ?? "") + delta;
+		state.streamingTexts.set(key, accumulated);
+		const message = {
+			role: "assistant",
+			content: [{
+				type: "text",
+				text: accumulated
+			}]
+		};
+		dispatch(state, "message_update", {
+			type: "message_update",
+			message,
+			assistantMessageEvent: {
+				type: "text_delta",
+				contentIndex: 0,
+				delta,
+				partial: message
+			}
+		}, eventContext).catch((error) => warn("message_update", error));
+	};
+	cordis.on("agent/assistant-stream", (payload) => {
+		const agent = payload.agent;
+		if (agent === void 0 || state.hostAnchor || !acceptsAgent(state, agent)) return;
+		const session = agentSession(agent);
+		if (session === void 0) return;
+		const frame = payload.frame;
+		if (frame.type === "start") {
+			liveStreams.set(session, {
+				attemptId: frame.attemptId,
+				turn: frame.turn,
+				step: frame.step,
+				index: -1,
+				ended: false
+			});
+			state.streamingTexts.delete(`${String(session.id ?? "")}:${String(frame.turn ?? 0)}:${String(frame.step ?? 0)}`);
+			return;
+		}
+		const active = liveStreams.get(session);
+		if (active === void 0 || active.ended || active.attemptId !== frame.attemptId) return;
+		if (frame.type === "chunk" && Number(frame.index) > active.index) {
+			active.index = Number(frame.index);
+			projectAssistantChunk(session, active, frame.chunk, contextFor(ctx, state, agent, void 0));
+		}
+		if (frame.type === "end") {
+			active.ended = true;
+			state.streamingTexts.delete(`${String(session.id ?? "")}:${String(active.turn ?? 0)}:${String(active.step ?? 0)}`);
+		}
+	});
 	const projectSessionEvent = (session, event) => {
 		const agent = [...state.activeAgents].find((candidate) => candidate.session === session);
 		const eventContext = contextFor(ctx, state, agent, void 0);
@@ -5107,7 +5464,7 @@ function subscribeLifecycle(ctx, state) {
 			const index = state.piTurnIndex.get(key) ?? 0;
 			state.piTurnIndex.set(key, index + 1);
 			state.projection = state.projection.then(async () => {
-				const stepEvents = (session.events ?? []).filter((entry) => {
+				const stepEvents = readSessionEvents(session).filter((entry) => {
 					const entryData = entry.data;
 					return Number(entryData?.turn ?? -1) === turn && Number(entryData?.step ?? -1) === step;
 				});
@@ -5140,27 +5497,12 @@ function subscribeLifecycle(ctx, state) {
 				type: "tool_execution_start",
 				toolCallId: data.callId,
 				toolName: data.name,
-				args
+				args: piViewOfToolArguments(state, String(data.name), args)
 			}, eventContext).catch((error) => warn("tool_execution_start", error));
 		}
-		if (type === "assistant/chunk" && (state.handlers.get("message_update")?.length ?? 0) > 0) {
+		if (type === "assistant/chunk" && !liveStreams.has(session)) {
 			const data = event.data;
-			const chunk = data.chunk ?? {};
-			const key = `${String(session.id ?? "")}:${String(data.turn ?? 0)}:${String(data.step ?? 0)}`;
-			const delta = typeof chunk.text === "string" ? chunk.text : typeof chunk.delta === "string" ? chunk.delta : "";
-			const accumulated = (state.streamingTexts.get(key) ?? "") + delta;
-			state.streamingTexts.set(key, accumulated);
-			dispatch(state, "message_update", {
-				type: "message_update",
-				message: {
-					role: "assistant",
-					content: [{
-						type: "text",
-						text: accumulated
-					}]
-				},
-				assistantMessageEvent: chunk
-			}, eventContext).catch((error) => warn("message_update", error));
+			projectAssistantChunk(session, data, data.chunk ?? {}, eventContext);
 		}
 		if (type === "assistant/message") {
 			const data = event.data;
@@ -5173,18 +5515,21 @@ function subscribeLifecycle(ctx, state) {
 				name: typeof data.title === "string" ? data.title : void 0
 			}, eventContext).catch((error) => warn("session_info_changed", error));
 		}
-		if (type === "compaction/start") dispatch(state, "session_before_compact", {
-			type: "session_before_compact",
-			preparation: { ...event.data },
-			branchEntries: [],
-			reason: compactionReason(event.data),
-			willRetry: false
-		}, eventContext).catch((error) => warn("session_before_compact", error));
+		if (type === "compaction/start") {
+			const before = dispatch(state, "session_before_compact", {
+				type: "session_before_compact",
+				preparation: { ...event.data },
+				branchEntries: [],
+				reason: compactionReason(event.data),
+				willRetry: false
+			}, eventContext).catch((error) => warn("session_before_compact", error));
+			state.projection = Promise.all([state.projection, before]).then(() => {});
+		}
 		if (type === "compaction/summary") {
 			const data = event.data;
 			const shadowed = data.shadowedRange;
 			const usage = data.usage;
-			dispatch(state, "session_compact", {
+			state.projection = state.projection.then(() => dispatch(state, "session_compact", {
 				type: "session_compact",
 				compactionEntry: {
 					type: "compaction",
@@ -5198,7 +5543,7 @@ function subscribeLifecycle(ctx, state) {
 				fromExtension: false,
 				reason: compactionReason(data),
 				willRetry: false
-			}, eventContext).catch((error) => warn("session_compact", error));
+			}, eventContext)).then(() => {}).catch((error) => warn("session_compact", error));
 		}
 		if (type === "request/header") {
 			const header = event.data.header ?? {};
@@ -5253,19 +5598,17 @@ function subscribeLifecycle(ctx, state) {
 			...config,
 			...override?.provider === void 0 ? {} : { provider: override.provider },
 			...override?.model === void 0 ? {} : { model: override.model },
-			...thinking === void 0 || thinking === "off" ? {} : { reasoningEffort: thinking }
+			...thinking === void 0 || thinking === "off" && (currentPiModel(state, agent)?.thinkingLevelMap)?.off === null ? {} : { reasoningEffort: thinking }
 		};
 	});
 	cordis.effect(() => async () => {
+		await state.projection;
 		const agent = state.hostAgent;
-		if (typeof agent === "object" && agent !== null && !state.piShutdownAgents.has(agent)) {
-			state.piShutdownAgents.add(agent);
+		if (typeof agent === "object" && agent !== null) {
 			state.disposedAgents.add(agent);
-			await dispatch(state, "session_shutdown", {
-				type: "session_shutdown",
-				reason: "quit"
-			}, contextFor(ctx, state, agent, void 0));
+			await shutdownPiSession(ctx, state, agent, "quit");
 		}
+		await Promise.all(state.pendingShutdowns);
 		state.hostAgent = void 0;
 		for (const active of state.activeAgents) untrackRuntimeSession(state, active);
 		state.activeAgents.clear();
@@ -5296,7 +5639,7 @@ async function flushPendingSessionStarts(ctx, state) {
 	if (state.ownerAgent !== void 0 && state.projectSessionEvent !== void 0) {
 		const session = agentSession(state.ownerAgent);
 		if (session !== void 0) {
-			const events = session.events ?? [];
+			const events = readSessionEvents(session);
 			let from = -1;
 			for (let index = events.length - 1; index >= 0; index -= 1) {
 				if (events[index].type === "turn/end") break;
@@ -5342,13 +5685,144 @@ async function restartReloadedPiSessions(ctx, state) {
 			type: "session_start",
 			reason: pending.get(agent) ?? "resume"
 		}, contextFor(ctx, state, agent, void 0)));
+		await discoverPiResources(ctx, state, agent, pending.get(agent) ?? "resume", void 0);
+		await refreshNativeSkillCommands(ctx, state, agent, void 0);
 	}
 }
+/**
+* Pi's `resources_discover`, fired right after session_start (Pi:
+* AgentSession.extendResourcesFromExtensions): handlers return extra
+* `skillPaths` (and prompt/theme paths) for the session's cwd, and Pi extends
+* its resource loader with them. On DSH the skills registry is the host's
+* `skills` service, so every discovered skill ROOT is handed to the official
+* filesystem provider (dsh-skill-filesystem) exactly like a package's static
+* skill directories — once per root, per package (the registry is host-level
+* and provider names must stay unique). Prompt templates and TUI themes have
+* no DSH seat and are reported, not silently dropped. A single SKILL.md file
+* path (Pi accepts those too) has no root to mount and is reported likewise.
+*/
+async function refreshNativeSkillCommands(ctx, state, agent, signal) {
+	const skills = optionalService(ctx, "skills");
+	if (skills === void 0) {
+		state.nativeSkillCommands = [];
+		return;
+	}
+	const options = {
+		cwd: cwdOf(agent),
+		scope: scopeOf(ctx),
+		signal: signal ?? new AbortController().signal
+	};
+	try {
+		const entries = [];
+		for (const summary of await skills.list(options)) {
+			if (summary.invocation?.userInvocable === false) continue;
+			const skill = await skills.get(String(summary.name), options);
+			if (typeof skill?.path !== "string") continue;
+			entries.push({
+				name: `skill:${String(summary.name)}`,
+				description: String(summary.description ?? ""),
+				source: "skill",
+				sourceInfo: {
+					path: skill.path,
+					source: skill.path,
+					scope: String(summary.source ?? "").startsWith("project") ? "project" : "user",
+					origin: "top-level",
+					baseDir: dirname(skill.path)
+				}
+			});
+		}
+		state.nativeSkillCommands = entries;
+	} catch (error) {
+		state.nativeSkillCommands = [];
+		logger(ctx).warn(`[pi2dsh] skill command metadata could not be refreshed: ${error instanceof Error ? error.message : String(error)}`);
+	}
+}
+async function discoverPiResources(ctx, state, agent, reason, signal) {
+	if ((state.handlers.get("resources_discover")?.length ?? 0) === 0) return;
+	const cwd = cwdOf(agent);
+	const results = await dispatch(state, "resources_discover", {
+		type: "resources_discover",
+		cwd,
+		reason: reason === "reload" ? "reload" : "startup"
+	}, contextFor(ctx, state, agent, signal));
+	const roots = [];
+	const skipped = [];
+	let promptPaths = 0;
+	let themePaths = 0;
+	for (const result of results) {
+		if (typeof result !== "object" || result === null) continue;
+		const record = result;
+		for (const entry of Array.isArray(record.skillPaths) ? record.skillPaths : []) {
+			if (typeof entry !== "string" || entry.length === 0) continue;
+			const absolute = resolve(cwd, entry);
+			let isDirectory = false;
+			try {
+				isDirectory = (await stat(absolute)).isDirectory();
+			} catch {
+				continue;
+			}
+			if (!isDirectory) {
+				skipped.push(absolute);
+				continue;
+			}
+			if (!state.discoveredSkillRoots.has(absolute) && !roots.includes(absolute)) roots.push(absolute);
+		}
+		if (Array.isArray(record.promptPaths)) promptPaths += record.promptPaths.length;
+		if (Array.isArray(record.themePaths)) themePaths += record.themePaths.length;
+	}
+	if (promptPaths > 0 || themePaths > 0 || skipped.length > 0) logger(ctx).info(`[pi2dsh] ${state.packageName}: resources_discover returned ${promptPaths} prompt path(s), ${themePaths} theme path(s) and ${skipped.length} single skill file(s) that DSH has no seat for; they were not mounted`);
+	if (roots.length === 0) return;
+	if (ctx.get("skills") === void 0) {
+		logger(ctx).warn(`[pi2dsh] ${state.packageName}: resources_discover found ${roots.length} skill root(s) but this DSH composition has no ctx.skills`);
+		return;
+	}
+	for (const root of roots) state.discoveredSkillRoots.add(root);
+	state.discoveredSkillProviders += 1;
+	const { apply: applyFilesystemSkills } = await import("@deepseek-ai/dsh-skill-filesystem");
+	const config = {
+		providerName: `pi2dsh-${state.packageName.replace(/[^a-zA-Z0-9_-]+/gu, "-").replace(/^-+|-+$/gu, "")}-discovered-${state.discoveredSkillProviders}`,
+		includeDefaultRoots: false,
+		customSkillDirs: roots,
+		watch: false
+	};
+	await ctx.plugin(Object.assign((skillCtx) => applyFilesystemSkills(skillCtx, config), { inject: ["skills"] }));
+	logger(ctx).info(`[pi2dsh] ${state.packageName}: resources_discover mounted ${roots.length} skill root(s) as ${config.providerName}`);
+}
+/**
+* The Pi view of a host tool's arguments. DSH's built-in file tools carry
+* Claude-style argument names (`file_path`, `old_string`/`new_string`,
+* grep's `include`); Pi's same-named built-ins carry `path`,
+* `oldText`/`newText`, `glob`. Extensions read `event.input` by Pi's names —
+* pi-code attaches a path-scoped rule to the read of a matching `input.path`,
+* and its hooks translate Pi shapes to Claude's `tool_input` — so a host call
+* is projected into Pi's shape for the tool_call / tool_result /
+* tool_execution_start events. Migrated Pi tools already speak Pi and pass
+* through untouched; unknown keys are kept, so nothing is lost.
+*/
+const HOST_TOOL_ARGUMENT_PROJECTION = {
+	read: { file_path: "path" },
+	write: { file_path: "path" },
+	edit: {
+		file_path: "path",
+		old_string: "oldText",
+		new_string: "newText"
+	},
+	grep: { include: "glob" }
+};
+function piViewOfToolArguments(state, name, args) {
+	if (state.tools.has(name)) return cloneJson(args);
+	const mapping = HOST_TOOL_ARGUMENT_PROJECTION[name];
+	if (mapping === void 0 || typeof args !== "object" || args === null || Array.isArray(args)) return cloneJson(args);
+	const projected = {};
+	for (const [key, value] of Object.entries(args)) projected[mapping[key] ?? key] = value;
+	return cloneJson(projected);
+}
 function subscribeInterceptors(ctx, state) {
 	const cordis = ctx;
 	cordis.on("tools/pre-execute", async (exec, next) => {
 		if (!acceptsAgent(state, exec.agent)) return next();
-		const input = cloneJson(exec.arguments);
+		const original = piViewOfToolArguments(state, exec.name, exec.arguments);
+		const input = cloneJson(original);
 		const event = {
 			type: "tool_call",
 			toolName: exec.name,
@@ -5356,7 +5830,7 @@ function subscribeInterceptors(ctx, state) {
 			input
 		};
 		const results = await dispatch(state, "tool_call", event, contextFor(ctx, state, exec.agent, exec.signal));
-		if (!jsonEqual(event.input, exec.arguments)) {
+		if (!jsonEqual(event.input, original)) {
 			if (state.tools.has(exec.name)) state.argMutations.set(exec, cloneJson(event.input));
 			else return {
 				kind: "deny",
@@ -5402,7 +5876,7 @@ function subscribeInterceptors(ctx, state) {
 			type: "tool_result",
 			toolName: exec.name,
 			toolCallId: exec.callId,
-			input: cloneJson(exec.arguments),
+			input: piViewOfToolArguments(state, exec.name, exec.arguments),
 			content: await dshToPiContent(ctx, result.content),
 			details: result.meta ?? null,
 			isError: result.isError,
@@ -5537,18 +6011,20 @@ async function runBeforeAgentStart(ctx, state, agent, signal, assembled) {
 		prompt,
 		...images.length > 0 ? { images } : {},
 		systemPrompt: assembled,
-		systemPromptOptions: {}
+		systemPromptOptions: await piSystemPromptOptions(ctx, state, agent, claimed.map((entry) => entry.message))
 	};
-	const results = await dispatch(state, "before_agent_start", event, contextFor(ctx, state, agent, signal));
+	const eventContext = contextFor(ctx, state, agent, signal);
+	const results = [];
+	for (const handler of state.handlers.get("before_agent_start") ?? []) {
+		const result = await runInPiRuntime(state, agent, () => handler(event, eventContext));
+		results.push(result);
+		if (typeof result === "object" && result !== null && typeof result.systemPrompt === "string") event.systemPrompt = result.systemPrompt;
+	}
+	if (event.systemPrompt !== assembled) state.turnSystemPromptOverrides.set(agent, event.systemPrompt);
 	const injected = [];
 	for (const result of results) {
 		if (typeof result !== "object" || result === null) continue;
-		const record = result;
-		if (typeof record.systemPrompt === "string") {
-			state.turnSystemPromptOverrides.set(agent, record.systemPrompt);
-			event.systemPrompt = record.systemPrompt;
-		}
-		const message = record.message;
+		const message = result.message;
 		if (message === void 0) continue;
 		const content = message.content;
 		const blocks = await piToDshContent(ctx, typeof content === "string" ? [{
@@ -5566,6 +6042,79 @@ async function runBeforeAgentStart(ctx, state, agent, signal, assembled) {
 	}
 	if (injected.length > 0) state.pendingInjections.set(agent, injected);
 }
+/**
+* Pi's `BuildSystemPromptOptions` for the before_agent_start event: the
+* structured view of "what the host loaded", which extensions read instead of
+* re-discovering resources. Two fields carry weight on DSH:
+*  - `cwd`: the session's working directory (pi-code's context-imports
+*    otherwise falls back to process.cwd(), the CLI's directory).
+*  - `contextFiles`: the AGENTS.md/CLAUDE.md chain the host loaded, as
+*    `{path, content}`. DSH delivers those as an `agent-instructions` user
+*    message rather than system-prompt text, so the set is recovered from the
+*    official loader itself: the baseline message records the exact
+*    discovery/budget identity DSH used, and `loadBaselineInstructionSet`
+*    from `@deepseek-ai/dsh-agent-instructions` re-runs that same walk. No
+*    parallel discovery logic lives here; without the package or a baseline
+*    the list is empty, exactly Pi's value when nothing was loaded.
+* (pi-code's CLAUDE.md `@import` expansion reads this list — with `{}` it
+* had nothing to expand and the model "found" the imported file with `read`.)
+*/
+async function piSystemPromptOptions(ctx, state, agent, claimed) {
+	const cwd = cwdOf(agent);
+	const baselineOf = (message) => {
+		const source = message?.source;
+		return source?.kind === "agent-instructions" && source.baseline === true ? source : void 0;
+	};
+	let baseline;
+	for (const message of claimed) {
+		baseline = baselineOf(message);
+		if (baseline !== void 0) break;
+	}
+	if (baseline === void 0) {
+		const events = readSessionEvents(agentSession(agent));
+		for (let index = events.length - 1; index >= 0 && baseline === void 0; index -= 1) {
+			const event = events[index];
+			const data = event.data;
+			if (event.type === "user/message") baseline = baselineOf(data);
+			else if (event.type === "agent/inbox/spliced" && Array.isArray(data?.inserted)) for (const inserted of data.inserted) {
+				baseline = baselineOf(inserted);
+				if (baseline !== void 0) break;
+			}
+		}
+	}
+	try {
+		const identity = typeof baseline?.baselineIdentity === "string" ? JSON.parse(baseline.baselineIdentity) : {};
+		const { discoverBaselineInstructionFiles } = await import("@deepseek-ai/dsh-agent-instructions");
+		const list = (value) => Array.isArray(value) && value.every((entry) => typeof entry === "string") ? value : void 0;
+		const discovered = await discoverBaselineInstructionFiles({
+			cwd,
+			...typeof identity.projectRoot === "string" && identity.projectRoot.length > 0 ? { projectRoot: identity.projectRoot } : {},
+			...list(identity.projectRootMarkers) !== void 0 ? { projectRootMarkers: list(identity.projectRootMarkers) } : {},
+			...list(identity.instructionFileCandidates) !== void 0 ? { instructionFileCandidates: list(identity.instructionFileCandidates) } : {},
+			...list(identity.localInstructionFileCandidates) !== void 0 ? { localInstructionFileCandidates: list(identity.localInstructionFileCandidates) } : {}
+		});
+		const maxSourceBytes = typeof identity.maxSourceBytes === "number" ? identity.maxSourceBytes : 1048576;
+		const contextFiles = [];
+		for (const file of discovered) try {
+			const bytes = await readFile(file.absolutePath);
+			if (bytes.byteLength > maxSourceBytes) continue;
+			contextFiles.push({
+				path: file.absolutePath,
+				content: bytes.toString("utf8")
+			});
+		} catch {}
+		return {
+			cwd,
+			contextFiles
+		};
+	} catch (error) {
+		logger(ctx).warn(`[pi2dsh] could not recover the host's instruction files for before_agent_start (contextFiles left empty): ${error instanceof Error ? error.message : String(error)}`);
+		return {
+			cwd,
+			contextFiles: []
+		};
+	}
+}
 async function piShapeOfPending(ctx, message) {
 	const source = message.source;
 	const content = await dshToPiContent(ctx, message.content ?? []);
@@ -5582,7 +6131,7 @@ async function applyPiContextTransform(ctx, state, agent, signal, pending) {
 	if ((state.handlers.get("context")?.length ?? 0) === 0) return pending;
 	const session = agentSession(agent);
 	const history = [];
-	for (const event of session?.events ?? []) {
+	for (const event of readSessionEvents(session)) {
 		const projected = await messageFromSessionEvent(ctx, event);
 		if (projected === void 0) continue;
 		if (event.type === "user/message") {
@@ -5630,12 +6179,18 @@ async function applyPiContextTransform(ctx, state, agent, signal, pending) {
 			rebuilt.push(original);
 			continue;
 		}
+		if (JSON.stringify(shape.content) === JSON.stringify(projectedPending[index]?.content)) {
+			rebuilt.push(original);
+			continue;
+		}
 		const blocks = await piToDshContent(ctx, typeof shape.content === "string" ? [{
 			type: "text",
 			text: shape.content
 		}] : shape.content ?? []);
+		const files = /* @__PURE__ */ new Map();
+		for (const block of original.content ?? []) if (block.type === "file") files.set(fileContentForPi(block.attachment, ctx).text, block);
 		rebuilt.push(createUserMessage({
-			content: blocks,
+			content: blocks.map((block) => block.type === "text" ? files.get(block.text) ?? block : block),
 			source: original.source ?? {
 				kind: "plugin",
 				plugin: state.messageSource
@@ -6053,6 +6608,37 @@ async function supersedeActiveLogin(state) {
 * @param config - the provider config, whose oauth block made it loginable.
 * @returns whether this call put a route in place.
 */
+/**
+* Mount-time route restore that tolerates composition order.
+*
+* The credentials service (credentials-local) can compose AFTER a
+* zero-package profile's host mount — probing immediately loses that race and
+* a stored login silently produces no route: an engine-only profile with a
+* valid auth.json hit MISSING_CREDENTIAL on every turn, while installing any
+* Pi package shifted mount timing enough to mask the bug (2026-08-30,
+* community/full-audit-work/zero-package-oauth-bug.md). When the service is
+* already there the restore stays awaited — that is mount readiness, see the
+* caller's comment. Otherwise the official inject seam re-runs it the moment
+* the service composes, the same pattern maybeProjectAuthorizationFlow uses.
+*/
+async function restoreLoggedInRouteWhenReady(ctx, state, name, config) {
+	if (optionalService(ctx, "credentials") !== void 0) {
+		await ensureLoggedInProviderRoute(ctx, state, name, config);
+		return;
+	}
+	const shared = state.shared;
+	shared.routeRestoreArmedIds ??= /* @__PURE__ */ new Set();
+	if (shared.routeRestoreArmedIds.has(name)) return;
+	const inject = ctx.inject;
+	if (typeof inject !== "function") {
+		await ensureLoggedInProviderRoute(ctx, state, name, config);
+		return;
+	}
+	shared.routeRestoreArmedIds.add(name);
+	inject.call(ctx, ["credentials"], (scope) => {
+		ensureLoggedInProviderRoute(scope, state, name, config).catch((error) => logger(ctx).warn(`[pi2dsh] could not restore the route for logged-in provider ${JSON.stringify(name)}: ${error instanceof Error ? error.message : String(error)}`));
+	});
+}
 async function ensureLoggedInProviderRoute(ctx, state, name, config) {
 	if (!providerSupportsOAuth(config)) return false;
 	if (providerCarriesTransport(config) || state.providerRouteDisposers.has(name)) return false;
@@ -6364,11 +6950,16 @@ async function projectAuthorizationFlow(scope, state, providerId) {
 							throw error;
 						}
 					},
-					deviceCode: async (title, detail) => {
+					deviceCode: (title, detail, signal) => {
 						session.notify({
 							message: String(title),
 							code: String(detail)
 						});
+						return new Promise((resolve) => {
+							if (!(signal instanceof AbortSignal)) return;
+							if (signal.aborted) resolve();
+							else signal.addEventListener("abort", () => resolve(), { once: true });
+						});
 					}
 				};
 				const canonical = canonicalOf();
@@ -6670,7 +7261,7 @@ async function sendPiMessage(ctx, state, content, mode, sessionOverride, customT
 		source: {
 			kind: "plugin",
 			plugin: state.messageSource,
-			...customType === void 0 ? {} : { piCustomType: customType }
+			...customType === void 0 ? { form: "relay" } : { piCustomType: customType }
 		}
 	});
 	if (sessionOverride !== void 0) {
@@ -6728,16 +7319,17 @@ function combineExecSignal(options) {
 		}
 	};
 }
-async function executePiCommand(service, cwd, command, args, options) {
+async function executePiCommand(service, cwd, command, args, options, environment) {
 	const operation = combineExecSignal(options);
 	try {
 		if (typeof command !== "string" || command.length === 0) throw new TypeError("Pi exec command must be a non-empty string");
 		if (!Array.isArray(args) || args.some((value) => typeof value !== "string")) throw new TypeError("Pi exec args must be strings");
-		const executable = await service.resolveExecutable(command, void 0, operation.signal);
+		const executable = await service.resolveExecutable(command, environment, operation.signal);
 		const collect = { maxBytes: 67108864 };
 		const handle = service.spawn({
 			argv: [executable, ...args],
 			cwd: options.cwd ?? cwd,
+			...environment === void 0 ? {} : { env: environment },
 			stdio: {
 				stdin: "ignore",
 				stdout: collect,
@@ -6809,6 +7401,7 @@ function registerCommand(ctx, state, command) {
 			const live = state.commands.get(command.name) ?? command;
 			await runInPiRuntime(state, agent, async () => {
 				await ensurePiSessionStarted(ctx, state, agent, invocation.signal);
+				await refreshNativeSkillCommands(ctx, state, agent, invocation.signal);
 				await live.handler(String(invocation.rawInput ?? "").trimStart(), commandContext);
 			});
 			const notices = commandContext.__notices;
@@ -6939,6 +7532,85 @@ function registerSharedProviderRoute(ctx, state, name, value) {
 	state.ownedProviderRoutes.add(name);
 	return route;
 }
+async function runPiPrintRequest(ctx, state, parent, request, signal) {
+	if (parent === void 0 || state.subagentSessionFactory === void 0) throw new Error("pi2dsh CLI: native print work requires an active DSH agent");
+	const catalog = state.shared.childExtensions;
+	const requestedPaths = [];
+	for (const requested of request.extensions) {
+		let matched;
+		for (const path of catalog?.packageByEntryPath.keys() ?? []) if (await realpath(path).catch(() => path) === requested) {
+			matched = path;
+			break;
+		}
+		if (matched === void 0) throw new Error(`pi2dsh CLI: extension ${requested} is not installed in this DSH profile`);
+		requestedPaths.push(matched);
+	}
+	const paths = [.../* @__PURE__ */ new Set([...request.noExtensions ? [] : catalog?.packageByEntryPath.keys() ?? [], ...requestedPaths])];
+	let model;
+	if (request.model !== void 0) {
+		model = state.modelCatalog?.all().find((entry) => `${entry.provider}/${entry.id}` === request.model || entry.id === request.model && (request.provider === void 0 || entry.provider === request.provider));
+		if (model === void 0) throw new Error(`pi2dsh CLI: model ${request.model} is unavailable in the DSH model directory`);
+	} else if (request.provider !== void 0) {
+		const inherited = currentPiModel(state, parent);
+		if (inherited?.provider !== request.provider) throw new Error("pi2dsh CLI: --provider requires an explicit --model for a different route");
+		model = inherited;
+	}
+	const created = await runInPiRuntime(state, parent, () => state.subagentSessionFactory({
+		cwd: request.cwd,
+		signal,
+		...model === void 0 ? {} : { model },
+		...request.thinking === void 0 ? {} : { thinkingLevel: request.thinking },
+		...request.tools === void 0 ? {} : { tools: request.tools },
+		...request.noSession ? { sessionManager: { getSessionFile: () => void 0 } } : {},
+		label: "Background task",
+		resourceLoader: {
+			getExtensions: () => ({
+				extensions: paths.map((path) => ({ path })),
+				errors: []
+			}),
+			getSystemPrompt: () => request.systemPrompt,
+			getAppendSystemPrompt: () => request.appendSystemPrompt === void 0 ? [] : [request.appendSystemPrompt]
+		}
+	}));
+	if (request.noSession) capabilityLedgerOf(ctx, state).reportHostDecision({
+		capability: "pi print --no-session",
+		reason: "the print worker has no Pi session file; DSH retains its native child audit log.",
+		guidance: "Native retention remains a DSH host policy.",
+		packageName: state.packageName
+	});
+	const child = created.session;
+	let rejectCancellation;
+	const cancellation = new Promise((_resolve, reject) => {
+		rejectCancellation = reject;
+	});
+	cancellation.catch(() => {});
+	const abort = () => {
+		child.abort();
+		rejectCancellation(signal.reason ?? /* @__PURE__ */ new Error("Pi print worker cancelled"));
+	};
+	signal.addEventListener("abort", abort, { once: true });
+	try {
+		const failures = [];
+		await child.bindExtensions({ onError: (error) => {
+			failures.push(error);
+		} });
+		if (failures.length > 0) throw new Error(`pi2dsh CLI: child extension mount failed: ${JSON.stringify(failures)}`);
+		signal.throwIfAborted();
+		await Promise.race([child.prompt(request.prompt), cancellation]);
+		signal.throwIfAborted();
+		const session = optionalService(ctx, "sessions")?.get(child.sessionManager?.getSessionId() ?? "");
+		const end = readSessionEvents(session).findLast((event) => event.type === "turn/end");
+		if ((end?.data)?.reason?.kind !== "completed") throw new Error(`pi2dsh CLI: native child did not complete: ${JSON.stringify(end?.data ?? {})}`);
+		return {
+			code: 0,
+			stdout: textBlocks(child.messages.findLast((message) => message.role === "assistant")?.content).map((block) => block.text).join("\n")
+		};
+	} finally {
+		signal.removeEventListener("abort", abort);
+		if (signal.aborted) child.abort();
+		await child.dispose();
+	}
+}
 function createPiApi(ctx, state) {
 	return {
 		on(event, handler) {
@@ -7030,10 +7702,22 @@ function createPiApi(ctx, state) {
 			const session = requireSession(state, "setLabel");
 			state.bridge.appendLabel(session.id, String(entryId), label);
 		},
-		exec(command, args = [], options = {}) {
+		async exec(command, args = [], options = {}) {
 			const service = optionalService(ctx, "subprocess");
 			if (service === void 0) unsupported("exec");
-			return executePiCommand(service, cwdOf(currentAgent(state)), command, args, options);
+			const parent = currentAgent(state);
+			let local = false;
+			try {
+				const { LocalSubprocessRuntime } = await import("@deepseek-ai/dsh-subprocess-local");
+				local = service instanceof LocalSubprocessRuntime;
+			} catch {}
+			if (!local) return executePiCommand(service, cwdOf(parent), command, args, options);
+			return withPiPrintTransport((request, signal) => runPiPrintRequest(ctx, state, parent, request, signal), (environment) => executePiCommand(service, cwdOf(parent), command, args, options, environment)).catch((error) => ({
+				stdout: "",
+				stderr: error instanceof Error ? error.message : String(error),
+				code: 1,
+				killed: options.signal?.aborted === true
+			}));
 		},
 		getActiveTools: () => getActiveTools(ctx, state),
 		getAllTools: () => {
@@ -7052,7 +7736,7 @@ function createPiApi(ctx, state) {
 			}));
 		},
 		setActiveTools: (names) => setActiveTools(ctx, state, names),
-		getCommands: () => [...state.commands.values()].map((command) => ({
+		getCommands: () => [...[...state.commands.values()].map((command) => ({
 			name: command.name,
 			description: command.description,
 			source: "extension",
@@ -7062,7 +7746,7 @@ function createPiApi(ctx, state) {
 				scope: "user",
 				origin: "package"
 			}
-		})),
+		})), ...state.nativeSkillCommands],
 		async setModel(model) {
 			const agent = currentAgent(state);
 			if (agent === void 0) return false;
@@ -7235,7 +7919,7 @@ async function loadExtensions(rootDir, manifest, api, onExtensionError, onCapabi
 	for (const extension of manifest.extensions) {
 		try {
 			const source = await readFile(join(rootDir, extension), "utf8");
-			const infraImport = /import[^;]*?\b(ModelRuntime|DefaultPackageManager)\b[^;]*?from\s*['"]@(?:earendil-works|mariozechner)\/pi-coding-agent['"]/su.exec(source);
+			const infraImport = /import[^;]*?\b(DefaultPackageManager)\b[^;]*?from\s*['"]@(?:earendil-works|mariozechner)\/pi-coding-agent['"]/su.exec(source);
 			if (infraImport !== null) onHostInfraReference?.(infraImport[1], extension);
 		} catch {}
 		try {
@@ -7285,6 +7969,7 @@ async function applyPiPackage(ctx, options) {
 		toolDisposers: /* @__PURE__ */ new Map(),
 		toolRestrictions: /* @__PURE__ */ new WeakMap(),
 		commands: /* @__PURE__ */ new Map(),
+		nativeSkillCommands: [],
 		commandDisposers: /* @__PURE__ */ new Map(),
 		dshCommandOwners: /* @__PURE__ */ new Map(),
 		companionRoutes: shared.companionRoutes,
@@ -7293,6 +7978,8 @@ async function applyPiPackage(ctx, options) {
 		activeAgents: /* @__PURE__ */ new Set(),
 		hostAgent: void 0,
 		piShutdownAgents: /* @__PURE__ */ new WeakSet(),
+		shutdownTasks: /* @__PURE__ */ new WeakMap(),
+		pendingShutdowns: /* @__PURE__ */ new Set(),
 		disposedAgents: /* @__PURE__ */ new WeakSet(),
 		startedSessions: /* @__PURE__ */ new Set(),
 		sessionStartTasks: /* @__PURE__ */ new Map(),
@@ -7300,6 +7987,8 @@ async function applyPiPackage(ctx, options) {
 		sessionlessStartTasks: /* @__PURE__ */ new WeakMap(),
 		extensionsReady: false,
 		pendingSessionStarts: /* @__PURE__ */ new Map(),
+		discoveredSkillRoots: /* @__PURE__ */ new Set(),
+		discoveredSkillProviders: 0,
 		currentSystemPrompt: "",
 		messageSource: `pi2dsh:${options.manifest.package.name}`,
 		eventBus: sharedEventBusFor(shared, ownerAgent),
@@ -7308,7 +7997,7 @@ async function applyPiPackage(ctx, options) {
 		llmBridge: void 0,
 		piAiRegistry: __createPiAiRuntimeRegistry(),
 		subagentSessionFactory: void 0,
-		bridge: new PiSessionBridge(),
+		bridge: new PiSessionBridge((ref) => fileContentForPi(ref, ctx)),
 		theme: sharedThemeFor(shared, ownerAgent),
 		shortcuts: /* @__PURE__ */ new Map(),
 		messageRenderers: /* @__PURE__ */ new Map(),
@@ -7365,7 +8054,7 @@ async function applyPiPackage(ctx, options) {
 	}
 	ensureLoginCommand(ctx, state);
 	for (const [name, config] of [...state.providers]) try {
-		await ensureLoggedInProviderRoute(ctx, state, name, config);
+		await restoreLoggedInRouteWhenReady(ctx, state, name, config);
 	} catch (error) {
 		logger(ctx).warn(`[pi2dsh] could not restore the route for logged-in provider ${JSON.stringify(name)}: ${error instanceof Error ? error.message : String(error)}`);
 	}
@@ -7448,6 +8137,131 @@ async function applyPiPackage(ctx, options) {
 					ok: true,
 					note: "run /reload (or restart the session) to apply"
 				};
+			},
+			async loginState() {
+				const flow = state.shared.browserLogin;
+				return {
+					providers: await Promise.all([...state.providers.entries()].filter(([, config]) => providerSupportsOAuth(config)).map(async ([id, config]) => ({
+						id,
+						name: config.oauth?.name ?? id,
+						signedIn: await storedOAuthCredential(oauthStoreOf(state), id).then((c) => c !== void 0, () => false)
+					}))),
+					...flow === void 0 ? {} : { flow: {
+						provider: flow.provider,
+						providerName: flow.providerName,
+						notices: flow.notices,
+						...flow.question === void 0 ? {} : { question: {
+							id: flow.question.id,
+							kind: flow.question.kind,
+							title: flow.question.title,
+							...flow.question.placeholder === void 0 ? {} : { placeholder: flow.question.placeholder },
+							...flow.question.options === void 0 ? {} : { options: flow.question.options }
+						} },
+						...flow.done === void 0 ? {} : { done: flow.done }
+					} }
+				};
+			},
+			async loginAction(action, provider, value) {
+				const shared = state.shared;
+				if (action === "dismiss") {
+					shared.browserLogin = void 0;
+					return { ok: true };
+				}
+				if (action === "answer") {
+					const flow = shared.browserLogin;
+					if (flow?.answer === void 0) throw new TypeError("no login question is waiting for an answer");
+					const settle = flow.answer;
+					flow.answer = void 0;
+					delete flow.question;
+					settle(value);
+					return { ok: true };
+				}
+				if (action === "cancel") {
+					const cancelled = await supersedeActiveLogin(state);
+					const flow = shared.browserLogin;
+					if (flow !== void 0 && flow.done === void 0) flow.done = {
+						ok: false,
+						summary: "Login cancelled"
+					};
+					return {
+						ok: true,
+						...cancelled === void 0 ? {} : { cancelled }
+					};
+				}
+				const config = state.providers.get(provider);
+				if (config === void 0 || !providerSupportsOAuth(config)) throw new TypeError(`unknown OAuth provider ${JSON.stringify(provider)}`);
+				const providerName = config.oauth?.name ?? provider;
+				if (action === "signout") {
+					await oauthStoreOf(state).delete(provider);
+					if (!providerCarriesTransport(config)) retireSharedProviderRoute(shared, provider);
+					return {
+						ok: true,
+						signedOut: provider
+					};
+				}
+				if (action !== "begin") throw new TypeError(`unknown login action ${JSON.stringify(action)}`);
+				let questionSeq = 0;
+				const flow = {
+					provider,
+					providerName,
+					notices: []
+				};
+				shared.browserLogin = flow;
+				const ask = (kind, title, extras, signal) => new Promise((resolve) => {
+					const id = ++questionSeq;
+					flow.question = {
+						id,
+						kind,
+						title,
+						...extras
+					};
+					flow.answer = (answered) => {
+						resolve(answered);
+					};
+					const withdraw = () => {
+						if (flow.question?.id !== id) return;
+						delete flow.question;
+						flow.answer = void 0;
+						resolve(void 0);
+					};
+					if (signal !== void 0) {
+						if (signal.aborted) withdraw();
+						else signal.addEventListener("abort", withdraw, { once: true });
+					}
+				});
+				runProviderLogin(ctx, state, provider, config, {
+					notify: (message) => {
+						flow.notices.push({ message: String(message) });
+					},
+					input: (title, placeholder, signal) => ask("input", String(title), typeof placeholder === "string" && placeholder.length > 0 ? { placeholder } : {}, signal),
+					select: (title, options, signal) => ask("select", String(title), { options: options.map((option) => String(option)) }, signal),
+					deviceCode: (title, detail, signal) => {
+						const code = /`([^`]+)`/u.exec(String(detail))?.[1];
+						flow.notices.push({
+							message: String(title),
+							...code === void 0 ? {} : { code }
+						});
+						return new Promise((resolve) => {
+							if (!(signal instanceof AbortSignal)) return;
+							if (signal.aborted) resolve();
+							else signal.addEventListener("abort", () => resolve(), { once: true });
+						});
+					}
+				}).then((summary) => {
+					if (shared.browserLogin === flow) flow.done = {
+						ok: true,
+						summary
+					};
+				}, (error) => {
+					if (shared.browserLogin === flow) flow.done = {
+						ok: false,
+						summary: error instanceof Error ? error.message : String(error)
+					};
+				});
+				return {
+					ok: true,
+					started: provider
+				};
 			}
 		});
 	}
@@ -7556,6 +8370,7 @@ async function applyPiPackage(ctx, options) {
 		messageSource: state.messageSource,
 		packageName: state.packageName,
 		parentAgentContext: () => currentAgent(state)?.ctx,
+		parentAgent: () => currentAgent(state),
 		registerChildTools: (childCtx, tools) => {
 			for (const tool of tools) registerChildPiTool(childCtx, state, tool);
 		},
@@ -7594,7 +8409,10 @@ async function applyPiPackage(ctx, options) {
 			const persistence = optionalService(ctx, "sessionPersistence");
 			if (typeof persistence?.list !== "function") return void 0;
 			try {
-				return !(await persistence.list()).some((header) => String(header?.id ?? "") === sessionId);
+				return !(await persistence.list()).some((snapshot) => {
+					const header = snapshot.header ?? snapshot;
+					return String(header.id ?? "") === sessionId;
+				});
 			} catch {
 				return;
 			}
@@ -7612,7 +8430,19 @@ async function applyPiPackage(ctx, options) {
 		adoptChildAgent: (child, thinkingLevel) => {
 			if (typeof child !== "object" || child === null) return;
 			state.childAgents.add(child);
-			if (typeof thinkingLevel === "string" && thinkingLevel.length > 0 && thinkingLevel !== "off") state.thinkingLevels.set(child, thinkingLevel);
+			if (typeof thinkingLevel === "string" && thinkingLevel.length > 0) {
+				state.thinkingLevels.set(child, thinkingLevel);
+				child.ctx?.on?.("agent/request", async (payload, next) => {
+					const config = await next();
+					if (payload.agent !== child) return config;
+					const level = state.thinkingLevels.get(child);
+					if (level === void 0 || level === "off" && (currentPiModel(state, child)?.thinkingLevelMap)?.off === null) return config;
+					return {
+						...config,
+						reasoningEffort: level
+					};
+				});
+			}
 		}
 	});
 	await registerPromptCommands(ctx, state, rootDir, options.manifest);
@@ -7625,7 +8455,7 @@ async function applyPiPackage(ctx, options) {
 	});
 	const onHostInfraReference = (symbol) => capabilityLedgerOf(ctx, state).reportStartupReference({
 		capability: symbol,
-		reason: symbol === "DefaultPackageManager" ? "installing packages is owned by the DSH host and its security gates (dsh plugin add/remove)." : "standalone model stacks are owned by the DSH host llm configuration (packages read ctx.modelRegistry).",
+		reason: "installing packages is owned by the DSH host and its security gates (dsh plugin add/remove).",
 		guidance: "",
 		packageName: state.packageName
 	});
@@ -7634,6 +8464,13 @@ async function applyPiPackage(ctx, options) {
 	await flushPendingSessionStarts(ctx, state);
 	const remounts = packageRemountsOf(ctx, shared);
 	remounts.set(state.packageName, async () => {
+		await state.projection;
+		const previousAgent = state.hostAgent ?? currentAgent(state);
+		if (previousAgent !== void 0) {
+			await shutdownPiSession(ctx, state, previousAgent, "reload");
+			state.piShutdownAgents.delete(previousAgent);
+			state.shutdownTasks.delete(previousAgent);
+		}
 		state.extensionsReady = false;
 		state.handlers.clear();
 		for (const off of state.eventBusOffs.splice(0)) off();
@@ -7671,4 +8508,4 @@ const runtimeInternals = {
 //#endregion
 export { overlayProviderConfig as a, runtimeInternals as c, normalizeToolSchema as i, getSharedChildExtensionCatalog as n, registerChildExtensionCatalog as o, mergeProviderRegistration as r, registerVisionCompanions as s, applyPiPackage as t };
 
-//# sourceMappingURL=runtime-Dnk9mhrc.mjs.map
+//# sourceMappingURL=runtime-B3N7s93Q.mjs.map