@jingyi0605/codingns 0.1.1 → 0.1.3

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

@@ -0,0 +1,237 @@
+import { spawn } from "node:child_process";
+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 stdinReader = readline.createInterface({
+    input: process.stdin,
+    crlfDelay: Infinity
+});
+stdinReader.on("line", (line) => {
+    void handleRequestLine(line);
+});
+async function handleRequestLine(line) {
+    let request;
+    try {
+        request = JSON.parse(line);
+    }
+    catch (error) {
+        logHelperError("无法解析请求", error);
+        return;
+    }
+    if (request.type !== "run") {
+        return;
+    }
+    try {
+        const result = await runGitCommand(request.repoRoot, request.args, request.options);
+        process.stdout.write(`${JSON.stringify({
+            type: "result",
+            id: request.id,
+            ok: true,
+            result
+        })}\n`);
+    }
+    catch (error) {
+        const appError = normalizeHelperError(error);
+        process.stdout.write(`${JSON.stringify({
+            type: "result",
+            id: request.id,
+            ok: false,
+            error: {
+                statusCode: appError.statusCode,
+                errorCode: appError.errorCode,
+                detail: appError.message
+            }
+        })}\n`);
+    }
+}
+async function runGitCommand(repoRoot, args, options = {}, retryAttempt = 0) {
+    const startedAt = Date.now();
+    const timeoutMs = options.timeoutMs ?? 15_000;
+    const effectiveArgs = ["-c", "core.quotepath=false", ...args];
+    const env = {
+        ...process.env,
+        ...(options.env ?? {})
+    };
+    return await new Promise((resolve, reject) => {
+        let child;
+        try {
+            child = spawn("git", effectiveArgs, {
+                cwd: repoRoot,
+                env,
+                stdio: ["ignore", "pipe", "pipe"]
+            });
+        }
+        catch (error) {
+            if (shouldRetryGitSpawn(error) && retryAttempt < GIT_COMMAND_SPAWN_RETRY_LIMIT) {
+                const nextAttempt = retryAttempt + 1;
+                logHelperWarn("git-command-retry", {
+                    workspaceId: options.workspaceId ?? null,
+                    operation: options.operation ?? null,
+                    repoRoot,
+                    args,
+                    command: `git ${args.join(" ")}`,
+                    retryAttempt: nextAttempt,
+                    retryLimit: GIT_COMMAND_SPAWN_RETRY_LIMIT,
+                    retryDelayMs: GIT_COMMAND_SPAWN_RETRY_DELAY_MS,
+                    errorCode: getErrnoCode(error),
+                    reason: getErrorMessage(error)
+                });
+                setTimeout(() => {
+                    resolve(runGitCommand(repoRoot, args, options, nextAttempt));
+                }, GIT_COMMAND_SPAWN_RETRY_DELAY_MS);
+                return;
+            }
+            reject(createGitCommandFailedError(error));
+            return;
+        }
+        let stdout = "";
+        let stderr = "";
+        let completed = false;
+        const finish = (callback) => {
+            if (completed) {
+                return;
+            }
+            completed = true;
+            clearTimeout(timer);
+            callback();
+        };
+        const timer = setTimeout(() => {
+            child.kill("SIGTERM");
+            finish(() => {
+                logHelperWarn("git-command-timeout", {
+                    workspaceId: options.workspaceId ?? null,
+                    operation: options.operation ?? null,
+                    repoRoot,
+                    args,
+                    command: `git ${args.join(" ")}`,
+                    timeoutMs,
+                    durationMs: Date.now() - startedAt,
+                    pid: child.pid ?? null,
+                    stdoutLength: stdout.length,
+                    stderrLength: stderr.length
+                });
+                reject({
+                    statusCode: 504,
+                    errorCode: "GIT_COMMAND_TIMEOUT",
+                    detail: `Git 命令执行超时：git ${args.join(" ")}`
+                });
+            });
+        }, timeoutMs);
+        child.stdout.on("data", (chunk) => {
+            stdout += String(chunk);
+        });
+        child.stderr.on("data", (chunk) => {
+            stderr += String(chunk);
+        });
+        child.on("error", (error) => {
+            finish(() => {
+                if (shouldRetryGitSpawn(error) && retryAttempt < GIT_COMMAND_SPAWN_RETRY_LIMIT) {
+                    const nextAttempt = retryAttempt + 1;
+                    logHelperWarn("git-command-retry", {
+                        workspaceId: options.workspaceId ?? null,
+                        operation: options.operation ?? null,
+                        repoRoot,
+                        args,
+                        command: `git ${args.join(" ")}`,
+                        retryAttempt: nextAttempt,
+                        retryLimit: GIT_COMMAND_SPAWN_RETRY_LIMIT,
+                        retryDelayMs: GIT_COMMAND_SPAWN_RETRY_DELAY_MS,
+                        errorCode: getErrnoCode(error),
+                        reason: getErrorMessage(error)
+                    });
+                    setTimeout(() => {
+                        resolve(runGitCommand(repoRoot, args, options, nextAttempt));
+                    }, GIT_COMMAND_SPAWN_RETRY_DELAY_MS);
+                    return;
+                }
+                reject(createGitCommandFailedError(error));
+            });
+        });
+        child.on("close", (exitCode) => {
+            finish(() => {
+                const code = exitCode ?? 1;
+                const durationMs = Date.now() - startedAt;
+                if (durationMs >= GIT_COMMAND_SLOW_THRESHOLD_MS) {
+                    logHelperWarn("git-command-slow", {
+                        workspaceId: options.workspaceId ?? null,
+                        operation: options.operation ?? null,
+                        repoRoot,
+                        args,
+                        command: `git ${args.join(" ")}`,
+                        timeoutMs,
+                        slowThresholdMs: GIT_COMMAND_SLOW_THRESHOLD_MS,
+                        durationMs,
+                        exitCode: code,
+                        pid: child.pid ?? null,
+                        stdoutLength: stdout.length,
+                        stderrLength: stderr.length
+                    });
+                }
+                if (code !== 0 && !options.allowNonZeroExit) {
+                    reject({
+                        statusCode: 500,
+                        errorCode: "GIT_COMMAND_FAILED",
+                        detail: stderr.trim() || stdout.trim() || `Git 命令失败：git ${args.join(" ")}`
+                    });
+                    return;
+                }
+                resolve({
+                    stdout,
+                    stderr,
+                    exitCode: code
+                });
+            });
+        });
+    });
+}
+function shouldRetryGitSpawn(error) {
+    return getErrnoCode(error) === "EBADF";
+}
+function normalizeHelperError(error) {
+    if (isHelperErrorLike(error)) {
+        return {
+            statusCode: error.statusCode,
+            errorCode: error.errorCode,
+            message: error.detail
+        };
+    }
+    return {
+        statusCode: 500,
+        errorCode: "GIT_COMMAND_FAILED",
+        message: getErrorMessage(error)
+    };
+}
+function isHelperErrorLike(error) {
+    if (!error || typeof error !== "object") {
+        return false;
+    }
+    const candidate = error;
+    return (typeof candidate.statusCode === "number"
+        && typeof candidate.errorCode === "string"
+        && typeof candidate.detail === "string");
+}
+function createGitCommandFailedError(error) {
+    return {
+        statusCode: 500,
+        errorCode: "GIT_COMMAND_FAILED",
+        detail: `Git 命令启动失败：${getErrorMessage(error)}`
+    };
+}
+function getErrorMessage(error) {
+    return error instanceof Error ? error.message : String(error);
+}
+function getErrnoCode(error) {
+    if (!error || typeof error !== "object") {
+        return null;
+    }
+    const candidate = error;
+    return typeof candidate.code === "string" ? candidate.code : null;
+}
+function logHelperWarn(scope, payload) {
+    console.warn(`[${scope}]`, payload);
+}
+function logHelperError(message, error) {
+    console.error(`[git-helper] ${message}`, error);
+}
+//# sourceMappingURL=git-command-helper-process.js.map

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

@@ -0,0 +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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"}

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

@@ -10,7 +10,15 @@ export interface GitCommandResult {
     stderr: string;
     exitCode: number;
 }
+interface GitCommandRunnerOptions {
+    preferHelperProcess?: boolean;
+}
 export declare class GitCommandRunner {
+    private readonly helperClient;
+    constructor(options?: GitCommandRunnerOptions);
     run(repoRoot: string, args: string[], options?: GitCommandOptions): Promise<GitCommandResult>;
+    dispose(): void;
+    private runDirect;
+    private retrySpawnIfNeeded;
 }
 export {};

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

@@ -1,18 +1,51 @@
 import { spawn } from "node:child_process";
 import { AppError } from "../../shared/errors/app-error.js";
+import { GitCommandHelperClient } from "./git-command-helper-client.js";
 const GIT_COMMAND_SLOW_THRESHOLD_MS = 3_000;
+const GIT_COMMAND_SPAWN_RETRY_LIMIT = 1;
+const GIT_COMMAND_SPAWN_RETRY_DELAY_MS = 50;
 export class GitCommandRunner {
+    helperClient;
+    constructor(options = {}) {
+        this.helperClient = options.preferHelperProcess ? new GitCommandHelperClient() : null;
+    }
     async run(repoRoot, args, options = {}) {
+        if (this.helperClient) {
+            return this.helperClient.run(repoRoot, args, options);
+        }
+        return this.runDirect(repoRoot, args, options, 0);
+    }
+    dispose() {
+        this.helperClient?.dispose();
+    }
+    async runDirect(repoRoot, args, options, retryAttempt) {
         const startedAt = Date.now();
         const timeoutMs = options.timeoutMs ?? 15_000;
         const effectiveArgs = ["-c", "core.quotepath=false", ...args];
-        const env = options.env ? { ...process.env, ...options.env } : process.env;
+        const env = {
+            ...process.env,
+            ...(options.env ?? {})
+        };
         return await new Promise((resolve, reject) => {
-            const child = spawn("git", effectiveArgs, {
-                cwd: repoRoot,
-                env,
-                stdio: ["ignore", "pipe", "pipe"]
-            });
+            let child;
+            try {
+                child = spawn("git", effectiveArgs, {
+                    cwd: repoRoot,
+                    env,
+                    stdio: ["ignore", "pipe", "pipe"]
+                });
+            }
+            catch (error) {
+                if (this.retrySpawnIfNeeded(error, repoRoot, args, options, retryAttempt, resolve)) {
+                    return;
+                }
+                reject(new AppError({
+                    statusCode: 500,
+                    errorCode: "GIT_COMMAND_FAILED",
+                    detail: `Git 命令启动失败：${getErrorMessage(error)}`
+                }));
+                return;
+            }
             let stdout = "";
             let stderr = "";
             let completed = false;
@@ -54,6 +87,9 @@ export class GitCommandRunner {
             });
             child.on("error", (error) => {
                 finish(() => {
+                    if (this.retrySpawnIfNeeded(error, repoRoot, args, options, retryAttempt, resolve)) {
+                        return;
+                    }
                     reject(new AppError({
                         statusCode: 500,
                         errorCode: "GIT_COMMAND_FAILED",
@@ -98,5 +134,40 @@ export class GitCommandRunner {
             });
         });
     }
+    retrySpawnIfNeeded(error, repoRoot, args, options, retryAttempt, resolve) {
+        const normalizedError = toErrnoException(error);
+        if (!shouldRetryGitSpawn(normalizedError) || retryAttempt >= GIT_COMMAND_SPAWN_RETRY_LIMIT) {
+            return false;
+        }
+        const nextAttempt = retryAttempt + 1;
+        console.warn("[git-command-retry]", {
+            workspaceId: options.workspaceId ?? null,
+            operation: options.operation ?? null,
+            repoRoot,
+            args,
+            command: `git ${args.join(" ")}`,
+            retryAttempt: nextAttempt,
+            retryLimit: GIT_COMMAND_SPAWN_RETRY_LIMIT,
+            retryDelayMs: GIT_COMMAND_SPAWN_RETRY_DELAY_MS,
+            errorCode: normalizedError.code ?? null,
+            reason: normalizedError.message
+        });
+        setTimeout(() => {
+            resolve(this.runDirect(repoRoot, args, options, nextAttempt));
+        }, GIT_COMMAND_SPAWN_RETRY_DELAY_MS);
+        return true;
+    }
+}
+function shouldRetryGitSpawn(error) {
+    return error.code === "EBADF";
+}
+function toErrnoException(error) {
+    if (error instanceof Error) {
+        return error;
+    }
+    return new Error(String(error));
+}
+function getErrorMessage(error) {
+    return error instanceof Error ? error.message : String(error);
 }
 //# sourceMappingURL=git-command-runner.js.map

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.d.ts

@@ -49,6 +49,7 @@ interface CommitPayloadBody {
 interface RemoteSyncBody {
     workspaceId?: string;
     action?: "fetch" | "pull" | "push" | "publish";
+    remote?: string;
 }
 export declare class GitController {
     private readonly gitReadService;
@@ -94,6 +95,9 @@ export declare class GitController {
     readonly switchBranch: (request: FastifyRequest<{
         Body: BranchSwitchBody;
     }>, reply: FastifyReply) => Promise<void>;
+    readonly getRemotes: (request: FastifyRequest<{
+        Querystring: WorkspaceQuery;
+    }>, reply: FastifyReply) => Promise<void>;
     readonly syncRemote: (request: FastifyRequest<{
         Body: RemoteSyncBody;
     }>, reply: FastifyReply) => Promise<void>;

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

@@ -92,6 +92,9 @@ export class GitController {
     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)));
+    };
     syncRemote = async (request, reply) => {
         const action = request.body.action;
         if (!action) {
@@ -102,7 +105,7 @@ export class GitController {
                 field: "action"
             });
         }
-        reply.send(await this.gitWriteService.syncRemote(requireWorkspaceId(request.body.workspaceId), action));
+        reply.send(await this.gitWriteService.syncRemote(requireWorkspaceId(request.body.workspaceId), action, request.body.remote));
     };
     undoLastCommit = async (request, reply) => {
         reply.send(await this.gitWriteService.undoLastCommit(requireWorkspaceId(request.body.workspaceId)));

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":"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"}
+{"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

@@ -1,5 +1,5 @@
 import type { GitCommandRunner } from "./git-command-runner.js";
-import type { GitBranchSnapshot, GitChangeItem, GitDiffResult, GitHistoryPage, GitRepoSnapshot } from "./types.js";
+import type { GitBranchSnapshot, GitChangeItem, GitDiffResult, GitHistoryPage, GitRemoteItem, GitRepoSnapshot } from "./types.js";
 import type { WorkspaceRepoGuard } from "./workspace-repo-guard.js";
 export declare class GitReadService {
     private readonly gitCommandRunner;
@@ -12,4 +12,5 @@ export declare class GitReadService {
     getDiff(workspaceId: string, targetPath: string, staged: boolean): Promise<GitDiffResult>;
     getHistory(workspaceId: string, cursor: string | null, limit: number): Promise<GitHistoryPage>;
     getBranches(workspaceId: string): Promise<GitBranchSnapshot>;
+    getRemotes(workspaceId: string): Promise<GitRemoteItem[]>;
 }

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

@@ -189,6 +189,36 @@ export class GitReadService {
             remote
         };
     }
+    async getRemotes(workspaceId) {
+        const repo = await this.workspaceRepoGuard.resolve(workspaceId);
+        const result = await this.gitCommandRunner.run(repo.repoRoot, ["remote", "-v"], {
+            workspaceId,
+            operation: "gitRead.getRemotes"
+        });
+        const remotes = new Map();
+        for (const line of result.stdout.split(/\r?\n/)) {
+            const trimmed = line.trim();
+            if (!trimmed)
+                continue;
+            const match = trimmed.match(/^(\S+)\s+(\S+)\s+\((fetch|push)\)/);
+            if (!match)
+                continue;
+            const [, name, url, kind] = match;
+            const existing = remotes.get(name);
+            if (existing) {
+                if (kind === "push")
+                    existing.pushUrl = url;
+            }
+            else {
+                remotes.set(name, {
+                    name,
+                    fetchUrl: kind === "fetch" ? url : url,
+                    pushUrl: kind === "push" ? url : url
+                });
+            }
+        }
+        return Array.from(remotes.values());
+    }
 }
 function parseBranchHeader(headerLine) {
     const header = headerLine.replace(/^##\s*/, "");

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

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

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

@@ -23,6 +23,6 @@ export declare class GitWriteService {
         commitHash: string;
     }>;
     switchBranch(workspaceId: string, branchName: string, create: boolean): Promise<GitBranchSnapshot>;
-    syncRemote(workspaceId: string, action: GitRemoteSyncResult["action"]): Promise<GitRemoteSyncResult>;
+    syncRemote(workspaceId: string, action: GitRemoteSyncResult["action"], remoteName?: string): Promise<GitRemoteSyncResult>;
     undoLastCommit(workspaceId: string): Promise<GitUndoCommitResult>;
 }

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

@@ -156,10 +156,11 @@ export class GitWriteService {
         }
         return await this.gitReadService.getBranches(workspaceId);
     }
-    async syncRemote(workspaceId, action) {
+    async syncRemote(workspaceId, action, remoteName) {
         const repo = await this.workspaceRepoGuard.resolve(workspaceId);
         const currentBranch = (await this.gitReadService.getStatus(workspaceId)).snapshot.branch;
-        const remoteUrl = await this.gitCommandRunner.run(repo.repoRoot, ["remote", "get-url", "origin"], {
+        const remote = remoteName || "origin";
+        const remoteUrl = await this.gitCommandRunner.run(repo.repoRoot, ["remote", "get-url", remote], {
             allowNonZeroExit: true,
             workspaceId,
             operation: "gitWrite.syncRemote"
@@ -168,16 +169,16 @@ export class GitWriteService {
             throw new AppError({
                 statusCode: 404,
                 errorCode: "REMOTE_NOT_FOUND",
-                detail: "Origin remote is not configured"
+                detail: `Remote '${remote}' is not configured`
             });
         }
         const args = action === "fetch"
-            ? ["fetch", "origin"]
+            ? ["fetch", remote]
             : action === "pull"
-                ? ["pull", "--ff-only", "origin", currentBranch]
+                ? ["pull", "--ff-only", remote, currentBranch]
                 : action === "push"
-                    ? ["push", "origin", currentBranch]
-                    : ["push", "--set-upstream", "origin", currentBranch];
+                    ? ["push", remote, currentBranch]
+                    : ["push", "--set-upstream", remote, currentBranch];
         const result = await this.gitCommandRunner.run(repo.repoRoot, args, {
             allowNonZeroExit: true,
             timeoutMs: 60_000,