@bobfrankston/mailx 1.0.435 → 1.0.436

package/client/app.js

@@ -2219,7 +2219,7 @@ document.getElementById("btn-open-log")?.addEventListener("click", async () => {
     }
 });
 async function openJsoncEditor(initialFile) {
-    const { readJsoncFile, writeJsoncFile, readConfigHelp } = await import("./lib/api-client.js");
+    const { readJsoncFile, writeJsoncFile, readConfigHelp, formatJsonc } = await import("./lib/api-client.js");
     const backdrop = document.createElement("div");
     backdrop.className = "mailx-modal-backdrop";
     const panel = document.createElement("div");
@@ -2253,6 +2253,7 @@ async function openJsoncEditor(initialFile) {
         </div>
         <div class="mailx-modal-error" id="jsonc-error" hidden></div>
         <div class="mailx-modal-buttons">
+            <button type="button" class="mailx-modal-btn" data-action="format" title="Reformat indentation while preserving comments and trailing commas">Format</button>
             <span class="mailx-modal-spacer"></span>
             <button type="button" class="mailx-modal-btn" data-action="cancel">Cancel</button>
             <button type="button" class="mailx-modal-btn mailx-modal-btn-primary" data-action="save">Save</button>
@@ -2311,17 +2312,34 @@ async function openJsoncEditor(initialFile) {
         renderGutter();
     };
     const showValidation = (err) => {
-        errorEl.textContent = `Line ${err.line}, col ${err.col}: ${err.message}`;
+        // CRITICAL: do NOT move the cursor here. Validation fires every 600ms
+        // while the user types; auto-selecting the error position yanked the
+        // cursor mid-edit and made fixing the error impossible (the user
+        // reported this as a fatal bug — the very mechanism preventing a save
+        // was preventing the fix). Location is shown via the gutter highlight
+        // + the "Line N, col M" message, and the user can click "Jump" to
+        // explicitly navigate.
+        errorEl.innerHTML = "";
+        const text = document.createElement("span");
+        text.textContent = `Line ${err.line}, col ${err.col}: ${err.message}  `;
+        const jumpBtn = document.createElement("button");
+        jumpBtn.type = "button";
+        jumpBtn.className = "mailx-modal-btn mailx-modal-btn-link";
+        jumpBtn.textContent = "Jump to error";
+        jumpBtn.addEventListener("click", () => {
+            textarea.focus();
+            try {
+                textarea.setSelectionRange(err.pos, err.pos + 1);
+            }
+            catch { /* */ }
+        });
+        errorEl.appendChild(text);
+        errorEl.appendChild(jumpBtn);
         errorEl.hidden = false;
         textarea.classList.add("mailx-modal-input-error");
         saveBtn.disabled = true;
         errorLine = err.line;
         renderGutter();
-        // Select the problem character so the browser draws a visible marker
-        try {
-            textarea.setSelectionRange(err.pos, err.pos + 1);
-        }
-        catch { /* out-of-range → ignore */ }
     };
     let validateTimer;
     const scheduleValidate = () => {
@@ -2377,6 +2395,31 @@ async function openJsoncEditor(initialFile) {
                 close();
                 return;
             }
+            if (action === "format") {
+                // Reformat via the service-side jsonc-parser format() — the
+                // edits are whitespace-only, so `//` and `/* */` comments
+                // survive intact (which JSON.stringify(parse(...)) does not).
+                btn.disabled = true;
+                const orig = btn.textContent;
+                btn.textContent = "Formatting…";
+                try {
+                    const r = await formatJsonc(textarea.value);
+                    if (r?.content !== undefined) {
+                        textarea.value = r.content;
+                        renderGutter();
+                        scheduleValidate();
+                    }
+                }
+                catch (e) {
+                    errorEl.textContent = `Format failed: ${e.message}`;
+                    errorEl.hidden = false;
+                }
+                finally {
+                    btn.disabled = false;
+                    btn.textContent = orig || "Format";
+                }
+                return;
+            }
             if (action === "save") {
                 // Final sync-check; refuse to save if it doesn't parse
                 const err = validateJsonc(textarea.value);

package/client/lib/api-client.js

@@ -339,6 +339,9 @@ export function readJsoncFile(name) {
 export function writeJsoncFile(name, content) {
     return ipc().writeJsoncFile?.(name, content);
 }
+export function formatJsonc(content) {
+    return ipc().formatJsonc?.(content);
+}
 export function readConfigHelp(name) {
     return ipc().readConfigHelp?.(name) ?? Promise.resolve({ content: "" });
 }

package/client/lib/mailxapi.js

@@ -131,6 +131,9 @@
         writeJsoncFile: function(name, content) {
             return callNode("writeJsoncFile", { name: name, content: content });
         },
+        formatJsonc: function(content) {
+            return callNode("formatJsonc", { content: content });
+        },
         readConfigHelp: function(name) {
             return callNode("readConfigHelp", { name: name });
         },

package/package.json

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

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

@@ -252,6 +252,7 @@ export declare class MailxService {
      *  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>;
+    formatJsonc(content: string): Promise<string>;
     /** Return the help section for a named config file, extracted from docs/config-help.md.
      *  Matches a level-2 heading whose text equals the filename. Returns markdown. */
     readConfigHelp(name: string): Promise<string>;

package/packages/mailx-service/index.js

@@ -1762,6 +1762,17 @@ export class MailxService {
         const { cloudRead } = await import("@bobfrankston/mailx-settings");
         return cloudRead(name);
     }
+    // Reformat JSONC preserving comments — applyEdits returns whitespace-only edits.
+    async formatJsonc(content) {
+        const { format, applyEdits } = await import("jsonc-parser");
+        const edits = format(content, undefined, {
+            tabSize: 2,
+            insertSpaces: true,
+            eol: "\n",
+            insertFinalNewline: true,
+        });
+        return applyEdits(content, edits);
+    }
     /** Return the help section for a named config file, extracted from docs/config-help.md.
      *  Matches a level-2 heading whose text equals the filename. Returns markdown. */
     async readConfigHelp(name) {

package/packages/mailx-service/jsonrpc.js

@@ -169,6 +169,8 @@ async function dispatchAction(svc, action, p) {
         case "writeJsoncFile":
             await svc.writeJsoncFile(p.name, p.content);
             return { ok: true };
+        case "formatJsonc":
+            return { content: await svc.formatJsonc(p.content) };
         case "readConfigHelp":
             return { content: await svc.readConfigHelp(p.name) };
         case "unsubscribeOneClick":

package/unwedge.cmd

@@ -1 +1 @@
-rmdir C:\Users\Bob\.claude\session-env\7299facd-d726-4f8a-8e7a-dbd852680c95 /s /q
+rmdir C:\Users\Bob\.claude\session-env\6787e337-1af0-423c-ae58-8d981702aebb /s /q