factory-factory 0.3.17 → 0.3.19

package/dist/src/backend/services/run-script/service/run-script-output-buffer.js

@@ -0,0 +1,62 @@
+export class RunScriptOutputBuffer {
+    maxBufferSize;
+    buffers = new Map();
+    listeners = new Map();
+    constructor(maxBufferSize) {
+        this.maxBufferSize = maxBufferSize;
+    }
+    set(workspaceId, output) {
+        this.buffers.set(workspaceId, this.truncate(output));
+    }
+    append(workspaceId, output) {
+        const currentBuffer = this.buffers.get(workspaceId) ?? '';
+        this.buffers.set(workspaceId, this.truncate(currentBuffer + output));
+        const listeners = this.listeners.get(workspaceId);
+        if (listeners) {
+            for (const listener of listeners) {
+                listener(output);
+            }
+        }
+    }
+    get(workspaceId) {
+        return this.buffers.get(workspaceId) ?? '';
+    }
+    clearBuffer(workspaceId) {
+        this.buffers.delete(workspaceId);
+    }
+    clearListeners(workspaceId) {
+        this.listeners.delete(workspaceId);
+    }
+    subscribe(workspaceId, listener) {
+        let listeners = this.listeners.get(workspaceId);
+        if (!listeners) {
+            listeners = new Set();
+            this.listeners.set(workspaceId, listeners);
+        }
+        listeners.add(listener);
+        return () => {
+            const currentListeners = this.listeners.get(workspaceId);
+            if (currentListeners) {
+                currentListeners.delete(listener);
+                if (currentListeners.size === 0) {
+                    this.listeners.delete(workspaceId);
+                }
+            }
+        };
+    }
+    evict(workspaceId) {
+        this.buffers.delete(workspaceId);
+        this.listeners.delete(workspaceId);
+    }
+    clear() {
+        this.buffers.clear();
+        this.listeners.clear();
+    }
+    truncate(output) {
+        if (output.length <= this.maxBufferSize) {
+            return output;
+        }
+        return output.slice(-this.maxBufferSize);
+    }
+}
+//# sourceMappingURL=run-script-output-buffer.js.map

package/dist/src/backend/services/run-script/service/run-script-output-buffer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"run-script-output-buffer.js","sourceRoot":"","sources":["../../../../../../src/backend/services/run-script/service/run-script-output-buffer.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,qBAAqB;IAIH;IAHZ,OAAO,GAAG,IAAI,GAAG,EAAkB,CAAC;IACpC,SAAS,GAAG,IAAI,GAAG,EAAuC,CAAC;IAE5E,YAA6B,aAAqB;QAArB,kBAAa,GAAb,aAAa,CAAQ;IAAG,CAAC;IAEtD,GAAG,CAAC,WAAmB,EAAE,MAAc;QACrC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;IACvD,CAAC;IAED,MAAM,CAAC,WAAmB,EAAE,MAAc;QACxC,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;QAC1D,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,QAAQ,CAAC,aAAa,GAAG,MAAM,CAAC,CAAC,CAAC;QAErE,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAClD,IAAI,SAAS,EAAE,CAAC;YACd,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;gBACjC,QAAQ,CAAC,MAAM,CAAC,CAAC;YACnB,CAAC;QACH,CAAC;IACH,CAAC;IAED,GAAG,CAAC,WAAmB;QACrB,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;IAC7C,CAAC;IAED,WAAW,CAAC,WAAmB;QAC7B,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IACnC,CAAC;IAED,cAAc,CAAC,WAAmB;QAChC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IACrC,CAAC;IAED,SAAS,CAAC,WAAmB,EAAE,QAAgC;QAC7D,IAAI,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAChD,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,SAAS,GAAG,IAAI,GAAG,EAAE,CAAC;YACtB,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;QAC7C,CAAC;QACD,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAExB,OAAO,GAAG,EAAE;YACV,MAAM,gBAAgB,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YACzD,IAAI,gBAAgB,EAAE,CAAC;gBACrB,gBAAgB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;gBAClC,IAAI,gBAAgB,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;oBAChC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;gBACrC,CAAC;YACH,CAAC;QACH,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,WAAmB;QACvB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QACjC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IACrC,CAAC;IAED,KAAK;QACH,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QACrB,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;IACzB,CAAC;IAEO,QAAQ,CAAC,MAAc;QAC7B,IAAI,MAAM,CAAC,MAAM,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACxC,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC3C,CAAC;CACF"}

package/dist/src/backend/services/run-script/service/run-script-output-buffer.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=run-script-output-buffer.test.d.ts.map

package/dist/src/backend/services/run-script/service/run-script-output-buffer.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"run-script-output-buffer.test.d.ts","sourceRoot":"","sources":["../../../../../../src/backend/services/run-script/service/run-script-output-buffer.test.ts"],"names":[],"mappings":""}

package/dist/src/backend/services/run-script/service/run-script-output-buffer.test.js

@@ -0,0 +1,25 @@
+import { describe, expect, it, vi } from 'vitest';
+import { RunScriptOutputBuffer } from './run-script-output-buffer.js';
+describe('RunScriptOutputBuffer', () => {
+    it('clears a workspace buffer without dropping listeners', () => {
+        const buffer = new RunScriptOutputBuffer(1024);
+        const listener = vi.fn();
+        buffer.set('ws-1', 'old logs');
+        buffer.subscribe('ws-1', listener);
+        buffer.clearBuffer('ws-1');
+        buffer.append('ws-1', 'new logs');
+        expect(buffer.get('ws-1')).toBe('new logs');
+        expect(listener).toHaveBeenCalledWith('new logs');
+    });
+    it('evicts a workspace buffer and its listeners', () => {
+        const buffer = new RunScriptOutputBuffer(1024);
+        const listener = vi.fn();
+        buffer.set('ws-1', 'old logs');
+        buffer.subscribe('ws-1', listener);
+        buffer.evict('ws-1');
+        buffer.append('ws-1', 'new logs');
+        expect(buffer.get('ws-1')).toBe('new logs');
+        expect(listener).not.toHaveBeenCalled();
+    });
+});
+//# sourceMappingURL=run-script-output-buffer.test.js.map

package/dist/src/backend/services/run-script/service/run-script-output-buffer.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"run-script-output-buffer.test.js","sourceRoot":"","sources":["../../../../../../src/backend/services/run-script/service/run-script-output-buffer.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAClD,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAEnE,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;IACrC,EAAE,CAAC,sDAAsD,EAAE,GAAG,EAAE;QAC9D,MAAM,MAAM,GAAG,IAAI,qBAAqB,CAAC,IAAI,CAAC,CAAC;QAC/C,MAAM,QAAQ,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;QACzB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QAC/B,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAEnC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAC3B,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QAElC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC5C,MAAM,CAAC,QAAQ,CAAC,CAAC,oBAAoB,CAAC,UAAU,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6CAA6C,EAAE,GAAG,EAAE;QACrD,MAAM,MAAM,GAAG,IAAI,qBAAqB,CAAC,IAAI,CAAC,CAAC;QAC/C,MAAM,QAAQ,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;QACzB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QAC/B,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAEnC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACrB,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QAElC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC5C,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;IAC1C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/src/backend/services/run-script/service/run-script-process-utils.d.ts

@@ -0,0 +1,19 @@
+import type { ChildProcess } from 'node:child_process';
+import type { createLogger } from '../../../../backend/services/logger.service.js';
+import type { RunScriptStatus } from '../../../../shared/core/index.js';
+type Logger = ReturnType<typeof createLogger>;
+export declare function shouldRejectStopWithoutProcess(status: RunScriptStatus, childProcess: ChildProcess | undefined, pid: number | null): boolean;
+export declare function runCleanupScriptProcess(workspaceId: string, workspace: {
+    runScriptCleanupCommand: string;
+    worktreePath: string;
+    runScriptPort: number | null;
+}, logger: Logger): Promise<void>;
+export declare function treeKillProcess(targetPid: number, signal: NodeJS.Signals, onError: (message: string, code?: string) => void, onComplete: () => void): Promise<void>;
+export declare function waitForChildProcessExit(params: {
+    workspaceId: string;
+    childProcess: ChildProcess | undefined;
+    pid: number | null;
+    logger: Logger;
+}): Promise<void>;
+export {};
+//# sourceMappingURL=run-script-process-utils.d.ts.map

package/dist/src/backend/services/run-script/service/run-script-process-utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"run-script-process-utils.d.ts","sourceRoot":"","sources":["../../../../../../src/backend/services/run-script/service/run-script-process-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAKvD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAErD,KAAK,MAAM,GAAG,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC;AAE9C,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,eAAe,EACvB,YAAY,EAAE,YAAY,GAAG,SAAS,EACtC,GAAG,EAAE,MAAM,GAAG,IAAI,GACjB,OAAO,CAKT;AAED,wBAAsB,uBAAuB,CAC3C,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE;IACT,uBAAuB,EAAE,MAAM,CAAC;IAChC,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B,EACD,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC,CA0Cf;AAED,wBAAsB,eAAe,CACnC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,CAAC,OAAO,EACtB,OAAO,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,KAAK,IAAI,EACjD,UAAU,EAAE,MAAM,IAAI,GACrB,OAAO,CAAC,IAAI,CAAC,CAUf;AAED,wBAAsB,uBAAuB,CAAC,MAAM,EAAE;IACpD,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,YAAY,GAAG,SAAS,CAAC;IACvC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC,IAAI,CAAC,CAsDhB"}

package/dist/src/backend/services/run-script/service/run-script-process-utils.js

@@ -0,0 +1,105 @@
+import { spawn } from 'node:child_process';
+import treeKill from 'tree-kill';
+import { toError } from '../../../../backend/lib/error-utils.js';
+import { FactoryConfigService } from '../../../../backend/services/factory-config.service.js';
+export function shouldRejectStopWithoutProcess(status, childProcess, pid) {
+    if (childProcess || pid) {
+        return false;
+    }
+    return status !== 'STARTING';
+}
+export async function runCleanupScriptProcess(workspaceId, workspace, logger) {
+    logger.info('Running cleanup script before stopping', {
+        workspaceId,
+        cleanupCommand: workspace.runScriptCleanupCommand,
+    });
+    try {
+        const cleanupCommand = workspace.runScriptPort
+            ? FactoryConfigService.substitutePort(workspace.runScriptCleanupCommand, workspace.runScriptPort)
+            : workspace.runScriptCleanupCommand;
+        const cleanupProcess = spawn('bash', ['-c', cleanupCommand], {
+            cwd: workspace.worktreePath,
+            detached: false,
+            stdio: 'ignore',
+        });
+        await new Promise((resolve) => {
+            const timeout = setTimeout(() => {
+                logger.warn('Cleanup script timed out, proceeding anyway', { workspaceId });
+                cleanupProcess.kill('SIGTERM');
+                resolve();
+            }, 5000);
+            cleanupProcess.on('exit', (code) => {
+                clearTimeout(timeout);
+                logger.info('Cleanup script completed', { workspaceId, exitCode: code });
+                resolve();
+            });
+            cleanupProcess.on('error', (error) => {
+                clearTimeout(timeout);
+                logger.error('Cleanup script error', error, { workspaceId });
+                resolve();
+            });
+        });
+    }
+    catch (error) {
+        logger.error('Failed to run cleanup script', toError(error), { workspaceId });
+    }
+}
+export async function treeKillProcess(targetPid, signal, onError, onComplete) {
+    await new Promise((resolve) => {
+        treeKill(targetPid, signal, (err) => {
+            if (err) {
+                onError(err.message, err.code);
+            }
+            onComplete();
+            resolve();
+        });
+    });
+}
+export async function waitForChildProcessExit(params) {
+    const { workspaceId, childProcess, pid, logger } = params;
+    if (!childProcess) {
+        return;
+    }
+    if (childProcess.exitCode !== null) {
+        return;
+    }
+    if (typeof childProcess.once !== 'function' || typeof childProcess.off !== 'function') {
+        return;
+    }
+    const waitPid = childProcess.pid ?? pid ?? undefined;
+    await new Promise((resolve) => {
+        const timeout = setTimeout(() => {
+            cleanup();
+            logger.warn('Timed out waiting for run script process exit after stop', {
+                workspaceId,
+                pid: waitPid,
+            });
+            resolve();
+        }, 10_000);
+        const cleanup = () => {
+            clearTimeout(timeout);
+            childProcess.off('exit', onExit);
+            childProcess.off('error', onError);
+        };
+        const onExit = () => {
+            cleanup();
+            resolve();
+        };
+        const onError = (error) => {
+            cleanup();
+            logger.warn('Run script process emitted error while waiting for exit', {
+                workspaceId,
+                pid: waitPid,
+                error,
+            });
+            resolve();
+        };
+        childProcess.once('exit', onExit);
+        childProcess.once('error', onError);
+        if (childProcess.exitCode !== null) {
+            cleanup();
+            resolve();
+        }
+    });
+}
+//# sourceMappingURL=run-script-process-utils.js.map

package/dist/src/backend/services/run-script/service/run-script-process-utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"run-script-process-utils.js","sourceRoot":"","sources":["../../../../../../src/backend/services/run-script/service/run-script-process-utils.ts"],"names":[],"mappings":"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"}

package/dist/src/backend/services/run-script/service/run-script.service.d.ts

@@ -1,11 +1,8 @@
-import type { RunScriptStatus } from '../../../../shared/core/index.js';
 export declare class RunScriptService {
     private readonly runningProcesses;
     private readonly postRunProcesses;
-    private readonly outputBuffers;
-    private readonly outputListeners;
-    private readonly postRunOutputBuffers;
-    private readonly postRunOutputListeners;
+    private readonly runOutput;
+    private readonly postRunOutput;
     private isShuttingDown;
     private shutdownHandlersRegistered;
     startRunScript(workspaceId: string): Promise<{
@@ -37,7 +34,7 @@ export declare class RunScriptService {
     private killProcessTree;
     private waitForProcessExit;
     getRunScriptStatus(workspaceId: string): Promise<{
-        status: RunScriptStatus;
+        status: import("../../../../shared/core/index.js").RunScriptStatus;
         pid: number | null;
         port: number | null;
         proxyUrl: string | null;

package/dist/src/backend/services/run-script/service/run-script.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run-script.service.d.ts","sourceRoot":"","sources":["../../../../../../src/backend/services/run-script/service/run-script.service.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAsBrD,qBAAa,gBAAgB;IAE3B,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAmC;IAGpE,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAmC;IAGpE,OAAO,CAAC,QAAQ,CAAC,aAAa,CAA6B;IAG3D,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAkD;IAGlF,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAA6B;IAGlE,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAkD;IAGzF,OAAO,CAAC,cAAc,CAAS;IAG/B,OAAO,CAAC,0BAA0B,CAAS;IAOrC,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC;QACjD,OAAO,EAAE,OAAO,CAAC;QACjB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC;IAwFF,OAAO,CAAC,0BAA0B;IAelC,OAAO,CAAC,uBAAuB;YA+CjB,iBAAiB;IAqE/B,OAAO,CAAC,YAAY;IAkBpB,OAAO,CAAC,mBAAmB;YAkBb,mBAAmB;YAqCnB,4BAA4B;YA0B5B,qBAAqB;YAqCrB,gBAAgB;IA6BxB,aAAa,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC;QAChD,OAAO,EAAE,OAAO,CAAC;QACjB,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC;YAuFY,uBAAuB;YAwBvB,oBAAoB;YAwBpB,yBAAyB;YAgBzB,gBAAgB;YA0DhB,kBAAkB;YA8DlB,kBAAkB;YAiClB,eAAe;YAsCf,kBAAkB;IA8D1B,kBAAkB,CAAC,WAAW,EAAE,MAAM;;;;;;;;;;;IA+B5C,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM;IAQ5C,qBAAqB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAWhD,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAAG,MAAM,IAAI;IAuBpF,sBAAsB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM;IAQnD,wBAAwB,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAAG,MAAM,IAAI;IAsBrF,OAAO;IAkCb,WAAW;IAyCX,wBAAwB,IAAI,IAAI;CAoCjC;AAED,wBAAgB,sBAAsB,CACpC,OAAO,GAAE;IAAE,wBAAwB,CAAC,EAAE,OAAO,CAAA;CAAO,GACnD,gBAAgB,CAMlB"}
+{"version":3,"file":"run-script.service.d.ts","sourceRoot":"","sources":["../../../../../../src/backend/services/run-script/service/run-script.service.ts"],"names":[],"mappings":"AAwBA,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAmC;IACpE,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAmC;IAEpE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAqD;IAC/E,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAqD;IAEnF,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,0BAA0B,CAAS;IAOrC,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC;QACjD,OAAO,EAAE,OAAO,CAAC;QACjB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC;IAwFF,OAAO,CAAC,0BAA0B;IAelC,OAAO,CAAC,uBAAuB;YA+CjB,iBAAiB;IAqE/B,OAAO,CAAC,YAAY;IAIpB,OAAO,CAAC,mBAAmB;YAIb,mBAAmB;YAqCnB,4BAA4B;YA0B5B,qBAAqB;YAqCrB,gBAAgB;IA6BxB,aAAa,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC;QAChD,OAAO,EAAE,OAAO,CAAC;QACjB,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC;YAuFY,uBAAuB;YAwBvB,oBAAoB;YAwBpB,yBAAyB;YAgBzB,gBAAgB;YAWhB,kBAAkB;YA8DlB,kBAAkB;YA8BlB,eAAe;YAmCf,kBAAkB;IAW1B,kBAAkB,CAAC,WAAW,EAAE,MAAM;;;;;;;;;;;IA+B5C,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM;IAQ5C,qBAAqB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAShD,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAAG,MAAM,IAAI;IAOpF,sBAAsB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM;IAQnD,wBAAwB,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAAG,MAAM,IAAI;IAOrF,OAAO;IAkCb,WAAW;IAuCX,wBAAwB,IAAI,IAAI;CAoCjC;AAED,wBAAgB,sBAAsB,CACpC,OAAO,GAAE;IAAE,wBAAwB,CAAC,EAAE,OAAO,CAAA;CAAO,GACnD,gBAAgB,CAMlB"}

package/dist/src/backend/services/run-script/service/run-script.service.js

@@ -1,5 +1,4 @@
 import { spawn } from 'node:child_process';
-import treeKill from 'tree-kill';
 import { toError } from '../../../../backend/lib/error-utils.js';
 import { FactoryConfigService } from '../../../../backend/services/factory-config.service.js';
 import { createLogger } from '../../../../backend/services/logger.service.js';
@@ -7,22 +6,16 @@ import { PortAllocationService } from '../../../../backend/services/port-allocat
 import { runScriptConfigPersistenceService, } from '../../../../backend/services/run-script-config-persistence.service.js';
 import { runScriptProxyService } from '../../../../backend/services/run-script-proxy.service.js';
 import { workspaceAccessor } from '../../../../backend/services/workspace/index.js';
+import { RunScriptOutputBuffer } from './run-script-output-buffer.js';
+import { runCleanupScriptProcess, shouldRejectStopWithoutProcess, treeKillProcess, waitForChildProcessExit, } from './run-script-process-utils.js';
 import { runScriptStateMachine } from './run-script-state-machine.service.js';
 const logger = createLogger('run-script-service');
 const MAX_OUTPUT_BUFFER_SIZE = 500 * 1024;
-function shouldRejectStopWithoutProcess(status, childProcess, pid) {
-    if (childProcess || pid) {
-        return false;
-    }
-    return status !== 'STARTING';
-}
 export class RunScriptService {
     runningProcesses = new Map();
     postRunProcesses = new Map();
-    outputBuffers = new Map();
-    outputListeners = new Map();
-    postRunOutputBuffers = new Map();
-    postRunOutputListeners = new Map();
+    runOutput = new RunScriptOutputBuffer(MAX_OUTPUT_BUFFER_SIZE);
+    postRunOutput = new RunScriptOutputBuffer(MAX_OUTPUT_BUFFER_SIZE);
     isShuttingDown = false;
     shutdownHandlersRegistered = false;
     async startRunScript(workspaceId) {
@@ -74,8 +67,8 @@ export class RunScriptService {
             }
             this.runningProcesses.set(workspaceId, childProcess);
             const startMessage = `\x1b[36m[Factory Factory]\x1b[0m Starting ${command}\n\n`;
-            this.outputBuffers.set(workspaceId, startMessage);
-            this.postRunOutputBuffers.delete(workspaceId);
+            this.runOutput.set(workspaceId, startMessage);
+            this.postRunOutput.clearBuffer(workspaceId);
             this.registerProcessHandlers(workspaceId, childProcess, pid);
             return await this.transitionToRunning(workspaceId, childProcess, pid, port, commands.runScriptPostRunCommand, workspace.worktreePath);
         }
@@ -137,7 +130,7 @@ export class RunScriptService {
             return;
         }
         this.runningProcesses.delete(workspaceId);
-        this.outputListeners.delete(workspaceId);
+        this.runOutput.clearListeners(workspaceId);
         await this.killPostRunProcess(workspaceId);
         await runScriptProxyService.stopTunnel(workspaceId);
         try {
@@ -176,32 +169,10 @@ export class RunScriptService {
         }
     }
     appendOutput(workspaceId, output) {
-        const currentBuffer = this.outputBuffers.get(workspaceId) ?? '';
-        let newBuffer = currentBuffer + output;
-        if (newBuffer.length > MAX_OUTPUT_BUFFER_SIZE) {
-            newBuffer = newBuffer.slice(-MAX_OUTPUT_BUFFER_SIZE);
-        }
-        this.outputBuffers.set(workspaceId, newBuffer);
-        const listeners = this.outputListeners.get(workspaceId);
-        if (listeners) {
-            for (const listener of listeners) {
-                listener(output);
-            }
-        }
+        this.runOutput.append(workspaceId, output);
     }
     appendPostRunOutput(workspaceId, output) {
-        const currentBuffer = this.postRunOutputBuffers.get(workspaceId) ?? '';
-        let newBuffer = currentBuffer + output;
-        if (newBuffer.length > MAX_OUTPUT_BUFFER_SIZE) {
-            newBuffer = newBuffer.slice(-MAX_OUTPUT_BUFFER_SIZE);
-        }
-        this.postRunOutputBuffers.set(workspaceId, newBuffer);
-        const listeners = this.postRunOutputListeners.get(workspaceId);
-        if (listeners) {
-            for (const listener of listeners) {
-                listener(output);
-            }
-        }
+        this.postRunOutput.append(workspaceId, output);
     }
     async transitionToRunning(workspaceId, childProcess, pid, port, runScriptPostRunCommand = null, worktreePath = null) {
         try {
@@ -406,46 +377,7 @@ export class RunScriptService {
         }
     }
     async runCleanupScript(workspaceId, workspace) {
-        logger.info('Running cleanup script before stopping', {
-            workspaceId,
-            cleanupCommand: workspace.runScriptCleanupCommand,
-        });
-        try {
-            const cleanupCommand = workspace.runScriptPort
-                ? FactoryConfigService.substitutePort(workspace.runScriptCleanupCommand, workspace.runScriptPort)
-                : workspace.runScriptCleanupCommand;
-            const cleanupProcess = spawn('bash', ['-c', cleanupCommand], {
-                cwd: workspace.worktreePath,
-                detached: false,
-                stdio: ['ignore', 'pipe', 'pipe'],
-            });
-            cleanupProcess.stdout?.on('error', (error) => {
-                logger.warn('Cleanup script stdout stream error', { workspaceId, error });
-            });
-            cleanupProcess.stderr?.on('error', (error) => {
-                logger.warn('Cleanup script stderr stream error', { workspaceId, error });
-            });
-            await new Promise((resolve) => {
-                const timeout = setTimeout(() => {
-                    logger.warn('Cleanup script timed out, proceeding anyway', { workspaceId });
-                    cleanupProcess.kill('SIGTERM');
-                    resolve();
-                }, 5000);
-                cleanupProcess.on('exit', (code) => {
-                    clearTimeout(timeout);
-                    logger.info('Cleanup script completed', { workspaceId, exitCode: code });
-                    resolve();
-                });
-                cleanupProcess.on('error', (error) => {
-                    clearTimeout(timeout);
-                    logger.error('Cleanup script error', error, { workspaceId });
-                    resolve();
-                });
-            });
-        }
-        catch (error) {
-            logger.error('Failed to run cleanup script', toError(error), { workspaceId });
-        }
+        await runCleanupScriptProcess(workspaceId, workspace, logger);
     }
     async spawnPostRunScript(workspaceId, runScriptPostRunCommand, worktreePath, port) {
         await Promise.resolve();
@@ -503,23 +435,15 @@ export class RunScriptService {
             return;
         }
         logger.info('Stopping postRun process', { workspaceId, pid: postRunPid });
-        await new Promise((resolve) => {
-            treeKill(postRunPid, 'SIGTERM', (err) => {
-                if (err) {
-                    const errorCode = err.code;
-                    const message = err.message;
-                    if (errorCode !== 'ESRCH' && !message.includes('No such process')) {
-                        logger.warn('Failed to tree-kill postRun process', {
-                            workspaceId,
-                            pid: postRunPid,
-                            error: message,
-                        });
-                    }
-                }
-                this.postRunProcesses.delete(workspaceId);
-                resolve();
-            });
-        });
+        await treeKillProcess(postRunPid, 'SIGTERM', (message, errorCode) => {
+            if (errorCode !== 'ESRCH' && !message.includes('No such process')) {
+                logger.warn('Failed to tree-kill postRun process', {
+                    workspaceId,
+                    pid: postRunPid,
+                    error: message,
+                });
+            }
+        }, () => this.postRunProcesses.delete(workspaceId));
     }
     async killProcessTree(workspaceId, childProcess, pid) {
         const targetPid = childProcess?.pid ?? pid;
@@ -528,76 +452,24 @@ export class RunScriptService {
         }
         const source = childProcess?.pid ? 'stored process' : 'PID';
         logger.info(`Stopping run script via ${source}`, { workspaceId, pid: targetPid });
-        await new Promise((resolve) => {
-            treeKill(targetPid, 'SIGTERM', (err) => {
-                if (err) {
-                    const errorCode = err.code;
-                    const message = err.message;
-                    if (errorCode === 'ESRCH' || message.includes('No such process')) {
-                        logger.debug('Run script process already exited before tree-kill', {
-                            workspaceId,
-                            pid: targetPid,
-                            error: message,
-                        });
-                    }
-                    else {
-                        logger.warn('Failed to tree-kill run script process', {
-                            workspaceId,
-                            pid: targetPid,
-                            error: message,
-                        });
-                    }
-                }
-                this.runningProcesses.delete(workspaceId);
-                resolve();
-            });
-        });
-    }
-    async waitForProcessExit(workspaceId, childProcess, pid) {
-        if (!childProcess) {
-            return;
-        }
-        if (childProcess.exitCode !== null) {
-            return;
-        }
-        if (typeof childProcess.once !== 'function' || typeof childProcess.off !== 'function') {
-            return;
-        }
-        const waitPid = childProcess.pid ?? pid ?? undefined;
-        await new Promise((resolve) => {
-            const timeout = setTimeout(() => {
-                cleanup();
-                logger.warn('Timed out waiting for run script process exit after stop', {
+        await treeKillProcess(targetPid, 'SIGTERM', (message, errorCode) => {
+            if (errorCode === 'ESRCH' || message.includes('No such process')) {
+                logger.debug('Run script process already exited before tree-kill', {
                     workspaceId,
-                    pid: waitPid,
-                });
-                resolve();
-            }, 10_000);
-            const cleanup = () => {
-                clearTimeout(timeout);
-                childProcess.off('exit', onExit);
-                childProcess.off('error', onError);
-            };
-            const onExit = () => {
-                cleanup();
-                resolve();
-            };
-            const onError = (error) => {
-                cleanup();
-                logger.warn('Run script process emitted error while waiting for exit', {
-                    workspaceId,
-                    pid: waitPid,
-                    error,
+                    pid: targetPid,
+                    error: message,
                 });
-                resolve();
-            };
-            childProcess.once('exit', onExit);
-            childProcess.once('error', onError);
-            if (childProcess.exitCode !== null) {
-                cleanup();
-                resolve();
+                return;
             }
-        });
+            logger.warn('Failed to tree-kill run script process', {
+                workspaceId,
+                pid: targetPid,
+                error: message,
+            });
+        }, () => this.runningProcesses.delete(workspaceId));
+    }
+    async waitForProcessExit(workspaceId, childProcess, pid) {
+        await waitForChildProcessExit({ workspaceId, childProcess, pid, logger });
     }
     async getRunScriptStatus(workspaceId) {
         const workspace = await workspaceAccessor.findById(workspaceId);
@@ -622,50 +494,20 @@ export class RunScriptService {
         };
     }
     getOutputBuffer(workspaceId) {
-        return this.outputBuffers.get(workspaceId) ?? '';
+        return this.runOutput.get(workspaceId);
     }
     evictWorkspaceBuffers(workspaceId) {
-        this.outputBuffers.delete(workspaceId);
-        this.outputListeners.delete(workspaceId);
-        this.postRunOutputBuffers.delete(workspaceId);
-        this.postRunOutputListeners.delete(workspaceId);
+        this.runOutput.evict(workspaceId);
+        this.postRunOutput.evict(workspaceId);
     }
     subscribeToOutput(workspaceId, listener) {
-        let listeners = this.outputListeners.get(workspaceId);
-        if (!listeners) {
-            listeners = new Set();
-            this.outputListeners.set(workspaceId, listeners);
-        }
-        listeners.add(listener);
-        return () => {
-            const listeners = this.outputListeners.get(workspaceId);
-            if (listeners) {
-                listeners.delete(listener);
-                if (listeners.size === 0) {
-                    this.outputListeners.delete(workspaceId);
-                }
-            }
-        };
+        return this.runOutput.subscribe(workspaceId, listener);
     }
     getPostRunOutputBuffer(workspaceId) {
-        return this.postRunOutputBuffers.get(workspaceId) ?? '';
+        return this.postRunOutput.get(workspaceId);
     }
     subscribeToPostRunOutput(workspaceId, listener) {
-        let listeners = this.postRunOutputListeners.get(workspaceId);
-        if (!listeners) {
-            listeners = new Set();
-            this.postRunOutputListeners.set(workspaceId, listeners);
-        }
-        listeners.add(listener);
-        return () => {
-            const listeners = this.postRunOutputListeners.get(workspaceId);
-            if (listeners) {
-                listeners.delete(listener);
-                if (listeners.size === 0) {
-                    this.postRunOutputListeners.delete(workspaceId);
-                }
-            }
-        };
+        return this.postRunOutput.subscribe(workspaceId, listener);
     }
     async cleanup() {
         logger.info('Cleaning up all running scripts', {
@@ -717,10 +559,8 @@ export class RunScriptService {
         }
         this.postRunProcesses.clear();
         runScriptProxyService.cleanupSync();
-        this.outputBuffers.clear();
-        this.outputListeners.clear();
-        this.postRunOutputBuffers.clear();
-        this.postRunOutputListeners.clear();
+        this.runOutput.clear();
+        this.postRunOutput.clear();
     }
     registerShutdownHandlers() {
         if (this.shutdownHandlersRegistered) {