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

package/dist/{chunk-VL3ONHTJ.js → chunk-7ZLJEU2E.js}

@@ -3,9 +3,11 @@ import {
   McpHttpHandler,
   TOOL_DEFS,
   TOOL_DEF_MAP,
+  collectRepoOverviews,
   executeTool,
-  toolSummaries
-} from "./chunk-R2D6JZ6H.js";
+  toolSummaries,
+  version
+} from "./chunk-4LUNMJTB.js";
 
 // src/webServer.ts
 import * as path3 from "path";
@@ -19,6 +21,7 @@ import {
   BackupManager,
   PermissionManager as PermissionManager2,
   detectMrPlatform,
+  enrichPrepareMr,
   findMrHost,
   hostnameOf,
   methodForRepo,
@@ -32,14 +35,15 @@ import {
   toHttpsRemoteUrl,
   upsertMrHost,
   maskToken,
-  validateMrToken,
-  JobStore as JobStore2
+  validateMrToken
 } from "@shaohui_jin/git-cockpit-core";
 
 // src/runtime.ts
 import { EventEmitter as EventEmitter2 } from "events";
 import {
   AuditLogger,
+  JobEngine,
+  JobStore,
   PermissionManager,
   RepoStore as RepoStore2,
   openDatabase,
@@ -117,8 +121,11 @@ var ConfigStore = class {
         const out = {};
         for (const [k, val] of Object.entries(v)) {
           const lower = k.toLowerCase();
-          if (/password|token|secret|authorization/i.test(lower)) out[k] = "[REDACTED]";
-          else out[k] = redact(val);
+          if (/password|token|secret|authorization/i.test(lower)) {
+            out[k] = typeof val === "string" && val.length > 0 ? "[REDACTED]" : val;
+          } else {
+            out[k] = redact(val);
+          }
         }
         return out;
       }
@@ -277,6 +284,16 @@ function createRuntime(options = {}) {
   const permissions = new PermissionManager(config);
   const repoStore = new RepoStore2(db);
   const repoManager = new RepoManager({ repoStore, eventBus, getConfig: () => configStore.get() });
+  const jobs = new JobEngine(eventBus, new JobStore(db), {
+    resolveGit: async (repoPath) => {
+      try {
+        return repoManager.getByPath(repoPath).service;
+      } catch {
+        const handle = await repoManager.open(repoPath);
+        return handle.service;
+      }
+    }
+  });
   return {
     configStore,
     config,
@@ -285,6 +302,7 @@ function createRuntime(options = {}) {
     permissions,
     repoStore,
     repoManager,
+    jobs,
     eventBus
   };
 }
@@ -304,14 +322,11 @@ function disposeRuntime(runtime) {
 import swagger from "@fastify/swagger";
 import swaggerUi from "@fastify/swagger-ui";
 import { zodToJsonSchema } from "zod-to-json-schema";
-
-// package.json
-var version = "0.1.13";
-
-// src/openapi.ts
 var REST_META = {
   "get /api/health": { summary: "\u63A2\u6D3B", 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"] },
+  "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"] },
   "post /api/repos/{id}/activate": { summary: "\u6FC0\u6D3B\u4ED3\u5E93\uFF08\u7F6E\u9876\uFF09", tags: ["\u4ED3\u5E93"] },
@@ -326,10 +341,18 @@ var REST_META = {
   "get /api/repos/{id}/branch-graph": { summary: "\u5206\u652F tip DAG\uFF08\u72B6\u6001\u9875 G6\uFF09", tags: ["\u53EA\u8BFB"] },
   "get /api/repos/{id}/file": { summary: "\u8BFB\u53D6\u67D0\u63D0\u4EA4\u4E2D\u7684\u6587\u4EF6", tags: ["\u53EA\u8BFB"] },
   "get /api/repos/{id}/stashes": { summary: "stash \u5217\u8868", tags: ["\u53EA\u8BFB"] },
+  "get /api/repos/{id}/workspace-conflicts": { summary: "\u5DE5\u4F5C\u533A merge/rebase \u51B2\u7A81\uFF08index \u4E09\u9636\u6BB5\uFF09", tags: ["\u53EA\u8BFB"] },
+  "get /api/repos/{id}/merge/preview": { summary: "merge-tree \u9884\u6F14\uFF08\u4E0D\u8FDB\u5BA1\u8BA1\uFF09", tags: ["\u53EA\u8BFB"] },
+  "get /api/repos/{id}/merge/rehearse": { summary: "\u9884\u6F14 + \u51B2\u7A81\u6B63\u6587\uFF08\u4E0D\u8FDB\u5BA1\u8BA1\uFF09", tags: ["\u53EA\u8BFB"] },
+  "get /api/repos/{id}/merge/blame": { summary: "\u51B2\u7A81\u6587\u4EF6\u4E24\u4FA7 blame", tags: ["\u53EA\u8BFB"] },
+  "get /api/repos/{id}/merge/survey": { summary: "\u5408\u5E76\u77E9\u9635\u6279\u91CF\u9884\u6F14", tags: ["\u53EA\u8BFB"] },
+  "get /api/repos/{id}/merge/order": { summary: "\u5EFA\u8BAE\u5408\u5165\u987A\u5E8F", tags: ["\u53EA\u8BFB"] },
+  "get /api/repos/{id}/mr/prepare": { summary: "\u5F00 PR/MR \u524D\u53EA\u8BFB\u89E3\u6790", tags: ["\u53EA\u8BFB"] },
   "get /api/repos/{id}/backups": { summary: "\u9AD8\u5371\u64CD\u4F5C\u5907\u4EFD\u5206\u652F / stash", tags: ["\u53EA\u8BFB"] },
   "get /api/repos/{id}/reflog": { summary: "reflog", tags: ["\u53EA\u8BFB"] },
   "get /api/jobs": { summary: "\u540E\u53F0\u4EFB\u52A1\u5217\u8868\uFF08\u514B\u9686\u7B49\uFF09", tags: ["\u4ED3\u5E93"] },
   "get /api/jobs/{id}": { summary: "\u540E\u53F0\u4EFB\u52A1\u8BE6\u60C5\u4E0E\u65E5\u5FD7", tags: ["\u4ED3\u5E93"] },
+  "post /api/jobs/{id}/cancel": { summary: "\u53D6\u6D88\u8FDB\u884C\u4E2D\u7684\u540E\u53F0\u4EFB\u52A1", tags: ["\u4ED3\u5E93"] },
   "post /api/jobs/clone": { summary: "\u540E\u53F0\u514B\u9686\u8FDC\u7A0B\u4ED3\u5E93", tags: ["\u4ED3\u5E93"] },
   "get /api/tools": { summary: "\u5DE5\u5177\u6CE8\u518C\u8868\uFF08\u542B\u98CE\u9669\u4E0E\u662F\u5426\u542F\u7528\uFF09", tags: ["\u7CFB\u7EDF"] },
   "get /api/logs": { summary: "\u64CD\u4F5C\u5BA1\u8BA1\u65E5\u5FD7", tags: ["\u7CFB\u7EDF"] },
@@ -421,184 +444,6 @@ async function registerApiDocs(app) {
   });
 }
 
-// src/jobs.ts
-import { randomUUID } from "crypto";
-import { assertCloneDest, assertSafeCloneUrl, spawnClone } from "@shaohui_jin/git-cockpit-core";
-var MAX_JOBS = 30;
-var MAX_LOG_LINES = 800;
-var INTERRUPT_MESSAGE = "\u670D\u52A1\u91CD\u542F\uFF0C\u4EFB\u52A1\u4E2D\u65AD";
-function splitLines(text) {
-  return text.replace(/\r\n/g, "\n").replace(/\r/g, "\n").split("\n");
-}
-function appendPendingChunk(buf, jobId, chunk) {
-  if (!chunk) return;
-  buf.set(jobId, (buf.get(jobId) ?? "") + chunk);
-}
-function takePendingChunk(buf, jobId) {
-  const text = buf.get(jobId) ?? "";
-  buf.delete(jobId);
-  return text.length ? text : void 0;
-}
-var JobManager = class {
-  constructor(eventBus, store) {
-    this.eventBus = eventBus;
-    this.store = store;
-    this.restore();
-  }
-  eventBus;
-  store;
-  jobs = /* @__PURE__ */ new Map();
-  lastEmit = 0;
-  pending = null;
-  flushTimer = null;
-  pendingChunks = /* @__PURE__ */ new Map();
-  list() {
-    return [...this.jobs.values()].sort((a, b) => a.startedAt < b.startedAt ? 1 : -1);
-  }
-  get(id) {
-    return this.jobs.get(id);
-  }
-  summary(job) {
-    return {
-      id: job.id,
-      kind: job.kind,
-      status: job.status,
-      url: job.url,
-      destDir: job.destDir,
-      error: job.error,
-      startedAt: job.startedAt,
-      finishedAt: job.finishedAt,
-      repoId: job.repoId,
-      logCount: job.logs.length,
-      tail: job.logs.slice(-3).join("\n")
-    };
-  }
-  startClone(opts) {
-    const url = assertSafeCloneUrl(opts.url);
-    const destDir = assertCloneDest(opts.destDir, opts.allowedRepos);
-    const running = this.list().find((j) => j.status === "running" && j.destDir === destDir);
-    if (running) {
-      throw new Error(`\u5DF2\u6709\u514B\u9686\u4EFB\u52A1\u6B63\u5728\u5199\u5165 ${destDir}`);
-    }
-    const job = {
-      id: `clone-${randomUUID()}`,
-      kind: "clone",
-      status: "running",
-      url,
-      destDir,
-      logs: [`$ git clone --progress -- ${url} ${destDir}`],
-      startedAt: (/* @__PURE__ */ new Date()).toISOString()
-    };
-    this.jobs.set(job.id, job);
-    this.persist(job);
-    this.prune();
-    this.emit(job);
-    void this.runClone(job, opts.onSuccess);
-    return job;
-  }
-  restore() {
-    const saved = this.store.list();
-    for (const job of saved) {
-      if (job.status === "running") {
-        job.status = "error";
-        job.error = INTERRUPT_MESSAGE;
-        job.finishedAt = (/* @__PURE__ */ new Date()).toISOString();
-        job.logs.push(INTERRUPT_MESSAGE);
-        while (job.logs.length > MAX_LOG_LINES) job.logs.shift();
-        this.persist(job);
-      }
-      this.jobs.set(job.id, job);
-    }
-    this.prune();
-  }
-  persist(job) {
-    try {
-      this.store.upsert(job);
-    } catch {
-    }
-  }
-  remove(id) {
-    this.jobs.delete(id);
-    try {
-      this.store.remove(id);
-    } catch {
-    }
-  }
-  async runClone(job, onSuccess) {
-    try {
-      await spawnClone(job.url, job.destDir, (chunk) => this.append(job, chunk));
-      if (onSuccess) {
-        const repoId = await onSuccess(job.destDir);
-        if (typeof repoId === "number") job.repoId = repoId;
-      }
-      job.status = "ok";
-      this.append(job, "\n\u514B\u9686\u5B8C\u6210\n");
-    } catch (err) {
-      job.status = "error";
-      job.error = err instanceof Error ? err.message : String(err);
-      this.append(job, `
-\u5931\u8D25: ${job.error}
-`);
-    } finally {
-      job.finishedAt = (/* @__PURE__ */ new Date()).toISOString();
-      this.emit(job, true);
-    }
-  }
-  append(job, chunk) {
-    const lines = splitLines(chunk);
-    if (!lines.length) return;
-    const last = job.logs[job.logs.length - 1] ?? "";
-    if (lines[0] !== void 0 && job.logs.length && !last.endsWith("\n") && chunk[0] !== "\n") {
-      job.logs[job.logs.length - 1] = last + lines[0];
-      job.logs.push(...lines.slice(1));
-    } else {
-      job.logs.push(...lines);
-    }
-    while (job.logs.length > MAX_LOG_LINES) job.logs.shift();
-    this.emit(job, false, chunk);
-  }
-  emit(job, force = false, chunk) {
-    appendPendingChunk(this.pendingChunks, job.id, chunk);
-    const now = Date.now();
-    if (!force && now - this.lastEmit < 200) {
-      this.pending = job;
-      this.flushTimer ??= setTimeout(() => {
-        this.flushTimer = null;
-        if (this.pending) this.emit(this.pending, true);
-      }, 200);
-      return;
-    }
-    this.lastEmit = now;
-    this.pending = null;
-    if (this.flushTimer) {
-      clearTimeout(this.flushTimer);
-      this.flushTimer = null;
-    }
-    this.persist(job);
-    const payload = {
-      id: job.id,
-      kind: job.kind,
-      status: job.status,
-      url: job.url,
-      destDir: job.destDir,
-      chunk: takePendingChunk(this.pendingChunks, job.id),
-      error: job.error,
-      startedAt: job.startedAt,
-      finishedAt: job.finishedAt,
-      repoId: job.repoId,
-      logCount: job.logs.length
-    };
-    this.eventBus.emit("job-progress", payload);
-  }
-  prune() {
-    const all = this.list();
-    if (all.length <= MAX_JOBS) return;
-    for (const j of all.slice(MAX_JOBS)) {
-      if (j.status !== "running") this.remove(j.id);
-    }
-  }
-};
-
 // src/webServer.ts
 function resolveWebDist() {
   const here = path3.resolve(path3.dirname(fileURLToPath(import.meta.url)));
@@ -620,6 +465,16 @@ function resolveWebDist() {
   }
   return null;
 }
+function queryFlag(v) {
+  if (v === void 0 || v === "") return void 0;
+  return v === "1" || v === "true";
+}
+function queryList(q, key) {
+  const v = q[key];
+  if (v == null || v === "") return [];
+  const parts = Array.isArray(v) ? v : [v];
+  return parts.flatMap((s) => String(s).split(",")).map((s) => s.trim()).filter(Boolean);
+}
 async function createWebServer(runtime, options = {}) {
   const app = Fastify({ logger: false, bodyLimit: 2 * 1024 * 1024 });
   await app.register(cors, {
@@ -633,11 +488,11 @@ async function createWebServer(runtime, options = {}) {
     await app.register(fastifyStatic, { root: staticDir, prefix: "/" });
   }
   const mcpHttp = new McpHttpHandler(runtime);
-  const jobs = new JobManager(runtime.eventBus, new JobStore2(runtime.db));
+  const jobs = runtime.jobs;
   app.get("/api/health", async () => ({
     ok: true,
     service: "git-cockpit",
-    version: "0.1.6",
+    version,
     uptimeMs: process.uptime() * 1e3
   }));
   app.get("/api/jobs", async () => ({
@@ -646,7 +501,17 @@ async function createWebServer(runtime, options = {}) {
   app.get("/api/jobs/:id", async (req, reply) => {
     const job = jobs.get(req.params.id);
     if (!job) return reply.code(404).send({ error: "\u4EFB\u52A1\u4E0D\u5B58\u5728" });
-    return { job };
+    return { job: jobs.detail(job) };
+  });
+  app.post("/api/jobs/:id/cancel", async (req, reply) => {
+    try {
+      const job = jobs.cancel(req.params.id);
+      return { job: jobs.summary(job) };
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : String(err);
+      const code = msg === "\u4EFB\u52A1\u4E0D\u5B58\u5728" ? 404 : 400;
+      return reply.code(code).send({ error: msg });
+    }
   });
   app.post("/api/jobs/clone", async (req, reply) => {
     const url = req.body?.url?.trim();
@@ -669,6 +534,56 @@ async function createWebServer(runtime, options = {}) {
       return reply.code(400).send({ error: toError(err) });
     }
   });
+  app.post("/api/jobs", async (req, reply) => {
+    const kind = req.body?.kind?.trim();
+    const payload = req.body?.payload ?? {};
+    try {
+      if (kind === "clone") {
+        const job = jobs.startClone({
+          url: String(payload.url ?? ""),
+          destDir: String(payload.destDir ?? ""),
+          allowedRepos: runtime.configStore.get().git.allowedRepos,
+          onSuccess: async (dest) => {
+            const handle = await runtime.repoManager.open(dest);
+            return handle.record.id;
+          }
+        });
+        return { job: jobs.summary(job) };
+      }
+      if (kind === "survey" || kind === "fetch") {
+        let repoPath = typeof req.body?.repoPath === "string" ? req.body.repoPath.trim() : "";
+        if (!repoPath && req.body?.repoId != null) {
+          const handle2 = await runtime.repoManager.getById(Number(req.body.repoId));
+          repoPath = handle2?.service.repoPath ?? "";
+        }
+        if (!repoPath) {
+          const current = await runtime.repoManager.getCurrent();
+          repoPath = current?.service.repoPath ?? "";
+        }
+        if (!repoPath) return reply.code(400).send({ error: "survey/fetch \u9700\u8981\u4ED3\u5E93" });
+        const handle = await runtime.repoManager.open(repoPath);
+        const job = kind === "survey" ? jobs.startSurvey({
+          repoPath: handle.service.repoPath,
+          intos: payload.intos ?? [],
+          froms: payload.froms ?? [],
+          fetch: payload.fetch,
+          remote: payload.remote,
+          git: handle.service
+        }) : jobs.startFetch({
+          repoPath: handle.service.repoPath,
+          remote: payload.remote,
+          git: handle.service
+        });
+        return { job: jobs.summary(job) };
+      }
+      return reply.code(400).send({ error: "\u4E0D\u652F\u6301\u7684 kind\uFF0C\u4F7F\u7528 clone / survey / fetch" });
+    } catch (err) {
+      return reply.code(400).send({ error: toError(err) });
+    }
+  });
+  app.get("/api/repos/overview", async () => ({
+    repos: await collectRepoOverviews(runtime)
+  }));
   app.get("/api/repos", async () => ({
     repos: runtime.repoManager.list()
   }));
@@ -793,7 +708,11 @@ async function createWebServer(runtime, options = {}) {
     async (req, reply) => withRepo(
       req,
       reply,
-      async ({ service }) => service.getBranchGraph(req.query.maxNodes ? Number(req.query.maxNodes) : 200)
+      async ({ service }) => service.getBranchGraph({
+        maxNodes: req.query.maxNodes ? Number(req.query.maxNodes) : 200,
+        into: req.query.into,
+        from: req.query.from
+      })
     )
   );
   app.get(
@@ -817,6 +736,94 @@ async function createWebServer(runtime, options = {}) {
     "/api/repos/:id/stashes",
     async (req, reply) => withRepo(req, reply, async ({ service }) => service.listStashes())
   );
+  app.get(
+    "/api/repos/:id/workspace-conflicts",
+    async (req, reply) => withRepo(req, reply, async ({ service }) => service.listWorkspaceConflicts())
+  );
+  app.get(
+    "/api/repos/:id/merge/preview",
+    async (req, reply) => withRepo(
+      req,
+      reply,
+      async ({ service }) => service.previewMerge({
+        into: req.query.into ?? "",
+        from: req.query.from ?? "",
+        fetch: queryFlag(req.query.fetch),
+        remote: req.query.remote,
+        path: req.query.path
+      })
+    )
+  );
+  app.get(
+    "/api/repos/:id/merge/rehearse",
+    async (req, reply) => withRepo(
+      req,
+      reply,
+      async ({ service }) => service.rehearseMerge({
+        into: req.query.into ?? "",
+        from: req.query.from ?? "",
+        fetch: queryFlag(req.query.fetch),
+        remote: req.query.remote,
+        path: req.query.path,
+        maxFiles: req.query.maxFiles ? Number(req.query.maxFiles) : void 0
+      })
+    )
+  );
+  app.get(
+    "/api/repos/:id/merge/blame",
+    async (req, reply) => withRepo(req, reply, async ({ service }) => {
+      if (!req.query.into || !req.query.from || !req.query.path) {
+        throw new GitOperationError("\u9700\u8981 into\u3001from \u4E0E path", "INVALID_REF");
+      }
+      return service.blameConflictFile({
+        into: req.query.into,
+        from: req.query.from,
+        path: req.query.path,
+        fetch: queryFlag(req.query.fetch),
+        remote: req.query.remote
+      });
+    })
+  );
+  app.get(
+    "/api/repos/:id/merge/survey",
+    async (req, reply) => withRepo(
+      req,
+      reply,
+      async ({ service }) => service.surveyMerges({
+        intos: queryList(req.query, "intos"),
+        froms: queryList(req.query, "froms"),
+        fetch: queryFlag(typeof req.query.fetch === "string" ? req.query.fetch : void 0),
+        remote: typeof req.query.remote === "string" ? req.query.remote : void 0
+      })
+    )
+  );
+  app.get(
+    "/api/repos/:id/merge/order",
+    async (req, reply) => withRepo(req, reply, async ({ service }) => {
+      const branches = queryList(req.query, "branches");
+      return service.suggestMergeOrder({
+        into: typeof req.query.into === "string" ? req.query.into : "",
+        branches,
+        fetch: queryFlag(typeof req.query.fetch === "string" ? req.query.fetch : void 0),
+        remote: typeof req.query.remote === "string" ? req.query.remote : void 0
+      });
+    })
+  );
+  app.get(
+    "/api/repos/:id/mr/prepare",
+    async (req, reply) => withRepo(req, reply, async ({ service }) => {
+      if (!req.query.into || !req.query.from) {
+        throw new GitOperationError("\u9700\u8981 into \u4E0E from", "INVALID_REF");
+      }
+      const prep = await service.prepareMr({
+        into: req.query.into,
+        from: req.query.from,
+        remote: req.query.remote?.trim() || void 0,
+        sourceBranch: req.query.sourceBranch
+      });
+      return enrichPrepareMr({ prep, mr: runtime.config.mr, cwd: service.repoPath });
+    })
+  );
   app.post(
     "/api/repos/:id/tools/:tool",
     { schema: { hide: true } },
@@ -1167,7 +1174,6 @@ export {
   RepoManager,
   createRuntime,
   disposeRuntime,
-  version,
   createWebServer
 };
-//# sourceMappingURL=chunk-VL3ONHTJ.js.map
+//# sourceMappingURL=chunk-7ZLJEU2E.js.map