@jeffusion/bungee-core 5.11.0 → 5.12.0

package/dist/plugins/chatgpt-oauth/index.js

@@ -15788,6 +15788,14 @@ async function* parseCodexSSE(source, options = {}) {
     yield* consumeLine(remainingLine);
   yield* dispatch();
 }
+function chatToolCall(state, value, includeIdentity, preserveCustomTools) {
+  const custom = preserveCustomTools && state.kind === "custom_tool_call";
+  return {
+    index: state.index,
+    ...includeIdentity ? { id: state.id, type: custom ? "custom" : "function" } : {},
+    [custom ? "custom" : "function"]: { ...includeIdentity ? { name: state.name } : {}, [custom ? "input" : "arguments"]: value }
+  };
+}
 function streamIncludesUsage(request) {
   return request?.stream_options?.include_usage === true;
 }
@@ -15872,6 +15880,7 @@ class CodexResponseProcessor {
   output = [];
   includeUsage;
   target;
+  preserveCustomTools;
   text = "";
   reasoning = "";
   messageText = new Map;
@@ -15891,6 +15900,7 @@ class CodexResponseProcessor {
   constructor(options = {}) {
     this.includeUsage = options.includeUsage ?? (options.request ? streamIncludesUsage(options.request) : false);
     this.target = options.target ?? "chat";
+    this.preserveCustomTools = options.preserveCustomTools ?? false;
     this.redactDiagnostic = options.redactDiagnostic;
   }
   validateOutputItem(item) {
@@ -16061,7 +16071,7 @@ class CodexResponseProcessor {
         this.tools.set(`output:${String(data.output_index)}`, state);
       const chunk = base();
       chunk.choices[0].delta.role = "assistant";
-      chunk.choices[0].delta.tool_calls = [{ index: state.index, id: state.id, type: "function", function: { name: state.name, arguments: "" } }];
+      chunk.choices[0].delta.tool_calls = [chatToolCall(state, "", true, this.preserveCustomTools)];
       output.push(chunk);
     } else if (type === "response.function_call_arguments.delta" || type === "response.custom_tool_call_input.delta") {
       const state = this.findTool(data);
@@ -16070,7 +16080,7 @@ class CodexResponseProcessor {
         state.arguments += delta;
         state.emittedArguments = true;
         const chunk = base();
-        chunk.choices[0].delta.tool_calls = [{ index: state.index, function: { arguments: delta } }];
+        chunk.choices[0].delta.tool_calls = [chatToolCall(state, delta, false, this.preserveCustomTools)];
         output.push(chunk);
       }
     } else if (type === "response.function_call_arguments.done" || type === "response.custom_tool_call_input.done") {
@@ -16081,7 +16091,7 @@ class CodexResponseProcessor {
       if (state && !state.emittedArguments && state.arguments) {
         state.emittedArguments = true;
         const chunk = base();
-        chunk.choices[0].delta.tool_calls = [{ index: state.index, function: { arguments: state.arguments } }];
+        chunk.choices[0].delta.tool_calls = [chatToolCall(state, state.arguments, false, this.preserveCustomTools)];
         output.push(chunk);
       }
     } else if (type === "response.output_item.done") {
@@ -16095,7 +16105,7 @@ class CodexResponseProcessor {
           if (!state.emittedArguments && state.arguments) {
             state.emittedArguments = true;
             const chunk = base();
-            chunk.choices[0].delta.tool_calls = [{ index: state.index, function: { arguments: state.arguments } }];
+            chunk.choices[0].delta.tool_calls = [chatToolCall(state, state.arguments, false, this.preserveCustomTools)];
             output.push(chunk);
           }
         } else {
@@ -16105,7 +16115,7 @@ class CodexResponseProcessor {
           if (data.output_index !== undefined)
             this.tools.set(`output:${String(data.output_index)}`, state2);
           const chunk = base();
-          chunk.choices[0].delta.tool_calls = [{ index: state2.index, id: state2.id, type: "function", function: { name: state2.name, arguments: state2.arguments } }];
+          chunk.choices[0].delta.tool_calls = [chatToolCall(state2, state2.arguments, true, this.preserveCustomTools)];
           output.push(chunk);
         }
         this.upsertOutput(item, data.output_index === undefined ? undefined : Number(data.output_index), this.target === "responses", data.content_index === undefined ? undefined : Number(data.content_index), typeof data.item_id === "string" ? data.item_id : undefined);
@@ -16230,7 +16240,7 @@ async function consumeCodexResponse(source, options = {}) {
     processor.process(event);
   return processor.finish();
 }
-function responsesToChatCompletion(response) {
+function responsesToChatCompletion(response, preserveCustomTools = false) {
   let content = "";
   let reasoning = "";
   const tool_calls = [];
@@ -16243,7 +16253,9 @@ function responsesToChatCompletion(response) {
       content += textFromItem(item);
     if (item.type === "reasoning")
       reasoning += (item.summary ?? []).filter((part) => part.type === "summary_text").map((part) => String(part.text ?? "")).join("") + (item.content ?? []).filter((part) => part.type === "reasoning_text").map((part) => String(part.text ?? "")).join("");
-    if (item.type === "function_call" || item.type === "custom_tool_call")
+    if (item.type === "custom_tool_call" && preserveCustomTools)
+      tool_calls.push({ id: item.call_id, type: "custom", custom: { name: item.name, input: String(item.input ?? "") } });
+    else if (item.type === "function_call" || item.type === "custom_tool_call")
       tool_calls.push({ id: item.call_id, type: "function", function: { name: item.name, arguments: String(item.arguments ?? item.input ?? "") } });
     if (item.type === "image_generation_call" && item.result)
       images.push({ type: "image_url", image_url: { url: `data:${imageMime(item.output_format)};base64,${item.result}` } });
@@ -16346,13 +16358,140 @@ var MAX_DISCARD_BYTES = 64 * 1024;
 var MAX_MODELS_BODY_BYTES = 256 * 1024;
 var MAX_PROFILE_HEADER_VALUE_BYTES = 8192;
 var CHATGPT_ORIGIN = "https://chatgpt.com";
+var SIWC_ORIGIN = "https://api.openai.com";
 var CODEX_ROUTING_HINT_HEADER = "X-Codex-Routing-Hint";
+var SIWC_FORBIDDEN_FIELDS = [
+  "background",
+  "conversation",
+  "max_output_tokens",
+  "max_completion_tokens",
+  "max_tool_calls",
+  "metadata",
+  "moderation",
+  "multi_agent",
+  "prompt",
+  "prompt_cache_retention",
+  "safety_identifier",
+  "temperature",
+  "top_logprobs",
+  "top_p",
+  "truncation",
+  "user",
+  "previous_response_id",
+  "client_metadata",
+  "context_management",
+  "prompt_cache_options"
+];
 function record(value) {
   if (typeof value !== "object" || value === null || Array.isArray(value)) {
     throw new CodexProtocolError("invalid_response", "Request must be a JSON object");
   }
   return value;
 }
+function siwcTool(tool) {
+  const value = record(tool);
+  if (value.type !== "function" && value.type !== "custom") {
+    throw new CodexProtocolError("invalid_response", "SIWC supports only function and custom tools");
+  }
+  const nested = value.type === "function" ? value.function : value.custom;
+  const definition = nested === undefined ? value : record(nested);
+  if (typeof definition.name !== "string" || !/^[A-Za-z0-9_-]{1,64}$/.test(definition.name)) {
+    throw new CodexProtocolError("invalid_response", "SIWC tool names must be 1-64 ASCII letters, digits, underscores or hyphens");
+  }
+  const normalized = { ...definition, type: value.type };
+  if (value.type === "custom" && normalized.format?.type === "grammar" && normalized.format.grammar !== undefined) {
+    const grammar = record(normalized.format.grammar);
+    if (!["lark", "regex"].includes(grammar.syntax) || typeof grammar.definition !== "string") {
+      throw new CodexProtocolError("invalid_response", "SIWC custom tool grammar is invalid");
+    }
+    normalized.format = { type: "grammar", syntax: grammar.syntax, definition: grammar.definition };
+  }
+  return normalized;
+}
+function normalizeSiwcRequest(input, target) {
+  if (input.previous_response_id !== undefined) {
+    throw new CodexProtocolError("invalid_response", "SIWC requires the full conversation in input; previous_response_id is unsupported");
+  }
+  if (input.tools !== undefined && !Array.isArray(input.tools)) {
+    throw new CodexProtocolError("invalid_response", "SIWC tools must be an array");
+  }
+  input.tools?.forEach(siwcTool);
+  if (target === "chat" && !Array.isArray(input.messages)) {
+    throw new CodexProtocolError("invalid_response", "Chat messages must be an array");
+  }
+  const out = target === "chat" ? convertChatCompletionsRequestToCodex(input) : JSON.parse(JSON.stringify(input));
+  out.store = false;
+  out.stream = true;
+  if (out.instructions === undefined || out.instructions === null)
+    out.instructions = "";
+  if (typeof out.instructions !== "string")
+    throw new CodexProtocolError("invalid_response", "SIWC instructions must be text");
+  if (typeof out.input === "string")
+    out.input = [{ type: "message", role: "user", content: [{ type: "input_text", text: out.input }] }];
+  if (out.input === undefined)
+    out.input = [];
+  if (!Array.isArray(out.input))
+    throw new CodexProtocolError("invalid_response", "SIWC input must contain the full conversation as an array");
+  const inputTypes = new Set(["message", "function_call", "function_call_output", "custom_tool_call", "custom_tool_call_output", "reasoning", "compaction"]);
+  for (const item of out.input) {
+    const value = record(item);
+    if (value.type === undefined && typeof value.role === "string")
+      value.type = "message";
+    if (!inputTypes.has(value.type))
+      throw new CodexProtocolError("invalid_response", "SIWC input contains an unsupported item");
+    if (value.type === "message") {
+      if (!["system", "developer", "user", "assistant"].includes(value.role))
+        throw new CodexProtocolError("invalid_response", "SIWC input contains an unsupported role");
+      if (value.role === "system")
+        value.role = "developer";
+    }
+  }
+  if (Array.isArray(out.tools))
+    out.tools = out.tools.map(siwcTool);
+  if (out.tool_choice !== undefined) {
+    if (typeof out.tool_choice === "string") {
+      if (!["auto", "none", "required"].includes(out.tool_choice))
+        throw new CodexProtocolError("invalid_response", "SIWC tool choice is unsupported");
+    } else
+      out.tool_choice = siwcTool(out.tool_choice);
+  }
+  for (const field of SIWC_FORBIDDEN_FIELDS)
+    delete out[field];
+  return out;
+}
+function setSiwcHeaders(context, target) {
+  for (const name of Object.keys(context.headers)) {
+    if (/^(chatgpt-account-id|session-id|thread-id|version|x-codex-.*|x-openai-internal-codex-.*)$/i.test(name))
+      delete context.headers[name];
+  }
+  setHeader(context.headers, "User-Agent", "Bungee/5.11.0");
+  setHeader(context.headers, "Originator", "Bungee");
+  setHeader(context.headers, "Accept", target === "models" ? "application/json" : "text/event-stream");
+  if (target !== "models")
+    setHeader(context.headers, "Content-Type", "application/json");
+}
+function parseSiwcModelsBody(body) {
+  let payload;
+  try {
+    payload = JSON.parse(body);
+  } catch {
+    throw new CodexModelsError("invalid_json");
+  }
+  if (typeof payload !== "object" || payload === null || Array.isArray(payload))
+    throw new CodexModelsError("invalid_structure");
+  const models = payload.models;
+  if (!Array.isArray(models) || models.length > 512)
+    throw new CodexModelsError("invalid_structure");
+  const text = (value) => typeof value === "string" && value.length > 0 && value.length <= 512 && value === value.trim() && !/[\r\n\0]/.test(value);
+  const listed = [];
+  for (const model of models) {
+    if (!model || typeof model !== "object" || Array.isArray(model) || !text(model.slug) || typeof model.visibility !== "string" || model.display_name !== undefined && !text(model.display_name))
+      throw new CodexModelsError("invalid_structure");
+    if (model.visibility === "list")
+      listed.push({ id: model.slug });
+  }
+  return listed;
+}
 function validHeaderValue(value) {
   return typeof value === "string" && new TextEncoder().encode(value).byteLength <= MAX_PROFILE_HEADER_VALUE_BYTES && value.trim().length > 0 && !/[\r\n\0]/.test(value);
 }
@@ -16577,7 +16716,7 @@ function serialize(event) {
 
 `;
 }
-function protocolStreamBody(source, target, includeUsage, signal, redact) {
+function protocolStreamBody(source, target, includeUsage, signal, redact, preserveCustomTools = false) {
   const protocolController = new AbortController;
   const onAbort = () => protocolController.abort(signal.reason ?? "cancelled");
   if (signal.aborted)
@@ -16595,7 +16734,7 @@ function protocolStreamBody(source, target, includeUsage, signal, redact) {
   const completion = new Promise((resolve) => {
     resolveCompletion = resolve;
   });
-  const processor = new CodexResponseProcessor({ target, includeUsage, redactDiagnostic: redact });
+  const processor = new CodexResponseProcessor({ target, includeUsage, redactDiagnostic: redact, preserveCustomTools });
   let terminalOutcome;
   const events = parseCodexSSE(source, { signal: protocolController.signal });
   const iterator = async function* () {
@@ -16667,6 +16806,26 @@ class ChatgptOauthAdapter {
   constructor() {}
   beforeRequest(context) {
     const target = context.url.pathname === MODELS_PATH ? "models" : context.url.pathname === CHAT_COMPLETIONS_PATH ? "chat" : context.url.pathname === RESPONSES_PATH ? "responses" : undefined;
+    if (context.url.origin === SIWC_ORIGIN) {
+      if (target === undefined)
+        return context;
+      const input = target === "models" ? undefined : record(context.body);
+      const stream = input?.stream === true;
+      const includeUsage = input ? streamIncludesUsage(input) : false;
+      context.body = input ? normalizeSiwcRequest(input, target) : undefined;
+      if (target !== "models")
+        context.url.pathname = RESPONSES_PATH;
+      setSiwcHeaders(context, target);
+      this.requests.set(context.requestId, Object.freeze({
+        target,
+        stream,
+        includeUsage,
+        siwc: true,
+        allowMissingContentType: target !== "models",
+        adaptedResponses: new WeakSet
+      }));
+      return context;
+    }
     if (context.url.pathname === CODEX_RESPONSES_PATH) {
       setCodexRoutingHint(context.headers, context.body);
       enforceCodexResponsesLite(context);
@@ -16722,6 +16881,14 @@ class ChatgptOauthAdapter {
     return context;
   }
   reconcileOutboundRequest(context) {
+    if (context.url.origin === SIWC_ORIGIN) {
+      if (context.url.pathname === RESPONSES_PATH) {
+        context.body = normalizeSiwcRequest(record(context.body), "responses");
+        setSiwcHeaders(context, "responses");
+      } else if (context.url.pathname === MODELS_PATH)
+        setSiwcHeaders(context, "models");
+      return context;
+    }
     if (context.url.pathname === CODEX_RESPONSES_PATH) {
       setCodexRoutingHint(context.headers, context.body);
       enforceCodexResponsesLite(context);
@@ -16766,7 +16933,8 @@ class ChatgptOauthAdapter {
         return errorResponse(502, joinCompletion(result.completion, Promise.resolve({ status: "failed", code: "invalid_response" }), context.signal));
       }
       try {
-        const models = parseCodexModelsBody(await readBoundedBody(result.response, context.signal), MAX_MODELS_BODY_BYTES);
+        const text = await readBoundedBody(result.response, context.signal);
+        const models = state.siwc ? parseSiwcModelsBody(text) : parseCodexModelsBody(text, MAX_MODELS_BODY_BYTES);
         const body = {
           object: "list",
           data: models.map(({ id }) => ({ id, object: "model", owned_by: "openai" }))
@@ -16792,7 +16960,7 @@ class ChatgptOauthAdapter {
       return errorResponse(502, joinCompletion(result.completion, bodyCompletion, context.signal));
     }
     if (state.stream) {
-      const converted = protocolStreamBody(result.response.body, state.target, state.includeUsage, context.signal, context.redactDiagnostic);
+      const converted = protocolStreamBody(result.response.body, state.target, state.includeUsage, context.signal, context.redactDiagnostic, state.siwc);
       const streamCompletion = joinCompletion(result.completion, converted.completion, context.signal);
       streamCompletion.then(cleanup, cleanup);
       return {
@@ -16807,7 +16975,7 @@ class ChatgptOauthAdapter {
         target: state.target,
         redactDiagnostic: context.redactDiagnostic
       });
-      const body = state.target === "chat" ? responsesToChatCompletion(stateResult.response) : stateResult.response;
+      const body = state.target === "chat" ? responsesToChatCompletion(stateResult.response, state.siwc) : stateResult.response;
       const protocolCompletion = Promise.resolve(stateResult.terminal === "completed" ? { status: "completed" } : { status: "incomplete", code: "incomplete" });
       const nonStreamCompletion = joinCompletion(result.completion, protocolCompletion, context.signal);
       nonStreamCompletion.then(cleanup, cleanup);
@@ -16847,4 +17015,4 @@ export {
   server_default as default
 };
 
-//# debugId=AD304F01A6899F4964756E2164756E21
+//# debugId=9E89B5DD5BF3FADA64756E2164756E21