@openclaw/cloudflare-ai-gateway-provider 2026.9.5 → 2026.9.7

package/dist/catalog-provider.js

@@ -2,10 +2,6 @@ import { buildCloudflareAiGatewayModelDefinition, resolveCloudflareAiGatewayBase
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { coerceSecretRef, resolveNonEnvSecretRefApiKeyMarker } from "openclaw/plugin-sdk/secret-input";
 //#region extensions/cloudflare-ai-gateway/catalog-provider.ts
-/**
-* Builds runtime model catalog entries from stored Cloudflare AI Gateway auth
-* profiles.
-*/
 function resolveCloudflareAiGatewayApiKey(cred) {
 	if (!cred || cred.type !== "api_key") return;
 	const keyRef = coerceSecretRef(cred.keyRef);
@@ -13,13 +9,6 @@ function resolveCloudflareAiGatewayApiKey(cred) {
 	if (keyRef && keyRefId) return keyRef.source === "env" ? keyRefId : resolveNonEnvSecretRefApiKeyMarker(keyRef.source);
 	return normalizeOptionalString(cred.key);
 }
-function resolveCloudflareAiGatewayMetadata(cred) {
-	if (!cred || cred.type !== "api_key") return {};
-	return {
-		accountId: normalizeOptionalString(cred.metadata?.accountId),
-		gatewayId: normalizeOptionalString(cred.metadata?.gatewayId)
-	};
-}
 /**
 * Returns a provider catalog entry when credentials and Gateway metadata are
 * complete enough to construct an Anthropic-compatible base URL.
@@ -27,15 +16,15 @@ function resolveCloudflareAiGatewayMetadata(cred) {
 function buildCloudflareAiGatewayCatalogProvider(params) {
 	const apiKey = normalizeOptionalString(params.envApiKey) ?? resolveCloudflareAiGatewayApiKey(params.credential);
 	if (!apiKey) return null;
-	const { accountId, gatewayId } = resolveCloudflareAiGatewayMetadata(params.credential);
+	const metadata = params.credential?.type === "api_key" ? params.credential.metadata : void 0;
+	const accountId = normalizeOptionalString(metadata?.accountId);
+	const gatewayId = normalizeOptionalString(metadata?.gatewayId);
 	if (!accountId || !gatewayId) return null;
-	const baseUrl = resolveCloudflareAiGatewayBaseUrl({
-		accountId,
-		gatewayId
-	});
-	if (!baseUrl) return null;
 	return {
-		baseUrl,
+		baseUrl: resolveCloudflareAiGatewayBaseUrl({
+			accountId,
+			gatewayId
+		}),
 		api: "anthropic-messages",
 		apiKey,
 		models: [buildCloudflareAiGatewayModelDefinition()]

package/dist/index.js

@@ -3,8 +3,8 @@ import { buildCloudflareAiGatewayCatalogProvider } from "./catalog-provider.js";
 import { applyCloudflareAiGatewayConnectionConfig, applyCloudflareAiGatewayProviderConnectionConfig } from "./onboard.js";
 import { wrapCloudflareAiGatewayProviderStream } from "./stream-wrappers.js";
 import { definePluginEntry } from "openclaw/plugin-sdk/plugin-entry";
-import { applyAuthProfileConfig, buildApiKeyCredential, ensureApiKeyFromOptionEnvOrPrompt, ensureAuthProfileStore, listProfilesForProvider, normalizeApiKeyInput, normalizeOptionalSecretInput, validateApiKeyInput } from "openclaw/plugin-sdk/provider-auth";
-import { upsertAuthProfileWithLockOrThrow } from "openclaw/plugin-sdk/provider-auth-api-key";
+import { applyAuthProfileConfig, buildApiKeyCredential, ensureAuthProfileStore, listProfilesForProvider, normalizeOptionalSecretInput } from "openclaw/plugin-sdk/provider-auth";
+import { captureProviderApiKey, persistProviderApiKey } from "openclaw/plugin-sdk/provider-auth-api-key";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 //#region extensions/cloudflare-ai-gateway/index.ts
 /**
@@ -62,36 +62,22 @@ var cloudflare_ai_gateway_default = definePluginEntry({
 						gatewayId: normalizeOptionalSecretInput(ctx.opts?.cloudflareAiGatewayGatewayId),
 						prompter: ctx.prompter
 					});
-					let capturedSecretInput = "";
-					let capturedCredential = false;
-					let capturedMode;
-					await ensureApiKeyFromOptionEnvOrPrompt({
+					const { input, mode } = await captureProviderApiKey(ctx, {
 						token: normalizeOptionalSecretInput(ctx.opts?.cloudflareAiGatewayApiKey),
 						tokenProvider: "cloudflare-ai-gateway",
-						secretInputMode: ctx.allowSecretRefPrompt === false ? ctx.secretInputMode ?? "plaintext" : ctx.secretInputMode,
-						config: ctx.config,
-						workspaceDir: ctx.workspaceDir,
 						expectedProviders: [PROVIDER_ID],
 						provider: PROVIDER_ID,
 						envLabel: PROVIDER_ENV_VAR,
 						promptMessage: "Enter Cloudflare AI Gateway API key",
-						normalize: normalizeApiKeyInput,
-						validate: validateApiKeyInput,
-						prompter: ctx.prompter,
-						setCredential: async (apiKey, mode) => {
-							capturedSecretInput = apiKey;
-							capturedCredential = true;
-							capturedMode = mode;
-						}
+						missingInputMessage: "Missing Cloudflare AI Gateway API key."
 					});
-					if (!capturedCredential) throw new Error("Missing Cloudflare AI Gateway API key.");
 					return {
 						profiles: [{
 							profileId: PROFILE_ID,
-							credential: buildApiKeyCredential(PROVIDER_ID, capturedSecretInput ?? "", {
+							credential: buildApiKeyCredential(PROVIDER_ID, input, {
 								accountId: metadata.accountId,
 								gatewayId: metadata.gatewayId
-							}, capturedMode ? { secretInputMode: capturedMode } : void 0)
+							}, mode ? { secretInputMode: mode } : void 0)
 						}],
 						configPatch: applyCloudflareAiGatewayProviderConnectionConfig(ctx.config, metadata),
 						defaultModel: CLOUDFLARE_AI_GATEWAY_DEFAULT_MODEL_REF
@@ -117,22 +103,14 @@ var cloudflare_ai_gateway_default = definePluginEntry({
 						envVar: PROVIDER_ENV_VAR
 					});
 					if (!resolved) return null;
-					if (resolved.source !== "profile") {
-						const credential = ctx.toApiKeyCredential({
-							provider: PROVIDER_ID,
-							resolved,
-							metadata: {
-								accountId,
-								gatewayId
-							}
-						});
-						if (!credential) return null;
-						await upsertAuthProfileWithLockOrThrow({
-							profileId: PROFILE_ID,
-							credential,
-							agentDir: ctx.agentDir
-						});
-					}
+					if (!await persistProviderApiKey(ctx, PROFILE_ID, {
+						provider: PROVIDER_ID,
+						resolved,
+						metadata: {
+							accountId,
+							gatewayId
+						}
+					})) return null;
 					const next = applyAuthProfileConfig(ctx.config, {
 						profileId: PROFILE_ID,
 						provider: PROVIDER_ID,

package/dist/stream-wrappers.js

@@ -2,24 +2,11 @@ import { createAnthropicThinkingPrefillPayloadWrapper } from "openclaw/plugin-sd
 import { createSubsystemLogger } from "openclaw/plugin-sdk/runtime-env";
 //#region extensions/cloudflare-ai-gateway/stream-wrappers.ts
 const log = createSubsystemLogger("cloudflare-ai-gateway-stream");
-function shouldPatchAnthropicMessagesPayload(model) {
-	return model?.api === void 0 || model.api === "anthropic-messages";
-}
-/**
-* Creates a wrapper that removes trailing assistant prefill messages before
-* extended-thinking Anthropic requests are sent through Cloudflare.
-*/
-function createCloudflareAiGatewayAnthropicThinkingPrefillWrapper(baseStreamFn) {
-	return createAnthropicThinkingPrefillPayloadWrapper(baseStreamFn, (stripped) => {
+function wrapCloudflareAiGatewayProviderStream(ctx) {
+	if (ctx.model?.api !== void 0 && ctx.model.api !== "anthropic-messages") return ctx.streamFn;
+	return createAnthropicThinkingPrefillPayloadWrapper(ctx.streamFn, (stripped) => {
 		log.warn(`removed ${stripped} trailing assistant prefill message${stripped === 1 ? "" : "s"} because Anthropic extended thinking requires conversations to end with a user turn`);
 	});
 }
-/**
-* Applies the Anthropic payload wrapper only for Anthropic-compatible models.
-*/
-function wrapCloudflareAiGatewayProviderStream(ctx) {
-	if (!shouldPatchAnthropicMessagesPayload(ctx.model)) return ctx.streamFn;
-	return createCloudflareAiGatewayAnthropicThinkingPrefillWrapper(ctx.streamFn);
-}
 //#endregion
 export { wrapCloudflareAiGatewayProviderStream };

package/openclaw.plugin.json

@@ -9,6 +9,9 @@
   "modelPricing": {
     "providers": {
       "cloudflare-ai-gateway": {
+        "modelsDev": {
+          "passthroughProviderModel": true
+        },
         "openRouter": {
           "passthroughProviderModel": true
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openclaw/cloudflare-ai-gateway-provider",
-  "version": "2026.9.5",
+  "version": "2026.9.7",
   "description": "OpenClaw Cloudflare AI Gateway provider plugin.",
   "repository": {
     "type": "git",
@@ -18,10 +18,10 @@
       "minHostVersion": ">=2026.6.8"
     },
     "compat": {
-      "pluginApi": ">=2026.9.5"
+      "pluginApi": ">=2026.9.7"
     },
     "build": {
-      "openclawVersion": "2026.9.5",
+      "openclawVersion": "2026.9.7",
       "bundledDist": false
     },
     "release": {
@@ -40,7 +40,7 @@
     "assets/activity.svg"
   ],
   "peerDependencies": {
-    "openclaw": ">=2026.9.5"
+    "openclaw": ">=2026.9.7"
   },
   "peerDependenciesMeta": {
     "openclaw": {