fix(auto-reply): clear unflushed cli bindings · openclaw/openclaw@58de6f9

Recent Commits to openclaw:main

obviyus · 2026-05-30 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -1609,6 +1609,8 @@ export async function runReplyAgent(params: {`
`1609`	`1609`	`const cliSessionBinding = usedCliProvider`
`1610`	`1610`	`? runResult.meta?.agentMeta?.cliSessionBinding`
`1611`	`1611`	`: undefined;`
	`1612`	`+const clearCliSessionBinding =`
	`1613`	`+usedCliProvider && runResult.meta?.agentMeta?.clearCliSessionBinding === true;`
`1612`	`1614`	`const runtimeContextTokens =`
`1613`	`1615`	`typeof runResult.meta?.agentMeta?.contextTokens === "number" &&`
`1614`	`1616`	`Number.isFinite(runResult.meta.agentMeta.contextTokens) &&`
`@@ -1644,6 +1646,7 @@ export async function runReplyAgent(params: {`
`1644`	`1646`	`systemPromptReport: runResult.meta?.systemPromptReport,`
`1645`	`1647`	`cliSessionId,`
`1646`	`1648`	`cliSessionBinding,`
	`1649`	`+ clearCliSessionBinding,`
`1647`	`1650`	`preserveFreshTotalTokensOnStaleUsage: preflightCompactionApplied,`
`1648`	`1651`	`});`
`1649`	`1652`

Original file line number	Diff line number	Diff line change
`@@ -1021,6 +1021,7 @@ export function createFollowupRunner(params: {`
`1021`	`1021`	`const modelUsed = runResult.meta?.agentMeta?.model ?? fallbackModel ?? defaultModel;`
`1022`	`1022`	`const providerUsed =`
`1023`	`1023`	`runResult.meta?.agentMeta?.provider ?? fallbackProvider ?? queued.run.provider;`
	`1024`	`+const usedCliProvider = isCliProvider(providerUsed, runtimeConfig);`
`1024`	`1025`	`const contextTokensUsed =`
`1025`	`1026`	`resolveContextTokensForModel({`
`1026`	`1027`	`cfg: queued.run.config,`
`@@ -1047,6 +1048,8 @@ export function createFollowupRunner(params: {`
`1047`	`1048`	`contextTokensUsed,`
`1048`	`1049`	`systemPromptReport: runResult.meta?.systemPromptReport,`
`1049`	`1050`	`cliSessionBinding: runResult.meta?.agentMeta?.cliSessionBinding,`
	`1051`	`+clearCliSessionBinding:`
	`1052`	`+usedCliProvider && runResult.meta?.agentMeta?.clearCliSessionBinding === true,`
`1050`	`1053`	`logLabel: "followup",`
`1051`	`1054`	`});`
`1052`	`1055`	`}`

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,8 @@`
`1`		`-import { setCliSessionBinding, setCliSessionId } from "../../agents/cli-session.js";`
	`1`	`+import {`
	`2`	`+clearCliSession,`
	`3`	`+setCliSessionBinding,`
	`4`	`+setCliSessionId,`
	`5`	`+} from "../../agents/cli-session.js";`
`2`	`6`	`import {`
`3`	`7`	`deriveSessionTotalTokens,`
`4`	`8`	`hasNonzeroUsage,`
`@@ -20,12 +24,26 @@ function applyCliSessionIdToSessionPatch(`
`20`	`24`	`providerUsed?: string;`
`21`	`25`	`cliSessionId?: string;`
`22`	`26`	`cliSessionBinding?: import("../../config/sessions.js").CliSessionBinding;`
	`27`	`+clearCliSessionBinding?: boolean;`
`23`	`28`	`},`
`24`	`29`	`entry: SessionEntry,`
`25`	`30`	`patch: Partial<SessionEntry>,`
`26`	`31`	`): Partial<SessionEntry> {`
`27`	`32`	`const cliProvider = params.providerUsed ?? entry.modelProvider;`
`28`		`-if (params.cliSessionBinding && cliProvider) {`
	`33`	`+if (!cliProvider) {`
	`34`	`+return patch;`
	`35`	`+}`
	`36`	`+if (params.clearCliSessionBinding === true) {`
	`37`	`+const nextEntry = { ...entry, ...patch };`
	`38`	`+clearCliSession(nextEntry, cliProvider);`
	`39`	`+return {`
	`40`	`+ ...patch,`
	`41`	`+cliSessionIds: nextEntry.cliSessionIds,`
	`42`	`+cliSessionBindings: nextEntry.cliSessionBindings,`
	`43`	`+claudeCliSessionId: nextEntry.claudeCliSessionId,`
	`44`	`+};`
	`45`	`+}`
	`46`	`+if (params.cliSessionBinding) {`
`29`	`47`	`const nextEntry = { ...entry, ...patch };`
`30`	`48`	`setCliSessionBinding(nextEntry, cliProvider, params.cliSessionBinding);`
`31`	`49`	`return {`
`@@ -35,7 +53,7 @@ function applyCliSessionIdToSessionPatch(`
`35`	`53`	`claudeCliSessionId: nextEntry.claudeCliSessionId,`
`36`	`54`	`};`
`37`	`55`	`}`
`38`		`-if (params.cliSessionId && cliProvider) {`
	`56`	`+if (params.cliSessionId) {`
`39`	`57`	`const nextEntry = { ...entry, ...patch };`
`40`	`58`	`setCliSessionId(nextEntry, cliProvider, params.cliSessionId);`
`41`	`59`	`return {`
`@@ -95,6 +113,7 @@ export async function persistSessionUsageUpdate(params: {`
`95`	`113`	`systemPromptReport?: SessionSystemPromptReport;`
`96`	`114`	`cliSessionId?: string;`
`97`	`115`	`cliSessionBinding?: import("../../config/sessions.js").CliSessionBinding;`
	`116`	`+clearCliSessionBinding?: boolean;`
`98`	`117`	`compactionTokensAfter?: number;`
`99`	`118`	`preserveFreshTotalTokensOnStaleUsage?: boolean;`
`100`	`119`	`preserveUserFacingSessionModelState?: boolean;`

Original file line number	Diff line number	Diff line change
`@@ -3289,6 +3289,52 @@ describe("persistSessionUsageUpdate", () => {`
`3289`	`3289`	`});`
`3290`	`3290`	`});`
`3291`	`3291`
	`3292`	`+it("clears stale CLI binding when usage update reports an unflushed replacement", async () => {`
	`3293`	`+const storePath = await createStorePath("openclaw-usage-cli-clear-");`
	`3294`	`+const sessionKey = "main";`
	`3295`	`+await seedSessionStore({`
	`3296`	`+ storePath,`
	`3297`	`+ sessionKey,`
	`3298`	`+entry: {`
	`3299`	`+sessionId: "s1",`
	`3300`	`+updatedAt: Date.now(),`
	`3301`	`+cliSessionIds: {`
	`3302`	`+"claude-cli": "stale-cli-session",`
	`3303`	`+"codex-cli": "codex-session",`
	`3304`	`+},`
	`3305`	`+cliSessionBindings: {`
	`3306`	`+"claude-cli": {`
	`3307`	`+sessionId: "stale-cli-session",`
	`3308`	`+authProfileId: "anthropic:old",`
	`3309`	`+},`
	`3310`	`+"codex-cli": {`
	`3311`	`+sessionId: "codex-session",`
	`3312`	`+},`
	`3313`	`+},`
	`3314`	`+claudeCliSessionId: "stale-cli-session",`
	`3315`	`+},`
	`3316`	`+});`
	`3317`	`+`
	`3318`	`+await persistSessionUsageUpdate({`
	`3319`	`+ storePath,`
	`3320`	`+ sessionKey,`
	`3321`	`+usage: { input: 24_000, output: 2_000, cacheRead: 8_000 },`
	`3322`	`+usageIsContextSnapshot: true,`
	`3323`	`+providerUsed: "claude-cli",`
	`3324`	`+clearCliSessionBinding: true,`
	`3325`	`+contextTokensUsed: 200_000,`
	`3326`	`+});`
	`3327`	`+`
	`3328`	`+const stored = JSON.parse(await fs.readFile(storePath, "utf-8"));`
	`3329`	`+expect(stored[sessionKey].cliSessionIds?.["claude-cli"]).toBeUndefined();`
	`3330`	`+expect(stored[sessionKey].cliSessionIds?.["codex-cli"]).toBe("codex-session");`
	`3331`	`+expect(stored[sessionKey].cliSessionBindings?.["claude-cli"]).toBeUndefined();`
	`3332`	`+expect(stored[sessionKey].cliSessionBindings?.["codex-cli"]).toEqual({`
	`3333`	`+sessionId: "codex-session",`
	`3334`	`+});`
	`3335`	`+expect(stored[sessionKey].claudeCliSessionId).toBeUndefined();`
	`3336`	`+});`
	`3337`	`+`
`3292`	`3338`	`it("prefers fresh final usage over zero compactionTokensAfter", async () => {`
`3293`	`3339`	`const storePath = await createStorePath("openclaw-usage-compaction-reset-");`
`3294`	`3340`	`const sessionKey = "main";`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main