wip

Author: brendan-kellam

packages/web/src/features/tools/adapters.ts

@@ -9,7 +9,7 @@ export function toVercelAITool<TName extends string, TShape extends z.ZodRawShap
     return tool({
         description: def.description,
         inputSchema: def.inputSchema,
-        execute: def.execute,
+        execute: (input) => def.execute(input, { source: 'sourcebot-ask-agent' }),
         toModelOutput: ({ output }) => ({
             type: "content",
             value: [{ type: "text", text: output.output }],
@@ -30,7 +30,7 @@ export function registerMcpTool<TName extends string, TShape extends z.ZodRawSha
         async (input) => {
             try {
                 const parsed = def.inputSchema.parse(input);
-                const result = await def.execute(parsed);
+                const result = await def.execute(parsed, { source: 'mcp' });
                 return { content: [{ type: "text" as const, text: result.output }] };
             } catch (error) {
                 const message = error instanceof Error ? error.message : String(error);

packages/web/src/features/tools/findSymbolDefinitions.ts

@@ -2,13 +2,11 @@ import { z } from "zod";
 import { isServiceError } from "@/lib/utils";
 import { findSearchBasedSymbolDefinitions } from "@/features/codeNav/api";
 import { addLineNumbers } from "@/features/chat/utils";
-import { createLogger } from "@sourcebot/shared";
 import { ToolDefinition } from "./types";
 import { FindSymbolFile } from "./findSymbolReferences";
+import { logger } from "./logger";
 import description from "./findSymbolDefinitions.txt";
 
-const logger = createLogger('tool-findSymbolDefinitions');
-
 const findSymbolDefinitionsShape = {
     symbol: z.string().describe("The symbol to find definitions of"),
     language: z.string().describe("The programming language of the symbol"),
@@ -27,8 +25,8 @@ export const findSymbolDefinitionsDefinition: ToolDefinition<
     name: 'find_symbol_definitions',
     description,
     inputSchema: z.object(findSymbolDefinitionsShape),
-    execute: async ({ symbol, language, repo }) => {
-        logger.debug('findSymbolDefinitions', { symbol, language, repo });
+    execute: async ({ symbol, language, repo }, _context) => {
+        logger.debug('find_symbol_definitions', { symbol, language, repo });
         const revision = "HEAD";
 
         const response = await findSearchBasedSymbolDefinitions({

packages/web/src/features/tools/findSymbolReferences.ts

@@ -2,12 +2,10 @@ import { z } from "zod";
 import { isServiceError } from "@/lib/utils";
 import { findSearchBasedSymbolReferences } from "@/features/codeNav/api";
 import { addLineNumbers } from "@/features/chat/utils";
-import { createLogger } from "@sourcebot/shared";
 import { ToolDefinition } from "./types";
+import { logger } from "./logger";
 import description from "./findSymbolReferences.txt";
 
-const logger = createLogger('tool-findSymbolReferences');
-
 const findSymbolReferencesShape = {
     symbol: z.string().describe("The symbol to find references to"),
     language: z.string().describe("The programming language of the symbol"),
@@ -34,8 +32,8 @@ export const findSymbolReferencesDefinition: ToolDefinition<
     name: 'find_symbol_references',
     description,
     inputSchema: z.object(findSymbolReferencesShape),
-    execute: async ({ symbol, language, repo }) => {
-        logger.debug('findSymbolReferences', { symbol, language, repo });
+    execute: async ({ symbol, language, repo }, _context) => {
+        logger.debug('find_symbol_references', { symbol, language, repo });
         const revision = "HEAD";
 
         const response = await findSearchBasedSymbolReferences({

packages/web/src/features/tools/listCommits.ts

@@ -1,12 +1,10 @@
 import { z } from "zod";
 import { isServiceError } from "@/lib/utils";
 import { listCommits, SearchCommitsResult } from "@/features/git";
-import { createLogger } from "@sourcebot/shared";
 import { ToolDefinition } from "./types";
+import { logger } from "./logger";
 import description from "./listCommits.txt";
 
-const logger = createLogger('tool-listCommits');
-
 const listCommitsShape = {
     repo: z.string().describe("The repository to list commits from"),
     query: z.string().describe("Search query to filter commits by message (case-insensitive)").optional(),
@@ -24,7 +22,7 @@ export const listCommitsDefinition: ToolDefinition<"list_commits", typeof listCo
     name: "list_commits",
     description,
     inputSchema: z.object(listCommitsShape),
-    execute: async (params) => {
+    execute: async (params, _context) => {
         logger.debug('list_commits', params);
 
         const { repo, query, since, until, author, ref, page, perPage } = params;

packages/web/src/features/tools/listRepos.ts

@@ -2,6 +2,7 @@ import { z } from "zod";
 import { isServiceError } from "@/lib/utils";
 import { listRepos } from "@/app/api/(server)/repos/listReposApi";
 import { ToolDefinition } from "./types";
+import { logger } from "./logger";
 import description from './listRepos.txt';
 
 const listReposShape = {
@@ -34,8 +35,16 @@ export const listReposDefinition: ToolDefinition<
     name: 'list_repos',
     description,
     inputSchema: z.object(listReposShape),
-    execute: async ({ page, perPage, sort, direction, query }) => {
-        const reposResponse = await listRepos({ page, perPage, sort, direction, query });
+    execute: async ({ page, perPage, sort, direction, query }, context) => {
+        logger.debug('list_repos', { page, perPage, sort, direction, query });
+        const reposResponse = await listRepos({
+            page,
+            perPage,
+            sort,
+            direction,
+            query,
+            source: context.source,
+        });
 
         if (isServiceError(reposResponse)) {
             throw new Error(reposResponse.message);

packages/web/src/features/tools/listTree.ts

@@ -3,6 +3,7 @@ import { isServiceError } from "@/lib/utils";
 import { getTree } from "@/features/git";
 import { buildTreeNodeIndex, joinTreePath, normalizeTreePath, sortTreeEntries } from "@/features/mcp/utils";
 import { ToolDefinition } from "./types";
+import { logger } from "./logger";
 import description from "./listTree.txt";
 
 const DEFAULT_TREE_DEPTH = 1;
@@ -41,7 +42,8 @@ export const listTreeDefinition: ToolDefinition<'list_tree', typeof listTreeShap
     name: 'list_tree',
     description,
     inputSchema: z.object(listTreeShape),
-    execute: async ({ repo, path = '', ref = 'HEAD', depth = DEFAULT_TREE_DEPTH, includeFiles = true, includeDirectories = true, maxEntries = DEFAULT_MAX_TREE_ENTRIES }) => {
+    execute: async ({ repo, path = '', ref = 'HEAD', depth = DEFAULT_TREE_DEPTH, includeFiles = true, includeDirectories = true, maxEntries = DEFAULT_MAX_TREE_ENTRIES }, context) => {
+        logger.debug('list_tree', { repo, path, ref, depth, includeFiles, includeDirectories, maxEntries });
         const normalizedPath = normalizeTreePath(path);
         const normalizedDepth = Math.min(depth, MAX_TREE_DEPTH);
         const normalizedMaxEntries = Math.min(maxEntries, MAX_MAX_TREE_ENTRIES);
@@ -74,7 +76,7 @@ export const listTreeDefinition: ToolDefinition<'list_tree', typeof listTreeShap
                 repoName: repo,
                 revisionName: ref,
                 paths: currentLevelPaths.filter(Boolean),
-            });
+            }, { source: context.source });
 
             if (isServiceError(treeResult)) {
                 throw new Error(treeResult.message);

packages/web/src/features/tools/logger.ts

@@ -0,0 +1,3 @@
+import { createLogger } from "@sourcebot/shared";
+
+export const logger = createLogger('tool');

packages/web/src/features/tools/readFile.ts

@@ -1,12 +1,10 @@
 import { z } from "zod";
 import { isServiceError } from "@/lib/utils";
 import { getFileSource } from "@/features/git";
-import { createLogger } from "@sourcebot/shared";
 import { ToolDefinition } from "./types";
+import { logger } from "./logger";
 import description from "./readFile.txt";
 
-const logger = createLogger('tool-readFile');
-
 // NOTE: if you change these values, update readFile.txt to match.
 const READ_FILES_MAX_LINES = 500;
 const MAX_LINE_LENGTH = 2000;
@@ -39,16 +37,16 @@ export const readFileDefinition: ToolDefinition<"read_file", typeof readFileShap
     name: "read_file",
     description,
     inputSchema: z.object(readFileShape),
-    execute: async ({ path, repo, offset, limit }) => {
-        logger.debug('readFile', { path, repo, offset, limit });
+    execute: async ({ path, repo, offset, limit }, context) => {
+        logger.debug('read_file', { path, repo, offset, limit });
         // @todo: make revision configurable.
         const revision = "HEAD";
 
         const fileSource = await getFileSource({
             path,
             repo,
             ref: revision,
-        });
+        }, { source: context.source });
 
         if (isServiceError(fileSource)) {
             throw new Error(fileSource.message);

packages/web/src/features/tools/searchCode.ts

@@ -2,13 +2,11 @@ import { z } from "zod";
 import { isServiceError } from "@/lib/utils";
 import { search } from "@/features/search";
 import { addLineNumbers } from "@/features/chat/utils";
-import { createLogger } from "@sourcebot/shared";
 import escapeStringRegexp from "escape-string-regexp";
 import { ToolDefinition } from "./types";
+import { logger } from "./logger";
 import description from "./searchCode.txt";
 
-const logger = createLogger('tool-searchCode');
-
 const DEFAULT_SEARCH_LIMIT = 100;
 
 const searchCodeShape = {
@@ -77,8 +75,8 @@ export const searchCodeDefinition: ToolDefinition<'search_code', typeof searchCo
         caseSensitive = false,
         ref,
         limit = DEFAULT_SEARCH_LIMIT,
-    }) => {
-        logger.debug('searchCode', { query, useRegex, repos, languages, filepaths, caseSensitive, ref, limit });
+    }, context) => {
+        logger.debug('search_code', { query, useRegex, repos, languages, filepaths, caseSensitive, ref, limit });
 
         if (repos.length > 0) {
             query += ` (repo:${repos.map(id => escapeStringRegexp(id)).join(' or repo:')})`;
@@ -104,7 +102,8 @@ export const searchCodeDefinition: ToolDefinition<'search_code', typeof searchCo
                 contextLines: 3,
                 isCaseSensitivityEnabled: caseSensitive,
                 isRegexEnabled: useRegex,
-            }
+            },
+            source: context.source,
         });
 
         if (isServiceError(response)) {

packages/web/src/features/tools/types.ts

@@ -1,10 +1,9 @@
 import { z } from "zod";
 
-// TShape is constrained to ZodRawShape (i.e. Record<string, ZodType>) so that
-// both adapters receive a statically-known object schema. Tool inputs are
-// always key-value objects, so this constraint is semantically correct and also
-// lets the MCP adapter pass `.shape` (a ZodRawShapeCompat) to registerTool,
-// which avoids an unresolvable conditional type in BaseToolCallback.
+export interface ToolContext {
+    source?: string;
+}
+
 export interface ToolDefinition<
     TName extends string,
     TShape extends z.ZodRawShape,
@@ -13,7 +12,7 @@ export interface ToolDefinition<
     name: TName;
     description: string;
     inputSchema: z.ZodObject<TShape>;
-    execute: (input: z.infer<z.ZodObject<TShape>>) => Promise<ToolResult<TMetadata>>;
+    execute: (input: z.infer<z.ZodObject<TShape>>, context: ToolContext) => Promise<ToolResult<TMetadata>>;
 }
 
 export interface ToolResult<TMetadata = Record<string, unknown>> {