@code-yeongyu/senpi 2026.8.24 → 2026.8.26

package/node_modules/@anthropic-ai/sdk/client.js

@@ -9,19 +9,26 @@ const values_1 = require("./internal/utils/values.js");
 const sleep_1 = require("./internal/utils/sleep.js");
 const errors_1 = require("./internal/errors.js");
 const detect_platform_1 = require("./internal/detect-platform.js");
+const request_signal_1 = require("./internal/request-signal.js");
 const Shims = tslib_1.__importStar(require("./internal/shims.js"));
 const Opts = tslib_1.__importStar(require("./internal/request-options.js"));
 const query_1 = require("./internal/utils/query.js");
 const version_1 = require("./version.js");
 const Errors = tslib_1.__importStar(require("./core/error.js"));
+const types_1 = require("./lib/credentials/types.js");
+const token_cache_1 = require("./lib/credentials/token-cache.js");
+const credential_chain_1 = require("./lib/credentials/credential-chain.js");
+const middleware_1 = require("./core/middleware.js");
 const Pagination = tslib_1.__importStar(require("./core/pagination.js"));
 const Uploads = tslib_1.__importStar(require("./core/uploads.js"));
 const API = tslib_1.__importStar(require("./resources/index.js"));
 const api_promise_1 = require("./core/api-promise.js");
 const completions_1 = require("./resources/completions.js");
+const files_1 = require("./resources/files.js");
 const models_1 = require("./resources/models.js");
 const beta_1 = require("./resources/beta/beta.js");
 const messages_1 = require("./resources/messages/messages.js");
+const skills_1 = require("./resources/skills/skills.js");
 const detect_platform_2 = require("./internal/detect-platform.js");
 const headers_1 = require("./internal/headers.js");
 const env_1 = require("./internal/utils/env.js");
@@ -33,11 +40,25 @@ exports.AI_PROMPT = '\\n\\nAssistant:';
  * Base class for Anthropic API clients.
  */
 class BaseAnthropic {
+    /**
+     * The active credential provider. Default credential resolution runs once
+     * at construction time. If it fails, the error is surfaced on every
+     * request and the client must be reconstructed — there is no retry path.
+     *
+     * Clones returned by {@link withOptions} share the parent's auth state
+     * (provider, token cache, pending resolution, and any resolution error)
+     * unless the caller passes an explicit `apiKey`, `authToken`,
+     * `credentials`, `config`, or `profile` override.
+     */
+    get credentials() {
+        return this._authState.provider;
+    }
     /**
      * API Client for interfacing with the Anthropic API.
      *
      * @param {string | null | undefined} [opts.apiKey=process.env['ANTHROPIC_API_KEY'] ?? null]
      * @param {string | null | undefined} [opts.authToken=process.env['ANTHROPIC_AUTH_TOKEN'] ?? null]
+     * @param {string | null | undefined} [opts.webhookKey=process.env['ANTHROPIC_WEBHOOK_SIGNING_KEY'] ?? null]
      * @param {string} [opts.baseURL=process.env['ANTHROPIC_BASE_URL'] ?? https://api.anthropic.com] - Override the default base URL for the API.
      * @param {number} [opts.timeout=10 minutes] - The maximum amount of time (in milliseconds) the client will wait for a response before timing out.
      * @param {MergedRequestInit} [opts.fetchOptions] - Additional `RequestInit` options to be passed to `fetch` calls.
@@ -47,12 +68,25 @@ class BaseAnthropic {
      * @param {Record<string, string | undefined>} opts.defaultQuery - Default query parameters to include with every request to the API.
      * @param {boolean} [opts.dangerouslyAllowBrowser=false] - By default, client-side use of this library is not allowed, as it risks exposing your secret API credentials to attackers.
      */
-    constructor({ baseURL = (0, env_1.readEnv)('ANTHROPIC_BASE_URL'), apiKey = (0, env_1.readEnv)('ANTHROPIC_API_KEY') ?? null, authToken = (0, env_1.readEnv)('ANTHROPIC_AUTH_TOKEN') ?? null, ...opts } = {}) {
+    constructor({ baseURL = (0, env_1.readEnv)('ANTHROPIC_BASE_URL'), apiKey, authToken, webhookKey = (0, env_1.readEnv)('ANTHROPIC_WEBHOOK_SIGNING_KEY') ?? null, ...opts } = {}) {
         _BaseAnthropic_instances.add(this);
+        this._requestAuthFlags = new WeakMap();
         _BaseAnthropic_encoder.set(this, void 0);
+        // An explicit `profile` is a constructor-level credential choice; when set,
+        // do not let env ANTHROPIC_API_KEY / ANTHROPIC_AUTH_TOKEN shadow it.
+        if (apiKey === undefined) {
+            apiKey = opts.profile != null ? null : (0, env_1.readEnv)('ANTHROPIC_API_KEY') ?? null;
+        }
+        if (authToken === undefined) {
+            authToken = opts.profile != null ? null : (0, env_1.readEnv)('ANTHROPIC_AUTH_TOKEN') ?? null;
+        }
+        if (opts.profile != null && (opts.credentials != null || opts.config != null)) {
+            throw new TypeError('Pass at most one of `profile`, `credentials`, or `config`.');
+        }
         const options = {
             apiKey,
             authToken,
+            webhookKey,
             ...opts,
             baseURL: baseURL || `https://api.anthropic.com`,
         };
@@ -60,41 +94,220 @@ class BaseAnthropic {
             throw new Errors.AnthropicError("It looks like you're running in a browser-like environment.\n\nThis is disabled by default, as it risks exposing your secret API credentials to attackers.\nIf you understand the risks and have appropriate mitigations in place,\nyou can set the `dangerouslyAllowBrowser` option to `true`, e.g.,\n\nnew Anthropic({ apiKey, dangerouslyAllowBrowser: true });\n");
         }
         this.baseURL = options.baseURL;
+        // After destructuring, `baseURL` is the constructor arg or
+        // ANTHROPIC_BASE_URL — both count as an explicit choice that a profile
+        // base_url must not override. A falsy value means we fell through to the
+        // hardcoded default above and a profile may supply the host. withOptions()
+        // propagates the parent's flag via __baseURLIsExplicit so a non-overriding
+        // clone doesn't mistake the inherited baseURL for a caller-supplied one.
+        this._baseURLIsExplicit = opts.__baseURLIsExplicit ?? !!baseURL;
         this.timeout = options.timeout ?? _a.DEFAULT_TIMEOUT /* 10 minutes */;
         this.logger = options.logger ?? console;
-        const defaultLogLevel = 'warn';
         // Set default logLevel early so that we can log a warning in parseLogLevel.
-        this.logLevel = defaultLogLevel;
+        this.logLevel = log_1.defaultLogLevel;
         this.logLevel =
-            (0, log_1.parseLogLevel)(options.logLevel, 'ClientOptions.logLevel', this) ??
-                (0, log_1.parseLogLevel)((0, env_1.readEnv)('ANTHROPIC_LOG'), "process.env['ANTHROPIC_LOG']", this) ??
-                defaultLogLevel;
+            (0, log_1.parseLogLevel)(options.logLevel, 'ClientOptions.logLevel', (0, log_1.loggerFor)(this)) ??
+                (0, log_1.parseLogLevel)((0, env_1.readEnv)('ANTHROPIC_LOG'), "process.env['ANTHROPIC_LOG']", (0, log_1.loggerFor)(this)) ??
+                log_1.defaultLogLevel;
         this.fetchOptions = options.fetchOptions;
         this.maxRetries = options.maxRetries ?? 2;
         this.fetch = options.fetch ?? Shims.getDefaultFetch();
         tslib_1.__classPrivateFieldSet(this, _BaseAnthropic_encoder, Opts.FallbackEncoder, "f");
+        this.middleware = [...(options.middleware ?? [])];
+        const customHeadersEnv = (0, env_1.readEnv)('ANTHROPIC_CUSTOM_HEADERS');
+        if (customHeadersEnv) {
+            const parsed = {};
+            for (const line of customHeadersEnv.split('\n')) {
+                const colon = line.indexOf(':');
+                if (colon >= 0) {
+                    parsed[line.substring(0, colon).trim()] = line.substring(colon + 1).trim();
+                }
+            }
+            options.defaultHeaders = { ...parsed, ...options.defaultHeaders };
+        }
+        const inherited = opts.__auth;
+        // Never persist the internal __auth handle on _options — it's a
+        // one-shot constructor signal, and leaking it through _options would
+        // cause withOptions() to spread a stale value into clones.
+        delete options.__auth;
+        delete options.__baseURLIsExplicit;
         this._options = options;
         this.apiKey = typeof apiKey === 'string' ? apiKey : null;
         this.authToken = authToken;
+        this.webhookKey = webhookKey;
+        if (inherited) {
+            this._authState = inherited;
+            if (!this._baseURLIsExplicit && inherited.baseURL) {
+                this.baseURL = inherited.baseURL;
+            }
+        }
+        else {
+            this._authState = { provider: null, tokenCache: null, resolution: null, error: null, extraHeaders: {} };
+            // apiKey/authToken win over credentials/config/profile; don't build a
+            // token cache or resolve a config that the request path will then ignore.
+            if (this.apiKey == null && this.authToken == null) {
+                const credentials = options.credentials ?? null;
+                if (credentials) {
+                    this._authState.provider = credentials;
+                    this._authState.tokenCache = this._makeTokenCache(credentials);
+                }
+                else if (options.config != null) {
+                    const result = (0, credential_chain_1.resolveCredentialsFromConfig)(options.config, this._credentialResolverOptions());
+                    this._authState.provider = result.provider;
+                    this._authState.tokenCache = this._makeTokenCache(result.provider);
+                    this._authState.extraHeaders = result.extraHeaders;
+                    this._applyCredentialBaseURL(result.baseURL);
+                }
+                else if (options.profile != null) {
+                    this._authState.resolution = this._resolveDefaultCredentials(options.profile);
+                }
+                else if (this._shouldResolveDefaultCredentials()) {
+                    // No explicit auth provided — lazily resolve from the credential
+                    // chain on first request. Errors are captured into _auth.error and
+                    // surfaced on first use rather than as an unhandled rejection.
+                    this._authState.resolution = this._resolveDefaultCredentials();
+                }
+            }
+        }
+    }
+    /**
+     * Whether to lazily resolve auth from the default credential chain when no
+     * explicit auth is configured. Called once from the constructor, so
+     * overrides must not depend on subclass instance state. Subclasses that
+     * bring their own auth scheme return false so unrelated local credentials
+     * are never resolved or allowed to supply a base URL.
+     */
+    _shouldResolveDefaultCredentials() {
+        return true;
+    }
+    /**
+     * Stores a profile/config-supplied base URL on the shared auth state and, if
+     * the caller did not pin `baseURL` via constructor option or env, adopts it
+     * as this client's outbound API host. Precedence: ctor opt > env > profile >
+     * hardcoded default.
+     */
+    _applyCredentialBaseURL(baseURL) {
+        if (!baseURL)
+            return;
+        const normalized = baseURL.replace(/\/+$/, '');
+        this._authState.baseURL = normalized;
+        if (!this._baseURLIsExplicit) {
+            this.baseURL = normalized;
+        }
+    }
+    /**
+     * Options bag passed into the credential chain. `baseURL` here is only the
+     * fallback host for the token-exchange POST when the config itself omits
+     * `base_url`; the chain returns the config's own `base_url` (if any) on
+     * {@link CredentialResult.baseURL}, which {@link _applyCredentialBaseURL}
+     * then adopts for outbound API requests. The two are deliberately decoupled
+     * so this fallback never round-trips into precedence.
+     */
+    _credentialResolverOptions() {
+        return {
+            baseURL: this.baseURL,
+            fetch: this._credentialsFetch(),
+            userAgent: this.getUserAgent(),
+            onCacheWriteError: (err) => {
+                (0, log_1.loggerFor)(this).debug('credential cache write failed (best-effort)', err);
+            },
+            onSafetyWarning: (msg) => {
+                (0, log_1.loggerFor)(this).warn(msg);
+            },
+        };
+    }
+    /**
+     * A `Fetch` for first-party credential token-exchange requests (OIDC
+     * federation jwt-bearer grants, user-OAuth refresh grants) that routes
+     * through this client's middleware chain, so middleware observes token
+     * traffic like any other request. Only client-level middleware applies:
+     * a minted token is shared across requests, so attributing the exchange
+     * to any one request's per-request middleware would be arbitrary. For the
+     * same reason, `ctx.options` is undefined for these requests.
+     */
+    _credentialsFetch() {
+        return (0, middleware_1.wrapFetchWithMiddleware)(this.fetch, this.middleware, undefined, this);
+    }
+    _makeTokenCache(provider) {
+        return new token_cache_1.TokenCache(provider, (err) => {
+            (0, log_1.loggerFor)(this).debug('advisory token refresh failed; serving cached token', err);
+        });
     }
     /**
      * Create a new client instance re-using the same options given to the current client with optional overriding.
      */
     withOptions(options) {
-        const client = new this.constructor({
+        // Share the auth state object unless the caller passes any auth-related
+        // key. The `in` check is intentional: even `apiKey: undefined` opts the
+        // clone out of sharing (it gets its own _auth and TokenCache, though it
+        // may still wrap the parent's provider via the credentials spread below).
+        const overridesStructuredAuth = 'credentials' in options || 'config' in options || 'profile' in options;
+        const overridesAuth = 'apiKey' in options || 'authToken' in options || overridesStructuredAuth;
+        const internal = {
             ...this._options,
-            baseURL: this.baseURL,
+            // Only forward baseURL when the caller (or env) explicitly chose it.
+            // For a non-explicit parent, this.baseURL may have been mutated to the
+            // profile-resolved host; pinning that as the clone's options.baseURL
+            // would make _options on the clone misreport caller intent and would
+            // leave the clone stuck on the parent's host across an auth override.
+            // The clone instead receives the construction-time value via
+            // ...this._options above and re-adopts the profile host through the
+            // shared _authState.baseURL + __baseURLIsExplicit=false path.
+            ...(this._baseURLIsExplicit ? { baseURL: this.baseURL } : {}),
             maxRetries: this.maxRetries,
             timeout: this.timeout,
             logger: this.logger,
             logLevel: this.logLevel,
             fetch: this.fetch,
             fetchOptions: this.fetchOptions,
+            middleware: this.middleware,
             apiKey: this.apiKey,
             authToken: this.authToken,
+            webhookKey: this.webhookKey,
+            // credentials: this.credentials is a no-op when __auth is shared (the
+            // ctor takes the inherited path and ignores options.credentials); when
+            // overridesAuth is true via apiKey/authToken only, it lets the clone
+            // build a fresh TokenCache around the parent's provider.
+            credentials: this.credentials,
+            // When the caller passes a structured-credential override, drop inherited
+            // structured-credential options so only `...options` supplies them —
+            // otherwise an inherited `credentials`/`config`/`profile` would trip the
+            // mutual-exclusion check or precedence over the override.
+            ...(overridesStructuredAuth ? { credentials: undefined, config: undefined, profile: undefined } : {}),
             ...options,
-        });
-        return client;
+            // Always set __auth so any stale value from ...this._options is
+            // overwritten. undefined means "build fresh auth from these options".
+            __auth: overridesAuth ? undefined : this._authState,
+            __baseURLIsExplicit: 'baseURL' in options ? true : this._baseURLIsExplicit,
+        };
+        return new this.constructor(internal);
+    }
+    /**
+     * Lazily resolves credentials from config files or environment variables.
+     * Called once from the constructor when no explicit auth is provided, or
+     * when an explicit `profile` was passed (in which case a missing/unresolved
+     * profile is surfaced as an error instead of falling through to "no auth").
+     * The returned promise is stored and awaited on the first request.
+     */
+    async _resolveDefaultCredentials(profile) {
+        try {
+            const result = await (0, credential_chain_1.defaultCredentials)(this._credentialResolverOptions(), profile);
+            if (result) {
+                this._authState.provider = result.provider;
+                this._authState.tokenCache = this._makeTokenCache(result.provider);
+                this._authState.extraHeaders = result.extraHeaders;
+                this._applyCredentialBaseURL(result.baseURL);
+            }
+            else if (profile != null) {
+                throw new Errors.AnthropicError(`Profile "${profile}" could not be resolved (no <config_dir>/configs/${profile}.json found).`);
+            }
+        }
+        catch (err) {
+            this._authState.error = err;
+        }
+        finally {
+            this._authState.resolution = null;
+        }
     }
     defaultQuery() {
         return this._options.defaultQuery;
@@ -103,6 +316,12 @@ class BaseAnthropic {
         if (values.get('x-api-key') || values.get('authorization')) {
             return;
         }
+        if (this._authState.error) {
+            throw this._authState.error;
+        }
+        if (this._authState.tokenCache || this._authState.resolution) {
+            return; // auth will be injected per-request via authHeaders
+        }
         if (this.apiKey && values.get('x-api-key')) {
             return;
         }
@@ -115,9 +334,32 @@ class BaseAnthropic {
         if (nulls.has('authorization')) {
             return;
         }
-        throw new Error('Could not resolve authentication method. Expected either apiKey or authToken to be set. Or for one of the "X-Api-Key" or "Authorization" headers to be explicitly omitted');
+        throw new Error('Could not resolve authentication method. Expected one of apiKey, authToken, credentials, config, or profile to be set. Or for one of the "X-Api-Key" or "Authorization" headers to be explicitly omitted');
+    }
+    _authFlags(opts) {
+        let flags = this._requestAuthFlags.get(opts);
+        if (!flags) {
+            flags = { usedTokenCache: false, didRefreshFor401: false };
+            this._requestAuthFlags.set(opts, flags);
+        }
+        return flags;
     }
     async authHeaders(opts) {
+        // Wait for lazy credential resolution if it's in progress. If it failed,
+        // return no auth headers — validateHeaders surfaces the stored error
+        // after the explicit-header escape hatch has had a chance to apply.
+        if (this._authState.resolution) {
+            await this._authState.resolution;
+        }
+        if (this._authState.error) {
+            return undefined;
+        }
+        // If we have a token cache and no API key is set, use token auth
+        if (this._authState.tokenCache && this.apiKey == null) {
+            const token = await this._authState.tokenCache.getToken();
+            this._authFlags(opts).usedTokenCache = true;
+            return (0, headers_1.buildHeaders)([{ Authorization: `Bearer ${token}` }]);
+        }
         return (0, headers_1.buildHeaders)([await this.apiKeyAuth(opts), await this.bearerAuth(opts)]);
     }
     async apiKeyAuth(opts) {
@@ -132,14 +374,11 @@ class BaseAnthropic {
         }
         return (0, headers_1.buildHeaders)([{ Authorization: `Bearer ${this.authToken}` }]);
     }
-    /**
-     * Basic re-implementation of `qs.stringify` for primitive types.
-     */
     stringifyQuery(query) {
         return (0, query_1.stringifyQuery)(query);
     }
     getUserAgent() {
-        return `${this.constructor.name}/JS ${version_1.VERSION}`;
+        return `Anthropic/JS ${version_1.VERSION}`;
     }
     defaultIdempotencyKey() {
         return `stainless-node-retry-${(0, uuid_1.uuid4)()}`;
@@ -180,8 +419,58 @@ class BaseAnthropic {
      *
      * This is useful for cases where you want to add certain headers based off of
      * the request properties, e.g. `method` or `url`.
+     *
+     * Runs after all middleware (including {@link backendMiddleware}),
+     * immediately before each underlying fetch call, so it sees exactly what
+     * goes over the wire. Middleware may replay a request by calling `next()`
+     * more than once, so this hook can run multiple times per attempt:
+     * overrides must be idempotent and overwrite headers from a previous
+     * invocation rather than append to them.
      */
-    async prepareRequest(request, { url, options }) { }
+    async prepareRequest(request, { url, options }) {
+        // Append auth-derived headers when using token auth. Done here (after all
+        // header merging) rather than in authHeaders() so we append to any existing
+        // anthropic-beta values instead of being overwritten by later header sources.
+        if (this._authState.tokenCache && this.apiKey == null) {
+            // Normalize to a Headers instance — custom fetch impls or polyfills can
+            // hand back arrays / plain objects, and silently dropping the beta
+            // header in that case would surface as a confusing server-side 4xx.
+            const headers = request.headers instanceof Headers ? request.headers : new Headers(request.headers);
+            for (const [k, v] of Object.entries(this._authState.extraHeaders)) {
+                if (!headers.has(k))
+                    headers.set(k, v);
+            }
+            const existing = headers
+                .get('anthropic-beta')
+                ?.split(',')
+                .map((s) => s.trim());
+            if (!existing?.includes(types_1.OAUTH_API_BETA_HEADER)) {
+                headers.append('anthropic-beta', types_1.OAUTH_API_BETA_HEADER);
+            }
+            request.headers = headers;
+        }
+    }
+    /**
+     * Internal {@link Middleware} composed innermost in the chain — inside both
+     * client-level and per-request middleware, immediately around the underlying
+     * `fetch`. Subclasses for third-party backends override this to adapt the
+     * canonical Anthropic-shaped request to the backend's wire shape (URL/body
+     * rewriting, request signing) and to normalize the wire response back to the
+     * canonical shape (e.g. AWS EventStream to SSE).
+     *
+     * Running inside the user's middleware means user middleware always observes
+     * canonical Anthropic-shaped traffic, and the adaptation re-runs (e.g.
+     * re-signs) on every `next()` invocation, covering whatever the middleware
+     * mutated.
+     *
+     * Errors thrown here follow the middleware error policy: they propagate to
+     * the caller as-is — no retries, no `APIConnectionError` wrapping — unless
+     * retryable (see {@link Middleware}); throw a `RetryableError` to opt into
+     * the retry path.
+     */
+    backendMiddleware() {
+        return [];
+    }
     get(path, opts) {
         return this.methodRequest('get', path, opts);
     }
@@ -210,30 +499,29 @@ class BaseAnthropic {
         const maxRetries = options.maxRetries ?? this.maxRetries;
         if (retriesRemaining == null) {
             retriesRemaining = maxRetries;
+            // Top-level call: reset per-request auth flags so a reused options object
+            // (via client.request(opts)) doesn't carry stale 401-refresh state.
+            this._requestAuthFlags.delete(options);
         }
         await this.prepareOptions(options);
         const { req, url, timeout } = await this.buildRequest(options, {
             retryCount: maxRetries - retriesRemaining,
         });
-        await this.prepareRequest(req, { url, options });
         /** Not an API request ID, just for correlating local log entries. */
         const requestLogID = 'log_' + ((Math.random() * (1 << 24)) | 0).toString(16).padStart(6, '0');
         const retryLogStr = retryOfRequestLogID === undefined ? '' : `, retryOf: ${retryOfRequestLogID}`;
         const startTime = Date.now();
-        (0, log_1.loggerFor)(this).debug(`[${requestLogID}] sending request`, (0, log_1.formatRequestDetails)({
-            retryOfRequestLogID,
-            method: options.method,
-            url,
-            options,
-            headers: req.headers,
-        }));
         if (options.signal?.aborted) {
             throw new Errors.APIUserAbortError();
         }
         const controller = new AbortController();
-        const response = await this.fetchWithTimeout(url, req, timeout, controller).catch(errors_1.castToError);
+        const response = await this.fetchWithTimeout(url, req, timeout, controller, options, {
+            requestLogID,
+            retryOfRequestLogID,
+        }).catch(errors_1.castToError);
         const headersTime = Date.now();
         if (response instanceof globalThis.Error) {
+            (0, request_signal_1.releaseRequestSignal)(controller);
             const retryMessage = `retrying, ${retriesRemaining} attempts remaining`;
             if (options.signal?.aborted) {
                 throw new Errors.APIUserAbortError();
@@ -244,6 +532,22 @@ class BaseAnthropic {
             // others do not provide enough information to distinguish timeouts from other connection errors
             const isTimeout = (0, errors_1.isAbortError)(response) ||
                 /timed? ?out/i.test(String(response) + ('cause' in response ? String(response.cause) : ''));
+            // Errors thrown by middleware (user middleware and the backend adaptation
+            // alike) propagate to the caller as-is — no retries, no APIConnectionError
+            // wrapping — except retryable errors (timeouts/aborts, APIConnectionErrors,
+            // and RetryableErrors, directly or in the `cause` chain), which stay on the
+            // retry path.
+            const hasMiddleware = this.middleware.length > 0 || !!options.middleware?.length || this.backendMiddleware().length > 0;
+            if (hasMiddleware && !isTimeout && !(0, middleware_1.isRetryableError)(response)) {
+                (0, log_1.loggerFor)(this).info(`[${requestLogID}] middleware error (not retryable)`);
+                (0, log_1.loggerFor)(this).debug(`[${requestLogID}] middleware error (not retryable)`, (0, log_1.formatRequestDetails)({
+                    retryOfRequestLogID,
+                    url,
+                    durationMs: headersTime - startTime,
+                    message: response.message,
+                }));
+                throw response;
+            }
             if (retriesRemaining) {
                 (0, log_1.loggerFor)(this).info(`[${requestLogID}] connection ${isTimeout ? 'timed out' : 'failed'} - ${retryMessage}`);
                 (0, log_1.loggerFor)(this).debug(`[${requestLogID}] connection ${isTimeout ? 'timed out' : 'failed'} (${retryMessage})`, (0, log_1.formatRequestDetails)({
@@ -264,19 +568,25 @@ class BaseAnthropic {
             if (isTimeout) {
                 throw new Errors.APIConnectionTimeoutError();
             }
+            // a retryable middleware-origin error is still the caller's error: once retries are
+            // exhausted it propagates as-is rather than wrapped in APIConnectionError
+            if (hasMiddleware && !(0, middleware_1.isFetchOriginError)(response)) {
+                throw response;
+            }
             throw new Errors.APIConnectionError({ cause: response });
         }
         const specialHeaders = [...response.headers.entries()]
-            .filter(([name]) => name === 'request-id')
+            .filter(([name]) => name === 'request-id' || name === 'anthropic-workspace-id')
             .map(([name, value]) => ', ' + name + ': ' + JSON.stringify(value))
             .join('');
         const responseInfo = `[${requestLogID}${retryLogStr}${specialHeaders}] ${req.method} ${url} ${response.ok ? 'succeeded' : 'failed'} with status ${response.status} in ${headersTime - startTime}ms`;
         if (!response.ok) {
-            const shouldRetry = await this.shouldRetry(response);
+            const shouldRetry = await this.shouldRetry(response, options);
             if (retriesRemaining && shouldRetry) {
                 const retryMessage = `retrying, ${retriesRemaining} attempts remaining`;
                 // We don't need the body of this response.
                 await Shims.CancelReadableStream(response.body);
+                (0, request_signal_1.releaseRequestSignal)(controller);
                 (0, log_1.loggerFor)(this).info(`${responseInfo} - ${retryMessage}`);
                 (0, log_1.loggerFor)(this).debug(`[${requestLogID}] response error (${retryMessage})`, (0, log_1.formatRequestDetails)({
                     retryOfRequestLogID,
@@ -300,6 +610,7 @@ class BaseAnthropic {
                 message: errMessage,
                 durationMs: Date.now() - startTime,
             }));
+            (0, request_signal_1.releaseRequestSignal)(controller);
             const err = this.makeStatusError(response.status, errJSON, errMessage, response.headers);
             throw err;
         }
@@ -311,6 +622,7 @@ class BaseAnthropic {
             headers: response.headers,
             durationMs: headersTime - startTime,
         }));
+        (0, request_signal_1.armAbandonmentBackstop)(response.body ?? response, controller);
         return { response, options, controller, requestLogID, retryOfRequestLogID, startTime };
     }
     getAPIList(path, Page, opts) {
@@ -322,7 +634,7 @@ class BaseAnthropic {
         const request = this.makeRequest(options, null, undefined);
         return new Pagination.PagePromise(this, request, Page);
     }
-    async fetchWithTimeout(url, init, ms, controller) {
+    async fetchWithTimeout(url, init, ms, controller, requestOptions, logCtx) {
         const { signal, method, ...options } = init || {};
         // Avoid creating a closure over `this`, `init`, or `options` to prevent memory leaks.
         // An arrow function like `() => controller.abort()` captures the surrounding scope,
@@ -331,9 +643,10 @@ class BaseAnthropic {
         // the lifetime of the signal. Using `.bind()` only retains a reference to the
         // controller itself.
         const abort = this._makeAbort(controller);
-        if (signal)
+        if (signal) {
             signal.addEventListener('abort', abort, { once: true });
-        const timeout = setTimeout(abort, ms);
+            (0, request_signal_1.registerRequestSignalCleanup)(controller, signal, abort);
+        }
         const isReadableBody = (globalThis.ReadableStream && options.body instanceof globalThis.ReadableStream) ||
             (typeof options.body === 'object' && options.body !== null && Symbol.asyncIterator in options.body);
         const fetchOptions = {
@@ -347,15 +660,65 @@ class BaseAnthropic {
             // See https://github.com/nodejs/undici/issues/2294
             fetchOptions.method = method.toUpperCase();
         }
-        try {
-            // use undefined this binding; fetch errors if bound to something else in browser/cloudflare
-            return await this.fetch.call(undefined, url, fetchOptions);
-        }
-        finally {
-            clearTimeout(timeout);
+        // Arm the timeout around the underlying fetch only, not the middleware
+        // chain — middleware can take arbitrarily long (or call `next` more than
+        // once), and each inner-fetch invocation gets its own `ms` timer.
+        const baseFetch = this.fetch;
+        const timedFetch = async (innerUrl, innerInit) => {
+            const timeout = setTimeout(abort, ms);
+            try {
+                return await baseFetch.call(undefined, innerUrl, innerInit);
+            }
+            finally {
+                clearTimeout(timeout);
+            }
+        };
+        // Prepare the request (auth signing and other `prepareRequest` hooks) as
+        // the innermost step, after any middleware — including the backend
+        // middleware, so it sees exactly what goes over the wire. Runs per
+        // inner-fetch invocation, so a request middleware rewrote — or replayed
+        // via a second `next()` call — is prepared fresh each time. Preparation is
+        // outside the timeout timer, matching its pre-middleware behavior.
+        const innerFetch = requestOptions === undefined ? timedFetch : (async (innerUrl, innerInit = {}) => {
+            const innerUrlStr = typeof innerUrl === 'string' ? innerUrl
+                : innerUrl instanceof URL ? innerUrl.href
+                    : innerUrl.url;
+            innerInit.headers =
+                innerInit.headers instanceof Headers ? innerInit.headers : new Headers(innerInit.headers);
+            await this.prepareRequest(innerInit, { url: innerUrlStr, options: requestOptions });
+            if (logCtx) {
+                (0, log_1.loggerFor)(this).debug(`[${logCtx.requestLogID}] sending request`, (0, log_1.formatRequestDetails)({
+                    retryOfRequestLogID: logCtx.retryOfRequestLogID,
+                    method: innerInit.method,
+                    url: innerUrlStr,
+                    options: requestOptions,
+                    headers: innerInit.headers,
+                }));
+            }
+            return timedFetch(innerUrl, innerInit);
+        });
+        const requestMiddleware = requestOptions?.middleware;
+        const backendMiddleware = this.backendMiddleware();
+        const allMiddleware = requestMiddleware?.length || backendMiddleware.length ?
+            [...this.middleware, ...(requestMiddleware ?? []), ...backendMiddleware]
+            : this.middleware;
+        return await (0, middleware_1.wrapFetchWithMiddleware)(innerFetch, allMiddleware, requestOptions, this)(url, fetchOptions);
+    }
+    async shouldRetry(response, options) {
+        // Reactive refresh: on a 401 from a request that used the token cache,
+        // invalidate and retry once. Only fires when this specific request was
+        // bearer-authenticated (not when an apiKey was used) and only once per
+        // request — a second 401 after refresh falls through to the normal
+        // retry policy below (which treats 4xx as non-retryable).
+        const flags = this._authFlags(options);
+        if (response.status === 401 &&
+            this._authState.tokenCache &&
+            flags.usedTokenCache &&
+            !flags.didRefreshFor401) {
+            flags.didRefreshFor401 = true;
+            this._authState.tokenCache.invalidate();
+            return true;
         }
-    }
-    async shouldRetry(response) {
         // Note this is not a standard header.
         const shouldRetryHeader = response.headers.get('x-should-retry');
         // If the server explicitly says whether or not to retry, obey.
@@ -429,6 +792,16 @@ class BaseAnthropic {
     async buildRequest(inputOptions, { retryCount = 0 } = {}) {
         const options = { ...inputOptions };
         const { method, path, query, defaultBaseURL } = options;
+        // Lazy credential resolution may carry a profile-supplied baseURL. Await
+        // it before building the request URL so the very first request — and
+        // requests on withOptions() clones created before resolution settled —
+        // hit the profile's host rather than the hardcoded default.
+        if (this._authState.resolution) {
+            await this._authState.resolution;
+        }
+        if (!this._baseURLIsExplicit && this._authState.baseURL && this.baseURL !== this._authState.baseURL) {
+            this.baseURL = this._authState.baseURL;
+        }
         const url = this.buildURL(path, query, defaultBaseURL);
         if ('timeout' in options)
             (0, values_1.validatePositiveInteger)('timeout', options.timeout);
@@ -551,6 +924,8 @@ class Anthropic extends BaseAnthropic {
         this.completions = new API.Completions(this);
         this.messages = new API.Messages(this);
         this.models = new API.Models(this);
+        this.files = new API.Files(this);
+        this.skills = new API.Skills(this);
         this.beta = new API.Beta(this);
     }
 }
@@ -558,5 +933,7 @@ exports.Anthropic = Anthropic;
 Anthropic.Completions = completions_1.Completions;
 Anthropic.Messages = messages_1.Messages;
 Anthropic.Models = models_1.Models;
+Anthropic.Files = files_1.Files;
+Anthropic.Skills = skills_1.Skills;
 Anthropic.Beta = beta_1.Beta;
 //# sourceMappingURL=client.js.map