zele 0.3.16 → 0.3.20

package/src/commands/attachment.ts

@@ -2,7 +2,7 @@
 // Lists attachments for a thread and downloads them to disk.
 // Skips re-download if file already exists with same size (like gogcli).
 
-import type { Goke } from 'goke'
+import type { ZeleCli } from '../cli-types.js'
 import { z } from 'zod'
 import fs from 'node:fs'
 import path from 'node:path'
@@ -10,7 +10,7 @@ import { getClient } from '../auth.js'
 import * as out from '../output.js'
 import { handleCommandError } from '../output.js'
 
-export function registerAttachmentCommands(cli: Goke) {
+export function registerAttachmentCommands(cli: ZeleCli) {
   // =========================================================================
   // attachment list
   // =========================================================================
@@ -86,6 +86,7 @@ export function registerAttachmentCommands(cli: Goke) {
 
       // Download
       const base64Data = await client.getAttachment({ messageId, attachmentId })
+      if (base64Data instanceof Error) return handleCommandError(base64Data)
       const buffer = Buffer.from(base64Data, 'base64')
 
       // Ensure output directory exists

package/src/commands/auth-cmd.ts

@@ -1,17 +1,72 @@
-// Auth commands: login, logout, whoami.
-// Manages OAuth2 authentication for zele.
+// Auth commands: login, login imap, logout, whoami.
+// 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 { login, logout, listAccounts, getAuthStatuses } from '../auth.js'
+import type { ZeleCli } from '../cli-types.js'
+import { z } from 'zod'
+import pc from 'picocolors'
+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). For headless/agent environments, run inside tmux: the command prints an authorization URL to open in a browser, then waits for the localhost redirect URL to be pasted back.')
+    .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 })
+
+        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')
+
+        const answer = await new Promise<string>((resolve) => {
+          rl.question('Enter choice [1]: ', resolve)
+        })
+        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
+        }
+      }
+
+      // Default: Google OAuth flow
       const result = await login()
       if (result instanceof Error) handleCommandError(result)
       const { email } = result
@@ -20,6 +75,56 @@ export function registerAuthCommands(cli: Goke) {
       process.exit(0)
     })
 
+  cli
+    .command('login imap', 'Add an IMAP/SMTP email account (non-interactive, designed for agents)')
+    .option('--email <email>', z.string().describe('Email address'))
+    .option('--imap-host <imapHost>', z.string().describe('IMAP server hostname'))
+    .option('--imap-port <imapPort>', z.string().describe('IMAP server port (default: 993)'))
+    .option('--smtp-host <smtpHost>', z.string().describe('SMTP server hostname (optional, enables sending)'))
+    .option('--smtp-port <smtpPort>', z.string().describe('SMTP server port (default: 465)'))
+    .option('--password <password>', z.string().describe('Password (shared for IMAP and SMTP unless overridden)'))
+    .option('--imap-user <imapUser>', z.string().describe('IMAP username (defaults to --email)'))
+    .option('--imap-password <imapPassword>', z.string().describe('IMAP password (overrides --password)'))
+    .option('--smtp-user <smtpUser>', z.string().describe('SMTP username (defaults to --email)'))
+    .option('--smtp-password <smtpPassword>', z.string().describe('SMTP password (overrides --password)'))
+    .option('--no-tls', 'Disable TLS (not recommended)')
+    .action(async (options) => {
+      if (!options.email) {
+        out.error('--email is required')
+        process.exit(1)
+      }
+      if (!options.imapHost) {
+        out.error('--imap-host is required')
+        process.exit(1)
+      }
+      if (!options.password && !options.imapPassword) {
+        out.error('--password or --imap-password is required')
+        process.exit(1)
+      }
+
+      out.hint('Testing IMAP connection...')
+
+      const result = await loginImap({
+        email: options.email,
+        imapHost: options.imapHost,
+        imapPort: options.imapPort ? Number(options.imapPort) : undefined,
+        smtpHost: options.smtpHost,
+        smtpPort: options.smtpPort ? Number(options.smtpPort) : undefined,
+        password: options.password,
+        imapUser: options.imapUser,
+        imapPassword: options.imapPassword,
+        smtpUser: options.smtpUser,
+        smtpPassword: options.smtpPassword,
+        tls: options.noTls !== true,
+      })
+      if (result instanceof Error) handleCommandError(result)
+
+      const caps = options.smtpHost ? 'IMAP + SMTP' : 'IMAP only'
+      out.success(`Authenticated ${result.email} (${caps})`)
+      await closePrisma()
+      process.exit(0)
+    })
+
   cli
     .command('logout [email]', 'Remove stored credentials for an account')
     .option('--force', 'Skip confirmation')
@@ -88,9 +193,10 @@ export function registerAuthCommands(cli: Goke) {
       out.printList(
         statuses.map((s) => ({
           email: s.email,
-          app_id: s.appId,
+          type: s.accountType,
+          capabilities: s.capabilities.join(', '),
           status: 'Authenticated',
-          expires: s.expiresAt?.toISOString() ?? 'unknown',
+          ...(s.expiresAt ? { expires: s.expiresAt.toISOString() } : {}),
         })),
         { summary: `${statuses.length} account(s)` },
       )

package/src/commands/calendar.ts

@@ -3,7 +3,7 @@
 // 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 { getCalendarClients, getCalendarClient } from '../auth.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
   // =========================================================================

package/src/commands/draft.ts

@@ -3,17 +3,18 @@
 // 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 { getClients, getClient } from '../auth.js'
 import type { GmailClient } from '../gmail-client.js'
+import type { ImapSmtpClient } from '../imap-smtp-client.js'
 import { AuthError } from '../api-utils.js'
 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
   // =========================================================================
@@ -88,14 +89,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()
 
@@ -154,11 +158,64 @@ export function registerDraftCommands(cli: Goke) {
         threadId: options.thread,
         fromEmail: options.from,
       })
+      if (result instanceof Error) handleCommandError(result)
 
       out.printYaml(result)
       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
   // =========================================================================
@@ -168,6 +225,7 @@ export function registerDraftCommands(cli: Goke) {
     .action(async (draftId, options) => {
       const { client } = await getClient(options.account)
       const result = await client.sendDraft({ draftId })
+      if (result instanceof Error) handleCommandError(result)
 
       out.printYaml(result)
       out.success('Draft sent')
@@ -197,7 +255,8 @@ export function registerDraftCommands(cli: Goke) {
 
       const { client } = await getClient(options.account)
 
-      await client.deleteDraft({ draftId })
+      const deleteResult = await client.deleteDraft({ draftId })
+      if (deleteResult instanceof Error) handleCommandError(deleteResult)
 
       out.printYaml({ draft_id: draftId, deleted: true })
     })

package/src/commands/filter.ts

@@ -1,12 +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, isScopeError } from '../api-utils.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
   // =========================================================================
@@ -15,10 +17,14 @@ export function registerFilterCommands(cli: Goke) {
     .command('mail filter list', 'List all Gmail filters')
     .action(async (options) => {
       const clients = await getClients(options.account)
+      const googleClients = clients.filter((c) => c.accountType === 'google')
+      if (googleClients.length === 0) {
+        handleCommandError(new UnsupportedError({ feature: 'Filters', accountType: 'IMAP/SMTP', hint: 'Filters are a Gmail-specific feature.' }))
+      }
 
       const results = await Promise.all(
-        clients.map(async ({ email, client }) => {
-          const res = await client.listFilters()
+        googleClients.map(async ({ email, client }) => {
+          const res = await (client as GmailClient).listFilters()
           if (res instanceof Error) return res
           return { email, filters: res.parsed }
         }),

package/src/commands/label.ts

@@ -3,13 +3,15 @@
 // 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 { getClients, getClient } from '../auth.js'
-import { AuthError } from '../api-utils.js'
+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
   // =========================================================================
@@ -18,11 +20,16 @@ export function registerLabelCommands(cli: Goke) {
     .command('label list', 'List all labels')
     .action(async (options) => {
       const clients = await getClients(options.account)
+      // Labels are Google-only — filter to Google accounts
+      const googleClients = clients.filter((c) => c.accountType === 'google')
+      if (googleClients.length === 0) {
+        handleCommandError(new UnsupportedError({ feature: 'Labels', accountType: 'IMAP/SMTP', hint: 'IMAP accounts use folders. Use --folder to browse different mailboxes.' }))
+      }
 
-      // Fetch from all accounts concurrently
+      // Fetch from all Google accounts concurrently
       const results = await Promise.all(
-        clients.map(async ({ email, client }) => {
-          const labelsResult = await client.listLabels()
+        googleClients.map(async ({ email, client }) => {
+          const labelsResult = await (client as GmailClient).listLabels()
           if (labelsResult instanceof Error) return labelsResult
           return { email, labels: labelsResult.parsed }
         }),
@@ -69,7 +76,7 @@ export function registerLabelCommands(cli: Goke) {
   cli
     .command('label get <labelId>', 'Get label details with counts')
     .action(async (labelId, options) => {
-      const { client } = await getClient(options.account)
+      const { client } = await getGmailClient(options.account)
 
       const label = await client.getLabel({ labelId })
 
@@ -93,7 +100,7 @@ export function registerLabelCommands(cli: Goke) {
     .option('--bg-color <bgColor>', z.string().describe('Background color (hex, e.g. #4986e7)'))
     .option('--text-color <textColor>', z.string().describe('Text color (hex, e.g. #ffffff)'))
     .action(async (name, options) => {
-      const { client } = await getClient(options.account)
+      const { client } = await getGmailClient(options.account)
 
       const result = await client.createLabel({
         name,
@@ -128,7 +135,7 @@ export function registerLabelCommands(cli: Goke) {
         }
       }
 
-      const { client } = await getClient(options.account)
+      const { client } = await getGmailClient(options.account)
       await client.deleteLabel({ labelId })
 
       out.printYaml({ label_id: labelId, deleted: true })
@@ -142,11 +149,15 @@ export function registerLabelCommands(cli: Goke) {
     .command('label counts', 'Show unread counts per label')
     .action(async (options) => {
       const clients = await getClients(options.account)
+      const googleClients = clients.filter((c) => c.accountType === 'google')
+      if (googleClients.length === 0) {
+        handleCommandError(new UnsupportedError({ feature: 'Label counts', accountType: 'IMAP/SMTP', hint: 'IMAP accounts use folders, not labels.' }))
+      }
 
-      // Fetch from all accounts concurrently
+      // Fetch from all Google accounts concurrently
       const results = await Promise.all(
-        clients.map(async ({ email, client }) => {
-          const countsResult = await client.getLabelCounts()
+        googleClients.map(async ({ email, client }) => {
+          const countsResult = await (client as GmailClient).getLabelCounts()
           if (countsResult instanceof Error) return countsResult
           return { email, counts: countsResult.parsed }
         }),