fix(agents): scope cli binding clears · openclaw/openclaw...

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
`@@ -1,2 +1,2 @@`
`1`	`1`	`export { runCliAgent } from "./cli-runner.js";`
`2`		`-export { getCliSessionId, setCliSessionId } from "./cli-session.js";`
	`2`	`+export { clearCliSession, getCliSessionId, setCliSessionId } from "./cli-session.js";`

Original file line number	Diff line number	Diff line change
`@@ -95,10 +95,11 @@ export function keepCliSessionBindingOnlyWhenReused(params: {`
`95`	`95`	`const existingSessionId = normalizeOptionalString(params.existingSessionId);`
`96`	`96`	`const agentMeta = params.result.meta.agentMeta;`
`97`	`97`	`const returnedSessionId = normalizeOptionalString(agentMeta?.cliSessionBinding?.sessionId);`
	`98`	`+const shouldClearStoredSession = agentMeta?.clearCliSessionBinding === true;`
`98`	`99`	`if (agentMeta === undefined \|\| (existingSessionId && returnedSessionId === existingSessionId)) {`
`99`	`100`	`return params.result;`
`100`	`101`	`}`
`101`		`-if (returnedSessionId) {`
	`102`	`+if (returnedSessionId \|\| shouldClearStoredSession) {`
`102`	`103`	`params.onDroppedReplacement?.();`
`103`	`104`	`}`
`104`	`105`	`return {`
`@@ -109,6 +110,7 @@ export function keepCliSessionBindingOnlyWhenReused(params: {`
`109`	`110`	`...agentMeta,`
`110`	`111`	`sessionId: "",`
`111`	`112`	`cliSessionBinding: undefined,`
	`113`	`+clearCliSessionBinding: undefined,`
`112`	`114`	`},`
`113`	`115`	`},`
`114`	`116`	`};`

Original file line number	Diff line number	Diff line change
`@@ -1950,6 +1950,7 @@ describe("runAgentTurnWithFallback", () => {`
`1950`	`1950`	`sessionId: "transient-cli-session",`
`1951`	`1951`	`authProfileId: "profile",`
`1952`	`1952`	`},`
	`1953`	`+clearCliSessionBinding: true,`
`1953`	`1954`	`},`
`1954`	`1955`	`},`
`1955`	`1956`	`});`
`@@ -1985,6 +1986,7 @@ describe("runAgentTurnWithFallback", () => {`
`1985`	`1986`	`}`
`1986`	`1987`	`expect(result.runResult.meta?.agentMeta?.sessionId).toBe("");`
`1987`	`1988`	`expect(result.runResult.meta?.agentMeta?.cliSessionBinding).toBeUndefined();`
	`1989`	`+expect(result.runResult.meta?.agentMeta?.clearCliSessionBinding).toBeUndefined();`
`1988`	`1990`	`expect(activeSessionStore.main.cliSessionBindings?.["codex-cli"]).toBeUndefined();`
`1989`	`1991`	`});`
`1990`	`1992`
`@@ -2036,6 +2038,54 @@ describe("runAgentTurnWithFallback", () => {`
`2036`	`2038`	`});`
`2037`	`2039`	`});`
`2038`	`2040`
	`2041`	`+it("clears room-event CLI bindings when an unflushed replacement is dropped", async () => {`
	`2042`	`+state.isCliProviderMock.mockReturnValue(true);`
	`2043`	`+state.runWithModelFallbackMock.mockImplementationOnce(async (params: FallbackRunnerParams) => ({`
	`2044`	`+result: await params.run("codex-cli", "gpt-5.4"),`
	`2045`	`+provider: "codex-cli",`
	`2046`	`+model: "gpt-5.4",`
	`2047`	`+attempts: [],`
	`2048`	`+}));`
	`2049`	`+state.runCliAgentMock.mockResolvedValueOnce({`
	`2050`	`+payloads: [{ text: "handled" }],`
	`2051`	`+meta: {`
	`2052`	`+agentMeta: {`
	`2053`	`+sessionId: "",`
	`2054`	`+provider: "codex-cli",`
	`2055`	`+model: "gpt-5.4",`
	`2056`	`+clearCliSessionBinding: true,`
	`2057`	`+},`
	`2058`	`+},`
	`2059`	`+});`
	`2060`	`+`
	`2061`	`+const runAgentTurnWithFallback = await getRunAgentTurnWithFallback();`
	`2062`	`+const followupRun = createFollowupRun();`
	`2063`	`+followupRun.currentInboundEventKind = "room_event";`
	`2064`	`+followupRun.run.provider = "codex-cli";`
	`2065`	`+followupRun.run.model = "gpt-5.4";`
	`2066`	`+const sessionEntry = {`
	`2067`	`+cliSessionBindings: {`
	`2068`	`+"codex-cli": { sessionId: "existing-cli-session" },`
	`2069`	`+},`
	`2070`	`+} as unknown as SessionEntry;`
	`2071`	`+const activeSessionStore = { main: sessionEntry };`
	`2072`	`+`
	`2073`	`+const result = await runAgentTurnWithFallback({`
	`2074`	`+ ...createMinimalRunAgentTurnParams({ followupRun }),`
	`2075`	`+ activeSessionStore,`
	`2076`	`+getActiveSessionEntry: () => sessionEntry,`
	`2077`	`+});`
	`2078`	`+`
	`2079`	`+expect(result.kind).toBe("success");`
	`2080`	`+if (result.kind !== "success") {`
	`2081`	`+throw new Error("expected success");`
	`2082`	`+}`
	`2083`	`+expect(result.runResult.meta?.agentMeta?.sessionId).toBe("");`
	`2084`	`+expect(result.runResult.meta?.agentMeta?.cliSessionBinding).toBeUndefined();`
	`2085`	`+expect(result.runResult.meta?.agentMeta?.clearCliSessionBinding).toBeUndefined();`
	`2086`	`+expect(activeSessionStore.main.cliSessionBindings?.["codex-cli"]).toBeUndefined();`
	`2087`	`+});`
	`2088`	`+`
`2039`	`2089`	`it("bridges CLI assistant agent events into onPartialReply for live preview (#76869)", async () => {`
`2040`	`2090`	`state.isCliProviderMock.mockReturnValue(true);`
`2041`	`2091`	`state.runWithModelFallbackMock.mockImplementationOnce(async (params: FallbackRunnerParams) => ({`

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`import { afterEach, beforeEach, describe, expect, it } from "vitest";`
`2`	`2`	`import {`
	`3`	`+clearCliSessionMock,`
`3`	`4`	`clearFastTestEnv,`
`4`	`5`	`getCliSessionIdMock,`
`5`	`6`	`isCliProviderMock,`
`@@ -284,6 +285,45 @@ describe("runCronIsolatedAgentTurn — cron model override forwarding (#58065)",`
`284`	`285`	`).toBe(true);`
`285`	`286`	`});`
`286`	`287`
	`288`	`+it("clears stale CLI bindings when cron CLI replacement is unflushed", async () => {`
	`289`	`+isCliProviderMock.mockReturnValue(true);`
	`290`	`+runWithModelFallbackMock.mockImplementation(async ({ provider, model, run }) => {`
	`291`	`+const result = await run(provider, model);`
	`292`	`+return { result, provider, model, attempts: [] };`
	`293`	`+});`
	`294`	`+const cronSession = makeCronSession({`
	`295`	`+sessionEntry: makeCronSessionEntry({`
	`296`	`+cliSessionBindings: {`
	`297`	`+"claude-cli": { sessionId: "stale-cli-session" },`
	`298`	`+"codex-cli": { sessionId: "codex-session" },`
	`299`	`+},`
	`300`	`+}),`
	`301`	`+isNewSession: false,`
	`302`	`+});`
	`303`	`+resolveCronSessionMock.mockReturnValue(cronSession);`
	`304`	`+runCliAgentMock.mockResolvedValueOnce({`
	`305`	`+payloads: [{ text: "summary done" }],`
	`306`	`+meta: {`
	`307`	`+agentMeta: {`
	`308`	`+provider: "claude-cli",`
	`309`	`+model: "claude-opus-4-6",`
	`310`	`+sessionId: "",`
	`311`	`+clearCliSessionBinding: true,`
	`312`	`+usage: { input: 10, output: 20 },`
	`313`	`+},`
	`314`	`+},`
	`315`	`+});`
	`316`	`+`
	`317`	`+const result = await runCronIsolatedAgentTurn(`
	`318`	`+makeParams({`
	`319`	`+job: makeJob({ sessionTarget: "session:existing-cron-session" }),`
	`320`	`+}),`
	`321`	`+);`
	`322`	`+`
	`323`	`+expect(result.status).toBe("ok");`
	`324`	`+expect(clearCliSessionMock).toHaveBeenCalledWith(cronSession.sessionEntry, "claude-cli");`
	`325`	`+});`
	`326`	`+`
`287`	`327`	`it("validates cron thinking with catalog reasoning metadata", async () => {`
`288`	`328`	`resolveAllowedModelRefMock.mockImplementation(() => ({`
`289`	`329`	`ref: { provider: "ollama", model: "qwen3:0.6b" },`

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@ export const runEmbeddedAgentMock = createMock();`
`56`	`56`	`export const runCliAgentMock = createMock();`
`57`	`57`	`export const lookupContextTokensMock = createMock();`
`58`	`58`	`export const getCliSessionIdMock = createMock();`
	`59`	`+export const clearCliSessionMock = createMock();`
`59`	`60`	`export const updateSessionStoreMock = createMock();`
`60`	`61`	`export const resolveCronSessionMock = createMock();`
`61`	`62`	`export const logWarnMock = createMock();`
`@@ -283,6 +284,7 @@ vi.mock("./run-subagent-registry.runtime.js", () => ({`
`283`	`284`	`}));`
`284`	`285`
`285`	`286`	`vi.mock("../../agents/cli-runner.runtime.js", () => ({`
	`287`	`+clearCliSession: clearCliSessionMock,`
`286`	`288`	`setCliSessionId: vi.fn(),`
`287`	`289`	`}));`
`288`	`290`
`@@ -487,6 +489,7 @@ function resetRunExecutionMocks(): void {`
`487`	`489`	`runEmbeddedAgentMock.mockReset();`
`488`	`490`	`runEmbeddedAgentMock.mockResolvedValue(makeDefaultEmbeddedResult());`
`489`	`491`	`runCliAgentMock.mockReset();`
	`492`	`+clearCliSessionMock.mockReset();`
`490`	`493`	`getCliSessionIdMock.mockReturnValue(undefined);`
`491`	`494`	`countActiveDescendantRunsMock.mockReset();`
`492`	`495`	`countActiveDescendantRunsMock.mockReturnValue(0);`

Original file line number	Diff line number	Diff line change
`@@ -944,7 +944,10 @@ async function finalizeCronRun(params: {`
`944`	`944`	`prepared.cronSession.sessionEntry.contextTokens = contextTokens;`
`945`	`945`	`if (isCliProvider(providerUsed, prepared.cfgWithAgentDefaults)) {`
`946`	`946`	`const cliSessionId = finalRunResult.meta?.agentMeta?.sessionId?.trim();`
`947`		`-if (cliSessionId) {`
	`947`	`+if (finalRunResult.meta?.agentMeta?.clearCliSessionBinding === true) {`
	`948`	`+const { clearCliSession } = await loadCliRunnerRuntime();`
	`949`	`+clearCliSession(prepared.cronSession.sessionEntry, providerUsed);`
	`950`	`+} else if (cliSessionId) {`
`948`	`951`	`const { setCliSessionId } = await loadCliRunnerRuntime();`
`949`	`952`	`setCliSessionId(prepared.cronSession.sessionEntry, providerUsed, cliSessionId);`
`950`	`953`	`}`

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

推荐订阅源

Recent Commits to openclaw:main