@jingyi0605/codingns 0.3.6 → 0.4.0

package/dist/server/modules/tasks/task-helper-client.d.ts

@@ -1,16 +1,19 @@
 import type { TaskHelperProcessHandlerName } from "./task-helper-process-handlers.js";
 export declare class TaskHelperProcessClient {
-    private readonly child;
-    private readonly stdoutReader;
+    private child;
+    private stdoutReader;
     private readonly pendingRequests;
     private nextRequestId;
     private disposed;
     constructor();
     execute<TResult>(handler: TaskHelperProcessHandlerName, input: unknown, signal?: AbortSignal): Promise<TResult>;
+    private executeOnce;
     dispose(): void;
     private handleResponseLine;
     private rejectAll;
     private sendCancel;
+    private ensureChild;
+    private handleChildTermination;
 }
 export declare function getSharedTaskHelperProcessClient(): TaskHelperProcessClient;
 export declare function disposeSharedTaskHelperProcessClient(): void;

package/dist/server/modules/tasks/task-helper-client.js

@@ -2,43 +2,42 @@ import { spawn } from "node:child_process";
 import path from "node:path";
 import readline from "node:readline";
 import { fileURLToPath } from "node:url";
+const GLOBAL_TASK_HELPER_PROCESS_CLIENT_KEY = "__codingnsTaskHelperProcessClient__";
 let sharedTaskHelperProcessClient = null;
 export class TaskHelperProcessClient {
-    child;
-    stdoutReader;
+    child = null;
+    stdoutReader = null;
     pendingRequests = new Map();
     nextRequestId = 1;
     disposed = false;
     constructor() {
-        const launch = resolveHelperLaunch();
-        this.child = spawn(launch.command, launch.args, {
-            cwd: process.cwd(),
-            env: process.env,
-            stdio: ["pipe", "pipe", "pipe"]
-        });
-        this.stdoutReader = readline.createInterface({
-            input: this.child.stdout
-        });
-        this.stdoutReader.on("line", (line) => {
-            this.handleResponseLine(line);
-        });
-        this.child.stderr.on("data", (chunk) => {
-            const content = String(chunk).trim();
-            if (content) {
-                console.warn(`[task-helper] ${content}`);
-            }
-        });
-        this.child.on("error", (error) => {
-            this.rejectAll(error);
-        });
-        this.child.on("exit", (code, signal) => {
-            this.rejectAll(new Error(`task helper 已退出：code=${code ?? "null"} signal=${signal ?? "null"}`));
-        });
+        this.ensureChild();
     }
     async execute(handler, input, signal) {
+        let attempt = 0;
+        while (true) {
+            try {
+                return await this.executeOnce(handler, input, signal);
+            }
+            catch (error) {
+                if (attempt >= 1 ||
+                    this.disposed ||
+                    signal?.aborted ||
+                    !isRetryableHelperClientError(error)) {
+                    throw error;
+                }
+                attempt += 1;
+                this.handleChildTermination(error instanceof Error
+                    ? error
+                    : new Error("task helper pipe 已断开"));
+            }
+        }
+    }
+    async executeOnce(handler, input, signal) {
         if (this.disposed) {
             return Promise.reject(new Error("task helper 已关闭"));
         }
+        const child = this.ensureChild();
         const id = String(this.nextRequestId++);
         return await new Promise((resolve, reject) => {
             let aborted = false;
@@ -74,7 +73,7 @@ export class TaskHelperProcessClient {
                     }
                 }
             });
-            this.child.stdin.write(`${JSON.stringify({
+            child.stdin.write(`${JSON.stringify({
                 id,
                 type: "run",
                 handler,
@@ -96,11 +95,13 @@ export class TaskHelperProcessClient {
             return;
         }
         this.disposed = true;
-        this.stdoutReader.close();
-        if (!this.child.killed) {
+        this.stdoutReader?.close();
+        if (this.child && !this.child.killed) {
             this.child.kill("SIGTERM");
         }
         this.rejectAll(new Error("task helper 已关闭"));
+        this.child = null;
+        this.stdoutReader = null;
     }
     handleResponseLine(line) {
         const trimmed = line.trim();
@@ -132,31 +133,110 @@ export class TaskHelperProcessClient {
         this.pendingRequests.clear();
     }
     async sendCancel(targetId) {
-        if (this.disposed || this.child.killed || this.child.stdin.destroyed) {
+        if (this.disposed ||
+            !this.child ||
+            this.child.killed ||
+            this.child.stdin.destroyed) {
             return;
         }
+        const child = this.child;
         await new Promise((resolve) => {
-            this.child.stdin.write(`${JSON.stringify({
-                id: `cancel:${targetId}`,
-                type: "cancel",
-                targetId
-            })}\n`, () => {
+            try {
+                child.stdin.write(`${JSON.stringify({
+                    id: `cancel:${targetId}`,
+                    type: "cancel",
+                    targetId
+                })}\n`, () => {
+                    resolve();
+                });
+            }
+            catch {
                 resolve();
-            });
+            }
         });
     }
+    ensureChild() {
+        if (this.child && this.stdoutReader && !this.child.killed && !this.child.stdin.destroyed) {
+            return this.child;
+        }
+        const launch = resolveHelperLaunch();
+        const child = spawn(launch.command, launch.args, {
+            cwd: process.cwd(),
+            env: process.env,
+            stdio: ["pipe", "pipe", "pipe"]
+        });
+        const stdoutReader = readline.createInterface({
+            input: child.stdout
+        });
+        stdoutReader.on("line", (line) => {
+            this.handleResponseLine(line);
+        });
+        child.stderr.on("data", (chunk) => {
+            const content = String(chunk).trim();
+            if (content) {
+                console.warn(`[task-helper] ${content}`);
+            }
+        });
+        child.stdin.on("error", (error) => {
+            this.handleChildTermination(error instanceof Error
+                ? error
+                : new Error("task helper stdin 已断开"));
+        });
+        child.on("error", (error) => {
+            this.handleChildTermination(error);
+        });
+        child.on("exit", (code, signal) => {
+            this.handleChildTermination(new Error(`task helper 已退出：code=${code ?? "null"} signal=${signal ?? "null"}`));
+        });
+        this.child = child;
+        this.stdoutReader = stdoutReader;
+        return child;
+    }
+    handleChildTermination(error) {
+        const child = this.child;
+        if (this.stdoutReader) {
+            this.stdoutReader.close();
+        }
+        if (child && !child.killed) {
+            child.kill("SIGTERM");
+        }
+        this.child = null;
+        this.stdoutReader = null;
+        this.rejectAll(error);
+    }
+}
+function isRetryableHelperClientError(error) {
+    if (!error || typeof error !== "object") {
+        return false;
+    }
+    const code = "code" in error ? error.code : null;
+    if (code === "EPIPE" || code === "ECONNRESET") {
+        return true;
+    }
+    const message = "message" in error ? String(error.message ?? "") : "";
+    return message.includes("task helper 已退出");
 }
 export function getSharedTaskHelperProcessClient() {
+    const scope = globalThis;
+    const globalClient = scope[GLOBAL_TASK_HELPER_PROCESS_CLIENT_KEY];
+    if (globalClient) {
+        sharedTaskHelperProcessClient = globalClient;
+        return globalClient;
+    }
     if (!sharedTaskHelperProcessClient) {
         sharedTaskHelperProcessClient = new TaskHelperProcessClient();
     }
+    scope[GLOBAL_TASK_HELPER_PROCESS_CLIENT_KEY] = sharedTaskHelperProcessClient;
     return sharedTaskHelperProcessClient;
 }
 export function disposeSharedTaskHelperProcessClient() {
-    if (!sharedTaskHelperProcessClient) {
+    const scope = globalThis;
+    const sharedClient = scope[GLOBAL_TASK_HELPER_PROCESS_CLIENT_KEY] ?? sharedTaskHelperProcessClient;
+    if (!sharedClient) {
         return;
     }
-    sharedTaskHelperProcessClient.dispose();
+    sharedClient.dispose();
+    scope[GLOBAL_TASK_HELPER_PROCESS_CLIENT_KEY] = null;
     sharedTaskHelperProcessClient = null;
 }
 function resolveHelperLaunch() {

package/dist/server/modules/tasks/task-helper-client.js.map

@@ -1 +1 @@
-{"version":3,"file":"task-helper-client.js","sourceRoot":"","sources":["../../../../src/modules/tasks/task-helper-client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"task-helper-client.js","sourceRoot":"","sources":["../../../../src/modules/tasks/task-helper-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAuC,MAAM,oBAAoB,CAAC;AAChF,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,QAAQ,MAAM,eAAe,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAuBzC,MAAM,qCAAqC,GAAG,qCAAqC,CAAC;AAEpF,IAAI,6BAA6B,GAAmC,IAAI,CAAC;AAEzE,MAAM,OAAO,uBAAuB;IAC1B,KAAK,GAA0C,IAAI,CAAC;IACpD,YAAY,GAA8B,IAAI,CAAC;IACtC,eAAe,GAAG,IAAI,GAAG,EAAmC,CAAC;IACtE,aAAa,GAAG,CAAC,CAAC;IAClB,QAAQ,GAAG,KAAK,CAAC;IAEzB;QACE,IAAI,CAAC,WAAW,EAAE,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,OAAO,CACX,OAAqC,EACrC,KAAc,EACd,MAAoB;QAEpB,IAAI,OAAO,GAAG,CAAC,CAAC;QAEhB,OAAO,IAAI,EAAE,CAAC;YACZ,IAAI,CAAC;gBACH,OAAO,MAAM,IAAI,CAAC,WAAW,CAAU,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;YACjE,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IACE,OAAO,IAAI,CAAC;oBACZ,IAAI,CAAC,QAAQ;oBACb,MAAM,EAAE,OAAO;oBACf,CAAC,4BAA4B,CAAC,KAAK,CAAC,EACpC,CAAC;oBACD,MAAM,KAAK,CAAC;gBACd,CAAC;gBAED,OAAO,IAAI,CAAC,CAAC;gBACb,IAAI,CAAC,sBAAsB,CACzB,KAAK,YAAY,KAAK;oBACpB,CAAC,CAAC,KAAK;oBACP,CAAC,CAAC,IAAI,KAAK,CAAC,sBAAsB,CAAC,CACtC,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,WAAW,CACvB,OAAqC,EACrC,KAAc,EACd,MAAoB;QAEpB,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC;QACtD,CAAC;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QACjC,MAAM,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;QAExC,OAAO,MAAM,IAAI,OAAO,CAAU,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACpD,IAAI,OAAO,GAAG,KAAK,CAAC;YACpB,IAAI,OAAO,GAAwB,IAAI,CAAC;YAExC,IAAI,MAAM,EAAE,CAAC;gBACX,OAAO,GAAG,GAAG,EAAE;oBACb,OAAO,GAAG,IAAI,CAAC;oBACf,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;oBAChC,KAAK,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;oBACzB,MAAM,CAAC,MAAM,CAAC,MAAM,IAAI,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAC;gBAC5D,CAAC,CAAC;gBAEF,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;oBACnB,OAAO,EAAE,CAAC;oBACV,OAAO;gBACT,CAAC;gBAED,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YAC5D,CAAC;YAED,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE,EAAE;gBAC3B,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;oBACjB,IAAI,OAAO,IAAI,MAAM,EAAE,CAAC;wBACtB,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;oBAC/C,CAAC;oBAED,IAAI,CAAC,OAAO,EAAE,CAAC;wBACb,OAAO,CAAC,KAAgB,CAAC,CAAC;oBAC5B,CAAC;gBACH,CAAC;gBACD,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;oBAChB,IAAI,OAAO,IAAI,MAAM,EAAE,CAAC;wBACtB,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;oBAC/C,CAAC;oBAED,IAAI,CAAC,OAAO,EAAE,CAAC;wBACb,MAAM,CAAC,KAAK,CAAC,CAAC;oBAChB,CAAC;gBACH,CAAC;aACF,CAAC,CAAC;YAEH,KAAK,CAAC,KAAK,CAAC,KAAK,CACf,GAAG,IAAI,CAAC,SAAS,CAAC;gBAChB,EAAE;gBACF,IAAI,EAAE,KAAK;gBACX,OAAO;gBACP,KAAK;aACN,CAAC,IAAI,EACN,CAAC,KAAK,EAAE,EAAE;gBACR,IAAI,CAAC,KAAK,EAAE,CAAC;oBACX,OAAO;gBACT,CAAC;gBAED,IAAI,OAAO,IAAI,MAAM,EAAE,CAAC;oBACtB,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;gBAC/C,CAAC;gBAED,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBAChC,MAAM,CAAC,KAAK,CAAC,CAAC;YAChB,CAAC,CACF,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAED,OAAO;QACL,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAClB,OAAO;QACT,CAAC;QAED,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,IAAI,CAAC,YAAY,EAAE,KAAK,EAAE,CAAC;QAE3B,IAAI,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;YACrC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC7B,CAAC;QAED,IAAI,CAAC,SAAS,CAAC,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC;QAC7C,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;IAC3B,CAAC;IAEO,kBAAkB,CAAC,IAAY;QACrC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QAE5B,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YAC7B,OAAO;QACT,CAAC;QAED,IAAI,OAAuB,CAAC;QAE5B,IAAI,CAAC;YACH,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAmB,CAAC;QAClD,CAAC;QAAC,MAAM,CAAC;YACP,OAAO;QACT,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAErD,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO;QACT,CAAC;QAED,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAExC,IAAI,OAAO,CAAC,EAAE,EAAE,CAAC;YACf,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAChC,OAAO;QACT,CAAC;QAED,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;IAC3C,CAAC;IAEO,SAAS,CAAC,KAAc;QAC9B,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,EAAE,CAAC;YACpD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACxB,CAAC;QAED,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC;IAC/B,CAAC;IAEO,KAAK,CAAC,UAAU,CAAC,QAAgB;QACvC,IACE,IAAI,CAAC,QAAQ;YACb,CAAC,IAAI,CAAC,KAAK;YACX,IAAI,CAAC,KAAK,CAAC,MAAM;YACjB,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,EAC1B,CAAC;YACD,OAAO;QACT,CAAC;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QAEzB,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;YAClC,IAAI,CAAC;gBACH,KAAK,CAAC,KAAK,CAAC,KAAK,CACf,GAAG,IAAI,CAAC,SAAS,CAAC;oBAChB,EAAE,EAAE,UAAU,QAAQ,EAAE;oBACxB,IAAI,EAAE,QAAQ;oBACd,QAAQ;iBACT,CAAC,IAAI,EACN,GAAG,EAAE;oBACH,OAAO,EAAE,CAAC;gBACZ,CAAC,CACF,CAAC;YACJ,CAAC;YAAC,MAAM,CAAC;gBACP,OAAO,EAAE,CAAC;YACZ,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,WAAW;QACjB,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,YAAY,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC;YACzF,OAAO,IAAI,CAAC,KAAK,CAAC;QACpB,CAAC;QAED,MAAM,MAAM,GAAG,mBAAmB,EAAE,CAAC;QACrC,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,EAAE;YAC/C,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE;YAClB,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;SAChC,CAAC,CAAC;QACH,MAAM,YAAY,GAAG,QAAQ,CAAC,eAAe,CAAC;YAC5C,KAAK,EAAE,KAAK,CAAC,MAAM;SACpB,CAAC,CAAC;QAEH,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YAC/B,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;QAChC,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;YAChC,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC;YAErC,IAAI,OAAO,EAAE,CAAC;gBACZ,OAAO,CAAC,IAAI,CAAC,iBAAiB,OAAO,EAAE,CAAC,CAAC;YAC3C,CAAC;QACH,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YAChC,IAAI,CAAC,sBAAsB,CACzB,KAAK,YAAY,KAAK;gBACpB,CAAC,CAAC,KAAK;gBACP,CAAC,CAAC,IAAI,KAAK,CAAC,uBAAuB,CAAC,CACvC,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YAC1B,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;YAChC,IAAI,CAAC,sBAAsB,CACzB,IAAI,KAAK,CACP,wBAAwB,IAAI,IAAI,MAAM,WAAW,MAAM,IAAI,MAAM,EAAE,CACpE,CACF,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,OAAO,KAAK,CAAC;IACf,CAAC;IAEO,sBAAsB,CAAC,KAAY;QACzC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QAEzB,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;QAC5B,CAAC;QAED,IAAI,KAAK,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;YAC3B,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACxB,CAAC;QAED,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IACxB,CAAC;CACF;AAED,SAAS,4BAA4B,CAAC,KAAc;IAClD,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QACxC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;IAEjD,IAAI,IAAI,KAAK,OAAO,IAAI,IAAI,KAAK,YAAY,EAAE,CAAC;QAC9C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,OAAO,GAAG,SAAS,IAAI,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACtE,OAAO,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;AAC7C,CAAC;AAED,MAAM,UAAU,gCAAgC;IAC9C,MAAM,KAAK,GAAG,UAEb,CAAC;IACF,MAAM,YAAY,GAAG,KAAK,CAAC,qCAAqC,CAAC,CAAC;IAElE,IAAI,YAAY,EAAE,CAAC;QACjB,6BAA6B,GAAG,YAAY,CAAC;QAC7C,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,IAAI,CAAC,6BAA6B,EAAE,CAAC;QACnC,6BAA6B,GAAG,IAAI,uBAAuB,EAAE,CAAC;IAChE,CAAC;IAED,KAAK,CAAC,qCAAqC,CAAC,GAAG,6BAA6B,CAAC;IAC7E,OAAO,6BAA6B,CAAC;AACvC,CAAC;AAED,MAAM,UAAU,oCAAoC;IAClD,MAAM,KAAK,GAAG,UAEb,CAAC;IACF,MAAM,YAAY,GAChB,KAAK,CAAC,qCAAqC,CAAC,IAAI,6BAA6B,CAAC;IAEhF,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,OAAO;IACT,CAAC;IAED,YAAY,CAAC,OAAO,EAAE,CAAC;IACvB,KAAK,CAAC,qCAAqC,CAAC,GAAG,IAAI,CAAC;IACpD,6BAA6B,GAAG,IAAI,CAAC;AACvC,CAAC;AAED,SAAS,mBAAmB;IAC1B,MAAM,eAAe,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACvD,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;IAChD,MAAM,UAAU,GAAG,eAAe,CAAC,OAAO,CACxC,8BAA8B,EAC9B,sBAAsB,SAAS,EAAE,CAClC,CAAC;IAEF,IAAI,SAAS,KAAK,KAAK,EAAE,CAAC;QACxB,OAAO;YACL,OAAO,EAAE,OAAO,CAAC,QAAQ;YACzB,IAAI,EAAE,CAAC,UAAU,EAAE,KAAK,EAAE,UAAU,CAAC;SACtC,CAAC;IACJ,CAAC;IAED,OAAO;QACL,OAAO,EAAE,OAAO,CAAC,QAAQ;QACzB,IAAI,EAAE,CAAC,UAAU,CAAC;KACnB,CAAC;AACJ,CAAC"}

package/dist/server/modules/tasks/task-helper-process.js

@@ -1,6 +1,13 @@
 import readline from "node:readline";
 import { runTaskHelperProcessHandler } from "./task-helper-process-handlers.js";
+const TASK_HELPER_HANDLER_CONCURRENCY = {
+    "session.workspace_discovery": 2
+};
+const TASK_HELPER_RSS_HIGH_WATER_BYTES = 768 * 1024 * 1024;
 const activeRequests = new Map();
+const queuedRequests = new Map();
+const queuedRequestsByHandler = new Map();
+const runningCountByHandler = new Map();
 const reader = readline.createInterface({
     input: process.stdin,
     crlfDelay: Number.POSITIVE_INFINITY
@@ -27,11 +34,42 @@ async function handleLine(line) {
         return;
     }
     if (payload.type === "cancel") {
-        activeRequests.get(payload.targetId)?.abort(new Error("helper task aborted"));
+        cancelRequest(payload.targetId);
         return;
     }
     const controller = new AbortController();
+    const task = {
+        payload,
+        controller
+    };
+    if (canStartTask(payload.handler)) {
+        startTask(task);
+        return;
+    }
+    queuedRequests.set(payload.id, task);
+    const queue = queuedRequestsByHandler.get(payload.handler) ?? [];
+    queue.push(task);
+    queuedRequestsByHandler.set(payload.handler, queue);
+}
+function writeResponse(payload) {
+    process.stdout.write(`${JSON.stringify(payload)}\n`);
+}
+function canStartTask(handler) {
+    const limit = TASK_HELPER_HANDLER_CONCURRENCY[handler];
+    if (!limit || limit <= 0) {
+        return true;
+    }
+    return (runningCountByHandler.get(handler) ?? 0) < limit;
+}
+function startTask(task) {
+    const { payload, controller } = task;
+    queuedRequests.delete(payload.id);
     activeRequests.set(payload.id, controller);
+    runningCountByHandler.set(payload.handler, (runningCountByHandler.get(payload.handler) ?? 0) + 1);
+    void runTask(task);
+}
+async function runTask(task) {
+    const { payload, controller } = task;
     try {
         const result = await runTaskHelperProcessHandler(payload.handler, payload.input, controller.signal);
         writeResponse({
@@ -51,9 +89,62 @@ async function handleLine(line) {
     }
     finally {
         activeRequests.delete(payload.id);
+        runningCountByHandler.set(payload.handler, Math.max(0, (runningCountByHandler.get(payload.handler) ?? 1) - 1));
+        drainQueue(payload.handler);
+        maybeRecycleProcess();
     }
 }
-function writeResponse(payload) {
-    process.stdout.write(`${JSON.stringify(payload)}\n`);
+function drainQueue(handler) {
+    const queue = queuedRequestsByHandler.get(handler);
+    if (!queue || queue.length === 0) {
+        return;
+    }
+    while (queue.length > 0 && canStartTask(handler)) {
+        const next = queue.shift();
+        if (!next) {
+            continue;
+        }
+        if (!queuedRequests.has(next.payload.id)) {
+            continue;
+        }
+        startTask(next);
+    }
+    if (queue.length === 0) {
+        queuedRequestsByHandler.delete(handler);
+    }
+}
+function cancelRequest(targetId) {
+    const active = activeRequests.get(targetId);
+    if (active) {
+        active.abort(new Error("helper task aborted"));
+        return;
+    }
+    const queued = queuedRequests.get(targetId);
+    if (!queued) {
+        return;
+    }
+    queuedRequests.delete(targetId);
+    const queue = queuedRequestsByHandler.get(queued.payload.handler);
+    if (!queue) {
+        return;
+    }
+    const nextQueue = queue.filter((entry) => entry.payload.id !== targetId);
+    if (nextQueue.length === 0) {
+        queuedRequestsByHandler.delete(queued.payload.handler);
+        return;
+    }
+    queuedRequestsByHandler.set(queued.payload.handler, nextQueue);
+}
+function maybeRecycleProcess() {
+    if (activeRequests.size > 0 || queuedRequests.size > 0) {
+        return;
+    }
+    if (process.memoryUsage.rss() < TASK_HELPER_RSS_HIGH_WATER_BYTES) {
+        return;
+    }
+    process.stderr.write(`[task-helper] rss 高水位回收，rss=${process.memoryUsage.rss()}\n`);
+    setImmediate(() => {
+        process.exit(0);
+    });
 }
 //# sourceMappingURL=task-helper-process.js.map

package/dist/server/modules/tasks/task-helper-process.js.map

@@ -1 +1 @@
-{"version":3,"file":"task-helper-process.js","sourceRoot":"","sources":["../../../../src/modules/tasks/task-helper-process.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,eAAe,CAAC;AAErC,OAAO,EACL,2BAA2B,EAE5B,MAAM,mCAAmC,CAAC;AA+B3C,MAAM,cAAc,GAAG,IAAI,GAAG,EAA2B,CAAC;AAE1D,MAAM,MAAM,GAAG,QAAQ,CAAC,eAAe,CAAC;IACtC,KAAK,EAAE,OAAO,CAAC,KAAK;IACpB,SAAS,EAAE,MAAM,CAAC,iBAAiB;CACpC,CAAC,CAAC;AAEH,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;IACzB,KAAK,UAAU,CAAC,IAAI,CAAC,CAAC;AACxB,CAAC,CAAC,CAAC;AAEH,KAAK,UAAU,UAAU,CAAC,IAAY;IACpC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;IAE5B,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO;IACT,CAAC;IAED,IAAI,OAA0B,CAAC;IAE/B,IAAI,CAAC;QACH,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAsB,CAAC;IACrD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,aAAa,CAAC;YACZ,IAAI,EAAE,QAAQ;YACd,EAAE,EAAE,SAAS;YACb,EAAE,EAAE,KAAK;YACT,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,6BAA6B;SAC9E,CAAC,CAAC;QACH,OAAO;IACT,CAAC;IAED,IAAI,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC9B,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,KAAK,CAAC,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC,CAAC;QAC9E,OAAO;IACT,CAAC;IAED,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;IACzC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;IAE3C,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,2BAA2B,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;QACpG,aAAa,CAAC;YACZ,IAAI,EAAE,QAAQ;YACd,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,EAAE,EAAE,IAAI;YACR,MAAM;SACP,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,aAAa,CAAC;YACZ,IAAI,EAAE,QAAQ;YACd,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,EAAE,EAAE,KAAK;YACT,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,oBAAoB;SACrE,CAAC,CAAC;IACL,CAAC;YAAS,CAAC;QACT,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACpC,CAAC;AACH,CAAC;AAED,SAAS,aAAa,CAAC,OAA2B;IAChD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AACvD,CAAC"}
+{"version":3,"file":"task-helper-process.js","sourceRoot":"","sources":["../../../../src/modules/tasks/task-helper-process.ts"],"names":[],"mappings":"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"}

package/dist/server/modules/tasks/task-types.d.ts

@@ -10,6 +10,9 @@ export declare const HOST_TASK_TYPES: {
     readonly templateRuntimeStatusDiscovery: "terminal.template_runtime_status_discovery";
     readonly debugRuntimeStaleReconciliation: "debug_runtime.stale_reconciliation";
     readonly serviceNpmGlobalUpdateInstall: "service.npm_global_update_install";
+    readonly assistantAutomationTick: "assistant.automation.tick";
+    readonly assistantAutomationEvaluate: "assistant.automation.evaluate";
+    readonly verificationRunExecute: "butler.verification_run.execute";
 };
 export type HostTaskType = (typeof HOST_TASK_TYPES)[keyof typeof HOST_TASK_TYPES];
 export type TaskExecutionLane = "request_main_thread" | "host_background" | "helper_process" | "external_process";

package/dist/server/modules/tasks/task-types.js

@@ -9,7 +9,10 @@ export const HOST_TASK_TYPES = {
     terminalManagerSnapshot: "terminal.manager_snapshot",
     templateRuntimeStatusDiscovery: "terminal.template_runtime_status_discovery",
     debugRuntimeStaleReconciliation: "debug_runtime.stale_reconciliation",
-    serviceNpmGlobalUpdateInstall: "service.npm_global_update_install"
+    serviceNpmGlobalUpdateInstall: "service.npm_global_update_install",
+    assistantAutomationTick: "assistant.automation.tick",
+    assistantAutomationEvaluate: "assistant.automation.evaluate",
+    verificationRunExecute: "butler.verification_run.execute"
 };
 export class TaskCancelledError extends Error {
     constructor(message = "任务已取消") {

package/dist/server/modules/tasks/task-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"task-types.js","sourceRoot":"","sources":["../../../../src/modules/tasks/task-types.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,eAAe,GAAG;IAC7B,kBAAkB,EAAE,qBAAqB;IACzC,sBAAsB,EAAE,0BAA0B;IAClD,yBAAyB,EAAE,6BAA6B;IACxD,mBAAmB,EAAE,uBAAuB;IAC5C,0BAA0B,EAAE,8BAA8B;IAC1D,4BAA4B,EAAE,iCAAiC;IAC/D,kBAAkB,EAAE,sBAAsB;IAC1C,uBAAuB,EAAE,2BAA2B;IACpD,8BAA8B,EAAE,4CAA4C;IAC5E,+BAA+B,EAAE,oCAAoC;IACrE,6BAA6B,EAAE,mCAAmC;CAC1D,CAAC;AAkIX,MAAM,OAAO,kBAAmB,SAAQ,KAAK;IAC3C,YAAY,OAAO,GAAG,OAAO;QAC3B,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,oBAAoB,CAAC;IACnC,CAAC;CACF;AAED,MAAM,OAAO,gBAAiB,SAAQ,KAAK;IACzC,YAAY,OAAO,GAAG,QAAQ;QAC5B,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,kBAAkB,CAAC;IACjC,CAAC;CACF"}
+{"version":3,"file":"task-types.js","sourceRoot":"","sources":["../../../../src/modules/tasks/task-types.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,eAAe,GAAG;IAC7B,kBAAkB,EAAE,qBAAqB;IACzC,sBAAsB,EAAE,0BAA0B;IAClD,yBAAyB,EAAE,6BAA6B;IACxD,mBAAmB,EAAE,uBAAuB;IAC5C,0BAA0B,EAAE,8BAA8B;IAC1D,4BAA4B,EAAE,iCAAiC;IAC/D,kBAAkB,EAAE,sBAAsB;IAC1C,uBAAuB,EAAE,2BAA2B;IACpD,8BAA8B,EAAE,4CAA4C;IAC5E,+BAA+B,EAAE,oCAAoC;IACrE,6BAA6B,EAAE,mCAAmC;IAClE,uBAAuB,EAAE,2BAA2B;IACpD,2BAA2B,EAAE,+BAA+B;IAC5D,sBAAsB,EAAE,iCAAiC;CACjD,CAAC;AAkIX,MAAM,OAAO,kBAAmB,SAAQ,KAAK;IAC3C,YAAY,OAAO,GAAG,OAAO;QAC3B,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,oBAAoB,CAAC;IACnC,CAAC;CACF;AAED,MAAM,OAAO,gBAAiB,SAAQ,KAAK;IACzC,YAAY,OAAO,GAAG,QAAQ;QAC5B,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,kBAAkB,CAAC;IACjC,CAAC;CACF"}

package/dist/server/modules/terminal/command-template-service.d.ts

@@ -19,6 +19,9 @@ interface RunCommandTemplateInput {
     terminalId?: string;
     shell?: string;
     runtimeType?: TerminalRuntimeType | null;
+    argsOverride?: string[];
+    envPatch?: Record<string, string>;
+    portOverride?: number | null;
     userId: string;
 }
 export declare class CommandTemplateService {
@@ -28,6 +31,12 @@ export declare class CommandTemplateService {
     private readonly terminalService;
     constructor(db: Database.Database, templateRepository: TerminalCommandTemplateRepository, workspaceService: WorkspaceService, terminalService: TerminalService);
     listTemplates(workspaceId: string): TerminalCommandTemplate[];
+    cloneTemplatesToWorkspace(input: {
+        sourceWorkspaceId: string;
+        targetWorkspaceId: string;
+        sourceWorkspacePath: string;
+        targetWorkspacePath: string;
+    }): TerminalCommandTemplate[];
     listTemplateRuntimeStatuses(workspaceId: string, signal?: AbortSignal): Promise<import("../../types/domain.js").TerminalTemplateRuntimeStatus[]>;
     listTemplateRuntimeStatusesByItems(items: Array<{
         templateId: string;

package/dist/server/modules/terminal/command-template-service.js

@@ -1,4 +1,5 @@
 import { randomBytes } from "node:crypto";
+import path from "node:path";
 import { AppError } from "../../shared/errors/app-error.js";
 import { createId } from "../../shared/utils/id.js";
 import { nowIso } from "../../shared/utils/time.js";
@@ -20,6 +21,53 @@ export class CommandTemplateService {
         this.workspaceService.getWorkspaceOrThrow(workspaceId);
         return this.templateRepository.listByWorkspace(workspaceId);
     }
+    cloneTemplatesToWorkspace(input) {
+        this.workspaceService.getWorkspaceOrThrow(input.sourceWorkspaceId);
+        this.workspaceService.getWorkspaceOrThrow(input.targetWorkspaceId);
+        const sourceTemplates = this.templateRepository
+            .listByWorkspace(input.sourceWorkspaceId)
+            .filter(shouldCloneToWorktree);
+        if (sourceTemplates.length === 0) {
+            return [];
+        }
+        const timestamp = nowIso();
+        const clonedTemplates = sourceTemplates.map((template) => buildValidatedTemplate({
+            id: createId(),
+            workspaceId: input.targetWorkspaceId,
+            name: template.name,
+            cwd: resolveInheritedTemplateCwd(template.cwd, input.sourceWorkspacePath, input.targetWorkspacePath),
+            command: template.command,
+            args: [...template.args],
+            env: { ...template.env },
+            port: template.port,
+            proxyEnabled: template.proxyEnabled,
+            proxySlug: template.proxyEnabled ? this.createUniqueProxySlug() : null,
+            runtimeType: template.runtimeType,
+            createdAt: timestamp,
+            updatedAt: timestamp,
+            sourceType: template.sourceType ?? "manual",
+            debugTargetId: template.debugTargetId ?? null,
+            debugServiceId: template.debugServiceId ?? null,
+            frameworkAnalysisId: template.frameworkAnalysisId ?? null,
+            adapterKind: template.adapterKind ?? null,
+            injectionMode: template.injectionMode ?? null,
+            generatedArtifactRef: template.generatedArtifactRef ?? null,
+            serviceDiscoveryMode: template.serviceDiscoveryMode ?? null,
+            managedBySystem: template.managedBySystem === true
+        }));
+        const persist = this.db.transaction(() => {
+            for (const template of clonedTemplates) {
+                this.templateRepository.create(template);
+            }
+        });
+        try {
+            persist();
+        }
+        catch (error) {
+            throw mapTemplateStorageError(error);
+        }
+        return clonedTemplates;
+    }
     async listTemplateRuntimeStatuses(workspaceId, signal) {
         return await this.listTemplateRuntimeStatusesByItems(this.listTemplates(workspaceId)
             .filter((template) => template.port !== null)
@@ -159,6 +207,15 @@ export class CommandTemplateService {
     }
     async runTemplate(input) {
         const template = this.getTemplateOrThrow(input.templateId);
+        const effectiveTemplate = {
+            ...template,
+            args: input.argsOverride ?? template.args,
+            env: {
+                ...template.env,
+                ...(input.envPatch ?? {})
+            },
+            port: input.portOverride === undefined ? template.port : input.portOverride
+        };
         let targetTerminalId = input.terminalId ?? null;
         let createdTerminal = false;
         if (targetTerminalId) {
@@ -176,21 +233,21 @@ export class CommandTemplateService {
             const terminal = await this.terminalService.createTerminal({
                 workspaceId: template.workspaceId,
                 name: `${template.name} 运行`,
-                cwd: template.cwd,
+                cwd: effectiveTemplate.cwd,
                 shell: input.shell,
-                runtimeType: input.runtimeType ?? template.runtimeType ?? undefined,
+                runtimeType: input.runtimeType ?? effectiveTemplate.runtimeType ?? undefined,
                 createdByUserId: input.userId,
-                env: template.env
+                env: effectiveTemplate.env
             });
             targetTerminalId = terminal.id;
             createdTerminal = true;
         }
         const terminal = this.terminalService.getTerminalOrThrow(targetTerminalId);
-        const commandLine = buildTemplateCommandLine(template, terminal.shell);
+        const commandLine = buildTemplateCommandLine(effectiveTemplate, terminal.shell);
         await this.terminalService.writeInput(targetTerminalId, `${commandLine}${getShellEnterSequence(terminal.shell)}`);
         return {
             terminalId: targetTerminalId,
-            templateId: template.id,
+            templateId: effectiveTemplate.id,
             createdTerminal
         };
     }
@@ -313,6 +370,31 @@ function normalizePort(input) {
 function containsControlCharacter(input) {
     return input.includes("\0") || input.includes("\n") || input.includes("\r");
 }
+function shouldCloneToWorktree(template) {
+    if (template.managedBySystem === true) {
+        return false;
+    }
+    if (template.sourceType === "debug_service") {
+        return false;
+    }
+    return true;
+}
+function resolveInheritedTemplateCwd(templateCwd, sourceWorkspacePath, targetWorkspacePath) {
+    const normalizedSourcePath = stripTrailingSeparators(path.resolve(sourceWorkspacePath));
+    const normalizedTargetPath = stripTrailingSeparators(path.resolve(targetWorkspacePath));
+    const normalizedTemplateCwd = path.resolve(templateCwd);
+    if (normalizedTemplateCwd === normalizedSourcePath) {
+        return normalizedTargetPath;
+    }
+    const relativePath = path.relative(normalizedSourcePath, normalizedTemplateCwd);
+    if (!relativePath || relativePath.startsWith("..") || path.isAbsolute(relativePath)) {
+        return templateCwd;
+    }
+    return path.join(normalizedTargetPath, relativePath);
+}
+function stripTrailingSeparators(input) {
+    return input.replace(/[\\/]+$/, "");
+}
 function mapTemplateStorageError(error) {
     if (error instanceof AppError) {
         return error;