vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-06 13:00:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(acpx): ignore Codex ACP timeout config

Browse Source
This commit is contained in:
Peter Steinberger
2026-04-28 00:12:27 +01:00
parent d74c8423c7
commit d3e4640bed
3 changed files with 94 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
extensions/acpx/src/runtime.test.ts
View File

@@ -353,6 +353,68 @@ describe("AcpxRuntime fresh reset wrapper", () => {
});
});
it("ignores unsupported Codex ACP timeout config controls", async () => {
const baseStore: TestSessionStore = {
load: vi.fn(async () => ({
acpxRecordId: "agent:codex:acp:test",
agentCommand: CODEX_ACP_COMMAND,
})),
save: vi.fn(async () => {}),
};
const { runtime, delegate } = makeRuntime(baseStore);
const setConfigOption = vi.spyOn(delegate, "setConfigOption").mockResolvedValue(undefined);
const handle: Parameters<NonNullable<AcpRuntime["setConfigOption"]>>[0]["handle"] = {
sessionKey: "agent:codex:acp:test",
backend: "acpx",
runtimeSessionName: "agent:codex:acp:test",
acpxRecordId: "agent:codex:acp:test",
};
await runtime.setConfigOption({
handle,
key: "timeout",
value: "60000",
});
await runtime.setConfigOption({
handle,
key: "Timeout_Seconds",
value: "60",
});
expect(setConfigOption).not.toHaveBeenCalled();
});
it("forwards timeout config controls for non-Codex ACP agents", async () => {
const baseStore: TestSessionStore = {
load: vi.fn(async () => ({
acpxRecordId: "agent:claude:acp:test",
agentCommand: "npx @agentclientprotocol/claude-agent-acp",
})),
save: vi.fn(async () => {}),
};
const { runtime, delegate } = makeRuntime(baseStore);
const setConfigOption = vi.spyOn(delegate, "setConfigOption").mockResolvedValue(undefined);
const handle: Parameters<NonNullable<AcpRuntime["setConfigOption"]>>[0]["handle"] = {
sessionKey: "agent:claude:acp:test",
backend: "acpx",
runtimeSessionName: "agent:claude:acp:test",
acpxRecordId: "agent:claude:acp:test",
};
await runtime.setConfigOption({
handle,
key: "timeout",
value: "60",
});
expect(setConfigOption).toHaveBeenCalledOnce();
expect(setConfigOption).toHaveBeenCalledWith({
handle,
key: "timeout",
value: "60",
});
});
it("keeps stale persistent loads hidden until a fresh record is saved", async () => {
const baseStore: TestSessionStore = {
load: vi.fn(async () => ({ acpxRecordId: "stale" }) as never),

57
extensions/acpx/src/runtime.ts
View File

@@ -510,36 +510,41 @@ export class AcpxRuntime implements AcpRuntime {
): Promise<void> {
const delegate = await this.resolveDelegateForHandle(input.handle);
const command = await this.resolveCommandForHandle(input.handle);
if (
(input.key === "model" ||
input.key === "thinking" ||
input.key === "thought_level" ||
input.key === "reasoning_effort") &&
isCodexAcpCommand(command)
) {
const override =
input.key === "model"
? normalizeCodexAcpModelOverride(input.value)
: normalizeCodexAcpModelOverride(undefined, input.value);
if (!override && input.key !== "model") {
const key = input.key.trim().toLowerCase();
if (isCodexAcpCommand(command)) {
if (key === "timeout" || key === "timeout_seconds") {
return;
}
if (override) {
if (override.model) {
await delegate.setConfigOption({
...input,
key: "model",
value: override.model,
});
if (
key === "model" ||
key === "thinking" ||
key === "thought_level" ||
key === "reasoning_effort"
) {
const override =
key === "model"
? normalizeCodexAcpModelOverride(input.value)
: normalizeCodexAcpModelOverride(undefined, input.value);
if (!override && key !== "model") {
return;
}
if (override.reasoningEffort) {
await delegate.setConfigOption({
...input,
key: "reasoning_effort",
value: override.reasoningEffort,
});
if (override) {
if (override.model) {
await delegate.setConfigOption({
...input,
key: "model",
value: override.model,
});
}
if (override.reasoningEffort) {
await delegate.setConfigOption({
...input,
key: "reasoning_effort",
value: override.reasoningEffort,
});
}
return;
}
return;
}
}
await delegate.setConfigOption(input);