migrate listRepos & listCommits

brendan-kellam · brendan-kellam · commit e9c4b3dfe0a7 · 2026-03-17T16:57:42.000-07:00
diff --git a/packages/web/src/features/chat/agent.ts b/packages/web/src/features/chat/agent.ts
@@ -15,9 +15,11 @@ import {
 import { randomUUID } from "crypto";
 import _dedent from "dedent";
 import { ANSWER_TAG, FILE_REFERENCE_PREFIX, toolNames } from "./constants";
-import { findSymbolDefinitionsTool, findSymbolReferencesTool, listCommitsTool, listReposTool, searchCodeTool } from "./tools";
+import { findSymbolDefinitionsTool, findSymbolReferencesTool, searchCodeTool } from "./tools";
 import { toVercelAITool } from "@/features/tools/adapters";
 import { readFileDefinition } from "@/features/tools/readFile";
+import { listCommitsDefinition } from "@/features/tools/listCommits";
+import { listReposDefinition } from "@/features/tools/listRepos";
 import { Source } from "./types";
 import { addLineNumbers, fileReferenceToString } from "./utils";
 
@@ -205,8 +207,8 @@ const createAgentStream = async ({
             [toolNames.readFile]: toVercelAITool(readFileDefinition),
             [toolNames.findSymbolReferences]: findSymbolReferencesTool,
             [toolNames.findSymbolDefinitions]: findSymbolDefinitionsTool,
-            [toolNames.listRepos]: listReposTool,
-            [toolNames.listCommits]: listCommitsTool,
+            [toolNames.listRepos]: toVercelAITool(listReposDefinition),
+            [toolNames.listCommits]: toVercelAITool(listCommitsDefinition),
         },
         temperature: env.SOURCEBOT_CHAT_MODEL_TEMPERATURE,
         stopWhen: [
diff --git a/packages/web/src/features/chat/components/chatThread/tools/listCommitsToolComponent.tsx b/packages/web/src/features/chat/components/chatThread/tools/listCommitsToolComponent.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { ListCommitsToolUIPart } from "@/features/chat/tools";
+import { ListCommitsToolUIPart } from "@/features/tools/registry";
 import { isServiceError } from "@/lib/utils";
 import { useMemo, useState } from "react";
 import { ToolHeader, TreeList } from "./shared";
@@ -41,14 +41,14 @@ export const ListCommitsToolComponent = ({ part }: { part: ListCommitsToolUIPart
                         </TreeList>
                     ) : (
                         <>
-                            {part.output.commits.length === 0 ? (
+                            {part.output.metadata.commits.length === 0 ? (
                                 <span className="text-sm text-muted-foreground ml-[25px]">No commits found</span>
                             ) : (
                                 <TreeList>
                                     <div className="text-sm text-muted-foreground mb-2">
-                                        Found {part.output.commits.length} of {part.output.totalCount} total commits:
+                                        Found {part.output.metadata.commits.length} of {part.output.metadata.totalCount} total commits:
                                     </div>
-                                    {part.output.commits.map((commit) => (
+                                    {part.output.metadata.commits.map((commit) => (
                                         <div key={commit.hash} className="mb-3 last:mb-0">
                                             <div className="flex items-start gap-2 text-sm">
                                                 <GitCommitVerticalIcon className="h-4 w-4 text-muted-foreground mt-0.5 flex-shrink-0" />
diff --git a/packages/web/src/features/chat/components/chatThread/tools/listReposToolComponent.tsx b/packages/web/src/features/chat/components/chatThread/tools/listReposToolComponent.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { ListReposToolUIPart } from "@/features/chat/tools";
+import { ListReposToolUIPart } from "@/features/tools/registry";
 import { isServiceError } from "@/lib/utils";
 import { useMemo, useState } from "react";
 import { ToolHeader, TreeList } from "./shared";
@@ -41,14 +41,14 @@ export const ListReposToolComponent = ({ part }: { part: ListReposToolUIPart })
                         </TreeList>
                     ) : (
                         <>
-                            {part.output.length === 0 ? (
+                            {part.output.metadata.repos.length === 0 ? (
                                 <span className="text-sm text-muted-foreground ml-[25px]">No repositories found</span>
                             ) : (
                                 <TreeList>
                                     <div className="text-sm text-muted-foreground mb-2">
-                                        Found {part.output.length} repositories:
+                                        Found {part.output.metadata.repos.length} repositories:
                                     </div>
-                                    {part.output.map((repoName, index) => (
+                                    {part.output.metadata.repos.map((repoName, index) => (
                                         <div key={index} className="flex items-center gap-2 text-sm">
                                             <FolderOpenIcon className="h-4 w-4 text-muted-foreground" />
                                             <span className="truncate">{repoName}</span>
diff --git a/packages/web/src/features/chat/tools/index.ts b/packages/web/src/features/chat/tools/index.ts
@@ -11,5 +11,3 @@
 export * from "./findSymbolReferences";
 export * from "./findSymbolDefinitions";
 export * from "./searchCode";
-export * from "./listRepos";
-export * from "./listCommits";
diff --git a/packages/web/src/features/chat/tools/listCommits.ts b/packages/web/src/features/chat/tools/listCommits.ts
diff --git a/packages/web/src/features/chat/tools/listRepos.ts b/packages/web/src/features/chat/tools/listRepos.ts
diff --git a/packages/web/src/features/chat/types.ts b/packages/web/src/features/chat/types.ts
@@ -3,7 +3,7 @@ import { BaseEditor, Descendant } from "slate";
 import { HistoryEditor } from "slate-history";
 import { ReactEditor, RenderElementProps } from "slate-react";
 import { z } from "zod";
-import { FindSymbolDefinitionsTool, FindSymbolReferencesTool, SearchCodeTool, ListReposTool, ListCommitsTool } from "./tools";
+import { FindSymbolDefinitionsTool, FindSymbolReferencesTool, SearchCodeTool } from "./tools";
 import { toolNames } from "./constants";
 import { ToolTypes } from "@/features/tools/registry";
 import { LanguageModel } from "@sourcebot/schemas/v3/index.type";
@@ -84,8 +84,8 @@ export type SBChatMessageToolTypes = {
     [toolNames.readFile]: ToolTypes['readFile'],
     [toolNames.findSymbolReferences]: FindSymbolReferencesTool,
     [toolNames.findSymbolDefinitions]: FindSymbolDefinitionsTool,
-    [toolNames.listRepos]: ListReposTool,
-    [toolNames.listCommits]: ListCommitsTool,
+    [toolNames.listRepos]: ToolTypes['listRepos'],
+    [toolNames.listCommits]: ToolTypes['listCommits'],
 }
 
 export type SBChatMessageDataParts = {
diff --git a/packages/web/src/features/tools/listCommits.ts b/packages/web/src/features/tools/listCommits.ts
@@ -0,0 +1,69 @@
+import { z } from "zod";
+import { isServiceError } from "@/lib/utils";
+import { listCommits } from "@/features/git";
+import { createLogger } from "@sourcebot/shared";
+import { ToolDefinition } from "./types";
+import description from "./listCommits.txt";
+
+const logger = createLogger('tool-listCommits');
+
+const listCommitsShape = {
+    repository: z.string().describe("The repository to list commits from"),
+    query: z.string().describe("Search query to filter commits by message (case-insensitive)").optional(),
+    since: z.string().describe("Start date for commit range (e.g., '30 days ago', '2024-01-01', 'last week')").optional(),
+    until: z.string().describe("End date for commit range (e.g., 'yesterday', '2024-12-31', 'today')").optional(),
+    author: z.string().describe("Filter commits by author name or email (case-insensitive)").optional(),
+    maxCount: z.number().describe("Maximum number of commits to return (default: 50)").optional(),
+};
+
+export type Commit = {
+    hash: string;
+    date: string;
+    message: string;
+    author: string;
+    refs: string;
+};
+
+export type ListCommitsMetadata = {
+    commits: Commit[];
+    totalCount: number;
+};
+
+export const listCommitsDefinition: ToolDefinition<"listCommits", typeof listCommitsShape, ListCommitsMetadata> = {
+    name: "listCommits",
+    description,
+    inputSchema: z.object(listCommitsShape),
+    execute: async ({ repository, query, since, until, author, maxCount }) => {
+        logger.debug('listCommits', { repository, query, since, until, author, maxCount });
+        const response = await listCommits({
+            repo: repository,
+            query,
+            since,
+            until,
+            author,
+            maxCount,
+        });
+
+        if (isServiceError(response)) {
+            throw new Error(response.message);
+        }
+
+        const commits: Commit[] = response.commits.map((commit) => ({
+            hash: commit.hash,
+            date: commit.date,
+            message: commit.message,
+            author: `${commit.author_name} <${commit.author_email}>`,
+            refs: commit.refs,
+        }));
+
+        const metadata: ListCommitsMetadata = {
+            commits,
+            totalCount: response.totalCount,
+        };
+
+        return {
+            output: JSON.stringify(metadata),
+            metadata,
+        };
+    },
+};
diff --git a/packages/web/src/features/tools/listCommits.txt b/packages/web/src/features/tools/listCommits.txt
diff --git a/packages/web/src/features/tools/listRepos.ts b/packages/web/src/features/tools/listRepos.ts
@@ -0,0 +1,48 @@
+import { z } from "zod";
+import { isServiceError } from "@/lib/utils";
+import { listRepos } from "@/app/api/(server)/repos/listReposApi";
+import { ToolDefinition } from "./types";
+import description from './listRepos.txt';
+
+const listReposShape = {
+    page: z.coerce.number().int().positive().default(1).describe("Page number for pagination"),
+    perPage: z.coerce.number().int().positive().max(100).default(30).describe("Number of repositories per page (max 100)"),
+    sort: z.enum(['name', 'pushed']).default('name').describe("Sort repositories by name or last pushed date"),
+    direction: z.enum(['asc', 'desc']).default('asc').describe("Sort direction"),
+    query: z.string().optional().describe("Filter repositories by name"),
+};
+
+type ListReposMetadata = {
+    repos: string[];
+};
+
+export const listReposDefinition: ToolDefinition<
+    'listRepos',
+    typeof listReposShape,
+    ListReposMetadata
+> = {
+    name: 'listRepos',
+    description,
+    inputSchema: z.object(listReposShape),
+    execute: async ({ page, perPage, sort, direction, query }) => {
+        const reposResponse = await listRepos({
+            page,
+            perPage,
+            sort,
+            direction,
+            query,
+        });
+
+        if (isServiceError(reposResponse)) {
+            throw new Error(reposResponse.message);
+        }
+
+        const repos = reposResponse.data.map((repo) => repo.repoName);
+        const metadata: ListReposMetadata = { repos };
+
+        return {
+            output: JSON.stringify(metadata),
+            metadata,
+        };
+    },
+};
diff --git a/packages/web/src/features/tools/listRepos.txt b/packages/web/src/features/tools/listRepos.txt
diff --git a/packages/web/src/features/tools/registry.ts b/packages/web/src/features/tools/registry.ts
@@ -1,17 +1,23 @@
 import { InferUITool, ToolUIPart } from "ai";
 import { weatherDefinition } from "./weather";
 import { readFileDefinition } from "./readFile";
+import { listCommitsDefinition } from "./listCommits";
+import { listReposDefinition } from "./listRepos";
 import { toVercelAITool } from "./adapters";
 
 export const toolRegistry = {
     [weatherDefinition.name]: weatherDefinition,
     [readFileDefinition.name]: readFileDefinition,
+    [listCommitsDefinition.name]: listCommitsDefinition,
+    [listReposDefinition.name]: listReposDefinition,
 } as const;
 
 // Vercel AI tool wrappers, keyed by tool name — pass directly to streamText.
 export const vercelAITools = {
     [weatherDefinition.name]: toVercelAITool(weatherDefinition),
     [readFileDefinition.name]: toVercelAITool(readFileDefinition),
+    [listCommitsDefinition.name]: toVercelAITool(listCommitsDefinition),
+    [listReposDefinition.name]: toVercelAITool(listReposDefinition),
 } as const;
 
 // Derive SBChatMessageToolTypes from the registry so that adding a tool here
@@ -21,3 +27,5 @@ export type ToolTypes = {
 };
 
 export type ReadFileToolUIPart = ToolUIPart<{ readFile: ToolTypes['readFile'] }>;
+export type ListCommitsToolUIPart = ToolUIPart<{ listCommits: ToolTypes['listCommits'] }>;
+export type ListReposToolUIPart = ToolUIPart<{ listRepos: ToolTypes['listRepos'] }>;
