From 9a8448facf9855250f4fede7ec76db5d34770947 Mon Sep 17 00:00:00 2001
From: liangfung <jueliang@tabbyml.com>
Date: Thu, 12 Dec 2024 16:40:26 +0700
Subject: [PATCH 01/39] feat(ui): resolve indexed repository of IDE workspace

---
 ee/tabby-ui/app/chat/page.tsx              | 15 +++++
 ee/tabby-ui/components/chat/chat-panel.tsx | 67 +++++++++++++++++++++-
 ee/tabby-ui/components/chat/chat.tsx       |  8 ++-
 ee/tabby-ui/lib/stores/chat-actions.ts     |  4 ++
 ee/tabby-ui/lib/stores/chat-store.ts       |  4 +-
 5 files changed, 93 insertions(+), 5 deletions(-)

diff --git a/ee/tabby-ui/app/chat/page.tsx b/ee/tabby-ui/app/chat/page.tsx
index 48287de58c56..62cb048d5f22 100644
--- a/ee/tabby-ui/app/chat/page.tsx
+++ b/ee/tabby-ui/app/chat/page.tsx
@@ -28,6 +28,9 @@ import { MemoizedReactMarkdown } from '@/components/markdown'
 
 import './page.css'
 
+import { useQuery } from 'urql'
+
+import { resolveGitUrlQuery } from '@/lib/tabby/query'
 import { saveFetcherOptions } from '@/lib/tabby/token-management'
 
 const convertToHSLColor = (style: string) => {
@@ -154,6 +157,17 @@ export default function ChatPage() {
     updateActiveSelection
   })
 
+  // FIXME get url from workspace
+  const workspaceGitURL = 'https://github.com/tabbyML/tabby'
+
+  const [{ data, fetching }] = useQuery({
+    query: resolveGitUrlQuery,
+    variables: {
+      gitUrl: workspaceGitURL
+    },
+    pause: !workspaceGitURL
+  })
+
   useEffect(() => {
     const onFocus = () => {
       // When we receive top level focus, just focus chatInputRef
@@ -395,6 +409,7 @@ export default function ChatPage() {
           (supportsOnLookupSymbol ? server?.lookupSymbol : undefined)
         }
         openInEditor={isInEditor && server?.openInEditor}
+        indexedRepository={data?.resolveGitUrl}
       />
     </ErrorBoundary>
   )
diff --git a/ee/tabby-ui/components/chat/chat-panel.tsx b/ee/tabby-ui/components/chat/chat-panel.tsx
index b9f41fa47a0d..4a182523ffb1 100644
--- a/ee/tabby-ui/components/chat/chat-panel.tsx
+++ b/ee/tabby-ui/components/chat/chat-panel.tsx
@@ -9,7 +9,10 @@ import type { Context } from 'tabby-chat-panel'
 
 import { SLUG_TITLE_MAX_LENGTH } from '@/lib/constants'
 import { useCopyToClipboard } from '@/lib/hooks/use-copy-to-clipboard'
-import { updateEnableActiveSelection } from '@/lib/stores/chat-actions'
+import {
+  updateEnableActiveSelection,
+  updateEnableIndexedRepository
+} from '@/lib/stores/chat-actions'
 import { useChatStore } from '@/lib/stores/chat-store'
 import { useMutation } from '@/lib/tabby/gql'
 import { setThreadPersistedMutation } from '@/lib/tabby/query'
@@ -20,6 +23,7 @@ import {
   IconCheck,
   IconEye,
   IconEyeOff,
+  IconFolderGit,
   IconRefresh,
   IconRemove,
   IconShare,
@@ -70,11 +74,16 @@ function ChatPanelRenderer(
     relevantContext,
     removeRelevantContext,
     activeSelection,
-    onCopyContent
+    onCopyContent,
+    indexedRepository
   } = React.useContext(ChatContext)
   const enableActiveSelection = useChatStore(
     state => state.enableActiveSelection
   )
+  const enableIndexedRepository = useChatStore(
+    state => state.enableIndexedRepository
+  )
+
   const [persisting, setPerisiting] = useState(false)
   const { width } = useWindowSize()
   const isExtraSmallScreen = typeof width === 'number' && width < 376
@@ -220,6 +229,60 @@ function ChatPanelRenderer(
         <div className="border-t bg-background px-4 py-2 shadow-lg sm:space-y-4 sm:rounded-t-xl sm:border md:py-4">
           <div className="flex flex-wrap gap-2">
             <AnimatePresence presenceAffectsLayout>
+              {indexedRepository ? (
+                <Tooltip delayDuration={100}>
+                  <TooltipTrigger asChild>
+                    <motion.div
+                      initial={{ opacity: 0, scale: 0.9, y: -5 }}
+                      animate={{ opacity: 1, scale: 1, y: 0 }}
+                      transition={{
+                        ease: 'easeInOut',
+                        duration: 0.1
+                      }}
+                      exit={{ opacity: 0, scale: 0.9, y: 5 }}
+                    >
+                      <Badge
+                        variant="outline"
+                        className={cn(
+                          'inline-flex h-7 flex-nowrap items-center gap-1.5 overflow-hidden rounded-md pr-0 text-sm font-semibold',
+                          {
+                            'border-dashed !text-muted-foreground italic line-through':
+                              !enableIndexedRepository
+                          }
+                        )}
+                      >
+                        <IconFolderGit />
+                        {indexedRepository.name}
+                        <span className="shrink-0 text-muted-foreground">
+                          Current repo
+                        </span>
+                        <Button
+                          size="icon"
+                          variant="ghost"
+                          className="h-7 w-7 shrink-0 rounded-l-none"
+                          onClick={e => {
+                            updateEnableIndexedRepository(
+                              !enableIndexedRepository
+                            )
+                          }}
+                        >
+                          {enableIndexedRepository ? (
+                            <IconEye />
+                          ) : (
+                            <IconEyeOff />
+                          )}
+                        </Button>
+                      </Badge>
+                    </motion.div>
+                  </TooltipTrigger>
+                  <TooltipContent className="text-md space-y-2">
+                    <span className="text-muted-foreground font-semibold">
+                      Indexed repository of current workspace:
+                    </span>
+                    <p>{indexedRepository.gitUrl}</p>
+                  </TooltipContent>
+                </Tooltip>
+              ) : null}
               {activeSelection ? (
                 <motion.div
                   initial={{ opacity: 0, scale: 0.9, y: -5 }}
diff --git a/ee/tabby-ui/components/chat/chat.tsx b/ee/tabby-ui/components/chat/chat.tsx
index 4600d5d69026..2f7b8bb4f854 100644
--- a/ee/tabby-ui/components/chat/chat.tsx
+++ b/ee/tabby-ui/components/chat/chat.tsx
@@ -15,6 +15,7 @@ import {
   CreateMessageInput,
   InputMaybe,
   MessageAttachmentCodeInput,
+  ResolveGitUrlQuery,
   ThreadRunOptionsInput
 } from '@/lib/gql/generates/graphql'
 import { useDebounceCallback } from '@/lib/hooks/use-debounce'
@@ -63,6 +64,7 @@ type ChatContextValue = {
   removeRelevantContext: (index: number) => void
   chatInputRef: RefObject<HTMLTextAreaElement>
   supportsOnApplyInEditorV2: boolean
+  indexedRepository: ResolveGitUrlQuery['resolveGitUrl']
 }
 
 export const ChatContext = React.createContext<ChatContextValue>(
@@ -125,7 +127,8 @@ function ChatRenderer(
     onLookupSymbol,
     openInEditor,
     chatInputRef,
-    supportsOnApplyInEditorV2
+    supportsOnApplyInEditorV2,
+    indexedRepository
   }: ChatProps,
   ref: React.ForwardedRef<ChatRef>
 ) {
@@ -556,7 +559,8 @@ function ChatRenderer(
         removeRelevantContext,
         chatInputRef,
         activeSelection,
-        supportsOnApplyInEditorV2
+        supportsOnApplyInEditorV2,
+        indexedRepository
       }}
     >
       <div className="flex justify-center overflow-x-hidden">
diff --git a/ee/tabby-ui/lib/stores/chat-actions.ts b/ee/tabby-ui/lib/stores/chat-actions.ts
index eb88174aad17..52349cbb624c 100644
--- a/ee/tabby-ui/lib/stores/chat-actions.ts
+++ b/ee/tabby-ui/lib/stores/chat-actions.ts
@@ -13,3 +13,7 @@ export const updateSelectedModel = (model: string | undefined) => {
 export const updateEnableActiveSelection = (enable: boolean) => {
   set(() => ({ enableActiveSelection: enable }))
 }
+
+export const updateEnableIndexedRepository = (enable: boolean) => {
+  set(() => ({ enableIndexedRepository: enable }))
+}
diff --git a/ee/tabby-ui/lib/stores/chat-store.ts b/ee/tabby-ui/lib/stores/chat-store.ts
index 1c09b032c6b7..6d0bd7674bac 100644
--- a/ee/tabby-ui/lib/stores/chat-store.ts
+++ b/ee/tabby-ui/lib/stores/chat-store.ts
@@ -9,12 +9,14 @@ export interface ChatState {
   activeChatId: string | undefined
   selectedModel: string | undefined
   enableActiveSelection: boolean
+  enableIndexedRepository: boolean
 }
 
 const initialState: ChatState = {
   activeChatId: nanoid(),
   selectedModel: undefined,
-  enableActiveSelection: true
+  enableActiveSelection: true,
+  enableIndexedRepository: true
 }
 
 export const useChatStore = create<ChatState>()(

From eb6a1ac8f070d71eeed3a33e6618819a79ea6cf6 Mon Sep 17 00:00:00 2001
From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com>
Date: Thu, 12 Dec 2024 09:46:24 +0000
Subject: [PATCH 02/39] [autofix.ci] apply automated fixes

---
 ee/tabby-ui/components/chat/chat-panel.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ee/tabby-ui/components/chat/chat-panel.tsx b/ee/tabby-ui/components/chat/chat-panel.tsx
index 4a182523ffb1..07f71b117ef1 100644
--- a/ee/tabby-ui/components/chat/chat-panel.tsx
+++ b/ee/tabby-ui/components/chat/chat-panel.tsx
@@ -276,7 +276,7 @@ function ChatPanelRenderer(
                     </motion.div>
                   </TooltipTrigger>
                   <TooltipContent className="text-md space-y-2">
-                    <span className="text-muted-foreground font-semibold">
+                    <span className="font-semibold text-muted-foreground">
                       Indexed repository of current workspace:
                     </span>
                     <p>{indexedRepository.gitUrl}</p>

From 55d58ab902c77a86fac32e55d596db9976ff7517 Mon Sep 17 00:00:00 2001
From: liangfung <jueliang@tabbyml.com>
Date: Thu, 12 Dec 2024 18:21:09 +0700
Subject: [PATCH 03/39] update: sync git url

---
 clients/tabby-chat-panel/src/index.ts      |  2 ++
 clients/vscode/src/chat/WebviewHelper.ts   | 27 +++++++++++++++++
 ee/tabby-ui/app/chat/page.tsx              | 28 +++++++++---------
 ee/tabby-ui/components/chat/chat-panel.tsx |  5 +++-
 ee/tabby-ui/components/chat/chat.tsx       | 34 +++++++++++++++++++---
 5 files changed, 76 insertions(+), 20 deletions(-)

diff --git a/clients/tabby-chat-panel/src/index.ts b/clients/tabby-chat-panel/src/index.ts
index da6a46aa0512..98234d9dd3b5 100644
--- a/clients/tabby-chat-panel/src/index.ts
+++ b/clients/tabby-chat-panel/src/index.ts
@@ -185,6 +185,7 @@ export interface ServerApi {
   addRelevantContext: (context: Context) => void
   updateTheme: (style: string, themeClass: string) => void
   updateActiveSelection: (context: Context | null) => void
+  updateGitUrl: (gitUrl: string | undefined) => void
 }
 
 export interface ClientApiMethods {
@@ -272,6 +273,7 @@ export function createServer(api: ServerApi): ClientApi {
       addRelevantContext: api.addRelevantContext,
       updateTheme: api.updateTheme,
       updateActiveSelection: api.updateActiveSelection,
+      updateGitUrl: api.updateGitUrl,
     },
   })
 }
diff --git a/clients/vscode/src/chat/WebviewHelper.ts b/clients/vscode/src/chat/WebviewHelper.ts
index bb514c66a4ce..01d3745ba28a 100644
--- a/clients/vscode/src/chat/WebviewHelper.ts
+++ b/clients/vscode/src/chat/WebviewHelper.ts
@@ -287,6 +287,21 @@ export class WebviewHelper {
     }
   }
 
+  public async syncIndexedGitUrlToChatPanel(url: string | undefined) {
+    try {
+      this.logger.log('sync indexed git url', url)
+      await this.client?.updateGitUrl(url);
+    } catch {
+      this.logger.log(
+        {
+          every: 100,
+          level: "warn",
+        },
+        "Git URL sync failed. Please update your Tabby server to the latest version.",
+      );
+    }
+  }
+
   public addRelevantContext(context: Context) {
     if (!this.client) {
       this.pendingRelevantContexts.push(context);
@@ -318,6 +333,7 @@ export class WebviewHelper {
     this.pendingMessages = [];
 
     this.syncActiveSelection(window.activeTextEditor);
+    this.syncIndexedGitURL(window.activeTextEditor);
 
     const agentConfig = this.lspClient.agentConfig.current;
     if (agentConfig?.server.token) {
@@ -371,6 +387,16 @@ export class WebviewHelper {
     this.syncActiveSelectionToChatPanel(fileContext);
   }
 
+  public async syncIndexedGitURL(editor: TextEditor | undefined) {
+    if (!editor) {
+      this.syncIndexedGitUrlToChatPanel(undefined);
+      return;
+    }
+
+    const filePathParams = await buildFilePathParams(editor.document.uri, this.gitProvider);
+    this.syncIndexedGitUrlToChatPanel(filePathParams?.gitRemoteUrl)
+  }
+
   public addAgentEventListeners() {
     this.lspClient.status.on("didChange", async (status: StatusInfo) => {
       const agentConfig = this.lspClient.agentConfig.current;
@@ -386,6 +412,7 @@ export class WebviewHelper {
   public addTextEditorEventListeners() {
     window.onDidChangeActiveTextEditor((e) => {
       this.syncActiveSelection(e);
+      this.syncIndexedGitURL(e);
     });
 
     window.onDidChangeTextEditorSelection((e) => {
diff --git a/ee/tabby-ui/app/chat/page.tsx b/ee/tabby-ui/app/chat/page.tsx
index 62cb048d5f22..468d98daedef 100644
--- a/ee/tabby-ui/app/chat/page.tsx
+++ b/ee/tabby-ui/app/chat/page.tsx
@@ -28,9 +28,6 @@ import { MemoizedReactMarkdown } from '@/components/markdown'
 
 import './page.css'
 
-import { useQuery } from 'urql'
-
-import { resolveGitUrlQuery } from '@/lib/tabby/query'
 import { saveFetcherOptions } from '@/lib/tabby/token-management'
 
 const convertToHSLColor = (style: string) => {
@@ -60,6 +57,7 @@ export default function ChatPage() {
   >([])
   const [pendingActiveSelection, setPendingActiveSelection] =
     useState<Context | null>(null)
+  const [pendingGitUrl, setPendingGitUrl] = useState<string | undefined>()
   const [errorMessage, setErrorMessage] = useState<ErrorMessage | null>(null)
   const [isRefreshLoading, setIsRefreshLoading] = useState(false)
 
@@ -107,6 +105,14 @@ export default function ChatPage() {
     }
   }
 
+  const updateGitUrl = (gitUrl: string | undefined) => {
+    if (chatRef.current) {
+      chatRef.current.updateGitUrl(gitUrl)
+    } else if (gitUrl) {
+      setPendingGitUrl(gitUrl)
+    }
+  }
+
   const server = useServer({
     init: (request: InitRequest) => {
       if (chatRef.current) return
@@ -154,18 +160,8 @@ export default function ChatPage() {
       document.documentElement.className =
         themeClass + ` client client-${client}`
     },
-    updateActiveSelection
-  })
-
-  // FIXME get url from workspace
-  const workspaceGitURL = 'https://github.com/tabbyML/tabby'
-
-  const [{ data, fetching }] = useQuery({
-    query: resolveGitUrlQuery,
-    variables: {
-      gitUrl: workspaceGitURL
-    },
-    pause: !workspaceGitURL
+    updateActiveSelection,
+    updateGitUrl
   })
 
   useEffect(() => {
@@ -276,12 +272,14 @@ export default function ChatPage() {
     setPendingRelevantContexts([])
     setPendingMessages([])
     setPendingActiveSelection(null)
+    setPendingGitUrl(undefined)
   }
 
   const onChatLoaded = () => {
     pendingRelevantContexts.forEach(addRelevantContext)
     pendingMessages.forEach(sendMessage)
     chatRef.current?.updateActiveSelection(pendingActiveSelection)
+    chatRef.current?.updateGitUrl(pendingGitUrl)
 
     clearPendingState()
     setChatLoaded(true)
diff --git a/ee/tabby-ui/components/chat/chat-panel.tsx b/ee/tabby-ui/components/chat/chat-panel.tsx
index 07f71b117ef1..6f20e34413bc 100644
--- a/ee/tabby-ui/components/chat/chat-panel.tsx
+++ b/ee/tabby-ui/components/chat/chat-panel.tsx
@@ -23,6 +23,8 @@ import {
   IconCheck,
   IconEye,
   IconEyeOff,
+  IconFileSearch2,
+  IconFileText,
   IconFolderGit,
   IconRefresh,
   IconRemove,
@@ -275,7 +277,7 @@ function ChatPanelRenderer(
                       </Badge>
                     </motion.div>
                   </TooltipTrigger>
-                  <TooltipContent className="text-md space-y-2">
+                  <TooltipContent className="text-md space-y-2" align="start">
                     <span className="font-semibold text-muted-foreground">
                       Indexed repository of current workspace:
                     </span>
@@ -303,6 +305,7 @@ function ChatPanelRenderer(
                       }
                     )}
                   >
+                    <IconFileText />
                     <ContextLabel
                       context={activeSelection}
                       className="flex-1 truncate"
diff --git a/ee/tabby-ui/components/chat/chat.tsx b/ee/tabby-ui/components/chat/chat.tsx
index 2f7b8bb4f854..797b8d3daeef 100644
--- a/ee/tabby-ui/components/chat/chat.tsx
+++ b/ee/tabby-ui/components/chat/chat.tsx
@@ -8,6 +8,7 @@ import type {
   NavigateOpts,
   SymbolInfo
 } from 'tabby-chat-panel'
+import { useQuery } from 'urql'
 
 import { ERROR_CODE_NOT_FOUND } from '@/lib/constants'
 import {
@@ -23,6 +24,7 @@ import { useLatest } from '@/lib/hooks/use-latest'
 import { useThreadRun } from '@/lib/hooks/use-thread-run'
 import { filename2prism } from '@/lib/language-utils'
 import { useChatStore } from '@/lib/stores/chat-store'
+import { resolveGitUrlQuery } from '@/lib/tabby/query'
 import { ExtendedCombinedError } from '@/lib/types'
 import {
   AssistantMessage,
@@ -78,6 +80,7 @@ export interface ChatRef {
   addRelevantContext: (context: Context) => void
   focus: () => void
   updateActiveSelection: (context: Context | null) => void
+  updateGitUrl: (gitUrl: string | undefined) => void
 }
 
 interface ChatProps extends React.ComponentProps<'div'> {
@@ -127,8 +130,7 @@ function ChatRenderer(
     onLookupSymbol,
     openInEditor,
     chatInputRef,
-    supportsOnApplyInEditorV2,
-    indexedRepository
+    supportsOnApplyInEditorV2
   }: ChatProps,
   ref: React.ForwardedRef<ChatRef>
 ) {
@@ -141,11 +143,24 @@ function ChatRenderer(
   const [activeSelection, setActiveSelection] = React.useState<Context | null>(
     null
   )
+  const [gitUrl, setGitUrl] = React.useState<string | undefined>()
   const enableActiveSelection = useChatStore(
     state => state.enableActiveSelection
   )
+  const enableIndexedRepository = useChatStore(
+    state => state.enableIndexedRepository
+  )
+
   const chatPanelRef = React.useRef<ChatPanelRef>(null)
 
+  const [{ data }] = useQuery({
+    query: resolveGitUrlQuery,
+    variables: {
+      gitUrl: gitUrl as string
+    },
+    pause: !gitUrl
+  })
+
   const {
     sendUserMessage,
     isLoading,
@@ -510,9 +525,19 @@ function ChatRenderer(
     300
   )
 
+  const debouncedUpdateGitUrl = useDebounceCallback(
+    (url: string | undefined) => {
+      setGitUrl(url)
+    },
+    300
+  )
+
   const updateActiveSelection = (ctx: Context | null) => {
     debouncedUpdateActiveSelection.run(ctx)
   }
+  const updateGitUrl = (gitUrl: string | undefined) => {
+    debouncedUpdateGitUrl.run(gitUrl)
+  }
 
   React.useImperativeHandle(
     ref,
@@ -523,7 +548,8 @@ function ChatRenderer(
         isLoading,
         addRelevantContext,
         focus: () => chatPanelRef.current?.focus(),
-        updateActiveSelection
+        updateActiveSelection,
+        updateGitUrl
       }
     },
     []
@@ -560,7 +586,7 @@ function ChatRenderer(
         chatInputRef,
         activeSelection,
         supportsOnApplyInEditorV2,
-        indexedRepository
+        indexedRepository: gitUrl ? data?.resolveGitUrl : undefined
       }}
     >
       <div className="flex justify-center overflow-x-hidden">

From 1deab14b48c5b5d7a41dd77c812e6b055cecdd6d Mon Sep 17 00:00:00 2001
From: liangfung <jueliang@tabbyml.com>
Date: Thu, 12 Dec 2024 18:29:59 +0700
Subject: [PATCH 04/39] update: lint

---
 ee/tabby-ui/components/chat/chat-panel.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ee/tabby-ui/components/chat/chat-panel.tsx b/ee/tabby-ui/components/chat/chat-panel.tsx
index 6f20e34413bc..aa6a80b00002 100644
--- a/ee/tabby-ui/components/chat/chat-panel.tsx
+++ b/ee/tabby-ui/components/chat/chat-panel.tsx
@@ -23,7 +23,6 @@ import {
   IconCheck,
   IconEye,
   IconEyeOff,
-  IconFileSearch2,
   IconFileText,
   IconFolderGit,
   IconRefresh,

From 9671198087109319ae105d46fcf3ec089181ed37 Mon Sep 17 00:00:00 2001
From: liangfung <jueliang@tabbyml.com>
Date: Thu, 12 Dec 2024 18:38:30 +0700
Subject: [PATCH 05/39] update: lint

---
 clients/vscode/src/chat/WebviewHelper.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/clients/vscode/src/chat/WebviewHelper.ts b/clients/vscode/src/chat/WebviewHelper.ts
index 01d3745ba28a..d0801722cb44 100644
--- a/clients/vscode/src/chat/WebviewHelper.ts
+++ b/clients/vscode/src/chat/WebviewHelper.ts
@@ -289,7 +289,7 @@ export class WebviewHelper {
 
   public async syncIndexedGitUrlToChatPanel(url: string | undefined) {
     try {
-      this.logger.log('sync indexed git url', url)
+      this.logger.log("sync indexed git url", url);
       await this.client?.updateGitUrl(url);
     } catch {
       this.logger.log(
@@ -394,7 +394,7 @@ export class WebviewHelper {
     }
 
     const filePathParams = await buildFilePathParams(editor.document.uri, this.gitProvider);
-    this.syncIndexedGitUrlToChatPanel(filePathParams?.gitRemoteUrl)
+    this.syncIndexedGitUrlToChatPanel(filePathParams?.gitRemoteUrl);
   }
 
   public addAgentEventListeners() {

From 81cdbf43b9736e3b84ce75c5bbe71b181709257a Mon Sep 17 00:00:00 2001
From: liangfung <jueliang@tabbyml.com>
Date: Thu, 12 Dec 2024 18:44:04 +0700
Subject: [PATCH 06/39] update: animation

---
 ee/tabby-ui/components/chat/chat-panel.tsx | 42 +++++++++++-----------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/ee/tabby-ui/components/chat/chat-panel.tsx b/ee/tabby-ui/components/chat/chat-panel.tsx
index aa6a80b00002..5ba006fadec5 100644
--- a/ee/tabby-ui/components/chat/chat-panel.tsx
+++ b/ee/tabby-ui/components/chat/chat-panel.tsx
@@ -231,17 +231,18 @@ function ChatPanelRenderer(
           <div className="flex flex-wrap gap-2">
             <AnimatePresence presenceAffectsLayout>
               {indexedRepository ? (
-                <Tooltip delayDuration={100}>
-                  <TooltipTrigger asChild>
-                    <motion.div
-                      initial={{ opacity: 0, scale: 0.9, y: -5 }}
-                      animate={{ opacity: 1, scale: 1, y: 0 }}
-                      transition={{
-                        ease: 'easeInOut',
-                        duration: 0.1
-                      }}
-                      exit={{ opacity: 0, scale: 0.9, y: 5 }}
-                    >
+                <motion.div
+                  key="indexed-repository"
+                  initial={{ opacity: 0, scale: 0.9, y: -5 }}
+                  animate={{ opacity: 1, scale: 1, y: 0 }}
+                  transition={{
+                    ease: 'easeInOut',
+                    duration: 0.1
+                  }}
+                  exit={{ opacity: 0, scale: 0.9, y: 5 }}
+                >
+                  <Tooltip delayDuration={100}>
+                    <TooltipTrigger asChild>
                       <Badge
                         variant="outline"
                         className={cn(
@@ -274,18 +275,19 @@ function ChatPanelRenderer(
                           )}
                         </Button>
                       </Badge>
-                    </motion.div>
-                  </TooltipTrigger>
-                  <TooltipContent className="text-md space-y-2" align="start">
-                    <span className="font-semibold text-muted-foreground">
-                      Indexed repository of current workspace:
-                    </span>
-                    <p>{indexedRepository.gitUrl}</p>
-                  </TooltipContent>
-                </Tooltip>
+                    </TooltipTrigger>
+                    <TooltipContent className="text-md space-y-2" align="start">
+                      <span className="font-semibold text-muted-foreground">
+                        Indexed repository of current workspace:
+                      </span>
+                      <p>{indexedRepository.gitUrl}</p>
+                    </TooltipContent>
+                  </Tooltip>
+                </motion.div>
               ) : null}
               {activeSelection ? (
                 <motion.div
+                  key="active-selection"
                   initial={{ opacity: 0, scale: 0.9, y: -5 }}
                   animate={{ opacity: 1, scale: 1, y: 0 }}
                   transition={{

From 6deb7477f908c623d47ebd1bceb2112b2fff85c9 Mon Sep 17 00:00:00 2001
From: liangfung <jueliang@tabbyml.com>
Date: Sun, 15 Dec 2024 19:52:08 +0700
Subject: [PATCH 07/39] update

---
 clients/vscode/src/chat/WebviewHelper.ts | 2 +-
 ee/tabby-ui/app/chat/page.tsx            | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/clients/vscode/src/chat/WebviewHelper.ts b/clients/vscode/src/chat/WebviewHelper.ts
index d0801722cb44..0c624fbf98a5 100644
--- a/clients/vscode/src/chat/WebviewHelper.ts
+++ b/clients/vscode/src/chat/WebviewHelper.ts
@@ -33,7 +33,7 @@ import { GitProvider } from "../git/GitProvider";
 import { createClient } from "./chatPanel";
 import { Client as LspClient } from "../lsp/Client";
 import { isBrowser } from "../env";
-import { getFileContextFromSelection, showFileContext, openTextDocument } from "./fileContext";
+import { getFileContextFromSelection, showFileContext, openTextDocument, buildFilePathParams } from "./fileContext";
 import {
   localUriToChatPanelFilepath,
   chatPanelFilepathToLocalUri,
diff --git a/ee/tabby-ui/app/chat/page.tsx b/ee/tabby-ui/app/chat/page.tsx
index 468d98daedef..0c537de99b07 100644
--- a/ee/tabby-ui/app/chat/page.tsx
+++ b/ee/tabby-ui/app/chat/page.tsx
@@ -407,7 +407,6 @@ export default function ChatPage() {
           (supportsOnLookupSymbol ? server?.lookupSymbol : undefined)
         }
         openInEditor={isInEditor && server?.openInEditor}
-        indexedRepository={data?.resolveGitUrl}
       />
     </ErrorBoundary>
   )

From 12c9a894460fdc3dd5fd6af9405ac403c60735fc Mon Sep 17 00:00:00 2001
From: liangfung <jueliang@tabbyml.com>
Date: Sat, 14 Dec 2024 23:40:49 +0700
Subject: [PATCH 08/39] feat(ui): add repo select in chat sidebar

---
 ee/tabby-ui/components/chat/prompt-form.tsx | 14 ++-
 ee/tabby-ui/components/chat/repo-select.tsx | 97 +++++++++++++++++++++
 2 files changed, 107 insertions(+), 4 deletions(-)
 create mode 100644 ee/tabby-ui/components/chat/repo-select.tsx

diff --git a/ee/tabby-ui/components/chat/prompt-form.tsx b/ee/tabby-ui/components/chat/prompt-form.tsx
index abe51405a278..184dffe279a4 100644
--- a/ee/tabby-ui/components/chat/prompt-form.tsx
+++ b/ee/tabby-ui/components/chat/prompt-form.tsx
@@ -26,6 +26,7 @@ import {
   SearchableSelectOption,
   SearchableSelectTextarea
 } from '@/components/searchable-select'
+import { RepoSelect } from './repo-select'
 
 export interface PromptProps
   extends Pick<UseChatHelpers, 'input' | 'setInput'> {
@@ -198,21 +199,21 @@ function PromptFormRenderer(
           return (
             <>
               <SearchableSelectAnchor>
-                <div className="relative flex max-h-60 w-full grow flex-col overflow-hidden bg-background px-8 sm:rounded-md sm:border sm:px-12">
-                  <span
+                <div className="relative flex max-h-60 w-full grow flex-col overflow-hidden bg-background pr-8 sm:rounded-md sm:border sm:pr-12">
+                  {/* <span
                     className={cn(
                       buttonVariants({ size: 'sm', variant: 'ghost' }),
                       'absolute left-0 top-4 h-8 w-8 rounded-full bg-background p-0 hover:bg-background sm:left-4'
                     )}
                   >
                     <IconEdit />
-                  </span>
+                  </span> */}
                   <SearchableSelectTextarea
                     tabIndex={0}
                     rows={1}
                     placeholder="Ask a question."
                     spellCheck={false}
-                    className="min-h-[60px] w-full resize-none bg-transparent px-4 py-[1.3rem] focus-within:outline-none"
+                    className="min-h-[60px] w-full resize-none bg-transparent pr-4 sm:pl-4 py-[1.3rem] focus-within:outline-none"
                     value={input}
                     ref={chatInputRef}
                     onChange={e => {
@@ -304,6 +305,11 @@ function PromptFormRenderer(
           )
         }}
       </SearchableSelect>
+      <RepoSelect
+        value={undefined}
+        onChange={() => {}}
+        models={['1', '2']}
+      />
     </form>
   )
 }
diff --git a/ee/tabby-ui/components/chat/repo-select.tsx b/ee/tabby-ui/components/chat/repo-select.tsx
new file mode 100644
index 000000000000..1ea63b5ddadb
--- /dev/null
+++ b/ee/tabby-ui/components/chat/repo-select.tsx
@@ -0,0 +1,97 @@
+import { Maybe } from '@/lib/gql/generates/graphql'
+import { cn } from '@/lib/utils'
+import { Badge } from '@/components/ui/badge'
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuRadioGroup,
+  DropdownMenuRadioItem,
+  DropdownMenuTrigger
+} from '@/components/ui/dropdown-menu'
+import { IconCheck, IconFolderGit } from '@/components/ui/icons'
+import { Skeleton } from '@/components/ui/skeleton'
+import LoadingWrapper from '@/components/loading-wrapper'
+
+interface RepoSelectProps {
+  // todo rename
+  models: Maybe<Array<string>> | undefined
+  value: string | undefined
+  onChange: (v: string) => void
+  isInitializing?: boolean
+  // sourceId
+  workspaceRepoId?: string
+}
+
+export function RepoSelect({
+  models,
+  value,
+  onChange,
+  isInitializing
+}: RepoSelectProps) {
+  const onModelSelect = (v: string) => {
+    onChange(v)
+  }
+
+  return (
+    <LoadingWrapper
+      loading={isInitializing}
+      fallback={
+        <div className="w-full pl-2">
+          <Skeleton className="h-3 w-[20%]" />
+        </div>
+      }
+    >
+      {!!models?.length && (
+        <DropdownMenu>
+          <DropdownMenuTrigger>
+            <Badge
+              variant="outline"
+              className="inline-flex h-7 flex-nowrap items-center gap-1 overflow-hidden rounded-md text-sm font-semibold"
+            >
+              <IconFolderGit />
+              {/* FIXME */}
+              {/* {value} */}
+              TabbyML/tabby
+            </Badge>
+          </DropdownMenuTrigger>
+          <DropdownMenuContent
+            side="bottom"
+            align="start"
+            className="dropdown-menu max-h-[30vh] min-w-[20rem] overflow-y-auto overflow-x-hidden rounded-md border bg-popover p-2 text-popover-foreground shadow animate-in"
+          >
+            <DropdownMenuRadioGroup value={value} onValueChange={onChange}>
+              {models.map(model => {
+                const isSelected = model === value
+                return (
+                  <DropdownMenuRadioItem
+                    onClick={e => {
+                      onModelSelect(model)
+                      e.stopPropagation()
+                    }}
+                    value={model}
+                    key={model}
+                    className="cursor-pointer py-2 pl-3"
+                  >
+                    <IconCheck
+                      className={cn(
+                        'mr-2 shrink-0',
+                        model === value ? 'opacity-100' : 'opacity-0'
+                      )}
+                    />
+                    <span
+                      className={cn({
+                        'font-medium': isSelected
+                      })}
+                    >
+                      {model}
+                    </span>
+                  </DropdownMenuRadioItem>
+                )
+              })}
+            </DropdownMenuRadioGroup>
+          </DropdownMenuContent>
+        </DropdownMenu>
+      )}
+    </LoadingWrapper>
+  )
+}

From 33da2ba4da9ea4c180c8b28a7066192d04d85ce1 Mon Sep 17 00:00:00 2001
From: liangfung <jueliang@tabbyml.com>
Date: Sun, 15 Dec 2024 23:55:34 +0700
Subject: [PATCH 09/39] update

---
 ee/tabby-schema/src/schema/mod.rs           |   2 +-
 ee/tabby-ui/components/chat/chat-panel.tsx  |  24 ++--
 ee/tabby-ui/components/chat/chat.tsx        |  36 ++++-
 ee/tabby-ui/components/chat/prompt-form.tsx |  12 +-
 ee/tabby-ui/components/chat/repo-select.tsx | 145 +++++++++++++-------
 5 files changed, 148 insertions(+), 71 deletions(-)

diff --git a/ee/tabby-schema/src/schema/mod.rs b/ee/tabby-schema/src/schema/mod.rs
index ffef5bdc5ee9..d0f81ad41c76 100644
--- a/ee/tabby-schema/src/schema/mod.rs
+++ b/ee/tabby-schema/src/schema/mod.rs
@@ -550,7 +550,7 @@ impl Query {
     }
 
     async fn context_info(ctx: &Context) -> Result<ContextInfo> {
-        let user = check_user(ctx).await?;
+        let user = check_user_allow_auth_token(ctx).await?;
         ctx.locator.context().read(Some(&user.policy)).await
     }
 
diff --git a/ee/tabby-ui/components/chat/chat-panel.tsx b/ee/tabby-ui/components/chat/chat-panel.tsx
index 5ba006fadec5..be87f39a909b 100644
--- a/ee/tabby-ui/components/chat/chat-panel.tsx
+++ b/ee/tabby-ui/components/chat/chat-panel.tsx
@@ -9,10 +9,7 @@ import type { Context } from 'tabby-chat-panel'
 
 import { SLUG_TITLE_MAX_LENGTH } from '@/lib/constants'
 import { useCopyToClipboard } from '@/lib/hooks/use-copy-to-clipboard'
-import {
-  updateEnableActiveSelection,
-  updateEnableIndexedRepository
-} from '@/lib/stores/chat-actions'
+import { updateEnableActiveSelection } from '@/lib/stores/chat-actions'
 import { useChatStore } from '@/lib/stores/chat-store'
 import { useMutation } from '@/lib/tabby/gql'
 import { setThreadPersistedMutation } from '@/lib/tabby/query'
@@ -24,7 +21,6 @@ import {
   IconEye,
   IconEyeOff,
   IconFileText,
-  IconFolderGit,
   IconRefresh,
   IconRemove,
   IconShare,
@@ -37,6 +33,7 @@ import { FooterText } from '@/components/footer'
 
 import { Tooltip, TooltipContent, TooltipTrigger } from '../ui/tooltip'
 import { ChatContext } from './chat'
+import { RepoSelect } from './repo-select'
 
 export interface ChatPanelProps
   extends Pick<UseChatHelpers, 'stop' | 'input' | 'setInput'> {
@@ -76,7 +73,11 @@ function ChatPanelRenderer(
     removeRelevantContext,
     activeSelection,
     onCopyContent,
-    indexedRepository
+    indexedRepository,
+    selectedRepoId,
+    setSelectedRepoId,
+    repos,
+    fetchingRepos
   } = React.useContext(ChatContext)
   const enableActiveSelection = useChatStore(
     state => state.enableActiveSelection
@@ -230,7 +231,14 @@ function ChatPanelRenderer(
         <div className="border-t bg-background px-4 py-2 shadow-lg sm:space-y-4 sm:rounded-t-xl sm:border md:py-4">
           <div className="flex flex-wrap gap-2">
             <AnimatePresence presenceAffectsLayout>
-              {indexedRepository ? (
+              <RepoSelect
+                value={selectedRepoId}
+                onChange={setSelectedRepoId}
+                repos={repos}
+                workspaceRepoId={indexedRepository?.sourceId}
+                isInitializing={fetchingRepos}
+              />
+              {/* {indexedRepository ? (
                 <motion.div
                   key="indexed-repository"
                   initial={{ opacity: 0, scale: 0.9, y: -5 }}
@@ -284,7 +292,7 @@ function ChatPanelRenderer(
                     </TooltipContent>
                   </Tooltip>
                 </motion.div>
-              ) : null}
+              ) : null} */}
               {activeSelection ? (
                 <motion.div
                   key="active-selection"
diff --git a/ee/tabby-ui/components/chat/chat.tsx b/ee/tabby-ui/components/chat/chat.tsx
index 797b8d3daeef..2ce6c3f527d3 100644
--- a/ee/tabby-ui/components/chat/chat.tsx
+++ b/ee/tabby-ui/components/chat/chat.tsx
@@ -13,6 +13,8 @@ import { useQuery } from 'urql'
 import { ERROR_CODE_NOT_FOUND } from '@/lib/constants'
 import {
   CodeQueryInput,
+  ContextInfo,
+  ContextSourceKind,
   CreateMessageInput,
   InputMaybe,
   MessageAttachmentCodeInput,
@@ -24,7 +26,7 @@ import { useLatest } from '@/lib/hooks/use-latest'
 import { useThreadRun } from '@/lib/hooks/use-thread-run'
 import { filename2prism } from '@/lib/language-utils'
 import { useChatStore } from '@/lib/stores/chat-store'
-import { resolveGitUrlQuery } from '@/lib/tabby/query'
+import { contextInfoQuery, resolveGitUrlQuery } from '@/lib/tabby/query'
 import { ExtendedCombinedError } from '@/lib/types'
 import {
   AssistantMessage,
@@ -67,6 +69,10 @@ type ChatContextValue = {
   chatInputRef: RefObject<HTMLTextAreaElement>
   supportsOnApplyInEditorV2: boolean
   indexedRepository: ResolveGitUrlQuery['resolveGitUrl']
+  selectedRepoId: string | null
+  setSelectedRepoId: React.Dispatch<React.SetStateAction<string | null>>
+  repos: ContextInfo['sources']
+  fetchingRepos: boolean
 }
 
 export const ChatContext = React.createContext<ChatContextValue>(
@@ -143,7 +149,13 @@ function ChatRenderer(
   const [activeSelection, setActiveSelection] = React.useState<Context | null>(
     null
   )
+  // gitUrl from workspace
   const [gitUrl, setGitUrl] = React.useState<string | undefined>()
+  // sourceId
+  const [selectedRepoId, setSelectedRepoId] = React.useState<string | null>(
+    null
+  )
+
   const enableActiveSelection = useChatStore(
     state => state.enableActiveSelection
   )
@@ -152,8 +164,22 @@ function ChatRenderer(
   )
 
   const chatPanelRef = React.useRef<ChatPanelRef>(null)
+  const [{ data: contextInfoData, fetching: fetchingSources }] = useQuery({
+    query: contextInfoQuery
+  })
+  const repos = React.useMemo(() => {
+    return (
+      contextInfoData?.contextInfo?.sources.filter(source => {
+        return [
+          ContextSourceKind.Git,
+          ContextSourceKind.Github,
+          ContextSourceKind.Gitlab
+        ].includes(source.sourceKind)
+      }) ?? []
+    )
+  }, [contextInfoData])
 
-  const [{ data }] = useQuery({
+  const [{ data: resolvedGitUrl }] = useQuery({
     query: resolveGitUrlQuery,
     variables: {
       gitUrl: gitUrl as string
@@ -586,7 +612,11 @@ function ChatRenderer(
         chatInputRef,
         activeSelection,
         supportsOnApplyInEditorV2,
-        indexedRepository: gitUrl ? data?.resolveGitUrl : undefined
+        indexedRepository: gitUrl ? resolvedGitUrl?.resolveGitUrl : undefined,
+        selectedRepoId,
+        setSelectedRepoId,
+        repos,
+        fetchingRepos: fetchingSources
       }}
     >
       <div className="flex justify-center overflow-x-hidden">
diff --git a/ee/tabby-ui/components/chat/prompt-form.tsx b/ee/tabby-ui/components/chat/prompt-form.tsx
index 184dffe279a4..c8916baf9f23 100644
--- a/ee/tabby-ui/components/chat/prompt-form.tsx
+++ b/ee/tabby-ui/components/chat/prompt-form.tsx
@@ -26,7 +26,6 @@ import {
   SearchableSelectOption,
   SearchableSelectTextarea
 } from '@/components/searchable-select'
-import { RepoSelect } from './repo-select'
 
 export interface PromptProps
   extends Pick<UseChatHelpers, 'input' | 'setInput'> {
@@ -199,15 +198,15 @@ function PromptFormRenderer(
           return (
             <>
               <SearchableSelectAnchor>
-                <div className="relative flex max-h-60 w-full grow flex-col overflow-hidden bg-background pr-8 sm:rounded-md sm:border sm:pr-12">
-                  {/* <span
+                <div className="relative flex max-h-60 w-full grow flex-col overflow-hidden bg-background px-8 sm:rounded-md sm:border sm:px-12">
+                  <span
                     className={cn(
                       buttonVariants({ size: 'sm', variant: 'ghost' }),
                       'absolute left-0 top-4 h-8 w-8 rounded-full bg-background p-0 hover:bg-background sm:left-4'
                     )}
                   >
                     <IconEdit />
-                  </span> */}
+                  </span>
                   <SearchableSelectTextarea
                     tabIndex={0}
                     rows={1}
@@ -305,11 +304,6 @@ function PromptFormRenderer(
           )
         }}
       </SearchableSelect>
-      <RepoSelect
-        value={undefined}
-        onChange={() => {}}
-        models={['1', '2']}
-      />
     </form>
   )
 }
diff --git a/ee/tabby-ui/components/chat/repo-select.tsx b/ee/tabby-ui/components/chat/repo-select.tsx
index 1ea63b5ddadb..8d805af47fc3 100644
--- a/ee/tabby-ui/components/chat/repo-select.tsx
+++ b/ee/tabby-ui/components/chat/repo-select.tsx
@@ -1,6 +1,5 @@
-import { Maybe } from '@/lib/gql/generates/graphql'
+import { ContextInfo } from '@/lib/gql/generates/graphql'
 import { cn } from '@/lib/utils'
-import { Badge } from '@/components/ui/badge'
 import {
   DropdownMenu,
   DropdownMenuContent,
@@ -8,30 +7,44 @@ import {
   DropdownMenuRadioItem,
   DropdownMenuTrigger
 } from '@/components/ui/dropdown-menu'
-import { IconCheck, IconFolderGit } from '@/components/ui/icons'
+import {
+  IconCheck,
+  IconChevronUpDown,
+  IconFolderGit,
+  IconRemove
+} from '@/components/ui/icons'
 import { Skeleton } from '@/components/ui/skeleton'
 import LoadingWrapper from '@/components/loading-wrapper'
 
+import { Badge } from '../ui/badge'
+import { Button } from '../ui/button'
+
 interface RepoSelectProps {
-  // todo rename
-  models: Maybe<Array<string>> | undefined
-  value: string | undefined
-  onChange: (v: string) => void
+  repos: ContextInfo['sources']
+  value: string | null | undefined
+  onChange: (v: string | null) => void
   isInitializing?: boolean
   // sourceId
   workspaceRepoId?: string
 }
 
 export function RepoSelect({
-  models,
+  repos,
   value,
   onChange,
-  isInitializing
+  isInitializing,
+  workspaceRepoId
 }: RepoSelectProps) {
-  const onModelSelect = (v: string) => {
+  const onSelectRepo = (v: string) => {
     onChange(v)
+    // todo input focus
   }
 
+  const isWorkspaceRepo = !!workspaceRepoId && workspaceRepoId === value
+  const selectedRepoName = repos?.find(
+    repo => repo.sourceId === value
+  )?.sourceName
+
   return (
     <LoadingWrapper
       loading={isInitializing}
@@ -41,41 +54,68 @@ export function RepoSelect({
         </div>
       }
     >
-      {!!models?.length && (
-        <DropdownMenu>
-          <DropdownMenuTrigger>
-            <Badge
-              variant="outline"
-              className="inline-flex h-7 flex-nowrap items-center gap-1 overflow-hidden rounded-md text-sm font-semibold"
-            >
-              <IconFolderGit />
-              {/* FIXME */}
-              {/* {value} */}
-              TabbyML/tabby
-            </Badge>
+      <DropdownMenu>
+        <Badge
+          variant="outline"
+          className="h-7 items-center gap-1 overflow-hidden rounded-md text-sm font-semibold pr-0 min-w-[8rem]"
+        >
+          <DropdownMenuTrigger className="outline-none" asChild>
+            <div className="cursor-pointer flex-1 flex items-center gap-1.5 truncate break-all">
+              <IconFolderGit className="shrink-0" />
+              <div className="flex-1 flex items-center gap-1.5">
+                <span
+                  className={cn({
+                    'text-muted-foreground': !selectedRepoName
+                  })}
+                >
+                  {selectedRepoName || 'Select repo...'}
+                </span>
+                {isWorkspaceRepo && (
+                  <span className="shrink-0 text-muted-foreground">
+                    Repo in workspace
+                  </span>
+                )}
+              </div>
+              {!value && <IconChevronUpDown className="shrink-0" />}
+            </div>
           </DropdownMenuTrigger>
-          <DropdownMenuContent
-            side="bottom"
-            align="start"
-            className="dropdown-menu max-h-[30vh] min-w-[20rem] overflow-y-auto overflow-x-hidden rounded-md border bg-popover p-2 text-popover-foreground shadow animate-in"
-          >
-            <DropdownMenuRadioGroup value={value} onValueChange={onChange}>
-              {models.map(model => {
-                const isSelected = model === value
-                return (
-                  <DropdownMenuRadioItem
-                    onClick={e => {
-                      onModelSelect(model)
-                      e.stopPropagation()
-                    }}
-                    value={model}
-                    key={model}
-                    className="cursor-pointer py-2 pl-3"
-                  >
+          {!!value && (
+            <Button
+              type="button"
+              size="icon"
+              variant="ghost"
+              className="h-7 w-7 shrink-0 rounded-l-none"
+              onClick={e => {
+                console.log('eeeeeeee')
+                e.preventDefault()
+                e.stopPropagation()
+                onChange(null)
+              }}
+            >
+              <IconRemove />
+            </Button>
+          )}
+        </Badge>
+        <DropdownMenuContent
+          side="top"
+          align="start"
+          className="dropdown-menu max-h-[30vh] min-w-[20rem] max-w-full overflow-y-auto overflow-x-hidden rounded-md border bg-popover p-2 text-popover-foreground shadow animate-in"
+        >
+          <DropdownMenuRadioGroup>
+            {repos.map(repo => {
+              const isSelected = repo.sourceId === value
+              return (
+                <DropdownMenuRadioItem
+                  value={repo.sourceId}
+                  key={repo.sourceId}
+                  className="cursor-pointer py-2 pl-3 flex items-center"
+                  onSelect={() => onSelectRepo(repo.sourceId)}
+                >
+                  <div className="flex-1 truncate flex items-center gap-2">
                     <IconCheck
                       className={cn(
-                        'mr-2 shrink-0',
-                        model === value ? 'opacity-100' : 'opacity-0'
+                        'shrink-0',
+                        repo.sourceId === value ? 'opacity-100' : 'opacity-0'
                       )}
                     />
                     <span
@@ -83,15 +123,20 @@ export function RepoSelect({
                         'font-medium': isSelected
                       })}
                     >
-                      {model}
+                      {repo.sourceName}
+                    </span>
+                  </div>
+                  {repo.sourceId === workspaceRepoId && (
+                    <span className="text-muted-foreground ml-1.5 shrink-0">
+                      Repo in workspace
                     </span>
-                  </DropdownMenuRadioItem>
-                )
-              })}
-            </DropdownMenuRadioGroup>
-          </DropdownMenuContent>
-        </DropdownMenu>
-      )}
+                  )}
+                </DropdownMenuRadioItem>
+              )
+            })}
+          </DropdownMenuRadioGroup>
+        </DropdownMenuContent>
+      </DropdownMenu>
     </LoadingWrapper>
   )
 }

From 1fce9824dc68df14843fdd801de640a3176590c9 Mon Sep 17 00:00:00 2001
From: liangfung <jueliang@tabbyml.com>
Date: Tue, 17 Dec 2024 01:17:21 +0700
Subject: [PATCH 10/39] update: set default repo

---
 clients/vscode/src/chat/WebviewHelper.ts    | 19 +++----
 clients/vscode/src/chat/fileContext.ts      | 12 +++++
 ee/tabby-ui/components/chat/chat-panel.tsx  | 58 ---------------------
 ee/tabby-ui/components/chat/chat.tsx        | 20 +++++--
 ee/tabby-ui/components/chat/repo-select.tsx | 18 ++++---
 ee/tabby-ui/lib/stores/chat-actions.ts      |  4 --
 ee/tabby-ui/lib/stores/chat-store.ts        |  4 +-
 7 files changed, 48 insertions(+), 87 deletions(-)

diff --git a/clients/vscode/src/chat/WebviewHelper.ts b/clients/vscode/src/chat/WebviewHelper.ts
index 0c624fbf98a5..a04bc227a183 100644
--- a/clients/vscode/src/chat/WebviewHelper.ts
+++ b/clients/vscode/src/chat/WebviewHelper.ts
@@ -33,7 +33,7 @@ import { GitProvider } from "../git/GitProvider";
 import { createClient } from "./chatPanel";
 import { Client as LspClient } from "../lsp/Client";
 import { isBrowser } from "../env";
-import { getFileContextFromSelection, showFileContext, openTextDocument, buildFilePathParams } from "./fileContext";
+import { getFileContextFromSelection, showFileContext, openTextDocument, getGitRemoteUrl } from "./fileContext";
 import {
   localUriToChatPanelFilepath,
   chatPanelFilepathToLocalUri,
@@ -287,7 +287,7 @@ export class WebviewHelper {
     }
   }
 
-  public async syncIndexedGitUrlToChatPanel(url: string | undefined) {
+  public async syncWorkspaceGitUrlToChatPanel(url: string | undefined) {
     try {
       this.logger.log("sync indexed git url", url);
       await this.client?.updateGitUrl(url);
@@ -333,7 +333,7 @@ export class WebviewHelper {
     this.pendingMessages = [];
 
     this.syncActiveSelection(window.activeTextEditor);
-    this.syncIndexedGitURL(window.activeTextEditor);
+    this.syncWorkspaceGitURL(window.activeTextEditor);
 
     const agentConfig = this.lspClient.agentConfig.current;
     if (agentConfig?.server.token) {
@@ -387,14 +387,9 @@ export class WebviewHelper {
     this.syncActiveSelectionToChatPanel(fileContext);
   }
 
-  public async syncIndexedGitURL(editor: TextEditor | undefined) {
-    if (!editor) {
-      this.syncIndexedGitUrlToChatPanel(undefined);
-      return;
-    }
-
-    const filePathParams = await buildFilePathParams(editor.document.uri, this.gitProvider);
-    this.syncIndexedGitUrlToChatPanel(filePathParams?.gitRemoteUrl);
+  public async syncWorkspaceGitURL(editor: TextEditor | undefined) {
+    const gitRemoteUrl = await getGitRemoteUrl(editor?.document.uri, this.gitProvider);
+    this.syncWorkspaceGitUrlToChatPanel(gitRemoteUrl);
   }
 
   public addAgentEventListeners() {
@@ -412,7 +407,7 @@ export class WebviewHelper {
   public addTextEditorEventListeners() {
     window.onDidChangeActiveTextEditor((e) => {
       this.syncActiveSelection(e);
-      this.syncIndexedGitURL(e);
+      this.syncWorkspaceGitURL(e);
     });
 
     window.onDidChangeTextEditorSelection((e) => {
diff --git a/clients/vscode/src/chat/fileContext.ts b/clients/vscode/src/chat/fileContext.ts
index 8cf6dbb50fce..cc9e3e350691 100644
--- a/clients/vscode/src/chat/fileContext.ts
+++ b/clients/vscode/src/chat/fileContext.ts
@@ -81,6 +81,18 @@ export async function showFileContext(fileContext: FileContext, gitProvider: Git
   editor.revealRange(new Range(start, end), TextEditorRevealType.InCenter);
 }
 
+export async function getGitRemoteUrl(fileUri: Uri | undefined, gitProvider: GitProvider): Promise<string | undefined> {
+  if (fileUri) {
+    const pathParams = await buildFilePathParams(fileUri, gitProvider)
+    return pathParams.gitRemoteUrl
+  }
+
+  const workspaceFolder = workspace.workspaceFolders?.[0];
+  if (!workspaceFolder) return undefined;
+  const repo = gitProvider.getRepository(workspaceFolder.uri);
+  return repo ? gitProvider.getDefaultRemoteUrl(repo) : undefined;
+}
+
 export async function buildFilePathParams(uri: Uri, gitProvider: GitProvider): Promise<FilePathParams> {
   const workspaceFolder =
     workspace.getWorkspaceFolder(uri) ?? (uri.scheme === "untitled" ? workspace.workspaceFolders?.[0] : undefined);
diff --git a/ee/tabby-ui/components/chat/chat-panel.tsx b/ee/tabby-ui/components/chat/chat-panel.tsx
index be87f39a909b..e644eaf80d4e 100644
--- a/ee/tabby-ui/components/chat/chat-panel.tsx
+++ b/ee/tabby-ui/components/chat/chat-panel.tsx
@@ -82,9 +82,6 @@ function ChatPanelRenderer(
   const enableActiveSelection = useChatStore(
     state => state.enableActiveSelection
   )
-  const enableIndexedRepository = useChatStore(
-    state => state.enableIndexedRepository
-  )
 
   const [persisting, setPerisiting] = useState(false)
   const { width } = useWindowSize()
@@ -238,61 +235,6 @@ function ChatPanelRenderer(
                 workspaceRepoId={indexedRepository?.sourceId}
                 isInitializing={fetchingRepos}
               />
-              {/* {indexedRepository ? (
-                <motion.div
-                  key="indexed-repository"
-                  initial={{ opacity: 0, scale: 0.9, y: -5 }}
-                  animate={{ opacity: 1, scale: 1, y: 0 }}
-                  transition={{
-                    ease: 'easeInOut',
-                    duration: 0.1
-                  }}
-                  exit={{ opacity: 0, scale: 0.9, y: 5 }}
-                >
-                  <Tooltip delayDuration={100}>
-                    <TooltipTrigger asChild>
-                      <Badge
-                        variant="outline"
-                        className={cn(
-                          'inline-flex h-7 flex-nowrap items-center gap-1.5 overflow-hidden rounded-md pr-0 text-sm font-semibold',
-                          {
-                            'border-dashed !text-muted-foreground italic line-through':
-                              !enableIndexedRepository
-                          }
-                        )}
-                      >
-                        <IconFolderGit />
-                        {indexedRepository.name}
-                        <span className="shrink-0 text-muted-foreground">
-                          Current repo
-                        </span>
-                        <Button
-                          size="icon"
-                          variant="ghost"
-                          className="h-7 w-7 shrink-0 rounded-l-none"
-                          onClick={e => {
-                            updateEnableIndexedRepository(
-                              !enableIndexedRepository
-                            )
-                          }}
-                        >
-                          {enableIndexedRepository ? (
-                            <IconEye />
-                          ) : (
-                            <IconEyeOff />
-                          )}
-                        </Button>
-                      </Badge>
-                    </TooltipTrigger>
-                    <TooltipContent className="text-md space-y-2" align="start">
-                      <span className="font-semibold text-muted-foreground">
-                        Indexed repository of current workspace:
-                      </span>
-                      <p>{indexedRepository.gitUrl}</p>
-                    </TooltipContent>
-                  </Tooltip>
-                </motion.div>
-              ) : null} */}
               {activeSelection ? (
                 <motion.div
                   key="active-selection"
diff --git a/ee/tabby-ui/components/chat/chat.tsx b/ee/tabby-ui/components/chat/chat.tsx
index 2ce6c3f527d3..943f347a25f1 100644
--- a/ee/tabby-ui/components/chat/chat.tsx
+++ b/ee/tabby-ui/components/chat/chat.tsx
@@ -159,9 +159,6 @@ function ChatRenderer(
   const enableActiveSelection = useChatStore(
     state => state.enableActiveSelection
   )
-  const enableIndexedRepository = useChatStore(
-    state => state.enableIndexedRepository
-  )
 
   const chatPanelRef = React.useRef<ChatPanelRef>(null)
   const [{ data: contextInfoData, fetching: fetchingSources }] = useQuery({
@@ -179,6 +176,7 @@ function ChatRenderer(
     )
   }, [contextInfoData])
 
+  // todo remove this
   const [{ data: resolvedGitUrl }] = useQuery({
     query: resolveGitUrlQuery,
     variables: {
@@ -199,6 +197,22 @@ function ChatRenderer(
     threadId
   })
 
+  React.useEffect(() => {
+    const setDefaultRepoId = () => {
+      if (!resolvedGitUrl || !repos?.length) return
+      if (selectedRepoId) return
+
+      const defaultRepo = repos.find(
+        o => o.sourceId === resolvedGitUrl.resolveGitUrl?.sourceId
+      )
+      if (defaultRepo) {
+        setSelectedRepoId(defaultRepo.sourceId)
+      }
+    }
+
+    setDefaultRepoId()
+  }, [resolvedGitUrl, repos])
+
   const onDeleteMessage = async (userMessageId: string) => {
     if (!threadId) return
 
diff --git a/ee/tabby-ui/components/chat/repo-select.tsx b/ee/tabby-ui/components/chat/repo-select.tsx
index 8d805af47fc3..bbd39b4c6099 100644
--- a/ee/tabby-ui/components/chat/repo-select.tsx
+++ b/ee/tabby-ui/components/chat/repo-select.tsx
@@ -1,3 +1,5 @@
+import { useWindowSize } from '@uidotdev/usehooks'
+
 import { ContextInfo } from '@/lib/gql/generates/graphql'
 import { cn } from '@/lib/utils'
 import {
@@ -35,6 +37,9 @@ export function RepoSelect({
   isInitializing,
   workspaceRepoId
 }: RepoSelectProps) {
+  const { width } = useWindowSize()
+  const isExtraSmallScreen = typeof width === 'number' && width < 240
+
   const onSelectRepo = (v: string) => {
     onChange(v)
     // todo input focus
@@ -57,14 +62,14 @@ export function RepoSelect({
       <DropdownMenu>
         <Badge
           variant="outline"
-          className="h-7 items-center gap-1 overflow-hidden rounded-md text-sm font-semibold pr-0 min-w-[8rem]"
+          className="h-7 items-center gap-1 overflow-hidden rounded-md text-sm font-semibold pr-0 min-w-[8rem] break-all"
         >
           <DropdownMenuTrigger className="outline-none" asChild>
-            <div className="cursor-pointer flex-1 flex items-center gap-1.5 truncate break-all">
+            <div className="cursor-pointer flex-1 flex items-center gap-1.5 overflow-hidden">
               <IconFolderGit className="shrink-0" />
-              <div className="flex-1 flex items-center gap-1.5">
+              <div className="flex-1 flex items-center gap-1.5 truncate break-all">
                 <span
-                  className={cn({
+                  className={cn('truncate', {
                     'text-muted-foreground': !selectedRepoName
                   })}
                 >
@@ -72,7 +77,7 @@ export function RepoSelect({
                 </span>
                 {isWorkspaceRepo && (
                   <span className="shrink-0 text-muted-foreground">
-                    Repo in workspace
+                    {isExtraSmallScreen ? 'Workspace' : 'Repo in workspace'}
                   </span>
                 )}
               </div>
@@ -86,7 +91,6 @@ export function RepoSelect({
               variant="ghost"
               className="h-7 w-7 shrink-0 rounded-l-none"
               onClick={e => {
-                console.log('eeeeeeee')
                 e.preventDefault()
                 e.stopPropagation()
                 onChange(null)
@@ -128,7 +132,7 @@ export function RepoSelect({
                   </div>
                   {repo.sourceId === workspaceRepoId && (
                     <span className="text-muted-foreground ml-1.5 shrink-0">
-                      Repo in workspace
+                      {isExtraSmallScreen ? 'Workspace' : 'Repo in workspace'}
                     </span>
                   )}
                 </DropdownMenuRadioItem>
diff --git a/ee/tabby-ui/lib/stores/chat-actions.ts b/ee/tabby-ui/lib/stores/chat-actions.ts
index 52349cbb624c..eb88174aad17 100644
--- a/ee/tabby-ui/lib/stores/chat-actions.ts
+++ b/ee/tabby-ui/lib/stores/chat-actions.ts
@@ -13,7 +13,3 @@ export const updateSelectedModel = (model: string | undefined) => {
 export const updateEnableActiveSelection = (enable: boolean) => {
   set(() => ({ enableActiveSelection: enable }))
 }
-
-export const updateEnableIndexedRepository = (enable: boolean) => {
-  set(() => ({ enableIndexedRepository: enable }))
-}
diff --git a/ee/tabby-ui/lib/stores/chat-store.ts b/ee/tabby-ui/lib/stores/chat-store.ts
index 6d0bd7674bac..1c09b032c6b7 100644
--- a/ee/tabby-ui/lib/stores/chat-store.ts
+++ b/ee/tabby-ui/lib/stores/chat-store.ts
@@ -9,14 +9,12 @@ export interface ChatState {
   activeChatId: string | undefined
   selectedModel: string | undefined
   enableActiveSelection: boolean
-  enableIndexedRepository: boolean
 }
 
 const initialState: ChatState = {
   activeChatId: nanoid(),
   selectedModel: undefined,
-  enableActiveSelection: true,
-  enableIndexedRepository: true
+  enableActiveSelection: true
 }
 
 export const useChatStore = create<ChatState>()(

From 05214936529c16d90a047d2cdf036409ee510a5f Mon Sep 17 00:00:00 2001
From: liangfung <jueliang@tabbyml.com>
Date: Tue, 17 Dec 2024 10:18:24 +0700
Subject: [PATCH 11/39] update: code_query

---
 ee/tabby-ui/components/chat/chat.tsx | 37 ++++++----------------------
 1 file changed, 8 insertions(+), 29 deletions(-)

diff --git a/ee/tabby-ui/components/chat/chat.tsx b/ee/tabby-ui/components/chat/chat.tsx
index 943f347a25f1..4780232c3605 100644
--- a/ee/tabby-ui/components/chat/chat.tsx
+++ b/ee/tabby-ui/components/chat/chat.tsx
@@ -254,8 +254,7 @@ function ChatRenderer(
       ]
       setQaPairs(nextQaPairs)
       const [userMessage, threadRunOptions] = generateRequestPayload(
-        qaPair.user,
-        enableActiveSelection
+        qaPair.user
       )
 
       return regenerate({
@@ -412,30 +411,13 @@ function ChatRenderer(
   }, [error])
 
   const generateRequestPayload = (
-    userMessage: UserMessage,
-    enableActiveSelection?: boolean
+    userMessage: UserMessage
   ): [CreateMessageInput, ThreadRunOptionsInput] => {
-    // use selectContext for code query by default
-    let contextForCodeQuery: FileContext | undefined = userMessage.selectContext
-
-    // if enableActiveSelection, use selectContext or activeContext for code query
-    if (enableActiveSelection) {
-      contextForCodeQuery = contextForCodeQuery || userMessage.activeContext
-    }
-
-    // check context for codeQuery
-    if (!isValidContextForCodeQuery(contextForCodeQuery)) {
-      contextForCodeQuery = undefined
-    }
-
-    const codeQuery: InputMaybe<CodeQueryInput> = contextForCodeQuery
+    const content = userMessage.message
+    const codeQuery: InputMaybe<CodeQueryInput> = selectedRepoId
       ? {
-          content: contextForCodeQuery.content ?? '',
-          filepath: contextForCodeQuery.filepath,
-          language: contextForCodeQuery.filepath
-            ? filename2prism(contextForCodeQuery.filepath)[0] || 'plaintext'
-            : 'plaintext',
-          gitUrl: contextForCodeQuery?.git_url ?? ''
+          content,
+          sourceId: selectedRepoId
         }
       : null
 
@@ -443,6 +425,7 @@ function ChatRenderer(
       enableActiveSelection && !!userMessage.activeContext
     const clientSideFileContexts: FileContext[] = uniqWith(
       compact([
+        userMessage.selectContext,
         hasUsableActiveContext && userMessage.activeContext,
         ...(userMessage?.relevantContext || [])
       ]),
@@ -456,8 +439,6 @@ function ChatRenderer(
         startLine: o.range.start
       }))
 
-    const content = userMessage.message
-
     return [
       {
         content,
@@ -517,9 +498,7 @@ function ChatRenderer(
 
       setQaPairs(nextQaPairs)
 
-      sendUserMessage(
-        ...generateRequestPayload(newUserMessage, enableActiveSelection)
-      )
+      sendUserMessage(...generateRequestPayload(newUserMessage))
     }
   )
 

From 16dc9ff1021160d1e544f36d52270f34961b60fa Mon Sep 17 00:00:00 2001
From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com>
Date: Tue, 17 Dec 2024 03:19:40 +0000
Subject: [PATCH 12/39] [autofix.ci] apply automated fixes

---
 clients/vscode/src/chat/fileContext.ts      |  4 ++--
 ee/tabby-ui/components/chat/prompt-form.tsx |  2 +-
 ee/tabby-ui/components/chat/repo-select.tsx | 12 ++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/clients/vscode/src/chat/fileContext.ts b/clients/vscode/src/chat/fileContext.ts
index cc9e3e350691..4fdf203808b7 100644
--- a/clients/vscode/src/chat/fileContext.ts
+++ b/clients/vscode/src/chat/fileContext.ts
@@ -83,8 +83,8 @@ export async function showFileContext(fileContext: FileContext, gitProvider: Git
 
 export async function getGitRemoteUrl(fileUri: Uri | undefined, gitProvider: GitProvider): Promise<string | undefined> {
   if (fileUri) {
-    const pathParams = await buildFilePathParams(fileUri, gitProvider)
-    return pathParams.gitRemoteUrl
+    const pathParams = await buildFilePathParams(fileUri, gitProvider);
+    return pathParams.gitRemoteUrl;
   }
 
   const workspaceFolder = workspace.workspaceFolders?.[0];
diff --git a/ee/tabby-ui/components/chat/prompt-form.tsx b/ee/tabby-ui/components/chat/prompt-form.tsx
index c8916baf9f23..eb93fd553437 100644
--- a/ee/tabby-ui/components/chat/prompt-form.tsx
+++ b/ee/tabby-ui/components/chat/prompt-form.tsx
@@ -212,7 +212,7 @@ function PromptFormRenderer(
                     rows={1}
                     placeholder="Ask a question."
                     spellCheck={false}
-                    className="min-h-[60px] w-full resize-none bg-transparent pr-4 sm:pl-4 py-[1.3rem] focus-within:outline-none"
+                    className="min-h-[60px] w-full resize-none bg-transparent py-[1.3rem] pr-4 focus-within:outline-none sm:pl-4"
                     value={input}
                     ref={chatInputRef}
                     onChange={e => {
diff --git a/ee/tabby-ui/components/chat/repo-select.tsx b/ee/tabby-ui/components/chat/repo-select.tsx
index bbd39b4c6099..41d661bd9c23 100644
--- a/ee/tabby-ui/components/chat/repo-select.tsx
+++ b/ee/tabby-ui/components/chat/repo-select.tsx
@@ -62,12 +62,12 @@ export function RepoSelect({
       <DropdownMenu>
         <Badge
           variant="outline"
-          className="h-7 items-center gap-1 overflow-hidden rounded-md text-sm font-semibold pr-0 min-w-[8rem] break-all"
+          className="h-7 min-w-[8rem] items-center gap-1 overflow-hidden break-all rounded-md pr-0 text-sm font-semibold"
         >
           <DropdownMenuTrigger className="outline-none" asChild>
-            <div className="cursor-pointer flex-1 flex items-center gap-1.5 overflow-hidden">
+            <div className="flex flex-1 cursor-pointer items-center gap-1.5 overflow-hidden">
               <IconFolderGit className="shrink-0" />
-              <div className="flex-1 flex items-center gap-1.5 truncate break-all">
+              <div className="flex flex-1 items-center gap-1.5 truncate break-all">
                 <span
                   className={cn('truncate', {
                     'text-muted-foreground': !selectedRepoName
@@ -112,10 +112,10 @@ export function RepoSelect({
                 <DropdownMenuRadioItem
                   value={repo.sourceId}
                   key={repo.sourceId}
-                  className="cursor-pointer py-2 pl-3 flex items-center"
+                  className="flex cursor-pointer items-center py-2 pl-3"
                   onSelect={() => onSelectRepo(repo.sourceId)}
                 >
-                  <div className="flex-1 truncate flex items-center gap-2">
+                  <div className="flex flex-1 items-center gap-2 truncate">
                     <IconCheck
                       className={cn(
                         'shrink-0',
@@ -131,7 +131,7 @@ export function RepoSelect({
                     </span>
                   </div>
                   {repo.sourceId === workspaceRepoId && (
-                    <span className="text-muted-foreground ml-1.5 shrink-0">
+                    <span className="ml-1.5 shrink-0 text-muted-foreground">
                       {isExtraSmallScreen ? 'Workspace' : 'Repo in workspace'}
                     </span>
                   )}

From 4f7751b259ffc7e87f454256c38fdcc8c2601355 Mon Sep 17 00:00:00 2001
From: liangfung <jueliang@tabbyml.com>
Date: Tue, 17 Dec 2024 11:31:25 +0700
Subject: [PATCH 13/39] update: focus

---
 ee/tabby-ui/components/chat/chat-panel.tsx  | 10 +++++++++-
 ee/tabby-ui/components/chat/repo-select.tsx |  1 -
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ee/tabby-ui/components/chat/chat-panel.tsx b/ee/tabby-ui/components/chat/chat-panel.tsx
index e644eaf80d4e..8e373ec26ce1 100644
--- a/ee/tabby-ui/components/chat/chat-panel.tsx
+++ b/ee/tabby-ui/components/chat/chat-panel.tsx
@@ -132,6 +132,14 @@ function ChatPanelRenderer(
     }
   }
 
+  const onSelectRepo = (sourceId: string | null) => {
+    setSelectedRepoId(sourceId)
+
+    setTimeout(() => {
+      chatInputRef.current?.focus()
+    })
+  }
+
   React.useImperativeHandle(
     ref,
     () => {
@@ -230,7 +238,7 @@ function ChatPanelRenderer(
             <AnimatePresence presenceAffectsLayout>
               <RepoSelect
                 value={selectedRepoId}
-                onChange={setSelectedRepoId}
+                onChange={onSelectRepo}
                 repos={repos}
                 workspaceRepoId={indexedRepository?.sourceId}
                 isInitializing={fetchingRepos}
diff --git a/ee/tabby-ui/components/chat/repo-select.tsx b/ee/tabby-ui/components/chat/repo-select.tsx
index 41d661bd9c23..d748119dc419 100644
--- a/ee/tabby-ui/components/chat/repo-select.tsx
+++ b/ee/tabby-ui/components/chat/repo-select.tsx
@@ -42,7 +42,6 @@ export function RepoSelect({
 
   const onSelectRepo = (v: string) => {
     onChange(v)
-    // todo input focus
   }
 
   const isWorkspaceRepo = !!workspaceRepoId && workspaceRepoId === value

From 58b82edb196768da88513598836639a317eba56f Mon Sep 17 00:00:00 2001
From: liangfung <jueliang@tabbyml.com>
Date: Tue, 17 Dec 2024 11:36:48 +0700
Subject: [PATCH 14/39] update: type

---
 ee/tabby-ui/components/chat/chat-panel.tsx  |  2 +-
 ee/tabby-ui/components/chat/chat.tsx        | 10 +++++-----
 ee/tabby-ui/components/chat/repo-select.tsx |  7 +++----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/ee/tabby-ui/components/chat/chat-panel.tsx b/ee/tabby-ui/components/chat/chat-panel.tsx
index 8e373ec26ce1..9afed6890119 100644
--- a/ee/tabby-ui/components/chat/chat-panel.tsx
+++ b/ee/tabby-ui/components/chat/chat-panel.tsx
@@ -132,7 +132,7 @@ function ChatPanelRenderer(
     }
   }
 
-  const onSelectRepo = (sourceId: string | null) => {
+  const onSelectRepo = (sourceId: string | undefined) => {
     setSelectedRepoId(sourceId)
 
     setTimeout(() => {
diff --git a/ee/tabby-ui/components/chat/chat.tsx b/ee/tabby-ui/components/chat/chat.tsx
index 4780232c3605..da15841f11be 100644
--- a/ee/tabby-ui/components/chat/chat.tsx
+++ b/ee/tabby-ui/components/chat/chat.tsx
@@ -69,8 +69,8 @@ type ChatContextValue = {
   chatInputRef: RefObject<HTMLTextAreaElement>
   supportsOnApplyInEditorV2: boolean
   indexedRepository: ResolveGitUrlQuery['resolveGitUrl']
-  selectedRepoId: string | null
-  setSelectedRepoId: React.Dispatch<React.SetStateAction<string | null>>
+  selectedRepoId: string | undefined
+  setSelectedRepoId: React.Dispatch<React.SetStateAction<string | undefined>>
   repos: ContextInfo['sources']
   fetchingRepos: boolean
 }
@@ -152,9 +152,9 @@ function ChatRenderer(
   // gitUrl from workspace
   const [gitUrl, setGitUrl] = React.useState<string | undefined>()
   // sourceId
-  const [selectedRepoId, setSelectedRepoId] = React.useState<string | null>(
-    null
-  )
+  const [selectedRepoId, setSelectedRepoId] = React.useState<
+    string | undefined
+  >()
 
   const enableActiveSelection = useChatStore(
     state => state.enableActiveSelection
diff --git a/ee/tabby-ui/components/chat/repo-select.tsx b/ee/tabby-ui/components/chat/repo-select.tsx
index d748119dc419..c98c2b758655 100644
--- a/ee/tabby-ui/components/chat/repo-select.tsx
+++ b/ee/tabby-ui/components/chat/repo-select.tsx
@@ -23,8 +23,8 @@ import { Button } from '../ui/button'
 
 interface RepoSelectProps {
   repos: ContextInfo['sources']
-  value: string | null | undefined
-  onChange: (v: string | null) => void
+  value: string | undefined
+  onChange: (v: string | undefined) => void
   isInitializing?: boolean
   // sourceId
   workspaceRepoId?: string
@@ -90,9 +90,8 @@ export function RepoSelect({
               variant="ghost"
               className="h-7 w-7 shrink-0 rounded-l-none"
               onClick={e => {
-                e.preventDefault()
                 e.stopPropagation()
-                onChange(null)
+                onChange(undefined)
               }}
             >
               <IconRemove />

From bd34f11ae5fef9a52685aa347b08ceb5cbdd4270 Mon Sep 17 00:00:00 2001
From: Meng Zhang <meng@tabbyml.com>
Date: Tue, 17 Dec 2024 13:39:28 +0800
Subject: [PATCH 15/39] Update ee/tabby-ui/components/chat/repo-select.tsx

---
 ee/tabby-ui/components/chat/repo-select.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ee/tabby-ui/components/chat/repo-select.tsx b/ee/tabby-ui/components/chat/repo-select.tsx
index c98c2b758655..299b7ded42d5 100644
--- a/ee/tabby-ui/components/chat/repo-select.tsx
+++ b/ee/tabby-ui/components/chat/repo-select.tsx
@@ -76,7 +76,7 @@ export function RepoSelect({
                 </span>
                 {isWorkspaceRepo && (
                   <span className="shrink-0 text-muted-foreground">
-                    {isExtraSmallScreen ? 'Workspace' : 'Repo in workspace'}
+                    Context
                   </span>
                 )}
               </div>

From 86d3290ebbb1fa331f2aff72dd4f4bd33264fcc2 Mon Sep 17 00:00:00 2001
From: Meng Zhang <meng@tabbyml.com>
Date: Tue, 17 Dec 2024 13:44:33 +0800
Subject: [PATCH 16/39] Apply suggestions from code review

---
 ee/tabby-ui/components/chat/repo-select.tsx | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/ee/tabby-ui/components/chat/repo-select.tsx b/ee/tabby-ui/components/chat/repo-select.tsx
index 299b7ded42d5..4ebd57ace05e 100644
--- a/ee/tabby-ui/components/chat/repo-select.tsx
+++ b/ee/tabby-ui/components/chat/repo-select.tsx
@@ -72,13 +72,8 @@ export function RepoSelect({
                     'text-muted-foreground': !selectedRepoName
                   })}
                 >
-                  {selectedRepoName || 'Select repo...'}
+                  {selectedRepoName || 'Workspace'}
                 </span>
-                {isWorkspaceRepo && (
-                  <span className="shrink-0 text-muted-foreground">
-                    Context
-                  </span>
-                )}
               </div>
               {!value && <IconChevronUpDown className="shrink-0" />}
             </div>

From 43754198b9fc0e9bc8779dd9b25286067107f1a5 Mon Sep 17 00:00:00 2001
From: liangfung <jueliang@tabbyml.com>
Date: Tue, 17 Dec 2024 11:39:43 +0700
Subject: [PATCH 17/39] update

---
 ee/tabby-ui/components/chat/repo-select.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ee/tabby-ui/components/chat/repo-select.tsx b/ee/tabby-ui/components/chat/repo-select.tsx
index 4ebd57ace05e..689764433384 100644
--- a/ee/tabby-ui/components/chat/repo-select.tsx
+++ b/ee/tabby-ui/components/chat/repo-select.tsx
@@ -49,6 +49,9 @@ export function RepoSelect({
     repo => repo.sourceId === value
   )?.sourceName
 
+  // if there's no repo, hide the repo select
+  if (!isInitializing || !repos.length) return null
+
   return (
     <LoadingWrapper
       loading={isInitializing}

From 7a92b16de08028cf1ac230393dfc0335ac01a7ed Mon Sep 17 00:00:00 2001
From: liangfung <jueliang@tabbyml.com>
Date: Tue, 17 Dec 2024 13:45:18 +0700
Subject: [PATCH 18/39] update: styling

---
 ee/tabby-ui/components/chat/repo-select.tsx | 179 +++++++++++++-------
 ee/tabby-ui/components/source-icon.tsx      |  34 ++++
 2 files changed, 153 insertions(+), 60 deletions(-)
 create mode 100644 ee/tabby-ui/components/source-icon.tsx

diff --git a/ee/tabby-ui/components/chat/repo-select.tsx b/ee/tabby-ui/components/chat/repo-select.tsx
index 689764433384..bdc7b130ee9d 100644
--- a/ee/tabby-ui/components/chat/repo-select.tsx
+++ b/ee/tabby-ui/components/chat/repo-select.tsx
@@ -1,25 +1,33 @@
+import { useRef, useState } from 'react'
 import { useWindowSize } from '@uidotdev/usehooks'
 
 import { ContextInfo } from '@/lib/gql/generates/graphql'
 import { cn } from '@/lib/utils'
+import { Badge } from '@/components/ui/badge'
+import { Button } from '@/components/ui/button'
 import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuRadioGroup,
-  DropdownMenuRadioItem,
-  DropdownMenuTrigger
-} from '@/components/ui/dropdown-menu'
+  Command,
+  CommandEmpty,
+  CommandGroup,
+  CommandInput,
+  CommandItem,
+  CommandList
+} from '@/components/ui/command'
 import {
   IconCheck,
   IconChevronUpDown,
   IconFolderGit,
   IconRemove
 } from '@/components/ui/icons'
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger
+} from '@/components/ui/popover'
 import { Skeleton } from '@/components/ui/skeleton'
 import LoadingWrapper from '@/components/loading-wrapper'
 
-import { Badge } from '../ui/badge'
-import { Button } from '../ui/button'
+import { SourceIcon } from '../source-icon'
 
 interface RepoSelectProps {
   repos: ContextInfo['sources']
@@ -37,38 +45,67 @@ export function RepoSelect({
   isInitializing,
   workspaceRepoId
 }: RepoSelectProps) {
+  const [open, setOpen] = useState(false)
+  const commandListRef = useRef<HTMLDivElement>(null)
+
   const { width } = useWindowSize()
-  const isExtraSmallScreen = typeof width === 'number' && width < 240
+  const isExtraSmallScreen = typeof width === 'number' && width < 360
 
   const onSelectRepo = (v: string) => {
     onChange(v)
   }
 
-  const isWorkspaceRepo = !!workspaceRepoId && workspaceRepoId === value
-  const selectedRepoName = repos?.find(
-    repo => repo.sourceId === value
-  )?.sourceName
+  const scrollCommandListToTop = () => {
+    requestAnimationFrame(() => {
+      if (commandListRef.current) {
+        commandListRef.current.scrollTop = 0
+      }
+    })
+  }
+
+  const onSearchChange = () => {
+    scrollCommandListToTop()
+  }
+
+  const selectedRepo = value
+    ? repos?.find(repo => repo.sourceId === value)
+    : undefined
+  const selectedRepoName = selectedRepo?.sourceName
 
   // if there's no repo, hide the repo select
-  if (!isInitializing || !repos.length) return null
+  if (!isInitializing && !repos.length) return null
 
   return (
     <LoadingWrapper
       loading={isInitializing}
       fallback={
         <div className="w-full pl-2">
-          <Skeleton className="h-3 w-[20%]" />
+          <Skeleton className="h-3 w-[10rem]" />
         </div>
       }
     >
-      <DropdownMenu>
+      <Popover open={open} onOpenChange={setOpen}>
         <Badge
           variant="outline"
-          className="h-7 min-w-[8rem] items-center gap-1 overflow-hidden break-all rounded-md pr-0 text-sm font-semibold"
+          className="h-7 items-center gap-1 overflow-hidden break-all rounded-md px-0 text-sm font-semibold hover:bg-muted/50"
         >
-          <DropdownMenuTrigger className="outline-none" asChild>
-            <div className="flex flex-1 cursor-pointer items-center gap-1.5 overflow-hidden">
-              <IconFolderGit className="shrink-0" />
+          <PopoverTrigger className="outline-none" asChild>
+            <div
+              className={cn(
+                'flex flex-1 cursor-pointer items-center gap-1.5 overflow-hidden pl-2.5',
+                {
+                  'min-w-[10rem]': !selectedRepo
+                }
+              )}
+            >
+              {selectedRepo ? (
+                <SourceIcon
+                  kind={selectedRepo.sourceKind}
+                  className="shrink-0 w-3.5 h-3.5"
+                />
+              ) : (
+                <IconFolderGit className="shrink-0" />
+              )}
               <div className="flex flex-1 items-center gap-1.5 truncate break-all">
                 <span
                   className={cn('truncate', {
@@ -78,15 +115,19 @@ export function RepoSelect({
                   {selectedRepoName || 'Workspace'}
                 </span>
               </div>
-              {!value && <IconChevronUpDown className="shrink-0" />}
+              {!value && (
+                <div className="w-7 h-7 flex items-center justify-center shrink-0">
+                  <IconChevronUpDown />
+                </div>
+              )}
             </div>
-          </DropdownMenuTrigger>
+          </PopoverTrigger>
           {!!value && (
             <Button
               type="button"
               size="icon"
               variant="ghost"
-              className="h-7 w-7 shrink-0 rounded-l-none"
+              className="h-7 w-7 shrink-0 rounded-l-none bg-background"
               onClick={e => {
                 e.stopPropagation()
                 onChange(undefined)
@@ -96,47 +137,65 @@ export function RepoSelect({
             </Button>
           )}
         </Badge>
-        <DropdownMenuContent
+        <PopoverContent
           side="top"
           align="start"
-          className="dropdown-menu max-h-[30vh] min-w-[20rem] max-w-full overflow-y-auto overflow-x-hidden rounded-md border bg-popover p-2 text-popover-foreground shadow animate-in"
+          className="dropdown-menu w-[80vw] overflow-x-hidden rounded-md border bg-popover p-2 text-popover-foreground shadow animate-in"
         >
-          <DropdownMenuRadioGroup>
-            {repos.map(repo => {
-              const isSelected = repo.sourceId === value
-              return (
-                <DropdownMenuRadioItem
-                  value={repo.sourceId}
-                  key={repo.sourceId}
-                  className="flex cursor-pointer items-center py-2 pl-3"
-                  onSelect={() => onSelectRepo(repo.sourceId)}
-                >
-                  <div className="flex flex-1 items-center gap-2 truncate">
-                    <IconCheck
-                      className={cn(
-                        'shrink-0',
-                        repo.sourceId === value ? 'opacity-100' : 'opacity-0'
-                      )}
-                    />
-                    <span
-                      className={cn({
-                        'font-medium': isSelected
-                      })}
+          <Command>
+            <CommandInput
+              placeholder="Search context..."
+              onValueChange={onSearchChange}
+            />
+            <CommandList className="max-h-[30vh]" ref={commandListRef}>
+              <CommandEmpty>No context found</CommandEmpty>
+              <CommandGroup>
+                {repos.map(repo => {
+                  const isSelected = repo.sourceId === value
+
+                  return (
+                    <CommandItem
+                      key={repo.sourceId}
+                      onSelect={() => {
+                        onSelectRepo(repo.sourceId)
+                        setOpen(false)
+                      }}
+                      title={repo.sourceName}
                     >
-                      {repo.sourceName}
-                    </span>
-                  </div>
-                  {repo.sourceId === workspaceRepoId && (
-                    <span className="ml-1.5 shrink-0 text-muted-foreground">
-                      {isExtraSmallScreen ? 'Workspace' : 'Repo in workspace'}
-                    </span>
-                  )}
-                </DropdownMenuRadioItem>
-              )
-            })}
-          </DropdownMenuRadioGroup>
-        </DropdownMenuContent>
-      </DropdownMenu>
+                      <IconCheck
+                        className={cn(
+                          'shrink-0 mr-1',
+                          repo.sourceId === value ? 'opacity-100' : 'opacity-0'
+                        )}
+                      />
+                      <div className="flex-1 overflow-x-hidden flex items-center gap-1">
+                        <SourceIcon
+                          kind={repo.sourceKind}
+                          className="shrink-0"
+                        />
+                        <div
+                          className={cn('font-medium truncate', {
+                            'font-semibold': isSelected
+                          })}
+                        >
+                          {repo.sourceName}
+                        </div>
+                      </div>
+                      {repo.sourceId === workspaceRepoId && (
+                        <span className="ml-1.5 shrink-0 text-muted-foreground">
+                          {isExtraSmallScreen
+                            ? 'Workspace'
+                            : 'Repo in workspace'}
+                        </span>
+                      )}
+                    </CommandItem>
+                  )
+                })}
+              </CommandGroup>
+            </CommandList>
+          </Command>
+        </PopoverContent>
+      </Popover>
     </LoadingWrapper>
   )
 }
diff --git a/ee/tabby-ui/components/source-icon.tsx b/ee/tabby-ui/components/source-icon.tsx
new file mode 100644
index 000000000000..01d78eaa0206
--- /dev/null
+++ b/ee/tabby-ui/components/source-icon.tsx
@@ -0,0 +1,34 @@
+import { ReactNode } from 'react'
+
+import { ContextSourceKind } from '@/lib/gql/generates/graphql'
+import {
+  IconCode,
+  IconEmojiBook,
+  IconEmojiGlobe,
+  IconGitHub,
+  IconGitLab
+} from '@/components/ui/icons'
+
+interface SourceIconProps {
+  kind: ContextSourceKind
+  gitIcon?: ReactNode
+  className?: string
+}
+
+export function SourceIcon({ kind, gitIcon, ...props }: SourceIconProps) {
+  switch (kind) {
+    case ContextSourceKind.Doc:
+      return <IconEmojiBook {...props} />
+    case ContextSourceKind.Web:
+      return <IconEmojiGlobe {...props} />
+    case ContextSourceKind.Github:
+      return <IconGitHub {...props} />
+    case ContextSourceKind.Gitlab:
+      return <IconGitLab {...props} />
+    case ContextSourceKind.Git:
+      // for custom git icon
+      return gitIcon || <IconCode {...props} />
+    default:
+      return null
+  }
+}

From 0dc66295667f9444bc4be27529414c5f79bcb4b3 Mon Sep 17 00:00:00 2001
From: Meng Zhang <meng@tabbyml.com>
Date: Tue, 17 Dec 2024 15:03:39 +0800
Subject: [PATCH 19/39] Update ee/tabby-ui/components/chat/repo-select.tsx

---
 ee/tabby-ui/components/chat/repo-select.tsx | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/ee/tabby-ui/components/chat/repo-select.tsx b/ee/tabby-ui/components/chat/repo-select.tsx
index bdc7b130ee9d..9b8c4faf5d39 100644
--- a/ee/tabby-ui/components/chat/repo-select.tsx
+++ b/ee/tabby-ui/components/chat/repo-select.tsx
@@ -181,13 +181,6 @@ export function RepoSelect({
                           {repo.sourceName}
                         </div>
                       </div>
-                      {repo.sourceId === workspaceRepoId && (
-                        <span className="ml-1.5 shrink-0 text-muted-foreground">
-                          {isExtraSmallScreen
-                            ? 'Workspace'
-                            : 'Repo in workspace'}
-                        </span>
-                      )}
                     </CommandItem>
                   )
                 })}

From 1111c8d37c1b5bf0d24ee79fe346eb2f0986ac68 Mon Sep 17 00:00:00 2001
From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com>
Date: Tue, 17 Dec 2024 07:04:44 +0000
Subject: [PATCH 20/39] [autofix.ci] apply automated fixes

---
 ee/tabby-ui/components/chat/repo-select.tsx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ee/tabby-ui/components/chat/repo-select.tsx b/ee/tabby-ui/components/chat/repo-select.tsx
index 9b8c4faf5d39..f5ae86742b0f 100644
--- a/ee/tabby-ui/components/chat/repo-select.tsx
+++ b/ee/tabby-ui/components/chat/repo-select.tsx
@@ -101,7 +101,7 @@ export function RepoSelect({
               {selectedRepo ? (
                 <SourceIcon
                   kind={selectedRepo.sourceKind}
-                  className="shrink-0 w-3.5 h-3.5"
+                  className="h-3.5 w-3.5 shrink-0"
                 />
               ) : (
                 <IconFolderGit className="shrink-0" />
@@ -116,7 +116,7 @@ export function RepoSelect({
                 </span>
               </div>
               {!value && (
-                <div className="w-7 h-7 flex items-center justify-center shrink-0">
+                <div className="flex h-7 w-7 shrink-0 items-center justify-center">
                   <IconChevronUpDown />
                 </div>
               )}
@@ -164,17 +164,17 @@ export function RepoSelect({
                     >
                       <IconCheck
                         className={cn(
-                          'shrink-0 mr-1',
+                          'mr-1 shrink-0',
                           repo.sourceId === value ? 'opacity-100' : 'opacity-0'
                         )}
                       />
-                      <div className="flex-1 overflow-x-hidden flex items-center gap-1">
+                      <div className="flex flex-1 items-center gap-1 overflow-x-hidden">
                         <SourceIcon
                           kind={repo.sourceKind}
                           className="shrink-0"
                         />
                         <div
-                          className={cn('font-medium truncate', {
+                          className={cn('truncate font-medium', {
                             'font-semibold': isSelected
                           })}
                         >

From 0bb466fe52c1dfc3c2f873f45e5f1c9b2c9df772 Mon Sep 17 00:00:00 2001
From: liangfung <jueliang@tabbyml.com>
Date: Tue, 17 Dec 2024 16:25:42 +0700
Subject: [PATCH 21/39] update: optional

---
 clients/tabby-chat-panel/src/index.ts             |  2 +-
 clients/vscode/src/chat/WebviewHelper.ts          | 10 +++++-----
 ee/tabby-ui/components/message-markdown/index.tsx |  1 +
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/clients/tabby-chat-panel/src/index.ts b/clients/tabby-chat-panel/src/index.ts
index 98234d9dd3b5..4edf9923cfad 100644
--- a/clients/tabby-chat-panel/src/index.ts
+++ b/clients/tabby-chat-panel/src/index.ts
@@ -185,7 +185,7 @@ export interface ServerApi {
   addRelevantContext: (context: Context) => void
   updateTheme: (style: string, themeClass: string) => void
   updateActiveSelection: (context: Context | null) => void
-  updateGitUrl: (gitUrl: string | undefined) => void
+  updateGitUrl?: (gitUrl: string | undefined) => void
 }
 
 export interface ClientApiMethods {
diff --git a/clients/vscode/src/chat/WebviewHelper.ts b/clients/vscode/src/chat/WebviewHelper.ts
index a04bc227a183..f942e7eb094b 100644
--- a/clients/vscode/src/chat/WebviewHelper.ts
+++ b/clients/vscode/src/chat/WebviewHelper.ts
@@ -289,8 +289,8 @@ export class WebviewHelper {
 
   public async syncWorkspaceGitUrlToChatPanel(url: string | undefined) {
     try {
-      this.logger.log("sync indexed git url", url);
-      await this.client?.updateGitUrl(url);
+      this.logger.log("sync workspace git url", url);
+      await this.client?.updateGitUrl?.(url);
     } catch {
       this.logger.log(
         {
@@ -333,7 +333,7 @@ export class WebviewHelper {
     this.pendingMessages = [];
 
     this.syncActiveSelection(window.activeTextEditor);
-    this.syncWorkspaceGitURL(window.activeTextEditor);
+    this.syncWorkspaceGitUrl(window.activeTextEditor);
 
     const agentConfig = this.lspClient.agentConfig.current;
     if (agentConfig?.server.token) {
@@ -387,7 +387,7 @@ export class WebviewHelper {
     this.syncActiveSelectionToChatPanel(fileContext);
   }
 
-  public async syncWorkspaceGitURL(editor: TextEditor | undefined) {
+  public async syncWorkspaceGitUrl(editor: TextEditor | undefined) {
     const gitRemoteUrl = await getGitRemoteUrl(editor?.document.uri, this.gitProvider);
     this.syncWorkspaceGitUrlToChatPanel(gitRemoteUrl);
   }
@@ -407,7 +407,7 @@ export class WebviewHelper {
   public addTextEditorEventListeners() {
     window.onDidChangeActiveTextEditor((e) => {
       this.syncActiveSelection(e);
-      this.syncWorkspaceGitURL(e);
+      this.syncWorkspaceGitUrl(e);
     });
 
     window.onDidChangeTextEditorSelection((e) => {
diff --git a/ee/tabby-ui/components/message-markdown/index.tsx b/ee/tabby-ui/components/message-markdown/index.tsx
index 935ed8bed849..a47c7c5e8fc6 100644
--- a/ee/tabby-ui/components/message-markdown/index.tsx
+++ b/ee/tabby-ui/components/message-markdown/index.tsx
@@ -203,6 +203,7 @@ export function MessageMarkdown({
       })
     }
     const symbolInfo = await onLookupSymbol(keyword, hints)
+    console.log('symbolInfo====', keyword, hints?.length || 0, symbolInfo)
     setSymbolLocationMap(map => new Map(map.set(keyword, symbolInfo)))
   }
 

From a9b587193a80aaa7904a9ae6d4bcfbc64eb85c36 Mon Sep 17 00:00:00 2001
From: liangfung <jueliang@tabbyml.com>
Date: Tue, 17 Dec 2024 16:27:24 +0700
Subject: [PATCH 22/39] update

---
 ee/tabby-ui/components/message-markdown/index.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ee/tabby-ui/components/message-markdown/index.tsx b/ee/tabby-ui/components/message-markdown/index.tsx
index a47c7c5e8fc6..935ed8bed849 100644
--- a/ee/tabby-ui/components/message-markdown/index.tsx
+++ b/ee/tabby-ui/components/message-markdown/index.tsx
@@ -203,7 +203,6 @@ export function MessageMarkdown({
       })
     }
     const symbolInfo = await onLookupSymbol(keyword, hints)
-    console.log('symbolInfo====', keyword, hints?.length || 0, symbolInfo)
     setSymbolLocationMap(map => new Map(map.set(keyword, symbolInfo)))
   }
 

From a2b3b93be782d385020fba1d02b30491accc7b3b Mon Sep 17 00:00:00 2001
From: liangfung <jueliang@tabbyml.com>
Date: Tue, 17 Dec 2024 20:35:21 +0700
Subject: [PATCH 23/39] update: chat panel api

---
 clients/tabby-chat-panel/src/index.ts       | 13 ++++-
 clients/vscode/src/chat/WebviewHelper.ts    | 54 ++++++++++++---------
 clients/vscode/src/chat/chatPanel.ts        |  1 +
 clients/vscode/src/chat/fileContext.ts      | 12 -----
 ee/tabby-ui/app/chat/page.tsx               | 26 +++++-----
 ee/tabby-ui/components/chat/chat.tsx        | 31 ++++++------
 ee/tabby-ui/components/chat/repo-select.tsx | 10 +++-
 7 files changed, 80 insertions(+), 67 deletions(-)

diff --git a/clients/tabby-chat-panel/src/index.ts b/clients/tabby-chat-panel/src/index.ts
index 4edf9923cfad..aeaf328a4712 100644
--- a/clients/tabby-chat-panel/src/index.ts
+++ b/clients/tabby-chat-panel/src/index.ts
@@ -177,6 +177,13 @@ export interface SymbolInfo {
   target: FileLocation
 }
 
+/**
+ * Includes information about a git repository in workspace folder
+ */
+export interface GitRepoInfo {
+  gitUrl: string
+}
+
 export interface ServerApi {
   init: (request: InitRequest) => void
   sendMessage: (message: ChatMessage) => void
@@ -185,7 +192,6 @@ export interface ServerApi {
   addRelevantContext: (context: Context) => void
   updateTheme: (style: string, themeClass: string) => void
   updateActiveSelection: (context: Context | null) => void
-  updateGitUrl?: (gitUrl: string | undefined) => void
 }
 
 export interface ClientApiMethods {
@@ -225,6 +231,9 @@ export interface ClientApiMethods {
    * @returns Whether the file location is opened successfully.
    */
   openInEditor: (target: FileLocation) => Promise<boolean>
+
+  // Provide all repos found in workspace folders.
+  provideWorkspaceGitRepoInfo?: () => Promise<GitRepoInfo[]>
 }
 
 export interface ClientApi extends ClientApiMethods {
@@ -259,6 +268,7 @@ export function createClient(target: HTMLIFrameElement, api: ClientApiMethods):
       onKeyboardEvent: api.onKeyboardEvent,
       lookupSymbol: api.lookupSymbol,
       openInEditor: api.openInEditor,
+      provideWorkspaceGitRepoInfo: api.provideWorkspaceGitRepoInfo,
     },
   })
 }
@@ -273,7 +283,6 @@ export function createServer(api: ServerApi): ClientApi {
       addRelevantContext: api.addRelevantContext,
       updateTheme: api.updateTheme,
       updateActiveSelection: api.updateActiveSelection,
-      updateGitUrl: api.updateGitUrl,
     },
   })
 }
diff --git a/clients/vscode/src/chat/WebviewHelper.ts b/clients/vscode/src/chat/WebviewHelper.ts
index f942e7eb094b..c059f8708c9d 100644
--- a/clients/vscode/src/chat/WebviewHelper.ts
+++ b/clients/vscode/src/chat/WebviewHelper.ts
@@ -13,6 +13,7 @@ import {
   commands,
   Location,
   LocationLink,
+  workspace
 } from "vscode";
 import type {
   ServerApi,
@@ -23,6 +24,7 @@ import type {
   LookupSymbolHint,
   SymbolInfo,
   FileLocation,
+  GitRepoInfo,
 } from "tabby-chat-panel";
 import { TABBY_CHAT_PANEL_API_VERSION } from "tabby-chat-panel";
 import hashObject from "object-hash";
@@ -33,7 +35,7 @@ import { GitProvider } from "../git/GitProvider";
 import { createClient } from "./chatPanel";
 import { Client as LspClient } from "../lsp/Client";
 import { isBrowser } from "../env";
-import { getFileContextFromSelection, showFileContext, openTextDocument, getGitRemoteUrl } from "./fileContext";
+import { getFileContextFromSelection, showFileContext, openTextDocument, buildFilePathParams } from "./fileContext";
 import {
   localUriToChatPanelFilepath,
   chatPanelFilepathToLocalUri,
@@ -287,21 +289,6 @@ export class WebviewHelper {
     }
   }
 
-  public async syncWorkspaceGitUrlToChatPanel(url: string | undefined) {
-    try {
-      this.logger.log("sync workspace git url", url);
-      await this.client?.updateGitUrl?.(url);
-    } catch {
-      this.logger.log(
-        {
-          every: 100,
-          level: "warn",
-        },
-        "Git URL sync failed. Please update your Tabby server to the latest version.",
-      );
-    }
-  }
-
   public addRelevantContext(context: Context) {
     if (!this.client) {
       this.pendingRelevantContexts.push(context);
@@ -333,7 +320,6 @@ export class WebviewHelper {
     this.pendingMessages = [];
 
     this.syncActiveSelection(window.activeTextEditor);
-    this.syncWorkspaceGitUrl(window.activeTextEditor);
 
     const agentConfig = this.lspClient.agentConfig.current;
     if (agentConfig?.server.token) {
@@ -387,11 +373,6 @@ export class WebviewHelper {
     this.syncActiveSelectionToChatPanel(fileContext);
   }
 
-  public async syncWorkspaceGitUrl(editor: TextEditor | undefined) {
-    const gitRemoteUrl = await getGitRemoteUrl(editor?.document.uri, this.gitProvider);
-    this.syncWorkspaceGitUrlToChatPanel(gitRemoteUrl);
-  }
-
   public addAgentEventListeners() {
     this.lspClient.status.on("didChange", async (status: StatusInfo) => {
       const agentConfig = this.lspClient.agentConfig.current;
@@ -407,7 +388,6 @@ export class WebviewHelper {
   public addTextEditorEventListeners() {
     window.onDidChangeActiveTextEditor((e) => {
       this.syncActiveSelection(e);
-      this.syncWorkspaceGitUrl(e);
     });
 
     window.onDidChangeTextEditorSelection((e) => {
@@ -720,6 +700,34 @@ export class WebviewHelper {
           return false;
         }
       },
+      provideWorkspaceGitRepoInfo: async (): Promise<GitRepoInfo[]> => {
+        const activeTextEditor = window.activeTextEditor;
+        const infoList: GitRepoInfo[] = [];
+        let activeGitUrl: string | undefined;
+        if (activeTextEditor) {
+          const pathParams = await buildFilePathParams(activeTextEditor.document.uri, this.gitProvider);
+          if (pathParams.gitRemoteUrl) {
+            activeGitUrl = pathParams.gitRemoteUrl;
+            infoList.push({
+              gitUrl: activeGitUrl,
+            })
+          }
+        };
+
+        const workspaceFolder = workspace.workspaceFolders || []
+        for (const folder of workspaceFolder) {
+          const repo = this.gitProvider.getRepository(folder.uri);
+          if (repo) {
+            const gitRemoteUrl = this.gitProvider.getDefaultRemoteUrl(repo);
+            if (gitRemoteUrl && gitRemoteUrl !== activeGitUrl) {
+              infoList.push({
+                gitUrl: gitRemoteUrl,
+              });
+            }
+          }
+        }
+        return infoList;
+      },
     });
   }
 }
diff --git a/clients/vscode/src/chat/chatPanel.ts b/clients/vscode/src/chat/chatPanel.ts
index 0d3c50de1582..36098eb61916 100644
--- a/clients/vscode/src/chat/chatPanel.ts
+++ b/clients/vscode/src/chat/chatPanel.ts
@@ -35,6 +35,7 @@ export function createClient(webview: Webview, api: ClientApiMethods): ServerApi
       onKeyboardEvent: api.onKeyboardEvent,
       lookupSymbol: api.lookupSymbol,
       openInEditor: api.openInEditor,
+      provideWorkspaceGitRepoInfo: api.provideWorkspaceGitRepoInfo
     },
   });
 }
diff --git a/clients/vscode/src/chat/fileContext.ts b/clients/vscode/src/chat/fileContext.ts
index 4fdf203808b7..8cf6dbb50fce 100644
--- a/clients/vscode/src/chat/fileContext.ts
+++ b/clients/vscode/src/chat/fileContext.ts
@@ -81,18 +81,6 @@ export async function showFileContext(fileContext: FileContext, gitProvider: Git
   editor.revealRange(new Range(start, end), TextEditorRevealType.InCenter);
 }
 
-export async function getGitRemoteUrl(fileUri: Uri | undefined, gitProvider: GitProvider): Promise<string | undefined> {
-  if (fileUri) {
-    const pathParams = await buildFilePathParams(fileUri, gitProvider);
-    return pathParams.gitRemoteUrl;
-  }
-
-  const workspaceFolder = workspace.workspaceFolders?.[0];
-  if (!workspaceFolder) return undefined;
-  const repo = gitProvider.getRepository(workspaceFolder.uri);
-  return repo ? gitProvider.getDefaultRemoteUrl(repo) : undefined;
-}
-
 export async function buildFilePathParams(uri: Uri, gitProvider: GitProvider): Promise<FilePathParams> {
   const workspaceFolder =
     workspace.getWorkspaceFolder(uri) ?? (uri.scheme === "untitled" ? workspace.workspaceFolders?.[0] : undefined);
diff --git a/ee/tabby-ui/app/chat/page.tsx b/ee/tabby-ui/app/chat/page.tsx
index 0c537de99b07..880ea1edc09c 100644
--- a/ee/tabby-ui/app/chat/page.tsx
+++ b/ee/tabby-ui/app/chat/page.tsx
@@ -57,7 +57,6 @@ export default function ChatPage() {
   >([])
   const [pendingActiveSelection, setPendingActiveSelection] =
     useState<Context | null>(null)
-  const [pendingGitUrl, setPendingGitUrl] = useState<string | undefined>()
   const [errorMessage, setErrorMessage] = useState<ErrorMessage | null>(null)
   const [isRefreshLoading, setIsRefreshLoading] = useState(false)
 
@@ -76,6 +75,10 @@ export default function ChatPage() {
   const [supportsOnApplyInEditorV2, setSupportsOnApplyInEditorV2] =
     useState(false)
   const [supportsOnLookupSymbol, setSupportsOnLookupSymbol] = useState(false)
+  const [
+    supportsProvideWorkspaceGitRepoInfo,
+    setSupportsProvideWorkspaceGitRepoInfo
+  ] = useState(false)
 
   const sendMessage = (message: ChatMessage) => {
     if (chatRef.current) {
@@ -105,14 +108,6 @@ export default function ChatPage() {
     }
   }
 
-  const updateGitUrl = (gitUrl: string | undefined) => {
-    if (chatRef.current) {
-      chatRef.current.updateGitUrl(gitUrl)
-    } else if (gitUrl) {
-      setPendingGitUrl(gitUrl)
-    }
-  }
-
   const server = useServer({
     init: (request: InitRequest) => {
       if (chatRef.current) return
@@ -160,8 +155,7 @@ export default function ChatPage() {
       document.documentElement.className =
         themeClass + ` client client-${client}`
     },
-    updateActiveSelection,
-    updateGitUrl
+    updateActiveSelection
   })
 
   useEffect(() => {
@@ -248,6 +242,9 @@ export default function ChatPage() {
           ?.hasCapability('onApplyInEditorV2')
           .then(setSupportsOnApplyInEditorV2)
         server?.hasCapability('lookupSymbol').then(setSupportsOnLookupSymbol)
+        server
+          ?.hasCapability('provideWorkspaceGitRepoInfo')
+          .then(setSupportsProvideWorkspaceGitRepoInfo)
       }
 
       checkCapabilities()
@@ -272,14 +269,12 @@ export default function ChatPage() {
     setPendingRelevantContexts([])
     setPendingMessages([])
     setPendingActiveSelection(null)
-    setPendingGitUrl(undefined)
   }
 
   const onChatLoaded = () => {
     pendingRelevantContexts.forEach(addRelevantContext)
     pendingMessages.forEach(sendMessage)
     chatRef.current?.updateActiveSelection(pendingActiveSelection)
-    chatRef.current?.updateGitUrl(pendingGitUrl)
 
     clearPendingState()
     setChatLoaded(true)
@@ -407,6 +402,11 @@ export default function ChatPage() {
           (supportsOnLookupSymbol ? server?.lookupSymbol : undefined)
         }
         openInEditor={isInEditor && server?.openInEditor}
+        provideWorkspaceGitRepoInfo={
+          isInEditor && supportsProvideWorkspaceGitRepoInfo
+            ? server?.provideWorkspaceGitRepoInfo
+            : undefined
+        }
       />
     </ErrorBoundary>
   )
diff --git a/ee/tabby-ui/components/chat/chat.tsx b/ee/tabby-ui/components/chat/chat.tsx
index da15841f11be..0b20362fe61d 100644
--- a/ee/tabby-ui/components/chat/chat.tsx
+++ b/ee/tabby-ui/components/chat/chat.tsx
@@ -4,6 +4,7 @@ import type {
   Context,
   FileContext,
   FileLocation,
+  GitRepoInfo,
   LookupSymbolHint,
   NavigateOpts,
   SymbolInfo
@@ -86,7 +87,6 @@ export interface ChatRef {
   addRelevantContext: (context: Context) => void
   focus: () => void
   updateActiveSelection: (context: Context | null) => void
-  updateGitUrl: (gitUrl: string | undefined) => void
 }
 
 interface ChatProps extends React.ComponentProps<'div'> {
@@ -114,6 +114,7 @@ interface ChatProps extends React.ComponentProps<'div'> {
   openInEditor?: (target: FileLocation) => void
   chatInputRef: RefObject<HTMLTextAreaElement>
   supportsOnApplyInEditorV2: boolean
+  provideWorkspaceGitRepoInfo?: () => Promise<GitRepoInfo[]>
 }
 
 function ChatRenderer(
@@ -136,7 +137,8 @@ function ChatRenderer(
     onLookupSymbol,
     openInEditor,
     chatInputRef,
-    supportsOnApplyInEditorV2
+    supportsOnApplyInEditorV2,
+    provideWorkspaceGitRepoInfo
   }: ChatProps,
   ref: React.ForwardedRef<ChatRef>
 ) {
@@ -176,7 +178,6 @@ function ChatRenderer(
     )
   }, [contextInfoData])
 
-  // todo remove this
   const [{ data: resolvedGitUrl }] = useQuery({
     query: resolveGitUrlQuery,
     variables: {
@@ -544,19 +545,9 @@ function ChatRenderer(
     300
   )
 
-  const debouncedUpdateGitUrl = useDebounceCallback(
-    (url: string | undefined) => {
-      setGitUrl(url)
-    },
-    300
-  )
-
   const updateActiveSelection = (ctx: Context | null) => {
     debouncedUpdateActiveSelection.run(ctx)
   }
-  const updateGitUrl = (gitUrl: string | undefined) => {
-    debouncedUpdateGitUrl.run(gitUrl)
-  }
 
   React.useImperativeHandle(
     ref,
@@ -567,14 +558,24 @@ function ChatRenderer(
         isLoading,
         addRelevantContext,
         focus: () => chatPanelRef.current?.focus(),
-        updateActiveSelection,
-        updateGitUrl
+        updateActiveSelection
       }
     },
     []
   )
 
   React.useEffect(() => {
+    const fetchWorkspaceGitRepo = () => {
+      if (provideWorkspaceGitRepoInfo) {
+        provideWorkspaceGitRepoInfo().then(repos => {
+          if (repos.length) {
+            setGitUrl(repos[0].gitUrl)
+          }
+        })
+      }
+    }
+
+    fetchWorkspaceGitRepo()
     setInitialzed(true)
     onLoaded?.()
   }, [])
diff --git a/ee/tabby-ui/components/chat/repo-select.tsx b/ee/tabby-ui/components/chat/repo-select.tsx
index f5ae86742b0f..e26a09db8a85 100644
--- a/ee/tabby-ui/components/chat/repo-select.tsx
+++ b/ee/tabby-ui/components/chat/repo-select.tsx
@@ -87,7 +87,13 @@ export function RepoSelect({
       <Popover open={open} onOpenChange={setOpen}>
         <Badge
           variant="outline"
-          className="h-7 items-center gap-1 overflow-hidden break-all rounded-md px-0 text-sm font-semibold hover:bg-muted/50"
+          className={cn(
+            'h-7 items-center gap-1 overflow-hidden break-all rounded-md px-0 text-sm font-semibold hover:bg-muted/50',
+            {
+              'border-dashed text-muted-foreground italic line-through':
+                !selectedRepo
+            }
+          )}
         >
           <PopoverTrigger className="outline-none" asChild>
             <div
@@ -116,7 +122,7 @@ export function RepoSelect({
                 </span>
               </div>
               {!value && (
-                <div className="flex h-7 w-7 shrink-0 items-center justify-center">
+                <div className="flex h-7 w-7 shrink-0 items-center justify-center text-foreground">
                   <IconChevronUpDown />
                 </div>
               )}

From fce7a5a18aaa0dd2c59d81ea8ada30b5696749ac Mon Sep 17 00:00:00 2001
From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com>
Date: Tue, 17 Dec 2024 13:36:32 +0000
Subject: [PATCH 24/39] [autofix.ci] apply automated fixes

---
 clients/vscode/src/chat/WebviewHelper.ts | 8 ++++----
 clients/vscode/src/chat/chatPanel.ts     | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/clients/vscode/src/chat/WebviewHelper.ts b/clients/vscode/src/chat/WebviewHelper.ts
index c059f8708c9d..f5a161b6504e 100644
--- a/clients/vscode/src/chat/WebviewHelper.ts
+++ b/clients/vscode/src/chat/WebviewHelper.ts
@@ -13,7 +13,7 @@ import {
   commands,
   Location,
   LocationLink,
-  workspace
+  workspace,
 } from "vscode";
 import type {
   ServerApi,
@@ -710,11 +710,11 @@ export class WebviewHelper {
             activeGitUrl = pathParams.gitRemoteUrl;
             infoList.push({
               gitUrl: activeGitUrl,
-            })
+            });
           }
-        };
+        }
 
-        const workspaceFolder = workspace.workspaceFolders || []
+        const workspaceFolder = workspace.workspaceFolders || [];
         for (const folder of workspaceFolder) {
           const repo = this.gitProvider.getRepository(folder.uri);
           if (repo) {
diff --git a/clients/vscode/src/chat/chatPanel.ts b/clients/vscode/src/chat/chatPanel.ts
index 36098eb61916..f991b2144fa1 100644
--- a/clients/vscode/src/chat/chatPanel.ts
+++ b/clients/vscode/src/chat/chatPanel.ts
@@ -35,7 +35,7 @@ export function createClient(webview: Webview, api: ClientApiMethods): ServerApi
       onKeyboardEvent: api.onKeyboardEvent,
       lookupSymbol: api.lookupSymbol,
       openInEditor: api.openInEditor,
-      provideWorkspaceGitRepoInfo: api.provideWorkspaceGitRepoInfo
+      provideWorkspaceGitRepoInfo: api.provideWorkspaceGitRepoInfo,
     },
   });
 }

From cd90e84c1350f113de175bd892c8ad01c1f989b3 Mon Sep 17 00:00:00 2001
From: liangfung <jueliang@tabbyml.com>
Date: Wed, 18 Dec 2024 02:05:29 +0700
Subject: [PATCH 25/39] update: init

---
 ee/tabby-ui/components/chat/chat-panel.tsx  |  6 +-
 ee/tabby-ui/components/chat/chat.tsx        | 91 ++++++++++-----------
 ee/tabby-ui/components/chat/repo-select.tsx | 15 +---
 3 files changed, 50 insertions(+), 62 deletions(-)

diff --git a/ee/tabby-ui/components/chat/chat-panel.tsx b/ee/tabby-ui/components/chat/chat-panel.tsx
index 9afed6890119..c488e3727cd5 100644
--- a/ee/tabby-ui/components/chat/chat-panel.tsx
+++ b/ee/tabby-ui/components/chat/chat-panel.tsx
@@ -73,11 +73,10 @@ function ChatPanelRenderer(
     removeRelevantContext,
     activeSelection,
     onCopyContent,
-    indexedRepository,
     selectedRepoId,
     setSelectedRepoId,
     repos,
-    fetchingRepos
+    initialized
   } = React.useContext(ChatContext)
   const enableActiveSelection = useChatStore(
     state => state.enableActiveSelection
@@ -240,8 +239,7 @@ function ChatPanelRenderer(
                 value={selectedRepoId}
                 onChange={onSelectRepo}
                 repos={repos}
-                workspaceRepoId={indexedRepository?.sourceId}
-                isInitializing={fetchingRepos}
+                isInitializing={!initialized}
               />
               {activeSelection ? (
                 <motion.div
diff --git a/ee/tabby-ui/components/chat/chat.tsx b/ee/tabby-ui/components/chat/chat.tsx
index 0b20362fe61d..4da7c9999252 100644
--- a/ee/tabby-ui/components/chat/chat.tsx
+++ b/ee/tabby-ui/components/chat/chat.tsx
@@ -19,7 +19,6 @@ import {
   CreateMessageInput,
   InputMaybe,
   MessageAttachmentCodeInput,
-  ResolveGitUrlQuery,
   ThreadRunOptionsInput
 } from '@/lib/gql/generates/graphql'
 import { useDebounceCallback } from '@/lib/hooks/use-debounce'
@@ -27,6 +26,7 @@ import { useLatest } from '@/lib/hooks/use-latest'
 import { useThreadRun } from '@/lib/hooks/use-thread-run'
 import { filename2prism } from '@/lib/language-utils'
 import { useChatStore } from '@/lib/stores/chat-store'
+import { client } from '@/lib/tabby/gql'
 import { contextInfoQuery, resolveGitUrlQuery } from '@/lib/tabby/query'
 import { ExtendedCombinedError } from '@/lib/types'
 import {
@@ -45,6 +45,7 @@ import { EmptyScreen } from './empty-screen'
 import { QuestionAnswerList } from './question-answer'
 
 type ChatContextValue = {
+  initialized: boolean
   threadId: string | undefined
   isLoading: boolean
   qaPairs: QuestionAnswerPair[]
@@ -69,11 +70,10 @@ type ChatContextValue = {
   removeRelevantContext: (index: number) => void
   chatInputRef: RefObject<HTMLTextAreaElement>
   supportsOnApplyInEditorV2: boolean
-  indexedRepository: ResolveGitUrlQuery['resolveGitUrl']
   selectedRepoId: string | undefined
   setSelectedRepoId: React.Dispatch<React.SetStateAction<string | undefined>>
   repos: ContextInfo['sources']
-  fetchingRepos: boolean
+  fetchingSources: boolean
 }
 
 export const ChatContext = React.createContext<ChatContextValue>(
@@ -151,8 +151,6 @@ function ChatRenderer(
   const [activeSelection, setActiveSelection] = React.useState<Context | null>(
     null
   )
-  // gitUrl from workspace
-  const [gitUrl, setGitUrl] = React.useState<string | undefined>()
   // sourceId
   const [selectedRepoId, setSelectedRepoId] = React.useState<
     string | undefined
@@ -178,14 +176,6 @@ function ChatRenderer(
     )
   }, [contextInfoData])
 
-  const [{ data: resolvedGitUrl }] = useQuery({
-    query: resolveGitUrlQuery,
-    variables: {
-      gitUrl: gitUrl as string
-    },
-    pause: !gitUrl
-  })
-
   const {
     sendUserMessage,
     isLoading,
@@ -198,22 +188,6 @@ function ChatRenderer(
     threadId
   })
 
-  React.useEffect(() => {
-    const setDefaultRepoId = () => {
-      if (!resolvedGitUrl || !repos?.length) return
-      if (selectedRepoId) return
-
-      const defaultRepo = repos.find(
-        o => o.sourceId === resolvedGitUrl.resolveGitUrl?.sourceId
-      )
-      if (defaultRepo) {
-        setSelectedRepoId(defaultRepo.sourceId)
-      }
-    }
-
-    setDefaultRepoId()
-  }, [resolvedGitUrl, repos])
-
   const onDeleteMessage = async (userMessageId: string) => {
     if (!threadId) return
 
@@ -549,6 +523,45 @@ function ChatRenderer(
     debouncedUpdateActiveSelection.run(ctx)
   }
 
+  const fetchWorkspaceGitRepo = () => {
+    if (provideWorkspaceGitRepoInfo) {
+      return provideWorkspaceGitRepoInfo()
+    } else {
+      return []
+    }
+  }
+
+  const resolveGitUrl = async (gitUrl: string | undefined) => {
+    if (!gitUrl) return undefined
+    return client.query(resolveGitUrlQuery, { gitUrl }).toPromise()
+  }
+
+  React.useEffect(() => {
+    const init = async () => {
+      const gitRepoInfo = await fetchWorkspaceGitRepo()
+      // get default repo
+      if (gitRepoInfo?.length) {
+        const defaultGitUrl = gitRepoInfo[0].gitUrl
+        const repo = await resolveGitUrl(defaultGitUrl)
+        if (repo?.data?.resolveGitUrl) {
+          setSelectedRepoId(repo.data.resolveGitUrl.sourceId)
+        }
+      }
+
+      setInitialzed(true)
+    }
+
+    if (!fetchingSources && !initialized) {
+      init()
+    }
+  }, [fetchingSources])
+
+  React.useEffect(() => {
+    if (initialized) {
+      onLoaded?.()
+    }
+  }, [initialized])
+
   React.useImperativeHandle(
     ref,
     () => {
@@ -564,22 +577,6 @@ function ChatRenderer(
     []
   )
 
-  React.useEffect(() => {
-    const fetchWorkspaceGitRepo = () => {
-      if (provideWorkspaceGitRepoInfo) {
-        provideWorkspaceGitRepoInfo().then(repos => {
-          if (repos.length) {
-            setGitUrl(repos[0].gitUrl)
-          }
-        })
-      }
-    }
-
-    fetchWorkspaceGitRepo()
-    setInitialzed(true)
-    onLoaded?.()
-  }, [])
-
   const chatMaxWidthClass = maxWidth ? `max-w-${maxWidth}` : 'max-w-2xl'
   if (!initialized) {
     return (
@@ -606,11 +603,11 @@ function ChatRenderer(
         chatInputRef,
         activeSelection,
         supportsOnApplyInEditorV2,
-        indexedRepository: gitUrl ? resolvedGitUrl?.resolveGitUrl : undefined,
         selectedRepoId,
         setSelectedRepoId,
         repos,
-        fetchingRepos: fetchingSources
+        fetchingSources,
+        initialized
       }}
     >
       <div className="flex justify-center overflow-x-hidden">
diff --git a/ee/tabby-ui/components/chat/repo-select.tsx b/ee/tabby-ui/components/chat/repo-select.tsx
index e26a09db8a85..d2ee9229c8d2 100644
--- a/ee/tabby-ui/components/chat/repo-select.tsx
+++ b/ee/tabby-ui/components/chat/repo-select.tsx
@@ -1,5 +1,4 @@
 import { useRef, useState } from 'react'
-import { useWindowSize } from '@uidotdev/usehooks'
 
 import { ContextInfo } from '@/lib/gql/generates/graphql'
 import { cn } from '@/lib/utils'
@@ -30,27 +29,21 @@ import LoadingWrapper from '@/components/loading-wrapper'
 import { SourceIcon } from '../source-icon'
 
 interface RepoSelectProps {
-  repos: ContextInfo['sources']
+  repos: ContextInfo['sources'] | undefined
   value: string | undefined
   onChange: (v: string | undefined) => void
   isInitializing?: boolean
-  // sourceId
-  workspaceRepoId?: string
 }
 
 export function RepoSelect({
   repos,
   value,
   onChange,
-  isInitializing,
-  workspaceRepoId
+  isInitializing
 }: RepoSelectProps) {
   const [open, setOpen] = useState(false)
   const commandListRef = useRef<HTMLDivElement>(null)
 
-  const { width } = useWindowSize()
-  const isExtraSmallScreen = typeof width === 'number' && width < 360
-
   const onSelectRepo = (v: string) => {
     onChange(v)
   }
@@ -73,7 +66,7 @@ export function RepoSelect({
   const selectedRepoName = selectedRepo?.sourceName
 
   // if there's no repo, hide the repo select
-  if (!isInitializing && !repos.length) return null
+  if (!isInitializing && !repos?.length) return null
 
   return (
     <LoadingWrapper
@@ -156,7 +149,7 @@ export function RepoSelect({
             <CommandList className="max-h-[30vh]" ref={commandListRef}>
               <CommandEmpty>No context found</CommandEmpty>
               <CommandGroup>
-                {repos.map(repo => {
+                {repos?.map(repo => {
                   const isSelected = repo.sourceId === value
 
                   return (

From 69c9d2e901f378d74a2844b8cb9421c66567ab65 Mon Sep 17 00:00:00 2001
From: liangfung <jueliang@tabbyml.com>
Date: Wed, 18 Dec 2024 10:03:57 +0700
Subject: [PATCH 26/39] update: init

---
 ee/tabby-ui/components/chat/chat-panel.tsx  |  1 +
 ee/tabby-ui/components/chat/chat.tsx        | 10 ++--------
 ee/tabby-ui/components/chat/prompt-form.tsx | 14 +++++++++++---
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/ee/tabby-ui/components/chat/chat-panel.tsx b/ee/tabby-ui/components/chat/chat-panel.tsx
index c488e3727cd5..92d5a7746e7e 100644
--- a/ee/tabby-ui/components/chat/chat-panel.tsx
+++ b/ee/tabby-ui/components/chat/chat-panel.tsx
@@ -323,6 +323,7 @@ function ChatPanelRenderer(
             setInput={setInput}
             isLoading={isLoading}
             chatInputRef={chatInputRef}
+            isInitializing={!initialized}
           />
           <FooterText className="hidden sm:block" />
         </div>
diff --git a/ee/tabby-ui/components/chat/chat.tsx b/ee/tabby-ui/components/chat/chat.tsx
index 4da7c9999252..e0939fdfcf42 100644
--- a/ee/tabby-ui/components/chat/chat.tsx
+++ b/ee/tabby-ui/components/chat/chat.tsx
@@ -38,7 +38,6 @@ import {
 } from '@/lib/types/chat'
 import { cn, nanoid } from '@/lib/utils'
 
-import { ListSkeleton } from '../skeleton'
 import { ChatPanel, ChatPanelRef } from './chat-panel'
 import { ChatScrollAnchor } from './chat-scroll-anchor'
 import { EmptyScreen } from './empty-screen'
@@ -142,7 +141,7 @@ function ChatRenderer(
   }: ChatProps,
   ref: React.ForwardedRef<ChatRef>
 ) {
-  const [initialized, setInitialzed] = React.useState(false)
+  const [initialized, setInitialized] = React.useState(false)
   const [threadId, setThreadId] = React.useState<string | undefined>()
   const isOnLoadExecuted = React.useRef(false)
   const [qaPairs, setQaPairs] = React.useState(initialMessages ?? [])
@@ -548,7 +547,7 @@ function ChatRenderer(
         }
       }
 
-      setInitialzed(true)
+      setInitialized(true)
     }
 
     if (!fetchingSources && !initialized) {
@@ -578,11 +577,6 @@ function ChatRenderer(
   )
 
   const chatMaxWidthClass = maxWidth ? `max-w-${maxWidth}` : 'max-w-2xl'
-  if (!initialized) {
-    return (
-      <ListSkeleton className={`${chatMaxWidthClass} mx-auto pt-4 md:pt-10`} />
-    )
-  }
 
   return (
     <ChatContext.Provider
diff --git a/ee/tabby-ui/components/chat/prompt-form.tsx b/ee/tabby-ui/components/chat/prompt-form.tsx
index eb93fd553437..98fcd56d54ec 100644
--- a/ee/tabby-ui/components/chat/prompt-form.tsx
+++ b/ee/tabby-ui/components/chat/prompt-form.tsx
@@ -32,6 +32,7 @@ export interface PromptProps
   onSubmit: (value: string) => Promise<void>
   isLoading: boolean
   chatInputRef: React.RefObject<HTMLTextAreaElement>
+  isInitializing?: boolean
 }
 
 export interface PromptFormRef {
@@ -39,7 +40,14 @@ export interface PromptFormRef {
 }
 
 function PromptFormRenderer(
-  { onSubmit, input, setInput, isLoading, chatInputRef }: PromptProps,
+  {
+    onSubmit,
+    input,
+    setInput,
+    isLoading,
+    chatInputRef,
+    isInitializing
+  }: PromptProps,
   ref: React.ForwardedRef<PromptFormRef>
 ) {
   const { formRef, onKeyDown } = useEnterSubmit()
@@ -137,7 +145,7 @@ function PromptFormRenderer(
     HTMLFormElement
   > = async e => {
     e.preventDefault()
-    if (!input?.trim() || isLoading) {
+    if (!input?.trim() || isLoading || isInitializing) {
       return
     }
 
@@ -233,7 +241,7 @@ function PromptFormRenderer(
                         <Button
                           type="submit"
                           size="icon"
-                          disabled={isLoading || input === ''}
+                          disabled={isInitializing || isLoading || input === ''}
                         >
                           <IconArrowElbow />
                           <span className="sr-only">Send message</span>

From c1af81e2e965acd913a808c507199b69b56a64e8 Mon Sep 17 00:00:00 2001
From: liangfung <jueliang@tabbyml.com>
Date: Wed, 18 Dec 2024 11:15:02 +0700
Subject: [PATCH 27/39] update: revert

---
 clients/vscode/src/chat/WebviewHelper.ts | 32 +-----------------------
 clients/vscode/src/chat/chatPanel.ts     |  1 -
 2 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/clients/vscode/src/chat/WebviewHelper.ts b/clients/vscode/src/chat/WebviewHelper.ts
index f5a161b6504e..bb514c66a4ce 100644
--- a/clients/vscode/src/chat/WebviewHelper.ts
+++ b/clients/vscode/src/chat/WebviewHelper.ts
@@ -13,7 +13,6 @@ import {
   commands,
   Location,
   LocationLink,
-  workspace,
 } from "vscode";
 import type {
   ServerApi,
@@ -24,7 +23,6 @@ import type {
   LookupSymbolHint,
   SymbolInfo,
   FileLocation,
-  GitRepoInfo,
 } from "tabby-chat-panel";
 import { TABBY_CHAT_PANEL_API_VERSION } from "tabby-chat-panel";
 import hashObject from "object-hash";
@@ -35,7 +33,7 @@ import { GitProvider } from "../git/GitProvider";
 import { createClient } from "./chatPanel";
 import { Client as LspClient } from "../lsp/Client";
 import { isBrowser } from "../env";
-import { getFileContextFromSelection, showFileContext, openTextDocument, buildFilePathParams } from "./fileContext";
+import { getFileContextFromSelection, showFileContext, openTextDocument } from "./fileContext";
 import {
   localUriToChatPanelFilepath,
   chatPanelFilepathToLocalUri,
@@ -700,34 +698,6 @@ export class WebviewHelper {
           return false;
         }
       },
-      provideWorkspaceGitRepoInfo: async (): Promise<GitRepoInfo[]> => {
-        const activeTextEditor = window.activeTextEditor;
-        const infoList: GitRepoInfo[] = [];
-        let activeGitUrl: string | undefined;
-        if (activeTextEditor) {
-          const pathParams = await buildFilePathParams(activeTextEditor.document.uri, this.gitProvider);
-          if (pathParams.gitRemoteUrl) {
-            activeGitUrl = pathParams.gitRemoteUrl;
-            infoList.push({
-              gitUrl: activeGitUrl,
-            });
-          }
-        }
-
-        const workspaceFolder = workspace.workspaceFolders || [];
-        for (const folder of workspaceFolder) {
-          const repo = this.gitProvider.getRepository(folder.uri);
-          if (repo) {
-            const gitRemoteUrl = this.gitProvider.getDefaultRemoteUrl(repo);
-            if (gitRemoteUrl && gitRemoteUrl !== activeGitUrl) {
-              infoList.push({
-                gitUrl: gitRemoteUrl,
-              });
-            }
-          }
-        }
-        return infoList;
-      },
     });
   }
 }
diff --git a/clients/vscode/src/chat/chatPanel.ts b/clients/vscode/src/chat/chatPanel.ts
index f991b2144fa1..0d3c50de1582 100644
--- a/clients/vscode/src/chat/chatPanel.ts
+++ b/clients/vscode/src/chat/chatPanel.ts
@@ -35,7 +35,6 @@ export function createClient(webview: Webview, api: ClientApiMethods): ServerApi
       onKeyboardEvent: api.onKeyboardEvent,
       lookupSymbol: api.lookupSymbol,
       openInEditor: api.openInEditor,
-      provideWorkspaceGitRepoInfo: api.provideWorkspaceGitRepoInfo,
     },
   });
 }

From b24c6b0fb23901d5215570432b30990c797c52e2 Mon Sep 17 00:00:00 2001
From: liangfung <jueliang@tabbyml.com>
Date: Wed, 18 Dec 2024 13:47:37 +0700
Subject: [PATCH 28/39] update

---
 ee/tabby-schema/src/schema/mod.rs           |  4 +-
 ee/tabby-ui/components/chat/chat.tsx        | 78 ++++++++++-----------
 ee/tabby-ui/components/chat/repo-select.tsx |  4 +-
 ee/tabby-ui/lib/utils/index.ts              |  1 +
 4 files changed, 41 insertions(+), 46 deletions(-)

diff --git a/ee/tabby-schema/src/schema/mod.rs b/ee/tabby-schema/src/schema/mod.rs
index d0f81ad41c76..c6c75e6e954d 100644
--- a/ee/tabby-schema/src/schema/mod.rs
+++ b/ee/tabby-schema/src/schema/mod.rs
@@ -541,7 +541,7 @@ impl Query {
     }
 
     async fn repository_list(ctx: &Context) -> Result<Vec<Repository>> {
-        let user = check_user(ctx).await?;
+        let user = check_user_allow_auth_token(ctx).await?;
 
         ctx.locator
             .repository()
@@ -550,7 +550,7 @@ impl Query {
     }
 
     async fn context_info(ctx: &Context) -> Result<ContextInfo> {
-        let user = check_user_allow_auth_token(ctx).await?;
+        let user = check_user(ctx).await?;
         ctx.locator.context().read(Some(&user.policy)).await
     }
 
diff --git a/ee/tabby-ui/components/chat/chat.tsx b/ee/tabby-ui/components/chat/chat.tsx
index e0939fdfcf42..1d55a45c64ad 100644
--- a/ee/tabby-ui/components/chat/chat.tsx
+++ b/ee/tabby-ui/components/chat/chat.tsx
@@ -12,13 +12,13 @@ import type {
 import { useQuery } from 'urql'
 
 import { ERROR_CODE_NOT_FOUND } from '@/lib/constants'
+import { graphql } from '@/lib/gql/generates'
 import {
   CodeQueryInput,
-  ContextInfo,
-  ContextSourceKind,
   CreateMessageInput,
   InputMaybe,
   MessageAttachmentCodeInput,
+  RepositorySourceListQuery,
   ThreadRunOptionsInput
 } from '@/lib/gql/generates/graphql'
 import { useDebounceCallback } from '@/lib/hooks/use-debounce'
@@ -26,8 +26,6 @@ import { useLatest } from '@/lib/hooks/use-latest'
 import { useThreadRun } from '@/lib/hooks/use-thread-run'
 import { filename2prism } from '@/lib/language-utils'
 import { useChatStore } from '@/lib/stores/chat-store'
-import { client } from '@/lib/tabby/gql'
-import { contextInfoQuery, resolveGitUrlQuery } from '@/lib/tabby/query'
 import { ExtendedCombinedError } from '@/lib/types'
 import {
   AssistantMessage,
@@ -36,13 +34,27 @@ import {
   UserMessage,
   UserMessageWithOptionalId
 } from '@/lib/types/chat'
-import { cn, nanoid } from '@/lib/utils'
+import { cn, findClosestRepositoryMatch, nanoid } from '@/lib/utils'
 
 import { ChatPanel, ChatPanelRef } from './chat-panel'
 import { ChatScrollAnchor } from './chat-scroll-anchor'
 import { EmptyScreen } from './empty-screen'
 import { QuestionAnswerList } from './question-answer'
 
+const repositoryListQuery = graphql(/* GraphQL */ `
+  query RepositorySourceList {
+    repositoryList {
+      id
+      name
+      kind
+      gitUrl
+      sourceId
+      sourceName
+      sourceKind
+    }
+  }
+`)
+
 type ChatContextValue = {
   initialized: boolean
   threadId: string | undefined
@@ -71,8 +83,8 @@ type ChatContextValue = {
   supportsOnApplyInEditorV2: boolean
   selectedRepoId: string | undefined
   setSelectedRepoId: React.Dispatch<React.SetStateAction<string | undefined>>
-  repos: ContextInfo['sources']
-  fetchingSources: boolean
+  repos: RepositorySourceListQuery['repositoryList'] | undefined
+  fetchingRepos: boolean
 }
 
 export const ChatContext = React.createContext<ChatContextValue>(
@@ -160,20 +172,11 @@ function ChatRenderer(
   )
 
   const chatPanelRef = React.useRef<ChatPanelRef>(null)
-  const [{ data: contextInfoData, fetching: fetchingSources }] = useQuery({
-    query: contextInfoQuery
+
+  const [{ data: repositoryListData, fetching: fetchingRepos }] = useQuery({
+    query: repositoryListQuery
   })
-  const repos = React.useMemo(() => {
-    return (
-      contextInfoData?.contextInfo?.sources.filter(source => {
-        return [
-          ContextSourceKind.Git,
-          ContextSourceKind.Github,
-          ContextSourceKind.Gitlab
-        ].includes(source.sourceKind)
-      }) ?? []
-    )
-  }, [contextInfoData])
+  const repos = repositoryListData?.repositoryList
 
   const {
     sendUserMessage,
@@ -530,30 +533,31 @@ function ChatRenderer(
     }
   }
 
-  const resolveGitUrl = async (gitUrl: string | undefined) => {
-    if (!gitUrl) return undefined
-    return client.query(resolveGitUrlQuery, { gitUrl }).toPromise()
-  }
-
   React.useEffect(() => {
     const init = async () => {
       const gitRepoInfo = await fetchWorkspaceGitRepo()
       // get default repo
-      if (gitRepoInfo?.length) {
+      if (gitRepoInfo?.length && repos?.length) {
         const defaultGitUrl = gitRepoInfo[0].gitUrl
-        const repo = await resolveGitUrl(defaultGitUrl)
-        if (repo?.data?.resolveGitUrl) {
-          setSelectedRepoId(repo.data.resolveGitUrl.sourceId)
+        const targetGirUrl = findClosestRepositoryMatch(
+          defaultGitUrl,
+          repos.map(x => x.gitUrl)
+        )
+        if (targetGirUrl) {
+          const repo = repos.find(x => x.gitUrl === targetGirUrl)
+          if (repo) {
+            setSelectedRepoId(repo.sourceId)
+          }
         }
       }
 
       setInitialized(true)
     }
 
-    if (!fetchingSources && !initialized) {
+    if (!fetchingRepos && !initialized) {
       init()
     }
-  }, [fetchingSources])
+  }, [fetchingRepos])
 
   React.useEffect(() => {
     if (initialized) {
@@ -600,7 +604,7 @@ function ChatRenderer(
         selectedRepoId,
         setSelectedRepoId,
         repos,
-        fetchingSources,
+        fetchingRepos,
         initialized
       }}
     >
@@ -669,13 +673,3 @@ function formatThreadRunErrorMessage(error: ExtendedCombinedError | undefined) {
 
   return error.message || 'Failed to fetch'
 }
-
-function isValidContextForCodeQuery(context: FileContext | undefined) {
-  if (!context) return false
-
-  const isUntitledFile =
-    context.filepath.startsWith('untitled:') &&
-    !filename2prism(context.filepath)[0]
-
-  return !isUntitledFile
-}
diff --git a/ee/tabby-ui/components/chat/repo-select.tsx b/ee/tabby-ui/components/chat/repo-select.tsx
index d2ee9229c8d2..36d841aa24a0 100644
--- a/ee/tabby-ui/components/chat/repo-select.tsx
+++ b/ee/tabby-ui/components/chat/repo-select.tsx
@@ -1,6 +1,6 @@
 import { useRef, useState } from 'react'
 
-import { ContextInfo } from '@/lib/gql/generates/graphql'
+import { RepositorySourceListQuery } from '@/lib/gql/generates/graphql'
 import { cn } from '@/lib/utils'
 import { Badge } from '@/components/ui/badge'
 import { Button } from '@/components/ui/button'
@@ -29,7 +29,7 @@ import LoadingWrapper from '@/components/loading-wrapper'
 import { SourceIcon } from '../source-icon'
 
 interface RepoSelectProps {
-  repos: ContextInfo['sources'] | undefined
+  repos: RepositorySourceListQuery['repositoryList'] | undefined
   value: string | undefined
   onChange: (v: string | undefined) => void
   isInitializing?: boolean
diff --git a/ee/tabby-ui/lib/utils/index.ts b/ee/tabby-ui/lib/utils/index.ts
index b68738695766..218487694347 100644
--- a/ee/tabby-ui/lib/utils/index.ts
+++ b/ee/tabby-ui/lib/utils/index.ts
@@ -8,6 +8,7 @@ import { AttachmentCodeItem, AttachmentDocItem } from '@/lib/types'
 import { Maybe } from '../gql/generates/graphql'
 
 export * from './chat'
+export * from './repository'
 
 export function cn(...inputs: ClassValue[]) {
   return twMerge(clsx(inputs))

From 6f96841cb11e78cc6560ee01b498cff83dd884f7 Mon Sep 17 00:00:00 2001
From: aliang <jueliang@tabbyml.com>
Date: Wed, 18 Dec 2024 13:51:55 +0700
Subject: [PATCH 29/39] Update clients/tabby-chat-panel/src/index.ts

Co-authored-by: Meng Zhang <meng@tabbyml.com>
---
 clients/tabby-chat-panel/src/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/clients/tabby-chat-panel/src/index.ts b/clients/tabby-chat-panel/src/index.ts
index aeaf328a4712..93d79f32f976 100644
--- a/clients/tabby-chat-panel/src/index.ts
+++ b/clients/tabby-chat-panel/src/index.ts
@@ -180,7 +180,7 @@ export interface SymbolInfo {
 /**
  * Includes information about a git repository in workspace folder
  */
-export interface GitRepoInfo {
+export interface GitRepository {
   gitUrl: string
 }
 

From d615a44c020d2be5a5fd9b4eaa452c2a2c230857 Mon Sep 17 00:00:00 2001
From: aliang <jueliang@tabbyml.com>
Date: Wed, 18 Dec 2024 13:52:01 +0700
Subject: [PATCH 30/39] Update clients/tabby-chat-panel/src/index.ts

Co-authored-by: Meng Zhang <meng@tabbyml.com>
---
 clients/tabby-chat-panel/src/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/clients/tabby-chat-panel/src/index.ts b/clients/tabby-chat-panel/src/index.ts
index 93d79f32f976..fc27dbf5d9c7 100644
--- a/clients/tabby-chat-panel/src/index.ts
+++ b/clients/tabby-chat-panel/src/index.ts
@@ -181,7 +181,7 @@ export interface SymbolInfo {
  * Includes information about a git repository in workspace folder
  */
 export interface GitRepository {
-  gitUrl: string
+  url: string
 }
 
 export interface ServerApi {

From a38b499664e53ab7ccdd3bac7509b2406f80a03d Mon Sep 17 00:00:00 2001
From: aliang <jueliang@tabbyml.com>
Date: Wed, 18 Dec 2024 13:52:11 +0700
Subject: [PATCH 31/39] Update clients/tabby-chat-panel/src/index.ts

Co-authored-by: Meng Zhang <meng@tabbyml.com>
---
 clients/tabby-chat-panel/src/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/clients/tabby-chat-panel/src/index.ts b/clients/tabby-chat-panel/src/index.ts
index fc27dbf5d9c7..a14e05653acb 100644
--- a/clients/tabby-chat-panel/src/index.ts
+++ b/clients/tabby-chat-panel/src/index.ts
@@ -233,7 +233,7 @@ export interface ClientApiMethods {
   openInEditor: (target: FileLocation) => Promise<boolean>
 
   // Provide all repos found in workspace folders.
-  provideWorkspaceGitRepoInfo?: () => Promise<GitRepoInfo[]>
+  readWorkspaceGitRepositories?: () => Promise<GitRepoInfo[]>
 }
 
 export interface ClientApi extends ClientApiMethods {

From d9a486862c0c408fd52437dde3786c5027a31d23 Mon Sep 17 00:00:00 2001
From: liangfung <jueliang@tabbyml.com>
Date: Wed, 18 Dec 2024 13:58:19 +0700
Subject: [PATCH 32/39] update: rename

---
 clients/tabby-chat-panel/src/index.ts |  4 ++--
 ee/tabby-ui/app/chat/page.tsx         |  6 +++---
 ee/tabby-ui/components/chat/chat.tsx  | 16 ++++++++--------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/clients/tabby-chat-panel/src/index.ts b/clients/tabby-chat-panel/src/index.ts
index a14e05653acb..08f419e295f7 100644
--- a/clients/tabby-chat-panel/src/index.ts
+++ b/clients/tabby-chat-panel/src/index.ts
@@ -233,7 +233,7 @@ export interface ClientApiMethods {
   openInEditor: (target: FileLocation) => Promise<boolean>
 
   // Provide all repos found in workspace folders.
-  readWorkspaceGitRepositories?: () => Promise<GitRepoInfo[]>
+  readWorkspaceGitRepositories?: () => Promise<GitRepository[]>
 }
 
 export interface ClientApi extends ClientApiMethods {
@@ -268,7 +268,7 @@ export function createClient(target: HTMLIFrameElement, api: ClientApiMethods):
       onKeyboardEvent: api.onKeyboardEvent,
       lookupSymbol: api.lookupSymbol,
       openInEditor: api.openInEditor,
-      provideWorkspaceGitRepoInfo: api.provideWorkspaceGitRepoInfo,
+      readWorkspaceGitRepositories: api.readWorkspaceGitRepositories,
     },
   })
 }
diff --git a/ee/tabby-ui/app/chat/page.tsx b/ee/tabby-ui/app/chat/page.tsx
index 880ea1edc09c..3fdc0d0f2c67 100644
--- a/ee/tabby-ui/app/chat/page.tsx
+++ b/ee/tabby-ui/app/chat/page.tsx
@@ -243,7 +243,7 @@ export default function ChatPage() {
           .then(setSupportsOnApplyInEditorV2)
         server?.hasCapability('lookupSymbol').then(setSupportsOnLookupSymbol)
         server
-          ?.hasCapability('provideWorkspaceGitRepoInfo')
+          ?.hasCapability('readWorkspaceGitRepositories')
           .then(setSupportsProvideWorkspaceGitRepoInfo)
       }
 
@@ -402,9 +402,9 @@ export default function ChatPage() {
           (supportsOnLookupSymbol ? server?.lookupSymbol : undefined)
         }
         openInEditor={isInEditor && server?.openInEditor}
-        provideWorkspaceGitRepoInfo={
+        readWorkspaceGitRepositories={
           isInEditor && supportsProvideWorkspaceGitRepoInfo
-            ? server?.provideWorkspaceGitRepoInfo
+            ? server?.readWorkspaceGitRepositories
             : undefined
         }
       />
diff --git a/ee/tabby-ui/components/chat/chat.tsx b/ee/tabby-ui/components/chat/chat.tsx
index 1d55a45c64ad..89b583c4c1ad 100644
--- a/ee/tabby-ui/components/chat/chat.tsx
+++ b/ee/tabby-ui/components/chat/chat.tsx
@@ -4,7 +4,7 @@ import type {
   Context,
   FileContext,
   FileLocation,
-  GitRepoInfo,
+  GitRepository,
   LookupSymbolHint,
   NavigateOpts,
   SymbolInfo
@@ -125,7 +125,7 @@ interface ChatProps extends React.ComponentProps<'div'> {
   openInEditor?: (target: FileLocation) => void
   chatInputRef: RefObject<HTMLTextAreaElement>
   supportsOnApplyInEditorV2: boolean
-  provideWorkspaceGitRepoInfo?: () => Promise<GitRepoInfo[]>
+  readWorkspaceGitRepositories?: () => Promise<GitRepository[]>
 }
 
 function ChatRenderer(
@@ -149,7 +149,7 @@ function ChatRenderer(
     openInEditor,
     chatInputRef,
     supportsOnApplyInEditorV2,
-    provideWorkspaceGitRepoInfo
+    readWorkspaceGitRepositories
   }: ChatProps,
   ref: React.ForwardedRef<ChatRef>
 ) {
@@ -526,8 +526,8 @@ function ChatRenderer(
   }
 
   const fetchWorkspaceGitRepo = () => {
-    if (provideWorkspaceGitRepoInfo) {
-      return provideWorkspaceGitRepoInfo()
+    if (readWorkspaceGitRepositories) {
+      return readWorkspaceGitRepositories()
     } else {
       return []
     }
@@ -535,10 +535,10 @@ function ChatRenderer(
 
   React.useEffect(() => {
     const init = async () => {
-      const gitRepoInfo = await fetchWorkspaceGitRepo()
+      const workspaceGitRepositories = await fetchWorkspaceGitRepo()
       // get default repo
-      if (gitRepoInfo?.length && repos?.length) {
-        const defaultGitUrl = gitRepoInfo[0].gitUrl
+      if (workspaceGitRepositories?.length && repos?.length) {
+        const defaultGitUrl = workspaceGitRepositories[0].url
         const targetGirUrl = findClosestRepositoryMatch(
           defaultGitUrl,
           repos.map(x => x.gitUrl)

From 7c9fa1cb655bebf175cddce1b6e9551b150ee1c8 Mon Sep 17 00:00:00 2001
From: liangfung <jueliang@tabbyml.com>
Date: Wed, 18 Dec 2024 13:59:32 +0700
Subject: [PATCH 33/39] update

---
 ee/tabby-ui/lib/utils/repository.ts | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 ee/tabby-ui/lib/utils/repository.ts

diff --git a/ee/tabby-ui/lib/utils/repository.ts b/ee/tabby-ui/lib/utils/repository.ts
new file mode 100644
index 000000000000..dfd582878c4c
--- /dev/null
+++ b/ee/tabby-ui/lib/utils/repository.ts
@@ -0,0 +1,9 @@
+import { go } from 'fuzzysort'
+
+export const findClosestRepositoryMatch = (
+  target: string,
+  gitUrls: string[]
+) => {
+  const results = go(target.replace(/\.git$/, ''), gitUrls)
+  return results.length > 0 ? results[0].target : null
+}

From 6c737c4cd7b0a6bab3e60cf5c342a78b0b55dd58 Mon Sep 17 00:00:00 2001
From: liangfung <jueliang@tabbyml.com>
Date: Wed, 18 Dec 2024 16:46:29 +0700
Subject: [PATCH 34/39] update: test

---
 Untitled-1.ipynb                     |  34 +++++++
 ee/tabby-ui/components/chat/chat.tsx |  10 +-
 ee/tabby-ui/lib/utils/repository.ts  |  24 +++--
 ee/tabby-ui/package.json             |   6 +-
 ee/tabby-ui/test/index.test.ts       | 102 +++++++++++++++++++
 ee/tabby-ui/tsconfig.json            |   6 +-
 pnpm-lock.yaml                       | 142 ++++++++++++++++++++++++++-
 7 files changed, 305 insertions(+), 19 deletions(-)
 create mode 100644 Untitled-1.ipynb
 create mode 100644 ee/tabby-ui/test/index.test.ts

diff --git a/Untitled-1.ipynb b/Untitled-1.ipynb
new file mode 100644
index 000000000000..75cdb1bf14ea
--- /dev/null
+++ b/Untitled-1.ipynb
@@ -0,0 +1,34 @@
+{
+ "cells": [
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "def fibonacci_memoization(n, memo={}):\n",
+    "    if n <= 0:\n",
+    "        raise ValueError(\"Input should be a positive integer.\")\n",
+    "    if n in memo:\n",
+    "        return memo[n]\n",
+    "    if n == 1:\n",
+    "        return 0\n",
+    "    elif n == 2:\n",
+    "        return 1\n",
+    "    else:\n",
+    "        memo[n] = fibonacci_memoization(n - 1, memo) + fibonacci_memoization(n - 2, memo)\n",
+    "        return memo[n]\n",
+    "\n",
+    "# Example usage:\n",
+    "print(fibonacci_memoization(10))"
+   ]
+  }
+ ],
+ "metadata": {
+  "language_info": {
+   "name": "python"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 2
+}
diff --git a/ee/tabby-ui/components/chat/chat.tsx b/ee/tabby-ui/components/chat/chat.tsx
index 89b583c4c1ad..61321f8df3eb 100644
--- a/ee/tabby-ui/components/chat/chat.tsx
+++ b/ee/tabby-ui/components/chat/chat.tsx
@@ -34,7 +34,7 @@ import {
   UserMessage,
   UserMessageWithOptionalId
 } from '@/lib/types/chat'
-import { cn, findClosestRepositoryMatch, nanoid } from '@/lib/utils'
+import { cn, findClosestGitRepository, nanoid } from '@/lib/utils'
 
 import { ChatPanel, ChatPanelRef } from './chat-panel'
 import { ChatScrollAnchor } from './chat-scroll-anchor'
@@ -539,10 +539,10 @@ function ChatRenderer(
       // get default repo
       if (workspaceGitRepositories?.length && repos?.length) {
         const defaultGitUrl = workspaceGitRepositories[0].url
-        const targetGirUrl = findClosestRepositoryMatch(
-          defaultGitUrl,
-          repos.map(x => x.gitUrl)
-        )
+        const targetGirUrl = findClosestGitRepository(
+          repos.map(x => ({ url: x.gitUrl })),
+          defaultGitUrl
+        )?.url
         if (targetGirUrl) {
           const repo = repos.find(x => x.gitUrl === targetGirUrl)
           if (repo) {
diff --git a/ee/tabby-ui/lib/utils/repository.ts b/ee/tabby-ui/lib/utils/repository.ts
index dfd582878c4c..bbb7c205d23f 100644
--- a/ee/tabby-ui/lib/utils/repository.ts
+++ b/ee/tabby-ui/lib/utils/repository.ts
@@ -1,9 +1,19 @@
-import { go } from 'fuzzysort'
+import gitUrlParse from 'git-url-parse'
+import type { GitRepository } from 'tabby-chat-panel'
 
-export const findClosestRepositoryMatch = (
-  target: string,
-  gitUrls: string[]
-) => {
-  const results = go(target.replace(/\.git$/, ''), gitUrls)
-  return results.length > 0 ? results[0].target : null
+export function findClosestGitRepository(
+  repositories: GitRepository[],
+  gitUrl: string
+): GitRepository | undefined {
+  const gitSearch = gitUrlParse(gitUrl)
+  if (!gitSearch) {
+    return undefined
+  }
+
+  const repos = repositories.filter(repo => {
+    const search = gitUrlParse(repo.url)
+    return search.name === gitSearch.name
+  })
+  // If there're multiple matches, we pick the one with highest alphabetical order
+  return repos.sort((a, b) => b.url.localeCompare(a.url))[0]
 }
diff --git a/ee/tabby-ui/package.json b/ee/tabby-ui/package.json
index f5d8d8bc420e..f44474941979 100644
--- a/ee/tabby-ui/package.json
+++ b/ee/tabby-ui/package.json
@@ -11,6 +11,7 @@
     "start": "next start",
     "lint": "next lint && pnpm format:check",
     "lint:fix": "next lint --fix && pnpm format:write",
+    "test": "vitest run",
     "preview": "next build && next start",
     "type-check": "tsc --noEmit",
     "format:write": "prettier --write \"{app,lib,components}/**/*.{ts,tsx,mdx}\" --cache",
@@ -77,6 +78,7 @@
     "focus-trap-react": "^10.1.1",
     "framer-motion": "^11.11.7",
     "fuzzysort": "^3.0.2",
+    "git-url-parse": "^16.0.0",
     "graphql": "^16.8.1",
     "graphql-ws": "^5.16.0",
     "humanize-duration": "^3.31.0",
@@ -134,6 +136,7 @@
     "@tailwindcss/typography": "^0.5.9",
     "@types/color": "^3.0.6",
     "@types/dompurify": "^3.0.5",
+    "@types/git-url-parse": "^9.0.3",
     "@types/he": "^1.2.3",
     "@types/humanize-duration": "^3.27.4",
     "@types/lodash-es": "^4.17.10",
@@ -162,6 +165,7 @@
     "tailwind-merge": "^1.12.0",
     "tailwindcss": "^3.3.1",
     "tailwindcss-animate": "^1.0.5",
-    "typescript": "^5.1.3"
+    "typescript": "^5.1.3",
+    "vitest": "^1.5.2"
   }
 }
diff --git a/ee/tabby-ui/test/index.test.ts b/ee/tabby-ui/test/index.test.ts
new file mode 100644
index 000000000000..eaf552c92786
--- /dev/null
+++ b/ee/tabby-ui/test/index.test.ts
@@ -0,0 +1,102 @@
+import { describe, expect, it } from 'vitest'
+import { findClosestGitRepository } from '../lib/utils/repository'
+import type { GitRepository } from 'tabby-chat-panel'
+
+describe('findClosestGitRepository', () => {
+  it('should match .git suffix', () => {
+    const repositories: GitRepository[] = [
+      { url: 'https://github.com/example/test' },
+    ]
+    const result = findClosestGitRepository(repositories, 'https://github.com/example/test.git')
+    expect(result).toEqual(repositories[0])
+  })
+
+  it('should match auth in URL', () => {
+    const repositories: GitRepository[] = [
+      { url: 'https://github.com/example/test' },
+    ]
+    const result = findClosestGitRepository(repositories, 'https://creds@github.com/example/test')
+    expect(result).toEqual(repositories[0])
+  })
+
+  it('should not match different names', () => {
+    const repositories: GitRepository[] = [
+      { url: 'https://github.com/example/anoth-repo' },
+    ]
+    const result = findClosestGitRepository(repositories, 'https://github.com/example/another-repo')
+    expect(result).toBeUndefined()
+  })
+
+  it('should not match repositories with a common prefix', () => {
+    const repositories: GitRepository[] = [
+      { url: 'https://github.com/TabbyML/registry-tabby' },
+    ]
+    const result = findClosestGitRepository(repositories, 'https://github.com/TabbyML/tabby')
+    expect(result).toBeUndefined()
+  })
+
+  it('should not match entirely different repository names', () => {
+    const repositories: GitRepository[] = [
+      { url: 'https://github.com/TabbyML/uptime' },
+    ]
+    const result = findClosestGitRepository(repositories, 'https://github.com/TabbyML/tabby')
+    expect(result).toBeUndefined()
+  })
+
+  it('should not match URL without repository name', () => {
+    const repositories: GitRepository[] = [
+      { url: 'https://github.com/TabbyML/tabby' },
+    ]
+    const result = findClosestGitRepository(repositories, 'https://github.com')
+    expect(result).toBeUndefined()
+  })
+
+  it('should not match different host', () => {
+    const repositories: GitRepository[] = [
+      { url: 'https://github.com/TabbyML/tabby' },
+    ]
+    const result = findClosestGitRepository(repositories, 'https://bitbucket.com/TabbyML/tabby')
+    expect(result).toBeUndefined()
+  })
+
+  it('should not match multiple close matches', () => {
+    const repositories: GitRepository[] = [
+      { url: 'https://bitbucket.com/CrabbyML/crabby' },
+      { url: 'https://gitlab.com/TabbyML/registry-tabby' },
+    ]
+    const result = findClosestGitRepository(repositories, 'git@github.com:TabbyML/tabby')
+    expect(result).toBeUndefined()
+  })
+
+  it('should match different protocol and suffix', () => {
+    const repositories: GitRepository[] = [
+      { url: 'https://github.com/TabbyML/tabby' },
+    ]
+    const result = findClosestGitRepository(repositories, 'git@github.com:TabbyML/tabby.git')
+    expect(result).toEqual(repositories[0])
+  })
+
+  it('should match different protocol', () => {
+    const repositories: GitRepository[] = [
+      { url: 'https://github.com/TabbyML/tabby' },
+    ]
+    const result = findClosestGitRepository(repositories, 'git@github.com:TabbyML/tabby')
+    expect(result).toEqual(repositories[0])
+  })
+
+  it('should match URL without organization', () => {
+    const repositories: GitRepository[] = [
+      { url: 'https://custom-git.com/TabbyML/tabby' },
+    ]
+    const result = findClosestGitRepository(repositories, 'https://custom-git.com/tabby')
+    expect(result).toEqual(repositories[0])
+  })
+
+  it('should match local URL', () => {
+    const repositories: GitRepository[] = [
+      { url: 'file:///home/TabbyML/tabby' },
+    ]
+    const result = findClosestGitRepository(repositories, 'git@github.com:TabbyML/tabby.git')
+    expect(result).toEqual(repositories[0])
+  })
+})
diff --git a/ee/tabby-ui/tsconfig.json b/ee/tabby-ui/tsconfig.json
index a625d1aef0af..a62cc00a466e 100644
--- a/ee/tabby-ui/tsconfig.json
+++ b/ee/tabby-ui/tsconfig.json
@@ -29,7 +29,9 @@
     "next-auth.d.ts",
     "**/*.ts",
     "**/*.tsx",
-    ".next/types/**/*.ts"
-, "lib/patch-fetch.js"  ],
+    ".next/types/**/*.ts",
+    "lib/patch-fetch.js",
+    "test"
+  ],
   "exclude": ["node_modules"]
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 94d67021249f..22d6692e4b94 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -224,6 +224,9 @@ importers:
 
   clients/tabby-chat-panel:
     dependencies:
+      git-url-parse:
+        specifier: ^16.0.0
+        version: 16.0.0
       react:
         specifier: 18.2.0
         version: 18.2.0
@@ -237,6 +240,9 @@ importers:
       '@antfu/ni':
         specifier: ^0.21.12
         version: 0.21.12
+      '@types/git-url-parse':
+        specifier: ^9.0.3
+        version: 9.0.3
       '@types/node':
         specifier: ^20.12.7
         version: 20.12.12
@@ -360,10 +366,10 @@ importers:
         version: 5.2.0
       esbuild-plugin-copy:
         specifier: ^2.1.1
-        version: 2.1.1(esbuild@0.19.12)
+        version: 2.1.1(esbuild@0.20.2)
       esbuild-plugin-polyfill-node:
         specifier: ^0.3.0
-        version: 0.3.0(esbuild@0.19.12)
+        version: 0.3.0(esbuild@0.20.2)
       eslint:
         specifier: ^8.55.0
         version: 8.57.0
@@ -601,6 +607,9 @@ importers:
       fuzzysort:
         specifier: ^3.0.2
         version: 3.0.2
+      git-url-parse:
+        specifier: ^16.0.0
+        version: 16.0.0
       graphql:
         specifier: ^16.8.1
         version: 16.8.1
@@ -767,6 +776,9 @@ importers:
       '@types/dompurify':
         specifier: ^3.0.5
         version: 3.0.5
+      '@types/git-url-parse':
+        specifier: ^9.0.3
+        version: 9.0.3
       '@types/he':
         specifier: ^1.2.3
         version: 1.2.3
@@ -854,6 +866,9 @@ importers:
       typescript:
         specifier: ^5.1.3
         version: 5.2.2
+      vitest:
+        specifier: ^1.5.2
+        version: 1.6.0(@types/node@17.0.45)(terser@5.31.0)
 
 packages:
 
@@ -3944,6 +3959,9 @@ packages:
   '@types/fs-extra@11.0.4':
     resolution: {integrity: sha512-yTbItCNreRooED33qjunPthRcSjERP1r4MqCZc7wv0u2sUkzTFp45tgUfS5+r7FrZPdmCCNflLhVSP/o+SemsQ==}
 
+  '@types/git-url-parse@9.0.3':
+    resolution: {integrity: sha512-Wrb8zeghhpKbYuqAOg203g+9YSNlrZWNZYvwxJuDF4dTmerijqpnGbI79yCuPtHSXHPEwv1pAFUB4zsSqn82Og==}
+
   '@types/glob@7.2.0':
     resolution: {integrity: sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==}
 
@@ -4022,6 +4040,9 @@ packages:
   '@types/object-hash@3.0.6':
     resolution: {integrity: sha512-fOBV8C1FIu2ELinoILQ+ApxcUKz4ngq+IWUYrxSGjXzzjUALijilampwkMgEtJ+h2njAW3pi853QpzNVCHB73w==}
 
+  '@types/parse-path@7.0.3':
+    resolution: {integrity: sha512-LriObC2+KYZD3FzCrgWGv/qufdUy4eXrxcLgQMfYXgPbLIecKIsVBaQgUPmxSSLcjmYbDTQbMgr6qr6l/eb7Bg==}
+
   '@types/parse5@6.0.3':
     resolution: {integrity: sha512-SuT16Q1K51EAVPz1K29DJ/sXjhSQ0zjvsypYJ6tlwVsRV9jwW5Adq2ch8Dq8kDBCkYnELS7N7VNCSB5nC56t/g==}
 
@@ -6513,6 +6534,12 @@ packages:
     resolution: {integrity: sha512-8EHPljDvs7qKykr6uw8b+lqLiUc/vUg+KVTI0uND4s63TdsZM2Xus3mflvF0DDG9SiM4RlCkFGL+7aAjRmV7KA==}
     hasBin: true
 
+  git-up@8.0.0:
+    resolution: {integrity: sha512-uBI8Zdt1OZlrYfGcSVroLJKgyNNXlgusYFzHk614lTasz35yg2PVpL1RMy0LOO2dcvF9msYW3pRfUSmafZNrjg==}
+
+  git-url-parse@16.0.0:
+    resolution: {integrity: sha512-Y8iAF0AmCaqXc6a5GYgPQW9ESbncNLOL+CeQAJRhmWUOmnPkKpBYeWYp4mFd3LA5j53CdGDdslzX12yEBVHQQg==}
+
   github-from-package@0.0.0:
     resolution: {integrity: sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==}
 
@@ -7104,6 +7131,9 @@ packages:
     resolution: {integrity: sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==}
     engines: {node: '>= 0.4'}
 
+  is-ssh@1.4.0:
+    resolution: {integrity: sha512-x7+VxdxOdlV3CYpjvRLBv5Lo9OJerlYanjwFrPR9fuGPjCiNiCzFgAWpiLAohSbsnH4ZAys3SBh+hq5rJosxUQ==}
+
   is-stream@2.0.1:
     resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==}
     engines: {node: '>=8'}
@@ -8324,9 +8354,16 @@ packages:
     resolution: {integrity: sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==}
     engines: {node: '>=0.10.0'}
 
+  parse-path@7.0.0:
+    resolution: {integrity: sha512-Euf9GG8WT9CdqwuWJGdf3RkUcTBArppHABkO7Lm8IzRQp0e2r/kkFnmhu4TSK30Wcu5rVAZLmfPKSBBi9tWFog==}
+
   parse-semver@1.1.1:
     resolution: {integrity: sha512-Eg1OuNntBMH0ojvEKSrvDSnwLmvVuUOSdylH/pSCPNMIspLlweJyIWXCE+k/5hm3cj/EBUYwmWkjhBALNP4LXQ==}
 
+  parse-url@9.2.0:
+    resolution: {integrity: sha512-bCgsFI+GeGWPAvAiUv63ZorMeif3/U0zaXABGJbOWt5OH2KCaPHF6S+0ok4aqM9RuIPGyZdx9tR9l13PsW4AYQ==}
+    engines: {node: '>=14.13.0'}
+
   parse5-htmlparser2-tree-adapter@7.0.0:
     resolution: {integrity: sha512-B77tOZrqqfUfnVcOrUvfdLbz4pu4RopLD/4vmu3HUPswwTA8OH0EMW9BlWR2B0RCoiZRAHEUu7IxeP1Pd1UU+g==}
 
@@ -8866,6 +8903,9 @@ packages:
   proto-list@1.2.4:
     resolution: {integrity: sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==}
 
+  protocols@2.0.1:
+    resolution: {integrity: sha512-/XJ368cyBJ7fzLMwLKv1e4vLxOju2MNAIokcr7meSaNcVbWz/CPcW22cP04mwxOErdA5mwjA8Q6w/cdAQxVn7Q==}
+
   ps-tree@1.2.0:
     resolution: {integrity: sha512-0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA==}
     engines: {node: '>= 0.10'}
@@ -14351,6 +14391,8 @@ snapshots:
       '@types/jsonfile': 6.1.4
       '@types/node': 20.12.12
 
+  '@types/git-url-parse@9.0.3': {}
+
   '@types/glob@7.2.0':
     dependencies:
       '@types/minimatch': 5.1.2
@@ -14425,6 +14467,8 @@ snapshots:
 
   '@types/object-hash@3.0.6': {}
 
+  '@types/parse-path@7.0.3': {}
+
   '@types/parse5@6.0.3': {}
 
   '@types/prismjs@1.26.4': {}
@@ -16722,11 +16766,11 @@ snapshots:
       is-date-object: 1.0.5
       is-symbol: 1.0.4
 
-  esbuild-plugin-copy@2.1.1(esbuild@0.19.12):
+  esbuild-plugin-copy@2.1.1(esbuild@0.20.2):
     dependencies:
       chalk: 4.1.2
       chokidar: 3.6.0
-      esbuild: 0.19.12
+      esbuild: 0.20.2
       fs-extra: 10.1.0
       globby: 11.1.0
 
@@ -16736,6 +16780,12 @@ snapshots:
       esbuild: 0.19.12
       import-meta-resolve: 3.1.1
 
+  esbuild-plugin-polyfill-node@0.3.0(esbuild@0.20.2):
+    dependencies:
+      '@jspm/core': 2.0.1
+      esbuild: 0.20.2
+      import-meta-resolve: 3.1.1
+
   esbuild@0.19.11:
     optionalDependencies:
       '@esbuild/aix-ppc64': 0.19.11
@@ -17755,6 +17805,15 @@ snapshots:
       pathe: 1.1.2
       tar: 6.2.1
 
+  git-up@8.0.0:
+    dependencies:
+      is-ssh: 1.4.0
+      parse-url: 9.2.0
+
+  git-url-parse@16.0.0:
+    dependencies:
+      git-up: 8.0.0
+
   github-from-package@0.0.0:
     optional: true
 
@@ -18432,6 +18491,10 @@ snapshots:
     dependencies:
       call-bind: 1.0.7
 
+  is-ssh@1.4.0:
+    dependencies:
+      protocols: 2.0.1
+
   is-stream@2.0.1: {}
 
   is-stream@3.0.0: {}
@@ -19956,10 +20019,19 @@ snapshots:
 
   parse-passwd@1.0.0: {}
 
+  parse-path@7.0.0:
+    dependencies:
+      protocols: 2.0.1
+
   parse-semver@1.1.1:
     dependencies:
       semver: 5.7.2
 
+  parse-url@9.2.0:
+    dependencies:
+      '@types/parse-path': 7.0.3
+      parse-path: 7.0.0
+
   parse5-htmlparser2-tree-adapter@7.0.0:
     dependencies:
       domhandler: 5.0.3
@@ -20533,6 +20605,8 @@ snapshots:
 
   proto-list@1.2.4: {}
 
+  protocols@2.0.1: {}
+
   ps-tree@1.2.0:
     dependencies:
       event-stream: 3.3.4
@@ -22466,6 +22540,23 @@ snapshots:
       d3-time: 3.1.0
       d3-timer: 3.0.1
 
+  vite-node@1.6.0(@types/node@17.0.45)(terser@5.31.0):
+    dependencies:
+      cac: 6.7.14
+      debug: 4.3.4(supports-color@9.4.0)
+      pathe: 1.1.2
+      picocolors: 1.0.1
+      vite: 5.2.11(@types/node@17.0.45)(terser@5.31.0)
+    transitivePeerDependencies:
+      - '@types/node'
+      - less
+      - lightningcss
+      - sass
+      - stylus
+      - sugarss
+      - supports-color
+      - terser
+
   vite-node@1.6.0(@types/node@20.12.12)(terser@5.31.0):
     dependencies:
       cac: 6.7.14
@@ -22483,6 +22574,16 @@ snapshots:
       - supports-color
       - terser
 
+  vite@5.2.11(@types/node@17.0.45)(terser@5.31.0):
+    dependencies:
+      esbuild: 0.20.2
+      postcss: 8.4.38
+      rollup: 4.27.4
+    optionalDependencies:
+      '@types/node': 17.0.45
+      fsevents: 2.3.3
+      terser: 5.31.0
+
   vite@5.2.11(@types/node@20.12.12)(terser@5.31.0):
     dependencies:
       esbuild: 0.20.2
@@ -22493,6 +22594,39 @@ snapshots:
       fsevents: 2.3.3
       terser: 5.31.0
 
+  vitest@1.6.0(@types/node@17.0.45)(terser@5.31.0):
+    dependencies:
+      '@vitest/expect': 1.6.0
+      '@vitest/runner': 1.6.0
+      '@vitest/snapshot': 1.6.0
+      '@vitest/spy': 1.6.0
+      '@vitest/utils': 1.6.0
+      acorn-walk: 8.3.2
+      chai: 4.4.1
+      debug: 4.3.4(supports-color@9.4.0)
+      execa: 8.0.1
+      local-pkg: 0.5.0
+      magic-string: 0.30.10
+      pathe: 1.1.2
+      picocolors: 1.0.1
+      std-env: 3.7.0
+      strip-literal: 2.1.0
+      tinybench: 2.8.0
+      tinypool: 0.8.4
+      vite: 5.2.11(@types/node@17.0.45)(terser@5.31.0)
+      vite-node: 1.6.0(@types/node@17.0.45)(terser@5.31.0)
+      why-is-node-running: 2.2.2
+    optionalDependencies:
+      '@types/node': 17.0.45
+    transitivePeerDependencies:
+      - less
+      - lightningcss
+      - sass
+      - stylus
+      - sugarss
+      - supports-color
+      - terser
+
   vitest@1.6.0(@types/node@20.12.12)(terser@5.31.0):
     dependencies:
       '@vitest/expect': 1.6.0

From c3e2dfec3bc29ff2c8851fa461402d502a3b9e58 Mon Sep 17 00:00:00 2001
From: liangfung <jueliang@tabbyml.com>
Date: Wed, 18 Dec 2024 16:49:05 +0700
Subject: [PATCH 35/39] update

---
 pnpm-lock.yaml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 22d6692e4b94..54a06d0b907a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -224,9 +224,6 @@ importers:
 
   clients/tabby-chat-panel:
     dependencies:
-      git-url-parse:
-        specifier: ^16.0.0
-        version: 16.0.0
       react:
         specifier: 18.2.0
         version: 18.2.0
@@ -240,9 +237,6 @@ importers:
       '@antfu/ni':
         specifier: ^0.21.12
         version: 0.21.12
-      '@types/git-url-parse':
-        specifier: ^9.0.3
-        version: 9.0.3
       '@types/node':
         specifier: ^20.12.7
         version: 20.12.12

From 3d292b87c998ca333c4e689f8a41349bcb2fa6d5 Mon Sep 17 00:00:00 2001
From: liangfung <jueliang@tabbyml.com>
Date: Wed, 18 Dec 2024 16:54:28 +0700
Subject: [PATCH 36/39] update: remove

---
 Untitled-1.ipynb | 34 ----------------------------------
 1 file changed, 34 deletions(-)
 delete mode 100644 Untitled-1.ipynb

diff --git a/Untitled-1.ipynb b/Untitled-1.ipynb
deleted file mode 100644
index 75cdb1bf14ea..000000000000
--- a/Untitled-1.ipynb
+++ /dev/null
@@ -1,34 +0,0 @@
-{
- "cells": [
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "def fibonacci_memoization(n, memo={}):\n",
-    "    if n <= 0:\n",
-    "        raise ValueError(\"Input should be a positive integer.\")\n",
-    "    if n in memo:\n",
-    "        return memo[n]\n",
-    "    if n == 1:\n",
-    "        return 0\n",
-    "    elif n == 2:\n",
-    "        return 1\n",
-    "    else:\n",
-    "        memo[n] = fibonacci_memoization(n - 1, memo) + fibonacci_memoization(n - 2, memo)\n",
-    "        return memo[n]\n",
-    "\n",
-    "# Example usage:\n",
-    "print(fibonacci_memoization(10))"
-   ]
-  }
- ],
- "metadata": {
-  "language_info": {
-   "name": "python"
-  }
- },
- "nbformat": 4,
- "nbformat_minor": 2
-}

From 2c666a8d0d10230c00f39e253e9c2733b97eac97 Mon Sep 17 00:00:00 2001
From: liangfung <jueliang@tabbyml.com>
Date: Wed, 18 Dec 2024 17:43:18 +0700
Subject: [PATCH 37/39] update: test

---
 ee/tabby-ui/lib/utils/repository.ts | 23 +++++++++++++++++++----
 ee/tabby-ui/test/index.test.ts      | 29 ++++++++++++++++++++++++++++-
 2 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/ee/tabby-ui/lib/utils/repository.ts b/ee/tabby-ui/lib/utils/repository.ts
index bbb7c205d23f..87e9a956edc4 100644
--- a/ee/tabby-ui/lib/utils/repository.ts
+++ b/ee/tabby-ui/lib/utils/repository.ts
@@ -5,15 +5,30 @@ export function findClosestGitRepository(
   repositories: GitRepository[],
   gitUrl: string
 ): GitRepository | undefined {
-  const gitSearch = gitUrlParse(gitUrl)
-  if (!gitSearch) {
+  const targetSearch = gitUrlParse(gitUrl)
+  if (!targetSearch) {
     return undefined
   }
 
   const repos = repositories.filter(repo => {
     const search = gitUrlParse(repo.url)
-    return search.name === gitSearch.name
+    const isSameResource =
+      search.resource === targetSearch.resource || search.protocol === 'file'
+    return isSameResource && search.name === targetSearch.name
   })
+
   // If there're multiple matches, we pick the one with highest alphabetical order
-  return repos.sort((a, b) => b.url.localeCompare(a.url))[0]
+  return repos.sort((a, b) => {
+    const canonicalUrlA = canonicalizeUrl(a.url)
+    const canonicalUrlB = canonicalizeUrl(b.url)
+    return canonicalUrlB.localeCompare(canonicalUrlA)
+  })[0]
+}
+
+export function canonicalizeUrl(url: string): string {
+  const strippedUrl = url.replace(/\.git$/, '')
+  const parsedUrl = new URL(strippedUrl)
+  parsedUrl.username = ''
+  parsedUrl.password = ''
+  return parsedUrl.toString()
 }
diff --git a/ee/tabby-ui/test/index.test.ts b/ee/tabby-ui/test/index.test.ts
index eaf552c92786..d4ec0eb31953 100644
--- a/ee/tabby-ui/test/index.test.ts
+++ b/ee/tabby-ui/test/index.test.ts
@@ -1,7 +1,34 @@
 import { describe, expect, it } from 'vitest'
-import { findClosestGitRepository } from '../lib/utils/repository'
+import { findClosestGitRepository, canonicalizeUrl } from '../lib/utils/repository'
 import type { GitRepository } from 'tabby-chat-panel'
 
+describe('canonicalizeUrl', () => {
+  it('should remove auth info from URL', () => {
+    const result = canonicalizeUrl('https://abc:dev@github.com/');
+    expect(result).toBe('https://github.com/');
+  });
+
+  it('should remove token from URL', () => {
+    const result = canonicalizeUrl('https://token@github.com/TabbyML/tabby');
+    expect(result).toBe('https://github.com/TabbyML/tabby');
+  });
+
+  it('should return the same URL if no auth info is present', () => {
+    const result = canonicalizeUrl('https://github.com/TabbyML/tabby');
+    expect(result).toBe('https://github.com/TabbyML/tabby');
+  });
+
+  it('should remove .git suffix from URL', () => {
+    const result = canonicalizeUrl('https://github.com/TabbyML/tabby.git');
+    expect(result).toBe('https://github.com/TabbyML/tabby');
+  });
+
+  it('should handle file URLs correctly', () => {
+    const result = canonicalizeUrl('file:///home/TabbyML/tabby');
+    expect(result).toBe('file:///home/TabbyML/tabby');
+  });
+});
+
 describe('findClosestGitRepository', () => {
   it('should match .git suffix', () => {
     const repositories: GitRepository[] = [

From f61f185c935f2f23e2d790e9c8d39e74f145172f Mon Sep 17 00:00:00 2001
From: liangfung <jueliang@tabbyml.com>
Date: Wed, 18 Dec 2024 18:06:40 +0700
Subject: [PATCH 38/39] update

---
 ee/tabby-ui/lib/utils/repository.ts | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/ee/tabby-ui/lib/utils/repository.ts b/ee/tabby-ui/lib/utils/repository.ts
index 87e9a956edc4..35ae1c468042 100644
--- a/ee/tabby-ui/lib/utils/repository.ts
+++ b/ee/tabby-ui/lib/utils/repository.ts
@@ -10,19 +10,23 @@ export function findClosestGitRepository(
     return undefined
   }
 
-  const repos = repositories.filter(repo => {
+  const filteredRepos = repositories.filter(repo => {
     const search = gitUrlParse(repo.url)
     const isSameResource =
       search.resource === targetSearch.resource || search.protocol === 'file'
     return isSameResource && search.name === targetSearch.name
   })
 
-  // If there're multiple matches, we pick the one with highest alphabetical order
-  return repos.sort((a, b) => {
-    const canonicalUrlA = canonicalizeUrl(a.url)
-    const canonicalUrlB = canonicalizeUrl(b.url)
-    return canonicalUrlB.localeCompare(canonicalUrlA)
-  })[0]
+  if (filteredRepos.length === 0) {
+    return undefined
+  } else {
+    // If there're multiple matches, we pick the one with highest alphabetical order
+    return filteredRepos.reduce((min, current) => {
+      const minUrl = canonicalizeUrl(min.url)
+      const currentUrl = canonicalizeUrl(current.url)
+      return minUrl > currentUrl ? min : current
+    })
+  }
 }
 
 export function canonicalizeUrl(url: string): string {

From 8b47b045abde49abee865cd8d8a0ff2315230926 Mon Sep 17 00:00:00 2001
From: liangfung <jueliang@tabbyml.com>
Date: Thu, 19 Dec 2024 09:27:30 +0700
Subject: [PATCH 39/39] update: test cases

---
 ee/tabby-ui/components/chat/chat.tsx | 13 +++++------
 ee/tabby-ui/lib/utils/repository.ts  | 24 +++++---------------
 ee/tabby-ui/test/index.test.ts       | 33 +++-------------------------
 3 files changed, 13 insertions(+), 57 deletions(-)

diff --git a/ee/tabby-ui/components/chat/chat.tsx b/ee/tabby-ui/components/chat/chat.tsx
index 61321f8df3eb..360afcec4bc7 100644
--- a/ee/tabby-ui/components/chat/chat.tsx
+++ b/ee/tabby-ui/components/chat/chat.tsx
@@ -539,15 +539,12 @@ function ChatRenderer(
       // get default repo
       if (workspaceGitRepositories?.length && repos?.length) {
         const defaultGitUrl = workspaceGitRepositories[0].url
-        const targetGirUrl = findClosestGitRepository(
-          repos.map(x => ({ url: x.gitUrl })),
+        const repo = findClosestGitRepository(
+          repos.map(x => ({ url: x.gitUrl, sourceId: x.sourceId })),
           defaultGitUrl
-        )?.url
-        if (targetGirUrl) {
-          const repo = repos.find(x => x.gitUrl === targetGirUrl)
-          if (repo) {
-            setSelectedRepoId(repo.sourceId)
-          }
+        )
+        if (repo) {
+          setSelectedRepoId(repo.sourceId)
         }
       }
 
diff --git a/ee/tabby-ui/lib/utils/repository.ts b/ee/tabby-ui/lib/utils/repository.ts
index 35ae1c468042..1689118f2bf2 100644
--- a/ee/tabby-ui/lib/utils/repository.ts
+++ b/ee/tabby-ui/lib/utils/repository.ts
@@ -1,10 +1,10 @@
 import gitUrlParse from 'git-url-parse'
 import type { GitRepository } from 'tabby-chat-panel'
 
-export function findClosestGitRepository(
-  repositories: GitRepository[],
+export function findClosestGitRepository<T extends GitRepository>(
+  repositories: T[],
   gitUrl: string
-): GitRepository | undefined {
+): T | undefined {
   const targetSearch = gitUrlParse(gitUrl)
   if (!targetSearch) {
     return undefined
@@ -12,27 +12,13 @@ export function findClosestGitRepository(
 
   const filteredRepos = repositories.filter(repo => {
     const search = gitUrlParse(repo.url)
-    const isSameResource =
-      search.resource === targetSearch.resource || search.protocol === 'file'
-    return isSameResource && search.name === targetSearch.name
+    return search.name === targetSearch.name
   })
 
   if (filteredRepos.length === 0) {
     return undefined
   } else {
     // If there're multiple matches, we pick the one with highest alphabetical order
-    return filteredRepos.reduce((min, current) => {
-      const minUrl = canonicalizeUrl(min.url)
-      const currentUrl = canonicalizeUrl(current.url)
-      return minUrl > currentUrl ? min : current
-    })
+    return filteredRepos.sort((a, b) => a.url.localeCompare(b.url))[0]
   }
 }
-
-export function canonicalizeUrl(url: string): string {
-  const strippedUrl = url.replace(/\.git$/, '')
-  const parsedUrl = new URL(strippedUrl)
-  parsedUrl.username = ''
-  parsedUrl.password = ''
-  return parsedUrl.toString()
-}
diff --git a/ee/tabby-ui/test/index.test.ts b/ee/tabby-ui/test/index.test.ts
index d4ec0eb31953..d65939cde364 100644
--- a/ee/tabby-ui/test/index.test.ts
+++ b/ee/tabby-ui/test/index.test.ts
@@ -1,34 +1,7 @@
 import { describe, expect, it } from 'vitest'
-import { findClosestGitRepository, canonicalizeUrl } from '../lib/utils/repository'
+import { findClosestGitRepository } from '../lib/utils/repository'
 import type { GitRepository } from 'tabby-chat-panel'
 
-describe('canonicalizeUrl', () => {
-  it('should remove auth info from URL', () => {
-    const result = canonicalizeUrl('https://abc:dev@github.com/');
-    expect(result).toBe('https://github.com/');
-  });
-
-  it('should remove token from URL', () => {
-    const result = canonicalizeUrl('https://token@github.com/TabbyML/tabby');
-    expect(result).toBe('https://github.com/TabbyML/tabby');
-  });
-
-  it('should return the same URL if no auth info is present', () => {
-    const result = canonicalizeUrl('https://github.com/TabbyML/tabby');
-    expect(result).toBe('https://github.com/TabbyML/tabby');
-  });
-
-  it('should remove .git suffix from URL', () => {
-    const result = canonicalizeUrl('https://github.com/TabbyML/tabby.git');
-    expect(result).toBe('https://github.com/TabbyML/tabby');
-  });
-
-  it('should handle file URLs correctly', () => {
-    const result = canonicalizeUrl('file:///home/TabbyML/tabby');
-    expect(result).toBe('file:///home/TabbyML/tabby');
-  });
-});
-
 describe('findClosestGitRepository', () => {
   it('should match .git suffix', () => {
     const repositories: GitRepository[] = [
@@ -78,12 +51,12 @@ describe('findClosestGitRepository', () => {
     expect(result).toBeUndefined()
   })
 
-  it('should not match different host', () => {
+  it('should match different host', () => {
     const repositories: GitRepository[] = [
       { url: 'https://github.com/TabbyML/tabby' },
     ]
     const result = findClosestGitRepository(repositories, 'https://bitbucket.com/TabbyML/tabby')
-    expect(result).toBeUndefined()
+    expect(result).toEqual(repositories[0])
   })
 
   it('should not match multiple close matches', () => {