@ccpocket/bridge 1.57.1 → 1.58.0

package/README.md

@@ -36,6 +36,8 @@ ccpocket-bridge
 | `BRIDGE_API_KEY` | (none) | API key authentication (enabled when set) |
 | `BRIDGE_ALLOWED_DIRS` | `$HOME` | Comma-separated list of project directories the Bridge may access |
 | `BRIDGE_PUBLIC_WS_URL` | (none) | Public `ws://` / `wss://` URL used for startup deep link and QR code |
+| `BRIDGE_CODEX_APP_SERVER_MODE` | `private` | Experimental Codex app-server mode: `private`, `managed`, or `external` |
+| `BRIDGE_CODEX_SHARED_APP_SERVER_URL` | `ws://127.0.0.1:8767` in `managed` mode | Experimental shared Codex app-server URL for Codex CLI co-presence |
 | `BRIDGE_DEMO_MODE` | (none) | Demo mode: hide Tailscale IPs and API key from QR code / logs |
 | `BRIDGE_RECORDING` | (none) | Enable session recording for debugging (enabled when set) |
 | `BRIDGE_DISABLE_MDNS` | (none) | Disable mDNS auto-discovery advertisement (enabled when set) |
@@ -79,6 +81,41 @@ is reachable through a reverse proxy, tunnel, or public domain.
 Without it, the printed QR code is LAN-oriented by default and typically encodes
 something like `ws://192.168.x.x:8765`.
 
+## Experimental: Join a CC Pocket Codex Session from Codex CLI
+
+By default, each Codex session uses a private app-server. To let Codex CLI join
+the same live thread that CC Pocket started, run the Bridge with shared
+app-server mode:
+
+```bash
+BRIDGE_CODEX_APP_SERVER_MODE=managed \
+BRIDGE_CODEX_SHARED_APP_SERVER_URL=ws://127.0.0.1:8767 \
+npx @ccpocket/bridge@latest
+```
+
+Then start or resume a Codex session from CC Pocket. When the session is ready,
+the session screen can copy a session-specific command like:
+
+```bash
+codex resume <thread-id> --remote ws://127.0.0.1:8767
+```
+
+Run that command in a terminal on the same machine as the Bridge. The
+`127.0.0.1` address is for the Mac/Linux machine running the Bridge and Codex
+CLI, not for the phone.
+
+Modes:
+
+- `private`: default behavior. No Codex CLI co-presence.
+- `managed`: Bridge starts one local WebSocket Codex app-server and shares it
+  with Codex CLI.
+- `external`: Bridge connects to an already-running app-server. In this mode,
+  `BRIDGE_CODEX_SHARED_APP_SERVER_URL` is required.
+
+This is experimental and currently targets Codex CLI co-presence only. Codex App
+compatibility is not guaranteed and may use a different integration model in the
+future.
+
 ## Requirements
 
 - Node.js v18+

package/dist/cli.js

@@ -41,6 +41,10 @@ else if (subcommand === "setup") {
         host: parseFlag("host"),
         apiKey: parseFlag("api-key"),
         publicWsUrl: parseFlag("public-ws-url"),
+        codexAppServerMode: parseFlag("codex-app-server-mode"),
+        codexSharedAppServerUrl: parseFlag("codex-shared-app-server-url"),
+        codexAppServerPort: parseFlag("codex-app-server-port"),
+        codexAppServerUrl: parseFlag("codex-app-server-url"),
     };
     if (platform() === "darwin") {
         import("./setup-launchd.js")
@@ -73,6 +77,10 @@ else {
     const host = parseFlag("host");
     const apiKey = parseFlag("api-key");
     const publicWsUrl = parseFlag("public-ws-url");
+    const codexAppServerMode = parseFlag("codex-app-server-mode");
+    const codexSharedAppServerUrl = parseFlag("codex-shared-app-server-url");
+    const codexAppServerPort = parseFlag("codex-app-server-port");
+    const codexAppServerUrl = parseFlag("codex-app-server-url");
     if (port)
         process.env.BRIDGE_PORT = port;
     if (host)
@@ -81,6 +89,18 @@ else {
         process.env.BRIDGE_API_KEY = apiKey;
     if (publicWsUrl)
         process.env.BRIDGE_PUBLIC_WS_URL = publicWsUrl;
+    if (codexAppServerMode) {
+        process.env.BRIDGE_CODEX_APP_SERVER_MODE = codexAppServerMode;
+    }
+    if (codexAppServerPort) {
+        process.env.BRIDGE_CODEX_APP_SERVER_PORT = codexAppServerPort;
+    }
+    if (codexSharedAppServerUrl) {
+        process.env.BRIDGE_CODEX_SHARED_APP_SERVER_URL = codexSharedAppServerUrl;
+    }
+    else if (codexAppServerUrl) {
+        process.env.BRIDGE_CODEX_APP_SERVER_URL = codexAppServerUrl;
+    }
     if (hasFlag("no-mdns"))
         process.env.BRIDGE_DISABLE_MDNS = "1";
     startServer();

package/dist/cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}

package/dist/codex-app-server-config.d.ts

@@ -0,0 +1,10 @@
+export type CodexAppServerMode = "private" | "managed" | "external";
+export declare function defaultCodexAppServerPort(bridgePort?: string): string;
+export declare function defaultCodexSharedAppServerUrl(bridgePort?: string): string;
+export declare function readCodexSharedAppServerUrl(env?: NodeJS.ProcessEnv): string | undefined;
+export declare function readCodexAppServerMode(env?: NodeJS.ProcessEnv): CodexAppServerMode;
+export declare function resolveCodexSharedAppServerUrl(mode: CodexAppServerMode, env?: NodeJS.ProcessEnv): string | undefined;
+export declare function codexCliJoinTarget(threadId: string, env?: NodeJS.ProcessEnv): {
+    url: string;
+    command: string;
+} | undefined;

package/dist/codex-app-server-config.js

@@ -0,0 +1,45 @@
+const DEFAULT_CODEX_APP_SERVER_PORT = "8767";
+const FALLBACK_CODEX_APP_SERVER_PORT = "8768";
+export function defaultCodexAppServerPort(bridgePort) {
+    return bridgePort?.trim() === DEFAULT_CODEX_APP_SERVER_PORT
+        ? FALLBACK_CODEX_APP_SERVER_PORT
+        : DEFAULT_CODEX_APP_SERVER_PORT;
+}
+export function defaultCodexSharedAppServerUrl(bridgePort) {
+    return `ws://127.0.0.1:${defaultCodexAppServerPort(bridgePort)}`;
+}
+export function readCodexSharedAppServerUrl(env = process.env) {
+    return (env.BRIDGE_CODEX_SHARED_APP_SERVER_URL?.trim() ||
+        env.BRIDGE_CODEX_APP_SERVER_URL?.trim() ||
+        undefined);
+}
+export function readCodexAppServerMode(env = process.env) {
+    const raw = env.BRIDGE_CODEX_APP_SERVER_MODE;
+    if (raw === "managed" || raw === "external")
+        return raw;
+    return "private";
+}
+export function resolveCodexSharedAppServerUrl(mode, env = process.env) {
+    const explicit = readCodexSharedAppServerUrl(env);
+    if (explicit)
+        return explicit;
+    if (mode !== "managed")
+        return undefined;
+    const legacyPort = env.BRIDGE_CODEX_APP_SERVER_PORT?.trim();
+    if (legacyPort)
+        return `ws://127.0.0.1:${legacyPort}`;
+    return defaultCodexSharedAppServerUrl(env.BRIDGE_PORT);
+}
+export function codexCliJoinTarget(threadId, env = process.env) {
+    const mode = readCodexAppServerMode(env);
+    if (mode === "private")
+        return undefined;
+    const url = resolveCodexSharedAppServerUrl(mode, env);
+    if (!url)
+        return undefined;
+    return {
+        url,
+        command: `codex resume ${threadId} --remote ${url}`,
+    };
+}
+//# sourceMappingURL=codex-app-server-config.js.map

package/dist/codex-app-server-config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"codex-app-server-config.js","sourceRoot":"","sources":["../src/codex-app-server-config.ts"],"names":[],"mappings":"AAAA,MAAM,6BAA6B,GAAG,MAAM,CAAC;AAC7C,MAAM,8BAA8B,GAAG,MAAM,CAAC;AAI9C,MAAM,UAAU,yBAAyB,CAAC,UAAmB;IAC3D,OAAO,UAAU,EAAE,IAAI,EAAE,KAAK,6BAA6B;QACzD,CAAC,CAAC,8BAA8B;QAChC,CAAC,CAAC,6BAA6B,CAAC;AACpC,CAAC;AAED,MAAM,UAAU,8BAA8B,CAAC,UAAmB;IAChE,OAAO,kBAAkB,yBAAyB,CAAC,UAAU,CAAC,EAAE,CAAC;AACnE,CAAC;AAED,MAAM,UAAU,2BAA2B,CACzC,MAAyB,OAAO,CAAC,GAAG;IAEpC,OAAO,CACL,GAAG,CAAC,kCAAkC,EAAE,IAAI,EAAE;QAC9C,GAAG,CAAC,2BAA2B,EAAE,IAAI,EAAE;QACvC,SAAS,CACV,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,sBAAsB,CACpC,MAAyB,OAAO,CAAC,GAAG;IAEpC,MAAM,GAAG,GAAG,GAAG,CAAC,4BAA4B,CAAC;IAC7C,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,UAAU;QAAE,OAAO,GAAG,CAAC;IACxD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,UAAU,8BAA8B,CAC5C,IAAwB,EACxB,MAAyB,OAAO,CAAC,GAAG;IAEpC,MAAM,QAAQ,GAAG,2BAA2B,CAAC,GAAG,CAAC,CAAC;IAClD,IAAI,QAAQ;QAAE,OAAO,QAAQ,CAAC;IAC9B,IAAI,IAAI,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAEzC,MAAM,UAAU,GAAG,GAAG,CAAC,4BAA4B,EAAE,IAAI,EAAE,CAAC;IAC5D,IAAI,UAAU;QAAE,OAAO,kBAAkB,UAAU,EAAE,CAAC;IAEtD,OAAO,8BAA8B,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;AACzD,CAAC;AAED,MAAM,UAAU,kBAAkB,CAChC,QAAgB,EAChB,MAAyB,OAAO,CAAC,GAAG;IAEpC,MAAM,IAAI,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAC;IACzC,IAAI,IAAI,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAEzC,MAAM,GAAG,GAAG,8BAA8B,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACtD,IAAI,CAAC,GAAG;QAAE,OAAO,SAAS,CAAC;IAE3B,OAAO;QACL,GAAG;QACH,OAAO,EAAE,gBAAgB,QAAQ,aAAa,GAAG,EAAE;KACpD,CAAC;AACJ,CAAC"}

package/dist/codex-process.d.ts

@@ -1,5 +1,7 @@
 import { EventEmitter } from "node:events";
 import type { ServerMessage, ProcessStatus } from "./parser.js";
+import { buildCodexSpawnSpec } from "./codex-transport.js";
+export { buildCodexSpawnSpec };
 export interface CodexStartOptions {
     threadId?: string;
     profile?: string;
@@ -72,18 +74,8 @@ export interface CodexProfileConfig {
     profiles: string[];
     defaultProfile?: string;
 }
-export declare function buildCodexSpawnSpec(projectPath: string, platform?: NodeJS.Platform): {
-    command: string;
-    args: string[];
-    options: {
-        cwd: string;
-        stdio: "pipe";
-        env: NodeJS.ProcessEnv;
-        windowsVerbatimArguments?: boolean;
-    };
-};
 export declare class CodexProcess extends EventEmitter<CodexProcessEvents> {
-    private child;
+    private transport;
     private _status;
     private _threadId;
     private _agentNickname;
@@ -265,6 +257,7 @@ export declare class CodexProcess extends EventEmitter<CodexProcessEvents> {
     private handleRpcResponse;
     private handleServerRequest;
     private handleNotification;
+    private isForeignThreadNotification;
     private handleTurnCompleted;
     private cleanupSteerTempPaths;
     private processItemStarted;

package/dist/codex-process.js

@@ -3,36 +3,14 @@ import { randomUUID } from "node:crypto";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { rm, writeFile } from "node:fs/promises";
-import { spawn } from "node:child_process";
+import { createCodexTransport, buildCodexSpawnSpec, } from "./codex-transport.js";
+import { codexCliJoinTarget } from "./codex-app-server-config.js";
 import { resolvePlatformPath } from "./path-utils.js";
+export { buildCodexSpawnSpec };
 const DEFAULT_CODEX_MODEL = "gpt-5.5";
 const COMPLETION_FETCH_COOLDOWN_MS = 1000;
-export function buildCodexSpawnSpec(projectPath, platform = process.platform) {
-    const cwd = resolvePlatformPath(projectPath, platform);
-    if (platform === "win32") {
-        return {
-            command: "cmd.exe",
-            args: ["/d", "/s", "/c", "codex app-server --listen stdio://"],
-            options: {
-                cwd,
-                stdio: "pipe",
-                env: process.env,
-                windowsVerbatimArguments: true,
-            },
-        };
-    }
-    return {
-        command: "codex",
-        args: ["app-server", "--listen", "stdio://"],
-        options: {
-            cwd,
-            stdio: "pipe",
-            env: process.env,
-        },
-    };
-}
 export class CodexProcess extends EventEmitter {
-    child = null;
+    transport = null;
     _status = "starting";
     _threadId = null;
     _agentNickname = null;
@@ -100,7 +78,7 @@ export class CodexProcess extends EventEmitter {
         return this._agentRole;
     }
     get isRunning() {
-        return this.child !== null;
+        return this.transport?.isRunning ?? false;
     }
     get approvalPolicy() {
         return this._approvalPolicy;
@@ -259,7 +237,7 @@ export class CodexProcess extends EventEmitter {
         return models;
     }
     start(projectPath, options) {
-        if (this.child) {
+        if (this.transport) {
             this.stop();
         }
         this.prepareLaunch(projectPath, options);
@@ -267,7 +245,7 @@ export class CodexProcess extends EventEmitter {
         void this.bootstrap(projectPath, options);
     }
     async initializeOnly(projectPath) {
-        if (this.child) {
+        if (this.transport) {
             this.stop();
         }
         this.prepareLaunch(projectPath);
@@ -285,9 +263,9 @@ export class CodexProcess extends EventEmitter {
         this.pendingUserInputs.clear();
         this.cleanupSteerTempPaths();
         this.rejectAllPending(new Error("stopped"));
-        if (this.child) {
-            this.child.kill("SIGTERM");
-            this.child = null;
+        if (this.transport) {
+            this.transport.stop();
+            this.transport = null;
         }
         this.setStatus("idle");
         console.log("[codex-process] Stopped");
@@ -314,22 +292,19 @@ export class CodexProcess extends EventEmitter {
         this._projectPath = projectPath;
     }
     launchAppServer(projectPath, options) {
-        const spawnSpec = buildCodexSpawnSpec(projectPath, this.platform);
-        console.log(`[codex-process] Starting app-server (cwd: ${spawnSpec.options.cwd}, sandbox: ${options?.sandboxMode ?? "workspace-write"}, approval: ${options?.approvalPolicy ?? "never"}, reviewer: ${this.approvalsReviewer}, model: ${options?.model ?? "default"}, collaboration: ${this._collaborationMode})`);
-        const child = spawn(spawnSpec.command, spawnSpec.args, spawnSpec.options);
-        this.child = child;
-        child.stdout.setEncoding("utf8");
-        child.stdout.on("data", (chunk) => {
+        console.log(`[codex-process] Starting app-server (cwd: ${projectPath}, sandbox: ${options?.sandboxMode ?? "workspace-write"}, approval: ${options?.approvalPolicy ?? "never"}, reviewer: ${this.approvalsReviewer}, model: ${options?.model ?? "default"}, collaboration: ${this._collaborationMode})`);
+        const transport = createCodexTransport(projectPath, this.platform);
+        this.transport = transport;
+        transport.on("data", (chunk) => {
             this.handleStdoutChunk(chunk);
         });
-        child.stderr.setEncoding("utf8");
-        child.stderr.on("data", (chunk) => {
+        transport.on("log", (chunk) => {
             const line = chunk.trim();
             if (line) {
                 console.log(`[codex-process] stderr: ${line}`);
             }
         });
-        child.on("error", (err) => {
+        transport.on("error", (err) => {
             if (this.stopped)
                 return;
             console.error("[codex-process] app-server process error:", err);
@@ -340,9 +315,9 @@ export class CodexProcess extends EventEmitter {
             this.setStatus("idle");
             this.emit("exit", 1);
         });
-        child.on("exit", (code) => {
+        transport.on("exit", (code) => {
             const exitCode = code ?? 0;
-            this.child = null;
+            this.transport = null;
             this.rejectAllPending(new Error("codex app-server exited"));
             if (!this.stopped && exitCode !== 0) {
                 this.emitMessage({
@@ -353,6 +328,7 @@ export class CodexProcess extends EventEmitter {
             this.setStatus("idle");
             this.emit("exit", code);
         });
+        transport.start(projectPath);
     }
     interrupt() {
         if (!this._threadId || !this.pendingTurnId)
@@ -713,6 +689,9 @@ export class CodexProcess extends EventEmitter {
                 this.startModel = resolvedSettings.model;
             }
             this._threadId = threadId;
+            this._agentNickname = stringOrNull(thread?.agentNickname);
+            this._agentRole = stringOrNull(thread?.agentRole);
+            const cliJoin = codexCliJoinTarget(threadId);
             this.emitMessage({
                 type: "system",
                 subtype: "init",
@@ -750,6 +729,7 @@ export class CodexProcess extends EventEmitter {
                 ...(options?.additionalWritableRoots?.length
                     ? { additionalWritableRoots: options.additionalWritableRoots }
                     : {}),
+                ...(cliJoin ? { codexCliJoin: cliJoin } : {}),
             });
             this.setStatus("idle");
             // Fetch skills/apps in background (non-blocking)
@@ -1278,6 +1258,8 @@ export class CodexProcess extends EventEmitter {
         }
     }
     handleNotification(method, params) {
+        if (this.isForeignThreadNotification(method, params))
+            return;
         switch (method) {
             case "thread/started": {
                 const thread = params.thread;
@@ -1394,6 +1376,20 @@ export class CodexProcess extends EventEmitter {
                 break;
         }
     }
+    isForeignThreadNotification(method, params) {
+        if (!isThreadScopedNotification(method))
+            return false;
+        const threadId = notificationThreadId(params);
+        if (!threadId)
+            return false;
+        // Thread binding comes from the thread/start or thread/resume response.
+        // In shared app-server modes, early notifications can belong to another
+        // client, so explicit-thread notifications are ignored until this process
+        // has its own authoritative thread id.
+        if (!this._threadId)
+            return true;
+        return threadId !== this._threadId;
+    }
     handleTurnCompleted(turn) {
         const status = String(turn?.status ?? "completed");
         const usage = this.lastTokenUsage;
@@ -1617,6 +1613,22 @@ export class CodexProcess extends EventEmitter {
                 });
                 break;
             }
+            case "user":
+            case "usermessage":
+            case "userinput": {
+                const text = extractUserText(item);
+                if (!text)
+                    return;
+                this.emitMessage({
+                    type: "user_input",
+                    text,
+                    userMessageUuid: itemId,
+                    ...(typeof item.timestamp === "string"
+                        ? { timestamp: item.timestamp }
+                        : {}),
+                });
+                break;
+            }
             case "reasoning": {
                 const text = extractReasoningText(item);
                 if (text) {
@@ -1845,11 +1857,10 @@ export class CodexProcess extends EventEmitter {
         }
     }
     writeEnvelope(envelope) {
-        if (!this.child || this.child.killed) {
+        if (!this.transport || !this.transport.isRunning) {
             throw new Error("codex app-server is not running");
         }
-        const line = `${JSON.stringify(envelope)}\n`;
-        this.child.stdin.write(line);
+        this.transport.write(envelope);
     }
     rejectAllPending(error) {
         for (const pending of this.pendingRpc.values()) {
@@ -2080,6 +2091,29 @@ function normalizeItemType(raw) {
         return "";
     return raw.replace(/[_\s-]/g, "").toLowerCase();
 }
+function isThreadScopedNotification(method) {
+    return (method.startsWith("thread/") ||
+        method.startsWith("turn/") ||
+        method.startsWith("item/") ||
+        method === "serverRequest/resolved");
+}
+function notificationThreadId(params) {
+    if (typeof params.threadId === "string")
+        return params.threadId;
+    const thread = params.thread;
+    if (thread && typeof thread === "object") {
+        const id = thread.id;
+        if (typeof id === "string")
+            return id;
+    }
+    const turn = params.turn;
+    if (turn && typeof turn === "object") {
+        const id = turn.threadId;
+        if (typeof id === "string")
+            return id;
+    }
+    return null;
+}
 function numberOrUndefined(value) {
     return typeof value === "number" && Number.isFinite(value)
         ? value
@@ -2328,6 +2362,13 @@ function extractAgentText(item) {
     }
     return "";
 }
+function extractUserText(item) {
+    if (typeof item.text === "string")
+        return item.text;
+    if (typeof item.message === "string")
+        return item.message;
+    return extractAgentText(item);
+}
 function extractReasoningText(item) {
     if (typeof item.text === "string")
         return item.text;