@jingyi0605/codingns 0.3.5 → 0.4.0

package/dist/server/modules/git/git-command-helper-process.js

@@ -3,6 +3,7 @@ import readline from "node:readline";
 const GIT_COMMAND_SLOW_THRESHOLD_MS = 3_000;
 const GIT_COMMAND_SPAWN_RETRY_LIMIT = 1;
 const GIT_COMMAND_SPAWN_RETRY_DELAY_MS = 50;
+const activeRequests = new Map();
 const stdinReader = readline.createInterface({
     input: process.stdin,
     crlfDelay: Infinity
@@ -19,11 +20,14 @@ async function handleRequestLine(line) {
         logHelperError("无法解析请求", error);
         return;
     }
-    if (request.type !== "run") {
+    if (request.type === "cancel") {
+        activeRequests.get(request.targetId)?.abort(createGitCommandCancelledError());
         return;
     }
+    const controller = new AbortController();
+    activeRequests.set(request.id, controller);
     try {
-        const result = await runGitCommand(request.repoRoot, request.args, request.options);
+        const result = await runGitCommand(request.repoRoot, request.args, request.options, 0, controller.signal);
         process.stdout.write(`${JSON.stringify({
             type: "result",
             id: request.id,
@@ -44,8 +48,11 @@ async function handleRequestLine(line) {
             }
         })}\n`);
     }
+    finally {
+        activeRequests.delete(request.id);
+    }
 }
-async function runGitCommand(repoRoot, args, options = {}, retryAttempt = 0) {
+async function runGitCommand(repoRoot, args, options = {}, retryAttempt = 0, signal) {
     const startedAt = Date.now();
     const timeoutMs = options.timeoutMs ?? 15_000;
     const effectiveArgs = ["-c", "core.quotepath=false", ...args];
@@ -54,6 +61,10 @@ async function runGitCommand(repoRoot, args, options = {}, retryAttempt = 0) {
         ...(options.env ?? {})
     };
     return await new Promise((resolve, reject) => {
+        if (signal?.aborted) {
+            reject(createGitCommandCancelledError(signal.reason));
+            return;
+        }
         let child;
         try {
             child = spawn("git", effectiveArgs, {
@@ -77,9 +88,9 @@ async function runGitCommand(repoRoot, args, options = {}, retryAttempt = 0) {
                     errorCode: getErrnoCode(error),
                     reason: getErrorMessage(error)
                 });
-                setTimeout(() => {
-                    resolve(runGitCommand(repoRoot, args, options, nextAttempt));
-                }, GIT_COMMAND_SPAWN_RETRY_DELAY_MS);
+                waitForRetryDelay(signal).then(() => {
+                    resolve(runGitCommand(repoRoot, args, options, nextAttempt, signal));
+                }, reject);
                 return;
             }
             reject(createGitCommandFailedError(error));
@@ -88,12 +99,16 @@ async function runGitCommand(repoRoot, args, options = {}, retryAttempt = 0) {
         let stdout = "";
         let stderr = "";
         let completed = false;
+        let onAbort = null;
         const finish = (callback) => {
             if (completed) {
                 return;
             }
             completed = true;
             clearTimeout(timer);
+            if (signal && onAbort) {
+                signal.removeEventListener("abort", onAbort);
+            }
             callback();
         };
         const timer = setTimeout(() => {
@@ -118,6 +133,17 @@ async function runGitCommand(repoRoot, args, options = {}, retryAttempt = 0) {
                 });
             });
         }, timeoutMs);
+        if (signal) {
+            onAbort = () => {
+                if (!child.killed) {
+                    child.kill("SIGTERM");
+                }
+                finish(() => {
+                    reject(createGitCommandCancelledError(signal.reason));
+                });
+            };
+            signal.addEventListener("abort", onAbort, { once: true });
+        }
         child.stdout.on("data", (chunk) => {
             stdout += String(chunk);
         });
@@ -140,9 +166,9 @@ async function runGitCommand(repoRoot, args, options = {}, retryAttempt = 0) {
                         errorCode: getErrnoCode(error),
                         reason: getErrorMessage(error)
                     });
-                    setTimeout(() => {
-                        resolve(runGitCommand(repoRoot, args, options, nextAttempt));
-                    }, GIT_COMMAND_SPAWN_RETRY_DELAY_MS);
+                    waitForRetryDelay(signal).then(() => {
+                        resolve(runGitCommand(repoRoot, args, options, nextAttempt, signal));
+                    }, reject);
                     return;
                 }
                 reject(createGitCommandFailedError(error));
@@ -218,6 +244,13 @@ function createGitCommandFailedError(error) {
         detail: `Git 命令启动失败：${getErrorMessage(error)}`
     };
 }
+function createGitCommandCancelledError(reason) {
+    return {
+        statusCode: 499,
+        errorCode: "GIT_COMMAND_CANCELLED",
+        detail: reason instanceof Error ? reason.message : "Git 命令已取消"
+    };
+}
 function getErrorMessage(error) {
     return error instanceof Error ? error.message : String(error);
 }
@@ -234,4 +267,24 @@ function logHelperWarn(scope, payload) {
 function logHelperError(message, error) {
     console.error(`[git-helper] ${message}`, error);
 }
+async function waitForRetryDelay(signal) {
+    if (signal?.aborted) {
+        throw createGitCommandCancelledError(signal.reason);
+    }
+    let onAbort = null;
+    await new Promise((resolve, reject) => {
+        const timer = setTimeout(resolve, GIT_COMMAND_SPAWN_RETRY_DELAY_MS);
+        if (signal) {
+            onAbort = () => {
+                clearTimeout(timer);
+                reject(createGitCommandCancelledError(signal.reason));
+            };
+            signal.addEventListener("abort", onAbort, { once: true });
+        }
+    }).finally(() => {
+        if (signal && onAbort) {
+            signal.removeEventListener("abort", onAbort);
+        }
+    });
+}
 //# sourceMappingURL=git-command-helper-process.js.map

package/dist/server/modules/git/git-command-helper-process.js.map

@@ -1 +1 @@
-{"version":3,"file":"git-command-helper-process.js","sourceRoot":"","sources":["../../../../src/modules/git/git-command-helper-process.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"git-command-helper-process.js","sourceRoot":"","sources":["../../../../src/modules/git/git-command-helper-process.ts"],"names":[],"mappings":"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"}

package/dist/server/modules/git/git-command-runner.d.ts

@@ -4,6 +4,7 @@ interface GitCommandOptions {
     env?: NodeJS.ProcessEnv;
     workspaceId?: string;
     operation?: string;
+    signal?: AbortSignal;
 }
 export interface GitCommandResult {
     stdout: string;

package/dist/server/modules/git/git-command-runner.js

@@ -11,7 +11,22 @@ export class GitCommandRunner {
     }
     async run(repoRoot, args, options = {}) {
         if (this.helperClient) {
-            return this.helperClient.run(repoRoot, args, options);
+            try {
+                return await this.helperClient.run(repoRoot, args, options);
+            }
+            catch (error) {
+                if (!shouldFallbackToDirectGitRun(error)) {
+                    throw error;
+                }
+                console.warn("[git-helper-fallback]", {
+                    workspaceId: options.workspaceId ?? null,
+                    operation: options.operation ?? null,
+                    repoRoot,
+                    args,
+                    command: `git ${args.join(" ")}`,
+                    reason: error.message
+                });
+            }
         }
         return this.runDirect(repoRoot, args, options, 0);
     }
@@ -26,8 +41,10 @@ export class GitCommandRunner {
             ...process.env,
             ...(options.env ?? {})
         };
+        const signal = options.signal;
         return await new Promise((resolve, reject) => {
             let child;
+            let onAbort = null;
             try {
                 child = spawn("git", effectiveArgs, {
                     cwd: repoRoot,
@@ -55,6 +72,9 @@ export class GitCommandRunner {
                 }
                 completed = true;
                 clearTimeout(timer);
+                if (signal && onAbort) {
+                    signal.removeEventListener("abort", onAbort);
+                }
                 callback();
             };
             const timer = setTimeout(() => {
@@ -79,6 +99,26 @@ export class GitCommandRunner {
                     }));
                 });
             }, timeoutMs);
+            if (signal) {
+                onAbort = () => {
+                    if (!child.killed) {
+                        child.kill("SIGTERM");
+                    }
+                    finish(() => {
+                        reject(signal.reason
+                            ?? new AppError({
+                                statusCode: 499,
+                                errorCode: "GIT_COMMAND_CANCELLED",
+                                detail: `Git 命令已取消：git ${args.join(" ")}`
+                            }));
+                    });
+                };
+                if (signal.aborted) {
+                    onAbort();
+                    return;
+                }
+                signal.addEventListener("abort", onAbort, { once: true });
+            }
             child.stdout.on("data", (chunk) => {
                 stdout += String(chunk);
             });
@@ -161,6 +201,9 @@ export class GitCommandRunner {
 function shouldRetryGitSpawn(error) {
     return error.code === "EBADF";
 }
+function shouldFallbackToDirectGitRun(error) {
+    return error instanceof AppError && error.errorCode === "GIT_HELPER_UNAVAILABLE";
+}
 function toErrnoException(error) {
     if (error instanceof Error) {
         return error;

package/dist/server/modules/git/git-command-runner.js.map

@@ -1 +1 @@
-{"version":3,"file":"git-command-runner.js","sourceRoot":"","sources":["../../../../src/modules/git/git-command-runner.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"git-command-runner.js","sourceRoot":"","sources":["../../../../src/modules/git/git-command-runner.ts"],"names":[],"mappings":"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"}

package/dist/server/modules/git/git-controller.js

@@ -1,4 +1,5 @@
 import { AppError } from "../../shared/errors/app-error.js";
+import { createRequestAbortSignal } from "../../shared/http/request-abort.js";
 import { requireUserId } from "../preferences/common.js";
 export class GitController {
     gitReadService;
@@ -10,7 +11,7 @@ export class GitController {
         this.commitOrchestrator = commitOrchestrator;
     }
     getStatus = async (request, reply) => {
-        reply.send(await this.gitReadService.getStatus(requireWorkspaceId(request.query.workspaceId)));
+        reply.send(await this.gitReadService.getStatus(requireWorkspaceId(request.query.workspaceId), createRequestAbortSignal(request)));
     };
     getDiff = async (request, reply) => {
         const workspaceId = requireWorkspaceId(request.query.workspaceId);
@@ -23,7 +24,7 @@ export class GitController {
                 field: "path"
             });
         }
-        reply.send(await this.gitReadService.getDiff(workspaceId, targetPath, request.query.staged === "true"));
+        reply.send(await this.gitReadService.getDiff(workspaceId, targetPath, request.query.staged === "true", createRequestAbortSignal(request)));
     };
     getCommitDetail = async (request, reply) => {
         const workspaceId = requireWorkspaceId(request.query.workspaceId);
@@ -36,7 +37,7 @@ export class GitController {
                 field: "commitHash"
             });
         }
-        reply.send(await this.gitReadService.getCommitDetail(workspaceId, commitHash));
+        reply.send(await this.gitReadService.getCommitDetail(workspaceId, commitHash, createRequestAbortSignal(request)));
     };
     stage = async (request, reply) => {
         reply.send(await this.gitWriteService.stage(requireWorkspaceId(request.body.workspaceId), request.body.targets ?? []));
@@ -98,19 +99,19 @@ export class GitController {
         reply.send(await this.commitOrchestrator.commit(requireWorkspaceId(request.body.workspaceId), requireDraft(request.body.draft)));
     };
     getHistory = async (request, reply) => {
-        reply.send(await this.gitReadService.getHistory(requireWorkspaceId(request.query.workspaceId), request.query.cursor ?? null, Number(request.query.limit ?? "20")));
+        reply.send(await this.gitReadService.getHistory(requireWorkspaceId(request.query.workspaceId), request.query.cursor ?? null, Number(request.query.limit ?? "20"), createRequestAbortSignal(request)));
     };
     getBranches = async (request, reply) => {
-        reply.send(await this.gitReadService.getBranches(requireWorkspaceId(request.query.workspaceId)));
+        reply.send(await this.gitReadService.getBranches(requireWorkspaceId(request.query.workspaceId), createRequestAbortSignal(request)));
     };
     getTags = async (request, reply) => {
-        reply.send(await this.gitReadService.getTags(requireWorkspaceId(request.query.workspaceId)));
+        reply.send(await this.gitReadService.getTags(requireWorkspaceId(request.query.workspaceId), createRequestAbortSignal(request)));
     };
     switchBranch = async (request, reply) => {
         reply.send(await this.gitWriteService.switchBranch(requireWorkspaceId(request.body.workspaceId), request.body.branchName?.trim() ?? "", request.body.create ?? false));
     };
     getRemotes = async (request, reply) => {
-        reply.send(await this.gitReadService.getRemotes(requireWorkspaceId(request.query.workspaceId)));
+        reply.send(await this.gitReadService.getRemotes(requireWorkspaceId(request.query.workspaceId), createRequestAbortSignal(request)));
     };
     syncRemote = async (request, reply) => {
         const action = request.body.action;

package/dist/server/modules/git/git-controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"git-controller.js","sourceRoot":"","sources":["../../../../src/modules/git/git-controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAsEzD,MAAM,OAAO,aAAa;IAEL;IACA;IACA;IAHnB,YACmB,cAA8B,EAC9B,eAAgC,EAChC,kBAAsC;QAFtC,mBAAc,GAAd,cAAc,CAAgB;QAC9B,oBAAe,GAAf,eAAe,CAAiB;QAChC,uBAAkB,GAAlB,kBAAkB,CAAoB;IACtD,CAAC;IAEK,SAAS,GAAG,KAAK,EACxB,OAAwD,EACxD,KAAmB,EACJ,EAAE;QACjB,KAAK,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,kBAAkB,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IACjG,CAAC,CAAC;IAEO,OAAO,GAAG,KAAK,EACtB,OAAmD,EACnD,KAAmB,EACJ,EAAE;QACjB,MAAM,WAAW,GAAG,kBAAkB,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAClE,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC;QAE9C,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,QAAQ,CAAC;gBACjB,UAAU,EAAE,GAAG;gBACf,SAAS,EAAE,eAAe;gBAC1B,MAAM,EAAE,kBAAkB;gBAC1B,KAAK,EAAE,MAAM;aACd,CAAC,CAAC;QACL,CAAC;QAED,KAAK,CAAC,IAAI,CACR,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAC/B,WAAW,EACX,UAAU,EACV,OAAO,CAAC,KAAK,CAAC,MAAM,KAAK,MAAM,CAChC,CACF,CAAC;IACJ,CAAC,CAAC;IAEO,eAAe,GAAG,KAAK,EAC9B,OAA2D,EAC3D,KAAmB,EACJ,EAAE;QACjB,MAAM,WAAW,GAAG,kBAAkB,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAClE,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC;QAEpD,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,QAAQ,CAAC;gBACjB,UAAU,EAAE,GAAG;gBACf,SAAS,EAAE,eAAe;gBAC1B,MAAM,EAAE,uBAAuB;gBAC/B,KAAK,EAAE,YAAY;aACpB,CAAC,CAAC;QACL,CAAC;QAED,KAAK,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC,CAAC;IACjF,CAAC,CAAC;IAEO,KAAK,GAAG,KAAK,EACpB,OAA8C,EAC9C,KAAmB,EACJ,EAAE;QACjB,KAAK,CAAC,IAAI,CACR,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,CAC9B,kBAAkB,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,EAC5C,OAAO,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAC3B,CACF,CAAC;IACJ,CAAC,CAAC;IAEO,OAAO,GAAG,KAAK,EACtB,OAA8C,EAC9C,KAAmB,EACJ,EAAE;QACjB,KAAK,CAAC,IAAI,CACR,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAChC,kBAAkB,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,EAC5C,OAAO,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAC3B,CACF,CAAC;IACJ,CAAC,CAAC;IAEO,OAAO,GAAG,KAAK,EACtB,OAA8C,EAC9C,KAAmB,EACJ,EAAE;QACjB,KAAK,CAAC,IAAI,CACR,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAChC,kBAAkB,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,EAC5C,OAAO,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAC3B,CACF,CAAC;IACJ,CAAC,CAAC;IAEO,QAAQ,GAAG,KAAK,EACvB,OAAwD,EACxD,KAAmB,EACJ,EAAE;QACjB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,kBAAkB,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IACpG,CAAC,CAAC;IAEO,SAAS,GAAG,KAAK,EACxB,OAAiD,EACjD,KAAmB,EACJ,EAAE;QACjB,MAAM,WAAW,GAAG,kBAAkB,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACjE,MAAM,gBAAgB,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,IAAI,EAAE,CAAC,CAAC;QAErE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC;YAC/B,MAAM,IAAI,QAAQ,CAAC;gBACjB,UAAU,EAAE,GAAG;gBACf,SAAS,EAAE,eAAe;gBAC1B,MAAM,EAAE,UAAU;gBAClB,KAAK,EAAE,MAAM;aACd,CAAC,CAAC;QACL,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,EAAE,EAAE,CAAC;YACzC,MAAM,IAAI,QAAQ,CAAC;gBACjB,UAAU,EAAE,GAAG;gBACf,SAAS,EAAE,eAAe;gBAC1B,MAAM,EAAE,YAAY;gBACpB,KAAK,EAAE,gBAAgB;aACxB,CAAC,CAAC;QACL,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,IAAI,gBAAgB,IAAI,CAAC,EAAE,CAAC;YAChE,MAAM,IAAI,QAAQ,CAAC;gBACjB,UAAU,EAAE,GAAG;gBACf,SAAS,EAAE,eAAe;gBAC1B,MAAM,EAAE,gBAAgB;gBACxB,KAAK,EAAE,kBAAkB;aAC1B,CAAC,CAAC;QACL,CAAC;QAED,KAAK,CAAC,IAAI,CACR,IAAI,CAAC,kBAAkB,CAAC,eAAe,CAAC,WAAW,EAAE;YACnD,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI;YACvB,cAAc,EAAE,OAAO,CAAC,IAAI,CAAC,cAAc;YAC3C,gBAAgB;YAChB,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,QAAQ,IAAI,IAAI;YACvC,WAAW,EAAE,OAAO,CAAC,IAAI,CAAC,WAAW,IAAI,KAAK;YAC9C,YAAY,EAAE,OAAO,CAAC,IAAI,CAAC,YAAY,IAAI,KAAK;YAChD,YAAY,EAAE,OAAO,CAAC,IAAI,CAAC,YAAY,IAAI,IAAI;SAChD,CAAC,CACH,CAAC;IACJ,CAAC,CAAC;IAEO,iBAAiB,GAAG,KAAK,EAChC,OAAkD,EAClD,KAAmB,EACJ,EAAE;QACjB,MAAM,WAAW,GAAG,kBAAkB,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAEjE,KAAK,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,WAAW,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,QAAQ,CAAC,CAAC,CAAC;IACpG,CAAC,CAAC;IAEO,cAAc,GAAG,KAAK,EAC7B,OAAoD,EACpD,KAAmB,EACJ,EAAE;QACjB,KAAK,CAAC,IAAI,CACR,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAC9B,kBAAkB,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,EAC5C,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CACjC,CACF,CAAC;IACJ,CAAC,CAAC;IAEO,MAAM,GAAG,KAAK,EACrB,OAAoD,EACpD,KAAmB,EACJ,EAAE;QACjB,KAAK,CAAC,IAAI,CACR,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAClC,kBAAkB,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,EAC5C,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CACjC,CACF,CAAC;IACJ,CAAC,CAAC;IAEO,UAAU,GAAG,KAAK,EACzB,OAAsD,EACtD,KAAmB,EACJ,EAAE;QACjB,KAAK,CAAC,IAAI,CACR,MAAM,IAAI,CAAC,cAAc,CAAC,UAAU,CAClC,kBAAkB,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,EAC7C,OAAO,CAAC,KAAK,CAAC,MAAM,IAAI,IAAI,EAC5B,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,IAAI,IAAI,CAAC,CACpC,CACF,CAAC;IACJ,CAAC,CAAC;IAEO,WAAW,GAAG,KAAK,EAC1B,OAAwD,EACxD,KAAmB,EACJ,EAAE;QACjB,KAAK,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,kBAAkB,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IACnG,CAAC,CAAC;IAEO,OAAO,GAAG,KAAK,EACtB,OAAwD,EACxD,KAAmB,EACJ,EAAE;QACjB,KAAK,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,kBAAkB,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IAC/F,CAAC,CAAC;IAEO,YAAY,GAAG,KAAK,EAC3B,OAAmD,EACnD,KAAmB,EACJ,EAAE;QACjB,KAAK,CAAC,IAAI,CACR,MAAM,IAAI,CAAC,eAAe,CAAC,YAAY,CACrC,kBAAkB,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,EAC5C,OAAO,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,EAAE,IAAI,EAAE,EACrC,OAAO,CAAC,IAAI,CAAC,MAAM,IAAI,KAAK,CAC7B,CACF,CAAC;IACJ,CAAC,CAAC;IAEO,UAAU,GAAG,KAAK,EACzB,OAAwD,EACxD,KAAmB,EACJ,EAAE;QACjB,KAAK,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,kBAAkB,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IAClG,CAAC,CAAC;IAEO,UAAU,GAAG,KAAK,EACzB,OAAiD,EACjD,KAAmB,EACJ,EAAE;QACjB,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC;QAEnC,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,QAAQ,CAAC;gBACjB,UAAU,EAAE,GAAG;gBACf,SAAS,EAAE,eAAe;gBAC1B,MAAM,EAAE,cAAc;gBACtB,KAAK,EAAE,QAAQ;aAChB,CAAC,CAAC;QACL,CAAC;QAED,KAAK,CAAC,IAAI,CACR,MAAM,IAAI,CAAC,eAAe,CAAC,UAAU,CACnC,kBAAkB,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,EAC5C,MAAM,EACN,OAAO,CAAC,IAAI,CAAC,MAAM,EACnB,OAAO,CAAC,IAAI,CAAC,IAAI,EACjB,OAAO,CAAC,IAAI,CAAC,QAAQ,KAAK,IAAI,EAC9B,aAAa,CAAC,OAAO,CAAC,CACvB,CACF,CAAC;IACJ,CAAC,CAAC;IAEO,cAAc,GAAG,KAAK,EAC7B,OAAiD,EACjD,KAAmB,EACJ,EAAE;QACjB,KAAK,CAAC,IAAI,CACR,MAAM,IAAI,CAAC,eAAe,CAAC,cAAc,CAAC,kBAAkB,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CACxF,CAAC;IACJ,CAAC,CAAC;CACH;AAED,SAAS,kBAAkB,CAAC,WAAoB;IAC9C,MAAM,KAAK,GAAG,WAAW,EAAE,IAAI,EAAE,CAAC;IAElC,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,IAAI,QAAQ,CAAC;YACjB,UAAU,EAAE,GAAG;YACf,SAAS,EAAE,eAAe;YAC1B,MAAM,EAAE,wBAAwB;YAChC,KAAK,EAAE,aAAa;SACrB,CAAC,CAAC;IACL,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,YAAY,CAAC,KAAkC;IACtD,MAAM,OAAO,GAAG,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAEvC,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,QAAQ,CAAC;YACjB,UAAU,EAAE,GAAG;YACf,SAAS,EAAE,eAAe;YAC1B,MAAM,EAAE,YAAY;YACpB,KAAK,EAAE,SAAS;SACjB,CAAC,CAAC;IACL,CAAC;IAED,OAAO;QACL,OAAO;QACP,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,IAAI;QACjC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,IAAI;QACrC,MAAM,EAAE,KAAK,EAAE,MAAM,IAAI,QAAQ;KAClC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"git-controller.js","sourceRoot":"","sources":["../../../../src/modules/git/git-controller.ts"],"names":[],"mappings":"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"}

package/dist/server/modules/git/git-read-service.d.ts

@@ -5,14 +5,14 @@ export declare class GitReadService {
     private readonly gitCommandRunner;
     private readonly workspaceRepoGuard;
     constructor(gitCommandRunner: GitCommandRunner, workspaceRepoGuard: WorkspaceRepoGuard);
-    getStatus(workspaceId: string): Promise<{
+    getStatus(workspaceId: string, signal?: AbortSignal): Promise<{
         snapshot: GitRepoSnapshot;
         changes: GitChangeItem[];
     }>;
-    getDiff(workspaceId: string, targetPath: string, staged: boolean): Promise<GitDiffResult>;
-    getCommitDetail(workspaceId: string, commitHash: string): Promise<GitCommitDetail>;
-    getHistory(workspaceId: string, cursor: string | null, limit: number): Promise<GitHistoryPage>;
-    getBranches(workspaceId: string): Promise<GitBranchSnapshot>;
-    getRemotes(workspaceId: string): Promise<GitRemoteItem[]>;
-    getTags(workspaceId: string): Promise<GitTagItem[]>;
+    getDiff(workspaceId: string, targetPath: string, staged: boolean, signal?: AbortSignal): Promise<GitDiffResult>;
+    getCommitDetail(workspaceId: string, commitHash: string, signal?: AbortSignal): Promise<GitCommitDetail>;
+    getHistory(workspaceId: string, cursor: string | null, limit: number, signal?: AbortSignal): Promise<GitHistoryPage>;
+    getBranches(workspaceId: string, signal?: AbortSignal): Promise<GitBranchSnapshot>;
+    getRemotes(workspaceId: string, signal?: AbortSignal): Promise<GitRemoteItem[]>;
+    getTags(workspaceId: string, signal?: AbortSignal): Promise<GitTagItem[]>;
 }

package/dist/server/modules/git/git-read-service.js

@@ -9,7 +9,7 @@ export class GitReadService {
         this.gitCommandRunner = gitCommandRunner;
         this.workspaceRepoGuard = workspaceRepoGuard;
     }
-    async getStatus(workspaceId) {
+    async getStatus(workspaceId, signal) {
         const repo = await this.workspaceRepoGuard.resolve(workspaceId);
         const statusResult = await this.gitCommandRunner.run(repo.repoRoot, [
             "status",
@@ -18,12 +18,14 @@ export class GitReadService {
             "--untracked-files=all"
         ], {
             workspaceId,
-            operation: "gitRead.getStatus"
+            operation: "gitRead.getStatus",
+            signal
         });
         const remoteResult = await this.gitCommandRunner.run(repo.repoRoot, ["remote", "get-url", "origin"], {
             allowNonZeroExit: true,
             workspaceId,
-            operation: "gitRead.getStatus"
+            operation: "gitRead.getStatus",
+            signal
         });
         const lines = statusResult.stdout
             .split(/\r?\n/)
@@ -46,7 +48,7 @@ export class GitReadService {
             changes
         };
     }
-    async getDiff(workspaceId, targetPath, staged) {
+    async getDiff(workspaceId, targetPath, staged, signal) {
         const repo = await this.workspaceRepoGuard.resolve(workspaceId);
         const relativePath = this.workspaceRepoGuard.ensureRelativePath(repo.repoRoot, targetPath);
         const diffArgs = staged
@@ -54,13 +56,15 @@ export class GitReadService {
             : ["diff", "--", relativePath];
         const diffResult = await this.gitCommandRunner.run(repo.repoRoot, diffArgs, {
             workspaceId,
-            operation: "gitRead.getDiff"
+            operation: "gitRead.getDiff",
+            signal
         });
         const numstatResult = await this.gitCommandRunner.run(repo.repoRoot, staged
             ? ["diff", "--cached", "--numstat", "--", relativePath]
             : ["diff", "--numstat", "--", relativePath], {
             workspaceId,
-            operation: "gitRead.getDiff"
+            operation: "gitRead.getDiff",
+            signal
         });
         const binary = numstatResult.stdout
             .split(/\r?\n/)
@@ -75,7 +79,7 @@ export class GitReadService {
             content: truncated ? diffResult.stdout.slice(0, MAX_DIFF_OUTPUT) : diffResult.stdout
         };
     }
-    async getCommitDetail(workspaceId, commitHash) {
+    async getCommitDetail(workspaceId, commitHash, signal) {
         const repo = await this.workspaceRepoGuard.resolve(workspaceId);
         const normalizedCommitHash = commitHash.trim();
         const [metadataResult, changedFilesResult, diffResult, versionResult] = await Promise.all([
@@ -87,7 +91,8 @@ export class GitReadService {
                 normalizedCommitHash
             ], {
                 workspaceId,
-                operation: "gitRead.getCommitDetail"
+                operation: "gitRead.getCommitDetail",
+                signal
             }),
             this.gitCommandRunner.run(repo.repoRoot, [
                 "show",
@@ -97,7 +102,8 @@ export class GitReadService {
                 normalizedCommitHash
             ], {
                 workspaceId,
-                operation: "gitRead.getCommitDetail"
+                operation: "gitRead.getCommitDetail",
+                signal
             }),
             this.gitCommandRunner.run(repo.repoRoot, [
                 "show",
@@ -106,12 +112,14 @@ export class GitReadService {
                 normalizedCommitHash
             ], {
                 workspaceId,
-                operation: "gitRead.getCommitDetail"
+                operation: "gitRead.getCommitDetail",
+                signal
             }),
             this.gitCommandRunner.run(repo.repoRoot, ["describe", "--tags", "--always", normalizedCommitHash], {
                 allowNonZeroExit: true,
                 workspaceId,
-                operation: "gitRead.getCommitDetail"
+                operation: "gitRead.getCommitDetail",
+                signal
             })
         ]);
         const metadata = parseCommitDetailMetadata(metadataResult.stdout, normalizedCommitHash);
@@ -134,7 +142,7 @@ export class GitReadService {
             diffContent: diffTruncated ? diffResult.stdout.slice(0, MAX_DIFF_OUTPUT) : diffResult.stdout
         };
     }
-    async getHistory(workspaceId, cursor, limit) {
+    async getHistory(workspaceId, cursor, limit, signal) {
         const repo = await this.workspaceRepoGuard.resolve(workspaceId);
         const safeLimit = clampHistoryLimit(limit);
         const offset = parseCursor(cursor);
@@ -145,7 +153,8 @@ export class GitReadService {
             "refs/remotes"
         ], {
             workspaceId,
-            operation: "gitRead.getHistory"
+            operation: "gitRead.getHistory",
+            signal
         });
         const parsedRefs = refsResult.stdout
             .split(/\r?\n/)
@@ -167,18 +176,21 @@ export class GitReadService {
                 "--pretty=format:%H%x1f%an%x1f%ad%x1f%s%x1f%b%x1f%D%x1e"
             ], {
                 workspaceId,
-                operation: "gitRead.getHistory"
+                operation: "gitRead.getHistory",
+                signal
             }),
             this.gitCommandRunner.run(repo.repoRoot, ["rev-list", "--count", "--all"], {
                 allowNonZeroExit: true,
                 workspaceId,
-                operation: "gitRead.getHistory"
+                operation: "gitRead.getHistory",
+                signal
             }),
             currentRef?.upstream
                 ? this.gitCommandRunner.run(repo.repoRoot, ["rev-list", "--left-right", `${currentRef.shortName}...${currentRef.upstream}`], {
                     allowNonZeroExit: true,
                     workspaceId,
-                    operation: "gitRead.getHistory"
+                    operation: "gitRead.getHistory",
+                    signal
                 })
                 : Promise.resolve({
                     stdout: "",
@@ -202,12 +214,13 @@ export class GitReadService {
             totalCount
         };
     }
-    async getBranches(workspaceId) {
+    async getBranches(workspaceId, signal) {
         const repo = await this.workspaceRepoGuard.resolve(workspaceId);
         const [statusResult, localResult, remoteResult] = await Promise.all([
             this.gitCommandRunner.run(repo.repoRoot, ["status", "--porcelain=1", "--branch"], {
                 workspaceId,
-                operation: "gitRead.getBranches"
+                operation: "gitRead.getBranches",
+                signal
             }),
             this.gitCommandRunner.run(repo.repoRoot, [
                 "for-each-ref",
@@ -215,7 +228,8 @@ export class GitReadService {
                 "refs/heads"
             ], {
                 workspaceId,
-                operation: "gitRead.getBranches"
+                operation: "gitRead.getBranches",
+                signal
             }),
             this.gitCommandRunner.run(repo.repoRoot, [
                 "for-each-ref",
@@ -223,7 +237,8 @@ export class GitReadService {
                 "refs/remotes"
             ], {
                 workspaceId,
-                operation: "gitRead.getBranches"
+                operation: "gitRead.getBranches",
+                signal
             })
         ]);
         const currentBranch = parseBranchHeader(statusResult.stdout.split(/\r?\n/).find((line) => line.startsWith("##")) ?? "## HEAD").branch;
@@ -248,11 +263,12 @@ export class GitReadService {
             remote
         };
     }
-    async getRemotes(workspaceId) {
+    async getRemotes(workspaceId, signal) {
         const repo = await this.workspaceRepoGuard.resolve(workspaceId);
         const result = await this.gitCommandRunner.run(repo.repoRoot, ["remote", "-v"], {
             workspaceId,
-            operation: "gitRead.getRemotes"
+            operation: "gitRead.getRemotes",
+            signal
         });
         const remotes = new Map();
         for (const line of result.stdout.split(/\r?\n/)) {
@@ -278,7 +294,7 @@ export class GitReadService {
         }
         return Array.from(remotes.values());
     }
-    async getTags(workspaceId) {
+    async getTags(workspaceId, signal) {
         const repo = await this.workspaceRepoGuard.resolve(workspaceId);
         const result = await this.gitCommandRunner.run(repo.repoRoot, [
             "for-each-ref",
@@ -287,7 +303,8 @@ export class GitReadService {
             "refs/tags"
         ], {
             workspaceId,
-            operation: "gitRead.getTags"
+            operation: "gitRead.getTags",
+            signal
         });
         return result.stdout
             .split(/\r?\n/)