Drop bridge message envelope

Author: axeldelafosse

src/loop/bridge-message-format.ts

@@ -1,34 +1,18 @@
 import type { Agent } from "./types";
 
-const BRIDGE_TAG_RE = /<\/?loop-bridge(?:\s+[^>]*)?>/gi;
 const BRIDGE_PREFIX_RE =
   /^(?:Message from (?:Claude|Codex) via the loop bridge:|(?:Claude|Codex):)\s*/i;
 
-const bridgeSourceLabel = (source: Agent): string =>
-  source === "claude" ? "Claude" : "Codex";
-
 export const formatCodexBridgeMessage = (
   source: Agent,
-  message: string,
-  messageId?: string
+  message: string
 ): string => {
   const trimmed = message.trim();
   if (!trimmed) {
     return "";
   }
-  const messageIdAttr = messageId ? ` message_id="${messageId}"` : "";
-  return [
-    `<loop-bridge source="${source}"${messageIdAttr}>`,
-    `${bridgeSourceLabel(source)}: ${trimmed}`,
-    "</loop-bridge>",
-  ].join("\n");
+  return source === "claude" ? `Claude: ${trimmed}` : trimmed;
 };
 
 export const normalizeBridgeMessage = (message: string): string =>
-  message
-    .trim()
-    .replace(BRIDGE_TAG_RE, " ")
-    .trim()
-    .replace(BRIDGE_PREFIX_RE, "")
-    .replace(/\s+/g, " ")
-    .trim();
+  message.trim().replace(BRIDGE_PREFIX_RE, "").replace(/\s+/g, " ").trim();

src/loop/bridge-runtime.ts

@@ -329,7 +329,7 @@ export const deliverCodexBridgeMessage = async (
     const delivered = await injectCodexMessage(
       status.codexRemoteUrl,
       status.codexThreadId,
-      formatCodexBridgeMessage(message.source, message.message, message.id)
+      formatCodexBridgeMessage(message.source, message.message)
     );
     if (delivered) {
       acknowledgeBridgeDelivery(
@@ -361,7 +361,7 @@ export const drainCodexTmuxMessages = async (
   }
   const delivered = await injectCodexTmuxMessage(
     status.tmuxSession,
-    formatCodexBridgeMessage(message.source, message.message, message.id)
+    formatCodexBridgeMessage(message.source, message.message)
   );
   if (!delivered) {
     return false;

src/loop/codex-tmux-proxy.ts

@@ -235,7 +235,7 @@ const buildBridgeInjectionFrame = (
       params: {
         expectedTurnId: activeTurnId,
         input: buildInput(
-          formatCodexBridgeMessage(message.source, message.message, message.id)
+          formatCodexBridgeMessage(message.source, message.message)
         ),
         threadId,
       },
@@ -246,7 +246,7 @@ const buildBridgeInjectionFrame = (
     method: TURN_START_METHOD,
     params: {
       input: buildInput(
-        formatCodexBridgeMessage(message.source, message.message, message.id)
+        formatCodexBridgeMessage(message.source, message.message)
       ),
       threadId,
     },

src/loop/paired-loop.ts

@@ -153,17 +153,15 @@ const reviewBridgePrompt = (
     .join("\n\n");
 
 const forwardBridgePrompt = ({
-  id,
   message,
   source,
 }: {
-  id: string;
   message: string;
   source: Agent;
 }): string =>
   (source === "claude"
     ? [
-        formatCodexBridgeMessage(source, message, id),
+        formatCodexBridgeMessage(source, message),
         "Treat this as direct agent-to-agent coordination. Do not reply to the human.",
         'Send a message to the other agent with "send_message" only when you have something useful for them to act on.',
         "Do not acknowledge receipt without new information.",

tests/loop/bridge.test.ts

@@ -75,16 +75,6 @@ const toolText = (stdout: string, id: number): string => {
   )?.content;
   return content?.[0]?.text ?? "";
 };
-const codexBridgeEnvelope = (
-  id: string,
-  message: string,
-  source: "claude" | "codex" = "claude"
-): string =>
-  [
-    `<loop-bridge source="${source}" message_id="${id}">`,
-    `${source === "claude" ? "Claude" : "Codex"}: ${message}`,
-    "</loop-bridge>",
-  ].join("\n");
 
 const runBridgeProcess = async (
   runDir: string,
@@ -481,15 +471,6 @@ test("bridge normalization treats short and legacy Claude prefixes as equivalent
       "Claude: Please verify the final diff."
     )
   ).toBe(true);
-  expect(
-    bridge.blocksBridgeBounce(
-      runDir,
-      "codex",
-      "claude",
-      codexBridgeEnvelope("msg-2", "Please verify the final diff.")
-    )
-  ).toBe(true);
-
   rmSync(root, { recursive: true, force: true });
 });
 
@@ -1181,7 +1162,7 @@ test("bridge delivers Claude replies directly to Codex when app-server state is
   expect(injectCodexMessage).toHaveBeenCalledWith(
     "ws://127.0.0.1:4500",
     "codex-thread-1",
-    codexBridgeEnvelope("msg-1", "The files look good to me.")
+    "Claude: The files look good to me."
   );
   expect(bridge.readPendingBridgeMessages(runDir)).toEqual([]);
   expect(
@@ -1239,7 +1220,7 @@ test("bridge prefers Codex app-server delivery even when tmux is live", async ()
   expect(injectCodexMessage).toHaveBeenCalledWith(
     "ws://127.0.0.1:4500",
     "codex-thread-1",
-    codexBridgeEnvelope("msg-live", "Please steer this into the active turn.")
+    "Claude: Please steer this into the active turn."
   );
   expect(bridge.readPendingBridgeMessages(runDir)).toEqual([]);
   expect(
@@ -1300,7 +1281,7 @@ test("bridge falls back to direct Codex delivery when the stored tmux session is
   expect(injectCodexMessage).toHaveBeenCalledWith(
     "ws://127.0.0.1:4500",
     "codex-thread-1",
-    '<loop-bridge source="claude" message_id="msg-2">\nClaude: Please review the final state.\n</loop-bridge>'
+    "Claude: Please review the final state."
   );
   expect(readRunManifest(join(runDir, "manifest.json"))?.tmuxSession).toBe(
     undefined
@@ -1385,22 +1366,6 @@ test("bridge drains pending codex tmux messages through the injected command dep
       ["tmux", "capture-pane", "-p", "-t", "repo-loop-8:0.1"],
       { stderr: "ignore", stdout: "pipe" },
     ],
-    [
-      [
-        "tmux",
-        "send-keys",
-        "-t",
-        "repo-loop-8:0.1",
-        "-l",
-        "--",
-        '<loop-bridge source="claude" message_id="msg-3">',
-      ],
-      { stderr: "ignore" },
-    ],
-    [
-      ["tmux", "send-keys", "-t", "repo-loop-8:0.1", "C-j"],
-      { stderr: "ignore" },
-    ],
     [
       [
         "tmux",
@@ -1413,22 +1378,6 @@ test("bridge drains pending codex tmux messages through the injected command dep
       ],
       { stderr: "ignore" },
     ],
-    [
-      ["tmux", "send-keys", "-t", "repo-loop-8:0.1", "C-j"],
-      { stderr: "ignore" },
-    ],
-    [
-      [
-        "tmux",
-        "send-keys",
-        "-t",
-        "repo-loop-8:0.1",
-        "-l",
-        "--",
-        "</loop-bridge>",
-      ],
-      { stderr: "ignore" },
-    ],
     [
       ["tmux", "send-keys", "-t", "repo-loop-8:0.1", "Enter"],
       { stderr: "ignore" },
@@ -1732,10 +1681,7 @@ test("runBridgeWorker falls back to app-server delivery after stale tmux cleanup
   expect(injectCodexMessage).toHaveBeenCalledWith(
     "ws://127.0.0.1:4500",
     "codex-thread-1",
-    codexBridgeEnvelope(
-      "msg-stale-fallback",
-      "Please deliver this after tmux cleanup."
-    )
+    "Claude: Please deliver this after tmux cleanup."
   );
   expect(readRunManifest(join(runDir, "manifest.json"))?.tmuxSession).toBe(
     undefined
@@ -1847,12 +1793,12 @@ test("runBridgeWorker retries queued codex app-server messages", async () => {
     [
       "ws://127.0.0.1:4500",
       "codex-thread-1",
-      codexBridgeEnvelope("msg-4", "Please review the final diff."),
+      "Claude: Please review the final diff.",
     ],
     [
       "ws://127.0.0.1:4500",
       "codex-thread-1",
-      codexBridgeEnvelope("msg-4", "Please review the final diff."),
+      "Claude: Please review the final diff.",
     ],
   ]);
   expect(bridge.readPendingBridgeMessages(runDir)).toEqual([]);

tests/loop/codex-tmux-proxy.test.ts

@@ -28,12 +28,6 @@ const bridgeMessage = {
   source: "claude" as const,
   target: "codex" as const,
 };
-const codexBridgeEnvelope = (id: string, message: string): string =>
-  [
-    `<loop-bridge source="claude" message_id="${id}">`,
-    `Claude: ${message}`,
-    "</loop-bridge>",
-  ].join("\n");
 
 const TEST_PORT_RANGE = 200;
 const TEST_PORT_RETRY_LIMIT = 5;
@@ -221,7 +215,7 @@ test("codex tmux proxy steers bridge messages into an active turn", () => {
       expectedTurnId: "turn-active",
       input: [
         {
-          text: codexBridgeEnvelope("msg-1", "Please review the latest diff."),
+          text: "Claude: Please review the latest diff.",
           text_elements: [],
           type: "text",
         },
@@ -244,7 +238,7 @@ test("codex tmux proxy starts a new turn when no active turn exists", () => {
     params: {
       input: [
         {
-          text: codexBridgeEnvelope("msg-1", "Please review the latest diff."),
+          text: "Claude: Please review the latest diff.",
           text_elements: [],
           type: "text",
         },

tests/loop/paired-loop.test.ts

@@ -772,9 +772,6 @@ test("runPairedLoop delivers peer messages back to the primary agent", async ()
     expect(calls).toHaveLength(3);
     expect(calls[0]?.agent).toBe("claude");
     expect(calls[1]?.agent).toBe("codex");
-    expect(calls[1]?.prompt).toContain(
-      '<loop-bridge source="claude" message_id="msg-1">'
-    );
     expect(calls[1]?.prompt).toContain("Claude: Please verify");
     expect(calls[1]?.prompt).toContain(
       "Please verify the implementation details."
@@ -817,9 +814,6 @@ test("runPairedLoop skips the default work turn after draining input for the pri
 
     expect(calls).toHaveLength(1);
     expect(calls[0]?.agent).toBe("codex");
-    expect(calls[0]?.prompt).toContain(
-      '<loop-bridge source="claude" message_id="msg-1">'
-    );
     expect(calls[0]?.prompt).toContain("Claude: Please verify");
     expect(calls[0]?.prompt).toContain(
       "Please verify the implementation details."