diff --git a/archon-ui-main/src/components/settings/IDEGlobalRules.tsx b/archon-ui-main/src/components/settings/IDEGlobalRules.tsx
index 0221e78c..a837e118 100644
--- a/archon-ui-main/src/components/settings/IDEGlobalRules.tsx
+++ b/archon-ui-main/src/components/settings/IDEGlobalRules.tsx
@@ -555,6 +555,7 @@ archon:manage_task(
           </p>
           <ul className="text-sm text-gray-600 dark:text-gray-400 mt-2 ml-4 list-disc">
             <li><strong>Claude Code:</strong> Create a CLAUDE.md file in your project root</li>
+            <li><strong>Gemini CLI:</strong> Create a GEMINI.md file in your project root</li>
             <li><strong>Cursor:</strong> Create .cursorrules file or add to Settings → Rules</li>
             <li><strong>Windsurf:</strong> Create .windsurfrules file in project root</li>
             <li><strong>Other IDEs:</strong> Add to your IDE's AI assistant configuration</li>
diff --git a/archon-ui-main/src/pages/MCPPage.tsx b/archon-ui-main/src/pages/MCPPage.tsx
index b25cf976..ea8d1ac8 100644
--- a/archon-ui-main/src/pages/MCPPage.tsx
+++ b/archon-ui-main/src/pages/MCPPage.tsx
@@ -10,7 +10,7 @@ import { IDEGlobalRules } from '../components/settings/IDEGlobalRules';
 // import { MCPClients } from '../components/mcp/MCPClients'; // Commented out - feature not implemented
 
 // Supported IDE/Agent types
-type SupportedIDE = 'windsurf' | 'cursor' | 'claudecode' | 'cline' | 'kiro' | 'augment';
+type SupportedIDE = 'windsurf' | 'cursor' | 'claudecode' | 'cline' | 'kiro' | 'augment' | 'gemini';
 
 /**
  * MCP Dashboard Page Component
@@ -265,6 +265,14 @@ export const MCPPage = () => {
         
       default:
         return '';
+      case 'gemini':
+        return JSON.stringify({
+          mcpServers: {
+            archon: {
+              httpUrl: mcpUrl
+            }
+          }
+        }, null, 2);
     }
   };
 
@@ -330,6 +338,16 @@ export const MCPPage = () => {
             '4. Reload configuration'
           ]
         };
+      case 'gemini':
+        return {
+          title: 'Gemini CLI Configuration',
+          steps: [
+            '1. Locate or create the settings file at ~/.gemini/settings.json',
+            '2. Add the configuration shown below to the file',
+            '3. Launch Gemini CLI in your terminal',
+            '4. Test the connection by typing /mcp to list available tools'
+          ]
+        };
       default:
         return {
           title: 'Configuration',
@@ -551,6 +569,16 @@ export const MCPPage = () => {
                         >
                           Claude Code
                         </button>
+                        <button
+                          onClick={() => setSelectedIDE('gemini')}
+                          className={`px-4 py-2 text-sm font-medium border-b-2 transition-colors ${
+                            selectedIDE === 'gemini'
+                              ? 'border-blue-500 text-blue-600 dark:text-blue-400'
+                              : 'border-transparent text-gray-500 dark:text-zinc-400 hover:text-gray-700 dark:hover:text-zinc-300'
+                          } cursor-pointer`}
+                        >
+                          Gemini CLI
+                        </button>
                         <button
                           onClick={() => setSelectedIDE('cursor')}
                           className={`px-4 py-2 text-sm font-medium border-b-2 transition-colors ${