aws-runtime-bridge 1.7.30 → 1.7.32

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;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"}
+{"version":3,"file":"file-browser.d.ts","sourceRoot":"","sources":["../../src/routes/file-browser.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAOH,OAAO,MAAM,MAAM,QAAQ,CAAC;AAyB5B,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

@@ -3,16 +3,16 @@
  *
  * 提供文件系统浏览功能
  */
-import os from 'node:os';
 import { createReadStream, promises as fs } from 'node:fs';
+import os from 'node:os';
 import path from 'node:path';
 import { Router } from 'express';
 import multer from 'multer';
 import { allowHostFileBrowser } from '../config.js';
 import { validateToken } from '../middleware/auth.js';
-import { createLogger } from '../utils/logger.js';
-import { createWorkspaceEntry, deleteWorkspaceEntry, extractWorkspaceArchive, listWorkspaceDirectory, moveWorkspaceEntry, previewWorkspaceDocument, readWorkspaceFile, renameWorkspaceEntry, resolveWorkspaceDownloadTarget, streamWorkspaceDirectoryZip, uploadWorkspaceFiles, writeWorkspaceFile, } from '../services/workspace-files.js';
+import { chmodWorkspaceEntry, createWorkspaceEntry, deleteWorkspaceEntry, extractWorkspaceArchive, getWorkspaceEntryProperties, listWorkspaceDirectory, moveWorkspaceEntry, previewWorkspaceDocument, readWorkspaceFile, renameWorkspaceEntry, resolveWorkspaceDownloadTarget, streamWorkspaceDirectoryZip, uploadWorkspaceFiles, writeWorkspaceFile, } from '../services/workspace-files.js';
 import { unwatchWorkspaceFile, watchWorkspaceFile } from '../services/workspace-watch.js';
+import { createLogger } from '../utils/logger.js';
 const log = createLogger('file-browser');
 export const fileBrowserRouter = Router();
 export const WORKSPACE_UPLOAD_FILE_LIMIT = 2000;
@@ -414,6 +414,44 @@ fileBrowserRouter.post('/workspace/read', validateToken, async (req, res) => {
         res.status(400).json({ error: err.message });
     }
 });
+/**
+ * 读取工作区文件或目录属性。
+ * POST /api/file-browser/workspace/properties
+ */
+fileBrowserRouter.post('/workspace/properties', validateToken, async (req, res) => {
+    try {
+        const { workspacePath, targetPath } = req.body || {};
+        res.json(await getWorkspaceEntryProperties({
+            workspacePath: String(workspacePath || ''),
+            targetPath: String(targetPath || '')
+        }));
+    }
+    catch (error) {
+        const err = error;
+        log.error('failed to get workspace entry properties:', err);
+        res.status(400).json({ error: err.message });
+    }
+});
+/**
+ * 修改工作区文件或目录权限。
+ * POST /api/file-browser/workspace/chmod
+ */
+fileBrowserRouter.post('/workspace/chmod', validateToken, async (req, res) => {
+    try {
+        const { workspacePath, targetPath, mode, recursive } = req.body || {};
+        res.json(await chmodWorkspaceEntry({
+            workspacePath: String(workspacePath || ''),
+            targetPath: String(targetPath || ''),
+            mode: String(mode || ''),
+            recursive: Boolean(recursive)
+        }));
+    }
+    catch (error) {
+        const err = error;
+        log.error('failed to chmod workspace entry:', err);
+        res.status(400).json({ error: err.message });
+    }
+});
 /**
  * 在目录选择器当前位置创建文件夹。
  * POST /api/file-browser/directory-picker/create

package/dist/routes/git.d.ts

@@ -4,6 +4,19 @@
  * 提供 Git Stash 快照的创建、列表、恢复和删除功能
  */
 export declare const gitRouter: import("express-serve-static-core").Router;
+/**
+ * 解析 Git 命令超时时间。
+ * 主流程：优先使用环境变量，非法或过小配置回落到默认值，避免 Git 检测请求长期挂起。
+ */
+export declare function resolveGitCommandTimeoutMs(): number;
+interface GitRepositoryContext {
+    workspacePath: string;
+    repositoryRootPath: string | null;
+    hasRepository: boolean;
+    isGitRepo: boolean;
+    usingParentGitRepo: boolean;
+    relativeWorkspacePath: string;
+}
 export declare function assertGitWorkspacePathAccessible(workspacePath: string): Promise<void>;
 type GitDiffFileStatus = 'modified' | 'added' | 'deleted' | 'renamed';
 /**
@@ -31,5 +44,12 @@ interface LatestGitStash {
  * 主流程：提取 stash 引用并保留后续描述，供无变更快照复用最近快照引用。
  */
 export declare function parseLatestGitStash(output: string): LatestGitStash | null;
+/**
+ * 解析 git diff 的 name-status 与 numstat 输出，生成前端文件树需要的汇总数据。
+ */
+export declare function parseGitStatusStagedPaths(output: string): Set<string>;
+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[];
 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;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"}
+{"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"}

package/dist/routes/git.js

@@ -8,7 +8,20 @@ import { spawn } from 'node:child_process';
 import { promises as fs } from 'node:fs';
 import path from 'node:path';
 import { validateToken } from '../middleware/auth.js';
+import { logger } from '../utils/logger.js';
 export const gitRouter = Router();
+const DEFAULT_GIT_COMMAND_TIMEOUT_MS = 10_000;
+/**
+ * 解析 Git 命令超时时间。
+ * 主流程：优先使用环境变量，非法或过小配置回落到默认值，避免 Git 检测请求长期挂起。
+ */
+export function resolveGitCommandTimeoutMs() {
+    const configured = Number(process.env.AWS_RUNTIME_GIT_COMMAND_TIMEOUT_MS);
+    if (Number.isFinite(configured) && configured >= 1_000) {
+        return configured;
+    }
+    return DEFAULT_GIT_COMMAND_TIMEOUT_MS;
+}
 export async function assertGitWorkspacePathAccessible(workspacePath) {
     let stat;
     try {
@@ -79,6 +92,18 @@ export function parseLatestGitStash(output) {
  */
 async function execGitCommand(workspacePath, args) {
     return new Promise((resolve) => {
+        let settled = false;
+        let timeout = null;
+        const finish = (result) => {
+            if (settled) {
+                return;
+            }
+            settled = true;
+            if (timeout) {
+                clearTimeout(timeout);
+            }
+            resolve(result);
+        };
         const child = spawn('git', args, {
             cwd: workspacePath,
             stdio: ['ignore', 'pipe', 'pipe'],
@@ -91,11 +116,21 @@ async function execGitCommand(workspacePath, args) {
         child.stderr?.on('data', (chunk) => {
             stderr += String(chunk || '');
         });
+        timeout = setTimeout(() => {
+            const timeoutMs = resolveGitCommandTimeoutMs();
+            logger.warn(`[runtime-bridge] git command timed out after ${timeoutMs}ms: git ${args.join(' ')} (cwd=${workspacePath})`);
+            child.kill('SIGKILL');
+            finish({
+                stdout,
+                stderr: stderr || `git command timed out after ${timeoutMs}ms`,
+                exitCode: 124,
+            });
+        }, resolveGitCommandTimeoutMs());
         child.on('error', (error) => {
-            resolve({ stdout: '', stderr: error.message, exitCode: 1 });
+            finish({ stdout: '', stderr: error.message, exitCode: 1 });
         });
         child.on('close', (code) => {
-            resolve({ stdout, stderr, exitCode: code ?? 1 });
+            finish({ stdout, stderr, exitCode: code ?? 1 });
         });
     });
 }
@@ -197,6 +232,96 @@ function parseRenameDisplayPath(rawPath) {
     }
     return normalizedPath;
 }
+/**
+ * 解析 git diff 的 name-status 与 numstat 输出，生成前端文件树需要的汇总数据。
+ */
+export function parseGitStatusStagedPaths(output) {
+    const stagedPaths = new Set();
+    const lines = String(output || '').split('\n').filter(line => line.trim());
+    for (const line of lines) {
+        const indexStatus = line[0] || ' ';
+        if (indexStatus === ' ' || indexStatus === '?') {
+            continue;
+        }
+        const rawPath = line.slice(3).trim();
+        const pathParts = rawPath.split(' -> ');
+        const displayPath = parseRenameDisplayPath(pathParts[pathParts.length - 1] || rawPath);
+        if (displayPath) {
+            stagedPaths.add(displayPath);
+        }
+    }
+    return stagedPaths;
+}
+/**
+ * 解析 git diff 的 name-status 与 numstat 输出，生成前端文件树需要的汇总数据。
+ */
+function parseGitDiffSummary(nameStatusOutput, numstatOutput, stagedPaths = new Set()) {
+    const statusMap = new Map();
+    const nameStatusLines = nameStatusOutput.split('\n').filter(line => line.trim());
+    for (const line of nameStatusLines) {
+        const parts = line.split('\t');
+        if (parts.length < 2) {
+            continue;
+        }
+        const status = resolveGitDiffStatus(parts[0]);
+        const pathIndex = status === 'renamed' && parts.length >= 3 ? 2 : 1;
+        const displayPath = parseRenameDisplayPath(parts[pathIndex]);
+        if (!displayPath) {
+            continue;
+        }
+        statusMap.set(displayPath, status);
+    }
+    const files = [];
+    const lines = numstatOutput.split('\n').filter(line => line.trim());
+    for (const line of lines) {
+        const parts = line.split('\t');
+        if (parts.length < 3)
+            continue;
+        const isBinaryDiff = parts[0] === '-' || parts[1] === '-';
+        const additions = parts[0] === '-' ? 0 : parseInt(parts[0], 10) || 0;
+        const deletions = parts[1] === '-' ? 0 : parseInt(parts[1], 10) || 0;
+        const filePath = parseRenameDisplayPath(parts.slice(2).join('\t').trim());
+        const status = statusMap.get(filePath) || 'modified';
+        if (!filePath || !shouldIncludeGitDiffSummaryFile(status, additions, deletions, isBinaryDiff)) {
+            continue;
+        }
+        files.push({ path: filePath, status, additions, deletions, staged: stagedPaths.has(filePath) });
+    }
+    return files;
+}
+function normalizeCommitHash(commitHash) {
+    return String(commitHash || '').trim();
+}
+export function normalizeGitCommitMessage(message) {
+    return String(message || '').trim();
+}
+export function createScopedGitPathspecArgs(context) {
+    return ['--', context.relativeWorkspacePath || '.'];
+}
+export function createScopedFilePathspecArgs(filePath, context) {
+    return ['--', resolveRepositoryRelativeFilePath(filePath, context)];
+}
+/**
+ * 解析 git log 的 NUL 分隔输出，避免提交标题中的特殊字符破坏字段切分。
+ */
+function parseGitCommitLog(output) {
+    const fields = output.split('\0');
+    const commits = [];
+    for (let index = 0; index + 4 < fields.length; index += 5) {
+        const hash = fields[index]?.trim();
+        if (!hash) {
+            continue;
+        }
+        commits.push({
+            hash,
+            shortHash: fields[index + 1]?.trim() || hash.slice(0, 8),
+            authorName: fields[index + 2]?.trim() || 'unknown',
+            authorDate: fields[index + 3]?.trim() || '',
+            subject: fields[index + 4]?.trim() || hash,
+        });
+    }
+    return commits;
+}
 /**
  * 检查路径是否为 git 仓库
  * POST /runtime/git/check
@@ -469,38 +594,12 @@ gitRouter.post('/git/diff', validateToken, async (req, res) => {
             res.status(400).json({ error: result.stderr || 'git diff failed' });
             return;
         }
-        const statusMap = new Map();
-        const nameStatusLines = nameStatusResult.stdout.split('\n').filter(line => line.trim());
-        for (const line of nameStatusLines) {
-            const parts = line.split('\t');
-            if (parts.length < 2) {
-                continue;
-            }
-            const status = resolveGitDiffStatus(parts[0]);
-            const pathIndex = status === 'renamed' && parts.length >= 3 ? 2 : 1;
-            const displayPath = parseRenameDisplayPath(parts[pathIndex]);
-            if (!displayPath) {
-                continue;
-            }
-            statusMap.set(displayPath, status);
-        }
-        const files = [];
-        const lines = result.stdout.split('\n').filter(line => line.trim());
-        for (const line of lines) {
-            // 格式: "12\t5\tsrc/file.java"
-            const parts = line.split('\t');
-            if (parts.length < 3)
-                continue;
-            const isBinaryDiff = parts[0] === '-' || parts[1] === '-';
-            const additions = parts[0] === '-' ? 0 : parseInt(parts[0], 10) || 0;
-            const deletions = parts[1] === '-' ? 0 : parseInt(parts[1], 10) || 0;
-            const filePath = parseRenameDisplayPath(parts.slice(2).join('\t').trim());
-            const status = statusMap.get(filePath) || 'modified';
-            if (!filePath || !shouldIncludeGitDiffSummaryFile(status, additions, deletions, isBinaryDiff)) {
-                continue;
-            }
-            files.push({ path: filePath, status, additions, deletions });
+        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));
         res.json({
             ok: true,
             isGitRepo: context.isGitRepo,
@@ -518,12 +617,200 @@ gitRouter.post('/git/diff', validateToken, async (req, res) => {
         res.status(500).json({ error: err.message || 'git diff failed' });
     }
 });
+/**
+ * 提交工作区未提交变更
+ * POST /runtime/git/commit
+ */
+gitRouter.post('/git/commit', validateToken, async (req, res) => {
+    const { workspacePath, repositoryPath, message } = req.body || {};
+    if (!workspacePath || !String(workspacePath).trim()) {
+        res.status(400).json({ error: 'workspacePath is required' });
+        return;
+    }
+    const commitMessage = normalizeGitCommitMessage(message);
+    if (!commitMessage) {
+        res.status(400).json({ error: 'commit message is required' });
+        return;
+    }
+    try {
+        const context = await resolveGitRepositoryContext(String(repositoryPath || workspacePath).trim());
+        if (!context.hasRepository || !context.repositoryRootPath) {
+            res.status(400).json({ error: 'workspace is not inside a git repository' });
+            return;
+        }
+        const pathspecArgs = createScopedGitPathspecArgs(context);
+        const addResult = await execGitCommand(context.repositoryRootPath, ['add', '--all', ...pathspecArgs]);
+        if (addResult.exitCode !== 0) {
+            res.status(400).json({ error: addResult.stderr || 'git add failed' });
+            return;
+        }
+        const stagedResult = await execGitCommand(context.repositoryRootPath, ['diff', '--cached', '--quiet', ...pathspecArgs]);
+        if (stagedResult.exitCode === 0) {
+            res.status(400).json({ error: '没有可提交的变更' });
+            return;
+        }
+        if (stagedResult.exitCode !== 1) {
+            res.status(400).json({ error: stagedResult.stderr || 'git staged diff failed' });
+            return;
+        }
+        const commitResult = await execGitCommand(context.repositoryRootPath, ['commit', '-m', commitMessage, ...pathspecArgs]);
+        if (commitResult.exitCode !== 0) {
+            res.status(400).json({ error: commitResult.stderr || commitResult.stdout || 'git commit failed' });
+            return;
+        }
+        res.json({
+            ok: true,
+            message: '提交完成',
+            output: commitResult.stdout,
+            workspacePath: context.workspacePath,
+            repositoryRootPath: context.repositoryRootPath,
+            relativeWorkspacePath: context.relativeWorkspacePath,
+        });
+    }
+    catch (error) {
+        const err = error;
+        res.status(500).json({ error: err.message || 'git commit failed' });
+    }
+});
+/**
+ * 将单个文件加入暂存区
+ * POST /runtime/git/add-file
+ */
+gitRouter.post('/git/add-file', validateToken, async (req, res) => {
+    const { workspacePath, repositoryPath, filePath } = req.body || {};
+    if (!workspacePath || !String(workspacePath).trim()) {
+        res.status(400).json({ error: 'workspacePath is required' });
+        return;
+    }
+    const normalizedFilePath = normalizeGitPath(String(filePath || '').trim());
+    if (!normalizedFilePath) {
+        res.status(400).json({ error: 'filePath is required' });
+        return;
+    }
+    try {
+        const context = await resolveGitRepositoryContext(String(repositoryPath || workspacePath).trim());
+        if (!context.hasRepository || !context.repositoryRootPath) {
+            res.status(400).json({ error: 'workspace is not inside a git repository' });
+            return;
+        }
+        const addResult = await execGitCommand(context.repositoryRootPath, ['add', ...createScopedFilePathspecArgs(normalizedFilePath, context)]);
+        if (addResult.exitCode !== 0) {
+            res.status(400).json({ error: addResult.stderr || 'git add file failed' });
+            return;
+        }
+        res.json({
+            ok: true,
+            filePath: normalizedFilePath,
+            workspacePath: context.workspacePath,
+            repositoryRootPath: context.repositoryRootPath,
+            relativeWorkspacePath: context.relativeWorkspacePath,
+        });
+    }
+    catch (error) {
+        const err = error;
+        res.status(500).json({ error: err.message || 'git add file failed' });
+    }
+});
+/**
+ * 获取工作区提交列表
+ * POST /runtime/git/commits
+ */
+gitRouter.post('/git/commits', validateToken, async (req, res) => {
+    const { workspacePath, repositoryPath, limit } = req.body || {};
+    if (!workspacePath || !String(workspacePath).trim()) {
+        res.status(400).json({ error: 'workspacePath is required' });
+        return;
+    }
+    try {
+        const context = await resolveGitRepositoryContext(String(repositoryPath || workspacePath).trim());
+        if (!context.hasRepository || !context.repositoryRootPath) {
+            res.json({ ok: true, commits: [], workspacePath: context.workspacePath, repositoryRootPath: null });
+            return;
+        }
+        const parsedLimit = Number(limit);
+        const safeLimit = Number.isInteger(parsedLimit) && parsedLimit > 0 && parsedLimit <= 100 ? parsedLimit : 30;
+        const result = await execGitCommand(context.repositoryRootPath, [
+            'log',
+            `-${safeLimit}`,
+            '--date=iso-strict',
+            '--pretty=format:%H%x00%h%x00%an%x00%ad%x00%s%x00',
+            '--',
+            context.relativeWorkspacePath || '.',
+        ]);
+        if (result.exitCode !== 0) {
+            res.status(400).json({ error: result.stderr || 'git log failed' });
+            return;
+        }
+        res.json({
+            ok: true,
+            commits: parseGitCommitLog(result.stdout),
+            workspacePath: context.workspacePath,
+            repositoryRootPath: context.repositoryRootPath,
+            relativeWorkspacePath: context.relativeWorkspacePath,
+        });
+    }
+    catch (error) {
+        const err = error;
+        res.status(500).json({ error: err.message || 'git commits failed' });
+    }
+});
+/**
+ * 获取指定提交相对父提交的变更概览
+ * POST /runtime/git/commit-diff
+ */
+gitRouter.post('/git/commit-diff', validateToken, async (req, res) => {
+    const { workspacePath, repositoryPath, commitHash } = req.body || {};
+    if (!workspacePath || !String(workspacePath).trim()) {
+        res.status(400).json({ error: 'workspacePath is required' });
+        return;
+    }
+    const normalizedCommitHash = normalizeCommitHash(commitHash);
+    if (!normalizedCommitHash) {
+        res.status(400).json({ error: 'commitHash is required' });
+        return;
+    }
+    try {
+        const context = await resolveGitRepositoryContext(String(repositoryPath || workspacePath).trim());
+        if (!context.hasRepository || !context.repositoryRootPath) {
+            res.status(400).json({ error: 'workspace is not inside a git repository' });
+            return;
+        }
+        const diffBaseArgs = ['diff', `${normalizedCommitHash}^!`];
+        const nameStatusResult = await execGitCommand(context.repositoryRootPath, createScopedGitArgs([...diffBaseArgs, '--name-status'], context));
+        if (nameStatusResult.exitCode !== 0) {
+            res.status(400).json({ error: nameStatusResult.stderr || 'git commit diff failed' });
+            return;
+        }
+        const numstatResult = await execGitCommand(context.repositoryRootPath, createScopedGitArgs([...diffBaseArgs, '--numstat'], context));
+        if (numstatResult.exitCode !== 0) {
+            res.status(400).json({ error: numstatResult.stderr || 'git commit diff failed' });
+            return;
+        }
+        const files = parseGitDiffSummary(nameStatusResult.stdout, numstatResult.stdout);
+        res.json({
+            ok: true,
+            commitHash: normalizedCommitHash,
+            isGitRepo: context.isGitRepo,
+            hasRepository: true,
+            usingParentGitRepo: context.usingParentGitRepo,
+            hasChanges: files.length > 0,
+            files,
+            workspacePath: context.workspacePath,
+            repositoryRootPath: context.repositoryRootPath,
+            relativeWorkspacePath: context.relativeWorkspacePath,
+        });
+    }
+    catch (error) {
+        const err = error;
+        res.status(500).json({ error: err.message || 'git commit diff failed' });
+    }
+});
 /**
  * 获取单个文件的详细差异
  * POST /runtime/git/diff-file
  */
 gitRouter.post('/git/diff-file', validateToken, async (req, res) => {
-    const { workspacePath, filePath } = req.body || {};
+    const { workspacePath, filePath, commitHash } = req.body || {};
     if (!workspacePath || !String(workspacePath).trim()) {
         res.status(400).json({ error: 'workspacePath is required' });
         return;
@@ -542,7 +829,11 @@ gitRouter.post('/git/diff-file', validateToken, async (req, res) => {
             return;
         }
         const repositoryRelativeFilePath = resolveRepositoryRelativeFilePath(normalizedFilePath, context);
-        const result = await execGitCommand(context.repositoryRootPath, ['diff', '--', repositoryRelativeFilePath]);
+        const normalizedCommitHash = normalizeCommitHash(commitHash);
+        const gitArgs = normalizedCommitHash
+            ? ['show', '--format=', '--no-ext-diff', normalizedCommitHash, '--', repositoryRelativeFilePath]
+            : ['diff', '--', repositoryRelativeFilePath];
+        const result = await execGitCommand(context.repositoryRootPath, gitArgs);
         if (result.exitCode !== 0) {
             res.status(400).json({ error: result.stderr || 'git diff file failed' });
             return;
@@ -551,6 +842,7 @@ gitRouter.post('/git/diff-file', validateToken, async (req, res) => {
             ok: true,
             filePath: normalizedFilePath,
             repositoryRelativeFilePath,
+            commitHash: normalizedCommitHash || null,
             diffContent: result.stdout,
             workspacePath: context.workspacePath,
             repositoryRootPath: context.repositoryRootPath,

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

@@ -1,5 +1,2 @@
-/**
- * Git 路由单元测试
- */
 export {};
 //# sourceMappingURL=git.test.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"git.test.d.ts","sourceRoot":"","sources":["../../src/routes/git.test.ts"],"names":[],"mappings":"AAAA;;GAEG"}
+{"version":3,"file":"git.test.d.ts","sourceRoot":"","sources":["../../src/routes/git.test.ts"],"names":[],"mappings":""}