@cjhyy/code-shell-server 0.8.0 → 0.8.2

package/dist/worker-bridge-core.d.ts

@@ -67,9 +67,9 @@ export interface WorkerBridgeCoreOptions {
     fallbackCwd?: () => string;
     log?: WorkerBridgeLog;
     /**
-     * Rewrite/side-effect hook for injectWorkerMessage lines (e.g. agent/run
-     * trust metadata + on-demand spawn). Returns the line to write; `method`
-     * is only used for log context.
+     * Rewrite/side-effect hook for every host-originated worker frame, whether
+     * injected or correlated (e.g. agent/run trust metadata + on-demand spawn).
+     * Returns the line to write; `method` is only used for log context.
      */
     prepareInbound?: (line: string) => {
         line: string;

package/dist/worker-bridge-core.js

@@ -10,7 +10,7 @@
 //   - stdout line framing (readline split) + listener dispatch
 //   - request/response correlation (id → resolver, with timeout / consume /
 //     settle-on-exit semantics)
-//   - inbound line injection (`injectWorkerMessage`) with a pluggable
+//   - inbound line injection and correlated requests with a pluggable
 //     `prepareInbound` hook for host-specific rewriting (e.g. agent/run trust)
 //   - worker generation counter (bumped on every successful spawn)
 //   - pending outbox flushed once the worker's stdin exists
@@ -283,21 +283,30 @@ export class WorkerBridgeCore {
                 settleOnExit: options.settleOnExit === true,
                 settle,
             });
-            const frame = JSON.stringify({
+            const rawFrame = JSON.stringify({
                 jsonrpc: "2.0",
                 id,
                 method,
                 ...(params === undefined ? {} : { params }),
             });
-            // Wake a lazily-unspawned worker before writing, so a spawn-triggering
-            // request (pet/IM-gateway agent/run) isn't dropped by sendLine and left
-            // to hang until timeout. Idempotent when a child is already alive.
-            if (options.ensureWorker)
-                this.ensureWorker(options.ensureWorkerCwd);
             let sent = false;
             let sendError;
             try {
-                sent = this.sendLine(frame);
+                // Correlated host requests must cross the same metadata boundary as
+                // injected renderer/mobile frames. In particular, Panel App
+                // agent.submitPrompt uses request() and carries the session bucket;
+                // bypassing this hook left the main process unable to route the first
+                // Panel tool call for a restored session.
+                const prepared = this.opts.prepareInbound
+                    ? this.opts.prepareInbound(rawFrame)
+                    : { line: rawFrame, method: undefined };
+                // Wake a lazily-unspawned worker before writing, so a spawn-triggering
+                // request (pet/IM-gateway agent/run) isn't dropped by sendLine and left
+                // to hang until timeout. Idempotent when prepareInbound already spawned
+                // the worker as an agent/run side effect.
+                if (options.ensureWorker)
+                    this.ensureWorker(options.ensureWorkerCwd);
+                sent = this.sendLine(prepared.line);
             }
             catch (e) {
                 sendError = e;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cjhyy/code-shell-server",
-  "version": "0.8.0",
+  "version": "0.8.2",
   "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",
@@ -38,9 +38,9 @@
     "clean": "node -e \"require('node:fs').rmSync('dist',{recursive:true,force:true})\""
   },
   "dependencies": {
-    "@cjhyy/code-shell-capability-coding": "0.8.0",
-    "@cjhyy/code-shell-core": "0.8.0",
-    "@cjhyy/code-shell-web": "0.8.0",
+    "@cjhyy/code-shell-capability-coding": "0.8.2",
+    "@cjhyy/code-shell-core": "0.8.2",
+    "@cjhyy/code-shell-web": "0.8.2",
     "@types/ws": "^8.18.1",
     "ws": "^8.21.0"
   },