@plosson/agentio 0.3.1 → 0.4.0

package/src/commands/gdrive.ts

@@ -0,0 +1,285 @@
+import { Command } from 'commander';
+import { google } from 'googleapis';
+import { createGoogleAuth } from '../auth/token-manager';
+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 { GDriveClient } from '../services/gdrive/client';
+import { printGDriveFileList, printGDriveFile, printGDriveDownloaded, printGDriveUploaded } from '../utils/output';
+import { CliError, handleError } from '../utils/errors';
+import { prompt } from '../utils/stdin';
+import type { GDriveCredentials, GDriveAccessLevel } from '../types/gdrive';
+
+const getGDriveClient = createClientGetter<GDriveCredentials, GDriveClient>({
+  service: 'gdrive',
+  createClient: (credentials) => new GDriveClient(credentials),
+});
+
+export function registerGDriveCommands(program: Command): void {
+  const gdrive = program
+    .command('gdrive')
+    .description('Google Drive operations');
+
+  gdrive
+    .command('list')
+    .description('List files')
+    .option('--profile <name>', 'Profile name')
+    .option('--limit <n>', 'Number of files', '20')
+    .option('--folder <id>', 'Folder ID to list (use "root" for root folder)')
+    .option('--query <query>', 'Drive API query filter')
+    .option('--order <field>', 'Order by field', 'modifiedTime desc')
+    .option('--trash', 'Include trashed files')
+    .addHelpText('after', `
+Query Syntax Examples:
+
+  Name search:
+    --query "name contains 'report'"      Files with "report" in name
+    --query "name = 'Budget 2024.xlsx'"   Exact name match
+
+  File type:
+    --query "mimeType = 'application/pdf'"
+    --query "mimeType contains 'image/'"
+
+  Ownership:
+    --query "'me' in owners"              Files you own
+    --query "not 'me' in owners"          Shared with you
+
+  Date filters:
+    --query "modifiedTime > '2024-01-01'"
+    --query "createdTime > '2024-01-01'"
+
+  Properties:
+    --query "starred = true"              Starred files
+    --query "shared = true"               Shared files
+
+  Combined:
+    --query "name contains 'report' and modifiedTime > '2024-01-01'"
+`)
+    .action(async (options) => {
+      try {
+        const { client } = await getGDriveClient(options.profile);
+        const files = await client.list({
+          limit: parseInt(options.limit, 10),
+          folderId: options.folder,
+          query: options.query,
+          orderBy: options.order,
+          includeTrash: options.trash,
+        });
+        printGDriveFileList(files);
+      } catch (error) {
+        handleError(error);
+      }
+    });
+
+  gdrive
+    .command('folders')
+    .description('List folders')
+    .option('--profile <name>', 'Profile name')
+    .option('--limit <n>', 'Number of folders', '20')
+    .option('--parent <id>', 'Parent folder ID (use "root" for root folder)')
+    .option('--query <query>', 'Additional query filter')
+    .action(async (options) => {
+      try {
+        const { client } = await getGDriveClient(options.profile);
+        const folders = await client.listFolders({
+          limit: parseInt(options.limit, 10),
+          parentId: options.parent,
+          query: options.query,
+        });
+        printGDriveFileList(folders, 'Folders');
+      } catch (error) {
+        handleError(error);
+      }
+    });
+
+  gdrive
+    .command('get <file-id-or-url>')
+    .description('Get file metadata')
+    .option('--profile <name>', 'Profile name')
+    .action(async (fileIdOrUrl: string, options) => {
+      try {
+        const { client } = await getGDriveClient(options.profile);
+        const file = await client.get(fileIdOrUrl);
+        printGDriveFile(file);
+      } catch (error) {
+        handleError(error);
+      }
+    });
+
+  gdrive
+    .command('search')
+    .description('Search for files')
+    .requiredOption('--query <text>', 'Search text (searches name and content)')
+    .option('--profile <name>', 'Profile name')
+    .option('--limit <n>', 'Number of results', '20')
+    .option('--type <mime>', 'Filter by MIME type')
+    .option('--folder <id>', 'Search within folder')
+    .action(async (options) => {
+      try {
+        const { client } = await getGDriveClient(options.profile);
+        const files = await client.search({
+          query: options.query,
+          mimeType: options.type,
+          limit: parseInt(options.limit, 10),
+          folderId: options.folder,
+        });
+        printGDriveFileList(files, 'Search Results');
+      } catch (error) {
+        handleError(error);
+      }
+    });
+
+  gdrive
+    .command('download <file-id-or-url>')
+    .description('Download a file (or export Google Workspace files)')
+    .option('--profile <name>', 'Profile name')
+    .requiredOption('--output <path>', 'Output file path')
+    .option('--export <format>', 'Export format for Google Workspace files (pdf, docx, xlsx, csv, pptx, txt, etc.)')
+    .addHelpText('after', `
+Export Formats:
+
+  Google Docs:    pdf, docx, odt, txt, html, rtf
+  Google Sheets:  xlsx, csv, pdf, ods, tsv
+  Google Slides:  pptx, pdf, odp, txt
+  Google Drawing: pdf, png, jpeg, svg
+
+Examples:
+  agentio gdrive download <doc-id> --output report.pdf --export pdf
+  agentio gdrive download <sheet-id> --output data.csv --export csv
+`)
+    .action(async (fileIdOrUrl: string, options) => {
+      try {
+        const { client } = await getGDriveClient(options.profile);
+        const result = await client.download({
+          fileIdOrUrl,
+          outputPath: options.output,
+          exportFormat: options.export,
+        });
+        printGDriveDownloaded(result);
+      } catch (error) {
+        handleError(error);
+      }
+    });
+
+  gdrive
+    .command('put <file-path>')
+    .description('Upload a file to Google Drive')
+    .option('--profile <name>', 'Profile name')
+    .option('--name <name>', 'Name for the file in Drive (defaults to local filename)')
+    .option('--folder <id>', 'Folder ID to upload to')
+    .option('--type <mime>', 'MIME type (auto-detected if not specified)')
+    .option('--convert', 'Convert to Google Workspace format (Doc, Sheet, or Slides)')
+    .addHelpText('after', `
+Conversion:
+
+  With --convert, supported files are converted to Google Workspace format:
+    docx, doc, odt, txt, html, rtf  →  Google Doc
+    xlsx, xls, ods, csv, tsv        →  Google Sheet
+    pptx, ppt, odp                  →  Google Slides
+
+Examples:
+  agentio gdrive put report.docx --convert     # Creates Google Doc
+  agentio gdrive put data.xlsx --convert       # Creates Google Sheet
+  agentio gdrive put slides.pptx --convert     # Creates Google Slides
+`)
+    .action(async (filePath: string, options) => {
+      try {
+        const { client } = await getGDriveClient(options.profile);
+        const result = await client.upload({
+          filePath,
+          name: options.name,
+          folderId: options.folder,
+          mimeType: options.type,
+          convert: options.convert,
+        });
+        printGDriveUploaded(result);
+      } catch (error) {
+        handleError(error);
+      }
+    });
+
+  // Profile management
+  const profile = createProfileCommands<GDriveCredentials>(gdrive, {
+    service: 'gdrive',
+    displayName: 'Google Drive',
+    getExtraInfo: (credentials) => {
+      if (!credentials) return '';
+      const access = credentials.accessLevel === 'full' ? 'full' : 'read-only';
+      return ` - ${credentials.email} (${access})`;
+    },
+  });
+
+  profile
+    .command('add')
+    .description('Add a new Google Drive profile')
+    .option('--profile <name>', 'Profile name (auto-detected from email if not provided)')
+    .option('--readonly', 'Create a read-only profile (skip access level prompt)')
+    .option('--full', 'Create a full access profile (skip access level prompt)')
+    .action(async (options) => {
+      try {
+        console.error('Google Drive Setup\n');
+
+        let accessLevel: GDriveAccessLevel;
+
+        if (options.readonly) {
+          accessLevel = 'readonly';
+        } else if (options.full) {
+          accessLevel = 'full';
+        } else {
+          console.error('Access level options:');
+          console.error('  1. Read-only  - List, search, download files');
+          console.error('  2. Full       - Read-only + upload, create folders, modify files\n');
+
+          const choice = await prompt('? Select access level (1 or 2): ');
+          accessLevel = choice.trim() === '2' ? 'full' : 'readonly';
+        }
+
+        const oauthService = accessLevel === 'full' ? 'gdrive-full' : 'gdrive-readonly';
+        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');
+          }
+        } 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'
+          );
+        }
+
+        const profileName = options.profile || userEmail;
+
+        const credentials: GDriveCredentials = {
+          accessToken: tokens.access_token,
+          refreshToken: tokens.refresh_token,
+          expiryDate: tokens.expiry_date,
+          tokenType: tokens.token_type,
+          scope: tokens.scope,
+          email: userEmail,
+          accessLevel,
+        };
+
+        await setProfile('gdrive', profileName);
+        await setCredentials('gdrive', profileName, credentials);
+
+        console.log(`\nSuccess! Profile "${profileName}" configured.`);
+        console.log(`   Email: ${userEmail}`);
+        console.log(`   Access: ${accessLevel === 'full' ? 'Full (read & write)' : 'Read-only'}`);
+        console.log(`   Test with: agentio gdrive list --profile ${profileName}`);
+      } catch (error) {
+        handleError(error);
+      }
+    });
+}

package/src/commands/github.ts

@@ -1,39 +1,18 @@
 import { Command } from 'commander';
-import { setCredentials, getCredentials } from '../auth/token-store';
-import { setProfile, getProfile } from '../config/config-manager';
+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 { GitHubClient } from '../services/github/client';
 import { performGitHubOAuthFlow } from '../auth/github-oauth';
 import { generateExportData } from './config';
 import { CliError, handleError } from '../utils/errors';
 import type { GitHubCredentials } from '../types/github';
 
-async function getGitHubClient(profileName: string): Promise<{ client: GitHubClient; profile: string }> {
-  const profile = await getProfile('github', profileName);
-
-  if (!profile) {
-    throw new CliError(
-      'PROFILE_NOT_FOUND',
-      `Profile "${profileName}" not found for github`,
-      'Run: agentio github profile add'
-    );
-  }
-
-  const credentials = await getCredentials<GitHubCredentials>('github', profile);
-
-  if (!credentials) {
-    throw new CliError(
-      'AUTH_FAILED',
-      `No credentials found for github profile "${profile}"`,
-      `Run: agentio github profile add --profile ${profile}`
-    );
-  }
-
-  return {
-    client: new GitHubClient(credentials),
-    profile,
-  };
-}
+const getGitHubClient = createClientGetter<GitHubCredentials, GitHubClient>({
+  service: 'github',
+  createClient: (credentials) => new GitHubClient(credentials),
+});
 
 function parseRepo(repo: string): { owner: string; name: string } {
   const parts = repo.split('/');
@@ -56,7 +35,7 @@ export function registerGitHubCommands(program: Command): void {
     .command('install')
     .description('Install AGENTIO_KEY and AGENTIO_CONFIG as GitHub Actions secrets')
     .argument('<repo>', 'Repository in owner/repo format')
-    .requiredOption('--profile <name>', 'Profile name')
+    .option('--profile <name>', 'Profile name (optional if only one profile exists)')
     .action(async (repo: string, options) => {
       try {
         // Validate repo format
@@ -91,7 +70,7 @@ export function registerGitHubCommands(program: Command): void {
     .command('uninstall')
     .description('Remove AGENTIO_KEY and AGENTIO_CONFIG secrets from a repository')
     .argument('<repo>', 'Repository in owner/repo format')
-    .requiredOption('--profile <name>', 'Profile name')
+    .option('--profile <name>', 'Profile name (optional if only one profile exists)')
     .action(async (repo: string, options) => {
       try {
         // Validate repo format

package/src/commands/gmail.ts

@@ -68,7 +68,7 @@ function findChromePath(): string | null {
   return null;
 }
 
-async function getGmailClient(profileName: string): Promise<{ client: GmailClient; profile: string }> {
+async function getGmailClient(profileName?: string): Promise<{ client: GmailClient; profile: string }> {
   const { tokens, profile } = await getValidTokens('gmail', profileName);
   const auth = createGoogleAuth(tokens);
   return { client: new GmailClient(auth), profile };
@@ -82,7 +82,7 @@ export function registerGmailCommands(program: Command): void {
   gmail
     .command('list')
     .description('List messages')
-    .requiredOption('--profile <name>', 'Profile name')
+    .option('--profile <name>', 'Profile name (optional if only one profile exists)')
     .option('--limit <n>', 'Number of messages', '10')
     .option('--query <query>', 'Gmail search query (see "gmail search --help" for syntax)')
     .option('--label <label>', 'Filter by label (repeatable)', (val, acc: string[]) => [...acc, val], [])
@@ -103,7 +103,7 @@ export function registerGmailCommands(program: Command): void {
   gmail
     .command('get <message-id>')
     .description('Get a message')
-    .requiredOption('--profile <name>', 'Profile name')
+    .option('--profile <name>', 'Profile name (optional if only one profile exists)')
     .option('--format <format>', 'Body format: text, html, or raw', 'text')
     .option('--body-only', 'Output only the message body')
     .action(async (messageId: string, options) => {
@@ -124,7 +124,7 @@ export function registerGmailCommands(program: Command): void {
     .command('search')
     .description('Search messages using Gmail query syntax')
     .requiredOption('--query <query>', 'Search query')
-    .requiredOption('--profile <name>', 'Profile name')
+    .option('--profile <name>', 'Profile name (optional if only one profile exists)')
     .option('--limit <n>', 'Max results', '10')
     .addHelpText('after', `
 Query Syntax Examples:
@@ -178,7 +178,7 @@ Query Syntax Examples:
   gmail
     .command('send')
     .description('Send an email')
-    .requiredOption('--profile <name>', 'Profile name')
+    .option('--profile <name>', 'Profile name (optional if only one profile exists)')
     .requiredOption('--to <email>', 'Recipient (repeatable)', (val, acc: string[]) => [...acc, val], [])
     .option('--cc <email>', 'CC recipient (repeatable)', (val, acc: string[]) => [...acc, val], [])
     .option('--bcc <email>', 'BCC recipient (repeatable)', (val, acc: string[]) => [...acc, val], [])
@@ -246,7 +246,7 @@ Query Syntax Examples:
   gmail
     .command('reply')
     .description('Reply to a thread')
-    .requiredOption('--profile <name>', 'Profile name')
+    .option('--profile <name>', 'Profile name (optional if only one profile exists)')
     .requiredOption('--thread-id <id>', 'Thread ID')
     .option('--body <body>', 'Reply body (or pipe via stdin)')
     .option('--html', 'Treat body as HTML')
@@ -277,7 +277,7 @@ Query Syntax Examples:
   gmail
     .command('archive <message-id...>')
     .description('Archive one or more messages')
-    .requiredOption('--profile <name>', 'Profile name')
+    .option('--profile <name>', 'Profile name (optional if only one profile exists)')
     .action(async (messageIds: string[], options) => {
       try {
         const { client } = await getGmailClient(options.profile);
@@ -293,7 +293,7 @@ Query Syntax Examples:
   gmail
     .command('mark <message-id...>')
     .description('Mark one or more messages as read or unread')
-    .requiredOption('--profile <name>', 'Profile name')
+    .option('--profile <name>', 'Profile name (optional if only one profile exists)')
     .option('--read', 'Mark as read')
     .option('--unread', 'Mark as unread')
     .action(async (messageIds: string[], options) => {
@@ -318,7 +318,7 @@ Query Syntax Examples:
   gmail
     .command('attachment <message-id>')
     .description('Download attachments from a message')
-    .requiredOption('--profile <name>', 'Profile name')
+    .option('--profile <name>', 'Profile name (optional if only one profile exists)')
     .option('--name <filename>', 'Download specific attachment by filename (downloads all if not specified)')
     .option('--output <dir>', 'Output directory', '.')
     .action(async (messageId: string, options) => {
@@ -361,7 +361,7 @@ Query Syntax Examples:
   gmail
     .command('export <message-id>')
     .description('Export a message as PDF')
-    .requiredOption('--profile <name>', 'Profile name')
+    .option('--profile <name>', 'Profile name (optional if only one profile exists)')
     .option('--output <path>', 'Output file path', 'message.pdf')
     .action(async (messageId: string, options) => {
       try {

package/src/commands/jira.ts

@@ -1,6 +1,6 @@
 import { Command } from 'commander';
 import { setCredentials, getCredentials } from '../auth/token-store';
-import { setProfile, getProfile } from '../config/config-manager';
+import { setProfile, resolveProfile } from '../config/config-manager';
 import { createProfileCommands } from '../utils/profile-commands';
 import { performJiraOAuthFlow, refreshJiraToken, type AtlassianSite } from '../auth/jira-oauth';
 import { JiraClient } from '../services/jira/client';
@@ -46,15 +46,17 @@ async function ensureValidToken(credentials: JiraCredentials, profile: string):
   return credentials;
 }
 
-async function getJiraClient(profileName: string): Promise<{ client: JiraClient; profile: string }> {
-  const profile = await getProfile('jira', profileName);
+async function getJiraClient(profileName?: string): Promise<{ client: JiraClient; profile: string }> {
+  const { profile, error } = await resolveProfile('jira', profileName);
 
   if (!profile) {
-    throw new CliError(
-      'PROFILE_NOT_FOUND',
-      `Profile "${profileName}" not found for jira`,
-      'Run: agentio jira profile add'
-    );
+    if (error === 'none') {
+      throw new CliError('PROFILE_NOT_FOUND', 'No jira profile configured', 'Run: agentio jira profile add');
+    }
+    if (error === 'multiple') {
+      throw new CliError('PROFILE_NOT_FOUND', 'Multiple jira profiles exist', 'Specify --profile <name>');
+    }
+    throw new CliError('PROFILE_NOT_FOUND', `Profile "${profileName}" not found for jira`, 'Run: agentio jira profile add');
   }
 
   let credentials = await getCredentials<JiraCredentials>('jira', profile);
@@ -85,7 +87,7 @@ export function registerJiraCommands(program: Command): void {
   jira
     .command('projects')
     .description('List JIRA projects')
-    .requiredOption('--profile <name>', 'Profile name')
+    .option('--profile <name>', 'Profile name (optional if only one profile exists)')
     .option('--limit <number>', 'Maximum number of projects', '50')
     .action(async (options) => {
       try {
@@ -103,7 +105,7 @@ export function registerJiraCommands(program: Command): void {
   jira
     .command('search')
     .description('Search JIRA issues')
-    .requiredOption('--profile <name>', 'Profile name')
+    .option('--profile <name>', 'Profile name (optional if only one profile exists)')
     .option('--jql <query>', 'JQL query')
     .option('--project <key>', 'Project key')
     .option('--status <status>', 'Issue status')
@@ -130,7 +132,7 @@ export function registerJiraCommands(program: Command): void {
     .command('get')
     .description('Get JIRA issue details')
     .argument('<issue-key>', 'Issue key (e.g., PROJ-123)')
-    .requiredOption('--profile <name>', 'Profile name')
+    .option('--profile <name>', 'Profile name (optional if only one profile exists)')
     .action(async (issueKey: string, options) => {
       try {
         const { client } = await getJiraClient(options.profile);
@@ -147,7 +149,7 @@ export function registerJiraCommands(program: Command): void {
     .description('Add a comment to an issue')
     .argument('<issue-key>', 'Issue key (e.g., PROJ-123)')
     .argument('[body]', 'Comment body (or pipe via stdin)')
-    .requiredOption('--profile <name>', 'Profile name')
+    .option('--profile <name>', 'Profile name (optional if only one profile exists)')
     .action(async (issueKey: string, body: string | undefined, options) => {
       try {
         let text = body;
@@ -173,7 +175,7 @@ export function registerJiraCommands(program: Command): void {
     .command('transitions')
     .description('List available transitions for an issue')
     .argument('<issue-key>', 'Issue key (e.g., PROJ-123)')
-    .requiredOption('--profile <name>', 'Profile name')
+    .option('--profile <name>', 'Profile name (optional if only one profile exists)')
     .action(async (issueKey: string, options) => {
       try {
         const { client } = await getJiraClient(options.profile);
@@ -190,7 +192,7 @@ export function registerJiraCommands(program: Command): void {
     .description('Transition an issue to a new status')
     .argument('<issue-key>', 'Issue key (e.g., PROJ-123)')
     .argument('<transition-id>', 'Transition ID (use "transitions" command to see available)')
-    .requiredOption('--profile <name>', 'Profile name')
+    .option('--profile <name>', 'Profile name (optional if only one profile exists)')
     .action(async (issueKey: string, transitionId: string, options) => {
       try {
         const { client } = await getJiraClient(options.profile);

package/src/commands/slack.ts

@@ -1,40 +1,19 @@
 import { Command } from 'commander';
 import { readFile } from 'fs/promises';
-import { setCredentials, getCredentials } from '../auth/token-store';
-import { setProfile, getProfile } from '../config/config-manager';
+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 { SlackClient } from '../services/slack/client';
 import { CliError, handleError } from '../utils/errors';
 import { readStdin, prompt } from '../utils/stdin';
 import { printSlackSendResult } from '../utils/output';
 import type { SlackCredentials, SlackWebhookCredentials } from '../types/slack';
 
-async function getSlackClient(profileName: string): Promise<{ client: SlackClient; profile: string }> {
-  const profile = await getProfile('slack', profileName);
-
-  if (!profile) {
-    throw new CliError(
-      'PROFILE_NOT_FOUND',
-      `Profile "${profileName}" not found for slack`,
-      'Run: agentio slack profile add'
-    );
-  }
-
-  const credentials = await getCredentials<SlackCredentials>('slack', profile);
-
-  if (!credentials) {
-    throw new CliError(
-      'AUTH_FAILED',
-      `No credentials found for slack profile "${profile}"`,
-      `Run: agentio slack profile add --profile ${profile}`
-    );
-  }
-
-  return {
-    client: new SlackClient(credentials),
-    profile,
-  };
-}
+const getSlackClient = createClientGetter<SlackCredentials, SlackClient>({
+  service: 'slack',
+  createClient: (credentials) => new SlackClient(credentials),
+});
 
 export function registerSlackCommands(program: Command): void {
   const slack = program
@@ -44,7 +23,7 @@ export function registerSlackCommands(program: Command): void {
   slack
     .command('send')
     .description('Send a message to Slack')
-    .requiredOption('--profile <name>', 'Profile name')
+    .option('--profile <name>', 'Profile name (optional if only one profile exists)')
     .option('--json [file]', 'Send Block Kit message from JSON file (or stdin if no file specified)')
     .argument('[message]', 'Message text (or pipe via stdin)')
     .action(async (message: string | undefined, options) => {

package/src/commands/sql.ts

@@ -1,45 +1,25 @@
 import { Command } from 'commander';
-import { setCredentials, getCredentials } from '../auth/token-store';
-import { setProfile, getProfile } from '../config/config-manager';
+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 { SqlClient } from '../services/sql/client';
 import { CliError, handleError } from '../utils/errors';
 import { readStdin, prompt } from '../utils/stdin';
 import type { SqlCredentials } from '../types/sql';
 
-async function getSqlClient(profileName: string): Promise<{ client: SqlClient; profile: string }> {
-  const profile = await getProfile('sql', profileName);
-
-  if (!profile) {
-    throw new CliError(
-      'PROFILE_NOT_FOUND',
-      `Profile "${profileName}" not found for sql`,
-      'Run: agentio sql profile add'
-    );
-  }
-
-  const credentials = await getCredentials<SqlCredentials>('sql', profile);
-
-  if (!credentials) {
-    throw new CliError(
-      'AUTH_FAILED',
-      `No credentials found for sql profile "${profile}"`,
-      `Run: agentio sql profile add --profile ${profile}`
-    );
-  }
-
-  return {
-    client: new SqlClient(credentials),
-    profile,
-  };
-}
+const getSqlClient = createClientGetter<SqlCredentials, SqlClient>({
+  service: 'sql',
+  createClient: (credentials) => new SqlClient(credentials),
+});
 
 function extractDisplayName(url: string): string {
   try {
     const parsed = new URL(url);
+    const username = parsed.username ? decodeURIComponent(parsed.username) : '';
     const host = parsed.hostname || 'localhost';
     const db = parsed.pathname.replace(/^\//, '') || 'database';
-    return `${host}/${db}`;
+    return username ? `${username}@${host}/${db}` : `${host}/${db}`;
   } catch {
     return url.substring(0, 30);
   }
@@ -53,7 +33,7 @@ export function registerSqlCommands(program: Command): void {
   sql
     .command('query')
     .description('Execute a SQL query')
-    .requiredOption('--profile <name>', 'Profile name')
+    .option('--profile <name>', 'Profile name (optional if only one profile exists)')
     .option('--limit <n>', 'Maximum rows to return', '100')
     .argument('[query]', 'SQL query (or pipe via stdin)')
     .action(async (query: string | undefined, options) => {