@cjhyy/code-shell-server 0.9.51 → 0.10.1

package/dist/remote-relay/connector.js

@@ -1,12 +1,13 @@
 import { WebSocket } from "ws";
 import { openRelayStream } from "./local-stream.js";
-import { isRelayHostId, isRelayOrigin, isRelayToken, parseRelayControlMessage, RELAY_CONNECT_PATH, RELAY_CONTROL_MAX_BYTES, RELAY_MAX_STREAMS, RELAY_PING_INTERVAL_MS, RELAY_PONG_TIMEOUT_MS, RELAY_SETUP_TIMEOUT_MS, } from "./protocol.js";
+import { isRelayHostId, isRelayOrigin, isRelayToken, parseRelayControlMessage, RELAY_CONNECT_PATH, RELAY_CONTROL_MAX_BYTES, RELAY_FEATURE_PAIRING, RELAY_FEATURES_HEADER, RELAY_MAX_STREAMS, RELAY_PING_INTERVAL_MS, RELAY_PONG_TIMEOUT_MS, RELAY_SETUP_TIMEOUT_MS, } from "./protocol.js";
 export function createDeviceRelayConnector(options) {
     if (!isRelayOrigin(options.relayOrigin) ||
         !isRelayOrigin(options.publicOrigin) ||
         !isRelayHostId(options.hostId) ||
         (!options.getCredential && !isRelayToken(options.credential)) ||
         (options.getCredential !== undefined && typeof options.getCredential !== "function") ||
+        (options.issuePairing !== undefined && typeof options.issuePairing !== "function") ||
         !options.localHost ||
         !Number.isInteger(options.localHost.port) ||
         options.localHost.port < 1 ||
@@ -96,7 +97,10 @@ export function createDeviceRelayConnector(options) {
         const url = new URL(RELAY_CONNECT_PATH, config.relayOrigin);
         url.protocol = "wss:";
         const ws = new WebSocket(url, {
-            headers: { Authorization: `Bearer ${credential}` },
+            headers: {
+                Authorization: `Bearer ${credential}`,
+                ...(config.issuePairing ? { [RELAY_FEATURES_HEADER]: RELAY_FEATURE_PAIRING } : {}),
+            },
             ca: config.ca,
             followRedirects: false,
             perMessageDeflate: false,
@@ -180,6 +184,29 @@ export function createDeviceRelayConnector(options) {
                 state("ready");
                 return;
             }
+            if (message.type === "pair") {
+                if (!config.issuePairing || !leaseId || message.leaseId !== leaseId)
+                    return ws.terminate();
+                let reply = {
+                    type: "pair-failed",
+                    v: 1,
+                    leaseId,
+                    requestId: message.requestId,
+                };
+                try {
+                    const issued = config.issuePairing();
+                    if (isRelayToken(issued?.token) &&
+                        Number.isSafeInteger(issued.expiresAt) &&
+                        issued.expiresAt > Date.now())
+                        reply = { ...reply, type: "paired", token: issued.token, expiresAt: issued.expiresAt };
+                }
+                catch {
+                    /* Refused or unavailable: the directory reports failure to its owner. */
+                }
+                if (current() && ws.readyState === ws.OPEN)
+                    ws.send(JSON.stringify(reply));
+                return;
+            }
             if (message.type !== "open" ||
                 !leaseId ||
                 message.leaseId !== leaseId ||

package/dist/remote-relay/protocol.d.ts

@@ -9,6 +9,10 @@ export declare const RELAY_STREAMS_PATH = "/api/v1/remote-hosts/streams/";
 export declare const RELAY_SETUP_TIMEOUT_MS = 10000;
 export declare const RELAY_PING_INTERVAL_MS = 20000;
 export declare const RELAY_PONG_TIMEOUT_MS = 60000;
+/** Control-upgrade header listing optional features; older directories ignore it. */
+export declare const RELAY_FEATURES_HEADER = "X-CodeShell-Relay-Features";
+/** The directory may ask this computer for a one-time phone pairing token. */
+export declare const RELAY_FEATURE_PAIRING = "pairing";
 export type RelayControlMessage = {
     type: "welcome";
     v: 1;
@@ -30,6 +34,23 @@ export type RelayControlMessage = {
     v: 1;
     leaseId: string;
     streamId: string;
+} | {
+    type: "pair";
+    v: 1;
+    leaseId: string;
+    requestId: string;
+} | {
+    type: "paired";
+    v: 1;
+    leaseId: string;
+    requestId: string;
+    token: string;
+    expiresAt: number;
+} | {
+    type: "pair-failed";
+    v: 1;
+    leaseId: string;
+    requestId: string;
 };
 export declare function isRelayToken(value: unknown): value is string;
 export declare function isRelayHostId(value: unknown): value is string;

package/dist/remote-relay/protocol.js

@@ -9,6 +9,10 @@ export const RELAY_STREAMS_PATH = "/api/v1/remote-hosts/streams/";
 export const RELAY_SETUP_TIMEOUT_MS = 10_000;
 export const RELAY_PING_INTERVAL_MS = 20_000;
 export const RELAY_PONG_TIMEOUT_MS = 60_000;
+/** Control-upgrade header listing optional features; older directories ignore it. */
+export const RELAY_FEATURES_HEADER = "X-CodeShell-Relay-Features";
+/** The directory may ask this computer for a one-time phone pairing token. */
+export const RELAY_FEATURE_PAIRING = "pairing";
 export function isRelayToken(value) {
     return typeof value === "string" && /^[A-Za-z0-9_-]{43}$/.test(value);
 }
@@ -60,5 +64,32 @@ export function parseRelayControlMessage(value) {
         case "failed":
             if (isRelayToken(message.streamId))
                 return { type: "failed", v: 1, leaseId: message.leaseId, streamId: message.streamId };
+            return;
+        case "pair":
+            if (isRelayToken(message.requestId))
+                return { type: "pair", v: 1, leaseId: message.leaseId, requestId: message.requestId };
+            return;
+        case "paired":
+            if (isRelayToken(message.requestId) &&
+                isRelayToken(message.token) &&
+                Number.isSafeInteger(message.expiresAt) &&
+                message.expiresAt > 0)
+                return {
+                    type: "paired",
+                    v: 1,
+                    leaseId: message.leaseId,
+                    requestId: message.requestId,
+                    token: message.token,
+                    expiresAt: message.expiresAt,
+                };
+            return;
+        case "pair-failed":
+            if (isRelayToken(message.requestId))
+                return {
+                    type: "pair-failed",
+                    v: 1,
+                    leaseId: message.leaseId,
+                    requestId: message.requestId,
+                };
     }
 }

package/dist/serve/cli.js

@@ -12,6 +12,7 @@ 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]
+       code-shell-serve account <login|status|features|links|logout|register> [options]
 
 Run the CodeShell headless Web host for a workspace.
 
@@ -146,6 +147,11 @@ export function resolveWebAppRoot() {
     }
 }
 export async function runServeCli(argv = process.argv.slice(2)) {
+    if (argv[0] === "account") {
+        const { runAccountCli } = await import("../account/cli.js");
+        await runAccountCli(argv.slice(1));
+        return;
+    }
     if (argv.includes("--help") || argv.includes("-h")) {
         console.log(SERVE_HELP);
         return;

package/dist/serve/headless-server.js

@@ -42,6 +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 { headlessWorkerEnv } from "../headless-worker-env.js";
 import { HostRuntime, interceptHostRequest } from "@cjhyy/code-shell-host";
 import { createModelTraceHttp } from "../model-trace-http.js";
 export async function startHeadlessServer(opts) {
@@ -440,16 +441,8 @@ export async function startHeadlessServer(opts) {
         entryPath: opts.workerEntryPath,
         execPath: opts.execPath,
         fallbackCwd: () => opts.cwd,
-        buildEnv: () => ({
-            ...process.env,
-            CODE_SHELL_REMOTE_LINK_CLIENT_SECRET: undefined,
-            // 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,
+        buildEnv: () => headlessWorkerEnv(process.env, {
             CODE_SHELL_DATA_ROOT: workerDataRoot,
-            CODE_SHELL_CREDENTIAL_ACCESS: "local",
             CODE_SHELL_CAPABILITY_MODULES: opts.workerCapabilityModules ??
                 `${import.meta.resolve("@cjhyy/code-shell-server/links")}#createLinkProviderModule`,
         }),
@@ -557,16 +550,8 @@ export async function startHeadlessServer(opts) {
             publicPathPrefix: opts.publicPathPrefix,
             agentTaskOptions: {
                 workerEntryPath: opts.workerEntryPath,
-                buildEnv: () => ({
-                    ...process.env,
-                    CODE_SHELL_REMOTE_LINK_CLIENT_SECRET: undefined,
-                    // 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,
+                buildEnv: () => headlessWorkerEnv(process.env, {
                     CODE_SHELL_DATA_ROOT: workerDataRoot,
-                    CODE_SHELL_CREDENTIAL_ACCESS: "local",
                     CODE_SHELL_CAPABILITY_MODULES: opts.workerCapabilityModules ??
                         `${import.meta.resolve("@cjhyy/code-shell-server/links")}#createLinkProviderModule`,
                 }),
@@ -895,6 +880,21 @@ export async function startHeadlessServer(opts) {
                 }
                 let approvalId;
                 let approvalRouted = false;
+                if (hubAuth && parsed.method === "agent/approvalKeepWaiting") {
+                    const requestId = parsed.params?.requestId;
+                    const approval = typeof requestId === "string" ? leases.get(requestId) : undefined;
+                    if (!approval || approval.sessionId !== parsed.params?.sessionId) {
+                        sendToTab(ws, hostQueryError(parsed.id ?? null, -32009, "approval is no longer pending"), "approval");
+                        return;
+                    }
+                    // Route fields belong to the worker's request, never to browser input.
+                    parsed.params = {
+                        sessionId: approval.sessionId,
+                        requestId: approval.requestId,
+                        ...(approval.connectionId !== undefined ? { connectionId: approval.connectionId } : {}),
+                        ...(approval.generation !== undefined ? { generation: approval.generation } : {}),
+                    };
+                }
                 if (hubAuth && parsed.method === "agent/approve") {
                     const requestId = parsed.params?.requestId;
                     const approval = typeof requestId === "string" ? leases.get(requestId) : undefined;
@@ -1431,7 +1431,12 @@ function readOptionalHubSessionState(sessionManager, sessionId) {
         throw error;
     }
 }
-const SERVE_ALLOWED_WORKER_METHODS = new Set(["agent/run", "agent/approve", "agent/cancel"]);
+const SERVE_ALLOWED_WORKER_METHODS = new Set([
+    "agent/run",
+    "agent/approve",
+    "agent/approvalKeepWaiting",
+    "agent/cancel",
+]);
 /**
  * The no-account Web host deliberately exposes only the methods used by its
  * bundled SPA. Passcode possession grants control of this workspace, not raw

package/dist/sessions-service.d.ts

@@ -40,6 +40,8 @@ export interface DiskSessionMeta {
     title: string;
     model?: string;
     provider?: string;
+    /** Explicit configured text connection persisted by the Session's last native run. */
+    modelConnectionId?: string;
     updatedAt: number;
     /** Durable creation time, when supplied by the engine's state schema. */
     createdAt?: number;
@@ -73,6 +75,8 @@ export declare function listDiskSessions(opts: {
     cursor?: string;
     /** Display-only project roots filter, applied before pagination. */
     cwds?: readonly string[];
+    /** Check one candidate against the same visibility rules without reading unrelated states. */
+    sessionId?: string;
     includeArchived?: boolean;
     /** Host read models may include children; ordinary sidebar queries stay top-level. */
     includeSubagents?: boolean;

package/dist/sessions-service.js

@@ -205,6 +205,14 @@ function decodeDiskSessionCursor(value) {
  *   - non-empty   → sub-agent → show only for the matching parent query
  */
 export async function listDiskSessions(opts, baseDir = sessionsRoot()) {
+    if (opts.sessionId !== undefined &&
+        (typeof opts.sessionId !== "string" ||
+            !SAFE_ID.test(opts.sessionId) ||
+            opts.sessionId.length > 128 ||
+            opts.sessionId === "." ||
+            opts.sessionId.includes(".."))) {
+        throw new Error("invalid session id");
+    }
     const parentSessionId = opts.parentSessionId;
     if (parentSessionId !== undefined &&
         (typeof parentSessionId !== "string" ||
@@ -224,7 +232,7 @@ export async function listDiskSessions(opts, baseDir = sessionsRoot()) {
             : normalized;
     };
     const cwdRoots = opts.cwds?.map(pathKey);
-    const dirs = (await scanSessionDirectories(baseDir)).filter(({ id }) => !isInternalEphemeralSessionId(id));
+    const dirs = (await scanSessionDirectories(baseDir)).filter(({ id }) => !isInternalEphemeralSessionId(id) && (opts.sessionId === undefined || id === opts.sessionId));
     dirs.sort(compareDiskSessionPosition);
     const decodedCursor = decodeDiskSessionCursor(opts.cursor);
     if (decodedCursor === null)
@@ -342,6 +350,11 @@ export async function listDiskSessions(opts, baseDir = sessionsRoot()) {
             engineSessionId: id,
             ...(typeof state.model === "string" ? { model: state.model } : {}),
             ...(typeof state.provider === "string" ? { provider: state.provider } : {}),
+            ...(typeof state.modelConnectionId === "string" &&
+                state.modelConnectionId.length > 0 &&
+                state.modelConnectionId.length <= 256
+                ? { modelConnectionId: state.modelConnectionId }
+                : {}),
             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.51",
+  "version": "0.10.1",
   "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",
@@ -45,6 +45,10 @@
     "./panels": {
       "types": "./dist/index.panels.d.ts",
       "import": "./dist/index.panels.js"
+    },
+    "./account": {
+      "types": "./dist/index.account.d.ts",
+      "import": "./dist/index.account.js"
     }
   },
   "bin": {
@@ -62,14 +66,14 @@
     "clean": "node -e \"require('node:fs').rmSync('dist',{recursive:true,force:true})\""
   },
   "dependencies": {
-    "@cjhyy/code-shell-capability-coding": "0.9.51",
-    "@cjhyy/code-shell-core": "0.9.51",
-    "@cjhyy/code-shell-web": "0.9.51",
+    "@cjhyy/code-shell-capability-coding": "0.10.1",
+    "@cjhyy/code-shell-core": "0.10.1",
+    "@cjhyy/code-shell-web": "0.10.1",
     "@modelcontextprotocol/sdk": "^1.31.0",
     "@types/ws": "^8.18.1",
     "ws": "^8.21.0",
-    "@cjhyy/code-shell-link": "0.9.51",
-    "@cjhyy/code-shell-host": "0.9.51"
+    "@cjhyy/code-shell-link": "0.10.1",
+    "@cjhyy/code-shell-host": "0.10.1"
   },
   "engines": {
     "node": ">=20.10"