@tonyclaw/agent-inspector 2.1.12 → 2.1.14

package/src/proxy/formats/openai/handler.ts

@@ -1,8 +1,22 @@
 import type { FormatHandler, ParsedRequest } from "../handler";
 import type { CapturedLog, TokenUsage } from "../../schemas";
-import { OpenAIRequestSchema, OpenAIResponseSchema, parseOpenAIResponse } from "./schemas";
+import {
+  OpenAIRequestSchema,
+  OpenAIResponsesRequestSchema,
+  parseOpenAIResponsesResponse,
+  parseOpenAIResponse,
+} from "./schemas";
 import { extractOpenAIStream } from "./stream";
 
+function emptyTokens(): TokenUsage {
+  return {
+    inputTokens: null,
+    outputTokens: null,
+    cacheCreationInputTokens: null,
+    cacheReadInputTokens: null,
+  };
+}
+
 export const OpenAIFormatHandler: FormatHandler = {
   format: "openai",
 
@@ -16,6 +30,13 @@ export const OpenAIFormatHandler: FormatHandler = {
           sessionId: headers?.get("x-session-affinity") ?? null,
         };
       }
+      const responsesResult = OpenAIResponsesRequestSchema.safeParse(json);
+      if (responsesResult.success) {
+        return {
+          model: responsesResult.data.model,
+          sessionId: headers?.get("x-session-affinity") ?? null,
+        };
+      }
       return null;
     } catch {
       return null;
@@ -62,12 +83,17 @@ export const OpenAIFormatHandler: FormatHandler = {
         cacheReadInputTokens,
       };
     }
-    return {
-      inputTokens: null,
-      outputTokens: null,
-      cacheCreationInputTokens: null,
-      cacheReadInputTokens: null,
-    };
+    const responsesParsed = parseOpenAIResponsesResponse(responseBody);
+    if (responsesParsed !== null) {
+      const usage = responsesParsed.usage;
+      return {
+        inputTokens: usage?.input_tokens ?? null,
+        outputTokens: usage?.output_tokens ?? null,
+        cacheCreationInputTokens: null,
+        cacheReadInputTokens: usage?.input_tokens_details?.cached_tokens ?? null,
+      };
+    }
+    return emptyTokens();
   },
 
   extractStream(
@@ -85,8 +111,13 @@ export const OpenAIFormatHandler: FormatHandler = {
       const json: unknown = JSON.parse(rawBody);
       if (typeof json === "object" && json !== null && !Array.isArray(json)) {
         const keys = Object.keys(json);
-        // OpenAI has `model` and `messages` at the top level, but NOT `system`
-        return keys.includes("model") && keys.includes("messages") && !keys.includes("system");
+        // OpenAI has `model` and either Chat `messages` or Responses `input`,
+        // but not Anthropic's top-level `system`.
+        return (
+          keys.includes("model") &&
+          (keys.includes("messages") || keys.includes("input")) &&
+          !keys.includes("system")
+        );
       }
       return false;
     } catch {

package/src/proxy/formats/openai/index.ts

@@ -9,8 +9,15 @@ export {
   OpenAIMessage,
   OpenAIMessageContent,
   OpenAIToolDefinition,
+  OpenAIResponsesRequestSchema,
+  OpenAIResponsesResponseSchema,
+  OpenAIResponsesSSEventSchema,
+  OpenAIResponsesToolDefinition,
+  OpenAIResponsesUsageSchema,
+  OpenAIResponsesOutputItemSchema,
   OpenAIChoice,
   OpenAIChoiceDelta,
+  parseOpenAIResponsesResponse,
   parseOpenAIResponse,
 } from "./schemas";
 

package/src/proxy/formats/openai/schemas.ts

@@ -5,10 +5,24 @@ export {
   OpenAIMessage,
   OpenAIMessageContent,
   OpenAIRequestSchema,
+  OpenAIResponsesRequestSchema,
+  OpenAIResponsesResponseSchema,
+  OpenAIResponsesSSEventSchema,
+  OpenAIResponsesToolDefinition,
+  OpenAIResponsesUsageSchema,
+  OpenAIResponsesOutputItemSchema,
   OpenAIResponseSchema,
   OpenAISSERawChunkSchema,
   OpenAIToolCallSchema,
   OpenAIToolDefinition,
+  parseOpenAIResponsesResponse,
   parseOpenAIResponse,
 } from "../../../contracts/openai";
-export type { OpenAIResponse, OpenAIToolCall } from "../../../contracts/openai";
+export type {
+  OpenAIResponse,
+  OpenAIResponsesRequest,
+  OpenAIResponsesResponse,
+  OpenAIResponsesSSEvent,
+  OpenAIResponsesOutputItem,
+  OpenAIToolCall,
+} from "../../../contracts/openai";