Skip to content

Commit d5211b7

Browse files
authored
chore: updated q feature dev name strings (#5004)
* Updated Q feature dev name * added changelog * Revert "added changelog" This reverts commit 9439145.
1 parent 143b29e commit d5211b7

File tree

4 files changed

+31
-20
lines changed

4 files changed

+31
-20
lines changed

packages/core/src/amazonqFeatureDev/constants.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export const featureDevScheme = 'aws-featureDev'
1212
// For uniquely identifiying which chat messages should be routed to FeatureDev
1313
export const featureDevChat = 'featureDevChat'
1414

15-
export const featureName = 'Amazon Q feature development'
15+
export const featureName = 'Amazon Q Developer Agent for software development'
1616

1717
// Max allowed size for file collection
1818
export const maxRepoSizeBytes = 200 * 1024 * 1024

packages/core/src/amazonqFeatureDev/controllers/chat/controller.ts

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import {
1717
MonthlyConversationLimitError,
1818
PlanIterationLimitError,
1919
SelectedFolderNotInWorkspaceFolderError,
20+
WorkspaceFolderNotFoundError,
2021
createUserFacingErrorMessage,
2122
} from '../../errors'
2223
import { defaultRetryLimit } from '../../limits'
@@ -320,7 +321,7 @@ export class FeatureDevController {
320321
private async onApproachGeneration(session: Session, message: string, tabID: string) {
321322
await session.preloader(message)
322323

323-
getLogger().info(`Q - Dev Chat conversation id: ${session.conversationId}`)
324+
getLogger().info(`${featureName} conversation id: ${session.conversationId}`)
324325

325326
this.messenger.sendAnswer({
326327
type: 'answer',
@@ -440,7 +441,7 @@ export class FeatureDevController {
440441
if (!this.isAmazonQVisible) {
441442
const open = 'Open chat'
442443
const resp = await vscode.window.showInformationMessage(
443-
'Your code suggestions from Amazon Q are ready to review',
444+
'The Amazon Q Developer Agent for software development has generated code for you to review',
444445
open
445446
)
446447
if (resp === open) {
@@ -753,13 +754,22 @@ export class FeatureDevController {
753754
return
754755
}
755756
} catch (err: any) {
756-
this.messenger.sendErrorMessage(
757-
createUserFacingErrorMessage(err.message),
758-
message.tabID,
759-
this.retriesRemaining(session),
760-
session?.state.phase,
761-
session?.conversationIdUnsafe
762-
)
757+
if (err instanceof WorkspaceFolderNotFoundError) {
758+
this.messenger.sendAnswer({
759+
type: 'answer',
760+
tabID: message.tabID,
761+
message: err.message,
762+
})
763+
this.messenger.sendChatInputEnabled(message.tabID, false)
764+
} else {
765+
this.messenger.sendErrorMessage(
766+
createUserFacingErrorMessage(err.message),
767+
message.tabID,
768+
this.retriesRemaining(session),
769+
session?.state.phase,
770+
session?.conversationIdUnsafe
771+
)
772+
}
763773
}
764774
}
765775

packages/core/src/amazonqFeatureDev/controllers/chat/messenger/messenger.ts

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,11 @@ export class Messenger {
6565
const conversationIdText = conversationId ? `\n\nConversation ID: **${conversationId}**` : ''
6666

6767
if (retries === 0) {
68-
this.dispatcher.sendErrorMessage(
69-
new ErrorMessage(
70-
`Sorry, we're unable to provide a response at this time. Please try again later or share feedback with our team to help us troubleshoot.`,
71-
errorMessage + conversationIdText,
72-
tabID
73-
)
74-
)
68+
this.sendAnswer({
69+
type: 'answer',
70+
tabID: tabID,
71+
message: `I'm sorry, I'm having technical difficulties and can't continue at the moment. Please try again later, and share feedback to help me improve.`,
72+
})
7573
this.sendAnswer({
7674
message: undefined,
7775
type: 'system-prompt',

packages/core/src/amazonqFeatureDev/errors.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,12 @@ export class PanelLoadError extends ToolkitError {
2727

2828
export class WorkspaceFolderNotFoundError extends ToolkitError {
2929
constructor() {
30-
super(`Workspace folder was not found. Open a workspace to continue using ${featureName}`, {
31-
code: 'WorkspaceFolderNotFound',
32-
})
30+
super(
31+
`I couldn't find a workspace folder. Open a workspace, and then open a new chat tab and enter /dev to start discussing your code task with me.`,
32+
{
33+
code: 'WorkspaceFolderNotFound',
34+
}
35+
)
3336
}
3437
}
3538

0 commit comments

Comments
 (0)