@rulvar/anthropic 1.14.0 → 1.16.0

package/dist/index.d.ts

@@ -1,3 +1,4 @@
+import Anthropic, { ClientOptions } from "@anthropic-ai/sdk";
 import { CanonicalId, ChatEvent, ChatRequest, FinishInfo, ModelCaps, PriceTable, ProviderAdapter, Usage, WireError } from "@rulvar/core";
 
 //#region src/caps.d.ts
@@ -59,16 +60,44 @@ interface AnthropicClientLike {
     }>;
   };
 }
+/**
+* Official SDK construction options forwarded verbatim to
+* `new Anthropic(...)`, minus `maxRetries`: Rulvar owns retries and
+* wall-clock, so SDK autoretries stay disabled no matter what is passed
+* here. This is the production surface for every credential mode the
+* SDK supports beyond a plain API key: bearer `authToken`, an
+* `AccessTokenProvider` via `credentials`, an `AnthropicConfig` via
+* `config` (OIDC/workload-identity federation included), a named
+* `profile`, plus `fetch`, `timeout`, and `defaultHeaders`.
+*/
+type AnthropicSdkOptions = Omit<ClientOptions, "maxRetries">;
 interface AnthropicAdapterOptions {
+  /** Shorthand for `sdkOptions.apiKey`; setting both is a ConfigError. */
   apiKey?: string;
+  /** Shorthand for `sdkOptions.baseURL`; setting both is a ConfigError. */
   baseURL?: string;
-  /** Test seam: a preconstructed client; production uses @anthropic-ai/sdk. */
-  client?: AnthropicClientLike;
+  /** Official SDK construction options; see `AnthropicSdkOptions`. */
+  sdkOptions?: AnthropicSdkOptions;
+  /**
+  * A preconstructed client instead of the construction options above
+  * (combining them is a ConfigError): the official `Anthropic` instance
+  * (production; it must be constructed with `maxRetries: 0`) or a
+  * structural `AnthropicClientLike` mock (tests).
+  */
+  client?: Anthropic | AnthropicClientLike;
 }
 /**
 * Creates the first-class Anthropic adapter (id 'anthropic'). SDK
 * autoretries are disabled (max_retries 0): the core owns retries and
-* wall-clock.
+* wall-clock. With no auth option at all, the underlying SDK resolves
+* credentials itself: `ANTHROPIC_API_KEY`, then bearer
+* `ANTHROPIC_AUTH_TOKEN`, then its config-file credential chain. When
+* `sdkOptions` carries structured auth (`credentials`, `config`, or
+* `profile`) and no `apiKey`/`authToken` is set anywhere, ambient
+* environment credentials are suppressed (explicit `apiKey: null,
+* authToken: null` are passed to the SDK), so the configured provider
+* is the one that authenticates; the SDK itself would otherwise let an
+* environment `ANTHROPIC_API_KEY` win over the provider.
 */
 declare function anthropic(options?: AnthropicAdapterOptions): ProviderAdapter;
 //#endregion
@@ -147,4 +176,4 @@ declare function mapAnthropicStream(stream: AsyncIterable<AnthropicStreamEvent>,
 */
 declare function anthropicErrorToWire(error: unknown): WireError;
 //#endregion
-export { ANTHROPIC_MODELS, ANTHROPIC_PRICING, type AnthropicAdapterOptions, type AnthropicClientLike, type AnthropicModelInfo, type AnthropicStreamEvent, DEFAULT_PAUSE_TURN_MAX_CONTINUATIONS, IdMap, type TurnMapping, anthropic, anthropicErrorToWire, anthropicModelInfo, buildAnthropicParams, mapAnthropicStream, mapStopReason, normalizeAnthropicUsage };
+export { ANTHROPIC_MODELS, ANTHROPIC_PRICING, type AnthropicAdapterOptions, type AnthropicClientLike, type AnthropicModelInfo, type AnthropicSdkOptions, type AnthropicStreamEvent, DEFAULT_PAUSE_TURN_MAX_CONTINUATIONS, IdMap, type TurnMapping, anthropic, anthropicErrorToWire, anthropicModelInfo, buildAnthropicParams, mapAnthropicStream, mapStopReason, normalizeAnthropicUsage };

package/dist/index.js

@@ -1,5 +1,5 @@
 import Anthropic from "@anthropic-ai/sdk";
-import { createCanonicalIdMinter, isStrictCompatibleSchema } from "@rulvar/core";
+import { ConfigError, createCanonicalIdMinter, isStrictCompatibleSchema } from "@rulvar/core";
 //#region src/caps.ts
 const ALL_EFFORTS = [
 	"low",
@@ -665,17 +665,43 @@ function anthropicErrorToWire(error) {
 */
 /** pause_turn continuation cap. */
 const DEFAULT_PAUSE_TURN_MAX_CONTINUATIONS = 5;
+function resolveAnthropicClient(options) {
+	if (options.client !== void 0) {
+		if (options.apiKey !== void 0 || options.baseURL !== void 0 || options.sdkOptions !== void 0) throw new ConfigError("anthropic(): 'client' is mutually exclusive with 'apiKey', 'baseURL', and 'sdkOptions'; configure the preconstructed client directly");
+		const maxRetries = options.client.maxRetries;
+		if (typeof maxRetries === "number" && maxRetries !== 0) throw new ConfigError(`anthropic(): the injected client has SDK autoretries enabled (maxRetries ${String(maxRetries)}); construct it with maxRetries: 0, Rulvar owns retries and wall-clock`);
+		return options.client;
+	}
+	const sdkOptions = options.sdkOptions ?? {};
+	if (options.apiKey !== void 0 && sdkOptions.apiKey !== void 0) throw new ConfigError("anthropic(): 'apiKey' and 'sdkOptions.apiKey' are both set; pick one place");
+	if (options.baseURL !== void 0 && sdkOptions.baseURL !== void 0) throw new ConfigError("anthropic(): 'baseURL' and 'sdkOptions.baseURL' are both set; pick one place");
+	const suppressAmbientEnv = (sdkOptions.credentials != null || sdkOptions.config != null || sdkOptions.profile != null) && options.apiKey === void 0 && sdkOptions.apiKey === void 0 && sdkOptions.authToken === void 0;
+	return new Anthropic({
+		...sdkOptions,
+		...suppressAmbientEnv ? {
+			apiKey: null,
+			authToken: null
+		} : {},
+		...options.apiKey === void 0 ? {} : { apiKey: options.apiKey },
+		...options.baseURL === void 0 ? {} : { baseURL: options.baseURL },
+		maxRetries: 0
+	});
+}
 /**
 * Creates the first-class Anthropic adapter (id 'anthropic'). SDK
 * autoretries are disabled (max_retries 0): the core owns retries and
-* wall-clock.
+* wall-clock. With no auth option at all, the underlying SDK resolves
+* credentials itself: `ANTHROPIC_API_KEY`, then bearer
+* `ANTHROPIC_AUTH_TOKEN`, then its config-file credential chain. When
+* `sdkOptions` carries structured auth (`credentials`, `config`, or
+* `profile`) and no `apiKey`/`authToken` is set anywhere, ambient
+* environment credentials are suppressed (explicit `apiKey: null,
+* authToken: null` are passed to the SDK), so the configured provider
+* is the one that authenticates; the SDK itself would otherwise let an
+* environment `ANTHROPIC_API_KEY` win over the provider.
 */
 function anthropic(options = {}) {
-	const client = options.client ?? new Anthropic({
-		...options.apiKey === void 0 ? {} : { apiKey: options.apiKey },
-		...options.baseURL === void 0 ? {} : { baseURL: options.baseURL },
-		maxRetries: 0
-	});
+	const client = resolveAnthropicClient(options);
 	const ids = new IdMap(createCanonicalIdMinter());
 	const refreshed = /* @__PURE__ */ new Map();
 	function infoFor(model) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rulvar/anthropic",
-  "version": "1.14.0",
+  "version": "1.16.0",
   "description": "Rulvar first-class provider adapter over @anthropic-ai/sdk.",
   "type": "module",
   "license": "Apache-2.0",
@@ -23,13 +23,13 @@
   },
   "dependencies": {
     "@anthropic-ai/sdk": "^0.110.0",
-    "@rulvar/core": "1.14.0"
+    "@rulvar/core": "1.16.0"
   },
   "devDependencies": {
     "@types/node": "^22.20.0",
     "tsdown": "^0.22.3",
     "typescript": "~6.0.3",
-    "@rulvar/testing": "1.14.0"
+    "@rulvar/testing": "1.16.0"
   },
   "repository": {
     "type": "git",