talon-agent 1.3.0 → 1.4.0

package/src/__tests__/gateway-actions.test.ts

@@ -125,9 +125,6 @@ describe("gateway shared actions", () => {
     originalFetch = globalThis.fetch;
     originalEnv = { ...process.env };
     vi.clearAllMocks();
-    // Reset env vars used by web_search
-    delete process.env.TALON_BRAVE_API_KEY;
-    delete process.env.TALON_SEARXNG_URL;
   });
 
   afterEach(() => {
@@ -276,377 +273,6 @@ describe("gateway shared actions", () => {
     });
   });
 
-  // ════════════════════════════════════════════════════════════════════════
-  // web_search
-  // ════════════════════════════════════════════════════════════════════════
-
-  describe("web_search", () => {
-    it("returns error for missing query", async () => {
-      const result = await handleSharedAction({ action: "web_search" }, 123);
-      expect(result).toEqual({ ok: false, error: "Missing query" });
-    });
-
-    it("returns error for empty query string", async () => {
-      const result = await handleSharedAction(
-        { action: "web_search", query: "" },
-        123,
-      );
-      expect(result).toEqual({ ok: false, error: "Missing query" });
-    });
-
-    it("uses Brave API when key is configured", async () => {
-      process.env.TALON_BRAVE_API_KEY = "test-brave-key";
-      const mockFetch = vi.fn().mockResolvedValueOnce(
-        mockResponse({
-          ok: true,
-          contentType: "application/json",
-          json: {
-            web: {
-              results: [
-                {
-                  title: "Result 1",
-                  url: "https://example.com/1",
-                  description: "Description 1",
-                },
-                {
-                  title: "Result 2",
-                  url: "https://example.com/2",
-                  description: "Description 2",
-                },
-              ],
-            },
-          },
-        }),
-      );
-      vi.stubGlobal("fetch", mockFetch);
-
-      const result = await handleSharedAction(
-        { action: "web_search", query: "test query" },
-        123,
-      );
-
-      expect(result?.ok).toBe(true);
-      expect(result?.text).toContain("via Brave");
-      expect(result?.text).toContain("Result 1");
-      expect(result?.text).toContain("https://example.com/1");
-      expect(result?.text).toContain("Description 1");
-      expect(result?.text).toContain("Result 2");
-
-      // Verify Brave API was called correctly
-      expect(mockFetch).toHaveBeenCalledTimes(1);
-      const [url, opts] = mockFetch.mock.calls[0];
-      expect(url).toContain("api.search.brave.com");
-      expect(url).toContain("q=test%20query");
-      expect(url).toContain("count=5");
-      expect(opts.headers["X-Subscription-Token"]).toBe("test-brave-key");
-    });
-
-    it("respects custom limit for Brave API", async () => {
-      process.env.TALON_BRAVE_API_KEY = "test-brave-key";
-      const mockFetch = vi.fn().mockResolvedValueOnce(
-        mockResponse({
-          ok: true,
-          json: {
-            web: {
-              results: [{ title: "R", url: "https://r.com", description: "d" }],
-            },
-          },
-        }),
-      );
-      vi.stubGlobal("fetch", mockFetch);
-
-      await handleSharedAction(
-        { action: "web_search", query: "test", limit: 8 },
-        123,
-      );
-      const [url] = mockFetch.mock.calls[0];
-      expect(url).toContain("count=8");
-    });
-
-    it("clamps search limit to 10", async () => {
-      process.env.TALON_BRAVE_API_KEY = "test-brave-key";
-      const mockFetch = vi.fn().mockResolvedValueOnce(
-        mockResponse({
-          ok: true,
-          json: {
-            web: {
-              results: [{ title: "R", url: "https://r.com", description: "d" }],
-            },
-          },
-        }),
-      );
-      vi.stubGlobal("fetch", mockFetch);
-
-      await handleSharedAction(
-        { action: "web_search", query: "test", limit: 50 },
-        123,
-      );
-      const [url] = mockFetch.mock.calls[0];
-      expect(url).toContain("count=10");
-    });
-
-    it("falls back to SearXNG when Brave returns non-ok", async () => {
-      process.env.TALON_BRAVE_API_KEY = "test-brave-key";
-      const mockFetch = vi
-        .fn()
-        .mockResolvedValueOnce(mockResponse({ ok: false, status: 429 })) // Brave fails
-        .mockResolvedValueOnce(
-          mockResponse({
-            ok: true,
-            json: {
-              results: [
-                {
-                  title: "SearX Result",
-                  url: "https://searx.example.com",
-                  content: "SearX snippet",
-                },
-              ],
-            },
-          }),
-        );
-      vi.stubGlobal("fetch", mockFetch);
-
-      const result = await handleSharedAction(
-        { action: "web_search", query: "fallback test" },
-        123,
-      );
-
-      expect(mockFetch).toHaveBeenCalledTimes(2);
-      expect(result?.ok).toBe(true);
-      expect(result?.text).toContain("via SearXNG");
-      expect(result?.text).toContain("SearX Result");
-    });
-
-    it("falls back to SearXNG when Brave throws an error", async () => {
-      process.env.TALON_BRAVE_API_KEY = "test-brave-key";
-      const mockFetch = vi
-        .fn()
-        .mockRejectedValueOnce(new Error("network error")) // Brave throws
-        .mockResolvedValueOnce(
-          mockResponse({
-            ok: true,
-            json: {
-              results: [
-                {
-                  title: "Fallback",
-                  url: "https://fb.com",
-                  content: "snippet",
-                },
-              ],
-            },
-          }),
-        );
-      vi.stubGlobal("fetch", mockFetch);
-
-      const result = await handleSharedAction(
-        { action: "web_search", query: "test" },
-        123,
-      );
-
-      expect(result?.ok).toBe(true);
-      expect(result?.text).toContain("via SearXNG");
-    });
-
-    it("uses SearXNG directly when no Brave key", async () => {
-      // No TALON_BRAVE_API_KEY set
-      const mockFetch = vi.fn().mockResolvedValueOnce(
-        mockResponse({
-          ok: true,
-          json: {
-            results: [
-              {
-                title: "Direct SearX",
-                url: "https://searx.com/r",
-                content: "content here",
-              },
-            ],
-          },
-        }),
-      );
-      vi.stubGlobal("fetch", mockFetch);
-
-      const result = await handleSharedAction(
-        { action: "web_search", query: "direct" },
-        123,
-      );
-
-      expect(mockFetch).toHaveBeenCalledTimes(1);
-      const [url] = mockFetch.mock.calls[0];
-      expect(url).toContain("localhost:8080");
-      expect(url).toContain("format=json");
-      expect(result?.ok).toBe(true);
-      expect(result?.text).toContain("via SearXNG");
-    });
-
-    it("uses custom SearXNG URL from env", async () => {
-      process.env.TALON_SEARXNG_URL = "http://my-searx:9090";
-      const mockFetch = vi.fn().mockResolvedValueOnce(
-        mockResponse({
-          ok: true,
-          json: {
-            results: [{ title: "T", url: "https://t.com", content: "c" }],
-          },
-        }),
-      );
-      vi.stubGlobal("fetch", mockFetch);
-
-      await handleSharedAction({ action: "web_search", query: "custom" }, 123);
-
-      const [url] = mockFetch.mock.calls[0];
-      expect(url).toContain("my-searx:9090");
-    });
-
-    it("returns 'no results' when both providers fail", async () => {
-      process.env.TALON_BRAVE_API_KEY = "test-key";
-      const mockFetch = vi
-        .fn()
-        .mockRejectedValueOnce(new Error("brave fail"))
-        .mockRejectedValueOnce(new Error("searx fail"));
-      vi.stubGlobal("fetch", mockFetch);
-
-      const result = await handleSharedAction(
-        { action: "web_search", query: "nothing" },
-        123,
-      );
-
-      expect(result?.ok).toBe(true);
-      expect(result?.text).toBe('No results for "nothing".');
-    });
-
-    it("returns 'no results' when both return non-ok", async () => {
-      process.env.TALON_BRAVE_API_KEY = "test-key";
-      const mockFetch = vi
-        .fn()
-        .mockResolvedValueOnce(mockResponse({ ok: false, status: 500 }))
-        .mockResolvedValueOnce(mockResponse({ ok: false, status: 503 }));
-      vi.stubGlobal("fetch", mockFetch);
-
-      const result = await handleSharedAction(
-        { action: "web_search", query: "failing" },
-        123,
-      );
-
-      expect(result?.ok).toBe(true);
-      expect(result?.text).toBe('No results for "failing".');
-    });
-
-    it("returns 'no results' when Brave returns empty results array", async () => {
-      process.env.TALON_BRAVE_API_KEY = "test-key";
-      const mockFetch = vi
-        .fn()
-        .mockResolvedValueOnce(
-          mockResponse({ ok: true, json: { web: { results: [] } } }),
-        )
-        .mockResolvedValueOnce(
-          mockResponse({ ok: true, json: { results: [] } }),
-        );
-      vi.stubGlobal("fetch", mockFetch);
-
-      const result = await handleSharedAction(
-        { action: "web_search", query: "empty" },
-        123,
-      );
-
-      expect(result?.ok).toBe(true);
-      expect(result?.text).toBe('No results for "empty".');
-    });
-
-    it("handles Brave response with missing web field", async () => {
-      process.env.TALON_BRAVE_API_KEY = "test-key";
-      const mockFetch = vi
-        .fn()
-        .mockResolvedValueOnce(mockResponse({ ok: true, json: {} })) // no web field
-        .mockResolvedValueOnce(
-          mockResponse({
-            ok: true,
-            json: {
-              results: [
-                { title: "FallbackR", url: "https://f.com", content: "fb" },
-              ],
-            },
-          }),
-        );
-      vi.stubGlobal("fetch", mockFetch);
-
-      const result = await handleSharedAction(
-        { action: "web_search", query: "test" },
-        123,
-      );
-      expect(result?.text).toContain("via SearXNG");
-    });
-
-    it("truncates long snippets to 200 chars", async () => {
-      process.env.TALON_BRAVE_API_KEY = "test-key";
-      const longDesc = "A".repeat(500);
-      const mockFetch = vi.fn().mockResolvedValueOnce(
-        mockResponse({
-          ok: true,
-          json: {
-            web: {
-              results: [
-                { title: "Long", url: "https://l.com", description: longDesc },
-              ],
-            },
-          },
-        }),
-      );
-      vi.stubGlobal("fetch", mockFetch);
-
-      const result = await handleSharedAction(
-        { action: "web_search", query: "long" },
-        123,
-      );
-      // The snippet should be sliced to 200 chars
-      expect(result?.text).not.toContain("A".repeat(201));
-      expect(result?.text).toContain("A".repeat(200));
-    });
-
-    it("handles missing description in Brave results", async () => {
-      process.env.TALON_BRAVE_API_KEY = "test-key";
-      const mockFetch = vi.fn().mockResolvedValueOnce(
-        mockResponse({
-          ok: true,
-          json: {
-            web: { results: [{ title: "NoDesc", url: "https://nd.com" }] },
-          },
-        }),
-      );
-      vi.stubGlobal("fetch", mockFetch);
-
-      const result = await handleSharedAction(
-        { action: "web_search", query: "nodesc" },
-        123,
-      );
-      expect(result?.ok).toBe(true);
-      expect(result?.text).toContain("NoDesc");
-    });
-
-    it("slices SearXNG results to limit", async () => {
-      const mockFetch = vi.fn().mockResolvedValueOnce(
-        mockResponse({
-          ok: true,
-          json: {
-            results: Array.from({ length: 20 }, (_, i) => ({
-              title: `R${i}`,
-              url: `https://r${i}.com`,
-              content: `c${i}`,
-            })),
-          },
-        }),
-      );
-      vi.stubGlobal("fetch", mockFetch);
-
-      const result = await handleSharedAction(
-        { action: "web_search", query: "many", limit: 3 },
-        123,
-      );
-      // Should only contain 3 results (numbered 1-3)
-      expect(result?.text).toContain("1. R0");
-      expect(result?.text).toContain("3. R2");
-      expect(result?.text).not.toContain("4. R3");
-    });
-  });
-
   // ════════════════════════════════════════════════════════════════════════
   // fetch_url
   // ════════════════════════════════════════════════════════════════════════
@@ -2082,14 +1708,13 @@ describe("gateway shared actions", () => {
   });
 });
 
-// ── Additional branch coverage for fetch_url and web_search ──────────────
+// ── Additional branch coverage for fetch_url ──────────────────────────────
 
 describe("gateway-actions — additional branch coverage", () => {
   let originalFetch: typeof globalThis.fetch;
 
   beforeEach(() => {
     originalFetch = globalThis.fetch;
-    delete process.env.TALON_BRAVE_API_KEY;
   });
 
   afterEach(() => {
@@ -2144,51 +1769,4 @@ describe("gateway-actions — additional branch coverage", () => {
     // Should succeed (downloaded as bin), covering ct ?? "" right side and ct.split("/")[1] ?? "file" right side
     expect(result?.ok).toBe(true);
   });
-
-  it("handles search result with missing content field (line 113 r.content ?? '' branch)", async () => {
-    const mockFetch = vi.fn().mockResolvedValueOnce({
-      ok: true,
-      status: 200,
-      headers: new Headers(),
-      json: async () => ({
-        results: [
-          { title: "Result", url: "https://example.com", content: undefined },
-        ],
-      }),
-      text: async () => "",
-      arrayBuffer: async () => new ArrayBuffer(0),
-    } as unknown as Response);
-    vi.stubGlobal("fetch", mockFetch);
-    process.env.TALON_SEARXNG_URL = "http://localhost:8080";
-
-    const result = await handleSharedAction(
-      { action: "web_search", query: "test" },
-      123,
-    );
-    expect(result?.ok).toBe(true);
-    // snippet should be "" (from ?? "")
-    expect(result?.text).toBeDefined();
-  });
-
-  it("handles search response with no results array (line 113 data.results ?? [] branch)", async () => {
-    const mockFetch = vi.fn().mockResolvedValueOnce({
-      ok: true,
-      status: 200,
-      headers: new Headers(),
-      json: async () => ({
-        /* no results property */
-      }),
-      text: async () => "",
-      arrayBuffer: async () => new ArrayBuffer(0),
-    } as unknown as Response);
-    vi.stubGlobal("fetch", mockFetch);
-    process.env.TALON_SEARXNG_URL = "http://localhost:8080";
-
-    const result = await handleSharedAction(
-      { action: "web_search", query: "empty" },
-      123,
-    );
-    expect(result?.ok).toBe(true);
-    expect(result?.text).toContain("No results for");
-  });
 });

package/src/backend/claude-sdk/index.ts

@@ -9,7 +9,6 @@ import {
   setSessionName,
 } from "../../storage/sessions.js";
 import { getChatSettings, setChatModel } from "../../storage/chat-settings.js";
-import { getRecentHistory } from "../../storage/history.js";
 import { resolve } from "node:path";
 import { classify } from "../../core/errors.js";
 import {
@@ -19,7 +18,7 @@ import {
 import { rebuildSystemPrompt } from "../../util/config.js";
 import { log, logError, logWarn } from "../../util/log.js";
 import { traceMessage } from "../../util/trace.js";
-import { formatSmartTimestamp, formatFullDatetime } from "../../util/time.js";
+import { formatFullDatetime } from "../../util/time.js";
 
 import type { QueryParams, QueryResult } from "../../core/types.js";
 
@@ -115,66 +114,68 @@ export async function handleMessage(
       "TaskOutput",
       "TaskStop",
       "AskUserQuestion",
+      // Always disable Claude Code built-in web tools — fetch_url is always
+      // available, and Brave Search MCP replaces WebSearch when configured.
+      "WebSearch",
+      "WebFetch",
     ],
     ...thinkingConfig,
     mcpServers: {
-      // Register frontend-specific MCP tools based on active frontend
+      // Register unified MCP tools server — one per messaging frontend.
+      // Terminal frontend relies on Claude Code built-in tools (Read, Write,
+      // Bash, etc.) and doesn't need a custom MCP tools server.
       ...(() => {
-        const frontends = Array.isArray(config.frontend)
+        const allFrontends = Array.isArray(config.frontend)
           ? config.frontend
           : [config.frontend];
+        const frontends = allFrontends.filter((f) => f !== "terminal");
         const bridgeUrl = `http://127.0.0.1:${bridgePortFn()}`;
-        const mcpEnv = { TALON_BRIDGE_URL: bridgeUrl, TALON_CHAT_ID: chatId };
         const servers: Record<
           string,
           { command: string; args: string[]; env: Record<string, string> }
         > = {};
-        // Resolve tsx from Talon's node_modules (cwd may be ~/.talon/workspace/ which has no node_modules)
         // Resolve tsx from the package root (3 levels up from src/backend/claude-sdk/)
         const tsxImport = resolve(
           import.meta.dirname ?? ".",
           "../../../node_modules/tsx/dist/esm/index.mjs",
         );
+        // Unified MCP server in core/tools/
+        const mcpServerPath = resolve(
+          import.meta.dirname ?? ".",
+          "../../core/tools/mcp-server.ts",
+        );
 
-        if (frontends.includes("telegram")) {
-          servers["telegram-tools"] = {
-            command: process.platform === "win32" ? "npx" : "node",
-            args:
-              process.platform === "win32"
-                ? ["tsx", resolve(import.meta.dirname ?? ".", "tools.ts")]
-                : [
-                    "--import",
-                    tsxImport,
-                    resolve(import.meta.dirname ?? ".", "tools.ts"),
-                  ],
-            env: mcpEnv,
+        for (const frontend of frontends) {
+          const serverName = `${frontend}-tools`;
+          const mcpEnv = {
+            TALON_BRIDGE_URL: bridgeUrl,
+            TALON_CHAT_ID: chatId,
+            TALON_FRONTEND: frontend,
           };
-        }
-        if (frontends.includes("teams")) {
-          servers["teams-tools"] = {
+          servers[serverName] = {
             command: process.platform === "win32" ? "npx" : "node",
             args:
               process.platform === "win32"
-                ? [
-                    "tsx",
-                    resolve(
-                      import.meta.dirname ?? ".",
-                      "../../frontend/teams/tools.ts",
-                    ),
-                  ]
-                : [
-                    "--import",
-                    tsxImport,
-                    resolve(
-                      import.meta.dirname ?? ".",
-                      "../../frontend/teams/tools.ts",
-                    ),
-                  ],
+                ? ["tsx", mcpServerPath]
+                : ["--import", tsxImport, mcpServerPath],
             env: mcpEnv,
           };
         }
         return servers;
       })(),
+      // Brave Search MCP server — provides brave_web_search and brave_local_search
+      ...(config.braveApiKey
+        ? {
+            "brave-search": {
+              command: resolve(
+                import.meta.dirname ?? ".",
+                "../../../node_modules/.bin/brave-search-mcp-server",
+              ),
+              args: [],
+              env: { BRAVE_API_KEY: config.braveApiKey },
+            },
+          }
+        : {}),
       ...getPluginMcpServers(`http://127.0.0.1:${bridgePortFn()}`, chatId),
     },
     ...(session.sessionId ? { resume: session.sessionId } : {}),
@@ -183,25 +184,9 @@ export async function handleMessage(
   const msgIdHint = params.messageId ? ` [msg_id:${params.messageId}]` : "";
   const nowTag = `[${formatFullDatetime()}]`;
 
-  // Session continuity: when resuming a session that has history but no active
-  // SDK session (after restart or /resume), prepend recent messages for context.
-  let continuityPrefix = "";
-  if (!session.sessionId && session.turns > 0) {
-    const recentMsgs = getRecentHistory(chatId, 10);
-    if (recentMsgs.length > 0) {
-      const contextLines = recentMsgs
-        .map((m) => {
-          const time = formatSmartTimestamp(m.timestamp);
-          return `[${time}] ${m.senderName}: ${m.text.slice(0, 300)}`;
-        })
-        .join("\n");
-      continuityPrefix = `[Session resumed — recent conversation context:\n${contextLines}]\n\n`;
-    }
-  }
-
   const prompt = isGroup
-    ? `${continuityPrefix}${nowTag} [${senderName}]${msgIdHint}: ${text}`
-    : `${continuityPrefix}${nowTag}${msgIdHint} ${text}`;
+    ? `${nowTag} [${senderName}]${msgIdHint}: ${text}`
+    : `${nowTag}${msgIdHint} ${text}`;
   log("agent", `[${chatId}] <- (${text.length} chars)`);
   traceMessage(chatId, "in", text, { senderName, isGroup });
 

package/src/backend/opencode/index.ts

@@ -17,7 +17,6 @@ import {
   resetSession,
 } from "../../storage/sessions.js";
 import { getChatSettings } from "../../storage/chat-settings.js";
-import { getRecentHistory } from "../../storage/history.js";
 import { classify } from "../../core/errors.js";
 import { log, logError, logWarn } from "../../util/log.js";
 import { traceMessage } from "../../util/trace.js";
@@ -53,7 +52,7 @@ async function ensureServer(): Promise<OpencodeClient> {
 
   // Register our MCP tools server with OpenCode
   try {
-    const toolsPath = new URL("../claude-sdk/tools.ts", import.meta.url)
+    const toolsPath = new URL("../../core/tools/mcp-server.ts", import.meta.url)
       .pathname;
     await client.mcp.add({
       body: {
@@ -63,6 +62,7 @@ async function ensureServer(): Promise<OpencodeClient> {
           command: ["node", "--import", "tsx", toolsPath],
           environment: {
             TALON_BRIDGE_URL: `http://127.0.0.1:${gatewayPortFn()}`,
+            TALON_FRONTEND: "telegram",
           },
         },
       },
@@ -149,24 +149,9 @@ export async function handleMessage(
 
   // Build prompt with group context
   const msgIdHint = params.messageId ? ` [msg_id:${params.messageId}]` : "";
-  let continuityPrefix = "";
-  const session = getSession(chatId);
-  if (!session.sessionId && session.turns > 0) {
-    const recent = getRecentHistory(chatId, 3);
-    if (recent.length > 0) {
-      const ctx = recent
-        .map(
-          (m) =>
-            `[${new Date(m.timestamp).toISOString().slice(11, 16)}] ${m.senderName}: ${m.text.slice(0, 300)}`,
-        )
-        .join("\n");
-      continuityPrefix = `[Session resumed — recent context:\n${ctx}]\n\n`;
-    }
-  }
-
   const prompt = isGroup
-    ? `${continuityPrefix}[${senderName}]${msgIdHint}: ${text}`
-    : `${continuityPrefix}${text}${msgIdHint}`;
+    ? `[${senderName}]${msgIdHint}: ${text}`
+    : `${text}${msgIdHint}`;
 
   log("agent", `[${chatId}] <- (${text.length} chars)`);
   traceMessage(chatId, "in", text, { senderName, isGroup });
@@ -211,7 +196,7 @@ export async function handleMessage(
       model: activeModel,
     });
 
-    if (session.turns === 0 && text) {
+    if (getSession(chatId).turns === 0 && text) {
       const cleanText = text
         .replace(/^\[.*?\]\s*/g, "")
         .replace(/\[msg_id:\d+\]\s*/g, "")