@iinm/plain-agent 1.9.3 → 1.10.0

package/README.md

@@ -62,7 +62,6 @@ A lightweight, capable coding agent for the terminal.
 ## Limitations
 
 - **Path validation only covers tool arguments** — Path validation restricts only paths explicitly passed as tool-use arguments; it cannot control file access inside arbitrary scripts. Always use sandboxed execution when allowing arbitrary script execution.
-- **No session persistence** — Sessions are not persisted. Start a fresh session and use memory files (`.plain-agent/memory/`) instead.
 - **Sequential subagent execution** — Subagents run one at a time rather than
   in parallel. The trade-off is full visibility: every step is streamed to
   your terminal so you can follow exactly what each subagent is doing.
@@ -115,25 +114,35 @@ Create the configuration.
     }
   ],
 
-  // (Optional) Enable web search tools
+  // (Optional) Enable web tools
   "tools": {
-    // askWeb: Searches the web to answer questions requiring up-to-date information or external sources.
-    "askWeb": {
+    "webSearch": {
       "provider": "gemini",
       "apiKey": "<GEMINI_API_KEY>",
       "model": "gemini-3-flash-preview"
+
       // 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"
+
+      // Or use a custom command
+      // "provider": "command",
+      // "command": "bash",
+      // "args": ["-c", "w3m -dump -o display_link_number=1 \"https://lite.duckduckgo.com/lite?q=$*\"", "-"]
     },
 
-    // askURL: Answers questions based on provided URL content.
-    "askURL": {
+    "webFetch": {
       "provider": "gemini",
       "apiKey": "<GEMINI_API_KEY>",
       "model": "gemini-3-flash-preview"
+
       // Or use Vertex AI (Requires gcloud CLI to get authentication token)
+
+      // Or use a custom command
+      // "provider": "command",
+      // "command": "w3m",
+      // "args": ["-dump", "-o", "display_link_number=1"]
     }
   }
 }
@@ -338,6 +347,21 @@ plain cost
 plain cost --from 2026-04-01 --to 2026-04-30
 ```
 
+Resume a previously interrupted interactive session. Sessions are
+auto-saved to `.plain-agent/sessions/` and can be removed with `rm` when
+no longer needed. Without an argument, the most recently updated session
+is resumed. Use `--list` to see resumable sessions. Switching models is
+not supported (`-m` is rejected).
+
+```sh
+plain resume
+```
+
+```
+plain resume --list
+plain resume 2026-05-10-0803-a7k
+```
+
 Configure plain-agent for your project.
 
 ```
@@ -388,7 +412,7 @@ Files are loaded in the following order. Settings in later files override earlie
         "action": "allow"
       },
       {
-        "toolName": { "$regex": "^(ask_web|ask_url)$" },
+        "toolName": { "$regex": "^(web_search|web_fetch)$" },
         "action": "allow"
       }
       // ⚠️ Never do this. mcp run outside the sandbox, so they can send anything externally.
@@ -447,7 +471,7 @@ Files are loaded in the following order. Settings in later files override earlie
       },
 
       {
-        "toolName": { "$regex": "^(ask_web|ask_url)$" },
+        "toolName": { "$regex": "^(web_search|web_fetch)$" },
         "action": "allow"
       },
 
@@ -539,8 +563,8 @@ The agent can use the following tools to assist with tasks:
 - **patch_file**: Patch a file.
 - **exec_command**: Run a command without shell interpretation.
 - **tmux_command**: Run a tmux command.
-- **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).
+- **web_search**: Search the web with one or more keyword sets and answer a question based on the combined results (requires Google API key, Vertex AI configuration, or the `command` provider with a local search command).
+- **web_fetch**: Fetch the contents of a single URL and answer a question based on it (requires Google API key, Vertex AI configuration, or the `command` provider with a local fetch command such as `w3m`, `curl`, or `lynx`).
 - **switch_to_subagent**: Switch to a subagent role within the same conversation, focusing on the specified goal.
 - **switch_to_main_agent**: Switch back to the main agent role and report the result. After reporting, the subagent's conversation history is removed from the context.
 - **compact_context**: Compact the conversation context by discarding prior messages and reloading task state from a memory file. Use when the context has grown large but the task is not yet complete. Can also be invoked via the `/compact` slash command.
@@ -591,10 +615,14 @@ The agent searches for subagent definitions in the following directories:
 
 ```md
 ---
-description: Simplifies and refines code for clarity and maintainability
+description: Fetches a web page and answers questions about its content
 ---
 
-You are a code simplifier. Your role is to refactor code while preserving its functionality.
+You are a web content reader and analyzer. Given a URL and a question, you:
+
+1. Fetch the page content using `w3m -dump <URL>`.
+2. Read and understand the fetched content.
+3. Answer the user's question based on the content.
 ```
 
 ## Claude Code Plugin Support

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iinm/plain-agent",
-  "version": "1.9.3",
+  "version": "1.10.0",
   "description": "A lightweight CLI-based coding agent",
   "license": "MIT",
   "type": "module",

package/src/agent.d.ts

@@ -9,6 +9,7 @@ import type {
   PartialMessageContent,
   ProviderTokenUsage,
 } from "./model";
+import type { SessionState } from "./sessionStore.mjs";
 import type { Tool, ToolUseApprover } from "./tool";
 
 export type Agent = {
@@ -18,10 +19,12 @@ export type Agent = {
 };
 
 export type AgentCommands = {
-  dumpMessages: () => Promise<void>;
-  loadMessages: () => Promise<void>;
   getCostSummary: () => CostSummary;
   pauseAutoApprove: () => void;
+  /** Subagent currently active for this session, or null. */
+  getActiveSubagent: () => { name: string } | null;
+  /** Wait for any pending session-state writes to flush to disk. */
+  flushSessionPersistence: () => Promise<void>;
 };
 
 type UserEventMap = {
@@ -49,4 +52,13 @@ export type AgentConfig = {
   toolUseApprover: ToolUseApprover;
   agentRoles: Map<string, AgentRole>;
   modelCostConfig?: CostConfig;
+  /** Metadata used when persisting session state. */
+  sessionMetadata: {
+    sessionId: string;
+    modelName: string;
+    workingDir: string;
+    startTime: Date;
+  };
+  /** When provided, the agent restores its state from this snapshot. */
+  initialState?: SessionState | null;
 };

package/src/agent.mjs

@@ -7,11 +7,11 @@
  */
 
 import { EventEmitter } from "node:events";
-import fs from "node:fs/promises";
+import { styleText } from "node:util";
 import { createAgentLoop } from "./agentLoop.mjs";
 import { createStateManager } from "./agentState.mjs";
 import { createCostTracker } from "./costTracker.mjs";
-import { MESSAGES_DUMP_FILE_PATH } from "./env.mjs";
+import { SESSION_FILE_VERSION, saveSession } from "./sessionStore.mjs";
 import { createSubagentManager } from "./subagent.mjs";
 import { createToolExecutor } from "./toolExecutor.mjs";
 import {
@@ -32,6 +32,8 @@ export function createAgent({
   toolUseApprover,
   agentRoles,
   modelCostConfig,
+  sessionMetadata,
+  initialState,
 }) {
   /** @type {UserEventEmitter} */
   const userEventEmitter = new EventEmitter();
@@ -44,23 +46,27 @@ export function createAgent({
     costTracker.recordUsage(usage);
   });
 
-  const stateManager = createStateManager(
-    [
-      {
-        role: "system",
-        content: [{ type: "text", text: prompt }],
-      },
-    ],
-    {
-      onMessagesAppended: (newMessages) => {
-        const lastMessage = newMessages.at(-1);
-        if (!lastMessage) {
-          return;
-        }
+  // Build the initial message list. When resuming, replace messages[0] with
+  // the freshly built system prompt (today/agent roles/skills may have
+  // changed) but keep the rest of the saved conversation verbatim.
+  /** @type {import("./model").SystemMessage} */
+  const systemMessage = {
+    role: "system",
+    content: [{ type: "text", text: prompt }],
+  };
+  const baseMessages = initialState?.messages?.length
+    ? [systemMessage, ...initialState.messages.slice(1)]
+    : [systemMessage];
+
+  const stateManager = createStateManager(baseMessages, {
+    onMessagesAppended: (newMessages) => {
+      const lastMessage = newMessages.at(-1);
+      if (lastMessage) {
         agentEventEmitter.emit("message", lastMessage);
-      },
+      }
+      schedulePersist();
     },
-  );
+  });
 
   const subagentManager = createSubagentManager(agentRoles, {
     onSubagentSwitched: (subagent) => {
@@ -68,6 +74,46 @@ export function createAgent({
     },
   });
 
+  // Restore the rest of the session state. Subagent restoration is silent
+  // (no event), since CLI listeners aren't attached yet — the CLI consults
+  // getActiveSubagent() at startup instead.
+  if (initialState) {
+    subagentManager.restoreState(initialState.subagentState);
+    toolUseApprover.restoreAllowedToolUseInSession(
+      initialState.allowedToolUseInSession,
+    );
+    costTracker.restoreUsageHistory(initialState.tokenUsageHistory);
+  }
+
+  /** @type {Promise<void>} */
+  let persistChain = Promise.resolve();
+  function schedulePersist() {
+    persistChain = persistChain.then(async () => {
+      try {
+        await saveSession({
+          version: SESSION_FILE_VERSION,
+          sessionId: sessionMetadata.sessionId,
+          modelName: sessionMetadata.modelName,
+          workingDir: sessionMetadata.workingDir,
+          startTime: sessionMetadata.startTime.toISOString(),
+          lastUpdatedAt: new Date().toISOString(),
+          messages: stateManager.getMessages(),
+          subagentState: subagentManager.getState(),
+          allowedToolUseInSession: toolUseApprover.getAllowedToolUseInSession(),
+          tokenUsageHistory: costTracker.getUsageHistory(),
+        });
+      } catch (err) {
+        const message = err instanceof Error ? err.message : String(err);
+        console.error(
+          styleText(
+            "yellow",
+            `Warning: failed to persist session state: ${message}`,
+          ),
+        );
+      }
+    });
+  }
+
   /**
    * @param {SwitchToSubagentInput} input
    */
@@ -130,42 +176,6 @@ export function createAgent({
     exclusiveToolNames: [switchToSubagentToolName, switchToMainAgentToolName],
   });
 
-  async function dumpMessages() {
-    const filePath = MESSAGES_DUMP_FILE_PATH;
-    try {
-      await fs.writeFile(
-        filePath,
-        JSON.stringify(stateManager.getMessages(), null, 2),
-      );
-      console.log(`Messages dumped to ${filePath}`);
-    } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      console.error(`Error dumping messages: ${message}`);
-    }
-  }
-
-  async function loadMessages() {
-    const filePath = MESSAGES_DUMP_FILE_PATH;
-    try {
-      const data = await fs.readFile(filePath, "utf-8");
-      const loadedMessages = JSON.parse(data);
-      if (Array.isArray(loadedMessages)) {
-        // Keep the system message (index 0) and replace the rest
-        stateManager.setMessages([
-          stateManager.getMessageAt(0),
-          ...loadedMessages.slice(1),
-        ]);
-        console.log(`Messages loaded from ${filePath}`);
-      } else {
-        console.error("Error loading messages: Invalid format in file.");
-      }
-    } catch (error) {
-      if (error instanceof Error) {
-        console.error(`Error loading messages: ${error.message}`);
-      }
-    }
-  }
-
   // Pause signal: set by Ctrl-C during agent execution, checked after each tool batch completes
   let paused = false;
   /** @type {import("./agentLoop.mjs").PauseSignal} */
@@ -193,12 +203,14 @@ export function createAgent({
     userEventEmitter,
     agentEventEmitter,
     agentCommands: {
-      dumpMessages,
-      loadMessages,
       getCostSummary: () => costTracker.calculateCost(),
       pauseAutoApprove: () => {
         paused = true;
       },
+      getActiveSubagent: () => subagentManager.getActiveSubagent(),
+      flushSessionPersistence: async () => {
+        await persistChain;
+      },
     },
   };
 }

package/src/cliArgs.mjs

@@ -1,5 +1,5 @@
 /**
- * @typedef {HelpSubcommand | InteractiveSubcommand | BatchSubcommand | ListModelsSubcommand | InstallClaudeCodePluginsSubcommand | CostSubcommand} Subcommand
+ * @typedef {HelpSubcommand | InteractiveSubcommand | BatchSubcommand | ListModelsSubcommand | InstallClaudeCodePluginsSubcommand | CostSubcommand | ResumeSubcommand} Subcommand
  */
 
 /**
@@ -26,6 +26,13 @@
  * @typedef {{ type: 'cost', from: string | null, to: string | null }} CostSubcommand
  */
 
+/**
+ * Resume a previously interrupted interactive session.
+ * - `sessionId === null` and `list === false`: resume the most recently updated session.
+ * - `list === true`: print the resumable sessions and exit.
+ * @typedef {{ type: 'resume', sessionId: string | null, list: boolean, config: string[] }} ResumeSubcommand
+ */
+
 /**
  * @typedef {Object} CliArgs
  * @property {Subcommand} subcommand - The subcommand to execute
@@ -110,6 +117,38 @@ export function parseCliArgs(argv) {
     };
   }
 
+  if (subcommandName === "resume") {
+    const resumeArgs = args.slice(1);
+    /** @type {string | null} */
+    let sessionId = null;
+    let list = false;
+    /** @type {string[]} */
+    const config = [];
+
+    for (let i = 0; i < resumeArgs.length; i++) {
+      const arg = resumeArgs[i];
+      if (arg === "--list") {
+        list = true;
+      } else if (arg === "-c" || arg === "--config") {
+        if (resumeArgs[i + 1]) {
+          config.push(resumeArgs[i + 1]);
+          i++;
+        }
+      } else if (arg === "-m" || arg === "--model") {
+        // Switching models on resume is not supported by design.
+        return {
+          subcommand: { type: "help" },
+        };
+      } else if (!arg.startsWith("-") && sessionId === null) {
+        sessionId = arg;
+      }
+    }
+
+    return {
+      subcommand: { type: "resume", sessionId, list, config },
+    };
+  }
+
   if (subcommandName === "cost") {
     const costArgs = args.slice(1);
     let from = null;
@@ -145,6 +184,7 @@ export function printHelp(exitCode = 0) {
   console.log(`
 Usage: plain [options]
        plain batch [options] <task>
+       plain resume [<sessionId>] [--list] [-c <file>]
        plain cost [--from YYYY-MM-DD] [--to YYYY-MM-DD]
        plain list-models
        plain install-claude-code-plugins
@@ -158,6 +198,11 @@ Subcommands:
   batch <task>                 Run in batch mode with the given task instruction.
                                Config files are NOT auto-loaded in batch mode;
                                use -c to specify config files explicitly.
+  resume                       Resume an interactive session that was
+                               interrupted. With no sessionId, resumes the
+                               most recently updated session. Use --list to
+                               see resumable sessions. Switching models is
+                               not supported (-m is rejected).
   cost                         Show aggregated token cost per day for a period.
                                Defaults to the first day of the current month
                                through today.

package/src/cliBatch.mjs

@@ -71,6 +71,7 @@ export async function startBatchSession({
         });
       }
 
+      await agentCommands.flushSessionPersistence();
       await onStop();
       resolve();
     });

package/src/cliCommands.mjs

@@ -131,18 +131,6 @@ export function createCommandHandler({
       return "continue";
     }
 
-    // /dump
-    if (inputTrimmed.toLowerCase() === "/dump") {
-      await agentCommands.dumpMessages();
-      return "prompt";
-    }
-
-    // /load
-    if (inputTrimmed.toLowerCase() === "/load") {
-      await agentCommands.loadMessages();
-      return "prompt";
-    }
-
     // /cost
     if (inputTrimmed.toLowerCase() === "/cost") {
       const summary = agentCommands.getCostSummary();

package/src/cliCompleter.mjs

@@ -32,8 +32,6 @@ export const SLASH_COMMANDS = [
     name: "/resume",
     description: "Resume conversation after an LLM provider error",
   },
-  { name: "/dump", description: "Save current messages to a JSON file" },
-  { name: "/load", description: "Load messages from a JSON file" },
   { name: "/cost", description: "Display session cost and token usage" },
   {
     name: "/compact",

package/src/cliCost.mjs

@@ -87,6 +87,24 @@ export function parseDateOnly(value) {
   return date;
 }
 
+/**
+ * Deduplicate usage records by sessionId, keeping only the last record for each session.
+ * This prevents double-counting when a session is resumed and exited multiple times.
+ *
+ * @param {UsageRecord[]} records - Records in chronological order (oldest first)
+ * @returns {UsageRecord[]} Deduplicated records (one per sessionId)
+ */
+function deduplicateBySessionId(records) {
+  /** @type {Map<string, UsageRecord>} */
+  const bySessionId = new Map();
+  for (const record of records) {
+    if (record.sessionId) {
+      bySessionId.set(record.sessionId, record);
+    }
+  }
+  return Array.from(bySessionId.values());
+}
+
 /**
  * Aggregate usage records into a cost report.
  *
@@ -103,12 +121,14 @@ export function aggregateUsage(records, period) {
     );
   }
 
+  const deduplicated = deduplicateBySessionId(records);
+
   /** @type {Map<string, Map<string, DailyEntry>>} */
   const byCurrency = new Map();
   let noPricingSessionCount = 0;
   let excludedOutOfRange = 0;
 
-  for (const record of records) {
+  for (const record of deduplicated) {
     if (record.timestamp == null) {
       excludedOutOfRange++;
       continue;

package/src/cliFormatter.mjs

@@ -152,20 +152,27 @@ export async function formatToolUse(toolUse) {
     ].join("\n");
   }
 
-  if (toolName === "ask_web") {
-    /** @type {Partial<import("./tools/askWeb.mjs").AskWebInput>} */
-    const askWebInput = input;
-    return [`tool: ${toolName}`, `question: ${askWebInput.question}`].join(
-      "\n",
-    );
+  if (toolName === "web_search") {
+    /** @type {Partial<import("./tools/webSearch.mjs").WebSearchInput>} */
+    const webSearchInput = input;
+    const searchesLine = webSearchInput.searches
+      ? webSearchInput.searches.map((s) => s.keywords.join(" ")).join(" | ")
+      : "";
+    return [
+      `tool: ${toolName}`,
+      `searches: ${searchesLine}`,
+      `question: ${webSearchInput.question}`,
+    ].join("\n");
   }
 
-  if (toolName === "ask_url") {
-    /** @type {Partial<import("./tools/askURL.mjs").AskURLInput>} */
-    const askURLInput = input;
-    return [`tool: ${toolName}`, `question: ${askURLInput.question}`].join(
-      "\n",
-    );
+  if (toolName === "web_fetch") {
+    /** @type {Partial<import("./tools/webFetch.mjs").WebFetchInput>} */
+    const webFetchInput = input;
+    return [
+      `tool: ${toolName}`,
+      `url: ${webFetchInput.url}`,
+      `question: ${webFetchInput.question}`,
+    ].join("\n");
   }
 
   const { provider: _, ...filteredToolUse } = toolUse;

package/src/cliInteractive.mjs

@@ -112,7 +112,7 @@ export function startInteractiveSession({
   const state = {
     turn: true,
     multiLineBuffer: null,
-    subagentName: "",
+    subagentName: agentCommands.getActiveSubagent()?.name ?? "",
   };
 
   /**
@@ -157,6 +157,7 @@ export function startInteractiveSession({
     console.log();
     console.log(formatCostSummary(summary));
     await persistUsage(summary, { sessionId, modelName, startTime });
+    await agentCommands.flushSessionPersistence();
     await onStop();
     process.exit(0);
   };
@@ -351,7 +352,7 @@ export function startInteractiveSession({
     process.stdout.write("\x1b[?2004h");
   }
 
-  let currentCliPrompt = getCliPrompt();
+  let currentCliPrompt = getCliPrompt(state.subagentName);
   cli = readline.createInterface({
     input: paste.transform,
     output: process.stdout,

package/src/config.d.ts

@@ -1,11 +1,71 @@
 import { ClaudeCodePluginRepo } from "./claudeCodePlugin.mjs";
 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";
+import {
+  WebFetchToolGeminiOptions,
+  WebFetchToolGeminiVertexAIOptions,
+} from "./tools/webFetch.mjs";
+import {
+  WebSearchToolGeminiOptions,
+  WebSearchToolGeminiVertexAIOptions,
+} from "./tools/webSearch.mjs";
 import { VoiceInputConfig } from "./voiceInput.mjs";
 
+/**
+ * JSON-serializable webFetch configuration.
+ *
+ * The `command` provider runs an arbitrary local command per fetch to
+ * download a URL's content; the agent's main model is then used to answer
+ * based on the dumped output. The runtime tool factory receives a resolved
+ * `modelCaller` instead — see `WebFetchToolOptions` in `tools/webFetch.mjs`.
+ */
+export type WebFetchToolConfig =
+  | WebFetchToolGeminiOptions
+  | WebFetchToolGeminiVertexAIOptions
+  | WebFetchToolCommandJsonConfig;
+
+export type WebFetchToolCommandJsonConfig = {
+  provider: "command";
+  /** Executable used to fetch the URL (e.g., `"w3m"`, `"curl"`). */
+  command: string;
+  /** Arguments passed before the URL (e.g., `["-dump"]`). The URL is appended automatically. */
+  args: string[];
+  /** Per-call timeout in milliseconds (default 30000). */
+  timeoutMs?: number;
+  /** Extra environment variables, merged on top of PATH / HOME / LANG. */
+  env?: Record<string, string>;
+  maxLength?: number;
+};
+
+/**
+ * JSON-serializable webSearch configuration.
+ *
+ * The `command` provider runs an arbitrary local command per keyword set
+ * to perform a search; the agent's main model is then used to filter the
+ * combined results down to entries relevant to the question. The runtime
+ * tool factory receives a resolved `modelCaller` instead — see
+ * `WebSearchToolOptions` in `tools/webSearch.mjs`.
+ */
+export type WebSearchToolConfig =
+  | WebSearchToolGeminiOptions
+  | WebSearchToolGeminiVertexAIOptions
+  | WebSearchToolCommandJsonConfig;
+
+export type WebSearchToolCommandJsonConfig = {
+  provider: "command";
+  /** Executable used to perform each search (e.g., a wrapper around a search API). */
+  command: string;
+  /** Arguments passed before each keyword set (e.g., `["-n", "5"]`). Keywords are appended automatically. */
+  args: string[];
+  /** Per-search timeout in milliseconds (default 30000). */
+  timeoutMs?: number;
+  /** Extra environment variables, merged on top of PATH / HOME / LANG. */
+  env?: Record<string, string>;
+  maxLengthPerSearch?: number;
+  maxTotalLength?: number;
+};
+
 export type AppConfig = {
   model?: string;
   models?: ModelDefinition[];
@@ -17,8 +77,8 @@ export type AppConfig = {
   };
   sandbox?: ExecCommandSanboxConfig;
   tools?: {
-    askWeb?: AskWebToolOptions;
-    askURL?: AskURLToolOptions;
+    webSearch?: WebSearchToolConfig;
+    webFetch?: WebFetchToolConfig;
   };
   mcpServers?: Record<string, MCPServerConfig>;
   notifyCmd?: { command: string; args?: string[] };

package/src/config.mjs

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