mirror of
https://github.com/openclaw/openclaw.git
synced 2026-06-02 18:45:16 +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
296 lines
9.5 KiB
TypeScript
296 lines
9.5 KiB
TypeScript
/**
|
|
* Test: before_compaction & after_compaction hook wiring
|
|
*/
|
|
import { beforeEach, describe, expect, it, vi } from "vitest";
|
|
import { makeZeroUsageSnapshot } from "../agents/usage.js";
|
|
|
|
const hookMocks = vi.hoisted(() => ({
|
|
runner: {
|
|
hasHooks: vi.fn(() => false),
|
|
runBeforeCompaction: vi.fn(async () => {}),
|
|
runAfterCompaction: vi.fn(async () => {}),
|
|
},
|
|
emitAgentEvent: vi.fn(),
|
|
}));
|
|
|
|
vi.mock("../plugins/hook-runner-global.js", () => ({
|
|
getGlobalHookRunner: () => hookMocks.runner,
|
|
}));
|
|
|
|
vi.mock("../infra/agent-events.js", () => ({
|
|
emitAgentEvent: hookMocks.emitAgentEvent,
|
|
}));
|
|
|
|
import {
|
|
handleCompactionEnd,
|
|
handleCompactionStart,
|
|
} from "../agents/embedded-agent-subscribe.handlers.compaction.js";
|
|
|
|
describe("compaction hook wiring", () => {
|
|
beforeEach(() => {
|
|
hookMocks.runner.hasHooks.mockClear();
|
|
hookMocks.runner.hasHooks.mockReturnValue(false);
|
|
hookMocks.runner.runBeforeCompaction.mockClear();
|
|
hookMocks.runner.runBeforeCompaction.mockResolvedValue(undefined);
|
|
hookMocks.runner.runAfterCompaction.mockClear();
|
|
hookMocks.runner.runAfterCompaction.mockResolvedValue(undefined);
|
|
hookMocks.emitAgentEvent.mockClear();
|
|
});
|
|
|
|
function createCompactionEndCtx(params: {
|
|
runId: string;
|
|
messages?: unknown[];
|
|
sessionFile?: string;
|
|
sessionKey?: string;
|
|
compactionCount?: number;
|
|
withRetryHooks?: boolean;
|
|
}) {
|
|
return {
|
|
params: {
|
|
runId: params.runId,
|
|
sessionKey: params.sessionKey,
|
|
session: {
|
|
messages: params.messages ?? [],
|
|
sessionFile: params.sessionFile,
|
|
},
|
|
},
|
|
state: { compactionInFlight: true },
|
|
log: { debug: vi.fn(), info: vi.fn(), warn: vi.fn() },
|
|
maybeResolveCompactionWait: vi.fn(),
|
|
incrementCompactionCount: vi.fn(),
|
|
getCompactionCount: () => params.compactionCount ?? 0,
|
|
noteCompactionTokensAfter: vi.fn(),
|
|
getLastCompactionTokensAfter: vi.fn(() => undefined),
|
|
...(params.withRetryHooks
|
|
? {
|
|
noteCompactionRetry: vi.fn(),
|
|
resetForCompactionRetry: vi.fn(),
|
|
}
|
|
: {}),
|
|
};
|
|
}
|
|
|
|
function getBeforeCompactionCall() {
|
|
const beforeCalls = hookMocks.runner.runBeforeCompaction.mock.calls as unknown as Array<
|
|
[unknown, unknown]
|
|
>;
|
|
return {
|
|
event: beforeCalls[0]?.[0] as
|
|
| { messageCount?: number; messages?: unknown[]; sessionFile?: string }
|
|
| undefined,
|
|
hookCtx: beforeCalls[0]?.[1] as { sessionKey?: string } | undefined,
|
|
};
|
|
}
|
|
|
|
function getAfterCompactionCall() {
|
|
const afterCalls = hookMocks.runner.runAfterCompaction.mock.calls as unknown as Array<
|
|
[unknown, unknown]
|
|
>;
|
|
return {
|
|
event: afterCalls[0]?.[0] as
|
|
| { messageCount?: number; compactedCount?: number; sessionFile?: string }
|
|
| undefined,
|
|
hookCtx: afterCalls[0]?.[1] as { sessionKey?: string } | undefined,
|
|
};
|
|
}
|
|
|
|
function expectCompactionEvent(params: {
|
|
call: ReturnType<typeof getBeforeCompactionCall> | ReturnType<typeof getAfterCompactionCall>;
|
|
expectedEvent: Record<string, unknown>;
|
|
expectedSessionKey?: string;
|
|
}) {
|
|
expect(params.call.event).toEqual(params.expectedEvent);
|
|
if (params.expectedSessionKey !== undefined) {
|
|
if (!params.call.hookCtx) {
|
|
throw new Error("Expected compaction hook context");
|
|
}
|
|
expect(params.call.hookCtx).toEqual({ sessionKey: params.expectedSessionKey });
|
|
}
|
|
}
|
|
|
|
function runCompactionEnd(
|
|
ctx: ReturnType<typeof createCompactionEndCtx> | Record<string, unknown>,
|
|
event: {
|
|
willRetry: boolean;
|
|
result?: { summary: string; tokensAfter?: number };
|
|
aborted?: boolean;
|
|
},
|
|
) {
|
|
handleCompactionEnd(
|
|
ctx as never,
|
|
{
|
|
type: "compaction_end",
|
|
...event,
|
|
} as never,
|
|
);
|
|
}
|
|
|
|
it("calls runBeforeCompaction in handleCompactionStart", () => {
|
|
hookMocks.runner.hasHooks.mockReturnValue(true);
|
|
|
|
const ctx = {
|
|
params: {
|
|
runId: "r1",
|
|
sessionKey: "agent:main:web-abc123",
|
|
session: { messages: [1, 2, 3], sessionFile: "/tmp/test.jsonl" },
|
|
onAgentEvent: vi.fn(),
|
|
},
|
|
state: { compactionInFlight: false },
|
|
log: { debug: vi.fn(), info: vi.fn(), warn: vi.fn() },
|
|
incrementCompactionCount: vi.fn(),
|
|
ensureCompactionPromise: vi.fn(),
|
|
};
|
|
|
|
handleCompactionStart(ctx as never, { type: "compaction_start", reason: "threshold" });
|
|
|
|
expect(hookMocks.runner.runBeforeCompaction).toHaveBeenCalledTimes(1);
|
|
expectCompactionEvent({
|
|
call: getBeforeCompactionCall(),
|
|
expectedEvent: {
|
|
messageCount: 3,
|
|
messages: [1, 2, 3],
|
|
sessionFile: "/tmp/test.jsonl",
|
|
},
|
|
expectedSessionKey: "agent:main:web-abc123",
|
|
});
|
|
expect(ctx.ensureCompactionPromise).toHaveBeenCalledTimes(1);
|
|
expect(hookMocks.emitAgentEvent).toHaveBeenCalledWith({
|
|
runId: "r1",
|
|
stream: "compaction",
|
|
data: { phase: "start" },
|
|
});
|
|
expect(ctx.params.onAgentEvent).toHaveBeenCalledWith({
|
|
stream: "compaction",
|
|
data: { phase: "start" },
|
|
});
|
|
});
|
|
|
|
it("calls runAfterCompaction when willRetry is false", () => {
|
|
hookMocks.runner.hasHooks.mockReturnValue(true);
|
|
|
|
const ctx = createCompactionEndCtx({
|
|
runId: "r2",
|
|
messages: [1, 2],
|
|
sessionFile: "/tmp/session.jsonl",
|
|
sessionKey: "agent:main:web-xyz",
|
|
compactionCount: 1,
|
|
});
|
|
|
|
runCompactionEnd(ctx, { willRetry: false, result: { summary: "compacted" } });
|
|
|
|
expect(hookMocks.runner.runAfterCompaction).toHaveBeenCalledTimes(1);
|
|
expectCompactionEvent({
|
|
call: getAfterCompactionCall(),
|
|
expectedEvent: {
|
|
messageCount: 2,
|
|
compactedCount: 1,
|
|
sessionFile: "/tmp/session.jsonl",
|
|
},
|
|
expectedSessionKey: "agent:main:web-xyz",
|
|
});
|
|
expect(ctx.incrementCompactionCount).toHaveBeenCalledTimes(1);
|
|
expect(ctx.noteCompactionTokensAfter).toHaveBeenCalledWith(undefined);
|
|
expect(ctx.maybeResolveCompactionWait).toHaveBeenCalledTimes(1);
|
|
expect(hookMocks.emitAgentEvent).toHaveBeenCalledWith({
|
|
runId: "r2",
|
|
stream: "compaction",
|
|
data: { phase: "end", willRetry: false, completed: true },
|
|
});
|
|
});
|
|
|
|
it("does not call runAfterCompaction when willRetry is true but still increments counter", () => {
|
|
hookMocks.runner.hasHooks.mockReturnValue(true);
|
|
|
|
const ctx = createCompactionEndCtx({
|
|
runId: "r3",
|
|
compactionCount: 1,
|
|
withRetryHooks: true,
|
|
});
|
|
|
|
runCompactionEnd(ctx, { willRetry: true, result: { summary: "compacted" } });
|
|
|
|
expect(hookMocks.runner.runAfterCompaction).not.toHaveBeenCalled();
|
|
// Counter is incremented even with willRetry — compaction succeeded (#38905)
|
|
expect(ctx.incrementCompactionCount).toHaveBeenCalledTimes(1);
|
|
expect(ctx.noteCompactionRetry).toHaveBeenCalledTimes(1);
|
|
expect(ctx.resetForCompactionRetry).toHaveBeenCalledTimes(1);
|
|
expect(ctx.maybeResolveCompactionWait).not.toHaveBeenCalled();
|
|
expect(hookMocks.emitAgentEvent).toHaveBeenCalledWith({
|
|
runId: "r3",
|
|
stream: "compaction",
|
|
data: { phase: "end", willRetry: true, completed: true },
|
|
});
|
|
});
|
|
|
|
it.each([
|
|
["does not increment counter when compaction was aborted", { willRetry: false, aborted: true }],
|
|
[
|
|
"does not increment counter when compaction has result but was aborted",
|
|
{ willRetry: false, result: { summary: "compacted" }, aborted: true },
|
|
],
|
|
["does not increment counter when result is undefined", { willRetry: false }],
|
|
] as const)("%s", (_name, event) => {
|
|
const ctx = createCompactionEndCtx({ runId: "r3c" });
|
|
runCompactionEnd(ctx, event);
|
|
expect(ctx.incrementCompactionCount).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it("resets stale assistant usage after final compaction", () => {
|
|
const messages = [
|
|
{ role: "user", content: "hello" },
|
|
{
|
|
role: "assistant",
|
|
content: "response one",
|
|
usage: { totalTokens: 180_000, input: 100, output: 50 },
|
|
},
|
|
{
|
|
role: "assistant",
|
|
content: "response two",
|
|
usage: { totalTokens: 181_000, input: 120, output: 60 },
|
|
},
|
|
];
|
|
|
|
const ctx = {
|
|
params: { runId: "r4", session: { messages } },
|
|
state: { compactionInFlight: true },
|
|
log: { debug: vi.fn(), info: vi.fn(), warn: vi.fn() },
|
|
maybeResolveCompactionWait: vi.fn(),
|
|
getCompactionCount: () => 1,
|
|
incrementCompactionCount: vi.fn(),
|
|
noteCompactionTokensAfter: vi.fn(),
|
|
getLastCompactionTokensAfter: vi.fn(() => undefined),
|
|
};
|
|
|
|
runCompactionEnd(ctx, { willRetry: false, result: { summary: "compacted" } });
|
|
|
|
const assistantOne = messages[1] as { usage?: unknown };
|
|
const assistantTwo = messages[2] as { usage?: unknown };
|
|
expect(assistantOne.usage).toEqual(makeZeroUsageSnapshot());
|
|
expect(assistantTwo.usage).toEqual(makeZeroUsageSnapshot());
|
|
});
|
|
|
|
it("does not clear assistant usage while compaction is retrying", () => {
|
|
const messages = [
|
|
{
|
|
role: "assistant",
|
|
content: "response",
|
|
usage: { totalTokens: 184_297, input: 130_000, output: 2_000 },
|
|
},
|
|
];
|
|
|
|
const ctx = {
|
|
params: { runId: "r5", session: { messages } },
|
|
state: { compactionInFlight: true },
|
|
log: { debug: vi.fn(), info: vi.fn(), warn: vi.fn() },
|
|
noteCompactionRetry: vi.fn(),
|
|
resetForCompactionRetry: vi.fn(),
|
|
getCompactionCount: () => 0,
|
|
};
|
|
|
|
runCompactionEnd(ctx, { willRetry: true });
|
|
|
|
const assistant = messages[0] as { usage?: unknown };
|
|
expect(assistant.usage).toEqual({ totalTokens: 184_297, input: 130_000, output: 2_000 });
|
|
});
|
|
});
|