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

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

@@ -1,103 +1,109 @@
-/** 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";
+/** 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;
+    'codeBlock.title': string;
+    'codeBlock.wrap': string;
+    'codeBlock.unwrap': string;
+    'terminal.signal': string;
+    'terminal.exitCode': string;
+    'terminal.noExitCode': 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;
+    '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;
+    'codeBlock.title': string;
+    'codeBlock.wrap': string;
+    'codeBlock.unwrap': string;
+    'terminal.signal': string;
+    'terminal.exitCode': string;
+    'terminal.noExitCode': 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;
+    '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,49 +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-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;
+/**
+ * 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;

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

@@ -1,77 +1,90 @@
-/**
- * Merged tool-call row — the shadowed `tool.call.toolview` registrant.
- *
- * For the first call of a consecutive run of grouped tools, renders the run as
- * one card (the first call's full row) plus one compact child row per
- * continuation call. For a continuation call, renders nothing: the seat stays
- * empty and the injected stylesheet collapses it out of the flow. When the
- * call is not a chat tool-call node at all (e.g. dispatched as a subcall),
- * falls back to a plain single row so the call never disappears.
- *
- * The row surface mirrors the built-in generic ToolRow: a variant title/icon
- * plus the settled card (read/search/diff/terminal/web) or IN/OUT text. The
- * card primitives' localized label props are built here from the plugin's own
- * dictionary (the primitives are cordis-free and require complete labels).
- *
- * Everything here is a pure function of the chat snapshot + the frozen call
- * slices (replay-deterministic); expand state is component-local view state.
- * @module
- */
-import { type ReactNode } from 'react';
-import type { ToolCallBlock } from '@deepseek-ai/dsh-client-ui-chat/client';
-import type { ToolCallViewProps } from '@deepseek-ai/dsh-client-ui-tool/client';
-import type { PropsLocale } from '@deepseek-ai/dsh-client-ui-slots';
-import type { MergeToolCallsConfig } from '../types.ts';
-/** Locale seat and inject face of the merged row registration. */
-export type MergedToolRowProps = ToolCallViewProps & PropsLocale<'merge-tool-calls'> & {
-    readonly cfg: MergeToolCallsConfig;
-};
-/**
- * The run's main card: the first call's chrome (variant title/icon + state)
- * plus, for a single call, its expandable content card. For a merged run the
- * main row's collapsed summary is the count (`Read · 5 Files`) and the
- * expanded body is the child-rows block (passed in as `children`); the first
- * call is rendered as the first child row so every file path lands on a child
- * row, never on the main row.
- */
-export declare const RowCard: import("react").NamedExoticComponent<{
-    toolName: string;
-    block: ToolCallBlock;
-    cwd: string | undefined;
-    home: string | undefined;
-    openFile: (path: string) => void;
-    inspect: (() => void) | undefined;
-    t: MergedToolRowProps["t"];
-    /** Continuation-call count; 0 means a single-call row (no child rows). */
-    mergedCount: number;
-    /** Child rows for the merged run (all calls, including the first). */
-    children?: ReactNode;
-}>;
-/**
- * One compact continuation row: the main row's tail structure ([sep dot][path]).
- * An expandable call toggles the inline content card on click (mirroring the
- * main row's whole-row disclosure); a read/write/edit-family path additionally
- * renders as an open-file link (the sidebar preview) that stops propagation,
- * exactly like the main row's summary link.
- */
-export declare const ChildRow: import("react").NamedExoticComponent<{
-    toolName: string;
-    block: ToolCallBlock;
-    cwd: string | undefined;
-    home: string | undefined;
-    openFile: (path: string) => void;
-    t: MergedToolRowProps["t"];
-}>;
-/**
- * The shadowed toolview: renders the merged run card for the run's first call,
- * nothing for continuation calls, and a plain single row when this call is not
- * a chat tool-call node.
- *
- * Child-row alignment is measured at runtime, not hardcoded: the main row's
- * separator dot sits after a variable-width title ("Read"/"Search"/"Bash"/…),
- * so its column depends on the rendered font. A layout effect measures the
- * dot's offset from the card root (once, plus on reflow via ResizeObserver)
- * and indents the children so their dots and paths land on the main row's
- * columns — no font/title constants to keep in sync.
- */
-export declare function MergedToolRow({ callId, toolName, block, cwd, home, openFile, inspect, t, cfg, useChat }: MergedToolRowProps): import("react").JSX.Element | null;
+/**
+ * Merged tool-call row — the shadowed `tool.call.toolview` registrant.
+ *
+ * For the first call of a consecutive run of grouped tools, renders the run as
+ * one card (the first call's full row) plus one compact child row per
+ * continuation call. For a continuation call, renders nothing: the seat stays
+ * empty and the injected stylesheet collapses it out of the flow. When the
+ * call is not a chat tool-call node at all (e.g. dispatched as a subcall),
+ * falls back to a plain single row so the call never disappears.
+ *
+ * The row surface mirrors the built-in generic ToolRow: a variant title/icon
+ * plus the settled card (read/search/diff/terminal/web) or IN/OUT text. The
+ * card primitives' localized label props are built here from the plugin's own
+ * dictionary (the primitives are cordis-free and require complete labels).
+ *
+ * Everything here is a pure function of the chat snapshot + the frozen call
+ * slices (replay-deterministic); expand state is component-local view state.
+ * @module
+ */
+import { type ReactNode } from 'react';
+import type { ToolCallBlock } from '@deepseek-ai/dsh-client-ui-chat/client';
+import type { StartedToolCallViewProps, ToolCallViewProps } from '@deepseek-ai/dsh-client-ui-tool/client';
+import type { PropsLocale } from '@deepseek-ai/dsh-client-ui-slots';
+import type { MergeToolCallsConfig } from '../types.ts';
+/** Locale seat and inject face of the merged row registration. */
+export type MergedToolRowProps = ToolCallViewProps & PropsLocale<'merge-tool-calls'> & {
+    readonly cfg: MergeToolCallsConfig;
+};
+/**
+ * Props of the dispatched arm. The preparing stage carries no dispatched
+ * arguments, so only `start`/`result` reach the argument-reading row.
+ */
+export type DispatchedMergedRowProps = StartedToolCallViewProps & PropsLocale<'merge-tool-calls'> & {
+    readonly cfg: MergeToolCallsConfig;
+};
+/**
+ * The run's main card: the first call's chrome (variant title/icon + state)
+ * plus, for a single call, its expandable content card. For a merged run the
+ * main row's collapsed summary is the count (`Read · 5 Files`) and the
+ * expanded body is the child-rows block (passed in as `children`); the first
+ * call is rendered as the first child row so every file path lands on a child
+ * row, never on the main row.
+ */
+export declare const RowCard: import("react").NamedExoticComponent<{
+    toolName: string;
+    block: ToolCallBlock;
+    cwd: string | undefined;
+    home: string | undefined;
+    openFile: (path: string) => void;
+    inspect: (() => void) | undefined;
+    t: MergedToolRowProps["t"];
+    /** Continuation-call count; 0 means a single-call row (no child rows). */
+    mergedCount: number;
+    /** Child rows for the merged run (all calls, including the first). */
+    children?: ReactNode;
+}>;
+/**
+ * One compact continuation row: the main row's tail structure ([sep dot][path]).
+ * An expandable call toggles the inline content card on click (mirroring the
+ * main row's whole-row disclosure); a read/write/edit-family path additionally
+ * renders as an open-file link (the sidebar preview) that stops propagation,
+ * exactly like the main row's summary link.
+ */
+export declare const ChildRow: import("react").NamedExoticComponent<{
+    toolName: string;
+    block: ToolCallBlock;
+    cwd: string | undefined;
+    home: string | undefined;
+    openFile: (path: string) => void;
+    t: MergedToolRowProps["t"];
+}>;
+/**
+ * The dispatched arm: renders the merged run card for the run's first call,
+ * nothing for continuation calls, and a plain single row when this call is not
+ * a chat tool-call node.
+ *
+ * Child-row alignment is measured at runtime, not hardcoded: the main row's
+ * separator dot sits after a variable-width title ("Read"/"Search"/"Bash"/…),
+ * so its column depends on the rendered font. A layout effect measures the
+ * dot's offset from the card root (once, plus on reflow via ResizeObserver)
+ * and indents the children so their dots and paths land on the main row's
+ * columns — no font/title constants to keep in sync.
+ */
+export declare function DispatchedMergedRow({ callId, toolName, block, cwd, home, openFile, inspect, t, cfg, useChat }: DispatchedMergedRowProps): import("react").JSX.Element | null;
+/**
+ * The shadowed `tool.call.toolview` dispatch. The owner props are a three-phase
+ * union: a `preparing` call (no dispatched arguments) renders the lightweight
+ * arm, while `start`/`result` delegate to the dispatched arm.
+ */
+export declare function MergedToolRow(props: MergedToolRowProps): import("react").JSX.Element;

package/lib/types/client/tool-names.d.ts

@@ -9,11 +9,17 @@
  * IN/OUT text — which the merged row reproduces faithfully.
  *
  * Deliberately excluded: tools with custom row cards this plugin does not
- * replicate (`skill`, `cordis_define`, and the live `cordis_run` /
- * `cordis_stop` / `cordis_undefine` rows), and `todo_write` /
- * `ask_user_question` whose summary formatting is tool-specific. They keep
- * their built-in rows unless the user names them in the `tools` config
- * explicitly.
+ * replicate (`skill`, `todo_write` / `ask_user_question` whose summary
+ * formatting is tool-specific, and the read-only Cordis inspection verbs
+ * `cordis_inspect_list` / `cordis_inspect_query` / `cordis_inspect_self`,
+ * which render through ui-tool's own details row). They keep their built-in
+ * rows unless the user names them in the `tools` config explicitly.
+ *
+ * The former dynamic Cordis verbs (`cordis_define`, `cordis_run`,
+ * `cordis_stop`, `cordis_undefine`, `cordis_inspect_self`) and their
+ * `cordis_package_inspect` / `cordis_runtime_inspect` inspection siblings no
+ * longer exist on the wire at 0.1.7-rc.1 (`tool-cordis` was narrowed to
+ * read-only inspection), so they are not listed here.
  * @module
  */
 /** Wire tool names merged by default (empty `tools` config = this list). */

package/lib/types/types.d.ts

@@ -6,8 +6,8 @@ export interface MergeToolCallsConfig {
     /**
      * Wire tool names whose consecutive calls merge. Empty = every built-in
      * generic-family tool (read/grep/glob/edit/write/bash/pwsh/web_search/
-     * web_fetch/run_code/cordis_package_inspect/cordis_runtime_inspect); a
-     * non-empty list is an explicit whitelist (any wire name works).
+     * web_fetch/run_code); a non-empty list is an explicit whitelist (any wire
+     * name works).
      */
     readonly tools: readonly string[];
     /** `adjacent`: any consecutive run in the chat flow; `step`: only within one agent step. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@huanlin/dsh-plugin-merge-tool-calls",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "publishConfig": {
     "access": "public"
   },
@@ -47,13 +47,12 @@
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
     "react": "^18.2.0",
-    "schemastery": "^3.18.0",
-    "@deepseek-ai/dsh-client-locale": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-client-ui-chat": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-client-ui-primitives": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-client-ui-renderer": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-client-ui-slots": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-client-ui-tool": "^0.1.5-rc.1"
+    "@deepseek-ai/dsh-client-locale": "^0.1.7-rc.1",
+    "@deepseek-ai/dsh-client-ui-chat": "^0.1.7-rc.1",
+    "@deepseek-ai/dsh-client-ui-primitives": "^0.1.7-rc.1",
+    "@deepseek-ai/dsh-client-ui-renderer": "^0.1.7-rc.1",
+    "@deepseek-ai/dsh-client-ui-slots": "^0.1.7-rc.1",
+    "@deepseek-ai/dsh-client-ui-tool": "^0.1.7-rc.1"
   },
   "peerDependenciesMeta": {
     "@deepseek-ai/cordis": {
@@ -62,9 +61,6 @@
     "react": {
       "optional": true
     },
-    "schemastery": {
-      "optional": true
-    },
     "@deepseek-ai/dsh-client-locale": {
       "optional": true
     },
@@ -85,13 +81,12 @@
     }
   },
   "devDependencies": {
-    "@deepseek-ai/schemastery": "^3.18.1",
+    "@deepseek-ai/schemastery": "^3.18.4",
     "@types/node": "^22.20.1",
     "@types/react": "~18.3.31",
     "jsdom": "^26.0.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "schemastery": "^3.18.0",
     "tsdown": "^0.15.0",
     "typescript": "^5.9.0",
     "vitest": "^3.2.0"