fix(acp): refresh runtime handles on config changes (#822...

Recent Commits to openclaw:main

giodl73-repo · 2026-05-17 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import { resolveAgentTimeoutMs } from "../../agents/timeout.js";`
	`2`	`+import { resolveRuntimeConfigCacheKey } from "../../config/runtime-snapshot.js";`
`2`	`3`	`import type { OpenClawConfig } from "../../config/types.openclaw.js";`
`3`	`4`	`import { logVerbose } from "../../globals.js";`
`4`	`5`	`import { formatErrorMessage } from "../../infra/errors.js";`
`@@ -424,6 +425,7 @@ export class AcpSessionManager {`
`424`	`425`	`agent,`
`425`	`426`	`mode: input.mode,`
`426`	`427`	`cwd: effectiveCwd,`
	`428`	`+configSignature: resolveRuntimeConfigCacheKey(input.cfg),`
`427`	`429`	`});`
`428`	`430`	`return {`
`429`	`431`	`runtime,`
`@@ -1469,12 +1471,14 @@ export class AcpSessionManager {`
`1469`	`1471`	`const model = normalizeText(runtimeOptions.model);`
`1470`	`1472`	`const thinking = normalizeText(runtimeOptions.thinking);`
`1471`	`1473`	`const configuredBackend = (params.meta.backend \|\| params.cfg.acp?.backend \|\| "").trim();`
	`1474`	`+const configSignature = resolveRuntimeConfigCacheKey(params.cfg);`
`1472`	`1475`	`const cached = this.getCachedRuntimeState(params.sessionKey);`
`1473`	`1476`	`if (cached) {`
`1474`	`1477`	`const backendMatches = !configuredBackend \|\| cached.backend === configuredBackend;`
`1475`	`1478`	`const agentMatches = cached.agent === agent;`
`1476`	`1479`	`const modeMatches = cached.mode === mode;`
`1477`	`1480`	`const cwdMatches = (cached.cwd ?? "") === (cwd ?? "");`
	`1481`	`+const configMatches = cached.configSignature === configSignature;`
`1478`	`1482`	`const handleMatchesMeta = this.runtimeHandleMatchesMeta({`
`1479`	`1483`	`handle: cached.handle,`
`1480`	`1484`	`meta: params.meta,`
`@@ -1484,6 +1488,7 @@ export class AcpSessionManager {`
`1484`	`1488`	`agentMatches &&`
`1485`	`1489`	`modeMatches &&`
`1486`	`1490`	`cwdMatches &&`
	`1491`	`+configMatches &&`
`1487`	`1492`	`handleMatchesMeta &&`
`1488`	`1493`	`(await this.isCachedRuntimeHandleReusable({`
`1489`	`1494`	`sessionKey: params.sessionKey,`
`@@ -1638,6 +1643,7 @@ export class AcpSessionManager {`
`1638`	`1643`	`agent,`
`1639`	`1644`	`mode,`
`1640`	`1645`	`cwd: effectiveCwd,`
	`1646`	`+ configSignature,`
`1641`	`1647`	`appliedControlSignature: undefined,`
`1642`	`1648`	`});`
`1643`	`1649`	`return {`

Original file line number	Diff line number	Diff line change
`@@ -945,6 +945,59 @@ describe("AcpSessionManager", () => {`
`945`	`945`	`expect(runtimeState.runTurn).toHaveBeenCalledTimes(2);`
`946`	`946`	`});`
`947`	`947`
	`948`	`+it("re-ensures cached runtime handles when the runtime config changes", async () => {`
	`949`	`+const runtimeState = createRuntime();`
	`950`	`+hoisted.requireAcpRuntimeBackendMock.mockReturnValue({`
	`951`	`+id: "acpx",`
	`952`	`+runtime: runtimeState.runtime,`
	`953`	`+});`
	`954`	`+hoisted.readAcpSessionEntryMock.mockReturnValue({`
	`955`	`+sessionKey: "agent:codex:acp:session-1",`
	`956`	`+storeSessionKey: "agent:codex:acp:session-1",`
	`957`	`+acp: readySessionMeta(),`
	`958`	`+});`
	`959`	`+const allowlistCfg = {`
	`960`	`+ ...baseCfg,`
	`961`	`+tools: {`
	`962`	`+exec: {`
	`963`	`+security: "allowlist",`
	`964`	`+safeBins: ["git"],`
	`965`	`+},`
	`966`	`+},`
	`967`	`+} satisfies OpenClawConfig;`
	`968`	`+const denyCfg = {`
	`969`	`+ ...baseCfg,`
	`970`	`+tools: {`
	`971`	`+exec: {`
	`972`	`+security: "deny",`
	`973`	`+safeBins: ["node"],`
	`974`	`+},`
	`975`	`+},`
	`976`	`+} satisfies OpenClawConfig;`
	`977`	`+`
	`978`	`+const manager = new AcpSessionManager();`
	`979`	`+await manager.runTurn({`
	`980`	`+cfg: allowlistCfg,`
	`981`	`+sessionKey: "agent:codex:acp:session-1",`
	`982`	`+text: "first",`
	`983`	`+mode: "prompt",`
	`984`	`+requestId: "r1",`
	`985`	`+});`
	`986`	`+await manager.runTurn({`
	`987`	`+cfg: denyCfg,`
	`988`	`+sessionKey: "agent:codex:acp:session-1",`
	`989`	`+text: "second",`
	`990`	`+mode: "prompt",`
	`991`	`+requestId: "r2",`
	`992`	`+});`
	`993`	`+`
	`994`	`+expect(runtimeState.ensureSession).toHaveBeenCalledTimes(2);`
	`995`	`+expect(runtimeState.runTurn).toHaveBeenCalledTimes(2);`
	`996`	`+expectRecordFields(mockCallArg(runtimeState.close), {`
	`997`	`+reason: "runtime-handle-replaced",`
	`998`	`+});`
	`999`	`+});`
	`1000`	`+`
`948`	`1001`	`it("re-ensures cached runtime handles when the backend reports the session is dead", async () => {`
`949`	`1002`	`const runtimeState = createRuntime();`
`950`	`1003`	`runtimeState.getStatus`

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ function mockState(sessionKey: string): CachedRuntimeState {`
`29`	`29`	`backend: "acpx",`
`30`	`30`	`agent: "codex",`
`31`	`31`	`mode: "persistent",`
	`32`	`+configSignature: "config:test",`
`32`	`33`	`};`
`33`	`34`	`}`
`34`	`35`

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ export type CachedRuntimeState = {`
`7`	`7`	`agent: string;`
`8`	`8`	`mode: AcpRuntimeSessionMode;`
`9`	`9`	`cwd?: string;`
	`10`	`+configSignature: string;`
`10`	`11`	`appliedControlSignature?: string;`
`11`	`12`	`};`
`12`	`13`

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

推荐订阅源

Recent Commits to openclaw:main