@lmzhen/dsh-evolution-merge-ui 0.34.0 → 0.36.0

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

@@ -0,0 +1,34 @@
+/** One merge row: summary, stage, facts, one primary decision and the copy/sort drawer. */
+import { type DragEvent, type ReactNode } from 'react';
+import type { MergeRowView } from './api.ts';
+type Translate = (key: string, values?: Readonly<Record<string, string | number>>) => string;
+export interface RowSortHandlers {
+    start(id: string): void;
+    over(event: DragEvent<HTMLDivElement>): void;
+    drop(id: string): void;
+    end(): void;
+    menu(id: string, x: number, y: number): void;
+}
+/**
+ * Render one row as a decision card. The approve action is the only primary; A/B, reject and
+ * auxiliary sort/copy commands cannot borrow that weight.
+ * @param props - row, translator, copier, sort hooks, body opener and decision callback.
+ * @returns the row with drag/keyboard wiring and a separate more drawer.
+ */
+export declare function MergeRow(props: {
+    row: MergeRowView;
+    t: Translate;
+    copy: (command: string) => void;
+    sort: RowSortHandlers;
+    openBoth: (a: {
+        name: string;
+        side: 'live' | 'archive';
+    }, b: {
+        name: string;
+        side: 'live' | 'archive';
+    }, rowId: string | undefined) => void;
+    onDecide: ((rowId: string, verb: 'approve' | 'reject') => void) | undefined;
+    busy: boolean;
+}): ReactNode;
+export {};
+//# sourceMappingURL=MergeRow.d.ts.map

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

@@ -0,0 +1,16 @@
+/** The merge run strips: active/last identity, state, progress, report and details. */
+import { type ReactNode } from 'react';
+import type { MergeViewPayload } from './api.ts';
+type Translate = (key: string, values?: Readonly<Record<string, string | number>>) => string;
+/**
+ * Render active and last runs as two independently labelled strips.
+ * @param props - view, translator and command copier.
+ * @returns the strips, or null when neither run exists.
+ */
+export declare function MergeRunStrips({ view, t, copy }: {
+    view: MergeViewPayload;
+    t: Translate;
+    copy: (command: string) => void;
+}): ReactNode;
+export {};
+//# sourceMappingURL=MergeRunStrip.d.ts.map

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

@@ -0,0 +1,15 @@
+/** The merge settings summary: two read-only state chips and one settings path. */
+import { type ReactNode } from 'react';
+import type { MergeViewPayload } from './api.ts';
+type Translate = (key: string, values?: Readonly<Record<string, string | number>>) => string;
+/**
+ * Render the read-only approval state without the old large settings card.
+ * @param props - the merge view and translator.
+ * @returns two chips and the one current settings path.
+ */
+export declare function MergeSettings({ view, t }: {
+    view: MergeViewPayload;
+    t: Translate;
+}): ReactNode;
+export {};
+//# sourceMappingURL=MergeSettings.d.ts.map

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

@@ -17,6 +17,10 @@ export interface QueueState {
     nextCursor?: string | undefined;
     failure?: MergeFailure | undefined;
 }
+export interface BodyTarget {
+    readonly name: string;
+    readonly side: 'live' | 'archive';
+}
 export type OverlayState = {
     kind: 'body';
     name: string;
@@ -24,6 +28,14 @@ export type OverlayState = {
     status: 'loading' | 'ready' | 'error';
     body?: MergeBody;
     failure?: MergeFailure;
+} | {
+    kind: 'pair';
+    a: BodyTarget;
+    b: BodyTarget;
+    status: 'loading' | 'ready' | 'error';
+    aBody?: MergeBody;
+    bBody?: MergeBody;
+    failure?: MergeFailure;
 } | {
     kind: 'history';
     status: 'loading' | 'ready' | 'error';
@@ -71,6 +83,7 @@ export declare class MergeStore {
     refresh(): void;
     loadMore(): void;
     openBody(name: string, side: 'live' | 'archive', rowId?: string): Promise<void>;
+    openPair(a: BodyTarget, b: BodyTarget, rowId?: string): Promise<void>;
     openHistory(): Promise<void>;
     closeOverlay(): void;
     dispose(): void;

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

@@ -1,7 +1,7 @@
 /** Batch 4 merge panel: keyed read store, four tabs, local overlays, localized errors. */
 import { type ReactNode } from 'react';
 import type { MergeStore } from './MergeStore.ts';
-import type { SettingsFace } from '@lmzhen/dsh-evolution-client-kit';
+import { type SettingsFace } from '@lmzhen/dsh-evolution-client-kit';
 export type Translate = (key: string, values?: Readonly<Record<string, string | number>>) => string;
 export interface MergeFace {
     store: MergeStore;

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

@@ -144,7 +144,7 @@ export interface MergeHistoryItem {
     reason: string;
     reasonCode?: string;
     lastVersion: number;
-    archivedAt: string;
+    archivedAt: string | null;
     sourceRunId?: string;
 }
 export interface MergeStateReadiness {

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

@@ -0,0 +1,20 @@
+/** Pure presentation decisions for one merge row; no network or store state. */
+export type PairSummary = {
+    readonly kind: 'same';
+    readonly text: string;
+} | {
+    readonly kind: 'different';
+    readonly a: string | null;
+    readonly b: string | null;
+} | {
+    readonly kind: 'missing';
+};
+/**
+ * Compare the two source summaries after trimming. Equal non-empty text is one fact;
+ * missing text stays missing rather than being invented.
+ * @param a - source A summary, or null.
+ * @param b - source B summary, or null.
+ * @returns the presentation form.
+ */
+export declare function summarizePair(a: string | null | undefined, b: string | null | undefined): PairSummary;
+//# sourceMappingURL=merge-presentation.d.ts.map

package/package.json

@@ -11,7 +11,7 @@
       ]
     }
   },
-  "version": "0.34.0",
+  "version": "0.36.0",
   "publishConfig": {
     "access": "public"
   },
@@ -51,7 +51,7 @@
     "react-dom": "^18.2.0"
   },
   "dependencies": {
-    "@lmzhen/dsh-evolution-client-kit": "^0.34.0"
+    "@lmzhen/dsh-evolution-client-kit": "^0.36.0"
   },
   "engines": {
     "dsh": ">=0.2.1-rc.2 <0.2.2-0"

package/lib/types/client/platform-menu.d.ts

@@ -1,52 +0,0 @@
-/**
- * The one seam onto the platform's menu material and rows.
- *
- * The family bundle keeps `@deepseek-ai/*` external, so the platform components are reached through
- * the loader-provided `require` (the same door the Markdown seam uses). A deployment without the
- * row gets the panel's own menu fallback; the platform path is not a hard dependency.
- * @module dsh-evolution-merge-ui/client
- */
-import { type ReactNode } from 'react';
-/** The platform's menu surface: a styled container that accepts div props. */
-export type MenuSurfaceComponent = (props: Record<string, unknown> & {
-    children?: ReactNode;
-}) => ReactNode;
-/** The platform's menu row: role=menuitem plus selected/disabled/danger semantics. */
-export type MenuItemButtonComponent = (props: {
-    children: ReactNode;
-    current?: boolean;
-    disabled?: boolean;
-    danger?: boolean;
-    separatorBefore?: boolean;
-    onSelect: () => void;
-}) => ReactNode;
-/** The two components this panel consumes from one platform module row. */
-export interface MenuPrimitives {
-    MenuSurface: MenuSurfaceComponent;
-    MenuItemButton: MenuItemButtonComponent;
-}
-/** One row of the coordinate menu, independent of the renderer. */
-export interface RowMenuAction {
-    readonly id: string;
-    readonly label: string;
-    readonly onSelect: () => void;
-    readonly separatorBefore?: boolean;
-}
-/**
- * Render the coordinate menu through the platform primitives.
- * @param primitives - the platform MenuSurface/MenuItemButton pair.
- * @param actions - rows in display order.
- * @param label - accessible menu name.
- * @param style - fixed position computed from the pointer.
- * @returns the menu element.
- */
-export declare function renderPlatformMenu(primitives: MenuPrimitives, actions: readonly RowMenuAction[], label: string, style: Record<string, string | number>): ReactNode;
-/**
- * Accept only the two component functions; a namespace row without them is not a menu.
- * @param row - the module row's exports.
- * @returns the two components, or undefined.
- */
-export declare function menuPrimitivesFrom(row: Record<string, unknown>): MenuPrimitives | undefined;
-/** The module-table row, when this deployment carries it. */
-export declare const PLATFORM_MENU: MenuPrimitives | undefined;
-//# sourceMappingURL=platform-menu.d.ts.map