zele 0.3.20 → 0.4.0

package/src/commands/auth-cmd.ts

@@ -5,6 +5,7 @@
 import type { ZeleCli } from '../cli-types.js'
 import { z } from 'zod'
 import pc from 'picocolors'
+import * as clack from '@clack/prompts'
 import { login, loginImap, logout, listAccounts, getAuthStatuses } from '../auth.js'
 import { closePrisma } from '../db.js'
 import * as out from '../output.js'
@@ -13,60 +14,71 @@ import { handleCommandError } from '../output.js'
 export function registerAuthCommands(cli: ZeleCli) {
   cli
     .command('login', 'Authenticate with Google (opens browser) or show IMAP/SMTP login instructions')
-    .action(async () => {
-      // In a TTY, ask if they want Google or Other
-      if (process.stdin.isTTY) {
-        const readline = await import('node:readline')
-        const rl = readline.createInterface({ input: process.stdin, output: process.stderr })
+    .option(
+      '--method <method>',
+      z.enum(['google', 'imap']).optional().describe('Authentication method (google or imap)'),
+    )
+    .action(async (options) => {
+      let method = options.method
 
-        console.error(pc.bold('\nChoose authentication method:\n'))
-        console.error('  ' + pc.cyan('1') + ' Google (opens browser for OAuth)')
-        console.error('  ' + pc.cyan('2') + ' Other (IMAP/SMTP with password)\n')
+      if (!method) {
+        if (!process.stdin.isTTY) {
+          out.error('Run non-interactively with: zele login --method google|imap')
+          process.exit(1)
+        }
 
-        const answer = await new Promise<string>((resolve) => {
-          rl.question('Enter choice [1]: ', resolve)
+        const choice = await clack.select({
+          message: 'Choose authentication method',
+          options: [
+            { value: 'google', label: 'Google', hint: 'opens browser for OAuth' },
+            { value: 'imap', label: 'Other', hint: 'IMAP/SMTP with password' },
+          ],
         })
-        rl.close()
-
-        const choice = answer.trim() || '1'
-
-        if (choice === '2') {
-          console.error(pc.bold('\nTo add an IMAP/SMTP account, run:\n'))
-          console.error(pc.dim('  # Fastmail'))
-          console.error(`  zele login imap \\`)
-          console.error(`    --email you@fastmail.com \\`)
-          console.error(`    --imap-host imap.fastmail.com --imap-port 993 \\`)
-          console.error(`    --smtp-host smtp.fastmail.com --smtp-port 465 \\`)
-          console.error(`    --password "your-app-password"`)
-          console.error()
-          console.error(pc.dim('  # Gmail (app password)'))
-          console.error(`  zele login imap \\`)
-          console.error(`    --email you@gmail.com \\`)
-          console.error(`    --imap-host imap.gmail.com --imap-port 993 \\`)
-          console.error(`    --smtp-host smtp.gmail.com --smtp-port 465 \\`)
-          console.error(`    --password "your-app-password"`)
-          console.error()
-          console.error(pc.dim('  # Outlook/Hotmail'))
-          console.error(`  zele login imap \\`)
-          console.error(`    --email you@outlook.com \\`)
-          console.error(`    --imap-host outlook.office365.com --imap-port 993 \\`)
-          console.error(`    --smtp-host smtp-mail.outlook.com --smtp-port 587 \\`)
-          console.error(`    --password "your-password"`)
-          console.error()
-          console.error(pc.dim('  # Generic (any IMAP/SMTP provider)'))
-          console.error(`  zele login imap \\`)
-          console.error(`    --email you@example.com \\`)
-          console.error(`    --imap-host imap.example.com --imap-port 993 \\`)
-          console.error(`    --smtp-host smtp.example.com --smtp-port 465 \\`)
-          console.error(`    --password "your-password"`)
-          console.error()
-          console.error(pc.dim('Omit --smtp-host for read-only (IMAP only, no sending).'))
-          console.error(pc.dim('Use --imap-user/--smtp-user if the login username differs from your email.'))
-          return
+
+        if (clack.isCancel(choice)) {
+          out.hint('Cancelled')
+          process.exit(0)
         }
+
+        method = choice
+      }
+
+      if (method === 'imap') {
+        console.error(pc.bold('\nTo add an IMAP/SMTP account, run:\n'))
+        console.error(pc.dim('  # Fastmail'))
+        console.error(`  zele login imap \\`)
+        console.error(`    --email you@fastmail.com \\`)
+        console.error(`    --imap-host imap.fastmail.com --imap-port 993 \\`)
+        console.error(`    --smtp-host smtp.fastmail.com --smtp-port 465 \\`)
+        console.error(`    --password "your-app-password"`)
+        console.error()
+        console.error(pc.dim('  # Gmail (app password)'))
+        console.error(`  zele login imap \\`)
+        console.error(`    --email you@gmail.com \\`)
+        console.error(`    --imap-host imap.gmail.com --imap-port 993 \\`)
+        console.error(`    --smtp-host smtp.gmail.com --smtp-port 465 \\`)
+        console.error(`    --password "your-app-password"`)
+        console.error()
+        console.error(pc.dim('  # Outlook/Hotmail'))
+        console.error(`  zele login imap \\`)
+        console.error(`    --email you@outlook.com \\`)
+        console.error(`    --imap-host outlook.office365.com --imap-port 993 \\`)
+        console.error(`    --smtp-host smtp-mail.outlook.com --smtp-port 587 \\`)
+        console.error(`    --password "your-password"`)
+        console.error()
+        console.error(pc.dim('  # Generic (any IMAP/SMTP provider)'))
+        console.error(`  zele login imap \\`)
+        console.error(`    --email you@example.com \\`)
+        console.error(`    --imap-host imap.example.com --imap-port 993 \\`)
+        console.error(`    --smtp-host smtp.example.com --smtp-port 465 \\`)
+        console.error(`    --password "your-password"`)
+        console.error()
+        console.error(pc.dim('Omit --smtp-host for read-only (IMAP only, no sending).'))
+        console.error(pc.dim('Use --imap-user/--smtp-user if the login username differs from your email.'))
+        return
       }
 
-      // Default: Google OAuth flow
+      // Google OAuth flow
       const result = await login()
       if (result instanceof Error) handleCommandError(result)
       const { email } = result
@@ -162,14 +174,12 @@ export function registerAuthCommands(cli: ZeleCli) {
           process.exit(1)
         }
 
-        const readline = await import('node:readline')
-        const rl = readline.createInterface({ input: process.stdin, output: process.stderr })
-        const answer = await new Promise<string>((resolve) => {
-          rl.question(`Remove credentials for ${targetEmail}? [y/N] `, resolve)
+        const confirmed = await clack.confirm({
+          message: `Remove credentials for ${targetEmail}?`,
+          initialValue: false,
         })
-        rl.close()
 
-        if (answer.toLowerCase() !== 'y') {
+        if (clack.isCancel(confirmed) || !confirmed) {
           out.hint('Cancelled')
           return
         }

package/src/commands/calendar.ts

@@ -5,7 +5,7 @@
 
 import type { ZeleCli } from '../cli-types.js'
 import { z } from 'zod'
-import readline from 'node:readline'
+import * as clack from '@clack/prompts'
 import { getCalendarClients, getCalendarClient } from '../auth.js'
 import type { CalendarClient, CalendarEvent, CalendarListItem, EventListResult } from '../calendar-client.js'
 import { AuthError } from '../api-utils.js'
@@ -76,11 +76,11 @@ export function registerCalendarCommands(cli: ZeleCli) {
     .option('--week', 'Show this week')
     .option('--days <days>', z.number().describe('Show next N days'))
     .option('--all', 'Fetch from all calendars')
-    .option('--query <query>', 'Free text search')
-    .option('--max [max]', 'Max results (default: 20)')
+    .option('--filter <filter>', 'Free text search')
+    .option('--limit [limit]', 'Max results (default: 20)')
     .option('--page <page>', 'Pagination token (requires --account, only works for a single account)')
     .action(async (options) => {
-      const max = options.max ? Number(options.max) : 20
+      const limit = options.limit ? Number(options.limit) : 20
       const calendarId = options.calendar ?? 'primary'
 
       if (options.all && options.calendar) {
@@ -122,8 +122,8 @@ export function registerCalendarCommands(cli: ZeleCli) {
                   calendarId: cal.id,
                   timeMin,
                   timeMax,
-                  query: options.query,
-                  maxResults: max,
+                  query: options.filter,
+                  maxResults: limit,
                 })
                 if (r instanceof Error) return r
                 return r.events.map((e) => ({ ...e, calendarId: cal.id }))
@@ -145,8 +145,8 @@ export function registerCalendarCommands(cli: ZeleCli) {
               calendarId,
               timeMin,
               timeMax,
-              query: options.query,
-              maxResults: max,
+              query: options.filter,
+              maxResults: limit,
               pageToken: options.page,
             })
             if (r instanceof Error) return r
@@ -171,7 +171,7 @@ export function registerCalendarCommands(cli: ZeleCli) {
           result.events.map((e) => ({ ...e, account: email })),
         )
         .sort((a, b) => new Date(a.start).getTime() - new Date(b.start).getTime())
-        .slice(0, max)
+        .slice(0, limit)
 
       if (merged.length === 0) {
         out.printList([], { summary: 'No events found' })
@@ -418,13 +418,12 @@ export function registerCalendarCommands(cli: ZeleCli) {
       const { client } = await getCalendarClient(options.account)
 
       if (!options.force && process.stdin.isTTY) {
-        const rl = readline.createInterface({ input: process.stdin, output: process.stderr })
-        const answer = await new Promise<string>((resolve) => {
-          rl.question(`Delete event ${eventId}? [y/N] `, resolve)
+        const confirmed = await clack.confirm({
+          message: `Delete event ${eventId}?`,
+          initialValue: false,
         })
-        rl.close()
 
-        if (answer.toLowerCase() !== 'y') {
+        if (clack.isCancel(confirmed) || !confirmed) {
           out.hint('Cancelled')
           return
         }

package/src/commands/draft.ts

@@ -6,6 +6,7 @@
 import type { ZeleCli } from '../cli-types.js'
 import { z } from 'zod'
 import fs from 'node:fs'
+import * as clack from '@clack/prompts'
 import { getClients, getClient } from '../auth.js'
 import type { GmailClient } from '../gmail-client.js'
 import type { ImapSmtpClient } from '../imap-smtp-client.js'
@@ -21,9 +22,9 @@ export function registerDraftCommands(cli: ZeleCli) {
 
   cli
     .command('draft list', 'List drafts')
-    .option('--max <max>', z.number().default(20).describe('Max results'))
+    .option('--limit <limit>', z.number().default(20).describe('Max results'))
     .option('--page <page>', z.string().describe('Pagination token (requires --account, only works for a single account)'))
-    .option('--query <query>', z.string().describe('Search query'))
+    .option('--filter <filter>', z.string().describe('Search query'))
     .action(async (options) => {
       const clients = await getClients(options.account)
 
@@ -36,8 +37,8 @@ export function registerDraftCommands(cli: ZeleCli) {
       const results = await Promise.all(
         clients.map(async ({ email, client }) => {
           const result = await client.listDrafts({
-            query: options.query,
-            maxResults: options.max,
+            query: options.filter,
+            maxResults: options.limit,
             pageToken: options.page,
           })
           if (result instanceof Error) return result
@@ -51,13 +52,13 @@ export function registerDraftCommands(cli: ZeleCli) {
           return true
         })
 
-      // Merge drafts from all accounts, sorted by date descending, capped at max
+      // Merge drafts from all accounts, sorted by date descending, capped at limit
       const merged = allResults
         .flatMap(({ email, result }) =>
           result.drafts.map((d) => ({ ...d, account: email })),
         )
         .sort((a, b) => new Date(b.date).getTime() - new Date(a.date).getTime())
-        .slice(0, options.max)
+        .slice(0, options.limit)
 
       if (merged.length === 0) {
         out.printList([], { summary: 'No drafts found' })
@@ -240,14 +241,12 @@ export function registerDraftCommands(cli: ZeleCli) {
     .option('--force', 'Skip confirmation')
     .action(async (draftId, options) => {
       if (!options.force && process.stdin.isTTY) {
-        const readline = await import('node:readline')
-        const rl = readline.createInterface({ input: process.stdin, output: process.stderr })
-        const answer = await new Promise<string>((resolve) => {
-          rl.question(`Delete draft ${draftId}? [y/N] `, resolve)
+        const confirmed = await clack.confirm({
+          message: `Delete draft ${draftId}?`,
+          initialValue: false,
         })
-        rl.close()
 
-        if (answer.toLowerCase() !== 'y') {
+        if (clack.isCancel(confirmed) || !confirmed) {
           out.hint('Cancelled')
           return
         }

package/src/commands/label.ts

@@ -5,6 +5,7 @@
 
 import type { ZeleCli } from '../cli-types.js'
 import { z } from 'zod'
+import * as clack from '@clack/prompts'
 import { getClients, getGmailClient } from '../auth.js'
 import { AuthError, UnsupportedError } from '../api-utils.js'
 import type { GmailClient } from '../gmail-client.js'
@@ -122,14 +123,12 @@ export function registerLabelCommands(cli: ZeleCli) {
     .option('--force', 'Skip confirmation')
     .action(async (labelId, options) => {
       if (!options.force && process.stdin.isTTY) {
-        const readline = await import('node:readline')
-        const rl = readline.createInterface({ input: process.stdin, output: process.stderr })
-        const answer = await new Promise<string>((resolve) => {
-          rl.question(`Delete label ${labelId}? [y/N] `, resolve)
+        const confirmed = await clack.confirm({
+          message: `Delete label ${labelId}?`,
+          initialValue: false,
         })
-        rl.close()
 
-        if (answer.toLowerCase() !== 'y') {
+        if (clack.isCancel(confirmed) || !confirmed) {
           out.hint('Cancelled')
           return
         }

package/src/commands/mail.ts

@@ -52,15 +52,15 @@ export function registerMailCommands(cli: ZeleCli) {
   cli
     .command('mail list', 'List email threads')
     .option('--folder [folder]', 'Folder to list (inbox, sent, trash, spam, starred, drafts, archive, all) (default: inbox)')
-    .option('--max [max]', 'Max results per page (default: 20)')
+    .option('--limit [limit]', 'Max threads to show (default: 20)')
     .option('--page <page>', 'Pagination token (requires --account, only works for a single account)')
     .option('--label <label>', 'Filter by label name')
     .option('--filter <filter>', 'Gmail search filter (e.g. "is:unread", "from:github", "has:attachment")')
     .action(async (options) => {
-      // `options.folder` / `options.max` are `string | undefined` now.
+      // `options.folder` / `options.limit` are `string | undefined` now.
       // `''` (bare flag) falls back to the default via `||`.
       const folder = options.folder || 'inbox'
-      const max = options.max ? Number(options.max) : 20
+      const limit = options.limit ? Number(options.limit) : 20
       const clients = await getClients(options.account)
 
       if (options.page && clients.length > 1) {
@@ -73,7 +73,7 @@ export function registerMailCommands(cli: ZeleCli) {
         clients.map(async ({ email, client, accountType }) => {
           const result = await client.listThreads({
             folder,
-            maxResults: max,
+            maxResults: limit,
             labelIds: options.label ? [options.label] : undefined,
             pageToken: options.page,
             query: options.filter,
@@ -102,13 +102,13 @@ export function registerMailCommands(cli: ZeleCli) {
       const labelMap = new Map<string, string>()
       for (const r of allResults) for (const [id, name] of r.labelMap) labelMap.set(id, name)
 
-      // Merge threads from all accounts, sorted by date descending, capped at max
+      // Merge threads from all accounts, sorted by date descending, capped at limit
       const merged = allResults
         .flatMap(({ email, result }) =>
           result.threads.map((t) => ({ ...t, account: email })),
         )
         .sort((a, b) => new Date(b.date).getTime() - new Date(a.date).getTime())
-        .slice(0, max)
+        .slice(0, limit)
 
       if (merged.length === 0) {
         out.printList([], { summary: 'No threads found' })
@@ -150,10 +150,10 @@ export function registerMailCommands(cli: ZeleCli) {
 
   cli
     .command('mail search <query>', 'Search email threads using Gmail query syntax (from:, to:, subject:, has:attachment, etc). See https://support.google.com/mail/answer/7190')
-    .option('--max [max]', 'Max results (default: 20)')
+    .option('--limit [limit]', 'Max results to show (default: 20)')
     .option('--page <page>', 'Pagination token (requires --account, only works for a single account)')
     .action(async (query, options) => {
-      const max = options.max ? Number(options.max) : 20
+      const limit = options.limit ? Number(options.limit) : 20
       const clients = await getClients(options.account)
 
       if (options.page && clients.length > 1) {
@@ -166,7 +166,7 @@ export function registerMailCommands(cli: ZeleCli) {
         clients.map(async ({ email, client, accountType }) => {
           const result = await client.listThreads({
             query,
-            maxResults: max,
+            maxResults: limit,
             pageToken: options.page,
           })
           if (result instanceof Error) return result
@@ -197,7 +197,7 @@ export function registerMailCommands(cli: ZeleCli) {
           result.threads.map((t) => ({ ...t, account: email })),
         )
         .sort((a, b) => new Date(b.date).getTime() - new Date(a.date).getTime())
-        .slice(0, max)
+        .slice(0, limit)
 
       if (merged.length === 0) {
         out.printList([], { summary: `No results for "${query}"` })

package/src/commands/watch.ts

@@ -18,7 +18,7 @@ export function registerWatchCommands(cli: ZeleCli) {
     .command('mail watch', 'Watch for new emails (poll via History API)')
     .option('--interval [interval]', z.string().describe('Poll interval in seconds (default: 15)'))
     .option('--folder [folder]', z.string().describe('Folder to watch (default: inbox)'))
-    .option('--query [query]', z.string().describe('Filter messages client-side (from:, to:, cc:, subject:, is:unread, is:starred, has:attachment, -negate). See https://support.google.com/mail/answer/7190'))
+    .option('--filter [filter]', z.string().describe('Filter messages client-side (from:, to:, cc:, subject:, is:unread, is:starred, has:attachment, -negate). See https://support.google.com/mail/answer/7190'))
     .option('--once', z.boolean().describe('Print changes once and exit (no loop)'))
     .action(async (options) => {
       const interval = options.interval ? Number(options.interval) : 15
@@ -43,7 +43,7 @@ export function registerWatchCommands(cli: ZeleCli) {
         client.watchInbox({
           folder,
           intervalMs: interval * 1000,
-          query: options.query,
+          query: options.filter,
           once: options.once,
         }),
       )

package/src/output.ts

@@ -140,7 +140,6 @@ turndown.addRule('hidden-elements', {
 export function htmlToMarkdown(html: string): string {
   // Pre-clean: remove common email noise
   const cleaned = html
-    .replace(/<!\-\-[\s\S]*?\-\->/g, '') // HTML comments
     .replace(/<o:p>[\s\S]*?<\/o:p>/gi, '') // Outlook tags
     .replace(/<!\[if[\s\S]*?<!\[endif\]>/gi, '') // Outlook conditional comments