linkshell-cli 0.3.24 → 0.3.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "linkshell-cli",
-  "version": "0.3.24",
+  "version": "0.3.25",
   "description": "Remote terminal bridge for Claude Code / Codex / Gemini / Copilot — control from your phone",
   "type": "module",
   "main": "dist/cli/src/index.js",
@@ -29,14 +29,21 @@
     "type": "git",
     "url": "git+https://github.com/LiuTianjie/LinkShell.git"
   },
+  "scripts": {
+    "build": "tsc -p tsconfig.json",
+    "postinstall": "node scripts/postinstall.mjs",
+    "typecheck": "tsc -p tsconfig.json --noEmit",
+    "dev": "tsx src/index.ts",
+    "test": "vitest run"
+  },
   "dependencies": {
+    "@linkshell/gateway": "workspace:*",
+    "@linkshell/protocol": "workspace:*",
     "commander": "^13.1.0",
     "node-pty": "^1.0.0",
     "qrcode-terminal": "^0.12.0",
     "ws": "^8.18.1",
-    "zod": "^4.4.3",
-    "@linkshell/gateway": "0.3.9",
-    "@linkshell/protocol": "0.3.11"
+    "zod": "^4.4.3"
   },
   "optionalDependencies": {
     "@anthropic-ai/claude-agent-sdk": "^0.2.128",
@@ -46,12 +53,5 @@
     "@types/ws": "^8.5.14",
     "tsx": "^4.19.3",
     "vitest": "^3.2.1"
-  },
-  "scripts": {
-    "build": "tsc -p tsconfig.json",
-    "postinstall": "node scripts/postinstall.mjs",
-    "typecheck": "tsc -p tsconfig.json --noEmit",
-    "dev": "tsx src/index.ts",
-    "test": "vitest run"
   }
-}
+}

package/src/runtime/acp/agent-workspace.ts

@@ -2497,6 +2497,7 @@ export class AgentWorkspaceProxy {
     if (
       method.startsWith("account/") ||
       method.startsWith("mcpServer/startupStatus/") ||
+      method.startsWith("remoteControl/") ||
       method === "thread/status/changed" ||
       method === "thread/tokenUsage/updated" ||
       method === "serverRequest/resolved" ||

package/src/runtime/acp/codex-rpc-bridge.ts

@@ -5,6 +5,8 @@ import { resolveCodexAppServerCommands, type AgentCommandConfig } from "./provid
 
 const CODEX_PROXY_STARTUP_GRACE_MS = 250;
 
+type JsonRpcId = string | number;
+
 export class CodexRpcBridge {
   private transport: JsonRpcStdioTransport | undefined;
   private transportReady = false;
@@ -13,6 +15,7 @@ export class CodexRpcBridge {
   private candidateIndex = 0;
   private startupTimer: ReturnType<typeof setTimeout> | undefined;
   private queuedMessages: JsonRpcMessage[] = [];
+  private inFlightRequests = new Map<JsonRpcId, JsonRpcMessage>();
 
   constructor(
     private readonly input: {
@@ -32,6 +35,7 @@ export class CodexRpcBridge {
       this.queuedMessages.push(jsonMessage);
       return;
     }
+    this.rememberRequest(jsonMessage);
     this.transport?.send(jsonMessage);
   }
 
@@ -46,6 +50,7 @@ export class CodexRpcBridge {
     this.transportReady = false;
     this.starting = false;
     this.queuedMessages = [];
+    this.inFlightRequests.clear();
     this.stopping = false;
   }
 
@@ -80,6 +85,7 @@ export class CodexRpcBridge {
       () => ({}),
       (message) => this.handleTransportExit(message),
       (message) => {
+        this.forgetRequest(message);
         this.input.send(createEnvelope({
           type: "agent.codex.rpc",
           hostDeviceId: this.input.hostDeviceId,
@@ -87,7 +93,11 @@ export class CodexRpcBridge {
         }));
         return true;
       },
-      { includeJsonrpc: false, verbose: this.input.verbose },
+      {
+        includeJsonrpc: false,
+        verbose: this.input.verbose,
+        onStderrData: (message) => this.handleTransportStderr(message),
+      },
     );
     this.transport.start(this.input.cwd);
     if (this.input.verbose) {
@@ -120,12 +130,14 @@ export class CodexRpcBridge {
       return;
     }
     this.failQueued(message);
+    this.failInFlight(message);
     this.emitError(message);
   }
 
   private flushQueued(): void {
     const messages = this.queuedMessages.splice(0);
     for (const message of messages) {
+      this.rememberRequest(message);
       this.transport?.send(message);
     }
   }
@@ -160,4 +172,50 @@ export class CodexRpcBridge {
       },
     }));
   }
+
+  private handleTransportStderr(message: string): void {
+    if (this.input.verbose) {
+      process.stderr.write(`[agent:codex-rpc] stderr ignored while app-server is running: ${message}\n`);
+    }
+  }
+
+  private rememberRequest(message: JsonRpcMessage): void {
+    if (!isJsonRpcRequest(message)) return;
+    this.inFlightRequests.set(message.id, message);
+  }
+
+  private forgetRequest(message: JsonRpcMessage): void {
+    if (!isJsonRpcResponse(message)) return;
+    this.inFlightRequests.delete(message.id);
+  }
+
+  private failInFlight(message: string): void {
+    const requests = [...this.inFlightRequests.values()];
+    this.inFlightRequests.clear();
+    for (const item of requests) {
+      if (!isJsonRpcRequest(item)) continue;
+      this.input.send(createEnvelope({
+        type: "agent.codex.rpc",
+        hostDeviceId: this.input.hostDeviceId,
+        payload: {
+          jsonrpc: "2.0",
+          id: item.id,
+          error: { code: -32000, message },
+        },
+      }));
+    }
+  }
+}
+
+function isJsonRpcRequest(message: JsonRpcMessage): message is JsonRpcMessage & { id: JsonRpcId; method: string } {
+  return "id" in message &&
+    "method" in message &&
+    (typeof message.id === "string" || typeof message.id === "number") &&
+    typeof message.method === "string";
+}
+
+function isJsonRpcResponse(message: JsonRpcMessage): message is JsonRpcMessage & { id: JsonRpcId } {
+  return "id" in message &&
+    (typeof message.id === "string" || typeof message.id === "number") &&
+    ("result" in message || "error" in message);
 }

package/src/runtime/acp/json-rpc.ts

@@ -26,6 +26,7 @@ export type JsonRpcMessage = JsonRpcRequest | JsonRpcResponse | JsonRpcNotificat
 interface JsonRpcTransportOptions {
   includeJsonrpc?: boolean;
   verbose?: boolean;
+  onStderrData?: (message: string) => void;
 }
 
 export class JsonRpcStdioTransport {
@@ -64,7 +65,10 @@ export class JsonRpcStdioTransport {
     this.child.stdout.on("data", (chunk: string) => this.read(chunk));
     this.child.stderr.on("data", (chunk: string) => {
       const trimmed = chunk.trim();
-      if (trimmed) process.stderr.write(`[agent:stderr] ${trimmed}\n`);
+      if (trimmed) {
+        process.stderr.write(`[agent:stderr] ${trimmed}\n`);
+        this.options.onStderrData?.(trimmed);
+      }
     });
     this.child.on("error", (error) => this.failAll(error.message));
     this.child.on("exit", (code, signal) => {