get-claudia 1.54.1 → 1.54.3

package/bin/google-setup.js

@@ -0,0 +1,69 @@
+/**
+ * Google Workspace MCP setup logic.
+ * Extracted as a module so it can be tested independently from the interactive CLI.
+ */
+
+import { existsSync, readFileSync, writeFileSync } from 'node:fs';
+import { join } from 'node:path';
+
+/**
+ * Detect old Google MCP server entries in .mcp.json.
+ * Returns { hasOldGmail, hasOldCalendar, hasWorkspace }.
+ */
+export function detectOldGoogleMcp(targetPath) {
+  const mcpPath = join(targetPath, '.mcp.json');
+  const result = { hasOldGmail: false, hasOldCalendar: false, hasWorkspace: false };
+
+  if (!existsSync(mcpPath)) return result;
+
+  try {
+    const config = JSON.parse(readFileSync(mcpPath, 'utf-8'));
+    const servers = config.mcpServers || {};
+    result.hasOldGmail = !!servers.gmail;
+    result.hasOldCalendar = !!servers['google-calendar'];
+    result.hasWorkspace = !!servers.google_workspace;
+  } catch {
+    // Malformed JSON
+  }
+
+  return result;
+}
+
+/**
+ * Add or update the google_workspace entry in .mcp.json.
+ * Removes old gmail and google-calendar entries if present.
+ * Creates .mcp.json if it doesn't exist.
+ */
+export function setupGoogleWorkspace(targetPath, clientId, clientSecret, tier) {
+  const mcpPath = join(targetPath, '.mcp.json');
+  const effectiveTier = tier || 'core';
+
+  let config;
+  if (existsSync(mcpPath)) {
+    try {
+      config = JSON.parse(readFileSync(mcpPath, 'utf-8'));
+    } catch {
+      config = { mcpServers: {} };
+    }
+  } else {
+    config = { mcpServers: {} };
+  }
+
+  if (!config.mcpServers) config.mcpServers = {};
+
+  // Remove old entries
+  delete config.mcpServers.gmail;
+  delete config.mcpServers['google-calendar'];
+
+  // Add/update google_workspace
+  config.mcpServers.google_workspace = {
+    command: 'uvx',
+    args: ['workspace-mcp', '--tool-tier', effectiveTier],
+    env: {
+      GOOGLE_OAUTH_CLIENT_ID: clientId,
+      GOOGLE_OAUTH_CLIENT_SECRET: clientSecret,
+    },
+  };
+
+  writeFileSync(mcpPath, JSON.stringify(config, null, 2) + '\n');
+}

package/bin/index.js

@@ -6,6 +6,7 @@ import { fileURLToPath } from 'url';
 import { spawn } from 'child_process';
 import { homedir } from 'os';
 import { createInterface } from 'readline';
+import { setupGoogleWorkspace, detectOldGoogleMcp } from './google-setup.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
@@ -501,6 +502,12 @@ async function main() {
   const filteredArgs = args.filter(a => a !== '--no-memory' && a !== '--yes' && a !== '-y');
   const arg = filteredArgs[0];
 
+  // ─── Subcommand: get-claudia google ─────────────────────────────────────
+  if (arg === 'google') {
+    await runGoogleSetup();
+    process.exit(0);
+  }
+
   // Support "." or "upgrade" for current directory
   const isCurrentDir = arg === '.' || arg === 'upgrade';
   const targetDir = isCurrentDir ? '.' : (arg || 'claudia');
@@ -1124,7 +1131,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] };
@@ -1384,12 +1391,22 @@ See the memory-manager skill for the full tool reference.`;
       // skill-index.json not found, skip skills section
     }
 
+    const googleSection = `## Google Workspace Integration (New!)
+
+Claudia can now connect to your full Google Workspace: Gmail, Calendar, Drive, Docs, Sheets, Tasks, and more through one server.
+
+**Quick setup:** Run \`npx get-claudia google\` to configure it interactively.
+
+Or see the Google Integration Setup section in CLAUDE.md for manual configuration.`;
+
     const content = `# Updated to v${version} (${date})
 
 ## What's New
 
 ${changelogSection}
 
+${googleSection}
+
 ${skillSections}
 
 ---
@@ -1403,4 +1420,104 @@ _Surface this update in your first greeting, then delete this file._
   }
 }
 
+// ─── Google Workspace Setup Command ──────────────────────────────────────────
+
+function prompt(question) {
+  if (!isTTY) return Promise.resolve('');
+  return new Promise((resolve) => {
+    const rl = createInterface({ input: process.stdin, output: process.stdout });
+    rl.question(` ${question} `, (answer) => {
+      rl.close();
+      resolve(answer.trim());
+    });
+  });
+}
+
+async function runGoogleSetup() {
+  const targetPath = process.cwd();
+
+  console.log('');
+  console.log(` ${colors.boldCyan}Google Workspace Setup${colors.reset}`);
+  console.log(` ${colors.dim}Connect Gmail, Calendar, Drive, Docs, Sheets, Tasks, and more${colors.reset}`);
+  console.log('');
+
+  // Check for uvx using spawn (safe, no shell injection)
+  try {
+    await new Promise((resolve, reject) => {
+      const child = spawn('uvx', ['--version'], { stdio: 'ignore' });
+      child.on('close', (code) => code === 0 ? resolve() : reject());
+      child.on('error', reject);
+    });
+  } catch {
+    console.log(` ${colors.red}!${colors.reset}  uvx is not installed. Install it first:`);
+    console.log(`   ${colors.cyan}pip install uv${colors.reset}  or  ${colors.cyan}brew install uv${colors.reset}`);
+    process.exit(1);
+  }
+
+  // Detect existing state
+  const state = detectOldGoogleMcp(targetPath);
+
+  if (state.hasOldGmail || state.hasOldCalendar) {
+    console.log(` ${colors.yellow}→${colors.reset} Found old Gmail/Calendar MCP servers. These will be replaced.`);
+    console.log(`   ${colors.dim}Same GCP credentials work with the new server.${colors.reset}`);
+    console.log('');
+  }
+
+  if (state.hasWorkspace) {
+    const overwrite = await confirm('Google Workspace MCP is already configured. Reconfigure?');
+    if (!overwrite) {
+      console.log(` ${colors.dim}Keeping existing config.${colors.reset}`);
+      return;
+    }
+  }
+
+  // Get credentials
+  console.log(` ${colors.dim}You need a Google Cloud OAuth client (Desktop type).${colors.reset}`);
+  console.log(` ${colors.dim}Create one at: https://console.cloud.google.com/apis/credentials${colors.reset}`);
+  console.log('');
+
+  const clientId = await prompt(`${colors.cyan}Client ID:${colors.reset}`);
+  if (!clientId) {
+    console.log(` ${colors.red}!${colors.reset}  Client ID is required.`);
+    process.exit(1);
+  }
+
+  const clientSecret = await prompt(`${colors.cyan}Client Secret:${colors.reset}`);
+  if (!clientSecret) {
+    console.log(` ${colors.red}!${colors.reset}  Client Secret is required.`);
+    process.exit(1);
+  }
+
+  // Pick tier
+  console.log('');
+  console.log(` ${colors.boldCyan}Tool tiers:${colors.reset}`);
+  console.log(`   ${colors.green}core${colors.reset}      43 tools  Gmail, Calendar, Drive, Contacts ${colors.dim}(recommended)${colors.reset}`);
+  console.log(`   ${colors.yellow}extended${colors.reset}  83 tools  + Docs, Sheets, Tasks, Chat`);
+  console.log(`   ${colors.magenta}complete${colors.reset} 111 tools  + Slides, Forms, Apps Script`);
+  console.log('');
+
+  const tierInput = await prompt(`${colors.cyan}Tier${colors.reset} ${colors.dim}(core/extended/complete, default: core):${colors.reset}`);
+  const tier = ['core', 'extended', 'complete'].includes(tierInput) ? tierInput : 'core';
+
+  // Write config
+  setupGoogleWorkspace(targetPath, clientId, clientSecret, tier);
+
+  console.log('');
+  console.log(` ${colors.green}✓${colors.reset} Google Workspace MCP configured (${colors.bold}${tier}${colors.reset} tier)`);
+
+  if (state.hasOldGmail || state.hasOldCalendar) {
+    console.log(` ${colors.green}✓${colors.reset} Old Gmail/Calendar entries removed`);
+  }
+
+  console.log('');
+  console.log(` ${colors.boldYellow}Next steps:${colors.reset}`);
+  console.log(`   1. Enable APIs in your GCP project: Gmail, Calendar, Drive, etc.`);
+  console.log(`      ${colors.dim}https://console.cloud.google.com/apis/library${colors.reset}`);
+  console.log(`   2. Restart Claude Code`);
+  console.log(`   3. First run will open your browser for Google sign-in`);
+  console.log('');
+  console.log(` ${colors.dim}Try: "check my inbox", "what's on my calendar", "search my Drive for..."${colors.reset}`);
+  console.log('');
+}
+
 main();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "get-claudia",
-  "version": "1.54.1",
+  "version": "1.54.3",
   "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.
 
 ---