Skip to content

Commit 5286f18

Browse files
cursoragentbrendan-kellam
cursoragent
and
brendan-kellam
committed
Add listCommits tool to Ask Sourcebot
- Add listCommits to toolNames constant and uiVisiblePartTypes - Create listCommitsTool with support for filtering by date range, author, and commit message - Implement ListCommitsToolComponent.tsx for UI display - Integrate tool into agent and detailsCard Co-authored-by: brendan <brendan@sourcebot.dev>
1 parent f2d2fa8 commit 5286f18

6 files changed

Lines changed: 144 additions & 3 deletions

File tree

‎packages/web/src/features/chat/agent.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { createLogger, env } from "@sourcebot/shared";
66
import { env as clientEnv } from "@sourcebot/shared/client";
77
import { LanguageModel, ModelMessage, StopCondition, streamText } from "ai";
88
import { ANSWER_TAG, FILE_REFERENCE_PREFIX, toolNames } from "./constants";
9-
import { createCodeSearchTool, findSymbolDefinitionsTool, findSymbolReferencesTool, listReposTool, readFilesTool } from "./tools";
9+
import { createCodeSearchTool, findSymbolDefinitionsTool, findSymbolReferencesTool, listReposTool, listCommitsTool, readFilesTool } from "./tools";
1010
import { Source } from "./types";
1111
import { addLineNumbers, fileReferenceToString } from "./utils";
1212
import _dedent from "dedent";
@@ -75,6 +75,7 @@ export const createAgentStream = async ({
7575
[toolNames.findSymbolReferences]: findSymbolReferencesTool,
7676
[toolNames.findSymbolDefinitions]: findSymbolDefinitionsTool,
7777
[toolNames.listRepos]: listReposTool,
78+
[toolNames.listCommits]: listCommitsTool,
7879
},
7980
temperature: env.SOURCEBOT_CHAT_MODEL_TEMPERATURE,
8081
stopWhen: [

‎packages/web/src/features/chat/components/chatThread/detailsCard.tsx‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import { FindSymbolReferencesToolComponent } from './tools/findSymbolReferencesT
1414
import { ReadFilesToolComponent } from './tools/readFilesToolComponent';
1515
import { SearchCodeToolComponent } from './tools/searchCodeToolComponent';
1616
import { ListReposToolComponent } from './tools/listReposToolComponent';
17+
import { ListCommitsToolComponent } from './tools/listCommitsToolComponent';
1718
import { SBChatMessageMetadata, SBChatMessagePart } from '../../types';
1819
import { SearchScopeIcon } from '../searchScopeIcon';
1920
import isEqual from "fast-deep-equal/react";
@@ -190,6 +191,13 @@ const DetailsCardComponent = ({
190191
part={part}
191192
/>
192193
)
194+
case 'tool-listCommits':
195+
return (
196+
<ListCommitsToolComponent
197+
key={index}
198+
part={part}
199+
/>
200+
)
193201
default:
194202
return null;
195203
}

‎packages/web/src/features/chat/components/chatThread/tools/listCommitsToolComponent.tsx‎

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
'use client';
2+
3+
import { ListCommitsToolUIPart } from "@/features/chat/tools";
4+
import { isServiceError } from "@/lib/utils";
5+
import { useMemo, useState } from "react";
6+
import { ToolHeader, TreeList } from "./shared";
7+
import { CodeSnippet } from "@/app/components/codeSnippet";
8+
import { Separator } from "@/components/ui/separator";
9+
import { GitCommitVerticalIcon } from "lucide-react";
10+
11+
export const ListCommitsToolComponent = ({ part }: { part: ListCommitsToolUIPart }) => {
12+
const [isExpanded, setIsExpanded] = useState(false);
13+
14+
const label = useMemo(() => {
15+
switch (part.state) {
16+
case 'input-streaming':
17+
return 'Listing commits...';
18+
case 'output-error':
19+
return '"List commits" tool call failed';
20+
case 'input-available':
21+
case 'output-available':
22+
return 'Listed commits';
23+
}
24+
}, [part]);
25+
26+
return (
27+
<div className="my-4">
28+
<ToolHeader
29+
isLoading={part.state !== 'output-available' && part.state !== 'output-error'}
30+
isError={part.state === 'output-error' || (part.state === 'output-available' && isServiceError(part.output))}
31+
isExpanded={isExpanded}
32+
label={label}
33+
Icon={GitCommitVerticalIcon}
34+
onExpand={setIsExpanded}
35+
/>
36+
{part.state === 'output-available' && isExpanded && (
37+
<>
38+
{isServiceError(part.output) ? (
39+
<TreeList>
40+
<span>Failed with the following error: <CodeSnippet className="text-sm text-destructive">{part.output.message}</CodeSnippet></span>
41+
</TreeList>
42+
) : (
43+
<>
44+
{part.output.commits.length === 0 ? (
45+
<span className="text-sm text-muted-foreground ml-[25px]">No commits found</span>
46+
) : (
47+
<TreeList>
48+
<div className="text-sm text-muted-foreground mb-2">
49+
Found {part.output.commits.length} of {part.output.totalCount} total commits:
50+
</div>
51+
{part.output.commits.map((commit, index) => (
52+
<div key={commit.hash} className="mb-3 last:mb-0">
53+
<div className="flex items-start gap-2 text-sm">
54+
<GitCommitVerticalIcon className="h-4 w-4 text-muted-foreground mt-0.5 flex-shrink-0" />
55+
<div className="flex-1 min-w-0">
56+
<div className="flex items-center gap-2 flex-wrap">
57+
<CodeSnippet className="text-xs font-mono">
58+
{commit.hash.substring(0, 7)}
59+
</CodeSnippet>
60+
{commit.refs && (
61+
<span className="text-xs text-muted-foreground">
62+
{commit.refs}
63+
</span>
64+
)}
65+
</div>
66+
<div className="mt-1 font-medium">
67+
{commit.message}
68+
</div>
69+
<div className="flex items-center gap-2 mt-1 text-xs text-muted-foreground">
70+
<span>{commit.author}</span>
71+
<span>•</span>
72+
<span>{new Date(commit.date).toLocaleString()}</span>
73+
</div>
74+
</div>
75+
</div>
76+
</div>
77+
))}
78+
</TreeList>
79+
)}
80+
</>
81+
)}
82+
<Separator className='ml-[7px] my-2' />
83+
</>
84+
)}
85+
</div>
86+
)
87+
}

‎packages/web/src/features/chat/constants.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ export const toolNames = {
1515
findSymbolReferences: 'findSymbolReferences',
1616
findSymbolDefinitions: 'findSymbolDefinitions',
1717
listRepos: 'listRepos',
18+
listCommits: 'listCommits',
1819
} as const;
1920

2021
// These part types are visible in the UI.
@@ -26,4 +27,5 @@ export const uiVisiblePartTypes: SBChatMessagePart['type'][] = [
2627
'tool-findSymbolDefinitions',
2728
'tool-findSymbolReferences',
2829
'tool-listRepos',
30+
'tool-listCommits',
2931
] as const;

‎packages/web/src/features/chat/tools.ts‎

Lines changed: 43 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { z } from "zod"
22
import { search } from "@/features/search"
33
import { InferToolInput, InferToolOutput, InferUITool, tool, ToolUIPart } from "ai";
44
import { isServiceError } from "@/lib/utils";
5-
import { FileSourceResponse, getFileSource } from '@/features/git';
5+
import { FileSourceResponse, getFileSource, listCommits } from '@/features/git';
66
import { findSearchBasedSymbolDefinitions, findSearchBasedSymbolReferences } from "../codeNav/api";
77
import { addLineNumbers } from "./utils";
88
import { toolNames } from "./constants";
@@ -267,3 +267,45 @@ export type ListReposTool = InferUITool<typeof listReposTool>;
267267
export type ListReposToolInput = InferToolInput<typeof listReposTool>;
268268
export type ListReposToolOutput = InferToolOutput<typeof listReposTool>;
269269
export type ListReposToolUIPart = ToolUIPart<{ [toolNames.listRepos]: ListReposTool }>;
270+
271+
export const listCommitsTool = tool({
272+
description: 'Lists commits in a repository with optional filtering by date range, author, and commit message.',
273+
inputSchema: z.object({
274+
repository: z.string().describe("The repository to list commits from"),
275+
query: z.string().describe("Search query to filter commits by message (case-insensitive)").optional(),
276+
since: z.string().describe("Start date for commit range (e.g., '30 days ago', '2024-01-01', 'last week')").optional(),
277+
until: z.string().describe("End date for commit range (e.g., 'yesterday', '2024-12-31', 'today')").optional(),
278+
author: z.string().describe("Filter commits by author name or email (case-insensitive)").optional(),
279+
maxCount: z.number().describe("Maximum number of commits to return (default: 50)").optional(),
280+
}),
281+
execute: async ({ repository, query, since, until, author, maxCount }) => {
282+
const response = await listCommits({
283+
repo: repository,
284+
query,
285+
since,
286+
until,
287+
author,
288+
maxCount,
289+
});
290+
291+
if (isServiceError(response)) {
292+
return response;
293+
}
294+
295+
return {
296+
commits: response.commits.map((commit) => ({
297+
hash: commit.hash,
298+
date: commit.date,
299+
message: commit.message,
300+
author: `${commit.author_name} <${commit.author_email}>`,
301+
refs: commit.refs,
302+
})),
303+
totalCount: response.totalCount,
304+
};
305+
}
306+
});
307+
308+
export type ListCommitsTool = InferUITool<typeof listCommitsTool>;
309+
export type ListCommitsToolInput = InferToolInput<typeof listCommitsTool>;
310+
export type ListCommitsToolOutput = InferToolOutput<typeof listCommitsTool>;
311+
export type ListCommitsToolUIPart = ToolUIPart<{ [toolNames.listCommits]: ListCommitsTool }>;

‎packages/web/src/features/chat/types.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { BaseEditor, Descendant } from "slate";
33
import { HistoryEditor } from "slate-history";
44
import { ReactEditor, RenderElementProps } from "slate-react";
55
import { z } from "zod";
6-
import { FindSymbolDefinitionsTool, FindSymbolReferencesTool, ReadFilesTool, SearchCodeTool, ListReposTool } from "./tools";
6+
import { FindSymbolDefinitionsTool, FindSymbolReferencesTool, ReadFilesTool, SearchCodeTool, ListReposTool, ListCommitsTool } from "./tools";
77
import { toolNames } from "./constants";
88
import { LanguageModel } from "@sourcebot/schemas/v3/index.type";
99

@@ -84,6 +84,7 @@ export type SBChatMessageToolTypes = {
8484
[toolNames.findSymbolReferences]: FindSymbolReferencesTool,
8585
[toolNames.findSymbolDefinitions]: FindSymbolDefinitionsTool,
8686
[toolNames.listRepos]: ListReposTool,
87+
[toolNames.listCommits]: ListCommitsTool,
8788
}
8889

8990
export type SBChatMessageDataParts = {

0 commit comments

Comments
 (0)