test: speed up import-heavy suites · openclaw/openclaw@34...

Recent Commits to openclaw:main

steipete · 2026-05-04 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,18 @@ async function expectVertexAdcEnvApiKey(params: {`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`
	`47`	`+function testModelDefinition(id: string): Model<Api> {`
	`48`	`+return {`
	`49`	`+ id,`
	`50`	`+name: id,`
	`51`	`+reasoning: false,`
	`52`	`+input: ["text"],`
	`53`	`+cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },`
	`54`	`+contextWindow: 128_000,`
	`55`	`+maxTokens: 8192,`
	`56`	`+};`
	`57`	`+}`
	`58`	`+`
`47`	`59`	`vi.mock("../plugins/setup-registry.js", async () => {`
`48`	`60`	`const { readFileSync } = await import("node:fs");`
`49`	`61`	`return {`
`@@ -627,6 +639,51 @@ describe("getApiKeyForModel", () => {`
`627`	`639`	`}`
`628`	`640`	`});`
`629`	`641`
	`642`	`+it("reuses runtime auth availability for provider auth checks", () => {`
	`643`	`+const store = { version: 1 as const, profiles: {} };`
	`644`	`+const localNoKeyConfig = {`
	`645`	`+models: {`
	`646`	`+providers: {`
	`647`	`+vllm: {`
	`648`	`+api: "openai-completions",`
	`649`	`+baseUrl: "http://127.0.0.1:8000/v1",`
	`650`	`+models: [testModelDefinition("meta-llama/Meta-Llama-3-8B-Instruct")],`
	`651`	`+},`
	`652`	`+remote: {`
	`653`	`+api: "openai-completions",`
	`654`	`+baseUrl: "https://remote.example.com/v1",`
	`655`	`+models: [testModelDefinition("remote-model")],`
	`656`	`+},`
	`657`	`+},`
	`658`	`+},`
	`659`	`+} as OpenClawConfig;`
	`660`	`+`
	`661`	`+expect(`
	`662`	`+hasAuthForModelProvider({`
	`663`	`+provider: "amazon-bedrock",`
	`664`	`+cfg: {} as OpenClawConfig,`
	`665`	`+env: {},`
	`666`	`+ store,`
	`667`	`+}),`
	`668`	`+).toBe(true);`
	`669`	`+expect(`
	`670`	`+hasAuthForModelProvider({`
	`671`	`+provider: "vllm",`
	`672`	`+cfg: localNoKeyConfig,`
	`673`	`+env: {},`
	`674`	`+ store,`
	`675`	`+}),`
	`676`	`+).toBe(true);`
	`677`	`+expect(`
	`678`	`+hasAuthForModelProvider({`
	`679`	`+provider: "remote",`
	`680`	`+cfg: localNoKeyConfig,`
	`681`	`+env: {},`
	`682`	`+ store,`
	`683`	`+}),`
	`684`	`+).toBe(false);`
	`685`	`+});`
	`686`	`+`
`630`	`687`	`it("hasAvailableAuthForProvider('google') accepts GOOGLE_API_KEY fallback", async () => {`
`631`	`688`	`await withEnvAsync(`
`632`	`689`	`{`

Original file line number	Diff line number	Diff line change
`@@ -11,11 +11,16 @@ const baseProviderTransform = {`
`11`	`11`	`},`
`12`	`12`	`};`
`13`	`13`
	`14`	`+const transformProviderSystemPrompt: Parameters<`
	`15`	`+typeof buildAttemptSystemPrompt`
	`16`	`+>[0]["transformProviderSystemPrompt"] = ({ context }) => context.systemPrompt;`
	`17`	`+`
`14`	`18`	`describe("buildAttemptSystemPrompt", () => {`
`15`	`19`	`it("preserves bootstrap Project Context when a system prompt override is configured", () => {`
`16`	`20`	`const result = buildAttemptSystemPrompt({`
`17`	`21`	`isRawModelRun: false,`
`18`	`22`	`systemPromptOverrideText: "Custom override prompt.",`
	`23`	`+ transformProviderSystemPrompt,`
`19`	`24`	`embeddedSystemPrompt: {`
`20`	`25`	`workspaceDir: "/tmp/openclaw",`
`21`	`26`	`reasoningTagHint: false,`
`@@ -59,6 +64,7 @@ describe("buildAttemptSystemPrompt", () => {`
`59`	`64`	`it("omits system prompts for raw model probes", () => {`
`60`	`65`	`const result = buildAttemptSystemPrompt({`
`61`	`66`	`isRawModelRun: true,`
	`67`	`+ transformProviderSystemPrompt,`
`62`	`68`	`embeddedSystemPrompt: {`
`63`	`69`	`workspaceDir: "/tmp/openclaw",`
`64`	`70`	`reasoningTagHint: false,`

Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,21 @@`
`1`	`1`	`import type { OpenClawConfig } from "../../../config/types.openclaw.js";`
`2`		`-import { transformProviderSystemPrompt } from "../../../plugins/provider-runtime.js";`
`3`	`2`	`import type { ProviderTransformSystemPromptContext } from "../../../plugins/types.js";`
`4`	`3`	`import { appendAgentBootstrapSystemPromptSupplement } from "../../system-prompt.js";`
`5`	`4`	`import { buildEmbeddedSystemPrompt, createSystemPromptOverride } from "../system-prompt.js";`
`6`	`5`
`7`	`6`	`type EmbeddedSystemPromptParams = Parameters<typeof buildEmbeddedSystemPrompt>[0];`
	`7`	`+type ProviderSystemPromptTransform = (params: {`
	`8`	`+provider: string;`
	`9`	`+config?: OpenClawConfig;`
	`10`	`+workspaceDir: string;`
	`11`	`+context: ProviderTransformSystemPromptContext;`
	`12`	`+}) => string;`
`8`	`13`
`9`	`14`	`export type BuildAttemptSystemPromptParams = {`
`10`	`15`	`isRawModelRun: boolean;`
`11`	`16`	`systemPromptOverrideText?: string;`
`12`	`17`	`embeddedSystemPrompt: EmbeddedSystemPromptParams;`
	`18`	`+transformProviderSystemPrompt: ProviderSystemPromptTransform;`
`13`	`19`	`providerTransform: {`
`14`	`20`	`provider: string;`
`15`	`21`	`config?: OpenClawConfig;`
`@@ -38,7 +44,7 @@ export function buildAttemptSystemPrompt(`
`38`	`44`
`39`	`45`	`const systemPrompt = params.isRawModelRun`
`40`	`46`	`? ""`
`41`		`- : transformProviderSystemPrompt({`
	`47`	`+ : params.transformProviderSystemPrompt({`
`42`	`48`	`provider: params.providerTransform.provider,`
`43`	`49`	`config: params.providerTransform.config,`
`44`	`50`	`workspaceDir: params.providerTransform.workspaceDir,`

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ import {`
`22`	`22`	`resolveEmbeddedAgentStreamFn,`
`23`	`23`	`resolveUnknownToolGuardThreshold,`
`24`	`24`	`shouldCreateBundleMcpRuntimeForAttempt,`
	`25`	`+shouldBuildCoreCodingToolsForAllowlist,`
`25`	`26`	`resolveAttemptToolPolicyMessageProvider,`
`26`	`27`	`resolvePromptBuildHookResult,`
`27`	`28`	`resolvePromptModeForSession,`
`@@ -81,6 +82,15 @@ describe("applyEmbeddedAttemptToolsAllow", () => {`
`81`	`82`	`applyEmbeddedAttemptToolsAllow(tools, [" cron ", "READ"]).map((tool) => tool.name),`
`82`	`83`	`).toEqual(["cron", "read"]);`
`83`	`84`	`});`
	`85`	`+`
	`86`	`+it("keeps plugin-only allowlists on the shared tool policy path", () => {`
	`87`	`+const tools = [{ name: "memory_search" }, { name: "plugin_extra" }];`
	`88`	`+`
	`89`	`+expect(shouldBuildCoreCodingToolsForAllowlist(["memory_search"])).toBe(false);`
	`90`	`+expect(`
	`91`	`+applyEmbeddedAttemptToolsAllow(tools, ["memory_search"]).map((tool) => tool.name),`
	`92`	`+).toEqual(["memory_search"]);`
	`93`	`+});`
`84`	`94`	`});`
`85`	`95`
`86`	`96`	`describe("buildEmbeddedAttemptToolRunContext", () => {`

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ import {`
`32`	`32`	`import {`
`33`	`33`	`resolveProviderSystemPromptContribution,`
`34`	`34`	`resolveProviderTextTransforms,`
	`35`	`+transformProviderSystemPrompt,`
`35`	`36`	`} from "../../../plugins/provider-runtime.js";`
`36`	`37`	`import { getPluginToolMeta } from "../../../plugins/tools.js";`
`37`	`38`	`import { isAcpSessionKey, isSubagentSessionKey } from "../../../routing/session-key.js";`
`@@ -525,7 +526,7 @@ const CORE_CODING_TOOL_ALLOWLIST_NAMES = new Set([`
`525`	`526`	`"write",`
`526`	`527`	`]);`
`527`	`528`
`528`		`-function shouldBuildCoreCodingToolsForAllowlist(toolsAllow?: string[]): boolean {`
	`529`	`+export function shouldBuildCoreCodingToolsForAllowlist(toolsAllow?: string[]): boolean {`
`529`	`530`	`if (!toolsAllow \|\| toolsAllow.length === 0) {`
`530`	`531`	`return true;`
`531`	`532`	`}`
`@@ -1291,6 +1292,7 @@ export async function runEmbeddedAttempt(`
`1291`	`1292`	`const attemptSystemPrompt = buildAttemptSystemPrompt({`
`1292`	`1293`	`isRawModelRun,`
`1293`	`1294`	`systemPromptOverrideText,`
	`1295`	`+ transformProviderSystemPrompt,`
`1294`	`1296`	`embeddedSystemPrompt: {`
`1295`	`1297`	`workspaceDir: effectiveWorkspace,`
`1296`	`1298`	`defaultThinkLevel: params.thinkLevel,`

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`import { describe, expect, it } from "vitest";`
`2`	`2`	`import type { OpenClawConfig } from "../../../config/types.js";`
`3`		`-import { migrateLegacyConfig } from "./legacy-config-migrate.js";`
`4`	`3`	`import { LEGACY_CONFIG_MIGRATIONS } from "./legacy-config-migrations.js";`
`5`	`4`
`6`	`5`	`function migrateLegacyConfigForTest(raw: unknown): {`
`@@ -211,38 +210,6 @@ describe("legacy migrate mention routing", () => {`
`211`	`210`	`});`
`212`	`211`
`213`	`212`	`describe("legacy migrate sandbox scope aliases", () => {`
`214`		`-it("returns migrated config when unrelated plugin validation issues remain (#76798)", () => {`
`215`		`-const res = migrateLegacyConfig({`
`216`		`-agents: {`
`217`		`-defaults: {`
`218`		`-model: { primary: "openai/gpt-5.5" },`
`219`		`-llm: { idleTimeoutSeconds: 120 },`
`220`		`-},`
`221`		`-},`
`222`		`-plugins: {`
`223`		`-entries: {`
`224`		`-brave: {`
`225`		`-enabled: true,`
`226`		`-config: { webSearch: { mode: "definitely-invalid" } },`
`227`		`-},`
`228`		`-},`
`229`		`-},`
`230`		`-tools: { web: { search: { provider: "brave" } } },`
`231`		`-});`
`232`		`-`
`233`		`-expect(res.partiallyValid).toBe(true);`
`234`		`-expect(res.changes).toContain(`
`235`		`-"Removed agents.defaults.llm; model idle timeout now follows models.providers.<id>.timeoutSeconds.",`
`236`		`-);`
`237`		`-expect(res.changes).toContain(`
`238`		`-"Migration applied; other validation issues remain — run doctor to review.",`
`239`		`-);`
`240`		`-expect(res.config?.agents?.defaults).toEqual({`
`241`		`-model: { primary: "openai/gpt-5.5" },`
`242`		`-});`
`243`		`-expect(res.config?.tools?.web?.search?.provider).toBe("brave");`
`244`		`-});`
`245`		`-`
`246`	`213`	`it("removes legacy agents.defaults.llm timeout config", () => {`
`247`	`214`	`const res = migrateLegacyConfigForTest({`
`248`	`215`	`agents: {`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main