@bobfrankston/mailx 1.0.293 → 1.0.295

package/client/components/message-list.js

@@ -220,7 +220,7 @@ export async function loadSearchResults(query, scope = "all", accountId = "", fo
             }
             const source = scope === "current" && accountId
                 ? await apiGetMessages(accountId, folderId, 1, 10000)
-                : await searchMessages("*", 1, 10000, "all");
+                : await apiGetUnifiedInbox(1, 10000);
             const matches = source.items.filter((m) => regex.test(m.subject || "") || regex.test(m.from?.name || "") || regex.test(m.from?.address || "") || regex.test(m.preview || ""));
             totalMessages = matches.length;
             state.setMessages(matches);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.293",
+  "version": "1.0.295",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",

package/packages/mailx-settings/cloud.js

@@ -47,9 +47,13 @@ function findGoogleCredentials() {
     return null;
 }
 const GDRIVE_TOKEN_DIR = path.join(SETTINGS_DIR, "tokens", "gdrive");
-// drive.file: app can only see files it created. Safe, publishable without security audit.
-// All machines sharing the same OAuth client ID see the same files.
-const GDRIVE_SCOPES = "https://www.googleapis.com/auth/drive.file";
+// drive: full access so we can find pre-existing folders like "home/.mailx"
+// that weren't created by this OAuth client. drive.file was safer but couldn't
+// discover folders created manually or by other tools — which broke first-run
+// setup when the user's convention is a nested path.
+// The Gmail scope is already mail.google.com (full email), so this isn't a
+// bigger privacy ask. Token cache at tokens/gdrive/ will re-auth on scope change.
+const GDRIVE_SCOPES = "https://www.googleapis.com/auth/drive";
 /** Paths to try when no config.path is set (fresh install). Order matters:
  *  "home/.mailx" is the user convention for shared family settings; "mailx"
  *  is the auto-created default. First one that exists on GDrive wins. */
@@ -107,11 +111,13 @@ async function getGoogleDriveToken() {
  *  missing. When `create` is true, creates the LAST segment if missing (won't
  *  create intermediate segments — that's a user error). */
 async function walkGDrivePath(token, segments, create) {
+    const fullPath = segments.join("/");
     let parentId;
     for (let i = 0; i < segments.length; i++) {
         const seg = segments[i];
         const found = await gDriveFindFolder(token, seg, parentId);
         if (found) {
+            console.log(`  [cloud] walk '${fullPath}': '${seg}' → ${found}${parentId ? ` (in ${parentId})` : ""}`);
             parentId = found;
         }
         else if (create && i === segments.length - 1) {
@@ -134,6 +140,21 @@ async function walkGDrivePath(token, segments, create) {
     }
     return parentId || null;
 }
+/** Resolve a folder ID back to its name (for diagnostic logging). */
+async function gDriveGetFolderName(token, folderId) {
+    try {
+        const res = await fetch(`https://www.googleapis.com/drive/v3/files/${folderId}?fields=name,parents`, {
+            headers: { Authorization: `Bearer ${token}` },
+        });
+        if (!res.ok)
+            return null;
+        const data = await res.json();
+        return data.name || null;
+    }
+    catch {
+        return null;
+    }
+}
 /** Find a single folder by name, optionally inside a parent. */
 async function gDriveFindFolder(token, name, parentId) {
     let query = `name='${name}' and mimeType='application/vnd.google-apps.folder' and trashed=false`;
@@ -174,14 +195,18 @@ export async function gDriveFindOrCreateFolder() {
         : GDRIVE_PATH_SEARCH_ORDER;
     try {
         for (const tryPath of pathsToTry) {
+            console.log(`  [cloud] Trying GDrive path: '${tryPath}'`);
             const segments = tryPath.split(/[/\\]/).filter(Boolean);
             const folderId = await walkGDrivePath(token, segments, false);
             if (folderId) {
-                console.log(`  [cloud] Found existing '${tryPath}' folder: ${folderId}`);
+                // Resolve folder ID back to name for verification
+                const name = await gDriveGetFolderName(token, folderId);
+                console.log(`  [cloud] Found existing '${tryPath}' → folder '${name || "?"}' (${folderId})`);
                 return folderId;
             }
+            console.log(`  [cloud] Path '${tryPath}' not found on GDrive`);
         }
-        // None found — create the first path (configured or default "mailx")
+        // None found — create the last (simplest) path
         const createPath = configuredPath || GDRIVE_PATH_SEARCH_ORDER[GDRIVE_PATH_SEARCH_ORDER.length - 1];
         const segments = createPath.split(/[/\\]/).filter(Boolean);
         const created = await walkGDrivePath(token, segments, true);

package/packages/mailx-store/db.js

@@ -570,8 +570,17 @@ export class MailxDB {
                 ftsQuery += `subject:${term} `;
             }
             else {
-                // Unqualified — search everything
-                ftsQuery += `${part}* `;
+                // Unqualified — search everything.
+                // Support "term1|term2" (regex OR) by converting to FTS5 OR.
+                // Strip surrounding /.../ if user typed regex delimiters.
+                let term = part.replace(/^\/|\/$/g, "");
+                if (term.includes("|")) {
+                    const alts = term.split("|").filter(Boolean).map(t => `${t}*`).join(" OR ");
+                    ftsQuery += `(${alts}) `;
+                }
+                else {
+                    ftsQuery += `${term}* `;
+                }
             }
         }
         ftsQuery = ftsQuery.trim();