dsh-diff-approval 0.7.0 → 0.9.0

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

@@ -3,5 +3,15 @@ import type { InjectFace, PropsLocale, PropsRuntime } from '@deepseek-ai/dsh-cli
 import type { PendingPanelFace } from './slots.ts';
 /** Full panel props composed by the sidebar footer-action slot. */
 export type PendingPanelProps = PropsRuntime<'sidebar.footer.action'> & InjectFace<PendingPanelFace> & PropsLocale<'diff-approval'>;
+/**
+ * Open the DSH settings dialog and switch to this plugin's section. The
+ * settings shell keeps its open state and the active section id as
+ * component-local viewing state with no cross-plugin service, so the dialog
+ * is opened by clicking the sidebar's settings trigger and then the nav cell
+ * for this section. `element.click()` still fires React's delegated click
+ * handlers, reaching the same state transitions a user gesture would.
+ * @param sectionLabel - the nav label of this plugin's settings section.
+ */
+export declare function openSettingsSection(sectionLabel: string): void;
 /** Render the pending-edit review panel and its unified footer action. */
-export declare function PendingPanel({ wide, useSessions, usePending, onRefresh, onKeep, onRevert, onBlockKeep, onBlockRevert, onOpen, t, }: PendingPanelProps): import("react").JSX.Element;
+export declare function PendingPanel({ wide, useSessions, usePending, onRefresh, onKeep, onRevert, onBlockKeep, onBlockRevert, onOpen, onPasteReference, onUndo, onRedo, onImportVcs, onAckRedoCleared, t, }: PendingPanelProps): import("react").JSX.Element;

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

@@ -0,0 +1,11 @@
+/** DSH Settings top-level section for this plugin's preferences. */
+import type { PropsLocale, PropsRuntime } from '@deepseek-ai/dsh-client-ui-slots';
+/** Full component props assembled by the Settings slot renderer. */
+export type DiffApprovalSettingsTabProps = PropsRuntime<'settings.section'> & PropsLocale<'diff-approval'>;
+/**
+ * The plugin's preferences: auto-paste a copied reference into the input, and
+ * whether importing workspace VCS changes includes untracked files. Each row
+ * mirrors the harness's Agent-preset row (title + description on the left, a
+ * pill picker on the right) with the two boolean states 打开 / 关闭.
+ */
+export declare function DiffApprovalSettingsTab({ t }: DiffApprovalSettingsTabProps): import("react").JSX.Element;

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

@@ -15,12 +15,22 @@ export declare const zh: {
     'panel.searchPlaceholder': string;
     'panel.missing': string;
     'panel.missingHint': string;
+    'panel.externalChanged': string;
+    'panel.dismiss': string;
     'panel.createHint': string;
+    'panel.pasteOnCopy': string;
+    'panel.pasteOnCopyDesc': string;
+    'panel.importUntracked': string;
+    'panel.importUntrackedDesc': string;
+    'settings.tabLabel': string;
     'row.create': string;
+    'row.failed': string;
     'row.added': string;
     'row.removed': string;
     'action.keep': string;
     'action.revert': string;
+    'action.keepAll': string;
+    'action.revertAll': string;
     'action.openFile': string;
     'action.revealFile': string;
     'action.busy': string;
@@ -31,7 +41,16 @@ export declare const zh: {
     'action.langAuto': string;
     'action.langAutoDetected': string;
     'action.langSelect': string;
+    'action.toggleOn': string;
+    'action.toggleOff': string;
+    'action.importVcs': string;
+    'action.importVcsBusy': string;
+    'panel.importNone': string;
+    'panel.importDone': string;
+    'panel.importNoVcs': string;
+    'panel.importFailed': string;
     'action.search': string;
+    'action.settings': string;
     'action.expand': string;
     'action.exitFullscreen': string;
     'action.close': string;
@@ -62,12 +81,22 @@ export declare const en: {
     'panel.searchPlaceholder': string;
     'panel.missing': string;
     'panel.missingHint': string;
+    'panel.externalChanged': string;
+    'panel.dismiss': string;
     'panel.createHint': string;
+    'panel.pasteOnCopy': string;
+    'panel.pasteOnCopyDesc': string;
+    'panel.importUntracked': string;
+    'panel.importUntrackedDesc': string;
+    'settings.tabLabel': string;
     'row.create': string;
+    'row.failed': string;
     'row.added': string;
     'row.removed': string;
     'action.keep': string;
     'action.revert': string;
+    'action.keepAll': string;
+    'action.revertAll': string;
     'action.openFile': string;
     'action.revealFile': string;
     'action.busy': string;
@@ -78,7 +107,16 @@ export declare const en: {
     'action.langAuto': string;
     'action.langAutoDetected': string;
     'action.langSelect': string;
+    'action.toggleOn': string;
+    'action.toggleOff': string;
+    'action.importVcs': string;
+    'action.importVcsBusy': string;
+    'panel.importNone': string;
+    'panel.importDone': string;
+    'panel.importNoVcs': string;
+    'panel.importFailed': string;
     'action.search': string;
+    'action.settings': string;
     'action.expand': string;
     'action.exitFullscreen': string;
     'action.close': string;

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

@@ -5,7 +5,7 @@
  * @module dsh-diff-approval/client/port
  */
 import type { ClientConnectionRpc, SessionId } from '@deepseek-ai/dsh-client-connection/client';
-import type { DiffApprovalActionValue, DiffApprovalBlockRange, DiffApprovalListValue, DiffApprovalOpenAction, DiffApprovalOpenValue } from '../types.ts';
+import type { DiffApprovalActionValue, DiffApprovalBlockRange, DiffApprovalListValue, DiffApprovalOpenAction, DiffApprovalOpenValue, VcsImportValue } from '../types.ts';
 /** The channel the host half registers and this port calls. */
 export declare const DIFF_APPROVAL_CHANNEL = "/diff-approval";
 /** This package's business verbs over the review channel. */
@@ -20,6 +20,12 @@ export interface DiffApprovalPort {
     blockKeep(sessionId: SessionId, id: string, block: DiffApprovalBlockRange): Promise<DiffApprovalActionValue>;
     /** Revert one diff block (restore its old lines in the file). */
     blockRevert(sessionId: SessionId, id: string, block: DiffApprovalBlockRange): Promise<DiffApprovalActionValue>;
+    /** Undo the session's last keep/revert (restore the before state). */
+    undo(sessionId: SessionId): Promise<DiffApprovalActionValue>;
+    /** Redo the session's last undone keep/revert (re-apply the after state). */
+    redo(sessionId: SessionId): Promise<DiffApprovalActionValue>;
+    /** Import the workspace's local VCS changes as pending entries. */
+    importVcs(sessionId: SessionId, includeUntracked: boolean): Promise<VcsImportValue>;
     /** Open one file with its default application or reveal it in the folder. */
     open(sessionId: SessionId, id: string, action: DiffApprovalOpenAction): Promise<DiffApprovalOpenValue>;
 }

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

@@ -0,0 +1,19 @@
+/** Client preferences for the review panel, persisted in localStorage. */
+/**
+ * Whether copying a reference should also paste it into the chat input and
+ * focus it. Defaults to on; only an explicit `'0'` disables it.
+ * @returns whether auto-paste is enabled.
+ */
+export declare function pasteOnCopyEnabled(): boolean;
+/** Persist the auto-paste preference. */
+export declare function setPasteOnCopyEnabled(value: boolean): void;
+/**
+ * Whether importing workspace VCS changes includes new/untracked files (git
+ * `??`, svn `?`, p4 unversioned). Defaults to off: collecting them scans the
+ * whole workspace, which can be slow on large trees, so the preference is
+ * opt-in. Only an explicit `'1'` enables it.
+ * @returns whether untracked files are imported.
+ */
+export declare function includeUntrackedEnabled(): boolean;
+/** Persist the import-untracked preference. */
+export declare function setIncludeUntrackedEnabled(value: boolean): void;

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

@@ -1,7 +1,7 @@
 /** The panel's injected business face and its observable snapshot. */
 import type { HostObservable } from '@deepseek-ai/dsh-client-ui-slots';
 import type { SessionId } from '@deepseek-ai/dsh-client-connection/client';
-import type { DiffApprovalBlockRange, DiffApprovalOpenAction, PendingFileDiff } from '../types.ts';
+import type { DiffApprovalBlockRange, DiffApprovalOpenAction, PendingFileDiff, VcsImportValue } from '../types.ts';
 /** What the panel reads and drives: the pending list plus in-flight entries. */
 export interface PendingDiffSnapshot {
     /** Whether a list read has completed at least once. */
@@ -12,8 +12,14 @@ export interface PendingDiffSnapshot {
     error?: string;
     /** Entry ids whose keep/revert is in flight; their controls are disabled. */
     busy: ReadonlySet<string>;
+    /** Entry ids whose last keep/revert failed, mapped to the error message; the panel surfaces these inline (row tag + detail banner) instead of hiding the list. */
+    failed?: ReadonlyMap<string, string> | undefined;
     /** The viewing session's workspace root (when it has one); enables workspace-relative references. */
     workspacePath?: string | undefined;
+    /** Latched when an external change created a fresh undo checkpoint that
+     * superseded the redo history; the panel surfaces it once (deferred if the
+     * panel is closed) via a bottom-right notice. */
+    redoCleared?: boolean;
 }
 /** The injected face the panel component receives from the plugin body. */
 export interface PendingPanelFace {
@@ -33,4 +39,14 @@ export interface PendingPanelFace {
     onBlockRevert: (sessionId: SessionId, id: string, block: DiffApprovalBlockRange) => Promise<void>;
     /** Open one file with its default application or reveal it in the folder. */
     onOpen: (sessionId: SessionId, id: string, action: DiffApprovalOpenAction) => Promise<void>;
+    /** Paste a copied reference into the session's chat input and focus it. */
+    onPasteReference: (sessionId: SessionId, reference: string) => void;
+    /** Undo the session's last keep/revert, then refresh the list; resolves to the affected entry id when it is still pending. */
+    onUndo: (sessionId: SessionId) => Promise<string | undefined>;
+    /** Redo the session's last undone keep/revert, then refresh the list; resolves to the affected entry id when it is still pending. */
+    onRedo: (sessionId: SessionId) => Promise<string | undefined>;
+    /** Import the workspace's local VCS changes as pending entries (detection included). */
+    onImportVcs: (sessionId: SessionId, includeUntracked: boolean) => Promise<VcsImportValue>;
+    /** Acknowledge the redo-cleared notice so it is only surfaced once. */
+    onAckRedoCleared: () => void;
 }

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

@@ -7,7 +7,7 @@
  */
 import type { SessionId } from '@deepseek-ai/dsh-client-connection/client';
 import type { HostObservable } from '@deepseek-ai/dsh-client-ui-slots';
-import type { DiffApprovalBlockRange, DiffApprovalOpenAction } from '../types.ts';
+import type { DiffApprovalBlockRange, DiffApprovalOpenAction, VcsImportValue } from '../types.ts';
 import type { PendingDiffSnapshot } from './slots.ts';
 import type { DiffApprovalPort } from './port.ts';
 /** The observable the panel reads and the plugin body drives. */
@@ -22,10 +22,18 @@ export interface PendingDiffStore extends HostObservable<PendingDiffSnapshot> {
     blockKeep: (sessionId: SessionId, id: string, block: DiffApprovalBlockRange) => Promise<void>;
     /** Revert one diff block, then refresh so the entry's diff reflects the undo. */
     blockRevert: (sessionId: SessionId, id: string, block: DiffApprovalBlockRange) => Promise<void>;
+    /** Undo the session's last keep/revert, then refresh; resolves to the affected entry id when it is still pending. */
+    undo: (sessionId: SessionId) => Promise<string | undefined>;
+    /** Redo the session's last undone keep/revert, then refresh; resolves to the affected entry id when it is still pending. */
+    redo: (sessionId: SessionId) => Promise<string | undefined>;
+    /** Import the workspace's local VCS changes as pending entries, then refresh. */
+    importVcs: (sessionId: SessionId, includeUntracked: boolean) => Promise<VcsImportValue>;
     /** Open one file with its default application or reveal it in the folder. */
     open: (sessionId: SessionId, id: string, action: DiffApprovalOpenAction) => Promise<void>;
     /** Drop every local fact (used on connection reset). */
     reset: () => void;
+    /** Acknowledge a redo-cleared notice so the panel surfaces it only once. */
+    clearRedoCleared: () => void;
 }
 /**
  * Create the store over the review-channel port.

package/lib/types/pending.d.ts

@@ -69,6 +69,18 @@ export declare class PendingDiffStore {
         oldText?: string;
         newText?: string;
     }): boolean;
+    /**
+     * Restore one entry exactly as given (an undo/redo replays a snapshot). The
+     * entry is inserted or replaced by id, and the path index points at it so a
+     * later capture folds into the restored entry. The store keeps one entry per
+     * path: restoring an entry for a path that a DIFFERENT entry currently owns
+     * drops that occupant first, so an undo can never leave two list items for
+     * the same file (e.g. an imported entry and a replayed keep of the same path).
+     * @param sessionId - the owning session.
+     * @param entry - the entry state to restore.
+     * @returns whether the store changed.
+     */
+    restore(sessionId: SessionId, entry: PendingEntry): boolean;
     /** Total entry count across all sessions. */
     get size(): number;
 }

package/lib/types/types.d.ts

@@ -53,6 +53,10 @@ export interface DiffApprovalListValue {
     files: PendingFileDiff[];
     /** The viewing session's workspace root (when it has one), for workspace-relative references. */
     workspacePath?: string | undefined;
+    /** Set when a detected external change created a fresh undo checkpoint while
+     * redo history was pending, so the panel can surface that the redo stack was
+     * superseded. */
+    redoCleared?: boolean | undefined;
 }
 /** What the open endpoint asks the OS to do with a file. */
 export type DiffApprovalOpenAction = 'open' | 'reveal';
@@ -82,10 +86,21 @@ export interface DiffApprovalBlockTarget {
     id: string;
     block: DiffApprovalBlockRange;
 }
-/** Outcome of one keep/revert request. */
-export type DiffApprovalActionOutcome = 'kept' | 'reverted' | 'missing';
+/** Outcome of one keep/revert/undo/redo request. */
+export type DiffApprovalActionOutcome = 'kept' | 'reverted' | 'missing' | 'undone' | 'redone' | 'nothing';
+/** The version-control systems the import integration knows. */
+export type VcsKind = 'git' | 'svn' | 'p4';
+/** Value returned by the channel's vcs-import endpoint. */
+export interface VcsImportValue {
+    /** How many pending entries were created (0 when nothing was imported). */
+    imported: number;
+    /** Whether a VCS root was found at all (false when the workspace is not in a git/svn/p4 checkout). */
+    detected: boolean;
+}
 /** Value returned by the channel's keep and revert endpoints. */
 export interface DiffApprovalActionValue {
     /** What the request did; `missing` means no pending entry existed. */
     outcome: DiffApprovalActionOutcome;
+    /** Entry id the undo/redo affected; absent for a no-op or a non-undo action. */
+    id?: string | undefined;
 }

package/lib/types/vcs.d.ts

@@ -0,0 +1,89 @@
+/**
+ * Version-control integration, host half: detect which VCS (git/svn/p4)
+ * encloses a workspace by walking up the directory tree, and enumerate the
+ * workspace's LOCAL changes for import into the pending list. The workspace
+ * is often a subdirectory of the VCS root, so the root is found by walking up
+ * from the workspace path and the imported changes are filtered to files
+ * inside the workspace. Commands run through the deployment's `ctx.shell`
+ * executor (applying its sandbox/policy) with the VCS root as the working
+ * directory.
+ *
+ * Scope of one import (mirrors the panel's preferences):
+ * - modified files (git: working tree vs index — "仅未暂存"; svn: vs BASE;
+ *   p4: opened edits), imported as `edit` (old = baseline, new = working);
+ * - deleted files, imported as `edit` with an empty new side (revert restores);
+ * - new/untracked files (git `??`, svn `?`, p4 not-yet-opened files), imported
+ *   as `create` ONLY when the untracked preference is on. For p4 that means a
+ *   full workspace scan (`p4 status`, which can be slow); with the preference
+ *   off only already-opened files are read.
+ * @module dsh-diff-approval/vcs
+ */
+/** The version-control systems this integration knows. */
+export type VcsKind = 'git' | 'svn' | 'p4';
+/** A detected version-control root and its kind. */
+export interface VcsRoot {
+    kind: VcsKind;
+    /** The directory whose VCS marker was found (the repo/checkout/client root). */
+    root: string;
+}
+/** One change imported from the VCS, ready to become a pending entry. */
+export interface VcsChange {
+    /** Absolute path of the changed file (inside the workspace). */
+    path: string;
+    kind: 'edit' | 'create';
+    /** Baseline (pre-change) content; empty for a brand-new file. */
+    oldText: string;
+    /** Working content; empty for a deleted file. */
+    newText: string;
+}
+/** The subset of `ctx.shell`'s executor this module calls (kept structural so
+ * the module stays dependency-light and testable with a fake). */
+export interface ShellExecutorLike {
+    resolve(request: {
+        command: string;
+        workdir?: string | undefined;
+        timeoutMs?: number | undefined;
+        signal?: AbortSignal | undefined;
+    }): unknown;
+    run(spec: unknown): Promise<{
+        exitCode: number | null;
+        stdout: {
+            text: string;
+        };
+        stderr: {
+            text: string;
+        };
+    }>;
+}
+/** Reads one file's working content; undefined when the file is absent. */
+export type VcsFileReader = (absolutePath: string) => Promise<string | undefined>;
+/** Everything an import needs, in one call shape. */
+export interface VcsImportInput {
+    kind: VcsKind;
+    /** The VCS root found by {@link detectVcsRoot}. */
+    root: string;
+    /** The session's workspace root; only changes under it are imported. */
+    workspaceRoot: string;
+    /** Whether new/untracked files are imported (git `??`, svn `?`). */
+    includeUntracked: boolean;
+    shell: ShellExecutorLike;
+    /** Reads working-file content (the host passes a node fs reader). */
+    readText: VcsFileReader;
+    signal?: AbortSignal | undefined;
+}
+/**
+ * Find the VCS enclosing `start` by walking up the directory tree: the first
+ * directory (deepest) holding a marker wins, with git > svn > p4 when several
+ * markers share one directory. Stops at the filesystem root.
+ * @param start - the workspace directory to start from.
+ * @returns the detected root, or undefined when no VCS marker is found.
+ */
+export declare function detectVcsRoot(start: string): VcsRoot | undefined;
+/**
+ * Enumerate the workspace's local changes for one VCS. Runs the VCS read-only
+ * commands and returns one {@link VcsChange} per changed file inside the
+ * workspace.
+ * @param input - the VCS, its root, the workspace root, and the reading tools.
+ * @returns the changes; an absent/unusable VCS surfaces as a thrown error.
+ */
+export declare function listVcsChanges(input: VcsImportInput): Promise<VcsChange[]>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-diff-approval",
-  "version": "0.7.0",
+  "version": "0.9.0",
   "description": "DeepSeek Harness plugin: pending-edit review with whole-file diff and Keep/Revert",
   "packageManager": "pnpm@11.21.0",
   "author": "Wu Zhiwei",
@@ -68,6 +68,7 @@
     "@deepseek-ai/dsh-client-locale": ">=0.1.0-rc.5",
     "@deepseek-ai/dsh-client-runtime": ">=0.1.0-rc.5",
     "@deepseek-ai/dsh-client-ui-primitives": ">=0.1.0-rc.5",
+    "@deepseek-ai/dsh-client-ui-settings": ">=0.1.0-rc.5",
     "@deepseek-ai/dsh-client-ui-sidebar": ">=0.1.0-rc.5",
     "@deepseek-ai/dsh-client-ui-slots": ">=0.1.0-rc.5",
     "@deepseek-ai/dsh-fs": ">=0.1.0-rc.5",
@@ -83,6 +84,7 @@
     "@deepseek-ai/dsh-client-locale": "^0.1.0-rc.5",
     "@deepseek-ai/dsh-client-runtime": "^0.1.0-rc.5",
     "@deepseek-ai/dsh-client-ui-primitives": "^0.1.0-rc.5",
+    "@deepseek-ai/dsh-client-ui-settings": "^0.1.0-rc.5",
     "@deepseek-ai/dsh-client-ui-sidebar": "^0.1.0-rc.5",
     "@deepseek-ai/dsh-client-ui-slots": "^0.1.0-rc.5",
     "@deepseek-ai/dsh-fs": "^0.1.0-rc.5",