@orion-agents/orion-code 0.1.1 → 0.1.3

package/dist/tools/git.js

@@ -10,21 +10,43 @@
  *   - git_push: 安全推送（验证 + commit）
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GIT_TOOLS = exports.gitPushTool = exports.gitStatusTool = void 0;
+exports.GIT_TOOLS = exports.gitBranchTool = exports.gitLogTool = exports.gitDiffTool = exports.gitCommitTool = exports.gitPushTool = exports.gitStatusTool = void 0;
 const tool_1 = require("../framework/tool");
 const child_process_1 = require("child_process");
+const path_1 = require("path");
+function normalizeStagePath(value) {
+    if (value.length === 0 ||
+        value.includes('\0') ||
+        value.includes('\r') ||
+        value.includes('\n') ||
+        value.includes('\\') ||
+        value.startsWith('/') ||
+        value.startsWith(':') ||
+        ['*', '?', '[', ']'].some(character => value.includes(character))) {
+        return null;
+    }
+    const normalized = path_1.posix.normalize(value);
+    if (normalized === '.' || normalized === '..' || normalized.startsWith('../')) {
+        return null;
+    }
+    return normalized;
+}
+function parseStagedPaths(output) {
+    return output.split('\0').filter(Boolean);
+}
 async function execGit(command, cwd, timeout = 30000) {
     return execGitArgs(command.split(' '), cwd, timeout);
 }
 async function execGitArgs(args, cwd, timeout = 30000) {
-    return new Promise((resolve) => {
+    return new Promise(resolve => {
         const workdir = cwd || process.cwd();
         (0, child_process_1.execFile)('git', args, {
             cwd: workdir,
             timeout,
             maxBuffer: 1024 * 1024,
         }, (error, stdout, stderr) => {
-            const output = stdout.toString().trim();
+            // Preserve the leading status columns from `git status --porcelain`.
+            const output = stdout.toString().trimEnd();
             const errOutput = stderr.toString().trim();
             if (error) {
                 resolve({
@@ -36,7 +58,7 @@ async function execGitArgs(args, cwd, timeout = 30000) {
             else {
                 resolve({
                     success: true,
-                    output: output || '(no output)',
+                    output,
                     error: errOutput || undefined,
                 });
             }
@@ -49,13 +71,13 @@ async function execGitArgs(args, cwd, timeout = 30000) {
 async function checkUncommittedChanges(cwd) {
     const statusResult = await execGit('status --porcelain', cwd);
     if (!statusResult.success) {
-        return { hasChanges: false, files: [] };
+        return { success: false, error: statusResult.error || 'unknown git status error' };
     }
     const files = statusResult.output
         .split('\n')
         .filter(line => line.trim())
         .map(line => line.slice(3).trim()); // 去除状态码
-    return { hasChanges: files.length > 0, files };
+    return { success: true, hasChanges: files.length > 0, files };
 }
 /**
  * 检查远程认证状态
@@ -99,7 +121,7 @@ exports.gitStatusTool = (0, tool_1.buildTool)({
         // git status --porcelain
         const statusResult = await execGit('status --porcelain', cwd);
         if (!statusResult.success) {
-            return { success: false, output: '', error: `git status failed: ${statusResult.error}` };
+            return { success: false, output: `git status failed: ${statusResult.error}`, error: `git status failed: ${statusResult.error}` };
         }
         // 解析状态
         const lines = statusResult.output.split('\n').filter(l => l.trim());
@@ -121,12 +143,36 @@ exports.gitStatusTool = (0, tool_1.buildTool)({
                 }
             }
         }
+        // Upstream divergence is best-effort: a detached HEAD or a branch without an
+        // upstream makes `rev-list` fail, and that must never turn a successful
+        // `git status` into an error.
+        let ahead = 0;
+        let behind = 0;
+        try {
+            const upstream = await execGitArgs(['rev-list', '--count', '--left-right', '@{upstream}...HEAD'], cwd);
+            if (upstream.success && upstream.output.includes('\t')) {
+                // `--left-right` prints "<left>\t<right>" for `@{upstream}...HEAD`:
+                // left  = commits in upstream but not HEAD  -> we are behind
+                // right = commits in HEAD but not upstream  -> we are ahead
+                const [behindCount, aheadCount] = upstream.output
+                    .trim()
+                    .split('\t')
+                    .map(value => parseInt(value, 10) || 0);
+                behind = behindCount;
+                ahead = aheadCount;
+            }
+        }
+        catch {
+            // no upstream / detached HEAD -> leave ahead=behind=0
+        }
         const summary = {
             clean: lines.length === 0,
             untracked,
             modified,
             staged,
             total: lines.length,
+            ahead,
+            behind,
         };
         const output = JSON.stringify(summary, null, 2);
         return {
@@ -144,15 +190,16 @@ exports.gitStatusTool = (0, tool_1.buildTool)({
 // ============================================================================
 exports.gitPushTool = (0, tool_1.buildTool)({
     name: 'git_push',
-    description: `安全执行 git push，自动验证 git status 和认证状态。
+    description: `安全执行 git push，自动验证 git status、显式 staging 边界和认证状态。
 
 工作流程：
 1. 检查 git status --porcelain（未暂存/未提交的文件）
-2. 可选自动 git add -A 添加所有变更
+2. 仅对显式文件 paths 执行 git add -- <paths>；拒绝目录、glob/pathspec 和预暂存越界文件
 3. git commit（如果需要）
-4. 检查远程认证状态
-5. git push
-6. 验证 push 成功
+4. 若提交后仍有未提交文件，在任何远程写入前停止
+5. 检查远程认证状态
+6. git push
+7. 验证 push 成功
 
 Issue #18/#23 修复：不再在未验证的情况下声称成功。`,
     parameters: {
@@ -164,7 +211,12 @@ Issue #18/#23 修复：不再在未验证的情况下声称成功。`,
             },
             add_all: {
                 type: 'boolean',
-                description: '是否自动 git add -A（默认 true）',
+                description: '已废弃且禁止；请使用 paths 显式列出要暂存的文件',
+            },
+            paths: {
+                type: 'array',
+                items: { type: 'string' },
+                description: '要暂存的精确仓库相对文件路径；存在工作区变更时必填',
             },
             cwd: {
                 type: 'string',
@@ -179,29 +231,164 @@ Issue #18/#23 修复：不再在未验证的情况下声称成功。`,
     },
     execute: async (args) => {
         const message = args.message;
-        const addAll = args.add_all ?? true;
+        const addAll = args.add_all ?? false;
+        const rawPaths = args.paths;
         const cwd = args.cwd;
         const verify = args.verify ?? true;
         if (!message || typeof message !== 'string') {
             return { success: false, output: '', error: 'git_push requires a commit message' };
         }
+        if (addAll) {
+            return {
+                success: false,
+                output: '',
+                error: 'git_push add_all=true is disabled; provide an explicit paths allowlist',
+            };
+        }
+        if (rawPaths !== undefined && !Array.isArray(rawPaths)) {
+            return { success: false, output: '', error: 'git_push paths must be an array of strings' };
+        }
+        const paths = rawPaths ?? [];
+        if (paths.some(path => typeof path !== 'string')) {
+            return {
+                success: false,
+                output: '',
+                error: 'git_push paths must contain only strings',
+            };
+        }
+        const normalizedPaths = paths.map(normalizeStagePath);
+        if (normalizedPaths.some(path => path === null)) {
+            return {
+                success: false,
+                output: '',
+                error: 'git_push paths must be exact repository-relative files without glob or pathspec syntax',
+            };
+        }
+        const stagePaths = [...new Set(normalizedPaths)];
         const log = [];
         // 1. 检查当前状态
         log.push('🔍 Checking git status...');
         const changes = await checkUncommittedChanges(cwd);
+        if (!changes.success) {
+            return {
+                success: false,
+                output: log.join('\n'),
+                error: `git status failed: ${changes.error}`,
+            };
+        }
         if (changes.hasChanges) {
             log.push(`  Found ${changes.files.length} uncommitted files: ${changes.files.slice(0, 5).join(', ')}${changes.files.length > 5 ? '...' : ''}`);
-            // 2. git add（如果启用）
-            if (addAll) {
-                log.push('📦 Running git add -A...');
-                const addResult = await execGit('add -A', cwd);
-                if (!addResult.success) {
-                    return { success: false, output: log.join('\n'), error: `git add failed: ${addResult.error}` };
+            // 2. 只暂存显式文件 allowlist；永不继承或扩大现有 staging 边界。
+            if (stagePaths.length === 0) {
+                return {
+                    success: false,
+                    output: log.join('\n'),
+                    error: 'Uncommitted changes require an explicit file paths allowlist',
+                };
+            }
+            const expectedStagePaths = new Set(stagePaths);
+            for (const path of stagePaths) {
+                const exactPathResult = await execGitArgs(['ls-files', '--cached', '--others', '--exclude-standard', '-z', '--', path], cwd);
+                if (!exactPathResult.success) {
+                    return {
+                        success: false,
+                        output: log.join('\n'),
+                        error: `Exact staging-path verification failed for ${path}: ${exactPathResult.error}`,
+                    };
+                }
+                const matchingPaths = parseStagedPaths(exactPathResult.output);
+                if (matchingPaths.length !== 1 || matchingPaths[0] !== path) {
+                    return {
+                        success: false,
+                        output: log.join('\n'),
+                        error: `git_push paths must identify exact files, not directories or expanded pathspecs: ${path}`,
+                    };
                 }
-                log.push('  ✓ Files added to staging');
             }
-            else {
-                log.push('  ⚠ add_all=false, skipping git add');
+            const initialStagedResult = await execGitArgs(['diff', '--cached', '--name-only', '-z'], cwd);
+            if (!initialStagedResult.success) {
+                return {
+                    success: false,
+                    output: log.join('\n'),
+                    error: `Initial staged-file verification failed: ${initialStagedResult.error}`,
+                };
+            }
+            const unexpectedInitialPaths = parseStagedPaths(initialStagedResult.output).filter(path => !expectedStagePaths.has(path));
+            if (unexpectedInitialPaths.length > 0) {
+                return {
+                    success: false,
+                    output: log.join('\n'),
+                    error: `Pre-staged files fall outside the explicit allowlist: ${unexpectedInitialPaths.join(', ')}`,
+                };
+            }
+            const indexSnapshotResult = await execGitArgs(['write-tree'], cwd);
+            if (!indexSnapshotResult.success || !/^[0-9a-f]{40,64}$/.test(indexSnapshotResult.output)) {
+                return {
+                    success: false,
+                    output: log.join('\n'),
+                    error: `Unable to snapshot the Git index before staging: ${indexSnapshotResult.error || 'invalid tree id'}`,
+                };
+            }
+            const restoreIndex = async () => {
+                const result = await execGitArgs(['read-tree', indexSnapshotResult.output], cwd);
+                return result.success ? undefined : result.error || 'unknown index restore error';
+            };
+            log.push(`📦 Staging ${stagePaths.length} explicit file(s)...`);
+            const addResult = await execGitArgs(['add', '--', ...stagePaths], cwd);
+            if (!addResult.success) {
+                const restoreError = await restoreIndex();
+                return {
+                    success: false,
+                    output: log.join('\n'),
+                    error: restoreError
+                        ? `git add failed: ${addResult.error}; index rollback failed: ${restoreError}`
+                        : `git add failed: ${addResult.error}; index restored`,
+                };
+            }
+            log.push(`  ✓ Staged: ${stagePaths.slice(0, 5).join(', ')}${stagePaths.length > 5 ? '...' : ''}`);
+            const stagedResult = await execGitArgs(['diff', '--cached', '--name-only', '-z'], cwd);
+            if (!stagedResult.success) {
+                const restoreError = await restoreIndex();
+                return {
+                    success: false,
+                    output: log.join('\n'),
+                    error: restoreError
+                        ? `Staged-file verification failed: ${stagedResult.error}; index rollback failed: ${restoreError}`
+                        : `Staged-file verification failed: ${stagedResult.error}; index restored`,
+                };
+            }
+            const stagedFiles = parseStagedPaths(stagedResult.output);
+            const unexpectedStagedPaths = stagedFiles.filter(path => !expectedStagePaths.has(path));
+            const missingStagedPaths = stagePaths.filter(path => !stagedFiles.includes(path));
+            if (unexpectedStagedPaths.length > 0 || missingStagedPaths.length > 0) {
+                const restoreError = await restoreIndex();
+                return {
+                    success: false,
+                    output: log.join('\n'),
+                    error: [
+                        'Staged files do not exactly match the explicit allowlist',
+                        unexpectedStagedPaths.length > 0
+                            ? `unexpected: ${unexpectedStagedPaths.join(', ')}`
+                            : '',
+                        missingStagedPaths.length > 0 ? `missing: ${missingStagedPaths.join(', ')}` : '',
+                        restoreError ? `index rollback failed: ${restoreError}` : 'index restored',
+                    ]
+                        .filter(Boolean)
+                        .join('; '),
+                };
+            }
+            log.push(`  ✓ Verified ${stagedFiles.length} staged file(s)`);
+            const preCommitHead = await execGitArgs(['rev-parse', 'HEAD'], cwd);
+            if (!preCommitHead.success || !/^[0-9a-f]{40,64}$/.test(preCommitHead.output)) {
+                const restoreError = await restoreIndex();
+                return {
+                    success: false,
+                    output: log.join('\n'),
+                    error: [
+                        `Unable to snapshot HEAD before commit: ${preCommitHead.error || 'invalid commit id'}`,
+                        restoreError ? `index rollback failed: ${restoreError}` : 'index restored',
+                    ].join('; '),
+                };
             }
             // 3. git commit
             log.push(`📝 Committing with message: "${message.slice(0, 50)}..."`);
@@ -212,12 +399,46 @@ Issue #18/#23 修复：不再在未验证的情况下声称成功。`,
                     log.push('  ⚠ Nothing new to commit');
                 }
                 else {
-                    return { success: false, output: log.join('\n'), error: `git commit failed: ${commitResult.error}` };
+                    const postFailureHead = await execGitArgs(['rev-parse', 'HEAD'], cwd);
+                    const restoreError = await restoreIndex();
+                    const headChanged = postFailureHead.success && postFailureHead.output !== preCommitHead.output;
+                    const headStatus = !postFailureHead.success
+                        ? `HEAD verification failed: ${postFailureHead.error || 'unknown error'}`
+                        : headChanged
+                            ? `HEAD changed unexpectedly from ${preCommitHead.output} to ${postFailureHead.output}; manual recovery required`
+                            : undefined;
+                    return {
+                        success: false,
+                        output: log.join('\n'),
+                        error: [
+                            `git commit failed: ${commitResult.error}`,
+                            restoreError ? `index rollback failed: ${restoreError}` : 'index restored',
+                            headStatus,
+                        ]
+                            .filter(Boolean)
+                            .join('; '),
+                    };
                 }
             }
             else {
                 log.push('  ✓ Commit successful');
             }
+            const postCommitChanges = await checkUncommittedChanges(cwd);
+            if (!postCommitChanges.success) {
+                return {
+                    success: false,
+                    output: log.join('\n'),
+                    error: `Post-commit git status failed: ${postCommitChanges.error}`,
+                };
+            }
+            if (postCommitChanges.hasChanges) {
+                log.push(`  ⚠ ${postCommitChanges.files.length} file(s) remain outside the committed boundary`);
+                return {
+                    success: false,
+                    output: log.join('\n'),
+                    error: 'Commit created but push was not attempted because the working tree is not clean',
+                };
+            }
         }
         else {
             log.push('  ✓ Working directory clean, no changes to commit');
@@ -230,7 +451,7 @@ Issue #18/#23 修复：不再在未验证的情况下声称成功。`,
                 return {
                     success: false,
                     output: log.join('\n'),
-                    error: auth.error || 'Remote authentication failed - please configure git credentials'
+                    error: auth.error || 'Remote authentication failed - please configure git credentials',
                 };
             }
             log.push('  ✓ Authentication verified');
@@ -239,14 +460,39 @@ Issue #18/#23 修复：不再在未验证的情况下声称成功。`,
         log.push('🚀 Pushing to remote...');
         const pushResult = await execGit('push', cwd, 60000); // 60s timeout
         if (!pushResult.success) {
-            return { success: false, output: log.join('\n'), error: `git push failed: ${pushResult.error}` };
+            return {
+                success: false,
+                output: log.join('\n'),
+                error: `git push failed: ${pushResult.error}`,
+            };
         }
         log.push('  ✓ Push completed');
         // 6. 验证最终状态（v0.1.11 增强）
         log.push('✅ Verifying final status...');
         const finalChanges = await checkUncommittedChanges(cwd);
+        if (!finalChanges.success) {
+            return {
+                success: false,
+                output: log.join('\n'),
+                error: `Final git status failed: ${finalChanges.error}`,
+            };
+        }
         const logResult = await execGit('log --oneline -1', cwd);
+        if (!logResult.success) {
+            return {
+                success: false,
+                output: log.join('\n'),
+                error: `Final git log failed: ${logResult.error}`,
+            };
+        }
         const untrackedResult = await execGit('status --short', cwd);
+        if (!untrackedResult.success) {
+            return {
+                success: false,
+                output: log.join('\n'),
+                error: `Final git status --short failed: ${untrackedResult.error}`,
+            };
+        }
         // v0.1.11: 检查是否有未追踪文件（?? 状态）
         const untrackedFiles = untrackedResult.output
             .split('\n')
@@ -266,8 +512,29 @@ Issue #18/#23 修复：不再在未验证的情况下声称成功。`,
                 error: 'Push completed but some files remain uncommitted - check git status',
             };
         }
+        const branchResult = await execGitArgs(['branch', '--show-current'], cwd);
+        if (!branchResult.success || !branchResult.output.trim()) {
+            return {
+                success: false,
+                output: log.join('\n'),
+                error: `Push completed but current branch verification failed: ${branchResult.error || 'empty branch'}`,
+            };
+        }
+        const branch = branchResult.output.trim();
+        const remoteResult = await execGitArgs(['config', '--get', `branch.${branch}.remote`], cwd);
+        if (!remoteResult.success || !remoteResult.output.trim()) {
+            return {
+                success: false,
+                output: log.join('\n'),
+                error: `Push completed but upstream remote verification failed: ${remoteResult.error || 'missing branch remote'}`,
+            };
+        }
+        const remote = remoteResult.output.trim();
+        const latestCommit = logResult.output.split('\n')[0];
         log.push(`  ✓ Working directory clean`);
-        log.push(`  ✓ Latest commit: ${logResult.output.split('\n')[0]}`);
+        log.push(`  ✓ Pushed branch: ${branch}`);
+        log.push(`  ✓ Remote: ${remote}`);
+        log.push(`  ✓ Latest commit: ${latestCommit}`);
         return {
             success: true,
             output: log.join('\n'),
@@ -275,11 +542,299 @@ Issue #18/#23 修复：不再在未验证的情况下声称成功。`,
     },
     isDestructive: () => true,
     isConcurrencySafe: () => false,
-    checkPermissions: () => ({ behavior: 'ask', reason: 'git push modifies remote repository' }),
-    userFacingName: (args) => `Git Push: ${args.message?.slice(0, 30)}`,
+    checkPermissions: args => ({
+        behavior: 'ask',
+        reason: Array.isArray(args.paths) && args.paths.length > 0
+            ? `git push will stage ${args.paths.length} explicit path(s), commit, and modify the remote repository`
+            : 'git push will modify the remote repository and refuses uncommitted changes without explicit paths',
+    }),
+    userFacingName: args => `Git Push: ${args.message?.slice(0, 30)}`,
+});
+// ============================================================================
+// git_commit 工具
+// ============================================================================
+exports.gitCommitTool = (0, tool_1.buildTool)({
+    name: 'git_commit',
+    description: `提交工作区变更到本地仓库。
+
+工作流程：
+1. 检查 git status --porcelain
+2. 仅对显式 paths 暂存（或 all=true 暂存全部已追踪变更）
+3. git commit -m <message>
+4. 验证 commit 成功
+
+安全：要求明确 message；拒绝盲目暂存未受控文件。`,
+    parameters: {
+        type: 'object',
+        properties: {
+            message: { type: 'string', description: 'Commit message（必填）' },
+            paths: {
+                type: 'array',
+                items: { type: 'string' },
+                description: '要暂存的精确仓库相对文件路径；与 all 互斥',
+            },
+            all: {
+                type: 'boolean',
+                description: '暂存所有已追踪文件的变更（不含未追踪文件）',
+            },
+            cwd: { type: 'string', description: '工作目录（可选）' },
+        },
+        required: ['message'],
+    },
+    execute: async (args) => {
+        const message = args.message;
+        const rawPaths = args.paths;
+        const all = args.all ?? false;
+        const cwd = args.cwd;
+        if (!message || typeof message !== 'string') {
+            return {
+                success: false,
+                output: 'git_commit requires a commit message',
+                error: 'git_commit requires a commit message',
+            };
+        }
+        if (rawPaths !== undefined && !Array.isArray(rawPaths)) {
+            return {
+                success: false,
+                output: 'git_commit paths must be an array of strings',
+                error: 'git_commit paths must be an array of strings',
+            };
+        }
+        const paths = rawPaths ?? [];
+        if (paths.some(item => typeof item !== 'string')) {
+            return {
+                success: false,
+                output: 'git_commit paths must contain only strings',
+                error: 'git_commit paths must contain only strings',
+            };
+        }
+        const normalized = paths.map(normalizeStagePath);
+        if (normalized.some(item => item === null)) {
+            return {
+                success: false,
+                output: 'git_commit paths must be exact repository-relative files without glob or pathspec syntax',
+                error: 'git_commit paths must be exact repository-relative files without glob or pathspec syntax',
+            };
+        }
+        const stagePaths = [...new Set(normalized)];
+        const log = [];
+        log.push('🔍 Checking git status...');
+        const changes = await checkUncommittedChanges(cwd);
+        if (!changes.success) {
+            return { success: false, output: log.join('\n'), error: `git status failed: ${changes.error}` };
+        }
+        if (!changes.hasChanges && stagePaths.length === 0 && !all) {
+            return { success: true, output: '✓ Working directory clean, nothing to commit' };
+        }
+        if (all) {
+            log.push('📦 Staging all tracked changes...');
+            const addResult = await execGit('add -u', cwd);
+            if (!addResult.success) {
+                return { success: false, output: log.join('\n'), error: `git add -u failed: ${addResult.error}` };
+            }
+        }
+        else if (stagePaths.length > 0) {
+            log.push(`📦 Staging ${stagePaths.length} explicit path(s)...`);
+            const addResult = await execGitArgs(['add', '--', ...stagePaths], cwd);
+            if (!addResult.success) {
+                return { success: false, output: log.join('\n'), error: `git add failed: ${addResult.error}` };
+            }
+        }
+        else {
+            return {
+                success: false,
+                output: log.join('\n'),
+                error: 'No changes staged: provide paths or set all=true',
+            };
+        }
+        log.push(`📝 Committing: "${message.slice(0, 50)}..."`);
+        const commitResult = await execGitArgs(['commit', '-m', message], cwd);
+        if (!commitResult.success) {
+            await execGit('reset', cwd);
+            if (commitResult.output.includes('nothing to commit')) {
+                return { success: true, output: log.join('\n') + '\n  ⚠ Nothing new to commit' };
+            }
+            return { success: false, output: log.join('\n'), error: `git commit failed: ${commitResult.error}` };
+        }
+        log.push('  ✓ Commit successful');
+        const logResult = await execGit('log --oneline -1', cwd);
+        if (logResult.success)
+            log.push(`  ✓ Latest commit: ${logResult.output.split('\n')[0]}`);
+        return { success: true, output: log.join('\n') };
+    },
+    isDestructive: () => false,
+    isConcurrencySafe: () => false,
+    checkPermissions: () => ({
+        behavior: 'ask',
+        reason: 'git commit will create a new commit in the local repository',
+    }),
+    userFacingName: args => `Git Commit: ${args.message?.slice(0, 30)}`,
+});
+// ============================================================================
+// git_diff 工具
+// ============================================================================
+exports.gitDiffTool = (0, tool_1.buildTool)({
+    name: 'git_diff',
+    description: '显示 Git 差异。默认工作区 vs 暂存区；staged=true 显示已暂存 vs HEAD；可指定 paths。',
+    parameters: {
+        type: 'object',
+        properties: {
+            staged: { type: 'boolean', description: '显示已暂存变更（vs HEAD），默认 false' },
+            stat: { type: 'boolean', description: '仅显示统计摘要（默认 false）' },
+            paths: { type: 'array', items: { type: 'string' }, description: '限定路径（可选）' },
+            cwd: { type: 'string', description: '工作目录（可选）' },
+        },
+        required: [],
+    },
+    execute: async (args) => {
+        const staged = args.staged ?? false;
+        const stat = args.stat ?? false;
+        const rawPaths = args.paths;
+        const cwd = args.cwd;
+        const paths = Array.isArray(rawPaths) ? rawPaths.map(String) : [];
+        const cmd = ['diff', '--no-color'];
+        if (stat)
+            cmd.push('--stat');
+        if (staged)
+            cmd.push('--cached');
+        if (paths.length)
+            cmd.push('--', ...paths);
+        const result = await execGitArgs(cmd, cwd, 60000);
+        if (!result.success) {
+            return { success: false, output: `git diff failed: ${result.error}`, error: `git diff failed: ${result.error}` };
+        }
+        const MAX = 20000;
+        const out = result.output.length > MAX
+            ? `${result.output.slice(0, MAX)}\n… (truncated, ${result.output.length} chars total)`
+            : result.output;
+        return { success: true, output: out || 'No differences' };
+    },
+    isReadOnly: () => true,
+    isConcurrencySafe: () => true,
+    checkPermissions: () => ({ behavior: 'allow' }),
+    userFacingName: () => 'Git Diff',
+});
+// ============================================================================
+// git_log 工具
+// ============================================================================
+exports.gitLogTool = (0, tool_1.buildTool)({
+    name: 'git_log',
+    description: '显示提交历史。可指定条数与格式。',
+    parameters: {
+        type: 'object',
+        properties: {
+            max_count: { type: 'number', description: '返回的最大提交数（默认 20，上限 200）' },
+            oneline: { type: 'boolean', description: '单行精简格式（默认 true）' },
+            cwd: { type: 'string', description: '工作目录（可选）' },
+        },
+        required: [],
+    },
+    execute: async (args) => {
+        const maxCount = typeof args.max_count === 'number' ? Math.min(Math.max(args.max_count, 1), 200) : 20;
+        const oneline = args.oneline ?? true;
+        const cwd = args.cwd;
+        const fmt = oneline ? '%h %s (%an, %ar)' : '%H%nAuthor: %an <%ae>%nDate: %ad%n%n%B';
+        const cmd = ['log', `--max-count=${maxCount}`, `--pretty=format:${fmt}`, '--no-color'];
+        if (!oneline)
+            cmd.push('--date=iso');
+        const result = await execGitArgs(cmd, cwd, 30000);
+        if (!result.success) {
+            return { success: false, output: `git log failed: ${result.error}`, error: `git log failed: ${result.error}` };
+        }
+        return { success: true, output: result.output || 'No commits' };
+    },
+    isReadOnly: () => true,
+    isConcurrencySafe: () => true,
+    checkPermissions: () => ({ behavior: 'allow' }),
+    userFacingName: () => 'Git Log',
+});
+// ============================================================================
+// git_branch 工具
+// ============================================================================
+exports.gitBranchTool = (0, tool_1.buildTool)({
+    name: 'git_branch',
+    description: `分支操作。
+
+action:
+- list（默认）: 列出本地分支，标记当前分支（*）与上游跟踪
+- create: 基于当前 HEAD 创建新分支（不切换）
+- switch: 切换到已有分支
+- delete: 删除本地分支（需 force 才允许未合并删除）`,
+    parameters: {
+        type: 'object',
+        properties: {
+            action: {
+                type: 'string',
+                enum: ['list', 'create', 'switch', 'delete'],
+                description: '操作类型（默认 list）',
+            },
+            name: { type: 'string', description: '分支名（create/switch/delete 必填）' },
+            force: { type: 'boolean', description: 'delete 时允许删除未合并分支（默认 false）' },
+            cwd: { type: 'string', description: '工作目录（可选）' },
+        },
+        required: [],
+    },
+    execute: async (args) => {
+        const action = args.action ?? 'list';
+        const name = args.name;
+        const force = args.force ?? false;
+        const cwd = args.cwd;
+        const log = [];
+        if (action === 'list') {
+            const result = await execGit('branch -vv', cwd);
+            if (!result.success) {
+                return { success: false, output: `git branch -vv failed: ${result.error}`, error: `git branch -vv failed: ${result.error}` };
+            }
+            return { success: true, output: result.output || 'No branches' };
+        }
+        if (!name || typeof name !== 'string') {
+            return { success: false, output: '', error: `git_branch ${action} requires a branch name` };
+        }
+        if (action === 'create') {
+            const result = await execGitArgs(['branch', name], cwd);
+            if (!result.success) {
+                return { success: false, output: log.join('\n'), error: `git branch create failed: ${result.error}` };
+            }
+            log.push(`✓ Created branch ${name}`);
+            return { success: true, output: log.join('\n') };
+        }
+        if (action === 'switch') {
+            const result = await execGitArgs(['checkout', name], cwd);
+            if (!result.success) {
+                return { success: false, output: log.join('\n'), error: `git checkout failed: ${result.error}` };
+            }
+            log.push(`✓ Switched to ${name}`);
+            return { success: true, output: log.join('\n') };
+        }
+        if (action === 'delete') {
+            const result = await execGitArgs(force ? ['branch', '-D', name] : ['branch', '-d', name], cwd);
+            if (!result.success) {
+                return { success: false, output: log.join('\n'), error: `git branch delete failed: ${result.error}` };
+            }
+            log.push(`✓ Deleted branch ${name}`);
+            return { success: true, output: log.join('\n') };
+        }
+        return { success: false, output: `Unknown git_branch action: ${action}`, error: `Unknown git_branch action: ${action}` };
+    },
+    isDestructive: () => false,
+    isConcurrencySafe: () => false,
+    checkPermissions: args => {
+        const action = args.action ?? 'list';
+        if (action === 'list')
+            return { behavior: 'allow' };
+        return { behavior: 'ask', reason: `git branch ${action} will modify local branch state` };
+    },
+    userFacingName: args => `Git Branch: ${args.action ?? 'list'}`,
 });
 // ============================================================================
 // 导出
 // ============================================================================
-exports.GIT_TOOLS = [exports.gitStatusTool, exports.gitPushTool];
+exports.GIT_TOOLS = [
+    exports.gitStatusTool,
+    exports.gitPushTool,
+    exports.gitCommitTool,
+    exports.gitDiffTool,
+    exports.gitLogTool,
+    exports.gitBranchTool,
+];
 //# sourceMappingURL=git.js.map