@xioflow/kernel 0.3.0 → 0.4.0

package/dist/supervisor/service.d.ts

@@ -0,0 +1,24 @@
+import { ExecutionDomain } from '../domain.js';
+import { PlatformDriver } from '../driver/types.js';
+import { ServiceSpec, ServiceHandle } from '../types.js';
+import { ProcessSupervisor } from './supervisor.js';
+export declare class ServiceSupervisor {
+    private domain;
+    private driver;
+    private supervisor;
+    private activeServices;
+    constructor(domain: ExecutionDomain, driver: PlatformDriver, supervisor: ProcessSupervisor);
+    startService(spec: ServiceSpec): Promise<ServiceHandle>;
+    private spawnInstance;
+    private setupReadiness;
+    private handleInstanceExit;
+    stopService(serviceId: string, graceMs?: number): Promise<void>;
+    /**
+     * 显式停止的唯一终态写入点：只有驱动确认整组已停且观测到根进程退出，才记录实例结果并释放 service 租约；
+     * 否则实例记为 indeterminate、租约保留，等待人工裁决（与 ProcessSupervisor 的 No premature release 一致）。
+     */
+    private finalizeStop;
+    close(): void;
+    private computeServiceFingerprint;
+}
+//# sourceMappingURL=service.d.ts.map

package/dist/supervisor/service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/supervisor/service.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,cAAc,EAA2C,MAAM,oBAAoB,CAAC;AAC7F,OAAO,EACL,WAAW,EACX,aAAa,EAKd,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AA8BpD,qBAAa,iBAAiB;IAI1B,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,UAAU;IALpB,OAAO,CAAC,cAAc,CAA0C;IAEhE,YACU,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,cAAc,EACtB,UAAU,EAAE,iBAAiB,EACnC;IAES,YAAY,CAAC,IAAI,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC,CAyGnE;YAEa,aAAa;IAoG3B,OAAO,CAAC,cAAc;YAyFR,kBAAkB;IAiKnB,WAAW,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,GAAE,MAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAoDjF;IAED;;;OAGG;IACH,OAAO,CAAC,YAAY;IAoEb,KAAK,IAAI,IAAI,CAWnB;IAED,OAAO,CAAC,yBAAyB;CAWlC"}

package/dist/supervisor/service.js

@@ -0,0 +1,588 @@
+import crypto from 'node:crypto';
+import fs from 'node:fs';
+import path from 'node:path';
+import { PassThrough } from 'node:stream';
+import { setupStreamDrainer } from './drainer.js';
+export class ServiceSupervisor {
+    domain;
+    driver;
+    supervisor;
+    activeServices = new Map();
+    constructor(domain, driver, supervisor) {
+        this.domain = domain;
+        this.driver = driver;
+        this.supervisor = supervisor;
+    }
+    async startService(spec) {
+        const existing = this.activeServices.get(spec.serviceId);
+        if (existing) {
+            if (existing.status === 'starting' || existing.status === 'running') {
+                return existing.handle;
+            }
+            throw new Error(`Service "${spec.serviceId}" is already finalized with status "${existing.status}"`);
+        }
+        // 验证所属 Run（N3 契约）
+        const store = this.domain.getStore();
+        const callingRun = store.getRun(spec.runId);
+        if (!callingRun) {
+            throw new Error(`Run "${spec.runId}" is not registered in domain "${this.domain.domainId}".`);
+        }
+        if (callingRun.status === 'succeeded' ||
+            callingRun.status === 'failed' ||
+            callingRun.status === 'cancelled' ||
+            callingRun.status === 'indeterminate') {
+            throw new Error(`Cannot start service "${spec.serviceId}" for Run "${spec.runId}" because the Run is already finalized with status "${callingRun.status}".`);
+        }
+        // 申请 service 级独占资源租约 (重启间隙保持租约不被其他 op 抢占，ARCHITECTURE §3.8 / 裁决 7)
+        const serviceLeaseHolder = `service:${spec.serviceId}`;
+        if (spec.requiredResources && spec.requiredResources.length > 0) {
+            this.domain.allocateResources(serviceLeaseHolder, spec.requiredResources, 0);
+        }
+        const stdinStream = new PassThrough();
+        const stdoutStream = new PassThrough();
+        let readyResolve;
+        let readyReject;
+        const readyPromise = new Promise((resolve, reject) => {
+            readyResolve = resolve;
+            readyReject = reject;
+        });
+        let stopResolve;
+        const stopPromise = new Promise((resolve) => {
+            stopResolve = resolve;
+        });
+        let instanceExitResolve;
+        const onInstanceExit = new Promise((resolve) => {
+            instanceExitResolve = resolve;
+        });
+        const state = {
+            serviceId: spec.serviceId,
+            runId: spec.runId,
+            spec,
+            status: 'starting',
+            attemptCount: 0,
+            currentInstanceIndex: 1,
+            currentOpId: `${spec.serviceId}#1`,
+            currentProcessHandle: null,
+            stdinStream,
+            stdoutStream,
+            readyResolve,
+            readyReject,
+            readyPromise,
+            stopResolve,
+            stopPromise,
+            stopRequested: false,
+            restartTimer: null,
+            instanceExitResolve,
+            onInstanceExit,
+            handle: null,
+            instanceStartedAt: Date.now(),
+        };
+        state.handle = {
+            serviceId: spec.serviceId,
+            runId: spec.runId,
+            stdin: stdinStream,
+            stdout: stdoutStream,
+            ready: readyPromise,
+            stop: (graceMs) => this.stopService(spec.serviceId, graceMs),
+            get onInstanceExit() {
+                return state.onInstanceExit;
+            },
+            get currentInstanceOpId() {
+                return state.currentOpId;
+            },
+        };
+        this.activeServices.set(spec.serviceId, state);
+        try {
+            await this.spawnInstance(state, 1);
+        }
+        catch (err) {
+            state.status = 'failed';
+            if (spec.requiredResources && spec.requiredResources.length > 0) {
+                this.domain.internalReleaseResources(serviceLeaseHolder, spec.requiredResources);
+            }
+            this.activeServices.delete(spec.serviceId);
+            throw err;
+        }
+        return state.handle;
+    }
+    async spawnInstance(state, instanceIndex) {
+        state.currentInstanceIndex = instanceIndex;
+        state.currentOpId = `${state.serviceId}#${instanceIndex}`;
+        state.instanceStartedAt = Date.now();
+        state.pendingInstanceResult = undefined;
+        // 更新 onInstanceExit 为当前实例的 promise
+        state.onInstanceExit = new Promise((resolve) => {
+            state.instanceExitResolve = resolve;
+        });
+        const store = this.domain.getStore();
+        const inputFingerprint = this.computeServiceFingerprint(state.spec);
+        // 1. [意图登记] SQLite 写入 Operation (status: intent_registered, kind: service)
+        const op = {
+            id: state.currentOpId,
+            runId: state.runId,
+            kind: 'service',
+            name: `service-instance-${state.serviceId}-${instanceIndex}`,
+            inputFingerprint,
+            requiredResources: state.spec.requiredResources ?? [],
+            status: 'intent_registered',
+        };
+        store.registerOperationIntent(op, this.domain.domainId);
+        // 2. 写入 journal 事件
+        if (instanceIndex === 1) {
+            store.recordEventAndTransitionState({
+                domainId: this.domain.domainId,
+                runId: state.runId,
+                operationId: state.currentOpId,
+                type: 'SERVICE_STARTED',
+                payload: {
+                    serviceId: state.serviceId,
+                    runId: state.runId,
+                    instanceIndex,
+                    opId: state.currentOpId,
+                    spec: {
+                        serviceId: state.spec.serviceId,
+                        command: journalSafeCommand(state.spec.command),
+                        restart: state.spec.restart,
+                        readiness: state.spec.readiness,
+                    },
+                },
+                timestamp: new Date().toISOString(),
+            });
+        }
+        // 3. 驱动启动受管进程
+        const commandWithStream = {
+            ...state.spec.command,
+            stdinMode: 'stream',
+        };
+        const processHandle = await this.driver.spawn(commandWithStream);
+        state.currentProcessHandle = processHandle;
+        // 4. [登记执行身份] 推进为 active
+        store.updateOperationStatus(state.currentOpId, 'active', processHandle.identity);
+        // 5. 放行门管道
+        if (processHandle.releaseGate) {
+            processHandle.releaseGate();
+        }
+        // 6. 连接 stdin/stdout 管道
+        if (processHandle.stdin) {
+            state.stdinStream.pipe(processHandle.stdin, { end: false });
+        }
+        // 直通消费 stdout，内核内存不保留 Head+Tail (ARCHITECTURE §3.8 / 契约 #50)
+        processHandle.stdout.pipe(state.stdoutStream, { end: false });
+        // 7. 消费 stderr 按 B3 有界上限排空并转储
+        const maxStderrBytes = state.spec.maxStderrBytes ?? 10 * 1024 * 1024;
+        let stderrSpillPath;
+        if (state.spec.artifactsDir) {
+            try {
+                fs.mkdirSync(state.spec.artifactsDir, { recursive: true });
+            }
+            catch { }
+            stderrSpillPath = path.join(state.spec.artifactsDir, `${state.currentOpId}.stderr.log`);
+        }
+        const stderrDrainer = setupStreamDrainer(processHandle.stderr, maxStderrBytes, stderrSpillPath);
+        state.currentStderrDrainer = stderrDrainer;
+        // 8. 处理就绪探测 (仅在第 1 次启动时)
+        if (instanceIndex === 1) {
+            this.setupReadiness(state, processHandle);
+        }
+        // 9. 监听退出事件
+        const exitPromise = processHandle.onRootExit ?? processHandle.onExit;
+        exitPromise.then((exitResult) => {
+            this.handleInstanceExit(state, instanceIndex, exitResult).catch(() => { });
+        });
+    }
+    setupReadiness(state, processHandle) {
+        const store = this.domain.getStore();
+        const readiness = state.spec.readiness;
+        if (!readiness || readiness === 'spawned') {
+            state.status = 'running';
+            const readyAt = new Date().toISOString();
+            store.recordEventAndTransitionState({
+                domainId: this.domain.domainId,
+                runId: state.runId,
+                operationId: state.currentOpId,
+                type: 'SERVICE_READY',
+                payload: {
+                    serviceId: state.serviceId,
+                    runId: state.runId,
+                    instanceIndex: 1,
+                    opId: state.currentOpId,
+                    readyAt,
+                },
+                timestamp: readyAt,
+            });
+            state.readyResolve({
+                serviceId: state.serviceId,
+                instanceIndex: 1,
+                readyAt,
+            });
+            return;
+        }
+        if (typeof readiness === 'object' && readiness.stdoutLine) {
+            const regex = readiness.stdoutLine;
+            const timeoutMs = readiness.timeoutMs ?? 5000;
+            let matched = false;
+            const onData = (chunk) => {
+                if (matched)
+                    return;
+                const text = chunk.toString();
+                const lines = text.split('\n');
+                for (const line of lines) {
+                    if (regex.test(line)) {
+                        matched = true;
+                        processHandle.stdout.off('data', onData);
+                        if (timer)
+                            clearTimeout(timer);
+                        state.status = 'running';
+                        const readyAt = new Date().toISOString();
+                        store.recordEventAndTransitionState({
+                            domainId: this.domain.domainId,
+                            runId: state.runId,
+                            operationId: state.currentOpId,
+                            type: 'SERVICE_READY',
+                            payload: {
+                                serviceId: state.serviceId,
+                                runId: state.runId,
+                                instanceIndex: 1,
+                                opId: state.currentOpId,
+                                readyAt,
+                                matchedLine: line,
+                            },
+                            timestamp: readyAt,
+                        });
+                        state.readyResolve({
+                            serviceId: state.serviceId,
+                            instanceIndex: 1,
+                            readyAt,
+                            matchedLine: line,
+                        });
+                        break;
+                    }
+                }
+            };
+            processHandle.stdout.on('data', onData);
+            const timer = setTimeout(() => {
+                if (!matched) {
+                    matched = true;
+                    processHandle.stdout.off('data', onData);
+                    // 不能先把 status 置为 failed：stopService 会把 failed 当作已终结直接返回，进程就泄漏了。
+                    // 记下失败原因，由停止流水线在确认停止后把终态记为 failed。
+                    state.failureReason = 'readiness_timeout';
+                    const err = new Error(`Service "${state.serviceId}" readiness check timed out after ${timeoutMs}ms`);
+                    state.readyReject(err);
+                    this.stopService(state.serviceId, 500).catch(() => { });
+                }
+            }, timeoutMs);
+        }
+    }
+    async handleInstanceExit(state, instanceIndex, exitResult) {
+        const exitedIdentity = state.currentProcessHandle?.identity;
+        // 释放管道连接
+        if (state.currentProcessHandle?.stdin) {
+            try {
+                state.stdinStream.unpipe(state.currentProcessHandle.stdin);
+            }
+            catch { }
+        }
+        if (state.currentProcessHandle?.stdout) {
+            try {
+                state.currentProcessHandle.stdout.unpipe(state.stdoutStream);
+            }
+            catch { }
+        }
+        state.currentStderrDrainer?.forceFinalize();
+        const stderrData = state.currentStderrDrainer?.getResult();
+        const store = this.domain.getStore();
+        const serviceLeaseHolder = `service:${state.serviceId}`;
+        // 身份核验走驱动真实结论，不再写死 is_original_process；驱动核验失败时如实记为 cannot_determine
+        let identityVerification = 'cannot_determine';
+        if (exitedIdentity) {
+            try {
+                identityVerification = await this.driver.verifyIdentity(exitedIdentity);
+            }
+            catch {
+                identityVerification = 'cannot_determine';
+            }
+        }
+        // 更新当前 operation 结果
+        const op = store.getOperation(state.currentOpId);
+        if (op) {
+            const isSuccess = exitResult.exitCode === 0 && exitResult.signal === null;
+            const isTruncated = stderrData?.isTruncated ?? false;
+            const result = {
+                kind: 'process',
+                status: isSuccess ? 'succeeded' : 'failed',
+                exitCode: exitResult.exitCode,
+                signal: exitResult.signal,
+                stdout: '',
+                stderr: stderrData?.content ?? '',
+                isTruncated,
+                stderrTruncated: isTruncated,
+                stderrRef: !stderrData?.spillError ? stderrData?.outputRef : undefined,
+                outputRef: !stderrData?.spillError ? stderrData?.outputRef : undefined,
+                stderrBytes: stderrData?.bytesSeen ?? 0,
+                stderrHash: !stderrData?.spillError ? stderrData?.outputHash : undefined,
+                outputHash: !stderrData?.spillError ? stderrData?.outputHash : undefined,
+                durationMs: Date.now() - state.instanceStartedAt,
+                completedAt: new Date().toISOString(),
+                identityVerification,
+                ...(stderrData?.spillError ? { spillError: stderrData.spillError, stderrSpillError: stderrData.spillError } : {}),
+            };
+            if (state.stopRequested) {
+                // 显式停止：根进程退出不等于整组已停，结果交给 stopService 在拿到驱动停止结论后落盘
+                state.pendingInstanceResult = result;
+            }
+            else {
+                store.recordOperationResult(state.currentOpId, result);
+            }
+        }
+        state.instanceExitResolve?.(exitResult);
+        // 1. 如果是显式请求停止：终态、事件与租约统一由 stopService → finalizeStop 处理
+        if (state.stopRequested) {
+            return;
+        }
+        // 2. 如果 domain 已关闭
+        if (this.domain.isClosed()) {
+            state.status = 'stopped';
+            if (state.spec.requiredResources && state.spec.requiredResources.length > 0) {
+                this.domain.internalReleaseResources(serviceLeaseHolder, state.spec.requiredResources);
+            }
+            return;
+        }
+        // 3. 如果进程正常以 0 退出，不重启
+        if (exitResult.exitCode === 0 && exitResult.signal === null) {
+            state.status = 'stopped';
+            store.recordEventAndTransitionState({
+                domainId: this.domain.domainId,
+                runId: state.runId,
+                operationId: state.currentOpId,
+                type: 'SERVICE_STOPPED',
+                payload: { serviceId: state.serviceId, runId: state.runId, reason: 'exit' },
+                timestamp: new Date().toISOString(),
+            });
+            if (state.spec.requiredResources && state.spec.requiredResources.length > 0) {
+                this.domain.internalReleaseResources(serviceLeaseHolder, state.spec.requiredResources);
+            }
+            state.stdoutStream.end();
+            return;
+        }
+        // 4. 异常退出：评估重启策略 (ARCHITECTURE §3.8 / D19)
+        const restart = state.spec.restart;
+        const shouldRestart = restart &&
+            restart !== 'never' &&
+            restart.policy === 'on-failure' &&
+            state.attemptCount < restart.maxRestarts;
+        if (shouldRestart) {
+            state.attemptCount++;
+            const newInstanceIndex = state.attemptCount + 1;
+            const newOpId = `${state.serviceId}#${newInstanceIndex}`;
+            store.recordEventAndTransitionState({
+                domainId: this.domain.domainId,
+                runId: state.runId,
+                operationId: state.currentOpId,
+                type: 'SERVICE_RESTARTED',
+                payload: {
+                    serviceId: state.serviceId,
+                    runId: state.runId,
+                    newInstanceIndex,
+                    newOpId,
+                    exitCode: exitResult.exitCode,
+                    signal: exitResult.signal,
+                    attempt: state.attemptCount,
+                },
+                timestamp: new Date().toISOString(),
+            });
+            // 重启间隙租约保持在 service 名下，不释放
+            state.restartTimer = setTimeout(async () => {
+                state.restartTimer = null;
+                if (state.stopRequested || this.domain.isClosed())
+                    return;
+                await this.spawnInstance(state, newInstanceIndex);
+            }, restart.backoffMs);
+        }
+        else {
+            // 超过重启上限或 restart: never
+            state.status = 'failed';
+            store.recordEventAndTransitionState({
+                domainId: this.domain.domainId,
+                runId: state.runId,
+                operationId: state.currentOpId,
+                type: 'SERVICE_FAILED',
+                payload: {
+                    serviceId: state.serviceId,
+                    runId: state.runId,
+                    maxRestartsExceeded: restart !== 'never' && state.attemptCount >= (restart?.maxRestarts ?? 0),
+                    exitCode: exitResult.exitCode,
+                    signal: exitResult.signal,
+                },
+                timestamp: new Date().toISOString(),
+            });
+            if (state.spec.requiredResources && state.spec.requiredResources.length > 0) {
+                this.domain.internalReleaseResources(serviceLeaseHolder, state.spec.requiredResources);
+            }
+            state.stdoutStream.end();
+        }
+    }
+    async stopService(serviceId, graceMs = 2000) {
+        const state = this.activeServices.get(serviceId);
+        if (!state)
+            return;
+        if (state.status === 'stopped' || state.status === 'failed')
+            return state.stopPromise;
+        // 停止流水线已在进行（例如 readiness 超时触发的停止）：加入同一个结果，避免重复终态写入
+        if (state.status === 'stopping')
+            return state.stopPromise;
+        state.stopRequested = true;
+        state.status = 'stopping';
+        if (state.restartTimer) {
+            clearTimeout(state.restartTimer);
+            state.restartTimer = null;
+            state.status = 'stopped';
+            const serviceLeaseHolder = `service:${state.serviceId}`;
+            if (state.spec.requiredResources && state.spec.requiredResources.length > 0) {
+                this.domain.internalReleaseResources(serviceLeaseHolder, state.spec.requiredResources);
+            }
+            const store = this.domain.getStore();
+            store.recordEventAndTransitionState({
+                domainId: this.domain.domainId,
+                runId: state.runId,
+                operationId: state.currentOpId,
+                type: 'SERVICE_STOPPED',
+                payload: { serviceId: state.serviceId, runId: state.runId, reason: 'stopped' },
+                timestamp: new Date().toISOString(),
+            });
+            state.stdoutStream.end();
+            state.stopResolve();
+            return state.stopPromise;
+        }
+        if (state.currentProcessHandle) {
+            let stopRes;
+            try {
+                stopRes = await this.driver.terminate(state.currentProcessHandle.identity, graceMs);
+            }
+            catch (err) {
+                stopRes = { stopped: 'cannot_determine', scope: 'unknown', errorDetails: err?.message ?? String(err) };
+            }
+            // 有界等待根进程退出事实：停止未确认时根进程可能仍活着，不能无限挂起调用方
+            const rootExitBoundMs = 1000;
+            const rootExited = await Promise.race([
+                state.onInstanceExit.then(() => true),
+                new Promise((resolve) => setTimeout(() => resolve(false), rootExitBoundMs)),
+            ]);
+            this.finalizeStop(state, stopRes, rootExited);
+        }
+        else {
+            state.status = 'stopped';
+            state.stopResolve();
+        }
+        return state.stopPromise;
+    }
+    /**
+     * 显式停止的唯一终态写入点：只有驱动确认整组已停且观测到根进程退出，才记录实例结果并释放 service 租约；
+     * 否则实例记为 indeterminate、租约保留，等待人工裁决（与 ProcessSupervisor 的 No premature release 一致）。
+     */
+    finalizeStop(state, stopRes, rootExited) {
+        const store = this.domain.getStore();
+        const serviceLeaseHolder = `service:${state.serviceId}`;
+        const pending = state.pendingInstanceResult;
+        state.pendingInstanceResult = undefined;
+        const confirmed = stopRes.stopped === 'confirmed_stopped' && rootExited && pending !== undefined;
+        const now = new Date().toISOString();
+        if (confirmed) {
+            const failed = state.failureReason !== undefined;
+            // 与 ProcessSupervisor 的取消语义一致：显式停止的实例记为 cancelled（被信号终止不是"失败"），
+            // readiness 超时等内核判定的失败记为 failed
+            const finalResult = failed
+                ? { ...pending, status: 'failed' }
+                : { ...pending, status: 'cancelled', terminationReason: 'user_cancelled' };
+            store.recordOperationResult(state.currentOpId, finalResult);
+            state.status = failed ? 'failed' : 'stopped';
+            store.recordEventAndTransitionState({
+                domainId: this.domain.domainId,
+                runId: state.runId,
+                operationId: state.currentOpId,
+                type: failed ? 'SERVICE_FAILED' : 'SERVICE_STOPPED',
+                payload: {
+                    serviceId: state.serviceId,
+                    runId: state.runId,
+                    reason: failed ? state.failureReason : 'stopped',
+                },
+                timestamp: now,
+            });
+            if (state.spec.requiredResources && state.spec.requiredResources.length > 0) {
+                this.domain.internalReleaseResources(serviceLeaseHolder, state.spec.requiredResources);
+            }
+        }
+        else {
+            const op = store.getOperation(state.currentOpId);
+            if (op && op.status !== 'done') {
+                const indetResult = {
+                    kind: 'indeterminate',
+                    status: 'indeterminate',
+                    reason: `Service "${state.serviceId}" instance ${state.currentOpId} stop could not be confirmed (driver: ${stopRes.stopped}, rootExited: ${rootExited})${stopRes.errorDetails ? `: ${stopRes.errorDetails}` : ''}`,
+                    recoveryGuidance: 'Inspect residual processes manually, then adjudicate the instance operation before releasing the service leases.',
+                    durationMs: Date.now() - state.instanceStartedAt,
+                    completedAt: now,
+                };
+                store.recordOperationResult(state.currentOpId, indetResult, false);
+            }
+            state.status = 'failed';
+            store.recordEventAndTransitionState({
+                domainId: this.domain.domainId,
+                runId: state.runId,
+                operationId: state.currentOpId,
+                type: 'SERVICE_FAILED',
+                payload: {
+                    serviceId: state.serviceId,
+                    runId: state.runId,
+                    reason: 'stop_unconfirmed',
+                    stopped: stopRes.stopped,
+                    rootExited,
+                    ...(stopRes.residualPids ? { residualPids: stopRes.residualPids } : {}),
+                },
+                timestamp: now,
+            });
+            // 租约保留在 service 名下，不释放
+        }
+        state.stdoutStream.end();
+        state.stopResolve();
+    }
+    close() {
+        for (const state of this.activeServices.values()) {
+            if (state.restartTimer) {
+                clearTimeout(state.restartTimer);
+                state.restartTimer = null;
+            }
+            if (state.status === 'starting' || state.status === 'running') {
+                this.stopService(state.serviceId, 500).catch(() => { });
+            }
+        }
+        this.activeServices.clear();
+    }
+    computeServiceFingerprint(spec) {
+        const canonical = {
+            serviceId: spec.serviceId,
+            runId: spec.runId,
+            execPath: spec.command.execPath,
+            args: spec.command.args,
+            cwd: spec.command.cwd,
+            requiredResources: [...(spec.requiredResources || [])].sort(),
+        };
+        return crypto.createHash('sha256').update(JSON.stringify(canonical)).digest('hex');
+    }
+}
+/**
+ * The journal is an audit record on disk: env values, argument values and
+ * stdin can carry credentials (`--api-key …`, `GITHUB_TOKEN=…`), so only their
+ * shape is kept. `inputFingerprint` still identifies the exact command.
+ */
+function journalSafeCommand(command) {
+    return {
+        execPath: command.execPath,
+        cwd: command.cwd,
+        argCount: command.args.length,
+        envKeys: command.envWhiteList ? Object.keys(command.envWhiteList).sort() : undefined,
+        inheritEnv: command.inheritEnv,
+        hasStdin: command.stdin !== undefined,
+    };
+}
+//# sourceMappingURL=service.js.map

package/dist/supervisor/service.js.map

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