@raysonmeng/agentbridge 0.1.7 → 0.1.9

package/.claude-plugin/marketplace.json

@@ -12,7 +12,7 @@
     {
       "name": "agentbridge",
       "description": "Bridge Claude Code and Codex through a shared daemon, push channel delivery, and reply/get_messages tools.",
-      "version": "0.1.7",
+      "version": "0.1.9",
       "author": {
         "name": "AgentBridge Contributors",
         "email": "raysonmeng@qq.com"

package/dist/cli.js

@@ -120,7 +120,7 @@ function parsePositiveIntEnv(name, fallback, log = () => {}, env = process.env)
 var require_package = __commonJS((exports, module) => {
   module.exports = {
     name: "@raysonmeng/agentbridge",
-    version: "0.1.7",
+    version: "0.1.9",
     description: "Bridge between Claude Code and Codex \u2014 bidirectional agent communication via MCP Channel + JSON-RPC",
     type: "module",
     packageManager: "bun@1.3.11",
@@ -1047,7 +1047,7 @@ var init_daemon_client = __esm(() => {
       this.ws = null;
       this.rejectPendingReplies("Daemon connection closed");
     }
-    async sendReply(message, requireReply) {
+    async sendReply(message, requireReply, onBusy) {
       if (!this.ws || this.ws.readyState !== WebSocket.OPEN) {
         return { success: false, error: "AgentBridge daemon is not connected." };
       }
@@ -1062,7 +1062,8 @@ var init_daemon_client = __esm(() => {
           type: "claude_to_codex",
           requestId,
           message,
-          ...requireReply ? { requireReply: true } : {}
+          ...requireReply ? { requireReply: true } : {},
+          ...onBusy && onBusy !== "reject" ? { onBusy } : {}
         });
       });
     }
@@ -1164,8 +1165,8 @@ function formatBuildInfo(build) {
 var BUILD_INFO;
 var init_build_info = __esm(() => {
   BUILD_INFO = Object.freeze({
-    version: defineString("0.1.7", "0.0.0-source"),
-    commit: defineString("1df8b91", "source"),
+    version: defineString("0.1.9", "0.0.0-source"),
+    commit: defineString("10dfd58", "source"),
     bundle: defineBundle("dist"),
     contractVersion: defineNumber(1, CONTRACT_VERSION)
   });

package/dist/daemon.js

@@ -17,8 +17,8 @@ function defineNumber(value, fallback) {
   return typeof value === "number" && Number.isFinite(value) ? value : fallback;
 }
 var BUILD_INFO = Object.freeze({
-  version: defineString("0.1.7", "0.0.0-source"),
-  commit: defineString("1df8b91", "source"),
+  version: defineString("0.1.9", "0.0.0-source"),
+  commit: defineString("10dfd58", "source"),
   bundle: defineBundle("dist"),
   contractVersion: defineNumber(1, CONTRACT_VERSION)
 });
@@ -639,6 +639,7 @@ class CodexAdapter extends EventEmitter {
   pendingServerResponses = new Map;
   staleProxyIds = new Map;
   bridgeRequestIds = new Map;
+  bridgeRequestKinds = new Map;
   intentionalDisconnect = false;
   pendingTuiMessages = [];
   reconnectingForNewSession = false;
@@ -797,6 +798,45 @@ class CodexAdapter extends EventEmitter {
       return false;
     }
   }
+  steerMessage(text) {
+    if (!this.threadId) {
+      this.log("Cannot steer: no active thread");
+      return false;
+    }
+    if (!this.appServerWs || this.appServerWs.readyState !== WebSocket.OPEN) {
+      this.log("Cannot steer: app-server WebSocket not connected");
+      return false;
+    }
+    if (!this.turnInProgress) {
+      this.log("Cannot steer: no turn in progress (use injectMessage)");
+      return false;
+    }
+    const expectedTurnId = this.currentSteerableTurnId();
+    if (!expectedTurnId) {
+      this.log("Cannot steer: no addressable active turn id (turn/started carried no id)");
+      return false;
+    }
+    this.log(`Steering message into active Codex turn ${expectedTurnId} (${text.length} chars)`);
+    const requestId = this.nextInjectionId--;
+    this.trackBridgeRequestId(requestId, "steer");
+    const params = {
+      threadId: this.threadId,
+      expectedTurnId,
+      input: [{ type: "text", text }]
+    };
+    try {
+      this.appServerWs.send(JSON.stringify({
+        method: "turn/steer",
+        id: requestId,
+        params
+      }));
+      return true;
+    } catch (err) {
+      this.untrackBridgeRequestId(requestId);
+      this.log(`Steer send failed: ${err.message}`);
+      return false;
+    }
+  }
   async waitForHealthy(maxRetries = 20, delayMs = 500) {
     for (let i = 0;i < maxRetries; i++) {
       try {
@@ -1519,14 +1559,22 @@ class CodexAdapter extends EventEmitter {
       this.interceptServerMessage(parsed, mapping.connId);
       return forwarded;
     }
-    if (!isNaN(numericId) && this.consumeBridgeRequestId(numericId)) {
+    const bridgeKind = !isNaN(numericId) ? this.consumeBridgeRequestId(numericId) : null;
+    if (bridgeKind) {
       if (parsed.error) {
-        this.log(`Bridge-originated request failed (id ${responseId}): ${parsed.error.message ?? "unknown error"}`);
-        this.lastTurnEndedAbnormally = true;
-        this.emit("turnAborted", `injected turn/start rejected: ${parsed.error.message ?? "unknown error"}`);
-        this.notifyPhaseIfChanged();
+        this.log(`Bridge-originated ${bridgeKind} request failed (id ${responseId}): ${parsed.error.message ?? "unknown error"}`);
+        if (bridgeKind === "steer") {
+          this.emit("steerFailed", parsed.error.message ?? "unknown error");
+        } else {
+          this.lastTurnEndedAbnormally = true;
+          this.emit("turnAborted", `injected turn/start rejected: ${parsed.error.message ?? "unknown error"}`);
+          this.notifyPhaseIfChanged();
+        }
       } else {
-        this.log(`Bridge-originated request completed (id ${responseId})`);
+        this.log(`Bridge-originated ${bridgeKind} request completed (id ${responseId})`);
+        if (bridgeKind === "steer") {
+          this.emit("steerAccepted");
+        }
       }
       return null;
     }
@@ -1719,6 +1767,14 @@ class CodexAdapter extends EventEmitter {
     this.log(`Thread detected: ${threadId} (${reason})`);
     this.emit("ready", threadId);
   }
+  currentSteerableTurnId() {
+    let newest = null;
+    for (const id of this.activeTurnIds) {
+      if (!id.startsWith("unknown:"))
+        newest = id;
+    }
+    return newest;
+  }
   get turnPhase() {
     if (this.activeTurnIds.size > 0) {
       const allStalled = [...this.activeTurnIds].every((id) => this.currentlyStalledTurnIds.has(id));
@@ -1737,6 +1793,7 @@ class CodexAdapter extends EventEmitter {
   markTurnStarted(turnId) {
     const wasInProgress = this.turnInProgress;
     const turnKey = typeof turnId === "string" && turnId.length > 0 ? turnId : `unknown:${Date.now()}`;
+    this.activeTurnIds.delete(turnKey);
     this.activeTurnIds.add(turnKey);
     this.stalledTurnIds.delete(turnKey);
     this.currentlyStalledTurnIds.delete(turnKey);
@@ -1877,18 +1934,23 @@ class CodexAdapter extends EventEmitter {
   consumeStaleProxyId(proxyId) {
     return this.clearTrackedId(this.staleProxyIds, proxyId);
   }
-  trackBridgeRequestId(requestId) {
+  trackBridgeRequestId(requestId, kind = "turn-start") {
     this.clearTrackedId(this.bridgeRequestIds, requestId);
     const timer = setTimeout(() => {
       this.bridgeRequestIds.delete(requestId);
+      this.bridgeRequestKinds.delete(requestId);
     }, CodexAdapter.RESPONSE_TRACKING_TTL_MS);
     timer.unref?.();
     this.bridgeRequestIds.set(requestId, timer);
+    this.bridgeRequestKinds.set(requestId, kind);
   }
   consumeBridgeRequestId(requestId) {
-    return this.clearTrackedId(this.bridgeRequestIds, requestId);
+    const kind = this.bridgeRequestKinds.get(requestId) ?? "turn-start";
+    this.bridgeRequestKinds.delete(requestId);
+    return this.clearTrackedId(this.bridgeRequestIds, requestId) ? kind : null;
   }
   untrackBridgeRequestId(requestId) {
+    this.bridgeRequestKinds.delete(requestId);
     this.clearTrackedId(this.bridgeRequestIds, requestId);
   }
   clearTrackedId(store, id) {
@@ -1910,6 +1972,7 @@ class CodexAdapter extends EventEmitter {
       clearTimeout(timer);
     }
     this.bridgeRequestIds.clear();
+    this.bridgeRequestKinds.clear();
   }
   clearResponseTrackingState() {
     this.clearTransientResponseTrackingState();
@@ -3947,6 +4010,14 @@ codex.on("turnPhaseChanged", ({ phase, previous }) => {
   tryWriteStatusFile(`turnPhase:${phase}`);
   broadcastStatus();
 });
+codex.on("steerFailed", (reason) => {
+  log(`Steer rejected by app-server: ${reason}`);
+  const advice = codex.turnInProgress ? "wait for it to finish (\u2705), then send normally" : "the turn has ended \u2014 resend as a normal reply";
+  emitToClaude(systemMessage("system_steer_failed", `\u26A0\uFE0F Your steer message did NOT reach Codex (${reason}). The original turn continues unaffected \u2014 ${advice}.`));
+});
+codex.on("steerAccepted", () => {
+  log("Steer accepted by app-server");
+});
 codex.on("turnStarted", () => {
   log("Codex turn started");
   emitToClaude(systemMessage("system_turn_started", "\u23F3 Codex is working on the current task. Wait for completion before sending a reply."));
@@ -4184,9 +4255,37 @@ function handleControlMessage(ws, raw) {
       }
       log(`Forwarding Claude \u2192 Codex (${message.message.content.length} chars, requireReply=${requireReply})`);
       const tierOverrides = BUDGET_CONFIG.codexTierControl ? budgetCoordinator?.getCodexTurnOverrides() ?? undefined : undefined;
+      if (codex.turnInProgress && message.onBusy === "steer") {
+        if (requireReply) {
+          sendProtocolMessage(ws, {
+            type: "claude_to_codex_result",
+            requestId: message.requestId,
+            success: false,
+            error: 'require_reply is not supported together with on_busy="steer" yet. Send the steer without require_reply, or wait for the turn to finish.'
+          });
+          return;
+        }
+        const steerContent = `[STEER from Claude]
+` + `Mid-turn update for the current Codex turn. Integrate if relevant; do not restart work unless explicitly requested.
+
+` + message.message.content;
+        const steered = codex.steerMessage(steerContent);
+        log(`Steer ${steered ? "transport-accepted" : "failed"} (${message.message.content.length} chars)`);
+        if (steered) {
+          clearAttentionWindow();
+        }
+        const steerFailureAdvice = codex.turnInProgress ? "Steer failed: the running turn cannot be steered right now \u2014 wait for it to finish (\u2705), then send normally." : "Steer failed: the turn may have just ended or the connection dropped \u2014 retry as a normal reply.";
+        sendProtocolMessage(ws, {
+          type: "claude_to_codex_result",
+          requestId: message.requestId,
+          success: steered,
+          error: steered ? undefined : steerFailureAdvice
+        });
+        return;
+      }
       const injected = codex.injectMessage(contentToSend, tierOverrides);
       if (!injected) {
-        const reason = codex.turnInProgress ? "Codex is busy executing a turn. Wait for it to finish before sending another message." : "Injection failed: no active thread or WebSocket not connected.";
+        const reason = codex.turnInProgress ? 'Codex is busy executing a turn. Options: wait for it to finish, or retry with on_busy="steer" to feed this message into the running turn without interrupting it.' : "Injection failed: no active thread or WebSocket not connected.";
         log(`Injection rejected: ${reason}`);
         sendProtocolMessage(ws, {
           type: "claude_to_codex_result",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raysonmeng/agentbridge",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "description": "Bridge between Claude Code and Codex — bidirectional agent communication via MCP Channel + JSON-RPC",
   "type": "module",
   "packageManager": "bun@1.3.11",

package/plugins/agentbridge/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "agentbridge",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "description": "Bridge Claude Code and Codex with a shared daemon, push channel delivery, and bidirectional reply tooling.",
   "author": {
     "name": "AgentBridge Contributors",

package/plugins/agentbridge/server/bridge-server.js

@@ -13947,7 +13947,7 @@ var CLAUDE_INSTRUCTIONS = [
   "## Turn coordination",
   "- When you see '\u23F3 Codex is working', do NOT call the reply tool \u2014 wait for '\u2705 Codex finished'.",
   "- After Codex finishes a turn, you have an attention window to review and respond before new messages arrive.",
-  "- If the reply tool returns a busy error, Codex is still executing \u2014 wait and try again later.",
+  '- If the reply tool returns a busy error, Codex is still executing. You decide: wait and retry later, or resend with on_busy="steer" to feed the message INTO the running turn (good for mid-course corrections; it does not interrupt or restart the work).',
   "",
   "## Budget awareness",
   "- Use the get_budget tool to check both agents' subscription quota (5h/weekly windows, drift, pause state).",
@@ -14099,6 +14099,11 @@ ${formatted}`
               require_reply: {
                 type: "boolean",
                 description: "When true, Codex is required to send a reply. All Codex messages from this turn will be forwarded immediately (bypassing STATUS buffering). Use this when you need a direct answer from Codex."
+              },
+              on_busy: {
+                type: "string",
+                enum: ["reject", "steer"],
+                description: `What to do when Codex is mid-turn. "reject" (default): fail with a busy error \u2014 wait and retry. "steer": feed this message INTO the running turn \u2014 Codex sees it immediately and integrates it without losing work. Use steer for mid-course corrections, added constraints, or updated acceptance criteria; it does NOT start a new turn, so don't combine it with require_reply. If you need Codex to STOP and do something else, wait for the turn to finish (interrupt support is coming separately).`
               }
             },
             required: ["text"]
@@ -14157,6 +14162,20 @@ ${formatted}`
       };
     }
     const requireReply = args?.require_reply === true;
+    const onBusyRaw = args?.on_busy;
+    const onBusy = onBusyRaw === "steer" ? "steer" : "reject";
+    if (onBusyRaw !== undefined && onBusyRaw !== "reject" && onBusyRaw !== "steer") {
+      return {
+        content: [{ type: "text", text: `Error: invalid on_busy value ${JSON.stringify(onBusyRaw)} \u2014 use "reject" or "steer".` }],
+        isError: true
+      };
+    }
+    if (onBusy === "steer" && requireReply) {
+      return {
+        content: [{ type: "text", text: 'Error: require_reply cannot be combined with on_busy="steer" yet \u2014 a steer joins the RUNNING turn instead of starting a new one, so reply tracking would mis-arm. Send the steer without require_reply.' }],
+        isError: true
+      };
+    }
     const bridgeMsg = {
       id: args?.chat_id ?? `reply_${Date.now()}`,
       source: "claude",
@@ -14170,7 +14189,7 @@ ${formatted}`
         isError: true
       };
     }
-    const result = await this.replySender(bridgeMsg, requireReply);
+    const result = await this.replySender(bridgeMsg, requireReply, onBusy);
     if (!result.success) {
       this.log(`Reply delivery failed: ${result.error}`);
       return {
@@ -14179,7 +14198,7 @@ ${formatted}`
       };
     }
     const pending = this.pendingMessages.length;
-    let responseText = "Reply sent to Codex.";
+    let responseText = onBusy === "steer" ? "Reply sent to Codex (will be steered into the running turn if one is active; watch for a system_steer_failed notice if the app-server rejects it)." : "Reply sent to Codex.";
     if (pending > 0) {
       responseText += ` Note: ${pending} unread Codex message${pending > 1 ? "s" : ""} already waiting \u2014 call get_messages to read them.`;
     }
@@ -14208,8 +14227,8 @@ function defineNumber(value, fallback) {
   return typeof value === "number" && Number.isFinite(value) ? value : fallback;
 }
 var BUILD_INFO = Object.freeze({
-  version: defineString("0.1.7", "0.0.0-source"),
-  commit: defineString("1df8b91", "source"),
+  version: defineString("0.1.9", "0.0.0-source"),
+  commit: defineString("10dfd58", "source"),
   bundle: defineBundle("plugin"),
   contractVersion: defineNumber(1, CONTRACT_VERSION)
 });
@@ -14381,7 +14400,7 @@ class DaemonClient extends EventEmitter2 {
     this.ws = null;
     this.rejectPendingReplies("Daemon connection closed");
   }
-  async sendReply(message, requireReply) {
+  async sendReply(message, requireReply, onBusy) {
     if (!this.ws || this.ws.readyState !== WebSocket.OPEN) {
       return { success: false, error: "AgentBridge daemon is not connected." };
     }
@@ -14396,7 +14415,8 @@ class DaemonClient extends EventEmitter2 {
         type: "claude_to_codex",
         requestId,
         message,
-        ...requireReply ? { requireReply: true } : {}
+        ...requireReply ? { requireReply: true } : {},
+        ...onBusy && onBusy !== "reject" ? { onBusy } : {}
       });
     });
   }
@@ -15416,7 +15436,7 @@ if (process.env.AGENTBRIDGE_TRACE === "1") {
     });
   } catch {}
 }
-claude.setReplySender(async (msg, requireReply) => {
+claude.setReplySender(async (msg, requireReply, onBusy) => {
   if (msg.source !== "claude") {
     return { success: false, error: "Invalid message source" };
   }
@@ -15426,7 +15446,7 @@ claude.setReplySender(async (msg, requireReply) => {
       error: disabledReplyError(daemonDisabledReason ?? "killed")
     };
   }
-  return daemonClient.sendReply(msg, requireReply);
+  return daemonClient.sendReply(msg, requireReply, onBusy);
 });
 daemonClient.on("codexMessage", (message) => {
   log(`Forwarding daemon \u2192 Claude (${message.content.length} chars)`);

package/plugins/agentbridge/server/daemon.js

@@ -17,8 +17,8 @@ function defineNumber(value, fallback) {
   return typeof value === "number" && Number.isFinite(value) ? value : fallback;
 }
 var BUILD_INFO = Object.freeze({
-  version: defineString("0.1.7", "0.0.0-source"),
-  commit: defineString("1df8b91", "source"),
+  version: defineString("0.1.9", "0.0.0-source"),
+  commit: defineString("10dfd58", "source"),
   bundle: defineBundle("plugin"),
   contractVersion: defineNumber(1, CONTRACT_VERSION)
 });
@@ -639,6 +639,7 @@ class CodexAdapter extends EventEmitter {
   pendingServerResponses = new Map;
   staleProxyIds = new Map;
   bridgeRequestIds = new Map;
+  bridgeRequestKinds = new Map;
   intentionalDisconnect = false;
   pendingTuiMessages = [];
   reconnectingForNewSession = false;
@@ -797,6 +798,45 @@ class CodexAdapter extends EventEmitter {
       return false;
     }
   }
+  steerMessage(text) {
+    if (!this.threadId) {
+      this.log("Cannot steer: no active thread");
+      return false;
+    }
+    if (!this.appServerWs || this.appServerWs.readyState !== WebSocket.OPEN) {
+      this.log("Cannot steer: app-server WebSocket not connected");
+      return false;
+    }
+    if (!this.turnInProgress) {
+      this.log("Cannot steer: no turn in progress (use injectMessage)");
+      return false;
+    }
+    const expectedTurnId = this.currentSteerableTurnId();
+    if (!expectedTurnId) {
+      this.log("Cannot steer: no addressable active turn id (turn/started carried no id)");
+      return false;
+    }
+    this.log(`Steering message into active Codex turn ${expectedTurnId} (${text.length} chars)`);
+    const requestId = this.nextInjectionId--;
+    this.trackBridgeRequestId(requestId, "steer");
+    const params = {
+      threadId: this.threadId,
+      expectedTurnId,
+      input: [{ type: "text", text }]
+    };
+    try {
+      this.appServerWs.send(JSON.stringify({
+        method: "turn/steer",
+        id: requestId,
+        params
+      }));
+      return true;
+    } catch (err) {
+      this.untrackBridgeRequestId(requestId);
+      this.log(`Steer send failed: ${err.message}`);
+      return false;
+    }
+  }
   async waitForHealthy(maxRetries = 20, delayMs = 500) {
     for (let i = 0;i < maxRetries; i++) {
       try {
@@ -1519,14 +1559,22 @@ class CodexAdapter extends EventEmitter {
       this.interceptServerMessage(parsed, mapping.connId);
       return forwarded;
     }
-    if (!isNaN(numericId) && this.consumeBridgeRequestId(numericId)) {
+    const bridgeKind = !isNaN(numericId) ? this.consumeBridgeRequestId(numericId) : null;
+    if (bridgeKind) {
       if (parsed.error) {
-        this.log(`Bridge-originated request failed (id ${responseId}): ${parsed.error.message ?? "unknown error"}`);
-        this.lastTurnEndedAbnormally = true;
-        this.emit("turnAborted", `injected turn/start rejected: ${parsed.error.message ?? "unknown error"}`);
-        this.notifyPhaseIfChanged();
+        this.log(`Bridge-originated ${bridgeKind} request failed (id ${responseId}): ${parsed.error.message ?? "unknown error"}`);
+        if (bridgeKind === "steer") {
+          this.emit("steerFailed", parsed.error.message ?? "unknown error");
+        } else {
+          this.lastTurnEndedAbnormally = true;
+          this.emit("turnAborted", `injected turn/start rejected: ${parsed.error.message ?? "unknown error"}`);
+          this.notifyPhaseIfChanged();
+        }
       } else {
-        this.log(`Bridge-originated request completed (id ${responseId})`);
+        this.log(`Bridge-originated ${bridgeKind} request completed (id ${responseId})`);
+        if (bridgeKind === "steer") {
+          this.emit("steerAccepted");
+        }
       }
       return null;
     }
@@ -1719,6 +1767,14 @@ class CodexAdapter extends EventEmitter {
     this.log(`Thread detected: ${threadId} (${reason})`);
     this.emit("ready", threadId);
   }
+  currentSteerableTurnId() {
+    let newest = null;
+    for (const id of this.activeTurnIds) {
+      if (!id.startsWith("unknown:"))
+        newest = id;
+    }
+    return newest;
+  }
   get turnPhase() {
     if (this.activeTurnIds.size > 0) {
       const allStalled = [...this.activeTurnIds].every((id) => this.currentlyStalledTurnIds.has(id));
@@ -1737,6 +1793,7 @@ class CodexAdapter extends EventEmitter {
   markTurnStarted(turnId) {
     const wasInProgress = this.turnInProgress;
     const turnKey = typeof turnId === "string" && turnId.length > 0 ? turnId : `unknown:${Date.now()}`;
+    this.activeTurnIds.delete(turnKey);
     this.activeTurnIds.add(turnKey);
     this.stalledTurnIds.delete(turnKey);
     this.currentlyStalledTurnIds.delete(turnKey);
@@ -1877,18 +1934,23 @@ class CodexAdapter extends EventEmitter {
   consumeStaleProxyId(proxyId) {
     return this.clearTrackedId(this.staleProxyIds, proxyId);
   }
-  trackBridgeRequestId(requestId) {
+  trackBridgeRequestId(requestId, kind = "turn-start") {
     this.clearTrackedId(this.bridgeRequestIds, requestId);
     const timer = setTimeout(() => {
       this.bridgeRequestIds.delete(requestId);
+      this.bridgeRequestKinds.delete(requestId);
     }, CodexAdapter.RESPONSE_TRACKING_TTL_MS);
     timer.unref?.();
     this.bridgeRequestIds.set(requestId, timer);
+    this.bridgeRequestKinds.set(requestId, kind);
   }
   consumeBridgeRequestId(requestId) {
-    return this.clearTrackedId(this.bridgeRequestIds, requestId);
+    const kind = this.bridgeRequestKinds.get(requestId) ?? "turn-start";
+    this.bridgeRequestKinds.delete(requestId);
+    return this.clearTrackedId(this.bridgeRequestIds, requestId) ? kind : null;
   }
   untrackBridgeRequestId(requestId) {
+    this.bridgeRequestKinds.delete(requestId);
     this.clearTrackedId(this.bridgeRequestIds, requestId);
   }
   clearTrackedId(store, id) {
@@ -1910,6 +1972,7 @@ class CodexAdapter extends EventEmitter {
       clearTimeout(timer);
     }
     this.bridgeRequestIds.clear();
+    this.bridgeRequestKinds.clear();
   }
   clearResponseTrackingState() {
     this.clearTransientResponseTrackingState();
@@ -3947,6 +4010,14 @@ codex.on("turnPhaseChanged", ({ phase, previous }) => {
   tryWriteStatusFile(`turnPhase:${phase}`);
   broadcastStatus();
 });
+codex.on("steerFailed", (reason) => {
+  log(`Steer rejected by app-server: ${reason}`);
+  const advice = codex.turnInProgress ? "wait for it to finish (\u2705), then send normally" : "the turn has ended \u2014 resend as a normal reply";
+  emitToClaude(systemMessage("system_steer_failed", `\u26A0\uFE0F Your steer message did NOT reach Codex (${reason}). The original turn continues unaffected \u2014 ${advice}.`));
+});
+codex.on("steerAccepted", () => {
+  log("Steer accepted by app-server");
+});
 codex.on("turnStarted", () => {
   log("Codex turn started");
   emitToClaude(systemMessage("system_turn_started", "\u23F3 Codex is working on the current task. Wait for completion before sending a reply."));
@@ -4184,9 +4255,37 @@ function handleControlMessage(ws, raw) {
       }
       log(`Forwarding Claude \u2192 Codex (${message.message.content.length} chars, requireReply=${requireReply})`);
       const tierOverrides = BUDGET_CONFIG.codexTierControl ? budgetCoordinator?.getCodexTurnOverrides() ?? undefined : undefined;
+      if (codex.turnInProgress && message.onBusy === "steer") {
+        if (requireReply) {
+          sendProtocolMessage(ws, {
+            type: "claude_to_codex_result",
+            requestId: message.requestId,
+            success: false,
+            error: 'require_reply is not supported together with on_busy="steer" yet. Send the steer without require_reply, or wait for the turn to finish.'
+          });
+          return;
+        }
+        const steerContent = `[STEER from Claude]
+` + `Mid-turn update for the current Codex turn. Integrate if relevant; do not restart work unless explicitly requested.
+
+` + message.message.content;
+        const steered = codex.steerMessage(steerContent);
+        log(`Steer ${steered ? "transport-accepted" : "failed"} (${message.message.content.length} chars)`);
+        if (steered) {
+          clearAttentionWindow();
+        }
+        const steerFailureAdvice = codex.turnInProgress ? "Steer failed: the running turn cannot be steered right now \u2014 wait for it to finish (\u2705), then send normally." : "Steer failed: the turn may have just ended or the connection dropped \u2014 retry as a normal reply.";
+        sendProtocolMessage(ws, {
+          type: "claude_to_codex_result",
+          requestId: message.requestId,
+          success: steered,
+          error: steered ? undefined : steerFailureAdvice
+        });
+        return;
+      }
       const injected = codex.injectMessage(contentToSend, tierOverrides);
       if (!injected) {
-        const reason = codex.turnInProgress ? "Codex is busy executing a turn. Wait for it to finish before sending another message." : "Injection failed: no active thread or WebSocket not connected.";
+        const reason = codex.turnInProgress ? 'Codex is busy executing a turn. Options: wait for it to finish, or retry with on_busy="steer" to feed this message into the running turn without interrupting it.' : "Injection failed: no active thread or WebSocket not connected.";
         log(`Injection rejected: ${reason}`);
         sendProtocolMessage(ws, {
           type: "claude_to_codex_result",