@bobfrankston/mailx 1.0.231 → 1.0.233

package/client/app.js

@@ -1154,9 +1154,10 @@ async function openJsoncEditor(initialFile) {
         <div class="mailx-modal-title">Edit config file</div>
         <label class="mailx-modal-label">File
             <select class="mailx-modal-input" id="jsonc-file">
-                <option value="accounts.jsonc">accounts.jsonc</option>
-                <option value="allowlist.jsonc">allowlist.jsonc</option>
-                <option value="clients.jsonc">clients.jsonc</option>
+                <option value="accounts.jsonc">accounts.jsonc — accounts (shared via Google Drive)</option>
+                <option value="allowlist.jsonc">allowlist.jsonc — remote-content allowlist (shared)</option>
+                <option value="clients.jsonc">clients.jsonc — per-device registrations (shared)</option>
+                <option value="config.jsonc">config.jsonc — local per-machine overrides (not synced)</option>
             </select>
         </label>
         <label class="mailx-modal-label">Contents (JSONC — comments and trailing commas allowed)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.231",
+  "version": "1.0.233",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",
@@ -24,7 +24,7 @@
     "@bobfrankston/iflow-node": "^0.1.2",
     "@bobfrankston/miscinfo": "^1.0.8",
     "@bobfrankston/oauthsupport": "^1.0.22",
-    "@bobfrankston/msger": "^0.1.293",
+    "@bobfrankston/msger": "^0.1.295",
     "@capacitor/android": "^8.3.0",
     "@capacitor/cli": "^8.3.0",
     "@capacitor/core": "^8.3.0",
@@ -78,7 +78,7 @@
       "@bobfrankston/iflow-node": "^0.1.2",
       "@bobfrankston/miscinfo": "^1.0.8",
       "@bobfrankston/oauthsupport": "^1.0.22",
-      "@bobfrankston/msger": "^0.1.293",
+      "@bobfrankston/msger": "^0.1.295",
       "@capacitor/android": "^8.3.0",
       "@capacitor/cli": "^8.3.0",
       "@capacitor/core": "^8.3.0",

package/packages/mailx-service/index.d.ts

@@ -62,7 +62,8 @@ export declare class MailxService {
     /** Get all messages in a thread (across folders) for an account. */
     getThreadMessages(accountId: string, threadId: string): any;
     /** Read a JSONC config file from the shared cloud dir or local ~/.mailx.
-     *  Names are whitelisted so the UI can't read arbitrary files. */
+     *  Names are whitelisted so the UI can't read arbitrary files.
+     *  `config.jsonc` is the local per-machine config (not cloud-synced). */
     readJsoncFile(name: string): Promise<string | null>;
     /** Write a JSONC config file. Validates that the content parses as JSONC
      *  (loosely — strips comments/trailing commas) before writing. */

package/packages/mailx-service/index.js

@@ -664,19 +664,29 @@ export class MailxService {
         return this.db.getThreadMessages(accountId, threadId);
     }
     /** Read a JSONC config file from the shared cloud dir or local ~/.mailx.
-     *  Names are whitelisted so the UI can't read arbitrary files. */
+     *  Names are whitelisted so the UI can't read arbitrary files.
+     *  `config.jsonc` is the local per-machine config (not cloud-synced). */
     async readJsoncFile(name) {
-        const whitelist = ["accounts.jsonc", "allowlist.jsonc", "clients.jsonc"];
-        if (!whitelist.includes(name))
+        const WHITELIST = ["accounts.jsonc", "allowlist.jsonc", "clients.jsonc", "config.jsonc"];
+        if (!WHITELIST.includes(name))
             throw new Error(`File not allowed: ${name}`);
+        if (name === "config.jsonc") {
+            const configPath = path.join(getConfigDir(), "config.jsonc");
+            try {
+                return fs.readFileSync(configPath, "utf-8");
+            }
+            catch {
+                return null;
+            }
+        }
         const { cloudRead } = await import("@bobfrankston/mailx-settings");
         return cloudRead(name);
     }
     /** Write a JSONC config file. Validates that the content parses as JSONC
      *  (loosely — strips comments/trailing commas) before writing. */
     async writeJsoncFile(name, content) {
-        const whitelist = ["accounts.jsonc", "allowlist.jsonc", "clients.jsonc"];
-        if (!whitelist.includes(name))
+        const WHITELIST = ["accounts.jsonc", "allowlist.jsonc", "clients.jsonc", "config.jsonc"];
+        if (!WHITELIST.includes(name))
             throw new Error(`File not allowed: ${name}`);
         // Validate the content parses before writing
         const { parse: parseJsonc } = await import("jsonc-parser");
@@ -685,6 +695,11 @@ export class MailxService {
         if (errors.length) {
             throw new Error(`JSONC parse error: ${errors.map(e => e.error).join(", ")}`);
         }
+        if (name === "config.jsonc") {
+            const configPath = path.join(getConfigDir(), "config.jsonc");
+            fs.writeFileSync(configPath, content);
+            return;
+        }
         const { cloudWrite } = await import("@bobfrankston/mailx-settings");
         const ok = await cloudWrite(name, content);
         if (!ok)

package/packages/mailx-store/db.js

@@ -127,8 +127,10 @@ export class MailxDB {
         this.db.exec("PRAGMA foreign_keys = ON");
         this.db.exec(SCHEMA);
         // Idempotent migrations for older databases that predate new columns.
-        // SQLite doesn't support "ADD COLUMN IF NOT EXISTS", so we probe the
-        // table schema and add missing columns one by one.
+        // SQLite doesn't support "ADD COLUMN IF NOT EXISTS", so we just try the
+        // ALTER and catch the "duplicate column" error. Simpler and more robust
+        // than probing via PRAGMA table_info (which can behave differently
+        // across sqlite drivers).
         this.addColumnIfMissing("messages", "thread_id", "TEXT");
         try {
             this.db.exec("CREATE INDEX IF NOT EXISTS idx_messages_thread_id ON messages(account_id, thread_id)");
@@ -137,10 +139,17 @@ export class MailxDB {
     }
     /** Idempotently add a column to a table if it's missing. */
     addColumnIfMissing(table, column, sqlType) {
-        const cols = this.db.prepare(`PRAGMA table_info(${table})`).all();
-        if (cols.some(c => c.name === column))
-            return;
-        this.db.exec(`ALTER TABLE ${table} ADD COLUMN ${column} ${sqlType}`);
+        try {
+            this.db.exec(`ALTER TABLE ${table} ADD COLUMN ${column} ${sqlType}`);
+            console.log(`  [db] added column ${table}.${column}`);
+        }
+        catch (e) {
+            const msg = String(e?.message || e);
+            // "duplicate column name" is the expected case when column already exists
+            if (!/duplicate column/i.test(msg)) {
+                console.error(`  [db] migration ${table}.${column} failed: ${msg}`);
+            }
+        }
     }
     /** Compute a thread id for an incoming message. Strategy:
      *  1. If any ancestor (in_reply_to or references) is already present in