Optional file to log to if structured logging is enabled
| | `SOURCEBOT_TELEMETRY_DISABLED` | `false` |Enables/disables telemetry collection in Sourcebot. See [this doc](/docs/overview.mdx#telemetry) for more info.
| | `DEFAULT_MAX_MATCH_COUNT` | `10000` |The default maximum number of search results to return when using search in the web app.
| +| `ALWAYS_INDEX_FILE_PATTERNS` | - |A comma separated list of glob patterns matching file paths that should always be indexed, regardless of size or number of trigrams.
| ### Enterprise Environment Variables | Variable | Default | Description | diff --git a/docs/docs/configuration/idp.mdx b/docs/docs/configuration/idp.mdx index 21ae756d..6d2475b5 100644 --- a/docs/docs/configuration/idp.mdx +++ b/docs/docs/configuration/idp.mdx @@ -366,3 +366,53 @@ A Microsoft Entra ID connection can be used for [authentication](/docs/configura +### Authentik + +[Auth.js Authentik Provider Docs](https://authjs.dev/getting-started/providers/authentik) + +An Authentik connection can be used for [authentication](/docs/configuration/auth). + +Sign in @@ -163,7 +162,7 @@ export const ChatSidePanel = ({ chat.id === chatId && "bg-muted" )} onClick={() => { - router.push(`/${domain}/chat/${chat.id}`); + router.push(`/${SINGLE_TENANT_ORG_DOMAIN}/chat/${chat.id}`); }} > {chat.name ?? 'Untitled chat'} diff --git a/packages/web/src/app/[domain]/components/lightweightCodeHighlighter.tsx b/packages/web/src/app/[domain]/components/lightweightCodeHighlighter.tsx index bb5912ea..f72e6485 100644 --- a/packages/web/src/app/[domain]/components/lightweightCodeHighlighter.tsx +++ b/packages/web/src/app/[domain]/components/lightweightCodeHighlighter.tsx @@ -6,7 +6,7 @@ import { memo, useEffect, useMemo, useState } from 'react' import { useCodeMirrorHighlighter } from '@/hooks/useCodeMirrorHighlighter' import tailwind from '@/tailwind' import { measure } from '@/lib/utils' -import { SourceRange } from '@/features/search/types' +import { SourceRange } from '@/features/search' // Define a plain text language const plainTextLanguage = StreamLanguage.define({ diff --git a/packages/web/src/app/[domain]/components/navigationMenu/index.tsx b/packages/web/src/app/[domain]/components/navigationMenu/index.tsx index 34fb014b..0b089886 100644 --- a/packages/web/src/app/[domain]/components/navigationMenu/index.tsx +++ b/packages/web/src/app/[domain]/components/navigationMenu/index.tsx @@ -1,4 +1,4 @@ -import { getConnectionStats, getRepos, getReposStats } from "@/actions"; +import { getConnectionStats, getCurrentUserRole, getOrgAccountRequests, getRepos, getReposStats } from "@/actions"; import { SourcebotLogo } from "@/app/components/sourcebotLogo"; import { auth } from "@/auth"; import { Button } from "@/components/ui/button"; @@ -10,7 +10,7 @@ import { env } from "@sourcebot/shared"; import { ServiceErrorException } from "@/lib/serviceError"; import { isServiceError } from "@/lib/utils"; import { DiscordLogoIcon, GitHubLogoIcon } from "@radix-ui/react-icons"; -import { RepoIndexingJobStatus, RepoIndexingJobType } from "@sourcebot/db"; +import { OrgRole, RepoIndexingJobStatus, RepoIndexingJobType } from "@sourcebot/db"; import Link from "next/link"; import { redirect } from "next/navigation"; import { OrgSelector } from "../orgSelector"; @@ -20,7 +20,7 @@ import { NavigationItems } from "./navigationItems"; import { ProgressIndicator } from "./progressIndicator"; import { TrialIndicator } from "./trialIndicator"; -const SOURCEBOT_DISCORD_URL = "https://discord.gg/GbXMEM5H"; +const SOURCEBOT_DISCORD_URL = "https://discord.gg/HDScTs3ptP"; const SOURCEBOT_GITHUB_URL = "https://github.com/sourcebot-dev/sourcebot"; interface NavigationMenuProps { @@ -39,11 +39,32 @@ export const NavigationMenu = async ({ throw new ServiceErrorException(repoStats); } - const connectionStats = isAuthenticated ? await getConnectionStats() : null; - if (isServiceError(connectionStats)) { - throw new ServiceErrorException(connectionStats); + const role = isAuthenticated ? await getCurrentUserRole(domain) : null; + if (isServiceError(role)) { + throw new ServiceErrorException(role); } + const stats = await (async () => { + if (!isAuthenticated || role !== OrgRole.OWNER) { + return null; + } + + const joinRequests = await getOrgAccountRequests(domain); + if (isServiceError(joinRequests)) { + throw new ServiceErrorException(joinRequests); + } + + const connectionStats = await getConnectionStats(); + if (isServiceError(connectionStats)) { + throw new ServiceErrorException(connectionStats); + } + + return { + numJoinRequests: joinRequests.length, + connectionStats, + }; + })(); + const sampleRepos = await getRepos({ where: { jobs: { @@ -100,9 +121,10 @@ export const NavigationMenu = async ({ numberOfRepos={numberOfRepos} isReposButtonNotificationDotVisible={numberOfReposWithFirstTimeIndexingJobsInProgress > 0} isSettingsButtonNotificationDotVisible={ - connectionStats ? - connectionStats.numberOfConnectionsWithFirstTimeSyncJobsInProgress > 0 : - false + stats ? ( + stats.connectionStats.numberOfConnectionsWithFirstTimeSyncJobsInProgress > 0 || + stats.numJoinRequests > 0 + ) : false } isAuthenticated={isAuthenticated} /> diff --git a/packages/web/src/app/[domain]/components/pathHeader.tsx b/packages/web/src/app/[domain]/components/pathHeader.tsx index d65d2c35..7d373b2e 100644 --- a/packages/web/src/app/[domain]/components/pathHeader.tsx +++ b/packages/web/src/app/[domain]/components/pathHeader.tsx @@ -233,7 +233,7 @@ export const PathHeader = ({ }} > @ - {`${branchDisplayName}`} + {`${branchDisplayName.replace(/^refs\/(heads|tags)\//, '')}`}
)} · diff --git a/packages/web/src/app/[domain]/components/searchBar/constants.ts b/packages/web/src/app/[domain]/components/searchBar/constants.ts index c637bee9..ea93cee8 100644 --- a/packages/web/src/app/[domain]/components/searchBar/constants.ts +++ b/packages/web/src/app/[domain]/components/searchBar/constants.ts @@ -16,57 +16,53 @@ export enum SearchPrefix { sym = "sym:", content = "content:", archived = "archived:", - case = "case:", fork = "fork:", - public = "public:", + visibility = "visibility:", context = "context:", } -export const publicModeSuggestions: Suggestion[] = [ +export const visibilityModeSuggestions: Suggestion[] = [ { - value: "yes", + value: "public", description: "Only include results from public repositories." }, { - value: "no", + value: "private", description: "Only include results from private repositories." }, + { + value: "any", + description: "Include results from both public and private repositories (default)." + }, ]; export const forkModeSuggestions: Suggestion[] = [ { value: "yes", + description: "Include results from forked repositories (default)." + }, + { + value: "no", + description: "Exclude results from forked repositories." + }, + { + value: "only", description: "Only include results from forked repositories." - }, - { - value: "no", - description: "Only include results from non-forked repositories." - }, -]; - -export const caseModeSuggestions: Suggestion[] = [ - { - value: "auto", - description: "Search patterns are case-insensitive if all characters are lowercase, and case sensitive otherwise (default)." - }, - { - value: "yes", - description: "Case sensitive search." - }, - { - value: "no", - description: "Case insensitive search." - }, + } ]; export const archivedModeSuggestions: Suggestion[] = [ { value: "yes", - description: "Only include results in archived repositories." + description: "Include results from archived repositories (default)." }, { value: "no", - description: "Only include results in non-archived repositories." + description: "Exclude results from archived repositories." }, + { + value: "only", + description: "Only include results from archived repositories." + } ]; diff --git a/packages/web/src/app/[domain]/components/searchBar/searchBar.tsx b/packages/web/src/app/[domain]/components/searchBar/searchBar.tsx index 6dbd47cd..dda7ab2a 100644 --- a/packages/web/src/app/[domain]/components/searchBar/searchBar.tsx +++ b/packages/web/src/app/[domain]/components/searchBar/searchBar.tsx @@ -42,14 +42,18 @@ import { Separator } from "@/components/ui/separator"; import { Tooltip, TooltipTrigger, TooltipContent } from "@/components/ui/tooltip"; import { Toggle } from "@/components/ui/toggle"; import { useDomain } from "@/hooks/useDomain"; -import { KeyboardShortcutHint } from "@/app/components/keyboardShortcutHint"; import { createAuditAction } from "@/ee/features/audit/actions"; import tailwind from "@/tailwind"; +import { CaseSensitiveIcon, RegexIcon } from "lucide-react"; interface SearchBarProps { className?: string; size?: "default" | "sm"; - defaultQuery?: string; + defaults?: { + isRegexEnabled?: boolean; + isCaseSensitivityEnabled?: boolean; + query?: string; + } autoFocus?: boolean; } @@ -91,8 +95,12 @@ const searchBarContainerVariants = cva( export const SearchBar = ({ className, size, - defaultQuery, autoFocus, + defaults: { + isRegexEnabled: defaultIsRegexEnabled = false, + isCaseSensitivityEnabled: defaultIsCaseSensitivityEnabled = false, + query: defaultQuery = "", + } = {} }: SearchBarProps) => { const router = useRouter(); const domain = useDomain(); @@ -102,11 +110,13 @@ export const SearchBar = ({ const [isSuggestionsEnabled, setIsSuggestionsEnabled] = useState(false); const [isSuggestionsBoxFocused, setIsSuggestionsBoxFocused] = useState(false); const [isHistorySearchEnabled, setIsHistorySearchEnabled] = useState(false); + const [isRegexEnabled, setIsRegexEnabled] = useState(defaultIsRegexEnabled); + const [isCaseSensitivityEnabled, setIsCaseSensitivityEnabled] = useState(defaultIsCaseSensitivityEnabled); const focusEditor = useCallback(() => editorRef.current?.view?.focus(), []); const focusSuggestionsBox = useCallback(() => suggestionBoxRef.current?.focus(), []); - const [_query, setQuery] = useState(defaultQuery ?? ""); + const [_query, setQuery] = useState(defaultQuery); const query = useMemo(() => { // Replace any newlines with spaces to handle // copy & pasting text with newlines. @@ -211,13 +221,15 @@ export const SearchBar = ({ metadata: { message: query, }, - }, domain) + }) const url = createPathWithQueryParams(`/${domain}/search`, [SearchQueryParams.query, query], + [SearchQueryParams.isRegexEnabled, isRegexEnabled ? "true" : null], + [SearchQueryParams.isCaseSensitivityEnabled, isCaseSensitivityEnabled ? "true" : null], ); router.push(url); - }, [domain, router]); + }, [domain, router, isRegexEnabled, isCaseSensitivityEnabled]); return ( -
- {`Multiple expressions can be or'd together with `}
+ Keyword search matches search patterns exactly in file contents. Wrapping search patterns in
- Expressions can be prefixed with certain keywords to modify search behavior. Some keywords can be negated using the
+ Search queries (keyword or regex) can include multiple search filters to further refine the search results. Some filters can be negated using the
+ By default, space-seperated expressions are and'd together. Using the
Searching...
-Failed to search
-{error.message}
+{error instanceof ServiceErrorException ? error.serviceError.message : error.message}
Search stats for nerds
-{`[${searchDurationMs} ms] Found ${numMatches} matches in ${fileMatches.length} ${fileMatches.length > 1 ? 'files' : 'file'}`}
- ) : ( -No results
- ) - } - {isMoreResultsButtonVisible && ( -Searching...
+ {numMatches > 0 && ( +{`Found ${numMatches} matches in ${fileMatches.length} ${fileMatches.length > 1 ? 'files' : 'file'}`}
+ )} + + ) : ( + <> +Search stats for nerds
+{`[${searchDurationMs} ms] Found ${numMatches} matches in ${fileMatches.length} ${fileMatches.length > 1 ? 'files' : 'file'}`}
+ ) : ( +No results
+ ) + } + {isMoreResultsButtonVisible && ( +Searching...
+No results found
diff --git a/packages/web/src/app/[domain]/search/components/searchResultsPanel/fileMatch.tsx b/packages/web/src/app/[domain]/search/components/searchResultsPanel/fileMatch.tsx index d6e6b8ab..33433392 100644 --- a/packages/web/src/app/[domain]/search/components/searchResultsPanel/fileMatch.tsx +++ b/packages/web/src/app/[domain]/search/components/searchResultsPanel/fileMatch.tsx @@ -1,6 +1,6 @@ 'use client'; -import { SearchResultFile, SearchResultChunk } from "@/features/search/types"; +import { SearchResultFile, SearchResultChunk } from "@/features/search"; import { LightweightCodeHighlighter } from "@/app/[domain]/components/lightweightCodeHighlighter"; import Link from "next/link"; import { getBrowsePath } from "@/app/[domain]/browse/hooks/utils"; diff --git a/packages/web/src/app/[domain]/search/components/searchResultsPanel/fileMatchContainer.tsx b/packages/web/src/app/[domain]/search/components/searchResultsPanel/fileMatchContainer.tsx index b10d656a..2779b301 100644 --- a/packages/web/src/app/[domain]/search/components/searchResultsPanel/fileMatchContainer.tsx +++ b/packages/web/src/app/[domain]/search/components/searchResultsPanel/fileMatchContainer.tsx @@ -5,7 +5,7 @@ import { Separator } from "@/components/ui/separator"; import { DoubleArrowDownIcon, DoubleArrowUpIcon } from "@radix-ui/react-icons"; import { useMemo } from "react"; import { FileMatch } from "./fileMatch"; -import { RepositoryInfo, SearchResultFile } from "@/features/search/types"; +import { RepositoryInfo, SearchResultFile } from "@/features/search"; import { Button } from "@/components/ui/button"; export const MAX_MATCHES_TO_PREVIEW = 3; @@ -75,7 +75,7 @@ export const FileMatchContainer = ({ } return `${branches[0]}${branches.length > 1 ? ` +${branches.length - 1}` : ''}`; - }, [isBranchFilteringEnabled, branches]); + }, [branches, isBranchFilteringEnabled]); const repo = useMemo(() => { return repoInfo[file.repositoryId]; diff --git a/packages/web/src/app/[domain]/search/components/searchResultsPanel/index.tsx b/packages/web/src/app/[domain]/search/components/searchResultsPanel/index.tsx index 61e41332..b2ee8e9e 100644 --- a/packages/web/src/app/[domain]/search/components/searchResultsPanel/index.tsx +++ b/packages/web/src/app/[domain]/search/components/searchResultsPanel/index.tsx @@ -1,10 +1,11 @@ 'use client'; -import { RepositoryInfo, SearchResultFile } from "@/features/search/types"; -import { FileMatchContainer, MAX_MATCHES_TO_PREVIEW } from "./fileMatchContainer"; +import { RepositoryInfo, SearchResultFile } from "@/features/search"; import { useVirtualizer, VirtualItem } from "@tanstack/react-virtual"; -import { useCallback, useEffect, useRef, useState } from "react"; -import { useDebounce, usePrevious } from "@uidotdev/usehooks"; +import { useDebounce } from "@uidotdev/usehooks"; +import { forwardRef, useCallback, useEffect, useImperativeHandle, useRef } from "react"; +import { useMap } from "usehooks-ts"; +import { FileMatchContainer, MAX_MATCHES_TO_PREVIEW } from "./fileMatchContainer"; interface SearchResultsPanelProps { fileMatches: SearchResultFile[]; @@ -15,6 +16,10 @@ interface SearchResultsPanelProps { repoInfo: RecordNo hover info found
@@ -160,13 +271,13 @@ export const SymbolHoverPopup: React.FC{props.children}
} diff --git a/packages/web/src/features/chat/components/chatBox/useSuggestionsData.ts b/packages/web/src/features/chat/components/chatBox/useSuggestionsData.ts index 4adf9694..d41367d5 100644 --- a/packages/web/src/features/chat/components/chatBox/useSuggestionsData.ts +++ b/packages/web/src/features/chat/components/chatBox/useSuggestionsData.ts @@ -32,15 +32,22 @@ export const useSuggestionsData = ({ const { data: fileSuggestions, isLoading: _isLoadingFileSuggestions } = useQuery({ queryKey: ["fileSuggestions-agentic", suggestionQuery, domain, selectedRepos], queryFn: () => { - let query = `file:${suggestionQuery}`; + const query = []; + if (suggestionQuery.length > 0) { + query.push(`file:${suggestionQuery}`); + } else { + query.push('file:.*'); + } + if (selectedRepos.length > 0) { - query += ` reposet:${selectedRepos.join(',')}`; + query.push(`reposet:${selectedRepos.join(',')}`); } return unwrapServiceError(search({ - query, + query: query.join(' '), matches: 10, contextLines: 1, + source: 'chat-file-suggestions' })) }, select: (data): FileSuggestion[] => { diff --git a/packages/web/src/features/chat/components/chatThread/answerCard.tsx b/packages/web/src/features/chat/components/chatThread/answerCard.tsx index e3f89f62..d420ce5e 100644 --- a/packages/web/src/features/chat/components/chatThread/answerCard.tsx +++ b/packages/web/src/features/chat/components/chatThread/answerCard.tsx @@ -6,7 +6,7 @@ import { Button } from "@/components/ui/button"; import { TableOfContentsIcon, ThumbsDown, ThumbsUp } from "lucide-react"; import { Separator } from "@/components/ui/separator"; import { MarkdownRenderer } from "./markdownRenderer"; -import { forwardRef, useCallback, useImperativeHandle, useRef, useState } from "react"; +import { forwardRef, memo, useCallback, useImperativeHandle, useRef, useState } from "react"; import { Toggle } from "@/components/ui/toggle"; import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip"; import { CopyIconButton } from "@/app/[domain]/components/copyIconButton"; @@ -14,10 +14,10 @@ import { useToast } from "@/components/hooks/use-toast"; import { convertLLMOutputToPortableMarkdown } from "../../utils"; import { submitFeedback } from "../../actions"; import { isServiceError } from "@/lib/utils"; -import { useDomain } from "@/hooks/useDomain"; import useCaptureEvent from "@/hooks/useCaptureEvent"; import { LangfuseWeb } from "langfuse"; import { env } from "@sourcebot/shared/client"; +import isEqual from "fast-deep-equal/react"; interface AnswerCardProps { answerText: string; @@ -31,7 +31,7 @@ const langfuseWeb = (env.NEXT_PUBLIC_SOURCEBOT_CLOUD_ENVIRONMENT !== undefined & baseUrl: env.NEXT_PUBLIC_LANGFUSE_BASE_URL, }) : null; -export const AnswerCard = forwardRef