zele 0.3.15 → 0.3.17

package/src/commands/calendar.ts

@@ -78,7 +78,7 @@ export function registerCalendarCommands(cli: Goke) {
     .option('--all', 'Fetch from all calendars')
     .option('--query <query>', 'Free text search')
     .option('--max [max]', 'Max results (default: 20)')
-    .option('--page <page>', 'Pagination token')
+    .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 calendarId = options.calendar ?? 'primary'

package/src/commands/draft.ts

@@ -8,6 +8,7 @@ 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'
@@ -21,7 +22,7 @@ export function registerDraftCommands(cli: Goke) {
   cli
     .command('draft list', 'List drafts')
     .option('--max <max>', z.number().default(20).describe('Max results'))
-    .option('--page <page>', z.string().describe('Pagination token'))
+    .option('--page <page>', z.string().describe('Pagination token (requires --account, only works for a single account)'))
     .option('--query <query>', z.string().describe('Search query'))
     .action(async (options) => {
       const clients = await getClients(options.account)
@@ -72,7 +73,7 @@ export function registerDraftCommands(cli: Goke) {
           subject: d.subject,
           date: out.formatDate(d.date),
         })),
-        { summary: `${merged.length} draft(s)` },
+        { summary: `${merged.length} draft(s)`, nextPage: allResults[0]?.result.nextPageToken },
       )
     })
 
@@ -154,6 +155,7 @@ export function registerDraftCommands(cli: Goke) {
         threadId: options.thread,
         fromEmail: options.from,
       })
+      if (result instanceof Error) handleCommandError(result)
 
       out.printYaml(result)
       out.success('Draft created')
@@ -168,6 +170,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 +200,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

@@ -0,0 +1,74 @@
+// Filter commands: list, create, delete Gmail filters.
+// Multi-account support via getClients/getClient like label.ts.
+
+import type { Goke } from 'goke'
+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) {
+  // =========================================================================
+  // filter list
+  // =========================================================================
+
+  cli
+    .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(
+        googleClients.map(async ({ email, client }) => {
+          const res = await (client as GmailClient).listFilters()
+          if (res instanceof Error) return res
+          return { email, filters: res.parsed }
+        }),
+      )
+
+      const allResults = results.filter((r): r is Exclude<typeof r, Error> => {
+        if (r instanceof AuthError) {
+          if (isScopeError(r)) {
+            out.error(`Missing required OAuth scopes. Run: zele login to grant updated permissions`)
+          } else {
+            out.error(`${r.message}. Try: zele login`)
+          }
+          return false
+        }
+        if (r instanceof Error) { out.error(`Failed to fetch filters: ${r.message}`); return false }
+        return true
+      })
+
+      const merged = allResults.flatMap(({ email, filters }) =>
+        filters.map((f) => ({ ...f, account: email })),
+      )
+
+      if (merged.length === 0) {
+        out.hint('No filters found')
+        return
+      }
+
+      const showAccount = clients.length > 1
+      for (const f of merged) {
+        out.printYaml({
+          ...(showAccount ? { account: f.account } : {}),
+          id: f.id,
+          criteria: f.criteria,
+          action: f.action,
+        })
+      }
+
+      out.hint(`${merged.length} filter(s)`)
+    })
+
+  // TODO: add `mail filter create` and `mail filter delete` commands once
+  // gmail.settings.basic scope is added to the GCP OAuth consent screen.
+  // The https://mail.google.com/ scope covers reading filters but Google
+  // enforces the narrower scope for write operations (create/delete).
+  // The gmail-client.ts methods (createFilter, deleteFilter, resolveLabel)
+  // are already implemented and ready to use.
+}

package/src/commands/label.ts

@@ -5,9 +5,11 @@
 
 import type { Goke } from 'goke'
 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) {
   // =========================================================================
@@ -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 }
         }),

package/src/commands/mail-actions.ts

@@ -1,10 +1,11 @@
-// Mail action commands: star, unstar, archive, trash, untrash, mark read/unread, label modify.
+// Mail action commands: star, unstar, archive, trash, untrash, mark read/unread, spam, unspam, label modify.
 // Bulk operations on threads — cache invalidation is handled by the client methods.
 
 import type { Goke } from 'goke'
 import { z } from 'zod'
 import { getClient } from '../auth.js'
 import type { GmailClient } from '../gmail-client.js'
+import type { ImapSmtpClient } from '../imap-smtp-client.js'
 import * as out from '../output.js'
 import { handleCommandError } from '../output.js'
 
@@ -16,7 +17,7 @@ async function bulkAction(
   threadIds: string[],
   actionName: string,
   accountFilter: string[] | undefined,
-  fn: (client: GmailClient, ids: string[]) => Promise<void | Error>,
+  fn: (client: GmailClient | ImapSmtpClient, ids: string[]) => Promise<void | Error>,
 ) {
   if (threadIds.length === 0) {
     out.error('No thread IDs provided')
@@ -66,7 +67,7 @@ export function registerMailActionCommands(cli: Goke) {
     })
 
   cli
-    .command('mail read-mark [...threadIds]', 'Mark threads as read')
+    .command('mail read-mark [...threadIds]', 'Mark threads as read (removes UNREAD label)')
     .action(async (threadIds, options) => {
       await bulkAction(threadIds, 'Marked as read', options.account, (c, ids) => c.markAsRead({ threadIds: ids }))
     })
@@ -77,6 +78,18 @@ export function registerMailActionCommands(cli: Goke) {
       await bulkAction(threadIds, 'Marked as unread', options.account, (c, ids) => c.markAsUnread({ threadIds: ids }))
     })
 
+  cli
+    .command('mail spam [...threadIds]', 'Mark threads as spam')
+    .action(async (threadIds, options) => {
+      await bulkAction(threadIds, 'Marked as spam', options.account, (c, ids) => c.markAsSpam({ threadIds: ids }))
+    })
+
+  cli
+    .command('mail unspam [...threadIds]', 'Remove threads from spam')
+    .action(async (threadIds, options) => {
+      await bulkAction(threadIds, 'Removed from spam', options.account, (c, ids) => c.unmarkSpam({ threadIds: ids }))
+    })
+
   cli
     .command('mail label [...threadIds]', 'Add or remove labels from threads')
     .option('--add <add>', z.string().describe('Labels to add (comma-separated)'))