+
{
+ if (isDropdown) { setIsOpen(v => !v); }
+ if (onClick) { onClick(); }
+ }}
+ >
+ {isDropdown && ({title}
- {desc1}
+ {desc1}
{/* right */}
@@ -1865,28 +1869,266 @@ const ChatBubble = ({ chatMessage, isCommitted, messageIdx, isLast, chatIsRunnin
+export const AcceptAllButtonWrapper = ({ text, onClick, className }: { text: string, onClick: () => void, className?: string }) => (
+
+ {text ? {text} :
+)
+
+export const RejectAllButtonWrapper = ({ text, onClick, className }: { text: string, onClick: () => void, className?: string }) => (
+
+ {text ? {text} :
+)
+
+
+
const CommandBarInChat = () => {
- const { state: commandBarState, sortedURIs: sortedCommandBarURIs } = useCommandBarState()
- const [isExpanded, setIsExpanded] = useState(false)
+ const { stateOfURI: commandBarStateOfURI, sortedURIs: sortedCommandBarURIs } = useCommandBarState()
+ const numFilesChanged = sortedCommandBarURIs.length
const accessor = useAccessor()
+ const editCodeService = accessor.get('IEditCodeService')
const commandService = accessor.get('ICommandService')
+ const chatThreadsState = useChatThreadsState()
+ const chatThreadsStreamState = useChatThreadsStreamState(chatThreadsState.currentThreadId)
- if (!sortedCommandBarURIs || sortedCommandBarURIs.length === 0) {
- return null
- }
+ const [isFileDetailsOpened, setFileDetailsOpened] = useState(false);
+
+ // close the file details if there are no files
+ useEffect(() => {
+ if (isFileDetailsOpened && numFilesChanged === 0) {
+ setFileDetailsOpened(false)
+ }
+ }, [isFileDetailsOpened, numFilesChanged, setFileDetailsOpened])
+
+
+ const isFinishedMakingThreadChanges = chatThreadsStreamState && !chatThreadsStreamState.isRunning && numFilesChanged !== 0
+
+ // ======== status of agent ========
+ // This icon answers the question "is the LLM doing work on this thread?"
+ // assume it is single threaded for now
+ // green = Running
+ // orange = Requires action
+ // dark = Done
+
+ const threadStatus = (
+ chatThreadsStreamState?.isRunning === 'awaiting_user' ? { title: 'Needs Approval', color: 'orange', } as const
+ : chatThreadsStreamState?.isRunning ? { title: 'Running', color: 'green', } as const
+ : { title: 'Done', color: 'dark', } as const
+ )
+
+
+ const threadStatusHTML =
+
+
+ // ======== info about changes ========
+ // num files changed
+ // acceptall + rejectall
+ // popup info about each change (each with num changes + acceptall + rejectall of their own)
+
+ const numFilesChangedStr = numFilesChanged === 0 ? 'No files with changes'
+ : `${sortedCommandBarURIs.length} file${numFilesChanged === 1 ? '' : 's'} changed`
+
+ const acceptAllButton = (
+
{
+ sortedCommandBarURIs.forEach(uri => {
+ editCodeService.acceptOrRejectAllDiffAreas({
+ uri,
+ removeCtrlKs: true,
+ behavior: "accept",
+ _addToHistory: true,
+ })
+ })
+ }}
+ />
+ )
+
+ const rejectAllButton = (
+ {
+ sortedCommandBarURIs.forEach(uri => {
+ editCodeService.acceptOrRejectAllDiffAreas({
+ uri,
+ removeCtrlKs: true,
+ behavior: "reject",
+ _addToHistory: true,
+ })
+ })
+ }}
+ />
+ )
+
+
+ const acceptRejectAllButtons = isFinishedMakingThreadChanges &&
+ {acceptAllButton}
+ {rejectAllButton}
+
+
+
+ // !select-text cursor-auto
+ const fileDetailsContent =
+ {sortedCommandBarURIs.map((uri, i) => {
+ const basename = getBasename(uri.fsPath)
+
+ const { sortedDiffIds, isStreaming } = commandBarStateOfURI[uri.fsPath] ?? {}
+ const isFinishedMakingFileChanges = !isStreaming
+
+ const numDiffs = sortedDiffIds?.length || 0
+
+ const fileStatus = (isFinishedMakingFileChanges
+ ? { title: 'Done', color: 'dark', } as const
+ : { title: 'Running', color: 'green', } as const
+ )
+
+ const acceptButton =
{ editCodeService.acceptOrRejectAllDiffAreas({ uri, removeCtrlKs: true, behavior: "accept", _addToHistory: true, }) }}
+ />
+
+ const rejectButton = { editCodeService.acceptOrRejectAllDiffAreas({ uri, removeCtrlKs: true, behavior: "reject", _addToHistory: true, }) }}
+ />
+
+ const fileNameHTML = commandService.executeCommand('vscode.open', uri, { preview: true })}
+ >
+ {basename}
+
+
+ const detailsContent = <>
+ {numDiffs} change{numDiffs !== 1 ? 's' : ''}
+
+
+ const acceptRejectButtons = isFinishedMakingFileChanges &&
+ {acceptButton}
+ {rejectButton}
+
+
+ const fileStatusHTML =
+
+ {fileNameHTML}
+ {detailsContent}
+
+
+ {acceptRejectButtons}
+ {fileStatusHTML}
+
+
setFileDetailsOpened(!isFileDetailsOpened)}
+ type='button'
+ disabled={numFilesChanged === 0}
+ >
+
+ )
+
+
+ const changesContent = <>
+ {/*
+
{'chatThreadsStreamState' + chatThreadsStreamState}
+
{'isRunning' + chatThreadsStreamState?.isRunning}
+
{'isFinishedWithChanges' + isFinishedMakingThreadChanges}
+
- {sortedCommandBarURIs.map((uri, i) => (
- { commandService.executeCommand('vscode.open', uri, { preview: true }) }}
- />
- ))}
-
+ <>
+ {/* file details */}
+
+
+ {fileDetailsContent}
+
+
+
+ {changesContent}
+
+
+ {acceptRejectAllButtons}
+ {threadStatusHTML}
+
+
-
{ textAreaRef.current?.focus() }}
+ const inputForm =
+
+ {previousMessages.length > 0 &&
+
+
- { chatThreadsService.setCurrentlyFocusedMessageIdx(undefined) }}
- ref={textAreaRef}
- fnsRef={textAreaFnsRef}
- multiline={true}
- />
+ { textAreaRef.current?.focus() }}
+ >
+ { chatThreadsService.setCurrentlyFocusedMessageIdx(undefined) }}
+ ref={textAreaRef}
+ fnsRef={textAreaFnsRef}
+ multiline={true}
+ />
-
+
+
+ // Accept File
+ //
+
+ // const rejectAllButton =
+ // Reject File
+ //
+
+ const acceptAllButton =
- Accept File
-
+ />
-
- const rejectAllButton =
- Reject File
-
+ />
const acceptRejectAllButtons =
{acceptAllButton}