@1mcp/agent 0.35.0-beta.1 → 0.35.0-beta.3

package/build/core/server/backgroundRuntimeSupervisor.js

@@ -0,0 +1,252 @@
+import { spawn } from 'child_process';
+import { writeBackgroundSupervisorState, } from '../../core/server/backgroundRuntimeSupervisorState.js';
+export * from '../../core/server/backgroundRuntimeSupervisorState.js';
+export const BACKGROUND_RESTART_DELAYS_MS = [1_000, 2_000, 4_000, 8_000, 16_000];
+export const BACKGROUND_STABLE_RESET_MS = 5 * 60 * 1_000;
+function defaultWaitForStop() {
+    return new Promise((resolve) => {
+        process.once('SIGINT', resolve);
+        process.once('SIGTERM', resolve);
+        process.once('SIGHUP', resolve);
+    });
+}
+function defaultSleep(ms, signal) {
+    return new Promise((resolve) => {
+        if (signal?.aborted) {
+            resolve();
+            return;
+        }
+        const timer = setTimeout(resolve, ms);
+        signal?.addEventListener('abort', () => {
+            clearTimeout(timer);
+            resolve();
+        }, { once: true });
+    });
+}
+function cloneState(state) {
+    return {
+        ...state,
+        lastExit: state.lastExit ? { ...state.lastExit } : null,
+    };
+}
+function waitForWorkerExit(worker, now) {
+    let workerErrorMessage;
+    worker.on('error', (error) => {
+        workerErrorMessage = error.message;
+    });
+    // An error does not prove termination; close is the authoritative signal
+    // that it is safe to account for the exit and consider a replacement.
+    return new Promise((resolve) => {
+        worker.once('close', (code, signal) => {
+            resolve({
+                kind: 'exit',
+                exit: {
+                    at: now().toISOString(),
+                    code,
+                    signal,
+                    ...(workerErrorMessage ? { error: workerErrorMessage } : {}),
+                },
+            });
+        });
+    });
+}
+/**
+ * Run one persistent Background Runtime Supervisor until deliberate stop.
+ * The worker is never restarted because of readiness alone; only an observed
+ * process exit consumes an attempt.
+ */
+export async function runBackgroundRuntimeSupervisor(options, dependencies) {
+    const supervisorPid = options.supervisorPid ?? process.pid;
+    const now = dependencies.now ?? (() => new Date());
+    const sleep = dependencies.sleep ?? defaultSleep;
+    const waitBeforeReadinessRetry = dependencies.waitBeforeReadinessRetry ?? defaultSleep;
+    const waitForStop = dependencies.waitForStop ?? defaultWaitForStop;
+    const stopPromise = waitForStop().then(() => ({ kind: 'stop' }));
+    const spawnWorker = dependencies.spawnWorker ??
+        ((command, args, spawnOptions) => spawn(command, [...args], spawnOptions));
+    const writeState = dependencies.writeState ??
+        ((snapshot) => writeBackgroundSupervisorState(options.configDir, snapshot));
+    const appendEvent = dependencies.appendEvent ?? (() => { });
+    const workerArgs = Object.freeze([...options.workerArgs]);
+    const state = {
+        version: 1,
+        status: 'starting',
+        supervisorPid,
+        runtimePid: null,
+        restartAttempt: 0,
+        lastExit: null,
+        nextRetryAt: null,
+        readyAt: null,
+        updatedAt: now().toISOString(),
+    };
+    let activeWorker;
+    let activeExitPromise;
+    const persist = (updates) => {
+        Object.assign(state, updates, { updatedAt: now().toISOString() });
+        writeState(cloneState(state));
+    };
+    const record = (event) => {
+        appendEvent({ ...event, at: now().toISOString(), supervisorPid });
+    };
+    try {
+        persist({ status: 'starting' });
+        for (;;) {
+            const worker = spawnWorker(options.workerCommand, workerArgs, { stdio: 'ignore' });
+            const exitPromise = waitForWorkerExit(worker, now);
+            if (!worker.pid) {
+                throw new Error('Background Runtime Supervisor failed to spawn a runtime worker');
+            }
+            activeWorker = worker;
+            activeExitPromise = exitPromise;
+            void exitPromise.then(() => {
+                if (activeWorker === worker) {
+                    activeWorker = undefined;
+                    activeExitPromise = undefined;
+                }
+            });
+            const runtimePid = worker.pid;
+            persist({ status: 'starting', runtimePid, nextRetryAt: null, readyAt: null });
+            record({ event: 'runtime-spawned', runtimePid, restartAttempt: state.restartAttempt });
+            const stopWorker = async () => {
+                persist({ status: 'stopping', nextRetryAt: null });
+                record({ event: 'supervisor-stopping', runtimePid });
+                worker.kill('SIGTERM');
+                await exitPromise;
+            };
+            const readiness = dependencies.waitForReady(worker).then((ready) => ({ kind: 'readiness', ready }));
+            const startupOutcome = await Promise.race([readiness, exitPromise, stopPromise]);
+            if (startupOutcome.kind === 'stop') {
+                await stopWorker();
+                return;
+            }
+            let exitOutcome;
+            if (startupOutcome.kind === 'readiness') {
+                let ready = startupOutcome.ready;
+                if (!ready) {
+                    persist({ status: 'running', readyAt: null });
+                    record({ event: 'runtime-unreachable', runtimePid, restartAttempt: state.restartAttempt });
+                }
+                while (!ready && !exitOutcome) {
+                    const retryReadinessTimer = new AbortController();
+                    const retryOutcome = await Promise.race([
+                        waitBeforeReadinessRetry(250, retryReadinessTimer.signal).then(() => ({
+                            kind: 'retry-readiness',
+                        })),
+                        exitPromise,
+                        stopPromise,
+                    ]);
+                    if (retryOutcome.kind === 'stop') {
+                        retryReadinessTimer.abort();
+                        await stopWorker();
+                        return;
+                    }
+                    if (retryOutcome.kind === 'exit') {
+                        retryReadinessTimer.abort();
+                        exitOutcome = retryOutcome;
+                        break;
+                    }
+                    const observation = await Promise.race([
+                        dependencies.waitForReady(worker).then((isReady) => ({ kind: 'readiness', ready: isReady })),
+                        exitPromise,
+                        stopPromise,
+                    ]);
+                    if (observation.kind === 'stop') {
+                        await stopWorker();
+                        return;
+                    }
+                    if (observation.kind === 'exit') {
+                        exitOutcome = observation;
+                        break;
+                    }
+                    ready = observation.ready;
+                }
+                if (ready) {
+                    persist({ status: 'running', readyAt: now().toISOString() });
+                    record({ event: 'runtime-ready', runtimePid, restartAttempt: state.restartAttempt });
+                }
+                if (!exitOutcome && ready && state.restartAttempt > 0) {
+                    record({ event: 'runtime-recovered', runtimePid, restartAttempt: state.restartAttempt });
+                    const stableTimer = new AbortController();
+                    const stableOutcome = await Promise.race([
+                        sleep(BACKGROUND_STABLE_RESET_MS, stableTimer.signal).then(() => ({ kind: 'stable' })),
+                        exitPromise,
+                        stopPromise,
+                    ]);
+                    if (stableOutcome.kind === 'stop') {
+                        stableTimer.abort();
+                        await stopWorker();
+                        return;
+                    }
+                    if (stableOutcome.kind === 'stable') {
+                        persist({ restartAttempt: 0 });
+                        record({ event: 'restart-counter-reset', runtimePid, restartAttempt: 0 });
+                        const settledOutcome = await Promise.race([exitPromise, stopPromise]);
+                        if (settledOutcome.kind === 'stop') {
+                            await stopWorker();
+                            return;
+                        }
+                        exitOutcome = settledOutcome;
+                    }
+                    else {
+                        stableTimer.abort();
+                        exitOutcome = stableOutcome;
+                    }
+                }
+                else if (!exitOutcome) {
+                    const runningOutcome = await Promise.race([exitPromise, stopPromise]);
+                    if (runningOutcome.kind === 'stop') {
+                        await stopWorker();
+                        return;
+                    }
+                    exitOutcome = runningOutcome;
+                }
+            }
+            else {
+                exitOutcome = startupOutcome;
+            }
+            if (!exitOutcome) {
+                throw new Error('Background Runtime Supervisor lost the worker exit outcome');
+            }
+            const exit = exitOutcome.exit;
+            persist({ runtimePid: null, lastExit: exit, nextRetryAt: null, readyAt: null });
+            record({ event: 'runtime-exit', runtimePid, restartAttempt: state.restartAttempt, exit });
+            if (state.restartAttempt >= BACKGROUND_RESTART_DELAYS_MS.length) {
+                persist({ status: 'crash-loop', runtimePid: null, nextRetryAt: null });
+                record({ event: 'retry-exhausted', restartAttempt: state.restartAttempt, exit });
+                await stopPromise;
+                persist({ status: 'stopping' });
+                record({ event: 'supervisor-stopping' });
+                return;
+            }
+            const restartAttempt = state.restartAttempt + 1;
+            const delayMs = BACKGROUND_RESTART_DELAYS_MS[restartAttempt - 1];
+            const nextRetryAt = new Date(now().getTime() + delayMs).toISOString();
+            persist({ status: 'restarting', restartAttempt, nextRetryAt });
+            record({ event: 'restart-scheduled', restartAttempt, delayMs, exit });
+            const retryTimer = new AbortController();
+            const delayOutcome = await Promise.race([
+                sleep(delayMs, retryTimer.signal).then(() => ({ kind: 'delay' })),
+                stopPromise,
+            ]);
+            if (delayOutcome.kind === 'stop') {
+                retryTimer.abort();
+                persist({ status: 'stopping', nextRetryAt: null });
+                record({ event: 'supervisor-stopping' });
+                return;
+            }
+        }
+    }
+    catch (error) {
+        if (activeWorker && activeExitPromise) {
+            try {
+                activeWorker.kill('SIGTERM');
+            }
+            catch {
+                // Keep ownership held until the tracked worker's exit can be observed.
+            }
+            await activeExitPromise;
+        }
+        throw error;
+    }
+}
+//# sourceMappingURL=backgroundRuntimeSupervisor.js.map

package/build/core/server/backgroundRuntimeSupervisor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"backgroundRuntimeSupervisor.js","sourceRoot":"","sources":["../../../src/core/server/backgroundRuntimeSupervisor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAqB,MAAM,eAAe,CAAC;AAEzD,OAAO,EAIL,8BAA8B,GAC/B,MAAM,sDAAsD,CAAC;AAE9D,cAAc,sDAAsD,CAAC;AAErE,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,CAAU,CAAC;AAC1F,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;AAwDzD,SAAS,kBAAkB;IACzB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAChC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QACjC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,YAAY,CAAC,EAAU,EAAE,MAAoB;IACpD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,IAAI,MAAM,EAAE,OAAO,EAAE,CAAC;YACpB,OAAO,EAAE,CAAC;YACV,OAAO;QACT,CAAC;QACD,MAAM,KAAK,GAAG,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QACtC,MAAM,EAAE,gBAAgB,CACtB,OAAO,EACP,GAAG,EAAE;YACH,YAAY,CAAC,KAAK,CAAC,CAAC;YACpB,OAAO,EAAE,CAAC;QACZ,CAAC,EACD,EAAE,IAAI,EAAE,IAAI,EAAE,CACf,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,UAAU,CAAC,KAAgC;IAClD,OAAO;QACL,GAAG,KAAK;QACR,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,IAAI;KACxD,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CAAC,MAA+B,EAAE,GAAe;IACzE,IAAI,kBAAsC,CAAC;IAC3C,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;QAC3B,kBAAkB,GAAG,KAAK,CAAC,OAAO,CAAC;IACrC,CAAC,CAAC,CAAC;IAEH,yEAAyE;IACzE,sEAAsE;IACtE,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;YACpC,OAAO,CAAC;gBACN,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE;oBACJ,EAAE,EAAE,GAAG,EAAE,CAAC,WAAW,EAAE;oBACvB,IAAI;oBACJ,MAAM;oBACN,GAAG,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,kBAAkB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBAC7D;aACF,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAClD,OAAoC,EACpC,YAA8C;IAE9C,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,IAAI,OAAO,CAAC,GAAG,CAAC;IAC3D,MAAM,GAAG,GAAG,YAAY,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;IACnD,MAAM,KAAK,GAAG,YAAY,CAAC,KAAK,IAAI,YAAY,CAAC;IACjD,MAAM,wBAAwB,GAAG,YAAY,CAAC,wBAAwB,IAAI,YAAY,CAAC;IACvF,MAAM,WAAW,GAAG,YAAY,CAAC,WAAW,IAAI,kBAAkB,CAAC;IACnE,MAAM,WAAW,GAAG,WAAW,EAAE,CAAC,IAAI,CAAc,GAAG,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;IAC9E,MAAM,WAAW,GACf,YAAY,CAAC,WAAW;QACxB,CAAC,CAAC,OAAe,EAAE,IAAuB,EAAE,YAA0B,EAAE,EAAE,CACxE,KAAK,CAAC,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC,EAAE,YAAY,CAAuC,CAAC,CAAC;IACnF,MAAM,UAAU,GACd,YAAY,CAAC,UAAU;QACvB,CAAC,CAAC,QAAmC,EAAE,EAAE,CAAC,8BAA8B,CAAC,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,CAAC;IACzG,MAAM,WAAW,GAAG,YAAY,CAAC,WAAW,IAAI,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IAC3D,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;IAE1D,MAAM,KAAK,GAA8B;QACvC,OAAO,EAAE,CAAC;QACV,MAAM,EAAE,UAAU;QAClB,aAAa;QACb,UAAU,EAAE,IAAI;QAChB,cAAc,EAAE,CAAC;QACjB,QAAQ,EAAE,IAAI;QACd,WAAW,EAAE,IAAI;QACjB,OAAO,EAAE,IAAI;QACb,SAAS,EAAE,GAAG,EAAE,CAAC,WAAW,EAAE;KAC/B,CAAC;IACF,IAAI,YAAiD,CAAC;IACtD,IAAI,iBAAyD,CAAC;IAE9D,MAAM,OAAO,GAAG,CAAC,OAA2C,EAAQ,EAAE;QACpE,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;QAClE,UAAU,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;IAChC,CAAC,CAAC;IACF,MAAM,MAAM,GAAG,CAAC,KAA8D,EAAQ,EAAE;QACtF,WAAW,CAAC,EAAE,GAAG,KAAK,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,WAAW,EAAE,EAAE,aAAa,EAAE,CAAC,CAAC;IACpE,CAAC,CAAC;IAEF,IAAI,CAAC;QACH,OAAO,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;QAEhC,SAAS,CAAC;YACR,MAAM,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,aAAa,EAAE,UAAU,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;YACnF,MAAM,WAAW,GAAG,iBAAiB,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;YACnD,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;gBAChB,MAAM,IAAI,KAAK,CAAC,gEAAgE,CAAC,CAAC;YACpF,CAAC;YACD,YAAY,GAAG,MAAM,CAAC;YACtB,iBAAiB,GAAG,WAAW,CAAC;YAChC,KAAK,WAAW,CAAC,IAAI,CAAC,GAAG,EAAE;gBACzB,IAAI,YAAY,KAAK,MAAM,EAAE,CAAC;oBAC5B,YAAY,GAAG,SAAS,CAAC;oBACzB,iBAAiB,GAAG,SAAS,CAAC;gBAChC,CAAC;YACH,CAAC,CAAC,CAAC;YACH,MAAM,UAAU,GAAG,MAAM,CAAC,GAAG,CAAC;YAC9B,OAAO,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;YAC9E,MAAM,CAAC,EAAE,KAAK,EAAE,iBAAiB,EAAE,UAAU,EAAE,cAAc,EAAE,KAAK,CAAC,cAAc,EAAE,CAAC,CAAC;YAEvF,MAAM,UAAU,GAAG,KAAK,IAAmB,EAAE;gBAC3C,OAAO,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;gBACnD,MAAM,CAAC,EAAE,KAAK,EAAE,qBAAqB,EAAE,UAAU,EAAE,CAAC,CAAC;gBACrD,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBACvB,MAAM,WAAW,CAAC;YACpB,CAAC,CAAC;YAEF,MAAM,SAAS,GAAG,YAAY,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,WAAoB,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;YAC7G,MAAM,cAAc,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC;YACjF,IAAI,cAAc,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;gBACnC,MAAM,UAAU,EAAE,CAAC;gBACnB,OAAO;YACT,CAAC;YACD,IAAI,WAA0C,CAAC;YAC/C,IAAI,cAAc,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;gBACxC,IAAI,KAAK,GAAG,cAAc,CAAC,KAAK,CAAC;gBACjC,IAAI,CAAC,KAAK,EAAE,CAAC;oBACX,OAAO,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;oBAC9C,MAAM,CAAC,EAAE,KAAK,EAAE,qBAAqB,EAAE,UAAU,EAAE,cAAc,EAAE,KAAK,CAAC,cAAc,EAAE,CAAC,CAAC;gBAC7F,CAAC;gBACD,OAAO,CAAC,KAAK,IAAI,CAAC,WAAW,EAAE,CAAC;oBAC9B,MAAM,mBAAmB,GAAG,IAAI,eAAe,EAAE,CAAC;oBAClD,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC;wBACtC,wBAAwB,CAAC,GAAG,EAAE,mBAAmB,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;4BACpE,IAAI,EAAE,iBAA0B;yBACjC,CAAC,CAAC;wBACH,WAAW;wBACX,WAAW;qBACZ,CAAC,CAAC;oBACH,IAAI,YAAY,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;wBACjC,mBAAmB,CAAC,KAAK,EAAE,CAAC;wBAC5B,MAAM,UAAU,EAAE,CAAC;wBACnB,OAAO;oBACT,CAAC;oBACD,IAAI,YAAY,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;wBACjC,mBAAmB,CAAC,KAAK,EAAE,CAAC;wBAC5B,WAAW,GAAG,YAAY,CAAC;wBAC3B,MAAM;oBACR,CAAC;oBACD,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC;wBACrC,YAAY,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,WAAoB,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;wBACrG,WAAW;wBACX,WAAW;qBACZ,CAAC,CAAC;oBACH,IAAI,WAAW,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;wBAChC,MAAM,UAAU,EAAE,CAAC;wBACnB,OAAO;oBACT,CAAC;oBACD,IAAI,WAAW,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;wBAChC,WAAW,GAAG,WAAW,CAAC;wBAC1B,MAAM;oBACR,CAAC;oBACD,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC;gBAC5B,CAAC;gBACD,IAAI,KAAK,EAAE,CAAC;oBACV,OAAO,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;oBAC7D,MAAM,CAAC,EAAE,KAAK,EAAE,eAAe,EAAE,UAAU,EAAE,cAAc,EAAE,KAAK,CAAC,cAAc,EAAE,CAAC,CAAC;gBACvF,CAAC;gBACD,IAAI,CAAC,WAAW,IAAI,KAAK,IAAI,KAAK,CAAC,cAAc,GAAG,CAAC,EAAE,CAAC;oBACtD,MAAM,CAAC,EAAE,KAAK,EAAE,mBAAmB,EAAE,UAAU,EAAE,cAAc,EAAE,KAAK,CAAC,cAAc,EAAE,CAAC,CAAC;oBACzF,MAAM,WAAW,GAAG,IAAI,eAAe,EAAE,CAAC;oBAC1C,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC;wBACvC,KAAK,CAAC,0BAA0B,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,QAAiB,EAAE,CAAC,CAAC;wBAC/F,WAAW;wBACX,WAAW;qBACZ,CAAC,CAAC;oBACH,IAAI,aAAa,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;wBAClC,WAAW,CAAC,KAAK,EAAE,CAAC;wBACpB,MAAM,UAAU,EAAE,CAAC;wBACnB,OAAO;oBACT,CAAC;oBACD,IAAI,aAAa,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;wBACpC,OAAO,CAAC,EAAE,cAAc,EAAE,CAAC,EAAE,CAAC,CAAC;wBAC/B,MAAM,CAAC,EAAE,KAAK,EAAE,uBAAuB,EAAE,UAAU,EAAE,cAAc,EAAE,CAAC,EAAE,CAAC,CAAC;wBAC1E,MAAM,cAAc,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC;wBACtE,IAAI,cAAc,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;4BACnC,MAAM,UAAU,EAAE,CAAC;4BACnB,OAAO;wBACT,CAAC;wBACD,WAAW,GAAG,cAAc,CAAC;oBAC/B,CAAC;yBAAM,CAAC;wBACN,WAAW,CAAC,KAAK,EAAE,CAAC;wBACpB,WAAW,GAAG,aAAa,CAAC;oBAC9B,CAAC;gBACH,CAAC;qBAAM,IAAI,CAAC,WAAW,EAAE,CAAC;oBACxB,MAAM,cAAc,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC;oBACtE,IAAI,cAAc,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;wBACnC,MAAM,UAAU,EAAE,CAAC;wBACnB,OAAO;oBACT,CAAC;oBACD,WAAW,GAAG,cAAc,CAAC;gBAC/B,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,WAAW,GAAG,cAAc,CAAC;YAC/B,CAAC;YAED,IAAI,CAAC,WAAW,EAAE,CAAC;gBACjB,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC;YAChF,CAAC;YACD,MAAM,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC;YAC9B,OAAO,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;YAChF,MAAM,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,cAAc,EAAE,KAAK,CAAC,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC;YAE1F,IAAI,KAAK,CAAC,cAAc,IAAI,4BAA4B,CAAC,MAAM,EAAE,CAAC;gBAChE,OAAO,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;gBACvE,MAAM,CAAC,EAAE,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,KAAK,CAAC,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC;gBACjF,MAAM,WAAW,CAAC;gBAClB,OAAO,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;gBAChC,MAAM,CAAC,EAAE,KAAK,EAAE,qBAAqB,EAAE,CAAC,CAAC;gBACzC,OAAO;YACT,CAAC;YAED,MAAM,cAAc,GAAG,KAAK,CAAC,cAAc,GAAG,CAAC,CAAC;YAChD,MAAM,OAAO,GAAG,4BAA4B,CAAC,cAAc,GAAG,CAAC,CAAC,CAAC;YACjE,MAAM,WAAW,GAAG,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,GAAG,OAAO,CAAC,CAAC,WAAW,EAAE,CAAC;YACtE,OAAO,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,cAAc,EAAE,WAAW,EAAE,CAAC,CAAC;YAC/D,MAAM,CAAC,EAAE,KAAK,EAAE,mBAAmB,EAAE,cAAc,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;YAEtE,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;YACzC,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC;gBACtC,KAAK,CAAC,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,OAAgB,EAAE,CAAC,CAAC;gBAC1E,WAAW;aACZ,CAAC,CAAC;YACH,IAAI,YAAY,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;gBACjC,UAAU,CAAC,KAAK,EAAE,CAAC;gBACnB,OAAO,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;gBACnD,MAAM,CAAC,EAAE,KAAK,EAAE,qBAAqB,EAAE,CAAC,CAAC;gBACzC,OAAO;YACT,CAAC;QACH,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,YAAY,IAAI,iBAAiB,EAAE,CAAC;YACtC,IAAI,CAAC;gBACH,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC/B,CAAC;YAAC,MAAM,CAAC;gBACP,uEAAuE;YACzE,CAAC;YACD,MAAM,iBAAiB,CAAC;QAC1B,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC"}

package/build/core/server/backgroundRuntimeSupervisorState.d.ts

@@ -0,0 +1,30 @@
+export declare const BACKGROUND_SUPERVISOR_STATE_FILE = "background-runtime.json";
+export declare const BACKGROUND_MAX_RESTART_ATTEMPTS = 5;
+export type BackgroundSupervisorStatus = 'starting' | 'running' | 'restarting' | 'crash-loop' | 'stopping';
+export type BackgroundRuntimeSignal = string;
+export interface BackgroundRuntimeExit {
+    at: string;
+    code: number | null;
+    signal: BackgroundRuntimeSignal | null;
+    error?: string;
+}
+export interface BackgroundSupervisorState {
+    version: 1;
+    status: BackgroundSupervisorStatus;
+    supervisorPid: number;
+    runtimePid: number | null;
+    restartAttempt: number;
+    lastExit: BackgroundRuntimeExit | null;
+    nextRetryAt: string | null;
+    readyAt: string | null;
+    updatedAt: string;
+}
+export declare class BackgroundSupervisorStateReadError extends Error {
+    readonly stateFilePath: string;
+    constructor(stateFilePath: string, cause: unknown);
+}
+export declare function getBackgroundSupervisorStatePath(configDir: string): string;
+export declare function readBackgroundSupervisorState(configDir: string): BackgroundSupervisorState | null;
+export declare function writeBackgroundSupervisorState(configDir: string, state: BackgroundSupervisorState): void;
+export declare function cleanupBackgroundSupervisorState(configDir: string, supervisorPid: number): boolean;
+//# sourceMappingURL=backgroundRuntimeSupervisorState.d.ts.map

package/build/core/server/backgroundRuntimeSupervisorState.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"backgroundRuntimeSupervisorState.d.ts","sourceRoot":"","sources":["../../../src/core/server/backgroundRuntimeSupervisorState.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,gCAAgC,4BAA4B,CAAC;AAC1E,eAAO,MAAM,+BAA+B,IAAI,CAAC;AAEjD,MAAM,MAAM,0BAA0B,GAAG,UAAU,GAAG,SAAS,GAAG,YAAY,GAAG,YAAY,GAAG,UAAU,CAAC;AAC3G,MAAM,MAAM,uBAAuB,GAAG,MAAM,CAAC;AAE7C,MAAM,WAAW,qBAAqB;IACpC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,MAAM,EAAE,uBAAuB,GAAG,IAAI,CAAC;IACvC,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,CAAC,CAAC;IACX,MAAM,EAAE,0BAA0B,CAAC;IACnC,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,qBAAqB,GAAG,IAAI,CAAC;IACvC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;CACnB;AAqBD,qBAAa,kCAAmC,SAAQ,KAAK;aAEzC,aAAa,EAAE,MAAM;gBAArB,aAAa,EAAE,MAAM,EACrC,KAAK,EAAE,OAAO;CAQjB;AAED,wBAAgB,gCAAgC,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAE1E;AAED,wBAAgB,6BAA6B,CAAC,SAAS,EAAE,MAAM,GAAG,yBAAyB,GAAG,IAAI,CAiBjG;AAED,wBAAgB,8BAA8B,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,yBAAyB,GAAG,IAAI,CAOxG;AAED,wBAAgB,gCAAgC,CAAC,SAAS,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAiBlG"}

package/build/core/server/backgroundRuntimeSupervisorState.js

@@ -0,0 +1,81 @@
+import fs from 'fs';
+import path from 'path';
+import { z } from 'zod';
+export const BACKGROUND_SUPERVISOR_STATE_FILE = 'background-runtime.json';
+export const BACKGROUND_MAX_RESTART_ATTEMPTS = 5;
+const stateSchema = z.object({
+    version: z.literal(1),
+    status: z.enum(['starting', 'running', 'restarting', 'crash-loop', 'stopping']),
+    supervisorPid: z.number().int().positive(),
+    runtimePid: z.number().int().positive().nullable(),
+    restartAttempt: z.number().int().min(0).max(BACKGROUND_MAX_RESTART_ATTEMPTS),
+    lastExit: z
+        .object({
+        at: z.string().datetime(),
+        code: z.number().int().nullable(),
+        signal: z.string().nullable(),
+        error: z.string().min(1).optional(),
+    })
+        .nullable(),
+    nextRetryAt: z.string().datetime().nullable(),
+    readyAt: z.string().datetime().nullable(),
+    updatedAt: z.string().datetime(),
+});
+export class BackgroundSupervisorStateReadError extends Error {
+    stateFilePath;
+    constructor(stateFilePath, cause) {
+        super(`Background supervisor state is unreadable (${stateFilePath}): ${cause instanceof Error ? cause.message : String(cause)}`, { cause });
+        this.stateFilePath = stateFilePath;
+        this.name = 'BackgroundSupervisorStateReadError';
+    }
+}
+export function getBackgroundSupervisorStatePath(configDir) {
+    return path.join(configDir, BACKGROUND_SUPERVISOR_STATE_FILE);
+}
+export function readBackgroundSupervisorState(configDir) {
+    const stateFilePath = getBackgroundSupervisorStatePath(configDir);
+    let content;
+    try {
+        content = fs.readFileSync(stateFilePath, 'utf8');
+    }
+    catch (error) {
+        if (error.code === 'ENOENT') {
+            return null;
+        }
+        throw new BackgroundSupervisorStateReadError(stateFilePath, error);
+    }
+    try {
+        return stateSchema.parse(JSON.parse(content));
+    }
+    catch (error) {
+        throw new BackgroundSupervisorStateReadError(stateFilePath, error);
+    }
+}
+export function writeBackgroundSupervisorState(configDir, state) {
+    const stateFilePath = getBackgroundSupervisorStatePath(configDir);
+    fs.mkdirSync(configDir, { recursive: true });
+    const validated = stateSchema.parse(state);
+    const tempFilePath = `${stateFilePath}.${process.pid}.tmp`;
+    fs.writeFileSync(tempFilePath, `${JSON.stringify(validated, null, 2)}\n`, { mode: 0o600 });
+    fs.renameSync(tempFilePath, stateFilePath);
+}
+export function cleanupBackgroundSupervisorState(configDir, supervisorPid) {
+    const current = readBackgroundSupervisorState(configDir);
+    if (!current) {
+        return true;
+    }
+    if (current.supervisorPid !== supervisorPid) {
+        return false;
+    }
+    try {
+        fs.unlinkSync(getBackgroundSupervisorStatePath(configDir));
+        return true;
+    }
+    catch (error) {
+        if (error.code === 'ENOENT') {
+            return true;
+        }
+        throw error;
+    }
+}
+//# sourceMappingURL=backgroundRuntimeSupervisorState.js.map

package/build/core/server/backgroundRuntimeSupervisorState.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"backgroundRuntimeSupervisorState.js","sourceRoot":"","sources":["../../../src/core/server/backgroundRuntimeSupervisorState.ts"],"names":[],"mappings":"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"}

package/build/core/server/clientInstanceFactory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"clientInstanceFactory.d.ts","sourceRoot":"","sources":["../../../src/core/server/clientInstanceFactory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAIpE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEzE,MAAM,WAAW,0BAA0B;IACzC,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,eAAe,CAAC;IACjC,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,wBAAsB,0BAA0B,CAAC,EAC/C,UAAU,EACV,WAAW,EACX,YAAY,EACZ,eAAe,EACf,YAAY,EACZ,QAAQ,EACR,WAAW,GACZ,EAAE,0BAA0B,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAmC5D"}
+{"version":3,"file":"clientInstanceFactory.d.ts","sourceRoot":"","sources":["../../../src/core/server/clientInstanceFactory.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAKpE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEzE,MAAM,WAAW,0BAA0B;IACzC,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,eAAe,CAAC;IACjC,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,wBAAsB,0BAA0B,CAAC,EAC/C,UAAU,EACV,WAAW,EACX,YAAY,EACZ,eAAe,EACf,YAAY,EACZ,QAAQ,EACR,WAAW,GACZ,EAAE,0BAA0B,GAAG,OAAO,CAAC,oBAAoB,CAAC,CA0C5D"}

package/build/core/server/clientInstanceFactory.js

@@ -1,9 +1,18 @@
+import { templateBackendLogSource } from '../../domains/backend-logs/backendLogSource.js';
 import { createTransportsWithContext } from '../../transport/transportFactory.js';
 import { getConnectionTimeout } from '../../utils/core/timeoutUtils.js';
 export async function createPooledClientInstance({ instanceId, instanceKey, templateName, processedConfig, renderedHash, clientId, idleTimeout, }) {
-    const transports = await createTransportsWithContext({
-        [templateName]: processedConfig,
-    }, undefined);
+    const backendLogOptions = processedConfig.type === 'stdio' || (!processedConfig.type && Boolean(processedConfig.command))
+        ? {
+            backendLogSources: {
+                [templateName]: templateBackendLogSource({ templateName, instanceId }),
+            },
+        }
+        : undefined;
+    const configs = { [templateName]: processedConfig };
+    const transports = backendLogOptions
+        ? await createTransportsWithContext(configs, undefined, backendLogOptions)
+        : await createTransportsWithContext(configs, undefined);
     const transport = transports[templateName];
     if (!transport) {
         throw new Error(`Failed to create transport for template ${templateName}`);
@@ -25,6 +34,7 @@ export async function createPooledClientInstance({ instanceId, instanceKey, temp
         createdAt: new Date(),
         lastUsedAt: new Date(),
         status: 'active',
+        outboundKeys: new Set(),
         clientIds: new Set([clientId]),
         idleTimeout,
     };

package/build/core/server/clientInstanceFactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"clientInstanceFactory.js","sourceRoot":"","sources":["../../../src/core/server/clientInstanceFactory.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,2BAA2B,EAAE,MAAM,oCAAoC,CAAC;AACjF,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAcvE,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAAC,EAC/C,UAAU,EACV,WAAW,EACX,YAAY,EACZ,eAAe,EACf,YAAY,EACZ,QAAQ,EACR,WAAW,GACgB;IAC3B,MAAM,UAAU,GAAG,MAAM,2BAA2B,CAClD;QACE,CAAC,YAAY,CAAC,EAAE,eAAe;KAChC,EACD,SAAS,CACV,CAAC;IAEF,MAAM,SAAS,GAAG,UAAU,CAAC,YAAY,CAAC,CAAC;IAC3C,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CAAC,2CAA2C,YAAY,EAAE,CAAC,CAAC;IAC7E,CAAC;IAED,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,MAAM,CAAC,mCAAmC,CAAC,CAAC;IAC5E,MAAM,aAAa,GAAG,aAAa,CAAC,mBAAmB,EAAE,CAAC;IAC1D,MAAM,MAAM,GAAG,aAAa,CAAC,0BAA0B,EAAE,CAAC;IAE1D,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,SAAS,CAAC,CAAC;IAC1D,MAAM,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,iBAAiB,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAEhG,OAAO;QACL,EAAE,EAAE,UAAU;QACd,WAAW;QACX,YAAY;QACZ,MAAM;QACN,SAAS;QACT,YAAY;QACZ,eAAe;QACf,cAAc,EAAE,CAAC;QACjB,SAAS,EAAE,IAAI,IAAI,EAAE;QACrB,UAAU,EAAE,IAAI,IAAI,EAAE;QACtB,MAAM,EAAE,QAAQ;QAChB,SAAS,EAAE,IAAI,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC;QAC9B,WAAW;KACZ,CAAC;AACJ,CAAC"}
+{"version":3,"file":"clientInstanceFactory.js","sourceRoot":"","sources":["../../../src/core/server/clientInstanceFactory.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,wBAAwB,EAAE,MAAM,+CAA+C,CAAC;AACzF,OAAO,EAAE,2BAA2B,EAAE,MAAM,oCAAoC,CAAC;AACjF,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAcvE,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAAC,EAC/C,UAAU,EACV,WAAW,EACX,YAAY,EACZ,eAAe,EACf,YAAY,EACZ,QAAQ,EACR,WAAW,GACgB;IAC3B,MAAM,iBAAiB,GACrB,eAAe,CAAC,IAAI,KAAK,OAAO,IAAI,CAAC,CAAC,eAAe,CAAC,IAAI,IAAI,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;QAC7F,CAAC,CAAC;YACE,iBAAiB,EAAE;gBACjB,CAAC,YAAY,CAAC,EAAE,wBAAwB,CAAC,EAAE,YAAY,EAAE,UAAU,EAAE,CAAC;aACvE;SACF;QACH,CAAC,CAAC,SAAS,CAAC;IAChB,MAAM,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,EAAE,eAAe,EAAE,CAAC;IACpD,MAAM,UAAU,GAAG,iBAAiB;QAClC,CAAC,CAAC,MAAM,2BAA2B,CAAC,OAAO,EAAE,SAAS,EAAE,iBAAiB,CAAC;QAC1E,CAAC,CAAC,MAAM,2BAA2B,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAE1D,MAAM,SAAS,GAAG,UAAU,CAAC,YAAY,CAAC,CAAC;IAC3C,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CAAC,2CAA2C,YAAY,EAAE,CAAC,CAAC;IAC7E,CAAC;IAED,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,MAAM,CAAC,mCAAmC,CAAC,CAAC;IAC5E,MAAM,aAAa,GAAG,aAAa,CAAC,mBAAmB,EAAE,CAAC;IAC1D,MAAM,MAAM,GAAG,aAAa,CAAC,0BAA0B,EAAE,CAAC;IAE1D,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,SAAS,CAAC,CAAC;IAC1D,MAAM,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,iBAAiB,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,iBAAiB,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAEhG,OAAO;QACL,EAAE,EAAE,UAAU;QACd,WAAW;QACX,YAAY;QACZ,MAAM;QACN,SAAS;QACT,YAAY;QACZ,eAAe;QACf,cAAc,EAAE,CAAC;QACjB,SAAS,EAAE,IAAI,IAAI,EAAE;QACrB,UAAU,EAAE,IAAI,IAAI,EAAE;QACtB,MAAM,EAAE,QAAQ;QAChB,YAAY,EAAE,IAAI,GAAG,EAAE;QACvB,SAAS,EAAE,IAAI,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC;QAC9B,WAAW;KACZ,CAAC;AACJ,CAAC"}

package/build/core/server/clientInstancePool.d.ts

@@ -1,3 +1,4 @@
+import { type BackendSupervisionSnapshot } from '../../core/server/backendStdioSupervisor.js';
 import type { MCPServerParams } from '../../core/types/transport.js';
 import type { ContextData } from '../../types/context.js';
 import { ClientPoolOptions, PooledClientInstance } from './clientInstancePoolTypes.js';
@@ -16,9 +17,13 @@ export declare class ClientInstancePool {
     private templateToInstances;
     private options;
     private cleanupTimer?;
-    private instanceCounter;
     private pendingCreations;
+    private removalOperations;
+    private supervisionPublisher?;
+    private isShuttingDown;
+    private shutdownPromise?;
     constructor(options?: Partial<ClientPoolOptions>);
+    setSupervisionPublisher(publisher: (instance: PooledClientInstance, snapshot: BackendSupervisionSnapshot) => void): void;
     /**
      * Creates or retrieves a client instance for the given template and variables
      */
@@ -47,6 +52,10 @@ export declare class ClientInstancePool {
      * Gets all instances for a specific template
      */
     getTemplateInstances(templateName: string): PooledClientInstance[];
+    /**
+     * Resolves a full or unambiguous-prefix instance ID within one template.
+     */
+    resolveTemplateInstance(templateName: string, instanceIdOrPrefix: string): PooledClientInstance | undefined;
     /**
      * Gets all active instances in the pool
      */
@@ -55,6 +64,8 @@ export declare class ClientInstancePool {
      * Manually removes an instance from the pool
      */
     removeInstance(instanceKey: string): Promise<void>;
+    private scheduleRemoval;
+    private removeCapturedInstance;
     /**
      * Forces cleanup of idle instances
      */
@@ -63,6 +74,11 @@ export declare class ClientInstancePool {
      * Shuts down the instance pool and cleans up all resources
      */
     shutdown(): Promise<void>;
+    private performShutdown;
+    private assertActive;
+    private disposeInstance;
+    restartInstance(instance: PooledClientInstance): Promise<BackendSupervisionSnapshot>;
+    private configureInstanceSupervision;
     /**
      * Gets pool statistics for monitoring
      */
@@ -81,10 +97,6 @@ export declare class ClientInstancePool {
      * Creates a unique instance key from template name and variable hash
      */
     private createInstanceKey;
-    /**
-     * Generates a unique instance ID
-     */
-    private generateInstanceId;
     /**
      * Checks if creating a new instance would exceed limits
      */

package/build/core/server/clientInstancePool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"clientInstancePool.d.ts","sourceRoot":"","sources":["../../../src/core/server/clientInstancePool.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAGpE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGzD,OAAO,EAAE,iBAAiB,EAAwB,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAE7G,YAAY,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,CAAC;AAExD;;;;;;;;GAQG;AACH,qBAAa,kBAAkB;IAC7B,OAAO,CAAC,SAAS,CAA2C;IAC5D,OAAO,CAAC,mBAAmB,CAAkC;IAC7D,OAAO,CAAC,OAAO,CAAoB;IACnC,OAAO,CAAC,YAAY,CAAC,CAAiC;IACtD,OAAO,CAAC,eAAe,CAAK;IAC5B,OAAO,CAAC,gBAAgB,CAAoD;gBAEhE,OAAO,GAAE,OAAO,CAAC,iBAAiB,CAAM;IAUpD;;OAEG;IACG,yBAAyB,CAC7B,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,eAAe,EAC/B,OAAO,EAAE,WAAW,EACpB,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE;QACR,SAAS,CAAC,EAAE,OAAO,CAAC;QACpB,SAAS,CAAC,EAAE,OAAO,CAAC;QACpB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,GACA,OAAO,CAAC,oBAAoB,CAAC;IAgGhC;;OAEG;IACH,mBAAmB,CAAC,QAAQ,EAAE,oBAAoB,EAAE,QAAQ,EAAE,MAAM,GAAG,oBAAoB;IAoB3F;;OAEG;IACH,wBAAwB,CAAC,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,GAAE,IAAiB,GAAG,IAAI;IAiCnG;;OAEG;IACH,WAAW,CAAC,WAAW,EAAE,MAAM,GAAG,oBAAoB,GAAG,SAAS;IAIlE;;OAEG;IACH,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAU1D;;OAEG;IACH,oBAAoB,CAAC,YAAY,EAAE,MAAM,GAAG,oBAAoB,EAAE;IAWlE;;OAEG;IACH,eAAe,IAAI,oBAAoB,EAAE;IAIzC;;OAEG;IACG,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IA6BxD;;OAEG;IACG,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAmC3C;;OAEG;IACG,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAqC/B;;OAEG;IACH,QAAQ,IAAI;QACV,cAAc,EAAE,MAAM,CAAC;QACvB,eAAe,EAAE,MAAM,CAAC;QACxB,aAAa,EAAE,MAAM,CAAC;QACtB,aAAa,EAAE,MAAM,CAAC;QACtB,YAAY,EAAE,MAAM,CAAC;KACtB;IAeD;;OAEG;IACH,OAAO,CAAC,mBAAmB;IA+B3B;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAIzB;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAI1B;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAuB3B;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAO1B;;OAEG;IACH,OAAO,CAAC,uBAAuB;IAU/B;;OAEG;IACH,OAAO,CAAC,iBAAiB;CAc1B"}
+{"version":3,"file":"clientInstancePool.d.ts","sourceRoot":"","sources":["../../../src/core/server/clientInstancePool.ts"],"names":[],"mappings":"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"}