zele 0.3.17 → 0.3.21

package/src/commands/auth-cmd.ts

@@ -2,71 +2,83 @@
 // Manages authentication for zele (Google OAuth and IMAP/SMTP credentials).
 // Supports multiple accounts: login adds accounts, logout removes one.
 
-import type { Goke } from 'goke'
+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'
 import { handleCommandError } from '../output.js'
 
-export function registerAuthCommands(cli: Goke) {
+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: Goke) {
           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

@@ -3,9 +3,9 @@
 // Cache is handled by the client — commands just call methods and use data.
 // Multi-account: list/events fetch all accounts concurrently and merge by start time.
 
-import type { Goke } from 'goke'
+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'
@@ -17,7 +17,7 @@ import { resolveTimeRange, parseTimeExpression, parseDuration, isDateOnly } from
 // Register commands
 // ---------------------------------------------------------------------------
 
-export function registerCalendarCommands(cli: Goke) {
+export function registerCalendarCommands(cli: ZeleCli) {
   // =========================================================================
   // cal list
   // =========================================================================
@@ -76,11 +76,11 @@ export function registerCalendarCommands(cli: Goke) {
     .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: Goke) {
                   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: Goke) {
               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: Goke) {
           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: Goke) {
       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

@@ -3,9 +3,10 @@
 // Cache invalidation is handled by the client (sendDraft invalidates threadLists).
 // Multi-account: list fetches all accounts concurrently and merges by date.
 
-import type { Goke } from 'goke'
+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'
@@ -14,16 +15,16 @@ import * as out from '../output.js'
 import { handleCommandError } from '../output.js'
 import pc from 'picocolors'
 
-export function registerDraftCommands(cli: Goke) {
+export function registerDraftCommands(cli: ZeleCli) {
   // =========================================================================
   // draft list
   // =========================================================================
 
   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: Goke) {
       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: Goke) {
           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' })
@@ -89,14 +90,17 @@ export function registerDraftCommands(cli: Goke) {
       const draft = await client.getDraft({ draftId })
       if (draft instanceof Error) handleCommandError(draft)
 
+      const fmtRecipients = (list: Array<{ name?: string; email: string }>) =>
+        list.map((r) => r.name && r.name !== r.email ? `${r.name} <${r.email}>` : r.email).join(', ')
+
       console.log(pc.bold(`Draft: ${draft.message.subject}`))
       console.log(pc.dim(`Draft ID: ${draft.id}`))
-      console.log(`To: ${draft.to.join(', ') || '(none)'}`)
+      console.log(`To: ${fmtRecipients(draft.to) || '(none)'}`)
       if (draft.cc.length > 0) {
-        console.log(`Cc: ${draft.cc.join(', ')}`)
+        console.log(`Cc: ${fmtRecipients(draft.cc)}`)
       }
       if (draft.bcc.length > 0) {
-        console.log(`Bcc: ${draft.bcc.join(', ')}`)
+        console.log(`Bcc: ${fmtRecipients(draft.bcc)}`)
       }
       console.log()
 
@@ -161,6 +165,58 @@ export function registerDraftCommands(cli: Goke) {
       out.success('Draft created')
     })
 
+  // =========================================================================
+  // draft update
+  // =========================================================================
+
+  cli
+    .command('draft update <draftId>', 'Update an existing draft')
+    .option('--to <to>', z.string().describe('New recipient email(s), comma-separated'))
+    .option('--subject <subject>', z.string().describe('New subject'))
+    .option('--body <body>', z.string().describe('New body text'))
+    .option('--body-file <bodyFile>', z.string().describe('Read new body from file (use - for stdin)'))
+    .option('--cc <cc>', z.string().describe('New CC recipients (comma-separated)'))
+    .option('--bcc <bcc>', z.string().describe('New BCC recipients (comma-separated)'))
+    .option('--from <from>', z.string().describe('Send-as alias email'))
+    .action(async (draftId, options) => {
+      const { client } = await getClient(options.account)
+
+      // Fetch existing draft to merge unchanged fields
+      const existing = await client.getDraft({ draftId })
+      if (existing instanceof Error) handleCommandError(existing)
+
+      let body = options.body
+      if (options.bodyFile) {
+        if (options.bodyFile === '-') {
+          const chunks: Buffer[] = []
+          for await (const chunk of process.stdin) {
+            chunks.push(chunk)
+          }
+          body = Buffer.concat(chunks).toString('utf-8')
+        } else {
+          body = fs.readFileSync(options.bodyFile, 'utf-8')
+        }
+      }
+
+      const parseEmails = (str: string) =>
+        str.split(',').map((e) => e.trim()).filter(Boolean).map((email) => ({ email }))
+
+      const result = await client.updateDraft({
+        draftId,
+        to: options.to ? parseEmails(options.to) : existing.to,
+        subject: options.subject ?? existing.message.subject,
+        body: body ?? existing.message.body,
+        cc: options.cc ? parseEmails(options.cc) : existing.cc,
+        bcc: options.bcc ? parseEmails(options.bcc) : existing.bcc,
+        threadId: existing.message.threadId || undefined,
+        fromEmail: options.from ?? existing.message.from.email,
+      })
+      if (result instanceof Error) handleCommandError(result)
+
+      out.printYaml(result)
+      out.success('Draft updated')
+    })
+
   // =========================================================================
   // draft send
   // =========================================================================
@@ -185,14 +241,12 @@ export function registerDraftCommands(cli: Goke) {
     .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/filter.ts

@@ -1,14 +1,14 @@
 // Filter commands: list, create, delete Gmail filters.
 // Multi-account support via getClients/getClient like label.ts.
 
-import type { Goke } from 'goke'
+import type { ZeleCli } from '../cli-types.js'
 import { getClients } from '../auth.js'
 import { AuthError, UnsupportedError, isScopeError } from '../api-utils.js'
 import type { GmailClient } from '../gmail-client.js'
 import * as out from '../output.js'
 import { handleCommandError } from '../output.js'
 
-export function registerFilterCommands(cli: Goke) {
+export function registerFilterCommands(cli: ZeleCli) {
   // =========================================================================
   // filter list
   // =========================================================================

package/src/commands/label.ts

@@ -3,15 +3,16 @@
 // Cache is handled by the client — commands just call methods and use data.
 // Multi-account: list and counts fetch all accounts concurrently and merge.
 
-import type { Goke } from 'goke'
+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'
 import * as out from '../output.js'
 import { handleCommandError } from '../output.js'
 
-export function registerLabelCommands(cli: Goke) {
+export function registerLabelCommands(cli: ZeleCli) {
   // =========================================================================
   // label list
   // =========================================================================
@@ -122,14 +123,12 @@ export function registerLabelCommands(cli: Goke) {
     .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
         }