pi2dsh 0.3.1 → 0.3.2

package/dist/{runtime-6DefpI6h.mjs → runtime-B9R7bDWT.mjs}

@@ -1,18 +1,18 @@
 
 import { t as getAgentDir } from "./pi-config-shim-CZ1wFzqM.mjs";
-import { E as __setSubagentSessionFactory, S as Theme, f as ExtensionRunner } from "./pi-coding-agent-Z1hTs61i.mjs";
-import { a as storedOAuthCredential, i as resolveOAuthApiKey, n as loginPiProvider, r as providerSupportsOAuth, t as FileCredentialStore } from "./oauth-bridge-BpPrppjR.mjs";
-import { r as builtinProviders } from "./pi-ai-CWFlgigJ.mjs";
+import { E as __setSubagentSessionFactory, S as Theme, f as ExtensionRunner } from "./pi-coding-agent-fPHwKP4d.mjs";
+import { a as resolvePiProviderAuth, n as loginPiProvider, r as providerSupportsOAuth, t as FileCredentialStore } from "./oauth-bridge-C6fL1qSv.mjs";
+import { L as AssistantMessageEventStream, S as realBuiltinProvider, i as builtinProviders, n as __setPiAiLlmBridge } from "./pi-ai-DhYGgq4Y.mjs";
 import { createRequire } from "node:module";
 import { access, readFile } from "node:fs/promises";
 import { join } from "node:path";
 import { fileURLToPath } from "node:url";
+import { appendFileSync, existsSync, mkdirSync, readFileSync } from "node:fs";
 import { EventEmitter } from "node:events";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { createJiti } from "jiti";
 import { createUserMessage } from "@deepseek-ai/dsh-llm";
 import { renderPrompt } from "@deepseek-ai/dsh-system-prompt";
-import { appendFileSync, existsSync, mkdirSync, readFileSync } from "node:fs";
 import { randomUUID } from "node:crypto";
 //#region src/session-bridge.ts
 function sidecarDir() {
@@ -435,11 +435,13 @@ var PiBridgedAgentSession = class {
 	}
 	abort() {
 		this.#aborted = true;
-		const cancel = this.#handle.agent.cancel;
-		cancel?.({
-			kind: "hook",
-			reason: "pi2dsh subagent abort()"
-		});
+		try {
+			const cancel = this.#handle.agent.cancel;
+			cancel?.({
+				kind: "hook",
+				reason: "pi2dsh subagent abort()"
+			});
+		} catch {}
 	}
 	setSessionName(name) {
 		this.#sessionName = String(name);
@@ -479,14 +481,34 @@ async function createBridgedAgentSession(host, options) {
 	const sessionId = `pi2dsh-sub-${Date.now().toString(36)}-${subagentSerial}`;
 	let handle;
 	try {
+		const requestedModel = options.model;
+		const loader = options.resourceLoader;
+		const overrideText = typeof options.systemPrompt === "string" && options.systemPrompt.length > 0 ? options.systemPrompt : typeof loader?.getSystemPrompt === "function" ? loader.getSystemPrompt() : void 0;
+		const appendTexts = (typeof loader?.getAppendSystemPrompt === "function" ? loader.getAppendSystemPrompt() : []).filter((text) => typeof text === "string" && text.length > 0);
+		const systemPrompt = overrideText !== void 0 && overrideText.length > 0 ? [overrideText, ...appendTexts].join("\n\n") : void 0;
 		handle = await agents.create({
 			sessionId,
 			meta: {
 				cwd: typeof options.cwd === "string" ? options.cwd : host.cwd(),
 				origin: "subagent",
 				...host.parentSessionId() !== void 0 ? { parentSession: host.parentSessionId() } : {}
-			}
+			},
+			...typeof requestedModel?.id === "string" && requestedModel.id.length > 0 ? { agentOptions: {
+				model: requestedModel.id,
+				...typeof requestedModel.provider === "string" && requestedModel.provider.length > 0 ? { provider: requestedModel.provider } : {}
+			} } : {}
 		});
+		if (systemPrompt !== void 0) {
+			const agentCtx = handle.agent.ctx;
+			const prompt = typeof agentCtx?.get === "function" ? agentCtx.get("systemPrompt") : void 0;
+			if (prompt === void 0) throw new Error("pi2dsh: createAgentSession() got a system prompt but the DSH composition has no systemPrompt service to carry it");
+			prompt.section({
+				name: "pi2dsh:subagent-system-prompt",
+				order: -1e6,
+				text: systemPrompt,
+				complete: true
+			});
+		}
 	} catch (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)})`);
 	}
@@ -494,6 +516,663 @@ async function createBridgedAgentSession(host, options) {
 	return { session: new PiBridgedAgentSession(host, handle, tools) };
 }
 //#endregion
+//#region src/model-bridge.ts
+function llmOf(ctx) {
+	try {
+		const service = ctx.get("llm");
+		if (typeof service?.stream !== "function") return void 0;
+		return service;
+	} catch {
+		return;
+	}
+}
+function piModelFromInfo(info) {
+	const modalities = Array.isArray(info.inputModalities) ? info.inputModalities : void 0;
+	return {
+		id: String(info.id ?? ""),
+		name: String(info.name ?? info.id ?? ""),
+		provider: String(info.provider ?? ""),
+		api: "dsh-llm",
+		input: modalities === void 0 ? ["text"] : modalities.filter((m) => m === "text" || m === "image"),
+		reasoning: info.reasoning !== void 0
+	};
+}
+/**
+* Cached projection of DSH's advisory model catalog as Pi Model objects.
+* `refresh()` re-reads providers and models; the runtime subscribes it to
+* `llm/adapters-updated`. Reads are synchronous (Pi's getAll contract).
+*/
+var ModelCatalog = class {
+	#llm;
+	#models = [];
+	#resolved = /* @__PURE__ */ new Map();
+	#refreshing;
+	constructor(llm) {
+		this.#llm = llm;
+	}
+	get present() {
+		return this.#llm !== void 0;
+	}
+	all() {
+		return [...this.#models];
+	}
+	find(provider, modelId) {
+		return this.#resolved.get(`${provider}${modelId}`) ?? this.#models.find((model) => model.provider === provider && model.id === modelId);
+	}
+	refresh() {
+		if (this.#llm === void 0) return Promise.resolve();
+		this.#refreshing ??= this.#refreshOnce().finally(() => {
+			this.#refreshing = void 0;
+		});
+		return this.#refreshing;
+	}
+	async #refreshOnce() {
+		const llm = this.#llm;
+		if (llm === void 0) return;
+		const next = [];
+		for (const provider of llm.listProviders()) try {
+			for (const info of await llm.listModels(provider.id)) next.push(piModelFromInfo({
+				...info,
+				provider: provider.id
+			}));
+		} catch {}
+		this.#models = next;
+	}
+	/** Exact-route metadata (context window, reasoning efforts), cached per route. */
+	async resolve(provider, modelId) {
+		if (this.#llm === void 0) return void 0;
+		const key = `${provider}${modelId}`;
+		const cached = this.#resolved.get(key);
+		if (cached !== void 0) return cached;
+		try {
+			const info = await this.#llm.resolveModelInfo(provider, modelId);
+			const model = piModelFromInfo(info);
+			const context = info.context;
+			if (typeof context?.contextWindow === "number") model.contextWindow = context.contextWindow;
+			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;
+			this.#resolved.set(key, model);
+			return model;
+		} catch {
+			return;
+		}
+	}
+};
+function dshBlocksFromPiContent(content) {
+	if (typeof content === "string") return content.length > 0 ? [{
+		type: "text",
+		text: content
+	}] : [];
+	if (!Array.isArray(content)) return [];
+	const blocks = [];
+	for (const block of content) if (block.type === "text" && typeof block.text === "string") blocks.push({
+		type: "text",
+		text: block.text
+	});
+	else if (block.type === "thinking" && typeof block.thinking === "string") blocks.push({
+		type: "reasoning",
+		text: block.thinking
+	});
+	else if (block.type === "toolCall") blocks.push({
+		type: "tool-call",
+		id: String(block.id ?? ""),
+		name: String(block.name ?? ""),
+		arguments: typeof block.arguments === "string" ? block.arguments : JSON.stringify(block.arguments ?? {})
+	});
+	else if (block.type === "image") blocks.push({
+		type: "text",
+		text: `[image omitted by pi2dsh: ${String(block.mimeType ?? "unknown media type")}]`
+	});
+	return blocks;
+}
+/**
+* Pi request context → DSH GenerateOptions parts. System prompt moves to the
+* dedicated slot; toolResult messages become DSH tool-result user messages.
+*/
+function piRequestToDshMessages(context) {
+	const messages = [];
+	const source = Array.isArray(context.messages) ? context.messages : [];
+	for (const message of source) if (message.role === "user") messages.push({
+		role: "user",
+		content: dshBlocksFromPiContent(message.content),
+		source: { kind: "user" }
+	});
+	else if (message.role === "assistant") messages.push({
+		role: "assistant",
+		content: dshBlocksFromPiContent(message.content),
+		source: {
+			kind: "model",
+			provider: String(message.provider ?? context.provider ?? "pi2dsh"),
+			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 ?? "")
+		}
+	});
+	const system = typeof context.systemPrompt === "string" && context.systemPrompt.length > 0 ? context.systemPrompt : void 0;
+	return {
+		...system === void 0 ? {} : { system },
+		messages
+	};
+}
+function piUsageFromDsh(usage) {
+	const input = Number(usage?.inputTokens ?? 0);
+	const output = Number(usage?.outputTokens ?? 0);
+	const cacheRead = Number(usage?.cacheReadTokens ?? 0);
+	const cacheWrite = Number(usage?.cacheWriteTokens ?? 0);
+	return {
+		input,
+		output,
+		cacheRead,
+		cacheWrite,
+		totalTokens: input + output + cacheRead + cacheWrite,
+		cost: {
+			input: 0,
+			output: 0,
+			cacheRead: 0,
+			cacheWrite: 0,
+			total: 0
+		}
+	};
+}
+function piStopReason(finish) {
+	switch (finish?.kind) {
+		case "stop": return "stop";
+		case "max-tokens": return "length";
+		case "tool-calls": return "toolUse";
+		case "aborted": return "aborted";
+		default: return "error";
+	}
+}
+/**
+* Run one hand-built pi-ai model call on DSH's native llm service, translating
+* the chunk stream into Pi's AssistantMessageEventStream vocabulary.
+*/
+function streamViaDshLlm(llm, request) {
+	const stream = new AssistantMessageEventStream();
+	const provider = String(request.model.provider ?? "");
+	const modelId = String(request.model.id ?? "");
+	const { system, messages } = piRequestToDshMessages({
+		...request.context,
+		provider,
+		model: modelId
+	});
+	const options = request.options ?? {};
+	const generate = {
+		provider,
+		model: modelId,
+		messages,
+		...system === void 0 ? {} : { system },
+		...Array.isArray(request.context.tools) ? { tools: normalizeToolSchemas(request.context.tools) } : {},
+		...typeof options.maxTokens === "number" ? { maxTokens: options.maxTokens } : {},
+		...typeof options.temperature === "number" ? { temperature: options.temperature } : {},
+		...options.signal instanceof AbortSignal ? { signal: options.signal } : {}
+	};
+	(async () => {
+		const partial = {
+			role: "assistant",
+			content: [],
+			provider,
+			model: modelId,
+			api: "dsh-llm"
+		};
+		const content = partial.content;
+		let usage;
+		stream.push({
+			type: "start",
+			partial
+		});
+		try {
+			for await (const chunk of llm.stream(generate)) {
+				const type = String(chunk.type ?? "");
+				const index = Number(chunk.index ?? 0);
+				if (type === "block-start") {
+					const blockType = String(chunk.blockType ?? "");
+					if (blockType === "text") {
+						content[index] = {
+							type: "text",
+							text: ""
+						};
+						stream.push({
+							type: "text_start",
+							contentIndex: index,
+							partial
+						});
+					} else if (blockType === "reasoning") {
+						content[index] = {
+							type: "thinking",
+							thinking: ""
+						};
+						stream.push({
+							type: "thinking_start",
+							contentIndex: index,
+							partial
+						});
+					} else if (blockType === "tool-call") {
+						content[index] = {
+							type: "toolCall",
+							id: "",
+							name: "",
+							arguments: void 0,
+							partialJson: ""
+						};
+						stream.push({
+							type: "toolcall_start",
+							contentIndex: index,
+							partial
+						});
+					}
+				} else if (type === "text-delta") {
+					const block = content[index] ??= {
+						type: "text",
+						text: ""
+					};
+					block.text = String(block.text ?? "") + String(chunk.text ?? "");
+					stream.push({
+						type: "text_delta",
+						contentIndex: index,
+						delta: String(chunk.text ?? ""),
+						partial
+					});
+				} else if (type === "reasoning-delta") {
+					const block = content[index] ??= {
+						type: "thinking",
+						thinking: ""
+					};
+					block.thinking = String(block.thinking ?? "") + String(chunk.text ?? "");
+					stream.push({
+						type: "thinking_delta",
+						contentIndex: index,
+						delta: String(chunk.text ?? ""),
+						partial
+					});
+				} else if (type === "tool-call-delta") {
+					const block = content[index] ??= {
+						type: "toolCall",
+						id: "",
+						name: "",
+						arguments: void 0,
+						partialJson: ""
+					};
+					if (chunk.id !== void 0) block.id = String(chunk.id);
+					if (chunk.name !== void 0) block.name = String(chunk.name);
+					block.partialJson = String(block.partialJson ?? "") + String(chunk.argumentsDelta ?? "");
+					stream.push({
+						type: "toolcall_delta",
+						contentIndex: index,
+						delta: String(chunk.argumentsDelta ?? ""),
+						partial
+					});
+				} else if (type === "block-end") {
+					const block = chunk.block;
+					const blockType = String(block?.type ?? "");
+					if (blockType === "text") {
+						content[index] = {
+							type: "text",
+							text: String(block?.text ?? "")
+						};
+						stream.push({
+							type: "text_end",
+							contentIndex: index,
+							content: String(block?.text ?? ""),
+							partial
+						});
+					} else if (blockType === "reasoning") {
+						content[index] = {
+							type: "thinking",
+							thinking: String(block?.text ?? "")
+						};
+						stream.push({
+							type: "thinking_end",
+							contentIndex: index,
+							content: String(block?.text ?? ""),
+							partial
+						});
+					} else if (blockType === "tool-call") {
+						let parsed;
+						try {
+							parsed = JSON.parse(String(block?.arguments ?? "{}"));
+						} catch {
+							parsed = {};
+						}
+						content[index] = {
+							type: "toolCall",
+							id: String(block?.id ?? ""),
+							name: String(block?.name ?? ""),
+							arguments: parsed
+						};
+						stream.push({
+							type: "toolcall_end",
+							contentIndex: index,
+							toolCall: content[index],
+							partial
+						});
+					}
+				} else if (type === "usage") usage = piUsageFromDsh(chunk.usage);
+				else if (type === "finish") {
+					const finish = chunk.reason;
+					const stopReason = piStopReason(finish);
+					if (stopReason === "error" || stopReason === "aborted") {
+						const failure = finish?.failure;
+						const error = {
+							type: "error",
+							reason: stopReason === "aborted" ? "aborted" : "error",
+							error: new Error(String(failure?.message ?? `model call failed (${stopReason})`))
+						};
+						stream.push({
+							...error,
+							partial
+						});
+						return;
+					}
+					const message = {
+						role: "assistant",
+						content: content.filter((block) => block !== void 0),
+						provider,
+						model: modelId,
+						api: "dsh-llm",
+						...usage === void 0 ? {} : { usage },
+						stopReason,
+						timestamp: Date.now()
+					};
+					stream.push({
+						type: "done",
+						reason: stopReason,
+						message
+					});
+					return;
+				}
+			}
+			stream.push({
+				type: "error",
+				reason: "error",
+				error: /* @__PURE__ */ new Error("pi2dsh: DSH llm stream ended without a finish chunk"),
+				partial
+			});
+		} catch (error) {
+			stream.push({
+				type: "error",
+				reason: "error",
+				error: error instanceof Error ? error : new Error(String(error)),
+				partial
+			});
+		}
+	})();
+	return stream;
+}
+function normalizeToolSchemas(tools) {
+	return tools.map((tool) => ({
+		name: String(tool.name ?? ""),
+		description: String(tool.description ?? ""),
+		parameters: tool.parameters ?? tool.inputSchema ?? {
+			type: "object",
+			properties: {}
+		}
+	}));
+}
+/** DSH GenerateOptions parts → the Pi request context a provider.stream expects. */
+function dshRequestToPiContext(options) {
+	const piMessages = [];
+	for (const message of Array.isArray(options.messages) ? options.messages : []) {
+		const content = Array.isArray(message.content) ? message.content : [];
+		const source = message.source;
+		if (message.role === "user" && source?.kind === "tool") {
+			const result = content[0];
+			piMessages.push({
+				role: "toolResult",
+				toolCallId: String(result?.toolCallId ?? ""),
+				content: piContentFromDshBlocks(Array.isArray(result?.content) ? result.content : []),
+				isError: result?.isError === true
+			});
+		} else if (message.role === "user") piMessages.push({
+			role: "user",
+			content: piContentFromDshBlocks(content)
+		});
+		else if (message.role === "assistant") piMessages.push({
+			role: "assistant",
+			content: piContentFromDshBlocks(content)
+		});
+	}
+	return {
+		...typeof options.system === "string" && options.system.length > 0 ? { systemPrompt: options.system } : {},
+		messages: piMessages,
+		...Array.isArray(options.tools) ? { tools: options.tools } : {}
+	};
+}
+function piContentFromDshBlocks(blocks) {
+	const out = [];
+	for (const block of blocks) if (block.type === "text") out.push({
+		type: "text",
+		text: String(block.text ?? "")
+	});
+	else if (block.type === "reasoning") out.push({
+		type: "thinking",
+		thinking: String(block.text ?? "")
+	});
+	else if (block.type === "tool-call") {
+		let parsed;
+		try {
+			parsed = JSON.parse(String(block.arguments ?? "{}"));
+		} catch {
+			parsed = {};
+		}
+		out.push({
+			type: "toolCall",
+			id: String(block.id ?? ""),
+			name: String(block.name ?? ""),
+			arguments: parsed
+		});
+	}
+	return out;
+}
+/** A Pi AssistantMessageEventStream → DSH StreamChunk sequence. */
+async function* piEventsToDshChunks(events) {
+	let usage;
+	for await (const event of events) {
+		const type = String(event.type ?? "");
+		const index = Number(event.contentIndex ?? 0);
+		if (type === "text_start") yield {
+			type: "block-start",
+			index,
+			blockType: "text"
+		};
+		else if (type === "text_delta") yield {
+			type: "text-delta",
+			index,
+			text: String(event.delta ?? "")
+		};
+		else if (type === "text_end") yield {
+			type: "block-end",
+			index,
+			block: {
+				type: "text",
+				text: String(event.content ?? "")
+			}
+		};
+		else if (type === "thinking_start") yield {
+			type: "block-start",
+			index,
+			blockType: "reasoning"
+		};
+		else if (type === "thinking_delta") yield {
+			type: "reasoning-delta",
+			index,
+			text: String(event.delta ?? "")
+		};
+		else if (type === "thinking_end") yield {
+			type: "block-end",
+			index,
+			block: {
+				type: "reasoning",
+				text: String(event.content ?? "")
+			}
+		};
+		else if (type === "toolcall_start") yield {
+			type: "block-start",
+			index,
+			blockType: "tool-call"
+		};
+		else if (type === "toolcall_delta") yield {
+			type: "tool-call-delta",
+			index,
+			id: "",
+			argumentsDelta: String(event.delta ?? "")
+		};
+		else if (type === "toolcall_end") {
+			const call = event.toolCall;
+			yield {
+				type: "block-end",
+				index,
+				block: {
+					type: "tool-call",
+					id: String(call?.id ?? ""),
+					name: String(call?.name ?? ""),
+					arguments: typeof call?.arguments === "string" ? call.arguments : JSON.stringify(call?.arguments ?? {})
+				}
+			};
+		} else if (type === "done") {
+			const message = event.message;
+			const piUsage = message?.usage;
+			if (piUsage !== void 0) {
+				usage = {
+					inputTokens: Number(piUsage.input ?? 0),
+					outputTokens: Number(piUsage.output ?? 0),
+					...piUsage.cacheRead === void 0 ? {} : { cacheReadTokens: Number(piUsage.cacheRead) },
+					...piUsage.cacheWrite === void 0 ? {} : { cacheWriteTokens: Number(piUsage.cacheWrite) }
+				};
+				yield {
+					type: "usage",
+					usage
+				};
+			}
+			const stop = String(message?.stopReason ?? "stop");
+			yield {
+				type: "finish",
+				reason: stop === "length" ? { kind: "max-tokens" } : stop === "toolUse" ? { kind: "tool-calls" } : stop === "aborted" ? {
+					kind: "aborted",
+					failure: {
+						message: "aborted by caller",
+						code: "ABORTED"
+					}
+				} : { kind: "stop" }
+			};
+			return;
+		} else if (type === "error") {
+			const error = event.error;
+			yield {
+				type: "finish",
+				reason: {
+					kind: String(event.reason ?? "") === "aborted" ? "aborted" : "error",
+					failure: {
+						message: error instanceof Error ? error.message : String(error ?? "provider stream error"),
+						code: "PI_PROVIDER"
+					}
+				}
+			};
+			return;
+		}
+	}
+	yield {
+		type: "finish",
+		reason: {
+			kind: "error",
+			failure: {
+				message: "pi2dsh: Pi provider stream ended without done/error",
+				code: "PI_PROVIDER"
+			}
+		}
+	};
+}
+//#endregion
+//#region src/provider-adapter.ts
+function providerCarriesTransport(value) {
+	return typeof value?.stream === "function";
+}
+function providerModels(provider) {
+	try {
+		const models = provider.getModels?.();
+		return Array.isArray(models) ? models : [];
+	} catch {
+		return [];
+	}
+}
+/**
+* Wrap one Pi provider object as a DSH LlmAdapter-shaped route handler.
+* Structural typing carries it through `llm.registerAdapter`.
+*/
+function piProviderDshAdapter(providerId, provider, host) {
+	return {
+		providerInfo: (id) => ({
+			id,
+			name: typeof provider.name === "string" ? provider.name : id
+		}),
+		providerRetryPolicy: () => void 0,
+		listModels: async (id) => providerModels(provider).map((model) => ({
+			provider: id,
+			id: String(model.id ?? ""),
+			name: String(model.name ?? model.id ?? ""),
+			...Array.isArray(model.input) ? { inputModalities: model.input.filter((m) => m === "text" || m === "image") } : {}
+		})),
+		resolveModel: async (id, modelId) => {
+			const known = providerModels(provider).find((model) => model.id === modelId);
+			return {
+				provider: id,
+				id: modelId,
+				name: String(known?.name ?? modelId),
+				...typeof known?.contextWindow === "number" ? { context: { contextWindow: known.contextWindow } } : {},
+				...typeof known?.maxTokens === "number" ? { defaultMaxTokens: known.maxTokens } : {}
+			};
+		},
+		async *stream(options) {
+			const auth = (await host.resolveAuth())?.auth;
+			const modelId = String(options.model ?? "");
+			const model = providerModels(provider).find((entry) => entry.id === modelId) ?? {
+				id: modelId,
+				provider: providerId
+			};
+			const piContext = dshRequestToPiContext(options);
+			const piOptions = {
+				...auth?.apiKey === void 0 ? {} : { apiKey: auth.apiKey },
+				...auth?.baseUrl === void 0 ? {} : { baseUrl: auth.baseUrl },
+				...auth?.headers === void 0 ? {} : { headers: auth.headers },
+				...options.signal instanceof AbortSignal ? { signal: options.signal } : {},
+				...typeof options.maxTokens === "number" ? { maxTokens: options.maxTokens } : {},
+				...typeof options.temperature === "number" ? { temperature: options.temperature } : {}
+			};
+			yield* piEventsToDshChunks(provider.stream(model, piContext, piOptions));
+		}
+	};
+}
+/**
+* Register the provider as a live DSH route when it carries a transport and
+* an llm service is mounted. A route conflict (an adapter already owns the
+* name — e.g. a deployment-configured `deepseek`) keeps the existing route
+* and reports the skip; the package's registry entry still stands.
+* @returns the route disposer, or undefined when nothing was registered.
+*/
+function registerPiProviderRoute(options) {
+	const { llm, providerId, provider, host } = options;
+	if (llm === void 0 || !providerCarriesTransport(provider)) return void 0;
+	try {
+		return llm.registerAdapter([providerId], piProviderDshAdapter(providerId, provider, host));
+	} catch (error) {
+		host.warn(`[pi2dsh] Pi provider ${JSON.stringify(providerId)} was not added as a DSH llm route (${error instanceof Error ? error.message : String(error)}); the existing route keeps the name`);
+		return;
+	}
+}
+//#endregion
 //#region src/runtime.ts
 function logger(ctx) {
 	const candidate = ctx.logger;
@@ -734,6 +1413,26 @@ function agentSession(agent) {
 	if (typeof record.id !== "string") return void 0;
 	return record;
 }
+function isSubagentOrigin(subject) {
+	const session = subject?.session ?? subject;
+	const header = session?.header;
+	return header?.origin === "subagent" || (header?.meta)?.origin === "subagent" || (session?.meta)?.origin === "subagent";
+}
+function currentPiModel(state, agent) {
+	const override = state.modelOverrides.get(agent);
+	const options = agent.options;
+	const provider = String(override?.provider ?? options?.provider ?? "");
+	const id = String(override?.model ?? options?.model ?? "");
+	if (id.length === 0) return override;
+	return (provider.length > 0 ? state.modelCatalog?.find(provider, id) : void 0) ?? {
+		id,
+		name: id,
+		provider,
+		api: "dsh-llm",
+		input: ["text"],
+		reasoning: false
+	};
+}
 function thinkingLevelOf(state, agent) {
 	if (agent !== void 0) {
 		const scoped = state.thinkingLevels.get(agent);
@@ -818,6 +1517,29 @@ function contextFor(ctx, state, agent, signal, command = false) {
 	};
 	const session = agentSession(agent);
 	const providerConfig = (name) => state.providers.get(name);
+	const catalog = state.modelCatalog;
+	const piProviderModels = () => {
+		const out = [];
+		for (const [key, value] of state.providers) {
+			let models;
+			try {
+				models = typeof value.getModels === "function" ? value.getModels() : value.models;
+			} catch {
+				continue;
+			}
+			if (!Array.isArray(models)) continue;
+			for (const model of models) out.push({
+				...model,
+				provider: String(model.provider ?? key)
+			});
+		}
+		return out;
+	};
+	const allModels = () => {
+		const fromLlm = catalog?.all() ?? [];
+		const seen = new Set(fromLlm.map((model) => `${model.provider} ${model.id}`));
+		return [...fromLlm, ...piProviderModels().filter((model) => !seen.has(`${String(model.provider)} ${String(model.id)}`))];
+	};
 	const base = {
 		ui,
 		mode: "rpc",
@@ -828,11 +1550,47 @@ function contextFor(ctx, state, agent, signal, command = false) {
 			events: []
 		}, cwdOf(agent)) : state.bridge.readonlySessionManager(session, cwdOf(agent)),
 		modelRegistry: {
-			getAll: () => [],
-			getAvailable: () => [],
-			find: (_provider, _modelId) => void 0,
+			getAll: () => allModels(),
+			getAvailable: () => allModels(),
+			find: (provider, modelId) => catalog?.find(provider, modelId) ?? piProviderModels().find((model) => model.provider === provider && model.id === modelId),
 			getError: () => void 0,
-			hasConfiguredAuth: (_model) => false,
+			hasConfiguredAuth: (model) => {
+				const provider = String(model?.provider ?? "");
+				return provider.length > 0 && (state.providers.has(provider) || (catalog?.all() ?? []).some((entry) => entry.provider === provider));
+			},
+			getApiKeyAndHeaders: async (model) => {
+				const provider = String(model?.provider ?? "");
+				const config = providerConfig(provider) ?? await realBuiltinProvider(provider);
+				if (config !== void 0) {
+					const auth = (await resolvePiProviderAuth({
+						providerId: provider,
+						providerConfig: config,
+						store: oauthStoreOf(state)
+					}))?.auth;
+					if (auth?.apiKey === void 0) return { ok: false };
+					return {
+						ok: true,
+						apiKey: auth.apiKey,
+						...auth.headers === void 0 ? {} : { headers: auth.headers },
+						...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 };
+				}
+			},
 			getProviderAuthStatus: (provider) => providerSupportsOAuth(providerConfig(provider)) ? "oauth" : "none",
 			getProvider: (provider) => providerConfig(provider),
 			getRegisteredProviderConfig: (provider) => providerConfig(provider),
@@ -843,42 +1601,44 @@ function contextFor(ctx, state, agent, signal, command = false) {
 			},
 			getProviderAuth: async (provider) => {
 				const config = providerConfig(provider);
-				if (!providerSupportsOAuth(config)) return void 0;
-				if (await storedOAuthCredential(oauthStoreOf(state), provider) === void 0) return void 0;
-				const apiKey = await resolveOAuthApiKey({
+				if (config === void 0) return void 0;
+				const resolved = await resolvePiProviderAuth({
 					providerId: provider,
 					providerConfig: config,
 					store: oauthStoreOf(state)
 				});
-				if (apiKey === void 0) return void 0;
-				return {
+				if (resolved?.auth === void 0) return resolved;
+				return resolved.auth.baseUrl === void 0 && config.baseUrl !== void 0 ? {
+					...resolved,
 					auth: {
-						apiKey,
+						...resolved.auth,
 						baseUrl: config.baseUrl
-					},
-					source: "OAuth"
-				};
+					}
+				} : resolved;
 			},
 			getApiKeyForProvider: async (provider) => {
 				const config = providerConfig(provider);
-				if (!providerSupportsOAuth(config)) return void 0;
-				return resolveOAuthApiKey({
+				if (config === void 0) return void 0;
+				return ((await resolvePiProviderAuth({
 					providerId: provider,
 					providerConfig: config,
 					store: oauthStoreOf(state)
-				});
+				}))?.auth)?.apiKey;
 			},
 			isUsingOAuth: (model) => {
 				const provider = String(model?.provider ?? "");
 				return provider.length > 0 && providerSupportsOAuth(providerConfig(provider));
 			},
-			refresh: async () => ({
-				models: [],
-				errors: []
-			})
+			refresh: async () => {
+				await catalog?.refresh();
+				return {
+					models: catalog?.all() ?? [],
+					errors: []
+				};
+			}
 		},
-		model: agent === void 0 ? void 0 : state.modelOverrides.get(agent),
-		scopedModels: [],
+		model: agent === void 0 ? void 0 : currentPiModel(state, agent),
+		scopedModels: catalog?.all() ?? [],
 		thinkingLevel: thinkingLevelOf(state, agent),
 		isIdle: () => command,
 		isProjectTrusted: () => false,
@@ -972,6 +1732,10 @@ function subscribeLifecycle(ctx, state) {
 	const warn = (event, error) => logger(ctx).warn(`[pi2dsh] ${event} handler failed: ${String(error)}`);
 	cordis.on("agent/session-start", (payload) => {
 		const agent = payload.agent;
+		if (isSubagentOrigin(agent)) {
+			state.activeAgents.add(agent);
+			return;
+		}
 		state.activeAgents.add(agent);
 		const session = agentSession(agent);
 		if (session !== void 0) state.bridge.load(session.id);
@@ -990,13 +1754,14 @@ function subscribeLifecycle(ctx, state) {
 		}
 		if (typeof agent === "object" && agent !== null && !state.disposedAgents.has(agent)) {
 			state.disposedAgents.add(agent);
-			dispatch(state, "session_shutdown", {
+			if (!isSubagentOrigin(agent)) dispatch(state, "session_shutdown", {
 				type: "session_shutdown",
 				reason: "quit"
 			}, contextFor(ctx, state, agent, void 0)).catch((error) => warn("session_shutdown", error));
 		}
 	});
 	cordis.on("session/event", (session, event) => {
+		if (isSubagentOrigin(session)) return;
 		const agent = [...state.activeAgents].find((candidate) => candidate.session === session);
 		const eventContext = contextFor(ctx, state, agent, void 0);
 		const type = event.type;
@@ -1246,6 +2011,13 @@ function oauthStoreOf(state) {
 function ensureLoginCommand(ctx, state) {
 	if (state.loginCommandRegistered === true) return;
 	state.loginCommandRegistered = true;
+	try {
+		registerLoginCommand(ctx, state);
+	} catch (error) {
+		logger(ctx).warn(`[pi2dsh] /login is already registered by an earlier package in this host; this package's providers use that command (${error instanceof Error ? error.message : String(error)})`);
+	}
+}
+function registerLoginCommand(ctx, state) {
 	registerCommand(ctx, state, {
 		name: "login",
 		description: "Log in to a Pi provider through its own OAuth flow",
@@ -1488,16 +2260,66 @@ function createPiApi(ctx, state) {
 		},
 		getFlag: (name) => state.flags.get(name),
 		registerProvider(providerOrName, config) {
-			const name = typeof providerOrName === "string" ? providerOrName : String(providerOrName?.name ?? "unnamed");
+			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 (providerSupportsOAuth(value)) {
 				ensureLoginCommand(ctx, state);
 				logger(ctx).info(`[pi2dsh] Pi provider ${JSON.stringify(name)} supports OAuth — log in with /login ${name}`);
-			} else logger(ctx).info(`[pi2dsh] recorded Pi provider ${JSON.stringify(name)}; model calls stay on DSH llm adapters`);
+			}
+			const routeDisposer = registerPiProviderRoute({
+				llm: llmOf(ctx),
+				providerId: name,
+				provider: value,
+				host: {
+					resolveAuth: async () => resolvePiProviderAuth({
+						providerId: name,
+						providerConfig: value,
+						store: oauthStoreOf(state)
+					}),
+					warn: (message) => logger(ctx).warn(message)
+				}
+			});
+			if (routeDisposer !== void 0) {
+				state.providerRouteDisposers.set(name, routeDisposer);
+				state.modelCatalog?.refresh();
+				logger(ctx).info(`[pi2dsh] Pi provider ${JSON.stringify(name)} registered as a native DSH llm route`);
+			} else if (!providerSupportsOAuth(value)) logger(ctx).info(`[pi2dsh] recorded Pi provider ${JSON.stringify(name)}; model calls stay on DSH llm adapters`);
+			const refreshModels = value.refreshModels;
+			if (typeof refreshModels === "function") (async () => {
+				const apiKey = ((await resolvePiProviderAuth({
+					providerId: name,
+					providerConfig: value,
+					store: oauthStoreOf(state)
+				}).catch(() => void 0))?.auth)?.apiKey;
+				await Promise.resolve(refreshModels.call(value, {
+					stored: void 0,
+					...apiKey === void 0 ? {} : { credential: {
+						type: "api_key",
+						key: apiKey
+					} },
+					store: {
+						read: async () => void 0,
+						write: async () => {},
+						delete: async () => {}
+					},
+					allowNetwork: true,
+					signal: new AbortController().signal,
+					publish: async (publication) => {
+						publication.update?.();
+						return true;
+					}
+				}));
+				state.modelCatalog?.refresh();
+			})().catch((error) => logger(ctx).warn(`[pi2dsh] model catalog refresh for Pi provider ${JSON.stringify(name)} failed (its registry entries stay static): ${error instanceof Error ? error.message : String(error)}`));
 		},
 		unregisterProvider(name) {
 			state.providers.delete(name);
+			const routeDisposer = state.providerRouteDisposers.get(name);
+			if (routeDisposer !== void 0) {
+				state.providerRouteDisposers.delete(name);
+				routeDisposer();
+			}
 		},
 		registerMessageRenderer(customType, renderer) {
 			state.messageRenderers.set(customType, renderer);
@@ -1769,7 +2591,8 @@ async function applyPiPackage(ctx, options) {
 		globalThinkingLevel: "off",
 		argMutations: /* @__PURE__ */ new WeakMap(),
 		streamingTexts: /* @__PURE__ */ new Map(),
-		lastLoggedModels: /* @__PURE__ */ new WeakMap()
+		lastLoggedModels: /* @__PURE__ */ new WeakMap(),
+		providerRouteDisposers: /* @__PURE__ */ new Map()
 	};
 	subscribeLifecycle(ctx, state);
 	subscribeInterceptors(ctx, state);
@@ -1791,6 +2614,20 @@ async function applyPiPackage(ctx, options) {
 			});
 		}
 	}
+	const llm = llmOf(ctx);
+	state.modelCatalog = new ModelCatalog(llm);
+	if (llm !== void 0) {
+		ctx.on("llm/adapters-updated", () => {
+			state.modelCatalog?.refresh();
+		});
+		await state.modelCatalog.refresh();
+		__setPiAiLlmBridge((model, context, callOptions) => streamViaDshLlm(llm, {
+			model,
+			context,
+			options: callOptions
+		}));
+		ctx.effect(() => () => __setPiAiLlmBridge(void 0));
+	}
 	__setSubagentSessionFactory((subagentOptions) => createBridgedAgentSession({
 		cordis: ctx,
 		cwd: () => cwdOf(currentAgent(state)),
@@ -1817,4 +2654,4 @@ const runtimeInternals = {
 //#endregion
 export { normalizeToolSchema as n, runtimeInternals as r, applyPiPackage as t };
 
-//# sourceMappingURL=runtime-6DefpI6h.mjs.map
+//# sourceMappingURL=runtime-B9R7bDWT.mjs.map