@cjhyy/code-shell-server 0.9.44 → 0.9.47

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.d.ts

@@ -34,6 +34,7 @@ export interface PanelRuntimeOptions {
     bindingCwd?: string;
     projectPackages?: boolean;
     dataDir: string;
+    traceStorageDir?: string;
     host: "hub" | "desktop";
     /** Host authority only, never a field accepted from Panel HTTP requests. */
     projectScope?: () => Promise<PanelProjectScopeBinding | undefined>;

package/dist/panels/runtime.js

@@ -10,6 +10,7 @@ import { panelRuntimeApiVersion, panelProcessMethods, panelResourceMethods, pane
 import { PanelResourceService } from "./resources/service.js";
 import { servePanelResource } from "./resources/http.js";
 import { panelConnections, panelConnectionIds, materializePanelConnections, } from "./connections.js";
+import { PanelModelTraceService, panelModelTraceMethods, panelModelTraceLimits, } from "./model-traces.js";
 import { PanelRuntimeServices } from "./runtime-services.js";
 import { PanelToolJobService, toolJobLimits, } from "./tool-jobs.js";
 import { createPanelToolExecutor } from "./tool-executor.js";
@@ -26,6 +27,7 @@ const MAX_FILE = 16 * 1024 * 1024;
 const GRANT_TTL = 30 * 60_000;
 const METHODS = [
     "context.get",
+    ...panelModelTraceMethods,
     "storage.get",
     "storage.getSnapshot",
     "storage.compareAndSet",
@@ -80,6 +82,7 @@ const MIME = {
     ".html": "text/html; charset=utf-8",
     ".js": "text/javascript; charset=utf-8",
     ".mjs": "text/javascript; charset=utf-8",
+    ".wasm": "application/wasm",
     ".css": "text/css; charset=utf-8",
     ".json": "application/json",
     ".md": "text/markdown; charset=utf-8",
@@ -420,6 +423,10 @@ export function createPanelRuntime(options) {
     const assets = new Map();
     const now = options.now ?? Date.now;
     const services = new PanelRuntimeServices({ dataDir: options.dataDir });
+    const modelTraces = new PanelModelTraceService({
+        storageDir: options.traceStorageDir,
+        now: options.now,
+    });
     const installed = options.listInstalled ??
         (options.projectPackages
             ? async (appId) => (await inspectProjectPanelApps(options.bindingCwd ?? options.cwd, appId)).apps
@@ -522,9 +529,31 @@ export function createPanelRuntime(options) {
         return app;
     }
     const processes = new PanelAppProcessService({
+        modelTraces,
+        modelTraceOwner: (owner) => {
+            const task = toolOwners.get(owner.guestId);
+            if (task)
+                return {
+                    appId: owner.appId,
+                    revision: owner.revision,
+                    workspacePath: options.cwd,
+                    traceId: task.taskId,
+                    taskId: task.taskId,
+                };
+            const grant = byGuest.get(owner.guestId);
+            if (!grant || grant.revision !== owner.revision)
+                return undefined;
+            return {
+                appId: owner.appId,
+                revision: owner.revision,
+                workspacePath: options.cwd,
+                sessionId: typeof grant.context.sessionId === "string" ? grant.context.sessionId : undefined,
+            };
+        },
         acquireExecution: (owner) => panelExecutionGate.enter({
             appId: owner.appId,
             projectPath: options.bindingCwd ?? options.cwd,
+            holder: { kind: "process" },
         }),
         approvalScope: "guest",
         resolvePackageEntry: async (owner, name) => {
@@ -751,7 +780,7 @@ export function createPanelRuntime(options) {
             resources,
             owner: (job, send) => {
                 const guestId = nextToolOwner--;
-                toolOwners.set(guestId, job.scope);
+                toolOwners.set(guestId, { ...job.scope, taskId: job.id });
                 return {
                     guestId,
                     appId: job.scope.appId,
@@ -826,6 +855,7 @@ export function createPanelRuntime(options) {
         assets.delete(grant.asset);
         byGuest.delete(grant.guestId);
         processes.revokeGuest(grant.guestId);
+        modelTraces.cancelOwner(`grant:${grant.id}`);
         agentTasks?.revokeInstance(grant.id);
         for (const item of grant.confirmations.values())
             item.finish(false);
@@ -912,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);
@@ -951,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) => {
@@ -1089,6 +1124,8 @@ export function createPanelRuntime(options) {
                 locale: typeof input.locale === "string" ? input.locale.slice(0, 32) : "zh-CN",
                 apiVersion: panelRuntimeApiVersion,
                 capabilities: {
+                    packageAssets: { wasm: true, fetch: "package" },
+                    modelTraces: { writeOnly: true, coverage: "logical-input", ...panelModelTraceLimits },
                     ...panelRuntimeCapabilities({
                         process: app.permissions.includes("process"),
                         cookieProcess: app.permissions.includes("process") &&
@@ -1189,7 +1226,9 @@ export function createPanelRuntime(options) {
                         return false;
                     if (method.startsWith("tools."))
                         return !!app.agent?.tools.length;
-                    return (method === "context.get" || app.permissions.includes(methodPermission(method)));
+                    return (method === "context.get" ||
+                        method.startsWith("modelTraces.") ||
+                        app.permissions.includes(methodPermission(method)));
                 }),
                 limitations: panel.compatibility.reasons,
             };
@@ -1276,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)))
@@ -1302,6 +1345,14 @@ export function createPanelRuntime(options) {
             grant.calls = history;
         if (method === "context.get")
             return grant.context;
+        if (method.startsWith("modelTraces."))
+            return modelTraces.call({
+                ownerKey: `grant:${grant.id}`,
+                appId: grant.app.id,
+                revision: grant.revision,
+                workspacePath: options.cwd,
+                sessionId: typeof grant.context.sessionId === "string" ? grant.context.sessionId : undefined,
+            }, method, params);
         if (method.startsWith("tasks."))
             return dispatchToolJobs(grant, method, params);
         if (method.startsWith("tools.")) {
@@ -1600,6 +1651,7 @@ export function createPanelRuntime(options) {
                 return {
                     effect: method,
                     prompt: value.prompt,
+                    modelTraceSource: `panel:${grant.app.id}`,
                     sessionId: grant.context.sessionId,
                     ...(value.displayText ? { displayText: value.displayText } : {}),
                 };
@@ -1692,6 +1744,7 @@ export function createPanelRuntime(options) {
         },
         async close() {
             closed = true;
+            modelTraces.closeAll();
             for (const preparation of preparingTools)
                 preparation.controller.abort();
             clearInterval(reaper);
@@ -1705,8 +1758,11 @@ export function createPanelRuntime(options) {
                 await taskCookies?.shutdown();
             }
             finally {
-                processes.close();
-                await Promise.all([resources.shutdown(), Promise.resolve(agentTasks?.close())]);
+                await Promise.all([
+                    processes.close(),
+                    resources.shutdown(),
+                    Promise.resolve(agentTasks?.close()),
+                ]);
             }
         },
         async handle(request, response) {
@@ -1936,7 +1992,7 @@ export function createPanelRuntime(options) {
                     // The embedding iframe must enable the same permission.
                     response.setHeader("Content-Security-Policy", "default-src 'none'; script-src " +
                         assetSource +
-                        "; style-src " +
+                        " 'wasm-unsafe-eval'; style-src " +
                         assetSource +
                         " 'unsafe-inline'; img-src " +
                         assetSource +
@@ -1944,7 +2000,9 @@ export function createPanelRuntime(options) {
                         assetSource +
                         " blob:; font-src " +
                         assetSource +
-                        " data:; connect-src 'none'; object-src 'none'; frame-src 'none'; base-uri 'none'; form-action 'none'; sandbox allow-scripts allow-downloads; frame-ancestors " +
+                        " data:; connect-src " +
+                        assetSource +
+                        "; object-src 'none'; frame-src 'none'; base-uri 'none'; form-action 'none'; sandbox allow-scripts allow-downloads; frame-ancestors " +
                         resourceOrigin);
                     response.setHeader("Permissions-Policy", "camera=(), microphone=(), geolocation=(), display-capture=()");
                 }

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.d.ts

@@ -120,6 +120,8 @@ export declare class PanelToolJobService {
     initialize(): Promise<void>;
     private load;
     private commit;
+    /** Make a job state visible to readers and subscribers. */
+    private publish;
     private lookup;
     /** Scoped existence check for transports merging read-only legacy history. */
     has(rawScope: ToolJobScope, id: string): Promise<boolean>;

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) {
@@ -283,6 +288,10 @@ export class PanelToolJobService {
         job.updatedAt = this.now();
         job.sequence++;
         await this.storage.write(job.id, job, toolJobLimits.maxRecordBytes);
+        this.publish(job);
+    }
+    /** Make a job state visible to readers and subscribers. */
+    publish(job) {
         this.jobs.set(job.id, job);
         try {
             this.options.onEvent?.(publicJob(job));
@@ -670,7 +679,23 @@ export class PanelToolJobService {
                 next.result = result;
                 next.progress = { ...next.progress, fraction: 1 };
             }
-            await this.commit(next);
+            try {
+                await this.commit(next);
+            }
+            catch (error) {
+                // The executor has exited; a job that stays "running" in memory would
+                // count as active forever and hide the outcome. Publish an explicit
+                // failure for this Host session instead (keeping any result), while
+                // the stale disk record is recovered as interrupted by a later Host.
+                const outcome = next.error ? `${next.status} (${next.error.message})` : next.status;
+                next.status = "failed";
+                next.error = {
+                    code: "TOOL_JOB_STORAGE_FAILED",
+                    message: `Task ${outcome} but its final state could not be saved: ${error instanceof Error ? error.message : String(error)}`.slice(0, 2000),
+                    retryable: next.recovery === "retry",
+                };
+                this.publish(next);
+            }
         });
     }
     async cancel(rawScope, id) {

package/dist/serve/cli.js

@@ -10,6 +10,7 @@ import { join, resolve } from "node:path";
 import { existsSync } from "node:fs";
 import { startHeadlessServer } from "./headless-server.js";
 import { startProjectControlServer } from "../project-runtime/control-server.js";
+import { configureModelTracing } from "@cjhyy/code-shell-core/internal";
 const SERVE_HELP = `Usage: code-shell-serve [options]
 
 Run the CodeShell headless Web host for a workspace.
@@ -127,7 +128,7 @@ export function resolveWorkerEntry() {
  * wrapper registered it; arena/pet stay desktop-only).
  */
 export function resolveWorkerCapabilityModules() {
-    return `${import.meta.resolve("@cjhyy/code-shell-capability-coding")}#createCodingModule`;
+    return `${import.meta.resolve("@cjhyy/code-shell-capability-coding")}#createCodingModule,${import.meta.resolve("@cjhyy/code-shell-server/links")}#createLinkProviderModule`;
 }
 /** Locate the built browser app (packages/web `app` build), when present. */
 export function resolveWebAppRoot() {
@@ -150,6 +151,12 @@ export async function runServeCli(argv = process.argv.slice(2)) {
         return;
     }
     const parsed = parseServeArgs(argv);
+    if (parsed.runtime === "local") {
+        configureModelTracing({
+            storageDir: join(parsed.dataDir, "worker", "sessions", ".model-traces"),
+            source: "server",
+        });
+    }
     const staticRootDir = parsed.staticRootDir ?? resolveWebAppRoot();
     const server = parsed.runtime === "docker"
         ? await startProjectControlServer({

package/dist/serve/headless-server.js

@@ -43,6 +43,7 @@ import { createHubFiles } from "../hub/files.js";
 import { createSessionHttpResponses } from "../session-http-responses.js";
 import { WorkerBridgeCore, previewLine } from "../worker-bridge-core.js";
 import { HostRuntime, interceptHostRequest } from "@cjhyy/code-shell-host";
+import { createModelTraceHttp } from "../model-trace-http.js";
 export async function startHeadlessServer(opts) {
     const remoteLink = remoteLinkHostConfiguration(opts.remoteLink, opts.publicOrigin);
     if (remoteLink && opts.authMode !== "hub")
@@ -131,7 +132,33 @@ export async function startHeadlessServer(opts) {
     let configurationChanging = false;
     let configurationReloadFailed = false;
     const runUploads = new Map();
-    const isRunning = (sessionId) => [...runningSessions.values()].includes(sessionId) || !!automationWorker?.ownsSession(sessionId);
+    // Core also starts top-level runs that never pass through a host agent/run,
+    // e.g. the follow-up turn of an asynchronously answered question. Count them
+    // from their own top-level stream boundaries so archive/export/automation
+    // gates see the session as busy until the run's terminal turn_complete.
+    const streamRuns = new Map();
+    const isRunning = (sessionId) => [...runningSessions.values()].includes(sessionId) ||
+        (streamRuns.get(sessionId) ?? 0) > 0 ||
+        !!automationWorker?.ownsSession(sessionId);
+    const observeRunBoundary = (sessionId, event) => {
+        if (!event || event.agentId !== undefined)
+            return;
+        const before = isRunning(sessionId);
+        const count = streamRuns.get(sessionId) ?? 0;
+        if (event.type === "session_started")
+            streamRuns.set(sessionId, count + 1);
+        else if (event.type === "turn_complete" && count > 0) {
+            if (count === 1)
+                streamRuns.delete(sessionId);
+            else
+                streamRuns.set(sessionId, count - 1);
+        }
+        else
+            return;
+        const running = isRunning(sessionId);
+        if (running !== before)
+            notify("serve/sessionStatus", { sessionId, running });
+    };
     let nextTabId = 1;
     let nextWorkerRequestId = 1;
     const outbound = new HubOutboundTransport({
@@ -207,6 +234,7 @@ export async function startHeadlessServer(opts) {
         pendingWorkerResponses.clear();
         pendingResponsesByTab.clear();
         runningSessions.clear();
+        streamRuns.clear();
         runOwners.clear();
         runReplay.clear();
         runInputs.clear();
@@ -269,6 +297,7 @@ export async function startHeadlessServer(opts) {
                     let event = params.event;
                     let deliveredInput;
                     const value = event;
+                    observeRunBoundary(params.sessionId, value);
                     if (value?.type === "session_user_message" && typeof value.clientMessageId === "string") {
                         const input = [...runInputs.values()].find((candidate) => candidate.sessionId === params.sessionId &&
                             candidate.event.clientMessageId === value.clientMessageId);
@@ -421,9 +450,8 @@ export async function startHeadlessServer(opts) {
             CODE_SHELL_WORKSPACE_ACCESS: undefined,
             CODE_SHELL_DATA_ROOT: workerDataRoot,
             CODE_SHELL_CREDENTIAL_ACCESS: "local",
-            ...(opts.workerCapabilityModules
-                ? { CODE_SHELL_CAPABILITY_MODULES: opts.workerCapabilityModules }
-                : {}),
+            CODE_SHELL_CAPABILITY_MODULES: opts.workerCapabilityModules ??
+                `${import.meta.resolve("@cjhyy/code-shell-server/links")}#createLinkProviderModule`,
         }),
         log,
         onStderr: (text) => log("worker.stderr", { text: previewLine(text) }),
@@ -486,6 +514,8 @@ export async function startHeadlessServer(opts) {
     };
     const configurationOptions = {
         cwd: workspaceCwd,
+        traceStorageDir: join(sessionRootDir, ".model-traces"),
+        traceSource: "server",
         isAuthorized: async (req) => !!(await hubAuth?.authenticate(req)),
         ownerId: async (req) => (await hubAuth?.authenticate(req))?.id,
         withMutation: withConfigurationMutation,
@@ -537,9 +567,8 @@ export async function startHeadlessServer(opts) {
                     CODE_SHELL_WORKSPACE_ACCESS: undefined,
                     CODE_SHELL_DATA_ROOT: workerDataRoot,
                     CODE_SHELL_CREDENTIAL_ACCESS: "local",
-                    ...(opts.workerCapabilityModules
-                        ? { CODE_SHELL_CAPABILITY_MODULES: opts.workerCapabilityModules }
-                        : {}),
+                    CODE_SHELL_CAPABILITY_MODULES: opts.workerCapabilityModules ??
+                        `${import.meta.resolve("@cjhyy/code-shell-server/links")}#createLinkProviderModule`,
                 }),
             },
             onChanged: () => notify("serve/configurationChanged", {}),
@@ -575,6 +604,13 @@ export async function startHeadlessServer(opts) {
     const files = hubAuth
         ? createHubFiles({ cwd: workspaceCwd, isAuthorized: configurationOptions.isAuthorized })
         : undefined;
+    const modelTraces = hubAuth
+        ? createModelTraceHttp({
+            storageDir: join(sessionRootDir, ".model-traces"),
+            workspacePath: workspaceCwd,
+            isAuthorized: configurationOptions.isAuthorized,
+        })
+        : undefined;
     const serveStatic = (req, res) => {
         const root = opts.staticRootDir;
         if (!root) {
@@ -681,11 +717,19 @@ export async function startHeadlessServer(opts) {
                     return;
                 if (await files.handle(req, res))
                     return;
+                if (await modelTraces.handle(req, res))
+                    return;
                 const upload = /^\/api\/v1\/uploads\/([^/]+)$/.exec(pathname);
                 if (upload && req.method === "PUT") {
                     await uploads.accept(upload[1], session.id, req, res, async () => !!(await hubAuth.authenticate(req)));
                     return;
                 }
+                if (upload && req.method === "DELETE") {
+                    // Removing a draft attachment releases its quota; idempotent for retries.
+                    await uploads.discard(upload[1], session.id);
+                    res.writeHead(204, { "cache-control": "no-store" }).end();
+                    return;
+                }
                 hubJson(res, 404, { error: "API endpoint not found" });
                 return;
             }
@@ -828,7 +872,16 @@ export async function startHeadlessServer(opts) {
                     sendToTab(ws, hostQueryError(parsed.id ?? null, -32000, "too many pending agent worker requests for this tab"), "pending-limit");
                     return;
                 }
+                // Retryable admission gates run before an approval lease is submitted:
+                // a submitted lease is excluded from snapshots until the worker ACKs.
+                if (hubAuth && (configurationChanging || configurationReloadFailed)) {
+                    sendToTab(ws, hostQueryError(parsed.id ?? null, -32009, configurationReloadFailed
+                        ? "请先重新保存配置或重启服务，再发送任务。"
+                        : "配置正在保存，请稍后重新发送任务。"), "configuration-changing");
+                    return;
+                }
                 let approvalId;
+                let approvalRouted = false;
                 if (hubAuth && parsed.method === "agent/approve") {
                     const requestId = parsed.params?.requestId;
                     const approval = typeof requestId === "string" ? leases.get(requestId) : undefined;
@@ -865,12 +918,6 @@ export async function startHeadlessServer(opts) {
                 let preparedUploads;
                 let uploadsTransferred = false;
                 const preparingRun = !!hubAuth && parsed.method === "agent/run";
-                if (hubAuth && (configurationChanging || configurationReloadFailed)) {
-                    sendToTab(ws, hostQueryError(parsed.id ?? null, -32009, configurationReloadFailed
-                        ? "请先重新保存配置或重启服务，再发送任务。"
-                        : "配置正在保存，请稍后重新发送任务。"), "configuration-changing");
-                    return;
-                }
                 if (preparingRun)
                     preparingRuns++;
                 try {
@@ -973,6 +1020,8 @@ export async function startHeadlessServer(opts) {
                             method: parsed.method,
                             ...(approvalId ? { approvalId } : {}),
                         });
+                        // The worker response route now owns the submitted lease.
+                        approvalRouted = true;
                         pendingResponsesByTab.set(tabId, (pendingResponsesByTab.get(tabId) ?? 0) + 1);
                         workerMessage.id = workerRequestId;
                         if (preparedUploads?.attachments.length) {
@@ -1023,6 +1072,11 @@ export async function startHeadlessServer(opts) {
                         preparingRuns--;
                     if (!uploadsTransferred)
                         preparedUploads?.release();
+                    if (approvalId && !approvalRouted) {
+                        // Rejected before dispatch: the worker never saw this decision.
+                        leases.retry(approvalId);
+                        notify("serve/approvalSnapshot", { approvals: leases.snapshot() });
+                    }
                 }
             };
             let queued = 0;
@@ -1305,7 +1359,7 @@ function replyToHostSessionQuery(message, sessionManager, workspaceCwd, isRunnin
                 data: {
                     state,
                     ...(legacy ? { outputJournal: journal, legacyBaseComplete: legacy.complete } : {}),
-                    ...(runReplay ? runReplay.snapshot(sessionId, transcript) : { transcript }),
+                    ...(runReplay ? runReplay.snapshot(sessionId, transcript, !!legacy) : { transcript }),
                     running: isRunning(sessionId),
                 },
             },

package/dist/sessions-service.js

@@ -3,6 +3,7 @@
  * Uses core's canonical session root so CODE_SHELL_HOME matches the worker.
  */
 import { SessionManager, sessionsRoot } from "@cjhyy/code-shell-core";
+import { scanSessionDirectories, readSessionListState, SessionFileError, } from "@cjhyy/code-shell-host/session-files";
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
 const SAFE_ID = /^[A-Za-z0-9_.-]+$/;
@@ -175,6 +176,9 @@ export async function cleanupStaleQuickChatSessions(baseDir = sessionsRoot()) {
     }
     return [...ids, ...stagingDirs];
 }
+function compareDiskSessionPosition(a, b) {
+    return b.mtime - a.mtime || a.id.localeCompare(b.id);
+}
 function encodeDiskSessionCursor(cursor) {
     return `v1:${cursor.mtime}:${cursor.id}`;
 }
@@ -210,37 +214,18 @@ export async function listDiskSessions(opts, baseDir = sessionsRoot()) {
             parentSessionId.includes(".."))) {
         throw new Error("invalid parent session id");
     }
-    // Async fs throughout: this is an IPC handler on the Electron main thread
-    // (sessions:listDisk). The previous synchronous statSync/readFileSync loops
-    // never yielded the event loop and froze the UI while enumerating sessions.
-    let entries;
-    try {
-        entries = await fs.readdir(baseDir, { withFileTypes: true });
-    }
-    catch (e) {
-        if (e.code === "ENOENT")
-            return { sessions: [], nextCursor: null };
-        throw e;
-    }
-    const candidates = entries.filter((e) => e.isDirectory() && SAFE_ID.test(e.name) && !isInternalEphemeralSessionId(e.name));
-    const stats = await Promise.all(candidates.map(async (e) => {
-        try {
-            return { id: e.name, mtime: (await fs.stat(path.join(baseDir, e.name))).mtimeMs };
-        }
-        catch {
-            return null; // skip unreadable
-        }
-    }));
-    const dirs = stats.filter((d) => d !== null);
-    dirs.sort((a, b) => b.mtime - a.mtime || a.id.localeCompare(b.id));
+    // Preserve the public adapter's explicit relative-root form. Host receives
+    // one absolute root; it never guesses a workspace for the caller.
+    baseDir = path.resolve(baseDir);
+    const dirs = (await scanSessionDirectories(baseDir)).filter(({ id }) => !isInternalEphemeralSessionId(id));
+    dirs.sort(compareDiskSessionPosition);
     const decodedCursor = decodeDiskSessionCursor(opts.cursor);
     if (decodedCursor === null)
         return { sessions: [], nextCursor: null };
     const start = typeof decodedCursor === "number"
         ? Math.max(0, decodedCursor)
         : (() => {
-            const index = dirs.findIndex((entry) => entry.mtime < decodedCursor.mtime ||
-                (entry.mtime === decodedCursor.mtime && entry.id > decodedCursor.id));
+            const index = dirs.findIndex((entry) => compareDiskSessionPosition(entry, decodedCursor) > 0);
             return index < 0 ? dirs.length : index;
         })();
     const sessions = [];
@@ -264,9 +249,14 @@ export async function listDiskSessions(opts, baseDir = sessionsRoot()) {
         const { id, mtime } = dirs[i];
         let state;
         try {
-            state = JSON.parse(await fs.readFile(path.join(baseDir, id, "state.json"), "utf8"));
+            state = JSON.parse(await readSessionListState(baseDir, id, MAX_HISTORY_STATE_BYTES));
+            if (!state || typeof state !== "object" || Array.isArray(state))
+                continue;
         }
-        catch {
+        catch (error) {
+            if (error instanceof SessionFileError && error.code === "too_large") {
+                process.emitWarning(`Session ${id}: state.json exceeds the 2 MiB catalog metadata limit; entry omitted.`, { code: "SESSION_LIST_STATE_TOO_LARGE" });
+            }
             continue;
         }
         if (state.ephemeral === true)