fix(codex): honor normalized source routes

omarshahine · omarshahine · commit f6a06ae5e422 · 2026-06-28T11:45:32.000-07:00
diff --git a/extensions/codex/src/app-server/dynamic-tools.test.ts b/extensions/codex/src/app-server/dynamic-tools.test.ts
@@ -1209,6 +1209,57 @@ describe("createCodexDynamicToolBridge", () => {
     expect(Object.keys(result)).not.toContain("terminate");
   });
 
+  it("keeps normalized explicit source routes terminal", async () => {
+    setActivePluginRegistry(
+      createTestRegistry([
+        {
+          pluginId: "sms",
+          plugin: {
+            id: "sms",
+            messaging: {
+              normalizeTarget: (raw: string) => {
+                const digits = raw.replace(/\D/gu, "");
+                return digits.length === 11 && digits.startsWith("1") ? `+${digits}` : raw.trim();
+              },
+            },
+          },
+          source: "test",
+        },
+      ]),
+    );
+    const bridge = createBridgeWithToolResult(
+      "message",
+      textToolResult("Sent.", { ok: true, messageId: "sms-853" }),
+      {
+        sourceReplyDeliveryMode: "message_tool_only",
+        currentChannelProvider: "sms",
+        currentChannelId: "sms:+12069106512",
+        currentMessagingTarget: "+12069106512",
+      },
+    );
+
+    const result = await handleMessageToolCall(bridge, {
+      action: "reply",
+      channel: "sms",
+      target: "+1 (206) 910-6512",
+      messageId: "853",
+      message: "visible reply",
+    });
+
+    expect(result).toEqual(expectInputText("Sent."));
+    expect(bridge.telemetry.messagingToolSentTargets).toEqual([
+      expect.objectContaining({
+        tool: "message",
+        provider: "sms",
+        to: "+12069106512",
+        text: "visible reply",
+      }),
+    ]);
+    expect(result.terminate).toBe(true);
+    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 () => {
     const bridge = createBridgeWithToolResult(
       "message",
diff --git a/extensions/codex/src/app-server/dynamic-tools.ts b/extensions/codex/src/app-server/dynamic-tools.ts
@@ -311,6 +311,9 @@ function hasExplicitNonSourceMessageRoute(
   ) {
     return true;
   }
+  if (messagingTarget?.to !== undefined) {
+    return false;
+  }
   if (targetValues.length === 0) {
     return false;
   }

Original file line number	Diff line number	Diff line change
`@@ -311,6 +311,9 @@ function hasExplicitNonSourceMessageRoute(`
`311`	`311`	`) {`
`312`	`312`	`return true;`
`313`	`313`	`}`
	`314`	`+ if (messagingTarget?.to !== undefined) {`
	`315`	`+ return false;`
	`316`	`+ }`
`314`	`317`	`if (targetValues.length === 0) {`
`315`	`318`	`return false;`
`316`	`319`	`}`