zele 0.3.12 → 0.3.14

package/src/gmail-client.test.ts

@@ -2,8 +2,13 @@
 // Captures entity/encoding regressions in snippet fields from Gmail metadata responses.
 
 import { expect, test } from 'vitest'
+import { OAuth2Client } from 'google-auth-library'
 import { GmailClient } from './gmail-client.js'
 
+// Create a real client instance for testing (no account context needed for parsing tests)
+const auth = new OAuth2Client()
+const client = new GmailClient({ auth })
+
 test('thread list snippet decodes HTML entities for TUI preview', () => {
   const rawThread = {
     id: 'thread_1',
@@ -16,7 +21,7 @@ test('thread list snippet decodes HTML entities for TUI preview', () => {
     ],
   }
 
-  const parsed = GmailClient.parseRawThreadListItem(rawThread as any)
+  const parsed = client.parseThreadListItem(rawThread as any)
   expect(parsed.snippet).toBe("It's ready & waiting")
 })
 
@@ -38,7 +43,7 @@ test('message snippet decodes HTML entities for detail preview', () => {
     labelIds: ['INBOX'],
   }
 
-  const parsed = GmailClient.parseRawMessage(rawMessage as any)
+  const parsed = client.parseMessage(rawMessage as any)
   expect(parsed.snippet).toBe("Built with Opus [4.6](https://4.6): you're in")
 })
 
@@ -54,6 +59,6 @@ test('thread list snippet strips zero-width and preheader garbage', () => {
     ],
   }
 
-  const parsed = GmailClient.parseRawThreadListItem(rawThread as any)
+  const parsed = client.parseThreadListItem(rawThread as any)
   expect(parsed.snippet).toBe('A host sent you a message')
 })

package/src/gmail-client.ts

@@ -353,7 +353,7 @@ export class GmailClient {
       const cached = await this.getCachedThread(t.id)
       if (cached && (!t.historyId || !cached.historyId || t.historyId === cached.historyId)) {
         return {
-          parsed: GmailClient.parseRawThreadListItem(cached),
+          parsed: this.parseThreadListItem(cached),
           raw: cached,
         }
       }
@@ -371,11 +371,11 @@ export class GmailClient {
       if (detail instanceof AuthError) return detail
       if (detail instanceof Error) return null
 
-      const parsed = GmailClient.parseRawThread(detail.data)
+      const parsed = this.parseThread(detail.data)
       await this.cacheThreadData(t.id, detail.data, parsed)
 
       return {
-        parsed: GmailClient.parseRawThreadListItem(detail.data),
+        parsed: this.parseThreadListItem(detail.data),
         raw: detail.data,
       }
     })
@@ -397,7 +397,7 @@ export class GmailClient {
     // Check cache
     const cached = await this.getCachedThread(threadId)
     if (cached) {
-      return { parsed: GmailClient.parseRawThread(cached), raw: cached }
+      return { parsed: this.parseThread(cached), raw: cached }
     }
 
     const res = await withRetry(() =>
@@ -408,7 +408,7 @@ export class GmailClient {
       }),
     )
 
-    const parsed = GmailClient.parseRawThread(res.data)
+    const parsed = this.parseThread(res.data)
     const result: ThreadResult = { parsed, raw: res.data }
 
     // Write cache
@@ -909,11 +909,11 @@ export class GmailClient {
   // Labels CRUD
   // =========================================================================
 
-  async listLabels(): Promise<{ parsed: ReturnType<typeof GmailClient.parseRawLabels>; raw: gmail_v1.Schema$Label[] } | AuthError | ApiError> {
+  async listLabels(): Promise<{ parsed: ReturnType<GmailClient['parseLabels']>; raw: gmail_v1.Schema$Label[] } | AuthError | ApiError> {
     // Check cache
     const cached = await this.getCachedLabels()
     if (cached) {
-      return { parsed: GmailClient.parseRawLabels(cached), raw: cached }
+      return { parsed: this.parseLabels(cached), raw: cached }
     }
 
     const res = await gmailBoundary(this.account?.email ?? 'unknown', () =>
@@ -928,7 +928,7 @@ export class GmailClient {
     // Write cache
     await this.cacheLabelsData(rawLabels)
 
-    return { parsed: GmailClient.parseRawLabels(rawLabels), raw: rawLabels }
+    return { parsed: this.parseLabels(rawLabels), raw: rawLabels }
   }
 
   async getLabel({ labelId }: { labelId: string }) {
@@ -1111,12 +1111,12 @@ export class GmailClient {
   }
 
   // =========================================================================
-  // Static: parse raw Google API responses (used by cache readers)
+  // Parsing: raw Google API responses → typed objects
   // =========================================================================
 
   /** Parse a raw gmail_v1.Schema$Thread (format: full) into ThreadData. */
-  static parseRawThread(raw: gmail_v1.Schema$Thread): ThreadData {
-    const messages = (raw.messages ?? []).map((m) => GmailClient.parseRawMessage(m))
+  parseThread(raw: gmail_v1.Schema$Thread): ThreadData {
+    const messages = (raw.messages ?? []).map((m) => this.parseMessage(m))
 
     if (messages.length === 0) {
       return {
@@ -1151,7 +1151,7 @@ export class GmailClient {
   }
 
   /** Parse a raw gmail_v1.Schema$Message into ParsedMessage. */
-  static parseRawMessage(message: gmail_v1.Schema$Message): ParsedMessage {
+  parseMessage(message: gmail_v1.Schema$Message): ParsedMessage {
     const headers = message.payload?.headers ?? []
     const labelIds = message.labelIds ?? []
 
@@ -1165,7 +1165,7 @@ export class GmailClient {
       .map((h) => h.value ?? '')
       .filter((v) => v.length > 0)
 
-    const { body, mimeType, textBody } = GmailClient.extractBodyStatic(message.payload ?? {})
+    const { body, mimeType, textBody } = this.extractBody(message.payload ?? {})
 
     return {
       id: message.id ?? '',
@@ -1192,15 +1192,16 @@ export class GmailClient {
       body,
       mimeType,
       textBody,
-      attachments: GmailClient.extractAttachmentMetaStatic(message.payload?.parts ?? []),
+      attachments: this.extractAttachmentMeta(message.payload?.parts ?? []),
     }
   }
 
-  /** Parse raw gmail_v1.Schema$Thread (format: metadata) into ThreadListItem. */
-  static parseRawThreadListItem(raw: gmail_v1.Schema$Thread): ThreadListItem {
+  /** Parse raw gmail_v1.Schema$Thread (format: metadata) into ThreadListItem.
+   *  Shows the other party in conversations where user sent the latest message. */
+  parseThreadListItem(raw: gmail_v1.Schema$Thread): ThreadListItem {
     const messages = raw.messages ?? []
-    const latest =
-      messages.findLast((m) => !m.labelIds?.includes('DRAFT')) ?? messages[messages.length - 1]
+    const nonDraftMessages = messages.filter((m) => !m.labelIds?.includes('DRAFT'))
+    const latest = nonDraftMessages[nonDraftMessages.length - 1] ?? messages[messages.length - 1]
 
     const headers = latest?.payload?.headers ?? []
     const allLabels = [...new Set(messages.flatMap((m) => m.labelIds ?? []))]
@@ -1208,21 +1209,45 @@ export class GmailClient {
     const getHeader = (name: string) =>
       headers.find((h) => h.name?.toLowerCase() === name.toLowerCase())?.value ?? null
 
+    // Determine display sender — show other party when user sent the latest message
+    let displayFrom = parseFrom(getHeader('from') ?? '')
+    const latestIsFromUser = latest?.labelIds?.includes('SENT') ?? false
+
+    if (latestIsFromUser && this.account?.email) {
+      const getMsgHeader = (msg: gmail_v1.Schema$Message, name: string) =>
+        msg.payload?.headers?.find((h) => h.name?.toLowerCase() === name.toLowerCase())?.value ?? null
+
+      // Find most recent message NOT from the user
+      const otherPartyMsg = nonDraftMessages.findLast((m) => !m.labelIds?.includes('SENT'))
+      if (otherPartyMsg) {
+        const fromHeader = getMsgHeader(otherPartyMsg, 'from')
+        if (fromHeader) displayFrom = parseFrom(fromHeader)
+      } else {
+        // All messages from user — show first recipient
+        const firstMsg = nonDraftMessages[0] ?? messages[0]
+        if (firstMsg) {
+          const toHeader = getMsgHeader(firstMsg, 'to') ?? ''
+          const recipients = parseAddressList(toHeader)
+          if (recipients[0]) displayFrom = recipients[0]
+        }
+      }
+    }
+
     return {
       id: raw.id ?? '',
       historyId: raw.historyId ?? null,
       snippet: sanitizeSnippet(latest?.snippet ?? ''),
       subject: (getHeader('subject') ?? '(no subject)').replace(/"/g, '').trim(),
-      from: parseFrom(getHeader('from') ?? ''),
+      from: displayFrom,
       date: getHeader('date') ?? '',
       labelIds: allLabels,
       unread: allLabels.includes('UNREAD'),
-      messageCount: messages.filter((m) => !m.labelIds?.includes('DRAFT')).length,
+      messageCount: nonDraftMessages.length,
     }
   }
 
   /** Parse raw gmail_v1.Schema$Label[] from labels.list into our label objects. */
-  static parseRawLabels(rawLabels: gmail_v1.Schema$Label[]) {
+  parseLabels(rawLabels: gmail_v1.Schema$Label[]) {
     return rawLabels.map((label) => ({
       id: label.id ?? '',
       name: label.name ?? '',
@@ -1239,19 +1264,15 @@ export class GmailClient {
   }
 
   /** Parse raw gmail_v1.Schema$Label[] (with counts) into label count objects. */
-  static parseRawLabelCounts(
-    rawLabels: gmail_v1.Schema$Label[],
-    archiveEstimate: number | null,
-  ) {
-    const result = rawLabels
-      .map((detail) => {
-        const labelName = (detail.name ?? detail.id ?? '').toLowerCase()
-        const isTotalLabel = labelName === 'draft' || labelName === 'sent'
-        return {
-          label: labelName === 'draft' ? 'drafts' : labelName,
-          count: Number(isTotalLabel ? detail.threadsTotal : detail.threadsUnread) || 0,
-        }
-      })
+  parseLabelCounts(rawLabels: gmail_v1.Schema$Label[], archiveEstimate: number | null) {
+    const result = rawLabels.map((detail) => {
+      const labelName = (detail.name ?? detail.id ?? '').toLowerCase()
+      const isTotalLabel = labelName === 'draft' || labelName === 'sent'
+      return {
+        label: labelName === 'draft' ? 'drafts' : labelName,
+        count: Number(isTotalLabel ? detail.threadsTotal : detail.threadsUnread) || 0,
+      }
+    })
 
     if (archiveEstimate !== null) {
       result.push({ label: 'archive', count: archiveEstimate })
@@ -1261,10 +1282,10 @@ export class GmailClient {
   }
 
   // =========================================================================
-  // Private static: body/attachment extraction (for static parse methods)
+  // Private: body/attachment extraction
   // =========================================================================
 
-  private static extractBodyStatic(payload: gmail_v1.Schema$MessagePart): {
+  private extractBody(payload: gmail_v1.Schema$MessagePart): {
     body: string
     mimeType: string
     textBody: string | null
@@ -1282,8 +1303,8 @@ export class GmailClient {
       return { body: '', mimeType: 'text/plain', textBody: null }
     }
 
-    const htmlData = GmailClient.findBodyPartStatic(payload.parts, 'text/html')
-    const textData = GmailClient.findBodyPartStatic(payload.parts, 'text/plain')
+    const htmlData = this.findBodyPart(payload.parts, 'text/html')
+    const textData = this.findBodyPart(payload.parts, 'text/plain')
     const textBody = textData ? decodeBase64Url(textData) : null
 
     if (htmlData) {
@@ -1296,7 +1317,7 @@ export class GmailClient {
 
     for (const part of payload.parts) {
       if (part.parts) {
-        const nested = GmailClient.extractBodyStatic(part)
+        const nested = this.extractBody(part)
         if (nested.body) return nested
       }
     }
@@ -1304,20 +1325,20 @@ export class GmailClient {
     return { body: '', mimeType: 'text/plain', textBody: null }
   }
 
-  private static findBodyPartStatic(parts: gmail_v1.Schema$MessagePart[], mimeType: string): string | null {
+  private findBodyPart(parts: gmail_v1.Schema$MessagePart[], mimeType: string): string | null {
     for (const part of parts) {
       if (part.mimeType === mimeType && part.body?.data) {
         return part.body.data
       }
       if (part.parts) {
-        const found = GmailClient.findBodyPartStatic(part.parts, mimeType)
+        const found = this.findBodyPart(part.parts, mimeType)
         if (found) return found
       }
     }
     return null
   }
 
-  private static extractAttachmentMetaStatic(parts: gmail_v1.Schema$MessagePart[]): AttachmentMeta[] {
+  private extractAttachmentMeta(parts: gmail_v1.Schema$MessagePart[]): AttachmentMeta[] {
     const results: AttachmentMeta[] = []
 
     for (const part of parts) {
@@ -1338,7 +1359,7 @@ export class GmailClient {
       }
 
       if (part.parts) {
-        results.push(...GmailClient.extractAttachmentMetaStatic(part.parts))
+        results.push(...this.extractAttachmentMeta(part.parts))
       }
     }
 
@@ -1543,21 +1564,6 @@ export class GmailClient {
     }
   }
 
-  // =========================================================================
-  // Private: message parsing (delegates to static methods)
-  // =========================================================================
-
-  private parseMessage(message: gmail_v1.Schema$Message): ParsedMessage {
-    return GmailClient.parseRawMessage(message)
-  }
-
-  private parseThreadListItem(
-    threadId: string,
-    thread: gmail_v1.Schema$Thread,
-  ): ThreadListItem {
-    return GmailClient.parseRawThreadListItem({ ...thread, id: threadId })
-  }
-
   // =========================================================================
   // Private: MIME message construction
   // =========================================================================