@xiaoso/dsh-tool-plus 0.1.6 → 0.1.7-beta.0

package/lib/{provider-response-C6vcbQyO.mjs → provider-response-SqKSkkUc.mjs}

@@ -1,6 +1,6 @@
 import { installBunShim as __installBunShim } from "./bun-shim.mjs";
 __installBunShim();
-//#region node_modules/.pnpm/@oh-my-pi+pi-ai@17.3.5/node_modules/@oh-my-pi/pi-ai/src/utils/provider-response.ts
+//#region node_modules/.pnpm/@oh-my-pi+pi-ai@18.1.17/node_modules/@oh-my-pi/pi-ai/src/utils/provider-response.ts
 function normalizeProviderResponse(response, requestId, metadata) {
 	const headers = {};
 	response.headers.forEach((value, key) => {

package/lib/{proxy-D9lm7ONA.mjs → proxy-5nWqRL1f.mjs}

@@ -1,9 +1,21 @@
 import { installBunShim as __installBunShim } from "./bun-shim.mjs";
 __installBunShim();
-import { n as StreamTimeoutError, r as ValidationError, v as AbortError } from "./error-C-f_Wnw4.mjs";
+import { b as debug } from "./src-BwW51vA5.mjs";
+import { _ as AbortError, n as StreamTimeoutError, r as ValidationError } from "./error-CORgGg5a.mjs";
 import * as tls from "node:tls";
 import * as net from "node:net";
-//#region node_modules/.pnpm/@oh-my-pi+pi-ai@17.3.5/node_modules/@oh-my-pi/pi-ai/src/utils/proxy.ts
+//#region node_modules/.pnpm/@oh-my-pi+pi-ai@18.1.17/node_modules/@oh-my-pi/pi-ai/src/utils/proxy.ts
+/**
+* Host:port of a proxy URL for logging. Proxy URLs can carry basic-auth
+* credentials, so never log the raw value.
+*/
+function proxyLogTarget(proxyUrl) {
+	try {
+		return new URL(proxyUrl).host;
+	} catch {
+		return "<unparseable>";
+	}
+}
 /**
 * Checks if a host is local or cloud metadata, which should always bypass the proxy
 * (e.g. localhost, 127/8, ::1, 169.254.169.254, metadata.google.internal).
@@ -71,6 +83,11 @@ function getProxyForProvider(provider) {
 	const envKey = `PI_PROXY_${provider.toUpperCase().replace(/[^A-Z0-9]/g, "_")}`;
 	const value = Bun.env[envKey] || Bun.env.PI_PROXY;
 	proxyCache.set(provider, value);
+	debug("provider proxy resolved", {
+		provider,
+		source: Bun.env[envKey] ? envKey : value ? "PI_PROXY" : "none",
+		proxy: value ? proxyLogTarget(value) : void 0
+	});
 	return value;
 }
 /** Resolves provider-specific and standard proxy variables for a target URL, honoring NO_PROXY. */
@@ -94,7 +111,6 @@ async function connectProxiedSocket(proxyUrlStr, targetUrlStr, options) {
 	const targetHost = targetUrl.hostname;
 	const { promise, resolve, reject } = Promise.withResolvers();
 	const readyEvent = useProxySsl ? "secureConnect" : "connect";
-	let rawSocket;
 	let tunnelSocket;
 	let timeout;
 	let responseData = "";
@@ -120,6 +136,12 @@ async function connectProxiedSocket(proxyUrlStr, targetUrlStr, options) {
 		settled = true;
 		cleanup();
 		destroyInProgress();
+		debug("proxy tunnel failed", {
+			proxy: `${proxyHost}:${proxyPort}`,
+			target: `${targetHost}:${targetPort}`,
+			error: String(error),
+			code: "code" in error ? String(error.code) : void 0
+		});
 		reject(error);
 	};
 	const resolveOnce = (socket) => {
@@ -133,6 +155,14 @@ async function connectProxiedSocket(proxyUrlStr, targetUrlStr, options) {
 	const onTunnelError = (error) => rejectOnce(error);
 	const onTunnelReady = () => {
 		if (!tunnelSocket) return;
+		debug("proxy tunnel established", {
+			proxy: `${proxyHost}:${proxyPort}`,
+			target: `${targetHost}:${targetPort}`,
+			peer: `${rawSocket?.remoteAddress ?? "?"}:${rawSocket?.remotePort ?? "?"}`,
+			localPort: rawSocket?.localPort,
+			alpn: tunnelSocket.alpnProtocol,
+			authorized: tunnelSocket.authorized
+		});
 		resolveOnce(tunnelSocket);
 	};
 	const onProxyData = (chunk) => {
@@ -142,6 +172,11 @@ async function connectProxiedSocket(proxyUrlStr, targetUrlStr, options) {
 		rawSocket.off("data", onProxyData);
 		rawSocket.off("error", onRawError);
 		const firstLine = responseData.split("\r\n")[0];
+		debug("proxy tunnel CONNECT reply", {
+			proxy: `${proxyHost}:${proxyPort}`,
+			target: `${targetHost}:${targetPort}`,
+			reply: firstLine
+		});
 		if (!firstLine.includes(" 200 ")) {
 			rejectOnce(new ValidationError(`Proxy tunnel failed: ${firstLine}`));
 			return;
@@ -166,6 +201,11 @@ async function connectProxiedSocket(proxyUrlStr, targetUrlStr, options) {
 		connectReq += "\r\n";
 		rawSocket.write(connectReq);
 		rawSocket.on("data", onProxyData);
+		debug("proxy tunnel CONNECT sent", {
+			proxy: `${proxyHost}:${proxyPort}`,
+			target: `${targetHost}:${targetPort}`,
+			peer: `${rawSocket.remoteAddress ?? "?"}:${rawSocket.remotePort ?? "?"}`
+		});
 	};
 	options?.signal?.addEventListener("abort", onAbort, { once: true });
 	if (options?.timeoutMs !== void 0 && Number.isFinite(options.timeoutMs) && options.timeoutMs > 0) {
@@ -175,7 +215,7 @@ async function connectProxiedSocket(proxyUrlStr, targetUrlStr, options) {
 		}, timeoutMs);
 		timeout.unref?.();
 	}
-	rawSocket = useProxySsl ? tls.connect({
+	const rawSocket = useProxySsl ? tls.connect({
 		host: proxyHost,
 		port: proxyPort
 	}) : net.connect({
@@ -187,4 +227,4 @@ async function connectProxiedSocket(proxyUrlStr, targetUrlStr, options) {
 	return promise;
 }
 //#endregion
-export { shouldBypassProxy as a, isLocalOrMetadataHost as i, getProxyForProvider as n, getProxyForUrl as r, connectProxiedSocket as t };
+export { getProxyForUrl as n, isLocalOrMetadataHost as r, connectProxiedSocket as t };

package/lib/{readability-Cpm-ocau.mjs → readability-uGhqb4GC.mjs}

@@ -1,6 +1,6 @@
 import { installBunShim as __installBunShim } from "./bun-shim.mjs";
 __installBunShim();
-//#region node_modules/.pnpm/@oh-my-pi+pi-utils@17.3.5/node_modules/@oh-my-pi/pi-utils/src/readability/readability.ts
+//#region node_modules/.pnpm/@oh-my-pi+pi-utils@18.1.17/node_modules/@oh-my-pi/pi-utils/src/readability/readability.ts
 const UNLIKELY$1 = /-ad-|ai2html|banner|breadcrumbs|comment|community|combx|disqus|extra|footer|gdpr|header|legends|menu|related|remark|replies|rss|shoutbox|sidebar|skyscraper|social|sponsor|supplemental|ad-break|agegate|pagination|pager|popup/i;
 const POSSIBLE$1 = /and|article|body|column|content|main|shadow/i;
 const POSITIVE = /article|body|content|entry|hentry|h-entry|main|page|pagination|post|text|blog|story/i;
@@ -423,7 +423,7 @@ var Readability = class {
 	}
 };
 //#endregion
-//#region node_modules/.pnpm/@oh-my-pi+pi-utils@17.3.5/node_modules/@oh-my-pi/pi-utils/src/readability/readerable.ts
+//#region node_modules/.pnpm/@oh-my-pi+pi-utils@18.1.17/node_modules/@oh-my-pi/pi-utils/src/readability/readerable.ts
 const UNLIKELY = /-ad-|ai2html|banner|breadcrumbs|combx|comment|community|cover-wrap|disqus|extra|footer|gdpr|header|legends|menu|related|remark|replies|rss|shoutbox|sidebar|skyscraper|social|sponsor|supplemental|ad-break|agegate|pagination|pager|popup|yom-remote/i;
 const POSSIBLE = /and|article|body|column|content|main|shadow/i;
 /** Estimates whether a document contains enough prose for article extraction. */

package/lib/reference-CtvM4zLU.mjs

@@ -0,0 +1,114 @@
+import { installBunShim as __installBunShim } from "./bun-shim.mjs";
+__installBunShim();
+import { a as discoveryVocabulary, i as collapseVocabulary } from "./taxonomy-DSIM99rS.mjs";
+import { i as getModelLikeIdSegments, n as getBracketStrippedModelIdCandidates, r as getLongestModelLikeIdSegment } from "./id-AL5obQzR.mjs";
+//#region node_modules/.pnpm/@oh-my-pi+pi-catalog@18.1.17/node_modules/@oh-my-pi/pi-catalog/src/identity/reference.ts
+/**
+* Proxy/reseller reference lookup: given a custom model id served through a
+* proxy (`[Kiro] claude-opus-4-8`, `gpt-5.4:cloud`, `vendor/claude-sonnet-4-6-thinking`),
+* find the bundled upstream model so missing pricing/capability metadata can be
+* inherited while keeping the custom transport.
+*
+* Kept separate from canonical-id resolution (`./equivalence`): this lookup
+* may strip `search`-style markers and prefers cache-pricing-complete
+* references, both of which would be wrong for canonical coalescing.
+*/
+const REFERENCE_MARKER_SUFFIXES = (() => {
+	const discovery = discoveryVocabulary();
+	const suffixes = [];
+	for (const marker of discovery.trailingMarkers) suffixes.push(`-${marker}`, `:${marker}`);
+	for (const marker of discovery.referenceOnlyTrailingMarkers) suffixes.push(`-${marker}`, `:${marker}`);
+	return suffixes;
+})();
+function isZeroCostXaiOAuthReference(candidate) {
+	return candidate.provider === "xai-oauth" && candidate.cost.input === 0 && candidate.cost.output === 0 && candidate.cost.cacheRead === 0 && candidate.cost.cacheWrite === 0;
+}
+function shouldReplaceReference(existing, candidate) {
+	if (!existing) return true;
+	if (candidate.contextWindow !== existing.contextWindow) return (candidate.contextWindow ?? 0) > (existing.contextWindow ?? 0);
+	if (candidate.maxTokens !== existing.maxTokens) return (candidate.maxTokens ?? 0) > (existing.maxTokens ?? 0);
+	const existingHasCachePricing = existing.cost.cacheRead > 0 || existing.cost.cacheWrite > 0;
+	const candidateHasCachePricing = candidate.cost.cacheRead > 0 || candidate.cost.cacheWrite > 0;
+	if (candidateHasCachePricing !== existingHasCachePricing) return candidateHasCachePricing;
+	return existing.provider !== "openai" && candidate.provider === "openai";
+}
+function normalizeReferenceKey(value) {
+	return value.trim().toLowerCase();
+}
+/**
+* Build a reference index from a model catalog (typically the bundled models).
+* Pure: callers are responsible for memoizing the result.
+*/
+function buildModelReferenceIndex(models) {
+	const exact = /* @__PURE__ */ new Map();
+	for (const candidate of models) {
+		if (isZeroCostXaiOAuthReference(candidate)) continue;
+		const key = normalizeReferenceKey(candidate.id);
+		if (shouldReplaceReference(exact.get(key), candidate)) exact.set(key, candidate);
+	}
+	return {
+		exact,
+		suffixAlias: buildSuffixAliasMap(exact)
+	};
+}
+function buildSuffixAliasMap(exactReferences) {
+	const aliases = /* @__PURE__ */ new Map();
+	for (const reference of exactReferences.values()) {
+		const slashIndex = reference.id.lastIndexOf("/");
+		if (slashIndex === -1) continue;
+		const suffix = reference.id.slice(slashIndex + 1);
+		const alias = getLongestModelLikeIdSegment(suffix);
+		if (!alias) continue;
+		if (shouldReplaceReference(aliases.get(alias), reference)) aliases.set(alias, reference);
+	}
+	return aliases;
+}
+function stripReferenceTrailingMarker(candidate) {
+	const lower = candidate.toLowerCase();
+	let suffixLength = 0;
+	const discovery = discoveryVocabulary();
+	for (const suffix of discovery.billingVariantSuffixes) if (lower.endsWith(suffix) && suffix.length > suffixLength) suffixLength = suffix.length;
+	for (const suffix of REFERENCE_MARKER_SUFFIXES) if (lower.endsWith(suffix) && suffix.length > suffixLength) suffixLength = suffix.length;
+	const collapse = collapseVocabulary();
+	for (const rule of collapse.suffixes) if (lower.endsWith(rule.suffix) && rule.suffix.length > suffixLength) suffixLength = rule.suffix.length;
+	for (const rule of collapse.routingVariants) if (lower.endsWith(rule.suffix) && rule.suffix.length > suffixLength) suffixLength = rule.suffix.length;
+	return suffixLength > 0 && suffixLength < candidate.length ? candidate.slice(0, -suffixLength) : void 0;
+}
+/**
+* Expand a proxied/affixed model id into the ids it may be catalogued under,
+* least-stripped first: bracket affixes, model-like segments, `:cloud`,
+* namespace prefix, `:`→`-`, lowercase, and declared trailing markers.
+* Shared by reference recovery and catalog-metric matching (`./metrics`).
+*/
+function getReferenceCandidateIds(modelId) {
+	const candidates = /* @__PURE__ */ new Set();
+	const queue = [modelId];
+	for (let index = 0; index < queue.length; index += 1) {
+		const candidate = queue[index]?.trim();
+		if (!candidate || candidates.has(candidate)) continue;
+		candidates.add(candidate);
+		for (const stripped of getBracketStrippedModelIdCandidates(candidate)) queue.push(stripped);
+		for (const segment of getModelLikeIdSegments(candidate)) queue.push(segment);
+		for (const suffix of [":cloud", "-cloud"]) if (candidate.toLowerCase().endsWith(suffix)) queue.push(candidate.slice(0, -suffix.length));
+		const slashIndex = candidate.lastIndexOf("/");
+		if (slashIndex !== -1) queue.push(candidate.slice(slashIndex + 1));
+		const colonToDash = candidate.replace(/:/g, "-");
+		if (colonToDash !== candidate) queue.push(colonToDash);
+		const lowercased = candidate.toLowerCase();
+		if (lowercased !== candidate) queue.push(lowercased);
+		const strippedMarker = stripReferenceTrailingMarker(candidate);
+		if (strippedMarker) queue.push(strippedMarker);
+	}
+	return [...candidates];
+}
+/** Resolve a (possibly proxied/affixed) model id to its bundled upstream reference. */
+function resolveModelReference(modelId, index) {
+	if (modelId.startsWith("@")) return void 0;
+	for (const candidate of getReferenceCandidateIds(modelId)) {
+		const key = normalizeReferenceKey(candidate);
+		const reference = index.exact.get(key) ?? index.suffixAlias.get(key);
+		if (reference) return reference;
+	}
+}
+//#endregion
+export { isZeroCostXaiOAuthReference as n, resolveModelReference as r, buildModelReferenceIndex as t };

package/lib/{request-debug-HJMoJncL.mjs → request-debug-NQN0BjHH.mjs}

@@ -2,7 +2,7 @@ import { installBunShim as __installBunShim } from "./bun-shim.mjs";
 __installBunShim();
 import { n as fs_promises_shim_exports } from "./fs-promises-shim-Bx0fpxuk.mjs";
 import "node:buffer";
-//#region node_modules/.pnpm/@oh-my-pi+pi-ai@17.3.5/node_modules/@oh-my-pi/pi-ai/src/utils/request-debug.ts
+//#region node_modules/.pnpm/@oh-my-pi+pi-ai@18.1.17/node_modules/@oh-my-pi/pi-ai/src/utils/request-debug.ts
 const REQUEST_DEBUG_ENV = "PI_REQ_DEBUG";
 const textEncoder = new TextEncoder();
 new TextDecoder("utf-8", { fatal: true });

package/lib/{sanitize-text-CfcXzw5X.mjs → sanitize-text-BCf5KmCf.mjs}

@@ -1,6 +1,6 @@
 import { installBunShim as __installBunShim } from "./bun-shim.mjs";
 __installBunShim();
-//#region node_modules/.pnpm/@oh-my-pi+pi-utils@17.3.5/node_modules/@oh-my-pi/pi-utils/src/sanitize-text.ts
+//#region node_modules/.pnpm/@oh-my-pi+pi-utils@18.1.17/node_modules/@oh-my-pi/pi-utils/src/sanitize-text.ts
 /**
 * Strip ANSI escape sequences, remove control characters / lone surrogates,
 * and normalize line endings.

package/lib/{scrapers-Cg5w77td.mjs → scrapers-D8oWspgW.mjs}

@@ -1,16 +1,16 @@
 import { installBunShim as __installBunShim } from "./bun-shim.mjs";
 __installBunShim();
 import { n as fs_promises_shim_exports } from "./fs-promises-shim-Bx0fpxuk.mjs";
-import { B as USER_AGENT, G as getDocsRsCacheDir, N as formatNumber, P as $env, T as warn, c as combineSignals, j as formatBytes, l as exec, s as Snowflake, x as parseFrontmatter, y as isEnoent } from "./src-BcD0_rQR.mjs";
-import { V as tryParseJson } from "./utils-Cp2Mxf_U.mjs";
-import { a as fetchBinary, c as getParallelExtractContent, i as convertWithMarkit, l as ensureTool, m as settings, n as asRecord, o as extractWithParallel, r as asString, s as findParallelApiKey, t as asNumber } from "./utils-C-dSORPa.mjs";
-import { n as isRecord } from "./type-guards-B9VVjRDK.mjs";
+import { $ as isEnoent, B as USER_AGENT, C as warn, G as getDocsRsCacheDir, N as $env, c as combineSignals, j as formatNumber, k as formatBytes, l as exec, s as Snowflake, y as parseFrontmatter } from "./src-BwW51vA5.mjs";
+import { W as tryParseJson } from "./utils-CUPhpw9A.mjs";
+import { a as fetchBinary, c as getParallelExtractContent, i as convertWithMarkit, l as ensureTool, m as settings, n as asRecord, o as extractWithParallel, r as asString, s as findParallelApiKey, t as asNumber } from "./utils-CCfhUQen.mjs";
+import { n as isRecord } from "./type-guards-CttAANEx.mjs";
 import { r as throwIfAborted, t as ToolAbortError } from "./tool-errors-DoyxivAR.mjs";
-import { c as getLocalizedText, d as looksLikeHtml, i as decodeHtmlEntities, l as htmlToBasicMarkdown, o as formatIsoDate, r as buildResult, s as formatMediaDuration, u as loadPage } from "./types-DX_bvuus.mjs";
+import { c as getLocalizedText, d as looksLikeHtml, i as decodeHtmlEntities, l as htmlToBasicMarkdown, o as formatIsoDate, r as buildResult, s as formatMediaDuration, u as loadPage } from "./types-PVueGi9S.mjs";
 import * as path from "node:path";
 import * as os from "node:os";
 import { gunzipSync } from "node:zlib";
-//#region node_modules/.pnpm/@oh-my-pi+pi-utils@17.3.5/node_modules/@oh-my-pi/pi-utils/src/version.ts
+//#region node_modules/.pnpm/@oh-my-pi+pi-utils@18.1.17/node_modules/@oh-my-pi/pi-utils/src/version.ts
 const DIGITS = /^\d+$/;
 /**
 * Compare two version strings.
@@ -222,7 +222,7 @@ const handleArxiv = async (url, timeout, signal) => {
 			signal
 		});
 		if (!result.ok) return null;
-		const { parseHTML } = await import("./dom-CawWi8fa.mjs");
+		const { parseHTML } = await import("./dom-DG3sPESc.mjs");
 		const entry = parseHTML(result.content).document.querySelector("entry");
 		if (!entry) return null;
 		const title = entry.querySelector("title")?.textContent?.trim()?.replace(/\s+/g, " ");
@@ -3527,7 +3527,7 @@ const handleGoPkg = async (url, timeout, signal) => {
 			notes: ["error"],
 			contentType: "text/plain"
 		});
-		const { parseHTML } = await import("./dom-CawWi8fa.mjs");
+		const { parseHTML } = await import("./dom-DG3sPESc.mjs");
 		const doc = parseHTML(pageResult.content).document;
 		const breadcrumb = doc.querySelector(".go-Breadcrumb");
 		if (breadcrumb) {
@@ -4183,7 +4183,7 @@ const handleIacr = async (url, timeout, signal) => {
 			signal
 		});
 		if (!result.ok) return null;
-		const { parseHTML } = await import("./dom-CawWi8fa.mjs");
+		const { parseHTML } = await import("./dom-DG3sPESc.mjs");
 		const doc = parseHTML(result.content).document;
 		const title = doc.querySelector("h3.mb-3")?.textContent?.trim() || doc.querySelector("meta[name=\"citation_title\"]")?.getAttribute("content");
 		const authors = Array.from(doc.querySelectorAll("meta[name=\"citation_author\"]")).map((m) => m.getAttribute("content")).filter((author) => Boolean(author));
@@ -6608,7 +6608,7 @@ const handleReadTheDocs = async (url, timeout, signal) => {
 		truncated: false,
 		notes
 	};
-	const { parseHTML } = await import("./dom-CawWi8fa.mjs");
+	const { parseHTML } = await import("./dom-DG3sPESc.mjs");
 	const root = parseHTML(result.content).document;
 	let mainContent = root.querySelector(".document") || root.querySelector("[role=\"main\"]") || root.querySelector("main") || root.querySelector(".rst-content") || root.querySelector(".body");
 	if (!mainContent) {
@@ -8239,7 +8239,7 @@ const handleTwitter = async (url, timeout, signal) => {
 				signal
 			});
 			if (result.ok && result.content.length > 500) {
-				const { parseHTML } = await import("./dom-CawWi8fa.mjs");
+				const { parseHTML } = await import("./dom-DG3sPESc.mjs");
 				const doc = parseHTML(result.content).document;
 				const tweetContent = doc.querySelector(".tweet-content")?.textContent?.trim();
 				const fullname = doc.querySelector(".fullname")?.textContent?.trim();
@@ -8860,7 +8860,7 @@ const handleWikipedia = async (url, timeout, signal) => {
 			signal
 		});
 		if (contentResult.ok) {
-			const { parseHTML } = await import("./dom-CawWi8fa.mjs");
+			const { parseHTML } = await import("./dom-DG3sPESc.mjs");
 			const sections = parseHTML(contentResult.content).document.querySelectorAll("section");
 			for (const section of sections) {
 				const heading = section.querySelector("h2, h3, h4");