Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-17 23:35:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

when thinking is collapsed, make sure to show full tool info (#300952)

Browse Source 
* /yolo -> switches to bypass mode, /autopilot switches to autopilot

* in collapsed mode, make sure headers are updated with more info

* Revert "in collapsed mode, make sure headers are updated with more info"

This reverts commit 104db3926e.

* Revert "/yolo -> switches to bypass mode, /autopilot switches to autopilot"

This reverts commit ded22eca4b.

* in collapsed mode, make sure headers are updated with more info

* better todos and fix comments
This commit is contained in:
Justin Chen
2026-03-11 18:00:52 -07:00
committed by GitHub
parent b8b027b4fd
commit 99c4016d8e
3 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/workbench/contrib/chat/common/model/chatProgressTypes/chatToolInvocation.ts
View File

@@ -74,7 +74,7 @@ export class ChatToolInvocation implements IChatToolInvocation {
// For streaming invocations, use a default message until handleToolStream provides one
let defaultMessage: string | IMarkdownString = '';
if (startOptions.startInStreaming) {
defaultMessage = localize('toolInvocationMessage', "Using \"{0}\"", toolData.displayName);
defaultMessage = toolData.displayName;
} else if (startOptions.startInCancelled) {
defaultMessage = startOptions.cancelReasonMessage ?? localize('toolDeniedMessage', "Tool \"{0}\" was denied", toolData.displayName);
}

4
src/vs/workbench/contrib/chat/common/tools/builtinTools/manageTodoListTool.ts
View File

@@ -157,7 +157,11 @@ export class ManageTodoListTool extends Disposable implements IToolImpl {
status: todo.status
}));
const invocationLabel = message?.replace(/^(Starting|Completed): /i, '') ?? localize('todo.updatingList', "Updating todo list");
const invocationMessage = new MarkdownString(invocationLabel);
return {
invocationMessage,
pastTenseMessage: new MarkdownString(message ?? localize('todo.updatedList', "Updated todo list")),
toolSpecificData: {
kind: 'todoList',

28
src/vs/workbench/contrib/terminalContrib/chatAgentTools/browser/tools/runInTerminalTool.ts
View File

@@ -26,7 +26,7 @@ import { ITerminalLogService, ITerminalProfile } from '../../../../../../platfor
import { IRemoteAgentService } from '../../../../../services/remote/common/remoteAgentService.js';
import { TerminalToolConfirmationStorageKeys } from '../../../../chat/browser/widget/chatContentParts/toolInvocationParts/chatTerminalToolConfirmationSubPart.js';
import { IChatService, type IChatTerminalToolInvocationData } from '../../../../chat/common/chatService/chatService.js';
import { CountTokensCallback, ILanguageModelToolsService, IPreparedToolInvocation, IToolData, IToolImpl, IToolInvocation, IToolInvocationPreparationContext, IToolResult, ToolDataSource, ToolInvocationPresentation, ToolProgress } from '../../../../chat/common/tools/languageModelToolsService.js';
import { CountTokensCallback, ILanguageModelToolsService, IPreparedToolInvocation, IStreamedToolInvocation, IToolData, IToolImpl, IToolInvocation, IToolInvocationPreparationContext, IToolInvocationStreamContext, IToolResult, ToolDataSource, ToolInvocationPresentation, ToolProgress } from '../../../../chat/common/tools/languageModelToolsService.js';
import { ITerminalChatService, ITerminalService, type ITerminalInstance } from '../../../../terminal/browser/terminal.js';
import { ITerminalProfileResolverService } from '../../../../terminal/common/terminal.js';
import { TerminalChatAgentToolsSettingId } from '../../common/terminalChatAgentToolsConfiguration.js';
@@ -437,6 +437,22 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
}
async handleToolStream(context: IToolInvocationStreamContext, _token: CancellationToken): Promise<IStreamedToolInvocation | undefined> {
const partialInput = context.rawInput as Partial<IRunInTerminalInputParams> | undefined;
if (partialInput && typeof partialInput === 'object' && partialInput.command) {
const normalizedCommand = partialInput.command.replace(/\r\n|\r|\n/g, ' ');
const truncatedCommand = normalizedCommand.length > 80
? normalizedCommand.substring(0, 77) + '...'
: normalizedCommand;
const escapedCommand = escapeMarkdownSyntaxTokens(truncatedCommand);
const invocationMessage = partialInput.isBackground
? new MarkdownString(localize('runInTerminal.streaming.background', "Running `{0}` in background", escapedCommand))
: new MarkdownString(localize('runInTerminal.streaming', "Running `{0}`", escapedCommand));
return { invocationMessage };
}
return { invocationMessage: localize('runInTerminal.streaming.default', "Running command") };
}
async prepareToolInvocation(context: IToolInvocationPreparationContext, token: CancellationToken): Promise<IPreparedToolInvocation | undefined> {
const args = context.parameters as IRunInTerminalInputParams;
@@ -684,7 +700,17 @@ export class RunInTerminalTool extends Disposable implements IToolImpl {
terminalCustomActions: customActions,
} : undefined;
const rawDisplayCommand = toolSpecificData.commandLine.toolEdited ?? toolSpecificData.commandLine.original;
const displayCommand = rawDisplayCommand.length > 80
? rawDisplayCommand.substring(0, 77) + '...'
: rawDisplayCommand;
const escapedDisplayCommand = escapeMarkdownSyntaxTokens(displayCommand);
const invocationMessage = args.isBackground
? new MarkdownString(localize('runInTerminal.invocation.background', "Running `{0}` in background", escapedDisplayCommand))
: new MarkdownString(localize('runInTerminal.invocation', "Running `{0}`", escapedDisplayCommand));
return {
invocationMessage,
confirmationMessages,
toolSpecificData,
};