@cjhyy/code-shell-server 0.9.44 → 0.9.46

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)

package/dist/worker-bridge-core.js

@@ -141,6 +141,17 @@ export class WorkerBridgeCore {
             this.settlePendingOnExit();
             this.opts.onSpawnError?.(err);
         });
+        // A write that overlaps worker exit fails asynchronously (EPIPE) on the
+        // stdin stream, after sendLine() already returned. Unlistened, that stream
+        // error is an uncaught exception that terminates the whole Host. The pipe
+        // is unusable either way: retire this exact child so its exit path
+        // settles pending requests like any other crash.
+        child.stdin.on("error", (err) => {
+            this.log("child.stdin.error", { error: String(err), pid: child.pid });
+            if (this.child === child && child.exitCode === null && child.signalCode === null) {
+                child.kill("SIGTERM");
+            }
+        });
         child.on("exit", (code, signal) => {
             // Close the readline interface bound to the dead child's stdout so it
             // (and its "line" listener) doesn't leak across restarts.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cjhyy/code-shell-server",
-  "version": "0.9.44",
+  "version": "0.9.46",
   "description": "CodeShell server transport layer — mobile remote HTTP/WS host, pairing, passcode gate, tunnel, rooms, uploads, and session/attachment services. Electron-free; precursor of the auth gateway.",
   "type": "module",
   "main": "./dist/index.js",
@@ -50,7 +50,8 @@
   "bin": {
     "code-shell-serve": "./dist/bin/code-shell-serve.js",
     "code-shell-settings-recovery": "./dist/bin/code-shell-settings-recovery.js",
-    "code-shell-cloud-account": "./dist/bin/code-shell-cloud-account.js"
+    "code-shell-cloud-account": "./dist/bin/code-shell-cloud-account.js",
+    "code-shell-link-cleanup": "./dist/bin/code-shell-link-cleanup.js"
   },
   "files": [
     "dist"
@@ -61,14 +62,14 @@
     "clean": "node -e \"require('node:fs').rmSync('dist',{recursive:true,force:true})\""
   },
   "dependencies": {
-    "@cjhyy/code-shell-capability-coding": "0.9.44",
-    "@cjhyy/code-shell-core": "0.9.44",
-    "@cjhyy/code-shell-web": "0.9.44",
+    "@cjhyy/code-shell-capability-coding": "0.9.46",
+    "@cjhyy/code-shell-core": "0.9.46",
+    "@cjhyy/code-shell-web": "0.9.46",
     "@modelcontextprotocol/sdk": "^1.31.0",
     "@types/ws": "^8.18.1",
     "ws": "^8.21.0",
-    "@cjhyy/code-shell-link": "0.9.44",
-    "@cjhyy/code-shell-host": "0.9.44"
+    "@cjhyy/code-shell-link": "0.9.46",
+    "@cjhyy/code-shell-host": "0.9.46"
   },
   "engines": {
     "node": ">=20.10"