a9ecb2efce
## Description This PR addresses the following improvements: **Unify Prettier Version**: Currently, the Prettier version used in `/package.json` and `/codex-cli/package.json` are different. In this PR, we're updating both to use Prettier v3. - Prettier v3 introduces improved support for JavaScript and TypeScript. (e.g. the formatting scenario shown in the image below. This is more aligned with the TypeScript indentation standard). <img width="1126" alt="image" src="https://github.com/user-attachments/assets/6e237eb8-4553-4574-b336-ed9561c55370" /> **Add Prettier Auto-Formatting in lint-staged**: We've added a step to automatically run prettier --write on JavaScript and TypeScript files as part of the lint-staged process, before the ESLint checks. - This will help ensure that all committed code is properly formatted according to the project's Prettier configuration.
90 lines
2.3 KiB
TypeScript
90 lines
2.3 KiB
TypeScript
import { describe, it, expect, vi } from "vitest";
|
||
|
||
// ---------------------------------------------------------------------------
|
||
// Mock helpers
|
||
// ---------------------------------------------------------------------------
|
||
|
||
const openAiState: { createSpy?: ReturnType<typeof vi.fn> } = {};
|
||
|
||
vi.mock("openai", () => {
|
||
class FakeOpenAI {
|
||
public responses = {
|
||
create: (...args: Array<any>) => openAiState.createSpy!(...args),
|
||
};
|
||
}
|
||
|
||
class APIConnectionTimeoutError extends Error {}
|
||
|
||
return {
|
||
__esModule: true,
|
||
default: FakeOpenAI,
|
||
APIConnectionTimeoutError,
|
||
};
|
||
});
|
||
|
||
vi.mock("../src/approvals.js", () => ({
|
||
__esModule: true,
|
||
alwaysApprovedCommands: new Set<string>(),
|
||
canAutoApprove: () => ({ type: "auto-approve", runInSandbox: false }) as any,
|
||
isSafeCommand: () => null,
|
||
}));
|
||
|
||
vi.mock("../src/format-command.js", () => ({
|
||
__esModule: true,
|
||
formatCommandForDisplay: (c: Array<string>) => c.join(" "),
|
||
}));
|
||
|
||
vi.mock("../src/utils/agent/log.js", () => ({
|
||
__esModule: true,
|
||
log: () => {},
|
||
isLoggingEnabled: () => false,
|
||
}));
|
||
|
||
import { AgentLoop } from "../src/utils/agent/agent-loop.js";
|
||
|
||
describe("AgentLoop – invalid request / 4xx errors", () => {
|
||
it("shows system message and resolves on invalid_request_error", async () => {
|
||
const err: any = new Error("Invalid request: model not found");
|
||
err.code = "invalid_request_error";
|
||
err.status = 400;
|
||
|
||
openAiState.createSpy = vi.fn(async () => {
|
||
throw err;
|
||
});
|
||
|
||
const received: Array<any> = [];
|
||
|
||
const agent = new AgentLoop({
|
||
model: "any",
|
||
instructions: "",
|
||
approvalPolicy: { mode: "auto" } as any,
|
||
additionalWritableRoots: [],
|
||
onItem: (i) => received.push(i),
|
||
onLoading: () => {},
|
||
getCommandConfirmation: async () => ({ review: "yes" }) as any,
|
||
onLastResponseId: () => {},
|
||
});
|
||
|
||
const userMsg = [
|
||
{
|
||
type: "message",
|
||
role: "user",
|
||
content: [{ type: "input_text", text: "hello" }],
|
||
},
|
||
];
|
||
|
||
await expect(agent.run(userMsg as any)).resolves.not.toThrow();
|
||
|
||
await new Promise((r) => setTimeout(r, 20));
|
||
|
||
const sysMsg = received.find(
|
||
(i) =>
|
||
i.role === "system" &&
|
||
typeof i.content?.[0]?.text === "string" &&
|
||
i.content[0].text.includes("OpenAI rejected"),
|
||
);
|
||
|
||
expect(sysMsg).toBeTruthy();
|
||
});
|
||
});
|