pi2dsh 0.8.0 → 0.9.0

package/dist/{runtime-B-Mun-jX.mjs → runtime-DMEJknhK.mjs}

@@ -1,5 +1,5 @@
 
-import { P as AssistantMessageEventStream, i as builtinProviders, r as __setPiAiLlmBridge } from "./pi-ai-C6Xag6xt.mjs";
+import { P as AssistantMessageEventStream, i as builtinProviders, r as __setPiAiLlmBridge } from "./pi-ai-BA3h0Dwv.mjs";
 import { t as getAgentDir } from "./pi-config-shim-CZ1wFzqM.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";
@@ -1223,7 +1223,8 @@ async function textOnlyMessages(messages, materialize) {
 * extension handles the turn's entering messages.
 */
 function imageAdmissionCompanionAdapter(options) {
-	const { originalId, imageModels, llm } = options;
+	const { originalId, llm } = options;
+	const admits = (modelId) => options.imageModels === void 0 || options.imageModels.has(modelId);
 	const materialize = options.materializeImage ?? (async () => void 0);
 	const admitImage = (info, id) => {
 		const modalities = Array.isArray(info.inputModalities) ? info.inputModalities.slice() : ["text"];
@@ -1242,10 +1243,10 @@ function imageAdmissionCompanionAdapter(options) {
 			};
 		},
 		providerRetryPolicy: () => void 0,
-		listModels: async (id) => (await llm.listModels(originalId)).filter((model) => imageModels.has(String(model.id))).map((model) => admitImage(model, id)),
+		listModels: async (id) => (await llm.listModels(originalId)).filter((model) => admits(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) : {
+			return admits(modelId) ? admitImage(info, id) : {
 				...info,
 				provider: id
 			};
@@ -2327,45 +2328,102 @@ function sharedHostStateOf(ctx) {
 	return shared;
 }
 /**
-* Image-admission companion routes, configured on the DSH side (the
-* engine's or a bundle's cordis config): `{ <existingRoute>: [modelIds] }`
-* registers a `<route>-vision` route that admits images at the host's
+* Image-admission companion routes: for every text-only route in the DSH
+* llm directory, a `<route>-vision` route that admits images at the host's
 * admission checks, replaces image blocks with explicit path-carrying
-* notices, and forwards text-only to the original route. The companion is
-* an ordinary directory entry (single-directory contract); Pi's ctx.model
-* reports the original route for it (companionRoutes). Idempotent per
-* host: repeated calls (several packages, engine + bundle) keep one live
-* adapter and one mapping.
+* notices, and forwards text-only to the original route. What happens to
+* an admitted image is decided at run time by whatever is mounted — a
+* vision extension analyzes it through the turn's entering messages, and
+* without one the notice's file path lets any image-capable tool read it —
+* so companions need no knowledge of any particular plugin and are
+* registered AUTOMATICALLY (zero configuration). `visionCompanions: false`
+* turns them off; an explicit `{ <route>: [modelIds] }` map narrows them.
+* The directory is live: adapters-updated re-sweeps, adding companions for
+* new text-only routes and disposing companions whose original vanished.
+* The companion is an ordinary directory entry (single-directory
+* contract); Pi's ctx.model reports the original route for it
+* (companionRoutes). Idempotent per host.
 */
-function registerVisionCompanions(ctx, companions) {
-	if (companions === void 0) return;
+function registerVisionCompanions(ctx, config) {
+	if (config === false) return;
 	const shared = sharedHostStateOf(ctx);
 	const llm = llmOf(ctx);
-	if (llm === void 0) {
-		logger(ctx).warn("[pi2dsh] visionCompanions configured, but this composition mounts no llm service; no companion route was registered");
-		return;
-	}
-	for (const [originalId, modelIds] of Object.entries(companions)) {
-		if (!Array.isArray(modelIds) || modelIds.length === 0) continue;
-		const companionId = `${originalId}-vision`;
-		shared.companionRoutes.set(companionId, originalId);
-		if (!llm.listProviders().some((provider) => provider.id === originalId)) {
-			logger(ctx).warn(`[pi2dsh] visionCompanions names route ${JSON.stringify(originalId)}, but no such llm route exists; no companion route was registered`);
-			continue;
-		}
-		if (shared.providerRouteDisposers.has(`${COMPANION_ROUTE_PREFIX}${companionId}`)) continue;
-		try {
-			const dispose = llm.registerAdapter([companionId], imageAdmissionCompanionAdapter({
+	if (llm === void 0) return;
+	const sweep = async () => {
+		const explicit = config;
+		const providers = llm.listProviders();
+		const wanted = /* @__PURE__ */ new Map();
+		if (explicit !== void 0) for (const [originalId, modelIds] of Object.entries(explicit)) {
+			if (!Array.isArray(modelIds) || modelIds.length === 0) continue;
+			if (!providers.some((provider) => provider.id === originalId)) {
+				logger(ctx).warn(`[pi2dsh] visionCompanions names route ${JSON.stringify(originalId)}, but no such llm route exists; no companion route was registered`);
+				continue;
+			}
+			wanted.set(`${originalId}-vision`, {
 				originalId,
-				imageModels: new Set(modelIds.map(String)),
-				llm,
-				materializeImage: (attachment) => materializeAttachmentImage(ctx, attachment)
-			}));
-			shared.providerRouteDisposers.set(`${COMPANION_ROUTE_PREFIX}${companionId}`, dispose);
-			logger(ctx).info(`[pi2dsh] image-admission companion route ${JSON.stringify(companionId)} registered for ${JSON.stringify(originalId)} (${modelIds.length} 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`);
+				imageModels: new Set(modelIds.map(String))
+			});
+		}
+		else for (const provider of providers) {
+			if (shared.companionRoutes.has(provider.id)) continue;
+			try {
+				const models = await llm.listModels(provider.id);
+				if (models.length === 0) continue;
+				if (models.every((model) => !(Array.isArray(model.inputModalities) && model.inputModalities.includes("image")))) wanted.set(`${provider.id}-vision`, {
+					originalId: provider.id,
+					imageModels: void 0
+				});
+			} catch {}
 		}
+		for (const [key, dispose] of shared.providerRouteDisposers) {
+			if (!key.startsWith(COMPANION_ROUTE_PREFIX)) continue;
+			const companionId = key.slice(17);
+			const originalId = shared.companionRoutes.get(companionId);
+			if (originalId !== void 0 && !providers.some((provider) => provider.id === originalId)) {
+				shared.providerRouteDisposers.delete(key);
+				dispose();
+				logger(ctx).info(`[pi2dsh] companion route ${JSON.stringify(companionId)} disposed (its original route ${JSON.stringify(originalId)} left the directory)`);
+			}
+		}
+		for (const [companionId, spec] of wanted) {
+			shared.companionRoutes.set(companionId, spec.originalId);
+			if (shared.providerRouteDisposers.has(`${COMPANION_ROUTE_PREFIX}${companionId}`)) continue;
+			try {
+				const dispose = llm.registerAdapter([companionId], imageAdmissionCompanionAdapter({
+					originalId: spec.originalId,
+					...spec.imageModels === void 0 ? {} : { imageModels: spec.imageModels },
+					llm,
+					materializeImage: (attachment) => materializeAttachmentImage(ctx, attachment)
+				}));
+				shared.providerRouteDisposers.set(`${COMPANION_ROUTE_PREFIX}${companionId}`, dispose);
+				logger(ctx).info(`[pi2dsh] image-admission companion route ${JSON.stringify(companionId)} registered for ${JSON.stringify(spec.originalId)}`);
+			} 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`);
+			}
+		}
+	};
+	let sweeping = false;
+	let queued = false;
+	const runSweep = () => {
+		if (sweeping) {
+			queued = true;
+			return;
+		}
+		sweeping = true;
+		sweep().finally(() => {
+			sweeping = false;
+			if (queued) {
+				queued = false;
+				runSweep();
+			}
+		});
+	};
+	runSweep();
+	if (shared.companionSweepSubscribed !== true) {
+		shared.companionSweepSubscribed = true;
+		ctx.on("llm/adapters-updated", () => {
+			runSweep();
+		});
 	}
 }
 const IMAGE_EXTENSIONS = {
@@ -3070,4 +3128,4 @@ const runtimeInternals = {
 //#endregion
 export { runtimeInternals as i, normalizeToolSchema as n, registerVisionCompanions as r, applyPiPackage as t };
 
-//# sourceMappingURL=runtime-B-Mun-jX.mjs.map
+//# sourceMappingURL=runtime-DMEJknhK.mjs.map