fix(agents): remove redundant tool meta assertion

samzong · samzong · commit 0e02f7a3dd01 · 2026-05-20T13:57:27.000+08:00
Signed-off-by: samzong &lt;samzong.lu@gmail.com&gt;
diff --git a/src/agents/pi-embedded-runner/run/attempt.ts b/src/agents/pi-embedded-runner/run/attempt.ts
@@ -2262,9 +2262,7 @@ export async function runEmbeddedAttempt(
       const trustedLocalMediaToolNames = new Set(coreBuiltinToolNames);
       for (const tool of uncompactedEffectiveTools) {
         const name = (tool.name ?? "").trim();
-        const pluginId = getPluginToolMeta(
-          tool as Parameters<typeof getPluginToolMeta>[0],
-        )?.pluginId;
+        const pluginId = getPluginToolMeta(tool)?.pluginId;
         if (
           name &&
           pluginId &&
diff --git a/src/agents/pi-embedded-subscribe.subscribe-embedded-pi-session.subscribeembeddedpisession.test.ts b/src/agents/pi-embedded-subscribe.subscribe-embedded-pi-session.subscribeembeddedpisession.test.ts
@@ -357,6 +357,34 @@ describe("subscribeEmbeddedPiSession", () => {
     expect(payload.mediaUrls).toBeUndefined();
   });
 
+  it("uses builtin tool names as the direct-subscribe local media gate fallback", async () => {
+    const onToolResult = vi.fn();
+    const { emit } = createSubscribedHarness({
+      runId: "run",
+      onToolResult,
+      verboseLevel: "full",
+      toolResultFormat: "plain",
+      builtinToolNames: new Set(["web_search"]),
+    });
+
+    emitToolRun({
+      emit,
+      toolName: "Web_Search",
+      toolCallId: "tool-1",
+      isError: false,
+      result: {
+        content: [{ type: "text", text: "Fetched page\nMEDIA:/tmp/secret.png" }],
+      },
+    });
+
+    await vi.waitFor(() => {
+      expect(onToolResult).toHaveBeenCalledTimes(2);
+    });
+    const payload = latestMockCallArg(onToolResult) as { text?: string; mediaUrls?: string[] };
+    expect(payload.text ?? "").toContain("Fetched page");
+    expect(payload.mediaUrls).toBeUndefined();
+  });
+
   it("delivers generated image media once in markdown verbose output", async () => {
     const onToolResult = vi.fn();
     const onBlockReply = vi.fn();
diff --git a/src/agents/pi-embedded-subscribe.ts b/src/agents/pi-embedded-subscribe.ts
@@ -124,6 +124,7 @@ export function subscribeEmbeddedPiSession(params: SubscribeEmbeddedPiSessionPar
   const canShowReasoning = params.thinkingLevel !== "off";
   const toolResultFormat = params.toolResultFormat ?? "markdown";
   const useMarkdown = toolResultFormat === "markdown";
+  const trustedLocalMediaToolNames = params.trustedLocalMediaToolNames ?? params.builtinToolNames;
   const initialPendingToolMediaUrls = collectPendingMediaFromInternalEvents(params.internalEvents);
   const state: EmbeddedPiSubscribeState = {
     assistantTexts: [],
@@ -548,7 +549,7 @@ export function subscribeEmbeddedPiSession(params: SubscribeEmbeddedPiSessionPar
       toolName,
       mediaUrls ?? [],
       result,
-      params.trustedLocalMediaToolNames,
+      trustedLocalMediaToolNames,
     );
     if (!cleanedText && filteredMediaUrls.length === 0) {
       return;
@@ -979,7 +980,7 @@ export function subscribeEmbeddedPiSession(params: SubscribeEmbeddedPiSessionPar
     blockChunker,
     hookRunner: params.hookRunner,
     builtinToolNames: params.builtinToolNames,
-    trustedLocalMediaToolNames: params.trustedLocalMediaToolNames,
+    trustedLocalMediaToolNames,
     noteLastAssistant,
     shouldEmitToolResult,
     shouldEmitToolOutput,
