Skip to content

File mentions enhancements: connection support and performance improvements #132

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
yonikliger-velocity wants to merge 2 commits into
base: main
Choose a base branch
from
Open

File mentions enhancements: connection support and performance improvements #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b55580
feat: Show all files in @ mentions with performance optimizations
yonikliger-velocity Mar 16, 2026
a3b8b00
fix: Add file mentions support for connection sessions
yonikliger-velocity Mar 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/renderer/src/components/sessions/FileMentionPopover.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ export function FileMentionPopover({
) : (
suggestions.map((file, index) => (
<div
key={file.relativePath}
key={file.path}
data-mention-item
data-testid="file-mention-item"
role="option"
Expand Down
106 changes: 93 additions & 13 deletions src/renderer/src/components/sessions/SessionView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,21 +459,65 @@ export function SessionView({ sessionId }: SessionViewProps): React.JSX.Element
const inputValueRef = useRef('')
const draftTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null)

// Flat file index for file mentions and search — keyed by worktree path.
// Uses git ls-files for a complete, gitignore-respecting file list.
// Ensure the index is loaded when worktreePath is resolved — SessionView cannot
// rely on the FileTree sidebar component having already populated the store
// (sidebar may be collapsed, on a different tab, or targeting a different worktree).
const fileIndex = useFileTreeStore((state) =>
worktreePath
? (state.fileIndexByWorktree.get(worktreePath) ?? EMPTY_FILE_INDEX)
: EMPTY_FILE_INDEX
// Connection path resolution error state
const [connectionPathError, setConnectionPathError] = useState<string | null>(null)

// Flat file index for file mentions and search.
// For worktree sessions: use worktreePath as key
// For connection sessions: use `connection:${connectionId}` as key and aggregate from all members
const fileIndex = useFileTreeStore((state) => {
if (worktreeId) {
// Regular worktree session
return worktreePath
? (state.fileIndexByWorktree.get(worktreePath) ?? EMPTY_FILE_INDEX)
: EMPTY_FILE_INDEX
} else if (connectionId) {
// Connection session - use connectionId as key
const cacheKey = `connection:${connectionId}`
return state.fileIndexByWorktree.get(cacheKey) ?? EMPTY_FILE_INDEX
}
return EMPTY_FILE_INDEX
})

// Subscribe to connection data for connection sessions
const activeConnection = useConnectionStore((state) =>
connectionId ? state.connections.find((c) => c.id === connectionId) : undefined
)

useEffect(() => {
if (worktreePath && fileIndex === EMPTY_FILE_INDEX) {
if (worktreeId && worktreePath && fileIndex === EMPTY_FILE_INDEX) {
// Regular worktree session - load from single worktree
console.log('[SessionView] Loading file index for worktree:', worktreePath)
useFileTreeStore.getState().loadFileIndex(worktreePath)
} else if (connectionId && fileIndex === EMPTY_FILE_INDEX) {
Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector bot Mar 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Reload connection file index after membership changes

The connection branch only calls loadFileIndexForConnection while fileIndex === EMPTY_FILE_INDEX, so once a connection index is cached it is never refreshed even if activeConnection.members changes (for example via addMember/removeMember/updateConnectionMembers in useConnectionStore). In an active connection session this leaves @ suggestions stale (new members' files never appear, removed members' files remain) until the view is remounted or cache is manually cleared.

Useful? React with 👍 / 👎.

// Connection session - load from all member worktrees
// Use the subscribed activeConnection instead of imperative getState()
if (activeConnection && activeConnection.members.length > 0) {
const members = activeConnection.members.map((m) => ({
symlinkName: m.symlink_name,
worktreePath: m.worktree_path
}))
console.log(
'[SessionView] Loading file index for connection:',
connectionId,
'from',
members.length,
'members'
)
useFileTreeStore.getState().loadFileIndexForConnection(connectionId, members)
} else if (!activeConnection) {
console.warn('[SessionView] Connection not found for file index loading', {
sessionId,
connectionId
})
} else {
console.warn('[SessionView] Connection has no members - file mentions disabled', {
sessionId,
connectionId
})
}
Comment on lines +508 to +518
Copy link
Copy Markdown
Contributor

@greptile-apps greptile-apps bot Mar 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Zero-member connection causes repeated console warnings on every effect re-run

When activeConnection.members.length === 0, the effect logs a warning and returns without storing anything. Because fileIndex === EMPTY_FILE_INDEX remains true, any subsequent change to an unrelated dependency (e.g. the activeConnection reference itself being replaced by the store on an unrelated update) will re-trigger the effect and log the same warning repeatedly.

Consider storing a sentinel value or a local ref to record that the zero-members case has already been handled, so the warning fires at most once per session mount:

const zeroMembersWarnedRef = useRef(false)

// …inside the else branch:
if (!zeroMembersWarnedRef.current) {
  console.warn('[SessionView] Connection has no members - file mentions disabled', …)
  zeroMembersWarnedRef.current = true
}

}
}, [worktreePath, fileIndex])
}, [worktreeId, worktreePath, connectionId, fileIndex, sessionId, activeConnection])

// File mentions hook
const fileMentions = useFileMentions(inputValue, cursorPosition, fileIndex)
Expand Down Expand Up @@ -1903,16 +1947,28 @@ export function SessionView({ sessionId }: SessionViewProps): React.JSX.Element
} else if (session.connection_id) {
// Connection session: resolve the connection folder path
setConnectionId(session.connection_id)
setConnectionPathError(null) // Clear any previous error
try {
const connResult = await window.connectionOps.get(session.connection_id)
if (shouldAbortInit()) return

if (connResult.success && connResult.connection) {
wtPath = connResult.connection.path
setWorktreePath(wtPath)
transcriptSourceRef.current.worktreePath = wtPath
setConnectionPathError(null) // Explicitly clear on success
} else {
// Connection lookup failed or returned no connection
const errorMsg = connResult.error || 'Connection not found'
console.error('Failed to resolve connection path:', errorMsg, 'connectionId:', session.connection_id)
setConnectionPathError(errorMsg)
toast.error(`Failed to load connection: ${errorMsg}`)
}
} catch {
console.warn('Failed to resolve connection path for session')
} catch (error) {
const errorMsg = error instanceof Error ? error.message : 'Unknown error'
console.error('Exception resolving connection path:', error, 'connectionId:', session.connection_id)
setConnectionPathError(errorMsg)
toast.error(`Failed to load connection: ${errorMsg}`)
}
}

Expand Down Expand Up @@ -4029,6 +4085,30 @@ export function SessionView({ sessionId }: SessionViewProps): React.JSX.Element
{/* Attachment previews */}
<AttachmentPreview attachments={attachments} onRemove={handleRemoveAttachment} />

{/* Connection error banner */}
{connectionPathError && (
<div className="mx-3 mb-2 p-3 rounded-md bg-destructive/10 border border-destructive/20 flex items-start gap-2">
<AlertCircle className="h-4 w-4 text-destructive shrink-0 mt-0.5" />
<div className="flex-1 min-w-0">
<p className="text-sm text-destructive font-medium">Connection Error</p>
<p className="text-xs text-muted-foreground mt-1">
Failed to load connection path: {connectionPathError}. File mentions (@) will not work.
</p>
</div>
<Button
variant="ghost"
size="sm"
onClick={() => {
// Retry connection loading by reinitializing the session
initializeSession()
}}
className="shrink-0"
>
<RefreshCw className="h-4 w-4" />
</Button>
</div>
)}

{/* Middle: textarea */}
<textarea
ref={textareaRef}
Expand Down
45 changes: 22 additions & 23 deletions src/renderer/src/hooks/useFileMentions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,15 @@ function detectTrigger(inputValue: string, cursorPosition: number): TriggerState
return closed
}

// Maximum number of suggestions to show (performance optimization for large repos)
const MAX_SUGGESTIONS = 200

function filterSuggestions(flatFiles: FlatFile[], query: string): FlatFile[] {
if (query === '') {
// Return first 5 files alphabetically by relativePath
return [...flatFiles].sort((a, b) => a.relativePath.localeCompare(b.relativePath)).slice(0, 5)
// Return up to MAX_SUGGESTIONS files alphabetically by relativePath
return [...flatFiles]
.sort((a, b) => a.relativePath.localeCompare(b.relativePath))
.slice(0, MAX_SUGGESTIONS)
}

// Score and filter
Expand All @@ -84,7 +89,7 @@ function filterSuggestions(flatFiles: FlatFile[], query: string): FlatFile[] {
if (b.score !== a.score) return b.score - a.score
return a.file.relativePath.localeCompare(b.file.relativePath)
})
.slice(0, 5)
.slice(0, MAX_SUGGESTIONS) // Cap results for performance

return scored.map(({ file }) => file)
}
Expand All @@ -102,12 +107,6 @@ export function useFileMentions(inputValue: string, cursorPosition: number, flat

const { isOpen, query, triggerIndex } = trigger

// Filter suggestions
const suggestions = useMemo(
() => (isOpen ? filterSuggestions(flatFiles, query) : []),
[isOpen, flatFiles, query]
)

// Reset selectedIndex when query changes
useEffect(() => {
if (query !== prevQueryRef.current) {
Expand All @@ -116,20 +115,6 @@ export function useFileMentions(inputValue: string, cursorPosition: number, flat
}
}, [query])

// Keyboard navigation
const moveSelection = useCallback(
(direction: 'up' | 'down') => {
if (suggestions.length === 0) return
setSelectedIndex((prev) => {
if (direction === 'down') {
return (prev + 1) % suggestions.length
}
return (prev - 1 + suggestions.length) % suggestions.length
})
},
[suggestions.length]
)

// Select a file — returns insertion data
const selectFile = useCallback(
(file: FlatFile): SelectFileResult => {
Expand Down Expand Up @@ -177,6 +162,20 @@ export function useFileMentions(inputValue: string, cursorPosition: number, flat
[effectiveIsOpen, flatFiles, query]
)

// Keyboard navigation
const moveSelection = useCallback(
(direction: 'up' | 'down') => {
if (effectiveSuggestions.length === 0) return
setSelectedIndex((prev) => {
if (direction === 'down') {
return (prev + 1) % effectiveSuggestions.length
}
return (prev - 1 + effectiveSuggestions.length) % effectiveSuggestions.length
})
},
[effectiveSuggestions.length]
)

// Update mention indices when the input text changes
const updateMentions = useCallback((oldValue: string, newValue: string) => {
if (oldValue === newValue) return
Expand Down
96 changes: 95 additions & 1 deletion src/renderer/src/stores/useFileTreeStore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ interface FileTreeState {
// Actions
loadFileTree: (worktreePath: string) => Promise<void>
loadFileIndex: (worktreePath: string) => Promise<void>
loadFileIndexForConnection: (
connectionId: string,
members: Array<{ symlinkName: string; worktreePath: string }>
) => Promise<void>
loadChildren: (worktreePath: string, dirPath: string) => Promise<void>
setExpanded: (worktreePath: string, paths: Set<string>) => void
toggleExpanded: (worktreePath: string, path: string) => void
Expand Down Expand Up @@ -127,6 +131,9 @@ export const useFileTreeStore = create<FileTreeState>()(
const loadingMap = new Map(state.fileIndexLoadingByWorktree)
if (result.success && result.files) {
indexMap.set(worktreePath, result.files)
} else {
// Log failure but don't throw - allows graceful degradation
console.error('[FileTreeStore] Failed to scan files:', result.error, 'path:', worktreePath)
}
loadingMap.set(worktreePath, false)
return { fileIndexByWorktree: indexMap, fileIndexLoadingByWorktree: loadingMap }
Expand All @@ -136,7 +143,8 @@ export const useFileTreeStore = create<FileTreeState>()(
// updates flow even when the Files sidebar tab is hidden.
// startWatching guards against duplicate subscriptions internally.
get().startWatching(worktreePath)
} catch {
} catch (error) {
console.error('[FileTreeStore] Exception scanning files:', error, 'path:', worktreePath)
set((state) => {
const loadingMap = new Map(state.fileIndexLoadingByWorktree)
loadingMap.set(worktreePath, false)
Expand All @@ -145,6 +153,92 @@ export const useFileTreeStore = create<FileTreeState>()(
}
},

// Load and aggregate file index for a connection from all member worktrees
loadFileIndexForConnection: async (
connectionId: string,
members: Array<{ symlinkName: string; worktreePath: string }>
) => {
// Use connectionId as the key for the aggregated file list
const cacheKey = `connection:${connectionId}`

// Prevent duplicate concurrent loads
if (get().fileIndexLoadingByWorktree.get(cacheKey)) return

set((state) => {
const newMap = new Map(state.fileIndexLoadingByWorktree)
newMap.set(cacheKey, true)
return { fileIndexLoadingByWorktree: newMap }
})

try {
// Load files from all member worktrees in parallel
const filePromises = members.map((member) =>
window.fileTreeOps.scanFlat(member.worktreePath).then((result) => ({
member,
result
}))
)
const results = await Promise.all(filePromises)

// Aggregate all files from all member worktrees
// Prefix each file's relativePath with the member's symlink name
const aggregatedFiles: FlatFile[] = []
let hasFailures = false

results.forEach(({ member, result }) => {
if (result.success && result.files) {
// Prefix files with symlink name to disambiguate files with same names
const prefixedFiles = result.files.map((file) => ({
...file,
relativePath: `${member.symlinkName}/${file.relativePath}`
}))
aggregatedFiles.push(...prefixedFiles)
} else {
hasFailures = true
}
})

// Only store the index if we got at least some results
// If all scans failed and aggregatedFiles is empty, don't store it
// so the reference-equality guard (fileIndex === EMPTY_FILE_INDEX) will retry
if (aggregatedFiles.length === 0 && hasFailures) {
console.error(
`[FileTreeStore] All member scans failed for connection ${connectionId} - not storing empty index`
)
set((state) => {
const loadingMap = new Map(state.fileIndexLoadingByWorktree)
loadingMap.set(cacheKey, false)
return { fileIndexLoadingByWorktree: loadingMap }
})
return
Comment on lines +188 to +213
Copy link
Copy Markdown
Contributor

@greptile-apps greptile-apps bot Mar 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Partial member scan failures stored silently with no user feedback

hasFailures is only consulted to avoid writing a completely empty index (the aggregatedFiles.length === 0 && hasFailures guard). When at least one member succeeds but others fail, hasFailures is true yet execution falls through to store the partial result without any log or UI signal.

This means a connection with three member repos where one is unreachable will silently show only two-thirds of the expected files — the user has no way to know some members were skipped.

Consider logging a warning and/or returning a flag that the caller can use to surface an error banner:

if (hasFailures) {
  const failedCount = results.filter(({ result }) => !result.success).length
  console.warn(
    `[FileTreeStore] ${failedCount}/${members.length} member scans failed for connection ${connectionId} — index is partial`
  )
}

Returning the number of failures from this function (or accepting a callback) would also let SessionView display a partial-load warning alongside the existing connectionPathError banner.

}

// Remove duplicates based on prefixed relativePath
const uniqueFiles = Array.from(
new Map(aggregatedFiles.map((f) => [f.relativePath, f])).values()
)

set((state) => {
const indexMap = new Map(state.fileIndexByWorktree)
const loadingMap = new Map(state.fileIndexLoadingByWorktree)
indexMap.set(cacheKey, uniqueFiles)
loadingMap.set(cacheKey, false)
return { fileIndexByWorktree: indexMap, fileIndexLoadingByWorktree: loadingMap }
})

console.log(
`[FileTreeStore] Loaded ${uniqueFiles.length} files for connection ${connectionId} from ${members.length} members`
)
} catch (error) {
console.error('[FileTreeStore] Exception loading connection files:', error, 'connectionId:', connectionId)
set((state) => {
const loadingMap = new Map(state.fileIndexLoadingByWorktree)
loadingMap.set(cacheKey, false)
return { fileIndexLoadingByWorktree: loadingMap }
})
}
},
Comment on lines 153 to +240
Copy link
Copy Markdown
Contributor

@greptile-apps greptile-apps bot Mar 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Connection file index never stays fresh — no file watchers set up

loadFileIndexForConnection loads the aggregated index once but never subscribes to file-system changes. Compare with loadFileIndex, which calls get().startWatching(worktreePath) after loading — that subscription is what keeps the regular file index up to date as files are added/deleted.

Without calling startWatching for each member worktree, any file added, renamed, or deleted within a connection member's directory is invisible to the @ mention list until the user triggers a full session reload. For a "connection" feature that aggregates multiple active repos, this is likely to cause persistent confusion ("why isn't my new file showing up?").

Each member worktree should be watched, and the handleFileChange callback should map changes back to a re-scan/update of the aggregated connection:${connectionId} index:

// After the set() call that stores uniqueFiles…
for (const member of members) {
  get().startWatching(member.worktreePath)
}

Note that handleFileChange currently operates on a single worktreePath key and does incremental updates; for the connection case you'd either need to extend it or do a full re-scan (loadFileIndexForConnection) on any member change event.


// Lazy load children for a directory
loadChildren: async (worktreePath: string, dirPath: string) => {
try {
Expand Down