@cjhyy/code-shell-server 0.9.44 → 0.9.47

package/dist/panels/execution-gate.js

@@ -10,9 +10,13 @@ export function panelExecutionProject(path) {
     }
 }
 export class PanelExecutionBusyError extends Error {
+    blockers;
     status = 409;
-    constructor(message) {
+    constructor(message, 
+    /** Present when executions block a change; empty while another change runs. */
+    blockers = []) {
         super(message);
+        this.blockers = blockers;
         this.name = "PanelExecutionBusyError";
     }
 }
@@ -25,7 +29,11 @@ export class PanelExecutionGate {
     sources = new Set();
     mutations = new Set();
     enter(scope) {
-        const held = { appId: scope.appId, projectPath: panelExecutionProject(scope.projectPath) };
+        const held = {
+            appId: scope.appId,
+            projectPath: panelExecutionProject(scope.projectPath),
+            ...(scope.holder ? { holder: { ...scope.holder } } : {}),
+        };
         if ([...this.mutations].some((matches) => matches(held)))
             throw new PanelExecutionBusyError("面板正在更新，请完成后重试。");
         this.executions.add(held);
@@ -49,13 +57,33 @@ export class PanelExecutionGate {
             this.sources.delete(source);
         };
     }
+    /** Executions that a change matching `matches` would wait for, grouped by holder. */
+    blockers(matches) {
+        const grouped = new Map();
+        const scopes = [...this.executions, ...[...this.sources].flatMap((source) => [...source()])];
+        for (const scope of scopes) {
+            if (!matches(scope))
+                continue;
+            const blocker = {
+                appId: scope.appId,
+                projectPath: scope.projectPath,
+                ...(scope.holder ? { holder: { ...scope.holder } } : {}),
+            };
+            const key = JSON.stringify(blocker), existing = grouped.get(key);
+            if (existing)
+                existing.count++;
+            else
+                grouped.set(key, { ...blocker, count: 1 });
+        }
+        return [...grouped.values()];
+    }
     async mutate(matches, work) {
         if (this.mutations.size)
             throw new PanelExecutionBusyError("另一个面板修改正在进行，请稍后重试。");
         // No await between the snapshot and installing the admission barrier.
-        if ([...this.executions].some(matches) ||
-            [...this.sources].some((source) => [...source()].some(matches)))
-            throw new PanelExecutionBusyError("面板还有正在提交、排队或运行的任务，请结束后再修改。");
+        const blockers = this.blockers(matches);
+        if (blockers.length)
+            throw new PanelExecutionBusyError("面板还有正在提交、排队或运行的任务，请结束后再修改。", blockers);
         this.mutations.add(matches);
         try {
             return await work();

package/dist/panels/http.d.ts

@@ -7,6 +7,7 @@ import { type PanelAgentTaskHostOptions } from "./agent-task-host.js";
 import type { PanelProjectScopeBinding } from "./project-scope.js";
 export declare function createPanelHttp(options: PanelManagementHttpOptions & {
     dataDir: string;
+    traceStorageDir?: string;
     host: "hub" | "desktop";
     projectScope?: () => Promise<PanelProjectScopeBinding | undefined>;
     publicPathPrefix?: string;

package/dist/panels/hub-automations.js

@@ -98,6 +98,7 @@ export function createHubPanelAutomationHost(options) {
                 releaseExecution = panelExecutionGate.enter({
                     appId: job.panelSource.appId,
                     projectPath: options.bindingCwd ?? cwd,
+                    holder: { kind: "automation" },
                 });
             }
             try {

package/dist/panels/hub-binding.js

@@ -9,7 +9,7 @@ function refused() {
 }
 function metadata(file) {
     try {
-        return lstatSync(file);
+        return lstatSync(file, { bigint: true });
     }
     catch (error) {
         if (error.code === "ENOENT")
@@ -20,8 +20,8 @@ function metadata(file) {
 function readPointer(file) {
     const descriptor = openSync(file, constants.O_RDONLY | (constants.O_NOFOLLOW ?? 0) | (constants.O_NONBLOCK ?? 0));
     try {
-        const info = fstatSync(descriptor);
-        if (!info.isFile() || info.size > 8192)
+        const info = fstatSync(descriptor, { bigint: true });
+        if (!info.isFile() || info.size > 8192n)
             refused();
         const content = readFileSync(descriptor, "utf8");
         if (Buffer.byteLength(content) > 8192 || content.includes("\0"))
@@ -54,13 +54,13 @@ function sameIdentity(actual, expected) {
 }
 function directoryGuard(path) {
     const canonical = realpathSync(path);
-    const info = lstatSync(canonical);
+    const info = lstatSync(canonical, { bigint: true });
     if (!info.isDirectory() || info.isSymbolicLink())
         refused();
     return () => {
         if (realpathSync(path) !== canonical)
             refused();
-        const current = lstatSync(canonical);
+        const current = lstatSync(canonical, { bigint: true });
         if (!current.isDirectory() || current.isSymbolicLink() || !sameIdentity(current, info))
             refused();
     };

package/dist/panels/model-trace-channel.d.ts

@@ -0,0 +1,21 @@
+import { PanelModelTraceService, type PanelModelTraceOwner } from "./model-traces.js";
+/** A dedicated reviewed-child descriptor; ordinary stdout/stderr never become prompts. */
+export declare class PanelModelTraceChannel {
+    private readonly options;
+    private readonly decoder;
+    private readonly frames;
+    private buffer;
+    private readonly calls;
+    private tail;
+    private stopped;
+    private pending;
+    constructor(options: {
+        service: PanelModelTraceService;
+        owner: PanelModelTraceOwner;
+        isAuthorized(): Promise<boolean>;
+    });
+    write(chunk: Buffer | string): void;
+    finish(status: "cancelled" | "failed"): Promise<void>;
+    abort(status?: "cancelled" | "failed"): void;
+    private consume;
+}

package/dist/panels/model-trace-channel.js

@@ -0,0 +1,110 @@
+import { StringDecoder } from "node:string_decoder";
+import { createNativeModelTraceFrameDecoder } from "@cjhyy/code-shell-core/internal";
+import { panelModelTraceLimits, } from "./model-traces.js";
+/** A dedicated reviewed-child descriptor; ordinary stdout/stderr never become prompts. */
+export class PanelModelTraceChannel {
+    options;
+    decoder = new StringDecoder("utf8");
+    frames = createNativeModelTraceFrameDecoder();
+    buffer = "";
+    calls = new Map();
+    tail = Promise.resolve();
+    stopped = false;
+    pending = 0;
+    constructor(options) {
+        this.options = options;
+    }
+    write(chunk) {
+        if (this.stopped)
+            return;
+        this.buffer += typeof chunk === "string" ? chunk : this.decoder.write(chunk);
+        let newline;
+        while ((newline = this.buffer.indexOf("\n")) >= 0) {
+            const physical = this.buffer.slice(0, newline);
+            this.buffer = this.buffer.slice(newline + 1);
+            if (!physical.trim())
+                continue;
+            let line;
+            try {
+                if (Buffer.byteLength(physical) > panelModelTraceLimits.maxParamsBytes)
+                    throw new Error("Oversized model observation");
+                line = this.frames.read(physical);
+            }
+            catch {
+                this.abort("failed");
+                return;
+            }
+            if (line === undefined || !line.trim())
+                continue;
+            if (++this.pending > 128) {
+                this.abort("failed");
+                return;
+            }
+            this.tail = this.tail.then(async () => {
+                try {
+                    if (this.stopped || !(await this.options.isAuthorized())) {
+                        this.abort();
+                        return;
+                    }
+                    if (this.stopped)
+                        return;
+                    this.consume(line);
+                }
+                catch {
+                    this.abort("failed");
+                }
+                finally {
+                    this.pending--;
+                }
+            });
+        }
+        if (Buffer.byteLength(this.buffer) > panelModelTraceLimits.maxParamsBytes)
+            this.abort("failed");
+    }
+    async finish(status) {
+        this.buffer += this.decoder.end();
+        if (this.buffer.trim())
+            this.write("\n");
+        await this.tail;
+        this.abort(status);
+    }
+    abort(status = "cancelled") {
+        this.stopped = true;
+        this.buffer = "";
+        this.calls.clear();
+        this.frames.clear();
+        this.options.service.cancelOwner(this.options.owner.ownerKey, status);
+    }
+    consume(line) {
+        if (!line.trim())
+            return;
+        const value = JSON.parse(line);
+        if (!value ||
+            typeof value !== "object" ||
+            Array.isArray(value) ||
+            value.version !== 1 ||
+            value.type !== "model_trace" ||
+            !["start", "finish"].includes(value.phase) ||
+            typeof value.callId !== "string" ||
+            !/^[a-zA-Z0-9_-]{1,128}$/.test(value.callId))
+            throw new Error("Invalid model observation channel message");
+        const { version: _version, type: _type, phase, callId, ...params } = value;
+        if (Object.hasOwn(params, "id"))
+            throw new Error("Child cannot select a Host observation id");
+        if (phase === "start") {
+            if (this.calls.has(callId))
+                throw new Error("Duplicate model observation call");
+            const result = this.options.service.call(this.options.owner, "modelTraces.start", params);
+            if (!("id" in result))
+                throw new Error("Model observation was not started");
+            this.calls.set(callId, result.id);
+        }
+        else {
+            const id = this.calls.get(callId);
+            if (!id)
+                throw new Error("Unknown model observation call");
+            this.options.service.call(this.options.owner, "modelTraces.finish", { ...params, id });
+            this.calls.delete(callId);
+        }
+    }
+}

package/dist/panels/model-traces.d.ts

@@ -0,0 +1,39 @@
+export declare const panelModelTraceMethods: string[];
+export declare const panelModelTraceLimits: Readonly<{
+    maxParamsBytes: number;
+    maxActivePerOwner: 64;
+    maxActive: 2048;
+    maxCallsPerMinute: 240;
+    maxLifetimeMs: number;
+}>;
+/** Supplied by a verified Host binding; no field is taken from an observation. */
+export interface PanelModelTraceOwner {
+    ownerKey: string;
+    appId: string;
+    revision: string;
+    workspacePath: string;
+    sessionId?: string;
+    traceId?: string;
+    taskId?: string;
+}
+/** Write-only Panel observations share the Host's policy, sanitization and history store. */
+export declare class PanelModelTraceService {
+    private readonly options;
+    private readonly active;
+    private readonly calls;
+    constructor(options?: {
+        storageDir?: string;
+        now?: () => number;
+    });
+    call(owner: PanelModelTraceOwner, method: string, params: unknown): {
+        id: string;
+        recorded: boolean;
+    } | {
+        recorded: boolean;
+    };
+    cancelOwner(ownerKey: string, status?: "cancelled" | "failed"): void;
+    closeAll(): void;
+    private close;
+    private now;
+    private prune;
+}

package/dist/panels/model-traces.js

@@ -0,0 +1,222 @@
+import { randomUUID } from "node:crypto";
+import { isAbsolute } from "node:path";
+import { recordExternalModelTrace, } from "@cjhyy/code-shell-core/internal";
+import { PanelBridgeError } from "./bridge-contract.js";
+export const panelModelTraceMethods = ["modelTraces.start", "modelTraces.finish"];
+export const panelModelTraceLimits = Object.freeze({
+    maxParamsBytes: 256 * 1024,
+    maxActivePerOwner: 64,
+    maxActive: 2048,
+    maxCallsPerMinute: 240,
+    maxLifetimeMs: 24 * 60 * 60 * 1000,
+});
+function invalid(message = "Invalid Panel model observation") {
+    throw new PanelBridgeError("INVALID_ARGUMENT", message);
+}
+function object(value, keys) {
+    if (!value || typeof value !== "object" || Array.isArray(value))
+        invalid();
+    if (Object.keys(value).some((key) => !keys.includes(key)))
+        invalid();
+    return value;
+}
+function label(value, optional = false) {
+    if (optional && value === undefined)
+        return undefined;
+    if (typeof value !== "string" || !value.trim() || value.length > 200 || /[\x00-\x1f]/.test(value))
+        invalid();
+    return value;
+}
+function usage(value) {
+    if (value === undefined)
+        return undefined;
+    const input = object(value, [
+        "promptTokens",
+        "completionTokens",
+        "totalTokens",
+        "cacheReadTokens",
+        "cacheCreationTokens",
+    ]);
+    for (const key of ["promptTokens", "completionTokens", "totalTokens"])
+        if (input[key] === undefined)
+            invalid("Model usage requires token counts");
+    for (const number of Object.values(input))
+        if (!Number.isSafeInteger(number) || Number(number) < 0)
+            invalid("Invalid model usage");
+    return input;
+}
+/** Write-only Panel observations share the Host's policy, sanitization and history store. */
+export class PanelModelTraceService {
+    options;
+    active = new Map();
+    calls = new Map();
+    constructor(options = {}) {
+        this.options = options;
+    }
+    call(owner, method, params) {
+        if (!owner.ownerKey ||
+            !/^[a-z][a-z0-9-]{0,63}$/.test(owner.appId) ||
+            !owner.revision ||
+            !isAbsolute(owner.workspacePath))
+            invalid("Invalid Host model observation owner");
+        if (!panelModelTraceMethods.includes(method))
+            invalid("Unsupported model observation method");
+        const encoded = JSON.stringify(params);
+        if (!encoded || Buffer.byteLength(encoded) > panelModelTraceLimits.maxParamsBytes)
+            throw new PanelBridgeError("PARAMS_TOO_LARGE", "Panel model observation exceeds the limit");
+        const now = this.now();
+        this.prune(now);
+        const calls = (this.calls.get(owner.ownerKey) ?? []).filter((time) => now - time < 60_000);
+        if (calls.length >= panelModelTraceLimits.maxCallsPerMinute)
+            throw new PanelBridgeError("RATE_LIMITED", "Panel model observation rate limit exceeded");
+        calls.push(now);
+        this.calls.set(owner.ownerKey, calls);
+        if (method === "modelTraces.start") {
+            const value = object(params, [
+                "provider",
+                "model",
+                "purpose",
+                "input",
+                "inputState",
+                "stream",
+            ]);
+            const provider = label(value.provider);
+            const model = label(value.model);
+            const purpose = label(value.purpose, true) ?? "model";
+            if (value.stream !== undefined && typeof value.stream !== "boolean")
+                invalid();
+            if (value.inputState !== undefined && value.inputState !== "truncated")
+                invalid();
+            const body = object(value.input, ["systemPrompt", "messages", "tools", "parameters"]);
+            if (body.systemPrompt !== undefined && typeof body.systemPrompt !== "string")
+                invalid();
+            for (const key of ["messages", "tools"])
+                if (body[key] !== undefined && !Array.isArray(body[key]))
+                    invalid();
+            if (body.parameters !== undefined &&
+                (!body.parameters || typeof body.parameters !== "object" || Array.isArray(body.parameters)))
+                invalid();
+            if (this.active.size >= panelModelTraceLimits.maxActive ||
+                [...this.active.values()].filter((item) => item.ownerKey === owner.ownerKey).length >=
+                    panelModelTraceLimits.maxActivePerOwner)
+                throw new PanelBridgeError("RATE_LIMITED", "Too many active Panel model observations");
+            const input = {
+                storageDir: this.options.storageDir,
+                workspacePath: owner.workspacePath,
+                ephemeral: false,
+                sessionId: owner.sessionId,
+                parentSessionId: undefined,
+                runId: owner.traceId,
+                source: `panel:${owner.appId}`,
+                purpose: `panel/${purpose}`,
+                provider,
+                model,
+                startedAt: now,
+                status: "running",
+                stream: value.stream,
+                coverage: "logical-input",
+                inputState: value.inputState,
+                input: {
+                    systemPrompt: body.systemPrompt ?? "",
+                    messages: body.messages ?? [],
+                    tools: body.tools ?? [],
+                    parameters: {
+                        ...body.parameters,
+                        codeshellPanel: {
+                            appId: owner.appId,
+                            revision: owner.revision,
+                            ...(owner.taskId ? { taskId: owner.taskId } : {}),
+                        },
+                    },
+                },
+            };
+            const record = recordExternalModelTrace(input);
+            const id = record?.id ?? randomUUID();
+            // Retain only already-sanitized content. Disabled recording never resumes mid-call.
+            this.active.set(id, {
+                ownerKey: owner.ownerKey,
+                ownerIdentity: JSON.stringify([
+                    owner.appId,
+                    owner.revision,
+                    owner.workspacePath,
+                    owner.sessionId,
+                ]),
+                recordId: record?.id,
+                startedAt: now,
+                input: { ...input, input: undefined },
+            });
+            return { id, recorded: !!record };
+        }
+        const value = object(params, ["id", "status", "output", "outputState", "error", "usage"]);
+        if (typeof value.id !== "string" || !/^[a-f0-9-]{36}$/i.test(value.id))
+            invalid();
+        const observation = this.active.get(value.id);
+        if (!observation ||
+            observation.ownerKey !== owner.ownerKey ||
+            observation.ownerIdentity !==
+                JSON.stringify([owner.appId, owner.revision, owner.workspacePath, owner.sessionId]))
+            throw new PanelBridgeError("REVOKED", "Model observation is unavailable for this Panel owner");
+        if (!["completed", "failed", "cancelled"].includes(String(value.status)))
+            invalid();
+        if (value.outputState !== undefined && value.outputState !== "truncated")
+            invalid();
+        const output = value.output === undefined
+            ? undefined
+            : object(value.output, ["text", "thinking", "toolCalls", "stopReason", "data"]);
+        for (const key of ["text", "thinking", "stopReason"])
+            if (output?.[key] !== undefined && typeof output[key] !== "string")
+                invalid();
+        if (output?.toolCalls !== undefined && !Array.isArray(output.toolCalls))
+            invalid();
+        if (value.error !== undefined && typeof value.error !== "string")
+            invalid();
+        const tokens = usage(value.usage);
+        this.active.delete(value.id);
+        const record = observation.recordId
+            ? recordExternalModelTrace({
+                ...observation.input,
+                id: observation.recordId,
+                endedAt: now,
+                status: value.status,
+                output,
+                outputState: value.outputState,
+                error: value.error,
+                usage: tokens,
+            })
+            : null;
+        return { recorded: !!record };
+    }
+    cancelOwner(ownerKey, status = "cancelled") {
+        for (const [id, observation] of this.active)
+            if (observation.ownerKey === ownerKey)
+                this.close(id, observation, status);
+        this.calls.delete(ownerKey);
+    }
+    closeAll() {
+        for (const [id, observation] of this.active)
+            this.close(id, observation, "cancelled");
+        this.calls.clear();
+    }
+    close(id, observation, status) {
+        this.active.delete(id);
+        if (observation.recordId)
+            recordExternalModelTrace({
+                ...observation.input,
+                id: observation.recordId,
+                endedAt: this.now(),
+                status,
+                error: status === "failed" ? "Panel process exited before the model call finished" : undefined,
+            });
+    }
+    now() {
+        return (this.options.now ?? Date.now)();
+    }
+    prune(now) {
+        for (const [id, observation] of this.active)
+            if (now - observation.startedAt > panelModelTraceLimits.maxLifetimeMs)
+                this.close(id, observation, "cancelled");
+        for (const [owner, calls] of this.calls)
+            if (calls.every((time) => now - time >= 60_000))
+                this.calls.delete(owner);
+    }
+}

package/dist/panels/process-service.d.ts

@@ -1,3 +1,4 @@
+import type { PanelModelTraceService, PanelModelTraceOwner } from "./model-traces.js";
 export { processLimits } from "./process-state.js";
 export interface PanelProcessApprovalScope {
     appId: string;
@@ -13,6 +14,9 @@ export interface PanelProcessOwner {
     send(event: "process.output" | "process.exit", payload: Record<string, unknown>): void;
 }
 export interface PanelAppProcessServiceOptions {
+    /** Dedicated descriptor only for a verified installed package entry. */
+    modelTraces?: PanelModelTraceService;
+    modelTraceOwner?(owner: PanelProcessOwner): Omit<PanelModelTraceOwner, "ownerKey"> | undefined;
     /** Host lease from before async preparation until the actual process group has exited. */
     acquireExecution?(owner: PanelProcessOwner): () => void;
     env?: NodeJS.ProcessEnv;
@@ -159,7 +163,13 @@ export declare class PanelAppProcessService {
     }>;
     private sendInput;
     revokeGuest(guestId: number): void;
-    /** Permanently shut down all guests, including operations awaiting approval. */
-    close(): void;
+    /**
+     * Permanently shut down all guests, including operations awaiting approval.
+     * Resolves once every native process group has exited or been force-killed:
+     * escalation runs on a Host timer, so a Host that exits earlier would leave
+     * a process ignoring SIGTERM running.
+     */
+    close(): Promise<void>;
+    private shutDown;
     private terminate;
 }

package/dist/panels/process-service.js

@@ -4,6 +4,7 @@ import { constants, lstatSync, realpathSync } from "node:fs";
 import { access, realpath, stat } from "node:fs/promises";
 import { basename, delimiter, extname, join } from "node:path";
 import { killProcessGroup } from "@cjhyy/code-shell-core/extension";
+import { PanelModelTraceChannel } from "./model-trace-channel.js";
 import { verifyProcessEntry } from "./process-entry.js";
 import { appendProcessEvent, ProcessReceipts, processLimits, sameProcessOwner, } from "./process-state.js";
 export { processLimits } from "./process-state.js";
@@ -231,7 +232,7 @@ export class PanelAppProcessService {
         options.assertCurrent?.();
         await this.authorize(owner, epoch);
         options.assertCurrent?.();
-        const info = await stat(resolved);
+        const info = await stat(resolved, { bigint: true });
         options.assertCurrent?.();
         await this.authorize(owner, epoch);
         options.assertCurrent?.();
@@ -327,7 +328,7 @@ export class PanelAppProcessService {
         }
         // Final synchronous identity check preserves the existing handle API and avoids
         // an await between validating a cwd and spawning the child into that directory.
-        const current = lstatSync(grant.path);
+        const current = lstatSync(grant.path, { bigint: true });
         if (!current.isDirectory() ||
             current.isSymbolicLink() ||
             current.dev !== grant.dev ||
@@ -518,12 +519,22 @@ export class PanelAppProcessService {
             if (!this.options.allowAuthorizedProcessWithoutPrompt)
                 this.approvedExecutables.add(approvalKey);
             const processId = randomUUID();
+            const modelTraceOwner = entry && this.options.modelTraces ? this.options.modelTraceOwner?.(owner) : undefined;
+            // Never inherit a caller's descriptor claim for an ordinary executable.
+            delete env.CODESHELL_MODEL_TRACE_FD;
+            if (modelTraceOwner)
+                env.CODESHELL_MODEL_TRACE_FD = "3";
             const child = spawn(executable.path, args, {
                 cwd,
                 detached: process.platform !== "win32",
                 env,
                 shell: false,
-                stdio: [input.stdin === "pipe" ? "pipe" : "ignore", "pipe", "pipe"],
+                stdio: [
+                    input.stdin === "pipe" ? "pipe" : "ignore",
+                    "pipe",
+                    "pipe",
+                    ...(modelTraceOwner ? ["pipe"] : []),
+                ],
                 windowsHide: true,
             });
             const record = {
@@ -607,6 +618,28 @@ export class PanelAppProcessService {
                 }),
             };
             this.processes.set(processId, running);
+            if (modelTraceOwner && this.options.modelTraces) {
+                const channel = new PanelModelTraceChannel({
+                    service: this.options.modelTraces,
+                    owner: {
+                        ...modelTraceOwner,
+                        ownerKey: `process:${processId}`,
+                        traceId: modelTraceOwner.traceId ?? processId,
+                    },
+                    isAuthorized: async () => {
+                        try {
+                            await this.authorize(owner, epoch);
+                            return this.processes.get(processId) === running && !running.termination;
+                        }
+                        catch {
+                            return false;
+                        }
+                    },
+                });
+                running.modelTraceChannel = channel;
+                child.stdio[3]?.on("data", (chunk) => channel.write(chunk));
+                child.stdio[3]?.on("error", () => channel.abort("failed"));
+            }
             let checkingInputs = false;
             const inputChecks = fileArgumentHandles.some((handle) => this.fileArguments.get(handle)?.validate)
                 ? setInterval(() => {
@@ -651,6 +684,7 @@ export class PanelAppProcessService {
                             });
                         }
                     }
+                    await running.modelTraceChannel?.finish(record.cancelRequested ? "cancelled" : "failed");
                     finishExit({ code: finalCode, signal });
                     this.retiring.delete(processId);
                     if (this.processes.get(processId)?.child !== child)
@@ -879,10 +913,18 @@ export class PanelAppProcessService {
             }
         }
     }
-    /** Permanently shut down all guests, including operations awaiting approval. */
+    /**
+     * Permanently shut down all guests, including operations awaiting approval.
+     * Resolves once every native process group has exited or been force-killed:
+     * escalation runs on a Host timer, so a Host that exits earlier would leave
+     * a process ignoring SIGTERM running.
+     */
     close() {
-        if (this.closed)
-            return;
+        if (!this.closed)
+            this.shutDown();
+        return Promise.all([...this.retiring.values()].map((running) => running.termination ?? Promise.resolve())).then(() => undefined);
+    }
+    shutDown() {
         this.closed = true;
         const guests = new Set([
             ...this.guestEpochs.keys(),
@@ -901,6 +943,7 @@ export class PanelAppProcessService {
     terminate(running) {
         if (running.termination)
             return;
+        running.modelTraceChannel?.abort();
         running.record.cancelRequested = true;
         running.record.status = "stopping";
         const pid = running.child.pid;