diff --git a/src/lib/components/chat/ChatTabs.svelte b/src/lib/components/chat/ChatTabs.svelte index 3292cd3f4e..bc3c56061b 100644 --- a/src/lib/components/chat/ChatTabs.svelte +++ b/src/lib/components/chat/ChatTabs.svelte @@ -108,6 +108,7 @@ > = {}; let dirtyFiles: Record = {}; let fileContexts: Record = {}; + let gitDirectories: Record = {}; let panelTarget: HTMLElement | null = null; let initialized = false; let tabsChatId = chatId; @@ -304,6 +305,7 @@ tabs = removeTab(tabs, id); delete dirtyFiles[id]; delete fileContexts[id]; + delete gitDirectories[id]; if (!tabs.tabs.length) showTabs.set(false); await tick(); document.getElementById(domId(tabs.activeId))?.focus(); @@ -467,6 +469,7 @@ tabs = removeTab(tabs, tab.id); delete dirtyFiles[tab.id]; delete fileContexts[tab.id]; + delete gitDirectories[tab.id]; } } }; @@ -519,6 +522,7 @@ tabs = emptyTabs(); dirtyFiles = {}; fileContexts = {}; + gitDirectories = {}; initialized = false; commentTarget = {}; } @@ -901,6 +905,7 @@ overlay={dragged} {chatId} bind:terminalContext={fileContexts[tab.id]} + bind:gitDirectory={gitDirectories[tab.id]} /> {:else if tab.kind === 'files' && codeInterpreterEnabled} @@ -920,7 +925,7 @@ bind:hideWhitespace={gitHideWhitespace} connection={gitConnection} {chatId} - directory={terminalContext?.currentDirectory ?? '.'} + directory={gitDirectories[tabs.activeId] ?? terminalContext?.currentDirectory ?? '.'} active={!!$showTabs} onOpenFile={(path) => openFile(path, gitConnection.selector)} onOpenDirectory={(path) => openFiles(gitConnection.selector, path)} diff --git a/src/lib/components/chat/FileNav.svelte b/src/lib/components/chat/FileNav.svelte index 62ff849bd3..f0bf556ddb 100644 --- a/src/lib/components/chat/FileNav.svelte +++ b/src/lib/components/chat/FileNav.svelte @@ -68,6 +68,7 @@ export let overlay = false; export let active = true; export let gitStatus: GitStatus | null = null; + export let gitDirectory: string | null = null; export let gitConnection: TerminalConnection | null = null; export let gitDiffMode: 'unified' | 'split' = 'unified'; export let gitHideWhitespace = false; @@ -1023,6 +1024,7 @@ selectedFileWritable = true; clearFilePreview(); clearSelection(); + if (!options.preserveTree || directory !== currentPath) gitDirectory = directory; currentPath = directory; terminalContext = { terminalId: effectiveTerminalId, currentDirectory: directory }; savedPath = directory; @@ -1087,6 +1089,7 @@ } expandedDirs = new Set(expandedDirs).add(directory); + gitDirectory = directory; saveTreeState(); const result = await fetchExpandedDir(directory); diff --git a/src/lib/components/chat/FileNav/FileNavToolbar.svelte b/src/lib/components/chat/FileNav/FileNavToolbar.svelte index 1943698728..9ee6db9972 100644 --- a/src/lib/components/chat/FileNav/FileNavToolbar.svelte +++ b/src/lib/components/chat/FileNav/FileNavToolbar.svelte @@ -170,7 +170,7 @@ aria-pressed={gitDiffOpen} on:click={onToggleGitDiff} > - + {/if} @@ -187,7 +187,7 @@ on:click={onRefresh} aria-label={$i18n.t('Refresh')} > - + {#if !selectedFile}