fix: narrow ACP timeout config suppression (#81603) · openclaw/openclaw@f8ae0fb

Recent Commits to openclaw:main

steipete · 2026-05-15 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,27 @@ function isOptionalTimeoutConfigKey(key: string): boolean {`
`51`	`51`	`return OPTIONAL_TIMEOUT_CONFIG_KEYS.has(normalizeLowercaseStringOrEmpty(key));`
`52`	`52`	`}`
`53`	`53`
	`54`	`+function isUnsupportedOptionalTimeoutConfigRejection(key: string, error: unknown): boolean {`
	`55`	`+if (!isOptionalTimeoutConfigKey(key)) {`
	`56`	`+return false;`
	`57`	`+}`
	`58`	`+const errorCode = error && typeof error === "object" ? (error as { code?: unknown }).code : null;`
	`59`	`+if (errorCode === "ACP_BACKEND_UNSUPPORTED_CONTROL") {`
	`60`	`+return true;`
	`61`	`+}`
	`62`	`+const message =`
	`63`	`+error instanceof Error ? error.message : typeof error === "string" ? error : String(error);`
	`64`	`+const normalized = normalizeLowercaseStringOrEmpty(message);`
	`65`	`+return (`
	`66`	`+normalized.includes("session/set_config_option") &&`
	`67`	`+(normalized.includes("-32602") \|\|`
	`68`	`+normalized.includes("invalid params") \|\|`
	`69`	`+normalized.includes("unsupported") \|\|`
	`70`	`+normalized.includes("not supported") \|\|`
	`71`	`+normalized.includes("not implement"))`
	`72`	`+);`
	`73`	`+}`
	`74`	`+`
`54`	`75`	`export async function resolveManagerRuntimeCapabilities(params: {`
`55`	`76`	`runtime: AcpRuntime;`
`56`	`77`	`handle: AcpRuntimeHandle;`
`@@ -172,7 +193,7 @@ export async function applyManagerRuntimeControls(params: {`
`172`	`193`	`value,`
`173`	`194`	`});`
`174`	`195`	`} catch (error) {`
`175`		`-if (isOptionalTimeoutConfigKey(key)) {`
	`196`	`+if (isUnsupportedOptionalTimeoutConfigRejection(key, error)) {`
`176`	`197`	`continue;`
`177`	`198`	`}`
`178`	`199`	`throw error;`

Original file line number	Diff line number	Diff line change
`@@ -3351,6 +3351,49 @@ describe("AcpSessionManager", () => {`
`3351`	`3351`	`expect(runtimeState.runTurn).toHaveBeenCalledTimes(1);`
`3352`	`3352`	`});`
`3353`	`3353`
	`3354`	`+it("fails turns when optional timeout config writes hit runtime failures", async () => {`
	`3355`	`+const runtimeState = createRuntime();`
	`3356`	`+runtimeState.setConfigOption.mockImplementation(async (input: { key: string }) => {`
	`3357`	`+if (input.key === "timeout") {`
	`3358`	`+throw new AcpRuntimeError("ACP_BACKEND_UNAVAILABLE", "ACP backend unavailable");`
	`3359`	`+}`
	`3360`	`+});`
	`3361`	`+hoisted.requireAcpRuntimeBackendMock.mockReturnValue({`
	`3362`	`+id: "acpx",`
	`3363`	`+runtime: runtimeState.runtime,`
	`3364`	`+});`
	`3365`	`+hoisted.readAcpSessionEntryMock.mockReturnValue({`
	`3366`	`+sessionKey: "agent:opencode:acp:session-1",`
	`3367`	`+storeSessionKey: "agent:opencode:acp:session-1",`
	`3368`	`+acp: {`
	`3369`	`+ ...readySessionMeta({ agent: "opencode" }),`
	`3370`	`+runtimeOptions: {`
	`3371`	`+timeoutSeconds: 120,`
	`3372`	`+},`
	`3373`	`+},`
	`3374`	`+});`
	`3375`	`+`
	`3376`	`+const manager = new AcpSessionManager();`
	`3377`	`+await expectRejectedRecord(`
	`3378`	`+manager.runTurn({`
	`3379`	`+cfg: baseCfg,`
	`3380`	`+sessionKey: "agent:opencode:acp:session-1",`
	`3381`	`+text: "do work",`
	`3382`	`+mode: "prompt",`
	`3383`	`+requestId: "run-opencode",`
	`3384`	`+}),`
	`3385`	`+{`
	`3386`	`+code: "ACP_BACKEND_UNAVAILABLE",`
	`3387`	`+},`
	`3388`	`+);`
	`3389`	`+`
	`3390`	`+expectMockCallFields(runtimeState.setConfigOption, {`
	`3391`	`+key: "timeout",`
	`3392`	`+value: "120",`
	`3393`	`+});`
	`3394`	`+expect(runtimeState.runTurn).not.toHaveBeenCalled();`
	`3395`	`+});`
	`3396`	`+`
`3354`	`3397`	`it("fails turns when adapters reject required runtime config", async () => {`
`3355`	`3398`	`const runtimeState = createRuntime();`
`3356`	`3399`	`runtimeState.setConfigOption.mockImplementation(async (input: { key: string }) => {`

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

推荐订阅源

Recent Commits to openclaw:main