@cjhyy/code-shell-server 0.9.48 → 0.9.49

package/dist/panels/bridge-contract.d.ts

@@ -11,7 +11,7 @@ export declare const panelBridgeLimits: Readonly<{
     callTimeoutMs: 15000;
     consentTimeoutMs: number;
 }>;
-export type PanelBridgeErrorCode = "PERMISSION_DENIED" | "REVOKED" | "SESSION_CHANGED" | "NOT_SUPPORTED" | "RATE_LIMITED" | "PARAMS_TOO_LARGE" | "RESULT_TOO_LARGE" | "TIMEOUT" | "INVALID_ARGUMENT" | "OPERATION_FAILED";
+export type PanelBridgeErrorCode = "PERMISSION_DENIED" | "REVOKED" | "SESSION_CHANGED" | "NOT_SUPPORTED" | "RATE_LIMITED" | "PARAMS_TOO_LARGE" | "RESULT_TOO_LARGE" | "TIMEOUT" | "INVALID_ARGUMENT" | "OPERATION_FAILED" | "SERVICE_CAPACITY" | "SERVICE_CONFIG_CONFLICT" | "SERVICE_REVISION_CONFLICT" | "SERVICE_REQUEST_KEY_CONFLICT";
 export declare class PanelBridgeError extends Error {
     readonly code: PanelBridgeErrorCode;
     readonly retryAfterMs?: number | undefined;

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

@@ -1,6 +1,6 @@
 /** 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";
+    kind: "panel-call" | "agent-tool" | "process" | "agent-task" | "tool-job" | "automation" | "service";
     /** Desktop WebContents id of the Panel instance that owns this execution. */
     guestId?: number;
     /** Trusted Host description, such as a native tool entry name. */
@@ -32,6 +32,12 @@ export declare class PanelExecutionBusyError extends Error {
 export declare class PanelExecutionGate {
     private readonly executions;
     private readonly sources;
+    private readonly settled;
+    private readonly serviceDrains;
+    registerServiceDrain(drain: (matches: (scope: PanelExecutionScope) => boolean) => Promise<void>): () => void;
+    /** Call only after validating the concrete authorized catalog mutation. */
+    drainServices(matches: (scope: PanelExecutionScope) => boolean): Promise<void>;
+    onMutationSettled(listener: () => void): () => void;
     private readonly mutations;
     enter(scope: PanelExecutionScope): () => void;
     run<T>(scope: PanelExecutionScope, work: () => Promise<T>): Promise<T>;

package/dist/panels/execution-gate.js

@@ -27,6 +27,24 @@ export class PanelExecutionBusyError extends Error {
 export class PanelExecutionGate {
     executions = new Set();
     sources = new Set();
+    settled = new Set();
+    serviceDrains = new Set();
+    registerServiceDrain(drain) {
+        this.serviceDrains.add(drain);
+        return () => {
+            this.serviceDrains.delete(drain);
+        };
+    }
+    /** Call only after validating the concrete authorized catalog mutation. */
+    async drainServices(matches) {
+        await Promise.all([...this.serviceDrains].map((drain) => drain(matches)));
+    }
+    onMutationSettled(listener) {
+        this.settled.add(listener);
+        return () => {
+            this.settled.delete(listener);
+        };
+    }
     mutations = new Set();
     enter(scope) {
         const held = {
@@ -98,6 +116,14 @@ export class PanelExecutionGate {
         }
         finally {
             this.mutations.delete(matches);
+            for (const listener of this.settled) {
+                try {
+                    listener();
+                }
+                catch {
+                    /* observer */
+                }
+            }
         }
     }
 }

package/dist/panels/management.js

@@ -506,6 +506,13 @@ export function createPanelManagement(options) {
         catalogMutation = next.catch(() => undefined);
         return next;
     }
+    async function drainSelectedServices(id, expected, guard, matches) {
+        const current = await selectedApp(id);
+        if (revision(current.app, current.digest) !== expected)
+            throw new PanelManagementError(409, "conflict", "面板已改变，请刷新后重试。");
+        await guard();
+        await panelExecutionGate.drainServices(matches);
+    }
     function setBinding(app, bound, expected) {
         options.assertBinding?.();
         if (!hasProject)
@@ -658,10 +665,15 @@ export function createPanelManagement(options) {
                 throw new PanelManagementError(403, "review_owner", "请在当前设备重新审阅这个版本。");
             await assertAuthorized(context, held.generation);
             const review = held.public;
-            return mutate(context, { appId: review.appId, kind: "binding" }, async (guard) => {
-                await assertAuthorized(context, held.generation);
+            const assertReviewLease = () => {
+                if (closed || generation(context.ownerId) !== held.generation)
+                    throw new PanelManagementError(401, "login_required", "登录已失效，请重新登录。");
                 if (restores.get(token) !== held || held.public.expiresAt <= now())
                     throw new PanelManagementError(409, "review_expired", "版本审阅已失效，请重新选择。");
+            };
+            const validateReview = async (guard) => {
+                await assertAuthorized(context, held.generation);
+                assertReviewLease();
                 const current = await restorationSelection(review.appId);
                 if (current.revision !== review.expectedRevision)
                     throw new PanelManagementError(409, "conflict", "项目面板已改变，请重新审阅。");
@@ -670,12 +682,25 @@ export function createPanelManagement(options) {
                     throw new PanelManagementError(400, "unsupported", "这个版本无法在当前环境使用。");
                 await guard();
                 await assertAuthorized(context, held.generation);
-                if (restores.get(token) !== held || held.public.expiresAt <= now())
-                    throw new PanelManagementError(409, "review_expired", "版本审阅已失效，请重新选择。");
+                assertReviewLease();
+                if (projectState(review.appId) !== held.projectState)
+                    throw new PanelManagementError(409, "conflict", "项目面板配置已改变，请重新审阅。");
+                return target;
+            };
+            return mutate(context, { appId: review.appId, kind: "binding" }, async (guard) => {
+                const target = await validateReview(guard);
+                assertReviewLease();
                 setBinding(target, true, { projectState: held.projectState });
                 restores.delete(token);
                 await options.onChanged?.(review.appId, "binding");
                 return { id: review.appId, packageDigest: review.packageDigest };
+            }, async (guard, matches) => {
+                // A reviewed version selection changes the executor's package just like
+                // unbinding. Validate authority and exact retained bytes before drain,
+                // then revalidate them before writing. Other executions still block.
+                await validateReview(guard);
+                assertReviewLease();
+                await panelExecutionGate.drainServices(matches);
             });
         },
         assertAuthorized,
@@ -761,6 +786,8 @@ export function createPanelManagement(options) {
                 throw new PanelManagementError(409, "already_installed", "这个面板已经安装，请确认项目更新。");
             let admitted = false;
             const assertReviewLease = () => {
+                if (closed || generation(context.ownerId) !== held.generation)
+                    throw new PanelManagementError(401, "login_required", "登录已失效，请重新登录。");
                 if (!admitted && (reviews.get(token) !== held || held.public.expiresAt <= now()))
                     throw new PanelManagementError(409, "review_expired", "预览已失效，请重新检查来源。");
             };
@@ -783,6 +810,7 @@ export function createPanelManagement(options) {
             };
             return mutate(context, { appId: held.public.preview.id, kind: held.public.kind }, async (guard) => {
                 await validateReview(guard);
+                assertReviewLease();
                 const id = held.public.preview.id;
                 const installed = await installReviewedLocalPanelApp(held.source, held.digest, new Date(now()).toISOString(), {
                     overwrite: held.public.kind === "update",
@@ -798,6 +826,7 @@ export function createPanelManagement(options) {
                         if (projectState(id) !== held.projectState)
                             throw new PanelManagementError(409, "conflict", "项目面板配置已改变，请重新预览。");
                         await guard();
+                        assertReviewLease();
                     },
                 });
                 reviews.delete(token);
@@ -813,7 +842,7 @@ export function createPanelManagement(options) {
                 invalidateSkillCache();
                 await options.onChanged?.(id, held.public.kind);
                 return { id, packageDigest: installed.packageDigest };
-            }, approval?.releaseExecutions
+            }, held.public.kind === "update"
                 ? async (guard, matches) => {
                     await validateReview(guard);
                     // A local directory/ZIP may have changed since preview. Check its
@@ -823,12 +852,19 @@ export function createPanelManagement(options) {
                     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);
+                    assertReviewLease();
+                    if (approval?.releaseExecutions) {
+                        // Force owns the review while its holders exit. TTL expiry during
+                        // cancellation must not invalidate consent; revocation is checked.
+                        admitted = true;
+                        reviews.delete(token);
+                        await approval.releaseExecutions(held.public.preview.id, matches);
+                    }
+                    else {
+                        // Ordinary updates drain only services. Other executions still
+                        // block, and failed publication must leave this review retryable.
+                        await panelExecutionGate.drainServices(matches);
+                    }
                 }
                 : undefined);
         },
@@ -852,7 +888,7 @@ export function createPanelManagement(options) {
                 setBinding(app, bound, { ...current, revision: expected });
                 await options.onChanged?.(id, "binding");
                 return snapshot();
-            });
+            }, (guard, matches) => drainSelectedServices(id, expected, guard, matches));
         },
         async remove(context, id, expected) {
             assertId(id);
@@ -878,7 +914,7 @@ export function createPanelManagement(options) {
                 invalidateSkillCache();
                 await options.onChanged?.(id, "remove");
                 return { removed: true };
-            });
+            }, (guard, matches) => drainSelectedServices(id, expected, guard, matches));
         },
         cancelOwner(owner) {
             generations.set(owner, generation(owner) + 1);

package/dist/panels/process-files.js

@@ -3,6 +3,7 @@ import { lstat, open, opendir, realpath } from "node:fs/promises";
 import { extname, isAbsolute, join, resolve } from "node:path";
 import { Readable } from "node:stream";
 import { pipeline } from "node:stream/promises";
+import { rangeBounds } from "../http-byte-range.js";
 const MAX_DOWNLOAD_BYTES = 2 * 1024 * 1024 * 1024;
 const MAX_ENTRIES = 200;
 const MAX_EXAMINED = 4096;
@@ -227,20 +228,44 @@ export async function handlePanelProcessDirectory(request, response, options) {
             fail(404, "下载文件已经改变。");
         await verifyDirectory();
         await authorize();
-        response.writeHead(200, {
+        // Directory outputs are mutable and have no stable representation validator.
+        // An If-Range condition cannot be confirmed, so return the complete file.
+        const range = request.headers["if-range"] === undefined ? request.headers.range : undefined;
+        const bounds = range === undefined
+            ? { start: 0, end: metadata.size - 1 }
+            : metadata.size > 0
+                ? rangeBounds(range, metadata.size)
+                : null;
+        const headers = {
             "Content-Type": "application/octet-stream",
             "Content-Disposition": disposition(name),
-            "Content-Length": metadata.size,
+            "Accept-Ranges": "bytes",
             "Content-Security-Policy": "default-src 'none'; sandbox",
             "Cache-Control": "no-store",
             "X-Content-Type-Options": "nosniff",
             "Referrer-Policy": "no-referrer",
+        };
+        if (!bounds) {
+            response.writeHead(416, {
+                ...headers,
+                "Content-Range": `bytes */${metadata.size}`,
+                "Content-Length": 0,
+            });
+            response.end();
+            return;
+        }
+        response.writeHead(range === undefined ? 200 : 206, {
+            ...headers,
+            "Content-Length": bounds.end - bounds.start + 1,
+            ...(range === undefined
+                ? {}
+                : { "Content-Range": `bytes ${bounds.start}-${bounds.end}/${metadata.size}` }),
         });
         if (request.method === "HEAD" || metadata.size === 0) {
             response.end();
             return;
         }
-        const input = file.createReadStream({ autoClose: false, start: 0, end: metadata.size - 1 });
+        const input = file.createReadStream({ autoClose: false, ...bounds });
         let checking = false;
         const timer = setInterval(() => {
             if (checking)

package/dist/panels/resources/library.d.ts

@@ -1,5 +1,6 @@
 import type { Readable } from "node:stream";
 import type { MediaAsset, MediaScope } from "./types.js";
+export { rangeBounds } from "../../http-byte-range.js";
 export declare function resourceMimeType(name: string, requested?: string): string;
 export interface MediaLibraryOptions {
     rootDirectory: string;
@@ -33,10 +34,6 @@ export interface MediaReadResult {
     body: Readable | null;
 }
 export declare function resourceName(value: string): string;
-export declare function rangeBounds(range: string, size: number): {
-    start: number;
-    end: number;
-} | null;
 /**
  * Host-owned immutable, scope-local media. importFile accepts only paths already
  * authorized by the caller (for example native file selection); guest APIs must

package/dist/panels/resources/library.js

@@ -3,6 +3,8 @@ import { constants } from "node:fs";
 import { lstat, mkdir, open, readdir, rename, rm } from "node:fs/promises";
 import { basename, extname, join } from "node:path";
 import { mediaDirectory, mediaScopeKey, readMediaJson, writeMediaJson } from "./storage.js";
+import { rangeBounds } from "../../http-byte-range.js";
+export { rangeBounds } from "../../http-byte-range.js";
 const ASSET_ID = /^asset-[a-f0-9]{64}$/;
 const MIME_BY_EXTENSION = {
     ".mp4": "video/mp4",
@@ -93,24 +95,6 @@ function assetRecord(raw, id) {
         createdAt: value.createdAt,
     };
 }
-export function rangeBounds(range, size) {
-    const match = /^bytes=(\d*)-(\d*)$/.exec(range);
-    if (!match || (!match[1] && !match[2]))
-        return null;
-    const first = match[1] ? Number(match[1]) : undefined;
-    const last = match[2] ? Number(match[2]) : undefined;
-    if ((first !== undefined && !Number.isSafeInteger(first)) ||
-        (last !== undefined && !Number.isSafeInteger(last)))
-        return null;
-    if (first === undefined) {
-        if (!last || last <= 0)
-            return null;
-        return { start: Math.max(0, size - last), end: size - 1 };
-    }
-    if (first >= size || (last !== undefined && last < first))
-        return null;
-    return { start: first, end: Math.min(last ?? size - 1, size - 1) };
-}
 /**
  * Host-owned immutable, scope-local media. importFile accepts only paths already
  * authorized by the caller (for example native file selection); guest APIs must

package/dist/panels/resources/references.js

@@ -25,12 +25,11 @@ function referenceId(value) {
 function validIdentity(value) {
     return value && Number.isSafeInteger(value.dev) && Number.isSafeInteger(value.ino);
 }
-function sameSource(a, b, relocating = false) {
-    return (a.dev === b.dev &&
-        a.ino === b.ino &&
-        a.size === b.size &&
-        a.mtimeMs === b.mtimeMs &&
-        (relocating || a.ctimeMs === b.ctimeMs));
+// Like other editors, recognize an original by file, size and modification time.
+// ctime is not identity: macOS changes it for tags, "last opened" and other
+// extended attributes, which would otherwise turn unchanged originals "changed".
+function sameSource(a, b) {
+    return a.dev === b.dev && a.ino === b.ino && a.size === b.size && a.mtimeMs === b.mtimeMs;
 }
 function view(record, state = "available") {
     return {
@@ -221,7 +220,21 @@ export class ExternalResourceReferences {
                     if (error.code !== "ENOENT")
                         throw error;
                 }
-                if ((await readdir(directory)).filter((name) => REFERENCE_ID.test(name.replace(/\.json$/, ""))).length >= MAX_REFERENCES)
+                const names = (await readdir(directory)).filter((name) => REFERENCE_ID.test(name.replace(/\.json$/, "")));
+                // IDs include the ctime seen at creation. Choosing the same unchanged
+                // original again must return its reference, not a duplicate asset.
+                for (const name of names) {
+                    const existing = await this.record(scope, name.replace(/\.json$/, "")).catch(() => undefined);
+                    if (existing?.root === root &&
+                        existing.path === path &&
+                        sameSource(existing.source, selected.initial) &&
+                        existing.ancestors.length === selected.directory.identities.length &&
+                        existing.ancestors.every((identity, index) => sameResourceIdentity(identity, selected.directory.identities[index]))) {
+                        await selected.verify();
+                        return view(existing);
+                    }
+                }
+                if (names.length >= MAX_REFERENCES)
                     throw new Error("External reference count limit exceeded");
                 const record = {
                     schemaVersion: 1,
@@ -302,7 +315,7 @@ export class ExternalResourceReferences {
             const selected = await this.selected(scope, root, resourceRelativePath(path), options);
             try {
                 // Metadata alone cannot establish that an unrelated replacement is the original file.
-                if (!sameSource(previous.source, selected.initial, true))
+                if (!sameSource(previous.source, selected.initial))
                     throw new Error("This is a different file; create a new external reference instead");
                 const record = {
                     ...previous,

package/dist/panels/runtime.js

@@ -349,7 +349,7 @@ function bridgeScript(id, origin) {
         call: ask,
         callResult: (method, params) => ask(method, params).then(value => ({ ok: true, value }), error => ({ ok: false, error: { code: error.code || "OPERATION_FAILED", message: error.message, ...(typeof error.retryAfterMs === "number" ? { retryAfterMs: error.retryAfterMs } : {}) } })),
         on: (name, listener) => {
-          if (!["context.changed", "process.output", "process.exit", "agent.task.changed", "tasks.changed", "media.job.changed"].includes(name) || typeof listener !== "function") {
+          if (!["context.changed", "process.output", "process.exit", "agent.task.changed", "tasks.changed", "services.changed", "media.job.changed"].includes(name) || typeof listener !== "function") {
             throw new Error("Invalid event listener");
           }
           let list = listeners.get(name);

package/dist/panels/tool-jobs.d.ts

@@ -47,6 +47,8 @@ export interface ToolJobProgress {
 export type ToolJobStatus = "queued" | "running" | "cancelling" | "succeeded" | "failed" | "cancelled" | "interrupted";
 export interface ToolJob {
     id: string;
+    /** Caller-owned idempotency identity, returned with its authorized receipt. */
+    requestKey?: string;
     scope: ToolJobScope;
     entry: ToolJobEntry;
     package?: ToolJobPackage;

package/dist/panels/tool-jobs.js

@@ -100,7 +100,7 @@ function progressValue(progress) {
     }, toolJobLimits.maxProgressBytes);
 }
 function publicJob(job) {
-    const { version: _version, requestKey: _requestKey, requestDigest: _requestDigest, ...value } = job;
+    const { version: _version, requestDigest: _requestDigest, ...value } = job;
     return toolJobJson(value, toolJobLimits.maxRecordBytes);
 }
 function packageValue(value) {

package/dist/sessions-service.d.ts

@@ -38,6 +38,8 @@ export interface DiskSessionMeta {
     engineSessionId: string;
     cwd: string;
     title: string;
+    model?: string;
+    provider?: string;
     updatedAt: number;
     /** Durable creation time, when supplied by the engine's state schema. */
     createdAt?: number;
@@ -69,6 +71,8 @@ export interface ListDiskSessionsResult {
 export declare function listDiskSessions(opts: {
     limit: number;
     cursor?: string;
+    /** Display-only project roots filter, applied before pagination. */
+    cwds?: readonly string[];
     includeArchived?: boolean;
     /** Host read models may include children; ordinary sidebar queries stay top-level. */
     includeSubagents?: boolean;

package/dist/sessions-service.js

@@ -217,6 +217,13 @@ export async function listDiskSessions(opts, baseDir = sessionsRoot()) {
     // 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 pathKey = (cwd) => {
+        const normalized = path.resolve(cwd);
+        return process.platform === "darwin" || process.platform === "win32"
+            ? normalized.toLocaleLowerCase("en-US")
+            : normalized;
+    };
+    const cwdRoots = opts.cwds?.map(pathKey);
     const dirs = (await scanSessionDirectories(baseDir)).filter(({ id }) => !isInternalEphemeralSessionId(id));
     dirs.sort(compareDiskSessionPosition);
     const decodedCursor = decodeDiskSessionCursor(opts.cursor);
@@ -288,6 +295,14 @@ export async function listDiskSessions(opts, baseDir = sessionsRoot()) {
         // is intentionally NOT filtered here — the renderer handles that via
         // isNoRepoCwd. (deleted-project resurrection)
         const cwdStr = typeof state.cwd === "string" ? state.cwd : "";
+        if (cwdRoots &&
+            (!cwdStr ||
+                !cwdRoots.some((root) => {
+                    const candidate = pathKey(cwdStr);
+                    return (candidate === root ||
+                        candidate.startsWith(root.endsWith(path.sep) ? root : root + path.sep));
+                })))
+            continue;
         // A child transcript remains useful after its temporary worktree is gone;
         // targeted reads do not rebuild projects in the sidebar.
         const childParentId = typeof state.parentSessionId === "string" && state.parentSessionId
@@ -325,6 +340,8 @@ export async function listDiskSessions(opts, baseDir = sessionsRoot()) {
                 ? { clientMessageId: state.clientMessageId }
                 : {}),
             engineSessionId: id,
+            ...(typeof state.model === "string" ? { model: state.model } : {}),
+            ...(typeof state.provider === "string" ? { provider: state.provider } : {}),
             cwd: typeof state.cwd === "string" ? state.cwd : "",
             // Prefer the LLM-generated title (now persisted to state); fall back to
             // the raw first-message summary, then the id. This lets the disk rebuild

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cjhyy/code-shell-server",
-  "version": "0.9.48",
+  "version": "0.9.49",
   "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",
@@ -62,14 +62,14 @@
     "clean": "node -e \"require('node:fs').rmSync('dist',{recursive:true,force:true})\""
   },
   "dependencies": {
-    "@cjhyy/code-shell-capability-coding": "0.9.48",
-    "@cjhyy/code-shell-core": "0.9.48",
-    "@cjhyy/code-shell-web": "0.9.48",
+    "@cjhyy/code-shell-capability-coding": "0.9.49",
+    "@cjhyy/code-shell-core": "0.9.49",
+    "@cjhyy/code-shell-web": "0.9.49",
     "@modelcontextprotocol/sdk": "^1.31.0",
     "@types/ws": "^8.18.1",
     "ws": "^8.21.0",
-    "@cjhyy/code-shell-link": "0.9.48",
-    "@cjhyy/code-shell-host": "0.9.48"
+    "@cjhyy/code-shell-link": "0.9.49",
+    "@cjhyy/code-shell-host": "0.9.49"
   },
   "engines": {
     "node": ">=20.10"