惯性聚合 高效追踪和阅读你感兴趣的博客、新闻、科技资讯
阅读原文 在惯性聚合中打开

推荐订阅源

让小产品的独立变现更简单 - ezindie.com
让小产品的独立变现更简单 - ezindie.com
U
Unit 42
Google DeepMind News
Google DeepMind News
博客园 - 司徒正美
Y
Y Combinator Blog
F
Fortinet All Blogs
云风的 BLOG
云风的 BLOG
T
Tailwind CSS Blog
G
Google Developers Blog
酷 壳 – CoolShell
酷 壳 – CoolShell
罗磊的独立博客
D
DataBreaches.Net
T
The Blog of Author Tim Ferriss
Cyber Security Advisories - MS-ISAC
Cyber Security Advisories - MS-ISAC
MyScale Blog
MyScale Blog
N
Netflix TechBlog - Medium
Microsoft Security Blog
Microsoft Security Blog
GbyAI
GbyAI
P
Proofpoint News Feed
Jina AI
Jina AI
B
Blog RSS Feed
腾讯CDC
阮一峰的网络日志
阮一峰的网络日志
D
Docker

Recent Commits to openclaw:main

test: merge chat side-result checks · openclaw/openclaw@ddd2c2a test: merge cron history checks · openclaw/openclaw@f7eb746 test: merge responsive navigation shell checks · openclaw/openclaw@c2e4b47 docs(changelog): add codex oauth fixes · openclaw/openclaw@628e6cd test: merge navigation routing cases · openclaw/openclaw@5d8cecb Tests: mock channel registry bundled fallback · openclaw/openclaw@2b08233 Secrets: avoid broad web search discovery for single plugin config · openclaw/openclaw@a464f59 test: merge config view browser checks · openclaw/openclaw@20cf511 fix(status): align oauth health with runtime · openclaw/openclaw@eed7116 feat: add macOS screen snapshots for monitor preview (#67954) thanks … · openclaw/openclaw@f377db1 fix: report shared auth scopes in hello-ok (#67810) thanks @BunsDev · openclaw/openclaw@0b6c39b Auto-reply: avoid eager bundled route fallback · openclaw/openclaw@3ea1bf4 Tests: narrow session binding contract setup · openclaw/openclaw@54e4e16 fix(macOS): enable undo/redo in webchat composer text input (#34962) · openclaw/openclaw@00951dc Tests: speed up channel setup promotion · openclaw/openclaw@82b529a Docs: refresh agent instructions · openclaw/openclaw@5775fe2 fix(auth): serialize OAuth refresh across agents to fix #26322 (#67876) · openclaw/openclaw@8e79080 test: allow ollama public surface boundary test · openclaw/openclaw@7d4f1a6 Docs: add test performance guardrails · openclaw/openclaw@89706d3 Tests: restore context-engine usage proof · openclaw/openclaw@e4c4f95 Tests: slim context engine runtime coverage · openclaw/openclaw@74c198f ci: retry failed custom checkouts · openclaw/openclaw@0ee5baf test: trim duplicate provider auth onboarding cases · openclaw/openclaw@1ffc02e matrix: fix sessions_spawn --thread subagent session spawning (#67643) · openclaw/openclaw@1ce2596 test: reduce auth choice fixture churn · openclaw/openclaw@857b9cd test: mock health status config boundaries · openclaw/openclaw@9d5ab4a test: mock onboard config io boundary · openclaw/openclaw@299694d test: mock legacy state plugin boundaries · openclaw/openclaw@2713089 test: mock channel install boundaries · openclaw/openclaw@b945248 test: mock doctor preview channel boundaries · openclaw/openclaw@b1a3ad4
fix(usage): map auth mechanism to usage-credential type f...
Peetiegonzal · 2026-06-13 · via Recent Commits to openclaw:main
Original file line numberDiff line numberDiff line change

@@ -24,10 +24,22 @@ describe("getProviderUsageLimits credential awareness", () => {

2424

expect(loadMock).not.toHaveBeenCalled();

2525

});

2626
27-

it("returns undefined for OpenAI with no credential type (no implicit oauth default)", async () => {

28-

const out = await getProviderUsageLimits("openai");

29-

expect(out).toBeUndefined();

30-

expect(loadMock).not.toHaveBeenCalled();

27+

it("resolves OpenAI limits for an auth-profile turn (mechanism, not credential type)", async () => {

28+

loadMock.mockResolvedValue({

29+

updatedAt: 0,

30+

providers: [{ provider: "openai", displayName: "OpenAI", windows: [] }],

31+

});

32+

await getProviderUsageLimits("openai", { credentialType: "auth-profile" });

33+

expect(loadMock).toHaveBeenCalledTimes(1);

34+

});

35+
36+

it("resolves OpenAI limits when the credential type is absent (oauth-eligible)", async () => {

37+

loadMock.mockResolvedValue({

38+

updatedAt: 0,

39+

providers: [{ provider: "openai", displayName: "OpenAI", windows: [] }],

40+

});

41+

await getProviderUsageLimits("openai");

42+

expect(loadMock).toHaveBeenCalledTimes(1);

3143

});

3244
3345

it("resolves OpenAI limits for an oauth turn", async () => {

Original file line numberDiff line numberDiff line change

@@ -18,6 +18,19 @@ type LimitsCacheEntry = {

1818

};

1919

const limitsCache = new Map<string, LimitsCacheEntry>();

2020
21+

// Map a per-turn auth signal — which may be the auth *mechanism* (e.g.

22+

// "auth-profile"), not a credential *type* — to the usage-credential vocabulary

23+

// resolveUsageProviderId expects. api-key/aws-sdk resolve NO usage provider, so an

24+

// api-key turn never resolves "openai" and cannot borrow cached oauth windows;

25+

// oauth/token/auth-profile and a missing signal are usage-eligible, and the actual

26+

// credential is re-checked at fetch time before any usage request is made.

27+

function toUsageCredentialType(raw: string | null | undefined): string {

28+

if (raw === "api-key" || raw === "aws-sdk") {

29+

return raw;

30+

}

31+

return raw === "token" ? "token" : "oauth";

32+

}

33+
2134

// Resolve the active provider to a usage-capable id and load its windows. Returns

2235

// undefined when the provider has no core-known usage (e.g. api-key-only or an

2336

// unmapped provider). Cached per usage-provider for 60s so a per-reply snapshot

@@ -26,12 +39,8 @@ export async function getProviderUsageLimits(

2639

provider: string | undefined | null,

2740

options?: { credentialType?: string | null; timeoutMs?: number; now?: number },

2841

): Promise<ReplyUsageLimits | undefined> {

29-

// Pass the turn's real credential type through unchanged. Do NOT default to

30-

// "oauth": resolveUsageProviderId only returns the OpenAI usage provider for

31-

// oauth/token, so defaulting would attach OAuth/ChatGPT windows to an API-key

32-

// turn. A missing credential type ⇒ no OpenAI limits (correct, not OAuth).

3342

const usageId = resolveUsageProviderId(provider, {

34-

credentialType: options?.credentialType ?? null,

43+

credentialType: toUsageCredentialType(options?.credentialType),

3544

});

3645

if (!usageId) {

3746

return undefined;

@@ -107,12 +116,8 @@ export function getProviderUsageLimitsCached(

107116

provider: string | undefined | null,

108117

options?: { credentialType?: string | null; timeoutMs?: number },

109118

): ReplyUsageLimits | undefined {

110-

// Pass the turn's real credential type through unchanged. Do NOT default to

111-

// "oauth": resolveUsageProviderId only returns the OpenAI usage provider for

112-

// oauth/token, so defaulting would attach OAuth/ChatGPT windows to an API-key

113-

// turn. A missing credential type ⇒ no OpenAI limits (correct, not OAuth).

114119

const usageId = resolveUsageProviderId(provider, {

115-

credentialType: options?.credentialType ?? null,

120+

credentialType: toUsageCredentialType(options?.credentialType),

116121

});

117122

if (!usageId) {

118123

return undefined;