@xiaoso/dsh-tool-plus 0.1.16 → 0.1.17-beta.0

package/lib/{turndown-D6fof1OX.mjs → turndown-Vya8SavL.mjs}

@@ -1,18 +1,26 @@
 import { installBunShim as __installBunShim } from "./bun-shim.mjs";
 __installBunShim();
-import { r as __exportAll } from "./fs-promises-shim-B2YFWkcd.mjs";
-//#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) {
+import { i as __exportAll } from "./fs-promises-shim-CANAxFWh.mjs";
+//#region node_modules/.pnpm/@oh-my-pi+pi-utils@18.12.6/node_modules/@oh-my-pi/pi-utils/src/turndown/gfm.ts
+/** Elements named `name` below `node` in document order, not descending into nested tables. */
+function descendantElements(node, name, limit = Number.POSITIVE_INFINITY) {
 	const matches = [];
-	for (const child of Array.from(node.children)) {
+	const stack = [];
+	const pushChildren = (parent) => {
+		const children = parent.children;
+		for (let index = children.length - 1; index >= 0; index--) stack.push(children[index]);
+	};
+	pushChildren(node);
+	while (stack.length > 0 && matches.length < limit) {
+		const child = stack.pop();
 		if (child.nodeName === name) matches.push(child);
-		if (child.nodeName !== "TABLE") matches.push(...descendantElements(child, name));
+		if (child.nodeName !== "TABLE") pushChildren(child);
 	}
 	return matches;
 }
 function isHeadingTable(node) {
 	if (node.nodeName !== "TABLE") return false;
-	const firstRow = descendantElements(node, "TR")[0];
+	const firstRow = descendantElements(node, "TR", 1)[0];
 	if (!firstRow) return false;
 	const cells = Array.from(firstRow.children);
 	return cells.length > 0 && cells.every((cell) => cell.nodeName === "TH");
@@ -47,12 +55,13 @@ function renderTable(service, table) {
 /** Install GitHub fenced code blocks selected by `highlight-source-*` wrappers. */
 const highlightedCodeBlock = (service) => {
 	service.addRule("highlightedCodeBlock", {
+		skipContent: true,
 		filter(node) {
 			return node.nodeName === "DIV" && /(?:^|\s)highlight-source-([^\s]+)/.test(node.getAttribute("class") ?? "");
 		},
 		replacement(_content, node, options) {
 			const language = /(?:^|\s)highlight-source-([^\s]+)/.exec(node.getAttribute("class") ?? "")?.[1] ?? "";
-			const text = descendantElements(node, "PRE")[0]?.textContent ?? "";
+			const text = descendantElements(node, "PRE", 1)[0]?.textContent ?? "";
 			return `\n\n${options.fence}${language}\n${text}\n${options.fence}\n\n`;
 		}
 	});
@@ -73,6 +82,7 @@ const strikethrough = (service) => {
 /** Install GFM task-list checkbox conversion. */
 const taskListItems = (service) => {
 	service.addRule("taskListItems", {
+		skipContent: true,
 		filter(node) {
 			return node.nodeName === "INPUT" && node.parentNode?.nodeName === "LI" && (node.getAttribute("type") ?? "").toLowerCase() === "checkbox";
 		},
@@ -84,6 +94,7 @@ const taskListItems = (service) => {
 /** Install GFM table conversion for tables with a heading row. */
 const tables = (service) => {
 	service.addRule("table", {
+		skipContent: true,
 		filter: isHeadingTable,
 		replacement(_content, node) {
 			return renderTable(service, node);
@@ -98,7 +109,7 @@ const gfm = (service) => {
 	taskListItems(service);
 };
 //#endregion
-//#region node_modules/.pnpm/@oh-my-pi+pi-utils@18.1.17/node_modules/@oh-my-pi/pi-utils/src/turndown/html.ts
+//#region node_modules/.pnpm/@oh-my-pi+pi-utils@18.12.6/node_modules/@oh-my-pi/pi-utils/src/turndown/html.ts
 const VOID_ELEMENTS = {
 	AREA: true,
 	BASE: true,
@@ -151,8 +162,13 @@ function escapeAttribute(value) {
 var HtmlNode = class {
 	parentNode = null;
 	childNodes = [];
+	/** Position in the parent's `childNodes`; assigned on append (the tree is immutable after parse). */
+	index = -1;
+	/** Position in the parent's `children`; -1 for non-element nodes. */
+	elementIndex = -1;
+	#elements = [];
 	get children() {
-		return this.childNodes.filter((child) => child.nodeType === 1);
+		return this.#elements;
 	}
 	get firstChild() {
 		return this.childNodes[0] ?? null;
@@ -161,17 +177,27 @@ var HtmlNode = class {
 		return this.childNodes[this.childNodes.length - 1] ?? null;
 	}
 	get previousSibling() {
-		if (!this.parentNode) return null;
-		const index = this.parentNode.childNodes.indexOf(this);
-		return index > 0 ? this.parentNode.childNodes[index - 1] ?? null : null;
+		if (!this.parentNode || this.index <= 0) return null;
+		return this.parentNode.childNodes[this.index - 1] ?? null;
 	}
 	get nextSibling() {
 		if (!this.parentNode) return null;
-		const index = this.parentNode.childNodes.indexOf(this);
-		return index >= 0 ? this.parentNode.childNodes[index + 1] ?? null : null;
+		return this.parentNode.childNodes[this.index + 1] ?? null;
 	}
 	get textContent() {
-		return this.childNodes.map((child) => child.textContent).join("");
+		const parts = [];
+		const stack = [];
+		for (let index = this.childNodes.length - 1; index >= 0; index--) stack.push(this.childNodes[index]);
+		while (stack.length > 0) {
+			const node = stack.pop();
+			if (node instanceof HtmlText) {
+				parts.push(node.value);
+				continue;
+			}
+			const childNodes = node.childNodes;
+			for (let index = childNodes.length - 1; index >= 0; index--) stack.push(childNodes[index]);
+		}
+		return parts.join("");
 	}
 	getAttribute(_name) {
 		return null;
@@ -181,7 +207,12 @@ var HtmlNode = class {
 	}
 	append(child) {
 		child.parentNode = this;
+		child.index = this.childNodes.length;
 		this.childNodes.push(child);
+		if (child.nodeType === 1) {
+			child.elementIndex = this.#elements.length;
+			this.#elements.push(child);
+		}
 	}
 };
 var HtmlText = class extends HtmlNode {
@@ -317,7 +348,7 @@ function serializeNode(node) {
 	return Array.from(node.childNodes).map(serializeNode).join("");
 }
 //#endregion
-//#region node_modules/.pnpm/@oh-my-pi+pi-utils@18.1.17/node_modules/@oh-my-pi/pi-utils/src/turndown/service.ts
+//#region node_modules/.pnpm/@oh-my-pi+pi-utils@18.12.6/node_modules/@oh-my-pi/pi-utils/src/turndown/service.ts
 const BLOCK_ELEMENTS = {
 	ADDRESS: true,
 	ARTICLE: true,
@@ -396,11 +427,30 @@ const DEFAULT_OPTIONS = {
 	linkReferenceStyle: "full",
 	preformattedCode: false
 };
-function matchesFilter(filter, node, options) {
+function normalizeFilter(filter) {
+	if (typeof filter === "function") return filter;
+	if (typeof filter === "string") return filter.toLowerCase();
+	return filter.map((tag) => tag.toLowerCase());
+}
+function matchesFilter(filter, node, name, options) {
 	if (typeof filter === "function") return filter(node, options);
-	const name = node.nodeName.toLowerCase();
-	if (typeof filter === "string") return name === filter.toLowerCase();
-	return filter.some((tag) => name === tag.toLowerCase());
+	if (typeof filter === "string") return name === filter;
+	return filter.includes(name);
+}
+/** Equivalent to `node.textContent.trim() !== ""` without building the subtree text. */
+function hasNonWhitespaceText(node) {
+	const stack = [node];
+	while (stack.length > 0) {
+		const current = stack.pop();
+		const type = current.nodeType;
+		if (type === 3 || type === 4) {
+			if (/\S/.test(current.textContent ?? "")) return true;
+		} else if (type === 1 || type === 9 || type === 11) {
+			const childNodes = current.childNodes;
+			for (let index = 0; index < childNodes.length; index++) stack.push(childNodes[index]);
+		}
+	}
+	return false;
 }
 function contentWithFlankingWhitespace(content, delimiter) {
 	const leading = content.match(/^\s+/)?.[0] ?? "";
@@ -416,8 +466,8 @@ function listItemPrefix(node, options) {
 	const parent = node.parentNode;
 	if (parent?.nodeName !== "OL") return `${options.bulletListMarker}   `;
 	const start = Number(parent.getAttribute("start") ?? "1");
-	const siblings = Array.from(parent.children);
-	return `${(Number.isFinite(start) ? start : 1) + siblings.indexOf(node)}.  `;
+	const index = node.elementIndex ?? Array.prototype.indexOf.call(parent.children, node);
+	return `${(Number.isFinite(start) ? start : 1) + index}.  `;
 }
 function hasNonblankDescendant(node) {
 	for (const child of Array.from(node.children)) if (NONBLANK_EMPTY_ELEMENTS[child.nodeName] || hasNonblankDescendant(child)) return true;
@@ -443,18 +493,19 @@ var TurndownService = class {
 		if (previous >= 0) this.#rules.splice(previous, 1);
 		this.#rules.unshift({
 			key,
-			rule
+			rule,
+			filter: normalizeFilter(rule.filter)
 		});
 		return this;
 	}
 	/** Preserve matching elements as HTML when no custom rule handles them. */
 	keep(filter) {
-		this.#keepFilters.unshift(filter);
+		this.#keepFilters.unshift(normalizeFilter(filter));
 		return this;
 	}
 	/** Drop matching elements and all of their converted content. */
 	remove(filter) {
-		this.#removeFilters.unshift(filter);
+		this.#removeFilters.unshift(normalizeFilter(filter));
 		return this;
 	}
 	/** Install one plugin or an ordered list of plugins. */
@@ -496,16 +547,17 @@ var TurndownService = class {
 			return node.parentNode?.nodeName === "CODE" ? collapsed : this.escape(collapsed);
 		}
 		if (node.nodeType !== 1) return this.#convertChildren(node);
-		if (!(node.textContent ?? "").trim() && !NONBLANK_EMPTY_ELEMENTS[node.nodeName] && !hasNonblankDescendant(node)) return this.options.blankReplacement?.("", node, this.options) ?? (BLOCK_ELEMENTS[node.nodeName] ? "\n\n" : "");
+		if (!hasNonWhitespaceText(node) && !NONBLANK_EMPTY_ELEMENTS[node.nodeName] && !hasNonblankDescendant(node)) return this.options.blankReplacement?.("", node, this.options) ?? (BLOCK_ELEMENTS[node.nodeName] ? "\n\n" : "");
+		const name = node.nodeName.toLowerCase();
+		const custom = this.#rules.find((entry) => matchesFilter(entry.filter, node, name, this.options));
 		const block = Boolean(BLOCK_ELEMENTS[node.nodeName]);
 		if (block) this.#previousSourceWhitespace = false;
-		const content = this.#convertChildren(node);
+		const content = custom?.rule.skipContent ? "" : this.#convertChildren(node);
 		if (block) this.#previousSourceWhitespace = false;
 		if (node.nodeName === "CODE") this.#previousSourceWhitespace = false;
-		const custom = this.#rules.find((entry) => matchesFilter(entry.rule.filter, node, this.options));
 		if (custom) return custom.rule.replacement(content, node, this.options);
-		if (this.#keepFilters.some((filter) => matchesFilter(filter, node, this.options))) return this.options.keepReplacement?.(content, node, this.options) ?? serializeNode(node);
-		if (this.#removeFilters.some((filter) => matchesFilter(filter, node, this.options))) return "";
+		if (this.#keepFilters.some((filter) => matchesFilter(filter, node, name, this.options))) return this.options.keepReplacement?.(content, node, this.options) ?? serializeNode(node);
+		if (this.#removeFilters.some((filter) => matchesFilter(filter, node, name, this.options))) return "";
 		return this.#defaultReplacement(content, node);
 	}
 	#defaultReplacement(content, node) {

package/lib/types/tools/hashline/native/index.d.ts

@@ -23,7 +23,7 @@
  * ast-edit / ast-grep / plan-mode-guard) import it directly.
  */
 import { blockRangeAt, EditSession, EditStore, editAutoGeneratedMessage, editDescription, editDiffString, editGrammar, editInspect, hashlineCountOps, structuredPatchHunks } from "@oh-my-pi/pi-natives";
-import type { BlockRange, BlockRangeOptions, EditApplyOutcome, EditApplyRequest, EditDiffResult, EditFileOpIntent, EditFileOutcome, EditFilePreview, EditInspection, EditMatcherEntry, EditPolicy, EditPreviewBatch, EditVaultRoot, EditWriteRequest, EditWriteResponse } from "@oh-my-pi/pi-natives";
+import type { BlockRange, BlockRangeOptions, EditApplyOutcome, EditApplyRequest, EditDiffResult, EditFileOpIntent, EditFileOutcome, EditFilePreview, EditInspection, EditMatcherEntry, EditPolicy, EditPreviewBatch, EditWriteRequest, EditWriteResponse } from "@oh-my-pi/pi-natives";
 import { buildCompactDiffPreview } from "./diff-preview.ts";
 import type { CompactDiffOptions, CompactDiffPreview } from "./diff-preview.ts";
 import { detectLineEnding, normalizeToLF, restoreLineEndings, stripBom } from "./normalize.ts";
@@ -106,4 +106,4 @@ export declare class MismatchError extends Error {
     constructor(message: string);
 }
 export { blockRangeAt, buildCompactDiffPreview, detectLineEnding, EditStore, EditSession, editAutoGeneratedMessage, editDescription, editDiffString, editGrammar, editInspect, hashlineCountOps, normalizeToLF, restoreLineEndings, stripBom, structuredPatchHunks, };
-export type { BlockRange, BlockRangeOptions, BomResult, CompactDiffOptions, CompactDiffPreview, EditApplyOutcome, EditApplyRequest, EditDiffResult, EditFileOpIntent, EditFileOutcome, EditFilePreview, EditInspection, EditMatcherEntry, EditPolicy, EditPreviewBatch, EditVaultRoot, EditWriteRequest, EditWriteResponse, LineEnding, };
+export type { BlockRange, BlockRangeOptions, BomResult, CompactDiffOptions, CompactDiffPreview, EditApplyOutcome, EditApplyRequest, EditDiffResult, EditFileOpIntent, EditFileOutcome, EditFilePreview, EditInspection, EditMatcherEntry, EditPolicy, EditPreviewBatch, EditWriteRequest, EditWriteResponse, LineEnding, };

package/lib/types/tools/hashline/native/policy.d.ts

@@ -70,27 +70,25 @@ export declare function canonicalCwd(cwd: string): string;
  *                         documents `enforcePlanModeWrite` as a deliberate
  *                         no-op), and no DSH session installs
  *                         `getPlanModeState`, so this resolves to `false`.
- * - `localSandboxRoot`  — upstream resolves the `local://` root. DSH has no
- *                         `local://` write sandbox: the edit-path guard
- *                         (`edit/adapter/tools/plan-mode-guard.ts`) hardcodes
- *                         `targetsLocalSandbox → false` and documents plan
- *                         mode as a hint layer, so `undefined` reproduces the
- *                         old engine's `allowTagPathRecovery` exactly (cwd
- *                         only). **If DSH ever wires a real sandbox root, it
- *                         must go through {@link canonicalCwd} too** — the
- *                         engine's containment check is byte-wise on
- *                         `localSandboxRoot` just like on `cwd`.
- *                         Consequence (D-3, awaiting the Lead's ruling): the
- *                         vendored engine's `allowTagPathRecovery` override —
- *                         which let a bare/mis-typed authored path rebind onto
- *                         the file its snapshot tag uniquely names — has no
- *                         counterpart here. The native engine now decides tag
- *                         path recovery from `cwd` / `localSandboxRoot` /
- *                         `vaultRoots` / `homeDir` alone, so a bare filename
- *                         that needs rebinding fails with native's own error
- *                         rather than silently landing on a recovered path.
- * - `vaultRoots`        — upstream `isVaultEnabled() ? cachedVaultRoots() : …`.
- *                         DSH has no `vault://` protocol → `undefined`.
+ * - `maxColumns`        — upstream `displayMaxColumns(settings)`: read's
+ *                         `tools.outputMaxColumns` bounded by
+ *                         `DEFAULT_MAX_COLUMN` (512), or 512 when read never
+ *                         cuts lines. DSH resolves the same setting through
+ *                         `resolveOutputMaxColumns`, so the mapping stays
+ *                         identical; the engine uses this cap to decide when a
+ *                         hashline anchor on a long line needs recorded read
+ *                         provenance.
+ * - `urlSchemes` / `urlAliasSchemes` — upstream lists the internal-URL
+ *                         router specs (and the schemes whose `scheme:/x`
+ *                         spelling aliases `scheme://x`). DSH wires no
+ *                         internal-URL router into the edit path and installs
+ *                         no `resolveUrl` callback, so both stay empty: the
+ *                         engine only ever sees plain paths here.
+ * - `planWritableRoots` — upstream `router.sandboxRoots(context)`: plain-path
+ *                         roots writable while plan mode is active. DSH's
+ *                         plan mode is a hint layer with no sandbox roots, so
+ *                         this stays empty while `planActive` still carries
+ *                         the hint.
  * - `homeDir`           — `os.homedir()` (upstream :571); the engine uses it
  *                         to recognise and refuse home-directory escapes.
  * - `rawInput`          — see {@link HashlinePolicyOptions.rawInput}.

package/lib/types/tools/omp/session/agent-storage.d.ts

@@ -120,7 +120,7 @@ export declare class AgentStorage {
      * @param credentials - New credentials to store
      * @returns Array of newly stored credentials with their database IDs
      */
-    replaceAuthCredentialsForProvider(provider: string, credentials: AuthCredential[]): StoredAuthCredential[];
+    replaceAuthCredentials(provider: string, credentials: AuthCredential[]): Promise<StoredAuthCredential[]>;
     /**
      * Updates an existing auth credential by ID.
      * @param id - Database row ID of the credential to update
@@ -132,13 +132,13 @@ export declare class AgentStorage {
      * @param id - Database row ID of the credential to disable
      * @param disabledCause - Human-readable cause stored with the disabled row
      */
-    deleteAuthCredential(id: number, disabledCause: string): void;
+    deleteAuthCredential(id: number, disabledCause: string): Promise<boolean>;
     /**
      * Disables all auth credentials for a provider with a persisted cause.
      * @param provider - Provider name whose credentials should be disabled
      * @param disabledCause - Human-readable cause stored with the disabled rows
      */
-    deleteAuthCredentialsForProvider(provider: string, disabledCause: string): void;
+    deleteAuthCredentials(provider: string, disabledCause: string): Promise<void>;
     /**
      * Gets a cached value by key. Returns null if not found or expired.
      */

package/lib/types/tools/shared/bun-named-shim.d.ts

@@ -5,6 +5,11 @@ export declare const YAML: {
     parse: (s: string) => unknown;
     stringify: (v: unknown) => string;
 };
+/** Bun.JSONC (pi-tui keybindings) — json5 is a tolerant superset of JSONC. */
+export declare const JSONC: {
+    parse: (s: string) => unknown;
+    stringify: (v: unknown) => string;
+};
 /** Bun build plugin hook (pi-utils module-timer) — inert under Node. */
 export declare function plugin(): void;
 /** Minimal Bun-shell result (pi-ai perplexity OAuth; never reached on non-macOS). */

package/lib/{types-BLrLohwK.mjs → types-tH1v9uRm.mjs}

@@ -1,6 +1,6 @@
 import { installBunShim as __installBunShim } from "./bun-shim.mjs";
 __installBunShim();
-import { c as combineSignals } from "./src-AELUUb5U.mjs";
+import { u as combineSignals } from "./src-BhinCSpi.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-D6fof1OX.mjs").then((n) => n.r);
+	const { createTurndown } = await import("./turndown-Vya8SavL.mjs").then((n) => n.r);
 	return createTurndown();
 }
 /**