pi2dsh 0.4.0 → 0.6.0

package/dist/{runtime-B7mEIRf-.mjs → runtime-xNd10ACP.mjs}

@@ -1,13 +1,14 @@
 
-import { C as realBuiltinProvider, R as AssistantMessageEventStream, S as openAIResponsesApi, a as builtinProviders, i as anthropicMessagesApi, r as __setPiAiLlmBridge, x as openAICompletionsApi } from "./pi-ai-B_88Wb0r.mjs";
+import { C as realBuiltinProvider, R as AssistantMessageEventStream, S as openAIResponsesApi, a as builtinProviders, i as anthropicMessagesApi, r as __setPiAiLlmBridge, x as openAICompletionsApi } from "./pi-ai-7HR3ciAs.mjs";
 import { r as normalizePath, t as getAgentDir } from "./pi-config-shim-CZ1wFzqM.mjs";
-import { E as __setSubagentSessionFactory, S as Theme, f as ExtensionRunner } from "./pi-coding-agent-COMX0KHL.mjs";
-import { a as resolvePiProviderAuth, n as loginPiProvider, r as providerSupportsOAuth, t as FileCredentialStore } from "./oauth-bridge-C6fL1qSv.mjs";
+import { E as __setSubagentSessionFactory, S as Theme, f as ExtensionRunner } from "./pi-coding-agent-CznNsOnV.mjs";
+import { a as resolvePiProviderAuth, n as loginPiProvider, r as providerSupportsOAuth, t as FileCredentialStore } from "./oauth-bridge-CfyImWx4.mjs";
 import { createRequire } from "node:module";
-import { access, readFile } from "node:fs/promises";
+import { access, mkdir, readFile, writeFile } from "node:fs/promises";
+import { appendFileSync, existsSync, mkdirSync, readFileSync } from "node:fs";
 import { join } from "node:path";
 import { fileURLToPath } from "node:url";
-import { appendFileSync, existsSync, mkdirSync, readFileSync } from "node:fs";
+import { tmpdir } from "node:os";
 import { EventEmitter } from "node:events";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { createJiti } from "jiti";
@@ -494,6 +495,7 @@ async function createBridgedAgentSession(host, options) {
 			meta: {
 				cwd: typeof options.cwd === "string" ? options.cwd : host.cwd(),
 				origin: "subagent",
+				delegationDepth: host.parentDelegationDepth() + 1,
 				...host.parentSessionId() !== void 0 ? { parentSession: host.parentSessionId() } : {}
 			},
 			...typeof requestedModel?.id === "string" && requestedModel.id.length > 0 ? { agentOptions: {
@@ -1750,8 +1752,17 @@ function modelsJsonPath() {
 const emptySnapshot = () => ({
 	models: [],
 	providers: /* @__PURE__ */ new Map(),
-	errors: []
+	errors: [],
+	companions: /* @__PURE__ */ new Map()
 });
+function companionImageModels(provider) {
+	if (provider.baseUrl !== void 0 || provider.models !== void 0 || provider.apiKey !== void 0) return void 0;
+	const overrides = provider.modelOverrides;
+	if (overrides === void 0) return void 0;
+	const imageModels = /* @__PURE__ */ new Set();
+	for (const [modelId, override] of Object.entries(overrides)) if (Array.isArray(override.input) && override.input.includes("image")) imageModels.add(modelId);
+	return imageModels.size > 0 ? imageModels : void 0;
+}
 /**
 * One load of models.json projected to Pi Model objects. Mirrors Pi's
 * composeModelProvider composition order: base (builtin) models →
@@ -1770,6 +1781,11 @@ async function loadModelsJsonSnapshot(baseProviderOf) {
 	for (const providerId of config.getProviderIds()) {
 		const providerConfig = config.getProvider(providerId);
 		if (providerConfig === void 0) continue;
+		const imageModels = companionImageModels(providerConfig);
+		if (imageModels !== void 0) {
+			snapshot.companions.set(providerId, imageModels);
+			continue;
+		}
 		try {
 			const base = await baseProviderOf?.(providerId);
 			const composed = applyModelsJson(providerId, typeof base?.getModels === "function" ? base.getModels() : [], providerConfig).map((model) => {
@@ -2002,6 +2018,77 @@ function piProviderDshAdapter(providerId, provider, host) {
 		}
 	};
 }
+const IMAGE_OMITTED_TEXT = "[image attachment omitted: the selected model reads text only]";
+const imageNoticeText = (path) => path === void 0 ? IMAGE_OMITTED_TEXT : `[image attached at ${path} — the selected model reads text only; use an image-capable tool to view it]`;
+async function textOnlyBlocks(blocks, materialize) {
+	const out = [];
+	for (const block of blocks) if (block.type === "image") {
+		const attachment = block.attachment;
+		const path = typeof attachment === "object" && attachment !== null ? await materialize(attachment) : void 0;
+		out.push({
+			type: "text",
+			text: imageNoticeText(path)
+		});
+	} else if (block.type === "tool-result" && Array.isArray(block.content)) out.push({
+		...block,
+		content: await textOnlyBlocks(block.content, materialize)
+	});
+	else out.push(block);
+	return out;
+}
+async function textOnlyMessages(messages, materialize) {
+	return Promise.all(messages.map(async (message) => Array.isArray(message.content) ? {
+		...message,
+		content: await textOnlyBlocks(message.content, materialize)
+	} : message));
+}
+/**
+* A DSH route that admits images on behalf of a text-only route — the
+* single-directory answer to models.json modelOverrides declaring
+* `input: ["text", "image"]` for models of a route this bridge does not own.
+* The companion honestly declares image input (so the host's admission and
+* model-switch checks pass), replaces image blocks with an explicit notice,
+* and forwards every call to the original route. It never carries a wire
+* transport of its own; the images themselves are served by whatever vision
+* extension handles the turn's entering messages.
+*/
+function imageAdmissionCompanionAdapter(options) {
+	const { originalId, imageModels, llm } = options;
+	const materialize = options.materializeImage ?? (async () => void 0);
+	const admitImage = (info, id) => {
+		const modalities = Array.isArray(info.inputModalities) ? info.inputModalities.slice() : ["text"];
+		if (!modalities.includes("image")) modalities.push("image");
+		return {
+			...info,
+			provider: id,
+			inputModalities: modalities
+		};
+	};
+	return {
+		providerInfo: (id) => {
+			return {
+				id,
+				name: `${llm.listProviders().find((provider) => provider.id === originalId)?.name ?? originalId} + Vision Bridge`
+			};
+		},
+		providerRetryPolicy: () => void 0,
+		listModels: async (id) => (await llm.listModels(originalId)).filter((model) => imageModels.has(String(model.id))).map((model) => admitImage(model, id)),
+		resolveModel: async (id, modelId) => {
+			const info = await llm.resolveModelInfo(originalId, modelId);
+			return imageModels.has(modelId) ? admitImage(info, id) : {
+				...info,
+				provider: id
+			};
+		},
+		async *stream(streamOptions) {
+			yield* llm.stream({
+				...streamOptions,
+				provider: originalId,
+				...Array.isArray(streamOptions.messages) ? { messages: await textOnlyMessages(streamOptions.messages, materialize) } : {}
+			});
+		}
+	};
+}
 /**
 * Register the provider as a live DSH route when an llm service is mounted.
 * A provider carrying its own transport streams through it; a config-only
@@ -2271,7 +2358,8 @@ function isSubagentOrigin(subject) {
 function currentPiModel(state, agent) {
 	const override = state.modelOverrides.get(agent);
 	const options = agent.options;
-	const provider = String(override?.provider ?? options?.provider ?? "");
+	const selectedProvider = String(override?.provider ?? options?.provider ?? "");
+	const provider = state.companionRoutes.get(selectedProvider) ?? selectedProvider;
 	const id = String(override?.model ?? options?.model ?? "");
 	if (id.length === 0) return override;
 	return (provider.length > 0 ? state.modelCatalog?.find(provider, id) : void 0) ?? {
@@ -2541,7 +2629,7 @@ function contextFor(ctx, state, agent, signal, command = false) {
 				return provider.length > 0 && providerSupportsOAuth(providerConfig(provider));
 			},
 			refresh: async () => {
-				await reloadModelsJson(ctx, state);
+				await reloadModelsJson(ctx, state, true);
 				await catalog?.refresh();
 				return {
 					models: allModels(),
@@ -3079,18 +3167,39 @@ async function collectPiImages(ctx, messages) {
 	return images;
 }
 function oauthStoreOf(state) {
-	state.oauthStore ??= new FileCredentialStore(join(getAgentDir(), "auth.json"));
-	return state.oauthStore;
+	state.shared.oauthStore ??= new FileCredentialStore(join(getAgentDir(), "auth.json"));
+	return state.shared.oauthStore;
 }
 const MODELS_JSON_ROUTE_PREFIX = "models.json/";
-async function reloadModelsJson(ctx, state) {
+const SHARED_HOST_STATE = /* @__PURE__ */ new WeakMap();
+function sharedHostStateOf(ctx) {
+	const key = ctx.root ?? ctx;
+	let shared = SHARED_HOST_STATE.get(key);
+	if (shared === void 0) {
+		shared = {
+			modelsJsonProviders: /* @__PURE__ */ new Map(),
+			companionRoutes: /* @__PURE__ */ new Map(),
+			providerRouteDisposers: /* @__PURE__ */ new Map(),
+			providers: /* @__PURE__ */ new Map()
+		};
+		SHARED_HOST_STATE.set(key, shared);
+	}
+	return shared;
+}
+async function reloadModelsJson(ctx, state, force = false) {
+	if (!force && state.shared.modelsJson !== void 0) {
+		state.modelsJson = state.shared.modelsJson;
+		return;
+	}
 	for (const [key, dispose] of state.providerRouteDisposers) {
 		if (!key.startsWith(MODELS_JSON_ROUTE_PREFIX)) continue;
 		state.providerRouteDisposers.delete(key);
 		dispose();
 	}
 	state.modelsJsonProviders.clear();
+	state.companionRoutes.clear();
 	state.modelsJson = await loadModelsJsonSnapshot(realBuiltinProvider);
+	state.shared.modelsJson = state.modelsJson;
 	for (const problem of state.modelsJson.errors) logger(ctx).warn(`[pi2dsh] models.json: ${problem}`);
 	for (const [providerId, providerConfig] of state.modelsJson.providers) {
 		const models = state.modelsJson.models.filter((model) => model.provider === providerId);
@@ -3118,10 +3227,61 @@ async function reloadModelsJson(ctx, state) {
 			logger(ctx).info(`[pi2dsh] models.json provider ${JSON.stringify(providerId)} registered as a native DSH llm route (${models.length} models)`);
 		}
 	}
+	registerCompanionRoutes(ctx, state);
+}
+function registerCompanionRoutes(ctx, state) {
+	const companions = state.modelsJson?.companions;
+	if (companions === void 0 || companions.size === 0) return;
+	const llm = llmOf(ctx);
+	if (llm === void 0) return;
+	for (const [originalId, imageModels] of companions) {
+		if (!llm.listProviders().some((provider) => provider.id === originalId)) {
+			logger(ctx).warn(`[pi2dsh] models.json: modelOverrides for ${JSON.stringify(originalId)} declare image input, but no such llm route exists; no companion route was registered`);
+			continue;
+		}
+		const companionId = `${originalId}-vision`;
+		state.companionRoutes.set(companionId, originalId);
+		try {
+			const dispose = llm.registerAdapter([companionId], imageAdmissionCompanionAdapter({
+				originalId,
+				imageModels,
+				llm,
+				materializeImage: (attachment) => materializeAttachmentImage(ctx, attachment)
+			}));
+			state.providerRouteDisposers.set(`${MODELS_JSON_ROUTE_PREFIX}${companionId}`, dispose);
+			logger(ctx).info(`[pi2dsh] image-admission companion route ${JSON.stringify(companionId)} registered for ${JSON.stringify(originalId)} (${imageModels.size} models)`);
+		} catch (error) {
+			logger(ctx).warn(`[pi2dsh] companion route ${JSON.stringify(companionId)} already has a live adapter in this host (${error instanceof Error ? error.message : String(error)}); reusing it`);
+		}
+	}
+}
+const IMAGE_EXTENSIONS = {
+	"image/png": "png",
+	"image/jpeg": "jpg",
+	"image/webp": "webp",
+	"image/gif": "gif"
+};
+async function materializeAttachmentImage(ctx, attachment) {
+	const attachments = ctx.get("attachments");
+	const id = typeof attachment.attachmentId === "string" ? attachment.attachmentId : void 0;
+	if (attachments === void 0 || id === void 0) return void 0;
+	const extension = IMAGE_EXTENSIONS[String(attachment.mediaType)] ?? "png";
+	const dir = join(tmpdir(), "pi2dsh-attached-images");
+	const filePath = join(dir, `${id}.${extension}`);
+	try {
+		if (!existsSync(filePath)) {
+			const stored = await attachments.readImage(attachment);
+			await mkdir(dir, { recursive: true });
+			await writeFile(filePath, Buffer.from(stored.data));
+		}
+		return filePath;
+	} catch {
+		return;
+	}
 }
 function ensureLoginCommand(ctx, state) {
-	if (state.loginCommandRegistered === true) return;
-	state.loginCommandRegistered = true;
+	if (state.shared.loginRegistered === true) return;
+	state.shared.loginRegistered = true;
 	try {
 		registerLoginCommand(ctx, state);
 	} catch (error) {
@@ -3689,7 +3849,9 @@ async function applyPiPackage(ctx, options) {
 			origin: "package"
 		}
 	}));
+	const shared = sharedHostStateOf(ctx);
 	const state = {
+		shared,
 		handlers: /* @__PURE__ */ new Map(),
 		tools: runtimeTools,
 		runner: new ExtensionRunner(piToolRecords),
@@ -3697,7 +3859,8 @@ async function applyPiPackage(ctx, options) {
 		toolRestrictions: /* @__PURE__ */ new WeakMap(),
 		commands: /* @__PURE__ */ new Map(),
 		commandDisposers: /* @__PURE__ */ new Map(),
-		modelsJsonProviders: /* @__PURE__ */ new Map(),
+		modelsJsonProviders: shared.modelsJsonProviders,
+		companionRoutes: shared.companionRoutes,
 		flags: /* @__PURE__ */ new Map(),
 		notifications: [],
 		activeAgents: /* @__PURE__ */ new Set(),
@@ -3711,7 +3874,7 @@ async function applyPiPackage(ctx, options) {
 		shortcuts: /* @__PURE__ */ new Map(),
 		messageRenderers: /* @__PURE__ */ new Map(),
 		entryRenderers: /* @__PURE__ */ new Map(),
-		providers: /* @__PURE__ */ new Map(),
+		providers: shared.providers,
 		autocompleteProviders: [],
 		editorBuffers: /* @__PURE__ */ new WeakMap(),
 		toolsExpanded: false,
@@ -3722,7 +3885,7 @@ async function applyPiPackage(ctx, options) {
 		argMutations: /* @__PURE__ */ new WeakMap(),
 		streamingTexts: /* @__PURE__ */ new Map(),
 		lastLoggedModels: /* @__PURE__ */ new WeakMap(),
-		providerRouteDisposers: /* @__PURE__ */ new Map()
+		providerRouteDisposers: shared.providerRouteDisposers
 	};
 	subscribeLifecycle(ctx, state);
 	subscribeInterceptors(ctx, state);
@@ -3745,12 +3908,15 @@ async function applyPiPackage(ctx, options) {
 		}
 	}
 	const llm = llmOf(ctx);
-	state.modelCatalog = new ModelCatalog(llm);
+	state.modelCatalog = shared.modelCatalog ??= new ModelCatalog(llm);
 	await reloadModelsJson(ctx, state);
 	if (llm !== void 0) {
-		ctx.on("llm/adapters-updated", () => {
-			state.modelCatalog?.refresh();
-		});
+		if (shared.catalogSubscribed !== true) {
+			shared.catalogSubscribed = true;
+			ctx.on("llm/adapters-updated", () => {
+				shared.modelCatalog?.refresh();
+			});
+		}
 		await state.modelCatalog.refresh();
 		__setPiAiLlmBridge((model, context, callOptions) => streamViaDshLlm(llm, {
 			model,
@@ -3766,6 +3932,13 @@ async function applyPiPackage(ctx, options) {
 			const session = agentSession(currentAgent(state));
 			return session === void 0 ? void 0 : String(session.id ?? "") || void 0;
 		},
+		parentDelegationDepth: () => {
+			const parent = currentAgent(state);
+			const header = agentSession(parent)?.header;
+			const fromHeader = typeof header?.delegationDepth === "number" ? header.delegationDepth : 0;
+			const fromOptions = typeof parent?.options?.subagentDepth === "number" ? parent.options.subagentDepth : 0;
+			return Math.max(fromHeader, fromOptions);
+		},
 		piContentToDsh: (content) => piToDshContent(ctx, content),
 		deliver: (agent, message, mode) => deliverAgentMessage(agent, message, mode),
 		messageFromSessionEvent,
@@ -3785,4 +3958,4 @@ const runtimeInternals = {
 //#endregion
 export { normalizeToolSchema as n, runtimeInternals as r, applyPiPackage as t };
 
-//# sourceMappingURL=runtime-B7mEIRf-.mjs.map
+//# sourceMappingURL=runtime-xNd10ACP.mjs.map