aws-runtime-bridge 1.7.36 → 1.7.37

package/dist/routes/git.d.ts

@@ -26,6 +26,13 @@ interface GitStashItem {
     createdAt: string | null;
 }
 type GitDiffFileStatus = 'modified' | 'added' | 'deleted' | 'renamed';
+interface GitDiffSummaryFile {
+    path: string;
+    status: GitDiffFileStatus;
+    additions: number;
+    deletions: number;
+    staged: boolean;
+}
 /**
  * 判断 Git diff 汇总行是否应该展示在差异树中。
  * 普通 modified 且文本增删均为 0 通常是 filemode/元数据噪声，避免显示为“无差异内容”。
@@ -61,6 +68,15 @@ export declare function parseLatestGitStash(output: string): LatestGitStash | nu
  * 解析 git diff 的 name-status 与 numstat 输出，生成前端文件树需要的汇总数据。
  */
 export declare function parseGitStatusStagedPaths(output: string): Set<string>;
+/**
+ * 解析 git diff 的 name-status 与 numstat 输出，生成前端文件树需要的汇总数据。
+ */
+export declare function parseGitDiffSummary(nameStatusOutput: string, numstatOutput: string, stagedPaths?: Set<string>, forceStaged?: boolean): GitDiffSummaryFile[];
+/**
+ * 合并工作区与暂存区差异汇总。
+ * 主流程：以路径去重，保留工作区展示顺序；同一路径若也存在暂存变更则标记为 staged 并累加统计。
+ */
+export declare function mergeGitDiffSummaryFiles(unstagedFiles: GitDiffSummaryFile[], stagedFiles: GitDiffSummaryFile[]): GitDiffSummaryFile[];
 export declare function normalizeGitCommitMessage(message: unknown): string;
 export declare function createScopedGitPathspecArgs(context: Pick<GitRepositoryContext, 'relativeWorkspacePath'>): string[];
 export declare function createScopedFilePathspecArgs(filePath: string, context: Pick<GitRepositoryContext, 'relativeWorkspacePath'>): string[];

package/dist/routes/git.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"git.d.ts","sourceRoot":"","sources":["../../src/routes/git.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AASH,eAAO,MAAM,SAAS,4CAAW,CAAC;AAIlC;;;GAGG;AACH,wBAAgB,0BAA0B,IAAI,MAAM,CAOnD;AAED,UAAU,oBAAoB;IAC5B,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,aAAa,EAAE,OAAO,CAAC;IACvB,SAAS,EAAE,OAAO,CAAC;IACnB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,qBAAqB,EAAE,MAAM,CAAC;CAC/B;AAED,wBAAsB,gCAAgC,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAe3F;AAED,UAAU,YAAY;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1B;AAED,KAAK,iBAAiB,GAAG,UAAU,GAAG,OAAO,GAAG,SAAS,GAAG,SAAS,CAAC;AAkBtE;;;GAGG;AACH,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,iBAAiB,EACzB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,OAAO,GACpB,OAAO,CAMT;AAED;;;GAGG;AACH,wBAAgB,mCAAmC,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAK3E;AAED,wBAAgB,uCAAuC,IAAI,MAAM,CAEhE;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAKjE;AAED,UAAU,cAAc;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,GAAG,IAAI,CAmCvE;AAkBD;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,cAAc,GAAG,IAAI,CAYzE;AA+KD;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAmBrE;AAkDD,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CAElE;AAED,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,IAAI,CAAC,oBAAoB,EAAE,uBAAuB,CAAC,GAAG,MAAM,EAAE,CAElH;AAED,wBAAgB,4BAA4B,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,oBAAoB,EAAE,uBAAuB,CAAC,GAAG,MAAM,EAAE,CAErI"}
+{"version":3,"file":"git.d.ts","sourceRoot":"","sources":["../../src/routes/git.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAUH,eAAO,MAAM,SAAS,4CAAW,CAAC;AAIlC;;;GAGG;AACH,wBAAgB,0BAA0B,IAAI,MAAM,CAOnD;AAED,UAAU,oBAAoB;IAC5B,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,aAAa,EAAE,OAAO,CAAC;IACvB,SAAS,EAAE,OAAO,CAAC;IACnB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,qBAAqB,EAAE,MAAM,CAAC;CAC/B;AAED,wBAAsB,gCAAgC,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAe3F;AAED,UAAU,YAAY;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1B;AAED,KAAK,iBAAiB,GAAG,UAAU,GAAG,OAAO,GAAG,SAAS,GAAG,SAAS,CAAC;AAEtE,UAAU,kBAAkB;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,iBAAiB,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,OAAO,CAAC;CACjB;AAUD;;;GAGG;AACH,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,iBAAiB,EACzB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,OAAO,GACpB,OAAO,CAMT;AAED;;;GAGG;AACH,wBAAgB,mCAAmC,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAK3E;AAED,wBAAgB,uCAAuC,IAAI,MAAM,CAEhE;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAKjE;AAED,UAAU,cAAc;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,GAAG,IAAI,CAmCvE;AAkBD;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,cAAc,GAAG,IAAI,CAYzE;AA+KD;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAmBrE;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,gBAAgB,EAAE,MAAM,EACxB,aAAa,EAAE,MAAM,EACrB,WAAW,GAAE,GAAG,CAAC,MAAM,CAAa,EACpC,WAAW,UAAQ,GAClB,kBAAkB,EAAE,CAuCtB;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CACtC,aAAa,EAAE,kBAAkB,EAAE,EACnC,WAAW,EAAE,kBAAkB,EAAE,GAChC,kBAAkB,EAAE,CAwBtB;AAMD,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CAElE;AAED,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,IAAI,CAAC,oBAAoB,EAAE,uBAAuB,CAAC,GAAG,MAAM,EAAE,CAElH;AAED,wBAAgB,4BAA4B,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,oBAAoB,EAAE,uBAAuB,CAAC,GAAG,MAAM,EAAE,CAErI"}

package/dist/routes/git.js

@@ -308,7 +308,7 @@ export function parseGitStatusStagedPaths(output) {
 /**
  * 解析 git diff 的 name-status 与 numstat 输出，生成前端文件树需要的汇总数据。
  */
-function parseGitDiffSummary(nameStatusOutput, numstatOutput, stagedPaths = new Set()) {
+export function parseGitDiffSummary(nameStatusOutput, numstatOutput, stagedPaths = new Set(), forceStaged = false) {
     const statusMap = new Map();
     const nameStatusLines = nameStatusOutput.split('\n').filter(line => line.trim());
     for (const line of nameStatusLines) {
@@ -338,10 +338,35 @@ function parseGitDiffSummary(nameStatusOutput, numstatOutput, stagedPaths = new
         if (!filePath || !shouldIncludeGitDiffSummaryFile(status, additions, deletions, isBinaryDiff)) {
             continue;
         }
-        files.push({ path: filePath, status, additions, deletions, staged: stagedPaths.has(filePath) });
+        files.push({ path: filePath, status, additions, deletions, staged: forceStaged || stagedPaths.has(filePath) });
     }
     return files;
 }
+/**
+ * 合并工作区与暂存区差异汇总。
+ * 主流程：以路径去重，保留工作区展示顺序；同一路径若也存在暂存变更则标记为 staged 并累加统计。
+ */
+export function mergeGitDiffSummaryFiles(unstagedFiles, stagedFiles) {
+    const fileMap = new Map();
+    for (const file of unstagedFiles) {
+        fileMap.set(file.path, { ...file });
+    }
+    for (const stagedFile of stagedFiles) {
+        const existingFile = fileMap.get(stagedFile.path);
+        if (!existingFile) {
+            fileMap.set(stagedFile.path, { ...stagedFile, staged: true });
+            continue;
+        }
+        fileMap.set(stagedFile.path, {
+            ...existingFile,
+            status: existingFile.status === 'modified' ? stagedFile.status : existingFile.status,
+            additions: existingFile.additions + stagedFile.additions,
+            deletions: existingFile.deletions + stagedFile.deletions,
+            staged: true,
+        });
+    }
+    return [...fileMap.values()];
+}
 function normalizeCommitHash(commitHash) {
     return String(commitHash || '').trim();
 }
@@ -630,12 +655,23 @@ gitRouter.post('/git/diff', validateToken, async (req, res) => {
             res.status(400).json({ error: result.stderr || 'git diff failed' });
             return;
         }
+        const stagedNameStatusResult = await execGitCommand(context.repositoryRootPath, createScopedGitArgs(['diff', '--cached', '--name-status'], context));
+        if (stagedNameStatusResult.exitCode !== 0) {
+            res.status(400).json({ error: stagedNameStatusResult.stderr || 'git staged diff failed' });
+            return;
+        }
+        const stagedNumstatResult = await execGitCommand(context.repositoryRootPath, createScopedGitArgs(['diff', '--cached', '--numstat'], context));
+        if (stagedNumstatResult.exitCode !== 0) {
+            res.status(400).json({ error: stagedNumstatResult.stderr || 'git staged diff failed' });
+            return;
+        }
         const statusResult = await execGitCommand(context.repositoryRootPath, createScopedGitArgs(['status', '--porcelain=v1'], context));
         if (statusResult.exitCode !== 0) {
             res.status(400).json({ error: statusResult.stderr || 'git status failed' });
             return;
         }
-        const files = parseGitDiffSummary(nameStatusResult.stdout, result.stdout, parseGitStatusStagedPaths(statusResult.stdout));
+        const stagedPaths = parseGitStatusStagedPaths(statusResult.stdout);
+        const files = mergeGitDiffSummaryFiles(parseGitDiffSummary(nameStatusResult.stdout, result.stdout, stagedPaths), parseGitDiffSummary(stagedNameStatusResult.stdout, stagedNumstatResult.stdout, stagedPaths, true));
         res.json({
             ok: true,
             isGitRepo: context.isGitRepo,
@@ -868,12 +904,28 @@ gitRouter.post('/git/diff-file', validateToken, async (req, res) => {
         const normalizedCommitHash = normalizeCommitHash(commitHash);
         const gitArgs = normalizedCommitHash
             ? ['show', '--format=', '--no-ext-diff', normalizedCommitHash, '--', repositoryRelativeFilePath]
-            : ['diff', '--', repositoryRelativeFilePath];
-        const result = await execGitCommand(context.repositoryRootPath, gitArgs);
+            : ['diff', 'HEAD', '--', repositoryRelativeFilePath];
+        let result = await execGitCommand(context.repositoryRootPath, gitArgs);
+        if (!normalizedCommitHash && result.exitCode !== 0) {
+            result = await execGitCommand(context.repositoryRootPath, ['diff', '--', repositoryRelativeFilePath]);
+        }
         if (result.exitCode !== 0) {
             res.status(400).json({ error: result.stderr || 'git diff file failed' });
             return;
         }
+        if (!normalizedCommitHash && !result.stdout.trim()) {
+            const stagedResult = await execGitCommand(context.repositoryRootPath, [
+                'diff',
+                '--cached',
+                '--',
+                repositoryRelativeFilePath,
+            ]);
+            if (stagedResult.exitCode !== 0) {
+                res.status(400).json({ error: stagedResult.stderr || 'git staged diff file failed' });
+                return;
+            }
+            result = stagedResult;
+        }
         res.json({
             ok: true,
             filePath: normalizedFilePath,

package/dist/routes/git.test.js

@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest';
-import { createScopedFilePathspecArgs, createScopedGitPathspecArgs, normalizeGitCommitMessage, parseGitStashListLine, parseLatestGitStash, parseGitStatusStagedPaths, } from './git.js';
+import { createScopedFilePathspecArgs, createScopedGitPathspecArgs, mergeGitDiffSummaryFiles, normalizeGitCommitMessage, parseGitDiffSummary, parseGitStashListLine, parseGitStatusStagedPaths, parseLatestGitStash, } from './git.js';
 describe('git commit helpers', () => {
     it('normalizes commit messages before executing git commit', () => {
         expect(normalizeGitCommitMessage('  chore: update dashboard  ')).toBe('chore: update dashboard');
@@ -20,6 +20,45 @@ describe('git commit helpers', () => {
         const stagedPaths = parseGitStatusStagedPaths('M  staged.ts\n M unstaged.ts\nA  added.ts\n?? untracked.ts\nR  old.ts -> renamed.ts\n');
         expect([...stagedPaths].sort()).toEqual(['added.ts', 'renamed.ts', 'staged.ts']);
     });
+    it('marks cached diff files as staged when parsing staged summaries', () => {
+        const files = parseGitDiffSummary('M\tsrc/staged.ts\n', '2\t1\tsrc/staged.ts\n', new Set(), true);
+        expect(files).toEqual([
+            {
+                path: 'src/staged.ts',
+                status: 'modified',
+                additions: 2,
+                deletions: 1,
+                staged: true,
+            },
+        ]);
+    });
+    it('merges unstaged and staged summaries while preserving staged-only files', () => {
+        const unstagedFiles = parseGitDiffSummary('M\tsrc/mixed.ts\nM\tsrc/unstaged.ts\n', '1\t0\tsrc/mixed.ts\n3\t1\tsrc/unstaged.ts\n', new Set(['src/mixed.ts']));
+        const stagedFiles = parseGitDiffSummary('M\tsrc/mixed.ts\nA\tsrc/staged-only.ts\n', '2\t1\tsrc/mixed.ts\n5\t0\tsrc/staged-only.ts\n', new Set(['src/mixed.ts', 'src/staged-only.ts']), true);
+        expect(mergeGitDiffSummaryFiles(unstagedFiles, stagedFiles)).toEqual([
+            {
+                path: 'src/mixed.ts',
+                status: 'modified',
+                additions: 3,
+                deletions: 1,
+                staged: true,
+            },
+            {
+                path: 'src/unstaged.ts',
+                status: 'modified',
+                additions: 3,
+                deletions: 1,
+                staged: false,
+            },
+            {
+                path: 'src/staged-only.ts',
+                status: 'added',
+                additions: 5,
+                deletions: 0,
+                staged: true,
+            },
+        ]);
+    });
 });
 describe('git stash reference helpers', () => {
     it('parses stable stash object hashes while preserving the display selector', () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aws-runtime-bridge",
-  "version": "1.7.36",
+  "version": "1.7.37",
   "description": "AgentsWorkStudio runtime bridge service for machine-level agent runtime integration",
   "type": "module",
   "main": "dist/index.js",