@vellumai/assistant 0.8.3 → 0.8.5

package/src/tools/network/web-search.ts

@@ -1,8 +1,12 @@
 import { getConfig } from "../../config/loader.js";
+import type {
+  WebSearchMetadata,
+  WebSearchResultItem,
+} from "../../daemon/message-types/web-activity.js";
 import { RiskLevel } from "../../permissions/types.js";
-import type { ToolDefinition } from "../../providers/types.js";
 import { getProviderKeyAsync } from "../../security/secure-keys.js";
 import { wrapUntrustedContent } from "../../security/untrusted-content.js";
+import { faviconUrlForDomain } from "../../util/favicon.js";
 import { getLogger } from "../../util/logger.js";
 import {
   DEFAULT_BASE_DELAY_MS,
@@ -12,6 +16,7 @@ import {
 } from "../../util/retry.js";
 import { registerTool } from "../registry.js";
 import type { Tool, ToolContext, ToolExecutionResult } from "../types.js";
+import { extractDomain } from "./domain-normalize.js";
 
 const log = getLogger("web-search");
 
@@ -201,6 +206,85 @@ function formatTavilyResults(
   return lines.join("\n");
 }
 
+function buildBraveMetadata(
+  results: BraveSearchResult[],
+  query: string,
+  durationMs: number,
+): WebSearchMetadata {
+  const items: WebSearchResultItem[] = results.map((r, i) => {
+    const domain = extractDomain(r.url);
+    return {
+      rank: i + 1,
+      title: r.title,
+      url: r.url,
+      domain,
+      faviconUrl: faviconUrlForDomain(domain),
+      snippet: r.description,
+      age: r.age,
+    };
+  });
+  return {
+    query,
+    provider: "brave",
+    resultCount: items.length,
+    durationMs,
+    results: items,
+  };
+}
+
+function buildPerplexityMetadata(
+  data: PerplexityResponse,
+  query: string,
+  durationMs: number,
+): WebSearchMetadata {
+  const citations = data.citations ?? [];
+  const items: WebSearchResultItem[] = citations.map((url, i) => {
+    const domain = extractDomain(url);
+    return {
+      rank: i + 1,
+      title: "",
+      url,
+      domain,
+      faviconUrl: faviconUrlForDomain(domain),
+    };
+  });
+  return {
+    query,
+    provider: "perplexity",
+    resultCount: items.length,
+    durationMs,
+    results: items,
+  };
+}
+
+function buildTavilyMetadata(
+  data: TavilySearchResponse,
+  query: string,
+  durationMs: number,
+): WebSearchMetadata {
+  const results = data.results ?? [];
+  const items: WebSearchResultItem[] = results.map((r, i) => {
+    const url = r.url ?? "";
+    const domain = extractDomain(url);
+    return {
+      rank: i + 1,
+      title: r.title?.trim() || url.trim() || "Untitled result",
+      url,
+      domain,
+      faviconUrl: r.favicon ?? faviconUrlForDomain(domain),
+      snippet: r.content,
+      score: r.score,
+    };
+  });
+  return {
+    query,
+    provider: "tavily",
+    resultCount: items.length,
+    durationMs,
+    results: items,
+  };
+}
+
 function tavilyTimeRangeForFreshness(
   freshness: string | undefined,
 ): "day" | "week" | "month" | "year" | undefined {
@@ -218,6 +302,28 @@ function tavilyTimeRangeForFreshness(
   }
 }
 
+function errorResult(
+  query: string,
+  provider: WebSearchProvider,
+  startedAt: number,
+  errorMessage: string,
+): ToolExecutionResult {
+  return {
+    content: `Error: ${errorMessage}`,
+    isError: true,
+    activityMetadata: {
+      webSearch: {
+        query,
+        provider,
+        resultCount: 0,
+        durationMs: Date.now() - startedAt,
+        results: [],
+        errorMessage,
+      },
+    },
+  };
+}
+
 async function executeBraveSearch(
   query: string,
   count: number,
@@ -238,6 +344,7 @@ async function executeBraveSearch(
   }
 
   const url = `${BRAVE_API_URL}?${params.toString()}`;
+  const startedAt = Date.now();
 
   for (let attempt = 0; attempt <= DEFAULT_MAX_RETRIES; attempt++) {
     const response = await fetch(url, {
@@ -252,6 +359,7 @@ async function executeBraveSearch(
     if (response.ok) {
       const data = (await response.json()) as BraveSearchResponse;
       const results = data.web?.results ?? [];
+      const durationMs = Date.now() - startedAt;
       return {
         content:
           wrapUntrustedContent(formatBraveResults(results, query), {
@@ -259,16 +367,21 @@ async function executeBraveSearch(
             sourceDetail: "brave",
           }) + CITATION_INSTRUCTION,
         isError: false,
+        activityMetadata: {
+          webSearch: buildBraveMetadata(results, query, durationMs),
+        },
       };
     }
 
     await response.text();
 
     if (response.status === 401 || response.status === 403) {
-      return {
-        content: "Error: Invalid or expired Brave Search API key",
-        isError: true,
-      };
+      return errorResult(
+        query,
+        "brave",
+        startedAt,
+        "Invalid or expired Brave Search API key",
+      );
     }
 
     if (response.status === 429 && attempt < DEFAULT_MAX_RETRIES) {
@@ -286,24 +399,22 @@ async function executeBraveSearch(
     }
 
     log.warn({ status: response.status }, "Brave Search API error");
-    if (response.status === 429) {
-      return {
-        content:
-          "Error: Brave Search rate limit exceeded after retries. Try again shortly.",
-        isError: true,
-      };
-    }
-    return {
-      content: `Error: Brave Search API returned status ${response.status}`,
-      isError: true,
-    };
+    return errorResult(
+      query,
+      "brave",
+      startedAt,
+      response.status === 429
+        ? "Brave Search rate limit exceeded after retries. Try again shortly."
+        : `Brave Search API returned status ${response.status}`,
+    );
   }
 
-  return {
-    content:
-      "Error: Brave Search rate limit exceeded after retries. Try again shortly.",
-    isError: true,
-  };
+  return errorResult(
+    query,
+    "brave",
+    startedAt,
+    "Brave Search rate limit exceeded after retries. Try again shortly.",
+  );
 }
 
 async function executePerplexitySearch(
@@ -311,6 +422,7 @@ async function executePerplexitySearch(
   apiKey: string,
   signal?: AbortSignal,
 ): Promise<ToolExecutionResult> {
+  const startedAt = Date.now();
   for (let attempt = 0; attempt <= DEFAULT_MAX_RETRIES; attempt++) {
     const response = await fetch(PERPLEXITY_API_URL, {
       method: "POST",
@@ -327,6 +439,7 @@ async function executePerplexitySearch(
 
     if (response.ok) {
       const data = (await response.json()) as PerplexityResponse;
+      const durationMs = Date.now() - startedAt;
       return {
         content:
           wrapUntrustedContent(formatPerplexityResults(data, query), {
@@ -334,16 +447,21 @@ async function executePerplexitySearch(
             sourceDetail: "perplexity",
           }) + CITATION_INSTRUCTION,
         isError: false,
+        activityMetadata: {
+          webSearch: buildPerplexityMetadata(data, query, durationMs),
+        },
       };
     }
 
     await response.text();
 
     if (response.status === 401 || response.status === 403) {
-      return {
-        content: "Error: Invalid or expired Perplexity API key",
-        isError: true,
-      };
+      return errorResult(
+        query,
+        "perplexity",
+        startedAt,
+        "Invalid or expired Perplexity API key",
+      );
     }
 
     if (response.status === 429 && attempt < DEFAULT_MAX_RETRIES) {
@@ -361,24 +479,22 @@ async function executePerplexitySearch(
     }
 
     log.warn({ status: response.status }, "Perplexity API error");
-    if (response.status === 429) {
-      return {
-        content:
-          "Error: Perplexity rate limit exceeded after retries. Try again shortly.",
-        isError: true,
-      };
-    }
-    return {
-      content: `Error: Perplexity API returned status ${response.status}`,
-      isError: true,
-    };
+    return errorResult(
+      query,
+      "perplexity",
+      startedAt,
+      response.status === 429
+        ? "Perplexity rate limit exceeded after retries. Try again shortly."
+        : `Perplexity API returned status ${response.status}`,
+    );
   }
 
-  return {
-    content:
-      "Error: Perplexity rate limit exceeded after retries. Try again shortly.",
-    isError: true,
-  };
+  return errorResult(
+    query,
+    "perplexity",
+    startedAt,
+    "Perplexity rate limit exceeded after retries. Try again shortly.",
+  );
 }
 
 async function executeTavilySearch(
@@ -398,6 +514,8 @@ async function executeTavilySearch(
     body.time_range = timeRange;
   }
 
+  const startedAt = Date.now();
+
   for (let attempt = 0; attempt <= DEFAULT_MAX_RETRIES; attempt++) {
     const response = await fetch(TAVILY_API_URL, {
       method: "POST",
@@ -412,6 +530,7 @@ async function executeTavilySearch(
 
     if (response.ok) {
       const data = (await response.json()) as TavilySearchResponse;
+      const durationMs = Date.now() - startedAt;
       return {
         content:
           wrapUntrustedContent(formatTavilyResults(data, query), {
@@ -419,16 +538,21 @@ async function executeTavilySearch(
             sourceDetail: "tavily",
           }) + CITATION_INSTRUCTION,
         isError: false,
+        activityMetadata: {
+          webSearch: buildTavilyMetadata(data, query, durationMs),
+        },
       };
     }
 
     await response.text();
 
     if (response.status === 401 || response.status === 403) {
-      return {
-        content: "Error: Invalid or expired Tavily API key",
-        isError: true,
-      };
+      return errorResult(
+        query,
+        "tavily",
+        startedAt,
+        "Invalid or expired Tavily API key",
+      );
     }
 
     if (response.status === 429 && attempt < DEFAULT_MAX_RETRIES) {
@@ -446,24 +570,22 @@ async function executeTavilySearch(
     }
 
     log.warn({ status: response.status }, "Tavily Search API error");
-    if (response.status === 429) {
-      return {
-        content:
-          "Error: Tavily Search rate limit exceeded after retries. Try again shortly.",
-        isError: true,
-      };
-    }
-    return {
-      content: `Error: Tavily Search API returned status ${response.status}`,
-      isError: true,
-    };
+    return errorResult(
+      query,
+      "tavily",
+      startedAt,
+      response.status === 429
+        ? "Tavily Search rate limit exceeded after retries. Try again shortly."
+        : `Tavily Search API returned status ${response.status}`,
+    );
   }
 
-  return {
-    content:
-      "Error: Tavily Search rate limit exceeded after retries. Try again shortly.",
-    isError: true,
-  };
+  return errorResult(
+    query,
+    "tavily",
+    startedAt,
+    "Tavily Search rate limit exceeded after retries. Try again shortly.",
+  );
 }
 
 // ----------------------------------------------------------------------------
@@ -527,39 +649,33 @@ class WebSearchTool implements Tool {
   description =
     "Search the web and return results. Useful for looking up current information, documentation, or anything the assistant doesn't know.";
   category = "network";
+  executionTarget = "sandbox" as const;
   defaultRiskLevel = RiskLevel.Low;
-
-  getDefinition(): ToolDefinition {
-    return {
-      name: this.name,
-      description: this.description,
-      input_schema: {
-        type: "object",
-        properties: {
-          query: {
-            type: "string",
-            description: "The search query string",
-          },
-          count: {
-            type: "number",
-            description:
-              "Number of results to return (1-20, default 10). Used with Brave and Tavily providers.",
-          },
-          offset: {
-            type: "number",
-            description:
-              "Pagination offset (0-9, default 0). Only used with Brave provider.",
-          },
-          freshness: {
-            type: "string",
-            description:
-              'Filter by recency: "pd" (past day), "pw" (past week), "pm" (past month), "py" (past year). Used with Brave and Tavily providers.',
-          },
-        },
-        required: ["query"],
+  input_schema = {
+    type: "object",
+    properties: {
+      query: {
+        type: "string",
+        description: "The search query string",
       },
-    };
-  }
+      count: {
+        type: "number",
+        description:
+          "Number of results to return (1-20, default 10). Used with Brave and Tavily providers.",
+      },
+      offset: {
+        type: "number",
+        description:
+          "Pagination offset (0-9, default 0). Only used with Brave provider.",
+      },
+      freshness: {
+        type: "string",
+        description:
+          'Filter by recency: "pd" (past day), "pw" (past week), "pm" (past month), "py" (past year). Used with Brave and Tavily providers.',
+      },
+    },
+    required: ["query"],
+  };
 
   async execute(
     input: Record<string, unknown>,
@@ -573,6 +689,7 @@ class WebSearchTool implements Tool {
       };
     }
 
+    const startedAt = Date.now();
     let provider = getWebSearchProvider();
     let apiKey = await getApiKey(provider);
 
@@ -594,11 +711,12 @@ class WebSearchTool implements Tool {
       }
 
       if (!apiKey) {
-        return {
-          content:
-            "Error: No web search API key configured. Set it via `keys set perplexity <key>`, `keys set brave <key>`, or `keys set tavily <key>`, or configure it from the Settings page under API Keys.",
-          isError: true,
-        };
+        return errorResult(
+          query,
+          provider,
+          startedAt,
+          "No web search API key configured. Set it via `keys set perplexity <key>`, `keys set brave <key>`, or `keys set tavily <key>`, or configure it from the Settings page under API Keys.",
+        );
       }
     }
 
@@ -627,7 +745,7 @@ class WebSearchTool implements Tool {
     } catch (err) {
       const msg = err instanceof Error ? err.message : String(err);
       log.error({ err }, "Web search failed");
-      return { content: `Error: Web search failed: ${msg}`, isError: true };
+      return errorResult(query, provider, startedAt, `Web search failed: ${msg}`);
     }
   }
 }

package/src/tools/registry.ts

@@ -10,7 +10,7 @@ import { hostFileWriteTool } from "./host-filesystem/write.js";
 import { hostShellTool } from "./host-terminal/host-shell.js";
 import { toProviderSafeToolName } from "./provider-tool-name.js";
 import { registerSystemTools } from "./system/register.js";
-import type { LoadedPluginTool, Tool } from "./types.js";
+import type { LoadedTool, Tool } from "./types.js";
 import { allUiSurfaceTools } from "./ui-surface/definitions.js";
 import { registerUiSurfaceTools } from "./ui-surface/registry.js";
 
@@ -85,12 +85,6 @@ function withProviderSafeToolName(tool: Tool): Tool {
   return {
     ...tool,
     name: safeName,
-    getDefinition(): ToolDefinition {
-      return {
-        ...tool.getDefinition(),
-        name: safeName,
-      };
-    },
   };
 }
 
@@ -193,12 +187,11 @@ export function registerSkillTools(newTools: Tool[]): Tool[] {
  */
 export function registerPluginTools(
   pluginName: string,
-  newTools: LoadedPluginTool[],
+  newTools: LoadedTool[],
 ): Tool[] {
   const stamped: Tool[] = newTools.map((pluginTool) => {
-    const { input_schema, ...rest } = pluginTool;
     const tool: Tool = {
-      ...rest,
+      ...pluginTool,
       category: "plugin",
       origin: "plugin" as const,
       ownerPluginId: pluginName,
@@ -206,13 +199,6 @@ export function registerPluginTools(
       ownerMcpServerId: undefined,
       ownerSkillBundled: undefined,
       ownerSkillVersionHash: undefined,
-      getDefinition(): ToolDefinition {
-        return {
-          name: pluginTool.name,
-          description: pluginTool.description,
-          input_schema,
-        };
-      },
     };
     return withProviderSafeToolName(tool);
   });
@@ -399,9 +385,7 @@ export function unregisterAllMcpTools(): void {
  * were registered after session creation (e.g. via `vellum mcp reload`).
  */
 export function getMcpToolDefinitions(): ToolDefinition[] {
-  return Array.from(tools.values())
-    .filter((t) => t.origin === "mcp")
-    .map((t) => t.getDefinition());
+  return Array.from(tools.values()).filter((t) => t.origin === "mcp");
 }
 
 /**
@@ -428,9 +412,9 @@ export function getAllToolDefinitions(): ToolDefinition[] {
   // the base tool list, which is shared across sessions via the global
   // registry.  Including them here causes "Tool names must be unique"
   // errors when the projection appends the same tools a second time.
-  return getAllTools()
-    .filter((t) => t.executionMode !== "proxy" && t.origin !== "skill")
-    .map((t) => t.getDefinition());
+  return getAllTools().filter(
+    (t) => t.executionMode !== "proxy" && t.origin !== "skill",
+  );
 }
 
 export async function initializeTools(): Promise<void> {

package/src/tools/schema-transforms.ts

@@ -12,7 +12,7 @@ export const ACTIVITY_SKIP_SET = new Set<string>();
  * or has a non-object schema.
  *
  * CRITICAL: Never mutates the input definitions - always returns deep clones
- * for any modified definition, since `getDefinition()` returns shared refs.
+ * for any modified definition, since `Tool.input_schema` is a shared ref.
  */
 export function injectActivityField(
   definitions: ToolDefinition[],

package/src/tools/skills/execute.ts

@@ -1,5 +1,4 @@
 import { RiskLevel } from "../../permissions/types.js";
-import type { ToolDefinition } from "../../providers/types.js";
 import { registerTool } from "../registry.js";
 import type { Tool, ToolContext, ToolExecutionResult } from "../types.js";
 
@@ -8,13 +7,10 @@ class SkillExecuteTool implements Tool {
   description =
     "Execute a tool provided by a loaded skill. Use this instead of calling skill tools directly. The skill's instructions (from skill_load) describe available tools and their parameters. For browser automation, use the `assistant browser` CLI commands instead.";
   category = "skills";
+  executionTarget = "sandbox" as const;
   defaultRiskLevel = RiskLevel.Low;
 
-  getDefinition(): ToolDefinition {
-    return {
-      name: this.name,
-      description: this.description,
-      input_schema: {
+  input_schema = {
         type: "object",
         properties: {
           tool: {
@@ -34,9 +30,7 @@ class SkillExecuteTool implements Tool {
           },
         },
         required: ["tool", "input", "activity"],
-      },
-    };
-  }
+      };
 
   async execute(
     _input: Record<string, unknown>,

package/src/tools/skills/load.ts

@@ -11,7 +11,6 @@ import {
   loadSkillCatalog,
 } from "../../config/skills.js";
 import { RiskLevel } from "../../permissions/types.js";
-import type { ToolDefinition } from "../../providers/types.js";
 import {
   autoInstallFromCatalog,
   resolveCatalog,
@@ -126,13 +125,10 @@ export class SkillLoadTool implements Tool {
   description =
     "Load full instructions for a skill. Works for both bundled skills (listed in the catalog) and custom workspace skills.";
   category = "skills";
+  executionTarget = "sandbox" as const;
   defaultRiskLevel = RiskLevel.Low;
 
-  getDefinition(): ToolDefinition {
-    return {
-      name: this.name,
-      description: this.description,
-      input_schema: {
+  input_schema = {
         type: "object",
         properties: {
           skill: {
@@ -141,9 +137,7 @@ export class SkillLoadTool implements Tool {
           },
         },
         required: ["skill"],
-      },
-    };
-  }
+      };
 
   async execute(
     input: Record<string, unknown>,

package/src/tools/skills/skill-tool-factory.ts

@@ -1,6 +1,5 @@
 import type { SkillToolEntry } from "../../config/skills.js";
 import { RiskLevel } from "../../permissions/types.js";
-import type { ToolDefinition } from "../../providers/types.js";
 import type {
   ExecutionTarget,
   Tool,
@@ -63,13 +62,7 @@ export function createSkillTool(
     ownerSkillVersionHash: versionHash,
     ownerSkillBundled: bundled,
 
-    getDefinition(): ToolDefinition {
-      return {
-        name: entry.name,
-        description: entry.description,
-        input_schema: entry.input_schema as ToolDefinition["input_schema"],
-      };
-    },
+    input_schema: entry.input_schema as object,
 
     async execute(
       input: Record<string, unknown>,

package/src/tools/subagent/notify-parent.ts

@@ -1,5 +1,4 @@
 import { RiskLevel } from "../../permissions/types.js";
-import type { ToolDefinition } from "../../providers/types.js";
 import { getSubagentManager } from "../../subagent/index.js";
 import { registerTool } from "../registry.js";
 import type { Tool, ToolContext, ToolExecutionResult } from "../types.js";
@@ -37,13 +36,10 @@ class NotifyParentTool implements Tool {
   description =
     "Send a notification to the parent conversation. Use this for important findings, when you're blocked, or when you have preliminary results the parent should know about. Do not overuse — notify for significant findings, not after every tool call.";
   category = "orchestration";
+  executionTarget = "sandbox" as const;
   defaultRiskLevel = RiskLevel.Low;
 
-  getDefinition(): ToolDefinition {
-    return {
-      name: this.name,
-      description: this.description,
-      input_schema: {
+  input_schema = {
         type: "object",
         properties: {
           message: {
@@ -63,9 +59,7 @@ class NotifyParentTool implements Tool {
           },
         },
         required: ["message", "activity"],
-      },
-    };
-  }
+      };
 
   async execute(
     input: Record<string, unknown>,