mirror of
https://github.com/openclaw/openclaw.git
synced 2026-06-01 02:33:24 +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
330 lines
9.2 KiB
TypeScript
330 lines
9.2 KiB
TypeScript
import type { StreamFn } from "openclaw/plugin-sdk/agent-core";
|
|
import type { Context, Model } from "openclaw/plugin-sdk/llm";
|
|
import { describe, expect, it } from "vitest";
|
|
import {
|
|
createVllmProviderThinkingWrapper,
|
|
createVllmQwenThinkingWrapper,
|
|
wrapVllmProviderStream,
|
|
} from "./stream.js";
|
|
|
|
function capturePayload(params: {
|
|
format: "chat-template" | "top-level";
|
|
thinkingLevel?: "off" | "low" | "medium" | "high" | "xhigh" | "max";
|
|
reasoning?: unknown;
|
|
initialPayload?: Record<string, unknown>;
|
|
model?: Partial<Model<"openai-completions">>;
|
|
}): Record<string, unknown> {
|
|
let captured: Record<string, unknown> = {};
|
|
const baseStreamFn: StreamFn = (_model, _context, options) => {
|
|
const payload = { ...params.initialPayload };
|
|
options?.onPayload?.(payload, _model);
|
|
captured = payload;
|
|
return {} as ReturnType<StreamFn>;
|
|
};
|
|
|
|
const wrapped = createVllmQwenThinkingWrapper({
|
|
baseStreamFn,
|
|
format: params.format,
|
|
thinkingLevel: params.thinkingLevel ?? "high",
|
|
});
|
|
void wrapped(
|
|
{
|
|
api: "openai-completions",
|
|
provider: "vllm",
|
|
id: "Qwen/Qwen3-8B",
|
|
reasoning: true,
|
|
...params.model,
|
|
} as Model<"openai-completions">,
|
|
{ messages: [] } as Context,
|
|
params.reasoning === undefined ? {} : ({ reasoning: params.reasoning } as never),
|
|
);
|
|
|
|
return captured;
|
|
}
|
|
|
|
describe("createVllmQwenThinkingWrapper", () => {
|
|
it("maps Qwen chat-template thinking off to chat_template_kwargs", () => {
|
|
const payload = capturePayload({
|
|
format: "chat-template",
|
|
reasoning: "none",
|
|
initialPayload: {
|
|
reasoning_effort: "high",
|
|
reasoning: { effort: "high" },
|
|
reasoningEffort: "high",
|
|
},
|
|
});
|
|
|
|
expect(payload).toEqual({
|
|
chat_template_kwargs: {
|
|
enable_thinking: false,
|
|
preserve_thinking: true,
|
|
},
|
|
});
|
|
});
|
|
|
|
it("maps Qwen chat-template thinking on to chat_template_kwargs", () => {
|
|
expect(capturePayload({ format: "chat-template", reasoning: "medium" })).toEqual({
|
|
chat_template_kwargs: {
|
|
enable_thinking: true,
|
|
preserve_thinking: true,
|
|
},
|
|
});
|
|
});
|
|
|
|
it("preserves explicit chat-template kwargs while setting enable_thinking", () => {
|
|
expect(
|
|
capturePayload({
|
|
format: "chat-template",
|
|
thinkingLevel: "off",
|
|
initialPayload: {
|
|
chat_template_kwargs: {
|
|
preserve_thinking: false,
|
|
force_nonempty_content: true,
|
|
},
|
|
},
|
|
}),
|
|
).toEqual({
|
|
chat_template_kwargs: {
|
|
enable_thinking: false,
|
|
preserve_thinking: false,
|
|
force_nonempty_content: true,
|
|
},
|
|
});
|
|
});
|
|
|
|
it("maps Qwen top-level thinking format to enable_thinking", () => {
|
|
expect(capturePayload({ format: "top-level", thinkingLevel: "off" })).toEqual({
|
|
enable_thinking: false,
|
|
});
|
|
expect(capturePayload({ format: "top-level", thinkingLevel: "high" })).toEqual({
|
|
enable_thinking: true,
|
|
});
|
|
});
|
|
|
|
it("patches configured Qwen models unless reasoning is explicitly disabled", () => {
|
|
expect(capturePayload({ format: "chat-template", model: { reasoning: undefined } })).toEqual({
|
|
chat_template_kwargs: {
|
|
enable_thinking: true,
|
|
preserve_thinking: true,
|
|
},
|
|
});
|
|
expect(capturePayload({ format: "chat-template", model: { reasoning: false } })).toStrictEqual(
|
|
{},
|
|
);
|
|
});
|
|
|
|
it("skips non-completions models", () => {
|
|
expect(
|
|
capturePayload({ format: "chat-template", model: { api: "openai-responses" as never } }),
|
|
).toStrictEqual({});
|
|
});
|
|
});
|
|
|
|
describe("createVllmProviderThinkingWrapper", () => {
|
|
function captureProviderPayload(params: {
|
|
thinkingLevel?: "off" | "low" | "medium" | "high" | "xhigh" | "max";
|
|
initialPayload?: Record<string, unknown>;
|
|
model?: Partial<Model<"openai-completions">>;
|
|
}): Record<string, unknown> {
|
|
let captured: Record<string, unknown> = {};
|
|
const baseStreamFn: StreamFn = (_model, _context, options) => {
|
|
const payload = { ...params.initialPayload };
|
|
options?.onPayload?.(payload, _model);
|
|
captured = payload;
|
|
return {} as ReturnType<StreamFn>;
|
|
};
|
|
|
|
const wrapped = createVllmProviderThinkingWrapper({
|
|
baseStreamFn,
|
|
thinkingLevel: params.thinkingLevel ?? "high",
|
|
});
|
|
void wrapped(
|
|
{
|
|
api: "openai-completions",
|
|
provider: "vllm",
|
|
id: "nemotron-3-super",
|
|
reasoning: true,
|
|
...params.model,
|
|
} as Model<"openai-completions">,
|
|
{ messages: [] } as Context,
|
|
{},
|
|
);
|
|
|
|
return captured;
|
|
}
|
|
|
|
it("injects Nemotron 3 chat-template kwargs when thinking is off", () => {
|
|
expect(captureProviderPayload({ thinkingLevel: "off" })).toEqual({
|
|
chat_template_kwargs: {
|
|
enable_thinking: false,
|
|
force_nonempty_content: true,
|
|
},
|
|
});
|
|
});
|
|
|
|
it("does not inject Nemotron 3 chat-template kwargs when thinking is enabled", () => {
|
|
expect(captureProviderPayload({ thinkingLevel: "low" })).toStrictEqual({});
|
|
});
|
|
|
|
it("preserves existing Nemotron 3 chat-template kwargs over defaults", () => {
|
|
expect(
|
|
captureProviderPayload({
|
|
thinkingLevel: "off",
|
|
initialPayload: {
|
|
chat_template_kwargs: {
|
|
enable_thinking: true,
|
|
},
|
|
},
|
|
}),
|
|
).toEqual({
|
|
chat_template_kwargs: {
|
|
enable_thinking: true,
|
|
force_nonempty_content: true,
|
|
},
|
|
});
|
|
});
|
|
|
|
it("skips non-Nemotron vLLM models", () => {
|
|
expect(
|
|
captureProviderPayload({
|
|
thinkingLevel: "off",
|
|
model: { id: "Qwen/Qwen3-8B" },
|
|
}),
|
|
).toStrictEqual({});
|
|
});
|
|
});
|
|
|
|
describe("wrapVllmProviderStream", () => {
|
|
it("registers when vLLM Qwen thinking format compat is configured", () => {
|
|
expect(
|
|
wrapVllmProviderStream({
|
|
provider: "vllm",
|
|
modelId: "Qwen/Qwen3-8B",
|
|
extraParams: {},
|
|
model: {
|
|
api: "openai-completions",
|
|
provider: "vllm",
|
|
id: "Qwen/Qwen3-8B",
|
|
reasoning: true,
|
|
compat: { thinkingFormat: "qwen-chat-template" },
|
|
} as Model<"openai-completions">,
|
|
streamFn: undefined,
|
|
} as never),
|
|
).toBeTypeOf("function");
|
|
});
|
|
|
|
it("ignores request params when Qwen thinking format compat is not configured", () => {
|
|
expect(
|
|
wrapVllmProviderStream({
|
|
provider: "vllm",
|
|
modelId: "Qwen/Qwen3-8B",
|
|
extraParams: { qwenThinkingFormat: "chat-template" },
|
|
model: {
|
|
api: "openai-completions",
|
|
provider: "vllm",
|
|
id: "Qwen/Qwen3-8B",
|
|
reasoning: true,
|
|
} as Model<"openai-completions">,
|
|
streamFn: undefined,
|
|
} as never),
|
|
).toBeUndefined();
|
|
});
|
|
|
|
it("uses model compat for Qwen thinking format", () => {
|
|
let captured: Record<string, unknown> = {};
|
|
const baseStreamFn: StreamFn = (_model, _context, options) => {
|
|
const payload = {};
|
|
options?.onPayload?.(payload, _model);
|
|
captured = payload;
|
|
return {} as ReturnType<StreamFn>;
|
|
};
|
|
const model = {
|
|
api: "openai-completions",
|
|
provider: "vllm",
|
|
id: "Qwen/Qwen3-8B",
|
|
reasoning: true,
|
|
compat: { thinkingFormat: "qwen-chat-template" },
|
|
} as unknown as Model<"openai-completions">;
|
|
const wrapped = wrapVllmProviderStream({
|
|
provider: "vllm",
|
|
modelId: "Qwen/Qwen3-8B",
|
|
extraParams: {},
|
|
thinkingLevel: "off",
|
|
model,
|
|
streamFn: baseStreamFn,
|
|
} as never);
|
|
|
|
expect(wrapped).toBeTypeOf("function");
|
|
void wrapped?.(model, { messages: [] } as Context, {});
|
|
|
|
expect(captured).toEqual({
|
|
chat_template_kwargs: {
|
|
enable_thinking: false,
|
|
preserve_thinking: true,
|
|
},
|
|
});
|
|
});
|
|
|
|
it("skips unconfigured vLLM and non-vLLM providers", () => {
|
|
expect(
|
|
wrapVllmProviderStream({
|
|
provider: "vllm",
|
|
modelId: "Qwen/Qwen3-8B",
|
|
extraParams: {},
|
|
model: {
|
|
api: "openai-completions",
|
|
provider: "vllm",
|
|
id: "Qwen/Qwen3-8B",
|
|
} as Model<"openai-completions">,
|
|
streamFn: undefined,
|
|
} as never),
|
|
).toBeUndefined();
|
|
|
|
expect(
|
|
wrapVllmProviderStream({
|
|
provider: "openai",
|
|
modelId: "gpt-5.4",
|
|
extraParams: {},
|
|
model: {
|
|
api: "openai-completions",
|
|
provider: "openai",
|
|
id: "gpt-5.4",
|
|
} as Model<"openai-completions">,
|
|
streamFn: undefined,
|
|
} as never),
|
|
).toBeUndefined();
|
|
});
|
|
|
|
it("registers for vLLM Nemotron when thinking is off", () => {
|
|
expect(
|
|
wrapVllmProviderStream({
|
|
provider: "vllm",
|
|
modelId: "nemotron-3-super",
|
|
extraParams: {},
|
|
thinkingLevel: "off",
|
|
model: {
|
|
api: "openai-completions",
|
|
provider: "vllm",
|
|
id: "nemotron-3-super",
|
|
} as Model<"openai-completions">,
|
|
streamFn: undefined,
|
|
} as never),
|
|
).toBeTypeOf("function");
|
|
|
|
expect(
|
|
wrapVllmProviderStream({
|
|
provider: "vllm",
|
|
modelId: "nemotron-3-super",
|
|
extraParams: {},
|
|
thinkingLevel: "low",
|
|
model: {
|
|
api: "openai-completions",
|
|
provider: "vllm",
|
|
id: "nemotron-3-super",
|
|
} as Model<"openai-completions">,
|
|
streamFn: undefined,
|
|
} as never),
|
|
).toBeUndefined();
|
|
});
|
|
});
|