@aui.io/aui-client 2.0.0 → 3.1.0

package/dist/cjs/core/stream/Stream.d.ts

@@ -0,0 +1,47 @@
+export declare namespace Stream {
+    interface Args {
+        /**
+         * The HTTP response stream to read from.
+         */
+        stream: ReadableStream;
+        /**
+         * The event shape to use for parsing the stream data.
+         */
+        eventShape: JsonEvent | SseEvent;
+        /**
+         * An abort signal to stop the stream.
+         */
+        signal?: AbortSignal;
+    }
+    interface JsonEvent {
+        type: "json";
+        messageTerminator: string;
+    }
+    interface SseEvent {
+        type: "sse";
+        streamTerminator?: string;
+    }
+}
+export declare class Stream<T> implements AsyncIterable<T> {
+    private stream;
+    private parse;
+    /**
+     * The prefix to use for each message. For example,
+     * for SSE, the prefix is "data: ".
+     */
+    private prefix;
+    private messageTerminator;
+    private streamTerminator;
+    private controller;
+    private decoder;
+    constructor({ stream, parse, eventShape, signal }: Stream.Args & {
+        parse: (val: unknown) => Promise<T>;
+    });
+    private iterMessages;
+    [Symbol.asyncIterator](): AsyncIterator<T, void, unknown>;
+    private decodeChunk;
+}
+/**
+ * Browser polyfill for ReadableStream
+ */
+export declare function readableStreamAsyncIterable<T>(stream: any): AsyncIterableIterator<T>;

package/dist/cjs/core/stream/Stream.js

@@ -0,0 +1,172 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __asyncValues = (this && this.__asyncValues) || function (o) {
+    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+    var m = o[Symbol.asyncIterator], i;
+    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
+    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
+    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
+};
+var __await = (this && this.__await) || function (v) { return this instanceof __await ? (this.v = v, this) : new __await(v); }
+var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _arguments, generator) {
+    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+    var g = generator.apply(thisArg, _arguments || []), i, q = [];
+    return i = Object.create((typeof AsyncIterator === "function" ? AsyncIterator : Object).prototype), verb("next"), verb("throw"), verb("return", awaitReturn), i[Symbol.asyncIterator] = function () { return this; }, i;
+    function awaitReturn(f) { return function (v) { return Promise.resolve(v).then(f, reject); }; }
+    function verb(n, f) { if (g[n]) { i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; if (f) i[n] = f(i[n]); } }
+    function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
+    function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
+    function fulfill(value) { resume("next", value); }
+    function reject(value) { resume("throw", value); }
+    function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Stream = void 0;
+exports.readableStreamAsyncIterable = readableStreamAsyncIterable;
+const index_js_1 = require("../runtime/index.js");
+const DATA_PREFIX = "data:";
+class Stream {
+    constructor({ stream, parse, eventShape, signal }) {
+        this.controller = new AbortController();
+        this.stream = stream;
+        this.parse = parse;
+        if (eventShape.type === "sse") {
+            this.prefix = DATA_PREFIX;
+            this.messageTerminator = "\n";
+            this.streamTerminator = eventShape.streamTerminator;
+        }
+        else {
+            this.messageTerminator = eventShape.messageTerminator;
+        }
+        signal === null || signal === void 0 ? void 0 : signal.addEventListener("abort", () => this.controller.abort());
+        // Initialize shared TextDecoder
+        if (typeof TextDecoder !== "undefined") {
+            this.decoder = new TextDecoder("utf-8");
+        }
+    }
+    iterMessages() {
+        return __asyncGenerator(this, arguments, function* iterMessages_1() {
+            var _a, e_1, _b, _c;
+            this.controller.signal;
+            const stream = readableStreamAsyncIterable(this.stream);
+            let buf = "";
+            let prefixSeen = false;
+            try {
+                for (var _d = true, stream_1 = __asyncValues(stream), stream_1_1; stream_1_1 = yield __await(stream_1.next()), _a = stream_1_1.done, !_a; _d = true) {
+                    _c = stream_1_1.value;
+                    _d = false;
+                    const chunk = _c;
+                    buf += this.decodeChunk(chunk);
+                    let terminatorIndex;
+                    while ((terminatorIndex = buf.indexOf(this.messageTerminator)) >= 0) {
+                        let line = buf.slice(0, terminatorIndex);
+                        buf = buf.slice(terminatorIndex + this.messageTerminator.length);
+                        if (!line.trim()) {
+                            continue;
+                        }
+                        if (!prefixSeen && this.prefix != null) {
+                            const prefixIndex = line.indexOf(this.prefix);
+                            if (prefixIndex === -1) {
+                                continue;
+                            }
+                            prefixSeen = true;
+                            line = line.slice(prefixIndex + this.prefix.length);
+                        }
+                        if (this.streamTerminator != null && line.includes(this.streamTerminator)) {
+                            return yield __await(void 0);
+                        }
+                        const message = yield __await(this.parse(JSON.parse(line)));
+                        yield yield __await(message);
+                        prefixSeen = false;
+                    }
+                }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (!_d && !_a && (_b = stream_1.return)) yield __await(_b.call(stream_1));
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
+        });
+    }
+    [Symbol.asyncIterator]() {
+        return __asyncGenerator(this, arguments, function* _a() {
+            var _b, e_2, _c, _d;
+            try {
+                for (var _e = true, _f = __asyncValues(this.iterMessages()), _g; _g = yield __await(_f.next()), _b = _g.done, !_b; _e = true) {
+                    _d = _g.value;
+                    _e = false;
+                    const message = _d;
+                    yield yield __await(message);
+                }
+            }
+            catch (e_2_1) { e_2 = { error: e_2_1 }; }
+            finally {
+                try {
+                    if (!_e && !_b && (_c = _f.return)) yield __await(_c.call(_f));
+                }
+                finally { if (e_2) throw e_2.error; }
+            }
+        });
+    }
+    decodeChunk(chunk) {
+        let decoded = "";
+        // If TextDecoder is available, use the streaming decoder instance
+        if (this.decoder != null) {
+            decoded += this.decoder.decode(chunk, { stream: true });
+        }
+        // Buffer is present in Node.js environment
+        else if (index_js_1.RUNTIME.type === "node" && typeof chunk !== "undefined") {
+            decoded += Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
+        }
+        return decoded;
+    }
+}
+exports.Stream = Stream;
+/**
+ * Browser polyfill for ReadableStream
+ */
+// biome-ignore lint/suspicious/noExplicitAny: allow explicit any
+function readableStreamAsyncIterable(stream) {
+    if (stream[Symbol.asyncIterator]) {
+        return stream;
+    }
+    const reader = stream.getReader();
+    return {
+        next() {
+            return __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const result = yield reader.read();
+                    if (result === null || result === void 0 ? void 0 : result.done) {
+                        reader.releaseLock();
+                    } // release lock when stream becomes closed
+                    return result;
+                }
+                catch (e) {
+                    reader.releaseLock(); // release lock when stream becomes errored
+                    throw e;
+                }
+            });
+        },
+        return() {
+            return __awaiter(this, void 0, void 0, function* () {
+                const cancelPromise = reader.cancel();
+                reader.releaseLock();
+                yield cancelPromise;
+                return { done: true, value: undefined };
+            });
+        },
+        [Symbol.asyncIterator]() {
+            return this;
+        },
+    };
+}

package/dist/cjs/core/stream/index.d.ts

@@ -0,0 +1 @@
+export { Stream } from "./Stream.js";

package/dist/cjs/core/stream/index.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Stream = void 0;
+var Stream_js_1 = require("./Stream.js");
+Object.defineProperty(exports, "Stream", { enumerable: true, get: function () { return Stream_js_1.Stream; } });

package/dist/cjs/core/websocket/ws.js

@@ -371,35 +371,7 @@ class ReconnectingWebSocket {
                     url = `${url}?${queryString}`;
                 }
             }
-            // FIX: Browser WebSocket doesn't support options parameter (causes "[object Object]" error)
-            // Detect if we're in a browser environment
-            const isBrowser = typeof window !== "undefined" && typeof window.document !== "undefined";
-            if (isBrowser) {
-                // Browser: Can only pass URL and optionally protocols (string/array)
-                // Add API key to URL as query parameter for browser authentication
-                // Backend accepts 'network_api_key' query param (without x- prefix)
-                if (this._headers && this._headers["x-network-api-key"]) {
-                    const separator = url.includes("?") ? "&" : "?";
-                    url = `${url}${separator}network_api_key=${encodeURIComponent(this._headers["x-network-api-key"])}`;
-                }
-                // FIX: Don't pass empty protocols array
-                if (this._protocols && this._protocols.length > 0) {
-                    this._ws = new WebSocket(url, this._protocols);
-                }
-                else {
-                    this._ws = new WebSocket(url);
-                }
-            }
-            else {
-                // Node.js: Can pass options with headers
-                // FIX: Don't pass empty protocols array - it breaks header authentication in Node.js v21+
-                if (this._protocols && this._protocols.length > 0) {
-                    this._ws = new WebSocket(url, this._protocols, options);
-                }
-                else {
-                    this._ws = new WebSocket(url, options);
-                }
-            }
+            this._ws = new WebSocket(url, this._protocols, options);
             this._ws.binaryType = this._binaryType;
             this._connectLock = false;
             this._addListeners();

package/dist/cjs/environments.d.ts

@@ -1,23 +1,11 @@
 export interface ApolloEnvironmentUrls {
     base: string;
-    wsUrl: string;
+    production: string;
 }
 export declare const ApolloEnvironment: {
     readonly Gcp: {
-        readonly base: "https://api.aui.io/ia-controller";
-        readonly wsUrl: "wss://api.aui.io";
-    };
-    readonly Azure: {
-        readonly base: "https://azure-v2.aui.io/ia-controller";
-        readonly wsUrl: "wss://azure-v2.aui.io";
-    };
-    readonly Aws: {
-        readonly base: "https://aws.aui.io/ia-controller";
-        readonly wsUrl: "wss://aws.aui.io";
-    };
-    readonly Default: {
-        readonly base: "https://api.aui.io/ia-controller";
-        readonly wsUrl: "wss://api.aui.io";
+        readonly base: "https://api-v3.aui.io/apollo-api-v2";
+        readonly production: "wss://api-v3.aui.io/apollo-api-v2";
     };
 };
-export type ApolloEnvironment = typeof ApolloEnvironment.Default | typeof ApolloEnvironment.Gcp | typeof ApolloEnvironment.Azure | typeof ApolloEnvironment.Aws;
+export type ApolloEnvironment = typeof ApolloEnvironment.Gcp;

package/dist/cjs/environments.js

@@ -1,24 +1,10 @@
 "use strict";
 // This file was auto-generated by Fern from our API Definition.
-// MANUALLY FIXED: Added wsUrl property for WebSocket URL resolution (see .fernignore)
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApolloEnvironment = void 0;
 exports.ApolloEnvironment = {
     Gcp: {
-        base: "https://api.aui.io/ia-controller",
-        wsUrl: "wss://api.aui.io",
-    },
-    Azure: {
-        base: "https://azure-v2.aui.io/ia-controller",
-        wsUrl: "wss://azure-v2.aui.io",
-    },
-    Aws: {
-        base: "https://aws.aui.io/ia-controller",
-        wsUrl: "wss://aws.aui.io",
-    },
-    // Default points to Gcp for backwards compatibility
-    Default: {
-        base: "https://api.aui.io/ia-controller",
-        wsUrl: "wss://api.aui.io",
+        base: "https://api-v3.aui.io/apollo-api-v2",
+        production: "wss://api-v3.aui.io/apollo-api-v2",
     },
 };

package/dist/cjs/exports.d.ts

@@ -1,7 +1,8 @@
 /**
- * Custom exports for the Apollo SDK
+ * Custom exports for the Apollo SDK.
  *
  * This file is in .fernignore and won't be overwritten by Fern generation.
- * Add any custom exports here that need to be available at the package root.
+ * Add any additional package-root exports here. Imported by index.ts via
+ * `export * from "./exports.js"`.
  */
-export { ApolloWsSessionSocket } from "./api/resources/apolloWsSession/client/Socket.js";
+export * from "./core/exports.js";

package/dist/cjs/exports.js

@@ -1,13 +1,24 @@
 "use strict";
 /**
- * Custom exports for the Apollo SDK
+ * Custom exports for the Apollo SDK.
  *
  * This file is in .fernignore and won't be overwritten by Fern generation.
- * Add any custom exports here that need to be available at the package root.
+ * Add any additional package-root exports here. Imported by index.ts via
+ * `export * from "./exports.js"`.
  */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ApolloWsSessionSocket = void 0;
-// Direct export of WebSocket Socket class for TypeScript users
-// This allows: import { ApolloWsSessionSocket } from '@aui.io/aui-client'
-var Socket_js_1 = require("./api/resources/apolloWsSession/client/Socket.js");
-Object.defineProperty(exports, "ApolloWsSessionSocket", { enumerable: true, get: function () { return Socket_js_1.ApolloWsSessionSocket; } });
+__exportStar(require("./core/exports.js"), exports);

package/dist/cjs/index.d.ts

@@ -1,6 +1,6 @@
 export * as Apollo from "./api/index.js";
 export type { BaseClientOptions, BaseRequestOptions } from "./BaseClient.js";
-export { ApolloClient } from "./Client.js";
+export { ApolloClient } from "./ApolloClientWrapper.js";
 export { ApolloEnvironment, type ApolloEnvironmentUrls } from "./environments.js";
 export { ApolloError, ApolloTimeoutError } from "./errors/index.js";
 export * from "./exports.js";

package/dist/cjs/index.js

@@ -38,8 +38,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApolloTimeoutError = exports.ApolloError = exports.ApolloEnvironment = exports.ApolloClient = exports.Apollo = void 0;
 exports.Apollo = __importStar(require("./api/index.js"));
-var Client_js_1 = require("./Client.js");
-Object.defineProperty(exports, "ApolloClient", { enumerable: true, get: function () { return Client_js_1.ApolloClient; } });
+var ApolloClientWrapper_js_1 = require("./ApolloClientWrapper.js");
+Object.defineProperty(exports, "ApolloClient", { enumerable: true, get: function () { return ApolloClientWrapper_js_1.ApolloClient; } });
 var environments_js_1 = require("./environments.js");
 Object.defineProperty(exports, "ApolloEnvironment", { enumerable: true, get: function () { return environments_js_1.ApolloEnvironment; } });
 var index_js_1 = require("./errors/index.js");

package/dist/cjs/version.d.ts

@@ -1 +1 @@
-export declare const SDK_VERSION = "2.0.0";
+export declare const SDK_VERSION = "3.1.0";

package/dist/cjs/version.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SDK_VERSION = void 0;
-exports.SDK_VERSION = "2.0.0";
+exports.SDK_VERSION = "3.1.0";

package/dist/esm/ApolloClientWrapper.d.mts

@@ -0,0 +1,49 @@
+import { ApolloClient as _GeneratedClient } from "./Client.mjs";
+import type { ApolloEnvironmentUrls } from "./environments.mjs";
+import { SessionSocket } from "./api/resources/session/client/Socket.mjs";
+import type { Session } from "./api/resources/session/client/Client.mjs";
+/** Publishable-key family, inferred from the key prefix. */
+export type PublishableKeyType = "agent" | "org" | "unknown";
+export declare namespace ApolloClient {
+    interface Options {
+        /** Deployment environment. Defaults to ApolloEnvironment.Gcp. */
+        environment?: ApolloEnvironmentUrls;
+        /** Publishable key (pk_network_ or pk_org_); exchanged for a bearer token. */
+        publishableKey?: string;
+        /** Organization API key; used directly as the bearer token. */
+        organizationApiKey?: string;
+    }
+    interface ConnectArgs extends Session.ConnectArgs {
+    }
+}
+/**
+ * ApolloClient adds authentication on top of the generated client: it takes a
+ * publishable key (or organization API key) and handles the token exchange/refresh
+ * transparently. Every generated resource (agents, threads, messaging, …) is
+ * inherited unchanged.
+ */
+export declare class ApolloClient extends _GeneratedClient {
+    private readonly _tokenAuth;
+    private readonly _env;
+    constructor(options?: ApolloClient.Options);
+    /** Publishable-key family (agent / org / unknown). */
+    get keyType(): PublishableKeyType;
+    /** Agent resolved from an agent-scoped key. Populated after the first exchange. */
+    get agentId(): string | undefined;
+    /** Organization the key belongs to. Populated after the first exchange. */
+    get organizationId(): string | undefined;
+    /** Force a token exchange (if needed) and return the resolved scope. */
+    getContext(): Promise<{
+        agentId?: string;
+        organizationId?: string;
+        keyType: PublishableKeyType;
+    }>;
+    /**
+     * Open a messaging WebSocket session. The bearer token is resolved and sent as
+     * Authorization on the upgrade, and the required `aui-websocket` subprotocol is
+     * negotiated. Built here (rather than via the generated session resource) so the
+     * generated code stays vanilla — Fern emits protocols: [] and forwards only
+     * per-call headers, neither of which the v2 server accepts.
+     */
+    connect(args?: ApolloClient.ConnectArgs): Promise<SessionSocket>;
+}

package/dist/esm/ApolloClientWrapper.mjs

@@ -0,0 +1,170 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { WebSocket as NodeWebSocket } from "ws";
+import { ApolloClient as _GeneratedClient } from "./Client.mjs";
+import { ApolloEnvironment } from "./environments.mjs";
+import * as core from "./core/index.mjs";
+import { SessionSocket } from "./api/resources/session/client/Socket.mjs";
+// A publishable key is exchanged (POST /management/v1/auth/token) for a short-lived
+// bearer token; every request then sends Authorization: Bearer <token>.
+const TOKEN_EXCHANGE_PATH = "/management/v1/auth/token";
+// Re-exchange this many ms before the token expires.
+const REFRESH_SKEW_MS = 60000;
+// Messaging WebSocket channel path (relative to the environment's WS base).
+const SESSION_WS_PATH = "/messaging/v1/session";
+// The v2 messaging server negotiates this subprotocol on the WS upgrade; the
+// connection is rejected without it. Fern emits protocols: [], so we set it here.
+const WS_SUBPROTOCOL = "aui-websocket";
+// Publishable-key exchange + token caching. Kept as a standalone object so the header
+// suppliers can close over it — a subclass may not touch `this` before super() runs.
+class Auth {
+    constructor(baseUrl, publishableKey, organizationApiKey) {
+        this.pk = publishableKey;
+        this.keyType = detectKeyType(publishableKey);
+        this._staticToken = organizationApiKey;
+        this._baseUrl = baseUrl;
+    }
+    get hasCredential() {
+        return Boolean(this.pk || this._staticToken);
+    }
+    get agentId() {
+        var _a;
+        return (_a = this._cache) === null || _a === void 0 ? void 0 : _a.agentId;
+    }
+    get organizationId() {
+        var _a;
+        return (_a = this._cache) === null || _a === void 0 ? void 0 : _a.organizationId;
+    }
+    getContext() {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
+            if (this.pk)
+                yield this.getToken();
+            return { agentId: (_a = this._cache) === null || _a === void 0 ? void 0 : _a.agentId, organizationId: (_b = this._cache) === null || _b === void 0 ? void 0 : _b.organizationId, keyType: this.keyType };
+        });
+    }
+    getToken() {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
+            if (this._staticToken)
+                return this._staticToken;
+            if (!this.pk)
+                return "";
+            if (((_a = this._cache) === null || _a === void 0 ? void 0 : _a.token) && Date.now() < this._cache.expiresAt - REFRESH_SKEW_MS) {
+                return this._cache.token;
+            }
+            (_b = this._inflight) !== null && _b !== void 0 ? _b : (this._inflight = this._exchange().finally(() => {
+                this._inflight = undefined;
+            }));
+            return this._inflight;
+        });
+    }
+    _exchange() {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
+            const res = yield fetch(`${this._baseUrl}${TOKEN_EXCHANGE_PATH}`, {
+                method: "POST",
+                headers: { "Content-Type": "application/json" },
+                body: JSON.stringify({ grant_type: "publishable_key", publishable_key: this.pk }),
+            });
+            if (!res.ok) {
+                let reason = String(res.status);
+                try {
+                    reason = (_b = (_a = ((yield res.json()))) === null || _a === void 0 ? void 0 : _a.error_description) !== null && _b !== void 0 ? _b : reason;
+                }
+                catch (_c) {
+                    /* non-JSON error body */
+                }
+                throw new Error(`Publishable key exchange failed (${res.status}): ${reason}`);
+            }
+            const { access_token, expires_in, agent_id, organization_id } = (yield res.json());
+            this._cache = {
+                token: access_token,
+                expiresAt: Date.now() + expires_in * 1000,
+                agentId: agent_id !== null && agent_id !== void 0 ? agent_id : undefined,
+                organizationId: organization_id !== null && organization_id !== void 0 ? organization_id : undefined,
+            };
+            return access_token;
+        });
+    }
+}
+/**
+ * ApolloClient adds authentication on top of the generated client: it takes a
+ * publishable key (or organization API key) and handles the token exchange/refresh
+ * transparently. Every generated resource (agents, threads, messaging, …) is
+ * inherited unchanged.
+ */
+export class ApolloClient extends _GeneratedClient {
+    constructor(options = {}) {
+        var _a;
+        const env = (_a = options.environment) !== null && _a !== void 0 ? _a : ApolloEnvironment.Gcp;
+        const auth = new Auth(env.base, options.publishableKey, options.organizationApiKey);
+        super({
+            environment: env,
+            headers: Object.assign({}, (auth.hasCredential ? { Authorization: () => __awaiter(this, void 0, void 0, function* () { return `Bearer ${yield auth.getToken()}`; }) } : {})),
+        });
+        this._tokenAuth = auth;
+        this._env = env;
+    }
+    /** Publishable-key family (agent / org / unknown). */
+    get keyType() {
+        return this._tokenAuth.keyType;
+    }
+    /** Agent resolved from an agent-scoped key. Populated after the first exchange. */
+    get agentId() {
+        return this._tokenAuth.agentId;
+    }
+    /** Organization the key belongs to. Populated after the first exchange. */
+    get organizationId() {
+        return this._tokenAuth.organizationId;
+    }
+    /** Force a token exchange (if needed) and return the resolved scope. */
+    getContext() {
+        return this._tokenAuth.getContext();
+    }
+    /**
+     * Open a messaging WebSocket session. The bearer token is resolved and sent as
+     * Authorization on the upgrade, and the required `aui-websocket` subprotocol is
+     * negotiated. Built here (rather than via the generated session resource) so the
+     * generated code stays vanilla — Fern emits protocols: [] and forwards only
+     * per-call headers, neither of which the v2 server accepts.
+     */
+    connect() {
+        return __awaiter(this, arguments, void 0, function* (args = {}) {
+            var _a, _b;
+            const token = yield this._tokenAuth.getToken();
+            const headers = Object.assign(Object.assign({}, (token ? { Authorization: `Bearer ${token}` } : {})), args.headers);
+            const socket = new core.ReconnectingWebSocket({
+                url: core.url.join(this._env.production, SESSION_WS_PATH),
+                protocols: [WS_SUBPROTOCOL],
+                queryParameters: {},
+                headers,
+                options: {
+                    debug: (_a = args.debug) !== null && _a !== void 0 ? _a : false,
+                    maxRetries: (_b = args.reconnectAttempts) !== null && _b !== void 0 ? _b : 30,
+                    // On Node 22+ the global (undici) WebSocket drops custom headers on the
+                    // upgrade, so the bearer token never arrives. Force the `ws` library on
+                    // Node; browsers fall back to the native global WebSocket.
+                    WebSocket: core.RUNTIME.type === "node" ? NodeWebSocket : undefined,
+                },
+            });
+            return new SessionSocket({ socket });
+        });
+    }
+}
+function detectKeyType(publishableKey) {
+    if (!publishableKey)
+        return "unknown";
+    if (publishableKey.startsWith("pk_network_"))
+        return "agent";
+    if (publishableKey.startsWith("pk_org_"))
+        return "org";
+    return "unknown";
+}

package/dist/esm/BaseClient.d.mts

@@ -4,8 +4,6 @@ export interface BaseClientOptions {
     environment?: core.Supplier<environments.ApolloEnvironment | environments.ApolloEnvironmentUrls>;
     /** Specify a custom URL to connect the client to. */
     baseUrl?: core.Supplier<string>;
-    /** Override the x-network-api-key header */
-    networkApiKey?: core.Supplier<string | undefined>;
     /** Additional headers to include in requests. */
     headers?: Record<string, string | core.Supplier<string | null | undefined> | null | undefined>;
     /** The default maximum time to wait for a response in seconds. */
@@ -24,8 +22,6 @@ export interface BaseRequestOptions {
     maxRetries?: number;
     /** A hook to abort the request. */
     abortSignal?: AbortSignal;
-    /** Override the x-network-api-key header */
-    networkApiKey?: string | undefined;
     /** Additional query string parameters to include in the request. */
     queryParams?: Record<string, unknown>;
     /** Additional headers to include in the request. */