[AI] fix(codex): continue after source-reply delivery instead of terminating turn

wangyan2026 · wangyan2026 · commit b80d0bc48271 · 2026-07-14T22:46:59.000+08:00
Delivered and receipt-confirmed source replies in message_tool_only mode no longer set terminate=true on the dynamic tool response, matching the generic embedded-runner behavior established by PR #92343. - Remove deliveredSourceReply/receiptConfirmedSourceReply from withDynamicToolTermination conditions - Only final=true + is actual source reply explicitly terminates; final omitted no longer degrades to terminate-on-delivery - toolConfirmedSourceReply (tool-returned terminate:true) still terminates unless overridden by final=false - sourceReplyFinal telemetry: still true when final omitted (preserves completed marker for stranded-reply recovery); false for final=false; true for final=true or toolConfirmed Related to #106961
diff --git a/extensions/codex/src/app-server/dynamic-tools.test.ts b/extensions/codex/src/app-server/dynamic-tools.test.ts
@@ -1317,7 +1317,7 @@ describe("createCodexDynamicToolBridge", () => {
     ]);
   });
 
-  it("marks delivered message-tool-only source replies as terminal when final is omitted", async () => {
+  it("does not mark delivered message-tool-only source replies as terminal when final is omitted", async () => {
     const bridge = createBridgeWithToolResult(
       "message",
       textToolResult("Sent.", { messageId: "imessage-6264" }),
@@ -1330,15 +1330,15 @@ describe("createCodexDynamicToolBridge", () => {
     });
 
     expect(result).toEqual(expectInputText("Sent."));
-    expect(result.terminate).toBe(true);
+    expect(result.terminate).toBeUndefined();
     expect(bridge.telemetry.didDeliverSourceReplyViaMessageTool).toBe(true);
     expect(bridge.telemetry.messagingToolSentTargets.at(-1)).toMatchObject({
       sourceReplyFinal: true,
     });
     expect(Object.keys(result)).not.toContain("terminate");
   });
 
-  it("requires explicit final=false to keep a delivered message-tool-only source reply non-terminal", async () => {
+  it("requires explicit final=true to make a delivered message-tool-only source reply terminal", async () => {
     const bridge = createBridgeWithToolResult(
       "message",
       textToolResult("Sent.", { messageId: "imessage-6264" }),
@@ -1373,7 +1373,7 @@ describe("createCodexDynamicToolBridge", () => {
     expect(Object.keys(result)).not.toContain("terminate");
   });
 
-  it("keeps message-tool-only source replies terminal when middleware redacts receipt details", async () => {
+  it("does not mark delivered message-tool-only source replies as terminal when middleware redacts receipt details", async () => {
     const registry = createEmptyPluginRegistry();
     registry.agentToolResultMiddlewares.push({
       pluginId: "receipt-redactor",
@@ -1406,7 +1406,8 @@ describe("createCodexDynamicToolBridge", () => {
     });
 
     expect(result).toEqual(expectInputText("Sent."));
-    expect(result.terminate).toBe(true);
+    expect(result.terminate).toBeUndefined();
+    expect(bridge.telemetry.didDeliverSourceReplyViaMessageTool).toBe(true);
     expect(Object.keys(result)).not.toContain("terminate");
   });
 
@@ -1435,7 +1436,7 @@ describe("createCodexDynamicToolBridge", () => {
     expect(bridge.telemetry.didDeliverSourceReplyViaMessageTool).toBe(false);
   });
 
-  it("keeps message-tool-only source replies terminal for explicit current source routes", async () => {
+  it("does not mark delivered explicit current source routes as terminal without final=true", async () => {
     const bridge = createBridgeWithToolResult(
       "message",
       textToolResult("Sent.", { ok: true, messageId: "imessage-853" }),
@@ -1457,15 +1458,15 @@ describe("createCodexDynamicToolBridge", () => {
     });
 
     expect(result).toEqual(expectInputText("Sent."));
-    expect(result.terminate).toBe(true);
+    expect(result.terminate).toBeUndefined();
     expect(bridge.telemetry.didDeliverSourceReplyViaMessageTool).toBe(true);
     expect(bridge.telemetry.messagingToolSentTargets.at(-1)).toMatchObject({
       sourceReplyFinal: true,
     });
     expect(Object.keys(result)).not.toContain("terminate");
   });
 
-  it("keeps normalized explicit source routes terminal", async () => {
+  it("does not mark normalized explicit source routes as terminal without final=true", async () => {
     setActivePluginRegistry(
       createTestRegistry([
         {
@@ -1511,12 +1512,12 @@ describe("createCodexDynamicToolBridge", () => {
         text: "visible reply",
       }),
     ]);
-    expect(result.terminate).toBe(true);
+    expect(result.terminate).toBeUndefined();
     expect(bridge.telemetry.didDeliverSourceReplyViaMessageTool).toBe(true);
     expect(Object.keys(result)).not.toContain("terminate");
   });
 
-  it("keeps message-tool-only source replies terminal when the reply receipt matches the current message id", async () => {
+  it("does not mark delivered message-tool-only source replies as terminal when the reply receipt matches the current message id", async () => {
     const bridge = createBridgeWithToolResult(
       "message",
       textToolResult("Sent.", {
@@ -1550,12 +1551,12 @@ describe("createCodexDynamicToolBridge", () => {
         text: "visible reply",
       }),
     ]);
-    expect(result.terminate).toBe(true);
+    expect(result.terminate).toBeUndefined();
     expect(bridge.telemetry.didDeliverSourceReplyViaMessageTool).toBe(true);
     expect(Object.keys(result)).not.toContain("terminate");
   });
 
-  it("keeps message-tool-only source replies terminal when a text receipt matches the current message id", async () => {
+  it("does not mark delivered message-tool-only source replies as terminal when a text receipt matches the current message id", async () => {
     const receiptText = JSON.stringify({
       ok: true,
       messageId: "provider-message-1",
@@ -1578,7 +1579,7 @@ describe("createCodexDynamicToolBridge", () => {
     });
 
     expect(result).toEqual(expectInputText(receiptText));
-    expect(result.terminate).toBe(true);
+    expect(result.terminate).toBeUndefined();
     expect(bridge.telemetry.didDeliverSourceReplyViaMessageTool).toBe(true);
     expect(Object.keys(result)).not.toContain("terminate");
   });
@@ -1641,7 +1642,7 @@ describe("createCodexDynamicToolBridge", () => {
     expect(bridge.telemetry.didDeliverSourceReplyViaMessageTool).toBe(false);
   });
 
-  it("keeps message-tool-only source replies terminal for explicit native target segments", async () => {
+  it("does not mark delivered explicit native target segments as terminal without final=true", async () => {
     const bridge = createBridgeWithToolResult("message", textToolResult("Sent.", { ok: true }), {
       sourceReplyDeliveryMode: "message_tool_only",
       currentChannelProvider: "imessage",
@@ -1658,12 +1659,12 @@ describe("createCodexDynamicToolBridge", () => {
     });
 
     expect(result).toEqual(expectInputText("Sent."));
-    expect(result.terminate).toBe(true);
+    expect(result.terminate).toBeUndefined();
     expect(bridge.telemetry.didDeliverSourceReplyViaMessageTool).toBe(true);
     expect(Object.keys(result)).not.toContain("terminate");
   });
 
-  it("keeps message-tool-only source replies terminal when the provider is only in the current channel id", async () => {
+  it("does not mark delivered source replies as terminal when the provider is only in the current channel id", async () => {
     const bridge = createBridgeWithToolResult("message", textToolResult("Sent.", { ok: true }), {
       sourceReplyDeliveryMode: "message_tool_only",
       currentChannelId: "imessage:any;-;+12069106512",
@@ -1679,7 +1680,7 @@ describe("createCodexDynamicToolBridge", () => {
     });
 
     expect(result).toEqual(expectInputText("Sent."));
-    expect(result.terminate).toBe(true);
+    expect(result.terminate).toBeUndefined();
     expect(bridge.telemetry.didDeliverSourceReplyViaMessageTool).toBe(true);
     expect(Object.keys(result)).not.toContain("terminate");
   });
@@ -1779,12 +1780,45 @@ describe("createCodexDynamicToolBridge", () => {
       arguments: { action: "inspect" },
     });
 
-    expect(firstResult.terminate).toBe(true);
-    expect(bridge.telemetry.didSendViaMessagingTool).toBe(true);
+    expect(firstResult.terminate).toBeUndefined();
+    expect(bridge.telemetry.didDeliverSourceReplyViaMessageTool).toBe(true);
     expect(secondResult).toEqual(expectInputText("No message sent."));
     expect(secondResult.terminate).toBeUndefined();
   });
 
+  it("continues after an intermediate message-tool-only source reply without final", async () => {
+    const execute = vi
+      .fn()
+      .mockResolvedValueOnce(
+        textToolResult("One moment.", { messageId: "source-reply-intermediate" }),
+      )
+      .mockResolvedValueOnce(textToolResult("Command output.", { exitCode: 0 }));
+    const bridge = createCodexDynamicToolBridge({
+      tools: [createTool({ name: "message", execute }), createTool({ name: "exec", execute })],
+      signal: new AbortController().signal,
+      hookContext: { sourceReplyDeliveryMode: "message_tool_only" },
+    });
+
+    const firstResult = await handleMessageToolCall(bridge, {
+      action: "send",
+      message: "One moment.",
+    });
+    expect(firstResult).toEqual(expectInputText("One moment."));
+    expect(firstResult.terminate).toBeUndefined();
+    expect(bridge.telemetry.didDeliverSourceReplyViaMessageTool).toBe(true);
+
+    const secondResult = await bridge.handleToolCall({
+      threadId: "thread-1",
+      turnId: "turn-1",
+      callId: "call-2",
+      namespace: null,
+      tool: "exec",
+      arguments: { command: "ls" },
+    });
+    expect(secondResult.success).toBe(true);
+    expect(secondResult.terminate).toBeUndefined();
+  });
+
   it("does not mark explicit message-tool sends as terminal source replies", async () => {
     const bridge = createBridgeWithToolResult(
       "message",
diff --git a/extensions/codex/src/app-server/dynamic-tools.ts b/extensions/codex/src/app-server/dynamic-tools.ts
@@ -686,17 +686,13 @@ export function createCodexDynamicToolBridge(params: {
           toolName === "message" &&
           !resultIsError &&
           (rawResult.terminate === true || result.terminate === true);
-        const hasExplicitFinalControl = typeof executedArgs.final === "boolean";
-        // Omitted final on a confirmed source reply must degrade to legacy
-        // terminate-on-delivery (completed marker), never progress; otherwise
-        // stranded-reply recovery re-delivers a duplicate of that reply.
         const sourceReplyFinal =
           params.hookContext?.sourceReplyDeliveryMode === "message_tool_only" &&
           toolName === "message" &&
           (toolConfirmedSourceReply || deliveredSourceReply || receiptConfirmedSourceReply)
-            ? hasExplicitFinalControl
-              ? executedArgs.final === true
-              : true
+            ? typeof executedArgs.final !== "boolean"
+              ? true
+              : executedArgs.final
             : undefined;
         collectToolTelemetry({
           toolName,
@@ -721,7 +717,10 @@ export function createCodexDynamicToolBridge(params: {
             )) ||
             isToolResultYield(rawResult) ||
             isToolResultYield(result) ||
-            ((deliveredSourceReply || receiptConfirmedSourceReply) && executedArgs.final !== false),
+            (params.hookContext?.sourceReplyDeliveryMode === "message_tool_only" &&
+              toolName === "message" &&
+              executedArgs.final === true &&
+              (deliveredSourceReply || receiptConfirmedSourceReply)),
         );
         const asyncStarted =
           isAsyncStartedToolResult(rawResult) || isAsyncStartedToolResult(result);
