pi2dsh 0.25.1 → 0.26.0

package/dist/{runtime-CCzYSxhI.mjs → runtime-BFJsumJX.mjs}

@@ -17,7 +17,7 @@ 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 { CONTEXT_WINDOW_EXCEEDED_CODE, EMPTY_RESPONSE_CODE, LlmAdapter, LlmError, QUOTA_EXCEEDED_CODE, ToolCallId, createToolResultMessage, createUserMessage, isContextWindowExceededError, isQuotaExceededError } from "@deepseek-ai/dsh-llm";
 import { scopeOf } from "@deepseek-ai/dsh-scope";
 import { renderPrompt } from "@deepseek-ai/dsh-system-prompt";
 import { foldSurface } from "@deepseek-ai/dsh-session";
@@ -626,7 +626,6 @@ var PiSessionBridge = class {
 				});
 			} else if (type === "tool/result") {
 				const message = data.message ?? {};
-				const tool = (Array.isArray(message.content) ? message.content : []).find((block) => block.type === "tool-result");
 				merged.push({
 					time,
 					entry: {
@@ -635,9 +634,9 @@ var PiSessionBridge = class {
 						timestamp: new Date(time).toISOString(),
 						message: {
 							role: "toolResult",
-							toolCallId: tool?.toolCallId,
-							content: dshToPiContent$1(tool?.content ?? []),
-							isError: tool?.isError === true
+							toolCallId: message.toolCallId,
+							content: dshToPiContent$1(message.content ?? []),
+							isError: message.isError === true
 						}
 					}
 				});
@@ -834,6 +833,9 @@ var PiBridgedAgentSession = class {
 	#aborted = false;
 	#liveStreamAttempt;
 	#streamingText = "";
+	#turnAssistant;
+	#pendingPrompt;
+	#promptActive = false;
 	constructor(host, handle, tools, thinkingLevel) {
 		this.#thinkingLevel = typeof thinkingLevel === "string" && thinkingLevel.length > 0 ? thinkingLevel : "off";
 		this.#host = host;
@@ -962,35 +964,30 @@ var PiBridgedAgentSession = class {
 			});
 		}
 		if (type === "request/header") {
-			const config = event.data.config ?? {};
+			const config = event.data.header?.config ?? {};
 			if (typeof config.model === "string") this.#model = {
 				id: config.model,
 				provider: String(config.provider ?? "")
 			};
 		}
 		if (type === "tools/result" || type === "tool/result") {
-			const data = event.data;
-			const message = data.message;
-			const blocks = Array.isArray(message?.content) ? message.content : [];
-			for (const block of blocks) {
-				const record = block;
-				if (record?.type !== "tool-result") continue;
-				const callId = String(record.toolCallId ?? (message?.source)?.callId ?? data.callId ?? "");
+			const message = event.data.message;
+			if (message?.role === "tool") {
+				const callId = String(message.toolCallId ?? "");
 				this.#pendingToolCalls.delete(callId);
-				const isError = record.isError === true;
+				const isError = message.isError === true;
 				emit({
 					type: "tool_execution_end",
 					toolCallId: callId,
 					toolName: this.#toolCallNames.get(callId) ?? "",
 					result: {
-						content: record.content ?? [],
+						content: message.content ?? [],
 						isError
 					},
 					isError
 				});
 				this.#toolCallNames.delete(callId);
 			}
-			if (blocks.length === 0) this.#pendingToolCalls.delete(String(data.callId ?? ""));
 		}
 		if (type === "tool/call") {
 			const data = event.data;
@@ -1037,6 +1034,10 @@ var PiBridgedAgentSession = class {
 			if (message === void 0) return;
 			if ((event.data?.source)?.form === "snapshot") this.#carried.add(message);
 			this.messages.push(message);
+			if (type === "assistant/message") this.#turnAssistant = {
+				turn: Number(event.data.turn),
+				message
+			};
 			emit({
 				type: "message_start",
 				message
@@ -1051,15 +1052,51 @@ var PiBridgedAgentSession = class {
 			this.#streaming = false;
 			this.#pendingToolCalls.clear();
 			this.#messageProjection = this.#messageProjection.then(() => {
+				const data = event.data;
+				const turn = Number(data.turn);
+				const reason = data.reason;
+				const stopReason = reason?.kind === "error" || reason?.kind === "blocked" ? "error" : reason?.kind === "aborted" ? "aborted" : reason?.kind === "max-tokens" ? "length" : "stop";
+				let message = this.#turnAssistant?.turn === turn ? this.#turnAssistant.message : void 0;
+				const synthetic = message === void 0 && stopReason !== "stop";
+				if (message === void 0 && stopReason !== "stop") {
+					message = {
+						role: "assistant",
+						content: [],
+						timestamp: Date.now()
+					};
+					this.messages.push(message);
+				}
+				if (message !== void 0) {
+					message.stopReason = stopReason;
+					if (stopReason === "error") {
+						const failure = reason?.error;
+						message.errorMessage = reason?.kind === "blocked" ? "DSH blocked the child turn before completion" : String(failure?.message ?? "DSH child turn failed");
+					}
+					if (synthetic) {
+						emit({
+							type: "message_start",
+							message
+						});
+						emit({
+							type: "message_end",
+							message
+						});
+					}
+				}
 				emit({
 					type: "turn_end",
-					turnIndex: Number(event.data.turn ?? 1) - 1,
-					message: {
+					turnIndex: turn - 1,
+					message: message ?? {
 						role: "assistant",
-						content: []
+						content: [],
+						stopReason
 					},
 					toolResults: []
 				});
+				emit({
+					type: "agent_end",
+					messages: [...this.messages]
+				});
 			});
 		}
 	}
@@ -1068,6 +1105,15 @@ var PiBridgedAgentSession = class {
 		return () => this.#subscribers.delete(handler);
 	}
 	async prompt(text) {
+		if (this.#promptActive) throw new Error("pi2dsh: this child session is already processing a prompt");
+		this.#promptActive = true;
+		try {
+			await this.#runPrompt(text);
+		} finally {
+			this.#promptActive = false;
+		}
+	}
+	async #runPrompt(text) {
 		this.#aborted = false;
 		if (this.#seed.length > 0) {
 			const seeded = this.#seed;
@@ -1085,7 +1131,7 @@ var PiBridgedAgentSession = class {
 				this.#host.deliver(this.#handle.agent, createUserMessage({
 					content: seedBlocks,
 					source: {
-						kind: "plugin",
+						kind: "pi2dsh",
 						plugin: this.#host.messageSource
 					}
 				}), "inject");
@@ -1096,26 +1142,43 @@ var PiBridgedAgentSession = class {
 			text: String(text)
 		}]);
 		const cordis = unscopedEventContext(this.#host.cordis);
-		const completed = new Promise((resolve) => {
-			const off = cordis.on("session/event", (session, event) => {
-				if (session !== this.#session) return;
-				if (event.type === "turn/end") {
-					off();
-					resolve();
-				}
-			});
-			this.#disposers.push(off);
-		});
-		this.#host.deliver(this.#handle.agent, createUserMessage({
+		const message = createUserMessage({
 			content: blocks,
 			source: {
-				kind: "plugin",
+				kind: "pi2dsh",
 				plugin: this.#host.messageSource,
 				form: "relay"
 			}
-		}), "followup");
-		await completed;
-		await this.#messageProjection;
+		});
+		let turn;
+		const offs = [];
+		const cleanup = () => {
+			for (const off of offs.splice(0)) off();
+		};
+		const completed = new Promise((resolve, reject) => {
+			this.#pendingPrompt = {
+				reject,
+				dispose: cleanup
+			};
+			offs.push(cordis.on("agent/inbox/claimed", (payload) => {
+				if (payload.agent === this.#handle.agent && payload.message?.id === message.id) turn = Number(payload.turn);
+			}));
+			offs.push(cordis.on("agent/disposed", (payload) => {
+				if (payload.agent === this.#handle.agent) reject(/* @__PURE__ */ new Error("pi2dsh: child agent was disposed before its prompt completed"));
+			}));
+			offs.push(cordis.on("session/event", (session, event) => {
+				if (session !== this.#session) return;
+				if (event.type === "turn/end" && turn !== void 0 && Number(event.data.turn) === turn) resolve();
+			}));
+		});
+		try {
+			this.#host.deliver(this.#handle.agent, message, "followup");
+			await completed;
+			await this.#messageProjection;
+		} finally {
+			cleanup();
+			this.#pendingPrompt = void 0;
+		}
 	}
 	async steer(text, images) {
 		await this.#queueMessage(text, images, "steer");
@@ -1133,7 +1196,7 @@ var PiBridgedAgentSession = class {
 		this.#host.deliver(this.#handle.agent, createUserMessage({
 			content: blocks,
 			source: {
-				kind: "plugin",
+				kind: "pi2dsh",
 				plugin: this.#host.messageSource
 			}
 		}), mode);
@@ -1231,6 +1294,8 @@ var PiBridgedAgentSession = class {
 		} catch {}
 	}
 	async dispose() {
+		this.#pendingPrompt?.reject(/* @__PURE__ */ new Error("pi2dsh: child session was disposed before its prompt completed"));
+		this.#pendingPrompt?.dispose();
 		for (const dispose of this.#disposers.splice(0)) try {
 			dispose();
 		} catch {}
@@ -2403,7 +2468,7 @@ function dshBlocksFromPiContent(content) {
 }
 /**
 * Pi request context → DSH GenerateOptions parts. System prompt moves to the
-* dedicated slot; toolResult messages become DSH tool-result user messages.
+* dedicated slot; toolResult messages become native DSH tool-role messages.
 */
 function piRequestToDshMessages(context) {
 	const messages = [];
@@ -2422,19 +2487,11 @@ function piRequestToDshMessages(context) {
 			model: String(message.model ?? context.model ?? "unknown")
 		}
 	});
-	else if (message.role === "toolResult") messages.push({
-		role: "user",
-		content: [{
-			type: "tool-result",
-			toolCallId: String(message.toolCallId ?? ""),
-			content: dshBlocksFromPiContent(message.content),
-			isError: message.isError === true
-		}],
-		source: {
-			kind: "tool",
-			callId: String(message.toolCallId ?? "")
-		}
-	});
+	else if (message.role === "toolResult") messages.push(createToolResultMessage({
+		callId: ToolCallId(String(message.toolCallId ?? "")),
+		content: dshBlocksFromPiContent(message.content),
+		isError: message.isError === true
+	}));
 	const system = typeof context.systemPrompt === "string" && context.systemPrompt.length > 0 ? context.systemPrompt : void 0;
 	return {
 		...system === void 0 ? {} : { system },
@@ -2712,18 +2769,17 @@ async function dshRequestToPiContext(options, attachments) {
 	}
 	for (const message of history) {
 		const content = Array.isArray(message.content) ? message.content : [];
-		const source = message.source;
 		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 ?? "");
+		else if (message.role === "developer") throw new LlmError("pi2dsh: this Pi provider cannot represent developer messages", "UNSUPPORTED_CONTENT");
+		else if (message.role === "tool") {
+			const toolCallId = String(message.toolCallId ?? "");
 			const toolName = toolNamesById.get(toolCallId);
 			piMessages.push({
 				role: "toolResult",
 				toolCallId,
 				...toolName === void 0 ? {} : { toolName },
-				content: await piContentFromDshBlocks(Array.isArray(result?.content) ? result.content : [], attachments),
-				isError: result?.isError === true
+				content: await piContentFromDshBlocks(content, attachments),
+				isError: message.isError === true
 			});
 		} else if (message.role === "user") piMessages.push({
 			role: "user",
@@ -3310,6 +3366,7 @@ const DSH_THINKING_FORMATS = /* @__PURE__ */ new Set([
 	"deepseek",
 	"openrouter",
 	"together",
+	"baseten",
 	"zai",
 	"qwen",
 	"chat-template",
@@ -3321,6 +3378,7 @@ const DSH_MAX_TOKENS_FIELDS = /* @__PURE__ */ new Set(["max_completion_tokens",
 const DSH_CACHE_CONTROL_FORMATS = /* @__PURE__ */ new Set(["anthropic"]);
 const DSH_CHAT_TEMPLATE_VARS = /* @__PURE__ */ new Set(["thinking.enabled", "thinking.effort"]);
 const COMPLETIONS = /* @__PURE__ */ new Set(["openai-completions"]);
+const RESPONSES = /* @__PURE__ */ new Set(["openai-responses"]);
 const ANTHROPIC = /* @__PURE__ */ new Set(["anthropic-messages"]);
 const COMPLETIONS_AND_RESPONSES = /* @__PURE__ */ new Set(["openai-completions", "openai-responses"]);
 const DSH_COMPAT_FIELD_PROTOCOLS = {
@@ -3331,6 +3389,9 @@ const DSH_COMPAT_FIELD_PROTOCOLS = {
 	supportsFinishReason: COMPLETIONS,
 	chatTemplateArgs: COMPLETIONS,
 	supportsThinkingTokenBudget: COMPLETIONS,
+	thinkingTokenBudgetField: COMPLETIONS,
+	vllmPriority: COMPLETIONS,
+	supportsMaxOutputTokens: RESPONSES,
 	maxTokensField: COMPLETIONS,
 	requiresToolResultName: COMPLETIONS,
 	requiresAssistantAfterToolResult: COMPLETIONS,
@@ -3385,9 +3446,13 @@ function compatProfileOf(value, api) {
 		const candidate = compat[field];
 		if (field === "maxTokensField") {
 			if (typeof candidate === "string" && DSH_MAX_TOKENS_FIELDS.has(candidate)) output[field] = candidate;
+		} else if (field === "vllmPriority") {
+			if (typeof candidate === "number" && Number.isSafeInteger(candidate)) output[field] = candidate;
+		} else if (field === "thinkingTokenBudgetField") {
+			if (candidate === "thinking_token_budget" || candidate === "thinking_budget" || candidate === "thinking_budget_tokens") output[field] = candidate;
 		} else if (field === "thinkingFormat") {
 			if (typeof candidate === "string" && DSH_THINKING_FORMATS.has(candidate)) output[field] = candidate;
-		} else if (field === "chatTemplateKwargs") {
+		} else if (field === "chatTemplateKwargs" || field === "chatTemplateArgs") {
 			const kwargs = chatTemplateKwargsOf(candidate);
 			if (kwargs !== void 0) output[field] = kwargs;
 		} else if (field === "cacheControlFormat") {
@@ -4087,12 +4152,16 @@ async function createPiTuiExtensionSurfaceAdapter(ctx, packageName, instanceKey)
 	const extensionService = service(ctx);
 	if (extensionService === void 0) return void 0;
 	const api = extensionService.api();
-	if (api.apiVersion !== 1 || !api.capabilities.has("unstable.surface.handle")) {
+	if (api.apiVersion !== 2 || !api.capabilities.has("unstable.surface.handle")) {
 		ctx.logger?.warn(`pi2dsh: piTuiExtensions cannot host Pi components (api=${api.apiVersion}, raw surface=${api.capabilities.has("unstable.surface.handle")})`);
 		return;
 	}
 	try {
-		const [hostModule, unstableModule] = await Promise.all([import("@xmoon76/dsh-pi-tui"), import("@xmoon76/dsh-pi-tui/extensions/unstable")]);
+		const hostEntry = "@xmoon76/dsh-pi-tui";
+		const unstableEntry = "@xmoon76/dsh-pi-tui/extensions/unstable";
+		const loader = ctx.get("loader", false);
+		const importPublic = (name) => loader === void 0 ? import(name) : loader.import(name);
+		const [hostModule, unstableModule] = await Promise.all([importPublic(hostEntry), importPublic(unstableEntry)]);
 		if (unstableModule.UNSTABLE_API_LEVEL !== 1) {
 			ctx.logger?.warn(`pi2dsh: unsupported dsh-pi-tui unstable API level ${unstableModule.UNSTABLE_API_LEVEL}`);
 			return;
@@ -4744,21 +4813,7 @@ function contextFor(ctx, state, agent, signal, command = false, sessionOverride,
 					...auth.baseUrl === void 0 && config.baseUrl === void 0 ? {} : { baseUrl: auth.baseUrl ?? config.baseUrl }
 				};
 			}
-			try {
-				const entry = llmOf(ctx)?.listConfigurableProviders?.()?.find((candidate) => candidate.provider === provider);
-				if (entry === void 0) return { ok: false };
-				const section = ctx.get("settings")?.get(entry.settingsNs);
-				const ref = entry.settingsPath.reduce((node, key) => typeof node === "object" && node !== null ? node[key] : void 0, section)?.apiKeyEnv;
-				if (typeof ref !== "string" || ref.length === 0) return { ok: false };
-				const resolved = await ctx.get("credentials")?.resolve(ref);
-				if (typeof resolved?.value !== "string" || resolved.value.length === 0) return { ok: false };
-				return {
-					ok: true,
-					apiKey: resolved.value
-				};
-			} catch {
-				return { ok: false };
-			}
+			return resolveHostModelAuth(ctx, provider);
 		},
 		getProviderAuthStatus: (provider) => providerSupportsOAuth(providerConfig(provider)) ? "oauth" : "none",
 		getProvider: (provider) => {
@@ -4774,7 +4829,13 @@ function contextFor(ctx, state, agent, signal, command = false, sessionOverride,
 			if (result instanceof Error) throw result;
 			return result;
 		},
-		getRegisteredProviderConfig: (provider) => providerConfig(provider),
+		registerProvider: (providerOrName, config) => {
+			if (typeof providerOrName === "string" && config === void 0) throw new Error("Provider config is required when registering by name");
+			registerPiProvider(ctx, state, providerOrName, config);
+		},
+		unregisterProvider: (provider) => unregisterPiProvider(ctx, state, provider),
+		getRegisteredProviderConfig: (provider) => state.nativeProviders.has(provider) ? void 0 : providerConfig(provider),
+		getRegisteredNativeProvider: (provider) => state.nativeProviders.has(provider) ? providerConfig(provider) : void 0,
 		getRegisteredProviderIds: () => [...state.providers.keys()],
 		getProviderDisplayName: (provider) => {
 			const config = providerConfig(provider);
@@ -4822,7 +4883,7 @@ function contextFor(ctx, state, agent, signal, command = false, sessionOverride,
 	const base = {
 		...sessionOverride === void 0 ? {} : {
 			sendMessage: (message, options = {}) => sendPiMessage(ctx, state, message.content, deliveryMode(options), sessionOverride, typeof message.customType === "string" ? message.customType : void 0),
-			sendUserMessage: (content) => sendPiMessage(ctx, state, content, "followup", sessionOverride),
+			sendUserMessage: (content) => reportUnawaitedDelivery(ctx, state, "sendUserMessage", sendPiMessage(ctx, state, content, "followup", sessionOverride)),
 			appendEntry: (customType, data) => {
 				state.bridge.appendCustomEntry(String(sessionOverride.id ?? ""), customType, data);
 			}
@@ -5210,12 +5271,12 @@ async function messageFromSessionEvent(ctx, event) {
 		};
 	}
 	if (type === "tool/result") {
-		const tool = (record.message?.content ?? []).find((block) => block.type === "tool-result");
+		const message = record.message;
 		return {
 			role: "toolResult",
-			toolCallId: tool?.toolCallId,
-			content: await dshToPiContent(ctx, tool?.content ?? []),
-			isError: tool?.isError === true
+			toolCallId: message?.toolCallId,
+			content: await dshToPiContent(ctx, message?.content ?? []),
+			isError: message?.isError === true
 		};
 	}
 }
@@ -5225,12 +5286,9 @@ function sourceReason(value) {
 /**
 * Claim Pi's once-per-session `session_start` event.
 *
-* dsh-TUI can execute a slash command before DSH starts the first model turn,
-* so `agent/session-start` has not necessarily been announced yet. Pi, by
-* contrast, announces `session_start` before the user can execute a command.
-* The command bridge uses this same claim before invoking a Pi command; when
-* DSH later announces the real agent lifecycle, the durable session id keeps
-* the second path from restarting the extension.
+* Normal engine mounts complete inside DSH's serial agent/created event.
+* The same idempotent claim also protects direct runtime users and reloads:
+* command/tool entry must not restart an already initialized Pi extension.
 */
 function claimPiSessionStart(state, agent) {
 	const id = agentSession(agent)?.id;
@@ -5356,7 +5414,7 @@ async function startPiSession(ctx, state, agent, reason, signal) {
 function subscribeLifecycle(ctx, state) {
 	const cordis = ctx;
 	const warn = (event, error) => logger(ctx).warn(`[pi2dsh] ${event} handler failed: ${String(error)}`);
-	cordis.on("agent/session-start", (payload) => {
+	cordis.on("agent/created", async (payload) => {
 		const agent = payload.agent;
 		if (!acceptsAgent(state, agent)) return;
 		state.activeAgents.add(agent);
@@ -5368,7 +5426,7 @@ function subscribeLifecycle(ctx, state) {
 			state.pendingSessionStarts.set(agent, sourceReason(payload.source));
 			return;
 		}
-		startPiSession(ctx, state, agent, sourceReason(payload.source), void 0).catch((error) => warn("session_start", error));
+		await startPiSession(ctx, state, agent, sourceReason(payload.source), payload.signal);
 	});
 	cordis.on("agent/disposed", (payload) => {
 		const agent = payload.agent;
@@ -5662,7 +5720,7 @@ async function flushPendingSessionStarts(ctx, state) {
 * session guard must deliberately NOT suppress this replay: from the new
 * instance's point of view this is its first `session_start`. The command's
 * AsyncLocalStorage agent is included because a lean composition can execute
-* a Pi command without publishing DSH's optional agent/session-start event.
+* a Pi command through the runtime directly, outside engine-managed creation.
 */
 async function restartReloadedPiSessions(ctx, state) {
 	state.extensionsReady = true;
@@ -6035,7 +6093,7 @@ async function runBeforeAgentStart(ctx, state, agent, signal, assembled) {
 		injected.push(createUserMessage({
 			content: blocks,
 			source: {
-				kind: "plugin",
+				kind: "pi2dsh",
 				plugin: state.messageSource,
 				...typeof message.customType === "string" ? { piCustomType: message.customType } : {}
 			}
@@ -6193,7 +6251,7 @@ async function applyPiContextTransform(ctx, state, agent, signal, pending) {
 		rebuilt.push(createUserMessage({
 			content: blocks.map((block) => block.type === "text" ? files.get(block.text) ?? block : block),
 			source: original.source ?? {
-				kind: "plugin",
+				kind: "pi2dsh",
 				plugin: state.messageSource
 			}
 		}));
@@ -6541,6 +6599,7 @@ async function materializeAttachmentImage(ctx, attachment) {
 }
 function ensureLoginCommand(ctx, state) {
 	if (!shouldRegisterCompatibilityCommand("login", state.tuiSurfaces?.nativeCommands) && optionalService(ctx, "authorization") !== void 0) {
+		state.shared.retireLoginCommand?.();
 		logger(ctx).debug("[pi2dsh] native terminal owns /login and the authorization service is composed; Pi OAuth flows are available through it");
 		return;
 	}
@@ -6548,8 +6607,26 @@ function ensureLoginCommand(ctx, state) {
 	state.shared.loginCommandRegistered = true;
 	try {
 		registerLoginCommand(ctx, state);
-		ctx.effect(() => () => {
-			state.shared.loginCommandRegistered = false;
+		const retire = () => {
+			state.commandDisposers.get("login")?.();
+			state.commandDisposers.delete("login");
+			state.commands.delete("login");
+			for (const [name, owner] of state.dshCommandOwners) if (owner === "login") state.dshCommandOwners.delete(name);
+			if (state.shared.retireLoginCommand === retire) {
+				delete state.shared.retireLoginCommand;
+				state.shared.loginCommandRegistered = false;
+			}
+		};
+		state.shared.retireLoginCommand = retire;
+		ctx.effect(() => retire);
+		ctx.inject(["piTuiExtensions", "authorization"], async (inner) => {
+			const terminal = await createPiTuiExtensionSurfaceAdapter(inner, state.packageName);
+			if (terminal === void 0) return;
+			try {
+				if (!shouldRegisterCompatibilityCommand("login", terminal.nativeCommands)) retire();
+			} finally {
+				terminal.dispose();
+			}
 		});
 	} catch (error) {
 		state.shared.loginCommandRegistered = false;
@@ -7230,6 +7307,20 @@ function deliverAgentMessage(agent, message, mode) {
 	deliver.call(agent, message);
 }
 /**
+* Pi declares sendMessage / sendUserMessage as returning void, so packages call
+* them without awaiting. A delivery that fails — typically a completion
+* notice sent while the host is already tearing the agent down — would
+* otherwise surface as an unhandled rejection, which the DSH CLI reports as a
+* fatal failure and a non-zero exit. The failure is reported once, as a
+* warning naming the package; a caller that does await still receives it.
+*/
+function reportUnawaitedDelivery(ctx, state, api, delivery) {
+	delivery.catch((error) => {
+		logger(ctx).warn(`[pi2dsh] ${state.packageName}: ${api} was not delivered: ${error instanceof Error ? error.message : String(error)}`);
+	});
+	return delivery;
+}
+/**
 * Pi's `sendMessage` / `sendUserMessage`, on DSH.
 *
 * Two things this has to get right that a plain `deliverAgentMessage` does not:
@@ -7260,7 +7351,7 @@ async function sendPiMessage(ctx, state, content, mode, sessionOverride, customT
 	const message = createUserMessage({
 		content: blocks,
 		source: {
-			kind: "plugin",
+			kind: "pi2dsh",
 			plugin: state.messageSource,
 			...customType === void 0 ? { form: "relay" } : { piCustomType: customType }
 		}
@@ -7612,6 +7703,44 @@ async function runPiPrintRequest(ctx, state, parent, request, signal) {
 		await child.dispose();
 	}
 }
+/**
+* The ONE provider registration path. Pi exposes it twice — `pi.registerProvider`
+* and `ctx.modelRegistry.registerProvider` (model-registry.ts) — over the same
+* runtime, so both surfaces land here. A string first argument is Pi's legacy
+* (name, config) form; an object is a pi-ai native Provider. Pi keeps the two in
+* separate ledgers that replace each other per id, which is what
+* getRegisteredProviderConfig / getRegisteredNativeProvider read back.
+*/
+function registerPiProvider(ctx, state, providerOrName, config) {
+	const name = typeof providerOrName === "string" ? providerOrName : String(providerOrName?.id ?? providerOrName?.name ?? "unnamed");
+	const value = typeof providerOrName === "string" ? config ?? {} : providerOrName;
+	state.providers.set(name, value);
+	if (typeof providerOrName === "string") state.nativeProviders.delete(name);
+	else state.nativeProviders.add(name);
+	recordPackageProviderRegistration(state.shared, state.packageName, name, value);
+	if (recomposeSharedProvider(state.shared, name)) retireSharedProviderRoute(state.shared, name);
+	const canonical = state.shared.providers.get(name) ?? value;
+	if (providerSupportsOAuth(canonical)) {
+		ensureLoginCommand(ctx, state);
+		maybeProjectAuthorizationFlow(ctx, state, name);
+		logger(ctx).info(`[pi2dsh] Pi provider ${JSON.stringify(name)} supports OAuth — log in with /login ${name}`);
+	}
+	if (registerSharedProviderRoute(ctx, state, name, canonical) !== void 0) {
+		state.modelCatalog?.refresh();
+		if (providerCarriesTransport(canonical)) logger(ctx).info(`[pi2dsh] Pi provider ${JSON.stringify(name)} registered as a native DSH llm route`);
+	} else if (!providerSupportsOAuth(canonical)) logger(ctx).info(`[pi2dsh] recorded Pi provider ${JSON.stringify(name)}; model calls stay on DSH llm adapters`);
+	discoverProviderModels(ctx, state, name, canonical);
+}
+function unregisterPiProvider(ctx, state, name) {
+	state.providers.delete(name);
+	state.nativeProviders.delete(name);
+	releaseSharedProviderRoute(state, name);
+	if ((state.shared.providerPackages?.get(name))?.delete(state.packageName) === true && recomposeSharedProvider(state.shared, name)) {
+		retireSharedProviderRoute(state.shared, name);
+		const restored = state.shared.providers.get(name);
+		if (restored !== void 0) registerSharedProviderRoute(ctx, state, name, restored);
+	}
+}
 function createPiApi(ctx, state) {
 	return {
 		on(event, handler) {
@@ -7637,33 +7766,8 @@ function createPiApi(ctx, state) {
 			logger(ctx).warn(`[pi2dsh] Pi flag --${name} uses its default only; DSH CLI registration is unsupported`);
 		},
 		getFlag: (name) => state.flags.get(name),
-		registerProvider(providerOrName, config) {
-			const name = typeof providerOrName === "string" ? providerOrName : String(providerOrName?.id ?? providerOrName?.name ?? "unnamed");
-			const value = typeof providerOrName === "string" ? config ?? {} : providerOrName;
-			state.providers.set(name, value);
-			recordPackageProviderRegistration(state.shared, state.packageName, name, value);
-			if (recomposeSharedProvider(state.shared, name)) retireSharedProviderRoute(state.shared, name);
-			const canonical = state.shared.providers.get(name) ?? value;
-			if (providerSupportsOAuth(canonical)) {
-				ensureLoginCommand(ctx, state);
-				maybeProjectAuthorizationFlow(ctx, state, name);
-				logger(ctx).info(`[pi2dsh] Pi provider ${JSON.stringify(name)} supports OAuth — log in with /login ${name}`);
-			}
-			if (registerSharedProviderRoute(ctx, state, name, canonical) !== void 0) {
-				state.modelCatalog?.refresh();
-				if (providerCarriesTransport(canonical)) logger(ctx).info(`[pi2dsh] Pi provider ${JSON.stringify(name)} registered as a native DSH llm route`);
-			} else if (!providerSupportsOAuth(canonical)) logger(ctx).info(`[pi2dsh] recorded Pi provider ${JSON.stringify(name)}; model calls stay on DSH llm adapters`);
-			discoverProviderModels(ctx, state, name, canonical);
-		},
-		unregisterProvider(name) {
-			state.providers.delete(name);
-			releaseSharedProviderRoute(state, name);
-			if ((state.shared.providerPackages?.get(name))?.delete(state.packageName) === true && recomposeSharedProvider(state.shared, name)) {
-				retireSharedProviderRoute(state.shared, name);
-				const restored = state.shared.providers.get(name);
-				if (restored !== void 0) registerSharedProviderRoute(ctx, state, name, restored);
-			}
-		},
+		registerProvider: (providerOrName, config) => registerPiProvider(ctx, state, providerOrName, config),
+		unregisterProvider: (name) => unregisterPiProvider(ctx, state, name),
 		registerMessageRenderer(customType, renderer) {
 			state.messageRenderers.set(customType, renderer);
 		},
@@ -7675,11 +7779,11 @@ function createPiApi(ctx, state) {
 		},
 		sendMessage(message, options = {}) {
 			requireAgent(state, "sendMessage");
-			return sendPiMessage(ctx, state, message.content, deliveryMode(options), void 0, typeof message.customType === "string" ? message.customType : void 0);
+			return reportUnawaitedDelivery(ctx, state, "sendMessage", sendPiMessage(ctx, state, message.content, deliveryMode(options), void 0, typeof message.customType === "string" ? message.customType : void 0));
 		},
 		sendUserMessage(content, options = {}) {
 			requireAgent(state, "sendUserMessage");
-			return sendPiMessage(ctx, state, content, options.deliverAs === "steer" ? "steer" : "followup");
+			return reportUnawaitedDelivery(ctx, state, "sendUserMessage", sendPiMessage(ctx, state, content, options.deliverAs === "steer" ? "steer" : "followup"));
 		},
 		appendEntry(customType, data) {
 			const session = requireSession(state, "appendEntry");
@@ -7849,7 +7953,7 @@ async function registerPromptCommands(ctx, state, rootDir, manifest) {
 						text: expandPrompt(text, rawInput)
 					}],
 					source: {
-						kind: "plugin",
+						kind: "pi2dsh",
 						plugin: `pi2dsh:${manifest.package.name}`,
 						form: "relay"
 					}
@@ -8004,6 +8108,7 @@ async function applyPiPackage(ctx, options) {
 		messageRenderers: /* @__PURE__ */ new Map(),
 		entryRenderers: /* @__PURE__ */ new Map(),
 		providers: /* @__PURE__ */ new Map(),
+		nativeProviders: /* @__PURE__ */ new Set(),
 		autocompleteProviders: [],
 		editorBuffers: /* @__PURE__ */ new WeakMap(),
 		toolsExpanded: false,
@@ -8490,7 +8595,28 @@ async function applyPiPackage(ctx, options) {
 	const healthSuffix = health === void 0 || health.status === "ok" ? "" : ` — ${health.status.toUpperCase()}: missing Pi capabilities ${health.gaps.join(", ")}`;
 	logger(ctx).info(`[pi2dsh] loaded ${options.manifest.package.name}: ${state.tools.size} tools, ${state.commands.size} commands, ${options.manifest.skillDirs.length} skill roots${healthSuffix}${state.hostAnchor ? " (host anchor)" : ""}`);
 }
+/** Resolve a host-owned route through its public config descriptor and credential reference. */
+async function resolveHostModelAuth(ctx, provider) {
+	try {
+		const entry = ctx.get("llm")?.listConfigurableProviders().find((candidate) => candidate.provider === provider);
+		if (entry === void 0) return { ok: false };
+		const section = ctx.get("settings")?.describe({ redactSecrets: true }).find((item) => item.ns === entry.settingsNs)?.value;
+		const ref = entry.settingsPath.reduce((node, key) => typeof node === "object" && node !== null ? node[key] : void 0, section)?.apiKeyEnv;
+		if (typeof ref !== "string" || ref.length === 0) return { ok: false };
+		const resolved = await ctx.get("credentials")?.resolve(ref);
+		return typeof resolved?.value === "string" && resolved.value.length > 0 ? {
+			ok: true,
+			apiKey: resolved.value
+		} : { ok: false };
+	} catch (error) {
+		return {
+			ok: false,
+			error: `Host credential resolution failed: ${error instanceof Error ? error.message : String(error)}`
+		};
+	}
+}
 const runtimeInternals = {
+	resolveHostModelAuth,
 	compactionReason,
 	resolveOfferedChoice,
 	currentPiModel,
@@ -8509,4 +8635,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-CCzYSxhI.mjs.map
+//# sourceMappingURL=runtime-BFJsumJX.mjs.map