@plosson/agentio 0.5.4 → 0.5.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plosson/agentio",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "description": "CLI for LLM agents to interact with communication and tracking services",
   "type": "module",
   "license": "MIT",
@@ -46,10 +46,16 @@
     "typescript": "^5.9.3"
   },
   "dependencies": {
+    "@googleapis/calendar": "^14.2.0",
+    "@googleapis/chat": "^44.6.0",
+    "@googleapis/drive": "^20.0.1",
+    "@googleapis/gmail": "^16.1.1",
+    "@googleapis/sheets": "^13.0.1",
+    "@googleapis/tasks": "^12.0.0",
     "@inquirer/prompts": "^8.2.0",
     "@whiskeysockets/baileys": "^7.0.0-rc.9",
     "commander": "^14.0.2",
-    "googleapis": "^169.0.0",
+    "google-auth-library": "^9.0.0",
     "libsodium-wrappers": "^0.8.1",
     "qrcode-terminal": "^0.12.0",
     "rss-parser": "^3.13.0"

package/src/auth/oauth.ts

@@ -1,4 +1,4 @@
-import { google } from 'googleapis';
+import { OAuth2Client } from 'google-auth-library';
 import { GOOGLE_OAUTH_CONFIG } from '../config/credentials';
 import { findAvailablePort, startOAuthCallbackServer, launchBrowser } from './oauth-server';
 import type { OAuthTokens } from '../types/tokens';
@@ -70,7 +70,7 @@ export async function performOAuthFlow(
   const port = await findAvailablePort();
   const redirectUri = `http://localhost:${port}/callback`;
 
-  const oauth2Client = new google.auth.OAuth2(
+  const oauth2Client = new OAuth2Client(
     GOOGLE_OAUTH_CONFIG.clientId,
     GOOGLE_OAUTH_CONFIG.clientSecret,
     redirectUri

package/src/auth/token-manager.ts

@@ -1,4 +1,4 @@
-import { google } from 'googleapis';
+import { OAuth2Client } from 'google-auth-library';
 import { getCredentials, setCredentials } from './token-store';
 import { resolveProfile } from '../config/config-manager';
 import { GOOGLE_OAUTH_CONFIG } from '../config/credentials';
@@ -56,7 +56,7 @@ async function refreshTokens(
   profileName: string,
   tokens: OAuthTokens
 ): Promise<OAuthTokens> {
-  const oauth2Client = new google.auth.OAuth2(
+  const oauth2Client = new OAuth2Client(
     GOOGLE_OAUTH_CONFIG.clientId,
     GOOGLE_OAUTH_CONFIG.clientSecret
   );
@@ -89,7 +89,7 @@ async function refreshTokens(
 }
 
 export function createGoogleAuth(tokens: OAuthTokens) {
-  const oauth2Client = new google.auth.OAuth2(
+  const oauth2Client = new OAuth2Client(
     GOOGLE_OAUTH_CONFIG.clientId,
     GOOGLE_OAUTH_CONFIG.clientSecret
   );
@@ -102,3 +102,25 @@ export function createGoogleAuth(tokens: OAuthTokens) {
 
   return oauth2Client;
 }
+
+/**
+ * Fetch user email from Google's userinfo endpoint
+ */
+export async function fetchGoogleUserEmail(accessToken: string): Promise<string> {
+  const response = await fetch('https://www.googleapis.com/oauth2/v2/userinfo', {
+    headers: {
+      Authorization: `Bearer ${accessToken}`,
+    },
+  });
+
+  if (!response.ok) {
+    throw new Error(`Failed to fetch user info: ${response.status}`);
+  }
+
+  const data = await response.json() as { email?: string };
+  if (!data.email) {
+    throw new Error('No email returned from userinfo endpoint');
+  }
+
+  return data.email;
+}

package/src/commands/gcal.ts

@@ -1,6 +1,6 @@
 import { Command } from 'commander';
-import { google } from 'googleapis';
-import { getValidTokens, createGoogleAuth } from '../auth/token-manager';
+import { calendar } from '@googleapis/calendar';
+import { getValidTokens, createGoogleAuth, fetchGoogleUserEmail } from '../auth/token-manager';
 import { setCredentials } from '../auth/token-store';
 import { setProfile } from '../config/config-manager';
 import { createProfileCommands } from '../utils/profile-commands';
@@ -365,13 +365,11 @@ export function registerGCalCommands(program: Command): void {
 
         const tokens = await performOAuthFlow('gcal');
 
-        // Fetch the user's email from calendar settings
-        const auth = createGoogleAuth(tokens);
-        const calendar = google.calendar({ version: 'v3', auth });
-        const settings = await calendar.calendarList.get({ calendarId: 'primary' });
-        const email = settings.data.id;
-
-        if (!email) {
+        // Fetch the user's email
+        let email: string;
+        try {
+          email = await fetchGoogleUserEmail(tokens.access_token);
+        } catch (error) {
           throw new CliError('AUTH_FAILED', 'Could not fetch email from Calendar', 'Try again or specify --profile manually');
         }
 

package/src/commands/gchat.ts

@@ -1,12 +1,12 @@
 import { Command } from 'commander';
-import { google } from 'googleapis';
+import { chat as gchat } from '@googleapis/chat';
 import { readFile } from 'fs/promises';
 import { setCredentials } from '../auth/token-store';
 import { setProfile } from '../config/config-manager';
 import { createProfileCommands } from '../utils/profile-commands';
 import { createClientGetter } from '../utils/client-factory';
 import { performOAuthFlow } from '../auth/oauth';
-import { createGoogleAuth } from '../auth/token-manager';
+import { createGoogleAuth, fetchGoogleUserEmail } from '../auth/token-manager';
 import { GChatClient } from '../services/gchat/client';
 import { CliError, handleError } from '../utils/errors';
 import { readStdin, prompt } from '../utils/stdin';
@@ -286,12 +286,7 @@ async function setupOAuthProfile(profileNameOverride?: string, readOnly?: boolea
   // Fetch user email for profile naming
   let userEmail: string;
   try {
-    const oauth2 = google.oauth2({ version: 'v2', auth });
-    const userInfo = await oauth2.userinfo.get();
-    userEmail = userInfo.data.email || '';
-    if (!userEmail) {
-      throw new Error('No email returned');
-    }
+    userEmail = await fetchGoogleUserEmail(tokens.access_token);
   } catch (error) {
     const errorMessage = error instanceof Error ? error.message : String(error);
     throw new CliError(
@@ -303,8 +298,8 @@ async function setupOAuthProfile(profileNameOverride?: string, readOnly?: boolea
 
   // Validate the token works with Chat API
   try {
-    const chat = google.chat({ version: 'v1', auth });
-    await chat.spaces.list({ pageSize: 1 });
+    const chatApi = gchat({ version: 'v1', auth: auth as any });
+    await chatApi.spaces.list({ pageSize: 1 });
   } catch (error) {
     const errorMessage = error instanceof Error ? error.message : String(error);
     throw new CliError(

package/src/commands/gdocs.ts

@@ -1,7 +1,6 @@
 import { Command } from 'commander';
 import { writeFile } from 'fs/promises';
-import { google } from 'googleapis';
-import { createGoogleAuth } from '../auth/token-manager';
+import { createGoogleAuth, fetchGoogleUserEmail } from '../auth/token-manager';
 import { setCredentials } from '../auth/token-store';
 import { setProfile } from '../config/config-manager';
 import { createProfileCommands } from '../utils/profile-commands';
@@ -146,17 +145,11 @@ Query Syntax Examples:
         console.error('Starting OAuth flow for Google Docs...\n');
 
         const tokens = await performOAuthFlow('gdocs');
-        const auth = createGoogleAuth(tokens);
 
         // Fetch user email for profile naming
         let userEmail: string;
         try {
-          const oauth2 = google.oauth2({ version: 'v2', auth });
-          const userInfo = await oauth2.userinfo.get();
-          userEmail = userInfo.data.email || '';
-          if (!userEmail) {
-            throw new Error('No email returned');
-          }
+          userEmail = await fetchGoogleUserEmail(tokens.access_token);
         } catch (error) {
           const errorMessage = error instanceof Error ? error.message : String(error);
           throw new CliError(

package/src/commands/gdrive.ts

@@ -1,6 +1,5 @@
 import { Command } from 'commander';
-import { google } from 'googleapis';
-import { createGoogleAuth } from '../auth/token-manager';
+import { createGoogleAuth, fetchGoogleUserEmail } from '../auth/token-manager';
 import { setCredentials } from '../auth/token-store';
 import { setProfile } from '../config/config-manager';
 import { createProfileCommands } from '../utils/profile-commands';
@@ -246,16 +245,10 @@ Examples:
         console.error(`\nStarting OAuth flow (${accessLevel} access)...\n`);
 
         const tokens = await performOAuthFlow(oauthService);
-        const auth = createGoogleAuth(tokens);
 
         let userEmail: string;
         try {
-          const oauth2 = google.oauth2({ version: 'v2', auth });
-          const userInfo = await oauth2.userinfo.get();
-          userEmail = userInfo.data.email || '';
-          if (!userEmail) {
-            throw new Error('No email returned');
-          }
+          userEmail = await fetchGoogleUserEmail(tokens.access_token);
         } catch (error) {
           const errorMessage = error instanceof Error ? error.message : String(error);
           throw new CliError(

package/src/commands/gmail.ts

@@ -1,8 +1,7 @@
 import { Command } from 'commander';
 import { basename, join } from 'path';
 import { tmpdir } from 'os';
-import { google } from 'googleapis';
-import { getValidTokens, createGoogleAuth } from '../auth/token-manager';
+import { getValidTokens, createGoogleAuth, fetchGoogleUserEmail } from '../auth/token-manager';
 import { setCredentials } from '../auth/token-store';
 import { setProfile } from '../config/config-manager';
 import { createProfileCommands } from '../utils/profile-commands';
@@ -471,12 +470,10 @@ ${emailHeader}
         const tokens = await performOAuthFlow('gmail');
 
         // Fetch the user's email to store with the profile
-        const auth = createGoogleAuth(tokens);
-        const gmailApi = google.gmail({ version: 'v1', auth });
-        const userProfile = await gmailApi.users.getProfile({ userId: 'me' });
-        const email = userProfile.data.emailAddress;
-
-        if (!email) {
+        let email: string;
+        try {
+          email = await fetchGoogleUserEmail(tokens.access_token);
+        } catch (error) {
           throw new CliError('AUTH_FAILED', 'Could not fetch email from Gmail', 'Try again or specify --profile manually');
         }
 

package/src/commands/gsheets.ts

@@ -1,7 +1,6 @@
 import { Command } from 'commander';
 import { writeFile } from 'fs/promises';
-import { google } from 'googleapis';
-import { createGoogleAuth } from '../auth/token-manager';
+import { createGoogleAuth, fetchGoogleUserEmail } from '../auth/token-manager';
 import { setCredentials } from '../auth/token-store';
 import { setProfile } from '../config/config-manager';
 import { createProfileCommands } from '../utils/profile-commands';
@@ -332,17 +331,11 @@ Examples:
         console.error('Starting OAuth flow for Google Sheets...\n');
 
         const tokens = await performOAuthFlow('gsheets');
-        const auth = createGoogleAuth(tokens);
 
         // Fetch user email for profile naming
         let userEmail: string;
         try {
-          const oauth2 = google.oauth2({ version: 'v2', auth });
-          const userInfo = await oauth2.userinfo.get();
-          userEmail = userInfo.data.email || '';
-          if (!userEmail) {
-            throw new Error('No email returned');
-          }
+          userEmail = await fetchGoogleUserEmail(tokens.access_token);
         } catch (error) {
           const errorMessage = error instanceof Error ? error.message : String(error);
           throw new CliError('AUTH_FAILED', `Failed to fetch user email: ${errorMessage}`, 'Ensure the account has an email address');

package/src/commands/gtasks.ts

@@ -1,6 +1,5 @@
 import { Command } from 'commander';
-import { google } from 'googleapis';
-import { getValidTokens, createGoogleAuth } from '../auth/token-manager';
+import { getValidTokens, createGoogleAuth, fetchGoogleUserEmail } from '../auth/token-manager';
 import { setCredentials } from '../auth/token-store';
 import { setProfile } from '../config/config-manager';
 import { createProfileCommands } from '../utils/profile-commands';
@@ -313,13 +312,11 @@ export function registerGTasksCommands(program: Command): void {
 
         const tokens = await performOAuthFlow('gtasks');
 
-        // Fetch user email via oauth2 userinfo
-        const auth = createGoogleAuth(tokens);
-        const oauth2 = google.oauth2({ version: 'v2', auth });
-        const userInfo = await oauth2.userinfo.get();
-        const email = userInfo.data.email;
-
-        if (!email) {
+        // Fetch user email
+        let email: string;
+        try {
+          email = await fetchGoogleUserEmail(tokens.access_token);
+        } catch (error) {
           throw new CliError('AUTH_FAILED', 'Could not fetch email', 'Try again or specify --profile manually');
         }
 

package/src/services/gcal/client.ts

@@ -1,4 +1,4 @@
-import { google, calendar_v3 } from 'googleapis';
+import { calendar, type calendar_v3 } from '@googleapis/calendar';
 import type { OAuth2Client } from 'google-auth-library';
 import type {
   GCalCalendar,
@@ -18,7 +18,7 @@ export class GCalClient implements ServiceClient {
   private userEmail: string | null = null;
 
   constructor(auth: OAuth2Client) {
-    this.calendar = google.calendar({ version: 'v3', auth });
+    this.calendar = calendar({ version: 'v3', auth: auth as any });
   }
 
   async validate(): Promise<ValidationResult> {

package/src/services/gchat/client.ts

@@ -1,5 +1,5 @@
-import { google } from 'googleapis';
-import type { chat_v1 } from 'googleapis';
+import { chat as gchat, type chat_v1 } from '@googleapis/chat';
+import { OAuth2Client } from 'google-auth-library';
 import { CliError, httpStatusToErrorCode, type ErrorCode } from '../../utils/errors';
 import type { ServiceClient, ValidationResult } from '../../types/service';
 import { GOOGLE_OAUTH_CONFIG } from '../../config/credentials';
@@ -31,7 +31,7 @@ export class GChatClient implements ServiceClient {
     try {
       const oauthCreds = this.credentials as GChatOAuthCredentials;
       const auth = this.createOAuthClient(oauthCreds);
-      const chat = google.chat({ version: 'v1', auth });
+      const chat = gchat({ version: 'v1', auth: auth as any });
       await chat.spaces.list({ pageSize: 1 });
       return { valid: true, info: 'oauth' };
     } catch (error) {
@@ -161,7 +161,7 @@ export class GChatClient implements ServiceClient {
   private async sendViaOAuth(options: GChatSendOptions & { spaceId?: string }): Promise<GChatSendResult> {
     const oauthCreds = this.credentials as GChatOAuthCredentials;
     const auth = this.createOAuthClient(oauthCreds);
-    const chat = google.chat({ version: 'v1', auth });
+    const chat = gchat({ version: 'v1', auth: auth as any });
 
     if (!options.spaceId) {
       throw new CliError(
@@ -202,7 +202,7 @@ export class GChatClient implements ServiceClient {
   private async listViaOAuth(options: GChatListOptions): Promise<GChatMessage[]> {
     const oauthCreds = this.credentials as GChatOAuthCredentials;
     const auth = this.createOAuthClient(oauthCreds);
-    const chat = google.chat({ version: 'v1', auth });
+    const chat = gchat({ version: 'v1', auth: auth as any });
 
     try {
       // Build filter from options
@@ -258,7 +258,7 @@ export class GChatClient implements ServiceClient {
   private async getViaOAuth(options: GChatGetOptions): Promise<GChatMessage> {
     const oauthCreds = this.credentials as GChatOAuthCredentials;
     const auth = this.createOAuthClient(oauthCreds);
-    const chat = google.chat({ version: 'v1', auth });
+    const chat = gchat({ version: 'v1', auth: auth as any });
 
     try {
       const response = await chat.spaces.messages.get({
@@ -303,7 +303,7 @@ export class GChatClient implements ServiceClient {
   private async listSpacesViaOAuth(): Promise<GChatSpace[]> {
     const oauthCreds = this.credentials as GChatOAuthCredentials;
     const auth = this.createOAuthClient(oauthCreds);
-    const chat = google.chat({ version: 'v1', auth });
+    const chat = gchat({ version: 'v1', auth: auth as any });
 
     try {
       const response = await chat.spaces.list({});
@@ -353,7 +353,7 @@ export class GChatClient implements ServiceClient {
   }
 
   private createOAuthClient(credentials: GChatOAuthCredentials) {
-    const oauth2Client = new google.auth.OAuth2(
+    const oauth2Client = new OAuth2Client(
       GOOGLE_OAUTH_CONFIG.clientId,
       GOOGLE_OAUTH_CONFIG.clientSecret
     );

package/src/services/gdocs/client.ts

@@ -1,6 +1,6 @@
 import { Readable } from 'stream';
-import { google } from 'googleapis';
-import type { drive_v3 } from 'googleapis';
+import { drive, type drive_v3 } from '@googleapis/drive';
+import { OAuth2Client } from 'google-auth-library';
 import { CliError, httpStatusToErrorCode, type ErrorCode } from '../../utils/errors';
 import type { ServiceClient, ValidationResult } from '../../types/service';
 import { GOOGLE_OAUTH_CONFIG } from '../../config/credentials';
@@ -13,7 +13,7 @@ export class GDocsClient implements ServiceClient {
   constructor(credentials: GDocsCredentials) {
     this.credentials = credentials;
     const auth = this.createOAuthClient();
-    this.drive = google.drive({ version: 'v3', auth });
+    this.drive = drive({ version: 'v3', auth: auth as any });
   }
 
   async validate(): Promise<ValidationResult> {
@@ -121,7 +121,7 @@ export class GDocsClient implements ServiceClient {
   }
 
   private createOAuthClient() {
-    const oauth2Client = new google.auth.OAuth2(
+    const oauth2Client = new OAuth2Client(
       GOOGLE_OAUTH_CONFIG.clientId,
       GOOGLE_OAUTH_CONFIG.clientSecret
     );

package/src/services/gdrive/client.ts

@@ -1,7 +1,7 @@
 import { readFile, writeFile, stat } from 'fs/promises';
 import { basename } from 'path';
-import { google } from 'googleapis';
-import type { drive_v3 } from 'googleapis';
+import { drive, type drive_v3 } from '@googleapis/drive';
+import { OAuth2Client } from 'google-auth-library';
 import { CliError, httpStatusToErrorCode, type ErrorCode } from '../../utils/errors';
 import type { ServiceClient, ValidationResult } from '../../types/service';
 import { GOOGLE_OAUTH_CONFIG } from '../../config/credentials';
@@ -97,7 +97,7 @@ export class GDriveClient implements ServiceClient {
   constructor(credentials: GDriveCredentials) {
     this.credentials = credentials;
     const auth = this.createOAuthClient();
-    this.drive = google.drive({ version: 'v3', auth });
+    this.drive = drive({ version: 'v3', auth: auth as any });
   }
 
   async validate(): Promise<ValidationResult> {
@@ -375,7 +375,7 @@ export class GDriveClient implements ServiceClient {
   }
 
   private createOAuthClient() {
-    const oauth2Client = new google.auth.OAuth2(
+    const oauth2Client = new OAuth2Client(
       GOOGLE_OAUTH_CONFIG.clientId,
       GOOGLE_OAUTH_CONFIG.clientSecret
     );

package/src/services/gmail/client.ts

@@ -1,4 +1,4 @@
-import { google, gmail_v1 } from 'googleapis';
+import { gmail, type gmail_v1 } from '@googleapis/gmail';
 import type { OAuth2Client } from 'google-auth-library';
 import { basename } from 'path';
 import type { GmailMessage, GmailListOptions, GmailSendOptions, GmailReplyOptions, GmailAttachment, GmailAttachmentInfo } from '../../types/gmail';
@@ -44,7 +44,7 @@ export class GmailClient implements ServiceClient {
   private userEmail: string | null = null;
 
   constructor(auth: OAuth2Client) {
-    this.gmail = google.gmail({ version: 'v1', auth });
+    this.gmail = gmail({ version: 'v1', auth: auth as any });
   }
 
   async validate(): Promise<ValidationResult> {

package/src/services/gsheets/client.ts

@@ -1,5 +1,6 @@
-import { google } from 'googleapis';
-import type { sheets_v4, drive_v3 } from 'googleapis';
+import { sheets, type sheets_v4 } from '@googleapis/sheets';
+import { drive, type drive_v3 } from '@googleapis/drive';
+import { OAuth2Client } from 'google-auth-library';
 import { CliError, httpStatusToErrorCode, type ErrorCode } from '../../utils/errors';
 import type { ServiceClient, ValidationResult } from '../../types/service';
 import { GOOGLE_OAUTH_CONFIG } from '../../config/credentials';
@@ -27,8 +28,8 @@ export class GSheetsClient implements ServiceClient {
   constructor(credentials: GSheetsCredentials) {
     this.credentials = credentials;
     const auth = this.createOAuthClient();
-    this.sheets = google.sheets({ version: 'v4', auth });
-    this.drive = google.drive({ version: 'v3', auth });
+    this.sheets = sheets({ version: 'v4', auth: auth as any });
+    this.drive = drive({ version: 'v3', auth: auth as any });
   }
 
   async validate(): Promise<ValidationResult> {
@@ -318,7 +319,7 @@ export class GSheetsClient implements ServiceClient {
   }
 
   private createOAuthClient() {
-    const oauth2Client = new google.auth.OAuth2(
+    const oauth2Client = new OAuth2Client(
       GOOGLE_OAUTH_CONFIG.clientId,
       GOOGLE_OAUTH_CONFIG.clientSecret
     );

package/src/services/gtasks/client.ts

@@ -1,4 +1,4 @@
-import { google, tasks_v1 } from 'googleapis';
+import { tasks, type tasks_v1 } from '@googleapis/tasks';
 import type { OAuth2Client } from 'google-auth-library';
 import type {
   GTaskList,
@@ -15,7 +15,7 @@ export class GTasksClient implements ServiceClient {
   private userEmail: string | null = null;
 
   constructor(auth: OAuth2Client) {
-    this.tasks = google.tasks({ version: 'v1', auth });
+    this.tasks = tasks({ version: 'v1', auth: auth as any });
   }
 
   async validate(): Promise<ValidationResult> {