Skip to content

fix terminal output broken in collapsible mode #302634

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

Draft
justschen wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix terminal output broken in collapsible mode #302634

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 12 additions & 2 deletions .../chat/browser/widget/chatContentParts/toolInvocationParts/chatTerminalToolProgressPart.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,9 +434,10 @@ export class ChatTerminalToolProgressPart extends BaseChatToolInvocationSubPart

this._renderImagePills(toolInvocation, context, elements.container);

// Only auto-expand in thinking containers if there's actual output to show
// Auto-expand output in collapsible wrappers if there's actual stored output to show.
// This covers both thinking containers and simple terminal mode on restore.
const hasStoredOutput = !!terminalData.terminalCommandOutput;
if (expandedStateByInvocation.get(toolInvocation) || (this._isInThinkingContainer && IChatToolInvocation.isComplete(toolInvocation) && hasStoredOutput)) {
if (expandedStateByInvocation.get(toolInvocation) || (this._usesCollapsibleWrapper && IChatToolInvocation.isComplete(toolInvocation) && hasStoredOutput)) {
void this._toggleOutput(true);
}
this._register(this._terminalChatService.registerProgressPart(this));
Expand Down Expand Up @@ -724,6 +725,11 @@ export class ChatTerminalToolProgressPart extends BaseChatToolInvocationSubPart
const tryResolveCommand = async (): Promise<ITerminalCommand | undefined> => {
const resolvedCommand = this._resolveCommand(terminalInstance);
this._addActions(terminalInstance, this._terminalData.terminalToolSessionId);
// In collapsible wrapper mode, sync output with the wrapper now that command
// is resolved. Deferred from construction because the command isn't available yet.
if (resolvedCommand && this._usesCollapsibleWrapper && !this._outputView.isExpanded && this._thinkingCollapsibleWrapper?.expanded.get()) {
this._toggleOutput(true);
Comment on lines +730 to +731
}
return resolvedCommand;
};

Expand Down Expand Up @@ -783,6 +789,10 @@ export class ChatTerminalToolProgressPart extends BaseChatToolInvocationSubPart

store.add(commandDetection.onCommandExecuted(() => {
this._addActions(terminalInstance, this._terminalData.terminalToolSessionId);
// Sync collapsible wrapper output now that the command is detected
if (this._usesCollapsibleWrapper && !this._outputView.isExpanded && this._thinkingCollapsibleWrapper?.expanded.get()) {
this._toggleOutput(true);
}
}));

store.add(commandDetection.onCommandFinished(() => {
Expand Down
Loading