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

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

@@ -1,13 +1,16 @@
 /**
  * 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.
+ * 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, type ToolResultNode } from '@deepseek-ai/dsh-client-runtime/client';
+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. */
@@ -15,29 +18,26 @@ 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 (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: DistributiveOmit<SearchBlockProps, 'maxLines' | 'className'>;
-    /** The result view's replacement title, which outranks the args summary. */
-    readonly title: string | undefined;
+    readonly card: SearchCardModelProps;
     readonly recovery: string | undefined;
 }
-/** Diff-card props (mirrors ui-tool; maxLines/className belong to the render site). */
+/** 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/className/labels belong to the render site). */
+/** 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 view's model-authored description shown above the card. */
+    /** 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. */
@@ -63,7 +63,7 @@ export interface CallRowModel {
     readonly diff: DiffCardModel | null;
     readonly read: ReadCardModel | null;
     readonly search: SearchCardModel | null;
-    readonly web: WebBlockProps | null;
+    readonly web: WebCardModel | null;
 }
 /**
  * Flatten a settled result's content blocks to display text.
@@ -74,4 +74,4 @@ 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;
+export declare function callRowModel(toolName: string, block: ToolCallBlock, cwd: string | undefined, home: string | undefined): CallRowModel;

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

@@ -1,9 +1,16 @@
 /**
  * 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.
+ * 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
@@ -12,4 +19,4 @@
  */
 import type { MergeToolCallsKey } from './locales.ts';
 /** All override-language dictionaries for the `NS` namespace. */
-export declare const dicts: Record<string, Record<MergeToolCallsKey, string>>;
+export declare const dicts: Record<string, Partial<Record<MergeToolCallsKey, string>>>;

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

@@ -10,7 +10,7 @@
  *
  * @module @dsh-external/dsh-plugin-merge-tool-calls/client
  */
-import type { ClientContext } from '@deepseek-ai/dsh-client-runtime/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' {

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

@@ -13,6 +13,8 @@ export declare const zh: {
     countCommands: string;
     countPrograms: string;
     countCalls: string;
+    copy: string;
+    copied: string;
     'terminal.signal': string;
     'terminal.exitCode': string;
     'terminal.running': string;
@@ -25,6 +27,27 @@ export declare const zh: {
     '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: {
@@ -41,6 +64,8 @@ export declare const en: {
     countCommands: string;
     countPrograms: string;
     countCalls: string;
+    copy: string;
+    copied: string;
     'terminal.signal': string;
     'terminal.exitCode': string;
     'terminal.running': string;
@@ -53,5 +78,26 @@ export declare const en: {
     '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

@@ -6,7 +6,7 @@
  * 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 { 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;
@@ -23,7 +23,10 @@ export interface ReadRun {
  * 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).
+ *    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

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

@@ -9,14 +9,16 @@
  * 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.
+ * 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-runtime/client';
+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';
@@ -36,6 +38,7 @@ 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"];
@@ -55,6 +58,7 @@ export declare const ChildRow: import("react").NamedExoticComponent<{
     toolName: string;
     block: ToolCallBlock;
     cwd: string | undefined;
+    home: string | undefined;
     openFile: (path: string) => void;
     t: MergedToolRowProps["t"];
 }>;
@@ -70,4 +74,4 @@ export declare const ChildRow: import("react").NamedExoticComponent<{
  * 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;
+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.3.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.2-rc.1",
+    "@deepseek-ai/dsh-client-ui-chat": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-client-ui-primitives": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-client-ui-renderer": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-client-ui-slots": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-client-ui-tool": "^0.1.2-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 {};