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

推荐订阅源

Engineering at Meta
Engineering at Meta
奇客Solidot–传递最新科技情报
奇客Solidot–传递最新科技情报
腾讯CDC
宝玉的分享
宝玉的分享
量子位
Recent Announcements
Recent Announcements
Martin Fowler
Martin Fowler
J
Java Code Geeks
V
Visual Studio Blog
阮一峰的网络日志
阮一峰的网络日志
Blog — PlanetScale
Blog — PlanetScale
大猫的无限游戏
大猫的无限游戏
博客园 - 叶小钗
S
SegmentFault 最新的问题
B
Blog
freeCodeCamp Programming Tutorials: Python, JavaScript, Git & More
博客园 - 【当耐特】
小众软件
小众软件
The Cloudflare Blog
Y
Y Combinator Blog
I
InfoQ
OSCHINA 社区最新新闻
OSCHINA 社区最新新闻
GbyAI
GbyAI
IT之家
IT之家

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: load staged Gemini CLI auth profiles · openclaw/open...
shakkernerd · 2026-06-17 · via Recent Commits to openclaw:main
11

// Google provider module implements model/runtime integration.

2+

import fs from "node:fs";

23

import type {

34

OpenClawPluginApi,

45

ProviderAuthContext,

@@ -7,11 +8,15 @@ import type {

78

import { buildOauthProviderAuthResult } from "openclaw/plugin-sdk/provider-auth-result";

89

import type { ProviderPlugin } from "openclaw/plugin-sdk/provider-model-shared";

910

import { fetchGeminiUsage } from "openclaw/plugin-sdk/provider-usage";

11+

import {

12+

GOOGLE_GEMINI_CLI_PROVIDER_ID,

13+

resolveGeminiCliProfileCredentialsPath,

14+

} from "./gemini-cli-auth-home.js";

1015

import { formatGoogleOauthApiKey, parseGoogleUsageToken } from "./oauth-token-shared.js";

1116

import { GOOGLE_GEMINI_PROVIDER_HOOKS } from "./provider-hooks.js";

1217

import { isModernGoogleModel, resolveGoogleGeminiForwardCompatModel } from "./provider-models.js";

131814-

const PROVIDER_ID = "google-gemini-cli";

19+

const PROVIDER_ID = GOOGLE_GEMINI_CLI_PROVIDER_ID;

1520

const PROVIDER_LABEL = "Gemini CLI OAuth";

1621

const DEFAULT_MODEL = "google/gemini-3.1-pro-preview";

1722

const ENV_VARS = [

@@ -22,6 +27,9 @@ const ENV_VARS = [

2227

] as const;

23282429

let oauthRuntimeModulePromise: Promise<typeof import("./oauth.runtime.js")> | null = null;

30+

type GeminiCliExternalAuthContext = Parameters<

31+

NonNullable<ProviderPlugin["resolveExternalAuthProfiles"]>

32+

>[0];

25332634

const loadOauthRuntimeModule = async () => {

2735

oauthRuntimeModulePromise ??= import("./oauth.runtime.js");

@@ -32,6 +40,76 @@ async function fetchGeminiCliUsage(ctx: ProviderFetchUsageSnapshotContext) {

3240

return await fetchGeminiUsage(ctx.token, ctx.timeoutMs, ctx.fetchFn, PROVIDER_ID);

3341

}

344243+

function normalizeString(value: string | undefined): string | undefined {

44+

const trimmed = value?.trim();

45+

return trimmed ? trimmed : undefined;

46+

}

47+48+

function decodeJwtPayload(token: string): Record<string, unknown> {

49+

const payload = token.split(".")[1];

50+

if (!payload) {

51+

return {};

52+

}

53+

try {

54+

const parsed = JSON.parse(Buffer.from(payload, "base64url").toString("utf8")) as unknown;

55+

return parsed && typeof parsed === "object" && !Array.isArray(parsed)

56+

? (parsed as Record<string, unknown>)

57+

: {};

58+

} catch {

59+

return {};

60+

}

61+

}

62+63+

function readGeminiCliProfileCredential(agentDir: string, profileId: string) {

64+

const credentialsPath = resolveGeminiCliProfileCredentialsPath(agentDir, profileId);

65+

let raw: unknown;

66+

try {

67+

raw = JSON.parse(fs.readFileSync(credentialsPath, "utf8")) as unknown;

68+

} catch {

69+

return null;

70+

}

71+

if (!raw || typeof raw !== "object" || Array.isArray(raw)) {

72+

return null;

73+

}

74+

const data = raw as Record<string, unknown>;

75+

const access = normalizeString(typeof data.access_token === "string" ? data.access_token : "");

76+

const refresh = normalizeString(typeof data.refresh_token === "string" ? data.refresh_token : "");

77+

const expires = data.expiry_date;

78+

if (!access || !refresh || typeof expires !== "number" || !Number.isFinite(expires)) {

79+

return null;

80+

}

81+82+

const idToken = normalizeString(typeof data.id_token === "string" ? data.id_token : "");

83+

const identity = idToken ? decodeJwtPayload(idToken) : {};

84+

const email = normalizeString(typeof identity.email === "string" ? identity.email : "");

85+

const accountId = normalizeString(typeof identity.sub === "string" ? identity.sub : "");

86+

return {

87+

type: "oauth" as const,

88+

provider: PROVIDER_ID,

89+

access,

90+

refresh,

91+

expires,

92+

...(idToken ? { idToken } : {}),

93+

...(email ? { email } : {}),

94+

...(accountId ? { accountId } : {}),

95+

};

96+

}

97+98+

function resolveConfiguredGeminiCliOAuthProfileIds(ctx: GeminiCliExternalAuthContext): string[] {

99+

const profileIds = new Set<string>();

100+

for (const [profileId, profile] of Object.entries(ctx.config?.auth?.profiles ?? {})) {

101+

if (profile.provider === PROVIDER_ID && profile.mode === "oauth") {

102+

profileIds.add(profileId);

103+

}

104+

}

105+

for (const [profileId, credential] of Object.entries(ctx.store.profiles)) {

106+

if (credential.provider === PROVIDER_ID && credential.type === "oauth") {

107+

profileIds.add(profileId);

108+

}

109+

}

110+

return [...profileIds].toSorted();

111+

}

112+35113

export function buildGoogleGeminiCliProvider(): ProviderPlugin {

36114

return {

37115

id: PROVIDER_ID,

@@ -126,6 +204,16 @@ export function buildGoogleGeminiCliProvider(): ProviderPlugin {

126204

providerId: PROVIDER_ID,

127205

ctx,

128206

}),

207+

resolveExternalAuthProfiles: (ctx) => {

208+

const agentDir = normalizeString(ctx.agentDir);

209+

if (!agentDir) {

210+

return [];

211+

}

212+

return resolveConfiguredGeminiCliOAuthProfileIds(ctx).flatMap((profileId) => {

213+

const credential = readGeminiCliProfileCredential(agentDir, profileId);

214+

return credential ? [{ profileId, credential, persistence: "runtime-only" as const }] : [];

215+

});

216+

},

129217

...GOOGLE_GEMINI_PROVIDER_HOOKS,

130218

isModernModelRef: ({ modelId }) => isModernGoogleModel(modelId),

131219

formatApiKey: (cred) => formatGoogleOauthApiKey(cred),