Clarify Claude tmux bridge tool guidance

Author: axeldelafosse

src/loop/tmux.ts

@@ -12,11 +12,7 @@ import {
   legacyClaudeChannelServerName,
   resolveClaudeChannelServerName,
 } from "./bridge-config";
-import {
-  bridgeToolName,
-  receiveMessagesStuckGuidance,
-  sendProactiveCodexGuidance,
-} from "./bridge-guidance";
+import { bridgeToolName } from "./bridge-guidance";
 import { getCodexAppServerUrl, getLastCodexThreadId } from "./codex-app-server";
 import {
   CODEX_TMUX_PROXY_SUBCOMMAND,
@@ -160,16 +156,20 @@ const quotedBridgeTool = (
   tool: "bridge_status" | "receive_messages" | "send_message"
 ): string => `"${bridgeToolName(agent, tool)}"`;
 
+const quotedClaudeTmuxBridgeTool = (
+  serverName: string,
+  tool: "bridge_status" | "receive_messages" | "send_message"
+): string => `"mcp__${serverName}__${tool}"`;
+
 const pairedBridgeGuidance = (
   agent: Agent,
   _runId: string,
   serverName: string
 ): string => {
   if (agent === "claude") {
     return [
-      `Your bridge MCP server is "${serverName}". All bridge tool calls must use the mcp__${serverName}__ prefix.`,
-      sendProactiveCodexGuidance(),
-      receiveMessagesStuckGuidance,
+      `Your bridge MCP server is "${serverName}". Use ${quotedClaudeTmuxBridgeTool(serverName, "send_message")} with target: "codex" for Codex-facing messages, including replies to inbound Codex channel messages; do not send Codex-facing responses as a human-facing message.`,
+      `Use ${quotedClaudeTmuxBridgeTool(serverName, "bridge_status")} or ${quotedClaudeTmuxBridgeTool(serverName, "receive_messages")} only if delivery looks stuck.`,
     ].join("\n");
   }
 

tests/loop/tmux.test.ts

@@ -799,10 +799,14 @@ test("tmux prompts keep the paired review workflow explicit", () => {
   expect(peerPrompt).toContain("Wait for Codex to send you a targeted request");
   expect(peerPrompt).not.toContain('"reply"');
   expect(peerPrompt).toContain(
-    'Use "send_message" with target: "codex" for Codex-facing messages, including replies to inbound Codex channel messages; do not send Codex-facing responses as a human-facing message.'
+    'Use "mcp__loop-bridge-repo-123-1__send_message" with target: "codex" for Codex-facing messages, including replies to inbound Codex channel messages; do not send Codex-facing responses as a human-facing message.'
   );
   expect(primaryPrompt).not.toContain("mcp__loop-bridge-repo-123-1__ prefix");
-  expect(peerPrompt).toContain("mcp__loop-bridge-repo-123-1__ prefix");
+  expect(peerPrompt).not.toContain("mcp__loop-bridge-repo-123-1__ prefix");
+  expect(peerPrompt).toContain('"mcp__loop-bridge-repo-123-1__bridge_status"');
+  expect(peerPrompt).toContain(
+    '"mcp__loop-bridge-repo-123-1__receive_messages"'
+  );
 });
 
 test("interactive tmux prompts tell both agents to wait for the human", () => {
@@ -839,13 +843,18 @@ test("interactive tmux prompts tell both agents to wait for the human", () => {
   expect(peerPrompt).toContain("human clearly assigns you separate work");
   expect(peerPrompt).not.toContain('"reply"');
   expect(peerPrompt).toContain(
-    'Use "send_message" with target: "codex" for Codex-facing messages, including replies to inbound Codex channel messages; do not send Codex-facing responses as a human-facing message.'
+    'Use "mcp__loop-bridge-repo-123-1__send_message" with target: "codex" for Codex-facing messages, including replies to inbound Codex channel messages; do not send Codex-facing responses as a human-facing message.'
+  );
+  expect(peerPrompt).not.toContain("mcp__loop-bridge-repo-123-1__ prefix");
+  expect(peerPrompt).toContain('"mcp__loop-bridge-repo-123-1__bridge_status"');
+  expect(peerPrompt).toContain(
+    '"mcp__loop-bridge-repo-123-1__receive_messages"'
   );
   expect(peerPrompt).toContain(
     "If you are answering Codex, use the bridge tools instead of a human-facing reply."
   );
   expect(primaryPrompt).not.toContain("mcp__loop-bridge-repo-123-1__ prefix");
-  expect(peerPrompt).toContain("mcp__loop-bridge-repo-123-1__ prefix");
+  expect(peerPrompt).not.toContain("mcp__loop-bridge-repo-123-1__ prefix");
 });
 
 test("runInTmux auto-confirms Claude startup prompts in paired mode", async () => {