dsh-easygit-plugin 0.2.3 → 0.3.0

package/lib/types/client/commit-actions.d.ts

@@ -0,0 +1,18 @@
+import type { EasyGitAction, EasyGitRequest, EasyGitResponse } from '../shared/contracts';
+interface Props {
+    sessionId: string;
+    revision: number;
+    hash?: string;
+    parents?: string[];
+    disabled?: boolean;
+    rpc<A extends EasyGitAction>(request: EasyGitRequest<A>, signal?: AbortSignal): Promise<EasyGitResponse<A>>;
+    onChanged(): void;
+    onConflicts(): void;
+    onBusy?(busy: boolean): void;
+    onCommand(label: string, command: string): (success: boolean) => void;
+}
+export declare function GitCommitActions(props: Props): import("react").DetailedReactHTMLElement<{
+    className: string;
+    'aria-label': string;
+}, HTMLElement>;
+export {};

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

@@ -0,0 +1,15 @@
+export interface ConflictBlock {
+    start: number;
+    end: number;
+    ours: string;
+    base: string | null;
+    theirs: string;
+}
+/** Result coordinates include marker lines, and update with the editor text. */
+export declare function conflictLineRanges(text: string, blocks: ConflictBlock[]): {
+    start: number;
+    end: number;
+}[];
+/** Keep byte-for-byte text boundaries, including CRLF and a missing final newline. */
+export declare function parseConflictBlocks(text: string, markerSize?: number): ConflictBlock[];
+export declare function chooseConflictBlock(text: string, block: ConflictBlock, choice: 'ours' | 'theirs' | 'both'): string;

package/lib/types/client/conflict-tab.d.ts

@@ -0,0 +1,14 @@
+import type { EasyGitAction, EasyGitRequest, EasyGitResponse } from '../shared/contracts';
+interface Props {
+    sessionId: string;
+    revision: number;
+    rpc<A extends EasyGitAction>(request: EasyGitRequest<A>, signal?: AbortSignal): Promise<EasyGitResponse<A>>;
+    onChanged(): void;
+    onDirty(dirty: boolean): void;
+    onCommand(label: string, command: string): (success: boolean) => void;
+}
+export declare function GitConflictsTab(props: Props): import("react").DetailedReactHTMLElement<{
+    className: string;
+    'aria-label': string;
+}, HTMLElement>;
+export {};

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

@@ -1,22 +1,48 @@
-import { createPanelController } from './panel-controller';
-import { appendCommandLog, analysisProposalId, beginTrackedRequest, buildAgentRepairPrompt, canDismissFailedProposal, buildFileTree, cancelTrackedRequest, clampWorkbenchRatio, commitFileTone, deriveCommitGraph, filterLocalBranches, failureContext, isCurrentCommitRequest, isLatestRequest, isTrackedRequestCurrent, mutationCommand, nextCommitSelection, openRecoveryProposal, parseReviewRows, pendingProposalTransition, recoveryProposalId, repositoryName, shouldShowAnalysisBanner, type AnyRecord } from './view-model';
+import { GitConflictsTab } from './conflict-tab';
+import { GitStashesTab } from './stash-tab';
+import { GitMergeTab } from './merge-tab';
+import { GitCommitActions } from './commit-actions';
+import { parseConflictBlocks, chooseConflictBlock, conflictLineRanges } from './conflict-model';
+import { registerWorkbench, requestAgentAnalysis, type Dispose } from './panel-controller';
+import { appendCommandLog, analysisProposalId, beginTrackedRequest, buildAgentRepairPrompt, canDismissFailedProposal, buildFileTree, cancelTrackedRequest, commitFileTone, deriveCommitGraph, filterLocalBranches, failureContext, isCurrentCommitRequest, isLatestRequest, isTrackedRequestCurrent, mutationCommand, nextCommitSelection, openRecoveryProposal, parseReviewRows, pendingProposalTransition, recoveryProposalId, repositoryName, shouldShowAnalysisBanner, type AnyRecord } from './view-model';
+type TimerFn = (callback: () => void, delayMs: number) => Dispose | void;
+interface RepositoryTabProps {
+    onConflicts(): void;
+    sessionId: string;
+    intervalFn?: TimerFn | null;
+    revision: number;
+    onChanged: Dispose;
+    onCommand: CommandReporter;
+    onFailure: FailureHandler;
+}
+type CommandReporter = (label: string, command: string) => (succeeded: boolean) => void;
+type FailureHandler = (response: AnyRecord) => void;
 type RefreshState = 'idle' | 'loading' | 'succeeded' | 'failed';
 declare function injectStyles(): () => void;
 declare function refreshButtonLabel(state: RefreshState): string;
 declare function renderRawDiffSurface(diff: string): any;
 declare function renderReviewSurface(diff: string): any;
+declare function GitChangesTab(props: RepositoryTabProps): any;
 declare const plugin: {
     inject: string[];
     apply(ctx: AnyRecord): void;
     __testing: {
-        createPanelController: typeof createPanelController;
+        GitChangesTab: typeof GitChangesTab;
+        GitCommitActions: typeof GitCommitActions;
+        GitMergeTab: typeof GitMergeTab;
+        GitStashesTab: typeof GitStashesTab;
+        GitConflictsTab: typeof GitConflictsTab;
+        parseConflictBlocks: typeof parseConflictBlocks;
+        chooseConflictBlock: typeof chooseConflictBlock;
+        conflictLineRanges: typeof conflictLineRanges;
+        registerWorkbench: typeof registerWorkbench;
+        requestAgentAnalysis: typeof requestAgentAnalysis;
         buildFileTree: typeof buildFileTree;
         parseReviewRows: typeof parseReviewRows;
         renderRawDiffSurface: typeof renderRawDiffSurface;
         renderReviewSurface: typeof renderReviewSurface;
         injectStyles: typeof injectStyles;
         filterLocalBranches: typeof filterLocalBranches;
-        clampWorkbenchRatio: typeof clampWorkbenchRatio;
         deriveCommitGraph: typeof deriveCommitGraph;
         repositoryName: typeof repositoryName;
         mutationCommand: typeof mutationCommand;

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

@@ -0,0 +1,16 @@
+import type { EasyGitAction, EasyGitRequest, EasyGitResponse } from '../shared/contracts';
+interface Props {
+    sessionId: string;
+    revision: number;
+    rpc<A extends EasyGitAction>(request: EasyGitRequest<A>, signal?: AbortSignal): Promise<EasyGitResponse<A>>;
+    onChanged(): void;
+    onConflicts(): void;
+    onCommand(label: string, command: string): (success: boolean) => void;
+    renderReview(diff: string): React.ReactNode;
+    renderRawDiff(diff: string): React.ReactNode;
+}
+export declare function GitMergeTab(props: Props): import("react").DetailedReactHTMLElement<{
+    className: string;
+    'aria-label': string;
+}, HTMLElement>;
+export {};

package/lib/types/client/panel-controller.d.ts

@@ -1,38 +1,10 @@
+import type { AnyRecord } from './view-model';
 export type Dispose = () => void;
-export interface PanelSnapshot {
-    detailsReady: boolean;
-    activeSessionId: string | null;
-    open: boolean;
-    error: string;
-}
-export interface PanelController {
-    attachDetails(): Dispose;
-    open(sessionId: unknown): boolean;
-    close(sessionId?: unknown): boolean;
-    toggle(sessionId: unknown): boolean;
-    isOpen(sessionId: unknown): boolean;
-    subscribe(listener: (state: PanelSnapshot) => void): Dispose;
-    snapshot(): PanelSnapshot;
-}
-interface SlotsLike {
-    register(definition: Record<string, unknown>, renderer: (props: Record<string, unknown>) => unknown): unknown;
-}
-interface LayoutLike {
-    openDetails(): void;
-    closeDetails(): void;
-}
-export interface PanelControllerOptions {
-    slots?: SlotsLike | null;
-    layout?: LayoutLike | null;
-    renderPanel: (props: {
-        sessionId: string;
-        close: Dispose;
-    }) => unknown;
-}
-/**
- * Mount the workbench only while it is open. Harness's built-in DetailsPanel
- * uses priority 0, so the workbench temporarily overrides it at -10 and
- * immediately releases the registration when closed.
- */
-export declare function createPanelController(options: PanelControllerOptions): PanelController;
-export {};
+/** Use the session-scoped conversation service; Connection no longer owns domain APIs. */
+export declare function requestAgentAnalysis(sessions: AnyRecord, sessionId: string, text: string): Promise<void>;
+/** Register a native tab without taking over the host's layout or other tabs. */
+export declare function registerWorkbench(ctx: AnyRecord, renderPanel: (props: {
+    sessionId: string;
+    close: Dispose;
+    sendPrompt(text: string): Promise<void>;
+}) => unknown): (sessionId: string) => void;

package/lib/types/client/stash-tab.d.ts

@@ -0,0 +1,15 @@
+import type { EasyGitAction, EasyGitRequest, EasyGitResponse } from '../shared/contracts';
+interface Props {
+    sessionId: string;
+    revision: number;
+    rpc<A extends EasyGitAction>(request: EasyGitRequest<A>, signal?: AbortSignal): Promise<EasyGitResponse<A>>;
+    onChanged(): void;
+    onConflicts(): void;
+    onCommand(label: string, command: string): (success: boolean) => void;
+    renderReview(diff: string): React.ReactNode;
+    renderRawDiff(diff: string): React.ReactNode;
+}
+export declare function GitStashesTab(props: Props): import("react").DetailedReactHTMLElement<{
+    className: string;
+}, HTMLElement>;
+export {};

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

@@ -1,6 +1,6 @@
 import type { BranchSummary, CommitSummary, GitFailureContext, RepositoryFile } from '../shared/contracts';
 export type AnyRecord = Record<string, any>;
-export type RepositoryMutationAction = 'stage-paths' | 'unstage-paths' | 'stage-all' | 'unstage-all' | 'commit' | 'create-branch' | 'switch-branch' | 'delete-branch';
+export type RepositoryMutationAction = 'stage-paths' | 'unstage-paths' | 'stage-all' | 'unstage-all' | 'commit' | 'create-branch' | 'switch-branch' | 'delete-branch' | 'create-stash' | 'apply-stash' | 'pop-stash' | 'drop-stash' | 'branch-stash';
 export interface CommandLogEntry {
     id: number;
     label: string;
@@ -38,33 +38,6 @@ export interface CommitGraphRow {
     laneCount: number;
     edges: CommitGraphEdge[];
 }
-export interface HostSplitLayout {
-    frame: HTMLElement;
-    sidebar: HTMLElement;
-    center: HTMLElement;
-    details: HTMLElement;
-}
-export interface ActiveHostSplit {
-    layout: HostSplitLayout;
-    splitColumns: string;
-    previousGridTemplateColumns: string;
-    previousTrack: string;
-    previousDetailsWidth: string;
-    previousDetailsMinWidth: string;
-    previousDetailsMaxWidth: string;
-    previousDetailsBorderLeft: string;
-}
-export interface ResizeDrag {
-    pointerId: number;
-    startX: number;
-    startWidth: number;
-    currentRatio: number;
-}
-export declare const WORKBENCH_RATIO_KEY = "dsh-easygit-plugin:workbench-ratio";
-export declare const WORKBENCH_TRACK = "--dsh-easygit-plugin-workbench-width";
-export declare const WORKBENCH_DEFAULT_RATIO = 0.36;
-export declare const WORKBENCH_MIN_RATIO = 0.24;
-export declare const WORKBENCH_MAX_RATIO = 0.75;
 export declare function appendCommandLog(current: CommandLogEntry[], entry: CommandLogEntry): CommandLogEntry[];
 export declare function filterLocalBranches(branches: BranchSummary[], query: string): BranchSummary[];
 export declare function isCurrentCommitRequest(selectedHash: string, requestedHash: string, currentSequence: number, requestSequence: number): boolean;
@@ -82,10 +55,6 @@ export declare function isTrackedRequestCurrent(ref: {
 }, request: TrackedRequest): boolean;
 export declare function isAbortError(error: unknown): boolean;
 export declare function deriveCommitGraph(commits: CommitSummary[]): CommitGraphRow[];
-export declare function clampWorkbenchRatio(value: number): number;
-export declare function readWorkbenchRatio(): number;
-export declare function persistWorkbenchRatio(value: number | null): void;
-export declare function workbenchTrackForRatio(ratio: number): string;
 export declare function repositoryName(topLevel: unknown): string;
 export declare function mutationCommand(action: string, payload?: AnyRecord): {
     label: string;
@@ -102,9 +71,6 @@ export declare function pendingProposalTransition(previousProposalId: string | n
     shouldOpen: boolean;
 };
 export declare function openRecoveryProposal(response: unknown, open: () => void, schedule?: (callback: () => void, delayMs: number) => unknown): boolean;
-export declare function viewportWidth(): number;
-export declare function sidebarTrackWidth(layout: HostSplitLayout): number;
-export declare function findWorkbenchHostSplit(anchor: HTMLElement): HostSplitLayout | null;
 export declare function buildFileTree(files: RepositoryFile[]): FileTreeNode;
 export declare function parseReviewRows(diff: string): ReviewRow[];
 export declare function diffLineClass(line: string): string;

package/lib/types/host/actions.d.ts

@@ -11,6 +11,9 @@ export interface WebServerService {
         handler(req: IncomingMessage, res: ServerResponse): Promise<void>;
     }): unknown;
 }
+export interface ConnectionService {
+    requestRejection(request: IncomingMessage): 401 | 403 | undefined;
+}
 interface ProposalVerification {
     changed: boolean;
     verified: boolean;
@@ -26,7 +29,7 @@ interface EasyGitActionDependencies {
     repository: GitRepositoryService;
     proposalStorageReady: Promise<void>;
     shell: ShellService | null;
-    repositoryContext(sessionId: string): RepositoryContext | null;
+    repositoryContext(sessionId: string): Promise<RepositoryContext | null>;
     latestPending(sessionId: string): StoredProposal | null;
     findProposal(sessionId: string, proposalId: unknown): StoredProposal | undefined;
     proposalView(proposal: StoredProposal): ProposalView;
@@ -36,8 +39,8 @@ interface EasyGitActionDependencies {
     verifyProposal(shell: ShellService | null, proposal: StoredProposal): Promise<ProposalVerification>;
     executeProposal(shell: ShellService | null, proposal: StoredProposal, policy: unknown, persist: () => Promise<void>): Promise<UnknownRecord>;
     recoverFailedCommand(sessionId: string, workdir: string, operationId: string, action: string, command: string, message: string, errorOutput: string, errorCode: string, reason: string): Promise<UnknownRecord | null>;
-    resolveExecutionPolicy(sessionId: string): unknown;
+    resolveExecutionPolicy(sessionId: string): Promise<unknown>;
 }
 /** Register the Client-to-Host POST dispatcher with a 1 MiB body limit. */
-export declare function registerEasyGitActions(webServer: WebServerService | null, dependencies: EasyGitActionDependencies): unknown;
+export declare function registerEasyGitActions(webServer: WebServerService | null, dependencies: EasyGitActionDependencies, connection: ConnectionService | null): unknown;
 export {};

package/lib/types/host/conflict-worker.d.ts

@@ -0,0 +1 @@
+export declare function conflictWorkerCommand(action: string, payload: Record<string, unknown>): string;

package/lib/types/host/git-repository-service.d.ts

@@ -1,4 +1,4 @@
-import type { ActionResult, CommitDetail, CommitDiffResult, CommitSummary, DiffResult, RepositoryReferences, RepositorySummary, StashSummary, SyncState } from '../shared/contracts';
+import type { ActionResult, CommitDetail, CommitDiffResult, CommitSummary, DiffResult, RepositoryReferences, RepositorySummary, StashSummary, StashDetail, SyncState } from '../shared/contracts';
 export type { BranchSummary, CommitDetail, CommitDiffResult, CommitFileChange, CommitRefSummary, CommitSummary, DiffResult, ReferenceSummary, RepositoryFile, RepositoryReferences, RepositorySummary, StashSummary, SyncState, } from '../shared/contracts';
 export interface GitRunResult {
     exitCode: number | null;
@@ -14,8 +14,12 @@ export interface GitRunResult {
 }
 export interface ShellService {
     resolve(request: Record<string, unknown>): unknown;
-    run(specification: unknown): Promise<GitRunResult>;
+    run?(specification: unknown): Promise<GitRunResult>;
+    execute?(specification: unknown): Promise<{
+        result(): Promise<GitRunResult>;
+    }>;
 }
+export declare function runShell(shell: ShellService, specification: unknown): Promise<GitRunResult>;
 interface MutationRequest {
     sessionId: string;
     workdir: string;
@@ -39,6 +43,11 @@ export declare class GitRepositoryService {
     getCommitDetail(workdir: string, hash: unknown, signal?: AbortSignal, sandboxPolicy?: unknown): Promise<ActionResult<CommitDetail>>;
     getCommitDiff(workdir: string, hash: unknown, signal?: AbortSignal, sandboxPolicy?: unknown): Promise<ActionResult<CommitDiffResult>>;
     getStashes(workdir: string, signal?: AbortSignal, sandboxPolicy?: unknown): Promise<ActionResult<StashSummary[]>>;
+    private resolveStash;
+    getStashDetail(workdir: string, selector: unknown, hash: unknown, signal?: AbortSignal, sandboxPolicy?: unknown): Promise<ActionResult<StashDetail>>;
+    getStashDiff(workdir: string, selector: unknown, hash: unknown, path: unknown, untracked: boolean, signal?: AbortSignal, sandboxPolicy?: unknown): Promise<ActionResult<DiffResult>>;
+    createStash(request: MutationRequest, message: unknown, paths: unknown, includeUntracked: boolean): Promise<ActionResult<RepositorySummary>>;
+    mutateStash(request: MutationRequest, action: 'apply-stash' | 'pop-stash' | 'drop-stash' | 'branch-stash', selector: unknown, hash: unknown, name?: unknown, confirmRisk?: boolean): Promise<ActionResult<RepositorySummary>>;
     getSyncState(workdir: string, signal?: AbortSignal, sandboxPolicy?: unknown): Promise<ActionResult<SyncState>>;
     fetchRemote(request: MutationRequest, remote: unknown): Promise<ActionResult<SyncState>>;
     pullFfOnly(request: MutationRequest): Promise<ActionResult<SyncState>>;
@@ -58,5 +67,7 @@ export declare class GitRepositoryService {
     private mutate;
     private mutateSync;
     private mutateAndRead;
+    conflictAction(action: string, workdir: string, payload: Record<string, unknown>, request?: MutationRequest, sandboxPolicy?: unknown): Promise<ActionResult<unknown>>;
+    private withMutation;
     private pruneOperations;
 }

package/lib/types/host/stash-worker.d.ts

@@ -0,0 +1 @@
+export declare function createStashCommand(message: string, paths: string[] | undefined, includeUntracked: boolean): string;

package/lib/types/shared/contracts.d.ts

@@ -65,6 +65,76 @@ export interface SyncState {
     rebaseInProgress: boolean;
     files: RepositoryFile[];
 }
+export type ConflictOperation = 'merge' | 'rebase' | 'cherry-pick' | 'revert';
+export type CommitEditAction = 'amend-message' | 'amend-commit' | 'undo-commit' | 'revert-commit';
+export interface CommitEditState {
+    head: string;
+    branch: string;
+    message: string;
+    parents: string[];
+    staged: boolean;
+    dirty: boolean;
+    blocked: boolean;
+    token: string;
+}
+interface CommitEditRequest {
+    sessionId: string;
+    operationId: string;
+    token: string;
+    confirmRisk: boolean;
+}
+export type MergeMode = 'normal' | 'ff-only' | 'squash';
+export interface MergePreview {
+    branch: string;
+    target: string;
+    head: string;
+    sourceHead: string;
+    base: string;
+    token: string;
+    canFastForward: boolean;
+    alreadyMerged: boolean;
+    commits: Array<{
+        hash: string;
+        subject: string;
+        author: string;
+        date: string;
+    }>;
+    commitsTruncated: boolean;
+    files: string[];
+    filesTruncated: boolean;
+    diff: string;
+    diffTruncated: boolean;
+}
+export interface ConflictFile {
+    path: string;
+    kind: string;
+    stages: number[];
+}
+export interface ConflictState {
+    operation: ConflictOperation | null;
+    mergeMode?: 'squash';
+    operationToken: string;
+    files: ConflictFile[];
+}
+export interface ConflictVersion {
+    exists: boolean;
+    text: string | null;
+    mode: string | null;
+    reason: string | null;
+    source?: string;
+}
+export interface ConflictDetail {
+    path: string;
+    operation: ConflictOperation | null;
+    token: string;
+    base: ConflictVersion;
+    ours: ConflictVersion;
+    theirs: ConflictVersion;
+    result: ConflictVersion;
+    editable: boolean;
+    special: boolean;
+    markerSize: number;
+}
 export interface BranchSummary {
     name: string;
     current: boolean;
@@ -134,6 +204,20 @@ export interface StashSummary {
     author: string;
     date: string;
 }
+export interface StashFile {
+    path: string;
+    status: string;
+    untracked: boolean;
+}
+export interface StashDetail {
+    hash: string;
+    files: StashFile[];
+    filesTruncated: boolean;
+}
+export interface StashTarget {
+    selector: string;
+    hash: string;
+}
 export interface DiffResult {
     path: string | null;
     staged: boolean;
@@ -203,6 +287,65 @@ export interface ProposalExecutionResponse extends ProposalCommandResponse {
     analysis?: AgentAnalysisRequest;
 }
 export interface EasyGitRequestMap {
+    'get-commit-edit-state': {
+        sessionId: string;
+    };
+    'amend-message': CommitEditRequest & {
+        message: string;
+    };
+    'amend-commit': CommitEditRequest;
+    'undo-commit': CommitEditRequest;
+    'revert-commit': CommitEditRequest & {
+        hash: string;
+        mainline?: number;
+    };
+    'get-merge-preview': {
+        sessionId: string;
+        target: string;
+    };
+    'merge-branch': {
+        sessionId: string;
+        operationId: string;
+        target: string;
+        token: string;
+        mode: MergeMode;
+    };
+    'get-conflicts': {
+        sessionId: string;
+    };
+    'get-conflict': {
+        sessionId: string;
+        path: string;
+    };
+    'save-conflict': {
+        sessionId: string;
+        operationId: string;
+        path: string;
+        token: string;
+        content: string;
+    };
+    'resolve-conflict': {
+        sessionId: string;
+        operationId: string;
+        path: string;
+        token: string;
+        choice: 'result' | 'ours' | 'theirs' | 'delete';
+    };
+    'start-operation': {
+        sessionId: string;
+        operationId: string;
+        kind: ConflictOperation;
+        target: string;
+        confirmRisk: boolean;
+    };
+    'finish-operation': {
+        sessionId: string;
+        operationId: string;
+        kind: ConflictOperation;
+        token: string;
+        mode: 'continue' | 'abort' | 'skip';
+        confirmRisk: boolean;
+    };
     'get-summary': {
         sessionId: string;
     };
@@ -229,6 +372,39 @@ export interface EasyGitRequestMap {
     'get-stashes': {
         sessionId: string;
     };
+    'get-stash-detail': {
+        sessionId: string;
+    } & StashTarget;
+    'get-stash-diff': {
+        sessionId: string;
+        path: string;
+        untracked: boolean;
+    } & StashTarget;
+    'create-stash': {
+        sessionId: string;
+        operationId: string;
+        message: string;
+        paths?: string[];
+        includeUntracked: boolean;
+    };
+    'apply-stash': {
+        sessionId: string;
+        operationId: string;
+    } & StashTarget;
+    'pop-stash': {
+        sessionId: string;
+        operationId: string;
+    } & StashTarget;
+    'drop-stash': {
+        sessionId: string;
+        operationId: string;
+        confirmRisk: boolean;
+    } & StashTarget;
+    'branch-stash': {
+        sessionId: string;
+        operationId: string;
+        name: string;
+    } & StashTarget;
     'get-sync-state': {
         sessionId: string;
     };
@@ -333,6 +509,19 @@ export interface EasyGitRequestMap {
     };
 }
 export interface EasyGitResponseMap {
+    'get-commit-edit-state': ActionResult<CommitEditState>;
+    'amend-message': ActionResult<ConflictState>;
+    'amend-commit': ActionResult<ConflictState>;
+    'undo-commit': ActionResult<ConflictState>;
+    'revert-commit': ActionResult<ConflictState>;
+    'get-merge-preview': ActionResult<MergePreview>;
+    'merge-branch': ActionResult<ConflictState>;
+    'get-conflicts': ActionResult<ConflictState>;
+    'get-conflict': ActionResult<ConflictDetail>;
+    'save-conflict': ActionResult<ConflictDetail>;
+    'resolve-conflict': ActionResult<ConflictState>;
+    'start-operation': ActionResult<ConflictState>;
+    'finish-operation': ActionResult<ConflictState>;
     'get-summary': ActionResult<RepositorySummary>;
     'get-diff': ActionResult<DiffResult>;
     'get-branches': ActionResult<RepositoryReferences>;
@@ -340,6 +529,13 @@ export interface EasyGitResponseMap {
     'get-commit-detail': ActionResult<CommitDetail>;
     'get-commit-diff': ActionResult<CommitDiffResult>;
     'get-stashes': ActionResult<StashSummary[]>;
+    'get-stash-detail': ActionResult<StashDetail>;
+    'get-stash-diff': ActionResult<DiffResult>;
+    'create-stash': ActionResult<RepositorySummary>;
+    'apply-stash': ActionResult<RepositorySummary>;
+    'pop-stash': ActionResult<RepositorySummary>;
+    'drop-stash': ActionResult<RepositorySummary>;
+    'branch-stash': ActionResult<RepositorySummary>;
     'get-sync-state': ActionResult<SyncState>;
     'stage-paths': ActionResult<RepositorySummary>;
     'unstage-paths': ActionResult<RepositorySummary>;
@@ -367,3 +563,4 @@ export type EasyGitRequest<A extends EasyGitAction = EasyGitAction> = {
     action: A;
 } & EasyGitRequestMap[A];
 export type EasyGitResponse<A extends EasyGitAction> = EasyGitResponseMap[A];
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-easygit-plugin",
-  "version": "0.2.3",
+  "version": "0.3.0",
   "description": "面向 DeepSeek Harness Web 的可视化 Git 工作台，支持查看仓库状态与提交记录、快捷执行常用 Git 操作，以及安全运行自然语言生成的分步骤命令提议。",
   "license": "MIT",
   "main": "lib/index.js",
@@ -23,10 +23,9 @@
     "client": {
       "platform": "web",
       "inject": [
-        "@deepseek-ai/dsh-client-runtime",
-        "@deepseek-ai/dsh-client-connection",
+        "@deepseek-ai/dsh-api-session-controller",
         "@deepseek-ai/dsh-client-ui-conversation",
-        "@deepseek-ai/dsh-client-ui-layout"
+        "@deepseek-ai/dsh-client-ui-sidebar-right"
       ]
     }
   },