fix(agents): preserve runtime tools in lean mode (#88381) · openclaw/openclaw@4d135ae

Recent Commits to openclaw:main

vincentkoc · 2026-05-31 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -371,6 +371,81 @@ describe("createOpenClawCodingTools", () => {`
`371`	`371`	`expect(toolNameList(tools)).toContain("message");`
`372`	`372`	`});`
`373`	`373`
	`374`	`+it("preserves runtime-allowed message through local model lean filtering", () => {`
	`375`	`+const tools = createOpenClawCodingTools({`
	`376`	`+config: {`
	`377`	`+agents: {`
	`378`	`+defaults: {`
	`379`	`+experimental: {`
	`380`	`+localModelLean: true,`
	`381`	`+},`
	`382`	`+},`
	`383`	`+},`
	`384`	`+tools: { profile: "minimal" },`
	`385`	`+},`
	`386`	`+runtimeToolAllowlist: ["message"],`
	`387`	`+toolConstructionPlan: {`
	`388`	`+includeBaseCodingTools: false,`
	`389`	`+includeShellTools: false,`
	`390`	`+includeChannelTools: false,`
	`391`	`+includeOpenClawTools: true,`
	`392`	`+includePluginTools: false,`
	`393`	`+},`
	`394`	`+});`
	`395`	`+`
	`396`	`+expect(toolNameList(tools)).toContain("message");`
	`397`	`+});`
	`398`	`+`
	`399`	`+it("preserves forced message through local model lean filtering without runtime allowlist", () => {`
	`400`	`+const tools = createOpenClawCodingTools({`
	`401`	`+config: {`
	`402`	`+agents: {`
	`403`	`+defaults: {`
	`404`	`+experimental: {`
	`405`	`+localModelLean: true,`
	`406`	`+},`
	`407`	`+},`
	`408`	`+},`
	`409`	`+tools: { profile: "minimal" },`
	`410`	`+},`
	`411`	`+forceMessageTool: true,`
	`412`	`+toolConstructionPlan: {`
	`413`	`+includeBaseCodingTools: false,`
	`414`	`+includeShellTools: false,`
	`415`	`+includeChannelTools: false,`
	`416`	`+includeOpenClawTools: true,`
	`417`	`+includePluginTools: false,`
	`418`	`+},`
	`419`	`+});`
	`420`	`+`
	`421`	`+expect(toolNameList(tools)).toContain("message");`
	`422`	`+});`
	`423`	`+`
	`424`	`+it("preserves message-tool-only replies through local model lean filtering without runtime allowlist", () => {`
	`425`	`+const tools = createOpenClawCodingTools({`
	`426`	`+config: {`
	`427`	`+agents: {`
	`428`	`+defaults: {`
	`429`	`+experimental: {`
	`430`	`+localModelLean: true,`
	`431`	`+},`
	`432`	`+},`
	`433`	`+},`
	`434`	`+tools: { profile: "minimal" },`
	`435`	`+},`
	`436`	`+sourceReplyDeliveryMode: "message_tool_only",`
	`437`	`+toolConstructionPlan: {`
	`438`	`+includeBaseCodingTools: false,`
	`439`	`+includeShellTools: false,`
	`440`	`+includeChannelTools: false,`
	`441`	`+includeOpenClawTools: true,`
	`442`	`+includePluginTools: false,`
	`443`	`+},`
	`444`	`+});`
	`445`	`+`
	`446`	`+expect(toolNameList(tools)).toContain("message");`
	`447`	`+});`
	`448`	`+`
`374`	`449`	`it("preserves runtime allowlist groups containing message through restrictive profiles", () => {`
`375`	`450`	`for (const runtimeToolAllowlist of [["group:messaging"], ["group:openclaw"], ["*"]]) {`
`376`	`451`	`const tools = createOpenClawCodingTools({`

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,10 @@ import { execSchema, processSchema } from "./bash-tools.schemas.js";`
`63`	`63`	`import { listChannelAgentTools } from "./channel-tools.js";`
`64`	`64`	`import { shouldSuppressManagedWebSearchTool } from "./codex-native-web-search.js";`
`65`	`65`	`import { resolveImageSanitizationLimits } from "./image-sanitization.js";`
`66`		`-import { filterLocalModelLeanTools } from "./local-model-lean.js";`
	`66`	`+import {`
	`67`	`+filterLocalModelLeanTools,`
	`68`	`+resolveLocalModelLeanPreserveToolNames,`
	`69`	`+} from "./local-model-lean.js";`
`67`	`70`	`import type { ModelAuthMode } from "./model-auth.js";`
`68`	`71`	`import { resolveOpenClawPluginToolsForOptions } from "./openclaw-plugin-tools.js";`
`69`	`72`	`import { createOpenClawTools } from "./openclaw-tools.js";`
`@@ -245,6 +248,8 @@ function applyModelProviderToolPolicy(`
`245`	`248`	`agentDir?: string;`
`246`	`249`	`modelCompat?: ModelCompatConfig;`
`247`	`250`	`suppressManagedWebSearch?: boolean;`
	`251`	`+runtimeToolAllowlist?: string[];`
	`252`	`+localModelLeanPreserveToolNames?: string[];`
`248`	`253`	`},`
`249`	`254`	`): AnyAgentTool[] {`
`250`	`255`	`let tools = toolsInput;`
`@@ -253,6 +258,7 @@ function applyModelProviderToolPolicy(`
`253`	`258`	`config: params?.config,`
`254`	`259`	`agentId: params?.agentId,`
`255`	`260`	`sessionKey: params?.sessionKey,`
	`261`	`+preserveToolNames: params?.localModelLeanPreserveToolNames ?? params?.runtimeToolAllowlist,`
`256`	`262`	`});`
`257`	`263`
`258`	`264`	`if (`
`@@ -593,6 +599,11 @@ export function createOpenClawCodingTools(options?: {`
`593`	`599`	`const normalized = normalizeToolName(toolName);`
`594`	`600`	`return normalized === "*" \|\| normalized === "message";`
`595`	`601`	`});`
	`602`	`+const localModelLeanPreserveToolNames = resolveLocalModelLeanPreserveToolNames({`
	`603`	`+toolNames: options?.runtimeToolAllowlist,`
	`604`	`+forceMessageTool: options?.forceMessageTool,`
	`605`	`+sourceReplyDeliveryMode: options?.sourceReplyDeliveryMode,`
	`606`	`+});`
`596`	`607`	`const runtimeProfileAlsoAllow = [`
`597`	`608`	`...(options?.forceMessageTool \|\| options?.sourceReplyDeliveryMode === "message_tool_only"`
`598`	`609`	`? ["message"]`
`@@ -1064,6 +1075,8 @@ export function createOpenClawCodingTools(options?: {`
`1064`	`1075`	`agentDir: options?.agentDir,`
`1065`	`1076`	`modelCompat: options?.modelCompat,`
`1066`	`1077`	`suppressManagedWebSearch: options?.suppressManagedWebSearch,`
	`1078`	`+runtimeToolAllowlist: options?.runtimeToolAllowlist,`
	`1079`	`+ localModelLeanPreserveToolNames,`
`1067`	`1080`	`});`
`1068`	`1081`	`options?.recordToolPrepStage?.("model-provider-policy");`
`1069`	`1082`	`// Sender identity is carried for command/channel-action auth; tool visibility`

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,11 @@ import { isTimeoutError } from "../../failover-error.js";`
`150`	`150`	`import { runAgentEndSideEffects } from "../../harness/agent-end-side-effects.js";`
`151`	`151`	`import { resolveHeartbeatPromptForSystemPrompt } from "../../heartbeat-system-prompt.js";`
`152`	`152`	`import { resolveImageSanitizationLimits } from "../../image-sanitization.js";`
`153`		`-import { filterLocalModelLeanTools, isLocalModelLeanEnabled } from "../../local-model-lean.js";`
	`153`	`+import {`
	`154`	`+filterLocalModelLeanTools,`
	`155`	`+isLocalModelLeanEnabled,`
	`156`	`+resolveLocalModelLeanPreserveToolNames,`
	`157`	`+} from "../../local-model-lean.js";`
`154`	`158`	`import { resolveModelAuthMode } from "../../model-auth.js";`
`155`	`159`	`import { resolveDefaultModelForAgent } from "../../model-selection.js";`
`156`	`160`	`import { supportsModelTools } from "../../model-tool-support.js";`
`@@ -1123,6 +1127,11 @@ export async function runEmbeddedAttempt(`
`1123`	`1127`	`]),`
`1124`	`1128`	`]`
`1125`	`1129`	`: toolsAllowWithForcedRuntimeTools;`
	`1130`	`+const localModelLeanPreserveToolNames = resolveLocalModelLeanPreserveToolNames({`
	`1131`	`+toolNames: effectiveToolsAllow,`
	`1132`	`+forceMessageTool: params.forceMessageTool,`
	`1133`	`+sourceReplyDeliveryMode: params.sourceReplyDeliveryMode,`
	`1134`	`+});`
`1126`	`1135`	`const shouldConstructTools =`
`1127`	`1136`	`toolConstructionPlan.constructTools \|\|`
`1128`	`1137`	`toolSearchControlsEnabledForRun \|\|`
`@@ -1216,6 +1225,7 @@ export async function runEmbeddedAttempt(`
`1216`	`1225`	`forceMessageTool: params.forceMessageTool,`
`1217`	`1226`	`enableHeartbeatTool: params.enableHeartbeatTool,`
`1218`	`1227`	`forceHeartbeatTool: params.forceHeartbeatTool,`
	`1228`	`+runtimeToolAllowlist: effectiveToolsAllow,`
`1219`	`1229`	`authProfileStore: params.authProfileStore,`
`1220`	`1230`	`recordToolPrepStage: (name) => corePluginToolStages.mark(name),`
`1221`	`1231`	`onToolOutcome: params.onToolOutcome,`
`@@ -1483,6 +1493,7 @@ export async function runEmbeddedAttempt(`
`1483`	`1493`	`tools: [...tools, ...normalizedBundledTools],`
`1484`	`1494`	`config: params.config,`
`1485`	`1495`	`agentId: sessionAgentId,`
	`1496`	`+preserveToolNames: localModelLeanPreserveToolNames,`
`1486`	`1497`	`});`
`1487`	`1498`	`const uncompactedToolSchemaProjection = filterRuntimeCompatibleTools(`
`1488`	`1499`	`projectedUncompactedEffectiveTools,`
`@@ -1554,6 +1565,7 @@ export async function runEmbeddedAttempt(`
`1554`	`1565`	`tools: toolSearch.tools,`
`1555`	`1566`	`config: params.config,`
`1556`	`1567`	`agentId: sessionAgentId,`
	`1568`	`+preserveToolNames: localModelLeanPreserveToolNames,`
`1557`	`1569`	`});`
`1558`	`1570`	`const toolSearchSchemaProjection = filterRuntimeCompatibleTools(projectedToolSearchTools);`
`1559`	`1571`	`logRuntimeToolSchemaQuarantine({`

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,11 @@`
`1`	`1`	`import { describe, expect, it } from "vitest";`
`2`	`2`	`import type { OpenClawConfig } from "../config/config.js";`
`3`	`3`	`import type { AnyAgentTool } from "./agent-tools.types.js";`
`4`		`-import { filterLocalModelLeanTools, isLocalModelLeanEnabled } from "./local-model-lean.js";`
	`4`	`+import {`
	`5`	`+filterLocalModelLeanTools,`
	`6`	`+isLocalModelLeanEnabled,`
	`7`	`+resolveLocalModelLeanPreserveToolNames,`
	`8`	`+} from "./local-model-lean.js";`
`5`	`9`
`6`	`10`	`function tools(names: string[]): AnyAgentTool[] {`
`7`	`11`	`return names.map((name) => ({ name })) as AnyAgentTool[];`
`@@ -32,6 +36,65 @@ describe("local model lean tool filtering", () => {`
`32`	`36`	`).toEqual(["read", "exec"]);`
`33`	`37`	`});`
`34`	`38`
	`39`	`+it("keeps explicitly preserved tools when lean mode is enabled", () => {`
	`40`	`+const cfg: OpenClawConfig = {`
	`41`	`+agents: {`
	`42`	`+defaults: {`
	`43`	`+experimental: {`
	`44`	`+localModelLean: true,`
	`45`	`+},`
	`46`	`+},`
	`47`	`+},`
	`48`	`+};`
	`49`	`+`
	`50`	`+expect(`
	`51`	`+filterLocalModelLeanTools({`
	`52`	`+tools: tools(["read", "browser", "cron", "message", "exec"]),`
	`53`	`+config: cfg,`
	`54`	`+preserveToolNames: ["browser", "cron", "group:messaging"],`
	`55`	`+}).map((tool) => tool.name),`
	`56`	`+).toEqual(["read", "browser", "cron", "message", "exec"]);`
	`57`	`+});`
	`58`	`+`
	`59`	`+it("adds reply-required message tools to lean preservation", () => {`
	`60`	`+expect(`
	`61`	`+resolveLocalModelLeanPreserveToolNames({`
	`62`	`+forceMessageTool: true,`
	`63`	`+}),`
	`64`	`+).toEqual(["message"]);`
	`65`	`+expect(`
	`66`	`+resolveLocalModelLeanPreserveToolNames({`
	`67`	`+sourceReplyDeliveryMode: "message_tool_only",`
	`68`	`+}),`
	`69`	`+).toEqual(["message"]);`
	`70`	`+expect(`
	`71`	`+resolveLocalModelLeanPreserveToolNames({`
	`72`	`+toolNames: ["group:messaging"],`
	`73`	`+forceMessageTool: true,`
	`74`	`+}),`
	`75`	`+).toEqual(["group:messaging", "message"]);`
	`76`	`+});`
	`77`	`+`
	`78`	`+it("does not treat wildcard preservation as disabling lean mode", () => {`
	`79`	`+const cfg: OpenClawConfig = {`
	`80`	`+agents: {`
	`81`	`+defaults: {`
	`82`	`+experimental: {`
	`83`	`+localModelLean: true,`
	`84`	`+},`
	`85`	`+},`
	`86`	`+},`
	`87`	`+};`
	`88`	`+`
	`89`	`+expect(`
	`90`	`+filterLocalModelLeanTools({`
	`91`	`+tools: tools(["read", "browser", "cron", "message", "exec"]),`
	`92`	`+config: cfg,`
	`93`	`+preserveToolNames: ["*"],`
	`94`	`+}).map((tool) => tool.name),`
	`95`	`+).toEqual(["read", "exec"]);`
	`96`	`+});`
	`97`	`+`
`35`	`98`	`it("lets an agent opt out of an inherited global lean setting", () => {`
`36`	`99`	`const cfg: OpenClawConfig = {`
`37`	`100`	`agents: {`

Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,33 @@ import type { OpenClawConfig } from "../config/types.openclaw.js";`
`2`	`2`	`import { normalizeAgentId, parseAgentSessionKey } from "../routing/session-key.js";`
`3`	`3`	`import { resolveAgentConfig, resolveDefaultAgentId } from "./agent-scope-config.js";`
`4`	`4`	`import type { AnyAgentTool } from "./agent-tools.types.js";`
	`5`	`+import { expandToolGroups, normalizeToolName } from "./tool-policy.js";`
`5`	`6`
`6`	`7`	`const LOCAL_MODEL_LEAN_DENY_TOOL_NAMES = new Set(["browser", "cron", "message"]);`
`7`	`8`
	`9`	`+function resolvePreservedLocalModelLeanToolNames(names?: Iterable<string>): Set<string> {`
	`10`	`+if (!names) {`
	`11`	`+return new Set();`
	`12`	`+}`
	`13`	`+return new Set(`
	`14`	`+expandToolGroups([...names])`
	`15`	`+.map(normalizeToolName)`
	`16`	`+.filter((name) => name && name !== "*"),`
	`17`	`+);`
	`18`	`+}`
	`19`	`+`
	`20`	`+export function resolveLocalModelLeanPreserveToolNames(params?: {`
	`21`	`+toolNames?: Iterable<string>;`
	`22`	`+forceMessageTool?: boolean;`
	`23`	`+sourceReplyDeliveryMode?: string;`
	`24`	`+}): string[] {`
	`25`	`+const names = [...(params?.toolNames ?? [])];`
	`26`	`+if (params?.forceMessageTool \|\| params?.sourceReplyDeliveryMode === "message_tool_only") {`
	`27`	`+names.push("message");`
	`28`	`+}`
	`29`	`+return [...new Set(names)];`
	`30`	`+}`
	`31`	`+`
`8`	`32`	`function resolveLocalModelLeanAgentId(params: {`
`9`	`33`	`config?: OpenClawConfig;`
`10`	`34`	`agentId?: string;`
`@@ -43,9 +67,17 @@ export function filterLocalModelLeanTools(params: {`
`43`	`67`	`config?: OpenClawConfig;`
`44`	`68`	`agentId?: string;`
`45`	`69`	`sessionKey?: string;`
	`70`	`+preserveToolNames?: Iterable<string>;`
`46`	`71`	`}): AnyAgentTool[] {`
`47`	`72`	`if (!isLocalModelLeanEnabled(params)) {`
`48`	`73`	`return params.tools;`
`49`	`74`	`}`
`50`		`-return params.tools.filter((tool) => !LOCAL_MODEL_LEAN_DENY_TOOL_NAMES.has(tool.name));`
	`75`	`+const preservedToolNames = resolvePreservedLocalModelLeanToolNames(params.preserveToolNames);`
	`76`	`+return params.tools.filter((tool) => {`
	`77`	`+const normalizedName = normalizeToolName(tool.name);`
	`78`	`+return (`
	`79`	`+preservedToolNames.has(normalizedName) \|\|`
	`80`	`+!LOCAL_MODEL_LEAN_DENY_TOOL_NAMES.has(normalizedName)`
	`81`	`+);`
	`82`	`+});`
`51`	`83`	`}`

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

推荐订阅源

Recent Commits to openclaw:main