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

推荐订阅源

S
SegmentFault 最新的问题
B
Blog
P
Proofpoint News Feed
美团技术团队
The GitHub Blog
The GitHub Blog
Y
Y Combinator Blog
A
About on SuperTechFans
让小产品的独立变现更简单 - ezindie.com
让小产品的独立变现更简单 - ezindie.com
Cyber Security Advisories - MS-ISAC
Cyber Security Advisories - MS-ISAC
Vercel News
Vercel News
有赞技术团队
有赞技术团队
小众软件
小众软件
H
Hackread – Cybersecurity News, Data Breaches, AI and More
Google DeepMind News
Google DeepMind News
Martin Fowler
Martin Fowler
OSCHINA 社区最新新闻
OSCHINA 社区最新新闻
aimingoo的专栏
aimingoo的专栏
H
Help Net Security
罗磊的独立博客
L
LangChain Blog
GbyAI
GbyAI
腾讯CDC
T
The Blog of Author Tim Ferriss
Microsoft Security Blog
Microsoft Security Blog

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 migrate supported auth imports · openclaw/openclaw@44...
fuller-stack · 2026-05-25 · via Recent Commits to openclaw:main

@@ -1,3 +1,4 @@

1+

import { createHash } from "node:crypto";

12

import { loadAuthProfileStoreWithoutExternalProfiles } from "openclaw/plugin-sdk/agent-runtime";

23

import {

34

createMigrationItem,

@@ -38,8 +39,12 @@ const HERMES_AUTH_DISPLAY_NAME = "Hermes import";

38393940

type HermesCodexAuthCandidate = {

4041

access: string;

42+

accountId?: string;

4143

refresh: string;

44+

sourceKind: "hermes-auth-json" | "opencode-auth-json";

45+

sourceCredentialIndex?: number;

4246

sourceLabel: string;

47+

sourcePath: string;

4348

updatedAt?: number;

4449

};

4550

@@ -86,7 +91,7 @@ function decodeJwtPayload(token: string): Record<string, unknown> | undefined {

8691

}

8792

}

889389-

function resolveCodexIdentity(access: string): CodexIdentity {

94+

function resolveCodexIdentity(access: string, accountId?: string): CodexIdentity {

9095

const payload = decodeJwtPayload(access);

9196

const auth = isRecord(payload?.["https://api.openai.com/auth"])

9297

? payload["https://api.openai.com/auth"]

@@ -95,11 +100,11 @@ function resolveCodexIdentity(access: string): CodexIdentity {

95100

? payload["https://api.openai.com/profile"]

96101

: {};

97102

const email = readString(profile.email);

98-

const accountId = readString(auth.chatgpt_account_id);

103+

const resolvedAccountId = accountId ?? readString(auth.chatgpt_account_id);

99104

const chatgptPlanType = readString(auth.chatgpt_plan_type);

100105

if (email) {

101106

return {

102-

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

107+

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

103108

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

104109

email,

105110

profileName: email,

@@ -109,9 +114,10 @@ function resolveCodexIdentity(access: string): CodexIdentity {

109114

readString(auth.chatgpt_account_user_id) ??

110115

readString(auth.chatgpt_user_id) ??

111116

readString(auth.user_id) ??

112-

readString(payload?.sub);

117+

readString(payload?.sub) ??

118+

resolvedAccountId;

113119

return {

114-

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

120+

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

115121

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

116122

...(stableSubject

117123

? { profileName: `id-${Buffer.from(stableSubject).toString("base64url")}` }

@@ -131,7 +137,24 @@ function resolveAccessTokenExpiry(access: string): number | undefined {

131137

return undefined;

132138

}

133139134-

function readProviderTokens(auth: Record<string, unknown>): HermesCodexAuthCandidate | undefined {

140+

function sourceCredentialFingerprint(candidate: HermesCodexAuthCandidate): string {

141+

const hash = createHash("sha256");

142+

for (const part of [

143+

candidate.sourceKind,

144+

candidate.accountId ?? "",

145+

candidate.access,

146+

candidate.refresh,

147+

]) {

148+

hash.update(part);

149+

hash.update("\0");

150+

}

151+

return hash.digest("hex");

152+

}

153+154+

function readProviderTokens(

155+

auth: Record<string, unknown>,

156+

sourcePath: string,

157+

): HermesCodexAuthCandidate | undefined {

135158

const providers = isRecord(auth.providers) ? auth.providers : {};

136159

const provider = isRecord(providers[OPENAI_CODEX_PROVIDER_ID])

137160

? providers[OPENAI_CODEX_PROVIDER_ID]

@@ -145,12 +168,17 @@ function readProviderTokens(auth: Record<string, unknown>): HermesCodexAuthCandi

145168

return {

146169

access,

147170

refresh,

171+

sourceKind: "hermes-auth-json",

148172

sourceLabel: "Hermes active OpenAI Codex provider",

173+

sourcePath,

149174

updatedAt: readTimestamp(provider?.last_refresh),

150175

};

151176

}

152177153-

function readPoolTokens(auth: Record<string, unknown>): HermesCodexAuthCandidate[] {

178+

function readPoolTokens(

179+

auth: Record<string, unknown>,

180+

sourcePath: string,

181+

): HermesCodexAuthCandidate[] {

154182

const pool = isRecord(auth.credential_pool) ? auth.credential_pool : {};

155183

const entries = Array.isArray(pool[OPENAI_CODEX_PROVIDER_ID])

156184

? pool[OPENAI_CODEX_PROVIDER_ID]

@@ -169,7 +197,9 @@ function readPoolTokens(auth: Record<string, unknown>): HermesCodexAuthCandidate

169197

candidates.push({

170198

access,

171199

refresh,

200+

sourceKind: "hermes-auth-json",

172201

sourceLabel: label,

202+

sourcePath,

173203

updatedAt: readTimestamp(entry.last_refresh) ?? readTimestamp(entry.last_status_at),

174204

});

175205

}

@@ -180,7 +210,7 @@ async function readHermesCodexAuthCandidates(

180210

authPath: string | undefined,

181211

): Promise<HermesCodexAuthCandidate[]> {

182212

const raw = await readText(authPath);

183-

if (!raw) {

213+

if (!raw || !authPath) {

184214

return [];

185215

}

186216

let parsed: unknown;

@@ -192,9 +222,49 @@ async function readHermesCodexAuthCandidates(

192222

if (!isRecord(parsed)) {

193223

return [];

194224

}

195-

return [readProviderTokens(parsed), ...readPoolTokens(parsed)]

225+

const candidates = [readProviderTokens(parsed, authPath), ...readPoolTokens(parsed, authPath)]

196226

.filter((candidate): candidate is HermesCodexAuthCandidate => candidate !== undefined)

197227

.toSorted((left, right) => (right.updatedAt ?? 0) - (left.updatedAt ?? 0));

228+

candidates.forEach((candidate, index) => {

229+

candidate.sourceCredentialIndex = index;

230+

});

231+

return candidates;

232+

}

233+234+

async function readOpenCodeOpenAICandidates(

235+

authPath: string | undefined,

236+

): Promise<HermesCodexAuthCandidate[]> {

237+

const raw = await readText(authPath);

238+

if (!raw || !authPath) {

239+

return [];

240+

}

241+

let parsed: unknown;

242+

try {

243+

parsed = JSON.parse(raw);

244+

} catch {

245+

return [];

246+

}

247+

if (!isRecord(parsed)) {

248+

return [];

249+

}

250+

const openai = isRecord(parsed.openai) ? parsed.openai : undefined;

251+

const access = readString(openai?.access);

252+

const accountId = readString(openai?.accountId);

253+

const refresh = readString(openai?.refresh);

254+

if (!access || !refresh) {

255+

return [];

256+

}

257+

return [

258+

{

259+

access,

260+

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

261+

refresh,

262+

sourceKind: "opencode-auth-json",

263+

sourceCredentialIndex: 0,

264+

sourceLabel: "OpenCode OpenAI OAuth credential",

265+

sourcePath: authPath,

266+

},

267+

];

198268

}

199269200270

function credentialExtra(identity: CodexIdentity): Record<string, unknown> | undefined {

@@ -219,7 +289,7 @@ function buildAuthResult(

219289

candidate: HermesCodexAuthCandidate,

220290

fallbackProfileName = "hermes-import",

221291

): ProviderAuthResult {

222-

const identity = resolveCodexIdentity(candidate.access);

292+

const identity = resolveCodexIdentity(candidate.access, candidate.accountId);

223293

return buildOauthProviderAuthResult({

224294

providerId: OPENAI_CODEX_PROVIDER_ID,

225295

defaultModel: OPENAI_CODEX_DEFAULT_MODEL,

@@ -243,10 +313,13 @@ function authProfileDedupeKey(profile: HermesCodexAuthProfile): string {

243313

return `${profile.credential.provider}:profile:${profile.sourceProfileId}`;

244314

}

245315246-

async function readHermesCodexAuthProfiles(

247-

authPath: string | undefined,

316+

async function readCodexAuthProfilesFromSource(

317+

source: HermesSource,

248318

): Promise<HermesCodexAuthProfile[]> {

249-

const candidates = await readHermesCodexAuthCandidates(authPath);

319+

const candidates = [

320+

...(await readHermesCodexAuthCandidates(source.authPath)),

321+

...(await readOpenCodeOpenAICandidates(source.opencodeAuthPath)),

322+

].toSorted((left, right) => (right.updatedAt ?? 0) - (left.updatedAt ?? 0));

250323

const profiles: HermesCodexAuthProfile[] = [];

251324

const seen = new Set<string>();

252325

for (const [index, candidate] of candidates.entries()) {

@@ -273,6 +346,24 @@ async function readHermesCodexAuthProfiles(

273346

return profiles;

274347

}

275348349+

async function readCodexAuthProfilesFromPath(params: {

350+

sourcePath: string | undefined;

351+

sourceKind: unknown;

352+

}): Promise<HermesCodexAuthProfile[]> {

353+

if (params.sourceKind === "opencode-auth-json") {

354+

return await readCodexAuthProfilesFromSource({

355+

root: "",

356+

archivePaths: [],

357+

...(params.sourcePath ? { opencodeAuthPath: params.sourcePath } : {}),

358+

});

359+

}

360+

return await readCodexAuthProfilesFromSource({

361+

root: "",

362+

archivePaths: [],

363+

...(params.sourcePath ? { authPath: params.sourcePath } : {}),

364+

});

365+

}

366+276367

function findMatchingProfile(

277368

store: AuthProfileStore,

278369

credential: OAuthCredential,

@@ -305,12 +396,47 @@ function oauthAuthProfileConfig(

305396

};

306397

}

307398399+

function matchesSourceCredentialFingerprint(

400+

profile: HermesCodexAuthProfile,

401+

fingerprint: string,

402+

): boolean {

403+

return sourceCredentialFingerprint(profile.candidate) === fingerprint;

404+

}

405+406+

function findPlannedAuthProfile(params: {

407+

profiles: HermesCodexAuthProfile[];

408+

sourceProfileId: string;

409+

sourceCredentialIndex?: number;

410+

sourceCredentialFingerprint?: string;

411+

}): HermesCodexAuthProfile | undefined {

412+

const bySourceProfileId = params.profiles.find(

413+

(entry) => entry.sourceProfileId === params.sourceProfileId,

414+

);

415+

const fingerprint = params.sourceCredentialFingerprint;

416+

if (!fingerprint) {

417+

return bySourceProfileId;

418+

}

419+

if (bySourceProfileId && matchesSourceCredentialFingerprint(bySourceProfileId, fingerprint)) {

420+

return bySourceProfileId;

421+

}

422+

const byIndex =

423+

params.sourceCredentialIndex === undefined

424+

? undefined

425+

: params.profiles.find(

426+

(entry) => entry.candidate.sourceCredentialIndex === params.sourceCredentialIndex,

427+

);

428+

if (byIndex && matchesSourceCredentialFingerprint(byIndex, fingerprint)) {

429+

return byIndex;

430+

}

431+

return params.profiles.find((entry) => matchesSourceCredentialFingerprint(entry, fingerprint));

432+

}

433+308434

export async function buildAuthItems(params: {

309435

ctx: MigrationProviderContext;

310436

source: HermesSource;

311437

targets: PlannedTargets;

312438

}): Promise<MigrationItem[]> {

313-

const profiles = await readHermesCodexAuthProfiles(params.source.authPath);

439+

const profiles = await readCodexAuthProfilesFromSource(params.source);

314440

if (profiles.length === 0) {

315441

return [];

316442

}

@@ -335,7 +461,7 @@ export async function buildAuthItems(params: {

335461

id: itemId,

336462

kind: "auth",

337463

action: skipped ? "skip" : "create",

338-

source: params.source.authPath,

464+

source: profile.candidate.sourcePath,

339465

target: `${params.targets.agentDir}/auth-profiles.json#${profileId}`,

340466

status: skipped ? "skipped" : conflict ? "conflict" : "planned",

341467

sensitive: true,

@@ -350,8 +476,12 @@ export async function buildAuthItems(params: {

350476

details: {

351477

provider: OPENAI_CODEX_PROVIDER_ID,

352478

profileId,

479+

...(typeof profile.candidate.sourceCredentialIndex === "number"

480+

? { sourceCredentialIndex: profile.candidate.sourceCredentialIndex }

481+

: {}),

482+

sourceCredentialFingerprint: sourceCredentialFingerprint(profile.candidate),

353483

sourceProfileId: profile.sourceProfileId,

354-

sourceKind: "hermes-auth-json",

484+

sourceKind: profile.candidate.sourceKind,

355485

sourceLabel: profile.candidate.sourceLabel,

356486

},

357487

});

@@ -370,12 +500,27 @@ export async function applyAuthItem(

370500

const profileId = typeof item.details?.profileId === "string" ? item.details.profileId : "";

371501

const sourceProfileId =

372502

typeof item.details?.sourceProfileId === "string" ? item.details.sourceProfileId : profileId;

503+

const sourceCredentialIndex =

504+

typeof item.details?.sourceCredentialIndex === "number"

505+

? item.details.sourceCredentialIndex

506+

: undefined;

507+

const sourceCredentialFingerprint =

508+

typeof item.details?.sourceCredentialFingerprint === "string"

509+

? item.details.sourceCredentialFingerprint

510+

: undefined;

373511

if (!source || !profileId) {

374512

return markMigrationItemError(item, HERMES_REASON_MISSING_SECRET_METADATA);

375513

}

376-

const profile = (await readHermesCodexAuthProfiles(source)).find(

377-

(entry) => entry.sourceProfileId === sourceProfileId,

378-

);

514+

const profiles = await readCodexAuthProfilesFromPath({

515+

sourcePath: source,

516+

sourceKind: item.details?.sourceKind,

517+

});

518+

const profile = findPlannedAuthProfile({

519+

profiles,

520+

sourceProfileId,

521+

...(sourceCredentialIndex === undefined ? {} : { sourceCredentialIndex }),

522+

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

523+

});

379524

if (!profile) {

380525

return markMigrationItemSkipped(item, HERMES_REASON_SECRET_NO_LONGER_PRESENT);

381526

}