aws-runtime-bridge 1.7.35 → 1.7.36

package/dist/routes/git.d.ts

@@ -18,6 +18,13 @@ interface GitRepositoryContext {
     relativeWorkspacePath: string;
 }
 export declare function assertGitWorkspacePathAccessible(workspacePath: string): Promise<void>;
+interface GitStashItem {
+    ref: string;
+    stashName?: string;
+    message: string;
+    branch: string;
+    createdAt: string | null;
+}
 type GitDiffFileStatus = 'modified' | 'added' | 'deleted' | 'renamed';
 /**
  * 判断 Git diff 汇总行是否应该展示在差异树中。
@@ -37,11 +44,17 @@ export declare function createMissingInitialCommitSnapshotError(): string;
 export declare function isGitStashNoChangesOutput(output: string): boolean;
 interface LatestGitStash {
     ref: string;
+    stashName: string;
     message: string;
 }
+/**
+ * 解析 git stash list --format 输出行。
+ * 主流程：优先返回稳定 stash commit hash 作为 ref，同时保留 stash@{n} 供界面展示。
+ */
+export declare function parseGitStashListLine(line: string): GitStashItem | null;
 /**
  * 从 git stash list -n 1 输出解析最近一次 stash。
- * 主流程：提取 stash 引用并保留后续描述，供无变更快照复用最近快照引用。
+ * 主流程：提取稳定 stash commit hash，供无变更快照复用最近快照引用。
  */
 export declare function parseLatestGitStash(output: string): LatestGitStash | null;
 /**

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;AASD,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,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,cAAc,GAAG,IAAI,CAWzE;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;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"}

package/dist/routes/git.js

@@ -71,20 +71,73 @@ export function isGitStashNoChangesOutput(output) {
         || normalized.includes('no changes to save')
         || normalized.includes('没有本地变更需要保存');
 }
+/**
+ * 解析 git stash list --format 输出行。
+ * 主流程：优先返回稳定 stash commit hash 作为 ref，同时保留 stash@{n} 供界面展示。
+ */
+export function parseGitStashListLine(line) {
+    const rawLine = String(line || '').trim();
+    if (!rawLine)
+        return null;
+    const fields = rawLine.split('\0');
+    if (fields.length >= 3) {
+        const stableRef = fields[0]?.trim();
+        const stashName = fields[1]?.trim();
+        const subject = fields[2]?.trim() || stashName;
+        const createdAt = fields[3]?.trim() || null;
+        if (!stableRef || !stashName)
+            return null;
+        const parsedSubject = parseGitStashSubject(subject || '');
+        return {
+            ref: stableRef,
+            stashName,
+            message: parsedSubject.message,
+            branch: parsedSubject.branch,
+            createdAt,
+        };
+    }
+    const match = rawLine.match(/^(stash@\{\d+\})(?::\s*)?(.*)$/);
+    if (!match)
+        return null;
+    const stashName = match[1];
+    const parsedSubject = parseGitStashSubject(match[2]?.trim() || stashName);
+    return {
+        ref: stashName,
+        stashName,
+        message: parsedSubject.message,
+        branch: parsedSubject.branch,
+        createdAt: null,
+    };
+}
+/**
+ * 从 stash subject 中拆出分支和用户消息。
+ */
+function parseGitStashSubject(subject) {
+    const normalized = String(subject || '').trim();
+    const branchMatch = normalized.match(/^(?:On|WIP on)\s+([^:]+):\s*(.*)$/);
+    if (branchMatch) {
+        return {
+            branch: branchMatch[1].trim(),
+            message: branchMatch[2].trim() || normalized,
+        };
+    }
+    return { branch: '', message: normalized };
+}
 /**
  * 从 git stash list -n 1 输出解析最近一次 stash。
- * 主流程：提取 stash 引用并保留后续描述，供无变更快照复用最近快照引用。
+ * 主流程：提取稳定 stash commit hash，供无变更快照复用最近快照引用。
  */
 export function parseLatestGitStash(output) {
     const firstLine = String(output || '').split('\n').find(line => line.trim());
     if (!firstLine)
         return null;
-    const match = firstLine.match(/^(stash@\{\d+\})(?::\s*)?(.*)$/);
-    if (!match)
+    const parsed = parseGitStashListLine(firstLine);
+    if (!parsed)
         return null;
     return {
-        ref: match[1],
-        message: match[2]?.trim() || match[1],
+        ref: parsed.ref,
+        stashName: parsed.stashName || parsed.ref,
+        message: parsed.message || parsed.ref,
     };
 }
 /**
@@ -374,13 +427,14 @@ gitRouter.post('/git/stash/create', validateToken, async (req, res) => {
             : defaultMessage;
         const result = await execGitCommand(normalizedPath, ['stash', 'push', '-m', stashMessage]);
         if (isGitStashNoChangesOutput(`${result.stdout}\n${result.stderr}`)) {
-            const latestResult = await execGitCommand(normalizedPath, ['stash', 'list', '-n', '1']);
+            const latestResult = await execGitCommand(normalizedPath, ['stash', 'list', '-n', '1', '--format=%H%x00%gd%x00%gs%x00%cr']);
             const latestStash = latestResult.exitCode === 0 ? parseLatestGitStash(latestResult.stdout) : null;
             res.json({
                 ok: true,
                 stashRef: latestStash?.ref ?? null,
+                stashName: latestStash?.stashName ?? null,
                 message: latestStash
-                    ? `没有本地变更需要保存，已复用最近快照 ${latestStash.ref}`
+                    ? `没有本地变更需要保存，已复用最近快照 ${latestStash.stashName}`
                     : '没有本地变更需要保存',
                 noChanges: true,
                 reusedLatestStash: Boolean(latestStash),
@@ -396,13 +450,13 @@ gitRouter.post('/git/stash/create', validateToken, async (req, res) => {
             res.status(400).json({ error: result.stderr || 'git stash push failed' });
             return;
         }
-        const listResult = await execGitCommand(normalizedPath, ['stash', 'list', '-n', '1']);
-        const firstLine = listResult.stdout.split('\n')[0] || '';
-        const match = firstLine.match(/^(stash@\{\d+\})/);
-        const stashRef = match ? match[1] : 'stash@{0}';
+        const listResult = await execGitCommand(normalizedPath, ['stash', 'list', '-n', '1', '--format=%H%x00%gd%x00%gs%x00%cr']);
+        const latestStash = listResult.exitCode === 0 ? parseLatestGitStash(listResult.stdout) : null;
+        const stashRef = latestStash?.ref || 'stash@{0}';
         res.json({
             ok: true,
             stashRef,
+            stashName: latestStash?.stashName ?? null,
             message: stashMessage,
             workspacePath: normalizedPath
         });
@@ -425,33 +479,15 @@ gitRouter.post('/git/stash/list', validateToken, async (req, res) => {
     try {
         const normalizedPath = path.resolve(String(workspacePath).trim());
         const stashLimit = Math.min(Math.max(1, Number(limit) || 20), 100);
-        const result = await execGitCommand(normalizedPath, ['stash', 'list', `-n`, String(stashLimit)]);
+        const result = await execGitCommand(normalizedPath, ['stash', 'list', '-n', String(stashLimit), '--format=%H%x00%gd%x00%gs%x00%cr']);
         if (result.exitCode !== 0) {
             res.status(400).json({ error: result.stderr || 'git stash list failed' });
             return;
         }
-        const stashes = [];
-        const lines = result.stdout.split('\n').filter(line => line.trim());
-        for (const line of lines) {
-            const refMatch = line.match(/^(stash@\{\d+\})/);
-            if (!refMatch)
-                continue;
-            const ref = refMatch[1];
-            const restOfLine = line.slice(ref.length + 2);
-            let branch = '';
-            let message = restOfLine;
-            const branchMatch = restOfLine.match(/^(?:On|WIP on)\s+([^:]+):\s*(.*)$/);
-            if (branchMatch) {
-                branch = branchMatch[1].trim();
-                message = branchMatch[2].trim();
-            }
-            stashes.push({
-                ref,
-                message,
-                branch,
-                createdAt: null,
-            });
-        }
+        const stashes = result.stdout
+            .split('\n')
+            .map(parseGitStashListLine)
+            .filter((stash) => stash !== null);
         res.json({
             ok: true,
             stashes,

package/dist/routes/git.test.js

@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest';
-import { createScopedFilePathspecArgs, createScopedGitPathspecArgs, normalizeGitCommitMessage, parseGitStatusStagedPaths, } from './git.js';
+import { createScopedFilePathspecArgs, createScopedGitPathspecArgs, normalizeGitCommitMessage, parseGitStashListLine, parseLatestGitStash, parseGitStatusStagedPaths, } from './git.js';
 describe('git commit helpers', () => {
     it('normalizes commit messages before executing git commit', () => {
         expect(normalizeGitCommitMessage('  chore: update dashboard  ')).toBe('chore: update dashboard');
@@ -21,3 +21,23 @@ describe('git commit helpers', () => {
         expect([...stagedPaths].sort()).toEqual(['added.ts', 'renamed.ts', 'staged.ts']);
     });
 });
+describe('git stash reference helpers', () => {
+    it('parses stable stash object hashes while preserving the display selector', () => {
+        const stash = parseGitStashListLine('0123456789abcdef0123456789abcdef01234567\u0000stash@{3}\u0000On main: 快照: 任务线-2026-06-02 10:00:00\u00002 hours ago');
+        expect(stash).toEqual({
+            ref: '0123456789abcdef0123456789abcdef01234567',
+            stashName: 'stash@{3}',
+            message: '快照: 任务线-2026-06-02 10:00:00',
+            branch: 'main',
+            createdAt: '2 hours ago',
+        });
+    });
+    it('uses the stable stash object hash for the latest no-change snapshot reuse', () => {
+        const latest = parseLatestGitStash('fedcba9876543210fedcba9876543210fedcba98\u0000stash@{0}\u0000On master: 快照: latest\u0000just now\n');
+        expect(latest).toEqual({
+            ref: 'fedcba9876543210fedcba9876543210fedcba98',
+            stashName: 'stash@{0}',
+            message: '快照: latest',
+        });
+    });
+});

package/package.json

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