ewilliams28/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-08-27 04:47:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

test: clear cli attempt broad matchers

Browse Source
This commit is contained in:
Peter Steinberger
2026-05-10 13:16:37 +01:00
parent eddf563611
commit 24edb84146
1 changed files with 98 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/agents/command/attempt-execution.cli.test.ts
+98 -106
View File
@@ -92,6 +92,35 @@ async function readSessionFileJsonLines<T>(sessionFile: string): Promise<T[]> {
return entries;
}
function requireRecord(value: unknown, label: string): Record<string, unknown> {
expect(typeof value).toBe("object");
expect(value).not.toBeNull();
if (typeof value !== "object" || value === null) {
throw new Error(`${label} was not an object`);
}
return value as Record<string, unknown>;
}
function expectRecordFields(record: Record<string, unknown>, fields: Record<string, unknown>) {
for (const [key, value] of Object.entries(fields)) {
expect(record[key]).toEqual(value);
}
}
function requireMockArg(mock: typeof runCliAgentMock, callIndex: number, label: string) {
const arg = mock.mock.calls[callIndex]?.[0];
expect(arg).toBeDefined();
return requireRecord(arg, label);
}
function expectMockArgFields(
mock: typeof runCliAgentMock,
fields: Record<string, unknown>,
callIndex = 0,
) {
expectRecordFields(requireMockArg(mock, callIndex, "mock call argument"), fields);
}
describe("CLI attempt execution", () => {
let tmpDir: string;
let storePath: string;
@@ -397,23 +426,26 @@ describe("CLI attempt execution", () => {
throw new Error("expected CLI transcript persistence to create a session file");
}
const entries = await readSessionFileEntries(sessionFile);
expect(entries[0]).toMatchObject({
expectRecordFields(requireRecord(entries[0], "session entry"), {
type: "session",
id: sessionEntry.sessionId,
cwd: tmpDir,
});
expect(entries[1]).toMatchObject({ type: "message", parentId: null });
expect(entries[2]).toMatchObject({
expectRecordFields(requireRecord(entries[1], "user transcript entry"), {
type: "message",
parentId: null,
});
expectRecordFields(requireRecord(entries[2], "assistant transcript entry"), {
type: "message",
parentId: entries[1]?.id,
});
const messages = await readSessionMessages(sessionFile);
expect(messages).toHaveLength(2);
expect(messages[0]).toMatchObject({
expectRecordFields(requireRecord(messages[0], "user message"), {
role: "user",
content: "persist this",
});
expect(messages[1]).toMatchObject({
expectRecordFields(requireRecord(messages[1], "assistant message"), {
role: "assistant",
api: "cli",
provider: "claude-cli",
@@ -456,7 +488,7 @@ describe("CLI attempt execution", () => {
let messages = await readSessionMessages(updatedFirst?.sessionFile ?? "");
expect(messages).toHaveLength(1);
expect(messages[0]).toMatchObject({
expectRecordFields(requireRecord(messages[0], "assistant message"), {
role: "assistant",
content: [{ type: "text", text: "already mirrored" }],
});
@@ -545,7 +577,7 @@ describe("CLI attempt execution", () => {
const messages = await readSessionMessages(sessionFile);
expect(messages).toHaveLength(3);
expect(messages.map((message) => message.role)).toEqual(["assistant", "user", "assistant"]);
expect(messages[2]).toMatchObject({
expectRecordFields(requireRecord(messages[2], "deduped assistant message"), {
content: [{ type: "text", text: "same answer" }],
});
});
@@ -580,7 +612,7 @@ describe("CLI attempt execution", () => {
});
const messages = await readSessionMessages(updatedEntry?.sessionFile ?? "");
expect(messages[0]).toMatchObject({
expectRecordFields(requireRecord(messages[0], "transcript user message"), {
role: "user",
content: "visible ask",
});
@@ -630,13 +662,11 @@ describe("CLI attempt execution", () => {
});
expect(runCliAgentMock).toHaveBeenCalledTimes(1);
expect(runCliAgentMock).toHaveBeenCalledWith(
expect.objectContaining({
trigger: "user",
messageChannel: "discord",
messageProvider: "discord-voice",
}),
);
expectMockArgFields(runCliAgentMock, {
trigger: "user",
messageChannel: "discord",
messageProvider: "discord-voice",
});
});
it("forwards runtime toolsAllow into CLI attempts so the CLI harness can fail closed", async () => {
@@ -682,12 +712,10 @@ describe("CLI attempt execution", () => {
sessionHasHistory: false,
});
expect(runCliAgentMock).toHaveBeenCalledWith(
expect.objectContaining({
provider: "claude-cli",
toolsAllow: ["read", "web_search"],
}),
);
expectMockArgFields(runCliAgentMock, {
provider: "claude-cli",
toolsAllow: ["read", "web_search"],
});
});
it("routes canonical Anthropic models through the configured Claude CLI runtime", async () => {
@@ -739,12 +767,10 @@ describe("CLI attempt execution", () => {
});
expect(runEmbeddedPiAgentMock).not.toHaveBeenCalled();
expect(runCliAgentMock).toHaveBeenCalledWith(
expect.objectContaining({
provider: "claude-cli",
model: "claude-opus-4-7",
}),
);
expectMockArgFields(runCliAgentMock, {
provider: "claude-cli",
model: "claude-opus-4-7",
});
});
it("routes canonical OpenAI models through the configured Codex CLI runtime", async () => {
@@ -796,12 +822,10 @@ describe("CLI attempt execution", () => {
});
expect(runEmbeddedPiAgentMock).not.toHaveBeenCalled();
expect(runCliAgentMock).toHaveBeenCalledWith(
expect.objectContaining({
provider: "codex-cli",
model: "gpt-5.4",
}),
);
expectMockArgFields(runCliAgentMock, {
provider: "codex-cli",
model: "gpt-5.4",
});
});
it("keeps one-shot model runs on the raw embedded provider path", async () => {
@@ -863,19 +887,17 @@ describe("CLI attempt execution", () => {
});
expect(runCliAgentMock).not.toHaveBeenCalled();
expect(runEmbeddedPiAgentMock).toHaveBeenCalledWith(
expect.objectContaining({
provider: "anthropic",
model: "claude-opus-4-7",
agentHarnessId: "pi",
prompt: "raw prompt",
messageChannel: "discord",
messageProvider: "discord-voice",
modelRun: true,
promptMode: "none",
disableTools: true,
}),
);
expectMockArgFields(runEmbeddedPiAgentMock, {
provider: "anthropic",
model: "claude-opus-4-7",
agentHarnessId: "pi",
prompt: "raw prompt",
messageChannel: "discord",
messageProvider: "discord-voice",
modelRun: true,
promptMode: "none",
disableTools: true,
});
expect(runEmbeddedPiAgentMock.mock.calls[0]?.[0]?.prompt).not.toContain(
"[Inter-session message]",
);
@@ -931,13 +953,11 @@ describe("CLI attempt execution", () => {
sessionHasHistory: false,
});
expect(runEmbeddedPiAgentMock).toHaveBeenCalledWith(
expect.objectContaining({
provider: "openai",
model: "gpt-5.4",
bashElevated,
}),
);
expectMockArgFields(runEmbeddedPiAgentMock, {
provider: "openai",
model: "gpt-5.4",
bashElevated,
});
});
it("forwards one-shot CLI cleanup to CLI providers", async () => {
@@ -984,12 +1004,10 @@ describe("CLI attempt execution", () => {
sessionHasHistory: false,
});
expect(runCliAgentMock).toHaveBeenCalledWith(
expect.objectContaining({
cleanupBundleMcpOnRunEnd: true,
cleanupCliLiveSessionOnRunEnd: true,
}),
);
expectMockArgFields(runCliAgentMock, {
cleanupBundleMcpOnRunEnd: true,
cleanupCliLiveSessionOnRunEnd: true,
});
expect(runEmbeddedPiAgentMock).not.toHaveBeenCalled();
});
});
@@ -1044,11 +1062,7 @@ describe("embedded attempt harness pinning", () => {
sessionHasHistory: true,
});
expect(runEmbeddedPiAgent).toHaveBeenCalledWith(
expect.objectContaining({
agentHarnessId: undefined,
}),
);
expectMockArgFields(runEmbeddedPiAgentMock, { agentHarnessId: undefined });
});
it("ignores stale session Codex harness pins on non-OpenAI model switches", async () => {
@@ -1089,11 +1103,7 @@ describe("embedded attempt harness pinning", () => {
sessionHasHistory: true,
});
expect(runEmbeddedPiAgent).toHaveBeenCalledWith(
expect.objectContaining({
agentHarnessId: undefined,
}),
);
expectMockArgFields(runEmbeddedPiAgentMock, { agentHarnessId: undefined });
});
it("forwards runtime toolsAllow into embedded attempts", async () => {
@@ -1136,11 +1146,7 @@ describe("embedded attempt harness pinning", () => {
sessionHasHistory: false,
});
expect(runEmbeddedPiAgent).toHaveBeenCalledWith(
expect.objectContaining({
toolsAllow: ["read", "web_search"],
}),
);
expectMockArgFields(runEmbeddedPiAgentMock, { toolsAllow: ["read", "web_search"] });
});
it("lets provider/model runtime policy choose Codex without storing a session harness pin", async () => {
@@ -1190,11 +1196,7 @@ describe("embedded attempt harness pinning", () => {
sessionHasHistory: true,
});
expect(runEmbeddedPiAgent).toHaveBeenCalledWith(
expect.objectContaining({
agentHarnessId: undefined,
}),
);
expectMockArgFields(runEmbeddedPiAgentMock, { agentHarnessId: undefined });
});
it("auto-forwards OpenAI Codex auth profiles to default Codex harness runs", async () => {
@@ -1249,13 +1251,11 @@ describe("embedded attempt harness pinning", () => {
sessionHasHistory: true,
});
expect(runEmbeddedPiAgent).toHaveBeenCalledWith(
expect.objectContaining({
agentHarnessId: undefined,
authProfileId: "openai-codex:work",
authProfileIdSource: "auto",
}),
);
expectMockArgFields(runEmbeddedPiAgentMock, {
agentHarnessId: undefined,
authProfileId: "openai-codex:work",
authProfileIdSource: "auto",
});
});
it("pins a fresh OpenAI session to the Codex harness by default", async () => {
@@ -1295,11 +1295,7 @@ describe("embedded attempt harness pinning", () => {
sessionHasHistory: false,
});
expect(runEmbeddedPiAgent).toHaveBeenCalledWith(
expect.objectContaining({
agentHarnessId: undefined,
}),
);
expectMockArgFields(runEmbeddedPiAgentMock, { agentHarnessId: undefined });
});
it("ignores stale OpenAI sessions pinned to PI and relies on default Codex routing", async () => {
@@ -1340,12 +1336,10 @@ describe("embedded attempt harness pinning", () => {
sessionHasHistory: true,
});
expect(runEmbeddedPiAgentMock).toHaveBeenCalledWith(
expect.objectContaining({
provider: "openai",
agentHarnessId: undefined,
}),
);
expectMockArgFields(runEmbeddedPiAgentMock, {
provider: "openai",
agentHarnessId: undefined,
});
});
it("routes explicit OpenAI PI runs with Codex OAuth through the legacy Codex auth transport", async () => {
@@ -1397,15 +1391,13 @@ describe("embedded attempt harness pinning", () => {
sessionHasHistory: false,
});
expect(runEmbeddedPiAgentMock).toHaveBeenCalledWith(
expect.objectContaining({
provider: "openai-codex",
model: "gpt-5.4",
agentHarnessId: undefined,
authProfileId: "openai-codex:work",
authProfileIdSource: "user",
}),
);
expectMockArgFields(runEmbeddedPiAgentMock, {
provider: "openai-codex",
model: "gpt-5.4",
agentHarnessId: undefined,
authProfileId: "openai-codex:work",
authProfileIdSource: "user",
});
});
it("does not pass CLI runtime aliases as embedded harness ids for fallback providers", async () => {