gaslamp 1.0.0 → 1.0.1

package/bin/gaslamp.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-// gaslamp — pass the lamp between Claude Code and Codex over MCP.
+// gaslamp: Minimal MCP server that lets Claude and Codex talk to each other.
 //
 //   gaslamp            run the MCP server on stdio (what Codex spawns)
 //   gaslamp serve      same as above, explicit
@@ -18,7 +18,7 @@ import { fileURLToPath } from "node:url";
 const HERE = dirname(fileURLToPath(import.meta.url));
 const pkg = JSON.parse(readFileSync(join(HERE, "..", "package.json"), "utf8"));
 
-const HELP = `gaslamp ${pkg.version} — pass the lamp between Claude Code and Codex over MCP
+const HELP = `gaslamp ${pkg.version}: Minimal MCP server that lets Claude and Codex talk to each other.
 
 Usage:
   gaslamp [serve]        Run the MCP server on stdio (what Codex spawns).

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gaslamp",
-  "version": "1.0.0",
-  "description": "Pass the lamp between Claude Code and Codex over MCP — either agent can hand work to the other for a review, a second opinion, or a fix. Zero dependencies.",
+  "version": "1.0.1",
+  "description": "Minimal MCP server that lets Claude and Codex talk to each other.",
   "type": "module",
   "bin": {
     "gaslamp": "bin/gaslamp.mjs"

package/src/setup.mjs

@@ -16,6 +16,8 @@
 //                            the package is published, or for from-source dev.
 
 import { spawnSync } from "node:child_process";
+import { readFileSync, writeFileSync } from "node:fs";
+import { homedir } from "node:os";
 import { dirname, join, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import { which } from "./which.mjs";
@@ -26,6 +28,45 @@ function run(label, cmd, args) {
   return r.status === 0;
 }
 
+// `codex mcp add` cannot persist per-server timeouts (its `-c` flag is a runtime
+// override that never lands in the block), so we patch ~/.codex/config.toml
+// directly. Without this, Codex's MCP client kills any tools/call that runs past
+// its default tool_timeout_sec — a substantial consult (30-45 min) dies with
+// `timed out awaiting tools/call after 120s` while the gaslamp child keeps
+// working, orphaned. The server itself has no timeout; this is the client side.
+// Idempotent: sets the keys in-place if present, inserts them if not.
+function patchCodexTimeouts() {
+  const tool = process.env.GASLAMP_TOOL_TIMEOUT_SEC || "100000"; // ~27.8h — matches Claude Code's own default MCP tool timeout (1e8 ms), so both directions are symmetric
+  const startup = process.env.GASLAMP_STARTUP_TIMEOUT_SEC || "30"; // headroom for npx cold-start
+  const cfgPath = join(process.env.CODEX_HOME || join(homedir(), ".codex"), "config.toml");
+
+  let text;
+  try { text = readFileSync(cfgPath, "utf8"); }
+  catch { console.warn(`  (could not read ${cfgPath}; skipped timeout patch)`); return; }
+
+  const lines = text.split("\n");
+  const header = lines.findIndex((l) => l.trim() === "[mcp_servers.gaslamp]");
+  if (header < 0) { console.warn("  (no [mcp_servers.gaslamp] block found; skipped timeout patch)"); return; }
+
+  // Block runs from the header to the next table header (line starting with `[`).
+  let end = lines.length;
+  for (let i = header + 1; i < lines.length; i++) { if (/^\s*\[/.test(lines[i])) { end = i; break; } }
+  const block = lines.slice(header, end);
+
+  const setKey = (key, val) => {
+    const i = block.findIndex((l) => new RegExp(`^\\s*${key}\\s*=`).test(l));
+    if (i >= 0) { block[i] = `${key} = ${val}`; return; }
+    let at = block.length;                       // insert before trailing blank lines
+    while (at > 1 && block[at - 1].trim() === "") at--;
+    block.splice(at, 0, `${key} = ${val}`);
+  };
+  setKey("tool_timeout_sec", tool);
+  setKey("startup_timeout_sec", startup);
+
+  writeFileSync(cfgPath, [...lines.slice(0, header), ...block, ...lines.slice(end)].join("\n"));
+  process.stdout.write(`  timeouts: tool_timeout_sec=${tool}s startup_timeout_sec=${startup}s in ${cfgPath}\n`);
+}
+
 // Quietly remove an existing registration (ignore "not found" noise).
 function remove(cli, name, scopeArgs = []) {
   spawnSync(cli, ["mcp", "remove", name, ...scopeArgs], { stdio: "ignore" });
@@ -62,6 +103,7 @@ export function runSetup(argv = []) {
     serveCmd = ["mcp", "add", "gaslamp", "--", "npx", "-y", "gaslamp", "serve"];
   }
   const okCodex = run("codex -> claude", "codex", serveCmd);
+  if (okCodex) patchCodexTimeouts(); // codex mcp add can't persist these; do it ourselves
 
   // --- Claude -> Codex: claude gets gaslamp's codex tools (user scope) --------
   remove("claude", "gaslamp", ["-s", "user"]);