aws-runtime-bridge 1.7.25 → 1.7.26

package/dist/routes/file-browser.d.ts

@@ -6,6 +6,32 @@
 import multer from 'multer';
 export declare const fileBrowserRouter: import("express-serve-static-core").Router;
 export declare const WORKSPACE_UPLOAD_FILE_LIMIT = 2000;
+interface FileBrowserItem {
+    name: string;
+    path: string;
+    isDirectory: boolean;
+}
+interface FileBrowserResponse {
+    isWindows: boolean;
+    currentPath: string;
+    items: FileBrowserItem[];
+}
+interface DirectoryTreeItem extends FileBrowserItem {
+    children?: DirectoryTreeItem[];
+    truncated?: boolean;
+}
+interface DirectoryTreeResponse extends FileBrowserResponse {
+    maxDepth: number;
+    maxItemsPerDirectory: number;
+    tree: DirectoryTreeItem[];
+}
+interface GitIgnoreRule {
+    pattern: string;
+    negated: boolean;
+    directoryOnly: boolean;
+    anchored: boolean;
+    hasSlash: boolean;
+}
 export declare function createWorkspaceUploadLimitResponse(error: multer.MulterError): {
     status: number;
     body: {
@@ -14,4 +40,11 @@ export declare function createWorkspaceUploadLimitResponse(error: multer.MulterE
     };
 };
 export declare function parseWorkspaceUploadRelativePaths(body: Record<string, unknown>): string[];
+/**
+ * 主流程：从选中的工作目录生成受限目录树，最多 10 层且每个目录只返回前 20 个子目录。
+ */
+export declare function listHostDirectoryTree(requestPath?: string): Promise<DirectoryTreeResponse>;
+export declare function parseGitIgnoreRules(content: string): GitIgnoreRule[];
+export declare function isIgnoredByGitIgnore(relativePath: string, isDirectory: boolean, rules: GitIgnoreRule[]): boolean;
+export {};
 //# sourceMappingURL=file-browser.d.ts.map

package/dist/routes/file-browser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"file-browser.d.ts","sourceRoot":"","sources":["../../src/routes/file-browser.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAOH,OAAO,MAAM,MAAM,QAAQ,CAAC;AAuB5B,eAAO,MAAM,iBAAiB,4CAAW,CAAC;AAE1C,eAAO,MAAM,2BAA2B,OAAO,CAAC;AAqChD,wBAAgB,kCAAkC,CAAC,KAAK,EAAE,MAAM,CAAC,WAAW,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,CAUvI;AAED,wBAAgB,iCAAiC,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,EAAE,CAgBzF"}
+{"version":3,"file":"file-browser.d.ts","sourceRoot":"","sources":["../../src/routes/file-browser.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAOH,OAAO,MAAM,MAAM,QAAQ,CAAC;AAuB5B,eAAO,MAAM,iBAAiB,4CAAW,CAAC;AAE1C,eAAO,MAAM,2BAA2B,OAAO,CAAC;AAUhD,UAAU,eAAe;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,UAAU,mBAAmB;IAC3B,SAAS,EAAE,OAAO,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,eAAe,EAAE,CAAC;CAC1B;AAKD,UAAU,iBAAkB,SAAQ,eAAe;IACjD,QAAQ,CAAC,EAAE,iBAAiB,EAAE,CAAC;IAC/B,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,UAAU,qBAAsB,SAAQ,mBAAmB;IACzD,QAAQ,EAAE,MAAM,CAAC;IACjB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,IAAI,EAAE,iBAAiB,EAAE,CAAC;CAC3B;AAED,UAAU,aAAa;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,EAAE,OAAO,CAAC;IACvB,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,EAAE,OAAO,CAAC;CACnB;AAiBD,wBAAgB,kCAAkC,CAAC,KAAK,EAAE,MAAM,CAAC,WAAW,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,CAUvI;AAED,wBAAgB,iCAAiC,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,EAAE,CAgBzF;AAyFD;;GAEG;AACH,wBAAsB,qBAAqB,CAAC,WAAW,SAAK,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAkB5F;AAoCD,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,aAAa,EAAE,CAuBpE;AAWD,wBAAgB,oBAAoB,CAAC,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,GAAG,OAAO,CAWhH"}

package/dist/routes/file-browser.js

@@ -23,6 +23,8 @@ const upload = multer({
         fileSize: 512 * 1024 * 1024
     }
 });
+const DIRECTORY_TREE_MAX_DEPTH = 10;
+const DIRECTORY_TREE_MAX_ITEMS_PER_DIRECTORY = 20;
 function toBoolean(value) {
     return value === true || value === 'true' || value === '1';
 }
@@ -141,6 +143,147 @@ async function listHostDirectories(requestPath = '') {
         items
     };
 }
+/**
+ * 主流程：从选中的工作目录生成受限目录树，最多 10 层且每个目录只返回前 20 个子目录。
+ */
+export async function listHostDirectoryTree(requestPath = '') {
+    const root = await listHostDirectories(requestPath);
+    const ignoreRules = root.currentPath ? await loadGitIgnoreRules(root.currentPath) : [];
+    if (!root.currentPath) {
+        return {
+            ...root,
+            maxDepth: DIRECTORY_TREE_MAX_DEPTH,
+            maxItemsPerDirectory: DIRECTORY_TREE_MAX_ITEMS_PER_DIRECTORY,
+            tree: root.items.slice(0, DIRECTORY_TREE_MAX_ITEMS_PER_DIRECTORY),
+        };
+    }
+    return {
+        ...root,
+        maxDepth: DIRECTORY_TREE_MAX_DEPTH,
+        maxItemsPerDirectory: DIRECTORY_TREE_MAX_ITEMS_PER_DIRECTORY,
+        tree: await buildDirectoryTree(root.currentPath, root.currentPath, 1, ignoreRules),
+    };
+}
+async function buildDirectoryTree(rootPath, directoryPath, depth, ignoreRules) {
+    if (depth > DIRECTORY_TREE_MAX_DEPTH) {
+        return [];
+    }
+    const entries = await fs.readdir(directoryPath, { withFileTypes: true });
+    const directories = entries
+        .filter((entry) => entry.isDirectory())
+        .filter((entry) => !isIgnoredDirectory(rootPath, path.join(directoryPath, entry.name), ignoreRules))
+        .sort((left, right) => left.name.localeCompare(right.name))
+        .slice(0, DIRECTORY_TREE_MAX_ITEMS_PER_DIRECTORY);
+    const nodes = [];
+    for (const entry of directories) {
+        const childPath = path.join(directoryPath, entry.name);
+        const node = {
+            name: entry.name,
+            path: childPath.replace(/\\/g, '/'),
+            isDirectory: true,
+        };
+        if (depth < DIRECTORY_TREE_MAX_DEPTH) {
+            try {
+                node.children = await buildDirectoryTree(rootPath, childPath, depth + 1, ignoreRules);
+            }
+            catch {
+                node.children = [];
+            }
+        }
+        else {
+            node.truncated = true;
+        }
+        nodes.push(node);
+    }
+    return nodes;
+}
+export function parseGitIgnoreRules(content) {
+    return String(content || '')
+        .split(/\r?\n/)
+        .map((line) => line.trim())
+        .filter((line) => line && !line.startsWith('#'))
+        .map((line) => {
+        const negated = line.startsWith('!');
+        const rawPattern = negated ? line.slice(1).trim() : line;
+        const anchored = rawPattern.startsWith('/');
+        const directoryOnly = rawPattern.endsWith('/');
+        const pattern = rawPattern
+            .replace(/^\/+/, '')
+            .replace(/\/+$/, '')
+            .replace(/\\/g, '/');
+        return {
+            pattern,
+            negated,
+            directoryOnly,
+            anchored,
+            hasSlash: pattern.includes('/'),
+        };
+    })
+        .filter((rule) => rule.pattern.length > 0);
+}
+async function loadGitIgnoreRules(rootPath) {
+    try {
+        const content = await fs.readFile(path.join(rootPath, '.gitignore'), 'utf8');
+        return parseGitIgnoreRules(content);
+    }
+    catch {
+        return [];
+    }
+}
+export function isIgnoredByGitIgnore(relativePath, isDirectory, rules) {
+    const normalizedPath = normalizeRelativePath(relativePath);
+    if (!normalizedPath)
+        return false;
+    let ignored = false;
+    for (const rule of rules) {
+        if (rule.directoryOnly && !isDirectory)
+            continue;
+        if (matchesGitIgnoreRule(normalizedPath, rule)) {
+            ignored = !rule.negated;
+        }
+    }
+    return ignored;
+}
+function isIgnoredDirectory(rootPath, directoryPath, ignoreRules) {
+    if (ignoreRules.length === 0)
+        return false;
+    const relativePath = path.relative(rootPath, directoryPath).replace(/\\/g, '/');
+    return isIgnoredByGitIgnore(relativePath, true, ignoreRules);
+}
+function matchesGitIgnoreRule(relativePath, rule) {
+    if (!rule.hasSlash && !rule.anchored) {
+        return relativePath.split('/').some((segment) => matchesGlobSegment(segment, rule.pattern));
+    }
+    const pattern = rule.pattern;
+    if (rule.anchored) {
+        return matchesGlobPath(relativePath, pattern) || relativePath.startsWith(pattern + '/');
+    }
+    return matchesGlobPath(relativePath, pattern)
+        || relativePath.endsWith('/' + pattern)
+        || relativePath.includes('/' + pattern + '/');
+}
+function matchesGlobPath(relativePath, pattern) {
+    const regex = new RegExp('^' + globToRegex(pattern) + '(?:/.*)?$');
+    return regex.test(relativePath);
+}
+function matchesGlobSegment(segment, pattern) {
+    const regex = new RegExp('^' + globToRegex(pattern) + '$');
+    return regex.test(segment);
+}
+function globToRegex(pattern) {
+    return pattern
+        .replace(/[.+^${}()|[\]\\]/g, '\\$&')
+        .replace(/\*\*/g, '.*')
+        .replace(/\*/g, '[^/]*')
+        .replace(/\?/g, '[^/]');
+}
+function normalizeRelativePath(relativePath) {
+    return String(relativePath || '')
+        .replace(/\\/g, '/')
+        .replace(/^\.\//, '')
+        .replace(/^\/+/, '')
+        .replace(/\/+$/, '');
+}
 async function resolveHostDirectoryPath(targetPath) {
     const normalizedPath = path.normalize(String(targetPath || ''));
     const stat = await fs.stat(normalizedPath);
@@ -218,6 +361,16 @@ fileBrowserRouter.post('/directory-picker/list', validateToken, async (req, res)
         res.status(400).json({ error: err.message });
     }
 });
+fileBrowserRouter.post('/directory-picker/tree', validateToken, async (req, res) => {
+    try {
+        const { path: requestPath = '' } = req.body || {};
+        res.json(await listHostDirectoryTree(String(requestPath || '')));
+    }
+    catch (error) {
+        const err = error;
+        res.status(400).json({ error: err.message });
+    }
+});
 /**
  * 列出工作区目录内容
  * POST /api/file-browser/workspace/list

package/dist/routes/file-browser.test.js

@@ -2,8 +2,11 @@
  * File Browser 路由单元测试
  */
 import { describe, it, expect } from 'vitest';
+import { mkdtemp, mkdir, rm, writeFile } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import path from 'node:path';
 import multer from 'multer';
-import { createWorkspaceUploadLimitResponse, parseWorkspaceUploadRelativePaths, WORKSPACE_UPLOAD_FILE_LIMIT } from './file-browser.js';
+import { createWorkspaceUploadLimitResponse, isIgnoredByGitIgnore, listHostDirectoryTree, parseGitIgnoreRules, parseWorkspaceUploadRelativePaths, WORKSPACE_UPLOAD_FILE_LIMIT } from './file-browser.js';
 describe('file-browser route validation', () => {
     it('returns root drives on Windows when path is empty', () => {
         const getRootForWindows = () => {
@@ -117,3 +120,36 @@ describe('file-browser response building', () => {
         expect(relativePaths).toEqual(['a/b/c.txt', 'a/d/e.txt']);
     });
 });
+describe('directory tree gitignore filtering', () => {
+    it('matches ignored directories from .gitignore rules', () => {
+        const rules = parseGitIgnoreRules(`
+node_modules/
+/dist/
+logs*
+!logs-keep/
+`);
+        expect(isIgnoredByGitIgnore('node_modules', true, rules)).toBe(true);
+        expect(isIgnoredByGitIgnore('packages/app/node_modules', true, rules)).toBe(true);
+        expect(isIgnoredByGitIgnore('dist', true, rules)).toBe(true);
+        expect(isIgnoredByGitIgnore('packages/app/dist', true, rules)).toBe(false);
+        expect(isIgnoredByGitIgnore('logs-temp', true, rules)).toBe(true);
+        expect(isIgnoredByGitIgnore('logs-keep', true, rules)).toBe(false);
+    });
+    it('filters actual directory tree entries using root .gitignore', async () => {
+        const root = await mkdtemp(path.join(tmpdir(), 'aws-tree-ignore-'));
+        try {
+            await mkdir(path.join(root, 'src'));
+            await mkdir(path.join(root, 'node_modules'));
+            await mkdir(path.join(root, 'dist'));
+            await writeFile(path.join(root, '.gitignore'), 'node_modules/\n/dist/\n');
+            const result = await listHostDirectoryTree(root);
+            const names = result.tree.map((item) => item.name);
+            expect(names).toContain('src');
+            expect(names).not.toContain('node_modules');
+            expect(names).not.toContain('dist');
+        }
+        finally {
+            await rm(root, { recursive: true, force: true });
+        }
+    });
+});

package/dist/routes/git.d.ts

@@ -11,5 +11,25 @@ type GitDiffFileStatus = 'modified' | 'added' | 'deleted' | 'renamed';
  * 普通 modified 且文本增删均为 0 通常是 filemode/元数据噪声，避免显示为“无差异内容”。
  */
 export declare function shouldIncludeGitDiffSummaryFile(status: GitDiffFileStatus, additions: number, deletions: number, isBinaryDiff: boolean): boolean;
+/**
+ * 判断 git stash 是否因仓库尚无初始提交而失败。
+ * 主流程：兼容 Git 不同版本输出，将底层英文错误归一成可面向用户的诊断。
+ */
+export declare function isGitStashMissingInitialCommitError(output: string): boolean;
+export declare function createMissingInitialCommitSnapshotError(): string;
+/**
+ * 判断 git stash push 是否明确表示没有本地变更。
+ * 主流程：兼容不同 Git 版本把 no-change 信息输出到 stdout 或 stderr，且可能返回 0 或非 0。
+ */
+export declare function isGitStashNoChangesOutput(output: string): boolean;
+interface LatestGitStash {
+    ref: string;
+    message: string;
+}
+/**
+ * 从 git stash list -n 1 输出解析最近一次 stash。
+ * 主流程：提取 stash 引用并保留后续描述，供无变更快照复用最近快照引用。
+ */
+export declare function parseLatestGitStash(output: string): LatestGitStash | null;
 export {};
 //# sourceMappingURL=git.d.ts.map

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;AAQH,eAAO,MAAM,SAAS,4CAAW,CAAC;AAWlC,wBAAsB,gCAAgC,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAe3F;AASD,KAAK,iBAAiB,GAAG,UAAU,GAAG,OAAO,GAAG,SAAS,GAAG,SAAS,CAAC;AAEtE;;;GAGG;AACH,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,iBAAiB,EACzB,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,OAAO,GACpB,OAAO,CAMT"}
+{"version":3,"file":"git.d.ts","sourceRoot":"","sources":["../../src/routes/git.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAQH,eAAO,MAAM,SAAS,4CAAW,CAAC;AAWlC,wBAAsB,gCAAgC,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAe3F;AASD,KAAK,iBAAiB,GAAG,UAAU,GAAG,OAAO,GAAG,SAAS,GAAG,SAAS,CAAC;AAEtE;;;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"}

package/dist/routes/git.js

@@ -35,6 +35,45 @@ export function shouldIncludeGitDiffSummaryFile(status, additions, deletions, is
     }
     return isBinaryDiff || additions > 0 || deletions > 0;
 }
+/**
+ * 判断 git stash 是否因仓库尚无初始提交而失败。
+ * 主流程：兼容 Git 不同版本输出，将底层英文错误归一成可面向用户的诊断。
+ */
+export function isGitStashMissingInitialCommitError(output) {
+    const normalized = String(output || '').toLowerCase();
+    return normalized.includes('you do not have the initial commit yet')
+        || (normalized.includes('bad revision') && normalized.includes('head'))
+        || (normalized.includes('ambiguous argument') && normalized.includes('head'));
+}
+export function createMissingInitialCommitSnapshotError() {
+    return '当前 Git 仓库还没有初始提交，无法创建快照。请先提交一次初始提交后再创建快照。';
+}
+/**
+ * 判断 git stash push 是否明确表示没有本地变更。
+ * 主流程：兼容不同 Git 版本把 no-change 信息输出到 stdout 或 stderr，且可能返回 0 或非 0。
+ */
+export function isGitStashNoChangesOutput(output) {
+    const normalized = String(output || '').toLowerCase();
+    return normalized.includes('no local changes to save')
+        || normalized.includes('no changes to save')
+        || normalized.includes('没有本地变更需要保存');
+}
+/**
+ * 从 git stash list -n 1 输出解析最近一次 stash。
+ * 主流程：提取 stash 引用并保留后续描述，供无变更快照复用最近快照引用。
+ */
+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)
+        return null;
+    return {
+        ref: match[1],
+        message: match[2]?.trim() || match[1],
+    };
+}
 /**
  * 执行 git 命令并返回输出
  */
@@ -209,15 +248,24 @@ gitRouter.post('/git/stash/create', validateToken, async (req, res) => {
             ? `快照: ${String(message).trim()}`
             : 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 latestStash = latestResult.exitCode === 0 ? parseLatestGitStash(latestResult.stdout) : null;
+            res.json({
+                ok: true,
+                stashRef: latestStash?.ref ?? null,
+                message: latestStash
+                    ? `没有本地变更需要保存，已复用最近快照 ${latestStash.ref}`
+                    : '没有本地变更需要保存',
+                noChanges: true,
+                reusedLatestStash: Boolean(latestStash),
+                workspacePath: normalizedPath
+            });
+            return;
+        }
         if (result.exitCode !== 0) {
-            if (result.stderr.includes('No local changes to save')) {
-                res.json({
-                    ok: true,
-                    stashRef: null,
-                    message: '没有本地变更需要保存',
-                    noChanges: true,
-                    workspacePath: normalizedPath
-                });
+            if (isGitStashMissingInitialCommitError(`${result.stdout}\n${result.stderr}`)) {
+                res.status(400).json({ error: createMissingInitialCommitSnapshotError() });
                 return;
             }
             res.status(400).json({ error: result.stderr || 'git stash push failed' });
@@ -292,10 +340,10 @@ gitRouter.post('/git/stash/list', validateToken, async (req, res) => {
     }
 });
 /**
- * 恢复 git stash 快照
- * POST /runtime/git/stash/pop
+ * 应用或弹出 git stash 快照。
+ * 主流程：恢复前先清理工作区未提交变更，再执行 apply/pop，并统一处理冲突和引用不存在错误。
  */
-gitRouter.post('/git/stash/pop', validateToken, async (req, res) => {
+async function restoreGitStash(req, res, mode) {
     const { workspacePath, ref } = req.body || {};
     if (!workspacePath || !String(workspacePath).trim()) {
         res.status(400).json({ error: 'workspacePath is required' });
@@ -305,7 +353,7 @@ gitRouter.post('/git/stash/pop', validateToken, async (req, res) => {
         const normalizedPath = path.resolve(String(workspacePath).trim());
         const stashRef = ref && String(ref).trim() ? String(ref).trim() : 'stash@{0}';
         await execGitCommand(normalizedPath, ['checkout', '--', '.']);
-        const result = await execGitCommand(normalizedPath, ['stash', 'pop', stashRef]);
+        const result = await execGitCommand(normalizedPath, ['stash', mode, stashRef]);
         if (result.exitCode !== 0) {
             if (result.stdout.includes('CONFLICT') || result.stderr.includes('CONFLICT')) {
                 res.json({
@@ -321,20 +369,35 @@ gitRouter.post('/git/stash/pop', validateToken, async (req, res) => {
                 res.status(404).json({ error: `快照 ${stashRef} 不存在` });
                 return;
             }
-            res.status(400).json({ error: result.stderr || 'git stash pop failed' });
+            res.status(400).json({ error: result.stderr || `git stash ${mode} failed` });
             return;
         }
         res.json({
             ok: true,
             stashRef,
-            message: `已恢复 ${stashRef}`,
+            message: mode === 'apply' ? `已应用 ${stashRef}` : `已恢复 ${stashRef}`,
+            preservedStash: mode === 'apply',
             workspacePath: normalizedPath
         });
     }
     catch (error) {
         const err = error;
-        res.status(500).json({ error: err.message || 'pop stash failed' });
+        res.status(500).json({ error: err.message || `${mode} stash failed` });
     }
+}
+/**
+ * 应用 git stash 快照但不删除快照
+ * POST /runtime/git/stash/apply
+ */
+gitRouter.post('/git/stash/apply', validateToken, async (req, res) => {
+    await restoreGitStash(req, res, 'apply');
+});
+/**
+ * 恢复 git stash 快照并删除快照
+ * POST /runtime/git/stash/pop
+ */
+gitRouter.post('/git/stash/pop', validateToken, async (req, res) => {
+    await restoreGitStash(req, res, 'pop');
 });
 /**
  * 删除指定的 git stash

package/dist/routes/git.test.js

@@ -5,7 +5,7 @@ import { mkdtemp, rm, writeFile } from 'node:fs/promises';
 import { tmpdir } from 'node:os';
 import path from 'node:path';
 import { describe, expect, it } from 'vitest';
-import { assertGitWorkspacePathAccessible, shouldIncludeGitDiffSummaryFile } from './git.js';
+import { assertGitWorkspacePathAccessible, createMissingInitialCommitSnapshotError, isGitStashNoChangesOutput, isGitStashMissingInitialCommitError, parseLatestGitStash, shouldIncludeGitDiffSummaryFile, } from './git.js';
 describe('git stash operations', () => {
     function parseStashList(output) {
         const stashes = [];
@@ -53,6 +53,17 @@ describe('git stash operations', () => {
     it('returns empty array for empty output', () => {
         expect(parseStashList('')).toEqual([]);
     });
+    it('parses latest stash for no-change snapshot reuse', () => {
+        const result = parseLatestGitStash('stash@{0}: On master: 快照: 快照: t1\n');
+        expect(result).toEqual({
+            ref: 'stash@{0}',
+            message: 'On master: 快照: 快照: t1',
+        });
+    });
+    it('returns null when there is no latest stash to reuse', () => {
+        expect(parseLatestGitStash('')).toBeNull();
+        expect(parseLatestGitStash('not a stash line')).toBeNull();
+    });
 });
 describe('git command validation', () => {
     it('validates workspacePath requirement', () => {
@@ -115,15 +126,28 @@ describe('git diff summary visibility', () => {
 });
 describe('error handling', () => {
     it('detects "no local changes" error', () => {
-        const isNoChangesError = (stderr) => stderr.includes('No local changes to save');
-        expect(isNoChangesError('error: No local changes to save')).toBe(true);
-        expect(isNoChangesError('other error')).toBe(false);
+        expect(isGitStashNoChangesOutput('No local changes to save')).toBe(true);
+        expect(isGitStashNoChangesOutput('stdout: No changes to save')).toBe(true);
+        expect(isGitStashNoChangesOutput('没有本地变更需要保存')).toBe(true);
+        expect(isGitStashNoChangesOutput('other error')).toBe(false);
+    });
+    it('detects stash failure before initial commit and returns an actionable message', () => {
+        expect(isGitStashMissingInitialCommitError('You do not have the initial commit yet\n')).toBe(true);
+        expect(isGitStashMissingInitialCommitError("fatal: bad revision 'HEAD'\n")).toBe(true);
+        expect(isGitStashMissingInitialCommitError("fatal: ambiguous argument 'HEAD': unknown revision\n")).toBe(true);
+        expect(isGitStashMissingInitialCommitError('No local changes to save')).toBe(false);
+        expect(createMissingInitialCommitSnapshotError()).toContain('请先提交一次初始提交');
     });
     it('detects conflict during pop', () => {
         const hasConflict = (stdout, stderr) => stdout.includes('CONFLICT') || stderr.includes('CONFLICT');
         expect(hasConflict('CONFLICT (content): Merge conflict', '')).toBe(true);
         expect(hasConflict('clean merge', '')).toBe(false);
     });
+    it('uses apply as the non-consuming restore command', () => {
+        const buildRestoreCommand = (mode, ref) => ['stash', mode, ref];
+        expect(buildRestoreCommand('apply', 'stash@{0}')).toEqual(['stash', 'apply', 'stash@{0}']);
+        expect(buildRestoreCommand('pop', 'stash@{0}')).toEqual(['stash', 'pop', 'stash@{0}']);
+    });
     it('detects invalid stash reference', () => {
         const isInvalidRef = (stderr) => stderr.includes('is not a valid reference');
         expect(isInvalidRef('stash@{99} is not a valid reference')).toBe(true);

package/dist/routes/properties.test.js

@@ -17,14 +17,14 @@ describe('properties route validation', () => {
 describe('properties file operations', () => {
     it('resolves relative propertiesPath', () => {
         const resolvePath = (workspacePath, propertiesPath) => {
-            const defaultPath = 'vibe-coding/my.properties';
+            const defaultPath = '.agentswork/my.properties';
             const resolved = propertiesPath || defaultPath;
             if (workspacePath && !resolved.startsWith('/'))
                 return `${workspacePath}/${resolved}`;
             return resolved;
         };
         expect(resolvePath('/project', 'config/app.properties')).toBe('/project/config/app.properties');
-        expect(resolvePath('/project')).toBe('/project/vibe-coding/my.properties');
+        expect(resolvePath('/project')).toBe('/project/.agentswork/my.properties');
     });
     it('parses properties content', () => {
         const parseProperties = (content) => {

package/dist/routes/yml.js

@@ -19,8 +19,8 @@ export const ymlRouter = Router();
 ymlRouter.post('/read-yml', validateToken, async (req, res) => {
     const { workspacePath, ymlPath } = req.body || {};
     try {
-        const { normalizedWorkspace, resolvedTarget } = resolveWorkspaceFilePath(workspacePath, ymlPath, 'vibe-coding/my.yml');
-        const providedPathStr = ymlPath ? String(ymlPath).trim() || 'vibe-coding/my.yml' : 'vibe-coding/my.yml';
+        const { normalizedWorkspace, resolvedTarget } = resolveWorkspaceFilePath(workspacePath, ymlPath, '.agentswork/my.yml');
+        const providedPathStr = ymlPath ? String(ymlPath).trim() || '.agentswork/my.yml' : '.agentswork/my.yml';
         if (path.isAbsolute(providedPathStr)) {
             let content = '';
             let exists = true;
@@ -117,8 +117,8 @@ ymlRouter.post('/read-yml', validateToken, async (req, res) => {
 ymlRouter.post('/load-yml', validateToken, async (req, res) => {
     const { workspacePath, ymlPath } = req.body || {};
     try {
-        const { normalizedWorkspace, resolvedTarget } = resolveWorkspaceFilePath(workspacePath, ymlPath, 'vibe-coding/my.yml');
-        const providedPathStr = ymlPath ? String(ymlPath).trim() || 'vibe-coding/my.yml' : 'vibe-coding/my.yml';
+        const { normalizedWorkspace, resolvedTarget } = resolveWorkspaceFilePath(workspacePath, ymlPath, '.agentswork/my.yml');
+        const providedPathStr = ymlPath ? String(ymlPath).trim() || '.agentswork/my.yml' : '.agentswork/my.yml';
         if (path.isAbsolute(providedPathStr)) {
             let content = null;
             let exists = true;
@@ -172,8 +172,8 @@ ymlRouter.post('/write-yml', validateToken, async (req, res) => {
         return;
     }
     try {
-        const { normalizedWorkspace, resolvedTarget: absoluteOrDefaultTarget } = resolveWorkspaceFilePath(workspacePath, ymlPath, 'vibe-coding/my.yml');
-        const providedPathStr = ymlPath ? String(ymlPath).trim() || 'vibe-coding/my.yml' : 'vibe-coding/my.yml';
+        const { normalizedWorkspace, resolvedTarget: absoluteOrDefaultTarget } = resolveWorkspaceFilePath(workspacePath, ymlPath, '.agentswork/my.yml');
+        const providedPathStr = ymlPath ? String(ymlPath).trim() || '.agentswork/my.yml' : '.agentswork/my.yml';
         if (path.isAbsolute(providedPathStr)) {
             const resolvedTarget = absoluteOrDefaultTarget;
             const configFileDir = path.dirname(resolvedTarget);

package/dist/routes/yml.test.js

@@ -27,9 +27,9 @@ describe('yml route validation', () => {
     });
     it('uses default ymlPath when not provided', () => {
         const resolveYmlPath = (ymlPath) => {
-            return ymlPath ? String(ymlPath).trim() || 'vibe-coding/my.yml' : 'vibe-coding/my.yml';
+            return ymlPath ? String(ymlPath).trim() || '.agentswork/my.yml' : '.agentswork/my.yml';
         };
-        expect(resolveYmlPath()).toBe('vibe-coding/my.yml');
+        expect(resolveYmlPath()).toBe('.agentswork/my.yml');
         expect(resolveYmlPath('custom/path.yml')).toBe('custom/path.yml');
     });
 });
@@ -38,7 +38,7 @@ describe('response building', () => {
         const response = {
             ok: true,
             workspacePath: '/project/workspace',
-            filePath: '/project/vibe-coding/my.yml',
+            filePath: '/project/.agentswork/my.yml',
             exists: true,
             content: 'agent:\n  - name: test',
         };

package/dist/utils/path-utils.js

@@ -40,5 +40,5 @@ export function resolveWorkspaceFilePath(workspacePath, relativeOrAbsolutePath,
  * @returns 解析后的路径结果
  */
 export function resolvePropertiesTargetPath(workspacePath, relativeOrAbsolutePath) {
-    return resolveWorkspaceFilePath(workspacePath, relativeOrAbsolutePath, 'vibe-coding/my.properties');
+    return resolveWorkspaceFilePath(workspacePath, relativeOrAbsolutePath, '.agentswork/my.properties');
 }

package/dist/utils/yaml-utils.d.ts

@@ -63,10 +63,10 @@ export declare function autoFillPathInYml(ymlContent: string, workspaceRelativeP
  * 3. 找到匹配的配置 → 使用该配置
  * 4. 所有层级都没有匹配的配置 → 使用最后一个找到的配置（或在工作目录创建）
  *
- * 例如：工作目录 D:\a\b\c\d，相对路径 vibe-coding/my.yml
- * 第1次查找：D:\a\b\c\d\vibe-coding\my.yml，匹配 path="."
- * 第2次查找：D:\a\b\c\vibe-coding\my.yml，匹配 path="d"
- * 第3次查找：D:\a\b\vibe-coding\my.yml，匹配 path="c/d"
+ * 例如：工作目录 D:\a\b\c\d，相对路径 .agentswork/my.yml
+ * 第1次查找：D:\a\b\c\d\.agentswork\my.yml，匹配 path="."
+ * 第2次查找：D:\a\b\c\.agentswork\my.yml，匹配 path="d"
+ * 第3次查找：D:\a\b\.agentswork\my.yml，匹配 path="c/d"
  * ...
  */
 export declare function loadYmlWithUpwardSearch(workspacePath: string, relativePath: string): Promise<YmlLoadResult>;

package/dist/utils/yaml-utils.js

@@ -224,10 +224,10 @@ export function autoFillPathInYml(ymlContent, workspaceRelativePath) {
  * 3. 找到匹配的配置 → 使用该配置
  * 4. 所有层级都没有匹配的配置 → 使用最后一个找到的配置（或在工作目录创建）
  *
- * 例如：工作目录 D:\a\b\c\d，相对路径 vibe-coding/my.yml
- * 第1次查找：D:\a\b\c\d\vibe-coding\my.yml，匹配 path="."
- * 第2次查找：D:\a\b\c\vibe-coding\my.yml，匹配 path="d"
- * 第3次查找：D:\a\b\vibe-coding\my.yml，匹配 path="c/d"
+ * 例如：工作目录 D:\a\b\c\d，相对路径 .agentswork/my.yml
+ * 第1次查找：D:\a\b\c\d\.agentswork\my.yml，匹配 path="."
+ * 第2次查找：D:\a\b\c\.agentswork\my.yml，匹配 path="d"
+ * 第3次查找：D:\a\b\.agentswork\my.yml，匹配 path="c/d"
  * ...
  */
 export async function loadYmlWithUpwardSearch(workspacePath, relativePath) {

package/dist/utils/yaml-utils.test.js

@@ -272,7 +272,7 @@ agent:
     describe('loadYmlWithUpwardSearch', () => {
         const tempRoot = path.join(os.tmpdir(), `aws-yaml-test-${Date.now()}`);
         const workspacePath = path.join(tempRoot, 'project', 'module', 'src');
-        const relativePath = 'vibe-coding/my.yml';
+        const relativePath = '.agentswork/my.yml';
         beforeEach(async () => {
             // 创建目录结构
             await fs.mkdir(workspacePath, { recursive: true });

package/package/aws-client-agent-mcp/dist/mcp-server.d.ts

@@ -32,15 +32,10 @@ export declare class McpServer {
     private static readonly MEMORY_TYPES;
     private static readonly MEMORY_TOOL_NAMES;
     /**
-     * 解析本地记忆文件路径。
-     * 主流程：显式配置优先 -> 长期记忆按角色分目录 -> task_list/recently_memory 按 Agent 实例分目录。
+     * 解析记忆存储路径。
+     * 主流程：task_list/recently_memory 走 server 数据库；长期 memory 默认写入项目 .agentswork/memory/memory/<domain>.json。
      */
     private static resolveMemoryStorePaths;
-    /**
-     * 生成可用于目录名的作用域片段。
-     * 主流程：裁剪输入 -> 替换路径危险字符 -> 空值落到明确 fallback。
-     */
-    private static toSafePathSegment;
     private getRequiredString;
     private getOptionalString;
     private getOptionalNumber;