@iinm/plain-agent 1.1.0 → 1.2.1

package/.config/config.predefined.json

@@ -701,6 +701,21 @@
         }
       }
     },
+    {
+      "name": "glm-5",
+      "variant": "bedrock",
+      "platform": {
+        "name": "bedrock",
+        "variant": "default"
+      },
+      "model": {
+        "format": "openai-messages",
+        "config": {
+          "model": "zai.glm-5",
+          "reasoning_effort": "high"
+        }
+      }
+    },
     {
       "name": "glm-5",
       "variant": "ollama",

package/README.md

@@ -87,19 +87,33 @@ Create the configuration.
 
   // Optional
   "tools": {
-    "askGoogle": {
-      "model": "gemini-3-flash-preview",
-
-      // Google AI Studio
-      "apiKey": "FIXME"
+    "askWeb": {
+      "provider": "gemini",
+      "apiKey": "FIXME",
+      "model": "gemini-3-flash-preview"
+      // Optional
+      // "baseURL": "<proxy_url>"
 
       // Or use Vertex AI (Requires gcloud CLI to get authentication token)
-      // "platform": "vertex-ai",
+      // "provider": "gemini-vertex-ai",
       // "baseURL": "https://aiplatform.googleapis.com/v1beta1/projects/<project_id>/locations/<location>",
+      // "model": "gemini-3-flash-preview"
+      // Optional:
+      // "account": "<service_account_email>"
     },
 
-    "searchWeb": {
-      "tavilyApiKey": "FIXME"
+    "askURL": {
+      "provider": "gemini",
+      "apiKey": "FIXME"
+      // Optional
+      // "baseURL": "<proxy_url>"
+
+      // Or use Vertex AI (Requires gcloud CLI to get authentication token)
+      // "provider": "gemini-vertex-ai",
+      // "baseURL": "https://aiplatform.googleapis.com/v1beta1/projects/<project_id>/locations/<location>",
+      // "model": "gemini-3-flash-preview"
+      // Optional:
+      // "account": "<service_account_email>"
     }
   },
 
@@ -173,9 +187,8 @@ The agent can use the following tools to assist with tasks:
 - **write_file**: Write a file.
 - **patch_file**: Patch a file.
 - **tmux_command**: Run a tmux command.
-- **fetch_web_page**: Fetch and extract web page content from a given URL, returning it as Markdown.
-- **ask_google**: Ask Google a question using natural language (requires Google API key or Vertex AI configuration).
-- **search_web**: Search the web for information (requires Tavily API key).
+- **ask_web**: Use the web search to answer questions that need up-to-date information or supporting sources. (requires Google API key or Vertex AI configuration).
+- **ask_url**: Use one or more provided URLs to answer a question. Include the URLs in your question. (requires Google API key or Vertex AI configuration).
 - **delegate_to_subagent**: Delegate a subtask to a subagent. The agent switches to a subagent role within the same conversation, focusing on the specified goal.
 - **report_as_subagent**: Report completion and return to the main agent. Used by subagents to communicate results and restore the main agent role. After reporting, the subagent's conversation history is removed from the context.
 
@@ -218,12 +231,6 @@ The agent loads configuration files in the following order. Settings in later fi
     "defaultAction": "deny",
     "maxApprovals": 100,
     "patterns": [
-      // Prohibit direct access to external URLs (even GET requests can leak data via URL parameters)
-      {
-        "toolName": "fetch_web_page",
-        "action": "deny",
-        "reason": "Use ask_google instead"
-      },
       {
         "toolName": { "$regex": "^(write_file|patch_file)$" },
         "action": "allow"
@@ -233,11 +240,10 @@ The agent loads configuration files in the following order. Settings in later fi
         "action": "allow"
       },
       {
-        "toolName": "ask_google",
+        "toolName": { "$regex": "^(ask_web|ask_url)$" },
         "action": "allow"
       }
-
-      // ⚠️ Never do this. fetch_web_page and mcp run outside the sandbox, so they can send anything externally.
+      // ⚠️ Never do this. mcp run outside the sandbox, so they can send anything externally.
       // {
       //   "toolName": { "$regex": "." },
       //   "action": "allow"
@@ -269,6 +275,7 @@ The agent loads configuration files in the following order. Settings in later fi
 ```js
 {
   "autoApproval": {
+    "defaultAction": "ask",
     // The maximum number of automatic approvals.
     "maxApprovals": 50,
     // Patterns are evaluated in order. First match wins.
@@ -290,8 +297,9 @@ The agent loads configuration files in the following order. Settings in later fi
         "input": { "command": "npm", "args": ["run", { "$regex": "^(check|test|lint|fix)$" }] },
         "action": "allow"
       },
+
       {
-        "toolName": "ask_google",
+        "toolName": { "$regex": "^(ask_web|ask_url)$" },
         "action": "allow"
       },
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iinm/plain-agent",
-  "version": "1.1.0",
+  "version": "1.2.1",
   "description": "A lightweight CLI-based coding agent",
   "license": "MIT",
   "type": "module",
@@ -37,21 +37,17 @@
   "dependencies": {
     "@aws-crypto/sha256-js": "^5.2.0",
     "@aws-sdk/credential-providers": "^3.1001.0",
-    "@modelcontextprotocol/sdk": "^1.27.1",
-    "@mozilla/readability": "^0.6.0",
+    "@cfworker/json-schema": "^4.1.1",
+    "@modelcontextprotocol/client": "^2.0.0-alpha.2",
     "@smithy/protocol-http": "^5.3.10",
     "@smithy/signature-v4": "^5.3.10",
     "diff": "^8.0.3",
-    "js-yaml": "^4.1.1",
-    "jsdom": "^28.1.0",
-    "turndown": "^7.2.2"
+    "js-yaml": "^4.1.1"
   },
   "devDependencies": {
     "@biomejs/biome": "^2.4.5",
     "@types/js-yaml": "^4.0.9",
-    "@types/jsdom": "^28.0.0",
     "@types/node": "^22.19.13",
-    "@types/turndown": "^5.0.6",
     "typescript": "^5.9.3"
   }
 }

package/src/cliFormatter.mjs

@@ -4,7 +4,6 @@
  * @import { PatchFileInput } from "./tools/patchFile"
  * @import { WriteFileInput } from "./tools/writeFile"
  * @import { TmuxCommandInput } from "./tools/tmuxCommand"
- * @import { TavilySearchInput } from "./tools/tavilySearch"
  * @import { DelegateToSubagentInput } from "./tools/delegateToSubagent"
  */
 
@@ -86,14 +85,6 @@ export function formatToolUse(toolUse) {
     ].join("\n");
   }
 
-  if (toolName === "search_web") {
-    /** @type {Partial<TavilySearchInput>} */
-    const tavilySearchInput = input;
-    return [`tool: ${toolName}`, `query: ${tavilySearchInput.query}`].join(
-      "\n",
-    );
-  }
-
   if (toolName === "delegate_to_subagent") {
     /** @type {Partial<DelegateToSubagentInput>} */
     const delegateInput = input;

package/src/config.d.ts

@@ -1,5 +1,7 @@
 import { ModelDefinition, PlatformConfig } from "./modelDefinition";
 import { ToolUsePattern } from "./tool";
+import { AskURLToolOptions } from "./tools/askURL.mjs";
+import { AskWebToolOptions } from "./tools/askWeb.mjs";
 import { ExecCommandSanboxConfig } from "./tools/execCommand";
 
 export type ClaudeCodePluginConfig = {
@@ -18,20 +20,8 @@ export type AppConfig = {
   };
   sandbox?: ExecCommandSanboxConfig;
   tools?: {
-    /**
-     * - Vertex AI: requires baseURL and account
-     * - AI Studio: requires apiKey
-     */
-    askGoogle?: {
-      platform?: "vertex-ai";
-      baseURL?: string;
-      account?: string;
-      apiKey?: string;
-      model?: string;
-    };
-    searchWeb?: {
-      tavilyApiKey?: string;
-    };
+    askWeb?: AskWebToolOptions;
+    askURL?: AskURLToolOptions;
   };
   mcpServers?: Record<string, MCPServerConfig>;
   notifyCmd?: string;

package/src/config.mjs

@@ -76,14 +76,18 @@ export async function loadAppConfig(options = {}) {
       },
       sandbox: config.sandbox ?? merged.sandbox,
       tools: {
-        searchWeb: {
-          ...(merged.tools?.searchWeb ?? {}),
-          ...(config.tools?.searchWeb ?? {}),
-        },
-        askGoogle: {
-          ...(merged.tools?.askGoogle ?? {}),
-          ...(config.tools?.askGoogle ?? {}),
-        },
+        askWeb: config.tools?.askWeb
+          ? {
+              ...(merged.tools?.askWeb ?? {}),
+              ...config.tools.askWeb,
+            }
+          : merged.tools?.askWeb,
+        askURL: config.tools?.askURL
+          ? {
+              ...(merged.tools?.askURL ?? {}),
+              ...config.tools.askURL,
+            }
+          : merged.tools?.askWeb,
       },
       mcpServers: {
         ...(merged.mcpServers ?? {}),

package/src/main.mjs

@@ -18,13 +18,12 @@ import {
 import { setupMCPServer } from "./mcp.mjs";
 import { createModelCaller } from "./modelCaller.mjs";
 import { createPrompt } from "./prompt.mjs";
-import { createAskGoogleTool } from "./tools/askGoogle.mjs";
+import { createAskURLTool } from "./tools/askURL.mjs";
+import { createAskWebTool } from "./tools/askWeb.mjs";
 import { createDelegateToSubagentTool } from "./tools/delegateToSubagent.mjs";
 import { createExecCommandTool } from "./tools/execCommand.mjs";
-import { fetchWebPageTool } from "./tools/fetchWebPage.mjs";
 import { patchFileTool } from "./tools/patchFile.mjs";
 import { createReportAsSubagentTool } from "./tools/reportAsSubagent.mjs";
-import { createTavilySearchTool } from "./tools/tavilySearch.mjs";
 import { createTmuxCommandTool } from "./tools/tmuxCommand.mjs";
 import { writeFileTool } from "./tools/writeFile.mjs";
 import { createToolUseApprover } from "./toolUseApprover.mjs";
@@ -142,23 +141,16 @@ if (cliArgs.listModels) {
     writeFileTool,
     patchFileTool,
     createTmuxCommandTool({ sandbox: appConfig.sandbox }),
-    fetchWebPageTool,
     createDelegateToSubagentTool(),
     createReportAsSubagentTool(),
   ];
 
-  if (appConfig.tools?.searchWeb?.tavilyApiKey) {
-    builtinTools.push(createTavilySearchTool(appConfig.tools.searchWeb));
+  if (appConfig.tools?.askWeb) {
+    builtinTools.push(createAskWebTool(appConfig.tools.askWeb));
   }
 
-  if (appConfig.tools?.askGoogle) {
-    builtinTools.push(
-      createAskGoogleTool({
-        platform: appConfig.tools.askGoogle.platform,
-        baseURL: appConfig.tools.askGoogle.baseURL,
-        apiKey: appConfig.tools.askGoogle.apiKey,
-      }),
-    );
+  if (appConfig.tools?.askURL) {
+    builtinTools.push(createAskURLTool(appConfig.tools.askURL));
   }
 
   const toolUseApprover = createToolUseApprover({

package/src/mcp.mjs

@@ -1,12 +1,11 @@
 /**
- * @import { Client } from "@modelcontextprotocol/sdk/client/index.js";
- * @import { StdioServerParameters } from "@modelcontextprotocol/sdk/client/stdio.js";
  * @import { StructuredToolResultContent, Tool, ToolImplementation } from "./tool";
  * @import { MCPServerConfig } from "./config";
  */
 
 import { mkdir, open } from "node:fs/promises";
 import path from "node:path";
+import { Client } from "@modelcontextprotocol/client";
 import { AGENT_PROJECT_METADATA_DIR } from "./env.mjs";
 import { writeTmpFile } from "./tmpfile.mjs";
 import { noThrow } from "./utils/noThrow.mjs";
@@ -52,7 +51,7 @@ export async function setupMCPServer(serverName, serverConfig) {
 /**
  * @typedef {Object} MCPClientOptions
  * @property {string} serverName - The name of the MCP server.
- * @property {StdioServerParameters} params - The transport to use for the client.
+ * @property {import("@modelcontextprotocol/client").StdioServerParameters} params - The transport to use for the client.
  */
 
 /**
@@ -60,10 +59,7 @@ export async function setupMCPServer(serverName, serverConfig) {
  * @returns {Promise<{client: Client; cleanup: () => void}>} - The MCP client and cleanup function.
  */
 async function startMCPServer(options) {
-  const mcpClient = await import("@modelcontextprotocol/sdk/client/index.js");
-  const mcpClientStdio = await import(
-    "@modelcontextprotocol/sdk/client/stdio.js"
-  );
+  const mcpClient = await import("@modelcontextprotocol/client");
 
   const client = new mcpClient.Client({
     name: "undefined",
@@ -83,7 +79,7 @@ async function startMCPServer(options) {
   const logPath = path.join(logDir, `mcp--${options.serverName}.stderr`);
   const stderrLogFile = await open(logPath, "a");
 
-  const transport = new mcpClientStdio.StdioClientTransport({
+  const transport = new mcpClient.StdioClientTransport({
     ...restParams,
     env: env ? { ...defaultEnv, ...env } : undefined,
     stderr: stderrLogFile.fd,

package/src/tools/askURL.mjs

@@ -0,0 +1,201 @@
+/**
+ * @import { Tool } from '../tool'
+ */
+
+import { styleText } from "node:util";
+import { getGoogleCloudAccessToken } from "../providers/platform/googleCloud.mjs";
+import { noThrow } from "../utils/noThrow.mjs";
+
+/** @typedef {AskURLToolGeminiOptions | AskURLToolGeminiVertexAIOptions} AskURLToolOptions */
+
+/**
+ * @typedef {Object} AskURLToolGeminiOptions
+ * @property {"gemini"} provider
+ * @property {string=} baseURL
+ * @property {string} apiKey
+ * @property {string} model
+ */
+
+/**
+ * @typedef {Object} AskURLToolGeminiVertexAIOptions
+ * @property {"gemini-vertex-ai"} provider
+ * @property {string} baseURL
+ * @property {string=} account
+ * @property {string} model
+ */
+
+/**
+ * @typedef {Object} AskWebInput
+ * @property {string} question
+ */
+
+/**
+ * @param {AskURLToolOptions} config
+ * @returns {Tool}
+ */
+export function createAskURLTool(config) {
+  /**
+   * @param {AskWebInput} input
+   * @param {number} retryCount
+   * @returns {Promise<string | Error>}
+   */
+  async function askURL(input, retryCount = 0) {
+    const model = config.model ?? "gemini-3-flash-preview";
+    const url =
+      config.provider === "gemini-vertex-ai"
+        ? `${config.baseURL}/publishers/google/models/${config.model}:generateContent`
+        : config.baseURL
+          ? `${config.baseURL}/models/${model}:generateContent`
+          : `https://generativelanguage.googleapis.com/v1beta/models/${model}:generateContent`;
+
+    /** @type {Record<string,string>} */
+    const authHeader =
+      config.provider === "gemini-vertex-ai"
+        ? {
+            Authorization: `Bearer ${await getGoogleCloudAccessToken(config.account)}`,
+          }
+        : {
+            "x-goog-api-key": config.apiKey ?? "",
+          };
+
+    const data = {
+      contents: [
+        {
+          role: "user",
+          parts: [
+            {
+              text: `I need a comprehensive answer to this question. Please note that I don't have access to external URLs, so include all relevant facts, data, or explanations directly in your response. Avoid referencing links I can't open.
+
+Question: ${input.question}`,
+            },
+          ],
+        },
+      ],
+      tools: [
+        {
+          url_context: {},
+        },
+      ],
+    };
+
+    const response = await fetch(url, {
+      method: "POST",
+      headers: {
+        ...authHeader,
+        "Content-Type": "application/json",
+      },
+      body: JSON.stringify(data),
+      signal: AbortSignal.timeout(120 * 1000),
+    });
+
+    if (response.status === 429 || response.status >= 500) {
+      const interval = Math.min(2 * 2 ** retryCount, 16);
+      console.error(
+        styleText(
+          "yellow",
+          `Google API returned ${response.status}. Retrying in ${interval} seconds...`,
+        ),
+      );
+      await new Promise((resolve) => setTimeout(resolve, interval * 1000));
+      return askURL(input, retryCount + 1);
+    }
+
+    if (!response.ok) {
+      return new Error(
+        `Failed to ask Web: status=${response.status}, body=${await response.text()}`,
+      );
+    }
+
+    const body = await response.json();
+
+    const candidate = body.candidates?.[0];
+    const text = candidate?.content?.parts?.[0]?.text;
+    /** @type {{segment?:{startIndex:number,endIndex:number,text:string},groundingChunkIndices?:number[]}[] | undefined} */
+    const supports = candidate?.groundingMetadata?.groundingSupports;
+    /** @type {{web?:{uri:string,title:string}}[] | undefined} */
+    const chunks = candidate?.groundingMetadata?.groundingChunks;
+
+    if (typeof text !== "string") {
+      return new Error(
+        `Unexpected response format from Google: ${JSON.stringify(body)}`,
+      );
+    }
+
+    /**
+     * @param {string} source
+     * @param {number} byteIndex
+     * @param {string} insertText
+     */
+    const insertTextAtUtf8ByteIndex = (source, byteIndex, insertText) => {
+      const sourceBuffer = Buffer.from(source, "utf8");
+      const normalizedByteIndex = Math.max(
+        0,
+        Math.min(byteIndex, sourceBuffer.length),
+      );
+
+      return Buffer.concat([
+        sourceBuffer.subarray(0, normalizedByteIndex),
+        Buffer.from(insertText, "utf8"),
+        sourceBuffer.subarray(normalizedByteIndex),
+      ]).toString("utf8");
+    };
+
+    // Sort by end_index desc because Gemini grounding indexes are byte offsets
+    // into the original UTF-8 text.
+    const sortedSupports = supports?.toSorted(
+      (a, b) => (b.segment?.endIndex ?? 0) - (a.segment?.endIndex ?? 0),
+    );
+
+    // Insert citations using UTF-8 byte offsets.
+    let textWithCitations = text;
+    for (const support of sortedSupports ?? []) {
+      const endIndex = support.segment?.endIndex;
+      if (
+        typeof endIndex !== "number" ||
+        !support.groundingChunkIndices?.length
+      ) {
+        continue;
+      }
+
+      textWithCitations = insertTextAtUtf8ByteIndex(
+        textWithCitations,
+        endIndex,
+        ` [${support.groundingChunkIndices.map((i) => i + 1).join(", ")}] `,
+      );
+    }
+
+    const chunkString = (chunks ?? [])
+      .map(
+        (chunk, index) =>
+          `- [${index + 1} - ${chunk.web?.title}](${chunk.web?.uri})`,
+      )
+      .join("\n");
+
+    return [textWithCitations, chunkString].join("\n\n");
+  }
+
+  return {
+    def: {
+      name: "ask_url",
+      description:
+        "Use one or more provided URLs to answer a question. Include the URLs in your question.",
+      inputSchema: {
+        type: "object",
+        properties: {
+          question: {
+            type: "string",
+            description:
+              "The question to ask, including one or more URLs to use as context.",
+          },
+        },
+        required: ["question"],
+      },
+    },
+
+    /**
+     * @param {AskWebInput} input
+     * @returns {Promise<string | Error>}
+     */
+    impl: async (input) => await noThrow(async () => askURL(input, 0)),
+  };
+}

package/src/tools/askWeb.mjs

@@ -0,0 +1,200 @@
+/**
+ * @import { Tool } from '../tool'
+ */
+
+import { styleText } from "node:util";
+import { getGoogleCloudAccessToken } from "../providers/platform/googleCloud.mjs";
+import { noThrow } from "../utils/noThrow.mjs";
+
+/** @typedef {AskWebToolGeminiOptions | AskWebToolGeminiVertexAIOptions} AskWebToolOptions */
+
+/**
+ * @typedef {Object} AskWebToolGeminiOptions
+ * @property {"gemini"} provider
+ * @property {string=} baseURL
+ * @property {string} apiKey
+ * @property {string} model
+ */
+
+/**
+ * @typedef {Object} AskWebToolGeminiVertexAIOptions
+ * @property {"gemini-vertex-ai"} provider
+ * @property {string} baseURL
+ * @property {string=} account
+ * @property {string} model
+ */
+
+/**
+ * @typedef {Object} AskWebInput
+ * @property {string} question
+ */
+
+/**
+ * @param {AskWebToolOptions} config
+ * @returns {Tool}
+ */
+export function createAskWebTool(config) {
+  /**
+   * @param {AskWebInput} input
+   * @param {number} retryCount
+   * @returns {Promise<string | Error>}
+   */
+  async function askWeb(input, retryCount = 0) {
+    const model = config.model ?? "gemini-3-flash-preview";
+    const url =
+      config.provider === "gemini-vertex-ai"
+        ? `${config.baseURL}/publishers/google/models/${config.model}:generateContent`
+        : config.baseURL
+          ? `${config.baseURL}/models/${model}:generateContent`
+          : `https://generativelanguage.googleapis.com/v1beta/models/${model}:generateContent`;
+
+    /** @type {Record<string,string>} */
+    const authHeader =
+      config.provider === "gemini-vertex-ai"
+        ? {
+            Authorization: `Bearer ${await getGoogleCloudAccessToken(config.account)}`,
+          }
+        : {
+            "x-goog-api-key": config.apiKey ?? "",
+          };
+
+    const data = {
+      contents: [
+        {
+          role: "user",
+          parts: [
+            {
+              text: `I need a comprehensive answer to this question. Please note that I don't have access to external URLs, so include all relevant facts, data, or explanations directly in your response. Avoid referencing links I can't open.
+
+Question: ${input.question}`,
+            },
+          ],
+        },
+      ],
+      tools: [
+        {
+          google_search: {},
+        },
+      ],
+    };
+
+    const response = await fetch(url, {
+      method: "POST",
+      headers: {
+        ...authHeader,
+        "Content-Type": "application/json",
+      },
+      body: JSON.stringify(data),
+      signal: AbortSignal.timeout(120 * 1000),
+    });
+
+    if (response.status === 429 || response.status >= 500) {
+      const interval = Math.min(2 * 2 ** retryCount, 16);
+      console.error(
+        styleText(
+          "yellow",
+          `Google API returned ${response.status}. Retrying in ${interval} seconds...`,
+        ),
+      );
+      await new Promise((resolve) => setTimeout(resolve, interval * 1000));
+      return askWeb(input, retryCount + 1);
+    }
+
+    if (!response.ok) {
+      return new Error(
+        `Failed to ask Web: status=${response.status}, body=${await response.text()}`,
+      );
+    }
+
+    const body = await response.json();
+
+    const candidate = body.candidates?.[0];
+    const text = candidate?.content?.parts?.[0]?.text;
+    /** @type {{segment?:{startIndex:number,endIndex:number,text:string},groundingChunkIndices?:number[]}[] | undefined} */
+    const supports = candidate?.groundingMetadata?.groundingSupports;
+    /** @type {{web?:{uri:string,title:string}}[] | undefined} */
+    const chunks = candidate?.groundingMetadata?.groundingChunks;
+
+    if (typeof text !== "string") {
+      return new Error(
+        `Unexpected response format from Google: ${JSON.stringify(body)}`,
+      );
+    }
+
+    /**
+     * @param {string} source
+     * @param {number} byteIndex
+     * @param {string} insertText
+     */
+    const insertTextAtUtf8ByteIndex = (source, byteIndex, insertText) => {
+      const sourceBuffer = Buffer.from(source, "utf8");
+      const normalizedByteIndex = Math.max(
+        0,
+        Math.min(byteIndex, sourceBuffer.length),
+      );
+
+      return Buffer.concat([
+        sourceBuffer.subarray(0, normalizedByteIndex),
+        Buffer.from(insertText, "utf8"),
+        sourceBuffer.subarray(normalizedByteIndex),
+      ]).toString("utf8");
+    };
+
+    // Sort by end_index desc because Gemini grounding indexes are byte offsets
+    // into the original UTF-8 text.
+    const sortedSupports = supports?.toSorted(
+      (a, b) => (b.segment?.endIndex ?? 0) - (a.segment?.endIndex ?? 0),
+    );
+
+    // Insert citations using UTF-8 byte offsets.
+    let textWithCitations = text;
+    for (const support of sortedSupports ?? []) {
+      const endIndex = support.segment?.endIndex;
+      if (
+        typeof endIndex !== "number" ||
+        !support.groundingChunkIndices?.length
+      ) {
+        continue;
+      }
+
+      textWithCitations = insertTextAtUtf8ByteIndex(
+        textWithCitations,
+        endIndex,
+        ` [${support.groundingChunkIndices.map((i) => i + 1).join(", ")}] `,
+      );
+    }
+
+    const chunkString = (chunks ?? [])
+      .map(
+        (chunk, index) =>
+          `- [${index + 1} - ${chunk.web?.title}](${chunk.web?.uri})`,
+      )
+      .join("\n");
+
+    return [textWithCitations, chunkString].join("\n\n");
+  }
+
+  return {
+    def: {
+      name: "ask_web",
+      description:
+        "Use the web search to answer questions that need up-to-date information or supporting sources.",
+      inputSchema: {
+        type: "object",
+        properties: {
+          question: {
+            type: "string",
+            description: "The question to ask",
+          },
+        },
+        required: ["question"],
+      },
+    },
+
+    /**
+     * @param {AskWebInput} input
+     * @returns {Promise<string | Error>}
+     */
+    impl: async (input) => await noThrow(async () => askWeb(input, 0)),
+  };
+}

package/src/tools/askGoogle.mjs

@@ -1,135 +0,0 @@
-/**
- * @import { Tool } from '../tool'
- */
-
-import { styleText } from "node:util";
-import { getGoogleCloudAccessToken } from "../providers/platform/googleCloud.mjs";
-import { noThrow } from "../utils/noThrow.mjs";
-
-/**
- * @typedef {Object} AskGoogleToolOptions
- * @property {"vertex-ai"=} platform
- * @property {string=} baseURL
- * @property {string=} apiKey - API key for Google AI Studio
- * @property {string=} account - The Google Cloud account to use for Vertex AI
- * @property {string=} model
- */
-
-/**
- * @typedef {Object} AskGoogleInput
- * @property {string} question
- */
-
-/**
- * @param {AskGoogleToolOptions} config
- * @returns {Tool}
- */
-export function createAskGoogleTool(config) {
-  /**
-   * @param {AskGoogleInput} input
-   * @param {number} retryCount
-   * @returns {Promise<string | Error>}
-   */
-  async function askGoogle(input, retryCount = 0) {
-    const model = config.model ?? "gemini-3-flash-preview";
-    const url =
-      config.platform === "vertex-ai" && config.baseURL
-        ? `${config.baseURL}/publishers/google/models/${model}:generateContent`
-        : config.baseURL
-          ? `${config.baseURL}/models/${model}:generateContent`
-          : `https://generativelanguage.googleapis.com/v1beta/models/${model}:generateContent`;
-
-    /** @type {Record<string,string>} */
-    const authHeader =
-      config.platform === "vertex-ai"
-        ? {
-            Authorization: `Bearer ${await getGoogleCloudAccessToken(config.account)}`,
-          }
-        : {
-            "x-goog-api-key": config.apiKey ?? "",
-          };
-
-    const data = {
-      contents: [
-        {
-          role: "user",
-          parts: [
-            {
-              text: `I need a comprehensive answer to this question. Please note that I don't have access to external URLs, so include all relevant facts, data, or explanations directly in your response. Avoid referencing links I can't open.
-
-Question: ${input.question}`,
-            },
-          ],
-        },
-      ],
-      tools: [
-        {
-          google_search: {},
-        },
-      ],
-    };
-
-    const response = await fetch(url, {
-      method: "POST",
-      headers: {
-        ...authHeader,
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify(data),
-      signal: AbortSignal.timeout(120 * 1000),
-    });
-
-    if (response.status === 429 || response.status >= 500) {
-      const interval = Math.min(2 * 2 ** retryCount, 16);
-      console.error(
-        styleText(
-          "yellow",
-          `Google API returned ${response.status}. Retrying in ${interval} seconds...`,
-        ),
-      );
-      await new Promise((resolve) => setTimeout(resolve, interval * 1000));
-      return askGoogle(input, retryCount + 1);
-    }
-
-    if (!response.ok) {
-      return new Error(
-        `Failed to ask Google: status=${response.status}, body=${await response.text()}`,
-      );
-    }
-
-    const body = await response.json();
-
-    const answer = body.candidates?.[0]?.content?.parts?.[0]?.text;
-
-    if (typeof answer !== "string") {
-      return new Error(
-        `Unexpected response format from Google: ${JSON.stringify(body)}`,
-      );
-    }
-
-    return answer;
-  }
-
-  return {
-    def: {
-      name: "ask_google",
-      description: "Ask Google a question using natural language",
-      inputSchema: {
-        type: "object",
-        properties: {
-          question: {
-            type: "string",
-            description: "The question to ask Google",
-          },
-        },
-        required: ["question"],
-      },
-    },
-
-    /**
-     * @param {AskGoogleInput} input
-     * @returns {Promise<string | Error>}
-     */
-    impl: async (input) => await noThrow(async () => askGoogle(input, 0)),
-  };
-}

package/src/tools/fetchWebPage.mjs

@@ -1,96 +0,0 @@
-/**
- * @import { Tool } from '../tool'
- */
-
-import { writeTmpFile } from "../tmpfile.mjs";
-import { noThrow } from "../utils/noThrow.mjs";
-
-const MAX_CONTENT_LENGTH = 1024 * 8;
-
-/** @type {Tool} */
-export const fetchWebPageTool = {
-  def: {
-    name: "fetch_web_page",
-    description:
-      "Fetch and extract web page content from a given URL, returning it as Markdown.",
-    inputSchema: {
-      type: "object",
-      properties: {
-        url: {
-          type: "string",
-        },
-      },
-      required: ["url"],
-    },
-  },
-
-  /**
-   * @param {Record<string, unknown>} input
-   * @returns {Record<string, unknown>}
-   */
-  maskApprovalInput: (input) => {
-    try {
-      const url = new URL(String(input.url));
-      return { url: url.hostname };
-    } catch {
-      return input;
-    }
-  },
-
-  /**
-   * @param {{url: string}} input
-   * @returns {Promise<string | Error>}
-   */
-  impl: async (input) =>
-    await noThrow(async () => {
-      const { Readability } = await import("@mozilla/readability");
-      const { JSDOM } = await import("jsdom");
-      const TurndownService = (await import("turndown")).default;
-
-      const response = await fetch(input.url, {
-        signal: AbortSignal.timeout(30 * 1000),
-      });
-      const html = await response.text();
-      const dom = new JSDOM(html, { url: input.url });
-      const reader = new Readability(dom.window.document);
-      const article = reader.parse();
-
-      if (!article?.content) {
-        return "";
-      }
-
-      const turndownService = new TurndownService({
-        headingStyle: "atx",
-        bulletListMarker: "-",
-        codeBlockStyle: "fenced",
-      });
-
-      const markdown = turndownService.turndown(article.content);
-      const trimmedMarkdown = markdown.trim();
-
-      if (trimmedMarkdown.length <= MAX_CONTENT_LENGTH) {
-        return trimmedMarkdown;
-      }
-
-      const filePath = await writeTmpFile(
-        trimmedMarkdown,
-        "read_web_page",
-        "md",
-      );
-
-      const lineCount = trimmedMarkdown.split("\n").length;
-
-      return [
-        `Content is large (${trimmedMarkdown.length} characters, ${lineCount} lines) and saved to ${filePath}`,
-        "- Use rg / awk to read specific parts",
-      ].join("\n");
-    }),
-};
-
-// Playground
-// (async () => {
-//   const input = {
-//     url: "https://devin.ai/agents101",
-//   };
-//   console.log(await fetchWebPageTool.impl(input));
-// })();

package/src/tools/tavilySearch.d.ts

@@ -1,6 +0,0 @@
-/**
- * @doc https://docs.tavily.com/documentation/api-reference/endpoint/search
- */
-export type TavilySearchInput = {
-  query: string;
-};

package/src/tools/tavilySearch.mjs

@@ -1,57 +0,0 @@
-/**
- * @import { Tool } from '../tool'
- * @import { TavilySearchInput } from './tavilySearch'
- */
-
-import { noThrow } from "../utils/noThrow.mjs";
-
-/**
- * @param {{tavilyApiKey?: string}} config
- * @returns {Tool}
- */
-export function createTavilySearchTool(config) {
-  return {
-    def: {
-      name: "search_web",
-      description: "Search the web for information",
-      inputSchema: {
-        type: "object",
-        properties: {
-          query: {
-            type: "string",
-          },
-        },
-        required: ["query"],
-      },
-    },
-
-    /**
-     * @param {TavilySearchInput} input
-     * @returns {Promise<string | Error>}
-     */
-    impl: async (input) =>
-      await noThrow(async () => {
-        const response = await fetch("https://api.tavily.com/search", {
-          method: "POST",
-          headers: {
-            Authorization: `Bearer ${config.tavilyApiKey}`,
-            "Content-Type": "application/json",
-          },
-          body: JSON.stringify({
-            ...input,
-            max_results: 5,
-          }),
-          signal: AbortSignal.timeout(120 * 1000),
-        });
-
-        if (!response.ok) {
-          return new Error(
-            `Failed to search: status=${response.status}, body=${await response.text()}`,
-          );
-        }
-
-        const body = await response.json();
-        return JSON.stringify(body);
-      }),
-  };
-}