dsh-easygit-plugin 0.2.1 → 0.2.2

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

@@ -18,14 +18,15 @@ interface ProposalVerification {
     message: string;
     changedState: string;
 }
+interface RepositoryContext {
+    workdir: string;
+    policy: unknown;
+}
 interface EasyGitActionDependencies {
     repository: GitRepositoryService;
     proposalStorageReady: Promise<void>;
     shell: ShellService | null;
-    repositoryContext(sessionId: string): {
-        workdir: string;
-        policy: unknown;
-    } | null;
+    repositoryContext(sessionId: string): RepositoryContext | null;
     latestPending(sessionId: string): StoredProposal | null;
     findProposal(sessionId: string, proposalId: unknown): StoredProposal | undefined;
     proposalView(proposal: StoredProposal): ProposalView;
@@ -34,6 +35,7 @@ interface EasyGitActionDependencies {
     runChecks(shell: ShellService | null, workdir: string, checks: ReturnType<typeof deriveChecks>): Promise<string[]>;
     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;
 }
 /** Register the Client-to-Host POST dispatcher with a 1 MiB body limit. */

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

@@ -1,5 +1,5 @@
-import type { ActionResult, CommitDetail, CommitDiffResult, CommitSummary, DiffResult, RepositoryReferences, RepositorySummary, StashSummary } from '../shared/contracts';
-export type { BranchSummary, CommitDetail, CommitDiffResult, CommitFileChange, CommitRefSummary, CommitSummary, DiffResult, ReferenceSummary, RepositoryFile, RepositoryReferences, RepositorySummary, StashSummary, } from '../shared/contracts';
+import type { ActionResult, CommitDetail, CommitDiffResult, CommitSummary, DiffResult, RepositoryReferences, RepositorySummary, StashSummary, 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;
     signal?: string | null;
@@ -39,6 +39,13 @@ 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[]>>;
+    getSyncState(workdir: string, signal?: AbortSignal, sandboxPolicy?: unknown): Promise<ActionResult<SyncState>>;
+    fetchRemote(request: MutationRequest, remote: unknown): Promise<ActionResult<SyncState>>;
+    pullFfOnly(request: MutationRequest): Promise<ActionResult<SyncState>>;
+    pushCurrent(request: MutationRequest, remote: unknown, branch: unknown, setUpstream: boolean): Promise<ActionResult<SyncState>>;
+    rebaseOnto(request: MutationRequest, target: unknown, confirmRisk: boolean): Promise<ActionResult<SyncState>>;
+    continueRebase(request: MutationRequest, confirmRisk: boolean): Promise<ActionResult<SyncState>>;
+    abortRebase(request: MutationRequest, confirmRisk: boolean): Promise<ActionResult<SyncState>>;
     stagePaths(request: MutationRequest, paths: unknown): Promise<ActionResult<RepositorySummary>>;
     unstagePaths(request: MutationRequest, paths: unknown): Promise<ActionResult<RepositorySummary>>;
     stageAll(request: MutationRequest): Promise<ActionResult<RepositorySummary>>;
@@ -49,5 +56,7 @@ export declare class GitRepositoryService {
     deleteBranch(request: MutationRequest, name: unknown, force: boolean, confirmRisk: boolean): Promise<ActionResult<RepositorySummary>>;
     private validatePaths;
     private mutate;
+    private mutateSync;
+    private mutateAndRead;
     private pruneOperations;
 }

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

@@ -8,8 +8,9 @@
  * The exposed model tools are git_propose and git_repo_state. Repository changes
  * are only available through the Client action route.
  */
+import type { GitFailureContext } from '../shared/contracts';
 import { ProposalService, type ProposalView, type StoredProposal } from './proposal-service';
-import { type ShellService } from './git-repository-service';
+import { GitRepositoryService, type ShellService } from './git-repository-service';
 import { addPathsOf, classifyRisk, classifyStepsRisk, deriveChecks, modernizeCommand, parseCommand, quoteShellArg, redactAndLimit, redactSecrets, validateCommand, type ExpectedCheck } from './command-policy';
 type UnknownRecord = Record<string, unknown>;
 interface HostContext {
@@ -32,11 +33,15 @@ interface ProposalExecutionResult extends UnknownRecord {
     stdout: string;
     stderr: string;
     diagnostics: string;
+    failure?: GitFailureContext;
     recovery?: {
         suggestion: string;
         command: string;
         proposalId: string | null;
     } | null;
+    analysis?: {
+        proposalId: string;
+    };
     error: string;
 }
 interface ProposalVerification {
@@ -69,8 +74,20 @@ declare function executeRegisteredProposal(shell: ShellService | null | undefine
  * A null command means the condition requires manual remediation.
  */
 declare function buildRecovery(_proposal: StoredProposal, failedStep: StoredProposal['steps'][number] | undefined, diagnostics: string): RecoverySuggestion | null;
+declare function buildRecoveryForCommand(cmd: string, text: string, reason?: string): RecoverySuggestion | null;
+declare function recoverFailedCommand(activeShell: ShellService | null | undefined, sessionId: string, workdir: string, operationId: string, action: string, command: string, message: string, errorOutput: string, errorCode: string, reason: string): Promise<{
+    failure: GitFailureContext;
+    recovery?: {
+        suggestion: string;
+        command: string;
+        proposalId: string | null;
+    };
+    analysis?: {
+        proposalId: string;
+    };
+} | null>;
 /** Register a recovery command as a pending proposal in the same session. */
-declare function registerRecoveryProposal(failedProposal: Pick<StoredProposal, 'sessionId' | 'workdir'>, recovery: RecoverySuggestion): StoredProposal | null;
+declare function registerRecoveryProposal(failedProposal: Pick<StoredProposal, 'sessionId' | 'workdir'>, recovery: RecoverySuggestion, failure?: GitFailureContext): StoredProposal | null;
 declare function storeProposal(sessionId: string, proposal: StoredProposal): StoredProposal;
 declare function findProposal(sessionId: string, proposalId: unknown): StoredProposal | undefined;
 declare function proposalView(proposal: StoredProposal): ProposalView;
@@ -98,12 +115,15 @@ declare const _default: {
         executeProposalSteps: typeof executeProposalSteps;
         executeRegisteredProposal: typeof executeRegisteredProposal;
         buildRecovery: typeof buildRecovery;
+        buildRecoveryForCommand: typeof buildRecoveryForCommand;
+        recoverFailedCommand: typeof recoverFailedCommand;
         registerRecoveryProposal: typeof registerRecoveryProposal;
         storeProposal: typeof storeProposal;
         findProposal: typeof findProposal;
         proposalView: typeof proposalView;
         latestPending: typeof latestPending;
         ProposalService: typeof ProposalService;
+        GitRepositoryService: typeof GitRepositoryService;
     };
 };
 export = _default;

package/lib/types/host/proposal-service.d.ts

@@ -1,4 +1,4 @@
-import type { ProposalStatus, ProposalView } from '../shared/contracts';
+import type { GitFailureContext, ProposalStatus, ProposalView } from '../shared/contracts';
 export type { ProposalView } from '../shared/contracts';
 import type { RiskLevel } from './command-policy';
 export interface ProposalStep {
@@ -23,6 +23,7 @@ export interface StoredProposal {
     fingerprint: string | null;
     verified: boolean;
     result: Record<string, unknown> | null;
+    failure?: GitFailureContext;
     [key: string]: unknown;
 }
 export interface ProposalStorageUnit {

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

@@ -1,7 +1,29 @@
 /** Shared Client-to-Host contracts. */
 export type ProposalStatus = 'pending' | 'running' | 'succeeded' | 'failed' | 'verified' | 'dismissed';
 export type ActionErrorCode = 'NOT_GIT_REPOSITORY' | 'SESSION_NOT_FOUND' | 'INVALID_ARGUMENT' | 'STATE_CONFLICT' | 'OPERATION_DUPLICATE' | 'GIT_FAILED' | 'TIMEOUT' | 'PERMISSION_DENIED' | 'INTERNAL_ERROR';
-export type ActionFailureReason = 'CURRENT_BRANCH' | 'BRANCH_NOT_FOUND' | 'UNMERGED_BRANCH';
+export type ActionFailureReason = 'CURRENT_BRANCH' | 'BRANCH_NOT_FOUND' | 'BRANCH_EXISTS' | 'UNMERGED_BRANCH' | 'NO_REMOTE' | 'NO_UPSTREAM' | 'DETACHED_HEAD' | 'DIRTY_WORKTREE' | 'CONFLICTS_PRESENT' | 'REBASE_IN_PROGRESS' | 'NO_REBASE_IN_PROGRESS' | 'REF_NOT_FOUND';
+export interface GitFailureContext {
+    source: 'workbench' | 'proposal';
+    code: string;
+    action: string;
+    command: string;
+    message: string;
+    stdout: string;
+    stderr: string;
+    diagnostics: string;
+    exitCode: number | null;
+    timedOut: boolean;
+    mayHavePartialChanges: boolean;
+    occurredAt: number;
+}
+export interface RecoveryProposal {
+    suggestion: string;
+    command: string;
+    proposalId: string | null;
+}
+export interface AgentAnalysisRequest {
+    proposalId: string;
+}
 export type ActionResult<T> = {
     ok: true;
     data: T;
@@ -12,6 +34,9 @@ export type ActionResult<T> = {
     message: string;
     diagnostics?: string;
     reason?: ActionFailureReason;
+    failure?: GitFailureContext;
+    recovery?: RecoveryProposal;
+    analysis?: AgentAnalysisRequest;
 };
 export interface RepositoryFile {
     indexStatus: string;
@@ -27,6 +52,19 @@ export interface RepositorySummary {
     files: RepositoryFile[];
     stagedCount: number;
 }
+export interface SyncState {
+    topLevel: string;
+    branch: string;
+    head: string;
+    upstream: string;
+    remotes: string[];
+    ahead: number;
+    behind: number;
+    dirty: boolean;
+    conflictCount: number;
+    rebaseInProgress: boolean;
+    files: RepositoryFile[];
+}
 export interface BranchSummary {
     name: string;
     current: boolean;
@@ -120,6 +158,10 @@ export interface ProposalView {
     result: Record<string, unknown> | null;
     closed: boolean;
     copied: boolean;
+    failure?: GitFailureContext;
+    recoverySuggestion?: string;
+    needsAgentAnalysis?: boolean;
+    analysisRequestedAt?: number;
 }
 export type ProposalStateResponse = {
     ok: true;
@@ -156,11 +198,9 @@ export interface ProposalExecutionResponse extends ProposalCommandResponse {
     stdout?: string;
     stderr?: string;
     diagnostics?: string;
-    recovery?: {
-        suggestion: string;
-        command: string;
-        proposalId: string | null;
-    } | null;
+    failure?: GitFailureContext;
+    recovery?: RecoveryProposal | null;
+    analysis?: AgentAnalysisRequest;
 }
 export interface EasyGitRequestMap {
     'get-summary': {
@@ -189,6 +229,9 @@ export interface EasyGitRequestMap {
     'get-stashes': {
         sessionId: string;
     };
+    'get-sync-state': {
+        sessionId: string;
+    };
     'stage-paths': {
         sessionId: string;
         operationId: string;
@@ -230,6 +273,42 @@ export interface EasyGitRequestMap {
         force?: boolean;
         confirmRisk?: boolean;
     };
+    fetch: {
+        sessionId: string;
+        operationId: string;
+        remote: string;
+    };
+    pull: {
+        sessionId: string;
+        operationId: string;
+    };
+    push: {
+        sessionId: string;
+        operationId: string;
+        remote?: string;
+        branch?: string;
+        setUpstream?: boolean;
+    };
+    rebase: {
+        sessionId: string;
+        operationId: string;
+        target: string;
+        confirmRisk?: boolean;
+    };
+    'rebase-continue': {
+        sessionId: string;
+        operationId: string;
+        confirmRisk?: boolean;
+    };
+    'rebase-abort': {
+        sessionId: string;
+        operationId: string;
+        confirmRisk?: boolean;
+    };
+    'request-analysis': {
+        sessionId: string;
+        proposalId: string;
+    };
     state: {
         sessionId: string;
     };
@@ -261,6 +340,7 @@ export interface EasyGitResponseMap {
     'get-commit-detail': ActionResult<CommitDetail>;
     'get-commit-diff': ActionResult<CommitDiffResult>;
     'get-stashes': ActionResult<StashSummary[]>;
+    'get-sync-state': ActionResult<SyncState>;
     'stage-paths': ActionResult<RepositorySummary>;
     'unstage-paths': ActionResult<RepositorySummary>;
     'stage-all': ActionResult<RepositorySummary>;
@@ -269,6 +349,13 @@ export interface EasyGitResponseMap {
     'create-branch': ActionResult<RepositorySummary>;
     'switch-branch': ActionResult<RepositorySummary>;
     'delete-branch': ActionResult<RepositorySummary>;
+    fetch: ActionResult<SyncState>;
+    pull: ActionResult<SyncState>;
+    push: ActionResult<SyncState>;
+    rebase: ActionResult<SyncState>;
+    'rebase-continue': ActionResult<SyncState>;
+    'rebase-abort': ActionResult<SyncState>;
+    'request-analysis': ProposalCommandResponse;
     state: ProposalStateResponse;
     dismiss: ProposalCommandResponse;
     'mark-copied': ProposalCommandResponse;

package/package.json

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