@raysonmeng/agentbridge 0.1.8 → 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.8",
+      "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.8",
+    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",
@@ -1165,8 +1165,8 @@ function formatBuildInfo(build) {
 var BUILD_INFO;
 var init_build_info = __esm(() => {
   BUILD_INFO = Object.freeze({
-    version: defineString("0.1.8", "0.0.0-source"),
-    commit: defineString("c80a7fd", "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.8", "0.0.0-source"),
-  commit: defineString("c80a7fd", "source"),
+  version: defineString("0.1.9", "0.0.0-source"),
+  commit: defineString("10dfd58", "source"),
   bundle: defineBundle("dist"),
   contractVersion: defineNumber(1, CONTRACT_VERSION)
 });
@@ -811,10 +811,19 @@ class CodexAdapter extends EventEmitter {
       this.log("Cannot steer: no turn in progress (use injectMessage)");
       return false;
     }
-    this.log(`Steering message into active Codex turn (${text.length} chars)`);
+    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, input: [{ type: "text", text }] };
+    const params = {
+      threadId: this.threadId,
+      expectedTurnId,
+      input: [{ type: "text", text }]
+    };
     try {
       this.appServerWs.send(JSON.stringify({
         method: "turn/steer",
@@ -1758,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));
@@ -1776,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);
@@ -3994,7 +4012,8 @@ codex.on("turnPhaseChanged", ({ phase, previous }) => {
 });
 codex.on("steerFailed", (reason) => {
   log(`Steer rejected by app-server: ${reason}`);
-  emitToClaude(systemMessage("system_steer_failed", `\u26A0\uFE0F Your steer message did NOT reach Codex (${reason}). The original turn continues unaffected \u2014 wait for it to finish, or resend as a normal reply.`));
+  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");
@@ -4255,11 +4274,12 @@ function handleControlMessage(ws, raw) {
         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 : "Steer failed: the turn may have just ended or the connection dropped \u2014 retry as a normal reply."
+          error: steered ? undefined : steerFailureAdvice
         });
         return;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raysonmeng/agentbridge",
-  "version": "0.1.8",
+  "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.8",
+  "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

@@ -14227,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.8", "0.0.0-source"),
-  commit: defineString("c80a7fd", "source"),
+  version: defineString("0.1.9", "0.0.0-source"),
+  commit: defineString("10dfd58", "source"),
   bundle: defineBundle("plugin"),
   contractVersion: defineNumber(1, CONTRACT_VERSION)
 });

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.8", "0.0.0-source"),
-  commit: defineString("c80a7fd", "source"),
+  version: defineString("0.1.9", "0.0.0-source"),
+  commit: defineString("10dfd58", "source"),
   bundle: defineBundle("plugin"),
   contractVersion: defineNumber(1, CONTRACT_VERSION)
 });
@@ -811,10 +811,19 @@ class CodexAdapter extends EventEmitter {
       this.log("Cannot steer: no turn in progress (use injectMessage)");
       return false;
     }
-    this.log(`Steering message into active Codex turn (${text.length} chars)`);
+    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, input: [{ type: "text", text }] };
+    const params = {
+      threadId: this.threadId,
+      expectedTurnId,
+      input: [{ type: "text", text }]
+    };
     try {
       this.appServerWs.send(JSON.stringify({
         method: "turn/steer",
@@ -1758,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));
@@ -1776,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);
@@ -3994,7 +4012,8 @@ codex.on("turnPhaseChanged", ({ phase, previous }) => {
 });
 codex.on("steerFailed", (reason) => {
   log(`Steer rejected by app-server: ${reason}`);
-  emitToClaude(systemMessage("system_steer_failed", `\u26A0\uFE0F Your steer message did NOT reach Codex (${reason}). The original turn continues unaffected \u2014 wait for it to finish, or resend as a normal reply.`));
+  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");
@@ -4255,11 +4274,12 @@ function handleControlMessage(ws, raw) {
         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 : "Steer failed: the turn may have just ended or the connection dropped \u2014 retry as a normal reply."
+          error: steered ? undefined : steerFailureAdvice
         });
         return;
       }