pi2dsh 0.12.4 → 0.13.1

package/dist/{runtime-DH0zEUpu.mjs → runtime-DEjs_Qlf.mjs}

@@ -1,8 +1,8 @@
 
-import { J as AssistantMessageEventStream, Y as isContextOverflow, c as builtinProviders, i as __setPiAiLlmBridge, x as getSupportedThinkingLevels } from "./pi-ai-BA3V_J0V.mjs";
-import { P as generateBranchSummary, Tn as PiCapabilityError, b as Theme, d as ExtensionRunner, w as __setSubagentSessionFactory, wn as CapabilityLedger } from "./pi-coding-agent-D9skobb6.mjs";
+import { X as isContextOverflow, Y as AssistantMessageEventStream, c as builtinProviders, i as __setPiAiLlmBridge, x as getSupportedThinkingLevels } from "./pi-ai-D7PqVeWs.mjs";
+import { P as generateBranchSummary, Tn as PiCapabilityError, b as Theme, d as ExtensionRunner, w as __setSubagentSessionFactory, wn as CapabilityLedger } from "./pi-coding-agent-BVZu0dHG.mjs";
 import { t as getAgentDir } from "./pi-config-shim-CZ1wFzqM.mjs";
-import { a as FileCredentialStore, c as providerSupportsOAuth, i as oauthCredentialRef, l as resolvePiProviderAuth, o as joinSignals, s as loginPiProvider, u as storedOAuthCredential } from "./credentials-oauth-BakY-0PA.mjs";
+import { a as FileCredentialStore, c as providerSupportsOAuth, i as oauthCredentialRef, l as resolvePiProviderAuth, o as joinSignals, s as loginPiProvider, u as storedOAuthCredential } from "./credentials-oauth-Txs6oew8.mjs";
 import { createRequire } from "node:module";
 import { access, mkdir, readFile, writeFile } from "node:fs/promises";
 import { appendFileSync, existsSync, mkdirSync, readFileSync } from "node:fs";
@@ -786,6 +786,15 @@ var BrowserSurfaces = class {
 	#draftRequests = /* @__PURE__ */ new Map();
 	#liveDrafts = /* @__PURE__ */ new Map();
 	#completionSources = /* @__PURE__ */ new Map();
+	#imageToolNames = /* @__PURE__ */ new Set();
+	/** Register one known image tool's exact DSH wire name. */
+	registerImageTool(name) {
+		if (name.length > 0) this.#imageToolNames.add(name);
+	}
+	/** Exact wire names needing the generic Pi image-result browser view. */
+	imageToolNames() {
+		return [...this.#imageToolNames];
+	}
 	/**
 	* Track one child session under its parent.
 	* @param parentSessionId - the session the panel floats over.
@@ -1158,6 +1167,14 @@ function registerBrowserSurfaceRoute(ctx, registry) {
 				response.end(JSON.stringify({ items }));
 				return;
 			}
+			if (url.pathname === "/pi2dsh/image-tool-names") {
+				response.writeHead(200, {
+					"content-type": "application/json; charset=utf-8",
+					"cache-control": "no-store"
+				});
+				response.end(method === "HEAD" ? void 0 : JSON.stringify({ names: registry.imageToolNames() }));
+				return;
+			}
 			if (url.pathname !== "/pi2dsh/browser-state") {
 				response.writeHead(404);
 				response.end();
@@ -2277,6 +2294,11 @@ function piProviderDshAdapter(providerId, provider, host) {
 				...typeof options.maxTokens === "number" ? { maxTokens: options.maxTokens } : {},
 				...typeof options.temperature === "number" ? { temperature: options.temperature } : {},
 				...typeof options.sessionId === "string" ? { sessionId: options.sessionId } : {},
+				...host.beforeProviderRequest === void 0 ? {} : { onPayload: (payload) => host.beforeProviderRequest(payload, {
+					provider: providerId,
+					model,
+					...options.signal instanceof AbortSignal ? { signal: options.signal } : {}
+				}) },
 				...effort === void 0 || effort === "off" ? {} : { reasoning: effort }
 			};
 			const contextWindow = typeof model.contextWindow === "number" ? model.contextWindow : void 0;
@@ -2382,9 +2404,98 @@ const DSH_THINKING_FORMATS = /* @__PURE__ */ new Set([
 	"together",
 	"zai",
 	"qwen",
+	"chat-template",
+	"qwen-chat-template",
 	"string-thinking",
 	"ant-ling"
 ]);
+const DSH_MAX_TOKENS_FIELDS = /* @__PURE__ */ new Set(["max_completion_tokens", "max_tokens"]);
+const DSH_CACHE_CONTROL_FORMATS = /* @__PURE__ */ new Set(["anthropic"]);
+const DSH_CHAT_TEMPLATE_VARS = /* @__PURE__ */ new Set(["thinking.enabled", "thinking.effort"]);
+const COMPLETIONS = /* @__PURE__ */ new Set(["openai-completions"]);
+const ANTHROPIC = /* @__PURE__ */ new Set(["anthropic-messages"]);
+const COMPLETIONS_AND_RESPONSES = /* @__PURE__ */ new Set(["openai-completions", "openai-responses"]);
+const DSH_COMPAT_FIELD_PROTOCOLS = {
+	supportsStore: COMPLETIONS,
+	supportsDeveloperRole: COMPLETIONS_AND_RESPONSES,
+	supportsReasoningEffort: COMPLETIONS,
+	supportsUsageInStreaming: COMPLETIONS,
+	maxTokensField: COMPLETIONS,
+	requiresToolResultName: COMPLETIONS,
+	requiresAssistantAfterToolResult: COMPLETIONS,
+	requiresThinkingAsText: COMPLETIONS,
+	requiresReasoningContentOnAssistantMessages: COMPLETIONS,
+	thinkingFormat: COMPLETIONS,
+	chatTemplateKwargs: COMPLETIONS,
+	supportsStrictMode: COMPLETIONS_AND_RESPONSES,
+	cacheControlFormat: COMPLETIONS,
+	supportsLongCacheRetention: new Set(DSH_PROTOCOLS),
+	supportsEagerToolInputStreaming: ANTHROPIC,
+	supportsCacheControlOnTools: ANTHROPIC,
+	supportsTemperature: ANTHROPIC,
+	forceAdaptiveThinking: ANTHROPIC,
+	allowEmptySignature: ANTHROPIC,
+	supportsStrictTools: ANTHROPIC
+};
+function recordOf(value) {
+	return value !== null && typeof value === "object" && !Array.isArray(value) ? value : void 0;
+}
+function chatTemplateKwargsOf(value) {
+	const input = recordOf(value);
+	if (input === void 0) return void 0;
+	const output = {};
+	for (const [key, candidate] of Object.entries(input)) {
+		if (candidate === null || typeof candidate === "string" || typeof candidate === "boolean" || typeof candidate === "number" && Number.isFinite(candidate)) {
+			output[key] = candidate;
+			continue;
+		}
+		const placeholder = recordOf(candidate);
+		if (placeholder === void 0 || typeof placeholder.$var !== "string" || !DSH_CHAT_TEMPLATE_VARS.has(placeholder.$var) || placeholder.omitWhenOff !== void 0 && typeof placeholder.omitWhenOff !== "boolean") continue;
+		output[key] = {
+			$var: placeholder.$var,
+			...typeof placeholder.omitWhenOff === "boolean" ? { omitWhenOff: placeholder.omitWhenOff } : {}
+		};
+	}
+	return Object.keys(output).length === 0 ? void 0 : output;
+}
+/**
+* The part of Pi's model compat that rc.8's official adapter deliberately
+* offers for this protocol. Vendor-owned catalog switches remain withheld:
+* forwarding one unknown key rejects the entire settings section, so this is
+* an explicit field gate rather than a spread.
+*/
+function compatProfileOf(value, api) {
+	const compat = recordOf(value);
+	if (compat === void 0 || api === void 0) return {};
+	const output = {};
+	const fields = Object.entries(DSH_COMPAT_FIELD_PROTOCOLS);
+	for (const [field, protocols] of fields) {
+		if (!protocols.has(api)) continue;
+		const candidate = compat[field];
+		if (field === "maxTokensField") {
+			if (typeof candidate === "string" && DSH_MAX_TOKENS_FIELDS.has(candidate)) output[field] = candidate;
+		} else if (field === "thinkingFormat") {
+			if (typeof candidate === "string" && DSH_THINKING_FORMATS.has(candidate)) output[field] = candidate;
+		} else if (field === "chatTemplateKwargs") {
+			const kwargs = chatTemplateKwargsOf(candidate);
+			if (kwargs !== void 0) output[field] = kwargs;
+		} else if (field === "cacheControlFormat") {
+			if (typeof candidate === "string" && DSH_CACHE_CONTROL_FORMATS.has(candidate)) output[field] = candidate;
+		} else if (typeof candidate === "boolean") output[field] = candidate;
+	}
+	return output;
+}
+function reasoningEffortsOf(model) {
+	if (model.reasoning === false) return false;
+	if (model.reasoning !== true) return void 0;
+	const levelMap = recordOf(model.thinkingLevelMap);
+	const efforts = {};
+	for (const level of getSupportedThinkingLevels(model)) {
+		const wire = levelMap?.[level];
+		efforts[level] = level === "off" && wire === void 0 ? null : wire ?? level;
+	}
+	return Object.keys(efforts).some((level) => level !== "off") ? efforts : void 0;
+}
 /** A positive whole number, or undefined — the profile schema rejects 0 and fractions. */
 function wholeAbove(value) {
 	return typeof value === "number" && Number.isInteger(value) && value >= 1 ? value : void 0;
@@ -2394,23 +2505,17 @@ function wholeAbove(value) {
 *
 * Field by field on purpose. The two vocabularies overlap but do not match:
 * Pi's `maxTokens` is routinely 0 for "unstated" while DSH requires at least 1,
-* Pi's `compat` carries gateway dialect flags DSH's profile has no slot for,
 * and Pi's `reasoning` is a boolean where DSH's `reasoningEfforts` is a map of
-* offered levels. Forwarding any of those verbatim rejects the whole settings
-* section — one bad key takes down every route in it.
+* offered levels. rc.8 gives compat a real profile slot, but only for a gated
+* protocol-specific subset. Forwarding these objects verbatim still rejects
+* the whole settings section — one bad key takes down every route in it.
 * @param model - the Pi model descriptor as its package declared it.
-* @param api - the wire protocol this route resolved to, which decides whether
-*   the reasoning compat switches are even a legal thing to state.
+* @param api - the wire protocol this route resolved to, which decides which
+*   compat fields are legal to state.
 */
 function modelProfileOf(model, api) {
-	const compat = model.compat;
-	const reasoningCompatAllowed = api === "openai-completions";
-	const thinkingFormat = reasoningCompatAllowed && typeof compat?.thinkingFormat === "string" && DSH_THINKING_FORMATS.has(compat.thinkingFormat) ? { thinkingFormat: compat.thinkingFormat } : {};
-	const supportsReasoningEffort = reasoningCompatAllowed && typeof compat?.supportsReasoningEffort === "boolean" ? { supportsReasoningEffort: compat.supportsReasoningEffort } : {};
-	const carriedCompat = {
-		...thinkingFormat,
-		...supportsReasoningEffort
-	};
+	const carriedCompat = compatProfileOf(model.compat, api);
+	const reasoningEfforts = reasoningEffortsOf(model);
 	const input = Array.isArray(model.input) ? model.input.filter((entry) => typeof entry === "string" && DSH_MODALITIES.has(entry)) : [];
 	const contextWindow = wholeAbove(model.contextWindow);
 	const maxTokens = wholeAbove(model.maxTokens);
@@ -2420,6 +2525,7 @@ function modelProfileOf(model, api) {
 		...contextWindow === void 0 ? {} : { contextWindow },
 		...maxTokens === void 0 ? {} : { maxTokens },
 		...input.length === 0 ? {} : { input },
+		...reasoningEfforts === void 0 ? {} : { reasoningEfforts },
 		...Object.keys(carriedCompat).length === 0 ? {} : { compat: carriedCompat }
 	};
 }
@@ -2447,12 +2553,14 @@ function registerCatalogOnlyRoute(options) {
 		const apiKeyEnv = envReferenceOf(provider.apiKey);
 		const api = protocolOf(provider.api) ?? protocolOf(first.api);
 		const baseURL = typeof provider.baseUrl === "string" ? provider.baseUrl : typeof first.baseUrl === "string" ? first.baseUrl : void 0;
+		const providerCompat = compatProfileOf(provider.compat, api);
 		return {
 			displayName: typeof provider.name === "string" ? provider.name : providerId,
 			...apiKeyEnv === void 0 ? {} : { apiKeyEnv },
 			...api === void 0 ? {} : { api },
 			...baseURL === void 0 ? {} : { baseURL },
-			...models.length === 0 ? {} : { models: models.map((model) => modelProfileOf(model, api)) }
+			...Object.keys(providerCompat).length === 0 ? {} : { compat: providerCompat },
+			...models.length === 0 ? {} : { models: models.map((model) => modelProfileOf(model, api ?? protocolOf(model.api))) }
 		};
 	}, `[pi2dsh] Pi provider ${JSON.stringify(providerId)} declares a catalog only; DSH's official llm-pi-ai adapter now serves it as a native route`);
 }
@@ -2549,6 +2657,10 @@ function registerPiProviderRoute(options) {
 //#region src/runtime.ts
 /** Fallback thread ids when a child session reports none. */
 let sidePanelSerial = 0;
+const KNOWN_IMAGE_TOOLS_BY_PACKAGE = /* @__PURE__ */ new Map([["@crazygit/pi-codex-image-gen", /* @__PURE__ */ new Set(["codex_generate_image"])]]);
+function isKnownImageTool(packageName, toolName) {
+	return KNOWN_IMAGE_TOOLS_BY_PACKAGE.get(packageName)?.has(toolName) === true;
+}
 function logger(ctx) {
 	const candidate = ctx.logger;
 	return {
@@ -2916,6 +3028,14 @@ function contextFor(ctx, state, agent, signal, command = false, sessionOverride)
 			question: String(title),
 			...placeholder === void 0 ? {} : { detail: String(placeholder) }
 		}),
+		deviceCode: async (title, detail, promptSignal) => {
+			await askOne(ctx, agent, joinSignals(signal, promptSignal), {
+				id: "pi2dsh-device-code",
+				question: String(title),
+				detail: String(detail),
+				options: [{ label: "Cancel login" }]
+			});
+		},
 		editor: (title, prefill) => askOne(ctx, agent, signal, {
 			id: "pi2dsh-editor",
 			question: String(title),
@@ -3365,6 +3485,31 @@ async function dispatch(state, eventName, event, eventContext) {
 	return results;
 }
 /**
+* Pi's request-body event is a waterfall over the body the provider transport
+* will actually send. Only package-registered Pi transports expose that body
+* through SimpleStreamOptions.onPayload; native DSH adapters build it behind
+* their own boundary and never call this function.
+*/
+async function dispatchBeforeProviderRequest(ctx, state, payload, request) {
+	let current = payload;
+	const agent = currentAgent(state);
+	const eventContext = contextFor(ctx, state, agent, request.signal);
+	eventContext.model = {
+		...request.model,
+		provider: request.provider
+	};
+	for (const handler of state.handlers.get("before_provider_request") ?? []) try {
+		const result = await state.agentScope.run(agent, () => handler({
+			type: "before_provider_request",
+			payload: current
+		}, eventContext));
+		if (result !== void 0 && typeof result === "object" && result !== null) current = result;
+	} catch (error) {
+		logger(ctx).warn(`[pi2dsh] before_provider_request handler failed: ${error instanceof Error ? error.message : String(error)}`);
+	}
+	return current;
+}
+/**
 * What triggered a compaction, in Pi's vocabulary.
 *
 * DSH's durable lifecycle events say two things about the trigger: a manual
@@ -4204,16 +4349,17 @@ async function supersedeActiveLogin(state) {
 async function ensureLoggedInProviderRoute(ctx, state, name, config) {
 	if (!providerSupportsOAuth(config)) return false;
 	if (providerCarriesTransport(config) || state.providerRouteDisposers.has(name)) return false;
-	if (llmOf(ctx)?.listProviders().some((provider) => provider.id === name) === true) return false;
+	const alreadyRouted = llmOf(ctx)?.listProviders().some((provider) => provider.id === name) === true;
 	if (await storedOAuthCredential(oauthStoreOf(state), name).catch(() => void 0) === void 0) return false;
+	const published = await publishOAuthCredential(ctx, state, name, config);
+	if (!published.ok) return false;
+	keepOAuthCredentialFresh(ctx, state);
+	if (alreadyRouted) return false;
 	const settings = optionalService(ctx, "settings");
 	if (settings === void 0) {
 		logger(ctx).warn(`[pi2dsh] logged in to ${JSON.stringify(name)}, but this composition has no settings service to declare its model route in`);
 		return false;
 	}
-	const published = await publishOAuthCredential(ctx, state, name, config);
-	if (!published.ok) return false;
-	keepOAuthCredentialFresh(ctx, state);
 	await settings.update("llm-pi-ai", { providers: { [name]: {
 		...typeof config.name === "string" ? { displayName: config.name } : {},
 		...published.baseUrl === void 0 ? {} : { baseURL: published.baseUrl },
@@ -4460,6 +4606,7 @@ function registerTool(ctx, state, tool) {
 	};
 	const dispose = ctx.tools.register(definition);
 	state.toolDisposers.set(tool.name, dispose);
+	if (isKnownImageTool(state.packageName, tool.name)) state.shared.browserSurfaces?.registerImageTool(tool.name);
 }
 function unregisterTool(state, name) {
 	const dispose = state.toolDisposers.get(name);
@@ -4840,6 +4987,7 @@ function createPiApi(ctx, state) {
 						store: oauthStoreOf(state)
 					}),
 					warn: (message) => logger(ctx).warn(message),
+					beforeProviderRequest: (payload, request) => dispatchBeforeProviderRequest(ctx, state, payload, request),
 					resolveAttachments: () => optionalService(ctx, "attachments")
 				}
 			});
@@ -5176,7 +5324,11 @@ async function applyPiPackage(ctx, options) {
 		oauth: provider.auth.oauth
 	});
 	ensureLoginCommand(ctx, state);
-	for (const [name, config] of [...state.providers]) ensureLoggedInProviderRoute(ctx, state, name, config).catch((error) => logger(ctx).warn(`[pi2dsh] could not restore the route for logged-in provider ${JSON.stringify(name)}: ${error instanceof Error ? error.message : String(error)}`));
+	for (const [name, config] of [...state.providers]) try {
+		await ensureLoggedInProviderRoute(ctx, state, name, config);
+	} catch (error) {
+		logger(ctx).warn(`[pi2dsh] could not restore the route for logged-in provider ${JSON.stringify(name)}: ${error instanceof Error ? error.message : String(error)}`);
+	}
 	if (options.manifest.skillDirs.length > 0) {
 		if (ctx.get("skills") === void 0) logger(ctx).warn("[pi2dsh] migrated skills were not mounted because this DSH composition has no ctx.skills");
 		else {
@@ -5335,6 +5487,7 @@ const runtimeInternals = {
 	resolveOfferedChoice,
 	dshToPiContent,
 	expandPrompt,
+	isKnownImageTool,
 	isSubagentOrigin,
 	normalizeToolResult,
 	splitArguments,
@@ -5344,4 +5497,4 @@ const runtimeInternals = {
 //#endregion
 export { runtimeInternals as i, normalizeToolSchema as n, registerVisionCompanions as r, applyPiPackage as t };
 
-//# sourceMappingURL=runtime-DH0zEUpu.mjs.map
+//# sourceMappingURL=runtime-DEjs_Qlf.mjs.map