pi2dsh 0.7.0 → 0.8.0

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

@@ -1,6 +1,6 @@
 
-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-B4hucafU.mjs";
-import { r as normalizePath, t as getAgentDir } from "./pi-config-shim-CZ1wFzqM.mjs";
+import { P as AssistantMessageEventStream, i as builtinProviders, r as __setPiAiLlmBridge } from "./pi-ai-C6Xag6xt.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";
 import { createRequire } from "node:module";
@@ -15,9 +15,6 @@ import { createJiti } from "jiti";
 import { createUserMessage } from "@deepseek-ai/dsh-llm";
 import { renderPrompt } from "@deepseek-ai/dsh-system-prompt";
 import { randomUUID } from "node:crypto";
-import { execSync, spawnSync } from "child_process";
-import { Type } from "typebox";
-import { Compile } from "typebox/compile";
 //#region src/session-bridge.ts
 function sidecarDir() {
 	return join(getAgentDir(), "session-entries");
@@ -1114,834 +1111,7 @@ async function* piEventsToDshChunks(events) {
 	};
 }
 //#endregion
-//#region src/compat/vendor/pi-json.ts
-/** Strip `//` line comments and trailing commas from JSON, leaving string literals untouched. */
-function stripJsonComments(input) {
-	return input.replace(/"(?:\\.|[^"\\])*"|\/\/[^\n]*/g, (m) => m[0] === "\"" ? m : "").replace(/"(?:\\.|[^"\\])*"|,(\s*[}\]])/g, (m, tail) => tail ?? (m[0] === "\"" ? m : ""));
-}
-//#endregion
-//#region src/compat/vendor/pi-model-config.ts
-/** Immutable, credential-blind models.json snapshot. */
-const PercentileCutoffsSchema = Type.Object({
-	p50: Type.Optional(Type.Number()),
-	p75: Type.Optional(Type.Number()),
-	p90: Type.Optional(Type.Number()),
-	p99: Type.Optional(Type.Number())
-});
-const OpenRouterRoutingSchema = Type.Object({
-	allow_fallbacks: Type.Optional(Type.Boolean()),
-	require_parameters: Type.Optional(Type.Boolean()),
-	data_collection: Type.Optional(Type.Union([Type.Literal("deny"), Type.Literal("allow")])),
-	zdr: Type.Optional(Type.Boolean()),
-	enforce_distillable_text: Type.Optional(Type.Boolean()),
-	order: Type.Optional(Type.Array(Type.String())),
-	only: Type.Optional(Type.Array(Type.String())),
-	ignore: Type.Optional(Type.Array(Type.String())),
-	quantizations: Type.Optional(Type.Array(Type.String())),
-	sort: Type.Optional(Type.Union([Type.String(), Type.Object({
-		by: Type.Optional(Type.String()),
-		partition: Type.Optional(Type.Union([Type.String(), Type.Null()]))
-	})])),
-	max_price: Type.Optional(Type.Object({
-		prompt: Type.Optional(Type.Union([Type.Number(), Type.String()])),
-		completion: Type.Optional(Type.Union([Type.Number(), Type.String()])),
-		image: Type.Optional(Type.Union([Type.Number(), Type.String()])),
-		audio: Type.Optional(Type.Union([Type.Number(), Type.String()])),
-		request: Type.Optional(Type.Union([Type.Number(), Type.String()]))
-	})),
-	preferred_min_throughput: Type.Optional(Type.Union([Type.Number(), PercentileCutoffsSchema])),
-	preferred_max_latency: Type.Optional(Type.Union([Type.Number(), PercentileCutoffsSchema]))
-});
-const VercelGatewayRoutingSchema = Type.Object({
-	only: Type.Optional(Type.Array(Type.String())),
-	order: Type.Optional(Type.Array(Type.String()))
-});
-const ThinkingLevelMapValueSchema = Type.Union([Type.String(), Type.Null()]);
-const ThinkingLevelMapSchema = Type.Object({
-	off: Type.Optional(ThinkingLevelMapValueSchema),
-	minimal: Type.Optional(ThinkingLevelMapValueSchema),
-	low: Type.Optional(ThinkingLevelMapValueSchema),
-	medium: Type.Optional(ThinkingLevelMapValueSchema),
-	high: Type.Optional(ThinkingLevelMapValueSchema),
-	xhigh: Type.Optional(ThinkingLevelMapValueSchema),
-	max: Type.Optional(ThinkingLevelMapValueSchema)
-});
-const ChatTemplateKwargScalarSchema = Type.Union([
-	Type.String(),
-	Type.Number(),
-	Type.Boolean(),
-	Type.Null()
-]);
-const ChatTemplateKwargVariableSchema = Type.Object({
-	$var: Type.Union([Type.Literal("thinking.enabled"), Type.Literal("thinking.effort")]),
-	omitWhenOff: Type.Optional(Type.Boolean())
-});
-const ChatTemplateKwargSchema = Type.Union([ChatTemplateKwargScalarSchema, ChatTemplateKwargVariableSchema]);
-const OpenAICompletionsCompatSchema = Type.Object({
-	supportsStore: Type.Optional(Type.Boolean()),
-	supportsDeveloperRole: Type.Optional(Type.Boolean()),
-	supportsReasoningEffort: Type.Optional(Type.Boolean()),
-	supportsUsageInStreaming: Type.Optional(Type.Boolean()),
-	maxTokensField: Type.Optional(Type.Union([Type.Literal("max_completion_tokens"), Type.Literal("max_tokens")])),
-	requiresToolResultName: Type.Optional(Type.Boolean()),
-	requiresAssistantAfterToolResult: Type.Optional(Type.Boolean()),
-	requiresThinkingAsText: Type.Optional(Type.Boolean()),
-	requiresReasoningContentOnAssistantMessages: Type.Optional(Type.Boolean()),
-	thinkingFormat: Type.Optional(Type.Union([
-		Type.Literal("openai"),
-		Type.Literal("openrouter"),
-		Type.Literal("together"),
-		Type.Literal("baseten"),
-		Type.Literal("deepseek"),
-		Type.Literal("zai"),
-		Type.Literal("qwen"),
-		Type.Literal("chat-template"),
-		Type.Literal("qwen-chat-template"),
-		Type.Literal("string-thinking"),
-		Type.Literal("ant-ling")
-	])),
-	chatTemplateKwargs: Type.Optional(Type.Record(Type.String(), ChatTemplateKwargSchema)),
-	chatTemplateArgs: Type.Optional(Type.Record(Type.String(), ChatTemplateKwargSchema)),
-	cacheControlFormat: Type.Optional(Type.Literal("anthropic")),
-	openRouterRouting: Type.Optional(OpenRouterRoutingSchema),
-	vercelGatewayRouting: Type.Optional(VercelGatewayRoutingSchema),
-	supportsOpenAIGrammarTools: Type.Optional(Type.Boolean()),
-	supportsStrictMode: Type.Optional(Type.Boolean()),
-	sendSessionAffinityHeaders: Type.Optional(Type.Boolean()),
-	deferredToolsMode: Type.Optional(Type.Literal("kimi")),
-	sessionAffinityFormat: Type.Optional(Type.Union([
-		Type.Literal("openai"),
-		Type.Literal("openai-nosession"),
-		Type.Literal("openrouter")
-	])),
-	supportsLongCacheRetention: Type.Optional(Type.Boolean())
-});
-const OpenAIResponsesCompatSchema = Type.Object({
-	supportsDeveloperRole: Type.Optional(Type.Boolean()),
-	sessionAffinityFormat: Type.Optional(Type.Union([
-		Type.Literal("openai"),
-		Type.Literal("openai-nosession"),
-		Type.Literal("openrouter")
-	])),
-	supportsLongCacheRetention: Type.Optional(Type.Boolean()),
-	supportsStrictMode: Type.Optional(Type.Boolean()),
-	supportsOpenAIGrammarTools: Type.Optional(Type.Boolean()),
-	supportsAdditionalTools: Type.Optional(Type.Boolean()),
-	supportsToolSearch: Type.Optional(Type.Boolean())
-});
-const AnthropicMessagesCompatSchema = Type.Object({
-	supportsEagerToolInputStreaming: Type.Optional(Type.Boolean()),
-	supportsLongCacheRetention: Type.Optional(Type.Boolean()),
-	sendSessionAffinityHeaders: Type.Optional(Type.Boolean()),
-	supportsCacheControlOnTools: Type.Optional(Type.Boolean()),
-	supportsTemperature: Type.Optional(Type.Boolean()),
-	forceAdaptiveThinking: Type.Optional(Type.Boolean()),
-	allowEmptySignature: Type.Optional(Type.Boolean()),
-	supportsStrictTools: Type.Optional(Type.Boolean()),
-	supportsToolReferences: Type.Optional(Type.Boolean())
-});
-const ProviderCompatSchema = Type.Union([
-	OpenAICompletionsCompatSchema,
-	OpenAIResponsesCompatSchema,
-	AnthropicMessagesCompatSchema
-]);
-const ModelCostRatesSchema = {
-	input: Type.Number(),
-	output: Type.Number(),
-	cacheRead: Type.Number(),
-	cacheWrite: Type.Number()
-};
-const ModelCostTierSchema = Type.Object({
-	inputTokensAbove: Type.Number(),
-	...ModelCostRatesSchema
-});
-const ModelCostSchema = Type.Object({
-	...ModelCostRatesSchema,
-	tiers: Type.Optional(Type.Array(ModelCostTierSchema))
-});
-const ModelDefinitionSchema = Type.Object({
-	id: Type.String({ minLength: 1 }),
-	name: Type.Optional(Type.String({ minLength: 1 })),
-	api: Type.Optional(Type.String({ minLength: 1 })),
-	baseUrl: Type.Optional(Type.String({ minLength: 1 })),
-	reasoning: Type.Optional(Type.Boolean()),
-	thinkingLevelMap: Type.Optional(ThinkingLevelMapSchema),
-	input: Type.Optional(Type.Array(Type.Union([Type.Literal("text"), Type.Literal("image")]))),
-	cost: Type.Optional(ModelCostSchema),
-	contextWindow: Type.Optional(Type.Number()),
-	maxTokens: Type.Optional(Type.Number()),
-	samplingParams: Type.Optional(Type.Record(Type.String(), Type.Unknown())),
-	headers: Type.Optional(Type.Record(Type.String(), Type.String())),
-	compat: Type.Optional(ProviderCompatSchema)
-});
-const ModelOverrideSchema = Type.Object({
-	name: Type.Optional(Type.String({ minLength: 1 })),
-	reasoning: Type.Optional(Type.Boolean()),
-	thinkingLevelMap: Type.Optional(ThinkingLevelMapSchema),
-	input: Type.Optional(Type.Array(Type.Union([Type.Literal("text"), Type.Literal("image")]))),
-	cost: Type.Optional(Type.Object({
-		input: Type.Optional(Type.Number()),
-		output: Type.Optional(Type.Number()),
-		cacheRead: Type.Optional(Type.Number()),
-		cacheWrite: Type.Optional(Type.Number()),
-		tiers: Type.Optional(Type.Array(ModelCostTierSchema))
-	})),
-	contextWindow: Type.Optional(Type.Number()),
-	maxTokens: Type.Optional(Type.Number()),
-	samplingParams: Type.Optional(Type.Record(Type.String(), Type.Unknown())),
-	headers: Type.Optional(Type.Record(Type.String(), Type.String())),
-	compat: Type.Optional(ProviderCompatSchema)
-});
-const ProviderConfigSchema = Type.Object({
-	name: Type.Optional(Type.String({ minLength: 1 })),
-	baseUrl: Type.Optional(Type.String({ minLength: 1 })),
-	apiKey: Type.Optional(Type.String({ minLength: 1 })),
-	api: Type.Optional(Type.String({ minLength: 1 })),
-	oauth: Type.Optional(Type.Literal("radius")),
-	headers: Type.Optional(Type.Record(Type.String(), Type.String())),
-	compat: Type.Optional(ProviderCompatSchema),
-	authHeader: Type.Optional(Type.Boolean()),
-	models: Type.Optional(Type.Array(ModelDefinitionSchema)),
-	modelOverrides: Type.Optional(Type.Record(Type.String(), ModelOverrideSchema))
-});
-const ModelsConfigSchema = Type.Object({ providers: Type.Record(Type.String(), ProviderConfigSchema) });
-const validateModelsConfig = Compile(ModelsConfigSchema);
-function formatValidationPath(error) {
-	if (error.keyword === "required") {
-		const requiredProperty = error.params.requiredProperties?.[0];
-		if (requiredProperty) {
-			const basePath = error.instancePath.replace(/^\//, "").replace(/\//g, ".");
-			return basePath ? `${basePath}.${requiredProperty}` : requiredProperty;
-		}
-	}
-	return error.instancePath.replace(/^\//, "").replace(/\//g, ".") || "root";
-}
-function deepFreeze(value) {
-	if (typeof value !== "object" || value === null || Object.isFrozen(value)) return value;
-	for (const child of Object.values(value)) deepFreeze(child);
-	return Object.freeze(value);
-}
-/** One immutable load of models.json. */
-var ModelConfig = class ModelConfig {
-	providers;
-	error;
-	constructor(providers, error) {
-		this.providers = providers;
-		this.error = error;
-	}
-	static async load(modelsJsonPath) {
-		if (!modelsJsonPath) return new ModelConfig(/* @__PURE__ */ new Map());
-		const path = normalizePath(modelsJsonPath);
-		let content;
-		try {
-			content = await readFile(path, "utf-8");
-		} catch (error) {
-			if (error.code === "ENOENT") return new ModelConfig(/* @__PURE__ */ new Map());
-			return new ModelConfig(/* @__PURE__ */ new Map(), `Failed to load models.json: ${error instanceof Error ? error.message : error}\n\nFile: ${path}`);
-		}
-		let parsed;
-		try {
-			parsed = JSON.parse(stripJsonComments(content));
-		} catch (error) {
-			return new ModelConfig(/* @__PURE__ */ new Map(), `Failed to parse models.json: ${error instanceof Error ? error.message : error}\n\nFile: ${path}`);
-		}
-		if (!validateModelsConfig.Check(parsed)) {
-			const errors = validateModelsConfig.Errors(parsed).map((error) => `  - ${formatValidationPath(error)}: ${error.message}`).join("\n") || "Unknown schema error";
-			return new ModelConfig(/* @__PURE__ */ new Map(), `Invalid models.json schema:\n${errors}\n\nFile: ${path}`);
-		}
-		const config = parsed;
-		const providers = /* @__PURE__ */ new Map();
-		for (const [providerId, provider] of Object.entries(config.providers)) providers.set(providerId, deepFreeze(structuredClone(provider)));
-		return new ModelConfig(providers);
-	}
-	getProvider(providerId) {
-		return this.providers.get(providerId);
-	}
-	getProviderIds() {
-		return [...this.providers.keys()];
-	}
-	getError() {
-		return this.error;
-	}
-};
-//#endregion
-//#region src/compat/vendor/pi-models-compose.ts
-function mergeCompat(base, override) {
-	if (!override) return base;
-	const merged = {
-		...base,
-		...override
-	};
-	const baseNested = base;
-	const overrideNested = override;
-	const mergedNested = merged;
-	for (const key of [
-		"openRouterRouting",
-		"vercelGatewayRouting",
-		"chatTemplateKwargs",
-		"chatTemplateArgs"
-	]) {
-		const baseValue = baseNested?.[key];
-		const overrideValue = overrideNested[key];
-		if (typeof baseValue === "object" && baseValue !== null || typeof overrideValue === "object" && overrideValue !== null) mergedNested[key] = {
-			...baseValue,
-			...overrideValue
-		};
-	}
-	return merged;
-}
-function applyModelOverride(model, override) {
-	return {
-		...model,
-		name: override.name ?? model.name,
-		reasoning: override.reasoning ?? model.reasoning,
-		thinkingLevelMap: override.thinkingLevelMap ? {
-			...model.thinkingLevelMap,
-			...override.thinkingLevelMap
-		} : model.thinkingLevelMap,
-		input: override.input ?? model.input,
-		cost: override.cost ? {
-			input: override.cost.input ?? model.cost.input,
-			output: override.cost.output ?? model.cost.output,
-			cacheRead: override.cost.cacheRead ?? model.cost.cacheRead,
-			cacheWrite: override.cost.cacheWrite ?? model.cost.cacheWrite,
-			tiers: override.cost.tiers ?? model.cost.tiers
-		} : model.cost,
-		contextWindow: override.contextWindow ?? model.contextWindow,
-		maxTokens: override.maxTokens ?? model.maxTokens,
-		samplingParams: override.samplingParams ? {
-			...model.samplingParams,
-			...override.samplingParams
-		} : model.samplingParams,
-		compat: mergeCompat(model.compat, override.compat)
-	};
-}
-function modelFromJson(providerId, definition, providerConfig, defaults) {
-	const api = definition.api ?? providerConfig.api ?? defaults?.api;
-	if (!api) throw new Error(`Provider ${providerId}, model ${definition.id}: no "api" specified. Set at provider or model level.`);
-	const baseUrl = definition.baseUrl ?? providerConfig.baseUrl ?? defaults?.baseUrl;
-	if (!baseUrl) throw new Error(`Provider ${providerId}: "baseUrl" is required when defining custom models.`);
-	if (definition.contextWindow !== void 0 && definition.contextWindow <= 0) throw new Error(`Provider ${providerId}, model ${definition.id}: invalid contextWindow`);
-	if (definition.maxTokens !== void 0 && definition.maxTokens <= 0) throw new Error(`Provider ${providerId}, model ${definition.id}: invalid maxTokens`);
-	return {
-		id: definition.id,
-		name: definition.name ?? definition.id,
-		api,
-		provider: providerId,
-		baseUrl,
-		reasoning: definition.reasoning ?? false,
-		thinkingLevelMap: definition.thinkingLevelMap,
-		input: definition.input ?? ["text"],
-		cost: definition.cost ?? {
-			input: 0,
-			output: 0,
-			cacheRead: 0,
-			cacheWrite: 0
-		},
-		contextWindow: definition.contextWindow ?? 128e3,
-		maxTokens: definition.maxTokens ?? 16384,
-		samplingParams: definition.samplingParams,
-		headers: void 0,
-		compat: mergeCompat(providerConfig.compat, definition.compat)
-	};
-}
-function applyModelsJson(providerId, baseModels, config) {
-	if (!config) return [...baseModels];
-	if (config.oauth && !config.baseUrl) throw new Error(`Provider ${providerId}: "baseUrl" is required when "oauth" is set.`);
-	const hasOverrides = config.modelOverrides && Object.keys(config.modelOverrides).length > 0;
-	if (!config.models?.length && !config.baseUrl && !config.headers && !config.compat && !hasOverrides && !config.apiKey && !config.oauth && config.authHeader === void 0) throw new Error(`Provider ${providerId}: must specify "baseUrl", "headers", "compat", "modelOverrides", or "models".`);
-	const models = baseModels.map((model) => ({
-		...model,
-		baseUrl: config.oauth === "radius" ? model.baseUrl : config.baseUrl ?? model.baseUrl,
-		compat: mergeCompat(model.compat, config.compat)
-	}));
-	for (const definition of config.models ?? []) {
-		const existingIndex = models.findIndex((model) => model.id === definition.id);
-		const model = modelFromJson(providerId, definition, config, existingIndex >= 0 ? models[existingIndex] : models[0]);
-		if (existingIndex >= 0) models[existingIndex] = model;
-		else models.push(model);
-	}
-	return models;
-}
-//#endregion
-//#region src/compat/vendor/pi-shell-config.ts
-function isLegacyWslBashPath(path) {
-	const normalized = path.replace(/\//g, "\\").toLowerCase();
-	return /^[a-z]:\\windows\\(?:system32|sysnative)\\bash\.exe$/.test(normalized);
-}
-function getBashShellConfig(shell) {
-	return isLegacyWslBashPath(shell) ? {
-		shell,
-		args: ["-s"],
-		commandTransport: "stdin"
-	} : {
-		shell,
-		args: ["-c"]
-	};
-}
-function findBashOnPath() {
-	if (process.platform === "win32") {
-		try {
-			const result = spawnSync("where", ["bash.exe"], {
-				encoding: "utf-8",
-				timeout: 5e3,
-				windowsHide: true
-			});
-			if (result.status === 0 && result.stdout) {
-				const firstMatch = result.stdout.trim().split(/\r?\n/)[0];
-				if (firstMatch && existsSync(firstMatch)) return firstMatch;
-			}
-		} catch {}
-		return null;
-	}
-	try {
-		const result = spawnSync("which", ["bash"], {
-			encoding: "utf-8",
-			timeout: 5e3
-		});
-		if (result.status === 0 && result.stdout) {
-			const firstMatch = result.stdout.trim().split(/\r?\n/)[0];
-			if (firstMatch) return firstMatch;
-		}
-	} catch {}
-	return null;
-}
-/**
-* Resolve shell configuration based on platform and an optional explicit shell path.
-* Resolution order:
-* 1. User-specified shellPath
-* 2. On Windows: Git Bash in known locations, then bash on PATH
-* 3. On Unix: /bin/bash, then bash on PATH, then fallback to sh
-*/
-function getShellConfig(customShellPath) {
-	if (customShellPath) {
-		if (existsSync(customShellPath)) return getBashShellConfig(customShellPath);
-		throw new Error(`Custom shell path not found: ${customShellPath}`);
-	}
-	if (process.platform === "win32") {
-		const paths = [];
-		const programFiles = process.env.ProgramFiles;
-		if (programFiles) paths.push(`${programFiles}\\Git\\bin\\bash.exe`);
-		const programFilesX86 = process.env["ProgramFiles(x86)"];
-		if (programFilesX86) paths.push(`${programFilesX86}\\Git\\bin\\bash.exe`);
-		for (const path of paths) if (existsSync(path)) return getBashShellConfig(path);
-		const bashOnPath = findBashOnPath();
-		if (bashOnPath) return getBashShellConfig(bashOnPath);
-		throw new Error(`No bash shell found. Options:
-  1. Install Git for Windows: https://git-scm.com/download/win
-  2. Add your bash to PATH (Cygwin, MSYS2, etc.)
-  3. Set shellPath in settings.json
-
-Searched Git Bash in:\n${paths.map((p) => `  ${p}`).join("\n")}`);
-	}
-	if (existsSync("/bin/bash")) return getBashShellConfig("/bin/bash");
-	const bashOnPath = findBashOnPath();
-	if (bashOnPath) return getBashShellConfig(bashOnPath);
-	return {
-		shell: "sh",
-		args: ["-c"]
-	};
-}
-//#endregion
-//#region src/compat/vendor/pi-resolve-config-value.ts
-/**
-* Resolve configuration values that may be shell commands, environment variables, or literals.
-* Used by auth-storage.ts and model-registry.ts.
-*/
-const ENV_VAR_NAME_RE = /^[A-Za-z_][A-Za-z0-9_]*$/;
-const ENV_VAR_NAME_PREFIX_RE = /^[A-Za-z_][A-Za-z0-9_]*/;
-function appendLiteral(parts, value) {
-	if (!value) return;
-	const previousPart = parts[parts.length - 1];
-	if (previousPart?.type === "literal") {
-		previousPart.value += value;
-		return;
-	}
-	parts.push({
-		type: "literal",
-		value
-	});
-}
-function parseConfigValueTemplate(config) {
-	const parts = [];
-	let index = 0;
-	while (index < config.length) {
-		const dollarIndex = config.indexOf("$", index);
-		if (dollarIndex < 0) {
-			appendLiteral(parts, config.slice(index));
-			break;
-		}
-		appendLiteral(parts, config.slice(index, dollarIndex));
-		const nextChar = config[dollarIndex + 1];
-		if (nextChar === "$" || nextChar === "!") {
-			appendLiteral(parts, nextChar);
-			index = dollarIndex + 2;
-			continue;
-		}
-		if (nextChar === "{") {
-			const endIndex = config.indexOf("}", dollarIndex + 2);
-			if (endIndex < 0) {
-				appendLiteral(parts, "$");
-				index = dollarIndex + 1;
-				continue;
-			}
-			const name = config.slice(dollarIndex + 2, endIndex);
-			if (ENV_VAR_NAME_RE.test(name)) parts.push({
-				type: "env",
-				name
-			});
-			else appendLiteral(parts, config.slice(dollarIndex, endIndex + 1));
-			index = endIndex + 1;
-			continue;
-		}
-		const match = config.slice(dollarIndex + 1).match(ENV_VAR_NAME_PREFIX_RE);
-		if (match) {
-			parts.push({
-				type: "env",
-				name: match[0]
-			});
-			index = dollarIndex + 1 + match[0].length;
-			continue;
-		}
-		appendLiteral(parts, "$");
-		index = dollarIndex + 1;
-	}
-	return parts;
-}
-function parseConfigValueReference(config) {
-	if (config.startsWith("!")) return {
-		type: "command",
-		config
-	};
-	return {
-		type: "template",
-		parts: parseConfigValueTemplate(config)
-	};
-}
-function resolveEnvConfigValue(name, env) {
-	return env?.[name] || process.env[name] || void 0;
-}
-function getTemplateEnvVarNames(parts) {
-	const names = [];
-	for (const part of parts) {
-		if (part.type !== "env" || names.includes(part.name)) continue;
-		names.push(part.name);
-	}
-	return names;
-}
-function resolveTemplate(parts, env) {
-	let resolved = "";
-	for (const part of parts) {
-		if (part.type === "literal") {
-			resolved += part.value;
-			continue;
-		}
-		const envValue = resolveEnvConfigValue(part.name, env);
-		if (envValue === void 0) return void 0;
-		resolved += envValue;
-	}
-	return resolved;
-}
-function getConfigValueEnvVarNames(config) {
-	const reference = parseConfigValueReference(config);
-	return reference.type === "template" ? getTemplateEnvVarNames(reference.parts) : [];
-}
-function getMissingConfigValueEnvVarNames(config, env) {
-	return getConfigValueEnvVarNames(config).filter((name) => resolveEnvConfigValue(name, env) === void 0);
-}
-function isCommandConfigValue(config) {
-	return parseConfigValueReference(config).type === "command";
-}
-function isConfigValueConfigured(config, env) {
-	return getMissingConfigValueEnvVarNames(config, env).length === 0;
-}
-function executeWithConfiguredShell(command) {
-	try {
-		const { shell, args, commandTransport } = getShellConfig();
-		const commandFromStdin = commandTransport === "stdin";
-		const result = spawnSync(shell, commandFromStdin ? args : [...args, command], {
-			encoding: "utf-8",
-			input: commandFromStdin ? command : void 0,
-			timeout: 1e4,
-			stdio: [
-				commandFromStdin ? "pipe" : "ignore",
-				"pipe",
-				"ignore"
-			],
-			shell: false,
-			windowsHide: true
-		});
-		if (result.error) {
-			if (result.error.code === "ENOENT") return {
-				executed: false,
-				value: void 0
-			};
-			return {
-				executed: true,
-				value: void 0
-			};
-		}
-		if (result.status !== 0) return {
-			executed: true,
-			value: void 0
-		};
-		return {
-			executed: true,
-			value: (result.stdout ?? "").trim() || void 0
-		};
-	} catch {
-		return {
-			executed: false,
-			value: void 0
-		};
-	}
-}
-function executeWithDefaultShell(command) {
-	try {
-		return execSync(command, {
-			encoding: "utf-8",
-			timeout: 1e4,
-			stdio: [
-				"ignore",
-				"pipe",
-				"ignore"
-			]
-		}).trim() || void 0;
-	} catch {
-		return;
-	}
-}
-function executeCommandUncached(commandConfig) {
-	const command = commandConfig.slice(1);
-	return process.platform === "win32" ? (() => {
-		const configuredResult = executeWithConfiguredShell(command);
-		return configuredResult.executed ? configuredResult.value : executeWithDefaultShell(command);
-	})() : executeWithDefaultShell(command);
-}
-/**
-* Resolve all header values using the same resolution logic as API keys.
-*/
-function resolveConfigValueUncached(config, env) {
-	const reference = parseConfigValueReference(config);
-	if (reference.type === "command") return executeCommandUncached(reference.config);
-	return resolveTemplate(reference.parts, env);
-}
-function resolveConfigValueOrThrow(config, description, env) {
-	const resolvedValue = resolveConfigValueUncached(config, env);
-	if (resolvedValue !== void 0) return resolvedValue;
-	const reference = parseConfigValueReference(config);
-	if (reference.type === "command") throw new Error(`Failed to resolve ${description} from shell command: ${reference.config.slice(1)}`);
-	if (reference.type === "template") {
-		const missingEnvVars = getMissingConfigValueEnvVarNames(config, env);
-		if (missingEnvVars.length === 1) throw new Error(`Failed to resolve ${description} from environment variable: ${missingEnvVars[0]}`);
-		if (missingEnvVars.length > 1) throw new Error(`Failed to resolve ${description} from environment variables: ${missingEnvVars.join(", ")}`);
-	}
-	throw new Error(`Failed to resolve ${description}`);
-}
-function resolveHeadersOrThrow(headers, description, env) {
-	if (!headers) return void 0;
-	const resolved = {};
-	for (const [key, value] of Object.entries(headers)) resolved[key] = resolveConfigValueOrThrow(value, `${description} header "${key}"`, env);
-	return Object.keys(resolved).length > 0 ? resolved : void 0;
-}
-//#endregion
-//#region src/models-json.ts
-function modelsJsonPath() {
-	return join(getAgentDir(), "models.json");
-}
-const emptySnapshot = () => ({
-	models: [],
-	providers: /* @__PURE__ */ new Map(),
-	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 →
-* applyModelsJson upserts → modelOverrides as the topmost user-config layer.
-* A provider that fails composition contributes an error and is skipped —
-* the same per-entry isolation the rest of the bridge applies to extensions.
-*/
-async function loadModelsJsonSnapshot(baseProviderOf) {
-	const snapshot = emptySnapshot();
-	const config = await ModelConfig.load(modelsJsonPath());
-	const loadError = config.getError();
-	if (loadError !== void 0) {
-		snapshot.errors.push(loadError);
-		return snapshot;
-	}
-	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) => {
-				const override = providerConfig.modelOverrides?.[String(model.id)];
-				return override ? applyModelOverride(model, override) : model;
-			});
-			snapshot.models.push(...composed);
-			snapshot.providers.set(providerId, providerConfig);
-		} catch (error) {
-			snapshot.errors.push(error instanceof Error ? error.message : String(error));
-		}
-	}
-	return snapshot;
-}
-/**
-* Pi's configured-auth answer for a models.json provider, following
-* composeApiKeyAuth.resolve + withConfiguredAuth and the registry's
-* translation of their failures:
-* - a configured apiKey resolves through $ENV/!command or fails loudly with
-*   the resolver's message;
-* - authHeader folds the resolved key into an Authorization header and,
-*   without a key, becomes Pi's "No API key found" answer;
-* - a provider with neither key nor authHeader answers with its resolved
-*   headers only (the registry's compatibility path).
-*/
-function resolveModelsJsonAuth(providerId, provider) {
-	try {
-		const headers = resolveHeadersOrThrow(provider.headers, `provider "${providerId}"`);
-		const rawKey = provider.apiKey;
-		if (rawKey === void 0) {
-			if (provider.authHeader ?? false) return {
-				ok: false,
-				error: `No API key found for "${providerId}"`
-			};
-			return {
-				ok: true,
-				...headers === void 0 ? {} : { headers }
-			};
-		}
-		const apiKey = resolveConfigValueOrThrow(rawKey, `API key for provider "${providerId}"`);
-		const merged = provider.authHeader ?? false ? {
-			...headers,
-			Authorization: `Bearer ${apiKey}`
-		} : headers;
-		return {
-			ok: true,
-			apiKey,
-			...merged === void 0 ? {} : { headers: merged }
-		};
-	} catch (error) {
-		return {
-			ok: false,
-			error: error instanceof Error ? error.message : String(error)
-		};
-	}
-}
-/**
-* Pi's withConfiguredAuth layered over an auth resolved by another family
-* (an extension-registered provider or a builtin): models.json headers
-* override the resolved ones, and authHeader folds the resolved key into
-* an Authorization header — failing loudly without one, as Pi does.
-*/
-function applyModelsJsonConfiguredAuth(providerId, provider, auth) {
-	try {
-		const configured = resolveHeadersOrThrow(provider.headers, `provider "${providerId}"`);
-		let headers = auth.headers || configured ? {
-			...auth.headers,
-			...configured
-		} : void 0;
-		if (provider.authHeader ?? false) {
-			if (auth.apiKey === void 0) return {
-				ok: false,
-				error: `No API key found for "${providerId}"`
-			};
-			headers = {
-				...headers,
-				Authorization: `Bearer ${auth.apiKey}`
-			};
-		}
-		return {
-			ok: true,
-			...auth.apiKey === void 0 ? {} : { apiKey: auth.apiKey },
-			...headers === void 0 ? {} : { headers }
-		};
-	} catch (error) {
-		return {
-			ok: false,
-			error: error instanceof Error ? error.message : String(error)
-		};
-	}
-}
-/**
-* One models.json provider as a Pi Provider object: the composed Pi Models
-* as its catalog and Pi's per-api wire clients as its transport (attached by
-* the provider adapter's synthesis). Registered as a DSH llm route, this
-* makes the DSH directory the single model directory — the Pi registry
-* projects it back, and registry.getProvider() answers a genuine Pi
-* Provider, so packages that stream through the provider surface work
-* unchanged.
-*/
-function modelsJsonPiProvider(providerId, provider, models) {
-	return {
-		id: providerId,
-		name: provider.name ?? providerId,
-		...provider.baseUrl === void 0 ? {} : { baseUrl: provider.baseUrl },
-		...provider.api === void 0 ? {} : { api: provider.api },
-		getModels: () => models
-	};
-}
-/**
-* Pi's configured-check (not liveness) for a models.json provider — the
-* configuredRequestAuthStatus semantics: a literal or !command key counts as
-* configured, a templated key counts only when its env vars are present, and
-* a provider without an apiKey defers to the other credential families.
-*/
-function modelsJsonAuthConfigured(provider) {
-	const value = provider.apiKey;
-	if (value === void 0) return void 0;
-	if (isCommandConfigValue(value)) return true;
-	if (getConfigValueEnvVarNames(value).length > 0) return isConfigValueConfigured(value);
-	return true;
-}
-//#endregion
 //#region src/provider-adapter.ts
-const PI_API_FACTORIES = {
-	"openai-completions": openAICompletionsApi,
-	"openai-responses": openAIResponsesApi,
-	"anthropic-messages": anthropicMessagesApi
-};
-function piApiClientFor(api) {
-	const factory = typeof api === "string" ? PI_API_FACTORIES[api] : void 0;
-	return factory === void 0 ? void 0 : factory();
-}
-/**
-* Give a config-only Pi provider (models.json entries, packages that declare
-* models without a stream) Pi's own transport: each call dispatches on the
-* model's declared `api` to the real pi-ai client, exactly as Pi's
-* provider composer does. Undispatchable providers (no models, or an api
-* with no client) answer undefined and stay off the directory.
-*/
-function withSynthesizedTransport(provider) {
-	const models = typeof provider.getModels === "function" ? provider.getModels() : Array.isArray(provider.models) ? provider.models : [];
-	if (models.length === 0) return void 0;
-	if (!models.some((model) => piApiClientFor(model.api) !== void 0)) return void 0;
-	const dispatch = (simple) => (model, context, options) => {
-		const client = piApiClientFor(model.api);
-		if (client === void 0) throw new Error(`pi2dsh: no wire-protocol client for api ${JSON.stringify(String(model.api))} (model ${String(model.provider)}/${String(model.id)})`);
-		return (simple ? client.streamSimple ?? client.stream : client.stream).call(client, model, context, options);
-	};
-	return {
-		...provider,
-		getModels: () => models,
-		stream: dispatch(false),
-		streamSimple: dispatch(true)
-	};
-}
 function providerCarriesTransport(value) {
 	return typeof value?.stream === "function";
 }
@@ -2044,7 +1214,7 @@ async function textOnlyMessages(messages, materialize) {
 }
 /**
 * A DSH route that admits images on behalf of a text-only route — the
-* single-directory answer to models.json modelOverrides declaring
+* single-directory answer to host configuration 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,
@@ -2100,10 +1270,12 @@ function imageAdmissionCompanionAdapter(options) {
 function registerPiProviderRoute(options) {
 	const { llm, providerId, provider, host } = options;
 	if (llm === void 0) return void 0;
-	const transport = providerCarriesTransport(provider) ? provider : withSynthesizedTransport(provider);
-	if (transport === void 0) return void 0;
+	if (!providerCarriesTransport(provider)) {
+		host.warn(`[pi2dsh] Pi provider ${JSON.stringify(providerId)} declares a model catalog but no transport; it was not added as a DSH llm route — configure the gateway in the host's llm settings instead`);
+		return;
+	}
 	try {
-		return llm.registerAdapter([providerId], piProviderDshAdapter(providerId, transport, host));
+		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;
@@ -2457,7 +1629,7 @@ function contextFor(ctx, state, agent, signal, command = false) {
 	const providerConfig = (name) => state.providers.get(name);
 	const catalog = state.modelCatalog;
 	const piNativeEntry = (provider, id) => {
-		const source = state.modelsJsonProviders.get(provider) ?? (state.providerRouteDisposers.has(provider) ? state.providers.get(provider) : void 0);
+		const source = state.providerRouteDisposers.has(provider) ? state.providers.get(provider) : void 0;
 		if (source === void 0) return void 0;
 		let models;
 		try {
@@ -2509,24 +1681,15 @@ function contextFor(ctx, state, agent, signal, command = false) {
 				const entry = catalog?.find(provider, modelId);
 				return entry === void 0 ? void 0 : restorePiShape(entry);
 			},
-			getError: () => {
-				const problems = state.modelsJson?.errors ?? [];
-				return problems.length > 0 ? problems.join("\n") : void 0;
-			},
+			getError: () => void 0,
 			hasConfiguredAuth: (model) => {
 				const provider = String(model?.provider ?? "");
 				if (provider.length === 0) return false;
-				const jsonProvider = state.modelsJson?.providers.get(provider);
-				if (jsonProvider !== void 0) {
-					const configured = modelsJsonAuthConfigured(jsonProvider);
-					if (configured !== void 0) return configured;
-				}
-				return state.providers.has(provider) || (catalog?.all() ?? []).some((entry) => entry.provider === provider) || jsonProvider !== void 0;
+				return state.providers.has(provider) || (catalog?.all() ?? []).some((entry) => entry.provider === provider);
 			},
 			getApiKeyAndHeaders: async (model) => {
 				const provider = String(model?.provider ?? "");
-				const jsonProvider = state.modelsJson?.providers.get(provider);
-				const config = providerConfig(provider) ?? (jsonProvider?.apiKey !== void 0 ? void 0 : await realBuiltinProvider(provider));
+				const config = providerConfig(provider);
 				if (config !== void 0) {
 					const auth = (await resolvePiProviderAuth({
 						providerId: provider,
@@ -2534,34 +1697,13 @@ function contextFor(ctx, state, agent, signal, command = false) {
 						store: oauthStoreOf(state)
 					}))?.auth;
 					if (auth?.apiKey === void 0) return { ok: false };
-					const configured = jsonProvider === void 0 ? void 0 : applyModelsJsonConfiguredAuth(provider, jsonProvider, {
-						apiKey: auth.apiKey,
-						...auth.headers === void 0 ? {} : { headers: auth.headers }
-					});
-					if (configured !== void 0 && !configured.ok) return {
-						ok: false,
-						error: configured.error
-					};
-					const headers = configured?.ok ? configured.headers : auth.headers;
 					return {
 						ok: true,
 						apiKey: auth.apiKey,
-						...headers === void 0 ? {} : { headers },
+						...auth.headers === void 0 ? {} : { headers: auth.headers },
 						...auth.baseUrl === void 0 && config.baseUrl === void 0 ? {} : { baseUrl: auth.baseUrl ?? config.baseUrl }
 					};
 				}
-				if (jsonProvider !== void 0) {
-					const resolved = resolveModelsJsonAuth(provider, jsonProvider);
-					if (!resolved.ok) return {
-						ok: false,
-						error: resolved.error
-					};
-					return {
-						ok: true,
-						...resolved.apiKey === void 0 ? {} : { apiKey: resolved.apiKey },
-						...resolved.headers === void 0 ? {} : { headers: resolved.headers }
-					};
-				}
 				try {
 					const entry = llmOf(ctx)?.listConfigurableProviders?.()?.find((candidate) => candidate.provider === provider);
 					if (entry === void 0) return { ok: false };
@@ -2580,8 +1722,8 @@ function contextFor(ctx, state, agent, signal, command = false) {
 			},
 			getProviderAuthStatus: (provider) => providerSupportsOAuth(providerConfig(provider)) ? "oauth" : "none",
 			getProvider: (provider) => {
-				const base = providerConfig(provider) ?? state.modelsJsonProviders.get(provider);
-				if (base !== void 0) return state.providerRouteDisposers.has(provider) || state.providerRouteDisposers.has(`${MODELS_JSON_ROUTE_PREFIX}${provider}`) ? dshRoutedPiProvider(base, provider) : base;
+				const base = providerConfig(provider);
+				if (base !== void 0) return state.providerRouteDisposers.has(provider) ? dshRoutedPiProvider(base, provider) : base;
 				if ((catalog?.all() ?? []).some((entry) => entry.provider === provider)) return dshRoutedPiProvider({
 					id: provider,
 					name: provider
@@ -2595,7 +1737,7 @@ function contextFor(ctx, state, agent, signal, command = false) {
 			getRegisteredProviderConfig: (provider) => providerConfig(provider),
 			getRegisteredProviderIds: () => [...state.providers.keys()],
 			getProviderDisplayName: (provider) => {
-				const config = providerConfig(provider) ?? state.modelsJsonProviders.get(provider);
+				const config = providerConfig(provider);
 				return typeof config?.name === "string" ? config.name : provider;
 			},
 			getProviderAuth: async (provider) => {
@@ -2629,11 +1771,10 @@ function contextFor(ctx, state, agent, signal, command = false) {
 				return provider.length > 0 && providerSupportsOAuth(providerConfig(provider));
 			},
 			refresh: async () => {
-				await reloadModelsJson(ctx, state, true);
 				await catalog?.refresh();
 				return {
 					models: allModels(),
-					errors: [...state.modelsJson?.errors ?? []]
+					errors: []
 				};
 			}
 		},
@@ -3170,14 +2311,13 @@ function oauthStoreOf(state) {
 	state.shared.oauthStore ??= new FileCredentialStore(join(getAgentDir(), "auth.json"));
 	return state.shared.oauthStore;
 }
-const MODELS_JSON_ROUTE_PREFIX = "models.json/";
+const COMPANION_ROUTE_PREFIX = "pi2dsh-companion/";
 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()
@@ -3187,84 +2327,42 @@ function sharedHostStateOf(ctx) {
 	return shared;
 }
 /**
-* Load models.json routes for a host with NO mounted Pi package yet — the
-* single-directory capability (custom providers + image-admission
-* companions in the DSH picker) is the bridge's own, not any plugin's.
-* A later package mount adopts the same shared snapshot.
+* 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
+* 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.
 */
-async function ensureModelsJsonRoutes(ctx) {
+function registerVisionCompanions(ctx, companions) {
+	if (companions === void 0) return;
 	const shared = sharedHostStateOf(ctx);
-	await reloadModelsJson(ctx, {
-		shared,
-		modelsJsonProviders: shared.modelsJsonProviders,
-		companionRoutes: shared.companionRoutes,
-		providerRouteDisposers: shared.providerRouteDisposers
-	});
-}
-async function reloadModelsJson(ctx, state, force = false) {
-	if (!force && state.shared.modelsJson !== void 0) {
-		state.modelsJson = state.shared.modelsJson;
+	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 [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);
-		const provider = modelsJsonPiProvider(providerId, providerConfig, models);
-		const routeDisposer = registerPiProviderRoute({
-			llm: llmOf(ctx),
-			providerId,
-			provider,
-			host: {
-				resolveAuth: async () => {
-					const resolved = resolveModelsJsonAuth(providerId, providerConfig);
-					if (!resolved.ok) return void 0;
-					return { auth: {
-						...resolved.apiKey === void 0 ? {} : { apiKey: resolved.apiKey },
-						...resolved.headers === void 0 ? {} : { headers: resolved.headers },
-						...providerConfig.baseUrl === void 0 ? {} : { baseUrl: providerConfig.baseUrl }
-					} };
-				},
-				warn: (message) => logger(ctx).warn(message)
-			}
-		});
-		if (routeDisposer !== void 0) {
-			state.modelsJsonProviders.set(providerId, provider);
-			state.providerRouteDisposers.set(`${MODELS_JSON_ROUTE_PREFIX}${providerId}`, routeDisposer);
-			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) {
+	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] models.json: modelOverrides for ${JSON.stringify(originalId)} declare image input, but no such llm route exists; no companion route was registered`);
+			logger(ctx).warn(`[pi2dsh] visionCompanions names route ${JSON.stringify(originalId)}, but no such llm route exists; no companion route was registered`);
 			continue;
 		}
-		const companionId = `${originalId}-vision`;
-		state.companionRoutes.set(companionId, originalId);
+		if (shared.providerRouteDisposers.has(`${COMPANION_ROUTE_PREFIX}${companionId}`)) continue;
 		try {
 			const dispose = llm.registerAdapter([companionId], imageAdmissionCompanionAdapter({
 				originalId,
-				imageModels,
+				imageModels: new Set(modelIds.map(String)),
 				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)`);
+			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`);
 		}
@@ -3874,7 +2972,6 @@ async function applyPiPackage(ctx, options) {
 		toolRestrictions: /* @__PURE__ */ new WeakMap(),
 		commands: /* @__PURE__ */ new Map(),
 		commandDisposers: /* @__PURE__ */ new Map(),
-		modelsJsonProviders: shared.modelsJsonProviders,
 		companionRoutes: shared.companionRoutes,
 		flags: /* @__PURE__ */ new Map(),
 		notifications: [],
@@ -3924,7 +3021,7 @@ async function applyPiPackage(ctx, options) {
 	}
 	const llm = llmOf(ctx);
 	state.modelCatalog = shared.modelCatalog ??= new ModelCatalog(llm);
-	await reloadModelsJson(ctx, state);
+	registerVisionCompanions(ctx, options.config?.visionCompanions);
 	if (llm !== void 0) {
 		if (shared.catalogSubscribed !== true) {
 			shared.catalogSubscribed = true;
@@ -3971,6 +3068,6 @@ const runtimeInternals = {
 	textBlocks
 };
 //#endregion
-export { runtimeInternals as i, ensureModelsJsonRoutes as n, normalizeToolSchema as r, applyPiPackage as t };
+export { runtimeInternals as i, normalizeToolSchema as n, registerVisionCompanions as r, applyPiPackage as t };
 
-//# sourceMappingURL=runtime-k3IlCgjQ.mjs.map
+//# sourceMappingURL=runtime-B-Mun-jX.mjs.map