@cjhyy/code-shell-server 0.9.42 → 0.9.43

package/dist/links/remote-catalog.d.ts

@@ -80,7 +80,7 @@ export declare const REMOTE_LINK_ADAPTERS: ({
     id: "figma";
     name: "Figma";
     group: "files";
-    actions: readonly ["get_file", "get_comments"];
+    actions: readonly ["get_file", "get_comments", "get_nodes", "get_images", "get_image_fills"];
 })[];
 export type RemoteProviderId = RemoteLinkProviderId;
 export interface RemoteProviderCapabilities {

package/dist/links/service.js

@@ -1042,7 +1042,6 @@ export function createLinkService(options = {}) {
             !REMOTE_LINK_ADAPTERS.some((adapter) => adapter.id === input.providerId) ||
             (input.resourceUrl !== undefined &&
                 (input.providerId !== "figma" ||
-                    !input.connectionId ||
                     typeof input.resourceUrl !== "string" ||
                     !input.resourceUrl)))
             throw new LinkServiceError(400, "invalid_request");
@@ -1070,13 +1069,12 @@ export function createLinkService(options = {}) {
                 throw new LinkServiceError(409, "conflict");
         }
         const prepared = { id, expected, input: { ...input, label: string(input.label) } };
-        if (input.resourceUrl !== undefined && !expected)
-            throw new LinkServiceError(400, "invalid_request");
         let attempt;
         try {
             let resourceFiles;
             if (input.providerId === "figma") {
-                // Recover the old whitelist from Host custody. Browser input can only suggest one new file.
+                // A first connection may select the pasted file in the same OAuth consent.
+                // Existing files still come exclusively from Host custody; input suggests one new file.
                 const groups = expected?.meta?.linkResourceGroups;
                 if (expected && (!groups || groups.length !== 1 || groups[0]?.id !== "files"))
                     throw new Error("Invalid saved Figma resources");
@@ -1179,6 +1177,21 @@ export function createLinkService(options = {}) {
                         throw new LinkServiceError(409, "conflict");
                     if (matches.length === 1) {
                         const expected = matches[0];
+                        if (credential.meta?.linkProvider === "figma") {
+                            const oldGroups = expected.meta?.linkResourceGroups;
+                            const newGroups = credential.meta?.linkResourceGroups;
+                            // A concurrent first connection never reviewed this saved grant.
+                            // Reuse only when the newly minted authority already covers it;
+                            // a local union cannot expand the remote token's file whitelist.
+                            if (expected.meta?.linkAccountId !== credential.meta?.linkAccountId ||
+                                oldGroups?.length !== 1 ||
+                                oldGroups[0]?.id !== "files" ||
+                                newGroups?.length !== 1 ||
+                                newGroups[0]?.id !== "files" ||
+                                oldGroups[0].items.some((item) => !newGroups[0].items.some((next) => next.id === item.id)) ||
+                                expected.meta?.linkCapabilityIds?.some((id) => !credential.meta?.linkCapabilityIds?.includes(id)))
+                                throw new LinkServiceError(409, "conflict");
+                        }
                         prepared = { ...prepared, id: expected.id, expected };
                         credential = { ...credential, id: expected.id, label: expected.label };
                     }

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

@@ -1,3 +1,4 @@
+import { HostRuntime, interceptHostRequest, unsupportedAskUserDecision, } from "@cjhyy/code-shell-host";
 import { randomUUID } from "node:crypto";
 import { createRequire } from "node:module";
 import { isAbsolute } from "node:path";
@@ -59,6 +60,10 @@ function progressFromEvent(event) {
 }
 /** Real independent Core workers shared by Desktop Web and standalone Hub. */
 export function createPanelAgentTaskHost(options = {}) {
+    const hostRuntime = new HostRuntime({ kind: "headless", label: "Panel agent task" }, [
+        { id: "panels", capabilities: options.onPanelAction ? ["panel"] : [] },
+    ]);
+    hostRuntime.start();
     const instances = new Map();
     let closed = false;
     const models = options.models ??
@@ -144,30 +149,36 @@ export function createPanelAgentTaskHost(options = {}) {
             ...(typeof params.connectionId === "string" ? { connectionId: params.connectionId } : {}),
             ...(Number.isInteger(params.generation) ? { generation: params.generation } : {}),
         };
-        if (request.toolName.startsWith("__")) {
+        if (request.toolName === "__ask_user__") {
+            // The Panel runtime only has a yes/no confirmation UI. It cannot answer
+            // a question; Core retires async questions without injecting a user answer.
+            outcomeResult(await rpc(running, "agent/approve", {
+                sessionId: pending.sessionId,
+                requestId: pending.id,
+                connectionId: pending.connectionId,
+                generation: pending.generation,
+                decision: unsupportedAskUserDecision(hostRuntime.adapter.label),
+            }));
+            return;
+        }
+        if (request.toolName === "__panel_action__" && options.onPanelAction) {
             let decision;
-            if (request.toolName === "__panel_action__" && options.onPanelAction) {
-                try {
-                    const result = await options.onPanelAction(instance.scope, request.args ?? {});
-                    await assertAuthorized(instance);
-                    const answer = JSON.stringify(result);
-                    if (!answer || Buffer.byteLength(answer) > 512 * 1024)
-                        throw new Error("Panel callback returned an invalid or oversized result");
-                    decision = { approved: true, answer };
-                }
-                catch (error) {
-                    decision = {
-                        approved: false,
-                        failure: "unavailable",
-                        reason: String(error).slice(0, 500),
-                    };
-                }
+            try {
+                const result = await options.onPanelAction(instance.scope, request.args ?? {});
+                await assertAuthorized(instance);
+                const answer = JSON.stringify(result);
+                if (!answer || Buffer.byteLength(answer) > 512 * 1024)
+                    throw new Error("Panel callback returned an invalid or oversized result");
+                decision = { approved: true, answer };
             }
-            else {
+            catch (error) {
                 decision = {
-                    approved: false,
-                    failure: "unavailable",
-                    reason: "This task host does not provide that capability",
+                    approved: true,
+                    answer: JSON.stringify({
+                        ok: false,
+                        failure: "unavailable",
+                        detail: String(error).slice(0, 500),
+                    }),
                 };
             }
             await assertAuthorized(instance);
@@ -258,15 +269,19 @@ export function createPanelAgentTaskHost(options = {}) {
                     entryPath,
                     execPath: options.execPath,
                     fallbackCwd: () => scope.cwd,
-                    buildEnv: options.buildEnv ??
-                        (() => ({
+                    buildEnv: () => ({
+                        ...(options.buildEnv?.() ?? {
                             ...process.env,
-                            // These switch on Desktop-main-only IPC clients in the worker.
-                            CODE_SHELL_OPERATION_BATCH_ACCESS: undefined,
-                            CODE_SHELL_MODEL_REQUEST_SIGNING: undefined,
-                            CODE_SHELL_CREDENTIAL_ACCESS: "local",
                             CODE_SHELL_CAPABILITY_MODULES: `${import.meta.resolve("@cjhyy/code-shell-capability-coding")}#createCodingModule`,
-                        })),
+                        }),
+                        // A task worker has no Desktop main bridge, even inside Desktop Web.
+                        CODE_SHELL_REMOTE_LINK_CLIENT_SECRET: undefined,
+                        CODE_SHELL_OPERATION_BATCH_ACCESS: undefined,
+                        CODE_SHELL_MODEL_REQUEST_SIGNING: undefined,
+                        CODE_SHELL_WORKSPACE_ACCESS: undefined,
+                        CODE_SHELL_HOST_MCP_SERVERS: undefined,
+                        CODE_SHELL_CREDENTIAL_ACCESS: "local",
+                    }),
                     onWorkerStarted: ({ pid }) => {
                         running.pid = pid;
                     },
@@ -281,13 +296,27 @@ export function createPanelAgentTaskHost(options = {}) {
                     catch {
                         return;
                     }
+                    if (interceptHostRequest(message, line, {
+                        runtime: hostRuntime,
+                        sendLine: (reply) => running.bridge.sendLine(reply),
+                        approve: (params) => {
+                            if (params.sessionId !== running.sessionId)
+                                return;
+                            void assertAuthorized(instance)
+                                .then(() => rpc(running, "agent/approve", params))
+                                .then(outcomeResult)
+                                .catch(() => stopWorker(running));
+                        },
+                    }))
+                        return;
                     if (message.params?.sessionId !== input.sessionId)
                         return;
                     if (message.method === "agent/approvalRequest") {
                         void handleWorkerApproval(instance, running, message.params).catch(() => stopWorker(running));
                     }
                     else if (message.method === "agent/approvalResolved") {
-                        instance.approvals.delete(message.params.requestId);
+                        if (!instance.approvals.delete(message.params.requestId))
+                            return;
                         void deliver(instance, "agent.task.approvalResolved", {
                             taskId: input.taskId,
                             requestId: message.params.requestId,
@@ -435,7 +464,10 @@ export function createPanelAgentTaskHost(options = {}) {
                         connectionId: pending.connectionId,
                         generation: pending.generation,
                         decision: input.approved
-                            ? { approved: true, scope: "once" }
+                            ? {
+                                approved: true,
+                                scope: "once",
+                            }
                             : { approved: false, reason: "Declined by user" },
                     }));
                     instance.approvals.delete(pending.id);
@@ -454,6 +486,7 @@ export function createPanelAgentTaskHost(options = {}) {
             for (const id of instances.keys())
                 revokeInstance(id);
             closed = true;
+            hostRuntime.stop();
         },
         activeTaskCount,
     };

package/dist/serve/headless-server.js

@@ -42,7 +42,7 @@ import { createHubSessions, hubSessionPreview, readHubSessionState, readHubTrans
 import { createHubFiles } from "../hub/files.js";
 import { createSessionHttpResponses } from "../session-http-responses.js";
 import { WorkerBridgeCore, previewLine } from "../worker-bridge-core.js";
-import { isHostAuthorityRequest, unsupportedHostRequestResponse, unsupportedLoopbackAnswer, unsupportedLoopbackCapability, } from "./host-requests.js";
+import { HostRuntime, interceptHostRequest } from "@cjhyy/code-shell-host";
 export async function startHeadlessServer(opts) {
     const remoteLink = remoteLinkHostConfiguration(opts.remoteLink, opts.publicOrigin);
     if (remoteLink && opts.authMode !== "hub")
@@ -227,48 +227,26 @@ export async function startHeadlessServer(opts) {
         }
     }, pendingResponseReaperMs);
     pendingResponseReaper.unref?.();
-    // Answer loopbacks only Desktop main can serve, instead of leasing them to a
-    // Web tab that has no way to fulfil them (ch.16 §3.2 step 1.1). Hub mode
-    // serves Panel actions itself; passcode mode has no Panel runtime.
-    const serveCapabilities = { panels: Boolean(hubAuth) };
-    const replyUnsupportedLoopback = (params) => {
-        const approval = params;
-        if (!approval ||
-            typeof approval.requestId !== "string" ||
-            typeof approval.sessionId !== "string")
-            return false;
-        const request = approval.request;
-        const capability = unsupportedLoopbackCapability(request?.toolName, serveCapabilities);
-        if (!capability)
-            return false;
-        // Core's child-browser activate/release frames are one-way notifications
-        // (protocol/server.ts childHost.activate / childHost.release): their
-        // requestId is never registered, so there is nothing to answer.
-        const childHost = approval.childHost;
-        if (childHost?.activate === true || childHost?.release === true)
-            return true;
-        log("worker.loopback_unsupported", { capability });
-        void bridge
-            .request("agent/approve", {
-            sessionId: approval.sessionId,
-            requestId: approval.requestId,
-            connectionId: approval.connectionId,
-            generation: approval.generation,
-            decision: { approved: true, answer: unsupportedLoopbackAnswer(capability) },
-        }, {
-            id: `unsupported-reply-${randomUUID()}`,
-            consume: true,
-            settleOnExit: true,
-            failFast: true,
-            timeoutMs: 5000,
-            meta: { origin: "host", producer: "serve-unsupported-loopback" },
-        })
-            .catch((e) => log("worker.loopback_unsupported_failed", {
-            capability,
-            reason: e instanceof Error ? e.message : "error",
-        }));
-        return true;
-    };
+    const hostRuntime = new HostRuntime({ kind: "headless", label: "headless serve" }, [
+        { id: "panels", capabilities: hubAuth ? ["panel"] : [] },
+    ]);
+    hostRuntime.start();
+    const interceptWorkerRequest = (message, line) => interceptHostRequest(message, line, {
+        runtime: hostRuntime,
+        sendLine: (reply) => bridge.sendLine(reply),
+        approve: (params) => {
+            void bridge
+                .request("agent/approve", params, {
+                id: `unsupported-reply-${randomUUID()}`,
+                consume: true,
+                settleOnExit: true,
+                failFast: true,
+                timeoutMs: 5000,
+                meta: { origin: "host", producer: "serve-unsupported-loopback" },
+            })
+                .catch((error) => log("worker.loopback_unsupported_failed", { reason: String(error) }));
+        },
+    });
     // Notifications describe shared agent state and are broadcast. Correlated
     // JSON-RPC responses must return only to the tab that issued the request;
     // browser tabs all start their local counters at `web-1`, so broadcasting a
@@ -282,16 +260,9 @@ export async function startHeadlessServer(opts) {
             log("worker.frame_dropped", { reason: "not json", raw: previewLine(line) });
             return;
         }
+        if (interceptWorkerRequest(message, line))
+            return;
         if (!message || message.id === undefined || message.method !== undefined) {
-            if (message && isHostAuthorityRequest(message)) {
-                log("worker.host_request_unsupported", { method: message.method });
-                bridge.sendLine(unsupportedHostRequestResponse(message.id, message.method));
-                return;
-            }
-            if (!hubAuth &&
-                message?.method === "agent/approvalRequest" &&
-                replyUnsupportedLoopback(message.params))
-                return;
             if (hubAuth && message?.method === "agent/streamEvent") {
                 const params = message.params;
                 if (typeof params?.sessionId === "string" && params.event !== undefined) {
@@ -340,8 +311,6 @@ export async function startHeadlessServer(opts) {
                     typeof approval.sessionId === "string") {
                     if (automationWorker?.handleApproval(approval))
                         return;
-                    if (replyUnsupportedLoopback(approval))
-                        return;
                     const request = approval.request;
                     if (request?.toolName === "__panel_action__") {
                         const ownerId = runOwners.get(approval.sessionId);
@@ -448,6 +417,8 @@ export async function startHeadlessServer(opts) {
             // These switch on Desktop-main-only IPC clients in the worker.
             CODE_SHELL_OPERATION_BATCH_ACCESS: undefined,
             CODE_SHELL_MODEL_REQUEST_SIGNING: undefined,
+            CODE_SHELL_HOST_MCP_SERVERS: undefined,
+            CODE_SHELL_WORKSPACE_ACCESS: undefined,
             CODE_SHELL_DATA_ROOT: workerDataRoot,
             CODE_SHELL_CREDENTIAL_ACCESS: "local",
             ...(opts.workerCapabilityModules
@@ -562,6 +533,8 @@ export async function startHeadlessServer(opts) {
                     // These switch on Desktop-main-only IPC clients in the worker.
                     CODE_SHELL_OPERATION_BATCH_ACCESS: undefined,
                     CODE_SHELL_MODEL_REQUEST_SIGNING: undefined,
+                    CODE_SHELL_HOST_MCP_SERVERS: undefined,
+                    CODE_SHELL_WORKSPACE_ACCESS: undefined,
                     CODE_SHELL_DATA_ROOT: workerDataRoot,
                     CODE_SHELL_CREDENTIAL_ACCESS: "local",
                     ...(opts.workerCapabilityModules
@@ -1164,6 +1137,7 @@ export async function startHeadlessServer(opts) {
         responses.clear();
         await panelAutomations?.close();
         clearInterval(pendingResponseReaper);
+        hostRuntime.stop();
         if (authReaper)
             clearInterval(authReaper);
         await uploads?.close();

package/dist/serve/host-requests.d.ts

@@ -1,29 +1,2 @@
-/**
- * Worker → host requests that a headless serve host cannot fulfil.
- *
- * Desktop main answers the browser, credential-cookie and workspace-switch
- * loopbacks plus the `desktop/*` authority requests. serve used to broadcast
- * them to Web tabs as ordinary approvals, so the worker waited for its timeout
- * (5 minutes for loopbacks, 30 seconds for automation). Answering at once with
- * a typed `unsupported` result lets the tool fail fast with a reason.
- *
- * Pure and host-neutral on purpose: it moves into packages/host unchanged
- * (architecture ch.16 §3.2 step 1.1). The wire shapes are documented in
- * docs/todo/platform-s0-protocol-inventory.md ("S0 应答格式").
- */
-/** What this host can serve itself; Panel actions are only served with a Panel runtime. */
-export interface ServeHostCapabilities {
-    panels: boolean;
-}
-export declare function unsupportedLoopbackCapability(toolName: unknown, host: ServeHostCapabilities): string | undefined;
-/** The `answer` string for an approved loopback decision. */
-export declare function unsupportedLoopbackAnswer(capability: string): string;
-export declare function isHostAuthorityRequest(message: {
-    id?: unknown;
-    method?: unknown;
-}): message is {
-    id: string | number;
-    method: string;
-};
-/** One JSON-RPC response line to write back to the worker. */
-export declare function unsupportedHostRequestResponse(id: string | number, method: string): string;
+/** @deprecated Import the shared host dispatcher from @cjhyy/code-shell-host. */
+export { isHostAuthorityRequest, unsupportedHostRequestResponse, unsupportedLoopbackAnswer, unsupportedLoopbackCapability, type ServeHostCapabilities, } from "@cjhyy/code-shell-host";

package/dist/serve/host-requests.js

@@ -1,62 +1,2 @@
-/**
- * Worker → host requests that a headless serve host cannot fulfil.
- *
- * Desktop main answers the browser, credential-cookie and workspace-switch
- * loopbacks plus the `desktop/*` authority requests. serve used to broadcast
- * them to Web tabs as ordinary approvals, so the worker waited for its timeout
- * (5 minutes for loopbacks, 30 seconds for automation). Answering at once with
- * a typed `unsupported` result lets the tool fail fast with a reason.
- *
- * Pure and host-neutral on purpose: it moves into packages/host unchanged
- * (architecture ch.16 §3.2 step 1.1). The wire shapes are documented in
- * docs/todo/platform-s0-protocol-inventory.md ("S0 应答格式").
- */
-const DESKTOP_ONLY_LOOPBACKS = Object.freeze({
-    __browser_action__: "browser",
-    __credential_action__: "credential.browserCookie",
-    __workspace_action__: "workspace.switch",
-});
-const PANEL_LOOPBACK = "__panel_action__";
-const PANEL_CAPABILITY = "panel";
-const HOST_AUTHORITY_METHOD_PREFIX = "desktop/";
-const METHOD_NOT_FOUND = -32601;
-function unsupportedText(capability) {
-    return `${capability} is not supported by this host (headless serve)`;
-}
-export function unsupportedLoopbackCapability(toolName, host) {
-    if (typeof toolName !== "string")
-        return undefined;
-    if (toolName === PANEL_LOOPBACK)
-        return host.panels ? undefined : PANEL_CAPABILITY;
-    return Object.hasOwn(DESKTOP_ONLY_LOOPBACKS, toolName)
-        ? DESKTOP_ONLY_LOOPBACKS[toolName]
-        : undefined;
-}
-/** The `answer` string for an approved loopback decision. */
-export function unsupportedLoopbackAnswer(capability) {
-    const text = unsupportedText(capability);
-    return JSON.stringify({
-        ok: false,
-        failure: "unsupported",
-        capability,
-        error: text,
-        detail: text,
-    });
-}
-export function isHostAuthorityRequest(message) {
-    return ((typeof message.id === "string" || typeof message.id === "number") &&
-        typeof message.method === "string" &&
-        message.method.startsWith(HOST_AUTHORITY_METHOD_PREFIX));
-}
-/** One JSON-RPC response line to write back to the worker. */
-export function unsupportedHostRequestResponse(id, method) {
-    return JSON.stringify({
-        jsonrpc: "2.0",
-        id,
-        error: {
-            code: METHOD_NOT_FOUND,
-            message: unsupportedText(method),
-            data: { failure: "unsupported", capability: method },
-        },
-    });
-}
+/** @deprecated Import the shared host dispatcher from @cjhyy/code-shell-host. */
+export { isHostAuthorityRequest, unsupportedHostRequestResponse, unsupportedLoopbackAnswer, unsupportedLoopbackCapability, } from "@cjhyy/code-shell-host";

package/package.json

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