@shaohui_jin/git-cockpit-mcp-server 0.1.13 → 0.1.15

package/README.md

@@ -54,7 +54,8 @@ git-cockpit version # 输出版本号
 
 - **多仓库管理**：统一打开/移除仓库，跨仓库操作
 - **安全机制**：工具按风险分级（readonly / write / dangerous），写操作 dry-run 预览 → 确认 → 执行；高危操作可配置人工审批
-- **内置 Web UI**：状态 / 历史 / 日志 / 设置视图，支持提交、分支、stash、pull/push、硬重置等操作
+- **MCP 默认摘要**：`git_diff` / `git_show` / `git_merge_rehearse` 默认不回完整正文；要正文请加 `path` 或 `detail=true`（网页 GET 仍是全文）
+- **内置 Web UI**：工作台 / 状态 / 历史 / 日志 / 设置视图，支持提交、分支、stash、pull/push、硬重置等操作
 - **审计日志**：所有工具调用记录落库，可回溯
 - **备份**：高危操作前自动备份分支引用与 stash 快照
 

package/dist/{chunk-R2D6JZ6H.js → chunk-4LUNMJTB.js}

@@ -6,6 +6,9 @@ import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
 
+// package.json
+var version = "0.1.15";
+
 // src/tools/handlers.ts
 import { z } from "zod";
 import {
@@ -13,6 +16,98 @@ import {
   GitOperationError,
   PermissionError
 } from "@shaohui_jin/git-cockpit-core";
+
+// src/tools/format.ts
+var FILE_CONTENT_LIMIT = 64 * 1024;
+function wantsDetail(args) {
+  return args?.detail === true;
+}
+function hasPath(args) {
+  return typeof args?.path === "string" && args.path.trim().length > 0;
+}
+function asRecord(value) {
+  return value !== null && typeof value === "object" && !Array.isArray(value) ? value : null;
+}
+function stripDiffPatch(diff) {
+  const d = asRecord(diff);
+  if (!d || !("rawPatch" in d)) return diff;
+  const { rawPatch: _raw, ...rest } = d;
+  return { ...rest, detailAvailable: true };
+}
+function stripRehearseBodies(result) {
+  const r = asRecord(result);
+  if (!r) return result;
+  const files = Array.isArray(r.conflictFiles) ? r.conflictFiles : [];
+  const paths = files.map((f) => {
+    const row = asRecord(f);
+    return {
+      path: row?.path ?? "",
+      contentConflict: row?.contentConflict ?? true,
+      hunks: []
+    };
+  });
+  const first = typeof paths[0]?.path === "string" ? paths[0].path : "";
+  return {
+    ...r,
+    conflictFiles: paths,
+    detailAvailable: true,
+    next: first ? [{ tool: "git_merge_rehearse", args: { into: r.into, from: r.from, path: first } }] : []
+  };
+}
+function summarizeForAgent(tool, result, args = {}) {
+  if (result == null) return result;
+  const detail2 = wantsDetail(args);
+  const pathSet = hasPath(args);
+  if (tool === "git_diff" || tool === "git_stash_show") {
+    if (detail2 || pathSet) return result;
+    return stripDiffPatch(result);
+  }
+  if (tool === "git_show") {
+    if (detail2 || pathSet) return result;
+    const row = asRecord(result);
+    if (!row) return result;
+    return { ...row, diff: stripDiffPatch(row.diff) };
+  }
+  if (tool === "git_merge_rehearse") {
+    if (detail2 || pathSet) return result;
+    return stripRehearseBodies(result);
+  }
+  if (tool === "git_file_content") {
+    if (detail2) return result;
+    const row = asRecord(result);
+    const content = typeof row?.content === "string" ? row.content : "";
+    const bytes = Buffer.byteLength(content, "utf8");
+    if (bytes <= FILE_CONTENT_LIMIT) return result;
+    return {
+      path: args.path,
+      truncated: true,
+      bytes,
+      detailAvailable: true
+    };
+  }
+  return result;
+}
+function formatResultForMcp(exec) {
+  if (!exec.success) {
+    const prefix = exec.error?.requiredApproval ? "\u9700\u8981\u5BA1\u6279" : "\u64CD\u4F5C\u5931\u8D25";
+    return `${prefix}\uFF1A${exec.error?.message ?? "\u672A\u77E5\u9519\u8BEF"}`;
+  }
+  const parts = [];
+  if (exec.dryRun) {
+    parts.push("[dry-run \u9884\u89C8] \u672A\u5B9E\u9645\u6267\u884C\u4EFB\u4F55\u64CD\u4F5C");
+  }
+  if (exec.backupCreated) {
+    parts.push(
+      `[\u81EA\u52A8\u5907\u4EFD] \u5206\u652F ${exec.backupCreated.branch ?? "(\u672A\u521B\u5EFA)"}${exec.backupCreated.stashRef ? `\uFF0Cstash ${exec.backupCreated.stashRef}` : ""}`
+    );
+  }
+  const summarized = summarizeForAgent(exec.tool, exec.result, exec.args ?? {});
+  const payload = typeof summarized === "string" ? summarized : JSON.stringify(summarized);
+  parts.push(payload);
+  return parts.join("\n\n");
+}
+
+// src/tools/handlers.ts
 async function resolveRepo(runtime, ctx, argsPath) {
   if (ctx.repoId !== void 0) {
     const handle = await runtime.repoManager.getById(ctx.repoId);
@@ -73,11 +168,15 @@ async function executeTool(def, rawArgs, ctx) {
       record("error", rawArgs, e.message);
       return { tool: def.name, source: ctx.source, dryRun: dryRun2, success: false, error: e, durationMs: Date.now() - t0 };
     }
-    const handle = await resolveRepo(runtime, ctx, args.repoPath);
-    const git = handle.service;
-    const repoPath2 = git.repoPath;
+    let git;
+    let repoPath2 = "";
+    if (def.needsRepo !== false) {
+      const handle = await resolveRepo(runtime, ctx, args.repoPath);
+      git = handle.service;
+      repoPath2 = git.repoPath;
+    }
     let backup = null;
-    if (!dryRun2 && def.risk === "dangerous" && runtime.config.git.backupOnDangerousOps) {
+    if (!dryRun2 && def.risk === "dangerous" && runtime.config.git.backupOnDangerousOps && git) {
       backup = await new BackupManager(git).createBackup();
       args = { ...args, __backup: { branch: backup.branch, stashRef: backup.stashRef } };
     }
@@ -92,7 +191,8 @@ async function executeTool(def, rawArgs, ctx) {
       result,
       preview,
       backupCreated: backup,
-      durationMs: Date.now() - t0
+      durationMs: Date.now() - t0,
+      args
     };
   } catch (err) {
     const e = extractError(err);
@@ -108,34 +208,68 @@ async function executeTool(def, rawArgs, ctx) {
     };
   }
 }
-function formatResultForMcp(exec) {
-  if (!exec.success) {
-    const prefix = exec.error?.requiredApproval ? "\u9700\u8981\u5BA1\u6279" : "\u64CD\u4F5C\u5931\u8D25";
-    return `${prefix}\uFF1A${exec.error?.message ?? "\u672A\u77E5\u9519\u8BEF"}`;
-  }
-  const parts = [];
-  if (exec.dryRun) {
-    parts.push("[dry-run \u9884\u89C8] \u672A\u5B9E\u9645\u6267\u884C\u4EFB\u4F55\u64CD\u4F5C");
-  }
-  if (exec.backupCreated) {
-    parts.push(`[\u81EA\u52A8\u5907\u4EFD] \u5206\u652F ${exec.backupCreated.branch ?? "(\u672A\u521B\u5EFA)"}${exec.backupCreated.stashRef ? `\uFF0Cstash ${exec.backupCreated.stashRef}` : ""}`);
-  }
-  const payload = typeof exec.result === "string" ? exec.result : JSON.stringify(exec.result, null, 2);
-  parts.push(payload);
-  return parts.join("\n\n");
-}
 
 // src/tools/index.ts
 import {
   enrichPrepareMr,
   createPullOrMergeRequest,
-  BackupManager as BackupManager2
+  BackupManager as BackupManager2,
+  GitOperationError as GitOperationError2,
+  SURVEY_ASYNC_THRESHOLD
 } from "@shaohui_jin/git-cockpit-core";
 
+// src/overview.ts
+var CONCURRENCY = 4;
+function unavailableOverview(path, extra = {}) {
+  const name = path.replace(/[\\/]+$/, "").split(/[\\/]/).pop() || path;
+  return {
+    path,
+    name,
+    available: false,
+    current: "",
+    tracking: null,
+    ahead: 0,
+    behind: 0,
+    dirtyCount: 0,
+    conflictCount: 0,
+    operation: "none",
+    tempMergeBranchCount: 0,
+    ...extra
+  };
+}
+async function mapPool(items, n, fn) {
+  const out = new Array(items.length);
+  let i = 0;
+  async function worker() {
+    while (i < items.length) {
+      const idx = i++;
+      out[idx] = await fn(items[idx]);
+    }
+  }
+  const workers = Math.min(n, items.length);
+  await Promise.all(Array.from({ length: workers }, () => worker()));
+  return out;
+}
+async function collectRepoOverviews(runtime) {
+  const repos = runtime.repoManager.list();
+  if (!repos.length) return [];
+  return mapPool(repos, CONCURRENCY, async (r) => {
+    try {
+      const handle = await runtime.repoManager.getById(r.id);
+      if (!handle) return unavailableOverview(r.path, { id: r.id, lastOpenedAt: r.lastOpenedAt });
+      const o = await handle.service.getOverview();
+      return { ...o, id: r.id, lastOpenedAt: r.lastOpenedAt };
+    } catch {
+      return unavailableOverview(r.path, { id: r.id, lastOpenedAt: r.lastOpenedAt });
+    }
+  });
+}
+
 // src/tools/schemas.ts
 import { z as z2 } from "zod";
 var repoPath = z2.string().optional().describe("\u4ED3\u5E93\u7EDD\u5BF9\u8DEF\u5F84\u3002\u4E0D\u63D0\u4F9B\u65F6\u4F7F\u7528\u5F53\u524D\u6253\u5F00\u7684\u4ED3\u5E93\u3002");
 var dryRun = z2.boolean().optional().describe("\u4E3A true \u65F6\u4EC5\u8FD4\u56DE\u5C06\u6267\u884C\u7684\u547D\u4EE4\u4E0E\u5F71\u54CD\u8303\u56F4\uFF08\u9884\u89C8/\u5E72\u8FD0\u884C\uFF09\uFF0C\u4E0D\u771F\u6B63\u4FEE\u6539\u4ED3\u5E93\u3002");
+var detail = z2.boolean().optional().describe("\u4E3A true \u65F6 MCP \u8FD4\u56DE\u5B8C\u6574\u6B63\u6587\uFF1B\u9ED8\u8BA4\u53EA\u56DE\u6458\u8981\uFF08\u8DEF\u5F84/\u7EDF\u8BA1\uFF09\u3002\u7F51\u9875 GET \u4E0D\u53D7\u5F71\u54CD\u3002");
 var maxCount = z2.number().int().min(1).max(1e4).optional().describe("\u6700\u591A\u8FD4\u56DE\u7684\u63D0\u4EA4\u6570\u91CF\u3002");
 var readonlyBase = { repoPath };
 var GitStatusSchema = z2.object({ ...readonlyBase });
@@ -154,13 +288,15 @@ var GitDiffSchema = z2.object({
   to: z2.string().optional().describe("\u7EC8\u70B9\u63D0\u4EA4"),
   path: z2.string().optional().describe("\u9650\u5B9A\u7684\u6587\u4EF6\u8DEF\u5F84"),
   staged: z2.boolean().optional().describe("\u67E5\u770B\u5DF2\u6682\u5B58\uFF08\u7D22\u5F15\uFF09\u5DEE\u5F02"),
-  maxPatchBytes: z2.number().int().positive().optional().describe("diff \u6B63\u6587\u6700\u5927\u5B57\u8282\u6570\uFF0C\u8D85\u51FA\u622A\u65AD")
+  maxPatchBytes: z2.number().int().positive().optional().describe("diff \u6B63\u6587\u6700\u5927\u5B57\u8282\u6570\uFF0C\u8D85\u51FA\u622A\u65AD"),
+  detail
 });
 var GitShowSchema = z2.object({
   ...readonlyBase,
   commit: z2.string().describe("\u8981\u67E5\u770B\u7684\u63D0\u4EA4 hash"),
   path: z2.string().optional().describe("\u9650\u5B9A\u6587\u4EF6"),
-  maxPatchBytes: z2.number().int().positive().optional()
+  maxPatchBytes: z2.number().int().positive().optional(),
+  detail
 });
 var GitBranchListSchema = z2.object({ ...readonlyBase });
 var GitTagListSchema = z2.object({ ...readonlyBase });
@@ -168,7 +304,8 @@ var GitRemoteListSchema = z2.object({ ...readonlyBase });
 var GitFileContentSchema = z2.object({
   ...readonlyBase,
   commit: z2.string().describe("\u63D0\u4EA4 hash\uFF08\u5982 HEAD\u3001main\uFF09"),
-  path: z2.string().describe("\u4ED3\u5E93\u5185\u6587\u4EF6\u76F8\u5BF9\u8DEF\u5F84")
+  path: z2.string().describe("\u4ED3\u5E93\u5185\u6587\u4EF6\u76F8\u5BF9\u8DEF\u5F84"),
+  detail
 });
 var GitGraphSchema = z2.object({
   ...readonlyBase,
@@ -176,7 +313,9 @@ var GitGraphSchema = z2.object({
 });
 var GitBranchGraphSchema = z2.object({
   ...readonlyBase,
-  maxNodes: z2.number().int().min(1).max(2e3).optional().describe("rev-list \u6700\u591A\u679A\u4E3E\u7684\u63D0\u4EA4\u6570\uFF0C\u7F3A\u7701 200")
+  maxNodes: z2.number().int().min(1).max(2e3).optional().describe("rev-list \u6700\u591A\u679A\u4E3E\u7684\u63D0\u4EA4\u6570\uFF0C\u7F3A\u7701 200"),
+  into: z2.string().optional().describe("\u5408\u5165\u76EE\u6807\uFF08\u7EBF\u4E0A / ours\uFF09\u3002\u4E0E from \u4E00\u8D77\u65F6\u8FD4\u56DE lineage"),
+  from: z2.string().optional().describe("\u6211\u7684\u5206\u652F\uFF08theirs\uFF09\u3002\u4E0E into \u4E00\u8D77\u65F6\u8FD4\u56DE lineage")
 });
 var GitReflogSchema = z2.object({
   ...readonlyBase,
@@ -196,7 +335,8 @@ var GitMergePreviewSchema = z2.object({
 var GitMergeRehearseSchema = z2.object({
   ...readonlyBase,
   ...mergeIntoFrom,
-  maxFiles: z2.number().int().min(1).max(100).optional().describe("\u6700\u591A\u751F\u6210\u51B2\u7A81\u6B63\u6587\u7684\u6587\u4EF6\u6570\uFF0C\u7F3A\u7701 20")
+  maxFiles: z2.number().int().min(1).max(100).optional().describe("\u6700\u591A\u751F\u6210\u51B2\u7A81\u6B63\u6587\u7684\u6587\u4EF6\u6570\uFF0C\u7F3A\u7701 20"),
+  detail
 });
 var GitMergeBlameSchema = z2.object({
   ...readonlyBase,
@@ -211,7 +351,8 @@ var GitMergeSurveySchema = z2.object({
   intos: z2.array(z2.string().min(1)).min(1).describe("\u5408\u5165\u76EE\u6807\uFF08\u7EBF\u4E0A / ours\uFF09\u5217\u8868"),
   froms: z2.array(z2.string().min(1)).min(1).describe("\u6211\u7684\u5206\u652F\uFF08theirs\uFF09\u5217\u8868"),
   fetch: z2.boolean().optional().describe("\u662F\u5426\u5148\u975E\u4EA4\u4E92 fetch\u3002\u7F3A\u7701 true\uFF1B\u6574\u6279\u53EA fetch \u4E00\u6B21"),
-  remote: z2.string().optional().describe("fetch \u4F7F\u7528\u7684\u8FDC\u7A0B\u540D\uFF0C\u7F3A\u7701 origin")
+  remote: z2.string().optional().describe("fetch \u4F7F\u7528\u7684\u8FDC\u7A0B\u540D\uFF0C\u7F3A\u7701 origin"),
+  async: z2.boolean().optional().describe("\u4E3A true \u6216\u683C\u5B50\u6570>20 \u65F6\u540E\u53F0\u8DD1\uFF0C\u7ACB\u5373\u8FD4\u56DE jobId\uFF0C\u7528 git_job_get \u67E5\u7ED3\u679C")
 });
 var GitMergeOrderSchema = z2.object({
   ...readonlyBase,
@@ -252,6 +393,26 @@ var GitPullSchema = z2.object({
   remote: z2.string().optional().describe("\u8FDC\u7A0B\u540D\uFF08\u7F3A\u7701 origin\uFF09"),
   branch: z2.string().optional().describe("\u8FDC\u7AEF\u5206\u652F\u540D")
 });
+var GitFetchSchema = z2.object({
+  ...writeBase,
+  remote: z2.string().optional().describe("\u8FDC\u7A0B\u540D\uFF08\u7F3A\u7701 origin\uFF09")
+});
+var continueFiles = z2.array(
+  z2.object({
+    path: z2.string().describe("\u4ED3\u5E93\u5185\u76F8\u5BF9\u8DEF\u5F84"),
+    resolvedContent: z2.string().describe("\u8BE5\u6587\u4EF6\u89E3\u51B3\u540E\u7684\u5B8C\u6574\u5185\u5BB9")
+  })
+).optional().describe("\u5DF2\u89E3\u51B3\u51B2\u7A81\u7684\u6587\u4EF6\uFF1B\u5199\u5165\u5DE5\u4F5C\u533A\u5E76 git add \u540E\u518D continue\u3002\u5DF2\u5728\u7F16\u8F91\u5668\u89E3\u51B3\u5E76\u53EF\u4E3A\u7A7A");
+var GitMergeAbortSchema = z2.object({ ...writeBase });
+var GitMergeContinueSchema = z2.object({
+  ...writeBase,
+  files: continueFiles
+});
+var GitRebaseAbortSchema = z2.object({ ...writeBase });
+var GitRebaseContinueSchema = z2.object({
+  ...writeBase,
+  files: continueFiles
+});
 var GitPushSchema = z2.object({
   ...writeBase,
   remote: z2.string().optional().describe("\u8FDC\u7A0B\u540D\uFF08\u7F3A\u7701 origin\uFF09"),
@@ -273,7 +434,18 @@ var GitStashListSchema = z2.object({ ...readonlyBase });
 var GitStashShowSchema = z2.object({
   ...readonlyBase,
   index: z2.number().int().min(0).optional().describe("stash \u5E8F\u53F7\uFF0C\u7F3A\u7701\u4E3A stash@{0}"),
-  maxPatchBytes: z2.number().int().positive().optional().describe("diff \u6B63\u6587\u6700\u5927\u5B57\u8282\u6570\uFF0C\u8D85\u51FA\u622A\u65AD")
+  maxPatchBytes: z2.number().int().positive().optional().describe("diff \u6B63\u6587\u6700\u5927\u5B57\u8282\u6570\uFF0C\u8D85\u51FA\u622A\u65AD"),
+  detail
+});
+var GitRepoOverviewSchema = z2.object({ ...readonlyBase });
+var GitJobListSchema = z2.object({ ...readonlyBase });
+var GitJobGetSchema = z2.object({
+  ...readonlyBase,
+  id: z2.string().min(1).describe("\u540E\u53F0\u4EFB\u52A1 id")
+});
+var GitJobCancelSchema = z2.object({
+  ...writeBase,
+  id: z2.string().min(1).describe("\u8981\u53D6\u6D88\u7684\u540E\u53F0\u4EFB\u52A1 id")
 });
 var GitStashApplySchema = z2.object({
   ...writeBase,
@@ -424,7 +596,11 @@ var TOOL_DEFS = [
     description: "\u5206\u652F tip DAG\uFF1Afor-each-ref + rev-list --parents\u3002\u8282\u70B9\u662F\u5404\u5206\u652F tip\uFF0C\u8FB9\u662F\u6700\u8FD1\u7956\u5148 tip\u3002\u4E0E Git Insight \u753B\u5E03\u540C\u4E00\u53E3\u5F84\u3002\u4E0D\u6539\u5DE5\u4F5C\u533A\u3002",
     risk: "readonly",
     schema: GitBranchGraphSchema,
-    handler: async (args, ctx) => ctx.git.getBranchGraph(args.maxNodes)
+    handler: async (args, ctx) => ctx.git.getBranchGraph({
+      maxNodes: args.maxNodes,
+      into: args.into,
+      from: args.from
+    })
   },
   {
     name: "git_reflog",
@@ -455,17 +631,29 @@ var TOOL_DEFS = [
   },
   {
     name: "git_merge_rehearse",
-    description: "\u5B8C\u6574\u5408\u5E76\u9884\u6F14\uFF1A\u51B2\u7A81\u6587\u4EF6 + diff3 \u51B2\u7A81\u6B63\u6587 + ours/theirs/base\uFF08\u4ECD\u4E0D\u6539\u5DE5\u4F5C\u533A\uFF09\u3002\u9009\u8FB9\u540E\u628A files[{path,resolvedContent}] \u4EA4\u7ED9 git_apply_resolve\u3002into/from \u542B\u4E49\u540C git_merge_preview\u3002",
+    description: "\u5B8C\u6574\u5408\u5E76\u9884\u6F14\uFF1A\u51B2\u7A81\u6587\u4EF6 + diff3 \u51B2\u7A81\u6B63\u6587 + ours/theirs/base\uFF08\u4ECD\u4E0D\u6539\u5DE5\u4F5C\u533A\uFF09\u3002MCP \u9ED8\u8BA4\u53EA\u56DE\u8DEF\u5F84\u6458\u8981\uFF1B\u8981\u6B63\u6587\u8BF7\u5E26 path \u6216 detail=true\u3002\u9009\u8FB9\u540E\u628A files \u4EA4\u7ED9 git_apply_resolve\u3002into/from \u540C git_merge_preview\u3002",
     risk: "readonly",
     schema: GitMergeRehearseSchema,
-    handler: async (args, ctx) => ctx.git.rehearseMerge({
-      into: args.into,
-      from: args.from,
-      fetch: args.fetch,
-      remote: args.remote,
-      path: args.path,
-      maxFiles: args.maxFiles
-    })
+    handler: async (args, ctx) => {
+      const wantBody = args.detail === true || typeof args.path === "string" && args.path.trim().length > 0;
+      if (!wantBody) {
+        return ctx.git.previewMerge({
+          into: args.into,
+          from: args.from,
+          fetch: args.fetch,
+          remote: args.remote,
+          path: args.path
+        });
+      }
+      return ctx.git.rehearseMerge({
+        into: args.into,
+        from: args.from,
+        fetch: args.fetch,
+        remote: args.remote,
+        path: args.path,
+        maxFiles: args.maxFiles
+      });
+    }
   },
   {
     name: "git_merge_blame",
@@ -482,15 +670,31 @@ var TOOL_DEFS = [
   },
   {
     name: "git_merge_survey",
-    description: "\u6279\u91CF\u9884\u6F14\u77E9\u9635\uFF1Aintos \xD7 froms \u6BCF\u5BF9\u8DD1\u4E00\u6B21 merge-tree\uFF0C\u6574\u6279\u53EA fetch \u4E00\u6B21\u3002\u53EA\u8FD4\u56DE\u7ED3\u8BBA\u4E0E\u51B2\u7A81\u8DEF\u5F84\uFF0C\u4E0D\u751F\u6210\u6B63\u6587\u3002\u9002\u5408\u53D1\u5E03\u524D\u626B\u63CF\u3002\u7981\u6B62\u7528 git_merge \u505A\u9884\u6F14\u3002",
+    description: "\u6279\u91CF\u9884\u6F14\u77E9\u9635\uFF1Aintos \xD7 froms \u6BCF\u5BF9\u8DD1\u4E00\u6B21 merge-tree\uFF0C\u6574\u6279\u53EA fetch \u4E00\u6B21\u3002\u53EA\u8FD4\u56DE\u7ED3\u8BBA\u4E0E\u51B2\u7A81\u8DEF\u5F84\u3002\u683C\u5B50>20 \u6216 async=true \u65F6\u540E\u53F0\u8DD1\u5E76\u8FD4\u56DE jobId\uFF08git_job_get\uFF09\u3002\u7981\u6B62\u7528 git_merge \u505A\u9884\u6F14\u3002",
     risk: "readonly",
     schema: GitMergeSurveySchema,
-    handler: async (args, ctx) => ctx.git.surveyMerges({
-      intos: args.intos,
-      froms: args.froms,
-      fetch: args.fetch,
-      remote: args.remote
-    })
+    handler: async (args, ctx) => {
+      const intos = args.intos;
+      const froms = args.froms;
+      const asyncWanted = args.async === true || intos.length * froms.length > SURVEY_ASYNC_THRESHOLD;
+      if (asyncWanted) {
+        const job = ctx.runtime.jobs.startSurvey({
+          repoPath: ctx.repoPath,
+          intos,
+          froms,
+          fetch: args.fetch,
+          remote: args.remote,
+          git: ctx.git
+        });
+        return { jobId: job.id, status: job.status, async: true, title: job.title };
+      }
+      return ctx.git.surveyMerges({
+        intos,
+        froms,
+        fetch: args.fetch,
+        remote: args.remote
+      });
+    }
   },
   {
     name: "git_merge_order",
@@ -520,6 +724,34 @@ var TOOL_DEFS = [
       return enrichPrepareMr({ prep, mr, cwd: ctx.git.repoPath });
     }
   },
+  {
+    name: "git_repo_overview",
+    description: "\u5DF2\u6253\u5F00\u4ED3\u5E93\u8109\u640F\uFF1A\u5206\u652F\u3001\u810F\u6587\u4EF6\u6570\u3001ahead/behind\u3001\u5DE5\u4F5C\u533A operation\u3001\u672C\u5730 merge/* \u6570\u3002\u4E0D\u56DE diff\u3002",
+    risk: "readonly",
+    needsRepo: false,
+    schema: GitRepoOverviewSchema,
+    handler: async (_args, ctx) => ({ repos: await collectRepoOverviews(ctx.runtime) })
+  },
+  {
+    name: "git_job_list",
+    description: "\u5217\u51FA\u540E\u53F0\u4EFB\u52A1\u6458\u8981\uFF08\u514B\u9686 / survey / fetch\uFF09\u3002",
+    risk: "readonly",
+    needsRepo: false,
+    schema: GitJobListSchema,
+    handler: async (_args, ctx) => ({ jobs: ctx.runtime.jobs.list().map((j) => ctx.runtime.jobs.summary(j)) })
+  },
+  {
+    name: "git_job_get",
+    description: "\u67E5\u770B\u4E00\u6761\u540E\u53F0\u4EFB\u52A1\uFF08\u65E5\u5FD7 + \u5B8C\u6210\u65F6\u7684 result \u6458\u8981\uFF09\u3002",
+    risk: "readonly",
+    needsRepo: false,
+    schema: GitJobGetSchema,
+    handler: async (args, ctx) => {
+      const job = ctx.runtime.jobs.get(args.id);
+      if (!job) throw new GitOperationError2("\u4EFB\u52A1\u4E0D\u5B58\u5728", "JOB_NOT_FOUND");
+      return ctx.runtime.jobs.detail(job);
+    }
+  },
   // ---------------------------------------------------------------------------
   // 写操作工具（默认开放，需预览/确认）
   // ---------------------------------------------------------------------------
@@ -579,6 +811,23 @@ var TOOL_DEFS = [
     schema: GitMergeSchema,
     handler: async (args, ctx) => ctx.git.merge(args.branch, { dryRun: args.dryRun })
   },
+  {
+    name: "git_merge_abort",
+    description: "\u4E2D\u6B62\u5F53\u524D\u5DE5\u4F5C\u533A merge\uFF08git merge --abort\uFF09\u3002\u53EA\u7528\u4E8E\u5DF2\u7ECF\u5F00\u59CB\u7684\u5DE5\u4F5C\u533A\u5408\u5E76\uFF0C\u7981\u6B62\u62FF\u6765\u4EE3\u66FF merge-tree \u9884\u6F14\u3002",
+    risk: "write",
+    schema: GitMergeAbortSchema,
+    handler: async (args, ctx) => ctx.git.mergeAbort({ dryRun: args.dryRun })
+  },
+  {
+    name: "git_merge_continue",
+    description: "\u7EE7\u7EED\u5F53\u524D\u5DE5\u4F5C\u533A merge\u3002\u53EF\u628A files[{path,resolvedContent}] \u5199\u5165\u5DE5\u4F5C\u533A\u5E76 git add \u540E\u518D continue\u3002\u4E0D\u662F git_apply_resolve\u3002",
+    risk: "write",
+    schema: GitMergeContinueSchema,
+    handler: async (args, ctx) => ctx.git.mergeContinue({
+      dryRun: args.dryRun,
+      files: args.files
+    })
+  },
   {
     name: "git_pull",
     description: "\u4ECE\u8FDC\u7A0B\u62C9\u53D6\u5E76\u5408\u5E76\uFF08\u975E\u5F3A\u5236\uFF09\u3002\u8FDC\u7A0B\u6709\u51B2\u7A81\u5C06\u63D0\u793A\u3002\u652F\u6301 dry_run \u9884\u89C8\u3002",
@@ -590,6 +839,16 @@ var TOOL_DEFS = [
       branch: args.branch
     })
   },
+  {
+    name: "git_fetch",
+    description: "\u4ECE\u8FDC\u7A0B\u6293\u53D6\u8DDF\u8E2A\u5206\u652F\uFF08git fetch --prune --no-tags\uFF09\uFF0C\u4E0D\u6539\u5DE5\u4F5C\u533A\u3001\u4E0D\u5408\u5E76\u3002\u66F4\u65B0 origin/xxx \u540E\u518D\u505A\u9884\u6F14\u6216\u5206\u652F\u56FE\u5BF9\u6BD4\u3002\u652F\u6301 dry_run \u9884\u89C8\u3002",
+    risk: "write",
+    schema: GitFetchSchema,
+    handler: async (args, ctx) => ctx.git.fetch({
+      dryRun: args.dryRun,
+      remote: args.remote
+    })
+  },
   {
     name: "git_push",
     description: "\u63A8\u9001\u5230\u8FDC\u7A0B\uFF08\u975E\u5F3A\u5236\uFF09\u3002\u63A8\u9001\u88AB\u62D2\u7EDD\uFF08\u8FDC\u7A0B\u6709\u65B0\u63D0\u4EA4\uFF09\u4F1A\u7ED9\u51FA\u63D0\u793A\u3002\u652F\u6301 dry_run \u9884\u89C8\u3002",
@@ -701,6 +960,25 @@ var TOOL_DEFS = [
       });
     }
   },
+  {
+    name: "git_job_cancel",
+    description: "\u53D6\u6D88\u8FDB\u884C\u4E2D\u7684\u540E\u53F0\u4EFB\u52A1\u3002\u514B\u9686\u4F1A\u6740\u8FDB\u7A0B\u5E76\u5220\u9664\u4E0D\u5B8C\u6574\u76EE\u5F55\u3002",
+    risk: "write",
+    needsRepo: false,
+    schema: GitJobCancelSchema,
+    handler: async (args, ctx) => {
+      if (args.dryRun) {
+        return {
+          dryRun: true,
+          command: "job cancel",
+          args: [args.id],
+          risk: "low",
+          note: "\u5C06\u53D6\u6D88\u8FDB\u884C\u4E2D\u7684\u540E\u53F0\u4EFB\u52A1"
+        };
+      }
+      return ctx.runtime.jobs.summary(ctx.runtime.jobs.cancel(args.id));
+    }
+  },
   // ---------------------------------------------------------------------------
   // 高风险工具（默认禁用，需开启/审批；自动备份）
   // ---------------------------------------------------------------------------
@@ -742,6 +1020,23 @@ var TOOL_DEFS = [
     risk: "dangerous",
     schema: GitRebaseSchema,
     handler: async (args, ctx) => ctx.git.rebase(args.branch, { dryRun: args.dryRun })
+  },
+  {
+    name: "git_rebase_abort",
+    description: "\u4E2D\u6B62\u5F53\u524D\u5DE5\u4F5C\u533A rebase\uFF08git rebase --abort\uFF09\u3002\u53EA\u7528\u4E8E\u5DF2\u7ECF\u5F00\u59CB\u7684\u53D8\u57FA\u3002",
+    risk: "write",
+    schema: GitRebaseAbortSchema,
+    handler: async (args, ctx) => ctx.git.rebaseAbort({ dryRun: args.dryRun })
+  },
+  {
+    name: "git_rebase_continue",
+    description: "\u7EE7\u7EED\u5F53\u524D\u5DE5\u4F5C\u533A rebase\u3002\u53EF\u628A files \u5199\u5165\u5DE5\u4F5C\u533A\u5E76 git add \u540E\u518D continue\u3002\u51B2\u7A81\u987B\u5148\u89E3\u51B3\u3002",
+    risk: "write",
+    schema: GitRebaseContinueSchema,
+    handler: async (args, ctx) => ctx.git.rebaseContinue({
+      dryRun: args.dryRun,
+      files: args.files
+    })
   }
 ];
 var TOOL_DEF_MAP = new Map(TOOL_DEFS.map((d) => [d.name, d]));
@@ -750,7 +1045,7 @@ function toolSummaries() {
 }
 
 // src/mcpServer.ts
-var MCP_SERVER_INFO = { name: "git-cockpit-mcp-server", version: "0.1.0" };
+var MCP_SERVER_INFO = { name: "git-cockpit-mcp-server", version };
 function createMcpServer(runtime) {
   const server = new McpServer(
     { name: MCP_SERVER_INFO.name, version: MCP_SERVER_INFO.version },
@@ -759,8 +1054,8 @@ function createMcpServer(runtime) {
       instructions: [
         "Git Cockpit MCP Server\uFF1A\u53EF\u89C6\u5316\u7684 Git \u64CD\u4F5C\u5DE5\u5177\u3002",
         "\u4F7F\u7528\u89C4\u5219\uFF1A",
-        "1. \u5148\u8C03\u7528 git_status \u67E5\u770B\u5DE5\u4F5C\u533A\u72B6\u6001\uFF1B",
-        "2. \u5199\u64CD\u4F5C\uFF08git_add/git_commit/git_push \u7B49\uFF09\u9ED8\u8BA4\u53EF\u6267\u884C\uFF0C\u4F46\u8BF7\u5148\u4F7F\u7528 dry_run=true \u9884\u89C8\u5F71\u54CD\u8303\u56F4\uFF1B",
+        "1. \u5148\u8C03\u7528 git_status \u67E5\u770B\u5DE5\u4F5C\u533A\u72B6\u6001\uFF08\u542B operation=merge/rebase \u65F6\u8D70\u5DE5\u4F5C\u533A\u6536\u5C3E\uFF0C\u4E0D\u8981\u7528\u9884\u6F14\u5DE5\u5177\u5192\u5145\uFF09\uFF1B",
+        "2. \u5199\u64CD\u4F5C\uFF08git_add/git_commit/git_fetch/git_push \u7B49\uFF09\u9ED8\u8BA4\u53EF\u6267\u884C\uFF0C\u4F46\u8BF7\u5148\u4F7F\u7528 dry_run=true \u9884\u89C8\u5F71\u54CD\u8303\u56F4\uFF1B",
         "3. \u9AD8\u98CE\u9669\u5DE5\u5177\uFF08git_reset_hard/git_clean/git_push_force/git_branch_delete_force/git_rebase\uFF09\u9ED8\u8BA4\u7981\u7528\uFF0C",
         "   \u9700\u7BA1\u7406\u5458\u5728\u914D\u7F6E\u4E2D\u5F00\u542F\uFF1B\u6267\u884C\u65F6\u7CFB\u7EDF\u4F1A\u81EA\u52A8\u5907\u4EFD\u5F53\u524D\u72B6\u6001\uFF1B",
         "4. \u672A\u6307\u5B9A repoPath \u65F6\u4F7F\u7528\u6700\u8FD1\u6253\u5F00\u7684\u4ED3\u5E93\uFF1B",
@@ -769,7 +1064,11 @@ function createMcpServer(runtime) {
         "   \u51B2\u7A81\u884C\u4F5C\u8005\u7528 git_merge_blame\uFF08\u6309\u6587\u4EF6\u3001\u53EA\u8BFB\uFF09\u3002",
         "   \u591A\u5206\u652F\u626B\u63CF\u7528 git_merge_survey\uFF1B\u5EFA\u8BAE\u5408\u5165\u987A\u5E8F\u7528 git_merge_order\u3002",
         "6. \u843D\u76D8\u7528 git_apply_resolve\uFF08\u72EC\u7ACB worktree\uFF0C\u4E3B\u533A\u4E0D\u5207\u6362\uFF09\uFF1B\u51B2\u7A81\u65F6\u628A\u9009\u8FB9\u540E\u7684 files \u4E00\u5E76\u4F20\u5165\u3002",
-        "7. \u5F00 PR/MR \u7528 git_mr_prepare / git_mr_create\u3002\u65B9\u5F0F\u4E0E Token \u5728\u8BBE\u7F6E MR \u914D\u7F6E\uFF08\u4E0D\u8FDB\u5DE5\u5177\u53C2\u6570\uFF09\uFF1A\u672C\u673A gh\xB7glab / Token / \u6D4F\u89C8\u5668\u9875\u3002\u627E\u4E0D\u5230 CLI \u65F6\u7ED3\u679C\u542B\u5B98\u65B9\u5B89\u88C5\u5730\u5740\u3002"
+        "7. \u5DE5\u4F5C\u533A\u5DF2\u7ECF\u51B2\u7A81\uFF1Agit_merge_continue / git_rebase_continue\uFF08\u53EF\u5E26 files\uFF09\u6216 abort\uFF1B\u4E0D\u662F apply_resolve\u3002",
+        "8. \u66F4\u65B0\u8FDC\u7A0B\u8DDF\u8E2A\u5206\u652F\u7528 git_fetch\u3002\u4E24\u5206\u652F\u5206\u53C9\u5BF9\u6BD4\u7528 git_branch_graph \u5E76\u4F20 into/from\u3002",
+        "9. \u5F00 PR/MR \u7528 git_mr_prepare / git_mr_create\u3002\u65B9\u5F0F\u4E0E Token \u5728\u8BBE\u7F6E MR \u914D\u7F6E\uFF08\u4E0D\u8FDB\u5DE5\u5177\u53C2\u6570\uFF09\uFF1A\u672C\u673A gh\xB7glab / Token / \u6D4F\u89C8\u5668\u9875\u3002\u627E\u4E0D\u5230 CLI \u65F6\u7ED3\u679C\u542B\u5B98\u65B9\u5B89\u88C5\u5730\u5740\u3002",
+        "10. \u5927\u7ED3\u679C\u9ED8\u8BA4\u6458\u8981\uFF1Agit_diff / git_show / git_merge_rehearse \u8981\u6B63\u6587\u8BF7\u52A0 path \u6216 detail=true\u3002",
+        "11. \u5DF2\u6253\u5F00\u4ED3\u5E93\u8109\u640F\u7528 git_repo_overview\u3002\u957F\u4EFB\u52A1\u7528 git_job_list / git_job_get / git_job_cancel\u3002"
       ].join("\n")
     }
   );
@@ -841,8 +1140,10 @@ var McpHttpHandler = class {
 };
 
 export {
-  executeTool,
+  collectRepoOverviews,
+  version,
   formatResultForMcp,
+  executeTool,
   TOOL_DEFS,
   TOOL_DEF_MAP,
   toolSummaries,
@@ -851,4 +1152,4 @@ export {
   startMcpStdio,
   McpHttpHandler
 };
-//# sourceMappingURL=chunk-R2D6JZ6H.js.map
+//# sourceMappingURL=chunk-4LUNMJTB.js.map