get-claudia 1.51.2 → 1.51.4

package/bin/index.js

@@ -413,6 +413,9 @@ async function main() {
     console.log(` ${colors.green}✓${colors.reset} Framework updated (data preserved)`);
   }
 
+  // Disable Gmail/Calendar MCP servers (Claudia has native CLI commands now)
+  disableGoogleMcpServers(targetPath);
+
   // Write context/whats-new.md for Claudia's self-awareness (silent)
   writeWhatsNewFile(targetPath, version);
 
@@ -811,12 +814,45 @@ async function main() {
 
     console.log('');
     console.log(` ${colors.dim}Optional: connect Google services${colors.reset}`);
-    console.log(`   ${colors.cyan}claudia gmail login${colors.reset}      ${colors.dim}Read & send email${colors.reset}`);
-    console.log(`   ${colors.cyan}claudia calendar login${colors.reset}   ${colors.dim}View & create events${colors.reset}`);
+    console.log(`   ${colors.cyan}claudia google login${colors.reset}     ${colors.dim}Gmail + Calendar in one step${colors.reset}`);
     console.log('');
   }
 }
 
+/**
+ * Disable Gmail and Google Calendar MCP servers in .mcp.json if present.
+ * Claudia now has native CLI commands for both services, so external MCP
+ * servers are no longer needed. This runs on both fresh installs and upgrades.
+ */
+function disableGoogleMcpServers(targetPath) {
+  const mcpPath = join(targetPath, '.mcp.json');
+  if (!existsSync(mcpPath)) return;
+
+  try {
+    const raw = readFileSync(mcpPath, 'utf-8');
+    const config = JSON.parse(raw);
+    if (!config.mcpServers) return;
+
+    const googleKeys = ['gmail', 'google-calendar', 'google_calendar', 'googleCalendar'];
+    let changed = false;
+
+    for (const key of googleKeys) {
+      if (config.mcpServers[key] && !config.mcpServers[key]._disabled) {
+        config.mcpServers[key]._disabled = true;
+        config.mcpServers[key]._replaced_by = 'claudia google login';
+        changed = true;
+      }
+    }
+
+    if (changed) {
+      writeFileSync(mcpPath, JSON.stringify(config, null, 2) + '\n');
+      console.log(` ${colors.yellow}→${colors.reset} Disabled Gmail/Calendar MCP servers (replaced by ${colors.cyan}claudia google login${colors.reset})`);
+    }
+  } catch {
+    // Not valid JSON or can't read -- skip silently
+  }
+}
+
 function installVisualizer() {
   const vizSrc = join(__dirname, '..', 'visualizer');
   if (!existsSync(vizSrc)) return;

package/cli/commands/google-auth.js

@@ -2,15 +2,20 @@
  * Google integration CLI commands.
  *
  * Provides:
- *   claudia gmail login      - Sign in with Google (Gmail)
- *   claudia gmail status     - Check connection status
+ *   claudia google login     - Sign in once for Gmail + Calendar
+ *   claudia google status    - Check connection status for all services
+ *   claudia google logout    - Sign out of all Google services
+ *   claudia gmail login      - Sign in with Google (Gmail only)
+ *   claudia gmail status     - Check Gmail connection status
  *   claudia gmail search     - Search emails
  *   claudia gmail read       - Read a specific email
- *   claudia gmail logout     - Sign out (remove stored tokens)
- *   claudia calendar login   - Sign in with Google (Calendar)
- *   claudia calendar status  - Check connection status
+ *   claudia gmail logout     - Sign out of Gmail
+ *   claudia calendar login   - Sign in with Google (Calendar only)
+ *   claudia calendar status  - Check Calendar connection status
  *   claudia calendar list    - List upcoming events
- *   claudia calendar logout  - Sign out (remove stored tokens)
+ *   claudia calendar search  - Search events by text
+ *   claudia calendar read    - Read a specific event by ID
+ *   claudia calendar logout  - Sign out of Calendar
  */
 
 import { authenticate, getAccessToken, isAuthenticated, revokeTokens, authStatus } from '../core/google-oauth.js';
@@ -218,6 +223,103 @@ export async function calendarListCommand(opts) {
   output({ events, timeRange: { from: now.toISOString(), to: timeMax.toISOString() }, total: events.length });
 }
 
+export async function calendarSearchCommand(query, opts) {
+  const token = await getAccessToken('calendar');
+  if (!token) {
+    console.error('Not authenticated. Run: claudia calendar login');
+    process.exitCode = 1;
+    return;
+  }
+
+  const now = new Date();
+  const maxDays = opts.days || 90;
+  const timeMin = opts.past
+    ? new Date(now.getTime() - maxDays * 24 * 60 * 60 * 1000)
+    : now;
+  const timeMax = new Date(now.getTime() + maxDays * 24 * 60 * 60 * 1000);
+  const maxResults = opts.limit || 25;
+
+  const url = new URL('https://www.googleapis.com/calendar/v3/calendars/primary/events');
+  url.searchParams.set('q', query);
+  url.searchParams.set('timeMin', timeMin.toISOString());
+  url.searchParams.set('timeMax', timeMax.toISOString());
+  url.searchParams.set('maxResults', String(maxResults));
+  url.searchParams.set('singleEvents', 'true');
+  url.searchParams.set('orderBy', 'startTime');
+
+  const resp = await fetch(url, {
+    headers: { Authorization: `Bearer ${token}` },
+  });
+
+  if (!resp.ok) {
+    const err = await resp.text();
+    console.error(`Calendar API error (${resp.status}): ${err}`);
+    process.exitCode = 1;
+    return;
+  }
+
+  const data = await resp.json();
+  const events = (data.items || []).map(e => ({
+    id: e.id,
+    summary: e.summary || '(no title)',
+    start: e.start?.dateTime || e.start?.date || '',
+    end: e.end?.dateTime || e.end?.date || '',
+    location: e.location || '',
+    attendees: (e.attendees || []).map(a => a.email),
+    status: e.status,
+    htmlLink: e.htmlLink,
+  }));
+
+  output({ events, query, total: events.length });
+}
+
+export async function calendarReadCommand(eventId) {
+  const token = await getAccessToken('calendar');
+  if (!token) {
+    console.error('Not authenticated. Run: claudia calendar login');
+    process.exitCode = 1;
+    return;
+  }
+
+  const resp = await fetch(
+    `https://www.googleapis.com/calendar/v3/calendars/primary/events/${encodeURIComponent(eventId)}`,
+    { headers: { Authorization: `Bearer ${token}` } }
+  );
+
+  if (!resp.ok) {
+    const err = await resp.text();
+    console.error(`Calendar API error (${resp.status}): ${err}`);
+    process.exitCode = 1;
+    return;
+  }
+
+  const e = await resp.json();
+  output({
+    id: e.id,
+    summary: e.summary || '(no title)',
+    description: e.description || '',
+    start: e.start?.dateTime || e.start?.date || '',
+    end: e.end?.dateTime || e.end?.date || '',
+    location: e.location || '',
+    attendees: (e.attendees || []).map(a => ({
+      email: a.email,
+      displayName: a.displayName || '',
+      responseStatus: a.responseStatus || '',
+      organizer: a.organizer || false,
+    })),
+    organizer: e.organizer?.email || '',
+    status: e.status,
+    htmlLink: e.htmlLink,
+    created: e.created,
+    updated: e.updated,
+    recurringEventId: e.recurringEventId || null,
+    conferenceData: e.conferenceData?.entryPoints?.map(ep => ({
+      type: ep.entryPointType,
+      uri: ep.uri,
+    })) || [],
+  });
+}
+
 export async function calendarLogoutCommand() {
   const removed = revokeTokens('calendar');
   if (removed) {
@@ -227,6 +329,31 @@ export async function calendarLogoutCommand() {
   }
 }
 
+// ── Unified Google Commands ──
+
+export async function googleLoginCommand() {
+  try {
+    await authenticate('google');
+    console.log('\n\u2713 Google connected! Claudia can now access Gmail and Calendar.');
+    console.log('  Try: claudia gmail search "is:unread"');
+    console.log('  Try: claudia calendar list');
+  } catch (err) {
+    console.error(`\n\u2717 ${err.message}`);
+    process.exitCode = 1;
+  }
+}
+
+export async function googleLogoutCommand() {
+  const gmailRemoved = revokeTokens('gmail');
+  const calendarRemoved = revokeTokens('calendar');
+  if (gmailRemoved || calendarRemoved) {
+    const services = [gmailRemoved && 'Gmail', calendarRemoved && 'Calendar'].filter(Boolean).join(' and ');
+    console.log(`\u2713 Signed out of ${services}. Run "claudia google login" to reconnect.`);
+  } else {
+    console.log('Not signed in to any Google services.');
+  }
+}
+
 // ── Shared status command ──
 
 export async function googleStatusCommand() {
@@ -234,6 +361,7 @@ export async function googleStatusCommand() {
   output({
     gmail: { connected: status.gmail, login_command: 'claudia gmail login' },
     calendar: { connected: status.calendar, login_command: 'claudia calendar login' },
+    unified_login: 'claudia google login',
     tokens_dir: '~/.claudia/tokens/',
   });
 }

package/cli/core/google-oauth.js

@@ -45,6 +45,13 @@ const SCOPES = {
     'https://www.googleapis.com/auth/calendar.readonly',
     'https://www.googleapis.com/auth/calendar.events',
   ],
+  google: [
+    'https://www.googleapis.com/auth/gmail.readonly',
+    'https://www.googleapis.com/auth/gmail.send',
+    'https://www.googleapis.com/auth/gmail.modify',
+    'https://www.googleapis.com/auth/calendar.readonly',
+    'https://www.googleapis.com/auth/calendar.events',
+  ],
 };
 
 // ── Credential resolution ──
@@ -75,12 +82,12 @@ function getCredentials() {
 /**
  * Run the full OAuth browser flow for a service.
  * Opens the user's browser, waits for consent, stores tokens locally.
- * @param {'gmail'|'calendar'} service
+ * @param {'gmail'|'calendar'|'google'} service
  * @returns {Promise<{access_token: string, refresh_token: string}>}
  */
 export async function authenticate(service) {
   const scopes = SCOPES[service];
-  if (!scopes) throw new Error(`Unknown service: ${service}. Use "gmail" or "calendar".`);
+  if (!scopes) throw new Error(`Unknown service: ${service}. Use "gmail", "calendar", or "google".`);
 
   const { clientId, clientSecret } = getCredentials();
 
@@ -101,6 +108,7 @@ export async function authenticate(service) {
 
   console.log(`\nOpening your browser to sign in with Google...`);
   console.log(`If it doesn't open, visit:\n  ${authUrl.toString()}\n`);
+  console.log(`Waiting for browser authorization...`);
 
   // 3. Start local server, open browser, wait for callback
   const code = await new Promise((resolve, reject) => {
@@ -134,8 +142,7 @@ export async function authenticate(service) {
       }
 
       res.writeHead(200, { 'Content-Type': 'text/html' });
-      const serviceName = service === 'calendar' ? 'Google Calendar' : 'Gmail';
-      res.end(htmlPage('Connected!', `Claudia now has access to your ${serviceName}. Here's what she can do:`, service));
+      res.end(htmlPage('Connected', `You're all set. Claudia is now connected.`, service));
       server.close();
       resolve(authCode);
     });
@@ -154,17 +161,28 @@ export async function authenticate(service) {
   });
 
   // 4. Exchange authorization code for tokens
-  const tokenResp = await fetch('https://oauth2.googleapis.com/token', {
-    method: 'POST',
-    headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-    body: new URLSearchParams({
-      code,
-      client_id: clientId,
-      client_secret: clientSecret,
-      redirect_uri: redirectUri,
-      grant_type: 'authorization_code',
-    }),
-  });
+  console.log(`Token received, finishing setup...`);
+
+  const controller = new AbortController();
+  const fetchTimeout = setTimeout(() => controller.abort(), 10_000);
+
+  let tokenResp;
+  try {
+    tokenResp = await fetch('https://oauth2.googleapis.com/token', {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+      body: new URLSearchParams({
+        code,
+        client_id: clientId,
+        client_secret: clientSecret,
+        redirect_uri: redirectUri,
+        grant_type: 'authorization_code',
+      }),
+      signal: controller.signal,
+    });
+  } finally {
+    clearTimeout(fetchTimeout);
+  }
 
   if (!tokenResp.ok) {
     const errBody = await tokenResp.text();
@@ -182,7 +200,14 @@ export async function authenticate(service) {
     scopes,
     created: new Date().toISOString(),
   };
-  writeFileSync(join(TOKENS_DIR, `${service}.json`), JSON.stringify(tokenData, null, 2));
+
+  if (service === 'google') {
+    // Unified login: save tokens for both gmail and calendar
+    writeFileSync(join(TOKENS_DIR, 'gmail.json'), JSON.stringify(tokenData, null, 2));
+    writeFileSync(join(TOKENS_DIR, 'calendar.json'), JSON.stringify(tokenData, null, 2));
+  } else {
+    writeFileSync(join(TOKENS_DIR, `${service}.json`), JSON.stringify(tokenData, null, 2));
+  }
 
   return tokens;
 }
@@ -291,23 +316,45 @@ function openBrowser(url) {
 }
 
 function htmlPage(title, message, service) {
-  const isSuccess = title === 'Connected!';
-  const LOGO_BASE64 = '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';
+  const isSuccess = title === 'Connected';
 
   const features = {
     gmail: [
-      ['Search & read emails', 'Ask Claudia to find emails by sender, subject, or content'],
-      ['Draft & send replies', 'Claudia can compose emails with your tone and context'],
-      ['Inbox triage', 'Get a morning brief of what needs attention'],
+      ['Search & read emails', 'Find emails by sender, subject, or content'],
+      ['Draft & send replies', 'Compose emails with your tone and context'],
+      ['Inbox triage', 'Morning brief of what needs attention'],
     ],
     calendar: [
-      ['View your schedule', 'Claudia sees upcoming events for meeting prep'],
-      ['Create events', 'Schedule meetings through natural conversation'],
-      ['Time awareness', 'Claudia knows when you\'re busy or free'],
+      ['View your schedule', 'See upcoming events for meeting prep'],
+      ['Create events', 'Schedule meetings through conversation'],
+      ['Time awareness', 'Know when you\'re busy or free'],
     ],
   };
 
-  const serviceFeatures = features[service] || features.gmail;
+  // For unified 'google' login, show both sets of features
+  const showGmail = service === 'gmail' || service === 'google';
+  const showCalendar = service === 'calendar' || service === 'google';
+
+  const featureCards = [];
+  if (showGmail) {
+    for (const [name, desc] of features.gmail) {
+      featureCards.push({ icon: '&#128233;', name, desc });
+    }
+  }
+  if (showCalendar) {
+    for (const [name, desc] of features.calendar) {
+      featureCards.push({ icon: '&#128197;', name, desc });
+    }
+  }
+
+  const serviceName = service === 'google' ? 'Gmail & Google Calendar'
+    : service === 'calendar' ? 'Google Calendar' : 'Gmail';
+
+  const featuresHtml = featureCards.map((f, i) => `
+    <div class="feature" style="animation-delay:${0.1 + i * 0.08}s">
+      <div class="feature-icon">${f.icon}</div>
+      <div class="feature-text"><h3>${f.name}</h3><p>${f.desc}</p></div>
+    </div>`).join('');
 
   return `<!DOCTYPE html>
 <html>
@@ -317,95 +364,70 @@ function htmlPage(title, message, service) {
   body {
     font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif;
     display: flex; justify-content: center; align-items: center; min-height: 100vh;
-    background: #09090b; color: #e0e0e0;
-    background-image: radial-gradient(ellipse at 50% 0%, rgba(124,111,239,0.12) 0%, transparent 50%);
+    background: #F0F0F0; color: #1d1d1f;
   }
   .card {
-    text-align: center; padding: 2.5rem 3rem 2rem; border-radius: 20px;
-    background: #131316; border: 1px solid #27272a; max-width: 480px; width: 100%;
-    box-shadow: 0 8px 32px rgba(0,0,0,0.4), 0 0 0 1px rgba(124,111,239,0.06);
-  }
-  .logo { margin-bottom: 1.25rem; }
-  .logo img {
-    width: 64px; height: auto; image-rendering: pixelated;
-    ${isSuccess ? 'animation: float 3s ease-in-out infinite;' : ''}
+    text-align: center; padding: 2.5rem 2.5rem 2rem; border-radius: 16px;
+    background: #fff; max-width: 440px; width: 100%;
+    box-shadow: 0 4px 24px rgba(0,0,0,0.08), 0 1px 3px rgba(0,0,0,0.04);
   }
-  @keyframes float {
-    0%, 100% { transform: translateY(0); }
-    50% { transform: translateY(-6px); }
-  }
-  .badge {
-    display: inline-flex; align-items: center; gap: 0.4rem;
-    padding: 0.35rem 0.9rem; border-radius: 99px; font-size: 0.78rem; font-weight: 500;
-    margin-bottom: 1.25rem;
+  .checkmark {
+    width: 48px; height: 48px; border-radius: 50%; margin: 0 auto 1.25rem;
+    display: flex; align-items: center; justify-content: center;
     ${isSuccess
-      ? 'background: rgba(124,111,239,0.12); color: #a99ef5; border: 1px solid rgba(124,111,239,0.2);'
-      : 'background: rgba(239,68,68,0.12); color: #fca5a5; border: 1px solid rgba(239,68,68,0.2);'}
-    ${isSuccess ? 'animation: fadeIn 0.5s ease;' : ''}
+      ? 'background: #00CED1; color: #fff;'
+      : 'background: #ef4444; color: #fff;'}
+    font-size: 1.4rem; font-weight: bold;
+    animation: popIn 0.4s cubic-bezier(0.175,0.885,0.32,1.275);
   }
-  @keyframes fadeIn { 0% { opacity: 0; transform: translateY(8px); } 100% { opacity: 1; transform: translateY(0); } }
+  @keyframes popIn { 0% { transform: scale(0); } 100% { transform: scale(1); } }
   h1 {
-    color: ${isSuccess ? '#e4e2ff' : '#fca5a5'}; font-size: 1.35rem;
-    font-weight: 600; margin-bottom: 0.5rem;
+    color: ${isSuccess ? '#00CED1' : '#ef4444'}; font-size: 1.4rem;
+    font-weight: 600; margin-bottom: 0.4rem;
+  }
+  .subtitle { color: #6e6e73; line-height: 1.5; font-size: 0.9rem; margin-bottom: 1.5rem; }
+  .service-label {
+    display: inline-block; padding: 0.2rem 0.7rem; border-radius: 99px;
+    font-size: 0.75rem; font-weight: 500; margin-bottom: 1.25rem;
+    background: rgba(0,206,209,0.08); color: #00CED1;
   }
-  .subtitle { color: #71717a; line-height: 1.6; font-size: 0.88rem; margin-bottom: 1.5rem; }
   .features {
     text-align: left; margin: 0 auto 1.5rem; padding: 0;
-    display: flex; flex-direction: column; gap: 0.75rem;
+    display: flex; flex-direction: column; gap: 0.5rem;
   }
   .feature {
-    display: flex; gap: 0.75rem; align-items: flex-start;
-    padding: 0.65rem 0.85rem; border-radius: 10px;
-    background: #18181b; border: 1px solid #27272a;
-    animation: slideIn 0.4s ease backwards;
+    display: flex; gap: 0.65rem; align-items: flex-start;
+    padding: 0.55rem 0.75rem; border-radius: 10px;
+    background: #f9f9fb; border: 1px solid #e8e8ed;
+    animation: slideIn 0.35s ease backwards;
   }
-  .feature:nth-child(1) { animation-delay: 0.1s; }
-  .feature:nth-child(2) { animation-delay: 0.2s; }
-  .feature:nth-child(3) { animation-delay: 0.3s; }
-  @keyframes slideIn { 0% { opacity: 0; transform: translateX(-12px); } 100% { opacity: 1; transform: translateX(0); } }
+  @keyframes slideIn { 0% { opacity: 0; transform: translateY(8px); } 100% { opacity: 1; transform: translateY(0); } }
   .feature-icon {
-    flex-shrink: 0; width: 28px; height: 28px; border-radius: 6px;
-    background: rgba(124,111,239,0.1); display: flex; align-items: center;
-    justify-content: center; font-size: 0.85rem; margin-top: 1px;
+    flex-shrink: 0; width: 26px; height: 26px; border-radius: 6px;
+    background: rgba(0,206,209,0.08); display: flex; align-items: center;
+    justify-content: center; font-size: 0.8rem; margin-top: 1px;
   }
-  .feature-text h3 { font-size: 0.82rem; font-weight: 500; color: #d4d4d8; margin-bottom: 2px; }
-  .feature-text p { font-size: 0.75rem; color: #52525b; line-height: 1.4; }
-  .divider { border: none; border-top: 1px solid #27272a; margin: 0 0 1rem; }
-  .footer { color: #3f3f46; font-size: 0.75rem; line-height: 1.5; }
-  .footer .privacy { color: #52525b; margin-bottom: 0.35rem; }
-  .footer .close { color: #3f3f46; }
+  .feature-text h3 { font-size: 0.8rem; font-weight: 500; color: #1d1d1f; margin-bottom: 1px; }
+  .feature-text p { font-size: 0.72rem; color: #86868b; line-height: 1.4; }
+  hr { border: none; border-top: 1px solid #e8e8ed; margin: 0 0 0.85rem; }
+  .footer { color: #86868b; font-size: 0.72rem; line-height: 1.6; }
+  .footer .close { color: #aeaeb2; margin-top: 0.25rem; }
 </style></head>
 <body>
 <div class="card">
-  <div class="logo">
-    <img src="data:image/png;base64,${LOGO_BASE64}" alt="Claudia" />
-  </div>
-  <div class="badge">${isSuccess ? '&#10003; Connected' : '&#10007; Failed'}</div>
-  <h1>${title}</h1>
-  <p class="subtitle">${message}</p>
+  <div class="checkmark">${isSuccess ? '&#10003;' : '&#10007;'}</div>
+  <h1>${isSuccess ? serviceName + ' Connected' : title}</h1>
+  <p class="subtitle">${isSuccess ? 'You can close this tab and return to your terminal.' : message}</p>
   ${isSuccess ? `
-  <div class="features">
-    <div class="feature">
-      <div class="feature-icon">${service === 'calendar' ? '&#128197;' : '&#128233;'}</div>
-      <div class="feature-text"><h3>${serviceFeatures[0][0]}</h3><p>${serviceFeatures[0][1]}</p></div>
-    </div>
-    <div class="feature">
-      <div class="feature-icon">${service === 'calendar' ? '&#9201;' : '&#9997;'}</div>
-      <div class="feature-text"><h3>${serviceFeatures[1][0]}</h3><p>${serviceFeatures[1][1]}</p></div>
-    </div>
-    <div class="feature">
-      <div class="feature-icon">${service === 'calendar' ? '&#128276;' : '&#128203;'}</div>
-      <div class="feature-text"><h3>${serviceFeatures[2][0]}</h3><p>${serviceFeatures[2][1]}</p></div>
-    </div>
-  </div>
-  <hr class="divider" />
+  <div class="service-label">What Claudia can do</div>
+  <div class="features">${featuresHtml}</div>
+  <hr />
   <div class="footer">
-    <div class="privacy">&#128274; Your tokens are stored locally and never leave your machine.</div>
-    <div class="close">You can close this tab and return to your terminal.</div>
+    <div>&#128274; Tokens stored locally. They never leave your machine.</div>
   </div>
   ` : `
-  <div class="footer" style="margin-top:1rem;">
-    <div class="close">Check your terminal for details, then try again.</div>
+  <div class="footer" style="margin-top:0.5rem;">
+    <div>Check your terminal for details, then try again.</div>
   </div>
   `}
 </div>

package/cli/index.js

@@ -570,7 +570,7 @@ gmail
 // ── Calendar subcommand group ──
 const calendar = program
   .command('calendar')
-  .description('Google Calendar integration (login, list events)');
+  .description('Google Calendar integration (login, list, search, read)');
 
 calendar
   .command('login')
@@ -598,6 +598,27 @@ calendar
     await calendarListCommand(opts);
   });
 
+calendar
+  .command('search')
+  .description('Search calendar events by text')
+  .argument('<query>', 'Search query, e.g. "meeting" or "lunch"')
+  .option('--days <n>', 'Days ahead to search', parseInt, 90)
+  .option('--limit <n>', 'Max results', parseInt, 25)
+  .option('--past', 'Also search past events within range')
+  .action(async (query, opts) => {
+    const { calendarSearchCommand } = await import('./commands/google-auth.js');
+    await calendarSearchCommand(query, opts);
+  });
+
+calendar
+  .command('read')
+  .description('Read a specific calendar event by ID')
+  .argument('<eventId>', 'Calendar event ID')
+  .action(async (eventId) => {
+    const { calendarReadCommand } = await import('./commands/google-auth.js');
+    await calendarReadCommand(eventId);
+  });
+
 calendar
   .command('logout')
   .description('Sign out of Calendar (remove stored tokens)')
@@ -606,14 +627,34 @@ calendar
     await calendarLogoutCommand();
   });
 
-// ── Google status (combined) ──
-program
-  .command('google-status')
+// ── Unified Google command group ──
+const google = program
+  .command('google')
+  .description('Google services (login, status, logout for Gmail + Calendar)');
+
+google
+  .command('login')
+  .description('Sign in once for both Gmail and Calendar')
+  .action(async () => {
+    const { googleLoginCommand } = await import('./commands/google-auth.js');
+    await googleLoginCommand();
+  });
+
+google
+  .command('status')
   .description('Show connection status for all Google services')
   .action(async () => {
     const { googleStatusCommand } = await import('./commands/google-auth.js');
     await googleStatusCommand();
   });
 
+google
+  .command('logout')
+  .description('Sign out of all Google services')
+  .action(async () => {
+    const { googleLogoutCommand } = await import('./commands/google-auth.js');
+    await googleLogoutCommand();
+  });
+
 // Parse and execute
 program.parseAsync(process.argv);

package/package.json

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

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

@@ -1,36 +1,16 @@
 {
   "mcpServers": {
-
-    "gmail": {
-      "_disabled": true,
-      "command": "npx",
-      "args": ["-y", "@gongrzhe/server-gmail-autoauth-mcp"],
-      "_setup": "Remove _disabled, restart Claude Code, authenticate when browser opens"
-    },
-
-    "google-calendar": {
-      "_disabled": true,
-      "command": "npx",
-      "args": ["-y", "@modelcontextprotocol/server-google-calendar"],
-      "_setup": "Remove _disabled, restart Claude Code, authenticate when browser opens"
-    }
-
   },
 
   "_notes": {
-    "quick_start": [
-      "1. Rename this file to .mcp.json",
-      "2. Remove _disabled from servers you want",
-      "3. Restart Claude Code",
-      "4. Gmail/Calendar will open a browser for you to authenticate with YOUR Google account"
-    ],
-    "memory": "Claudia's memory system now uses the `claudia` CLI (via Bash tool), not MCP. No MCP server needed for memory.",
+    "gmail_and_calendar": "Claudia has built-in Gmail and Calendar support. Run 'claudia google login' to connect. No MCP server needed.",
+    "memory": "Claudia's memory system uses the 'claudia' CLI (via Bash tool), not MCP. No MCP server needed for memory.",
     "security": "Each user authenticates with their own accounts. OAuth tokens are stored locally on your machine, never shared.",
     "not_included": {
       "filesystem": "Claude Code has native Read/Write/Edit tools",
       "web-search": "Claude Code has native WebSearch",
       "fetch": "Claude Code has native WebFetch"
     },
-    "more_servers": "Find more at mcp.so or github.com/modelcontextprotocol/servers"
+    "adding_servers": "Add MCP servers here if needed. Find more at mcp.so or github.com/modelcontextprotocol/servers"
   }
 }

package/template-v2/CLAUDE.md

@@ -321,16 +321,20 @@ I adapt to whatever tools are available. When you ask me to do something that ne
 
 | Command | What it does |
 |---------|-------------|
-| `claudia gmail login` | Opens browser for Google OAuth sign-in |
+| `claudia google login` | Sign in once for both Gmail + Calendar |
+| `claudia google status` | Show connection status for all services |
+| `claudia google logout` | Disconnect all Google services |
+| `claudia gmail login` | Opens browser for Gmail-only OAuth |
 | `claudia gmail status` | Check if Gmail is connected |
 | `claudia gmail search "<query>"` | Search emails (Gmail search syntax) |
 | `claudia gmail read <messageId>` | Read a specific email |
 | `claudia gmail logout` | Disconnect Gmail, remove tokens |
-| `claudia calendar login` | Opens browser for Google Calendar OAuth |
+| `claudia calendar login` | Opens browser for Calendar-only OAuth |
 | `claudia calendar status` | Check if Calendar is connected |
 | `claudia calendar list` | Show upcoming events |
+| `claudia calendar search "<query>"` | Search events by text |
+| `claudia calendar read <eventId>` | Read a specific event by ID |
 | `claudia calendar logout` | Disconnect Calendar, remove tokens |
-| `claudia google-status` | Show status of all Google connections |
 
 These are **real CLI commands**, not questions. Always run them via the Bash tool. Tokens are stored locally at `~/.claudia/tokens/`.