@shaohui_jin/git-cockpit-mcp-server 0.1.23 → 0.1.25

package/README.md

@@ -22,12 +22,13 @@ npm install -g @shaohui_jin/git-cockpit-mcp-server
 ```bash
 git-cockpit start   # 启动常驻服务：Web UI + MCP Server（Streamable HTTP），默认 http://localhost:3000
 git-cockpit mcp     # 以 stdio 模式运行 MCP Server（供 Claude Desktop / Cursor 等客户端连接）
+                    # 已有常驻服务时自动桥接过去，多客户端共用一个后端
 git-cockpit version # 输出版本号
 ```
 
 启动后浏览器访问 `http://localhost:3000` 即可使用 Web 界面；`/mcp` 端点提供 MCP Streamable HTTP 接入。
 
-### 接入 MCP 客户端（stdio）
+### 接入 MCP 客户端（stdio，推荐）
 
 以 Claude Desktop / Cursor 为例，在 MCP 配置中加入：
 
@@ -42,7 +43,28 @@ git-cockpit version # 输出版本号
 }
 ```
 
-网页和聊天窗口要一起用时，改跑 `git-cockpit start`，客户端连 `http://localhost:3000/mcp`。不要再开一个 `git-cockpit mcp` 抢同一仓。
+**唯一 daemon 机制**：`git-cockpit mcp` 探活到已有 daemon 就转发 stdio 请求；没有 daemon 则由当前命令启动一个 daemon，再桥接到它。
+客户端 stdin 关闭时，如果 daemon 是本命令启动的，会一并关闭；桥接失败不会静默创建第二套 Runtime。多个客户端因此可以稳定共用同一个 Git Cockpit、
+任务队列与仓库锁，客户端配置里不需要写密钥。多仓库时先读取 `git-cockpit://repos`，再调用
+`git_repo_select({ "repoId": 1 })` 绑定当前 MCP session；后续省略仓库参数时不会串到其他客户端的仓库。
+
+### 接入 MCP 客户端（Streamable HTTP）
+
+`/mcp` 与 `/api/*` 一样受本机密钥保护，URL 方式**必须带请求头**：
+
+```json
+{
+  "mcpServers": {
+    "git-cockpit-http": {
+      "url": "http://localhost:3000/mcp",
+      "headers": { "X-Git-Cockpit-Secret": "<你的 localSecret>" }
+    }
+  }
+}
+```
+
+密钥在 `~/.git-cockpit/config.json` 的 `auth.localSecret`，也可在 Web 界面的「设置」里点 **复制本机访问密钥**。
+密钥不对会得到 **401**；手写请求时 `Accept` 必须同时含 `application/json` 与 `text/event-stream`，否则 **406**。
 
 **不要**和 Git Insight（或其它会直接改同一仓的 Git MCP）同时用于同一个仓库。
 
@@ -63,15 +85,17 @@ git-cockpit version # 输出版本号
 
 宿主可插入这四条 Prompt（`safe_commit` / `merge_preview_apply` / `workspace_continue` / `open_mr`），正文即上面四段。只读状态也可读 Resource：`git-cockpit://repos`、`git-cockpit://repo/current`、`git-cockpit://jobs`、`git-cockpit://jobs/{id}`。
 
+多仓库时先读 `git-cockpit://repos` 拿 `repoId`，再 `git_repo_select({ "repoId": 1 })` 绑定当前 MCP session；之后省略 `repoId/repoPath` 的工具都作用在这个仓。要临时操作别的仓，单次调用传 `repoId` 即可，不会改变绑定。
+
 默认只给摘要；要某文件正文加 `path` 或 `detail=true`。
 
 ### 环境变量
 
-| 变量 | 说明 | 默认 |
-| --- | --- | --- |
+| 变量                   | 说明                                 | 默认             |
+| ---------------------- | ------------------------------------ | ---------------- |
 | `GIT_COCKPIT_DATA_DIR` | 数据目录（仓库列表、审计日志、备份） | `~/.git-cockpit` |
-| `GIT_COCKPIT_PORT` | Web 服务端口 | `3000` |
-| `GIT_COCKPIT_HOST` | 监听地址 | `localhost` |
+| `GIT_COCKPIT_PORT`     | Web 服务端口                         | `3000`           |
+| `GIT_COCKPIT_HOST`     | 监听地址                             | `localhost`      |
 
 ## 主要特性
 
@@ -96,4 +120,4 @@ git-cockpit version # 输出版本号
 
 ## License
 
-MIT
+MIT

package/dist/{chunk-S7EIN5TE.js → chunk-563C4WZJ.js}

@@ -4,12 +4,13 @@ import {
   McpHttpHandler,
   TOOL_DEFS,
   TOOL_DEF_MAP,
+  collectRepoOverviewForId,
   collectRepoOverviews,
   executeTool,
   summarizeForAgent,
   toolSummaries,
   version
-} from "./chunk-JSX53BCR.js";
+} from "./chunk-FDPM74UE.js";
 
 // src/webServer.ts
 import * as path3 from "path";
@@ -66,7 +67,13 @@ import {
 import * as fs from "fs";
 import * as path from "path";
 import { randomBytes } from "crypto";
-import { DEFAULT_CONFIG, expandHome, normalizeLlmConfig, normalizeMrConfig, normalizePermissions } from "@shaohui_jin/git-cockpit-core";
+import {
+  DEFAULT_CONFIG,
+  expandHome,
+  normalizeLlmConfig,
+  normalizeMrConfig,
+  normalizePermissions
+} from "@shaohui_jin/git-cockpit-core";
 function deepMerge(target, source) {
   if (source === null || source === void 0) return target;
   if (Array.isArray(source)) {
@@ -168,11 +175,7 @@ var ConfigStore = class {
 // src/repoManager.ts
 import "events";
 import * as path2 from "path";
-import {
-  assertRepoAllowed,
-  GitService,
-  RepoNotFoundError
-} from "@shaohui_jin/git-cockpit-core";
+import { assertRepoAllowed, GitService, RepoNotFoundError } from "@shaohui_jin/git-cockpit-core";
 var RepoManager = class {
   constructor(options) {
     this.options = options;
@@ -185,6 +188,7 @@ var RepoManager = class {
   /** repo 根路径（规范化绝对路径） -> repoId */
   pathToId = /* @__PURE__ */ new Map();
   idToService = /* @__PURE__ */ new Map();
+  opening = /* @__PURE__ */ new Map();
   eventBus;
   list() {
     return this.options.repoStore.list().map((r) => ({
@@ -213,20 +217,38 @@ var RepoManager = class {
       throw err;
     }
   }
-  /** 打开仓库：校验并记录；重复打开返回既有实例 */
+  /** 打开仓库：同一路径并发请求共享同一个 GitService 实例。 */
   async open(repoPath) {
+    const requestedKey = normalizePath(repoPath);
+    const inFlight = this.opening.get(requestedKey);
+    if (inFlight) return inFlight;
+    const task = this.openInternal(repoPath, requestedKey);
+    this.opening.set(requestedKey, task);
+    try {
+      return await task;
+    } finally {
+      this.opening.delete(requestedKey);
+    }
+  }
+  async openInternal(repoPath, requestedKey) {
+    const knownId = this.pathToId.get(requestedKey);
+    if (knownId !== void 0 && knownId !== 0) {
+      const known = await this.getById(knownId);
+      if (known) {
+        this.options.repoStore.open(known.service.repoPath);
+        return { service: known.service, record: this.options.repoStore.getById(knownId) ?? known.record };
+      }
+    }
     const service = await GitService.open(repoPath);
     assertRepoAllowed(service.repoPath, this.options.getConfig().git.allowedRepos);
     const root = service.repoPath;
     const key = normalizePath(root);
     const existingId = this.pathToId.get(key);
     if (existingId !== void 0 && existingId !== 0) {
-      const record2 = this.options.repoStore.getById(existingId);
-      if (record2) {
+      const existing = await this.getById(existingId);
+      if (existing) {
         this.options.repoStore.open(root);
-        this.idToService.set(record2.id, service);
-        this.attach(service);
-        return { service, record: this.options.repoStore.getById(record2.id) ?? record2 };
+        return { service: existing.service, record: this.options.repoStore.getById(existingId) ?? existing.record };
       }
     }
     const record = this.options.repoStore.open(root);
@@ -356,8 +378,10 @@ import swaggerUi from "@fastify/swagger-ui";
 import { zodToJsonSchema } from "zod-to-json-schema";
 var REST_META = {
   "get /api/health": { summary: "\u63A2\u6D3B", tags: ["\u7CFB\u7EDF"] },
+  "post /api/shutdown": { summary: "\u4F18\u96C5\u9000\u51FA daemon\uFF08\u672C\u673A\u5BC6\u94A5\uFF1B\u6709 running \u4EFB\u52A1\u65F6 409\uFF09", tags: ["\u7CFB\u7EDF"] },
   "get /api/repos": { summary: "\u5DF2\u6253\u5F00\u4ED3\u5E93\u5217\u8868", tags: ["\u4ED3\u5E93"] },
-  "get /api/repos/overview": { summary: "\u5DF2\u6253\u5F00\u4ED3\u5E93\u8109\u640F\uFF08\u5DE5\u4F5C\u53F0\uFF09", tags: ["\u4ED3\u5E93"] },
+  "get /api/repos/overview": { summary: "\u5DF2\u6253\u5F00\u4ED3\u5E93\u8109\u640F\uFF08\u5DE5\u4F5C\u53F0\uFF0C\u5168\u91CF\uFF09", tags: ["\u4ED3\u5E93"] },
+  "get /api/repos/{id}/overview": { summary: "\u5355\u4E2A\u4ED3\u5E93\u8109\u640F\uFF08\u5DE5\u4F5C\u53F0\u589E\u91CF\uFF09", tags: ["\u4ED3\u5E93"] },
   "post /api/jobs": { summary: "\u63D0\u4EA4\u540E\u53F0\u4EFB\u52A1\uFF08clone / survey / fetch\uFF09", tags: ["\u4ED3\u5E93"] },
   "post /api/repos/open": { summary: "\u6253\u5F00\u672C\u5730\u4ED3\u5E93", tags: ["\u4ED3\u5E93"] },
   "delete /api/repos/{id}": { summary: "\u5173\u95ED\u5E76\u79FB\u9664\u4ED3\u5E93", tags: ["\u4ED3\u5E93"] },
@@ -736,11 +760,15 @@ async function confirmChatWrite(runtime, gate, token) {
   if (!gate.previewsMatch(ticket.preview, fresh)) {
     return { ok: false, error: "\u4ED3\u5E93\u5DF2\u53D8\u5316\uFF0C\u8BF7\u91CD\u65B0\u9884\u89C8\u540E\u518D\u786E\u8BA4", tool: ticket.tool, preview: fresh };
   }
-  const exec = await executeTool(def, { ...ticket.args, dryRun: false, repoPath: ticket.repoPath }, {
-    runtime,
-    source: "chat",
-    repoPath: ticket.repoPath
-  });
+  const exec = await executeTool(
+    def,
+    { ...ticket.args, dryRun: false, repoPath: ticket.repoPath },
+    {
+      runtime,
+      source: "chat",
+      repoPath: ticket.repoPath
+    }
+  );
   if (!exec.success) {
     return { ok: false, error: exec.error?.message ?? "\u6267\u884C\u5931\u8D25", tool: ticket.tool };
   }
@@ -967,6 +995,20 @@ async function createWebServer(runtime, options = {}) {
     }
     return { secret: runtime.config.auth.localSecret };
   });
+  app.post("/api/shutdown", async (_req, reply) => {
+    if (jobs.list().some((j) => j.status === "running")) {
+      return reply.code(409).send({ error: "\u6709\u4EFB\u52A1\u8FDB\u884C\u4E2D\uFF0C\u8BF7\u5148\u7B49\u5F85\u7ED3\u675F" });
+    }
+    await reply.code(204).send();
+    setImmediate(() => {
+      void (async () => {
+        mcpHttp.dispose();
+        await app.close();
+        disposeRuntime(runtime);
+        if (!process.env.VITEST) process.exit(0);
+      })();
+    });
+  });
   app.get("/api/jobs", async () => ({
     jobs: jobs.list().map((j) => jobs.summary(j))
   }));
@@ -1070,6 +1112,17 @@ async function createWebServer(runtime, options = {}) {
   app.get("/api/repos/overview", async () => ({
     repos: await collectRepoOverviews(runtime)
   }));
+  app.get("/api/repos/:id/overview", async (req, reply) => {
+    const id = Number(req.params.id);
+    if (!Number.isInteger(id)) {
+      return reply.code(400).send({ error: "\u975E\u6CD5\u4ED3\u5E93 id" });
+    }
+    const overview = await collectRepoOverviewForId(runtime, id);
+    if (!overview) {
+      return reply.code(404).send({ error: "\u4ED3\u5E93\u4E0D\u5B58\u5728\u6216\u5DF2\u5931\u6548" });
+    }
+    return { overview };
+  });
   app.get("/api/repos", async () => ({
     repos: runtime.repoManager.list()
   }));
@@ -1198,7 +1251,11 @@ async function createWebServer(runtime, options = {}) {
   );
   app.get(
     "/api/repos/:id/graph",
-    async (req, reply) => withRepo(req, reply, async ({ service }) => service.getGraph(req.query.maxCount ? Number(req.query.maxCount) : 500))
+    async (req, reply) => withRepo(
+      req,
+      reply,
+      async ({ service }) => service.getGraph(req.query.maxCount ? Number(req.query.maxCount) : 500)
+    )
   );
   app.get(
     "/api/repos/:id/branch-graph",
@@ -1214,7 +1271,11 @@ async function createWebServer(runtime, options = {}) {
   );
   app.get(
     "/api/repos/:id/reflog",
-    async (req, reply) => withRepo(req, reply, async ({ service }) => service.getReflog(req.query.maxCount ? Number(req.query.maxCount) : 50))
+    async (req, reply) => withRepo(
+      req,
+      reply,
+      async ({ service }) => service.getReflog(req.query.maxCount ? Number(req.query.maxCount) : 50)
+    )
   );
   app.get(
     "/api/repos/:id/backups",
@@ -1362,17 +1423,20 @@ async function createWebServer(runtime, options = {}) {
       })
     };
   });
-  app.post("/api/settings/mr-template/parse", async (req, reply) => {
-    const markdown = typeof req.body?.markdown === "string" ? req.body.markdown : "";
-    if (!markdown.trim()) return reply.code(400).send({ error: "\u8BF7\u63D0\u4F9B Markdown \u6587\u672C" });
-    try {
-      const template = parseMrTemplateMarkdown(markdown, req.body?.filename ?? "");
-      return { template, preview: renderMrTemplate(template) };
-    } catch (err) {
-      const message = err instanceof Error ? err.message : String(err);
-      return reply.code(400).send({ error: message });
+  app.post(
+    "/api/settings/mr-template/parse",
+    async (req, reply) => {
+      const markdown = typeof req.body?.markdown === "string" ? req.body.markdown : "";
+      if (!markdown.trim()) return reply.code(400).send({ error: "\u8BF7\u63D0\u4F9B Markdown \u6587\u672C" });
+      try {
+        const template = parseMrTemplateMarkdown(markdown, req.body?.filename ?? "");
+        return { template, preview: renderMrTemplate(template) };
+      } catch (err) {
+        const message = err instanceof Error ? err.message : String(err);
+        return reply.code(400).send({ error: message });
+      }
     }
-  });
+  );
   app.post(
     "/api/settings/mr-template/preview",
     async (req, reply) => {
@@ -1546,6 +1610,10 @@ data: ${JSON.stringify(payload)}
     reply.hijack();
     await mcpHttp.handle(req.raw, reply.raw, req.body);
   });
+  app.delete("/mcp", { schema: { hide: true } }, async (req, reply) => {
+    reply.hijack();
+    await mcpHttp.handle(req.raw, reply.raw, void 0);
+  });
   if (staticDir) {
     app.setNotFoundHandler(async (req, reply) => {
       if (req.url.startsWith("/api") || req.url.startsWith("/mcp") || req.url.startsWith("/docs")) {
@@ -1726,4 +1794,4 @@ export {
   disposeRuntime,
   createWebServer
 };
-//# sourceMappingURL=chunk-S7EIN5TE.js.map
+//# sourceMappingURL=chunk-563C4WZJ.js.map