diff --git a/package-lock.json b/package-lock.json
index 49aac312dde..cec9cd2e05a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11966,9 +11966,10 @@
             }
         },
         "node_modules/@aws/mynah-ui": {
-            "version": "4.25.1",
+            "version": "4.26.0",
+            "resolved": "https://registry.npmjs.org/@aws/mynah-ui/-/mynah-ui-4.26.0.tgz",
+            "integrity": "sha512-hMdEKX07FO84XFFE+DzW+AJDbozLRU62cWofzZGsSAyrJIRTQlKfoo7ws3rECRqcgYIHtmyif/91ex7vo11byA==",
             "hasInstallScript": true,
-            "license": "Apache License 2.0",
             "dependencies": {
                 "escape-html": "^1.0.3",
                 "highlight.js": "^11.11.0",
@@ -26733,7 +26734,7 @@
                 "@aws-sdk/s3-request-presigner": "<3.696.0",
                 "@aws-sdk/smithy-client": "<3.696.0",
                 "@aws-sdk/util-arn-parser": "<3.696.0",
-                "@aws/mynah-ui": "^4.25.1",
+                "@aws/mynah-ui": "^4.26.0",
                 "@gerhobbelt/gitignore-parser": "^0.2.0-9",
                 "@iarna/toml": "^2.2.5",
                 "@smithy/fetch-http-handler": "^3.0.0",
diff --git a/packages/amazonq/.changes/next-release/Feature-5f829ea1-e33b-4687-bc6d-76ed1558cd7e.json b/packages/amazonq/.changes/next-release/Feature-5f829ea1-e33b-4687-bc6d-76ed1558cd7e.json
new file mode 100644
index 00000000000..52370b566ce
--- /dev/null
+++ b/packages/amazonq/.changes/next-release/Feature-5f829ea1-e33b-4687-bc6d-76ed1558cd7e.json
@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Add support for Code search in Q chat"
+}
diff --git a/packages/amazonq/test/unit/codewhispererChat/controllers/chat/chatRequest/converter.test.ts b/packages/amazonq/test/unit/codewhispererChat/controllers/chat/chatRequest/converter.test.ts
index d18b916229f..ea0c7889426 100644
--- a/packages/amazonq/test/unit/codewhispererChat/controllers/chat/chatRequest/converter.test.ts
+++ b/packages/amazonq/test/unit/codewhispererChat/controllers/chat/chatRequest/converter.test.ts
@@ -58,6 +58,8 @@ describe('triggerPayloadToChatRequest', () => {
             relativePath: 'path-prompt',
             type: 'prompt',
             innerContext: createLargeString(size, 'prompt-'),
+            startLine: 0,
+            endLine: 100,
         }
     }
 
@@ -68,6 +70,8 @@ describe('triggerPayloadToChatRequest', () => {
             relativePath: 'path-rule',
             type: 'rule',
             innerContext: createLargeString(size, 'rule-'),
+            startLine: 0,
+            endLine: 100,
         }
     }
 
@@ -78,6 +82,8 @@ describe('triggerPayloadToChatRequest', () => {
             relativePath: 'path-file',
             type: 'file',
             innerContext: createLargeString(size, 'file-'),
+            startLine: 0,
+            endLine: 100,
         }
     }
 
@@ -116,13 +122,23 @@ describe('triggerPayloadToChatRequest', () => {
         const payloadWithEmptyContents: TriggerPayload = {
             ...mockBasicPayload,
             additionalContents: [
-                { name: 'prompt1', description: 'prompt1', relativePath: 'path1', type: 'prompt', innerContext: '' },
+                {
+                    name: 'prompt1',
+                    description: 'prompt1',
+                    relativePath: 'path1',
+                    type: 'prompt',
+                    innerContext: '',
+                    startLine: 0,
+                    endLine: 100,
+                },
                 {
                     name: 'prompt2',
                     description: 'prompt2',
                     relativePath: 'path2',
                     type: 'prompt',
                     innerContext: 'valid content',
+                    startLine: 0,
+                    endLine: 100,
                 },
             ],
         }
diff --git a/packages/core/package.json b/packages/core/package.json
index 325f3256800..288d95fb8a6 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -522,7 +522,7 @@
         "@aws-sdk/s3-request-presigner": "<3.696.0",
         "@aws-sdk/smithy-client": "<3.696.0",
         "@aws-sdk/util-arn-parser": "<3.696.0",
-        "@aws/mynah-ui": "^4.25.1",
+        "@aws/mynah-ui": "^4.26.0",
         "@gerhobbelt/gitignore-parser": "^0.2.0-9",
         "@iarna/toml": "^2.2.5",
         "@smithy/fetch-http-handler": "^3.0.0",
diff --git a/packages/core/package.nls.json b/packages/core/package.nls.json
index 63b623d24a9..22d2ce3fc3b 100644
--- a/packages/core/package.nls.json
+++ b/packages/core/package.nls.json
@@ -330,6 +330,8 @@
     "AWS.amazonq.context.files.description": "Add a file to context",
     "AWS.amazonq.context.prompts.title": "Prompts",
     "AWS.amazonq.context.prompts.description": "Add a saved prompt to context",
+    "AWS.amazonq.context.code.title": "Code",
+    "AWS.amazonq.context.code.description": "Add code to context",
     "AWS.amazonq.savedPrompts.title": "Prompt name",
     "AWS.amazonq.savedPrompts.create": "Create",
     "AWS.amazonq.savedPrompts.action": "Create a new prompt",
diff --git a/packages/core/src/amazonq/lsp/config.ts b/packages/core/src/amazonq/lsp/config.ts
index 8557d3cff63..6731c8a4bb4 100644
--- a/packages/core/src/amazonq/lsp/config.ts
+++ b/packages/core/src/amazonq/lsp/config.ts
@@ -15,7 +15,7 @@ export interface LspConfig {
 
 export const defaultAmazonQWorkspaceLspConfig: LspConfig = {
     manifestUrl: 'https://aws-toolkit-language-servers.amazonaws.com/q-context/manifest.json',
-    supportedVersions: '0.1.42',
+    supportedVersions: '0.1.46',
     id: 'AmazonQ-Workspace', // used for identification in global storage/local disk location. Do not change.
     path: undefined,
 }
diff --git a/packages/core/src/amazonq/lsp/lspClient.ts b/packages/core/src/amazonq/lsp/lspClient.ts
index e895f0fa8c7..6b62208fe38 100644
--- a/packages/core/src/amazonq/lsp/lspClient.ts
+++ b/packages/core/src/amazonq/lsp/lspClient.ts
@@ -122,7 +122,7 @@ export class LspClient {
         }
     }
 
-    async updateIndex(filePath: string[], mode: 'update' | 'remove' | 'add') {
+    async updateIndex(filePath: string[], mode: 'update' | 'remove' | 'add' | 'context_command_symbol_update') {
         const payload: UpdateIndexV2RequestPayload = {
             filePaths: filePath,
             updateMode: mode,
diff --git a/packages/core/src/amazonq/lsp/lspController.ts b/packages/core/src/amazonq/lsp/lspController.ts
index a789d1dd5cb..f20a415b305 100644
--- a/packages/core/src/amazonq/lsp/lspController.ts
+++ b/packages/core/src/amazonq/lsp/lspController.ts
@@ -15,6 +15,7 @@ import { isAmazonInternalOs } from '../../shared/vscode/env'
 import { WorkspaceLspInstaller } from './workspaceInstaller'
 import { lspSetupStage } from '../../shared/lsp/utils/setupStage'
 import { RelevantTextDocumentAddition } from '../../codewhispererChat/controllers/chat/model'
+import { waitUntil } from '../../shared/utilities/timeoutUtils'
 
 export interface Chunk {
     readonly filePath: string
@@ -45,6 +46,7 @@ export interface BuildIndexConfig {
 export class LspController {
     static #instance: LspController
     private _isIndexingInProgress = false
+    private _contextCommandSymbolsUpdated = false
     private logger = getLogger('amazonqWorkspaceLsp')
 
     public static get instance() {
@@ -192,6 +194,38 @@ export class LspController {
             }
         })
     }
+    /**
+     * Updates context command symbols once per session by synchronizing with the LSP client index.
+     * Context menu will contain file and folders to begin with,
+     * then this asynchronous function should be invoked after the files and folders are found
+     * the LSP then further starts to parse workspace and find symbols, which takes
+     * anywhere from 5 seconds to about 40 seconds, depending on project size.
+     * @returns {Promise<void>}
+     */
+    async updateContextCommandSymbolsOnce() {
+        if (this._contextCommandSymbolsUpdated) {
+            return
+        }
+        this._contextCommandSymbolsUpdated = true
+        getLogger().debug(`LspController: Start adding symbols to context picker menu`)
+        try {
+            const indexSeqNum = await LspClient.instance.getIndexSequenceNumber()
+            await LspClient.instance.updateIndex([], 'context_command_symbol_update')
+            await waitUntil(
+                async () => {
+                    const newIndexSeqNum = await LspClient.instance.getIndexSequenceNumber()
+                    if (newIndexSeqNum > indexSeqNum) {
+                        await vscode.commands.executeCommand(`aws.amazonq.updateContextCommandItems`)
+                        return true
+                    }
+                    return false
+                },
+                { interval: 1000, timeout: 60_000, truthy: true }
+            )
+        } catch (err) {
+            getLogger().error(`LspController: Failed to find symbols`)
+        }
+    }
 
     private async setupLsp(context: vscode.ExtensionContext) {
         await lspSetupStage('all', async () => {
diff --git a/packages/core/src/amazonq/lsp/types.ts b/packages/core/src/amazonq/lsp/types.ts
index 1da8dfb00de..2940ce240c8 100644
--- a/packages/core/src/amazonq/lsp/types.ts
+++ b/packages/core/src/amazonq/lsp/types.ts
@@ -88,12 +88,44 @@ export const GetIndexSequenceNumberRequestType: RequestType<GetRepomapIndexJSONR
     'lsp/getIndexSequenceNumber'
 )
 
-export type ContextCommandItemType = 'file' | 'folder'
+export type ContextCommandItemType = 'file' | 'folder' | 'code'
+
+export type SymbolType =
+    | 'Class'
+    | 'Function'
+    | 'Interface'
+    | 'Type'
+    | 'Enum'
+    | 'Struct'
+    | 'Delegate'
+    | 'Namespace'
+    | 'Object'
+    | 'Module'
+    | 'Method'
+
+export interface Position {
+    line: number
+    column: number
+}
+export interface Span {
+    start: Position
+    end: Position
+}
+
+// LSP definition of DocumentSymbol
+
+export interface DocumentSymbol {
+    name: string
+    kind: SymbolType
+    range: Span
+}
 
 export interface ContextCommandItem {
     workspaceFolder: string
     type: ContextCommandItemType
     relativePath: string
+    symbol?: DocumentSymbol
+    id?: string
 }
 
 export type GetContextCommandPromptRequestPayload = {
diff --git a/packages/core/src/codewhispererChat/controllers/chat/controller.ts b/packages/core/src/codewhispererChat/controllers/chat/controller.ts
index 8bcc36d835d..7264bcece69 100644
--- a/packages/core/src/codewhispererChat/controllers/chat/controller.ts
+++ b/packages/core/src/codewhispererChat/controllers/chat/controller.ts
@@ -447,6 +447,17 @@ export class ChatController {
                         description: i18n('AWS.amazonq.context.files.description'),
                         icon: 'file' as MynahIconsType,
                     },
+                    {
+                        command: i18n('AWS.amazonq.context.code.title'),
+                        children: [
+                            {
+                                groupName: i18n('AWS.amazonq.context.code.title'),
+                                commands: [],
+                            },
+                        ],
+                        description: i18n('AWS.amazonq.context.code.description'),
+                        icon: 'code-block' as MynahIconsType,
+                    },
                     {
                         command: i18n('AWS.amazonq.context.prompts.title'),
                         children: [
@@ -471,7 +482,8 @@ export class ChatController {
                 commands: [{ command: commandName, description: commandDescription }],
             })
         }
-        const promptsCmd: QuickActionCommand = contextCommand[0].commands?.[3]
+        const symbolsCmd: QuickActionCommand = contextCommand[0].commands?.[3]
+        const promptsCmd: QuickActionCommand = contextCommand[0].commands?.[4]
 
         // Check for user prompts
         try {
@@ -514,22 +526,40 @@ export class ChatController {
                         command: path.basename(contextCommandItem.relativePath),
                         description: path.join(wsFolderName, contextCommandItem.relativePath),
                         route: [contextCommandItem.workspaceFolder, contextCommandItem.relativePath],
-                        id: 'file',
+                        label: 'file' as ContextCommandItemType,
+                        id: contextCommandItem.id,
                         icon: 'file' as MynahIconsType,
                     })
-                } else {
+                } else if (contextCommandItem.type === 'folder') {
                     folderCmd.children?.[0].commands.push({
                         command: path.basename(contextCommandItem.relativePath),
                         description: path.join(wsFolderName, contextCommandItem.relativePath),
                         route: [contextCommandItem.workspaceFolder, contextCommandItem.relativePath],
-                        id: 'folder',
+                        label: 'folder' as ContextCommandItemType,
+                        id: contextCommandItem.id,
                         icon: 'folder' as MynahIconsType,
                     })
                 }
+                // TODO: Remove the limit of 25k once the performance issue of mynahUI in webview is fixed.
+                else if (
+                    contextCommandItem.symbol &&
+                    symbolsCmd.children &&
+                    symbolsCmd.children[0].commands.length < 25_000
+                ) {
+                    symbolsCmd.children?.[0].commands.push({
+                        command: contextCommandItem.symbol.name,
+                        description: `${contextCommandItem.symbol.kind}, ${path.join(wsFolderName, contextCommandItem.relativePath)}, L${contextCommandItem.symbol.range.start.line}-${contextCommandItem.symbol.range.end.line}`,
+                        route: [contextCommandItem.workspaceFolder, contextCommandItem.relativePath],
+                        label: 'code' as ContextCommandItemType,
+                        id: contextCommandItem.id,
+                        icon: 'code-block' as MynahIconsType,
+                    })
+                }
             }
         }
 
         this.messenger.sendContextCommandData(contextCommand)
+        void LspController.instance.updateContextCommandSymbolsOnce()
     }
 
     private handlePromptCreate(tabID: string) {
@@ -951,13 +981,13 @@ export class ChatController {
         }
         triggerPayload.workspaceRulesCount = workspaceRules.length
 
-        // Add context commands added by user to context
         for (const context of triggerPayload.context) {
             if (typeof context !== 'string' && context.route && context.route.length === 2) {
                 contextCommands.push({
                     workspaceFolder: context.route[0] || '',
-                    type: context.icon === 'folder' ? 'folder' : 'file',
+                    type: (context.label || '') as ContextCommandItemType,
                     relativePath: context.route[1] || '',
+                    id: context.id,
                 })
             }
         }
@@ -972,11 +1002,7 @@ export class ChatController {
         workspaceFolders.sort()
         const workspaceFolder = workspaceFolders[0]
         for (const contextCommand of contextCommands) {
-            const relativePath = path.relative(
-                workspaceFolder,
-                path.join(contextCommand.workspaceFolder, contextCommand.relativePath)
-            )
-            session.relativePathToWorkspaceRoot.set(relativePath, contextCommand.workspaceFolder)
+            session.relativePathToWorkspaceRoot.set(contextCommand.workspaceFolder, contextCommand.workspaceFolder)
         }
         let prompts: AdditionalContextPrompt[] = []
         try {
@@ -1006,6 +1032,8 @@ export class ChatController {
                 innerContext: prompt.content.substring(0, additionalContentInnerContextLimit),
                 type: contextType,
                 relativePath: relativePath,
+                startLine: prompt.startLine,
+                endLine: prompt.endLine,
             }
 
             triggerPayload.additionalContents.push(entry)
@@ -1094,7 +1122,10 @@ export class ChatController {
             if (!relativePathsOfMergedRelevantDocuments.includes(relativePath) && !seen.includes(relativePath)) {
                 triggerPayload.documentReferences.push({
                     relativeFilePath: relativePath,
-                    lineRanges: [{ first: -1, second: -1 }],
+                    lineRanges:
+                        additionalContent.name === 'symbol'
+                            ? [{ first: additionalContent.startLine, second: additionalContent.endLine }]
+                            : [{ first: -1, second: -1 }],
                 })
                 seen.push(relativePath)
             }
diff --git a/packages/core/src/codewhispererChat/controllers/chat/model.ts b/packages/core/src/codewhispererChat/controllers/chat/model.ts
index 92878c515d9..8e13360a486 100644
--- a/packages/core/src/codewhispererChat/controllers/chat/model.ts
+++ b/packages/core/src/codewhispererChat/controllers/chat/model.ts
@@ -223,10 +223,12 @@ export type AdditionalContextInfo = {
     cwsprChatHasProjectContext?: boolean
 }
 
+export type LineInfo = { startLine: number; endLine: number }
+
 // TODO move this to API definition (or just use this across the codebase)
-export type RelevantTextDocumentAddition = RelevantTextDocument & { startLine: number; endLine: number }
+export type RelevantTextDocumentAddition = RelevantTextDocument & LineInfo
 
-export type AdditionalContentEntryAddition = AdditionalContentEntry & { type: string; relativePath: string }
+export type AdditionalContentEntryAddition = AdditionalContentEntry & { type: string; relativePath: string } & LineInfo
 
 export interface DocumentReference {
     readonly relativeFilePath: string