diff --git a/packages/amazonq/.changes/next-release/Feature-d86356a0-bc42-4187-a7f8-205afbc25d76.json b/packages/amazonq/.changes/next-release/Feature-d86356a0-bc42-4187-a7f8-205afbc25d76.json
new file mode 100644
index 00000000000..510dd1c150d
--- /dev/null
+++ b/packages/amazonq/.changes/next-release/Feature-d86356a0-bc42-4187-a7f8-205afbc25d76.json
@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Amazon Q /dev: support `.hbs`, `.gjs`, `.gts`, `.astro`, `.mdx`, `.svelte`, `.erb`, `.rake` files"
+}
diff --git a/packages/core/src/shared/filetypes.ts b/packages/core/src/shared/filetypes.ts
index 843397e6a17..9457592c8b2 100644
--- a/packages/core/src/shared/filetypes.ts
+++ b/packages/core/src/shared/filetypes.ts
@@ -155,6 +155,7 @@ export const codefileExtensions = new Set([
     '.ads',
     '.apl',
     '.asm',
+    '.astro',
     '.awk',
     '.b',
     '.bas',
@@ -195,6 +196,7 @@ export const codefileExtensions = new Set([
     '.el',
     '.elm',
     '.env',
+    '.erb',
     '.erl',
     '.ex',
     '.exs',
@@ -211,6 +213,7 @@ export const codefileExtensions = new Set([
     '.fsx',
     '.gd',
     '.gitignore',
+    '.gjs',
     '.go',
     '.gql',
     '.gradle',
@@ -220,9 +223,11 @@ export const codefileExtensions = new Set([
     '.gsp',
     '.gst',
     '.gsx',
+    '.gts',
     '.gvy',
     '.h',
     '.hack',
+    '.hbs',
     '.hh',
     '.hpp',
     '.hrl',
@@ -253,6 +258,7 @@ export const codefileExtensions = new Set([
     '.mak',
     '.makefile',
     '.md',
+    '.mdx',
     '.mjs',
     '.ml',
     '.mli',
@@ -289,6 +295,7 @@ export const codefileExtensions = new Set([
     '.pyw',
     '.qs',
     '.r',
+    '.rake',
     '.raku',
     '.rakumod',
     '.rakutest',
@@ -331,6 +338,7 @@ export const codefileExtensions = new Set([
     '.ss',
     '.st',
     '.sv',
+    '.svelte',
     '.svg',
     '.swift',
     '.t',