fix(agents): preserve auth-boundary cli invalidation · openclaw/openclaw@21b5f60

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
`@@ -1506,6 +1506,45 @@ describe("shouldSkipLocalCliCredentialEpoch", () => {`
`1506`	`1506`	`}`
`1507`	`1507`	`});`
`1508`	`1508`
	`1509`	`+it("keeps auth-boundary invalidation ahead of orphaned transcript checks", async () => {`
	`1510`	`+const { dir, sessionFile } = createSessionFile();`
	`1511`	`+`
	`1512`	`+try {`
	`1513`	`+setClaudeCliBackendForPrepareTest();`
	`1514`	`+const transcriptCheck = vi.fn(async () => true);`
	`1515`	`+const orphanCheck = vi.fn(async () => true);`
	`1516`	`+setCliRunnerPrepareTestDeps({`
	`1517`	`+claudeCliSessionTranscriptHasContent: transcriptCheck,`
	`1518`	`+claudeCliSessionTranscriptHasOrphanedToolUse: orphanCheck,`
	`1519`	`+});`
	`1520`	`+`
	`1521`	`+const context = await prepareCliRunContext({`
	`1522`	`+sessionId: "session-test",`
	`1523`	`+sessionKey: "agent:main:telegram:direct:peer",`
	`1524`	`+ sessionFile,`
	`1525`	`+workspaceDir: dir,`
	`1526`	`+prompt: "follow-up",`
	`1527`	`+provider: "claude-cli",`
	`1528`	`+model: "opus",`
	`1529`	`+timeoutMs: 1_000,`
	`1530`	`+runId: "run-orphan-auth-boundary",`
	`1531`	`+cliSessionBinding: {`
	`1532`	`+sessionId: "orphaned-claude-sid",`
	`1533`	`+authProfileId: "anthropic:old-profile",`
	`1534`	`+cwdHash: hashCliSessionText(dir),`
	`1535`	`+},`
	`1536`	`+cliSessionId: "orphaned-claude-sid",`
	`1537`	`+config: createCliBackendConfig(),`
	`1538`	`+});`
	`1539`	`+`
	`1540`	`+expect(transcriptCheck).not.toHaveBeenCalled();`
	`1541`	`+expect(orphanCheck).not.toHaveBeenCalled();`
	`1542`	`+expect(context.reusableCliSession).toEqual({ invalidatedReason: "auth-profile" });`
	`1543`	`+} finally {`
	`1544`	`+fs.rmSync(dir, { recursive: true, force: true });`
	`1545`	`+}`
	`1546`	`+});`
	`1547`	`+`
`1509`	`1548`	`it("keeps the claude-cli sessionId when the on-disk transcript is present", async () => {`
`1510`	`1549`	`const { dir, sessionFile } = createSessionFile();`
`1511`	`1550`	`try {`

Original file line number	Diff line number	Diff line change
`@@ -370,15 +370,22 @@ export async function prepareCliRunContext(`
`370`	`370`	`bundleMcpEnabled && mcpLoopbackRuntime`
`371`	`371`	`? hashCliSessionText(JSON.stringify(promptTools.map((tool) => tool.name).toSorted()))`
`372`	`372`	`: undefined;`
`373`		`-// Pre-flight: if a saved Claude CLI sessionId points at a transcript that no`
`374`		`-// longer exists on disk (e.g. update.run aborted mid-swap, Claude CLI was`
`375`		-// reinstalled, or the projects tree was manually pruned), `claude --resume`
`376`		`-// hangs or fails outside the cli-runner session_expired path. The persisted`
`377`		`-// binding then never gets refreshed, causing every subsequent turn to retry`
`378`		`-// the same dead sessionId. Drop the binding here so this turn starts fresh`
`379`		`-// and the post-run flow writes the new sessionId back via setCliSessionBinding.`
`380`		`-const candidateClaudeCliSessionId =`
`381`		`-params.cliSessionBinding?.sessionId?.trim() \|\| params.cliSessionId?.trim() \|\| undefined;`
	`373`	`+const reusableCliSessionCandidate: CliReusableSession = params.cliSessionBinding`
	`374`	`+ ? resolveCliSessionReuse({`
	`375`	`+binding: params.cliSessionBinding,`
	`376`	`+authProfileId: effectiveAuthProfileId,`
	`377`	`+ authEpoch,`
	`378`	`+authEpochVersion: CLI_AUTH_EPOCH_VERSION,`
	`379`	`+ extraSystemPromptHash,`
	`380`	`+ promptToolNamesHash,`
	`381`	`+ cwdHash,`
	`382`	`+mcpConfigHash: preparedBackendFinal.mcpConfigHash,`
	`383`	`+mcpResumeHash: preparedBackendFinal.mcpResumeHash,`
	`384`	`+})`
	`385`	`+ : params.cliSessionId`
	`386`	`+ ? { sessionId: params.cliSessionId }`
	`387`	`+ : {};`
	`388`	`+const candidateClaudeCliSessionId = reusableCliSessionCandidate.sessionId?.trim() \|\| undefined;`
`382`	`389`	`const hasClaudeCliCandidate =`
`383`	`390`	`candidateClaudeCliSessionId !== undefined && isClaudeCliProvider(params.provider);`
`384`	`391`	`const claudeCliTranscriptMissing =`
`@@ -402,21 +409,7 @@ export async function prepareCliRunContext(`
`402`	`409`	`: undefined;`
`403`	`410`	`const reusableCliSession: CliReusableSession = claudeCliInvalidatedReason`
`404`	`411`	`? { invalidatedReason: claudeCliInvalidatedReason }`
`405`		`- : params.cliSessionBinding`
`406`		`- ? resolveCliSessionReuse({`
`407`		`-binding: params.cliSessionBinding,`
`408`		`-authProfileId: effectiveAuthProfileId,`
`409`		`- authEpoch,`
`410`		`-authEpochVersion: CLI_AUTH_EPOCH_VERSION,`
`411`		`- extraSystemPromptHash,`
`412`		`- promptToolNamesHash,`
`413`		`- cwdHash,`
`414`		`-mcpConfigHash: preparedBackendFinal.mcpConfigHash,`
`415`		`-mcpResumeHash: preparedBackendFinal.mcpResumeHash,`
`416`		`-})`
`417`		`- : params.cliSessionId`
`418`		`- ? { sessionId: params.cliSessionId }`
`419`		`- : {};`
	`412`	`+ : reusableCliSessionCandidate;`
`420`	`413`	`if (reusableCliSession.invalidatedReason) {`
`421`	`414`	`cliBackendLog.info(`
`422`	`415`	`cli session reset: provider=${params.provider} reason=${reusableCliSession.invalidatedReason}`,

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

推荐订阅源

Recent Commits to openclaw:main