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

package/lib/{stream-markup-healing-DZ6bVDxH.mjs → thinking-CiLa2LFB.mjs}

@@ -1,9 +1,7 @@
 import { installBunShim as __installBunShim } from "./bun-shim.mjs";
 __installBunShim();
-import { D as partialSuffixOverlapAny, E as FencedThinkingScanner, T as createInbandScanner } from "./utils-Cp2Mxf_U.mjs";
-import { h as isDeepseekModelIdOrName } from "./models-DRA2c_8U.mjs";
-import "./identity-HNO1Oe9B.mjs";
-//#region node_modules/.pnpm/@oh-my-pi+pi-ai@17.3.5/node_modules/@oh-my-pi/pi-ai/src/dialect/thinking.ts
+import { D as FencedThinkingScanner, O as partialSuffixOverlapAny } from "./utils-CUPhpw9A.mjs";
+//#region node_modules/.pnpm/@oh-my-pi+pi-ai@18.1.17/node_modules/@oh-my-pi/pi-ai/src/dialect/thinking.ts
 /**
 * Every dialect's in-band thinking section in its canonical `renderThinking`
 * form (see the sibling `./*.ts` scanners). {@link ThinkingInbandScanner} heals
@@ -18,7 +16,8 @@ import "./identity-HNO1Oe9B.mjs";
 const TAGS = [
 	{
 		open: "<think>",
-		close: "</think>"
+		close: "</think>",
+		impliedOpen: true
 	},
 	{
 		open: "<thinking>",
@@ -47,7 +46,10 @@ const TAGS = [
 	}
 ];
 const OPENS = TAGS.map((tag) => tag.open);
+const IMPLIED_OPEN_TAGS = TAGS.filter((tag) => tag.impliedOpen);
+const IMPLIED_OPEN_DELIMITERS = [...OPENS, ...IMPLIED_OPEN_TAGS.map((tag) => tag.close)];
 var ThinkingInbandScanner = class {
+	#impliedOpen;
 	#buffer = "";
 	#closeTag = "";
 	#thinking = "";
@@ -63,6 +65,9 @@ var ThinkingInbandScanner = class {
 	* stream — or one indented ≤3 spaces, as CommonMark allows — is recognized.
 	*/
 	#lineIndent = 0;
+	constructor(options = {}) {
+		this.#impliedOpen = options.impliedOpen === true;
+	}
 	feed(text) {
 		if (text.length === 0) return [];
 		this.#buffer += text;
@@ -127,7 +132,7 @@ var ThinkingInbandScanner = class {
 				if (this.#emitCode(final, events)) continue;
 				break;
 			}
-			const hit = scanVisible(this.#buffer, final);
+			const hit = scanVisible(this.#buffer, final, this.#impliedOpen);
 			if (hit.kind === "none") {
 				this.#emitText(this.#buffer, events);
 				this.#buffer = "";
@@ -138,6 +143,11 @@ var ThinkingInbandScanner = class {
 				this.#buffer = this.#buffer.slice(hit.index);
 				break;
 			}
+			if (hit.kind === "impliedClose") {
+				this.#buffer = this.#buffer.slice(hit.index + hit.tag.close.length);
+				events.push({ type: "impliedThinkingEnd" });
+				continue;
+			}
 			if (hit.kind === "code") {
 				const fenced = hit.ticks >= 3 && this.#lineIndent >= 0 && this.#lineIndent <= 3;
 				this.#emitText(this.#buffer.slice(hit.index, hit.index + hit.ticks), events);
@@ -217,14 +227,16 @@ var ThinkingInbandScanner = class {
 };
 /**
 * Walk idle visible text for the earliest boundary: a leaked reasoning-tag open,
-* a Markdown code-span/fence opener (a backtick run), or — when more chunks may
-* follow — a held partial delimiter at the buffer tail.
+* a bare close of an implied-open tag (when `impliedOpen`), a Markdown
+* code-span/fence opener (a backtick run), or — when more chunks may follow — a
+* held partial delimiter at the buffer tail.
 *
 * Reasoning tags win at any position so the gemini ` ```thinking ` fence is
 * healed instead of being read as a code fence. Backtick runs enter code mode so
 * a literal `<think>` inside inline code or a fenced block stays visible text.
 */
-function scanVisible(buffer, final) {
+function scanVisible(buffer, final, impliedOpen) {
+	const delimiters = impliedOpen ? IMPLIED_OPEN_DELIMITERS : OPENS;
 	for (let i = 0; i < buffer.length; i++) {
 		const tag = TAGS.find((candidate) => buffer.startsWith(candidate.open, i));
 		if (tag) return {
@@ -232,9 +244,17 @@ function scanVisible(buffer, final) {
 			index: i,
 			tag
 		};
+		if (impliedOpen) {
+			const closed = IMPLIED_OPEN_TAGS.find((candidate) => buffer.startsWith(candidate.close, i));
+			if (closed) return {
+				kind: "impliedClose",
+				index: i,
+				tag: closed
+			};
+		}
 		if (!final) {
 			const rest = buffer.slice(i);
-			if (OPENS.some((open) => open.length > rest.length && open.startsWith(rest))) return {
+			if (delimiters.some((delimiter) => delimiter.length > rest.length && delimiter.startsWith(rest))) return {
 				kind: "hold",
 				index: i
 			};
@@ -313,179 +333,4 @@ function isAllBackticks(text) {
 	return text.length > 0;
 }
 //#endregion
-//#region node_modules/.pnpm/@oh-my-pi+pi-ai@17.3.5/node_modules/@oh-my-pi/pi-ai/src/utils/stream-markup-healing.ts
-/**
-* Streaming-safe filters for leaked chat-template tool-call and thinking markup.
-*
-* Hosted models sometimes leak raw template markup into visible `content` instead
-* of returning structured events. Tool-call healing delegates to the same
-* dialect scanners used by owned in-band tool calling; this file keeps the
-* provider-facing compatibility wrapper and model/provider gating.
-*/
-const KIMI_SECTION_END = "<|tool_calls_section_end|>";
-const DSML_TOOL_CALLS_CLOSE_FULLWIDTH = "</｜DSML｜tool_calls>";
-const DSML_TOOL_CALLS_CLOSE_ASCII = "</|DSML|tool_calls>";
-/**
-* State machine that consumes streamed visible text and emits cleaned text,
-* thinking deltas, and reconstructed tool calls.
-*
-* A {@link ThinkingInbandScanner} always heals leaked reasoning idioms
-* (`<think>`, `<thinking>`, ` ```thinking `, Gemma/Harmony channels, …) out of
-* the visible channel. For Kimi / DeepSeek-DSML the provider tool-call grammar
-* runs first and its cleaned text is piped through that thinking healer, so a
-* model can leak tool-call markup and reasoning in the same stream.
-*
-* Feed only one stream channel (usually `delta.content` / `message.content`).
-* Mixing reasoning and visible text into the same instance can corrupt held-back
-* partial tag buffers.
-*/
-var StreamMarkupHealing = class {
-	#pattern;
-	/** Provider tool-call grammar (Kimi tokens / DSML envelope); absent for plain text streams. */
-	#toolScanner;
-	/** Always-on healer for leaked reasoning idioms in the visible text channel. */
-	#thinkingScanner = new ThinkingInbandScanner();
-	#sectionTerminated = false;
-	#completed = [];
-	constructor(options) {
-		this.#pattern = options.pattern;
-		this.#toolScanner = options.pattern === "kimi" ? createInbandScanner("kimi") : options.pattern === "dsml" ? createInbandScanner("xml", { xmlTagset: "dsml" }) : void 0;
-	}
-	get pattern() {
-		return this.#pattern;
-	}
-	/**
-	* Feed a chunk and return visible text only. Reconstructed tool calls are
-	* stored for {@link drainCompleted}; thinking blocks are intentionally not
-	* returned by this compatibility helper. Use {@link feedEvents} when the caller
-	* needs ordered text/thinking/tool-call events.
-	*/
-	feed(text) {
-		let clean = "";
-		for (const event of this.feedEvents(text)) if (event.type === "text") clean += event.text;
-		else if (event.type === "toolCall") this.#completed.push(event.call);
-		return clean;
-	}
-	/** Feed a chunk and return cleaned text/thinking/tool-call events in stream order. */
-	feedEvents(text) {
-		if (text.length === 0) return [];
-		this.#markSectionClosed(text);
-		if (!this.#toolScanner) return this.#convertScannerEvents(this.#thinkingScanner.feed(text));
-		return this.#convertScannerEvents(this.#healThinking(this.#toolScanner.feed(text)));
-	}
-	/**
-	* Feed a chunk and return cleaned events, excluding synthesized tool calls.
-	* Used when the upstream chunk also carries structured `tool_calls`, keeping
-	* that structured payload as the single source of truth while preserving
-	* adjacent text and thinking events.
-	*/
-	feedEventsWithoutCalls(text) {
-		const events = this.feedEvents(text);
-		let out;
-		for (let i = 0; i < events.length; i++) {
-			const event = events[i];
-			if (event.type === "toolCall") out ??= events.slice(0, i);
-			else if (out) out.push(event);
-		}
-		return out ?? events;
-	}
-	/** Drain accumulated tool calls from calls to {@link feed}. */
-	drainCompleted() {
-		if (this.#completed.length === 0) return [];
-		return this.#completed.splice(0, this.#completed.length);
-	}
-	/**
-	* Flush held-back stream-end fragments as ordered events. Partial tool-call
-	* sections/envelopes are dropped by the delegated scanners; unterminated
-	* thinking blocks are emitted as thinking, matching the previous MiniMax parser
-	* behavior.
-	*/
-	flushEvents() {
-		const tail = this.#toolScanner ? this.#healThinking(this.#toolScanner.flush()) : [];
-		tail.push(...this.#thinkingScanner.flush());
-		return this.#convertScannerEvents(tail);
-	}
-	/** Flush held-back text only. Reconstructed calls are retained for {@link drainCompleted}. */
-	flushPending() {
-		let clean = "";
-		for (const event of this.flushEvents()) if (event.type === "text") clean += event.text;
-		else if (event.type === "toolCall") this.#completed.push(event.call);
-		return clean;
-	}
-	/** True once any configured tool-call section/envelope has fully closed. */
-	get sectionClosed() {
-		return this.#sectionTerminated;
-	}
-	#markSectionClosed(text) {
-		if (this.#sectionTerminated || !this.#toolScanner) return;
-		if (this.#pattern === "kimi") {
-			this.#sectionTerminated = text.includes(KIMI_SECTION_END);
-			return;
-		}
-		this.#sectionTerminated = text.includes(DSML_TOOL_CALLS_CLOSE_FULLWIDTH) || text.includes(DSML_TOOL_CALLS_CLOSE_ASCII);
-	}
-	/**
-	* Re-scan the tool scanner's visible text through the always-on thinking
-	* healer: `text` events are healed for leaked reasoning idioms, while the tool
-	* scanner's own thinking / tool-call events pass through in stream order.
-	*/
-	#healThinking(toolEvents) {
-		const out = [];
-		for (const event of toolEvents) if (event.type === "text") out.push(...this.#thinkingScanner.feed(event.text));
-		else out.push(event);
-		return out;
-	}
-	#convertScannerEvents(events) {
-		const out = [];
-		for (const event of events) switch (event.type) {
-			case "text":
-				out.push({
-					type: "text",
-					text: event.text
-				});
-				break;
-			case "thinkingDelta":
-				if (event.delta.length > 0) out.push({
-					type: "thinking",
-					thinking: event.delta
-				});
-				break;
-			case "toolEnd": out.push({
-				type: "toolCall",
-				call: {
-					id: generateHealedToolCallId(),
-					name: event.name,
-					arguments: JSON.stringify(event.arguments)
-				}
-			});
-		}
-		return out;
-	}
-};
-function generateHealedToolCallId() {
-	return `call_${crypto.randomUUID().replace(/-/g, "").slice(0, 24)}`;
-}
-/** Cheap model/provider gate for Kimi-K2 chat-template token leaks. */
-function modelMayLeakKimiToolCalls(provider, modelId) {
-	if (provider === "kimi-code" || provider === "moonshot") return true;
-	return /kimi[-/_.]?k2/i.test(modelId);
-}
-/** Cheap model/provider gate for DeepSeek DSML envelope leaks. */
-function modelMayLeakDsmlToolCalls(provider, modelId) {
-	if (!isDeepseekModelIdOrName(modelId)) return false;
-	return provider === "ollama" || provider === "ollama-cloud" || provider === "nvidia" || provider === "deepseek" || provider === "fireworks" || provider === "nanogpt" || provider === "opencode-go" || provider === "openrouter";
-}
-/**
-* Pick the leaked-markup healer for an OpenAI-compatible / Ollama visible-text
-* stream. Kimi chat-template tokens and DeepSeek DSML envelopes need their
-* dedicated tool-call grammars; every other model uses `"thinking"`. All three
-* patterns run the generic {@link ThinkingInbandScanner}, so leaked reasoning
-* idioms (e.g. a Gemini ` ```thinking ` fence on OpenRouter) are always healed.
-*/
-function getStreamMarkupHealingPattern(provider, modelId) {
-	if (modelMayLeakKimiToolCalls(provider, modelId)) return "kimi";
-	if (modelMayLeakDsmlToolCalls(provider, modelId)) return "dsml";
-	return "thinking";
-}
-//#endregion
-export { getStreamMarkupHealingPattern as n, StreamMarkupHealing as t };
+export { ThinkingInbandScanner as t };

package/lib/{turndown-DN7ByzEI.mjs → turndown-DrX1M4WG.mjs}

@@ -1,7 +1,7 @@
 import { installBunShim as __installBunShim } from "./bun-shim.mjs";
 __installBunShim();
 import { r as __exportAll } from "./fs-promises-shim-Bx0fpxuk.mjs";
-//#region node_modules/.pnpm/@oh-my-pi+pi-utils@17.3.5/node_modules/@oh-my-pi/pi-utils/src/turndown/gfm.ts
+//#region node_modules/.pnpm/@oh-my-pi+pi-utils@18.1.17/node_modules/@oh-my-pi/pi-utils/src/turndown/gfm.ts
 function descendantElements(node, name) {
 	const matches = [];
 	for (const child of Array.from(node.children)) {
@@ -98,7 +98,7 @@ const gfm = (service) => {
 	taskListItems(service);
 };
 //#endregion
-//#region node_modules/.pnpm/@oh-my-pi+pi-utils@17.3.5/node_modules/@oh-my-pi/pi-utils/src/turndown/html.ts
+//#region node_modules/.pnpm/@oh-my-pi+pi-utils@18.1.17/node_modules/@oh-my-pi/pi-utils/src/turndown/html.ts
 const VOID_ELEMENTS = {
 	AREA: true,
 	BASE: true,
@@ -284,7 +284,7 @@ function parseHtmlFragment(html) {
 	const stack = [root];
 	for (const token of htmlTokens(html)) {
 		const parent = stack[stack.length - 1] ?? root;
-		if (token.startsWith("<!--") || /^<!/i.test(token)) continue;
+		if (token.startsWith("<!--") || token.startsWith("<!")) continue;
 		if (!token.startsWith("<")) {
 			parent.append(new HtmlText(decodeEntities(token)));
 			continue;
@@ -317,7 +317,7 @@ function serializeNode(node) {
 	return Array.from(node.childNodes).map(serializeNode).join("");
 }
 //#endregion
-//#region node_modules/.pnpm/@oh-my-pi+pi-utils@17.3.5/node_modules/@oh-my-pi/pi-utils/src/turndown/service.ts
+//#region node_modules/.pnpm/@oh-my-pi+pi-utils@18.1.17/node_modules/@oh-my-pi/pi-utils/src/turndown/service.ts
 const BLOCK_ELEMENTS = {
 	ADDRESS: true,
 	ARTICLE: true,

package/lib/{type-guards-B9VVjRDK.mjs → type-guards-CttAANEx.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/type-guards.ts
+//#region node_modules/.pnpm/@oh-my-pi+pi-utils@18.1.17/node_modules/@oh-my-pi/pi-utils/src/type-guards.ts
 function isRecord(value) {
 	return !!value && typeof value === "object" && !Array.isArray(value);
 }

package/lib/{types-DX_bvuus.mjs → types-PVueGi9S.mjs}

@@ -1,6 +1,6 @@
 import { installBunShim as __installBunShim } from "./bun-shim.mjs";
 __installBunShim();
-import { c as combineSignals } from "./src-BcD0_rQR.mjs";
+import { c as combineSignals } from "./src-BwW51vA5.mjs";
 import { t as ToolAbortError } from "./tool-errors-DoyxivAR.mjs";
 import { scheduler } from "node:timers/promises";
 //#region src/tools/omp/web/scrapers/types.ts
@@ -176,7 +176,7 @@ function getTurndown() {
 	return turndownPromise;
 }
 async function initTurndown() {
-	const { createTurndown } = await import("./turndown-DN7ByzEI.mjs").then((n) => n.r);
+	const { createTurndown } = await import("./turndown-DrX1M4WG.mjs").then((n) => n.r);
 	return createTurndown();
 }
 /**