fix(amazonq): codewhisperer manual trigger not working in Q (#4716)

* fix manual trigger not working in q

* rm hack

Author: leigaol

packages/core/src/shared/vscode/commands2.ts

@@ -15,6 +15,7 @@ import { ToolkitError } from '../errors'
 import crypto from 'crypto'
 import { keysAsInt } from '../utilities/tsUtils'
 import { partialClone } from '../utilities/collectionUtils'
+import { VSCODE_EXTENSION_ID } from '../utilities'
 
 type Callback = (...args: any[]) => any
 type CommandFactory<T extends Callback, U extends any[]> = (...parameters: U) => T
@@ -635,8 +636,8 @@ async function runCommand<T extends Callback>(fn: T, info: CommandInfo<T>): Prom
 
     try {
         if (info.autoconnect === true) {
-            // HACK: this only occurs for the explorer case, which is in toolkit
-            await vscode.commands.executeCommand('_aws.toolkit.auth.autoConnect')
+            const prefix = globals.context.extension.id === VSCODE_EXTENSION_ID.amazonq ? 'amazonq' : 'toolkit'
+            await vscode.commands.executeCommand(`_aws.${prefix}.auth.autoConnect`)
         }
 
         return await (instrumenter ? instrumenter(fn, ...args) : fn(...args))