fix: force message through empty allowlists · openclaw/openclaw@df70ed2

Recent Commits to openclaw:main

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

File tree

extensions/codex/src/app-server
src/agents
- pi-embedded-runner/run

Original file line number	Diff line number	Diff line change
`@@ -918,6 +918,37 @@ describe("runCodexAppServerAttempt", () => {`
`918`	`918`	`expect(dynamicToolNames).toContain("music_generate");`
`919`	`919`	`});`
`920`	`920`
	`921`	`+it("keeps forced message dynamic tool when toolsAllow is empty", async () => {`
	`922`	`+__testing.setOpenClawCodingToolsFactoryForTests(() => [`
	`923`	`+createRuntimeDynamicTool("message"),`
	`924`	`+createRuntimeDynamicTool("music_generate"),`
	`925`	`+]);`
	`926`	`+const harness = createStartedThreadHarness();`
	`927`	`+const params = createParams(`
	`928`	`+path.join(tempDir, "session.jsonl"),`
	`929`	`+path.join(tempDir, "workspace"),`
	`930`	`+);`
	`931`	`+params.disableTools = false;`
	`932`	`+params.runtimePlan = createCodexRuntimePlanFixture();`
	`933`	`+params.sourceReplyDeliveryMode = "message_tool_only";`
	`934`	`+params.toolsAllow = [];`
	`935`	`+`
	`936`	`+const run = runCodexAppServerAttempt(params, {`
	`937`	`+pluginConfig: { appServer: { mode: "yolo" } },`
	`938`	`+});`
	`939`	`+await harness.waitForMethod("turn/start", 120_000);`
	`940`	`+await harness.completeTurn({ threadId: "thread-1", turnId: "turn-1" });`
	`941`	`+await run;`
	`942`	`+`
	`943`	`+const startRequest = harness.requests.find((entry) => entry.method === "thread/start");`
	`944`	`+const dynamicToolNames =`
	`945`	`+(`
	`946`	`+startRequest?.params as { dynamicTools?: Array<{ name?: string }> } \| undefined`
	`947`	`+)?.dynamicTools?.map((tool) => tool.name) ?? [];`
	`948`	`+`
	`949`	`+expect(dynamicToolNames).toEqual(["message"]);`
	`950`	`+});`
	`951`	`+`
`921`	`952`	`it("starts Codex threads with searchable OpenClaw dynamic tools by default", async () => {`
`922`	`953`	`__testing.setOpenClawCodingToolsFactoryForTests(() => [`
`923`	`954`	`createRuntimeDynamicTool("message"),`

Original file line number	Diff line number	Diff line change
`@@ -2344,9 +2344,12 @@ function includeForcedMessageToolAllow(`
`2344`	`2344`	`if (!shouldForceMessageTool(params)) {`
`2345`	`2345`	`return toolsAllow;`
`2346`	`2346`	`}`
`2347`		`-if (!toolsAllow?.length) {`
	`2347`	`+if (toolsAllow === undefined) {`
`2348`	`2348`	`return toolsAllow;`
`2349`	`2349`	`}`
	`2350`	`+if (toolsAllow.length === 0) {`
	`2351`	`+return ["message"];`
	`2352`	`+}`
`2350`	`2353`	`const normalized = new Set(toolsAllow.map((name) => normalizeCodexDynamicToolName(name)));`
`2351`	`2354`	`return normalized.has("message") ? toolsAllow : [...toolsAllow, "message"];`
`2352`	`2355`	`}`

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,18 @@ describe("applyEmbeddedAttemptToolsAllow", () => {`
`59`	`59`	`]);`
`60`	`60`	`});`
`61`	`61`
	`62`	`+it("materializes forced message tool through empty runtime allowlists", () => {`
	`63`	`+const tools = [{ name: "music_generate" }, { name: "message" }];`
	`64`	`+const toolsAllow = mergeForcedEmbeddedAttemptToolsAllow([], {`
	`65`	`+forceMessageTool: true,`
	`66`	`+});`
	`67`	`+`
	`68`	`+expect(toolsAllow).toEqual(["message"]);`
	`69`	`+expect(applyEmbeddedAttemptToolsAllow(tools, toolsAllow).map((tool) => tool.name)).toEqual([`
	`70`	`+"message",`
	`71`	`+]);`
	`72`	`+});`
	`73`	`+`
`62`	`74`	`it("normalizes explicit toolsAllow entries before filtering", () => {`
`63`	`75`	`const tools = [{ name: "cron" }, { name: "read" }, { name: "message" }];`
`64`	`76`
`@@ -155,6 +167,24 @@ describe("resolveEmbeddedAttemptToolConstructionPlan", () => {`
`155`	`167`	`});`
`156`	`168`	`});`
`157`	`169`
	`170`	`+it("constructs message tool for forced message delivery on explicit no-tools runs", () => {`
	`171`	`+expectConstructionPlan(`
	`172`	`+resolveEmbeddedAttemptToolConstructionPlan({ toolsAllow: [], forceMessageTool: true }),`
	`173`	`+{`
	`174`	`+constructTools: true,`
	`175`	`+includeCoreTools: true,`
	`176`	`+runtimeToolAllowlist: ["message"],`
	`177`	`+coding: {`
	`178`	`+includeBaseCodingTools: false,`
	`179`	`+includeShellTools: false,`
	`180`	`+includeChannelTools: false,`
	`181`	`+includeOpenClawTools: true,`
	`182`	`+includePluginTools: false,`
	`183`	`+},`
	`184`	`+},`
	`185`	`+);`
	`186`	`+});`
	`187`	`+`
`158`	`188`	`it("materializes only plugin candidates for plugin-only allowlists", () => {`
`159`	`189`	`expectConstructionPlan(`
`160`	`190`	`resolveEmbeddedAttemptToolConstructionPlan({ toolsAllow: ["memory_search"] }),`

Original file line number	Diff line number	Diff line change
`@@ -113,9 +113,16 @@ export function mergeForcedEmbeddedAttemptToolsAllow(`
`113`	`113`	`toolsAllow: string[] \| undefined,`
`114`	`114`	`params: { forceMessageTool?: boolean },`
`115`	`115`	`): string[] \| undefined {`
`116`		`-if (!params.forceMessageTool \|\| !toolsAllow?.length \|\| hasWildcardToolAllowlist(toolsAllow)) {`
	`116`	`+if (`
	`117`	`+!params.forceMessageTool \|\|`
	`118`	`+toolsAllow === undefined \|\|`
	`119`	`+hasWildcardToolAllowlist(toolsAllow)`
	`120`	`+) {`
`117`	`121`	`return toolsAllow;`
`118`	`122`	`}`
	`123`	`+if (toolsAllow.length === 0) {`
	`124`	`+return ["message"];`
	`125`	`+}`
`119`	`126`	`const normalized = new Set(toolsAllow.map((entry) => normalizeToolName(entry)));`
`120`	`127`	`return normalized.has("message") ? toolsAllow : [...toolsAllow, "message"];`
`121`	`128`	`}`

Original file line number	Diff line number	Diff line change
`@@ -39,12 +39,19 @@ describe("extractToolResultMediaPaths", () => {`
`39`	`39`	`attachments: [`
`40`	`40`	`{ type: "audio", path: "/tmp/song.mp3", mimeType: "audio/mpeg" },`
`41`	`41`	`{ type: "image", url: "https://example.test/cover.png" },`
	`42`	`+{ type: "file", media: "/tmp/stems.zip" },`
	`43`	`+{ type: "file", fileUrl: "https://example.test/stems.zip" },`
`42`	`44`	`],`
`43`	`45`	`},`
`44`	`46`	`},`
`45`	`47`	`}),`
`46`	`48`	`).toEqual({`
`47`		`-mediaUrls: ["/tmp/song.mp3", "https://example.test/cover.png"],`
	`49`	`+mediaUrls: [`
	`50`	`+"/tmp/song.mp3",`
	`51`	`+"https://example.test/cover.png",`
	`52`	`+"/tmp/stems.zip",`
	`53`	`+"https://example.test/stems.zip",`
	`54`	`+],`
`48`	`55`	`});`
`49`	`56`	`});`
`50`	`57`

Original file line number	Diff line number	Diff line change
`@@ -379,10 +379,12 @@ function collectStructuredMediaUrls(media: Record<string, unknown>): string[] {`
`379`	`379`	`return;`
`380`	`380`	`}`
`381`	`381`	`const attachment = value as Record<string, unknown>;`
	`382`	`+pushString(attachment.media);`
`382`	`383`	`pushString(attachment.path);`
`383`	`384`	`pushString(attachment.url);`
`384`	`385`	`pushString(attachment.mediaUrl);`
`385`	`386`	`pushString(attachment.filePath);`
	`387`	`+pushString(attachment.fileUrl);`
`386`	`388`	`};`
`387`	`389`	`if (typeof media.mediaUrl === "string" && media.mediaUrl.trim()) {`
`388`	`390`	`urls.push(media.mediaUrl.trim());`

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

推荐订阅源

Recent Commits to openclaw:main

File tree