@huanlin/dsh-plugin-merge-tool-calls 0.4.1 → 0.4.2

package/lib/index.js

@@ -1,4 +1,4 @@
-//#region node_modules/.pnpm/@deepseek-ai+cosmokit@1.8.2/node_modules/@deepseek-ai/cosmokit/lib/index.js
+//#region node_modules/.pnpm/@deepseek-ai+cosmokit@1.8.5/node_modules/@deepseek-ai/cosmokit/lib/index.js
 /** Return true when a value is `null` or `undefined`. */
 function isNullable(value) {
 	return value === null || value === void 0;
@@ -22,6 +22,43 @@ function pick(source, keys, forced) {
 	for (const key of keys) if (forced || source[key] !== void 0) result[key] = source[key];
 	return result;
 }
+/** Shared config references used by schema validators and plugin runtimes. */
+const write = Symbol.for("cosmokit.volatile.write");
+function snapshot(value, ancestors = /* @__PURE__ */ new Set()) {
+	if (typeof value === "function") throw new TypeError("volatile config cannot contain functions");
+	if (value === null || typeof value !== "object") return value;
+	if (ancestors.has(value)) throw new TypeError("volatile config cannot contain cycles");
+	ancestors.add(value);
+	try {
+		if (Array.isArray(value)) return Object.freeze(value.map((item) => snapshot(item, ancestors)));
+		if (Object.getPrototypeOf(value) !== Object.prototype && Object.getPrototypeOf(value) !== null) throw new TypeError("volatile config objects must be plain objects or arrays");
+		return Object.freeze(Object.fromEntries(Object.entries(value).map(([key, item]) => [key, snapshot(item, ancestors)])));
+	} finally {
+		ancestors.delete(value);
+	}
+}
+/**
+* Create a detached reference containing an immutable copy of the supplied data.
+* @param value - validated config data; class instances and functions are unsupported.
+* @returns a reference whose value is updated only by its owning runtime.
+*/
+function createVolatile(value) {
+	let current = snapshot(value);
+	return Object.freeze({
+		get: () => current,
+		[write]: (value$1) => {
+			current = value$1;
+		}
+	});
+}
+/**
+* Identify references across ESM/CJS copies of the shared library.
+* @param value - a parsed config value.
+* @returns whether the value implements the shared reference protocol.
+*/
+function isVolatile(value) {
+	return typeof value === "object" && value !== null && write in value;
+}
 /** Test values using `instanceof` with a `toStringTag` fallback. */
 function is(type, value) {
 	if (arguments.length === 1) return (value$1) => is(type, value$1);
@@ -106,26 +143,47 @@ function clone(source, refs = /* @__PURE__ */ new Map()) {
 	}
 	return result;
 }
-/** Deeply compare arrays, dates, regexps, buffers, and plain object fields. */
+/**
+* Compare values recursively, treating two volatile references as equal regardless of value.
+* Strict comparison distinguishes null/undefined, treats opaque objects by identity,
+* compares URLs by normalized href, treats array holes as undefined, and considers distinct cyclic structures unequal.
+* @param a - first value.
+* @param b - second value.
+* @param strict - whether to require strict data equality outside volatile references.
+* @returns whether the values compare equal.
+*/
 function deepEqual(a, b, strict) {
-	if (a === b) return true;
-	if (!strict && isNullable(a) && isNullable(b)) return true;
-	if (typeof a !== typeof b) return false;
-	if (typeof a !== "object") return false;
-	if (!a || !b) return false;
-	function check(test, then) {
-		return test(a) ? test(b) ? then(a, b) : false : test(b) ? false : void 0;
-	}
-	return check(Array.isArray, (a$1, b$1) => a$1.length === b$1.length && a$1.every((item, index) => deepEqual(item, b$1[index]))) ?? check(is("Date"), (a$1, b$1) => a$1.valueOf() === b$1.valueOf()) ?? check(is("RegExp"), (a$1, b$1) => a$1.source === b$1.source && a$1.flags === b$1.flags) ?? check(isArrayBufferLike, (a$1, b$1) => {
-		if (a$1.byteLength !== b$1.byteLength) return false;
-		const viewA = new Uint8Array(a$1);
-		const viewB = new Uint8Array(b$1);
-		for (let i = 0; i < viewA.length; i++) if (viewA[i] !== viewB[i]) return false;
-		return true;
-	}) ?? Object.keys({
-		...a,
-		...b
-	}).every((key) => deepEqual(a[key], b[key], strict));
+	const ancestors = /* @__PURE__ */ new Set();
+	function compare(a$1, b$1) {
+		if (a$1 === b$1) return true;
+		if (isVolatile(a$1) || isVolatile(b$1)) return isVolatile(a$1) && isVolatile(b$1);
+		if (!strict && isNullable(a$1) && isNullable(b$1)) return true;
+		if (typeof a$1 !== typeof b$1 || typeof a$1 !== "object" || !a$1 || !b$1) return false;
+		if (ancestors.has(a$1)) return false;
+		function check(test, then) {
+			return test(a$1) ? test(b$1) ? then(a$1, b$1) : false : test(b$1) ? false : void 0;
+		}
+		ancestors.add(a$1);
+		try {
+			return check(Array.isArray, (a$2, b$2) => {
+				if (a$2.length !== b$2.length) return false;
+				for (let index = 0; index < a$2.length; index++) if (!compare(a$2[index], b$2[index])) return false;
+				return true;
+			}) ?? check(is("Date"), (a$2, b$2) => a$2.valueOf() === b$2.valueOf()) ?? check(is("URL"), (a$2, b$2) => a$2.href === b$2.href) ?? check(is("RegExp"), (a$2, b$2) => a$2.source === b$2.source && a$2.flags === b$2.flags) ?? check(isArrayBufferLike, (a$2, b$2) => {
+				if (a$2.byteLength !== b$2.byteLength) return false;
+				const viewA = new Uint8Array(a$2);
+				const viewB = new Uint8Array(b$2);
+				for (let i = 0; i < viewA.length; i++) if (viewA[i] !== viewB[i]) return false;
+				return true;
+			}) ?? ((!strict || [a$1, b$1].every((value) => Object.getPrototypeOf(value) === Object.prototype || Object.getPrototypeOf(value) === null)) && Object.keys({
+				...a$1,
+				...b$1
+			}).every((key) => compare(a$1[key], b$1[key])));
+		} finally {
+			ancestors.delete(a$1);
+		}
+	}
+	return compare(a, b);
 }
 /** Time constants plus parsing and formatting helpers. */
 var Time;
@@ -199,7 +257,7 @@ var Time;
 })(Time || (Time = {}));
 
 //#endregion
-//#region node_modules/.pnpm/@deepseek-ai+schemastery@3.18.1/node_modules/@deepseek-ai/schemastery/lib/index.mjs
+//#region node_modules/.pnpm/@deepseek-ai+schemastery@3.18.4/node_modules/@deepseek-ai/schemastery/lib/index.mjs
 const kSchema = Symbol.for("schemastery");
 const kValidationError = Symbol.for("ValidationError");
 globalThis.__schemastery_index__ ??= 0;
@@ -375,6 +433,7 @@ Schema.prototype.pattern = function pattern(regexp) {
 	return schema;
 };
 Schema.prototype.simplify = function simplify(value) {
+	if (isVolatile(value)) value = value.get();
 	if (deepEqual(value, this.meta.default, this.type === "dict")) return null;
 	if (isNullable(value)) return value;
 	if (this.type === "object" || this.type === "dict") {
@@ -431,12 +490,49 @@ for (const key of [
 	};
 	return schema;
 } });
+Schema.prototype.volatile = function volatile() {
+	if (this.meta.volatile) throw new TypeError("volatile schema is already wrapped");
+	return this.extra("volatile", true);
+};
 const resolvers = {};
+const checkedVolatile = Symbol("checked-volatile-schema");
+function validateVolatileSchema(schema, path = [], blocked = false, seen = /* @__PURE__ */ new Map()) {
+	const states = seen.get(schema) ?? /* @__PURE__ */ new Set();
+	if (states.has(blocked)) return;
+	states.add(blocked);
+	seen.set(schema, states);
+	if (schema.meta?.volatile && blocked) throw new ValidationError("volatile fields require a fixed object path without an enclosing volatile field", { path });
+	const nested = blocked || !!schema.meta?.volatile;
+	if (schema.dict) for (const [key, child] of Object.entries(schema.dict)) validateVolatileSchema(child, [...path, key], nested, seen);
+	if (schema.sKey) validateVolatileSchema(schema.sKey, [...path, "<key>"], true, seen);
+	if (schema.inner && (schema.type !== "lazy" || schema.inner[kSchema])) validateVolatileSchema(schema.inner, [...path, "*"], true, seen);
+	if (schema.list) for (let index = 0; index < schema.list.length; index++) validateVolatileSchema(schema.list[index], [...path, String(index)], true, seen);
+}
 Schema.extend = function extend(type, resolve) {
 	resolvers[type] = resolve;
 };
 Schema.resolve = function resolve(data, schema, options = {}, strict = false) {
 	if (!schema) return [data];
+	if (!options[checkedVolatile]) {
+		validateVolatileSchema(schema, options.path);
+		options = {
+			...options,
+			[checkedVolatile]: true
+		};
+	}
+	if (schema.meta?.volatile) {
+		const inner = Schema(schema);
+		inner.meta = {
+			...schema.meta,
+			volatile: false
+		};
+		const [value, adapted] = Schema.resolve(data, inner, options, strict);
+		try {
+			return [createVolatile(value), adapted];
+		} catch (error) {
+			throw new ValidationError(error instanceof Error ? error.message : String(error), options);
+		}
+	}
 	if (options.ignore?.(data, schema)) return [data];
 	if (isNullable(data) && schema.type !== "lazy") {
 		if (schema.meta.required) throw new ValidationError(`missing required value`, options);
@@ -539,6 +635,7 @@ Schema.extend("lazy", (data, schema, options, strict) => {
 			...schema.meta,
 			...schema.inner.meta
 		};
+		validateVolatileSchema(schema.inner, options.path, true);
 	}
 	return Schema.resolve(data, schema.inner, options, strict);
 });
@@ -638,7 +735,7 @@ function property(data, key, schema, options) {
 	} catch (e) {
 		if (!options?.autofix) throw e;
 		delete data[key];
-		return schema.meta.default;
+		return schema.meta.volatile ? createVolatile(schema.meta.default) : schema.meta.default;
 	}
 }
 Schema.extend("array", (data, { inner, meta }, options) => {

package/lib/types/client/card-model.d.ts

@@ -1,77 +1,77 @@
-/**
- * Pure card/row derivation from a frozen call slice, mirroring ui-tool's
- * meta-based card models (read/search/diff/terminal/web) at the plugin
- * boundary (those models are ui-tool internals and cannot be imported
- * cross-package). Same wire contract, same defensive treatment of untrusted
- * result metadata: cards derive from the call arguments plus the persisted
- * result `meta` and single text block. A merged row renders the same surface
- * the built-in row would: a variant title/icon plus a card primitive or IN/OUT
- * text. The localized label props each primitive now requires are supplied by
- * the render site (`rows.tsx`), not here.
- * @module
- */
-import type { ToolCallBlock, ToolResultNode } from '@deepseek-ai/dsh-client-ui-chat/client';
-import type { DiffBlockProps, ReadBlockProps, SearchBlockProps, TerminalBlockProps, WebBlockProps } from '@deepseek-ai/dsh-client-ui-primitives';
-import { type ToolVariant } from './tool-names.ts';
-/** Row state semantic, mirroring ui-tool's ToolRowState. */
-export type RowState = 'running' | 'ok' | 'error' | 'stopped';
-export type { ToolVariant } from './tool-names.ts';
-/** Read-card props the ReadBlock primitive draws (per-render maxLines owned by the caller). */
-export type ReadCardModel = Pick<ReadBlockProps, 'label' | 'lines' | 'totalLines' | 'lang'>;
-type DistributiveOmit<T, K extends keyof T> = T extends unknown ? Omit<T, K> : never;
-/** Search-card props (the primitive's own union minus the render site's fields). */
-type SearchCardModelProps = DistributiveOmit<SearchBlockProps, 'labels' | 'maxLines' | 'className'>;
-/** Search-card props plus the capped-result recovery locator (mirrors ui-tool). */
-export interface SearchCardModel {
-    readonly card: SearchCardModelProps;
-    readonly recovery: string | undefined;
-}
-/** Diff-card props (mirrors ui-tool; maxLines/labels/className belong to the render site). */
-export interface DiffCardModel {
-    readonly card: Pick<DiffBlockProps, 'diffs'>;
-}
-/** Terminal-card props (mirrors ui-tool; maxLines/labels/className belong to the render site). */
-export interface TerminalCardModel {
-    readonly card: Pick<TerminalBlockProps, 'command' | 'cwd' | 'output' | 'exitCode' | 'signal' | 'running'>;
-    /** The call's model-authored description shown above the card. */
-    readonly description: string | undefined;
-}
-/** Web-card props (the primitive's own union minus the render site's fields). */
-export type WebCardModel = DistributiveOmit<WebBlockProps, 'labels' | 'className'>;
-/** True when a settled terminal card reports a failing exit (mirrors ui-tool). */
-export declare function terminalFailed(model: TerminalCardModel): boolean;
-/** Everything a merged row needs, derived once from the frozen slice. */
-export interface CallRowModel {
-    readonly state: RowState;
-    readonly variant: ToolVariant;
-    /** Row title: variant title, or the tool-owned title when it refines one. */
-    readonly title: string;
-    /** Args/result-derived one-line summary (path for file tools, query for searches, …). */
-    readonly summary: string;
-    /** Expanded-body input text (pretty args); null = no input section. */
-    readonly body: string | null;
-    /** Flattened result text; null while running or when the result carries no text. */
-    readonly output: string | null;
-    /** First result line on an error row (the collapsed summary's error text). */
-    readonly errorSummary: string | null;
-    /** Openable workspace path from args; absent for non-file tools and errors. */
-    readonly filePath: string | undefined;
-    /** Whether the row has anything to expand (a card, args body, or output). */
-    readonly expandable: boolean;
-    /** Expanded-body content cards, mutually exclusive, or null when absent. */
-    readonly terminal: TerminalCardModel | null;
-    readonly diff: DiffCardModel | null;
-    readonly read: ReadCardModel | null;
-    readonly search: SearchCardModel | null;
-    readonly web: WebCardModel | null;
-}
-/**
- * Flatten a settled result's content blocks to display text.
- * @param node - settled result node.
- * @returns joined text (may be empty).
- */
-export declare function resultText(node: ToolResultNode): string;
-/** Strip the workspace root from a workspace-rooted absolute path (display only). */
-export declare function relativizeToCwd(text: string, cwd: string | undefined): string;
-/** Derive the row model for one call of a grouped tool. */
-export declare function callRowModel(toolName: string, block: ToolCallBlock, cwd: string | undefined, home: string | undefined): CallRowModel;
+/**
+ * Pure card/row derivation from a frozen call slice, mirroring ui-tool's
+ * meta-based card models (read/search/diff/terminal/web) at the plugin
+ * boundary (those models are ui-tool internals and cannot be imported
+ * cross-package). Same wire contract, same defensive treatment of untrusted
+ * result metadata: cards derive from the call arguments plus the persisted
+ * result `meta` and single text block. A merged row renders the same surface
+ * the built-in row would: a variant title/icon plus a card primitive or IN/OUT
+ * text. The localized label props each primitive now requires are supplied by
+ * the render site (`rows.tsx`), not here.
+ * @module
+ */
+import type { ToolCallBlock, ToolResultNode } from '@deepseek-ai/dsh-client-ui-chat/client';
+import type { DiffBlockProps, ReadBlockProps, SearchBlockProps, TerminalBlockProps, WebBlockProps } from '@deepseek-ai/dsh-client-ui-primitives';
+import { type ToolVariant } from './tool-names.ts';
+/** Row state semantic, mirroring ui-tool's ToolRowState. */
+export type RowState = 'running' | 'ok' | 'error' | 'stopped';
+export type { ToolVariant } from './tool-names.ts';
+/** Read-card props the ReadBlock primitive draws (per-render maxLines owned by the caller). */
+export type ReadCardModel = Pick<ReadBlockProps, 'label' | 'lines' | 'totalLines' | 'lang'>;
+type DistributiveOmit<T, K extends keyof T> = T extends unknown ? Omit<T, K> : never;
+/** Search-card props (the primitive's own union minus the render site's fields). */
+type SearchCardModelProps = DistributiveOmit<SearchBlockProps, 'labels' | 'maxLines' | 'className'>;
+/** Search-card props plus the capped-result recovery locator (mirrors ui-tool). */
+export interface SearchCardModel {
+    readonly card: SearchCardModelProps;
+    readonly recovery: string | undefined;
+}
+/** Diff-card props (mirrors ui-tool; maxLines/labels/className belong to the render site). */
+export interface DiffCardModel {
+    readonly card: Pick<DiffBlockProps, 'diffs'>;
+}
+/** Terminal-card props (mirrors ui-tool; maxLines/labels/className belong to the render site). */
+export interface TerminalCardModel {
+    readonly card: Pick<TerminalBlockProps, 'command' | 'cwd' | 'output' | 'exitCode' | 'signal' | 'running'>;
+    /** The call's model-authored description shown above the card. */
+    readonly description: string | undefined;
+}
+/** Web-card props (the primitive's own union minus the render site's fields). */
+export type WebCardModel = DistributiveOmit<WebBlockProps, 'labels' | 'className'>;
+/** True when a settled terminal card reports a failing exit (mirrors ui-tool). */
+export declare function terminalFailed(model: TerminalCardModel): boolean;
+/** Everything a merged row needs, derived once from the frozen slice. */
+export interface CallRowModel {
+    readonly state: RowState;
+    readonly variant: ToolVariant;
+    /** Row title: variant title, or the tool-owned title when it refines one. */
+    readonly title: string;
+    /** Args/result-derived one-line summary (path for file tools, query for searches, …). */
+    readonly summary: string;
+    /** Expanded-body input text (pretty args); null = no input section. */
+    readonly body: string | null;
+    /** Flattened result text; null while running or when the result carries no text. */
+    readonly output: string | null;
+    /** First result line on an error row (the collapsed summary's error text). */
+    readonly errorSummary: string | null;
+    /** Openable workspace path from args; absent for non-file tools and errors. */
+    readonly filePath: string | undefined;
+    /** Whether the row has anything to expand (a card, args body, or output). */
+    readonly expandable: boolean;
+    /** Expanded-body content cards, mutually exclusive, or null when absent. */
+    readonly terminal: TerminalCardModel | null;
+    readonly diff: DiffCardModel | null;
+    readonly read: ReadCardModel | null;
+    readonly search: SearchCardModel | null;
+    readonly web: WebCardModel | null;
+}
+/**
+ * Flatten a settled result's content blocks to display text.
+ * @param node - settled result node.
+ * @returns joined text (may be empty).
+ */
+export declare function resultText(node: ToolResultNode): string;
+/** Strip the workspace root from a workspace-rooted absolute path (display only). */
+export declare function relativizeToCwd(text: string, cwd: string | undefined): string;
+/** Derive the row model for one call of a grouped tool. */
+export declare function callRowModel(toolName: string, block: ToolCallBlock, cwd: string | undefined, home: string | undefined): CallRowModel;

package/lib/types/client/dictionaries.d.ts

@@ -1,22 +1,22 @@
-/**
- * The 19 better-locale override languages for the merged tool-call row copy,
- * keyed by language id. Values keep `{placeholder}` interpolation (e.g. `{n}`
- * in `mergedCount`), matching the better-locale store's `LocaleDict`
- * contract.
- *
- * Each dictionary is PARTIAL: languages carry the keys they translate, and a
- * missing key falls through the locale lookup chain to the base `en`/`zh`
- * dictionary registered by the plugin. Dictionaries written before the
- * v0.1.2-alpha.1 adaptation predate the read/search/diff/web card-label keys
- * (`read.*` / `search.*` / `diff.*` / `web.*` / `markdown.*` / `copy` /
- * `copied`); those render in English under an override language until a
- * translation lands here.
- *
- * The apply function registers these into `ctx.betterLocale` (the override
- * store) under `NS`, so when the user selects an override language through
- * dsh-plugin-better-locale (and DSH is on 'en', whose slot the override
- * borrows), the row copy renders in the override language.
- */
-import type { MergeToolCallsKey } from './locales.ts';
-/** All override-language dictionaries for the `NS` namespace. */
-export declare const dicts: Record<string, Partial<Record<MergeToolCallsKey, string>>>;
+/**
+ * The 19 better-locale override languages for the merged tool-call row copy,
+ * keyed by language id. Values keep `{placeholder}` interpolation (e.g. `{n}`
+ * in `mergedCount`), matching the better-locale store's `LocaleDict`
+ * contract.
+ *
+ * Each dictionary is PARTIAL: languages carry the keys they translate, and a
+ * missing key falls through the locale lookup chain to the base `en`/`zh`
+ * dictionary registered by the plugin. Dictionaries written before the
+ * v0.1.2-alpha.1 adaptation predate the read/search/diff/web card-label keys
+ * (`read.*` / `search.*` / `diff.*` / `web.*` / `markdown.*` / `copy` /
+ * `copied`); those render in English under an override language until a
+ * translation lands here.
+ *
+ * The apply function registers these into `ctx.betterLocale` (the override
+ * store) under `NS`, so when the user selects an override language through
+ * dsh-plugin-better-locale (and DSH is on 'en', whose slot the override
+ * borrows), the row copy renders in the override language.
+ */
+import type { MergeToolCallsKey } from './locales.ts';
+/** All override-language dictionaries for the `NS` namespace. */
+export declare const dicts: Record<string, Partial<Record<MergeToolCallsKey, string>>>;

package/lib/types/client/index.d.ts

@@ -1,29 +1,29 @@
-/**
- * merge-tool-calls — browser half.
- *
- * Shadows the shipped `tool.call.toolview` entries for every grouped tool at
- * priority -1 (the keyed slot's shadowing rule: lowest priority renders). An
- * empty `tools` config means every built-in generic-family tool
- * (see {@link ALL_TOOL_NAMES}); a non-empty list is an explicit whitelist.
- * The shadowed component merges consecutive calls of one tool in the chat flow
- * into a single card with compact child rows.
- *
- * @module @dsh-external/dsh-plugin-merge-tool-calls/client
- */
-import type { Context as ClientContext } from '@deepseek-ai/cordis';
-import { type MergeToolCallsConfig } from '../types.ts';
-import { type MergeToolCallsKey } from './locales.ts';
-declare module '@deepseek-ai/dsh-client-ui-slots' {
-    interface LocaleNamespaceMap {
-        /** Copy for the merged tool-call rows. */
-        'merge-tool-calls': MergeToolCallsKey;
-    }
-}
-/** Required services: the slot registry (toolview shadowing) and locale. */
-export declare const inject: string[];
-/**
- * Register one shadowed toolview per grouped tool.
- * @param ctx - client root context.
- * @param config - row config; defaults apply when the loader passes none.
- */
-export declare function apply(ctx: ClientContext, config?: Partial<MergeToolCallsConfig>): void;
+/**
+ * merge-tool-calls — browser half.
+ *
+ * Shadows the shipped `tool.call.toolview` entries for every grouped tool at
+ * priority -1 (the keyed slot's shadowing rule: lowest priority renders). An
+ * empty `tools` config means every built-in generic-family tool
+ * (see {@link ALL_TOOL_NAMES}); a non-empty list is an explicit whitelist.
+ * The shadowed component merges consecutive calls of one tool in the chat flow
+ * into a single card with compact child rows.
+ *
+ * @module @dsh-external/dsh-plugin-merge-tool-calls/client
+ */
+import type { Context as ClientContext } from '@deepseek-ai/cordis';
+import { type MergeToolCallsConfig } from '../types.ts';
+import { type MergeToolCallsKey } from './locales.ts';
+declare module '@deepseek-ai/dsh-client-ui-slots' {
+    interface LocaleNamespaceMap {
+        /** Copy for the merged tool-call rows. */
+        'merge-tool-calls': MergeToolCallsKey;
+    }
+}
+/** Required services: the slot registry (toolview shadowing) and locale. */
+export declare const inject: string[];
+/**
+ * Register one shadowed toolview per grouped tool.
+ * @param ctx - client root context.
+ * @param config - row config; defaults apply when the loader passes none.
+ */
+export declare function apply(ctx: ClientContext, config?: Partial<MergeToolCallsConfig>): void;