pi2dsh 0.15.0 → 0.15.2

package/dist/index.mjs

@@ -1,8 +1,8 @@
 
-import { a as registerVisionCompanions } from "./runtime-BN4E4OtI.mjs";
+import { a as registerVisionCompanions } from "./runtime-BlbKWw7W.mjs";
 import { t as resolvePiPackage } from "./source-0sA5z08z.mjs";
 import { applyPiHost, applyPreparedPiHost, manifestForInstalled, preparePiHost } from "./host.mjs";
-import { a as PI_AI_PACKAGES, c as UI_CONTEXT_RULES, d as ruleForEvent, f as ruleForHostImport, i as HOST_IMPORT_RULES, l as ruleForApi, n as CONTEXT_RULES, o as PI_CODING_AGENT_PACKAGES, p as ruleForUiContextProperty, r as EVENT_RULES, s as PI_TUI_PACKAGES, t as API_RULES, u as ruleForContextProperty } from "./compatibility-DH_Gi96X.mjs";
+import { a as PI_AI_PACKAGES, c as UI_CONTEXT_RULES, d as ruleForEvent, f as ruleForHostImport, i as HOST_IMPORT_RULES, l as ruleForApi, n as CONTEXT_RULES, o as PI_CODING_AGENT_PACKAGES, p as ruleForUiContextProperty, r as EVENT_RULES, s as PI_TUI_PACKAGES, t as API_RULES, u as ruleForContextProperty } from "./compatibility-DVMqXJux.mjs";
 import { n as convertPiMcpConfig, r as renderMcpPatch, t as collectPiMcpServers } from "./mcp-config-jmzbgdHa.mjs";
 import { readFile } from "node:fs/promises";
 import { existsSync } from "node:fs";
@@ -234,7 +234,7 @@ async function apply(ctx, config = {}) {
 * @returns the compatibility report.
 */
 async function analyzePackage(pkg) {
-	const { analyzePackage: run } = await import("./analyzer-er3QPDc0.mjs");
+	const { analyzePackage: run } = await import("./analyzer-C5FQXB7R.mjs");
 	return run(pkg);
 }
 //#endregion

package/dist/{runtime-BN4E4OtI.mjs → runtime-BlbKWw7W.mjs}

@@ -2,7 +2,7 @@
 import { En as PiCapabilityError, F as generateBranchSummary, Tn as CapabilityLedger, b as Theme, d as ExtensionRunner, w as __runWithSubagentSessionFactory } from "./pi-coding-agent-DK8hbJP5.mjs";
 import { t as getAgentDir } from "./pi-config-shim-CZ1wFzqM.mjs";
 import { $ as isContextOverflow, Q as AssistantMessageEventStream, S as getSupportedThinkingLevels, c as builtinProviders, o as __runWithPiAiRuntime, r as __createPiAiRuntimeRegistry } from "./pi-ai-DpqiLdPA.mjs";
-import { W as getKeybindings } from "./pi-tui-DruSeKmd.mjs";
+import { W as getKeybindings, _t as stripTerminalSequences } from "./pi-tui-DruSeKmd.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-Didpkkjx.mjs";
 import { createRequire } from "node:module";
 import { access, mkdir, readFile, writeFile } from "node:fs/promises";
@@ -13,7 +13,7 @@ import { tmpdir } from "node:os";
 import { EventEmitter } from "node:events";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { createJiti } from "jiti";
-import { CONTEXT_WINDOW_EXCEEDED_CODE, EMPTY_RESPONSE_CODE, LlmError, QUOTA_EXCEEDED_CODE, createUserMessage, isContextWindowExceededError, isQuotaExceededError } from "@deepseek-ai/dsh-llm";
+import { CONTEXT_WINDOW_EXCEEDED_CODE, EMPTY_RESPONSE_CODE, LlmAdapter, LlmError, QUOTA_EXCEEDED_CODE, createUserMessage, isContextWindowExceededError, isQuotaExceededError } from "@deepseek-ai/dsh-llm";
 import { scopeOf } from "@deepseek-ai/dsh-scope";
 import { renderPrompt } from "@deepseek-ai/dsh-system-prompt";
 import { randomUUID } from "node:crypto";
@@ -2252,6 +2252,18 @@ function piCarriedFields(model) {
 * Wrap one Pi provider object as a DSH LlmAdapter-shaped route handler.
 * Structural typing carries it through `llm.registerAdapter`.
 */
+/** Build the route handler ON the host's own LlmAdapter base class. The
+* 0.1.0-rc.8 dispatch reads adapter methods structurally, so a plain object
+* worked; 0.1.1's dispatch calls `adapter.prepareCall` — a method the BASE
+* CLASS provides (it binds resolveModel + stream into a one-shot prepared
+* call). Because `@deepseek-ai/dsh-llm` is a peer, `LlmAdapter` here is
+* whichever generation the host installed: own-property methods carry the
+* bridge behavior on both, and everything the base contributes on newer
+* generations (prepareCall, retry-policy defaults) is inherited instead of
+* re-implemented. */
+function llmAdapterInstance(methods) {
+	return Object.assign(new LlmAdapter(), methods);
+}
 function piProviderDshAdapter(providerId, provider, host) {
 	let warnedStop = false;
 	const warnStopUnsupported = () => {
@@ -2259,7 +2271,7 @@ function piProviderDshAdapter(providerId, provider, host) {
 		warnedStop = true;
 		host.warn(`[pi2dsh] a request to Pi provider ${JSON.stringify(providerId)} carries stop sequences, which Pi models at no layer — they cannot be forwarded, so the model will not halt on them`);
 	};
-	return {
+	return llmAdapterInstance({
 		providerInfo: (id) => ({
 			id,
 			name: typeof provider.name === "string" ? provider.name : id
@@ -2333,7 +2345,7 @@ function piProviderDshAdapter(providerId, provider, host) {
 				reasoningEffort: reasoning
 			}), contextWindow);
 		}
-	};
+	});
 }
 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]`;
@@ -2382,7 +2394,7 @@ function imageAdmissionCompanionAdapter(options) {
 			inputModalities: modalities
 		};
 	};
-	return {
+	return llmAdapterInstance({
 		providerInfo: (id) => {
 			return {
 				id,
@@ -2405,7 +2417,7 @@ function imageAdmissionCompanionAdapter(options) {
 				...Array.isArray(streamOptions.messages) ? { messages: await textOnlyMessages(streamOptions.messages, materialize) } : {}
 			});
 		}
-	};
+	});
 }
 /** A wire protocol DSH's official adapter can serve, or undefined. */
 function protocolOf(value) {
@@ -3126,11 +3138,16 @@ function answerText(answer) {
 async function askOne(ctx, agent, signal, question) {
 	const service = optionalService(ctx, "userQuestions");
 	if (service === void 0) unsupported("ctx.ui AskUser");
-	return answerText((await service.ask({
-		questions: [question],
-		...agent !== void 0 ? { agent } : {},
-		signal
-	})).answers.find((answer) => answer.id === question.id));
+	try {
+		return answerText((await service.ask({
+			questions: [question],
+			...agent !== void 0 ? { agent } : {},
+			signal
+		})).answers.find((answer) => answer.id === question.id));
+	} catch (error) {
+		if (signal?.aborted === true) return void 0;
+		throw error;
+	}
 }
 function agentSession(agent) {
 	const session = agent?.session;
@@ -3229,9 +3246,76 @@ async function summarizeAbandonedBranch(ctx, state, agent, events, boundary, opt
 	}
 	return result.summary;
 }
+/** Resolve Pi's official `ExtensionUIDialogOptions` third argument
+* (`{ signal?, timeout? }`, types.ts:96 at the pinned upstream) into one
+* abort signal. A bare AbortSignal is also accepted — pi-ai's OAuth prompt
+* callbacks hand the signal directly. Anything else resolves to undefined.
+* The `timeout` field is realized with AbortSignal.timeout, so a dialog the
+* package wants auto-dismissed really leaves the screen. Silently ignoring
+* the options object is what left the OAuth paste box on screen after the
+* browser callback had already won (pi-mcp-adapter passes
+* `ui.input(title, undefined, { signal })` and cancels it in its
+* waitForAuthorizationResponse finally block). */
+function dialogAbortSignal(opts) {
+	if (opts instanceof AbortSignal) return opts;
+	if (typeof opts !== "object" || opts === null) return void 0;
+	const record = opts;
+	const signals = [];
+	if (record.signal instanceof AbortSignal) signals.push(record.signal);
+	if (typeof record.timeout === "number" && Number.isFinite(record.timeout) && record.timeout > 0) signals.push(AbortSignal.timeout(record.timeout));
+	if (signals.length === 0) return void 0;
+	return signals.length === 1 ? signals[0] : AbortSignal.any(signals);
+}
+const OSC8_HYPERLINK = /\u001b\]8;[^;]*;([^\u0007\u001b]*)(?:\u0007|\u001b\\)([\s\S]*?)\u001b\]8;;(?:\u0007|\u001b\\)/gu;
+const MARKDOWN_LINK = /\[([^\]]+)\]\(([^)]+)\)/gu;
+/**
+* Translate terminal-oriented Pi dialog copy into DSH's native question
+* shape. Pi packages legitimately put OSC 8 links and a multi-line body in
+* the dialog title because Pi's TUI owns that whole text block. DSH separates
+* a plain-text heading from a Markdown detail block, and its Web client renders
+* terminal control bytes literally. Keep the plugin's words and destination,
+* but move them onto the host's real presentation contract.
+*/
+function projectDialogPrompt(title, supplementalDetail, linkMode) {
+	const linkedUrls = /* @__PURE__ */ new Set();
+	const normalize = (value) => {
+		const formatted = String(value).replace(OSC8_HYPERLINK, (whole, url, label) => {
+			linkedUrls.add(url);
+			if (linkMode === "terminal") return whole;
+			return `[${stripTerminalSequences(label).replace(/([\\\[\]])/gu, "\\$1")}](${url})`;
+		});
+		return (linkMode === "terminal" ? formatted : stripTerminalSequences(formatted)).replace(/\r\n?/gu, "\n");
+	};
+	const titleLines = normalize(title).split("\n");
+	while (titleLines[0]?.trim() === "") titleLines.shift();
+	while (titleLines.at(-1)?.trim() === "") titleLines.pop();
+	const headingLine = titleLines.shift()?.trim() || "Input required";
+	const headingHasLink = linkMode === "terminal" ? headingLine.includes("\x1B]8;") : [...headingLine.matchAll(MARKDOWN_LINK)].length > 0;
+	const question = linkMode === "terminal" ? stripTerminalSequences(headingLine) : headingLine.replace(MARKDOWN_LINK, "$1");
+	if (headingHasLink) titleLines.unshift("", headingLine);
+	const detailLines = [...titleLines];
+	if (supplementalDetail !== void 0) {
+		if (detailLines.length > 0 && detailLines.at(-1)?.trim() !== "") detailLines.push("");
+		detailLines.push(...normalize(supplementalDetail).split("\n"));
+	}
+	const deduplicated = [];
+	for (const line of detailLines) {
+		if (linkedUrls.has(line.trim())) continue;
+		if (line.trim() === "" && deduplicated.at(-1)?.trim() === "") continue;
+		deduplicated.push(line.replace(/[ \t]+$/gu, ""));
+	}
+	while (deduplicated[0]?.trim() === "") deduplicated.shift();
+	while (deduplicated.at(-1)?.trim() === "") deduplicated.pop();
+	const detail = deduplicated.join("\n");
+	return {
+		question,
+		...detail.length === 0 ? {} : { detail }
+	};
+}
 function contextFor(ctx, state, agent, signal, command = false, sessionOverride) {
 	const notices = [];
 	const userQuestions = optionalService(ctx, "userQuestions");
+	const dialogLinkMode = optionalService(ctx, "tuiScenes") === void 0 ? "markdown" : "terminal";
 	const ui = {
 		notify(message, type) {
 			const text = String(message);
@@ -3240,40 +3324,36 @@ function contextFor(ctx, state, agent, signal, command = false, sessionOverride)
 			const level = type === "warning" || type === "error" ? "warn" : "info";
 			logger(ctx)[level](`[pi2dsh] ${text}`);
 		},
-		select: async (title, options, promptSignal) => {
+		select: async (title, options, opts) => {
 			const labels = options.map((option) => String(option));
-			const answered = await askOne(ctx, agent, joinSignals(signal, promptSignal), {
+			const answered = await askOne(ctx, agent, joinSignals(signal, dialogAbortSignal(opts)), {
 				id: "pi2dsh-select",
-				question: String(title),
+				...projectDialogPrompt(title, void 0, dialogLinkMode),
 				options: labels.map((label) => ({ label }))
 			});
 			return answered === void 0 ? void 0 : resolveOfferedChoice(answered, labels);
 		},
-		async confirm(title, message) {
-			return await askOne(ctx, agent, signal, {
+		async confirm(title, message, opts) {
+			return await askOne(ctx, agent, joinSignals(signal, dialogAbortSignal(opts)), {
 				id: "pi2dsh-confirm",
-				question: String(title),
-				detail: String(message),
+				...projectDialogPrompt(title, message, dialogLinkMode),
 				options: [{ label: "Yes" }, { label: "No" }]
 			}) === "Yes";
 		},
-		input: (title, placeholder, promptSignal) => askOne(ctx, agent, joinSignals(signal, promptSignal), {
+		input: (title, placeholder, opts) => askOne(ctx, agent, joinSignals(signal, dialogAbortSignal(opts)), {
 			id: "pi2dsh-input",
-			question: String(title),
-			...placeholder === void 0 ? {} : { detail: String(placeholder) }
+			...projectDialogPrompt(title, placeholder, dialogLinkMode)
 		}),
-		deviceCode: async (title, detail, promptSignal) => {
-			await askOne(ctx, agent, joinSignals(signal, promptSignal), {
+		deviceCode: async (title, detail, opts) => {
+			await askOne(ctx, agent, joinSignals(signal, dialogAbortSignal(opts)), {
 				id: "pi2dsh-device-code",
-				question: String(title),
-				detail: String(detail),
+				...projectDialogPrompt(title, detail, dialogLinkMode),
 				options: [{ label: "Cancel login" }]
 			});
 		},
 		editor: (title, prefill) => askOne(ctx, agent, signal, {
 			id: "pi2dsh-editor",
-			question: String(title),
-			...prefill === void 0 ? {} : { detail: `Current text:\n${String(prefill)}` }
+			...projectDialogPrompt(title, prefill === void 0 ? void 0 : `Current text:\n${String(prefill)}`, dialogLinkMode)
 		}),
 		setStatus: (key, text) => {
 			state.shared.browserSurfaces?.setStatus(sessionIdOf(state, agent), state.packageName, String(key), text);
@@ -6206,4 +6286,4 @@ const runtimeInternals = {
 //#endregion
 export { registerVisionCompanions as a, overlayProviderConfig as i, mergeProviderRegistration as n, runtimeInternals as o, normalizeToolSchema as r, applyPiPackage as t };
 
-//# sourceMappingURL=runtime-BN4E4OtI.mjs.map
+//# sourceMappingURL=runtime-BlbKWw7W.mjs.map