agent-relay-server 0.4.10 → 0.4.11

package/README.md

@@ -224,6 +224,9 @@ time, it starts a new thread by default to avoid surprising cwd-based attachment
 to an unrelated loaded session. Use `codex-relay --thread-mode auto` or
 `AGENT_RELAY_CODEX_FALLBACK_THREAD_MODE=auto` when you deliberately want the
 fallback sidecar to attach to the newest loaded thread for the current cwd.
+The lower-level sidecar also defaults to `CODEX_THREAD_MODE=start`; `auto` is an
+explicit opt-in because it may deliver relay messages into an already-open Codex
+session for the same directory.
 
 ### Codex approval mode
 

package/codex/README.md

@@ -12,9 +12,9 @@ This sidecar connects to a Codex app-server session and to Agent Relay, then del
 
 ## Current behavior
 
-- attaches to a loaded thread for the current `cwd` when one exists
-- otherwise resumes the newest thread for the current `cwd`
-- otherwise creates a new thread
+- starts a new thread by default
+- resumes the actual launched thread when the SessionStart hook provides a thread id
+- only attaches to loaded/latest same-cwd threads when `CODEX_THREAD_MODE=auto`
 - registers a relay agent with `client: codex-live`
 - marks the relay agent `ready=true` once app-server + thread are attached
 - polls relay inbox and delivers messages into the live thread
@@ -131,6 +131,6 @@ startup in time.
 
 Current sidecar behavior is stable for live delivery. Remaining gaps are advanced policies such as batching by sender, message prioritization queues, and more nuanced retry/backoff behavior.
 
-- `CODEX_THREAD_MODE=auto` will attach to an already loaded thread for the same `cwd`. That is what you want for real live control, but it also means the sidecar can attach to your current interactive Codex session if one is already open.
-- For isolated testing, set `CODEX_THREAD_MODE=start` so the sidecar always creates its own thread.
+- `CODEX_THREAD_MODE=start` is the safe default: the sidecar creates its own thread unless the hook supplied an explicit thread id.
+- `CODEX_THREAD_MODE=auto` will attach to an already loaded thread for the same `cwd`. That can be useful for advanced live control, but it also means relay messages can enter your current interactive Codex session if one is already open.
 - A brand-new thread is not materialized for `includeTurns` reads until the first turn starts. That is an app-server behavior, not a relay bug.

package/codex/live-sidecar.test.ts

@@ -0,0 +1,20 @@
+import { describe, expect, it } from "bun:test";
+import { loadConfig, parseThreadMode } from "./live-sidecar";
+
+describe("codex live sidecar config", () => {
+  it("defaults to starting an isolated thread", () => {
+    const config = loadConfig({
+      CODEX_LIVE_CWD: "/tmp/agent-relay-test",
+    });
+
+    expect(config.threadMode).toBe("start");
+  });
+
+  it("only accepts known thread attachment modes", () => {
+    expect(parseThreadMode("auto")).toBe("auto");
+    expect(parseThreadMode("resume")).toBe("resume");
+    expect(parseThreadMode("start")).toBe("start");
+    expect(parseThreadMode("latest")).toBe("start");
+    expect(parseThreadMode(undefined)).toBe("start");
+  });
+});

package/codex/live-sidecar.ts

@@ -572,38 +572,43 @@ function describeError(error: unknown): string {
   return error instanceof Error ? error.message : String(error);
 }
 
-function envNumber(name: string, fallback: number): number {
-  const raw = process.env[name];
+function envNumber(env: NodeJS.ProcessEnv, name: string, fallback: number): number {
+  const raw = env[name];
   if (!raw) return fallback;
   const parsed = Number(raw);
   return Number.isFinite(parsed) && parsed > 0 ? parsed : fallback;
 }
 
-function loadConfig(): Config {
-  const cwd = process.env.CODEX_LIVE_CWD || process.cwd();
-  const capabilities = (process.env.AGENT_RELAY_CAPS || "chat")
+export function parseThreadMode(raw: string | undefined): Config["threadMode"] {
+  if (raw === "auto" || raw === "resume" || raw === "start") return raw;
+  return "start";
+}
+
+export function loadConfig(env: NodeJS.ProcessEnv = process.env): Config {
+  const cwd = env.CODEX_LIVE_CWD || process.cwd();
+  const capabilities = (env.AGENT_RELAY_CAPS || "chat")
     .split(",")
     .map((value) => value.trim())
     .filter(Boolean);
 
   return {
-    relayUrl: process.env.AGENT_RELAY_URL || "http://127.0.0.1:4850",
-    appServerUrl: process.env.CODEX_APP_SERVER_URL || "ws://127.0.0.1:4501",
+    relayUrl: env.AGENT_RELAY_URL || "http://127.0.0.1:4850",
+    appServerUrl: env.CODEX_APP_SERVER_URL || "ws://127.0.0.1:4501",
     cwd,
-    rig: process.env.CODEX_LIVE_RIG || "codex-live",
+    rig: env.CODEX_LIVE_RIG || "codex-live",
     capabilities,
-    tags: ["codex", process.env.CODEX_LIVE_RIG || "codex-live", cwd.split("/").filter(Boolean).at(-1) || "unknown"],
-    statePath: process.env.CODEX_LIVE_STATE_PATH || resolve(cwd, "codex/runtime/live-state.json"),
-    pollIntervalMs: envNumber("CODEX_LIVE_POLL_INTERVAL_MS", 2000),
-    heartbeatIntervalMs: envNumber("CODEX_LIVE_HEARTBEAT_INTERVAL_MS", 30000),
-    coalesceWindowMs: envNumber("CODEX_LIVE_COALESCE_WINDOW_MS", 600),
-    reconnectInitialDelayMs: envNumber("CODEX_LIVE_RECONNECT_INITIAL_MS", 1000),
-    reconnectMaxDelayMs: envNumber("CODEX_LIVE_RECONNECT_MAX_MS", 10000),
-    threadMode: (process.env.CODEX_THREAD_MODE as Config["threadMode"]) || "auto",
-    threadId: process.env.CODEX_THREAD_ID || undefined,
-    model: process.env.CODEX_MODEL || undefined,
-    approvalPolicy: process.env.CODEX_LIVE_APPROVAL_POLICY || undefined,
-    sandbox: process.env.CODEX_LIVE_SANDBOX || undefined,
+    tags: ["codex", env.CODEX_LIVE_RIG || "codex-live", cwd.split("/").filter(Boolean).at(-1) || "unknown"],
+    statePath: env.CODEX_LIVE_STATE_PATH || resolve(cwd, "codex/runtime/live-state.json"),
+    pollIntervalMs: envNumber(env, "CODEX_LIVE_POLL_INTERVAL_MS", 2000),
+    heartbeatIntervalMs: envNumber(env, "CODEX_LIVE_HEARTBEAT_INTERVAL_MS", 30000),
+    coalesceWindowMs: envNumber(env, "CODEX_LIVE_COALESCE_WINDOW_MS", 600),
+    reconnectInitialDelayMs: envNumber(env, "CODEX_LIVE_RECONNECT_INITIAL_MS", 1000),
+    reconnectMaxDelayMs: envNumber(env, "CODEX_LIVE_RECONNECT_MAX_MS", 10000),
+    threadMode: parseThreadMode(env.CODEX_THREAD_MODE),
+    threadId: env.CODEX_THREAD_ID || undefined,
+    model: env.CODEX_MODEL || undefined,
+    approvalPolicy: env.CODEX_LIVE_APPROVAL_POLICY || undefined,
+    sandbox: env.CODEX_LIVE_SANDBOX || undefined,
   };
 }
 
@@ -613,7 +618,9 @@ async function main(): Promise<void> {
   await sidecar.run();
 }
 
-main().catch((error) => {
-  console.error(error instanceof Error ? error.stack || error.message : String(error));
-  process.exit(1);
-});
+if (import.meta.main) {
+  main().catch((error) => {
+    console.error(error instanceof Error ? error.stack || error.message : String(error));
+    process.exit(1);
+  });
+}

package/codex/plugin/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-relay",
-  "version": "0.4.10",
+  "version": "0.4.11",
   "description": "Agent Relay integration for Codex sessions",
   "author": {
     "name": "Edin Mujkanovic"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-relay-server",
-  "version": "0.4.10",
+  "version": "0.4.11",
   "description": "Lightweight HTTP message relay for inter-agent communication across machines",
   "module": "src/index.ts",
   "type": "module",