mirror of
https://github.com/openclaw/openclaw.git
synced 2026-06-04 04:34:05 +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
240 lines
7.8 KiB
TypeScript
240 lines
7.8 KiB
TypeScript
import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
|
|
import { withMockedPlatform } from "../test-utils/vitest-spies.js";
|
|
|
|
const { spawnMock } = vi.hoisted(() => ({
|
|
spawnMock: vi.fn(),
|
|
}));
|
|
|
|
vi.mock("node:child_process", async () => {
|
|
const { mockNodeBuiltinModule } = await import("openclaw/plugin-sdk/test-node-mocks");
|
|
return mockNodeBuiltinModule(
|
|
() => vi.importActual<typeof import("node:child_process")>("node:child_process"),
|
|
{
|
|
spawn: (...args: unknown[]) => spawnMock(...args),
|
|
},
|
|
);
|
|
});
|
|
|
|
let killProcessTree: typeof import("./kill-tree.js").killProcessTree;
|
|
let signalProcessTree: typeof import("./kill-tree.js").signalProcessTree;
|
|
|
|
function expectTaskkillCall(index: number, args: string[]) {
|
|
expect(spawnMock.mock.calls[index]).toStrictEqual([
|
|
"taskkill",
|
|
args,
|
|
{
|
|
detached: true,
|
|
stdio: "ignore",
|
|
windowsHide: true,
|
|
},
|
|
]);
|
|
}
|
|
|
|
describe("killProcessTree", () => {
|
|
let killSpy: ReturnType<typeof vi.spyOn>;
|
|
|
|
beforeAll(async () => {
|
|
({ killProcessTree, signalProcessTree } = await import("./kill-tree.js"));
|
|
});
|
|
|
|
beforeEach(() => {
|
|
spawnMock.mockClear();
|
|
killSpy = vi.spyOn(process, "kill");
|
|
vi.useFakeTimers();
|
|
});
|
|
|
|
afterEach(() => {
|
|
killSpy.mockRestore();
|
|
vi.useRealTimers();
|
|
vi.clearAllMocks();
|
|
});
|
|
|
|
it("on Windows skips delayed force-kill when PID is already gone", async () => {
|
|
killSpy.mockImplementation(((pid: number, signal?: NodeJS.Signals | number) => {
|
|
if (pid === 4242 && signal === 0) {
|
|
throw new Error("ESRCH");
|
|
}
|
|
return true;
|
|
}) as typeof process.kill);
|
|
|
|
await withMockedPlatform("win32", async () => {
|
|
killProcessTree(4242, { graceMs: 25 });
|
|
|
|
expect(spawnMock).toHaveBeenCalledTimes(1);
|
|
expectTaskkillCall(0, ["/T", "/PID", "4242"]);
|
|
|
|
await vi.advanceTimersByTimeAsync(25);
|
|
expect(spawnMock).toHaveBeenCalledTimes(1);
|
|
});
|
|
});
|
|
|
|
it("on Windows force-kills after grace period only when PID still exists", async () => {
|
|
killSpy.mockImplementation(((pid: number, signal?: NodeJS.Signals | number) => {
|
|
if (pid === 5252 && signal === 0) {
|
|
return true;
|
|
}
|
|
return true;
|
|
}) as typeof process.kill);
|
|
|
|
await withMockedPlatform("win32", async () => {
|
|
killProcessTree(5252, { graceMs: 10 });
|
|
|
|
await vi.advanceTimersByTimeAsync(10);
|
|
|
|
expect(spawnMock).toHaveBeenCalledTimes(2);
|
|
expectTaskkillCall(0, ["/T", "/PID", "5252"]);
|
|
expectTaskkillCall(1, ["/F", "/T", "/PID", "5252"]);
|
|
});
|
|
});
|
|
|
|
it("on Unix sends SIGTERM first and skips SIGKILL when process exits", async () => {
|
|
killSpy.mockImplementation(((pid: number, signal?: NodeJS.Signals | number) => {
|
|
if (pid === -3333 && signal === 0) {
|
|
throw new Error("ESRCH");
|
|
}
|
|
if (pid === 3333 && signal === 0) {
|
|
throw new Error("ESRCH");
|
|
}
|
|
return true;
|
|
}) as typeof process.kill);
|
|
|
|
await withMockedPlatform("linux", async () => {
|
|
killProcessTree(3333, { graceMs: 10 });
|
|
|
|
await vi.advanceTimersByTimeAsync(10);
|
|
|
|
expect(killSpy).toHaveBeenCalledWith(-3333, "SIGTERM");
|
|
expect(killSpy).not.toHaveBeenCalledWith(-3333, "SIGKILL");
|
|
expect(killSpy).not.toHaveBeenCalledWith(3333, "SIGKILL");
|
|
});
|
|
});
|
|
|
|
it("on Unix sends SIGKILL after grace period when process is still alive", async () => {
|
|
killSpy.mockImplementation(((pid: number, signal?: NodeJS.Signals | number) => {
|
|
if (pid === -4444 && signal === 0) {
|
|
return true;
|
|
}
|
|
return true;
|
|
}) as typeof process.kill);
|
|
|
|
await withMockedPlatform("linux", async () => {
|
|
killProcessTree(4444, { graceMs: 5 });
|
|
|
|
await vi.advanceTimersByTimeAsync(5);
|
|
|
|
expect(killSpy).toHaveBeenCalledWith(-4444, "SIGTERM");
|
|
expect(killSpy).toHaveBeenCalledWith(-4444, "SIGKILL");
|
|
});
|
|
});
|
|
|
|
it("on Unix force-kills synchronously without SIGTERM or delayed escalation", async () => {
|
|
killSpy.mockImplementation(() => true);
|
|
|
|
await withMockedPlatform("linux", async () => {
|
|
killProcessTree(4949, { force: true });
|
|
await vi.advanceTimersByTimeAsync(60_000);
|
|
|
|
expect(killSpy).toHaveBeenCalledTimes(1);
|
|
expect(killSpy).toHaveBeenCalledWith(-4949, "SIGKILL");
|
|
expect(killSpy).not.toHaveBeenCalledWith(-4949, "SIGTERM");
|
|
});
|
|
});
|
|
|
|
it("on Unix force-kills a live detached group even after the parent pid exits", async () => {
|
|
killSpy.mockImplementation(((pid: number, signal?: NodeJS.Signals | number) => {
|
|
if (pid === -4545 && signal === 0) {
|
|
return true;
|
|
}
|
|
if (pid === 4545 && signal === 0) {
|
|
throw new Error("ESRCH");
|
|
}
|
|
return true;
|
|
}) as typeof process.kill);
|
|
|
|
await withMockedPlatform("linux", async () => {
|
|
killProcessTree(4545, { graceMs: 5 });
|
|
|
|
await vi.advanceTimersByTimeAsync(5);
|
|
|
|
expect(killSpy).toHaveBeenCalledWith(-4545, "SIGTERM");
|
|
expect(killSpy).toHaveBeenCalledWith(-4545, "SIGKILL");
|
|
expect(killSpy).not.toHaveBeenCalledWith(4545, "SIGKILL");
|
|
});
|
|
});
|
|
|
|
it("on Unix skips group kill when detached:false to avoid SIGTERMing the parent's own process group (#71662)", async () => {
|
|
killSpy.mockImplementation(((pid: number, signal?: NodeJS.Signals | number) => {
|
|
if (pid === 5555 && signal === 0) {
|
|
throw new Error("ESRCH");
|
|
}
|
|
return true;
|
|
}) as typeof process.kill);
|
|
|
|
await withMockedPlatform("linux", async () => {
|
|
killProcessTree(5555, { graceMs: 10, detached: false });
|
|
await vi.advanceTimersByTimeAsync(10);
|
|
|
|
// Direct pid kill is fine. Group kill (`-pid`) is FORBIDDEN here because
|
|
// when the child wasn't spawned detached, its process group is the
|
|
// gateway's group — `-pid` would SIGTERM the gateway itself.
|
|
expect(killSpy).toHaveBeenCalledWith(5555, "SIGTERM");
|
|
expect(killSpy).not.toHaveBeenCalledWith(-5555, "SIGTERM");
|
|
expect(killSpy).not.toHaveBeenCalledWith(-5555, "SIGKILL");
|
|
});
|
|
});
|
|
|
|
it("on Unix uses group kill by default (detached:true preserved as the existing behavior)", async () => {
|
|
killSpy.mockImplementation(((pid: number, signal?: NodeJS.Signals | number) => {
|
|
if (pid === -6666 && signal === 0) {
|
|
throw new Error("ESRCH");
|
|
}
|
|
if (pid === 6666 && signal === 0) {
|
|
throw new Error("ESRCH");
|
|
}
|
|
return true;
|
|
}) as typeof process.kill);
|
|
|
|
await withMockedPlatform("linux", async () => {
|
|
killProcessTree(6666, { graceMs: 10 });
|
|
await vi.advanceTimersByTimeAsync(10);
|
|
|
|
expect(killSpy).toHaveBeenCalledWith(-6666, "SIGTERM");
|
|
});
|
|
});
|
|
|
|
it("on Unix sends a single requested tree signal without scheduling escalation", async () => {
|
|
killSpy.mockImplementation(() => true);
|
|
|
|
await withMockedPlatform("linux", async () => {
|
|
signalProcessTree(7777, "SIGTERM");
|
|
|
|
await vi.advanceTimersByTimeAsync(60_000);
|
|
|
|
expect(killSpy).toHaveBeenCalledTimes(1);
|
|
expect(killSpy).toHaveBeenCalledWith(-7777, "SIGTERM");
|
|
expect(killSpy).not.toHaveBeenCalledWith(-7777, "SIGKILL");
|
|
});
|
|
});
|
|
|
|
it("on Windows maps requested tree signals to taskkill force mode", async () => {
|
|
await withMockedPlatform("win32", async () => {
|
|
signalProcessTree(8888, "SIGTERM");
|
|
signalProcessTree(8888, "SIGKILL");
|
|
|
|
expect(spawnMock).toHaveBeenCalledTimes(2);
|
|
expectTaskkillCall(0, ["/T", "/PID", "8888"]);
|
|
expectTaskkillCall(1, ["/F", "/T", "/PID", "8888"]);
|
|
});
|
|
});
|
|
|
|
it("on Windows force-kills synchronously without delayed taskkill", async () => {
|
|
await withMockedPlatform("win32", async () => {
|
|
killProcessTree(9999, { force: true });
|
|
await vi.advanceTimersByTimeAsync(60_000);
|
|
|
|
expect(spawnMock).toHaveBeenCalledTimes(1);
|
|
expectTaskkillCall(0, ["/F", "/T", "/PID", "9999"]);
|
|
});
|
|
});
|
|
});
|