@cjhyy/code-shell-server 0.9.46 → 0.9.48

package/dist/mobile-remote/room-process-stop.js

@@ -0,0 +1,46 @@
+/** Retire an unusable room transport without leaving an unresponsive CLI alive. */
+export function stopRoomProcess(child) {
+    if (child.exitCode !== null || child.signalCode !== null)
+        return;
+    const signal = (value) => {
+        if (child.pid && child.pid > 1 && process.platform !== "win32") {
+            try {
+                process.kill(-child.pid, value);
+                return;
+            }
+            catch {
+                /* A failed spawn or an exited group falls back to the exact child. */
+            }
+        }
+        try {
+            child.kill(value);
+        }
+        catch {
+            /* already gone */
+        }
+    };
+    signal("SIGTERM");
+    if (!child.pid)
+        return;
+    const timer = setTimeout(() => signal("SIGKILL"), 1_000);
+    timer.unref();
+    child.once("exit", () => clearTimeout(timer));
+}
+/**
+ * `close` waits for every holder of the child's stdout/stderr. A grandchild the
+ * CLI backgrounded with inherited stdio (a dev server, say) keeps them open
+ * after the CLI exits, so the room would never settle. Once the CLI has exited
+ * and its buffered output had a grace period to drain, release the pipes;
+ * the grandchild itself is left running.
+ */
+export function releaseStdioAfterExit(child, graceMs = 1_000) {
+    child.once("exit", () => {
+        const timer = setTimeout(() => {
+            child.stdout?.destroy();
+            child.stderr?.destroy();
+            child.stdin?.destroy();
+        }, graceMs);
+        timer.unref();
+        child.once("close", () => clearTimeout(timer));
+    });
+}

package/dist/panels/agent-task-service.d.ts

@@ -96,7 +96,8 @@ export declare class PanelAppAgentTaskService {
     get(owner: PanelAgentTaskOwner, id: unknown): PanelAgentTaskView;
     cancel(owner: PanelAgentTaskOwner, id: unknown): Promise<PanelAgentTaskView>;
     rebind(owner: PanelAgentTaskOwner): void;
-    cancelApp(appId: string): void;
+    /** `projects` limits cancellation to tasks bound to those (canonical) projects. */
+    cancelApp(appId: string, projects?: ReadonlySet<string>): void;
     private execute;
     private scopedTask;
     private emit;

package/dist/panels/agent-task-service.js

@@ -1,4 +1,4 @@
-import { panelExecutionGate } from "./execution-gate.js";
+import { panelExecutionGate, panelExecutionProject } from "./execution-gate.js";
 import { randomUUID } from "node:crypto";
 const MAX_TASKS = 200;
 const MAX_PROMPT_CHARS = 20_000;
@@ -131,7 +131,11 @@ export class PanelAppAgentTaskService {
             cancelRequested: false,
             activity: [],
         };
-        const release = panelExecutionGate.enter(owner);
+        const release = panelExecutionGate.enter({
+            appId: owner.appId,
+            projectPath: owner.projectPath,
+            holder: { kind: "agent-task", guestId: owner.guestId },
+        });
         this.tasks.set(task.id, task);
         this.trimHistory();
         this.emit(task);
@@ -174,10 +178,13 @@ export class PanelAppAgentTaskService {
             this.runtime.rebind(task.sessionId, task.owner);
         }
     }
-    cancelApp(appId) {
+    /** `projects` limits cancellation to tasks bound to those (canonical) projects. */
+    cancelApp(appId, projects) {
         for (const task of this.tasks.values()) {
             if (task.owner.appId !== appId || TERMINAL_STATUSES.has(task.status))
                 continue;
+            if (projects && !projects.has(panelExecutionProject(task.owner.projectPath)))
+                continue;
             task.cancelRequested = true;
             task.status = "cancelling";
             task.updatedAt = this.now();

package/dist/panels/execution-gate.d.ts

@@ -1,13 +1,29 @@
+/** What holds an execution, so a refused change can name it. Host-assigned only. */
+export interface PanelExecutionHolder {
+    kind: "panel-call" | "agent-tool" | "process" | "agent-task" | "tool-job" | "automation";
+    /** Desktop WebContents id of the Panel instance that owns this execution. */
+    guestId?: number;
+    /** Trusted Host description, such as a native tool entry name. */
+    label?: string;
+}
 export interface PanelExecutionScope {
     appId: string;
     /** Host-verified binding project, never a directory supplied by the guest. */
     projectPath: string;
+    holder?: PanelExecutionHolder;
+}
+export interface PanelExecutionBlocker extends PanelExecutionScope {
+    count: number;
 }
 /** Existing path aliases must not create separate admission domains. */
 export declare function panelExecutionProject(path: string): string;
 export declare class PanelExecutionBusyError extends Error {
+    /** Present when executions block a change; empty while another change runs. */
+    readonly blockers: PanelExecutionBlocker[];
     readonly status = 409;
-    constructor(message: string);
+    constructor(message: string, 
+    /** Present when executions block a change; empty while another change runs. */
+    blockers?: PanelExecutionBlocker[]);
 }
 /** One process owns admission for every Panel runtime sharing its installed catalog.
  * Acquire synchronously before authorization/IO; release after real execution cleanup,
@@ -21,6 +37,10 @@ export declare class PanelExecutionGate {
     run<T>(scope: PanelExecutionScope, work: () => Promise<T>): Promise<T>;
     /** Durable queues remain occupied even while paused and between process attempts. */
     register(source: () => Iterable<PanelExecutionScope>): () => void;
-    mutate<T>(matches: (scope: PanelExecutionScope) => boolean, work: () => Promise<T>): Promise<T>;
+    /** Executions that a change matching `matches` would wait for, grouped by holder. */
+    blockers(matches: (scope: PanelExecutionScope) => boolean): PanelExecutionBlocker[];
+    mutate<T>(matches: (scope: PanelExecutionScope) => boolean, work: () => Promise<T>, 
+    /** Trusted Host preparation that validates a review before draining existing work. */
+    drain?: () => Promise<void>): Promise<T>;
 }
 export declare const panelExecutionGate: PanelExecutionGate;

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,15 +57,43 @@ export class PanelExecutionGate {
             this.sources.delete(source);
         };
     }
-    async mutate(matches, work) {
+    /** 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, 
+    /** Trusted Host preparation that validates a review before draining existing work. */
+    drain) {
         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 && !drain)
+            throw new PanelExecutionBusyError("面板还有正在提交、排队或运行的任务，请结束后再修改。", blockers);
         this.mutations.add(matches);
         try {
+            if (drain) {
+                await drain();
+                const remaining = this.blockers(matches);
+                if (remaining.length)
+                    throw new PanelExecutionBusyError("面板还有正在提交、排队或运行的任务，请结束后再修改。", remaining);
+            }
             return await work();
         }
         finally {

package/dist/panels/http.d.ts

@@ -39,6 +39,7 @@ export declare function createPanelHttp(options: PanelManagementHttpOptions & {
         install(context: import("./types.js").PanelOperationContext, token: unknown, bind?: boolean, approval?: {
             overwrite?: boolean;
             expectedId?: string;
+            releaseExecutions?: (appId: string, matches: (scope: import("./execution-gate.js").PanelExecutionScope) => boolean) => Promise<void>;
         }): Promise<{
             id: string;
             packageDigest: string | undefined;

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/management-http.d.ts

@@ -30,6 +30,7 @@ export declare function createPanelManagementHttp(options: PanelManagementHttpOp
         install(context: PanelOperationContext, token: unknown, bind?: boolean, approval?: {
             overwrite?: boolean;
             expectedId?: string;
+            releaseExecutions?: (appId: string, matches: (scope: import("./execution-gate.js").PanelExecutionScope) => boolean) => Promise<void>;
         }): Promise<{
             id: string;
             packageDigest: string | undefined;

package/dist/panels/management.d.ts

@@ -1,3 +1,4 @@
+import { type PanelExecutionScope } from "./execution-gate.js";
 import { type PanelAppPreview, type PanelAppSourceInput } from "@cjhyy/code-shell-core";
 import type { PanelCompatibility, PanelDiscovery, PanelOperationContext, PanelReview, PanelProjectReview, PanelSnapshot, PanelPackageHistory, PanelPackageRestoreReview } from "./types.js";
 export declare class PanelManagementError extends Error {
@@ -50,6 +51,8 @@ export declare function createPanelManagement(options: PanelManagementOptions):
     install(context: PanelOperationContext, token: unknown, bind?: boolean, approval?: {
         overwrite?: boolean;
         expectedId?: string;
+        /** Trusted Host callback, never supplied by an HTTP request body. */
+        releaseExecutions?: (appId: string, matches: (scope: PanelExecutionScope) => boolean) => Promise<void>;
     }): Promise<{
         id: string;
         packageDigest: string | undefined;

package/dist/panels/management.js

@@ -3,7 +3,7 @@ import { panelPackageMutationMatches } from "./package-mutation.js";
 import { createHash, randomBytes } from "node:crypto";
 import { lstatSync, mkdirSync, statSync } from "node:fs";
 import { basename, extname, isAbsolute, join, resolve } from "node:path";
-import { SettingsManager, PanelAppAlreadyInstalledError, PanelAppInstallError, PanelAppReviewChangedError, assertSafePanelAppId, discoverGitPanelApps, installReviewedLocalPanelApp, invalidateSkillCache, listInstalledPanelApps, inspectProjectPanelApps, listRetainedPanelAppPackages, resolvePanelAppPackage, parsePanelAppPackagePins, retainInstalledPanelApp, userHome, panelAppsRoot, previewLocalPanelApp, resolveGitHubPanelAppCommit, resolvePanelAppBindingPolicy, uninstallPanelApp, } from "@cjhyy/code-shell-core";
+import { SettingsManager, PanelAppAlreadyInstalledError, PanelAppInstallError, PanelAppReviewChangedError, assertSafePanelAppId, discoverGitPanelApps, installReviewedLocalPanelApp, invalidateSkillCache, listInstalledPanelApps, inspectProjectPanelApps, listRetainedPanelAppPackages, resolvePanelAppPackage, parsePanelAppPackagePins, currentPanelAppPackagePins, installedPanelAppUpdatedAt, retainInstalledPanelApp, userHome, panelAppsRoot, previewLocalPanelApp, resolveGitHubPanelAppCommit, resolvePanelAppBindingPolicy, uninstallPanelApp, } from "@cjhyy/code-shell-core";
 import { mutateJsonFile } from "@cjhyy/code-shell-core/internal";
 import { parseGithubUrl } from "@cjhyy/code-shell-core/internal/skills";
 const REVIEW_TTL = 8 * 60_000;
@@ -177,14 +177,17 @@ export function createPanelManagement(options) {
             .update(JSON.stringify({
             app,
             digest,
-            ...(options.projectPackages
-                ? { pin: parsePanelAppPackagePins(project ?? projectSettings())[app.id] ?? null }
-                : {}),
+            ...(options.projectPackages ? { pin: selectedPin(app.id, project) } : {}),
             bound: current.boundApps.has(app.id),
             disabled: current.globalDisabledApps.has(app.id),
         }))
             .digest("hex");
     }
+    /** The pinned package identity; when it was pinned does not change the selection. */
+    function selectedPin(id, project) {
+        const pin = parsePanelAppPackagePins(project ?? projectSettings())[id];
+        return pin ? { version: pin.version, packageDigest: pin.packageDigest } : null;
+    }
     function projectSettings() {
         return new SettingsManager(workspace, "full").getRawForScope("project", workspace, {
             strict: true,
@@ -291,7 +294,7 @@ export function createPanelManagement(options) {
         // Never attach a new revision to stale displayed binding state. File and
         // package inspection above can yield to another device's mutation.
         for (const app of [...panels, ...issues]) {
-            const pin = options.projectPackages ? parsePanelAppPackagePins(project)[app.id] : undefined;
+            const pin = options.projectPackages ? currentPanelAppPackagePins(project)[app.id] : undefined;
             if (projectState(app.id, project) !== projectState(app.id) ||
                 current.globalDisabledApps.has(app.id) !== policy().globalDisabledApps.has(app.id) ||
                 (pin && (pin.packageDigest !== app.packageDigest || pin.version !== app.version)))
@@ -484,7 +487,7 @@ export function createPanelManagement(options) {
             return value;
         });
     }
-    async function mutate(context, change, work) {
+    async function mutate(context, change, work, prepare) {
         const expected = generation(context.ownerId);
         const guard = () => assertAuthorized(context, expected);
         const run = async () => {
@@ -493,7 +496,11 @@ export function createPanelManagement(options) {
                 await guard();
                 return work(guard);
             };
-            return panelExecutionGate.mutate(panelPackageMutationMatches({ ...change, projectPath: options.bindingCwd ?? options.cwd }), () => (options.withMutation ? options.withMutation(write) : write()));
+            const matches = panelPackageMutationMatches({
+                ...change,
+                projectPath: options.bindingCwd ?? options.cwd,
+            });
+            return panelExecutionGate.mutate(matches, () => (options.withMutation ? options.withMutation(write) : write()), prepare ? () => prepare(guard, matches) : undefined);
         };
         const next = catalogMutation.then(run, run);
         catalogMutation = next.catch(() => undefined);
@@ -524,7 +531,20 @@ export function createPanelManagement(options) {
                 if (bound) {
                     if (!app.packageDigest)
                         throw new Error("Cannot bind an unverified Panel package");
-                    pins[app.id] = { version: app.version, packageDigest: app.packageDigest };
+                    const existing = pins[app.id];
+                    // Rebinding the package a current pin already selects changes nothing, so
+                    // it must not invalidate other devices' revisions or pending reviews.
+                    const unchanged = existing?.version === app.version &&
+                        existing.packageDigest === app.packageDigest &&
+                        !!currentPanelAppPackagePins({ panelAppPins: { [app.id]: existing } })[app.id];
+                    if (!unchanged)
+                        pins[app.id] = {
+                            version: app.version,
+                            packageDigest: app.packageDigest,
+                            // Holds this project only until the next global install or update, so it
+                            // must be strictly later than the install it was chosen after.
+                            pinnedAt: new Date(Math.max(now(), (installedPanelAppUpdatedAt(app.id) ?? 0) + 1)).toISOString(),
+                        };
                 }
                 else
                     delete pins[app.id];
@@ -735,12 +755,18 @@ export function createPanelManagement(options) {
             await assertAuthorized(context, held.generation);
             if (approval?.expectedId && approval.expectedId !== held.public.preview.id)
                 invalid();
+            if (approval?.releaseExecutions && held.public.kind !== "update")
+                invalid();
             if (approval && held.public.kind === "update" && !approval.overwrite)
                 throw new PanelManagementError(409, "already_installed", "这个面板已经安装，请确认项目更新。");
-            return mutate(context, { appId: held.public.preview.id, kind: held.public.kind }, async (guard) => {
-                await assertAuthorized(context, held.generation);
-                if (reviews.get(token) !== held || held.public.expiresAt <= now())
+            let admitted = false;
+            const assertReviewLease = () => {
+                if (!admitted && (reviews.get(token) !== held || held.public.expiresAt <= now()))
                     throw new PanelManagementError(409, "review_expired", "预览已失效，请重新检查来源。");
+            };
+            const validateReview = async (guard) => {
+                await assertAuthorized(context, held.generation);
+                assertReviewLease();
                 const id = held.public.preview.id;
                 if (held.public.kind === "update") {
                     const current = await selectedApp(id);
@@ -753,6 +779,11 @@ export function createPanelManagement(options) {
                 if (projectState(id) !== held.projectState)
                     throw new PanelManagementError(409, "conflict", "项目面板配置已改变，请重新预览。");
                 await guard();
+                assertReviewLease();
+            };
+            return mutate(context, { appId: held.public.preview.id, kind: held.public.kind }, async (guard) => {
+                await validateReview(guard);
+                const id = held.public.preview.id;
                 const installed = await installReviewedLocalPanelApp(held.source, held.digest, new Date(now()).toISOString(), {
                     overwrite: held.public.kind === "update",
                     expectedId: id,
@@ -782,7 +813,24 @@ export function createPanelManagement(options) {
                 invalidateSkillCache();
                 await options.onChanged?.(id, held.public.kind);
                 return { id, packageDigest: installed.packageDigest };
-            });
+            }, approval?.releaseExecutions
+                ? async (guard, matches) => {
+                    await validateReview(guard);
+                    // A local directory/ZIP may have changed since preview. Check its
+                    // reviewed bytes before cancelling work, then recheck mutable
+                    // project/catalog authority after the source read.
+                    const preview = await previewLocalPanelApp(held.source);
+                    if (preview.id !== held.public.preview.id || preview.reviewToken !== held.digest)
+                        throw new PanelManagementError(409, "conflict", "来源已改变，请重新检查更新。");
+                    await validateReview(guard);
+                    // This admitted operation owns the review while its holders exit.
+                    // TTL expiry during cancellation must not invalidate that consent;
+                    // owner revocation and package/project changes are still checked.
+                    admitted = true;
+                    reviews.delete(token);
+                    await approval.releaseExecutions(held.public.preview.id, matches);
+                }
+                : undefined);
         },
         async binding(context, id, bound, expected) {
             assertId(id);
@@ -793,11 +841,11 @@ export function createPanelManagement(options) {
                 const current = await selectedApp(id);
                 if (bound && !compatibility(current.app).supported)
                     throw new PanelManagementError(400, "unsupported", "这个面板需要当前 Web 环境未提供的能力。");
-                // Legacy installs need a retained copy before the project can pin them.
-                // An already pinned project must keep its selected version, not the catalog's.
+                // An unpinned (or superseded) selection needs a retained copy before the
+                // project can pin it. A current pin must keep its selected version.
                 const app = bound &&
                     options.projectPackages &&
-                    !parsePanelAppPackagePins(projectSettings())[current.app.id]
+                    !currentPanelAppPackagePins(projectSettings())[current.app.id]
                     ? await retainInstalledPanelApp(current.app.id, current.app.packageDigest)
                     : current.app;
                 await guard();

package/dist/panels/package-mutation.d.ts

@@ -4,5 +4,5 @@ export interface PanelPackageMutation {
     projectPath: string;
     kind: "install" | "update" | "binding" | "remove";
 }
-/** Pinned projects retain their bytes when a different project updates the catalog. */
+/** A catalog install or update supersedes every project's pin, so it reaches every project. */
 export declare function panelPackageMutationMatches(change: PanelPackageMutation): (scope: PanelExecutionScope) => boolean;

package/dist/panels/package-mutation.js

@@ -1,6 +1,6 @@
-import { projectPanelAppPackagePins, resolvePanelAppBindingProjectPath, } from "@cjhyy/code-shell-core";
+import { resolvePanelAppBindingProjectPath } from "@cjhyy/code-shell-core";
 import { panelExecutionProject } from "./execution-gate.js";
-/** Pinned projects retain their bytes when a different project updates the catalog. */
+/** A catalog install or update supersedes every project's pin, so it reaches every project. */
 export function panelPackageMutationMatches(change) {
     const project = panelExecutionProject(resolvePanelAppBindingProjectPath(change.projectPath));
     return (scope) => {
@@ -11,13 +11,6 @@ export function panelPackageMutationMatches(change) {
         const bindingProject = resolvePanelAppBindingProjectPath(scope.projectPath);
         if (panelExecutionProject(bindingProject) === project)
             return true;
-        if (change.kind === "binding")
-            return false;
-        try {
-            return !projectPanelAppPackagePins(bindingProject, change.appId)[change.appId];
-        }
-        catch {
-            return true;
-        } // An unreadable project cannot prove that it is insulated.
+        return change.kind !== "binding";
     };
 }

package/dist/panels/resources/uploads.js

@@ -214,12 +214,21 @@ export class ResourceUploadIngest {
     }
     async cleanupExpired() {
         await this.initialize();
-        for (const record of [...this.records.values()])
-            if (record.expiresAt <= this.options.now()) {
-                const key = this.key(record.scope, record.sessionId);
-                this.finishes.get(key)?.abort();
-                await this.locked(key, () => this.remove(record));
-            }
+        for (const key of [...this.records.keys()]) {
+            // Another upload may have renewed while cleanup waited on an earlier
+            // entry. Only the current expired record can cancel a running finish.
+            const record = this.records.get(key);
+            if (!record || record.expiresAt > this.options.now())
+                continue;
+            this.finishes.get(key)?.abort();
+            await this.locked(key, async () => {
+                // A write already holding this lock may acknowledge a chunk and renew
+                // the lease before cleanup enters. Never delete that renewed upload.
+                const current = this.records.get(key);
+                if (current && current.expiresAt <= this.options.now())
+                    await this.remove(current);
+            });
+        }
     }
     async begin(scope, raw) {
         await this.authorize(scope);

package/dist/panels/runtime.js

@@ -553,6 +553,7 @@ export function createPanelRuntime(options) {
         acquireExecution: (owner) => panelExecutionGate.enter({
             appId: owner.appId,
             projectPath: options.bindingCwd ?? options.cwd,
+            holder: { kind: "process" },
         }),
         approvalScope: "guest",
         resolvePackageEntry: async (owner, name) => {
@@ -941,7 +942,11 @@ export function createPanelRuntime(options) {
         };
     }
     async function onPanelAction(scope, input) {
-        return panelExecutionGate.run({ appId: scope.appId, projectPath: options.bindingCwd ?? options.cwd }, () => onPanelActionAdmitted(scope, input));
+        return panelExecutionGate.run({
+            appId: scope.appId,
+            projectPath: options.bindingCwd ?? options.cwd,
+            holder: { kind: "panel-call" },
+        }, () => onPanelActionAdmitted(scope, input));
     }
     async function onPanelActionAdmitted(scope, input) {
         const grant = grants.get(scope.instanceId);
@@ -980,6 +985,7 @@ export function createPanelRuntime(options) {
         const releaseExecution = panelExecutionGate.enter({
             appId: grant.app.id,
             projectPath: options.bindingCwd ?? options.cwd,
+            holder: { kind: "agent-tool" },
         });
         const requestId = randomBytes(18).toString("base64url");
         const value = await new Promise((done) => {
@@ -1309,7 +1315,11 @@ export function createPanelRuntime(options) {
         }
     }
     async function call(grant, input) {
-        return panelExecutionGate.run({ appId: grant.app.id, projectPath: options.bindingCwd ?? options.cwd }, () => callAdmitted(grant, input));
+        return panelExecutionGate.run({
+            appId: grant.app.id,
+            projectPath: options.bindingCwd ?? options.cwd,
+            holder: { kind: "panel-call" },
+        }, () => callAdmitted(grant, input));
     }
     async function callAdmitted(grant, input) {
         if (!(await authorized(grant)))

package/dist/panels/task-cookies.js

@@ -1,7 +1,7 @@
 import { createHmac, timingSafeEqual } from "node:crypto";
 import { chmod, lstat, mkdir, mkdtemp, realpath, rm, writeFile } from "node:fs/promises";
 import { isAbsolute, join } from "node:path";
-import { formatNetscapeCookies, parseCookieJar, } from "@cjhyy/code-shell-core";
+import { formatNetscapeCookies, normalizeCookieDomain, cookieAppliesToHost, parseCookieJar, } from "@cjhyy/code-shell-core";
 function targetUrl(raw) {
     if (typeof raw !== "string" || raw.length > 2048)
         throw new Error("Cookie selection requires an HTTPS URL");
@@ -16,16 +16,6 @@ function targetUrl(raw) {
         throw new Error("Cookie selection requires an HTTPS URL");
     return url;
 }
-function domain(raw) {
-    if (typeof raw !== "string")
-        return;
-    const value = raw.toLowerCase().replace(/^\./, "");
-    if (value.length > 253 ||
-        !value.includes(".") ||
-        !value.split(".").every((label) => /^[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?$/.test(label)))
-        return;
-    return value;
-}
 function beneath(host, root) {
     return host === root || host.endsWith(`.${root}`);
 }
@@ -86,7 +76,7 @@ export class PanelTaskCookieService {
         ]))
             .digest("hex");
     }
-    cookies(credential, root) {
+    cookies(credential, host) {
         const now = (this.options.now?.() ?? Date.now()) / 1000;
         if (typeof credential.secret !== "string" ||
             Buffer.byteLength(credential.secret) > 4 * 1024 * 1024)
@@ -106,8 +96,10 @@ export class PanelTaskCookieService {
                         !cookie.path.startsWith("/") ||
                         /[\x00-\x1f\x7f]/.test(cookie.path))))
                 return false;
-            const cookieDomain = domain(cookie.domain);
-            if (!cookieDomain || !beneath(cookieDomain, root))
+            // Account eligibility and actual Cookie scope are different fences:
+            // a login captured on www.example.com can carry .example.com cookies,
+            // but must not export host-only cookies from a sibling login host.
+            if (!cookieAppliesToHost(cookie, host))
                 return false;
             if (cookie.expirationDate !== undefined &&
                 (typeof cookie.expirationDate !== "number" ||
@@ -120,10 +112,10 @@ export class PanelTaskCookieService {
     async snapshot(scope, url) {
         await this.options.authorize(scope);
         const result = (await this.options.credentials(scope)).flatMap((credential) => {
-            const root = domain(credential.meta?.domain);
+            const root = normalizeCookieDomain(credential.meta?.domain);
             if (credential.type !== "cookie" || !root || !beneath(url.hostname.toLowerCase(), root))
                 return [];
-            const cookies = this.cookies(credential, root);
+            const cookies = this.cookies(credential, url.hostname);
             if (!cookies.length)
                 return [];
             return [

package/dist/panels/tool-jobs.js

@@ -179,11 +179,16 @@ export class PanelToolJobService {
         };
     }
     executionScopes() {
+        const held = (scope, label) => ({
+            appId: scope.appId,
+            projectPath: scope.projectPath,
+            holder: { kind: "tool-job", ...(label ? { label } : {}) },
+        });
         return [
-            ...[...this.preparing.values()].map((item) => item.scope),
+            ...[...this.preparing.values()].map((item) => held(item.scope)),
             ...[...this.jobs.values()]
                 .filter((job) => !TERMINAL.has(job.status) || this.active.has(job.id))
-                .map((job) => job.scope),
+                .map((job) => held(job.scope, job.entry.name)),
         ];
     }
     activeCount(projectPath) {