mirror of
https://github.com/openclaw/openclaw.git
synced 2026-06-10 08:43:34 +00:00
* refactor: extract agent core package Introduce packages/agent-core as the OpenClaw-owned home for reusable agent loop, harness, session, prompt, and runtime dependency contracts. * refactor: extract shared llm runtime Move provider model registries, stream wrappers, OAuth helpers, and LLM utilities into src/llm with plugin-sdk barrels instead of depending on the old embedded runtime layout. * refactor: remove pi runtime internals Rename remaining Pi-shaped agent surfaces to OpenClaw agent runtime names, delete obsolete Pi docs and package graph checks, and add the third-party notice for incorporated code. * refactor: tighten agent session runtime Make agent-core/runtime dependencies explicit, consolidate compaction and session transcript helpers, and move model/session helpers behind OpenClaw-owned contracts. * refactor: remove static model and pi auth paths Drop static model catalogs and Pi auth bridges, move model/provider facts to manifest-owned runtime contracts, and harden internal embedded-agent utilities. * refactor: remove legacy provider compat paths * docs: remove agent parity notes * fix: skip provider wildcard metadata parsing * refactor: share session extension sdk loading * refactor: inline acpx proxy error formatter * refactor: fold edit recovery into edit tool * fix: accept extension batch separator * test: align startup provider plugin expectations * fix: restore provider-scoped release discovery * test: align static asset packaging expectations * fix: run static provider catalogs during scoped discovery * fix: add provider entry catalogs for scoped live discovery * fix: load lightweight provider catalog entries * fix: refresh provider-scoped plugin metadata * fix: keep provider catalog entries on release live path * fix: keep static manifest models in release live checks * fix: harden release model discovery * fix: reduce OpenAI live cache probe reasoning * fix: disable OpenAI cache probe reasoning * ci: extend OpenAI gateway live timeout * fix: extend live gateway model budget * fix: stabilize release validation regressions * fix: honor provider aliases in model rows * fix: stabilize release validation lanes * fix: stabilize release memory qa * ci: stabilize release validation lanes * ci: prefer ipv4 for live docker node calls * fix: restore shared tool-call stream wrapper * ci: remove legacy pi test shard alias * fix: clean up embedded agent test drift * fix: stabilize runtime alias status * fix: clean up embedded agent ci drift * fix: restore release ci invariants * fix: clean up post-rebase runtime drift * fix: restore release ci checks * fix: restore release ci after rebase * fix: remove stale pi runtime path * test: align compaction runtime expectations * test: update plugin prerelease expectations * fix: handle claude live tool approvals * fix: stabilize release validation gates * fix: finish agent runtime import * test: finish post-rebase agent runtime mocks * fix: keep codex compaction native * fix: stabilize codex app-server hook tests * test: isolate codex diagnostic active run * test: remove codex diagnostic completion race # Conflicts: # extensions/codex/src/app-server/run-attempt.test.ts * ci: fix full release manifest performance run id * refactor: narrow llm plugin sdk boundary * chore: drop generated google boundary stamps * fix: repair rebase fallout * fix: clean up rebased runtime references * fix: decode codex jwt payloads as base64url * fix: preserve shipped pi runtime alias * fix: add scoped sdk virtual modules * fix: decode llm codex oauth jwt as base64url * fix: avoid stale vertex adc negative cache * fix: harden tool arg decoding and codeql path * fix: keep vertex adc negative checks live * refactor: consolidate codex jwt and edit helpers * fix: await codex oauth node runtime imports * fix: preserve sdk tool and notice contracts * fix: preserve shipped compat config boundaries * fix: align codex oauth callback host * fix: terminate agent-core loop streams on failure * fix: keep codex oauth callback alive during fallback * ci: include session tools in critical codeql scans * fix: keep Cloudflare Anthropic provider auth header * docs: redirect legacy pi runtime pages * fix: honor bundled web provider compat discovery * fix: protect session output spill files * fix: keep legacy agent dir env blocked * fix: contain auto-discovered skill symlinks * fix: harden agent core sdk proxy surfaces * fix: restore approval reaction sdk compat * fix: keep live docker runs bounded * fix: keep codex oauth redirect host aligned * fix: resolve post-rebase agent runtime drift * fix: redact anthropic oauth parse failures * fix: preserve responses strict tool shaping * fix: repair agent runtime rebase cleanup * docs: redirect retired parity pages * fix: bound auto-discovered resources to roots * fix: repair post-rebase agent test drift * fix: preserve bundled provider allowlist migration * fix: preserve manifest-owned provider aliases * fix: declare photon image dependency * fix: keep provider headers out of proxy body * fix: preserve shipped env aliases * fix: refresh control ui i18n generated state * fix: quote read fallback paths * fix: preview edits through configured backend * test: satisfy core test typecheck * fix: preserve ZAI usage auth fallback * test: repair codex diagnostic test * fix: repair agent runtime rebase drift * test: finish embedded runner import rename * fix: repair agent runtime rebase integrations * test: align compaction oauth fallback expectations * fix: allow sdk-auth session models * fix: update doctor tool schema import * fix: preserve bedrock plugin region * fix: stream harmony-like prose immediately * ci: include session runtime in codeql shards * fix: repair latest rebase integrations * fix: honor explicit codex websocket transport * fix: keep openai-compatible credentials provider-scoped * fix: refresh sdk api baseline after rebase * fix: route cli runtime aliases through openclaw harness * test: rename stale harness mock expectation * test: rename embedded agent overflow calls * test: clean embedded auth test wording * test: use openclaw stream types in deepinfra cache test * fix: refresh sdk api baseline on latest main * fix: honor bundled discovery compat allowlists * fix: refresh sdk api baseline after latest rebase * fix: remove stale rebase imports * test: rename stale model catalog mock * test: mock renamed doctor runtime modules * fix: map canonical kimi env auth * fix: use internal model registry in bench script * fix: migrate deepinfra provider catalog entry * fix: enforce builtin tool suppression * fix: route compaction auth and proxy payloads safely * refactor: prune unused llm registry leftovers * test: update codex hooks session import * test: fix model picker ci coverage * test: align model picker auth mock types
171 lines
5.2 KiB
TypeScript
171 lines
5.2 KiB
TypeScript
import type { AgentMessage } from "openclaw/plugin-sdk/agent-core";
|
|
import type { ExtensionContext } from "openclaw/plugin-sdk/agent-sessions";
|
|
import * as agentSessions from "openclaw/plugin-sdk/agent-sessions";
|
|
import type { AssistantMessage, UserMessage } from "openclaw/plugin-sdk/llm";
|
|
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
|
import { retryAsync } from "../infra/retry.js";
|
|
|
|
// Mock the external generateSummary function
|
|
vi.mock("openclaw/plugin-sdk/agent-sessions", async () => {
|
|
const actual = await vi.importActual<typeof agentSessions>("openclaw/plugin-sdk/agent-sessions");
|
|
return {
|
|
...actual,
|
|
generateSummary: vi.fn(),
|
|
};
|
|
});
|
|
|
|
const mockGenerateSummary = vi.mocked(agentSessions.generateSummary);
|
|
type MockGenerateSummaryCompat = (
|
|
currentMessages: AgentMessage[],
|
|
model: NonNullable<ExtensionContext["model"]>,
|
|
reserveTokens: number,
|
|
apiKey: string,
|
|
headers: Record<string, string> | undefined,
|
|
signal?: AbortSignal,
|
|
customInstructions?: string,
|
|
previousSummary?: string,
|
|
) => Promise<string>;
|
|
const mockGenerateSummaryCompat = mockGenerateSummary as unknown as MockGenerateSummaryCompat;
|
|
|
|
describe("compaction retry integration", () => {
|
|
beforeEach(() => {
|
|
mockGenerateSummary.mockClear();
|
|
});
|
|
|
|
afterEach(() => {
|
|
vi.clearAllTimers();
|
|
vi.useRealTimers();
|
|
});
|
|
const testMessages: AgentMessage[] = [
|
|
{
|
|
role: "user",
|
|
content: "Test message",
|
|
timestamp: 1,
|
|
} satisfies UserMessage,
|
|
{
|
|
role: "assistant",
|
|
content: [{ type: "text", text: "Test response" }],
|
|
api: "openai-responses",
|
|
provider: "openai",
|
|
model: "gpt-5.4",
|
|
usage: {
|
|
input: 0,
|
|
output: 0,
|
|
cacheRead: 0,
|
|
cacheWrite: 0,
|
|
totalTokens: 0,
|
|
cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 },
|
|
},
|
|
stopReason: "stop",
|
|
timestamp: 2,
|
|
} satisfies AssistantMessage,
|
|
];
|
|
|
|
const testModel = {
|
|
provider: "anthropic",
|
|
model: "claude-3-opus",
|
|
} as unknown as NonNullable<ExtensionContext["model"]>;
|
|
|
|
const invokeGenerateSummary = (signal = new AbortController().signal) =>
|
|
mockGenerateSummaryCompat(testMessages, testModel, 1000, "test-api-key", undefined, signal);
|
|
|
|
const runSummaryRetry = (options: Parameters<typeof retryAsync>[1]) =>
|
|
retryAsync(() => invokeGenerateSummary(), options);
|
|
|
|
it("should successfully call generateSummary with retry wrapper", async () => {
|
|
mockGenerateSummary.mockResolvedValueOnce("Test summary");
|
|
|
|
const result = await runSummaryRetry({
|
|
attempts: 3,
|
|
minDelayMs: 500,
|
|
maxDelayMs: 5000,
|
|
jitter: 0.2,
|
|
label: "compaction/generateSummary",
|
|
});
|
|
|
|
expect(result).toBe("Test summary");
|
|
expect(mockGenerateSummary).toHaveBeenCalledTimes(1);
|
|
});
|
|
|
|
it("should retry on transient error and succeed", async () => {
|
|
mockGenerateSummary
|
|
.mockRejectedValueOnce(new Error("Network timeout"))
|
|
.mockResolvedValueOnce("Success after retry");
|
|
|
|
const result = await runSummaryRetry({
|
|
attempts: 3,
|
|
minDelayMs: 0,
|
|
maxDelayMs: 0,
|
|
label: "compaction/generateSummary",
|
|
});
|
|
|
|
expect(result).toBe("Success after retry");
|
|
expect(mockGenerateSummary).toHaveBeenCalledTimes(2);
|
|
});
|
|
|
|
it("should NOT retry on user abort", async () => {
|
|
const abortErr = new Error("aborted");
|
|
abortErr.name = "AbortError";
|
|
(abortErr as { cause?: unknown }).cause = { source: "user" };
|
|
|
|
mockGenerateSummary.mockRejectedValueOnce(abortErr);
|
|
|
|
await expect(
|
|
retryAsync(() => invokeGenerateSummary(), {
|
|
attempts: 3,
|
|
minDelayMs: 0,
|
|
label: "compaction/generateSummary",
|
|
shouldRetry: (err: unknown) => !(err instanceof Error && err.name === "AbortError"),
|
|
}),
|
|
).rejects.toThrow("aborted");
|
|
|
|
// Should NOT retry on user cancellation (AbortError filtered by shouldRetry)
|
|
expect(mockGenerateSummary).toHaveBeenCalledTimes(1);
|
|
});
|
|
|
|
it("should retry up to 3 times and then fail", async () => {
|
|
mockGenerateSummary.mockRejectedValue(new Error("Persistent API error"));
|
|
|
|
await expect(
|
|
runSummaryRetry({
|
|
attempts: 3,
|
|
minDelayMs: 0,
|
|
maxDelayMs: 0,
|
|
label: "compaction/generateSummary",
|
|
}),
|
|
).rejects.toThrow("Persistent API error");
|
|
|
|
expect(mockGenerateSummary).toHaveBeenCalledTimes(3);
|
|
});
|
|
|
|
it("should apply exponential backoff", async () => {
|
|
vi.useFakeTimers();
|
|
|
|
mockGenerateSummary
|
|
.mockRejectedValueOnce(new Error("Error 1"))
|
|
.mockRejectedValueOnce(new Error("Error 2"))
|
|
.mockResolvedValueOnce("Success on 3rd attempt");
|
|
|
|
const delays: number[] = [];
|
|
const promise = runSummaryRetry({
|
|
attempts: 3,
|
|
minDelayMs: 500,
|
|
maxDelayMs: 5000,
|
|
jitter: 0,
|
|
label: "compaction/generateSummary",
|
|
onRetry: (info) => delays.push(info.delayMs),
|
|
});
|
|
|
|
await vi.runAllTimersAsync();
|
|
const result = await promise;
|
|
|
|
expect(result).toBe("Success on 3rd attempt");
|
|
expect(mockGenerateSummary).toHaveBeenCalledTimes(3);
|
|
// First retry: 500ms, second retry: 1000ms
|
|
expect(delays[0]).toBe(500);
|
|
expect(delays[1]).toBe(1000);
|
|
|
|
vi.useRealTimers();
|
|
});
|
|
});
|