diff --git a/bun.lock b/bun.lock
index 094ab342..9ec4e195 100644
--- a/bun.lock
+++ b/bun.lock
@@ -7,7 +7,9 @@
       "dependencies": {
         "@codemirror/autocomplete": "^6.20.0",
         "@codemirror/commands": "^6.10.1",
+        "@codemirror/lang-cpp": "^6.0.3",
         "@codemirror/lang-css": "^6.3.1",
+        "@codemirror/lang-go": "^6.0.1",
         "@codemirror/lang-html": "^6.4.11",
         "@codemirror/lang-javascript": "^6.2.4",
         "@codemirror/lang-json": "^6.0.2",
@@ -95,7 +97,7 @@
     },
     "packages/desktop": {
       "name": "@openchamber/desktop",
-      "version": "1.6.9",
+      "version": "1.7.3",
       "devDependencies": {
         "@tauri-apps/cli": "^2",
         "@types/node": "^24.3.1",
@@ -104,11 +106,13 @@
     },
     "packages/ui": {
       "name": "@openchamber/ui",
-      "version": "1.6.9",
+      "version": "1.7.3",
       "dependencies": {
         "@codemirror/autocomplete": "^6.20.0",
         "@codemirror/commands": "^6.10.1",
+        "@codemirror/lang-cpp": "^6.0.3",
         "@codemirror/lang-css": "^6.3.1",
+        "@codemirror/lang-go": "^6.0.1",
         "@codemirror/lang-html": "^6.4.11",
         "@codemirror/lang-javascript": "^6.2.4",
         "@codemirror/lang-json": "^6.0.2",
@@ -200,7 +204,7 @@
     },
     "packages/vscode": {
       "name": "openchamber",
-      "version": "1.6.9",
+      "version": "1.7.3",
       "dependencies": {
         "@openchamber/ui": "workspace:*",
         "@opencode-ai/sdk": "^1.2.5",
@@ -223,7 +227,7 @@
     },
     "packages/web": {
       "name": "@openchamber/web",
-      "version": "1.6.9",
+      "version": "1.7.3",
       "bin": {
         "openchamber": "./bin/cli.js",
       },
diff --git a/package.json b/package.json
index db4af5dd..fd6d89ab 100644
--- a/package.json
+++ b/package.json
@@ -67,6 +67,8 @@
     "@codemirror/lang-markdown": "^6.5.0",
     "@codemirror/lang-python": "^6.2.1",
     "@codemirror/lang-rust": "^6.0.2",
+    "@codemirror/lang-cpp": "^6.0.3",
+    "@codemirror/lang-go": "^6.0.1",
     "@codemirror/lang-sql": "^6.10.0",
     "@codemirror/lang-xml": "^6.1.0",
     "@codemirror/lang-yaml": "^6.1.2",
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 37a92ccb..41e1a256 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -20,6 +20,8 @@
     "@codemirror/lang-markdown": "^6.5.0",
     "@codemirror/lang-python": "^6.2.1",
     "@codemirror/lang-rust": "^6.0.2",
+    "@codemirror/lang-cpp": "^6.0.3",
+    "@codemirror/lang-go": "^6.0.1",
     "@codemirror/lang-sql": "^6.10.0",
     "@codemirror/lang-xml": "^6.1.0",
     "@codemirror/lang-yaml": "^6.1.2",
diff --git a/packages/ui/src/lib/codemirror/languageByExtension.ts b/packages/ui/src/lib/codemirror/languageByExtension.ts
index 608532f2..50651862 100644
--- a/packages/ui/src/lib/codemirror/languageByExtension.ts
+++ b/packages/ui/src/lib/codemirror/languageByExtension.ts
@@ -12,6 +12,8 @@ import { xml } from '@codemirror/lang-xml';
 import { yaml as yamlLanguage } from '@codemirror/lang-yaml';
 import { rust } from '@codemirror/lang-rust';
 import { elixir } from 'codemirror-lang-elixir';
+import { cpp } from '@codemirror/lang-cpp';
+import { go } from '@codemirror/lang-go';
 
 import { Language, LanguageDescription, StreamLanguage, HighlightStyle, syntaxHighlighting } from '@codemirror/language';
 import { tags as t } from '@lezer/highlight';
@@ -81,6 +83,13 @@ function codeBlockLanguageResolver(info: string): Language | LanguageDescription
     case 'rs':
     case 'rust':
       return rust().language;
+    case 'c':
+    case 'cpp':
+    case 'h':
+    case 'hpp':
+      return cpp().language;
+    case 'go':
+      return go().language;
     case 'ex':
     case 'exs':
     case 'elixir':
@@ -210,6 +219,13 @@ export function languageByExtension(filePath: string): Extension | null {
       return xml();
     case 'rs':
       return rust();
+    case 'c':
+    case 'cpp':
+    case 'h':
+    case 'hpp':
+      return cpp();
+    case 'go':
+      return go();
 
     // Legacy modes
     case 'rb':