@minhspark/codex-mcp-bridge 1.22.17 → 1.22.19

package/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "codex-mcp-bridge",
-  "version": "1.22.17",
+  "version": "1.22.19",
   "description": "Connect ChatGPT to your own Codex Desktop projects and conversations.",
   "author": {
     "name": "Bui Dang Minh"

package/CHANGELOG.md

@@ -4,6 +4,36 @@ Follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/) and [SemVer](ht
 
 ## [Unreleased]
 
+## [1.22.19] - 2026-10-22
+
+### Fixed
+
+- Relay cleanup validates the canonical parent, expected file type, ownership, link count and identity before removing a configuration file or Unix socket. A regular file selected through a socket path is preserved, and symlinks and hardlinks are rejected.
+- Unix relay sockets are created with mode `0600` before accepting connections. Startup verifies the socket identity and permissions without changing permissions through an environment-derived path, and restores the process umask after binding.
+- Supervisor timer intervals use explicit lower and upper bounds, including Node's timer overflow limit, so CodeQL can verify the resource limits.
+
+### Tests
+
+- Regression tests cover ordinary files, hardlinks, symlinks, custom Unix sockets, private socket creation, umask restoration, replaced socket identities and timer boundaries.
+
+## [1.22.18] - 2026-10-22
+
+### Fixed
+
+- `wait_codex_reply` with a short `timeoutSec` no longer fails with `The response deadline elapsed while another operation held this thread` when no other operation held the thread. The tool's deadline starts before the caller's identity check, and that check spawns PowerShell on Windows. When it used up the whole budget, the observation never started and the bridge reported a held thread instead of a timeout. It now returns the normal timeout result with `nextAction: wait_codex_reply`. The held-thread message is now used only when another operation actually holds the thread; otherwise the error says the deadline elapsed before the operation started.
+
+### Tests
+
+- The account-change wait test no longer depends on timing. Its relay fixture parks `wait_threads` on a gate that the test releases, instead of a fixed 2.5 s sleep against a 1 s budget. That timing failed on a stalled `windows-latest` runner.
+- The relay fixture in `test/bridge-integration.test.mjs` provisions its creation receipts once per file, so Windows tests no longer spend four PowerShell cold starts inside their own timing.
+- The Desktop task integration assertions now print the tool result when they fail.
+
+### Verification
+
+- New unit tests cover a deadline that elapses before an unheld operation starts, and one that elapses while another operation holds the thread. The first fails on 1.22.17.
+- Simulating a 1.2 s caller check reproduced the CI failure text exactly on 1.22.17. The rewritten test passes with 1.2 s and 3 s simulated delays.
+- Full suite on macOS: 1558 pass, 0 fail, 23 skipped.
+
 ## [1.22.17] - 2026-10-22
 
 ### Fixed

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@minhspark/codex-mcp-bridge",
-  "version": "1.22.17",
+  "version": "1.22.19",
   "description": "Two-way MCP bridge between Claude and Codex: prompts into a live Codex thread, messages into a running Claude Code session.",
   "keywords": [
     "mcp",

package/plugin.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://agent-plugins.org/schemas/1.0.0/plugin.schema.json",
   "name": "codex-mcp-bridge",
-  "version": "1.22.17",
+  "version": "1.22.19",
   "description": "Connect ChatGPT to your own Codex Desktop projects and conversations.",
   "author": {
     "name": "Bui Dang Minh",

package/scripts/install-native-relay.mjs

@@ -21,10 +21,11 @@ import { applyStdioMcpRegistration, stdioMcpRegistration } from "../src/codex-mc
 import { createReleaseSnapshot, snapshotRoot } from "../src/release-snapshot.mjs";
 import { codexAccessPaths, enableCodexFullAccess, fullAccessEnabled } from "../src/codex-full-access.mjs";
 import { stableInstallPath } from "../src/install-paths.mjs";
+import { removeRelayFile } from "../src/native-relay-files.mjs";
 
 exitForVersionRequest(import.meta.url);
 
-const VERSION = "1.22.17";
+const VERSION = "1.22.19";
 const root = stableInstallPath(path.resolve(path.dirname(fileURLToPath(import.meta.url)), ".."));
 const entry = path.join(root, "src", "mcp-supervisor.mjs");
 const entryArgs = ["native-relay-companion.mjs"];
@@ -50,8 +51,7 @@ if (remove) {
   const retiredExecutor = readRelayConfig()?.relayThreadId;
   const sockets = IS_WINDOWS ? [] : [...new Set([relaySocketPath(), desktopTaskSocketPath(), accountRelaySocketPath()])];
   for (const leftover of [relayConfigPath(), ...sockets]) {
-    if (fs.existsSync(leftover)) {
-      fs.rmSync(leftover, { force: true });
+    if (removeRelayFile(leftover, { kind: leftover === relayConfigPath() ? "config" : "socket" })) {
       console.log(`removed ${leftover}`);
     }
   }

package/src/claude-bridge.mjs

@@ -30,7 +30,7 @@ import { discoverClaudeProject } from "./claude-project-discovery.mjs";
 
 exitForVersionRequest(import.meta.url);
 
-const VERSION = "1.22.17";
+const VERSION = "1.22.19";
 void import("./telemetry.mjs").then(({ startUsageReporting }) => startUsageReporting({ version: VERSION })).catch(() => {});
 const FORWARD_MIN_INTERVAL_MS = 5000;
 const FORWARD_MAX_PER_SESSION = 50;

package/src/index.mjs

@@ -41,7 +41,7 @@ import { createRelayWake, relayKeeperEnabled, relayWakeStateFile, startRelayKeep
 
 exitForVersionRequest(import.meta.url);
 
-const VERSION = "1.22.17";
+const VERSION = "1.22.19";
 void import("./telemetry.mjs").then(({ startUsageReporting }) => startUsageReporting({ version: VERSION })).catch(() => {});
 const log = (msg) => process.stderr.write(`[codex-mcp-bridge] ${msg}\n`);
 

package/src/mcp-supervisor.mjs

@@ -18,6 +18,14 @@ const hasId = (message) => Object.hasOwn(message, "id");
 const idKey = (id) => JSON.stringify(id);
 const errorMessage = (id, message) => ({ jsonrpc: "2.0", id, error: { code: -32603, message } });
 
+export function supervisorInterval(value, fallback) {
+  const parsed = Number(value);
+  if (!Number.isFinite(parsed) || parsed <= 0) return fallback;
+  if (parsed < 100) return 100;
+  if (parsed > 2147483647) return 2147483647;
+  return parsed;
+}
+
 function lines(stream, receive, failed) {
   let buffer = Buffer.alloc(0);
   stream.on("data", (chunk) => {
@@ -156,13 +164,9 @@ export async function runSupervisor(entry, options = {}) {
     const pipe = await resolveNativeToolsPipePath();
     if (pipe) env.CODEX_APP_TOOLS_PIPE_PATH = pipe;
   }
-  const interval = (value, fallback) => {
-    const parsed = Number(value);
-    return Number.isFinite(parsed) && parsed > 0 ? Math.max(100, Math.min(2147483647, parsed)) : fallback;
-  };
-  const pollMs = interval(env.CODEX_BRIDGE_RELOAD_POLL_MS, 1000);
-  const settleMs = interval(env.CODEX_BRIDGE_RELOAD_SETTLE_MS, 1500);
-  const pruneDelayMs = interval(env.CODEX_BRIDGE_RUNTIME_PRUNE_DELAY_MS, 60000);
+  const pollMs = supervisorInterval(env.CODEX_BRIDGE_RELOAD_POLL_MS, 1000);
+  const settleMs = supervisorInterval(env.CODEX_BRIDGE_RELOAD_SETTLE_MS, 1500);
+  const pruneDelayMs = supervisorInterval(env.CODEX_BRIDGE_RUNTIME_PRUNE_DELAY_MS, 60000);
   let active;
   let initializeParams;
   let initializeResult;

package/src/native-relay-companion.mjs

@@ -34,12 +34,13 @@ import { createRuntimeState } from "./runtime-state.mjs";
 import { hardenedBridgeEnabled } from "./hardened-root-policy.mjs";
 import { protectCurrentUserPipe } from "./windows-pipe-acl.mjs";
 import { createHardenedRootPolicy } from "./hardened-root-policy.mjs";
+import { removeRelayFile, relayFileIdentity, verifyRelaySocketMode } from "./native-relay-files.mjs";
 
 import { NativeCreationReceipts, creationIdValid } from "./native-creation-receipts.mjs";
 
 exitForVersionRequest(import.meta.url);
 
-const VERSION = "1.22.17";
+const VERSION = "1.22.19";
 const log = (msg) => process.stderr.write(`[native-relay] ${msg}\n`);
 
 function errorResponse(code, message, sent, details) {
@@ -393,8 +394,8 @@ export class RelaySocketServer {
     requireAccountContext = false,
     strict = hardenedBridgeEnabled(),
     protectSocket = protectCurrentUserPipe,
-    restrictSocket = (target) => {
-      if (!IS_WINDOWS) fs.chmodSync(target, 0o600);
+    restrictSocket = (target, expected) => {
+      if (!IS_WINDOWS) verifyRelaySocketMode(target, expected);
     },
     signalExit = true,
     log: logFn = () => {},
@@ -468,7 +469,7 @@ export class RelaySocketServer {
         this.aclReady = true;
         for (const provisional of this.provisionalSockets) provisional.destroy();
         this.provisionalSockets.clear();
-      } else this.restrictSocket(this.socketPath);
+      } else this.restrictSocket(this.socketPath, this.boundIdentity);
       if (generation !== this.startGeneration) throw new Error("Relay socket startup was cancelled");
     } catch (err) {
       this.aclReady = !IS_WINDOWS || !this.strict;
@@ -524,10 +525,15 @@ export class RelaySocketServer {
   #bind(target) {
     return new Promise((resolve, reject) => {
       this.server.once("error", reject);
-      this.server.listen(target, () => {
-        this.server.off("error", reject);
-        resolve();
-      });
+      const previousMask = IS_WINDOWS ? null : process.umask(0o177);
+      try {
+        this.server.listen(target, () => {
+          this.server.off("error", reject);
+          resolve();
+        });
+      } finally {
+        if (previousMask !== null) process.umask(previousMask);
+      }
     });
   }
 
@@ -553,7 +559,7 @@ export class RelaySocketServer {
           if (error.code !== "EEXIST") throw error;
           if (!replaceStale || attempt || await this.#socketIsLive()) throw new Error(`another native relay companion already owns ${this.socketPath}`);
           this.log(`removing the stale relay socket left at ${this.socketPath}`);
-          fs.rmSync(this.socketPath, { force: true });
+          removeRelayFile(this.socketPath);
         }
       }
       const identity = fs.lstatSync(this.socketPath, { bigint: true });
@@ -570,13 +576,8 @@ export class RelaySocketServer {
   async #listen({ replaceStale }) {
     if (!IS_WINDOWS && await this.#listenLinked(replaceStale)) return;
     try {
-      await new Promise((resolve, reject) => {
-        this.server.once("error", reject);
-        this.server.listen(this.socketPath, () => {
-          this.server.off("error", reject);
-          resolve();
-        });
-      });
+      await this.#bind(this.socketPath);
+      if (!IS_WINDOWS) this.boundIdentity = relayFileIdentity(this.socketPath, "socket");
     } catch (err) {
       if (err.code !== "EADDRINUSE" || !replaceStale) throw err;
       if (IS_WINDOWS) {
@@ -590,7 +591,7 @@ export class RelaySocketServer {
         throw new Error(`another native relay companion already owns ${this.socketPath}`);
       }
       this.log(`removing the stale relay socket left at ${this.socketPath}`);
-      fs.rmSync(this.socketPath, { force: true });
+      removeRelayFile(this.socketPath);
       await this.#listen({ replaceStale: false });
     }
   }

package/src/native-relay-files.mjs

@@ -0,0 +1,40 @@
+import fs from "node:fs";
+import path from "node:path";
+
+export function relayFileIdentity(target, kind, expected) {
+  const root = fs.realpathSync.native(path.dirname(target));
+  const name = path.basename(target);
+  if (kind === "config" && name !== "native-relay.json") throw new Error("Unexpected relay configuration filename");
+  const file = path.resolve(root, name);
+  if (!file.startsWith(root.endsWith(path.sep) ? root : `${root}${path.sep}`)) throw new Error("Relay file escaped its directory");
+  const current = fs.lstatSync(file, { bigint: true });
+  if (current.isSymbolicLink() || (kind === "config" ? !current.isFile() : !current.isSocket())
+      || current.nlink !== 1n
+      || typeof process.getuid === "function" && current.uid !== BigInt(process.getuid())
+      || expected && (current.dev !== expected.dev || current.ino !== expected.ino)) {
+    throw new Error(`Unsafe relay ${kind} file: ${target}`);
+  }
+  return current;
+}
+
+export function removeRelayFile(target, { kind = "socket", directory = path.dirname(target), expected } = {}) {
+  let root;
+  try { root = fs.realpathSync.native(directory); }
+  catch (error) { if (error.code === "ENOENT") return false; throw error; }
+  const name = kind === "config" ? "native-relay.json" : path.basename(target);
+  if (path.basename(target) !== name) throw new Error("Unexpected relay configuration filename");
+  const file = path.resolve(root, name);
+  if (!file.startsWith(root.endsWith(path.sep) ? root : `${root}${path.sep}`)) throw new Error("Relay file escaped its directory");
+  let identity;
+  try { identity = relayFileIdentity(file, kind, expected); }
+  catch (error) { if (error.code === "ENOENT") return false; throw error; }
+  if (fs.realpathSync.native(file) !== file) throw new Error("Relay file is redirected");
+  relayFileIdentity(file, kind, identity);
+  fs.unlinkSync(file);
+  return true;
+}
+
+export function verifyRelaySocketMode(target, expected) {
+  const current = relayFileIdentity(target, "socket", expected);
+  if ((current.mode & 0o777n) !== 0o600n) throw new Error("Relay socket was not created with mode 0600");
+}

package/src/thread-delivery.mjs

@@ -160,10 +160,12 @@ export class DesktopTaskDelivery {
   }
 
   async withThread(threadId, operation, { deadline, onDeadline } = {}) {
+    const held = this.threadOperations.has(threadId);
     const previous = this.threadOperations.get(threadId) ?? Promise.resolve();
     let expired = false;
     const current = previous.catch(() => {}).then(() => {
-      if (expired || (deadline !== undefined && this.now() >= deadline)) throw new Error("The response deadline elapsed while another operation held this thread. No new prompt was sent.");
+      if (deadline !== undefined && this.now() >= deadline) expired = true;
+      if (expired) throw new Error(`The response deadline elapsed ${held ? "while another operation held this thread" : "before the operation started"}. No new prompt was sent.`);
       return operation();
     });
     this.threadOperations.set(threadId, current);