Skip to content

Commit edd908b

Browse files
committed
fix: apply agent mode before persisting
1 parent a943bce commit edd908b

2 files changed

Lines changed: 68 additions & 2 deletions

File tree

‎src/CodexAcpServer.ts‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -793,8 +793,14 @@ export class CodexAcpServer {
793793
if (!newMode) {
794794
throw RequestError.invalidParams();
795795
}
796-
await this.codexAcpClient.setAgentMode(sessionState.sessionId, newMode);
796+
const previousMode = sessionState.agentMode;
797797
sessionState.agentMode = newMode;
798+
try {
799+
await this.codexAcpClient.setAgentMode(sessionState.sessionId, newMode);
800+
} catch (error) {
801+
sessionState.agentMode = previousMode;
802+
throw error;
803+
}
798804
}
799805

800806
private async applyCollaborationModeChange(sessionState: SessionState, value: string): Promise<void> {

‎src/__tests__/CodexACPAgent/session-config-options.test.ts‎

Lines changed: 61 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
import {describe, expect, it, vi} from "vitest";
2-
import {createCodexMockTestFixture, createTestModel} from "../acp-test-utils";
2+
import {
3+
createCodexMockTestFixture,
4+
createTestModel,
5+
mockPromptTurn,
6+
} from "../acp-test-utils";
37
import {AgentMode, MODE_CONFIG_ID} from "../../AgentMode";
48
import {
59
MODEL_CONFIG_ID,
@@ -16,6 +20,17 @@ const lowEffort: ReasoningEffortOption = {reasoningEffort: "low", description: "
1620
const mediumEffort: ReasoningEffortOption = {reasoningEffort: "medium", description: "Balanced"};
1721
const highEffort: ReasoningEffortOption = {reasoningEffort: "high", description: "Thorough"};
1822

23+
function deferred<T>(): {
24+
promise: Promise<T>;
25+
resolve: (value: T | PromiseLike<T>) => void;
26+
} {
27+
let resolve!: (value: T | PromiseLike<T>) => void;
28+
const promise = new Promise<T>((resolvePromise) => {
29+
resolve = resolvePromise;
30+
});
31+
return {promise, resolve};
32+
}
33+
1934
function buildModels(): {fast: Model; slow: Model} {
2035
const fast = createTestModel({
2136
id: "fast-model",
@@ -161,6 +176,51 @@ describe("Session config options", () => {
161176
expect((modeOption as any).currentValue).toBe(AgentMode.ReadOnly.id);
162177
});
163178

179+
it("uses a new agent mode for prompts while thread persistence is pending", async () => {
180+
const {fast} = buildModels();
181+
const {fixture, codexAcpAgent, update} = await createSession("fast-model[medium]", [fast]);
182+
const sessionState = codexAcpAgent.getSessionState("session-id");
183+
const turnStartSpy = mockPromptTurn(fixture, sessionState.sessionId);
184+
const persistence = deferred<void>();
185+
update.mockReturnValue(persistence.promise);
186+
187+
const modeChange = codexAcpAgent.setSessionConfigOption({
188+
sessionId: sessionState.sessionId,
189+
configId: MODE_CONFIG_ID,
190+
value: AgentMode.AgentFullAccess.id,
191+
});
192+
193+
expect(sessionState.agentMode).toBe(AgentMode.AgentFullAccess);
194+
195+
await codexAcpAgent.prompt({
196+
sessionId: sessionState.sessionId,
197+
prompt: [{type: "text", text: "test"}],
198+
});
199+
200+
expect(turnStartSpy).toHaveBeenCalledWith(expect.objectContaining({
201+
approvalPolicy: AgentMode.AgentFullAccess.approvalPolicy,
202+
sandboxPolicy: AgentMode.AgentFullAccess.sandboxPolicy,
203+
}));
204+
205+
persistence.resolve();
206+
await modeChange;
207+
});
208+
209+
it("rolls back the agent mode when thread persistence fails", async () => {
210+
const {fast} = buildModels();
211+
const {codexAcpAgent, update} = await createSession("fast-model[medium]", [fast]);
212+
const sessionState = codexAcpAgent.getSessionState("session-id");
213+
update.mockRejectedValue(new Error("settings update failed"));
214+
215+
await expect(codexAcpAgent.setSessionConfigOption({
216+
sessionId: sessionState.sessionId,
217+
configId: MODE_CONFIG_ID,
218+
value: AgentMode.AgentFullAccess.id,
219+
})).rejects.toThrow("settings update failed");
220+
221+
expect(sessionState.agentMode).toBe(AgentMode.Agent);
222+
});
223+
164224
it("changes collaboration mode without starting a model turn", async () => {
165225
const {fast} = buildModels();
166226
const {codexAcpAgent, update} = await createSession("fast-model[medium]", [fast]);

0 commit comments

Comments
 (0)