get-claudia 1.54.0 → 1.54.2

package/bin/index.js

@@ -149,6 +149,7 @@ class ProgressRenderer {
       case 'error':   return `${colors.red}!${colors.reset}`;
       case 'active':  return `${colors.cyan}${this.spinnerChars[this.spinnerFrame]}${colors.reset}`;
       case 'skipped': return `${colors.dim}○${colors.reset}`;
+      case 'cascade': return `${colors.dim}·${colors.reset}`;
       default:        return `${colors.dim}░${colors.reset}`;
     }
   }
@@ -156,7 +157,7 @@ class ProgressRenderer {
   getCompletedCount() {
     return STEPS.filter(s => {
       const st = this.states[s.id].state;
-      return st === 'done' || st === 'warn' || st === 'skipped';
+      return st === 'done' || st === 'warn' || st === 'skipped' || st === 'cascade';
     }).length;
   }
 
@@ -175,7 +176,7 @@ class ProgressRenderer {
     for (const step of STEPS) {
       const { state, detail } = this.states[step.id];
       const icon = this.getIcon(state);
-      const label = state === 'skipped'
+      const label = (state === 'skipped' || state === 'cascade')
         ? `${colors.dim}${step.label}${colors.reset}`
         : step.label;
       const detailStr = detail
@@ -183,7 +184,7 @@ class ProgressRenderer {
         : '';
       // Pad label to 20 chars for alignment
       const paddedLabel = step.label.padEnd(20);
-      lines.push(` ${icon} ${state === 'skipped' ? colors.dim + paddedLabel + colors.reset : paddedLabel}${detailStr}`);
+      lines.push(` ${icon} ${(state === 'skipped' || state === 'cascade') ? colors.dim + paddedLabel + colors.reset : paddedLabel}${detailStr}`);
     }
 
     lines.push('');
@@ -209,10 +210,11 @@ class ProgressRenderer {
     if (supportsInPlace) return; // handled by render()
     const step = STEPS.find(s => s.id === stepId);
     if (!step) return;
-    if (state === 'done' || state === 'warn' || state === 'error' || state === 'skipped') {
+    if (state === 'done' || state === 'warn' || state === 'error' || state === 'skipped' || state === 'cascade') {
       const icon = state === 'done' ? '✓' :
                    state === 'warn' ? '○' :
-                   state === 'error' ? '!' : '-';
+                   state === 'error' ? '!' :
+                   state === 'cascade' ? '·' : '-';
       console.log(` ${icon} ${step.label}${detail ? '  ' + detail : ''}`);
     }
   }
@@ -277,6 +279,77 @@ async function installOllama() {
   });
 }
 
+// ─── Python helpers ─────────────────────────────────────────────────────
+
+/** Check if Python 3.10+ is available. Returns the command name or null. */
+async function isPythonInstalled() {
+  for (const cmd of ['python3', 'python']) {
+    const ver = await new Promise((resolve) => {
+      const proc = spawn(cmd, ['--version'], { stdio: 'pipe', timeout: 5000 });
+      let stdout = '';
+      proc.stdout.on('data', (d) => { stdout += d.toString(); });
+      proc.on('close', () => resolve(stdout.trim()));
+      proc.on('error', () => resolve(''));
+    });
+    const match = ver.match(/Python (\d+)\.(\d+)/);
+    if (match && (parseInt(match[1]) > 3 || (parseInt(match[1]) === 3 && parseInt(match[2]) >= 10))) {
+      return cmd;
+    }
+  }
+  return null;
+}
+
+/**
+ * Install Python automatically.
+ * macOS: uses brew if available
+ * Linux: tries apt, dnf, pacman
+ * Windows: skip (requires manual install from python.org)
+ */
+async function installPython() {
+  if (isWindows) return false;
+
+  if (process.platform === 'darwin') {
+    const hasBrew = await new Promise((resolve) => {
+      const proc = spawn('which', ['brew'], { stdio: 'pipe', timeout: 5000 });
+      proc.on('close', (code) => resolve(code === 0));
+      proc.on('error', () => resolve(false));
+    });
+    if (hasBrew) {
+      return new Promise((resolve) => {
+        const proc = spawn('brew', ['install', 'python@3.12'], {
+          stdio: 'pipe', timeout: 300000
+        });
+        proc.on('close', (code) => resolve(code === 0));
+        proc.on('error', () => resolve(false));
+      });
+    }
+    return false;
+  }
+
+  // Linux: try apt, dnf, pacman
+  for (const [pm, args] of [
+    ['apt-get', ['install', '-y', 'python3', 'python3-venv']],
+    ['dnf', ['install', '-y', 'python3']],
+    ['pacman', ['-S', '--noconfirm', 'python']],
+  ]) {
+    const hasPm = await new Promise((resolve) => {
+      const proc = spawn('which', [pm], { stdio: 'pipe', timeout: 5000 });
+      proc.on('close', (code) => resolve(code === 0));
+      proc.on('error', () => resolve(false));
+    });
+    if (hasPm) {
+      return new Promise((resolve) => {
+        const proc = spawn('sudo', [pm, ...args], {
+          stdio: 'pipe', timeout: 300000
+        });
+        proc.on('close', (code) => resolve(code === 0));
+        proc.on('error', () => resolve(false));
+      });
+    }
+  }
+  return false;
+}
+
 /**
  * Start the Ollama service and wait for it to respond.
  * On macOS: open the Ollama app or run `ollama serve` in background.
@@ -548,6 +621,7 @@ async function main() {
 
   // Run CLI-based setup (no Python daemon needed)
   let memoryOk = false;
+  let rootCause = null;
 
   try {
     // Step 1: Environment -- check Node.js version, detect/install/start Ollama
@@ -689,30 +763,19 @@ async function main() {
       ? join(daemonVenvDir, 'Scripts', 'pip')
       : join(daemonVenvDir, 'bin', 'pip');
 
-    // Phase 1: Find Python 3.10+
-    let pythonCmd = null;
-    for (const cmd of ['python3', 'python']) {
-      const ver = await new Promise((resolve) => {
-        const proc = spawn(cmd, ['--version'], { stdio: 'pipe' });
-        let stdout = '';
-        proc.stdout.on('data', (d) => { stdout += d.toString(); });
-        proc.on('close', () => resolve(stdout.trim()));
-        proc.on('error', () => resolve(''));
-      });
-      const match = ver.match(/Python (\d+)\.(\d+)/);
-      if (match) {
-        const major = parseInt(match[1], 10);
-        const minor = parseInt(match[2], 10);
-        if (major > 3 || (major === 3 && minor >= 10)) {
-          pythonCmd = cmd;
-          break;
-        }
-      }
+    // Phase 1: Find Python 3.10+ (auto-install if missing)
+    let pythonCmd = await isPythonInstalled();
+
+    if (!pythonCmd) {
+      renderer.update('daemon', 'active', 'installing Python...');
+      const installed = await installPython();
+      if (installed) pythonCmd = await isPythonInstalled();
     }
 
     if (!pythonCmd) {
       renderer.update('daemon', 'warn', 'Python 3.10+ not found');
       if (!supportsInPlace) renderer.appendLine('daemon', 'warn', 'Python 3.10+ not found');
+      rootCause = { step: 'daemon', issue: 'python' };
     } else {
       // Phase 2: Create venv if it doesn't exist
       if (!existsSync(venvPython)) {
@@ -726,6 +789,7 @@ async function main() {
         if (!venvCreated) {
           renderer.update('daemon', 'warn', 'venv creation failed');
           if (!supportsInPlace) renderer.appendLine('daemon', 'warn', 'venv creation failed');
+          rootCause = rootCause || { step: 'daemon', issue: 'venv' };
         }
       }
 
@@ -746,6 +810,7 @@ async function main() {
         } else {
           renderer.update('daemon', 'warn', 'pip install failed');
           if (!supportsInPlace) renderer.appendLine('daemon', 'warn', 'pip install failed');
+          rootCause = rootCause || { step: 'daemon', issue: 'pip' };
         }
       }
 
@@ -763,6 +828,7 @@ async function main() {
           daemonOk = false;
           renderer.update('daemon', 'warn', 'daemon import failed');
           if (!supportsInPlace) renderer.appendLine('daemon', 'warn', 'import failed');
+          rootCause = rootCause || { step: 'daemon', issue: 'import' };
         }
       }
 
@@ -820,59 +886,71 @@ async function main() {
     }
 
     // MCP Config step: verify .mcp.json is correct and check stdio server count
-    renderer.update('mcp', 'active', 'checking .mcp.json...');
-    const mcpCheckResult = checkMcpConfig(targetPath);
-    if (mcpCheckResult.hasDaemon && mcpCheckResult.stdioCount <= 1) {
-      renderer.update('mcp', 'done', `claudia-memory configured${mcpCheckResult.stdioCount === 1 ? '' : ' (no stdio servers?)'}`);
-      if (!supportsInPlace) renderer.appendLine('mcp', 'done', 'claudia-memory configured');
-    } else if (mcpCheckResult.hasDaemon && mcpCheckResult.stdioCount > 1) {
-      renderer.update('mcp', 'warn', `${mcpCheckResult.stdioCount} stdio servers (only 1 reliable)`);
-      if (!supportsInPlace) renderer.appendLine('mcp', 'warn', `${mcpCheckResult.stdioCount} stdio servers`);
+    if (rootCause?.step === 'daemon') {
+      const cascadeMsg = rootCause.issue === 'python' ? 'needs Python first' : 'needs daemon first';
+      renderer.update('mcp', 'cascade', cascadeMsg);
+      if (!supportsInPlace) renderer.appendLine('mcp', 'cascade', cascadeMsg);
     } else {
-      renderer.update('mcp', 'warn', 'claudia-memory not in .mcp.json');
-      if (!supportsInPlace) renderer.appendLine('mcp', 'warn', 'daemon not configured');
+      renderer.update('mcp', 'active', 'checking .mcp.json...');
+      const mcpCheckResult = checkMcpConfig(targetPath);
+      if (mcpCheckResult.hasDaemon && mcpCheckResult.stdioCount <= 1) {
+        renderer.update('mcp', 'done', `claudia-memory configured${mcpCheckResult.stdioCount === 1 ? '' : ' (no stdio servers?)'}`);
+        if (!supportsInPlace) renderer.appendLine('mcp', 'done', 'claudia-memory configured');
+      } else if (mcpCheckResult.hasDaemon && mcpCheckResult.stdioCount > 1) {
+        renderer.update('mcp', 'warn', `${mcpCheckResult.stdioCount} stdio servers (only 1 reliable)`);
+        if (!supportsInPlace) renderer.appendLine('mcp', 'warn', `${mcpCheckResult.stdioCount} stdio servers`);
+      } else {
+        renderer.update('mcp', 'warn', 'claudia-memory not in .mcp.json');
+        if (!supportsInPlace) renderer.appendLine('mcp', 'warn', 'daemon not configured');
+      }
     }
 
     // Vault step: handled below
 
     // Health Check: check daemon health endpoint or verify daemon can import
-    renderer.update('health', 'active', 'verifying...');
-    let healthOk = false;
+    if (rootCause?.step === 'daemon') {
+      const cascadeMsg = rootCause.issue === 'python' ? 'needs Python first' : 'needs daemon first';
+      renderer.update('health', 'cascade', cascadeMsg);
+      if (!supportsInPlace) renderer.appendLine('health', 'cascade', cascadeMsg);
+    } else {
+      renderer.update('health', 'active', 'verifying...');
+      let healthOk = false;
 
-    // Try the standalone daemon's health endpoint first (port 3848)
-    try {
-      const healthResp = await fetch('http://localhost:3848/status', {
-        signal: AbortSignal.timeout(3000),
-      });
-      if (healthResp.ok) {
-        const healthData = await healthResp.json();
-        healthOk = healthData.status === 'healthy' || healthData.status === 'degraded';
+      // Try the standalone daemon's health endpoint first (port 3848)
+      try {
+        const healthResp = await fetch('http://localhost:3848/status', {
+          signal: AbortSignal.timeout(3000),
+        });
+        if (healthResp.ok) {
+          const healthData = await healthResp.json();
+          healthOk = healthData.status === 'healthy' || healthData.status === 'degraded';
+        }
+      } catch {
+        // Standalone daemon not running -- that's OK, check daemon importability instead
       }
-    } catch {
-      // Standalone daemon not running -- that's OK, check daemon importability instead
-    }
 
-    // Fallback: verify the daemon can at least be imported
-    if (!healthOk && daemonOk && existsSync(venvPython)) {
-      healthOk = await new Promise((resolve) => {
-        const proc = spawn(venvPython, ['-c', 'from claudia_memory.database import Database; print("ok")'], {
-          stdio: 'pipe',
-          timeout: 10000
+      // Fallback: verify the daemon can at least be imported
+      if (!healthOk && daemonOk && existsSync(venvPython)) {
+        healthOk = await new Promise((resolve) => {
+          const proc = spawn(venvPython, ['-c', 'from claudia_memory.database import Database; print("ok")'], {
+            stdio: 'pipe',
+            timeout: 10000
+          });
+          proc.on('close', (code) => resolve(code === 0));
+          proc.on('error', () => resolve(false));
         });
-        proc.on('close', (code) => resolve(code === 0));
-        proc.on('error', () => resolve(false));
-      });
-    }
+      }
 
-    if (healthOk) {
-      renderer.update('health', 'done', 'system healthy');
-      if (!supportsInPlace) renderer.appendLine('health', 'done', 'system healthy');
-    } else if (daemonOk) {
-      renderer.update('health', 'warn', 'daemon installed, standalone not running');
-      if (!supportsInPlace) renderer.appendLine('health', 'warn', 'standalone not running');
-    } else {
-      renderer.update('health', 'warn', 'check CLAUDE.md for troubleshooting');
-      if (!supportsInPlace) renderer.appendLine('health', 'warn', 'check manually');
+      if (healthOk) {
+        renderer.update('health', 'done', 'system healthy');
+        if (!supportsInPlace) renderer.appendLine('health', 'done', 'system healthy');
+      } else if (daemonOk) {
+        renderer.update('health', 'warn', 'daemon installed, standalone not running');
+        if (!supportsInPlace) renderer.appendLine('health', 'warn', 'standalone not running');
+      } else {
+        renderer.update('health', 'warn', 'check CLAUDE.md for troubleshooting');
+        if (!supportsInPlace) renderer.appendLine('health', 'warn', 'check manually');
+      }
     }
 
     memoryOk = daemonOk || hasExistingDb;
@@ -891,7 +969,7 @@ async function main() {
   // Vault step, then completion
   runVaultStep(renderer, () => {
     renderer.render();
-    showCompletion(targetDir, isCurrentDir, memoryOk);
+    showCompletion(targetDir, isCurrentDir, memoryOk, rootCause);
   });
 
   // ── Vault step ──
@@ -951,8 +1029,8 @@ async function main() {
       renderer.update('vault', 'done', 'configured');
       if (!supportsInPlace) renderer.appendLine('vault', 'done', 'configured');
     } else {
-      renderer.update('vault', 'warn', 'Obsidian not found (optional)');
-      if (!supportsInPlace) renderer.appendLine('vault', 'warn', 'Obsidian not found (optional)');
+      renderer.update('vault', 'skipped', 'Obsidian not installed (optional)');
+      if (!supportsInPlace) renderer.appendLine('vault', 'skipped', 'Obsidian not installed (optional)');
     }
 
     callback(obsidianDetected);
@@ -960,42 +1038,67 @@ async function main() {
 
   // ── Completion block ──
 
-  function showCompletion(targetDir, isCurrentDir, memoryInstalled) {
-    const cdCmd = isCurrentDir ? '' : `cd ${targetDir} && `;
+  function showCompletion(targetDir, isCurrentDir, memoryInstalled, failureCause) {
+    const rerunCmd = isCurrentDir ? 'npx get-claudia .' : `cd ${targetDir} && npx get-claudia .`;
+    const launchCmd = isCurrentDir ? 'claude' : `cd ${targetDir} && claude`;
 
     console.log('');
     console.log(`${colors.dim}${'━'.repeat(46)}${colors.reset}`);
 
-    // Post-install component summary
-    const mcpCheck = checkMcpConfig(targetPath);
-    const components = [
-      { name: 'Personality & Skills', ok: true },
-      { name: 'Memory Daemon', ok: memoryInstalled },
-      { name: 'MCP Config', ok: mcpCheck.hasDaemon },
-    ];
-
-    console.log(` ${colors.bold}Components:${colors.reset}`);
-    for (const c of components) {
-      if (c.ok && !c.warn) {
-        console.log(`   ${colors.green}✓${colors.reset} ${c.name}`);
-      } else if (c.warn) {
-        console.log(`   ${colors.yellow}⚠${colors.reset} ${c.name} ${colors.dim}${c.warn}${colors.reset}`);
-      } else {
-        console.log(`   ${colors.yellow}○${colors.reset} ${c.name} ${colors.dim}(not ready)${colors.reset}`);
-      }
+    if (memoryInstalled && !failureCause) {
+      // Everything worked
+      console.log('');
+      console.log(` ${colors.green}Ready to go!${colors.reset}`);
+      console.log('');
+      console.log(` ${colors.bold}Next:${colors.reset} Open Claude Code:`);
+      console.log(`   ${colors.cyan}${launchCmd}${colors.reset}`);
+      console.log('');
+      return;
     }
 
+    // Something needs fixing
+    console.log('');
+    console.log(` ${colors.boldYellow}Almost there!${colors.reset} One thing to fix:`);
     console.log('');
-    console.log(` ${colors.bold}Next:${colors.reset} Open Claude Code:`);
-    console.log(`   ${colors.cyan}${cdCmd}claude${colors.reset}`);
 
-    if (!memoryInstalled) {
-      console.log('');
-      console.log(` ${colors.dim}Memory requires Python 3.10+, the claudia-memory daemon, and Ollama.${colors.reset}`);
-      console.log(` ${colors.dim}Re-run setup after installing Python and Ollama.${colors.reset}`);
+    if (failureCause?.issue === 'python') {
+      console.log(` ${colors.bold}→ Install Python 3.10+:${colors.reset}`);
+      if (process.platform === 'darwin') {
+        const hasBrew = existsSync('/opt/homebrew/bin/brew') || existsSync('/usr/local/bin/brew');
+        if (hasBrew) {
+          console.log(`   ${colors.cyan}brew install python@3.12${colors.reset}`);
+        } else {
+          console.log(`   ${colors.dim}Install Homebrew first:${colors.reset}`);
+          console.log(`   ${colors.cyan}/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"${colors.reset}`);
+          console.log('');
+          console.log(`   ${colors.dim}Then:${colors.reset}`);
+          console.log(`   ${colors.cyan}brew install python@3.12${colors.reset}`);
+        }
+      } else if (isWindows) {
+        console.log(`   ${colors.cyan}https://www.python.org/downloads/${colors.reset}`);
+      } else {
+        console.log(`   ${colors.cyan}sudo apt install python3 python3-venv${colors.reset}  ${colors.dim}(Debian/Ubuntu)${colors.reset}`);
+        console.log(`   ${colors.cyan}sudo dnf install python3${colors.reset}              ${colors.dim}(Fedora/RHEL)${colors.reset}`);
+      }
+    } else if (failureCause?.issue === 'venv') {
+      console.log(` ${colors.bold}→ Python venv creation failed.${colors.reset}`);
+      console.log(`   ${colors.dim}Try: python3 -m ensurepip && python3 -m venv ~/.claudia/daemon/venv${colors.reset}`);
+    } else if (failureCause?.issue === 'pip') {
+      console.log(` ${colors.bold}→ Daemon package install failed.${colors.reset}`);
+      console.log(`   ${colors.dim}Check your internet connection and try again.${colors.reset}`);
+    } else if (failureCause?.issue === 'import') {
+      console.log(` ${colors.bold}→ Daemon installed but won't load.${colors.reset}`);
+      console.log(`   ${colors.dim}Try: rm -rf ~/.claudia/daemon/venv && re-run setup.${colors.reset}`);
+    } else {
+      console.log(` ${colors.bold}→ Memory daemon not ready.${colors.reset}`);
     }
 
     console.log('');
+    console.log(` ${colors.bold}Then finish setup:${colors.reset}`);
+    console.log(`   ${colors.cyan}${rerunCmd}${colors.reset}`);
+    console.log('');
+    console.log(` ${colors.dim}Stuck? Copy this message into any AI chat and ask for help.${colors.reset}`);
+    console.log('');
   }
 }
 
@@ -1021,7 +1124,7 @@ function restoreMcpServers(targetPath) {
 
     // Path 1: Restore from _disabled_mcpServers stash (older migration format)
     if (config._disabled_mcpServers) {
-      const toRestore = ['claudia-memory', 'claudia_memory', 'gmail', 'google-calendar'];
+      const toRestore = ['claudia-memory', 'claudia_memory'];
       for (const key of toRestore) {
         if (config._disabled_mcpServers[key] && !config.mcpServers[key]) {
           const serverConfig = { ...config._disabled_mcpServers[key] };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "get-claudia",
-  "version": "1.54.0",
+  "version": "1.54.2",
   "description": "An AI assistant who learns how you work.",
   "keywords": [
     "claudia",

package/template-v2/.mcp.json.example

@@ -6,15 +6,19 @@
       "_description": "Claudia memory system with vector search",
       "_setup": "Auto-configured by the installer (npx get-claudia). The installer creates a Python venv at ~/.claudia/daemon/venv/ and sets the correct command path in .mcp.json automatically."
     },
-    "gmail": {
-      "command": "npx",
-      "args": ["-y", "@gongrzhe/server-gmail-autoauth-mcp"],
-      "_setup": "Requires your own Google Cloud credentials. See Google Integration Setup in CLAUDE.md, then run: npx @gongrzhe/server-gmail-autoauth-mcp auth"
-    },
-    "google-calendar": {
-      "command": "npx",
-      "args": ["-y", "@gongrzhe/server-calendar-autoauth-mcp"],
-      "_setup": "Requires your own Google Cloud credentials. See Google Integration Setup in CLAUDE.md, then run: npx @gongrzhe/server-calendar-autoauth-mcp auth"
+    "google_workspace": {
+      "command": "uvx",
+      "args": ["workspace-mcp", "--tool-tier", "core"],
+      "env": {
+        "GOOGLE_OAUTH_CLIENT_ID": "",
+        "GOOGLE_OAUTH_CLIENT_SECRET": ""
+      },
+      "_setup": "Google Workspace MCP: Gmail, Calendar, Drive, Docs, Sheets, Tasks, and more in one server. Requires Google Cloud OAuth credentials. See Google Integration Setup in CLAUDE.md. Tool tiers: core (43 tools), extended (83), complete (111). Start with core.",
+      "_tiers": {
+        "core": "Gmail, Calendar, Drive, Contacts (43 tools, recommended default)",
+        "extended": "Adds Docs, Sheets, Tasks, Chat (83 tools)",
+        "complete": "All services including Slides, Forms, Apps Script (111 tools)"
+      }
     },
     "rube": {
       "type": "http",
@@ -29,7 +33,7 @@
 
   "_notes": {
     "memory": "Claudia's memory is powered by the claudia-memory daemon (Python MCP server). It provides ~33 tools for semantic search, pattern detection, and relationship tracking. The installer (npx get-claudia) automatically sets up the daemon in a Python venv at ~/.claudia/daemon/venv/ and configures .mcp.json.",
-    "gmail_and_calendar": "Gmail and Calendar are enabled by default as stdio MCP servers. Each requires Google Cloud credentials (see Google Integration Setup in CLAUDE.md). Alternatively, connect them through Rube (HTTP) for a simpler setup.",
+    "google_workspace": "Google Workspace uses the workspace-mcp server (taylorwilsdon/google_workspace_mcp). One server covers Gmail, Calendar, Drive, Docs, Sheets, Tasks, and more. Tool tiers control context usage. See Google Integration Setup in CLAUDE.md.",
     "rube": "Rube (by Composio) connects 500+ apps through one HTTP MCP connection. Each user creates their own free Rube account at rube.app. See the Rube section in CLAUDE.md for setup and troubleshooting.",
     "security": "Each user authenticates with their own accounts and credentials. OAuth tokens are stored locally on your machine, never shared.",
     "not_included": {

package/template-v2/CLAUDE.md

@@ -319,12 +319,10 @@ I adapt to whatever tools are available. When you ask me to do something that ne
 
 **Obsidian vault:** My memory syncs to an Obsidian vault at `~/.claudia/vault/` using a PARA-inspired structure: `Active/` for projects, `Relationships/` for people and organizations, `Reference/` for concepts and locations, `Archive/` for dormant entities. Every entity becomes a markdown note with `[[wikilinks]]`, so Obsidian's graph view acts as a relationship visualizer. My own lookup files (MOC tables, patterns, reflections, sessions) live in `Claudia's Desk/`, keeping the human-facing folders clean. The vault syncs on-demand via `claudia vault sync`. SQLite remains the source of truth; the vault is a read projection.
 
-**Gmail and Calendar (MCP):** Gmail and Calendar are provided by third-party MCP servers that each user authenticates with their own Google Cloud credentials. When these MCPs are connected, I have access to tools like `search_emails`, `read_email`, `send_email`, `list_events`, `search_events`, etc. I use these tools naturally when you ask me to check email, send messages, or look at your calendar.
+**Google Workspace (MCP):** Google Workspace is provided by the workspace-mcp server ([taylorwilsdon/google_workspace_mcp](https://github.com/taylorwilsdon/google_workspace_mcp)). One server covers Gmail, Calendar, Drive, Docs, Sheets, Tasks, Contacts, and more. Tool tiers control how many tools are exposed: `--tool-tier core` (43 tools, default), `--tool-tier extended` (83 tools), or `--tool-tier complete` (111 tools). When connected, I have access to Gmail, Calendar, Drive, Docs, Sheets, Tasks, and more. I use these tools naturally when you ask me to check email, send messages, look at your calendar, search Drive, or work with documents.
 
 If the MCP tools aren't responding or you see authentication errors, the user needs to set up their Google Cloud credentials. See the **Google Integration Setup** section below.
 
-**Alternative:** CLI commands (`claudia gmail search`, `claudia calendar list`, etc.) are also available as a fallback. These require separate authentication via `claudia google login`.
-
 **Rube (500+ Apps):** Rube (by Composio) is an optional MCP aggregator that connects Claudia to hundreds of apps through a single server. Each user creates their own free Rube account, connects the apps they want via one-click OAuth, and Claudia gets access to all of them through one MCP connection.
 
 If a user asks about connecting apps, integrations, or any of the services listed below, proactively suggest Rube as the easiest path. Walk them through setup step by step.
@@ -348,7 +346,7 @@ If a user asks about connecting apps, integrations, or any of the services liste
 | **Calendar** | Google Calendar, Outlook Calendar, Calendly |
 | **And 500+ more** | Browse the full list at [rube.app](https://rube.app) |
 
-**External integrations** (Gmail, Google Calendar, Rube, Brave Search) are optional add-ons that extend what I can see and do. I work fully without them. The core value is relationships and context.
+**External integrations** (Google Workspace, Rube, Brave Search) are optional add-ons that extend what I can see and do. I work fully without them. The core value is relationships and context.
 
 ### Rube Setup (Guide Users Through This)
 
@@ -403,33 +401,41 @@ The MCP tools from Rube will have names like `SLACK_SEND_MESSAGE`, `NOTION_CREAT
 | Rate limited | Rube has usage limits on the free tier. The user may need to upgrade at rube.app/pricing. |
 | Want to disconnect an app | Go to Rube dashboard and disconnect the app there. No Claudia config changes needed. |
 
-**Rube vs. Individual MCPs:** Rube works alongside (not instead of) Gmail and Calendar MCPs. Individual MCPs give a direct connection with no intermediary but require per-service Google Cloud setup. Rube gives one setup for everything but routes data through Composio servers. Both can coexist. If a user has both Gmail MCP and Rube's Gmail connected, prefer the direct MCP tools.
+**Rube vs. workspace-mcp:** Rube works alongside (not instead of) the workspace-mcp server. Workspace-mcp gives a direct connection with no intermediary but requires Google Cloud setup. Rube gives one setup for everything but routes data through Composio servers. Both can coexist. If a user has both workspace-mcp and Rube's Google apps connected, prefer the direct workspace-mcp tools.
 
 ### Google Integration Setup
 
-Gmail and Calendar MCP servers require your own Google Cloud credentials. Each user sets this up once:
+The workspace-mcp server requires your own Google Cloud credentials. Each user sets this up once:
 
 1. Go to [Google Cloud Console](https://console.cloud.google.com/)
 2. Create a new project (or select an existing one)
-3. Enable the **Gmail API** and/or **Google Calendar API**:
+3. Enable the APIs you need:
    - Go to APIs & Services > Library
-   - Search for "Gmail API", click Enable
-   - Search for "Google Calendar API", click Enable
+   - Search for and enable: **Gmail API**, **Google Calendar API**, **Google Drive API**, **Google Docs API**, **Google Sheets API**, **Google Tasks API**, **People API** (Contacts)
+   - You can enable more later as needed
 4. Create OAuth credentials:
    - Go to APIs & Services > Credentials
    - Click "Create Credentials" > "OAuth client ID"
    - If prompted, configure the consent screen first (External, add your email as test user)
    - Application type: **Desktop app**
-   - Click Create, then download the JSON file
-5. Rename the downloaded file to `gcp-oauth.keys.json`
-6. Authenticate each service:
-   ```bash
-   npx @gongrzhe/server-gmail-autoauth-mcp auth
-   npx @gongrzhe/server-calendar-autoauth-mcp auth
-   ```
-   Each command opens your browser for Google sign-in. Tokens are stored locally at `~/.gmail-mcp/` and `~/.calendar-mcp/`.
-
-After setup, restart Claude Code and the MCP servers will connect automatically.
+   - Click Create
+   - Copy the **Client ID** and **Client Secret**
+5. Add credentials to `.mcp.json`:
+   - Open `.mcp.json` in the project root
+   - Find the `google_workspace` server entry
+   - Set the `GOOGLE_CLIENT_ID` and `GOOGLE_CLIENT_SECRET` environment variables:
+     ```json
+     "env": {
+       "GOOGLE_CLIENT_ID": "your-client-id.apps.googleusercontent.com",
+       "GOOGLE_CLIENT_SECRET": "your-client-secret"
+     }
+     ```
+6. Choose your tool tier:
+   - The default is `--tool-tier core` (43 tools), which covers most needs
+   - For more capabilities, change to `--tool-tier extended` (83 tools) or `--tool-tier complete` (111 tools) in the server args
+7. Restart Claude Code. On first run, the server opens your browser for Google sign-in. Tokens are stored locally for future sessions.
+
+**Migrating from the old setup:** If you previously used separate Gmail and Calendar MCP servers, the same GCP project works. Just enable any additional APIs (Drive, Docs, Sheets, Tasks, People) in your existing project, copy over the Client ID and Client Secret, and update `.mcp.json` to use the `google_workspace` server entry instead of the old individual entries.
 
 ---