From d53f9bd81361f69b93b1f19faa5e2b133f4ca82c Mon Sep 17 00:00:00 2001
From: diegosouzapw <diegosouzapw@users.noreply.github.com>
Date: Sun, 2 Aug 2026 10:05:03 -0300
Subject: [PATCH] fix(responses): avoid usage normalization short-circuit

---
 open-sse/utils/stream.ts                      |  7 +-
 ...ponses-commentary-passthrough-6199.test.ts | 64 +++++++++++++++++++
 2 files changed, 69 insertions(+), 2 deletions(-)

diff --git a/open-sse/utils/stream.ts b/open-sse/utils/stream.ts
index 4b4243b8f2..3958745e02 100644
--- a/open-sse/utils/stream.ts
+++ b/open-sse/utils/stream.ts
@@ -1582,12 +1582,13 @@ export function createSSEStream(options: StreamOptions = {}) {
                     parsed,
                     passthroughResponsesOutputItems
                   );
+                  const usageNormalized = normalizeUsage(parsed);
                   if (
                     stripped ||
                     backfilled ||
                     textualToolCallBackfilled ||
                     responsesIdsNormalized ||
-                    normalizeUsage(parsed)
+                    usageNormalized
                   ) {
                     output = `data: ${JSON.stringify(parsed)}\n\n`;
                     injectedUsage = true;
@@ -2282,7 +2283,9 @@ export function createSSEStream(options: StreamOptions = {}) {
                   const isResponses = flushedType.startsWith("response.");
                   const isClaude = isClaudeEventPayload(flushedParsed);
                   if (isResponses) {
-                    if (normalizeResponsesSseIds(flushedParsed) || normalizeUsage(flushedParsed)) {
+                    const idsNormalized = normalizeResponsesSseIds(flushedParsed);
+                    const usageNormalized = normalizeUsage(flushedParsed);
+                    if (idsNormalized || usageNormalized) {
                       output = `data: ${JSON.stringify(flushedParsed)}\n\n`;
                     }
                   } else if (!isClaude) {
diff --git a/tests/unit/responses-commentary-passthrough-6199.test.ts b/tests/unit/responses-commentary-passthrough-6199.test.ts
index cb7f34ec7f..4ff4094279 100644
--- a/tests/unit/responses-commentary-passthrough-6199.test.ts
+++ b/tests/unit/responses-commentary-passthrough-6199.test.ts
@@ -228,6 +228,42 @@ test("response.completed always includes total_tokens for strict Codex clients",
   });
 });
 
+test("response.completed normalizes usage when lifecycle echoes are stripped", async () => {
+  const output = await readTransformed(
+    [
+      sse({
+        type: "response.completed",
+        response: {
+          id: "resp_agentrouter_live_shape",
+          status: "completed",
+          instructions: "echoed upstream instructions",
+          tools: [{ type: "function", name: "echoed_tool" }],
+          output: [],
+          usage: {
+            prompt_tokens: 91,
+            completion_tokens: 0,
+            input_tokens: 91,
+            output_tokens: 0,
+            cache_read_input_tokens: 0,
+            cache_creation_input_tokens: 0,
+          },
+        },
+      }),
+    ],
+    PASSTHROUGH_RESPONSES_OPTIONS
+  );
+
+  const completedLine = output
+    .split(/\r?\n/)
+    .find((line) => line.startsWith("data:") && line.includes('"response.completed"'));
+  assert.ok(completedLine, "the terminal Responses event must be forwarded");
+
+  const completed = JSON.parse(completedLine.slice(5).trim());
+  assert.equal("instructions" in completed.response, false);
+  assert.equal("tools" in completed.response, false);
+  assert.equal(completed.response.usage.total_tokens, 91);
+});
+
 test("response.completed synthesizes zero usage when upstream omits usage", async () => {
   const completed = {
     type: "response.completed",
@@ -249,6 +285,34 @@ test("response.completed synthesizes zero usage when upstream omits usage", asyn
   });
 });
 
+test("buffered response.completed normalizes IDs and usage independently", async () => {
+  const completed = {
+    type: "response.completed",
+    response: {
+      id: 12345,
+      status: "completed",
+      output: [],
+      usage: { input_tokens: 12, output_tokens: 3 },
+    },
+  };
+  const output = await readTransformed(
+    [`data: ${JSON.stringify(completed)}`],
+    PASSTHROUGH_RESPONSES_OPTIONS
+  );
+  const completedLine = output
+    .split(/\r?\n/)
+    .find((line) => line.startsWith("data:") && line.includes('"response.completed"'));
+  assert.ok(completedLine, "the buffered terminal Responses event must be forwarded");
+
+  const forwarded = JSON.parse(completedLine.slice(5).trim());
+  assert.equal(forwarded.response.id, "12345");
+  assert.deepEqual(forwarded.response.usage, {
+    input_tokens: 12,
+    output_tokens: 3,
+    total_tokens: 15,
+  });
+});
+
 test("Claude to Responses translation includes canonical Codex usage", async () => {
   const output = await readTransformed(
     [