Search scope refactor#405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
msukkari merged 4 commits into from
Jul 29, 2025
+394 −463
Merged

Search scope refactor #405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a5562d7
new demo card ui
msukkari Jul 28, 2025
f9e0500
rename search context to search scope
msukkari Jul 28, 2025
3b2dd51
rename everything to use search scope
msukkari Jul 28, 2025
f0c8561
add changelog entry
msukkari Jul 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
- Add search context to ask sourcebot context selector. [#397](https://github.com/sourcebot-dev/sourcebot/pull/397)
- Add ability to include/exclude connection in search context. [#399](https://github.com/sourcebot-dev/sourcebot/pull/399)
- Search context refactor to search scope and demo card UI changes. [#405](https://github.com/sourcebot-dev/sourcebot/pull/405)

### Fixed
- Fixed multiple writes race condition on config file watcher. [#398](https://github.com/sourcebot-dev/sourcebot/pull/398)
Expand Down
59 changes: 9 additions & 50 deletions packages/web/src/app/[domain]/chat/[id]/components/chatThreadPanel.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,13 +2,12 @@

import { ResizablePanel } from '@/components/ui/resizable';
import { ChatThread } from '@/features/chat/components/chatThread';
import { LanguageModelInfo, SBChatMessage, SET_CHAT_STATE_QUERY_PARAM, SetChatStatePayload } from '@/features/chat/types';
import { LanguageModelInfo, SBChatMessage, SearchScope, SET_CHAT_STATE_QUERY_PARAM, SetChatStatePayload } from '@/features/chat/types';
import { RepositoryQuery, SearchContextQuery } from '@/lib/types';
import { CreateUIMessage } from 'ai';
import { useRouter, useSearchParams } from 'next/navigation';
import { useEffect, useState } from 'react';
import { useChatId } from '../../useChatId';
import { ContextItem } from '@/features/chat/components/chatBox/contextSelector';

interface ChatThreadPanelProps {
languageModels: LanguageModelInfo[];
Expand All@@ -33,62 +32,22 @@ export const ChatThreadPanel = ({
const router = useRouter();
const searchParams = useSearchParams();
const [inputMessage, setInputMessage] = useState<CreateUIMessage<SBChatMessage> | undefined>(undefined);

// Use the last user's last message to determine what repos and contexts we should select by default.
const lastUserMessage = messages.findLast((message) => message.role === "user");
const defaultSelectedRepos = lastUserMessage?.metadata?.selectedRepos ?? [];
const defaultSelectedContexts = lastUserMessage?.metadata?.selectedContexts ?? [];
const defaultSelectedSearchScopes = lastUserMessage?.metadata?.selectedSearchScopes ?? [];
const [selectedSearchScopes, setSelectedSearchScopes] = useState<SearchScope[]>(defaultSelectedSearchScopes);

const [selectedItems, setSelectedItems] = useState<ContextItem[]>([
...defaultSelectedRepos.map(repoName => {
const repoInfo = repos.find(r => r.repoName === repoName);
return {
type: 'repo' as const,
value: repoName,
name: repoInfo?.repoDisplayName || repoName.split('/').pop() || repoName,
codeHostType: repoInfo?.codeHostType || ''
};
}),
...defaultSelectedContexts.map(contextName => {
const context = searchContexts.find(c => c.name === contextName);
return {
type: 'context' as const,
value: contextName,
name: contextName,
repoCount: context?.repoNames.length || 0
};
})
]);

useEffect(() => {
const setChatState = searchParams.get(SET_CHAT_STATE_QUERY_PARAM);
if (!setChatState) {
return;
}

try {
const { inputMessage, selectedRepos, selectedContexts } = JSON.parse(setChatState) as SetChatStatePayload;
const { inputMessage, selectedSearchScopes } = JSON.parse(setChatState) as SetChatStatePayload;
setInputMessage(inputMessage);
setSelectedItems([
...selectedRepos.map(repoName => {
const repoInfo = repos.find(r => r.repoName === repoName);
return {
type: 'repo' as const,
value: repoName,
name: repoInfo?.repoDisplayName || repoName.split('/').pop() || repoName,
codeHostType: repoInfo?.codeHostType || ''
};
}),
...selectedContexts.map(contextName => {
const context = searchContexts.find(c => c.name === contextName);
return {
type: 'context' as const,
value: contextName,
name: contextName,
repoCount: context?.repoNames.length || 0
};
})
]);
setSelectedSearchScopes(selectedSearchScopes);
} catch {
console.error('Invalid message in URL');
}
Expand All@@ -97,7 +56,7 @@ export const ChatThreadPanel = ({
const newSearchParams = new URLSearchParams(searchParams.toString());
newSearchParams.delete(SET_CHAT_STATE_QUERY_PARAM);
router.replace(`?${newSearchParams.toString()}`, { scroll: false });
}, [searchParams, router, repos, searchContexts]);
}, [searchParams, router]);

return (
<ResizablePanel
Expand All@@ -113,8 +72,8 @@ export const ChatThreadPanel = ({
languageModels={languageModels}
repos={repos}
searchContexts={searchContexts}
selectedItems={selectedItems}
onSelectedItemsChange={setSelectedItems}
selectedSearchScopes={selectedSearchScopes}
onSelectedSearchScopesChange={setSelectedSearchScopes}
isChatReadonly={isChatReadonly}
/>
</div>
Expand Down
15 changes: 7 additions & 8 deletions packages/web/src/app/[domain]/chat/components/newChatPanel.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,12 +5,11 @@ import { ChatBox } from "@/features/chat/components/chatBox";
import { ChatBoxToolbar } from "@/features/chat/components/chatBox/chatBoxToolbar";
import { CustomSlateEditor } from "@/features/chat/customSlateEditor";
import { useCreateNewChatThread } from "@/features/chat/useCreateNewChatThread";
import { LanguageModelInfo } from "@/features/chat/types";
import { LanguageModelInfo, SearchScope } from "@/features/chat/types";
import { RepositoryQuery, SearchContextQuery } from "@/lib/types";
import { useCallback, useState } from "react";
import { Descendant } from "slate";
import { useLocalStorage } from "usehooks-ts";
import { ContextItem } from "@/features/chat/components/chatBox/contextSelector";

interface NewChatPanelProps {
languageModels: LanguageModelInfo[];
Expand All@@ -25,13 +24,13 @@ export const NewChatPanel = ({
searchContexts,
order,
}: NewChatPanelProps) => {
const [selectedItems, setSelectedItems] = useLocalStorage<ContextItem[]>("selectedContextItems", [], { initializeWithValue: false });
const [selectedSearchScopes, setSelectedSearchScopes] = useLocalStorage<SearchScope[]>("selectedSearchScopes", [], { initializeWithValue: false });
const { createNewChatThread, isLoading } = useCreateNewChatThread();
const [isContextSelectorOpen, setIsContextSelectorOpen] = useState(false);

const onSubmit = useCallback((children: Descendant[]) => {
createNewChatThread(children, selectedItems);
}, [createNewChatThread, selectedItems]);
createNewChatThread(children, selectedSearchScopes);
}, [createNewChatThread, selectedSearchScopes]);


return (
Expand All@@ -50,7 +49,7 @@ export const NewChatPanel = ({
preferredSuggestionsBoxPlacement="bottom-start"
isRedirecting={isLoading}
languageModels={languageModels}
selectedItems={selectedItems}
selectedSearchScopes={selectedSearchScopes}
searchContexts={searchContexts}
onContextSelectorOpenChanged={setIsContextSelectorOpen}
/>
Expand All@@ -59,8 +58,8 @@ export const NewChatPanel = ({
languageModels={languageModels}
repos={repos}
searchContexts={searchContexts}
selectedItems={selectedItems}
onSelectedItemsChange={setSelectedItems}
selectedSearchScopes={selectedSearchScopes}
onSelectedSearchScopesChange={setSelectedSearchScopes}
isContextSelectorOpen={isContextSelectorOpen}
onContextSelectorOpenChanged={setIsContextSelectorOpen}
/>
Expand Down
17 changes: 6 additions & 11 deletions packages/web/src/app/[domain]/components/homepage/agenticSearch.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,13 +3,12 @@
import { Separator } from "@/components/ui/separator";
import { ChatBox } from "@/features/chat/components/chatBox";
import { ChatBoxToolbar } from "@/features/chat/components/chatBox/chatBoxToolbar";
import { LanguageModelInfo } from "@/features/chat/types";
import { LanguageModelInfo, SearchScope } from "@/features/chat/types";
import { useCreateNewChatThread } from "@/features/chat/useCreateNewChatThread";
import { RepositoryQuery, SearchContextQuery } from "@/lib/types";
import { useState } from "react";
import { SearchModeSelector, SearchModeSelectorProps } from "./toolbar";
import { useLocalStorage } from "usehooks-ts";
import { ContextItem } from "@/features/chat/components/chatBox/contextSelector";
import { DemoExamples } from "@/types";
import { AskSourcebotDemoCards } from "./askSourcebotDemoCards";

Expand All@@ -34,20 +33,20 @@ export const AgenticSearch = ({
demoExamples,
}: AgenticSearchProps) => {
const { createNewChatThread, isLoading } = useCreateNewChatThread();
const [selectedItems, setSelectedItems] = useLocalStorage<ContextItem[]>("selectedContextItems", [], { initializeWithValue: false });
const [selectedSearchScopes, setSelectedSearchScopes] = useLocalStorage<SearchScope[]>("selectedSearchScopes", [], { initializeWithValue: false });
const [isContextSelectorOpen, setIsContextSelectorOpen] = useState(false);

return (
<div className="flex flex-col items-center w-full">
<div className="mt-4 w-full border rounded-md shadow-sm max-w-[800px]">
<ChatBox
onSubmit={(children) => {
createNewChatThread(children, selectedItems);
createNewChatThread(children, selectedSearchScopes);
}}
className="min-h-[50px]"
isRedirecting={isLoading}
languageModels={languageModels}
selectedItems={selectedItems}
selectedSearchScopes={selectedSearchScopes}
searchContexts={searchContexts}
onContextSelectorOpenChanged={setIsContextSelectorOpen}
/>
Expand All@@ -58,8 +57,8 @@ export const AgenticSearch = ({
languageModels={languageModels}
repos={repos}
searchContexts={searchContexts}
selectedItems={selectedItems}
onSelectedItemsChange={setSelectedItems}
selectedSearchScopes={selectedSearchScopes}
onSelectedSearchScopesChange={setSelectedSearchScopes}
isContextSelectorOpen={isContextSelectorOpen}
onContextSelectorOpenChanged={setIsContextSelectorOpen}
/>
Expand All@@ -74,10 +73,6 @@ export const AgenticSearch = ({
{demoExamples && (
<AskSourcebotDemoCards
demoExamples={demoExamples}
selectedItems={selectedItems}
setSelectedItems={setSelectedItems}
searchContexts={searchContexts}
repos={repos}
/>
)}
</div >
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Search scope refactor#405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

msukkari
merged 4 commits into

from

Jul 29, 2025

+394

−463

 Merged


Search scope refactor
#405
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
a5562d7

new demo card ui


msukkari Jul 28, 2025
f9e0500

rename search context to search scope


msukkari Jul 28, 2025
3b2dd51

rename everything to use search scope


msukkari Jul 28, 2025
f0c8561

add changelog entry


msukkari Jul 28, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
- Add search context to ask sourcebot context selector. [#397](https://github.com/sourcebot-dev/sourcebot/pull/397)
- Add ability to include/exclude connection in search context. [#399](https://github.com/sourcebot-dev/sourcebot/pull/399)
- Search context refactor to search scope and demo card UI changes. [#405](https://github.com/sourcebot-dev/sourcebot/pull/405)

### Fixed
- Fixed multiple writes race condition on config file watcher. [#398](https://github.com/sourcebot-dev/sourcebot/pull/398)
Expand Down

59 changes: 9 additions & 50 deletions
packages/web/src/app/[domain]/chat/[id]/components/chatThreadPanel.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,13 +2,12 @@

import { ResizablePanel } from '@/components/ui/resizable';
import { ChatThread } from '@/features/chat/components/chatThread';
import { LanguageModelInfo, SBChatMessage, SET_CHAT_STATE_QUERY_PARAM, SetChatStatePayload } from '@/features/chat/types';
import { LanguageModelInfo, SBChatMessage, SearchScope, SET_CHAT_STATE_QUERY_PARAM, SetChatStatePayload } from '@/features/chat/types';
import { RepositoryQuery, SearchContextQuery } from '@/lib/types';
import { CreateUIMessage } from 'ai';
import { useRouter, useSearchParams } from 'next/navigation';
import { useEffect, useState } from 'react';
import { useChatId } from '../../useChatId';
import { ContextItem } from '@/features/chat/components/chatBox/contextSelector';

interface ChatThreadPanelProps {
 languageModels: LanguageModelInfo[];
Expand All@@ -33,62 +32,22 @@ export const ChatThreadPanel = ({
 const router = useRouter();
 const searchParams = useSearchParams();
 const [inputMessage, setInputMessage] = useState<CreateUIMessage<SBChatMessage> | undefined>(undefined);

 // Use the last user's last message to determine what repos and contexts we should select by default.
 const lastUserMessage = messages.findLast((message) => message.role === "user");
 const defaultSelectedRepos = lastUserMessage?.metadata?.selectedRepos ?? [];
 const defaultSelectedContexts = lastUserMessage?.metadata?.selectedContexts ?? [];
 const defaultSelectedSearchScopes = lastUserMessage?.metadata?.selectedSearchScopes ?? [];
 const [selectedSearchScopes, setSelectedSearchScopes] = useState<SearchScope[]>(defaultSelectedSearchScopes);

 const [selectedItems, setSelectedItems] = useState<ContextItem[]>([
 ...defaultSelectedRepos.map(repoName => {
 const repoInfo = repos.find(r => r.repoName === repoName);
 return {
 type: 'repo' as const,
 value: repoName,
 name: repoInfo?.repoDisplayName || repoName.split('/').pop() || repoName,
 codeHostType: repoInfo?.codeHostType || ''
 };
 }),
 ...defaultSelectedContexts.map(contextName => {
 const context = searchContexts.find(c => c.name === contextName);
 return {
 type: 'context' as const,
 value: contextName,
 name: contextName,
 repoCount: context?.repoNames.length || 0
 };
 })
 ]);

 useEffect(() => {
 const setChatState = searchParams.get(SET_CHAT_STATE_QUERY_PARAM);
 if (!setChatState) {
 return;
 }

 try {
 const { inputMessage, selectedRepos, selectedContexts } = JSON.parse(setChatState) as SetChatStatePayload;
 const { inputMessage, selectedSearchScopes } = JSON.parse(setChatState) as SetChatStatePayload;
 setInputMessage(inputMessage);
 setSelectedItems([
 ...selectedRepos.map(repoName => {
 const repoInfo = repos.find(r => r.repoName === repoName);
 return {
 type: 'repo' as const,
 value: repoName,
 name: repoInfo?.repoDisplayName || repoName.split('/').pop() || repoName,
 codeHostType: repoInfo?.codeHostType || ''
 };
 }),
 ...selectedContexts.map(contextName => {
 const context = searchContexts.find(c => c.name === contextName);
 return {
 type: 'context' as const,
 value: contextName,
 name: contextName, 
 repoCount: context?.repoNames.length || 0
 };
 })
 ]);
 setSelectedSearchScopes(selectedSearchScopes);
 } catch {
 console.error('Invalid message in URL');
 }
Expand All@@ -97,7 +56,7 @@ export const ChatThreadPanel = ({
 const newSearchParams = new URLSearchParams(searchParams.toString());
 newSearchParams.delete(SET_CHAT_STATE_QUERY_PARAM);
 router.replace(`?${newSearchParams.toString()}`, { scroll: false });
 }, [searchParams, router, repos, searchContexts]);
 }, [searchParams, router]);

 return (
 <ResizablePanel
Expand All@@ -113,8 +72,8 @@ export const ChatThreadPanel = ({
 languageModels={languageModels}
 repos={repos}
 searchContexts={searchContexts}
selectedItems={selectedItems}
onSelectedItemsChange={setSelectedItems}
selectedSearchScopes={selectedSearchScopes}
onSelectedSearchScopesChange={setSelectedSearchScopes}
 isChatReadonly={isChatReadonly}
 />
 </div>
Expand Down

15 changes: 7 additions & 8 deletions
packages/web/src/app/[domain]/chat/components/newChatPanel.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,12 +5,11 @@ import { ChatBox } from "@/features/chat/components/chatBox";
import { ChatBoxToolbar } from "@/features/chat/components/chatBox/chatBoxToolbar";
import { CustomSlateEditor } from "@/features/chat/customSlateEditor";
import { useCreateNewChatThread } from "@/features/chat/useCreateNewChatThread";
import { LanguageModelInfo } from "@/features/chat/types";
import { LanguageModelInfo, SearchScope } from "@/features/chat/types";
import { RepositoryQuery, SearchContextQuery } from "@/lib/types";
import { useCallback, useState } from "react";
import { Descendant } from "slate";
import { useLocalStorage } from "usehooks-ts";
import { ContextItem } from "@/features/chat/components/chatBox/contextSelector";

interface NewChatPanelProps {
 languageModels: LanguageModelInfo[];
Expand All@@ -25,13 +24,13 @@ export const NewChatPanel = ({
 searchContexts,
 order,
}: NewChatPanelProps) => {
 const [selectedItems, setSelectedItems] = useLocalStorage<ContextItem[]>("selectedContextItems", [], { initializeWithValue: false });
 const [selectedSearchScopes, setSelectedSearchScopes] = useLocalStorage<SearchScope[]>("selectedSearchScopes", [], { initializeWithValue: false });
 const { createNewChatThread, isLoading } = useCreateNewChatThread();
 const [isContextSelectorOpen, setIsContextSelectorOpen] = useState(false);

 const onSubmit = useCallback((children: Descendant[]) => {
 createNewChatThread(children, selectedItems);
 }, [createNewChatThread, selectedItems]);
 createNewChatThread(children, selectedSearchScopes);
 }, [createNewChatThread, selectedSearchScopes]);


 return (
Expand All@@ -50,7 +49,7 @@ export const NewChatPanel = ({
 preferredSuggestionsBoxPlacement="bottom-start"
 isRedirecting={isLoading}
 languageModels={languageModels}
selectedItems={selectedItems}
selectedSearchScopes={selectedSearchScopes}
 searchContexts={searchContexts}
 onContextSelectorOpenChanged={setIsContextSelectorOpen}
 />
Expand All@@ -59,8 +58,8 @@ export const NewChatPanel = ({
 languageModels={languageModels}
 repos={repos}
 searchContexts={searchContexts}
selectedItems={selectedItems}
onSelectedItemsChange={setSelectedItems}
selectedSearchScopes={selectedSearchScopes}
onSelectedSearchScopesChange={setSelectedSearchScopes}
 isContextSelectorOpen={isContextSelectorOpen}
 onContextSelectorOpenChanged={setIsContextSelectorOpen}
 />
Expand Down

17 changes: 6 additions & 11 deletions
packages/web/src/app/[domain]/components/homepage/agenticSearch.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,13 +3,12 @@
import { Separator } from "@/components/ui/separator";
import { ChatBox } from "@/features/chat/components/chatBox";
import { ChatBoxToolbar } from "@/features/chat/components/chatBox/chatBoxToolbar";
import { LanguageModelInfo } from "@/features/chat/types";
import { LanguageModelInfo, SearchScope } from "@/features/chat/types";
import { useCreateNewChatThread } from "@/features/chat/useCreateNewChatThread";
import { RepositoryQuery, SearchContextQuery } from "@/lib/types";
import { useState } from "react";
import { SearchModeSelector, SearchModeSelectorProps } from "./toolbar";
import { useLocalStorage } from "usehooks-ts";
import { ContextItem } from "@/features/chat/components/chatBox/contextSelector";
import { DemoExamples } from "@/types";
import { AskSourcebotDemoCards } from "./askSourcebotDemoCards";

Expand All@@ -34,20 +33,20 @@ export const AgenticSearch = ({
 demoExamples,
}: AgenticSearchProps) => {
 const { createNewChatThread, isLoading } = useCreateNewChatThread();
 const [selectedItems, setSelectedItems] = useLocalStorage<ContextItem[]>("selectedContextItems", [], { initializeWithValue: false });
 const [selectedSearchScopes, setSelectedSearchScopes] = useLocalStorage<SearchScope[]>("selectedSearchScopes", [], { initializeWithValue: false });
 const [isContextSelectorOpen, setIsContextSelectorOpen] = useState(false);

 return (
 <div className="flex flex-col items-center w-full">
 <div className="mt-4 w-full border rounded-md shadow-sm max-w-[800px]">
 <ChatBox
 onSubmit={(children) => {
 createNewChatThread(children, selectedItems);
 createNewChatThread(children, selectedSearchScopes);
 }}
 className="min-h-[50px]"
 isRedirecting={isLoading}
 languageModels={languageModels}
selectedItems={selectedItems}
selectedSearchScopes={selectedSearchScopes}
 searchContexts={searchContexts}
 onContextSelectorOpenChanged={setIsContextSelectorOpen}
 />
Expand All@@ -58,8 +57,8 @@ export const AgenticSearch = ({
 languageModels={languageModels}
 repos={repos}
 searchContexts={searchContexts}
selectedItems={selectedItems}
onSelectedItemsChange={setSelectedItems}
selectedSearchScopes={selectedSearchScopes}
onSelectedSearchScopesChange={setSelectedSearchScopes}
 isContextSelectorOpen={isContextSelectorOpen}
 onContextSelectorOpenChanged={setIsContextSelectorOpen}
 />
Expand All@@ -74,10 +73,6 @@ export const AgenticSearch = ({
 {demoExamples && (
 <AskSourcebotDemoCards
 demoExamples={demoExamples}
 selectedItems={selectedItems}
 setSelectedItems={setSelectedItems}
 searchContexts={searchContexts}
 repos={repos}
 />
 )}
 </div >
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Search scope refactor#405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

msukkari
merged 4 commits into

from

Jul 29, 2025

+394

−463

 Merged


Search scope refactor
#405
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
a5562d7

new demo card ui


msukkari Jul 28, 2025
f9e0500

rename search context to search scope


msukkari Jul 28, 2025
3b2dd51

rename everything to use search scope


msukkari Jul 28, 2025
f0c8561

add changelog entry


msukkari Jul 28, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
- Add search context to ask sourcebot context selector. [#397](https://github.com/sourcebot-dev/sourcebot/pull/397)
- Add ability to include/exclude connection in search context. [#399](https://github.com/sourcebot-dev/sourcebot/pull/399)
- Search context refactor to search scope and demo card UI changes. [#405](https://github.com/sourcebot-dev/sourcebot/pull/405)

### Fixed
- Fixed multiple writes race condition on config file watcher. [#398](https://github.com/sourcebot-dev/sourcebot/pull/398)
Expand Down

59 changes: 9 additions & 50 deletions
packages/web/src/app/[domain]/chat/[id]/components/chatThreadPanel.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,13 +2,12 @@

import { ResizablePanel } from '@/components/ui/resizable';
import { ChatThread } from '@/features/chat/components/chatThread';
import { LanguageModelInfo, SBChatMessage, SET_CHAT_STATE_QUERY_PARAM, SetChatStatePayload } from '@/features/chat/types';
import { LanguageModelInfo, SBChatMessage, SearchScope, SET_CHAT_STATE_QUERY_PARAM, SetChatStatePayload } from '@/features/chat/types';
import { RepositoryQuery, SearchContextQuery } from '@/lib/types';
import { CreateUIMessage } from 'ai';
import { useRouter, useSearchParams } from 'next/navigation';
import { useEffect, useState } from 'react';
import { useChatId } from '../../useChatId';
import { ContextItem } from '@/features/chat/components/chatBox/contextSelector';

interface ChatThreadPanelProps {
 languageModels: LanguageModelInfo[];
Expand All@@ -33,62 +32,22 @@ export const ChatThreadPanel = ({
 const router = useRouter();
 const searchParams = useSearchParams();
 const [inputMessage, setInputMessage] = useState<CreateUIMessage<SBChatMessage> | undefined>(undefined);

 // Use the last user's last message to determine what repos and contexts we should select by default.
 const lastUserMessage = messages.findLast((message) => message.role === "user");
 const defaultSelectedRepos = lastUserMessage?.metadata?.selectedRepos ?? [];
 const defaultSelectedContexts = lastUserMessage?.metadata?.selectedContexts ?? [];
 const defaultSelectedSearchScopes = lastUserMessage?.metadata?.selectedSearchScopes ?? [];
 const [selectedSearchScopes, setSelectedSearchScopes] = useState<SearchScope[]>(defaultSelectedSearchScopes);

 const [selectedItems, setSelectedItems] = useState<ContextItem[]>([
 ...defaultSelectedRepos.map(repoName => {
 const repoInfo = repos.find(r => r.repoName === repoName);
 return {
 type: 'repo' as const,
 value: repoName,
 name: repoInfo?.repoDisplayName || repoName.split('/').pop() || repoName,
 codeHostType: repoInfo?.codeHostType || ''
 };
 }),
 ...defaultSelectedContexts.map(contextName => {
 const context = searchContexts.find(c => c.name === contextName);
 return {
 type: 'context' as const,
 value: contextName,
 name: contextName,
 repoCount: context?.repoNames.length || 0
 };
 })
 ]);

 useEffect(() => {
 const setChatState = searchParams.get(SET_CHAT_STATE_QUERY_PARAM);
 if (!setChatState) {
 return;
 }

 try {
 const { inputMessage, selectedRepos, selectedContexts } = JSON.parse(setChatState) as SetChatStatePayload;
 const { inputMessage, selectedSearchScopes } = JSON.parse(setChatState) as SetChatStatePayload;
 setInputMessage(inputMessage);
 setSelectedItems([
 ...selectedRepos.map(repoName => {
 const repoInfo = repos.find(r => r.repoName === repoName);
 return {
 type: 'repo' as const,
 value: repoName,
 name: repoInfo?.repoDisplayName || repoName.split('/').pop() || repoName,
 codeHostType: repoInfo?.codeHostType || ''
 };
 }),
 ...selectedContexts.map(contextName => {
 const context = searchContexts.find(c => c.name === contextName);
 return {
 type: 'context' as const,
 value: contextName,
 name: contextName, 
 repoCount: context?.repoNames.length || 0
 };
 })
 ]);
 setSelectedSearchScopes(selectedSearchScopes);
 } catch {
 console.error('Invalid message in URL');
 }
Expand All@@ -97,7 +56,7 @@ export const ChatThreadPanel = ({
 const newSearchParams = new URLSearchParams(searchParams.toString());
 newSearchParams.delete(SET_CHAT_STATE_QUERY_PARAM);
 router.replace(`?${newSearchParams.toString()}`, { scroll: false });
 }, [searchParams, router, repos, searchContexts]);
 }, [searchParams, router]);

 return (
 <ResizablePanel
Expand All@@ -113,8 +72,8 @@ export const ChatThreadPanel = ({
 languageModels={languageModels}
 repos={repos}
 searchContexts={searchContexts}
selectedItems={selectedItems}
onSelectedItemsChange={setSelectedItems}
selectedSearchScopes={selectedSearchScopes}
onSelectedSearchScopesChange={setSelectedSearchScopes}
 isChatReadonly={isChatReadonly}
 />
 </div>
Expand Down

15 changes: 7 additions & 8 deletions
packages/web/src/app/[domain]/chat/components/newChatPanel.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,12 +5,11 @@ import { ChatBox } from "@/features/chat/components/chatBox";
import { ChatBoxToolbar } from "@/features/chat/components/chatBox/chatBoxToolbar";
import { CustomSlateEditor } from "@/features/chat/customSlateEditor";
import { useCreateNewChatThread } from "@/features/chat/useCreateNewChatThread";
import { LanguageModelInfo } from "@/features/chat/types";
import { LanguageModelInfo, SearchScope } from "@/features/chat/types";
import { RepositoryQuery, SearchContextQuery } from "@/lib/types";
import { useCallback, useState } from "react";
import { Descendant } from "slate";
import { useLocalStorage } from "usehooks-ts";
import { ContextItem } from "@/features/chat/components/chatBox/contextSelector";

interface NewChatPanelProps {
 languageModels: LanguageModelInfo[];
Expand All@@ -25,13 +24,13 @@ export const NewChatPanel = ({
 searchContexts,
 order,
}: NewChatPanelProps) => {
 const [selectedItems, setSelectedItems] = useLocalStorage<ContextItem[]>("selectedContextItems", [], { initializeWithValue: false });
 const [selectedSearchScopes, setSelectedSearchScopes] = useLocalStorage<SearchScope[]>("selectedSearchScopes", [], { initializeWithValue: false });
 const { createNewChatThread, isLoading } = useCreateNewChatThread();
 const [isContextSelectorOpen, setIsContextSelectorOpen] = useState(false);

 const onSubmit = useCallback((children: Descendant[]) => {
 createNewChatThread(children, selectedItems);
 }, [createNewChatThread, selectedItems]);
 createNewChatThread(children, selectedSearchScopes);
 }, [createNewChatThread, selectedSearchScopes]);


 return (
Expand All@@ -50,7 +49,7 @@ export const NewChatPanel = ({
 preferredSuggestionsBoxPlacement="bottom-start"
 isRedirecting={isLoading}
 languageModels={languageModels}
selectedItems={selectedItems}
selectedSearchScopes={selectedSearchScopes}
 searchContexts={searchContexts}
 onContextSelectorOpenChanged={setIsContextSelectorOpen}
 />
Expand All@@ -59,8 +58,8 @@ export const NewChatPanel = ({
 languageModels={languageModels}
 repos={repos}
 searchContexts={searchContexts}
selectedItems={selectedItems}
onSelectedItemsChange={setSelectedItems}
selectedSearchScopes={selectedSearchScopes}
onSelectedSearchScopesChange={setSelectedSearchScopes}
 isContextSelectorOpen={isContextSelectorOpen}
 onContextSelectorOpenChanged={setIsContextSelectorOpen}
 />
Expand Down

17 changes: 6 additions & 11 deletions
packages/web/src/app/[domain]/components/homepage/agenticSearch.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,13 +3,12 @@
import { Separator } from "@/components/ui/separator";
import { ChatBox } from "@/features/chat/components/chatBox";
import { ChatBoxToolbar } from "@/features/chat/components/chatBox/chatBoxToolbar";
import { LanguageModelInfo } from "@/features/chat/types";
import { LanguageModelInfo, SearchScope } from "@/features/chat/types";
import { useCreateNewChatThread } from "@/features/chat/useCreateNewChatThread";
import { RepositoryQuery, SearchContextQuery } from "@/lib/types";
import { useState } from "react";
import { SearchModeSelector, SearchModeSelectorProps } from "./toolbar";
import { useLocalStorage } from "usehooks-ts";
import { ContextItem } from "@/features/chat/components/chatBox/contextSelector";
import { DemoExamples } from "@/types";
import { AskSourcebotDemoCards } from "./askSourcebotDemoCards";

Expand All@@ -34,20 +33,20 @@ export const AgenticSearch = ({
 demoExamples,
}: AgenticSearchProps) => {
 const { createNewChatThread, isLoading } = useCreateNewChatThread();
 const [selectedItems, setSelectedItems] = useLocalStorage<ContextItem[]>("selectedContextItems", [], { initializeWithValue: false });
 const [selectedSearchScopes, setSelectedSearchScopes] = useLocalStorage<SearchScope[]>("selectedSearchScopes", [], { initializeWithValue: false });
 const [isContextSelectorOpen, setIsContextSelectorOpen] = useState(false);

 return (
 <div className="flex flex-col items-center w-full">
 <div className="mt-4 w-full border rounded-md shadow-sm max-w-[800px]">
 <ChatBox
 onSubmit={(children) => {
 createNewChatThread(children, selectedItems);
 createNewChatThread(children, selectedSearchScopes);
 }}
 className="min-h-[50px]"
 isRedirecting={isLoading}
 languageModels={languageModels}
selectedItems={selectedItems}
selectedSearchScopes={selectedSearchScopes}
 searchContexts={searchContexts}
 onContextSelectorOpenChanged={setIsContextSelectorOpen}
 />
Expand All@@ -58,8 +57,8 @@ export const AgenticSearch = ({
 languageModels={languageModels}
 repos={repos}
 searchContexts={searchContexts}
selectedItems={selectedItems}
onSelectedItemsChange={setSelectedItems}
selectedSearchScopes={selectedSearchScopes}
onSelectedSearchScopesChange={setSelectedSearchScopes}
 isContextSelectorOpen={isContextSelectorOpen}
 onContextSelectorOpenChanged={setIsContextSelectorOpen}
 />
Expand All@@ -74,10 +73,6 @@ export const AgenticSearch = ({
 {demoExamples && (
 <AskSourcebotDemoCards
 demoExamples={demoExamples}
 selectedItems={selectedItems}
 setSelectedItems={setSelectedItems}
 searchContexts={searchContexts}
 repos={repos}
 />
 )}
 </div >
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Search scope refactor#405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

msukkari
merged 4 commits into

from

Jul 29, 2025

+394

−463

 Merged


Search scope refactor
#405
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
a5562d7

new demo card ui


msukkari Jul 28, 2025
f9e0500

rename search context to search scope


msukkari Jul 28, 2025
3b2dd51

rename everything to use search scope


msukkari Jul 28, 2025
f0c8561

add changelog entry


msukkari Jul 28, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
- Add search context to ask sourcebot context selector. [#397](https://github.com/sourcebot-dev/sourcebot/pull/397)
- Add ability to include/exclude connection in search context. [#399](https://github.com/sourcebot-dev/sourcebot/pull/399)
- Search context refactor to search scope and demo card UI changes. [#405](https://github.com/sourcebot-dev/sourcebot/pull/405)

### Fixed
- Fixed multiple writes race condition on config file watcher. [#398](https://github.com/sourcebot-dev/sourcebot/pull/398)
Expand Down

59 changes: 9 additions & 50 deletions
packages/web/src/app/[domain]/chat/[id]/components/chatThreadPanel.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,13 +2,12 @@

import { ResizablePanel } from '@/components/ui/resizable';
import { ChatThread } from '@/features/chat/components/chatThread';
import { LanguageModelInfo, SBChatMessage, SET_CHAT_STATE_QUERY_PARAM, SetChatStatePayload } from '@/features/chat/types';
import { LanguageModelInfo, SBChatMessage, SearchScope, SET_CHAT_STATE_QUERY_PARAM, SetChatStatePayload } from '@/features/chat/types';
import { RepositoryQuery, SearchContextQuery } from '@/lib/types';
import { CreateUIMessage } from 'ai';
import { useRouter, useSearchParams } from 'next/navigation';
import { useEffect, useState } from 'react';
import { useChatId } from '../../useChatId';
import { ContextItem } from '@/features/chat/components/chatBox/contextSelector';

interface ChatThreadPanelProps {
 languageModels: LanguageModelInfo[];
Expand All@@ -33,62 +32,22 @@ export const ChatThreadPanel = ({
 const router = useRouter();
 const searchParams = useSearchParams();
 const [inputMessage, setInputMessage] = useState<CreateUIMessage<SBChatMessage> | undefined>(undefined);

 // Use the last user's last message to determine what repos and contexts we should select by default.
 const lastUserMessage = messages.findLast((message) => message.role === "user");
 const defaultSelectedRepos = lastUserMessage?.metadata?.selectedRepos ?? [];
 const defaultSelectedContexts = lastUserMessage?.metadata?.selectedContexts ?? [];
 const defaultSelectedSearchScopes = lastUserMessage?.metadata?.selectedSearchScopes ?? [];
 const [selectedSearchScopes, setSelectedSearchScopes] = useState<SearchScope[]>(defaultSelectedSearchScopes);

 const [selectedItems, setSelectedItems] = useState<ContextItem[]>([
 ...defaultSelectedRepos.map(repoName => {
 const repoInfo = repos.find(r => r.repoName === repoName);
 return {
 type: 'repo' as const,
 value: repoName,
 name: repoInfo?.repoDisplayName || repoName.split('/').pop() || repoName,
 codeHostType: repoInfo?.codeHostType || ''
 };
 }),
 ...defaultSelectedContexts.map(contextName => {
 const context = searchContexts.find(c => c.name === contextName);
 return {
 type: 'context' as const,
 value: contextName,
 name: contextName,
 repoCount: context?.repoNames.length || 0
 };
 })
 ]);

 useEffect(() => {
 const setChatState = searchParams.get(SET_CHAT_STATE_QUERY_PARAM);
 if (!setChatState) {
 return;
 }

 try {
 const { inputMessage, selectedRepos, selectedContexts } = JSON.parse(setChatState) as SetChatStatePayload;
 const { inputMessage, selectedSearchScopes } = JSON.parse(setChatState) as SetChatStatePayload;
 setInputMessage(inputMessage);
 setSelectedItems([
 ...selectedRepos.map(repoName => {
 const repoInfo = repos.find(r => r.repoName === repoName);
 return {
 type: 'repo' as const,
 value: repoName,
 name: repoInfo?.repoDisplayName || repoName.split('/').pop() || repoName,
 codeHostType: repoInfo?.codeHostType || ''
 };
 }),
 ...selectedContexts.map(contextName => {
 const context = searchContexts.find(c => c.name === contextName);
 return {
 type: 'context' as const,
 value: contextName,
 name: contextName, 
 repoCount: context?.repoNames.length || 0
 };
 })
 ]);
 setSelectedSearchScopes(selectedSearchScopes);
 } catch {
 console.error('Invalid message in URL');
 }
Expand All@@ -97,7 +56,7 @@ export const ChatThreadPanel = ({
 const newSearchParams = new URLSearchParams(searchParams.toString());
 newSearchParams.delete(SET_CHAT_STATE_QUERY_PARAM);
 router.replace(`?${newSearchParams.toString()}`, { scroll: false });
 }, [searchParams, router, repos, searchContexts]);
 }, [searchParams, router]);

 return (
 <ResizablePanel
Expand All@@ -113,8 +72,8 @@ export const ChatThreadPanel = ({
 languageModels={languageModels}
 repos={repos}
 searchContexts={searchContexts}
selectedItems={selectedItems}
onSelectedItemsChange={setSelectedItems}
selectedSearchScopes={selectedSearchScopes}
onSelectedSearchScopesChange={setSelectedSearchScopes}
 isChatReadonly={isChatReadonly}
 />
 </div>
Expand Down

15 changes: 7 additions & 8 deletions
packages/web/src/app/[domain]/chat/components/newChatPanel.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,12 +5,11 @@ import { ChatBox } from "@/features/chat/components/chatBox";
import { ChatBoxToolbar } from "@/features/chat/components/chatBox/chatBoxToolbar";
import { CustomSlateEditor } from "@/features/chat/customSlateEditor";
import { useCreateNewChatThread } from "@/features/chat/useCreateNewChatThread";
import { LanguageModelInfo } from "@/features/chat/types";
import { LanguageModelInfo, SearchScope } from "@/features/chat/types";
import { RepositoryQuery, SearchContextQuery } from "@/lib/types";
import { useCallback, useState } from "react";
import { Descendant } from "slate";
import { useLocalStorage } from "usehooks-ts";
import { ContextItem } from "@/features/chat/components/chatBox/contextSelector";

interface NewChatPanelProps {
 languageModels: LanguageModelInfo[];
Expand All@@ -25,13 +24,13 @@ export const NewChatPanel = ({
 searchContexts,
 order,
}: NewChatPanelProps) => {
 const [selectedItems, setSelectedItems] = useLocalStorage<ContextItem[]>("selectedContextItems", [], { initializeWithValue: false });
 const [selectedSearchScopes, setSelectedSearchScopes] = useLocalStorage<SearchScope[]>("selectedSearchScopes", [], { initializeWithValue: false });
 const { createNewChatThread, isLoading } = useCreateNewChatThread();
 const [isContextSelectorOpen, setIsContextSelectorOpen] = useState(false);

 const onSubmit = useCallback((children: Descendant[]) => {
 createNewChatThread(children, selectedItems);
 }, [createNewChatThread, selectedItems]);
 createNewChatThread(children, selectedSearchScopes);
 }, [createNewChatThread, selectedSearchScopes]);


 return (
Expand All@@ -50,7 +49,7 @@ export const NewChatPanel = ({
 preferredSuggestionsBoxPlacement="bottom-start"
 isRedirecting={isLoading}
 languageModels={languageModels}
selectedItems={selectedItems}
selectedSearchScopes={selectedSearchScopes}
 searchContexts={searchContexts}
 onContextSelectorOpenChanged={setIsContextSelectorOpen}
 />
Expand All@@ -59,8 +58,8 @@ export const NewChatPanel = ({
 languageModels={languageModels}
 repos={repos}
 searchContexts={searchContexts}
selectedItems={selectedItems}
onSelectedItemsChange={setSelectedItems}
selectedSearchScopes={selectedSearchScopes}
onSelectedSearchScopesChange={setSelectedSearchScopes}
 isContextSelectorOpen={isContextSelectorOpen}
 onContextSelectorOpenChanged={setIsContextSelectorOpen}
 />
Expand Down

17 changes: 6 additions & 11 deletions
packages/web/src/app/[domain]/components/homepage/agenticSearch.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,13 +3,12 @@
import { Separator } from "@/components/ui/separator";
import { ChatBox } from "@/features/chat/components/chatBox";
import { ChatBoxToolbar } from "@/features/chat/components/chatBox/chatBoxToolbar";
import { LanguageModelInfo } from "@/features/chat/types";
import { LanguageModelInfo, SearchScope } from "@/features/chat/types";
import { useCreateNewChatThread } from "@/features/chat/useCreateNewChatThread";
import { RepositoryQuery, SearchContextQuery } from "@/lib/types";
import { useState } from "react";
import { SearchModeSelector, SearchModeSelectorProps } from "./toolbar";
import { useLocalStorage } from "usehooks-ts";
import { ContextItem } from "@/features/chat/components/chatBox/contextSelector";
import { DemoExamples } from "@/types";
import { AskSourcebotDemoCards } from "./askSourcebotDemoCards";

Expand All@@ -34,20 +33,20 @@ export const AgenticSearch = ({
 demoExamples,
}: AgenticSearchProps) => {
 const { createNewChatThread, isLoading } = useCreateNewChatThread();
 const [selectedItems, setSelectedItems] = useLocalStorage<ContextItem[]>("selectedContextItems", [], { initializeWithValue: false });
 const [selectedSearchScopes, setSelectedSearchScopes] = useLocalStorage<SearchScope[]>("selectedSearchScopes", [], { initializeWithValue: false });
 const [isContextSelectorOpen, setIsContextSelectorOpen] = useState(false);

 return (
 <div className="flex flex-col items-center w-full">
 <div className="mt-4 w-full border rounded-md shadow-sm max-w-[800px]">
 <ChatBox
 onSubmit={(children) => {
 createNewChatThread(children, selectedItems);
 createNewChatThread(children, selectedSearchScopes);
 }}
 className="min-h-[50px]"
 isRedirecting={isLoading}
 languageModels={languageModels}
selectedItems={selectedItems}
selectedSearchScopes={selectedSearchScopes}
 searchContexts={searchContexts}
 onContextSelectorOpenChanged={setIsContextSelectorOpen}
 />
Expand All@@ -58,8 +57,8 @@ export const AgenticSearch = ({
 languageModels={languageModels}
 repos={repos}
 searchContexts={searchContexts}
selectedItems={selectedItems}
onSelectedItemsChange={setSelectedItems}
selectedSearchScopes={selectedSearchScopes}
onSelectedSearchScopesChange={setSelectedSearchScopes}
 isContextSelectorOpen={isContextSelectorOpen}
 onContextSelectorOpenChanged={setIsContextSelectorOpen}
 />
Expand All@@ -74,10 +73,6 @@ export const AgenticSearch = ({
 {demoExamples && (
 <AskSourcebotDemoCards
 demoExamples={demoExamples}
 selectedItems={selectedItems}
 setSelectedItems={setSelectedItems}
 searchContexts={searchContexts}
 repos={repos}
 />
 )}
 </div >
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Search scope refactor#405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

msukkari
merged 4 commits into

from

Jul 29, 2025

+394

−463

 Merged


Search scope refactor
#405
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
a5562d7

new demo card ui


msukkari Jul 28, 2025
f9e0500

rename search context to search scope


msukkari Jul 28, 2025
3b2dd51

rename everything to use search scope


msukkari Jul 28, 2025
f0c8561

add changelog entry


msukkari Jul 28, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
- Add search context to ask sourcebot context selector. [#397](https://github.com/sourcebot-dev/sourcebot/pull/397)
- Add ability to include/exclude connection in search context. [#399](https://github.com/sourcebot-dev/sourcebot/pull/399)
- Search context refactor to search scope and demo card UI changes. [#405](https://github.com/sourcebot-dev/sourcebot/pull/405)

### Fixed
- Fixed multiple writes race condition on config file watcher. [#398](https://github.com/sourcebot-dev/sourcebot/pull/398)
Expand Down

59 changes: 9 additions & 50 deletions
packages/web/src/app/[domain]/chat/[id]/components/chatThreadPanel.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,13 +2,12 @@

import { ResizablePanel } from '@/components/ui/resizable';
import { ChatThread } from '@/features/chat/components/chatThread';
import { LanguageModelInfo, SBChatMessage, SET_CHAT_STATE_QUERY_PARAM, SetChatStatePayload } from '@/features/chat/types';
import { LanguageModelInfo, SBChatMessage, SearchScope, SET_CHAT_STATE_QUERY_PARAM, SetChatStatePayload } from '@/features/chat/types';
import { RepositoryQuery, SearchContextQuery } from '@/lib/types';
import { CreateUIMessage } from 'ai';
import { useRouter, useSearchParams } from 'next/navigation';
import { useEffect, useState } from 'react';
import { useChatId } from '../../useChatId';
import { ContextItem } from '@/features/chat/components/chatBox/contextSelector';

interface ChatThreadPanelProps {
 languageModels: LanguageModelInfo[];
Expand All@@ -33,62 +32,22 @@ export const ChatThreadPanel = ({
 const router = useRouter();
 const searchParams = useSearchParams();
 const [inputMessage, setInputMessage] = useState<CreateUIMessage<SBChatMessage> | undefined>(undefined);

 // Use the last user's last message to determine what repos and contexts we should select by default.
 const lastUserMessage = messages.findLast((message) => message.role === "user");
 const defaultSelectedRepos = lastUserMessage?.metadata?.selectedRepos ?? [];
 const defaultSelectedContexts = lastUserMessage?.metadata?.selectedContexts ?? [];
 const defaultSelectedSearchScopes = lastUserMessage?.metadata?.selectedSearchScopes ?? [];
 const [selectedSearchScopes, setSelectedSearchScopes] = useState<SearchScope[]>(defaultSelectedSearchScopes);

 const [selectedItems, setSelectedItems] = useState<ContextItem[]>([
 ...defaultSelectedRepos.map(repoName => {
 const repoInfo = repos.find(r => r.repoName === repoName);
 return {
 type: 'repo' as const,
 value: repoName,
 name: repoInfo?.repoDisplayName || repoName.split('/').pop() || repoName,
 codeHostType: repoInfo?.codeHostType || ''
 };
 }),
 ...defaultSelectedContexts.map(contextName => {
 const context = searchContexts.find(c => c.name === contextName);
 return {
 type: 'context' as const,
 value: contextName,
 name: contextName,
 repoCount: context?.repoNames.length || 0
 };
 })
 ]);

 useEffect(() => {
 const setChatState = searchParams.get(SET_CHAT_STATE_QUERY_PARAM);
 if (!setChatState) {
 return;
 }

 try {
 const { inputMessage, selectedRepos, selectedContexts } = JSON.parse(setChatState) as SetChatStatePayload;
 const { inputMessage, selectedSearchScopes } = JSON.parse(setChatState) as SetChatStatePayload;
 setInputMessage(inputMessage);
 setSelectedItems([
 ...selectedRepos.map(repoName => {
 const repoInfo = repos.find(r => r.repoName === repoName);
 return {
 type: 'repo' as const,
 value: repoName,
 name: repoInfo?.repoDisplayName || repoName.split('/').pop() || repoName,
 codeHostType: repoInfo?.codeHostType || ''
 };
 }),
 ...selectedContexts.map(contextName => {
 const context = searchContexts.find(c => c.name === contextName);
 return {
 type: 'context' as const,
 value: contextName,
 name: contextName, 
 repoCount: context?.repoNames.length || 0
 };
 })
 ]);
 setSelectedSearchScopes(selectedSearchScopes);
 } catch {
 console.error('Invalid message in URL');
 }
Expand All@@ -97,7 +56,7 @@ export const ChatThreadPanel = ({
 const newSearchParams = new URLSearchParams(searchParams.toString());
 newSearchParams.delete(SET_CHAT_STATE_QUERY_PARAM);
 router.replace(`?${newSearchParams.toString()}`, { scroll: false });
 }, [searchParams, router, repos, searchContexts]);
 }, [searchParams, router]);

 return (
 <ResizablePanel
Expand All@@ -113,8 +72,8 @@ export const ChatThreadPanel = ({
 languageModels={languageModels}
 repos={repos}
 searchContexts={searchContexts}
selectedItems={selectedItems}
onSelectedItemsChange={setSelectedItems}
selectedSearchScopes={selectedSearchScopes}
onSelectedSearchScopesChange={setSelectedSearchScopes}
 isChatReadonly={isChatReadonly}
 />
 </div>
Expand Down

15 changes: 7 additions & 8 deletions
packages/web/src/app/[domain]/chat/components/newChatPanel.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,12 +5,11 @@ import { ChatBox } from "@/features/chat/components/chatBox";
import { ChatBoxToolbar } from "@/features/chat/components/chatBox/chatBoxToolbar";
import { CustomSlateEditor } from "@/features/chat/customSlateEditor";
import { useCreateNewChatThread } from "@/features/chat/useCreateNewChatThread";
import { LanguageModelInfo } from "@/features/chat/types";
import { LanguageModelInfo, SearchScope } from "@/features/chat/types";
import { RepositoryQuery, SearchContextQuery } from "@/lib/types";
import { useCallback, useState } from "react";
import { Descendant } from "slate";
import { useLocalStorage } from "usehooks-ts";
import { ContextItem } from "@/features/chat/components/chatBox/contextSelector";

interface NewChatPanelProps {
 languageModels: LanguageModelInfo[];
Expand All@@ -25,13 +24,13 @@ export const NewChatPanel = ({
 searchContexts,
 order,
}: NewChatPanelProps) => {
 const [selectedItems, setSelectedItems] = useLocalStorage<ContextItem[]>("selectedContextItems", [], { initializeWithValue: false });
 const [selectedSearchScopes, setSelectedSearchScopes] = useLocalStorage<SearchScope[]>("selectedSearchScopes", [], { initializeWithValue: false });
 const { createNewChatThread, isLoading } = useCreateNewChatThread();
 const [isContextSelectorOpen, setIsContextSelectorOpen] = useState(false);

 const onSubmit = useCallback((children: Descendant[]) => {
 createNewChatThread(children, selectedItems);
 }, [createNewChatThread, selectedItems]);
 createNewChatThread(children, selectedSearchScopes);
 }, [createNewChatThread, selectedSearchScopes]);


 return (
Expand All@@ -50,7 +49,7 @@ export const NewChatPanel = ({
 preferredSuggestionsBoxPlacement="bottom-start"
 isRedirecting={isLoading}
 languageModels={languageModels}
selectedItems={selectedItems}
selectedSearchScopes={selectedSearchScopes}
 searchContexts={searchContexts}
 onContextSelectorOpenChanged={setIsContextSelectorOpen}
 />
Expand All@@ -59,8 +58,8 @@ export const NewChatPanel = ({
 languageModels={languageModels}
 repos={repos}
 searchContexts={searchContexts}
selectedItems={selectedItems}
onSelectedItemsChange={setSelectedItems}
selectedSearchScopes={selectedSearchScopes}
onSelectedSearchScopesChange={setSelectedSearchScopes}
 isContextSelectorOpen={isContextSelectorOpen}
 onContextSelectorOpenChanged={setIsContextSelectorOpen}
 />
Expand Down

17 changes: 6 additions & 11 deletions
packages/web/src/app/[domain]/components/homepage/agenticSearch.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,13 +3,12 @@
import { Separator } from "@/components/ui/separator";
import { ChatBox } from "@/features/chat/components/chatBox";
import { ChatBoxToolbar } from "@/features/chat/components/chatBox/chatBoxToolbar";
import { LanguageModelInfo } from "@/features/chat/types";
import { LanguageModelInfo, SearchScope } from "@/features/chat/types";
import { useCreateNewChatThread } from "@/features/chat/useCreateNewChatThread";
import { RepositoryQuery, SearchContextQuery } from "@/lib/types";
import { useState } from "react";
import { SearchModeSelector, SearchModeSelectorProps } from "./toolbar";
import { useLocalStorage } from "usehooks-ts";
import { ContextItem } from "@/features/chat/components/chatBox/contextSelector";
import { DemoExamples } from "@/types";
import { AskSourcebotDemoCards } from "./askSourcebotDemoCards";

Expand All@@ -34,20 +33,20 @@ export const AgenticSearch = ({
 demoExamples,
}: AgenticSearchProps) => {
 const { createNewChatThread, isLoading } = useCreateNewChatThread();
 const [selectedItems, setSelectedItems] = useLocalStorage<ContextItem[]>("selectedContextItems", [], { initializeWithValue: false });
 const [selectedSearchScopes, setSelectedSearchScopes] = useLocalStorage<SearchScope[]>("selectedSearchScopes", [], { initializeWithValue: false });
 const [isContextSelectorOpen, setIsContextSelectorOpen] = useState(false);

 return (
 <div className="flex flex-col items-center w-full">
 <div className="mt-4 w-full border rounded-md shadow-sm max-w-[800px]">
 <ChatBox
 onSubmit={(children) => {
 createNewChatThread(children, selectedItems);
 createNewChatThread(children, selectedSearchScopes);
 }}
 className="min-h-[50px]"
 isRedirecting={isLoading}
 languageModels={languageModels}
selectedItems={selectedItems}
selectedSearchScopes={selectedSearchScopes}
 searchContexts={searchContexts}
 onContextSelectorOpenChanged={setIsContextSelectorOpen}
 />
Expand All@@ -58,8 +57,8 @@ export const AgenticSearch = ({
 languageModels={languageModels}
 repos={repos}
 searchContexts={searchContexts}
selectedItems={selectedItems}
onSelectedItemsChange={setSelectedItems}
selectedSearchScopes={selectedSearchScopes}
onSelectedSearchScopesChange={setSelectedSearchScopes}
 isContextSelectorOpen={isContextSelectorOpen}
 onContextSelectorOpenChanged={setIsContextSelectorOpen}
 />
Expand All@@ -74,10 +73,6 @@ export const AgenticSearch = ({
 {demoExamples && (
 <AskSourcebotDemoCards
 demoExamples={demoExamples}
 selectedItems={selectedItems}
 setSelectedItems={setSelectedItems}
 searchContexts={searchContexts}
 repos={repos}
 />
 )}
 </div >
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Search scope refactor#405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

msukkari
merged 4 commits into

from

Jul 29, 2025

+394

−463

 Merged


Search scope refactor
#405
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
a5562d7

new demo card ui


msukkari Jul 28, 2025
f9e0500

rename search context to search scope


msukkari Jul 28, 2025
3b2dd51

rename everything to use search scope


msukkari Jul 28, 2025
f0c8561

add changelog entry


msukkari Jul 28, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
- Add search context to ask sourcebot context selector. [#397](https://github.com/sourcebot-dev/sourcebot/pull/397)
- Add ability to include/exclude connection in search context. [#399](https://github.com/sourcebot-dev/sourcebot/pull/399)
- Search context refactor to search scope and demo card UI changes. [#405](https://github.com/sourcebot-dev/sourcebot/pull/405)

### Fixed
- Fixed multiple writes race condition on config file watcher. [#398](https://github.com/sourcebot-dev/sourcebot/pull/398)
Expand Down

59 changes: 9 additions & 50 deletions
packages/web/src/app/[domain]/chat/[id]/components/chatThreadPanel.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,13 +2,12 @@

import { ResizablePanel } from '@/components/ui/resizable';
import { ChatThread } from '@/features/chat/components/chatThread';
import { LanguageModelInfo, SBChatMessage, SET_CHAT_STATE_QUERY_PARAM, SetChatStatePayload } from '@/features/chat/types';
import { LanguageModelInfo, SBChatMessage, SearchScope, SET_CHAT_STATE_QUERY_PARAM, SetChatStatePayload } from '@/features/chat/types';
import { RepositoryQuery, SearchContextQuery } from '@/lib/types';
import { CreateUIMessage } from 'ai';
import { useRouter, useSearchParams } from 'next/navigation';
import { useEffect, useState } from 'react';
import { useChatId } from '../../useChatId';
import { ContextItem } from '@/features/chat/components/chatBox/contextSelector';

interface ChatThreadPanelProps {
 languageModels: LanguageModelInfo[];
Expand All@@ -33,62 +32,22 @@ export const ChatThreadPanel = ({
 const router = useRouter();
 const searchParams = useSearchParams();
 const [inputMessage, setInputMessage] = useState<CreateUIMessage<SBChatMessage> | undefined>(undefined);

 // Use the last user's last message to determine what repos and contexts we should select by default.
 const lastUserMessage = messages.findLast((message) => message.role === "user");
 const defaultSelectedRepos = lastUserMessage?.metadata?.selectedRepos ?? [];
 const defaultSelectedContexts = lastUserMessage?.metadata?.selectedContexts ?? [];
 const defaultSelectedSearchScopes = lastUserMessage?.metadata?.selectedSearchScopes ?? [];
 const [selectedSearchScopes, setSelectedSearchScopes] = useState<SearchScope[]>(defaultSelectedSearchScopes);

 const [selectedItems, setSelectedItems] = useState<ContextItem[]>([
 ...defaultSelectedRepos.map(repoName => {
 const repoInfo = repos.find(r => r.repoName === repoName);
 return {
 type: 'repo' as const,
 value: repoName,
 name: repoInfo?.repoDisplayName || repoName.split('/').pop() || repoName,
 codeHostType: repoInfo?.codeHostType || ''
 };
 }),
 ...defaultSelectedContexts.map(contextName => {
 const context = searchContexts.find(c => c.name === contextName);
 return {
 type: 'context' as const,
 value: contextName,
 name: contextName,
 repoCount: context?.repoNames.length || 0
 };
 })
 ]);

 useEffect(() => {
 const setChatState = searchParams.get(SET_CHAT_STATE_QUERY_PARAM);
 if (!setChatState) {
 return;
 }

 try {
 const { inputMessage, selectedRepos, selectedContexts } = JSON.parse(setChatState) as SetChatStatePayload;
 const { inputMessage, selectedSearchScopes } = JSON.parse(setChatState) as SetChatStatePayload;
 setInputMessage(inputMessage);
 setSelectedItems([
 ...selectedRepos.map(repoName => {
 const repoInfo = repos.find(r => r.repoName === repoName);
 return {
 type: 'repo' as const,
 value: repoName,
 name: repoInfo?.repoDisplayName || repoName.split('/').pop() || repoName,
 codeHostType: repoInfo?.codeHostType || ''
 };
 }),
 ...selectedContexts.map(contextName => {
 const context = searchContexts.find(c => c.name === contextName);
 return {
 type: 'context' as const,
 value: contextName,
 name: contextName, 
 repoCount: context?.repoNames.length || 0
 };
 })
 ]);
 setSelectedSearchScopes(selectedSearchScopes);
 } catch {
 console.error('Invalid message in URL');
 }
Expand All@@ -97,7 +56,7 @@ export const ChatThreadPanel = ({
 const newSearchParams = new URLSearchParams(searchParams.toString());
 newSearchParams.delete(SET_CHAT_STATE_QUERY_PARAM);
 router.replace(`?${newSearchParams.toString()}`, { scroll: false });
 }, [searchParams, router, repos, searchContexts]);
 }, [searchParams, router]);

 return (
 <ResizablePanel
Expand All@@ -113,8 +72,8 @@ export const ChatThreadPanel = ({
 languageModels={languageModels}
 repos={repos}
 searchContexts={searchContexts}
selectedItems={selectedItems}
onSelectedItemsChange={setSelectedItems}
selectedSearchScopes={selectedSearchScopes}
onSelectedSearchScopesChange={setSelectedSearchScopes}
 isChatReadonly={isChatReadonly}
 />
 </div>
Expand Down

15 changes: 7 additions & 8 deletions
packages/web/src/app/[domain]/chat/components/newChatPanel.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,12 +5,11 @@ import { ChatBox } from "@/features/chat/components/chatBox";
import { ChatBoxToolbar } from "@/features/chat/components/chatBox/chatBoxToolbar";
import { CustomSlateEditor } from "@/features/chat/customSlateEditor";
import { useCreateNewChatThread } from "@/features/chat/useCreateNewChatThread";
import { LanguageModelInfo } from "@/features/chat/types";
import { LanguageModelInfo, SearchScope } from "@/features/chat/types";
import { RepositoryQuery, SearchContextQuery } from "@/lib/types";
import { useCallback, useState } from "react";
import { Descendant } from "slate";
import { useLocalStorage } from "usehooks-ts";
import { ContextItem } from "@/features/chat/components/chatBox/contextSelector";

interface NewChatPanelProps {
 languageModels: LanguageModelInfo[];
Expand All@@ -25,13 +24,13 @@ export const NewChatPanel = ({
 searchContexts,
 order,
}: NewChatPanelProps) => {
 const [selectedItems, setSelectedItems] = useLocalStorage<ContextItem[]>("selectedContextItems", [], { initializeWithValue: false });
 const [selectedSearchScopes, setSelectedSearchScopes] = useLocalStorage<SearchScope[]>("selectedSearchScopes", [], { initializeWithValue: false });
 const { createNewChatThread, isLoading } = useCreateNewChatThread();
 const [isContextSelectorOpen, setIsContextSelectorOpen] = useState(false);

 const onSubmit = useCallback((children: Descendant[]) => {
 createNewChatThread(children, selectedItems);
 }, [createNewChatThread, selectedItems]);
 createNewChatThread(children, selectedSearchScopes);
 }, [createNewChatThread, selectedSearchScopes]);


 return (
Expand All@@ -50,7 +49,7 @@ export const NewChatPanel = ({
 preferredSuggestionsBoxPlacement="bottom-start"
 isRedirecting={isLoading}
 languageModels={languageModels}
selectedItems={selectedItems}
selectedSearchScopes={selectedSearchScopes}
 searchContexts={searchContexts}
 onContextSelectorOpenChanged={setIsContextSelectorOpen}
 />
Expand All@@ -59,8 +58,8 @@ export const NewChatPanel = ({
 languageModels={languageModels}
 repos={repos}
 searchContexts={searchContexts}
selectedItems={selectedItems}
onSelectedItemsChange={setSelectedItems}
selectedSearchScopes={selectedSearchScopes}
onSelectedSearchScopesChange={setSelectedSearchScopes}
 isContextSelectorOpen={isContextSelectorOpen}
 onContextSelectorOpenChanged={setIsContextSelectorOpen}
 />
Expand Down

17 changes: 6 additions & 11 deletions
packages/web/src/app/[domain]/components/homepage/agenticSearch.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,13 +3,12 @@
import { Separator } from "@/components/ui/separator";
import { ChatBox } from "@/features/chat/components/chatBox";
import { ChatBoxToolbar } from "@/features/chat/components/chatBox/chatBoxToolbar";
import { LanguageModelInfo } from "@/features/chat/types";
import { LanguageModelInfo, SearchScope } from "@/features/chat/types";
import { useCreateNewChatThread } from "@/features/chat/useCreateNewChatThread";
import { RepositoryQuery, SearchContextQuery } from "@/lib/types";
import { useState } from "react";
import { SearchModeSelector, SearchModeSelectorProps } from "./toolbar";
import { useLocalStorage } from "usehooks-ts";
import { ContextItem } from "@/features/chat/components/chatBox/contextSelector";
import { DemoExamples } from "@/types";
import { AskSourcebotDemoCards } from "./askSourcebotDemoCards";

Expand All@@ -34,20 +33,20 @@ export const AgenticSearch = ({
 demoExamples,
}: AgenticSearchProps) => {
 const { createNewChatThread, isLoading } = useCreateNewChatThread();
 const [selectedItems, setSelectedItems] = useLocalStorage<ContextItem[]>("selectedContextItems", [], { initializeWithValue: false });
 const [selectedSearchScopes, setSelectedSearchScopes] = useLocalStorage<SearchScope[]>("selectedSearchScopes", [], { initializeWithValue: false });
 const [isContextSelectorOpen, setIsContextSelectorOpen] = useState(false);

 return (
 <div className="flex flex-col items-center w-full">
 <div className="mt-4 w-full border rounded-md shadow-sm max-w-[800px]">
 <ChatBox
 onSubmit={(children) => {
 createNewChatThread(children, selectedItems);
 createNewChatThread(children, selectedSearchScopes);
 }}
 className="min-h-[50px]"
 isRedirecting={isLoading}
 languageModels={languageModels}
selectedItems={selectedItems}
selectedSearchScopes={selectedSearchScopes}
 searchContexts={searchContexts}
 onContextSelectorOpenChanged={setIsContextSelectorOpen}
 />
Expand All@@ -58,8 +57,8 @@ export const AgenticSearch = ({
 languageModels={languageModels}
 repos={repos}
 searchContexts={searchContexts}
selectedItems={selectedItems}
onSelectedItemsChange={setSelectedItems}
selectedSearchScopes={selectedSearchScopes}
onSelectedSearchScopesChange={setSelectedSearchScopes}
 isContextSelectorOpen={isContextSelectorOpen}
 onContextSelectorOpenChanged={setIsContextSelectorOpen}
 />
Expand All@@ -74,10 +73,6 @@ export const AgenticSearch = ({
 {demoExamples && (
 <AskSourcebotDemoCards
 demoExamples={demoExamples}
 selectedItems={selectedItems}
 setSelectedItems={setSelectedItems}
 searchContexts={searchContexts}
 repos={repos}
 />
 )}
 </div >
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Search scope refactor#405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

msukkari
merged 4 commits into

from

Jul 29, 2025

+394

−463

 Merged


Search scope refactor
#405
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
a5562d7

new demo card ui


msukkari Jul 28, 2025
f9e0500

rename search context to search scope


msukkari Jul 28, 2025
3b2dd51

rename everything to use search scope


msukkari Jul 28, 2025
f0c8561

add changelog entry


msukkari Jul 28, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
- Add search context to ask sourcebot context selector. [#397](https://github.com/sourcebot-dev/sourcebot/pull/397)
- Add ability to include/exclude connection in search context. [#399](https://github.com/sourcebot-dev/sourcebot/pull/399)
- Search context refactor to search scope and demo card UI changes. [#405](https://github.com/sourcebot-dev/sourcebot/pull/405)

### Fixed
- Fixed multiple writes race condition on config file watcher. [#398](https://github.com/sourcebot-dev/sourcebot/pull/398)
Expand Down

59 changes: 9 additions & 50 deletions
packages/web/src/app/[domain]/chat/[id]/components/chatThreadPanel.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,13 +2,12 @@

import { ResizablePanel } from '@/components/ui/resizable';
import { ChatThread } from '@/features/chat/components/chatThread';
import { LanguageModelInfo, SBChatMessage, SET_CHAT_STATE_QUERY_PARAM, SetChatStatePayload } from '@/features/chat/types';
import { LanguageModelInfo, SBChatMessage, SearchScope, SET_CHAT_STATE_QUERY_PARAM, SetChatStatePayload } from '@/features/chat/types';
import { RepositoryQuery, SearchContextQuery } from '@/lib/types';
import { CreateUIMessage } from 'ai';
import { useRouter, useSearchParams } from 'next/navigation';
import { useEffect, useState } from 'react';
import { useChatId } from '../../useChatId';
import { ContextItem } from '@/features/chat/components/chatBox/contextSelector';

interface ChatThreadPanelProps {
 languageModels: LanguageModelInfo[];
Expand All@@ -33,62 +32,22 @@ export const ChatThreadPanel = ({
 const router = useRouter();
 const searchParams = useSearchParams();
 const [inputMessage, setInputMessage] = useState<CreateUIMessage<SBChatMessage> | undefined>(undefined);

 // Use the last user's last message to determine what repos and contexts we should select by default.
 const lastUserMessage = messages.findLast((message) => message.role === "user");
 const defaultSelectedRepos = lastUserMessage?.metadata?.selectedRepos ?? [];
 const defaultSelectedContexts = lastUserMessage?.metadata?.selectedContexts ?? [];
 const defaultSelectedSearchScopes = lastUserMessage?.metadata?.selectedSearchScopes ?? [];
 const [selectedSearchScopes, setSelectedSearchScopes] = useState<SearchScope[]>(defaultSelectedSearchScopes);

 const [selectedItems, setSelectedItems] = useState<ContextItem[]>([
 ...defaultSelectedRepos.map(repoName => {
 const repoInfo = repos.find(r => r.repoName === repoName);
 return {
 type: 'repo' as const,
 value: repoName,
 name: repoInfo?.repoDisplayName || repoName.split('/').pop() || repoName,
 codeHostType: repoInfo?.codeHostType || ''
 };
 }),
 ...defaultSelectedContexts.map(contextName => {
 const context = searchContexts.find(c => c.name === contextName);
 return {
 type: 'context' as const,
 value: contextName,
 name: contextName,
 repoCount: context?.repoNames.length || 0
 };
 })
 ]);

 useEffect(() => {
 const setChatState = searchParams.get(SET_CHAT_STATE_QUERY_PARAM);
 if (!setChatState) {
 return;
 }

 try {
 const { inputMessage, selectedRepos, selectedContexts } = JSON.parse(setChatState) as SetChatStatePayload;
 const { inputMessage, selectedSearchScopes } = JSON.parse(setChatState) as SetChatStatePayload;
 setInputMessage(inputMessage);
 setSelectedItems([
 ...selectedRepos.map(repoName => {
 const repoInfo = repos.find(r => r.repoName === repoName);
 return {
 type: 'repo' as const,
 value: repoName,
 name: repoInfo?.repoDisplayName || repoName.split('/').pop() || repoName,
 codeHostType: repoInfo?.codeHostType || ''
 };
 }),
 ...selectedContexts.map(contextName => {
 const context = searchContexts.find(c => c.name === contextName);
 return {
 type: 'context' as const,
 value: contextName,
 name: contextName, 
 repoCount: context?.repoNames.length || 0
 };
 })
 ]);
 setSelectedSearchScopes(selectedSearchScopes);
 } catch {
 console.error('Invalid message in URL');
 }
Expand All@@ -97,7 +56,7 @@ export const ChatThreadPanel = ({
 const newSearchParams = new URLSearchParams(searchParams.toString());
 newSearchParams.delete(SET_CHAT_STATE_QUERY_PARAM);
 router.replace(`?${newSearchParams.toString()}`, { scroll: false });
 }, [searchParams, router, repos, searchContexts]);
 }, [searchParams, router]);

 return (
 <ResizablePanel
Expand All@@ -113,8 +72,8 @@ export const ChatThreadPanel = ({
 languageModels={languageModels}
 repos={repos}
 searchContexts={searchContexts}
selectedItems={selectedItems}
onSelectedItemsChange={setSelectedItems}
selectedSearchScopes={selectedSearchScopes}
onSelectedSearchScopesChange={setSelectedSearchScopes}
 isChatReadonly={isChatReadonly}
 />
 </div>
Expand Down

15 changes: 7 additions & 8 deletions
packages/web/src/app/[domain]/chat/components/newChatPanel.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,12 +5,11 @@ import { ChatBox } from "@/features/chat/components/chatBox";
import { ChatBoxToolbar } from "@/features/chat/components/chatBox/chatBoxToolbar";
import { CustomSlateEditor } from "@/features/chat/customSlateEditor";
import { useCreateNewChatThread } from "@/features/chat/useCreateNewChatThread";
import { LanguageModelInfo } from "@/features/chat/types";
import { LanguageModelInfo, SearchScope } from "@/features/chat/types";
import { RepositoryQuery, SearchContextQuery } from "@/lib/types";
import { useCallback, useState } from "react";
import { Descendant } from "slate";
import { useLocalStorage } from "usehooks-ts";
import { ContextItem } from "@/features/chat/components/chatBox/contextSelector";

interface NewChatPanelProps {
 languageModels: LanguageModelInfo[];
Expand All@@ -25,13 +24,13 @@ export const NewChatPanel = ({
 searchContexts,
 order,
}: NewChatPanelProps) => {
 const [selectedItems, setSelectedItems] = useLocalStorage<ContextItem[]>("selectedContextItems", [], { initializeWithValue: false });
 const [selectedSearchScopes, setSelectedSearchScopes] = useLocalStorage<SearchScope[]>("selectedSearchScopes", [], { initializeWithValue: false });
 const { createNewChatThread, isLoading } = useCreateNewChatThread();
 const [isContextSelectorOpen, setIsContextSelectorOpen] = useState(false);

 const onSubmit = useCallback((children: Descendant[]) => {
 createNewChatThread(children, selectedItems);
 }, [createNewChatThread, selectedItems]);
 createNewChatThread(children, selectedSearchScopes);
 }, [createNewChatThread, selectedSearchScopes]);


 return (
Expand All@@ -50,7 +49,7 @@ export const NewChatPanel = ({
 preferredSuggestionsBoxPlacement="bottom-start"
 isRedirecting={isLoading}
 languageModels={languageModels}
selectedItems={selectedItems}
selectedSearchScopes={selectedSearchScopes}
 searchContexts={searchContexts}
 onContextSelectorOpenChanged={setIsContextSelectorOpen}
 />
Expand All@@ -59,8 +58,8 @@ export const NewChatPanel = ({
 languageModels={languageModels}
 repos={repos}
 searchContexts={searchContexts}
selectedItems={selectedItems}
onSelectedItemsChange={setSelectedItems}
selectedSearchScopes={selectedSearchScopes}
onSelectedSearchScopesChange={setSelectedSearchScopes}
 isContextSelectorOpen={isContextSelectorOpen}
 onContextSelectorOpenChanged={setIsContextSelectorOpen}
 />
Expand Down

17 changes: 6 additions & 11 deletions
packages/web/src/app/[domain]/components/homepage/agenticSearch.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,13 +3,12 @@
import { Separator } from "@/components/ui/separator";
import { ChatBox } from "@/features/chat/components/chatBox";
import { ChatBoxToolbar } from "@/features/chat/components/chatBox/chatBoxToolbar";
import { LanguageModelInfo } from "@/features/chat/types";
import { LanguageModelInfo, SearchScope } from "@/features/chat/types";
import { useCreateNewChatThread } from "@/features/chat/useCreateNewChatThread";
import { RepositoryQuery, SearchContextQuery } from "@/lib/types";
import { useState } from "react";
import { SearchModeSelector, SearchModeSelectorProps } from "./toolbar";
import { useLocalStorage } from "usehooks-ts";
import { ContextItem } from "@/features/chat/components/chatBox/contextSelector";
import { DemoExamples } from "@/types";
import { AskSourcebotDemoCards } from "./askSourcebotDemoCards";

Expand All@@ -34,20 +33,20 @@ export const AgenticSearch = ({
 demoExamples,
}: AgenticSearchProps) => {
 const { createNewChatThread, isLoading } = useCreateNewChatThread();
 const [selectedItems, setSelectedItems] = useLocalStorage<ContextItem[]>("selectedContextItems", [], { initializeWithValue: false });
 const [selectedSearchScopes, setSelectedSearchScopes] = useLocalStorage<SearchScope[]>("selectedSearchScopes", [], { initializeWithValue: false });
 const [isContextSelectorOpen, setIsContextSelectorOpen] = useState(false);

 return (
 <div className="flex flex-col items-center w-full">
 <div className="mt-4 w-full border rounded-md shadow-sm max-w-[800px]">
 <ChatBox
 onSubmit={(children) => {
 createNewChatThread(children, selectedItems);
 createNewChatThread(children, selectedSearchScopes);
 }}
 className="min-h-[50px]"
 isRedirecting={isLoading}
 languageModels={languageModels}
selectedItems={selectedItems}
selectedSearchScopes={selectedSearchScopes}
 searchContexts={searchContexts}
 onContextSelectorOpenChanged={setIsContextSelectorOpen}
 />
Expand All@@ -58,8 +57,8 @@ export const AgenticSearch = ({
 languageModels={languageModels}
 repos={repos}
 searchContexts={searchContexts}
selectedItems={selectedItems}
onSelectedItemsChange={setSelectedItems}
selectedSearchScopes={selectedSearchScopes}
onSelectedSearchScopesChange={setSelectedSearchScopes}
 isContextSelectorOpen={isContextSelectorOpen}
 onContextSelectorOpenChanged={setIsContextSelectorOpen}
 />
Expand All@@ -74,10 +73,6 @@ export const AgenticSearch = ({
 {demoExamples && (
 <AskSourcebotDemoCards
 demoExamples={demoExamples}
 selectedItems={selectedItems}
 setSelectedItems={setSelectedItems}
 searchContexts={searchContexts}
 repos={repos}
 />
 )}
 </div >
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Search scope refactor#405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

msukkari
merged 4 commits into

from

Jul 29, 2025

+394

−463

 Merged


Search scope refactor
#405
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


4 commits


Select commit
Hold shift + click to select a range
a5562d7

new demo card ui


msukkari Jul 28, 2025
f9e0500

rename search context to search scope


msukkari Jul 28, 2025
3b2dd51

rename everything to use search scope


msukkari Jul 28, 2025
f0c8561

add changelog entry


msukkari Jul 28, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
- Add search context to ask sourcebot context selector. [#397](https://github.com/sourcebot-dev/sourcebot/pull/397)
- Add ability to include/exclude connection in search context. [#399](https://github.com/sourcebot-dev/sourcebot/pull/399)
- Search context refactor to search scope and demo card UI changes. [#405](https://github.com/sourcebot-dev/sourcebot/pull/405)

### Fixed
- Fixed multiple writes race condition on config file watcher. [#398](https://github.com/sourcebot-dev/sourcebot/pull/398)
Expand Down

59 changes: 9 additions & 50 deletions
packages/web/src/app/[domain]/chat/[id]/components/chatThreadPanel.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,13 +2,12 @@

import { ResizablePanel } from '@/components/ui/resizable';
import { ChatThread } from '@/features/chat/components/chatThread';
import { LanguageModelInfo, SBChatMessage, SET_CHAT_STATE_QUERY_PARAM, SetChatStatePayload } from '@/features/chat/types';
import { LanguageModelInfo, SBChatMessage, SearchScope, SET_CHAT_STATE_QUERY_PARAM, SetChatStatePayload } from '@/features/chat/types';
import { RepositoryQuery, SearchContextQuery } from '@/lib/types';
import { CreateUIMessage } from 'ai';
import { useRouter, useSearchParams } from 'next/navigation';
import { useEffect, useState } from 'react';
import { useChatId } from '../../useChatId';
import { ContextItem } from '@/features/chat/components/chatBox/contextSelector';

interface ChatThreadPanelProps {
 languageModels: LanguageModelInfo[];
Expand All@@ -33,62 +32,22 @@ export const ChatThreadPanel = ({
 const router = useRouter();
 const searchParams = useSearchParams();
 const [inputMessage, setInputMessage] = useState<CreateUIMessage<SBChatMessage> | undefined>(undefined);

 // Use the last user's last message to determine what repos and contexts we should select by default.
 const lastUserMessage = messages.findLast((message) => message.role === "user");
 const defaultSelectedRepos = lastUserMessage?.metadata?.selectedRepos ?? [];
 const defaultSelectedContexts = lastUserMessage?.metadata?.selectedContexts ?? [];
 const defaultSelectedSearchScopes = lastUserMessage?.metadata?.selectedSearchScopes ?? [];
 const [selectedSearchScopes, setSelectedSearchScopes] = useState<SearchScope[]>(defaultSelectedSearchScopes);

 const [selectedItems, setSelectedItems] = useState<ContextItem[]>([
 ...defaultSelectedRepos.map(repoName => {
 const repoInfo = repos.find(r => r.repoName === repoName);
 return {
 type: 'repo' as const,
 value: repoName,
 name: repoInfo?.repoDisplayName || repoName.split('/').pop() || repoName,
 codeHostType: repoInfo?.codeHostType || ''
 };
 }),
 ...defaultSelectedContexts.map(contextName => {
 const context = searchContexts.find(c => c.name === contextName);
 return {
 type: 'context' as const,
 value: contextName,
 name: contextName,
 repoCount: context?.repoNames.length || 0
 };
 })
 ]);

 useEffect(() => {
 const setChatState = searchParams.get(SET_CHAT_STATE_QUERY_PARAM);
 if (!setChatState) {
 return;
 }

 try {
 const { inputMessage, selectedRepos, selectedContexts } = JSON.parse(setChatState) as SetChatStatePayload;
 const { inputMessage, selectedSearchScopes } = JSON.parse(setChatState) as SetChatStatePayload;
 setInputMessage(inputMessage);
 setSelectedItems([
 ...selectedRepos.map(repoName => {
 const repoInfo = repos.find(r => r.repoName === repoName);
 return {
 type: 'repo' as const,
 value: repoName,
 name: repoInfo?.repoDisplayName || repoName.split('/').pop() || repoName,
 codeHostType: repoInfo?.codeHostType || ''
 };
 }),
 ...selectedContexts.map(contextName => {
 const context = searchContexts.find(c => c.name === contextName);
 return {
 type: 'context' as const,
 value: contextName,
 name: contextName, 
 repoCount: context?.repoNames.length || 0
 };
 })
 ]);
 setSelectedSearchScopes(selectedSearchScopes);
 } catch {
 console.error('Invalid message in URL');
 }
Expand All@@ -97,7 +56,7 @@ export const ChatThreadPanel = ({
 const newSearchParams = new URLSearchParams(searchParams.toString());
 newSearchParams.delete(SET_CHAT_STATE_QUERY_PARAM);
 router.replace(`?${newSearchParams.toString()}`, { scroll: false });
 }, [searchParams, router, repos, searchContexts]);
 }, [searchParams, router]);

 return (
 <ResizablePanel
Expand All@@ -113,8 +72,8 @@ export const ChatThreadPanel = ({
 languageModels={languageModels}
 repos={repos}
 searchContexts={searchContexts}
selectedItems={selectedItems}
onSelectedItemsChange={setSelectedItems}
selectedSearchScopes={selectedSearchScopes}
onSelectedSearchScopesChange={setSelectedSearchScopes}
 isChatReadonly={isChatReadonly}
 />
 </div>
Expand Down

15 changes: 7 additions & 8 deletions
packages/web/src/app/[domain]/chat/components/newChatPanel.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,12 +5,11 @@ import { ChatBox } from "@/features/chat/components/chatBox";
import { ChatBoxToolbar } from "@/features/chat/components/chatBox/chatBoxToolbar";
import { CustomSlateEditor } from "@/features/chat/customSlateEditor";
import { useCreateNewChatThread } from "@/features/chat/useCreateNewChatThread";
import { LanguageModelInfo } from "@/features/chat/types";
import { LanguageModelInfo, SearchScope } from "@/features/chat/types";
import { RepositoryQuery, SearchContextQuery } from "@/lib/types";
import { useCallback, useState } from "react";
import { Descendant } from "slate";
import { useLocalStorage } from "usehooks-ts";
import { ContextItem } from "@/features/chat/components/chatBox/contextSelector";

interface NewChatPanelProps {
 languageModels: LanguageModelInfo[];
Expand All@@ -25,13 +24,13 @@ export const NewChatPanel = ({
 searchContexts,
 order,
}: NewChatPanelProps) => {
 const [selectedItems, setSelectedItems] = useLocalStorage<ContextItem[]>("selectedContextItems", [], { initializeWithValue: false });
 const [selectedSearchScopes, setSelectedSearchScopes] = useLocalStorage<SearchScope[]>("selectedSearchScopes", [], { initializeWithValue: false });
 const { createNewChatThread, isLoading } = useCreateNewChatThread();
 const [isContextSelectorOpen, setIsContextSelectorOpen] = useState(false);

 const onSubmit = useCallback((children: Descendant[]) => {
 createNewChatThread(children, selectedItems);
 }, [createNewChatThread, selectedItems]);
 createNewChatThread(children, selectedSearchScopes);
 }, [createNewChatThread, selectedSearchScopes]);


 return (
Expand All@@ -50,7 +49,7 @@ export const NewChatPanel = ({
 preferredSuggestionsBoxPlacement="bottom-start"
 isRedirecting={isLoading}
 languageModels={languageModels}
selectedItems={selectedItems}
selectedSearchScopes={selectedSearchScopes}
 searchContexts={searchContexts}
 onContextSelectorOpenChanged={setIsContextSelectorOpen}
 />
Expand All@@ -59,8 +58,8 @@ export const NewChatPanel = ({
 languageModels={languageModels}
 repos={repos}
 searchContexts={searchContexts}
selectedItems={selectedItems}
onSelectedItemsChange={setSelectedItems}
selectedSearchScopes={selectedSearchScopes}
onSelectedSearchScopesChange={setSelectedSearchScopes}
 isContextSelectorOpen={isContextSelectorOpen}
 onContextSelectorOpenChanged={setIsContextSelectorOpen}
 />
Expand Down

17 changes: 6 additions & 11 deletions
packages/web/src/app/[domain]/components/homepage/agenticSearch.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,13 +3,12 @@
import { Separator } from "@/components/ui/separator";
import { ChatBox } from "@/features/chat/components/chatBox";
import { ChatBoxToolbar } from "@/features/chat/components/chatBox/chatBoxToolbar";
import { LanguageModelInfo } from "@/features/chat/types";
import { LanguageModelInfo, SearchScope } from "@/features/chat/types";
import { useCreateNewChatThread } from "@/features/chat/useCreateNewChatThread";
import { RepositoryQuery, SearchContextQuery } from "@/lib/types";
import { useState } from "react";
import { SearchModeSelector, SearchModeSelectorProps } from "./toolbar";
import { useLocalStorage } from "usehooks-ts";
import { ContextItem } from "@/features/chat/components/chatBox/contextSelector";
import { DemoExamples } from "@/types";
import { AskSourcebotDemoCards } from "./askSourcebotDemoCards";

Expand All@@ -34,20 +33,20 @@ export const AgenticSearch = ({
 demoExamples,
}: AgenticSearchProps) => {
 const { createNewChatThread, isLoading } = useCreateNewChatThread();
 const [selectedItems, setSelectedItems] = useLocalStorage<ContextItem[]>("selectedContextItems", [], { initializeWithValue: false });
 const [selectedSearchScopes, setSelectedSearchScopes] = useLocalStorage<SearchScope[]>("selectedSearchScopes", [], { initializeWithValue: false });
 const [isContextSelectorOpen, setIsContextSelectorOpen] = useState(false);

 return (
 <div className="flex flex-col items-center w-full">
 <div className="mt-4 w-full border rounded-md shadow-sm max-w-[800px]">
 <ChatBox
 onSubmit={(children) => {
 createNewChatThread(children, selectedItems);
 createNewChatThread(children, selectedSearchScopes);
 }}
 className="min-h-[50px]"
 isRedirecting={isLoading}
 languageModels={languageModels}
selectedItems={selectedItems}
selectedSearchScopes={selectedSearchScopes}
 searchContexts={searchContexts}
 onContextSelectorOpenChanged={setIsContextSelectorOpen}
 />
Expand All@@ -58,8 +57,8 @@ export const AgenticSearch = ({
 languageModels={languageModels}
 repos={repos}
 searchContexts={searchContexts}
selectedItems={selectedItems}
onSelectedItemsChange={setSelectedItems}
selectedSearchScopes={selectedSearchScopes}
onSelectedSearchScopesChange={setSelectedSearchScopes}
 isContextSelectorOpen={isContextSelectorOpen}
 onContextSelectorOpenChanged={setIsContextSelectorOpen}
 />
Expand All@@ -74,10 +73,6 @@ export const AgenticSearch = ({
 {demoExamples && (
 <AskSourcebotDemoCards
 demoExamples={demoExamples}
 selectedItems={selectedItems}
 setSelectedItems={setSelectedItems}
 searchContexts={searchContexts}
 repos={repos}
 />
 )}
 </div >
Expand Down
Loading