@huanlin/dsh-plugin-merge-tool-calls 0.2.2 → 0.4.0

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
- * tool-call/read-card/search-card/diff-card/terminal-card/web-card models 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 views. A merged row renders the same surface the built-in
- * row would: a variant title/icon plus a card primitive or IN/OUT text.
- * @module
- */
-import { type ToolCallBlock, type ToolResultNode } from '@deepseek-ai/dsh-client-runtime/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'>;
-/**
- * Distributive `Omit`: a plain `Omit<A | B, K>` keeps only the keys common to
- * both members, dropping the discriminated `files`/`paths` fields. Distributing
- * over the naked type parameter preserves each shape.
- */
-type DistributiveOmit<T, K extends keyof T> = T extends unknown ? Omit<T, K> : never;
-/** Search-card props plus the capped-result recovery locator (mirrors ui-tool). */
-export interface SearchCardModel {
-    readonly card: DistributiveOmit<SearchBlockProps, 'maxLines' | 'className'>;
-    /** The result view's replacement title, which outranks the args summary. */
-    readonly title: string | undefined;
-    readonly recovery: string | undefined;
-}
-/** Diff-card props (mirrors ui-tool; maxLines/className belong to the render site). */
-export interface DiffCardModel {
-    readonly card: Pick<DiffBlockProps, 'diffs'>;
-}
-/** Terminal-card props (mirrors ui-tool; maxLines/className/labels belong to the render site). */
-export interface TerminalCardModel {
-    readonly card: Pick<TerminalBlockProps, 'command' | 'cwd' | 'output' | 'exitCode' | 'signal' | 'running'>;
-    /** The call view's model-authored description shown above the card. */
-    readonly description: string | undefined;
-}
-/** 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: WebBlockProps | 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): 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,15 +1,22 @@
-/**
- * The 19 better-locale override languages for the merged tool-call row copy,
- * keyed by language id. Each dictionary carries the same key set as `en`/`zh`
- * in `./locales.ts` (enforced by the `Record<MergeToolCallsKey, string>`
- * annotation); values keep `{placeholder}` interpolation (e.g. `{n}` in
- * `mergedCount`), matching the better-locale store's `LocaleDict` contract.
- *
- * 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, 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 { ClientContext } from '@deepseek-ai/dsh-client-runtime/client';
-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;

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

@@ -1,57 +1,103 @@
-/** Product copy for the merged tool-call rows. */
-export declare const zh: {
-    running: string;
-    failed: string;
-    stopped: string;
-    expand: string;
-    collapse: string;
-    more: string;
-    showLess: string;
-    mergedCount: string;
-    countFiles: string;
-    countQueries: string;
-    countCommands: string;
-    countPrograms: string;
-    countCalls: string;
-    'terminal.signal': string;
-    'terminal.exitCode': string;
-    'terminal.running': string;
-    'terminal.failed': string;
-    'terminal.done': string;
-    'terminal.copy': string;
-    'terminal.copied': string;
-    'terminal.noOutput': string;
-    'terminal.collapseAria': string;
-    'terminal.collapse': string;
-    'terminal.expandAria': string;
-    'terminal.expandRest': string;
-};
-export type MergeToolCallsKey = keyof typeof zh;
-export declare const en: {
-    running: string;
-    failed: string;
-    stopped: string;
-    expand: string;
-    collapse: string;
-    more: string;
-    showLess: string;
-    mergedCount: string;
-    countFiles: string;
-    countQueries: string;
-    countCommands: string;
-    countPrograms: string;
-    countCalls: string;
-    'terminal.signal': string;
-    'terminal.exitCode': string;
-    'terminal.running': string;
-    'terminal.failed': string;
-    'terminal.done': string;
-    'terminal.copy': string;
-    'terminal.copied': string;
-    'terminal.noOutput': string;
-    'terminal.collapseAria': string;
-    'terminal.collapse': string;
-    'terminal.expandAria': string;
-    'terminal.expandRest': string;
-};
-export declare const NS = "merge-tool-calls";
+/** Product copy for the merged tool-call rows. */
+export declare const zh: {
+    running: string;
+    failed: string;
+    stopped: string;
+    expand: string;
+    collapse: string;
+    more: string;
+    showLess: string;
+    mergedCount: string;
+    countFiles: string;
+    countQueries: string;
+    countCommands: string;
+    countPrograms: string;
+    countCalls: string;
+    copy: string;
+    copied: string;
+    'terminal.signal': string;
+    'terminal.exitCode': string;
+    'terminal.running': string;
+    'terminal.failed': string;
+    'terminal.done': string;
+    'terminal.copy': string;
+    'terminal.copied': string;
+    'terminal.noOutput': string;
+    'terminal.collapseAria': string;
+    'terminal.collapse': string;
+    'terminal.expandAria': string;
+    'terminal.expandRest': string;
+    'read.window': string;
+    'read.collapseAria': string;
+    'read.expandAria': string;
+    'read.expandRest': string;
+    'search.paths': string;
+    'search.paths.truncated': string;
+    'search.matches': string;
+    'search.matches.truncated': string;
+    'search.noResults': string;
+    'search.collapseAria': string;
+    'search.expandAria': string;
+    'search.expandRest': string;
+    'diff.collapseAria': string;
+    'diff.expandAria': string;
+    'diff.expandRest': string;
+    'diff.files': string;
+    'web.noResults': string;
+    'web.sourcesTruncated': string;
+    'web.http': string;
+    'web.contentTruncated': string;
+    'markdown.footnotes': string;
+};
+export type MergeToolCallsKey = keyof typeof zh;
+export declare const en: {
+    running: string;
+    failed: string;
+    stopped: string;
+    expand: string;
+    collapse: string;
+    more: string;
+    showLess: string;
+    mergedCount: string;
+    countFiles: string;
+    countQueries: string;
+    countCommands: string;
+    countPrograms: string;
+    countCalls: string;
+    copy: string;
+    copied: string;
+    'terminal.signal': string;
+    'terminal.exitCode': string;
+    'terminal.running': string;
+    'terminal.failed': string;
+    'terminal.done': string;
+    'terminal.copy': string;
+    'terminal.copied': string;
+    'terminal.noOutput': string;
+    'terminal.collapseAria': string;
+    'terminal.collapse': string;
+    'terminal.expandAria': string;
+    'terminal.expandRest': string;
+    'read.window': string;
+    'read.collapseAria': string;
+    'read.expandAria': string;
+    'read.expandRest': string;
+    'search.paths': string;
+    'search.paths.truncated': string;
+    'search.matches': string;
+    'search.matches.truncated': string;
+    'search.noResults': string;
+    'search.collapseAria': string;
+    'search.expandAria': string;
+    'search.expandRest': string;
+    'diff.collapseAria': string;
+    'diff.expandAria': string;
+    'diff.expandRest': string;
+    'diff.files': string;
+    'web.noResults': string;
+    'web.sourcesTruncated': string;
+    'web.http': string;
+    'web.contentTruncated': string;
+    'markdown.footnotes': string;
+};
+export declare const NS = "merge-tool-calls";

package/lib/types/client/merge-run.d.ts

@@ -1,46 +1,49 @@
-/**
- * Pure detection of a consecutive run of grouped tool calls in the chat flow,
- * and the per-seat merged-group partition over it.
- *
- * A pure function of the chat snapshot (order + node store), so the merged
- * display is deterministic under replay: the web layer recomputes it per frame.
- * @module
- */
-import type { ChatNodeStore, ToolCallBlock } from '@deepseek-ai/dsh-client-runtime/client';
-import type { MergeGroupMode } from '../types.ts';
-/** The wire tool name of a call in either lifecycle form (mirrors ui-tool). */
-export declare function callNameOf(block: ToolCallBlock): string;
-/** Whether the call's wire name is one of the grouped tools (empty = all). */
-export declare function isGroupedTool(name: string, tools: readonly string[]): boolean;
-/** One merged group: the group's first call plus its consecutive continuations. */
-export interface ReadRun {
-    /** Whether this seat is the group's rendering head (the only seat that shows the card). */
-    readonly isFirst: boolean;
-    /** The group's root blocks in flow order (first + continuations). */
-    readonly blocks: readonly ToolCallBlock[];
-}
-/**
- * Compute the merged group this call belongs to.
- *
- * 1. Locates this call's node in the chat order; null when it is not a chat
- *    tool-call node (e.g. a read dispatched as a subcall).
- * 2. Walks backward/forward to the maximal consecutive run containing it. A
- *    call continues the run when it is a grouped tool AND same-tool-same-run:
- *    the identical wire name, or a sibling of the same known variant family
- *    (grep+glob, bash+pwsh, read+web_fetch…). Unknown names (variant
- *    `others`) only merge with themselves, so unrelated tools never share a
- *    card (`adjacent`: any consecutive run; `step`: same agent step as this
- *    call).
- * 3. Partitions the run into `maxGroupSize`-sized groups; this call is the
- *    group's first only when it heads one of those partitions. Truncation
- *    therefore never orphans a call: the excess starts its own group.
- *
- * @param order - chat node key order.
- * @param nodes - chat node store.
- * @param myCallId - the call id of the seat asking about itself.
- * @param tools - grouped wire tool names; empty means every tool.
- * @param groupBy - grouping mode.
- * @param maxGroupSize - per-group cap.
- * @returns the group partition, or null when the call is not a chat tool-call node.
- */
-export declare function readRun(order: readonly string[], nodes: ChatNodeStore, myCallId: string, tools: readonly string[], groupBy: MergeGroupMode, maxGroupSize: number): ReadRun | null;
+/**
+ * Pure detection of a consecutive run of grouped tool calls in the chat flow,
+ * and the per-seat merged-group partition over it.
+ *
+ * A pure function of the chat snapshot (order + node store), so the merged
+ * display is deterministic under replay: the web layer recomputes it per frame.
+ * @module
+ */
+import type { ChatNodeStore, ToolCallBlock } from '@deepseek-ai/dsh-client-ui-chat/client';
+import type { MergeGroupMode } from '../types.ts';
+/** The wire tool name of a call in either lifecycle form (mirrors ui-tool). */
+export declare function callNameOf(block: ToolCallBlock): string;
+/** Whether the call's wire name is one of the grouped tools (empty = all). */
+export declare function isGroupedTool(name: string, tools: readonly string[]): boolean;
+/** One merged group: the group's first call plus its consecutive continuations. */
+export interface ReadRun {
+    /** Whether this seat is the group's rendering head (the only seat that shows the card). */
+    readonly isFirst: boolean;
+    /** The group's root blocks in flow order (first + continuations). */
+    readonly blocks: readonly ToolCallBlock[];
+}
+/**
+ * Compute the merged group this call belongs to.
+ *
+ * 1. Locates this call's node in the chat order; null when it is not a chat
+ *    tool-call node (e.g. a read dispatched as a subcall). The node key
+ *    format stays a ui-conversation internal, so the seat finds itself by
+ *    scanning the store for the tool-call node owning its call id instead of
+ *    recomputing the key.
+ * 2. Walks backward/forward to the maximal consecutive run containing it. A
+ *    call continues the run when it is a grouped tool AND same-tool-same-run:
+ *    the identical wire name, or a sibling of the same known variant family
+ *    (grep+glob, bash+pwsh, read+web_fetch…). Unknown names (variant
+ *    `others`) only merge with themselves, so unrelated tools never share a
+ *    card (`adjacent`: any consecutive run; `step`: same agent step as this
+ *    call).
+ * 3. Partitions the run into `maxGroupSize`-sized groups; this call is the
+ *    group's first only when it heads one of those partitions. Truncation
+ *    therefore never orphans a call: the excess starts its own group.
+ *
+ * @param order - chat node key order.
+ * @param nodes - chat node store.
+ * @param myCallId - the call id of the seat asking about itself.
+ * @param tools - grouped wire tool names; empty means every tool.
+ * @param groupBy - grouping mode.
+ * @param maxGroupSize - per-group cap.
+ * @returns the group partition, or null when the call is not a chat tool-call node.
+ */
+export declare function readRun(order: readonly string[], nodes: ChatNodeStore, myCallId: string, tools: readonly string[], groupBy: MergeGroupMode, maxGroupSize: number): ReadRun | null;