imsg-mcp 1.3.2 → 1.5.0

package/dist/tui.js

@@ -2,10 +2,10 @@
 import { jsx, jsxs, Fragment } from "react/jsx-runtime";
 import { parseArgs } from "node:util";
 import { useScreenSize, withFullScreen } from "fullscreen-ink";
-import { g as getImsgDbPath, a as getContactsDbPaths, b as getSlugsDbPath, j as sendToChat, k as sendToChatId, m as sendMessageAlt, r as registerCleanup, c as checkLocalAccess, f as formatAccessReport, q as installShutdownHandlers, x as startHeapMonitor, v as logStartup, F as enableFileLogging, B as stopHeapMonitor, A as logShutdown } from "./shutdown-pPAPSnk3.js";
+import { u as dispatchAnalytic, I as IMPLEMENTED_TYPES, b as getImsgDbPath, d as getContactsDbPaths, e as getSlugsDbPath, l as sendToChat, m as sendToChatId, n as sendMessageReliable, w as registerCleanup, c as checkLocalAccess, f as formatAccessReport, v as installShutdownHandlers, B as startHeapMonitor, z as logStartup, L as enableFileLogging, F as stopHeapMonitor, E as logShutdown } from "./shutdown-Vh0gjb6m.js";
 import { spawnSync, execSync } from "node:child_process";
 import { resolveTuiConfig } from "./tui-config-Crn6TZPg.js";
-import { a as rankFuzzy, b as dispatchAnalytic, I as IMPLEMENTED_TYPES, c as readWatchdogState, o as onMemorySample, m as minMessageId, r as resolveRecipient, d as defaultCountryFromEnv, i as installWatchdog } from "./watchdog-Cbgm050b.js";
+import { a as rankFuzzy, o as onMemorySample, b as readWatchdogState, m as minMessageId, r as resolveRecipient, d as defaultCountryFromEnv, i as installWatchdog } from "./watchdog-B3T-dQT-.js";
 import { existsSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
@@ -14,7 +14,7 @@ import React, { createContext, useContext, useMemo, useEffect, useState, useRef,
 import { TextInput } from "@inkjs/ui";
 import { parseUserDate, formatJumpTarget } from "./dateParse-DJXMfq3a.js";
 import { e as extensionFor, t as toJSON, a as toCSV, b as toMarkdown } from "./exportFormats-wytSyBTp.js";
-import { h as hasNativeModule, I as IMessageDB } from "./imessage-db-Cz8MIIpG.js";
+import { h as hasNativeModule, I as IMessageDB } from "./imessage-db-BrHJPOq7.js";
 const FC_LIST_TIMEOUT_MS = 1e3;
 let cached = null;
 function detectNerdFont() {
@@ -807,8 +807,10 @@ const COMPOSE_NEW_KEYS = [
 ];
 const FILTER_KEYS = [["Enter/Esc", "exit filter"]];
 const DRAWER_KEYS = [
-  ["j/k", "scroll"],
-  ["o", "open attachment"],
+  ["j/k", "select attachment"],
+  ["o", "open"],
+  ["s", "save"],
+  ["y", "copy path"],
   ["Esc/q", "close"]
 ];
 function HelpBar({ mode, focus }) {
@@ -1110,9 +1112,10 @@ function Label({ children }) {
     ": "
   ] }) });
 }
-function MessageDrawer({ message: m, width, height }) {
+function MessageDrawer({ message: m, width, height, selectedAttachmentIdx = 0 }) {
   const theme = useTheme();
   const hasAttachments = m.attachments && m.attachments.length > 0;
+  const multiAttachment = (m.attachments?.length ?? 0) > 1;
   return /* @__PURE__ */ jsxs(
     Box,
     {
@@ -1157,6 +1160,14 @@ function MessageDrawer({ message: m, width, height }) {
             /* @__PURE__ */ jsx(Label, { children: "GUID" }),
             /* @__PURE__ */ jsx(Text, { color: theme.drawer.value, wrap: "truncate", children: m.guid })
           ] }),
+          m.sendError !== void 0 && /* @__PURE__ */ jsxs(Box, { children: [
+            /* @__PURE__ */ jsx(Label, { children: "Status" }),
+            /* @__PURE__ */ jsxs(Text, { color: theme.edited, bold: true, children: [
+              "NOT DELIVERED — send failed (error ",
+              m.sendError,
+              ")"
+            ] })
+          ] }),
           m.isEdited && /* @__PURE__ */ jsxs(Box, { children: [
             /* @__PURE__ */ jsx(Label, { children: "Status" }),
             /* @__PURE__ */ jsx(Text, { color: theme.edited, children: "Edited" })
@@ -1182,29 +1193,43 @@ function MessageDrawer({ message: m, width, height }) {
               m.attachments.length,
               "):"
             ] }),
-            m.attachments.map((att) => {
+            m.attachments.map((att, i) => {
+              const isSel = multiAttachment && i === selectedAttachmentIdx;
               return /* @__PURE__ */ jsxs(
                 Box,
                 {
                   flexDirection: "column",
-                  paddingLeft: 1,
                   children: [
-                    /* @__PURE__ */ jsx(Text, { color: theme.drawer.value, wrap: "truncate", children: att.transferName ?? att.filename }),
-                    /* @__PURE__ */ jsxs(Text, { color: theme.drawer.label, children: [
+                    /* @__PURE__ */ jsxs(Box, { children: [
+                      /* @__PURE__ */ jsx(Box, { flexShrink: 0, children: /* @__PURE__ */ jsx(Text, { color: isSel ? theme.sent.bg : theme.drawer.label, children: multiAttachment ? isSel ? "▸" : " " : " " }) }),
+                      /* @__PURE__ */ jsx(Text, { color: theme.drawer.value, bold: isSel, wrap: "truncate", children: att.transferName ?? att.filename })
+                    ] }),
+                    /* @__PURE__ */ jsx(Box, { paddingLeft: 1, children: /* @__PURE__ */ jsxs(Text, { color: theme.drawer.label, children: [
                       att.mimeType ?? "unknown",
                       " ·",
                       " ",
-                      att.totalBytes > 0 ? formatBytes(att.totalBytes) : "?",
-                      /* @__PURE__ */ jsx(Text, { color: theme.senderName, children: " (press o to preview)" })
-                    ] })
+                      att.totalBytes > 0 ? formatBytes(att.totalBytes) : "?"
+                    ] }) })
                   ]
                 },
                 `${att.filename}-${att.transferName ?? ""}-${att.mimeType ?? ""}-${att.totalBytes}`
               );
             }),
-            /* @__PURE__ */ jsxs(Box, { marginTop: 1, children: [
-              /* @__PURE__ */ jsx(Text, { color: theme.help.key, children: "o" }),
-              /* @__PURE__ */ jsx(Text, { color: theme.help.desc, children: ": open attachment" })
+            /* @__PURE__ */ jsxs(Box, { marginTop: 1, flexDirection: "column", children: [
+              multiAttachment && /* @__PURE__ */ jsxs(Text, { color: theme.help.desc, children: [
+                /* @__PURE__ */ jsx(Text, { color: theme.help.key, children: "j/k" }),
+                ": select attachment"
+              ] }),
+              /* @__PURE__ */ jsxs(Text, { color: theme.help.desc, children: [
+                /* @__PURE__ */ jsx(Text, { color: theme.help.key, children: "o" }),
+                ": open",
+                "  ",
+                /* @__PURE__ */ jsx(Text, { color: theme.help.key, children: "s" }),
+                ": save to ~/Downloads",
+                "  ",
+                /* @__PURE__ */ jsx(Text, { color: theme.help.key, children: "y" }),
+                ": copy path"
+              ] })
             ] })
           ] }),
           /* @__PURE__ */ jsxs(Box, { flexDirection: "column", marginTop: 1, children: [
@@ -1527,7 +1552,8 @@ const ANALYTIC_LABEL = {
   response_time_stats: "Response Times",
   daily_heatmap: "Daily Heatmap",
   tapback_summary: "Tapback Summary",
-  year_in_review_wrapped: "Year in Review (Wrapped)"
+  year_in_review_wrapped: "Year in Review (Wrapped)",
+  relationship_leaderboard: "Relationship Leaderboard"
 };
 const RANGE_LABEL = {
   "30d": "Last 30 days",
@@ -1709,8 +1735,34 @@ function AnalyticsResultView({
       return /* @__PURE__ */ jsx(TapbacksView, { rows: data, height });
     case "year_in_review_wrapped":
       return /* @__PURE__ */ jsx(WrappedView, { result: data });
+    case "relationship_leaderboard":
+      return /* @__PURE__ */ jsx(LeaderboardView, { result: data, height });
   }
 }
+function LeaderboardView({
+  result,
+  height
+}) {
+  const theme = useTheme();
+  const rows = result.leaderboard.slice(0, Math.max(height - 3, 5));
+  if (rows.length === 0) return /* @__PURE__ */ jsx(NoData, {});
+  const max = rows[0]?.score || 0;
+  return /* @__PURE__ */ jsx(Box, { flexDirection: "column", children: rows.map((r, i) => /* @__PURE__ */ jsxs(Box, { gap: 1, children: [
+    /* @__PURE__ */ jsx(Text, { color: theme.lineNum, children: String(i + 1).padStart(2) }),
+    /* @__PURE__ */ jsx(Text, { color: theme.senderName, bold: true, children: r.contact.length > 24 ? `${r.contact.slice(0, 23)}…` : r.contact }),
+    /* @__PURE__ */ jsxs(Text, { color: theme.info.label, children: [
+      r.total,
+      " msgs · ",
+      Math.round(r.reciprocity * 100),
+      "% recip ·",
+      " ",
+      Math.round(r.daysSinceLast),
+      "d ago · score",
+      " ",
+      max > 0 ? Math.round(r.score / max * 100) : 0
+    ] })
+  ] }, r.contact)) });
+}
 function NoData() {
   const theme = useTheme();
   return /* @__PURE__ */ jsx(Text, { color: theme.help.desc, children: "No data in this window." });
@@ -2003,17 +2055,19 @@ const ANALYTIC_DESCRIPTION = {
   response_time_stats: "Reply latency (median, p95, mean)",
   daily_heatmap: "7×24 grid of activity by weekday × hour",
   tapback_summary: "Tapback reactions sent per contact",
-  year_in_review_wrapped: "Wrapped summary: top contacts, peak day, totals"
+  year_in_review_wrapped: "Wrapped summary: top contacts, peak day, totals",
+  relationship_leaderboard: "Top relationships by volume, reciprocity, and recency"
 };
 let instanceCounter = 0;
 function makeInstance(type) {
   instanceCounter += 1;
-  const state = { type, range: "30d", chatIdentifier: null };
+  const range = type === "relationship_leaderboard" ? "all" : "30d";
+  const state = { type, range, chatIdentifier: null };
   return {
     id: `analytics.${type}-${Date.now()}-${instanceCounter}`,
     moduleId: "analytics",
     title: `Analytics: ${ANALYTIC_LABEL[type]}`,
-    subtitle: "range: 30d",
+    subtitle: `range: ${range}`,
     state
   };
 }
@@ -2161,6 +2215,7 @@ function ConversationItem({
   const truncatedName = truncateToWidth(name, nameW);
   const snippetW = Math.max(width - 6, 8);
   const truncatedSnippet = truncateToWidth(snippet, snippetW, "");
+  const slugText = truncateSlugForRow(c.threadSlug ?? "", Math.max(width - 3, 10));
   return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", width, children: [
     /* @__PURE__ */ jsxs(
       Box,
@@ -2218,9 +2273,9 @@ function ConversationItem({
               justifyContent: "flex-end",
               paddingRight: 1,
               backgroundColor: theme.sidebar.slugBg,
-              children: /* @__PURE__ */ jsxs(Text, { color: theme.sidebar.slug, dimColor: true, italic: true, children: [
+              children: /* @__PURE__ */ jsxs(Text, { color: theme.sidebar.slug, dimColor: true, italic: true, wrap: "truncate", children: [
                 "~",
-                c.threadSlug
+                slugText
               ] })
             }
           )
@@ -2230,6 +2285,16 @@ function ConversationItem({
     !isLast && /* @__PURE__ */ jsx(Box, { paddingX: 1, children: /* @__PURE__ */ jsx(Text, { color: theme.sidebar.separator, dimColor: true, children: theme.glyphs.separator.repeat(Math.max(width - 4, 1)) }) })
   ] });
 }
+function truncateSlugForRow(slug, maxCols) {
+  if (visualWidth(slug) <= maxCols) return slug;
+  const m = slug.match(/^(.*)(~[a-z]+~[0-9a-f]+)$/);
+  if (m?.[1] !== void 0 && m[2] !== void 0) {
+    const tailW = visualWidth(m[2]);
+    const nameCols = Math.max(maxCols - tailW, 3);
+    return `${truncateToWidth(m[1], nameCols)}${m[2]}`;
+  }
+  return truncateToWidth(slug, maxCols);
+}
 function DefaultModuleSidebarItem({
   instance,
   selected,
@@ -2514,13 +2579,17 @@ function MessageBubble({
               ] })
             )
           ] }) }),
-          /* @__PURE__ */ jsx(Text, { color: isSent ? theme.sentText : theme.receivedText, wrap: "truncate", children: text }),
+          /* @__PURE__ */ jsx(Text, { color: isSent ? theme.sentText : theme.receivedText, wrap: "wrap", children: text }),
           reactions && /* @__PURE__ */ jsxs(Text, { children: [
             " ",
             reactions
           ] }),
           hasAttachments && /* @__PURE__ */ jsx(Text, { color: theme.attachment, children: " 📎" }),
-          m.isEdited && /* @__PURE__ */ jsx(Text, { color: theme.edited, children: " ✎" })
+          m.isEdited && /* @__PURE__ */ jsx(Text, { color: theme.edited, children: " ✎" }),
+          m.sendError !== void 0 && /* @__PURE__ */ jsxs(Text, { color: theme.edited, bold: true, children: [
+            " ",
+            "✗ not delivered"
+          ] })
         ] }),
         m.isReply && (() => {
           let replyText = m.replyTo?.replyToText ?? null;
@@ -2531,7 +2600,7 @@ function MessageBubble({
           return /* @__PURE__ */ jsxs(Box, { children: [
             lineNum !== void 0 && /* @__PURE__ */ jsx(Text, { children: "    " }),
             /* @__PURE__ */ jsx(Text, { children: "  " }),
-            /* @__PURE__ */ jsxs(Text, { color: theme.replyContext, italic: true, children: [
+            /* @__PURE__ */ jsxs(Text, { color: theme.replyContext, italic: true, wrap: "truncate", children: [
               "  ↩ ",
               display
             ] })
@@ -2553,7 +2622,7 @@ function PendingBubble({ text, status }) {
     ] }),
     /* @__PURE__ */ jsx(Text, { color: theme.timestamp, children: "now".padEnd(14) }),
     /* @__PURE__ */ jsx(Text, { color: theme.sent.bg, bold: true, children: `${theme.glyphs.sent} Me: ` }),
-    /* @__PURE__ */ jsx(Text, { color: theme.pending.fg, wrap: "truncate", children: text })
+    /* @__PURE__ */ jsx(Text, { color: theme.pending.fg, wrap: "wrap", children: text })
   ] });
 }
 function ThreadPane({
@@ -2589,10 +2658,10 @@ function ThreadPane({
     if (cursorIdx >= messages.length - NEAR_END && pending.length === 0) {
       const end2 = messages.length - 1;
       let start2 = end2;
-      let totalLines2 = lineHeight(messages, end2, maxBubbleW);
-      while (start2 > 0 && totalLines2 + lineHeight(messages, start2 - 1, maxBubbleW) <= msgAreaHeight) {
+      let totalLines2 = lineHeight(messages, end2, maxBubbleW, isGroup);
+      while (start2 > 0 && totalLines2 + lineHeight(messages, start2 - 1, maxBubbleW, isGroup) <= msgAreaHeight) {
         start2--;
-        totalLines2 += lineHeight(messages, start2, maxBubbleW);
+        totalLines2 += lineHeight(messages, start2, maxBubbleW, isGroup);
       }
       return { visibleStart: start2, visibleEnd: end2 + 1 };
     }
@@ -2601,24 +2670,24 @@ function ThreadPane({
     const targetAbove = Math.floor(msgAreaHeight * 0.4);
     while (start > 0 && linesAbove < targetAbove) {
       start--;
-      linesAbove += lineHeight(messages, start, maxBubbleW);
+      linesAbove += lineHeight(messages, start, maxBubbleW, isGroup);
     }
     let end = cursorIdx;
-    let totalLines = linesAbove + lineHeight(messages, cursorIdx, maxBubbleW);
+    let totalLines = linesAbove + lineHeight(messages, cursorIdx, maxBubbleW, isGroup);
     while (end < total - 1 && totalLines < msgAreaHeight) {
       end++;
       if (end < messages.length) {
-        totalLines += lineHeight(messages, end, maxBubbleW);
+        totalLines += lineHeight(messages, end, maxBubbleW, isGroup);
       } else {
         totalLines += 1;
       }
     }
     while (start > 0 && totalLines < msgAreaHeight) {
       start--;
-      totalLines += lineHeight(messages, start, maxBubbleW);
+      totalLines += lineHeight(messages, start, maxBubbleW, isGroup);
     }
     return { visibleStart: start, visibleEnd: end + 1 };
-  }, [messages, pending.length, selectedMsgIdx, msgAreaHeight, maxBubbleW]);
+  }, [messages, pending.length, selectedMsgIdx, msgAreaHeight, maxBubbleW, isGroup]);
   const visibleMessages = messages.slice(visibleStart, Math.min(visibleEnd, messages.length));
   const messagesByGuid = useMemo(() => {
     const map = /* @__PURE__ */ new Map();
@@ -2748,22 +2817,27 @@ function ThreadPane({
     }
   );
 }
-function lineHeight(messages, i, bubbleWidth) {
+function wrapRows(text, innerW) {
+  let rows = 0;
+  for (const line of text.split("\n")) {
+    rows += Math.max(1, Math.ceil(visualWidth(line) / innerW));
+  }
+  return rows;
+}
+function lineHeight(messages, i, bubbleWidth, isGroup) {
   if (i < 0 || i >= messages.length) return 1;
   const msg = messages[i];
-  const innerW = Math.max(20, bubbleWidth - 4);
+  const firstInGroup = isGroupStart(msg, i > 0 ? messages[i - 1] : void 0);
+  const senderPad = isGroup && firstInGroup && !msg.isFromMe ? 14 : 0;
+  const innerW = Math.max(16, bubbleWidth - 25 - senderPad);
   const text = msg.text ?? "";
-  let h = Math.max(1, Math.ceil(text.length / innerW));
-  if (msg.isReply) {
-    const replyLen = msg.replyTo?.replyToText?.length ?? 0;
-    h += Math.max(1, Math.ceil(replyLen / Math.max(20, innerW - 4)));
-  }
+  let h = wrapRows(text, innerW);
+  if (msg.isReply) h += 1;
   if (i === 0) {
     h += 1;
   } else if (isDifferentDay(messages[i - 1].date, msg.date)) {
     h += 2;
   }
-  if (msg.attachments && msg.attachments.length > 0) h += 1;
   return h;
 }
 function nextGroupBoundary(messages, fromIdx) {
@@ -2836,7 +2910,6 @@ function useDevStats(visible) {
   const lastTimeRef = useRef(Date.now());
   const lastQueryMsRef = useRef(null);
   useEffect(() => {
-    if (!visible) return;
     const sample = () => {
       const now = Date.now();
       const elapsed = now - lastTimeRef.current;
@@ -2863,9 +2936,13 @@ function useDevStats(visible) {
       });
     };
     sample();
-    const timer = setInterval(sample, 2e3);
-    timer.unref();
-    return () => clearInterval(timer);
+    if (visible) {
+      const timer = setInterval(sample, 2e3);
+      timer.unref();
+      return () => clearInterval(timer);
+    }
+    const unsubscribe = onMemorySample(() => sample());
+    return unsubscribe;
   }, [visible]);
   const recordQueryTime = useCallback((ms) => {
     lastQueryMsRef.current = Math.round(ms * 10) / 10;
@@ -3027,7 +3104,8 @@ function useImsg() {
       if (slugRecord.isGroup) {
         return slugRecord.displayName && !slugRecord.displayName.startsWith("chat") ? sendToChat(slugRecord.displayName, text) : sendToChatId(slugRecord.chatGuid, text);
       }
-      return sendMessageAlt(slugRecord.chatIdentifier, text);
+      const preferred = db.getPreferredSendService(slugRecord.chatIdentifier) ?? (slugRecord.service === "SMS" ? "SMS" : "iMessage");
+      return sendMessageReliable(slugRecord.chatIdentifier, text, preferred);
     },
     [getDb]
   );
@@ -3051,9 +3129,12 @@ function useImsg() {
           error: `Ambiguous: ${resolution.candidates.length} matches for "${input}". Pick a specific handle.`
         };
       }
-      return sendMessageAlt(resolution.handle, text);
+      const db = getDb();
+      const conv = await db.findChatByHandle(resolution.handle);
+      const preferred = conv && !conv.isGroupChat ? db.getPreferredSendService(conv.chatIdentifier) ?? (conv.serviceType === "SMS" ? "SMS" : "iMessage") : void 0;
+      return sendMessageReliable(resolution.handle, text, preferred);
     },
-    [resolveRecipientInput]
+    [resolveRecipientInput, getDb]
   );
   const refresh = useCallback(() => {
     getDb().scheduleBackgroundRefresh();
@@ -3124,6 +3205,7 @@ const initialState = {
   status: "Loading...",
   numBuffer: "",
   showDevStats: false,
+  drawerAttachmentIdx: 0,
   conversationLoadedCount: 0,
   conversationLoadingMore: false,
   messageOldestLoadedId: null,
@@ -3382,9 +3464,11 @@ function reducer(state, action) {
     case "EXIT_FILTER":
       return { ...state, mode: "browse", filterQuery: "" };
     case "OPEN_DRAWER":
-      return { ...state, mode: "drawer" };
+      return { ...state, mode: "drawer", drawerAttachmentIdx: 0 };
     case "CLOSE_DRAWER":
       return { ...state, mode: "browse" };
+    case "SET_DRAWER_ATTACHMENT":
+      return { ...state, drawerAttachmentIdx: Math.max(0, action.index) };
     case "SET_NUM_BUFFER":
       return { ...state, numBuffer: action.value };
     case "TOGGLE_DEV_STATS":
@@ -3476,8 +3560,8 @@ function App() {
   const commands2 = useMemo(() => allCommands(state), [state]);
   const commandCtx = useMemo(() => ({ state, dispatch, imsg }), [state, imsg]);
   const loadMessages = useCallback(
-    async (idx) => {
-      const conv = state.conversations[idx];
+    async (idx, convOverride) => {
+      const conv = convOverride ?? state.conversations[idx];
       if (!conv) return;
       dispatch({
         type: "SET_LOADING",
@@ -3498,11 +3582,15 @@ function App() {
     dispatch({ type: "SET_CONVERSATIONS", data: convs });
     if (convs.length > 0) {
       const prevSlug = selected?.threadSlug;
+      let targetIdx = Math.min(Math.max(state.selectedIdx, 0), convs.length - 1);
       if (prevSlug) {
         const idx = convs.findIndex((c) => c.threadSlug === prevSlug);
-        if (idx >= 0) dispatch({ type: "SELECT", index: idx, visibleCount: sidebarVisibleCount });
+        if (idx >= 0) {
+          dispatch({ type: "SELECT", index: idx, visibleCount: sidebarVisibleCount });
+          targetIdx = idx;
+        }
       }
-      await loadMessages(state.selectedIdx);
+      await loadMessages(targetIdx, convs[targetIdx]);
     }
     imsg.refresh();
     dispatch({ type: "SET_LOADING", loading: false, status: "" });
@@ -3527,11 +3615,11 @@ function App() {
       selected.chatIdentifier,
       state.messageOldestLoadedId
     );
-    if (olderMsgs.length === 0) {
+    const newOldestId = minMessageId(olderMsgs) ?? -1;
+    if (olderMsgs.length === 0 || newOldestId < 0 || newOldestId >= state.messageOldestLoadedId) {
       dispatch({ type: "PREPEND_MESSAGES", data: [], oldestId: -1 });
       return;
     }
-    const newOldestId = minMessageId(olderMsgs) ?? -1;
     dispatch({ type: "PREPEND_MESSAGES", data: olderMsgs, oldestId: newOldestId });
   }, [imsg, selected, state.messageLoadingOlder, state.messageOldestLoadedId]);
   useEffect(() => {
@@ -3590,11 +3678,19 @@ function App() {
         try {
           const msgs = await imsg.loadMessages(selected.chatIdentifier);
           const found = msgs.some((m) => m.isFromMe && m.text?.includes(text));
-          if (found) {
+          const failed = msgs.some(
+            (m) => m.isFromMe && m.sendError !== void 0 && m.text?.includes(text)
+          );
+          if (failed) {
+            dispatch({ type: "SET_MESSAGES", data: msgs });
+            dispatch({ type: "FAIL_PENDING", text });
+          } else if (found) {
             dispatch({ type: "SET_MESSAGES", data: msgs });
             dispatch({ type: "RESOLVE_PENDING", text });
           } else if (attempt < 7) {
             pollTimerRef.current = setTimeout(poll, 1500);
+          } else {
+            dispatch({ type: "FAIL_PENDING", text });
           }
         } catch {
           dispatch({ type: "FAIL_PENDING", text });
@@ -3681,6 +3777,9 @@ function App() {
       }
       return;
     }
+    if (state.mode === "compose-new") {
+      return;
+    }
     if (state.mode === "confirm") {
       if (key.return) {
         await sendMessage();
@@ -3690,10 +3789,29 @@ function App() {
       return;
     }
     if (state.mode === "drawer") {
+      const attCount = selectedMsg?.attachments?.length ?? 0;
       if (key.escape || input === "q") {
         dispatch({ type: "CLOSE_DRAWER" });
+      } else if ((input === "j" || key.downArrow) && attCount > 1) {
+        dispatch({
+          type: "SET_DRAWER_ATTACHMENT",
+          index: Math.min(state.drawerAttachmentIdx + 1, attCount - 1)
+        });
+      } else if ((input === "k" || key.upArrow) && attCount > 1) {
+        dispatch({ type: "SET_DRAWER_ATTACHMENT", index: state.drawerAttachmentIdx - 1 });
       } else if (input === "o" && selectedMsg) {
-        openAttachment(selectedMsg);
+        openAttachment(selectedMsg, state.drawerAttachmentIdx);
+      } else if (input === "s" && selectedMsg) {
+        saveAttachment(selectedMsg, state.drawerAttachmentIdx);
+      } else if (input === "y" && selectedMsg) {
+        const att = selectedMsg.attachments?.[state.drawerAttachmentIdx];
+        if (att?.filename) {
+          const filepath = att.filename.replace(/^~/, process.env.HOME ?? "~");
+          execSync("pbcopy", { input: filepath });
+          dispatch({ type: "SET_STATUS", status: "Attachment path copied." });
+        } else {
+          dispatch({ type: "SET_STATUS", status: "No attachment to copy." });
+        }
       }
       return;
     }
@@ -3938,9 +4056,16 @@ function App() {
         const prev = prevGroupBoundary(state.messages, state.selectedMsgIdx);
         dispatch({ type: "SELECT_MSG", index: prev });
       } else if (input === "o") {
-        openAttachment(
-          state.selectedMsgIdx >= 0 ? state.messages[state.selectedMsgIdx] : void 0
-        );
+        const msg = state.selectedMsgIdx >= 0 ? state.messages[state.selectedMsgIdx] : void 0;
+        if (msg && (msg.attachments?.length ?? 0) > 1) {
+          dispatch({ type: "OPEN_DRAWER" });
+          dispatch({
+            type: "SET_STATUS",
+            status: `${msg.attachments?.length} attachments — j/k select, o open, s save`
+          });
+        } else {
+          openAttachment(msg);
+        }
       }
     }
   });
@@ -4037,7 +4162,7 @@ function App() {
     state.selectionAnchor,
     selected
   ]);
-  function openAttachment(msg) {
+  function openAttachment(msg, attIdx = 0) {
     if (!msg) {
       dispatch({ type: "SET_STATUS", status: "No message selected." });
       return;
@@ -4046,7 +4171,7 @@ function App() {
       dispatch({ type: "SET_STATUS", status: "No attachment on this message." });
       return;
     }
-    const att = msg.attachments[0];
+    const att = msg.attachments[attIdx] ?? msg.attachments[0];
     if (!att.filename) {
       dispatch({ type: "SET_STATUS", status: "Attachment has no file path." });
       return;
@@ -4064,6 +4189,35 @@ function App() {
       }
     });
   }
+  function saveAttachment(msg, attIdx) {
+    const att = msg.attachments?.[attIdx];
+    if (!att?.filename) {
+      dispatch({ type: "SET_STATUS", status: "No attachment to save." });
+      return;
+    }
+    const src = att.filename.replace(/^~/, process.env.HOME ?? "~");
+    import("node:fs").then((fs) => {
+      import("node:path").then((path) => {
+        try {
+          const base = att.transferName ?? path.basename(src);
+          const dir = join(homedir(), "Downloads");
+          const ext = path.extname(base);
+          const stem = base.slice(0, base.length - ext.length);
+          let dest = path.join(dir, base);
+          for (let n = 1; fs.existsSync(dest); n++) {
+            dest = path.join(dir, `${stem}-${n}${ext}`);
+          }
+          fs.copyFileSync(src, dest);
+          dispatch({ type: "SET_STATUS", status: `Saved to ${dest.replace(homedir(), "~")}` });
+        } catch (e) {
+          dispatch({
+            type: "SET_STATUS",
+            status: `Save failed: ${e instanceof Error ? e.message : String(e)}`
+          });
+        }
+      });
+    });
+  }
   const handleMouse = useCallback(
     (event) => {
       if (event.type === "click") {
@@ -4163,7 +4317,15 @@ function App() {
           onSubmitCompose: (text) => text.trim() && dispatch({ type: "CONFIRM_SEND" })
         }
       ),
-      state.mode === "drawer" && selectedMsg && /* @__PURE__ */ jsx(MessageDrawer, { message: selectedMsg, width: drawerWidth, height: bodyHeight }),
+      state.mode === "drawer" && selectedMsg && /* @__PURE__ */ jsx(
+        MessageDrawer,
+        {
+          message: selectedMsg,
+          width: drawerWidth,
+          height: bodyHeight,
+          selectedAttachmentIdx: state.drawerAttachmentIdx
+        }
+      ),
       state.showDevStats && /* @__PURE__ */ jsx(DevStats, { stats: devStats, width: devStatsWidth })
     ] }),
     state.mode === "date-jump" && /* @__PURE__ */ jsx(