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

推荐订阅源

A
About on SuperTechFans
G
Google Developers Blog
L
LangChain Blog
aimingoo的专栏
aimingoo的专栏
OSCHINA 社区最新新闻
OSCHINA 社区最新新闻
云风的 BLOG
云风的 BLOG
小众软件
小众软件
月光博客
月光博客
Recent Announcements
Recent Announcements
人人都是产品经理
人人都是产品经理
P
Proofpoint News Feed
博客园 - 聂微东
让小产品的独立变现更简单 - ezindie.com
让小产品的独立变现更简单 - ezindie.com
雷峰网
雷峰网
The Cloudflare Blog
博客园_首页
美团技术团队
大猫的无限游戏
大猫的无限游戏
B
Blog
IT之家
IT之家
Jina AI
Jina AI
H
Hackread – Cybersecurity News, Data Breaches, AI and More
C
Check Point 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(agents): preserve Codex auth for compaction fallback ...
steipete · 2026-05-30 · via Recent Commits to openclaw:main

@@ -24,7 +24,11 @@ import {

2424

resolveProviderTextTransforms,

2525

transformProviderSystemPrompt,

2626

} from "../../plugins/provider-runtime.js";

27-

import { isCronSessionKey, isSubagentSessionKey } from "../../routing/session-key.js";

27+

import {

28+

isCronSessionKey,

29+

isSubagentSessionKey,

30+

parseAgentSessionKey,

31+

} from "../../routing/session-key.js";

2832

import { resolveSkillsPromptForRun } from "../../skills/loading/workspace.js";

2933

import { resolveEmbeddedRunSkillEntries } from "../../skills/runtime/embedded-run-entries.js";

3034

import {

@@ -41,6 +45,7 @@ import {

4145

setCompactionSafeguardCancelReason,

4246

} from "../agent-hooks/compaction-safeguard-runtime.js";

4347

import { createPreparedEmbeddedAgentSettingsManager } from "../agent-project-settings.js";

48+

import { isDefaultAgentRuntimeId } from "../agent-runtime-id.js";

4449

import {

4550

resolveAgentDir,

4651

resolveRunModelFallbacksOverride,

@@ -87,7 +92,6 @@ import {

8792

import { isFallbackSummaryError, runWithModelFallback } from "../model-fallback.js";

8893

import { supportsModelTools } from "../model-tool-support.js";

8994

import { ensureOpenClawModelsJson } from "../models-config.js";

90-

import { resolveContextConfigProviderForRuntime } from "../openai-codex-routing.js";

9195

import { wrapStreamFnTextTransforms } from "../plugin-text-transforms.js";

9296

import { resolveAgentPromptSurfaceForSessionKey } from "../prompt-surface.js";

9397

import { registerProviderStreamForModel } from "../provider-stream.js";

@@ -489,20 +493,67 @@ async function compactEmbeddedAgentSessionDirectOnce(

489493

workspaceDir: resolvedWorkspace,

490494

allowGatewaySubagentBinding: params.allowGatewaySubagentBinding,

491495

});

496+

const earlyAgentIds = resolveSessionAgentIds({

497+

sessionKey: params.sessionKey,

498+

config: params.config,

499+

agentId: params.agentId,

500+

});

501+

const agentDir =

502+

params.agentDir ?? resolveAgentDir(params.config ?? {}, earlyAgentIds.sessionAgentId);

503+

const runtimePolicySessionKey = params.sandboxSessionKey ?? params.sessionKey;

504+

const runtimePolicyAgentId =

505+

params.sandboxSessionKey && parseAgentSessionKey(params.sandboxSessionKey)

506+

? undefined

507+

: params.agentId;

508+

const policyCompactionTarget = resolveEmbeddedCompactionTarget({

509+

config: params.config,

510+

provider: params.provider,

511+

modelId: params.model,

512+

authProfileId: params.authProfileId,

513+

defaultProvider: DEFAULT_PROVIDER,

514+

defaultModel: DEFAULT_MODEL,

515+

});

516+

const configuredHarnessPolicy = resolveAgentHarnessPolicy({

517+

provider: policyCompactionTarget.provider ?? DEFAULT_PROVIDER,

518+

modelId: policyCompactionTarget.model ?? DEFAULT_MODEL,

519+

config: params.config,

520+

agentId: runtimePolicyAgentId,

521+

sessionKey: runtimePolicySessionKey,

522+

});

523+

const configuredHarnessRuntime =

524+

configuredHarnessPolicy.runtimeSource &&

525+

configuredHarnessPolicy.runtimeSource !== "implicit" &&

526+

!isDefaultAgentRuntimeId(configuredHarnessPolicy.runtime)

527+

? configuredHarnessPolicy.runtime

528+

: undefined;

529+

const selectedHarnessRuntime = params.agentHarnessId ?? configuredHarnessRuntime;

492530

const resolvedCompactionTarget = resolveEmbeddedCompactionTarget({

493531

config: params.config,

494532

provider: params.provider,

495533

modelId: params.model,

496534

authProfileId: params.authProfileId,

535+

harnessRuntime: selectedHarnessRuntime,

497536

defaultProvider: DEFAULT_PROVIDER,

498537

defaultModel: DEFAULT_MODEL,

499538

});

500539

// Keep the configured provider for harness policy, while auth/model loading below can

501540

// route OpenAI compaction through Codex OAuth when that runtime owns the session credentials.

502541

const provider = resolvedCompactionTarget.provider ?? DEFAULT_PROVIDER;

503542

const runtimeProvider = resolvedCompactionTarget.runtimeProvider ?? provider;

543+

const contextConfigProvider = resolvedCompactionTarget.contextProvider ?? provider;

504544

const modelId = resolvedCompactionTarget.model ?? DEFAULT_MODEL;

505545

const authProfileId = resolvedCompactionTarget.authProfileId;

546+

if (runtimeProvider !== provider || selectedHarnessRuntime) {

547+

await ensureSelectedAgentHarnessPlugin({

548+

config: params.config,

549+

provider,

550+

modelId,

551+

agentId: runtimePolicyAgentId,

552+

sessionKey: runtimePolicySessionKey,

553+

agentHarnessRuntimeOverride: selectedHarnessRuntime,

554+

workspaceDir: resolvedWorkspace,

555+

});

556+

}

506557

let thinkLevel: ThinkLevel = params.thinkLevel ?? "off";

507558

const attemptedThinking = new Set<ThinkLevel>();

508559

const fail = (reason: string, err?: unknown): EmbeddedAgentCompactResult => {

@@ -531,13 +582,6 @@ async function compactEmbeddedAgentSessionDirectOnce(

531582

: undefined,

532583

};

533584

};

534-

const earlyAgentIds = resolveSessionAgentIds({

535-

sessionKey: params.sessionKey,

536-

config: params.config,

537-

agentId: params.agentId,

538-

});

539-

const agentDir =

540-

params.agentDir ?? resolveAgentDir(params.config ?? {}, earlyAgentIds.sessionAgentId);

541585

await ensureOpenClawModelsJson(params.config, agentDir, {

542586

workspaceDir: resolvedWorkspace,

543587

});

@@ -627,11 +671,7 @@ async function compactEmbeddedAgentSessionDirectOnce(

627671

sessionId: params.sessionId,

628672

cwd: effectiveCwd,

629673

});

630-

const { sessionAgentId: effectiveSkillAgentId } = resolveSessionAgentIds({

631-

sessionKey: params.sessionKey,

632-

config: params.config,

633-

agentId: params.agentId,

634-

});

674+

const { sessionAgentId: effectiveSkillAgentId } = earlyAgentIds;

635675636676

let restoreSkillEnv: (() => void) | undefined;

637677

let compactionSessionManager: unknown = null;

@@ -683,19 +723,9 @@ async function compactEmbeddedAgentSessionDirectOnce(

683723

// Apply contextTokens cap to model so session runtime's auto-compaction

684724

// threshold uses the effective limit, not the native context window.

685725

const runtimeModelWithContext = runtimeModel as ProviderRuntimeModel;

686-

const runtimeHarnessPolicy = resolveAgentHarnessPolicy({

687-

provider,

688-

modelId,

689-

config: params.config,

690-

agentId: effectiveSkillAgentId,

691-

sessionKey: params.sessionKey,

692-

});

693726

const ctxInfo = resolveContextWindowInfo({

694727

cfg: params.config,

695-

provider: resolveContextConfigProviderForRuntime({

696-

provider,

697-

runtimeId: params.agentHarnessId ?? runtimeHarnessPolicy.runtime,

698-

}),

728+

provider: contextConfigProvider,

699729

modelId,

700730

modelContextTokens: readAgentModelContextTokens(runtimeModel),

701731

modelContextWindow: runtimeModelWithContext.contextWindow,

@@ -731,7 +761,7 @@ async function compactEmbeddedAgentSessionDirectOnce(

731761

model: effectiveModel,

732762

modelApi: effectiveModel.api,

733763

harnessId: params.agentHarnessId,

734-

harnessRuntime: runtimeHarnessPolicy.runtime,

764+

harnessRuntime: selectedHarnessRuntime,

735765

authProfileProvider: authProfileId?.split(":", 1)[0],

736766

sessionAuthProfileId: authProfileId,

737767

config: params.config,