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

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

@@ -1,73 +1,77 @@
-/**
- * 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.
- *
- * 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-runtime/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;
-    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;
-    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, openFile, inspect, t, cfg, useSession }: 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 { 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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@huanlin/dsh-plugin-merge-tool-calls",
-  "version": "0.2.2",
+  "version": "0.4.0",
   "publishConfig": {
     "access": "public"
   },
@@ -17,10 +17,6 @@
       "types": "./lib/types/index.d.ts",
       "import": "./lib/index.js"
     },
-    "./invariant": {
-      "types": "./lib/types/invariant.d.ts",
-      "import": "./lib/invariant.js"
-    },
     "./client": {
       "types": "./lib/types/client/index.d.ts",
       "default": "./lib/client.js"
@@ -38,9 +34,10 @@
     },
     "client": {
       "inject": [
-        "@deepseek-ai/dsh-client-runtime",
         "@deepseek-ai/dsh-client-locale",
+        "@deepseek-ai/dsh-client-ui-renderer",
         "@deepseek-ai/dsh-client-ui-tool",
+        "@deepseek-ai/dsh-client-ui-chat",
         "@deepseek-ai/dsh-client-ui-slots",
         "@deepseek-ai/dsh-client-ui-primitives"
       ],
@@ -48,17 +45,18 @@
     }
   },
   "peerDependencies": {
-    "cordis": "^4.0.0-rc.7",
+    "@deepseek-ai/cordis": "^4.0.1",
     "react": "^18.2.0",
     "schemastery": "^3.18.0",
-    "@deepseek-ai/dsh-client-locale": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-runtime": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-primitives": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-slots": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-tool": "0.1.0-rc.6"
+    "@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"
   },
   "peerDependenciesMeta": {
-    "cordis": {
+    "@deepseek-ai/cordis": {
       "optional": true
     },
     "react": {
@@ -70,12 +68,15 @@
     "@deepseek-ai/dsh-client-locale": {
       "optional": true
     },
-    "@deepseek-ai/dsh-client-runtime": {
+    "@deepseek-ai/dsh-client-ui-chat": {
       "optional": true
     },
     "@deepseek-ai/dsh-client-ui-primitives": {
       "optional": true
     },
+    "@deepseek-ai/dsh-client-ui-renderer": {
+      "optional": true
+    },
     "@deepseek-ai/dsh-client-ui-slots": {
       "optional": true
     },
@@ -84,17 +85,9 @@
     }
   },
   "devDependencies": {
-    "@deepseek-ai/dsh-client-locale": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-runtime": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-conversation": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-primitives": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-slots": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-ui-tool": "0.1.0-rc.6",
-    "@deepseek-ai/dsh-invariants": "0.1.0-rc.6",
     "@deepseek-ai/schemastery": "^3.18.1",
     "@types/node": "^22.20.1",
     "@types/react": "~18.3.31",
-    "cordis": "^4.0.0-rc.7",
     "jsdom": "^26.0.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

package/lib/invariant.js

@@ -1,11 +0,0 @@
-//#region src/invariant.ts
-const PACKAGE_NAME = "@huanlin/dsh-plugin-merge-tool-calls";
-const name = "merge-tool-calls-invariant";
-const inject = ["invariants"];
-/** No runtime invariant: this package contributes client-only slot entries. */
-const install = () => {};
-/** Register package ownership with the invariant service. */
-const apply = (ctx) => Promise.resolve(ctx.invariants.register(PACKAGE_NAME, install));
-
-//#endregion
-export { apply, inject, name };

package/lib/types/invariant.d.ts

@@ -1,12 +0,0 @@
-/** Package invariant companion for dsh-plugin-merge-tool-calls. */
-import type { InvariantInstaller } from '@deepseek-ai/dsh-invariants';
-export declare const name = "merge-tool-calls-invariant";
-export declare const inject: string[];
-interface InvariantContext {
-    invariants: {
-        register: (name: string, installer: InvariantInstaller) => () => void;
-    };
-}
-/** Register package ownership with the invariant service. */
-export declare const apply: (ctx: InvariantContext) => Promise<() => void>;
-export {};