@psnext/slingcli 2.5.20260623-1 → 2.5.20260705-1

package/node_modules/@aws-sdk/signature-v4-multi-region/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/signature-v4-multi-region",
-  "version": "3.996.35",
+  "version": "3.996.38",
   "scripts": {
     "build": "concurrently 'yarn:build:types' 'yarn:build:es' && yarn build:cjs",
     "build:browser": "node ./test-browser/browser-build/esbuild",
@@ -26,9 +26,9 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@aws-sdk/types": "^3.973.13",
-    "@smithy/signature-v4": "^5.4.6",
-    "@smithy/types": "^4.14.3",
+    "@aws-sdk/types": "^3.973.15",
+    "@smithy/signature-v4": "^5.6.1",
+    "@smithy/types": "^4.15.1",
     "tslib": "^2.6.2"
   },
   "devDependencies": {

package/node_modules/@aws-sdk/types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-sdk/types",
-  "version": "3.973.13",
+  "version": "3.973.15",
   "main": "./dist-cjs/index.js",
   "module": "./dist-es/index.js",
   "types": "./dist-types/index.d.ts",
@@ -42,7 +42,7 @@
     "directory": "packages-internal/types"
   },
   "dependencies": {
-    "@smithy/types": "^4.14.3",
+    "@smithy/types": "^4.15.1",
     "tslib": "^2.6.2"
   },
   "devDependencies": {

package/node_modules/@aws-sdk/xml-builder/dist-cjs/index.js

@@ -1,6 +1,3 @@
-const { parseXML } = require("./xml-parser");
-exports.parseXML = parseXML;
-
 const ATTR_ESCAPE_RE = /[&<>"]/g;
 const ATTR_ESCAPE_MAP = {
     "&": "&amp;",
@@ -125,5 +122,241 @@ class XmlNode {
     }
 }
 
+function parseXML(xml) {
+    const state = new AwsXmlParser(xml);
+    return state.parse();
+}
+class AwsXmlParser {
+    x;
+    i = 0;
+    z;
+    constructor(x) {
+        this.x = x;
+        this.x = x.replace(/\r\n?/g, "\n");
+        this.z = this.x.length;
+    }
+    parse() {
+        const p = this;
+        const { z } = p;
+        while (p.i < z) {
+            p.trim();
+            if (p.i >= z) {
+                break;
+            }
+            if (p.isNext("<?")) {
+                p.readTo("?>");
+                p.trim();
+            }
+            else if (p.isNext("<!--")) {
+                p.readTo("-->");
+                p.trim();
+            }
+            else if (p.isNext("<!DOCTYPE", false)) {
+                p.skipDoctype();
+                p.trim();
+            }
+            else if (p.x[p.i] === "<") {
+                const root = p.parseTag();
+                return { [root.tag]: root.value };
+            }
+            else {
+                throw new Error("@aws-sdk XML parse error: unexpected content.");
+            }
+        }
+        throw new Error("@aws-sdk XML parse error: no root element.");
+    }
+    isNext(s, caseSensitive = true) {
+        const p = this;
+        if (caseSensitive) {
+            return p.x.startsWith(s, p.i);
+        }
+        return p.x.toLowerCase().startsWith(s.toLowerCase(), p.i);
+    }
+    readTo(stop) {
+        const p = this;
+        const _i = p.x.indexOf(stop, p.i);
+        if (_i === -1) {
+            throw new Error(`@aws-sdk XML parse error: expected "${stop}" not found.`);
+        }
+        const result = p.x.slice(p.i, _i);
+        p.i = _i + stop.length;
+        return result;
+    }
+    trim() {
+        const p = this;
+        while (p.i < p.z && " \t\r\n".includes(p.x[p.i])) {
+            ++p.i;
+        }
+    }
+    readAttrValue() {
+        const p = this;
+        const quote = p.x[p.i];
+        ++p.i;
+        let value = "";
+        while (p.i < p.z && p.x[p.i] !== quote) {
+            value += p.x[p.i++];
+        }
+        ++p.i;
+        return p.decodeEntities(value);
+    }
+    parseTag() {
+        const p = this;
+        ++p.i;
+        let tag = "";
+        while (p.i < p.z && !" \t\r\n>/".includes(p.x[p.i])) {
+            tag += p.x[p.i++];
+        }
+        let hasAttrs = false;
+        const attrs = Object.create(null);
+        while (p.i < p.z) {
+            p.trim();
+            if (">/".includes(p.x[p.i])) {
+                break;
+            }
+            let name = "";
+            while (p.i < p.z && !"= \t\r\n>/?".includes(p.x[p.i])) {
+                name += p.x[p.i++];
+            }
+            p.trim();
+            if (p.x[p.i] !== "=") {
+                break;
+            }
+            ++p.i;
+            p.trim();
+            attrs[name] = p.readAttrValue();
+            hasAttrs = true;
+        }
+        if (p.i >= p.z) {
+            throw new Error("@aws-sdk XML parse error: unexpected end of input.");
+        }
+        if (p.x[p.i] === "/") {
+            ++p.i;
+            if (p.i >= p.z || p.x[p.i] !== ">") {
+                throw new Error("@aws-sdk XML parse error: expected > at the end of self-closing tag.");
+            }
+            ++p.i;
+            Object.setPrototypeOf(attrs, Object.prototype);
+            return { tag, value: hasAttrs ? attrs : "" };
+        }
+        if (p.x[p.i] !== ">") {
+            throw new Error("@aws-sdk XML parse error: expected > at the end of opening tag.");
+        }
+        ++p.i;
+        const textParts = [];
+        const childTags = [];
+        let hasElementChild = false;
+        while (p.i < p.z) {
+            if (p.isNext("</")) {
+                break;
+            }
+            if (p.x[p.i] === "<") {
+                if (p.isNext("<!--")) {
+                    p.readTo("-->");
+                }
+                else if (p.isNext("<![CDATA[")) {
+                    p.i += 9;
+                    textParts.push(p.readTo("]]>"));
+                }
+                else if (p.isNext("<?")) {
+                    p.readTo("?>");
+                }
+                else {
+                    hasElementChild = true;
+                    childTags.push(p.parseTag());
+                }
+            }
+            else {
+                let text = "";
+                while (p.i < p.z && p.x[p.i] !== "<") {
+                    text += p.x[p.i++];
+                }
+                textParts.push(p.decodeEntities(text));
+            }
+        }
+        if (!p.isNext("</")) {
+            throw new Error(`@aws-sdk XML parse error: missing closing tag </${tag}>.`);
+        }
+        p.i += 2;
+        const closeTag = p.readTo(">").trim();
+        if (closeTag !== tag) {
+            throw new Error(`@aws-sdk XML parse error: mismatched tags <${tag}> and </${closeTag}>.`);
+        }
+        if (!hasAttrs && textParts.length === 0 && !hasElementChild) {
+            return { tag, value: "" };
+        }
+        if (!hasAttrs && !hasElementChild) {
+            const text = textParts.length === 1 ? textParts[0] : textParts.join("");
+            if (text.trim() === "" && text.includes("\n")) {
+                return { tag, value: "" };
+            }
+            return { tag, value: text };
+        }
+        const obj = Object.create(null);
+        for (const text of textParts) {
+            if (text.trim() === "" && text.includes("\n")) {
+                continue;
+            }
+            obj["#text"] = "#text" in obj ? obj["#text"] + text : text;
+        }
+        for (const child of childTags) {
+            if (child.tag in obj) {
+                if (Array.isArray(obj[child.tag])) {
+                    obj[child.tag].push(child.value);
+                }
+                else {
+                    obj[child.tag] = [obj[child.tag], child.value];
+                }
+            }
+            else {
+                obj[child.tag] = child.value;
+            }
+        }
+        for (const [k, v] of Object.entries(attrs)) {
+            obj[k] = v;
+        }
+        Object.setPrototypeOf(obj, Object.prototype);
+        return { tag, value: obj };
+    }
+    static ENTITIES = {
+        amp: "&",
+        lt: "<",
+        gt: ">",
+        quot: '"',
+        apos: "'",
+    };
+    skipDoctype() {
+        const p = this;
+        p.i += 9;
+        let depth = 0;
+        while (p.i < p.z) {
+            const c = p.x[p.i];
+            if (c === "[") {
+                ++depth;
+            }
+            else if (c === "]") {
+                --depth;
+            }
+            else if (c === ">" && depth === 0) {
+                ++p.i;
+                return;
+            }
+            ++p.i;
+        }
+        throw new Error("@aws-sdk XML parse error: unclosed DOCTYPE.");
+    }
+    decodeEntities(s) {
+        return s.replace(/&(?:#x([0-9a-fA-F]{1,6})|#(\d{1,7})|([a-zA-Z][a-zA-Z0-9]{0,30}));/g, (_, hex, dec, named) => {
+            if (hex) {
+                return String.fromCharCode(parseInt(hex, 16));
+            }
+            if (dec) {
+                return String.fromCharCode(parseInt(dec, 10));
+            }
+            return AwsXmlParser.ENTITIES[named] ?? "";
+        });
+    }
+}
+
 exports.XmlNode = XmlNode;
 exports.XmlText = XmlText;
+exports.parseXML = parseXML;

package/node_modules/@aws-sdk/xml-builder/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@aws-sdk/xml-builder",
-  "version": "3.972.31",
+  "version": "3.972.33",
   "description": "XML utilities for the AWS SDK",
   "dependencies": {
-    "@smithy/types": "^4.14.3",
+    "@smithy/types": "^4.15.1",
     "tslib": "^2.6.2"
   },
   "scripts": {
@@ -45,8 +45,7 @@
     "./dist-es/xml-parser": "./dist-es/xml-parser.browser"
   },
   "react-native": {
-    "./dist-es/xml-parser": "./dist-es/xml-parser.browser",
-    "./dist-cjs/xml-parser": "./dist-cjs/xml-parser.browser"
+    "./dist-es/xml-parser": "./dist-es/xml-parser.browser"
   },
   "homepage": "https://github.com/aws/aws-sdk-js-v3/tree/main/packages-internal/xml-builder",
   "repository": {

package/node_modules/@earendil-works/pi-agent-core/dist/agent.js

@@ -97,6 +97,7 @@ export class Agent {
     beforeToolCall;
     afterToolCall;
     prepareNextTurn;
+    prepareNextTurnWithContext;
     activeRun;
     /** Session identifier forwarded to providers for cache-aware backends. */
     sessionId;
@@ -119,6 +120,7 @@ export class Agent {
         this.beforeToolCall = options.beforeToolCall;
         this.afterToolCall = options.afterToolCall;
         this.prepareNextTurn = options.prepareNextTurn;
+        this.prepareNextTurnWithContext = options.prepareNextTurnWithContext;
         this.steeringQueue = new PendingMessageQueue(options.steeringMode ?? "one-at-a-time");
         this.followUpQueue = new PendingMessageQueue(options.followUpMode ?? "one-at-a-time");
         this.sessionId = options.sessionId;
@@ -289,7 +291,14 @@ export class Agent {
             toolExecution: this.toolExecution,
             beforeToolCall: this.beforeToolCall,
             afterToolCall: this.afterToolCall,
-            prepareNextTurn: this.prepareNextTurn ? async () => await this.prepareNextTurn?.(this.signal) : undefined,
+            prepareNextTurn: this.prepareNextTurnWithContext || this.prepareNextTurn
+                ? async (context) => {
+                    if (this.prepareNextTurnWithContext) {
+                        return await this.prepareNextTurnWithContext(context, this.signal);
+                    }
+                    return await this.prepareNextTurn?.(this.signal);
+                }
+                : undefined,
             convertToLlm: this.convertToLlm,
             transformContext: this.transformContext,
             getApiKey: this.getApiKey,

package/node_modules/@earendil-works/pi-agent-core/dist/harness/compaction/compaction.js

@@ -65,13 +65,16 @@ export function calculateContextTokens(usage) {
 function getAssistantUsage(msg) {
     if (msg.role === "assistant" && "usage" in msg) {
         const assistantMsg = msg;
-        if (assistantMsg.stopReason !== "aborted" && assistantMsg.stopReason !== "error" && assistantMsg.usage) {
+        if (assistantMsg.stopReason !== "aborted" &&
+            assistantMsg.stopReason !== "error" &&
+            assistantMsg.usage &&
+            calculateContextTokens(assistantMsg.usage) > 0) {
             return assistantMsg.usage;
         }
     }
     return undefined;
 }
-/** Return usage from the last successful assistant message in session entries. */
+/** Return usage from the last valid assistant message in session entries. */
 export function getLastAssistantUsage(entries) {
     for (let i = entries.length - 1; i >= 0; i--) {
         const entry = entries[i];
@@ -471,14 +474,12 @@ export async function compact(preparation, models, model, customInstructions, si
     }
     let summary;
     if (isSplitTurn && turnPrefixMessages.length > 0) {
-        const [historyResult, turnPrefixResult] = await Promise.all([
-            messagesToSummarize.length > 0
-                ? generateSummary(messagesToSummarize, models, model, settings.reserveTokens, signal, customInstructions, previousSummary, thinkingLevel)
-                : Promise.resolve(ok("No prior history.")),
-            generateTurnPrefixSummary(turnPrefixMessages, models, model, settings.reserveTokens, signal, thinkingLevel),
-        ]);
+        const historyResult = messagesToSummarize.length > 0
+            ? await generateSummary(messagesToSummarize, models, model, settings.reserveTokens, signal, customInstructions, previousSummary, thinkingLevel)
+            : ok("No prior history.");
         if (!historyResult.ok)
             return err(historyResult.error);
+        const turnPrefixResult = await generateTurnPrefixSummary(turnPrefixMessages, models, model, settings.reserveTokens, signal, thinkingLevel);
         if (!turnPrefixResult.ok)
             return err(turnPrefixResult.error);
         summary = `${historyResult.value}\n\n---\n\n**Turn Context (split turn):**\n\n${turnPrefixResult.value}`;

package/node_modules/@earendil-works/pi-agent-core/dist/harness/env/nodejs.js

@@ -6,6 +6,20 @@ import { tmpdir } from "node:os";
 import { isAbsolute, join, resolve } from "node:path";
 import { createInterface } from "node:readline";
 import { ExecutionError, err, FileError, ok, toError, } from "../types.js";
+const MAX_TIMEOUT_MS = 2_147_483_647;
+const MAX_TIMEOUT_SECONDS = MAX_TIMEOUT_MS / 1000;
+function resolveTimeoutMs(timeout) {
+    if (timeout === undefined)
+        return ok(undefined);
+    if (!Number.isFinite(timeout) || timeout <= 0) {
+        return err(new ExecutionError("timeout", "Invalid timeout: must be a finite number of seconds"));
+    }
+    const timeoutMs = timeout * 1000;
+    if (timeoutMs > MAX_TIMEOUT_MS) {
+        return err(new ExecutionError("timeout", `Invalid timeout: maximum is ${MAX_TIMEOUT_SECONDS} seconds`));
+    }
+    return ok(timeoutMs);
+}
 function resolvePath(cwd, path) {
     return isAbsolute(path) ? path : resolve(cwd, path);
 }
@@ -203,6 +217,10 @@ export class NodeExecutionEnv {
     async exec(command, options) {
         if (options?.abortSignal?.aborted)
             return err(new ExecutionError("aborted", "aborted"));
+        const timeoutMsResult = resolveTimeoutMs(options?.timeout);
+        if (!timeoutMsResult.ok)
+            return err(timeoutMsResult.error);
+        const timeoutMs = timeoutMsResult.value;
         const cwd = options?.cwd ? resolvePath(this.cwd, options.cwd) : this.cwd;
         const shellConfig = await getShellConfig(this.shellPath);
         if (!shellConfig.ok)
@@ -250,13 +268,13 @@ export class NodeExecutionEnv {
                 return;
             }
             timeoutId =
-                typeof options?.timeout === "number"
+                timeoutMs !== undefined
                     ? setTimeout(() => {
                         timedOut = true;
                         if (child?.pid) {
                             killProcessTree(child.pid);
                         }
-                    }, options.timeout * 1000)
+                    }, timeoutMs)
                     : undefined;
             if (options?.abortSignal) {
                 if (options.abortSignal.aborted) {

package/node_modules/@earendil-works/pi-agent-core/dist/harness/session/session.js

@@ -180,12 +180,13 @@ export class Session {
         });
     }
     async appendSessionName(name) {
+        const sanitizedName = name.replace(/[\r\n]+/g, " ").trim();
         return this.appendTypedEntry({
             type: "session_info",
             id: await this.storage.createEntryId(),
             parentId: await this.storage.getLeafId(),
             timestamp: new Date().toISOString(),
-            name: name.trim(),
+            name: sanitizedName,
         });
     }
     async moveTo(entryId, summary) {

package/node_modules/@earendil-works/pi-agent-core/dist/harness/utils/shell-output.js

@@ -1,4 +1,4 @@
-import { ExecutionError, err, ok, toError, } from "../types.js";
+import { ExecutionError, err, ok, toError } from "../types.js";
 import { DEFAULT_MAX_BYTES, truncateTail } from "./truncate.js";
 function toExecutionError(error) {
     if (error instanceof ExecutionError)

package/node_modules/@earendil-works/pi-agent-core/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@earendil-works/pi-agent-core",
-	"version": "0.79.10",
+	"version": "0.80.3",
 	"description": "General-purpose agent with transport abstraction, state management, and attachment support",
 	"type": "module",
 	"main": "./dist/index.js",
@@ -29,7 +29,7 @@
 		"prepublishOnly": "npm run clean && npm run build"
 	},
 	"dependencies": {
-		"@earendil-works/pi-ai": "^0.79.10",
+		"@earendil-works/pi-ai": "^0.80.3",
 		"ignore": "7.0.5",
 		"typebox": "1.1.38",
 		"yaml": "2.9.0"

package/node_modules/@earendil-works/pi-ai/dist/api/anthropic-messages.js

@@ -5,9 +5,8 @@ import { headersToRecord } from "../utils/headers.js";
 import { parseJsonWithRepair, parseStreamingJson } from "../utils/json-parse.js";
 import { getProviderEnvValue } from "../utils/provider-env.js";
 import { sanitizeSurrogates } from "../utils/sanitize-unicode.js";
-import { resolveCloudflareBaseUrl } from "./cloudflare.js";
 import { buildCopilotDynamicHeaders, hasCopilotVisionInput } from "./github-copilot-headers.js";
-import { adjustMaxTokensForThinking, buildBaseOptions } from "./simple-options.js";
+import { adjustMaxTokensForThinking, buildBaseOptions, clampMaxTokensToContext } from "./simple-options.js";
 import { transformMessages } from "./transform-messages.js";
 /**
  * Resolve cache retention preference.
@@ -108,14 +107,11 @@ function convertContentBlocks(content) {
 const FINE_GRAINED_TOOL_STREAMING_BETA = "fine-grained-tool-streaming-2025-05-14";
 const INTERLEAVED_THINKING_BETA = "interleaved-thinking-2025-05-14";
 function getAnthropicCompat(model) {
-    // Auto-detect session affinity and cache control support from provider
-    const isFireworks = model.provider === "fireworks";
-    const isCloudflareAiGatewayAnthropic = model.provider === "cloudflare-ai-gateway" && model.baseUrl.includes("anthropic");
     return {
-        supportsEagerToolInputStreaming: model.compat?.supportsEagerToolInputStreaming ?? !isFireworks,
-        supportsLongCacheRetention: model.compat?.supportsLongCacheRetention ?? !isFireworks,
-        sendSessionAffinityHeaders: model.compat?.sendSessionAffinityHeaders ?? !!(isFireworks || isCloudflareAiGatewayAnthropic),
-        supportsCacheControlOnTools: model.compat?.supportsCacheControlOnTools ?? !isFireworks,
+        supportsEagerToolInputStreaming: model.compat?.supportsEagerToolInputStreaming ?? true,
+        supportsLongCacheRetention: model.compat?.supportsLongCacheRetention ?? true,
+        sendSessionAffinityHeaders: model.compat?.sendSessionAffinityHeaders ?? false,
+        supportsCacheControlOnTools: model.compat?.supportsCacheControlOnTools ?? true,
         supportsTemperature: model.compat?.supportsTemperature ?? true,
         allowEmptySignature: model.compat?.allowEmptySignature ?? false,
     };
@@ -129,6 +125,26 @@ function mergeHeaders(...headerSources) {
     }
     return merged;
 }
+function hasHeader(headers, name) {
+    if (!headers)
+        return false;
+    const expected = name.toLowerCase();
+    for (const [key, value] of Object.entries(headers)) {
+        if (key.toLowerCase() === expected && value !== null && value.trim().length > 0)
+            return true;
+    }
+    return false;
+}
+function assertRequestAuth(provider, apiKey, headers) {
+    if (apiKey)
+        return;
+    if (hasHeader(headers, "authorization") ||
+        hasHeader(headers, "x-api-key") ||
+        hasHeader(headers, "cf-aig-authorization")) {
+        return;
+    }
+    throw new Error(`No API key for provider: ${provider}`);
+}
 const ANTHROPIC_MESSAGE_EVENTS = new Set([
     "message_start",
     "message_delta",
@@ -309,9 +325,7 @@ export const stream = (model, context, options) => {
             }
             else {
                 const apiKey = options?.apiKey;
-                if (!apiKey) {
-                    throw new Error(`No API key for provider: ${model.provider}`);
-                }
+                assertRequestAuth(model.provider, apiKey, options?.headers);
                 let copilotDynamicHeaders;
                 if (model.provider === "github-copilot") {
                     const hasImages = hasCopilotVisionInput(context.messages);
@@ -322,7 +336,7 @@ export const stream = (model, context, options) => {
                 }
                 const cacheRetention = resolveCacheRetention(options?.cacheRetention, options?.env);
                 const cacheSessionId = cacheRetention === "none" ? undefined : options?.sessionId;
-                const created = createClient(model, apiKey, options?.interleavedThinking ?? true, shouldUseFineGrainedToolStreamingBeta(model, context), options?.headers, copilotDynamicHeaders, cacheSessionId, options?.env);
+                const created = createClient(model, apiKey, options?.interleavedThinking ?? true, shouldUseFineGrainedToolStreamingBeta(model, context), options?.headers, copilotDynamicHeaders, cacheSessionId);
                 client = created.client;
                 isOAuth = created.isOAuthToken;
             }
@@ -508,6 +522,14 @@ export const stream = (model, context, options) => {
                     if (event.usage.cache_creation_input_tokens != null) {
                         output.usage.cacheWrite = event.usage.cache_creation_input_tokens;
                     }
+                    // Anthropic reports reasoning tokens in `output_tokens_details.thinking_tokens` on the
+                    // final message_delta usage (a subset of output_tokens). SDK 0.91.1 omits the field from
+                    // its Usage type, so read it through a narrow cast. Verified against the live API.
+                    const thinkingTokens = event.usage
+                        .output_tokens_details?.thinking_tokens;
+                    if (thinkingTokens != null) {
+                        output.usage.reasoning = thinkingTokens;
+                    }
                     // Anthropic doesn't provide total_tokens, compute from components
                     output.usage.totalTokens =
                         output.usage.input + output.usage.output + output.usage.cacheRead + output.usage.cacheWrite;
@@ -558,11 +580,8 @@ function mapThinkingLevelToEffort(model, level) {
     }
 }
 export const streamSimple = (model, context, options) => {
-    const apiKey = options?.apiKey;
-    if (!apiKey) {
-        throw new Error(`No API key for provider: ${model.provider}`);
-    }
-    const base = buildBaseOptions(model, options, apiKey);
+    assertRequestAuth(model.provider, options?.apiKey, options?.headers);
+    const base = buildBaseOptions(model, context, options, options?.apiKey);
     if (!options?.reasoning) {
         return stream(model, context, { ...base, thinkingEnabled: false });
     }
@@ -579,17 +598,18 @@ export const streamSimple = (model, context, options) => {
     // Undefined means the caller did not request an output cap; let the helper use the model cap.
     // Do not coerce to 0 here, or the thinking budget would become the entire max_tokens value.
     const adjusted = adjustMaxTokensForThinking(base.maxTokens, model.maxTokens, options.reasoning, options.thinkingBudgets);
+    const maxTokens = clampMaxTokensToContext(model, context, adjusted.maxTokens);
     return stream(model, context, {
         ...base,
-        maxTokens: adjusted.maxTokens,
+        maxTokens,
         thinkingEnabled: true,
-        thinkingBudgetTokens: adjusted.thinkingBudget,
+        thinkingBudgetTokens: Math.min(adjusted.thinkingBudget, Math.max(0, maxTokens - 1024)),
     });
 };
 function isOAuthToken(apiKey) {
     return apiKey.includes("sk-ant-oat");
 }
-function createClient(model, apiKey, interleavedThinking, useFineGrainedToolStreamingBeta, optionsHeaders, dynamicHeaders, sessionId, env) {
+function createClient(model, apiKey, interleavedThinking, useFineGrainedToolStreamingBeta, optionsHeaders, dynamicHeaders, sessionId) {
     // Adaptive thinking models have interleaved thinking built in, so skip the beta header.
     const needsInterleavedBeta = interleavedThinking && model.compat?.forceAdaptiveThinking !== true;
     const betaFeatures = [];
@@ -599,28 +619,11 @@ function createClient(model, apiKey, interleavedThinking, useFineGrainedToolStre
     if (needsInterleavedBeta) {
         betaFeatures.push(INTERLEAVED_THINKING_BETA);
     }
-    if (model.provider === "cloudflare-ai-gateway") {
-        const client = new Anthropic({
-            apiKey: null,
-            authToken: null,
-            baseURL: resolveCloudflareBaseUrl(model, env),
-            dangerouslyAllowBrowser: true,
-            defaultHeaders: mergeHeaders({
-                accept: "application/json",
-                "anthropic-dangerous-direct-browser-access": "true",
-                "cf-aig-authorization": `Bearer ${apiKey}`,
-                "x-api-key": null,
-                Authorization: null,
-                ...(betaFeatures.length > 0 ? { "anthropic-beta": betaFeatures.join(",") } : {}),
-            }, model.headers, optionsHeaders),
-        });
-        return { client, isOAuthToken: false };
-    }
     // Copilot: Bearer auth, selective betas.
     if (model.provider === "github-copilot") {
         const client = new Anthropic({
             apiKey: null,
-            authToken: apiKey,
+            authToken: apiKey ?? null,
             baseURL: model.baseUrl,
             dangerouslyAllowBrowser: true,
             defaultHeaders: mergeHeaders({
@@ -632,7 +635,7 @@ function createClient(model, apiKey, interleavedThinking, useFineGrainedToolStre
         return { client, isOAuthToken: false };
     }
     // OAuth: Bearer auth, Claude Code identity headers
-    if (isOAuthToken(apiKey)) {
+    if (apiKey && isOAuthToken(apiKey)) {
         const client = new Anthropic({
             apiKey: null,
             authToken: apiKey,
@@ -648,18 +651,19 @@ function createClient(model, apiKey, interleavedThinking, useFineGrainedToolStre
         });
         return { client, isOAuthToken: true };
     }
-    // API key auth
+    // API key or header-owned auth.
     const sessionAffinityHeaders = sessionId && getAnthropicCompat(model).sendSessionAffinityHeaders ? { "x-session-affinity": sessionId } : {};
+    const defaultHeaders = mergeHeaders({
+        accept: "application/json",
+        "anthropic-dangerous-direct-browser-access": "true",
+        ...(betaFeatures.length > 0 ? { "anthropic-beta": betaFeatures.join(",") } : {}),
+    }, sessionAffinityHeaders, model.headers, optionsHeaders);
     const client = new Anthropic({
-        apiKey,
+        apiKey: apiKey ?? null,
         authToken: null,
         baseURL: model.baseUrl,
         dangerouslyAllowBrowser: true,
-        defaultHeaders: mergeHeaders({
-            accept: "application/json",
-            "anthropic-dangerous-direct-browser-access": "true",
-            ...(betaFeatures.length > 0 ? { "anthropic-beta": betaFeatures.join(",") } : {}),
-        }, sessionAffinityHeaders, model.headers, optionsHeaders),
+        defaultHeaders,
     });
     return { client, isOAuthToken: false };
 }