Skip to content

fix(chat): Use shell icon in shell command header #6974

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

Merged
merged 1 commit into from
Apr 9, 2025
+4 −16
Merged

fix(chat): Use shell icon in shell command header #6974

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions packages/core/src/amazonq/webview/ui/apps/cwChatConnector.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ export class Connector extends BaseConnector {
break
case 'run-shell-command':
answer.header = {
icon: 'code-block' as MynahIconsType,
icon: 'shell' as MynahIconsType,
body: 'shell',
status: {
icon: 'ok' as MynahIconsType,
Expand All @@ -372,7 +372,7 @@ export class Connector extends BaseConnector {
break
case 'reject-shell-command':
answer.header = {
icon: 'code-block' as MynahIconsType,
icon: 'shell' as MynahIconsType,
body: 'shell',
status: {
icon: 'cancel' as MynahIconsType,
Expand Down
3 changes: 0 additions & 3 deletions packages/core/src/codewhispererChat/controllers/chat/controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -812,10 +812,7 @@ export class ChatController {
getLogger().error(
`toolUse name: ${currentToolUse!.name} of toolUseWithError in the stored session doesn't match when click shell command reject button.`
)
return
}

await this.generateStaticTextResponse('reject-shell-command', triggerId)
}

private async processCustomFormAction(message: CustomFormActionMessage) {
Expand Down
13 changes: 2 additions & 11 deletions packages/core/src/codewhispererChat/controllers/chat/messenger/messenger.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,7 @@ import { AsyncEventProgressMessage } from '../../../../amazonq/commons/connector
import { localize } from '../../../../shared/utilities/vsCodeUtils'
import { getDiffLinesFromChanges } from '../../../../shared/utilities/diffUtils'

export type StaticTextResponseType =
| 'quick-action-help'
| 'onboarding-help'
| 'transform'
| 'help'
| 'reject-shell-command'
export type StaticTextResponseType = 'quick-action-help' | 'onboarding-help' | 'transform' | 'help'

export type MessengerResponseType = {
$metadata: { requestId?: string; httpStatusCode?: number }
Expand Down Expand Up @@ -555,7 +550,7 @@ export class Messenger {
},
]
header = {
icon: 'code-block' as MynahIconsType,
icon: 'shell' as MynahIconsType,
body: 'shell',
buttons,
}
Expand Down Expand Up @@ -676,10 +671,6 @@ export class Messenger {
]
followUpsHeader = 'Try Examples:'
break
case 'reject-shell-command':
// need to update the string later
message = 'The shell command execution rejected. Abort.'
break
}

this.dispatcher.sendChatMessage(
Expand Down
Loading