@bobfrankston/mailx-settings 0.1.34 → 0.1.35

package/cloud.d.ts

@@ -6,12 +6,12 @@
  * which prevents conflicts with existing folders of the same name.
  * All machines using the same OAuth client ID share the same folder.
  *
- * ── Restoring removed providers ──
- * OneDrive (removed 2026-04-06): Required microsoft-credentials.json in ~/.mailx/,
- *   MS_SCOPES = "https://graph.microsoft.com/Files.ReadWrite offline_access",
- *   authenticateOAuth with tokenDir ~/.mailx/tokens/microsoft/.
- *   Read/write via Graph API: GET/PUT https://graph.microsoft.com/v1.0/me/drive/root:/{path}:/content
- *   Azure AD app registration needed: https://portal.azure.com → App registrations → Desktop app
+ * OneDrive (restored 2026-07-12): Microsoft Graph, PATH-addressed (no folder
+ *   IDs — `root:/{path}:/content`), so the whole GDrive folder-ID
+ *   discovery/validation/ownership machinery has no OneDrive counterpart.
+ *   Needs ~/.rmfmail/microsoft-credentials.json (Azure public-client app;
+ *   same registration the Outlook Graph mail provider uses — different
+ *   scopes on the same token infrastructure).
  *
  * Dropbox (removed 2026-04-06): Never implemented — placeholder only.
  *   Would need Dropbox OAuth app, token management, and Dropbox API v2 calls.
@@ -46,7 +46,12 @@ export declare function gDriveValidateCachedFolder(folderId: string): Promise<bo
  *  orphaning the user's accounts/contacts/etc. Switched to the dotted name
  *  matching the actual folder convention. */
 export declare function gDriveFindOrCreateFolder(): Promise<string | null>;
-export type CloudProvider = "gdrive" | "google" | "local";
+/** Fetch the authenticated Microsoft user's profile (setup-flow display). */
+export declare function getMicrosoftProfile(): Promise<{
+    name?: string;
+    email?: string;
+} | null>;
+export type CloudProvider = "gdrive" | "google" | "onedrive" | "local";
 export interface CloudFile {
     /** Read a file. For gdrive, path is just the filename (folder ID is implicit). */
     read(filePath: string): Promise<string | null>;
@@ -58,10 +63,12 @@ export interface CloudFile {
     exists(filePath: string): Promise<boolean>;
 }
 /**
- * Get a cloud file provider. For gdrive, pass the folder ID.
- * Files are stored flat in the folder (no subdirectory navigation).
+ * Get a cloud file provider. The locator is provider-specific: gdrive takes
+ * the folder ID; onedrive takes the base PATH under the drive root (e.g.
+ * "home/.rmfmail"). Files are stored flat in that folder either way — the
+ * CloudFile contract is identical, only the FS API underneath differs.
  */
-export declare function getCloudProvider(provider: string, folderId?: string): CloudFile | null;
+export declare function getCloudProvider(provider: string, locator?: string): CloudFile | null;
 /** Fetch the authenticated Google user's profile (name + email) via the People API.
  *  Caller must supply an OAuth access token whose scopes include `contacts.readonly`
  *  or `userinfo.profile`. The Drive token (drive.file) does NOT have the right scope

package/cloud.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cloud.d.ts","sourceRoot":"","sources":["cloud.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AA+RH;;;;;;;;;oDASoD;AACpD,wBAAsB,0BAA0B,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CA8BnF;AAcD;;;;;;;;;;;;;;;;;6CAiB6C;AAC7C,wBAAsB,wBAAwB,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAwBvE;AAyHD,MAAM,MAAM,aAAa,GAAG,QAAQ,GAAG,QAAQ,GAAG,OAAO,CAAC;AAE1D,MAAM,WAAW,SAAS;IACtB,kFAAkF;IAClF,IAAI,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC/C,8DAA8D;IAC9D,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IACrD,uGAAuG;IACvG,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACxD,8BAA8B;IAC9B,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAC9C;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAyBtF;AAED;;;;2DAI2D;AAC3D,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAAC,CAoBvG"}
+{"version":3,"file":"cloud.d.ts","sourceRoot":"","sources":["cloud.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AA+RH;;;;;;;;;oDASoD;AACpD,wBAAsB,0BAA0B,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CA8BnF;AAcD;;;;;;;;;;;;;;;;;6CAiB6C;AAC7C,wBAAsB,wBAAwB,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAwBvE;AA8OD,6EAA6E;AAC7E,wBAAsB,mBAAmB,IAAI,OAAO,CAAC;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAAC,CAS7F;AAID,MAAM,MAAM,aAAa,GAAG,QAAQ,GAAG,QAAQ,GAAG,UAAU,GAAG,OAAO,CAAC;AAEvE,MAAM,WAAW,SAAS;IACtB,kFAAkF;IAClF,IAAI,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC/C,8DAA8D;IAC9D,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IACrD,uGAAuG;IACvG,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACxD,8BAA8B;IAC9B,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAC9C;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAoCrF;AAED;;;;2DAI2D;AAC3D,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAAC,CAoBvG"}

package/cloud.js

@@ -6,12 +6,12 @@
  * which prevents conflicts with existing folders of the same name.
  * All machines using the same OAuth client ID share the same folder.
  *
- * ── Restoring removed providers ──
- * OneDrive (removed 2026-04-06): Required microsoft-credentials.json in ~/.mailx/,
- *   MS_SCOPES = "https://graph.microsoft.com/Files.ReadWrite offline_access",
- *   authenticateOAuth with tokenDir ~/.mailx/tokens/microsoft/.
- *   Read/write via Graph API: GET/PUT https://graph.microsoft.com/v1.0/me/drive/root:/{path}:/content
- *   Azure AD app registration needed: https://portal.azure.com → App registrations → Desktop app
+ * OneDrive (restored 2026-07-12): Microsoft Graph, PATH-addressed (no folder
+ *   IDs — `root:/{path}:/content`), so the whole GDrive folder-ID
+ *   discovery/validation/ownership machinery has no OneDrive counterpart.
+ *   Needs ~/.rmfmail/microsoft-credentials.json (Azure public-client app;
+ *   same registration the Outlook Graph mail provider uses — different
+ *   scopes on the same token infrastructure).
  *
  * Dropbox (removed 2026-04-06): Never implemented — placeholder only.
  *   Would need Dropbox OAuth app, token management, and Dropbox API v2 calls.
@@ -568,14 +568,154 @@ async function gDriveWriteToFolder(folderId, fileName, content) {
         }
     }
 }
+// ── OneDrive (Microsoft Graph, path-addressed) ──
+const MS_TOKEN_DIR = path.join(SETTINGS_DIR, "tokens", "microsoft");
+// offline_access is a SCOPE on the Microsoft identity platform (unlike
+// Google's access_type=offline query param) — required for a refresh token.
+const ONEDRIVE_SCOPES = "https://graph.microsoft.com/Files.ReadWrite offline_access";
+const GRAPH_ROOT = "https://graph.microsoft.com/v1.0/me/drive";
+function findMicrosoftCredentials() {
+    const local = path.join(SETTINGS_DIR, "microsoft-credentials.json");
+    return fs.existsSync(local) ? local : null;
+}
+async function getOneDriveToken() {
+    const creds = findMicrosoftCredentials();
+    if (!creds) {
+        console.error(`  [cloud] No Microsoft credentials — expected ${path.join(SETTINGS_DIR, "microsoft-credentials.json")} (Azure portal → App registrations → public/native client)`);
+        return null;
+    }
+    try {
+        const token = await authenticateOAuth(creds, {
+            scope: ONEDRIVE_SCOPES,
+            tokenDirectory: MS_TOKEN_DIR,
+            tokenFileName: "onedrive-token.json",
+            credentialsKey: "installed",
+            // Google-ism; Microsoft grants refresh tokens via the
+            // offline_access scope above instead.
+            includeOfflineAccess: false,
+            logFn: (type, message) => {
+                const p = "  [oauth onedrive]";
+                if (type === "error")
+                    console.error(`${p} ${message}`);
+                else
+                    console.log(`${p} ${message}`);
+            },
+        });
+        if (!token?.access_token)
+            console.error("  [cloud] OneDrive auth: returned null — OAuth likely timed out");
+        return token?.access_token || null;
+    }
+    catch (e) {
+        console.error(`  [cloud] OneDrive auth FAILED: ${e.message}`);
+        return null;
+    }
+}
+/** Graph item URL for `<basePath>/<fileName>` under the drive root. */
+function graphContentUrl(basePath, fileName) {
+    const rel = [basePath.replace(/^\/+|\/+$/g, ""), fileName]
+        .filter(Boolean).join("/")
+        .split("/").map(encodeURIComponent).join("/");
+    return `${GRAPH_ROOT}/root:/${rel}:/content`;
+}
+/** Create every segment of basePath that doesn't exist yet. Graph's
+ *  PUT :/content does NOT auto-create parent folders — a fresh account's
+ *  first write would 404. conflictBehavior:fail + tolerating the
+ *  nameAlreadyExists error makes this an idempotent walk. Once per
+ *  process per path — after that the folders exist. */
+const _ensuredPaths = new Set();
+async function oneDriveEnsurePath(token, basePath) {
+    const clean = basePath.replace(/^\/+|\/+$/g, "");
+    if (!clean || _ensuredPaths.has(clean))
+        return;
+    let parent = "";
+    for (const seg of clean.split("/")) {
+        const url = parent
+            ? `${GRAPH_ROOT}/root:/${parent.split("/").map(encodeURIComponent).join("/")}:/children`
+            : `${GRAPH_ROOT}/root/children`;
+        const r = await fetch(url, {
+            method: "POST",
+            headers: { "Authorization": `Bearer ${token}`, "Content-Type": "application/json" },
+            body: JSON.stringify({ name: seg, folder: {}, "@microsoft.graph.conflictBehavior": "fail" }),
+        });
+        // 201 created, 409 nameAlreadyExists — both mean the segment exists now.
+        if (!r.ok && r.status !== 409) {
+            throw new Error(`OneDrive folder create "${seg}" failed: ${r.status} ${await r.text().catch(() => "")}`);
+        }
+        parent = parent ? `${parent}/${seg}` : seg;
+    }
+    _ensuredPaths.add(clean);
+}
+async function oneDriveRead(basePath, fileName) {
+    const token = await getOneDriveToken();
+    if (!token)
+        return null;
+    const r = await fetch(graphContentUrl(basePath, fileName), { headers: { "Authorization": `Bearer ${token}` } });
+    if (r.status === 404)
+        return null;
+    if (!r.ok) {
+        console.error(`  [cloud] OneDrive read ${fileName}: ${r.status}`);
+        return null;
+    }
+    return await r.text();
+}
+async function oneDriveReadBinary(basePath, fileName) {
+    const token = await getOneDriveToken();
+    if (!token)
+        return null;
+    const r = await fetch(graphContentUrl(basePath, fileName), { headers: { "Authorization": `Bearer ${token}` } });
+    if (r.status === 404)
+        return null;
+    if (!r.ok) {
+        console.error(`  [cloud] OneDrive readBinary ${fileName}: ${r.status}`);
+        return null;
+    }
+    return Buffer.from(await r.arrayBuffer()).toString("base64");
+}
+async function oneDriveWrite(basePath, fileName, content) {
+    const token = await getOneDriveToken();
+    if (!token)
+        throw new Error("OneDrive auth failed — cannot write");
+    const put = () => fetch(graphContentUrl(basePath, fileName), {
+        method: "PUT",
+        headers: { "Authorization": `Bearer ${token}`, "Content-Type": "text/plain" },
+        body: content,
+    });
+    let r = await put();
+    if (r.status === 404 || r.status === 409) {
+        // Parent path missing (fresh account) — create it and retry once.
+        await oneDriveEnsurePath(token, basePath);
+        r = await put();
+    }
+    if (!r.ok)
+        throw new Error(`OneDrive write ${fileName} failed: ${r.status} ${await r.text().catch(() => "")}`);
+}
+/** Fetch the authenticated Microsoft user's profile (setup-flow display). */
+export async function getMicrosoftProfile() {
+    const token = await getOneDriveToken();
+    if (!token)
+        return null;
+    try {
+        const r = await fetch("https://graph.microsoft.com/v1.0/me", { headers: { "Authorization": `Bearer ${token}` } });
+        if (!r.ok)
+            return null;
+        const me = await r.json();
+        return { name: me.displayName, email: me.mail || me.userPrincipalName };
+    }
+    catch {
+        return null;
+    }
+}
 /**
- * Get a cloud file provider. For gdrive, pass the folder ID.
- * Files are stored flat in the folder (no subdirectory navigation).
+ * Get a cloud file provider. The locator is provider-specific: gdrive takes
+ * the folder ID; onedrive takes the base PATH under the drive root (e.g.
+ * "home/.rmfmail"). Files are stored flat in that folder either way — the
+ * CloudFile contract is identical, only the FS API underneath differs.
  */
-export function getCloudProvider(provider, folderId) {
+export function getCloudProvider(provider, locator) {
     switch (provider) {
         case "google":
-        case "gdrive":
+        case "gdrive": {
+            const folderId = locator;
             if (!folderId) {
                 console.error("  [cloud] gdrive requires a folder ID — run initCloudConfig first");
                 return null;
@@ -586,6 +726,16 @@ export function getCloudProvider(provider, folderId) {
                 write: (fileName, content) => gDriveWriteToFolder(folderId, fileName, content),
                 exists: async (fileName) => (await gDriveReadFromFolder(folderId, fileName)) !== null,
             };
+        }
+        case "onedrive": {
+            const basePath = locator || "home/.rmfmail";
+            return {
+                read: (fileName) => oneDriveRead(basePath, fileName),
+                readBinary: (fileName) => oneDriveReadBinary(basePath, fileName),
+                write: (fileName, content) => oneDriveWrite(basePath, fileName, content),
+                exists: async (fileName) => (await oneDriveRead(basePath, fileName)) !== null,
+            };
+        }
         case "local":
             return {
                 read: async (p) => { try {
@@ -604,7 +754,7 @@ export function getCloudProvider(provider, folderId) {
                 exists: async (p) => fs.existsSync(p),
             };
         default:
-            console.error(`  [cloud] Provider "${provider}" not supported — only gdrive is available`);
+            console.error(`  [cloud] Provider "${provider}" not supported — gdrive and onedrive are available`);
             return null;
     }
 }

package/index.d.ts

@@ -231,7 +231,7 @@ export declare function initLocalConfig(sharedDir?: string, storePath?: string):
  *  Finds or creates the app-owned ".rmfmail" folder via Drive API and stores its ID.
  *  No mount scanning — API only. Existing settings at other paths (e.g., home/.rmfmail
  *  from Desktop sync) must be migrated manually or via config.jsonc importPath. */
-export declare function initCloudConfig(provider?: "gdrive"): Promise<void>;
+export declare function initCloudConfig(provider?: "gdrive" | "onedrive"): Promise<void>;
 declare const DEFAULT_SETTINGS: MailxSettings;
 /** Get historyDays for an account: per-account override > system override > shared default */
 export declare function getHistoryDays(accountId?: string): number;

package/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}

package/index.js

@@ -146,6 +146,12 @@ const LOCAL_DIR = path.join(process.env.USERPROFILE || process.env.HOME || ".",
 const LOCAL_CONFIG_PATH = path.join(LOCAL_DIR, "config.jsonc");
 const LEGACY_CONFIG_PATH = path.join(LOCAL_DIR, "config.json");
 const DEFAULT_STORE_PATH = path.join(LOCAL_DIR, "mailxstore");
+/** Provider-specific locator for getCloudProvider: gdrive wants the cached
+ *  folder ID, onedrive wants the base path. One helper so the call sites
+ *  can't drift apart. */
+function cloudLocator(cfg) {
+    return cfg.provider === "onedrive" ? cfg.path : cfg.folderId;
+}
 /** Resolve a path from config — relative to ~/.mailx/, ~ expands to home */
 function resolvePath(p) {
     if (!p)
@@ -174,7 +180,7 @@ function readLocalConfig() {
 /** Resolve provider config to a filesystem path (checks for local Google Drive mount) */
 function resolveProvider(cfg) {
     // Cloud providers use API only — no filesystem mount scanning
-    if (cfg.provider === "gdrive" || cfg.provider === "google")
+    if (cfg.provider === "gdrive" || cfg.provider === "google" || cfg.provider === "onedrive")
         return undefined;
     if (cfg.provider === "local")
         return resolvePath(cfg.path);
@@ -248,8 +254,8 @@ export async function cloudRead(filename) {
             clearFolderIdInConfig();
         }
     }
-    // Ensure we have a folder ID
-    if (!pendingCloudConfig.folderId) {
+    // Ensure we have a folder ID (gdrive only — onedrive is path-addressed)
+    if (pendingCloudConfig.provider !== "onedrive" && !pendingCloudConfig.folderId) {
         pendingCloudConfig.folderId = await gDriveFindOrCreateFolder() || undefined;
         if (pendingCloudConfig.folderId)
             saveFolderIdToConfig(pendingCloudConfig.folderId);
@@ -258,7 +264,7 @@ export async function cloudRead(filename) {
             return null;
         }
     }
-    const provider = getCloudProvider(pendingCloudConfig.provider, pendingCloudConfig.folderId);
+    const provider = getCloudProvider(pendingCloudConfig.provider, cloudLocator(pendingCloudConfig));
     if (!provider) {
         setCloudError(`No cloud provider for ${pendingCloudConfig.provider}`, { op: "read", filename });
         return null;
@@ -296,14 +302,14 @@ export async function cloudRead(filename) {
 export async function cloudReadBinary(filename) {
     if (!pendingCloudConfig)
         return null;
-    if (!pendingCloudConfig.folderId) {
+    if (pendingCloudConfig.provider !== "onedrive" && !pendingCloudConfig.folderId) {
         pendingCloudConfig.folderId = await gDriveFindOrCreateFolder() || undefined;
         if (pendingCloudConfig.folderId)
             saveFolderIdToConfig(pendingCloudConfig.folderId);
         if (!pendingCloudConfig.folderId)
             return null;
     }
-    const provider = getCloudProvider(pendingCloudConfig.provider, pendingCloudConfig.folderId);
+    const provider = getCloudProvider(pendingCloudConfig.provider, cloudLocator(pendingCloudConfig));
     if (!provider?.readBinary)
         return null;
     try {
@@ -327,8 +333,8 @@ export async function cloudWrite(filename, content) {
         setCloudError(err, { op: "write", filename });
         throw new Error(err);
     }
-    // Ensure we have a folder ID
-    if (!pendingCloudConfig.folderId) {
+    // Ensure we have a folder ID (gdrive only — onedrive is path-addressed)
+    if (pendingCloudConfig.provider !== "onedrive" && !pendingCloudConfig.folderId) {
         pendingCloudConfig.folderId = await gDriveFindOrCreateFolder() || undefined;
         if (pendingCloudConfig.folderId)
             saveFolderIdToConfig(pendingCloudConfig.folderId);
@@ -338,7 +344,7 @@ export async function cloudWrite(filename, content) {
             throw new Error(err);
         }
     }
-    const provider = getCloudProvider(pendingCloudConfig.provider, pendingCloudConfig.folderId);
+    const provider = getCloudProvider(pendingCloudConfig.provider, cloudLocator(pendingCloudConfig));
     if (!provider) {
         const err = `No cloud provider for ${pendingCloudConfig.provider}`;
         setCloudError(err, { op: "write", filename });
@@ -403,8 +409,8 @@ export function getStorageInfo() {
             }
             // Provider-based entry — check for API mode (folderId) first, then mount
             const name = (entry.provider === "gdrive" || entry.provider === "google") ? "gdrive" : entry.provider;
-            if (entry.folderId) {
-                // Has folder ID → API mode (don't scan filesystem for mounts)
+            if (entry.folderId || entry.provider === "onedrive") {
+                // Has folder ID (or is path-addressed onedrive) → API mode (don't scan filesystem for mounts)
                 return { provider: name, mode: "api", cloudPath: entry.path, folderName: entry.path, folderId: entry.folderId, configDir, cloudError: lastCloudError || undefined };
             }
             const resolved = resolveSharedEntry(entry);
@@ -1385,17 +1391,25 @@ export async function initCloudConfig(provider = "gdrive") {
     const existing = readLocalConfig();
     if (existing.sharedDir)
         return; // Already configured
-    // Find or create the settings folder via Drive API. Stored path is the
-    // canonical post-rebrand location; the folderId is what actually drives
-    // subsequent reads/writes, so even legacy users with the old folder name
-    // work fine since gDriveFindOrCreateFolder resolves whichever exists.
-    const folderId = await gDriveFindOrCreateFolder();
-    const sharedDir = { provider, path: "home/.rmfmail", folderId: folderId || undefined };
+    let sharedDir;
+    if (provider === "onedrive") {
+        // Path-addressed — no folder discovery; the first write creates the
+        // folder chain (oneDriveEnsurePath). Same layout convention as Drive.
+        sharedDir = { provider, path: "home/.rmfmail" };
+    }
+    else {
+        // Find or create the settings folder via Drive API. Stored path is the
+        // canonical post-rebrand location; the folderId is what actually drives
+        // subsequent reads/writes, so even legacy users with the old folder name
+        // work fine since gDriveFindOrCreateFolder resolves whichever exists.
+        const folderId = await gDriveFindOrCreateFolder();
+        sharedDir = { provider, path: "home/.rmfmail", folderId: folderId || undefined };
+    }
     const config = { ...existing, sharedDir, storePath: existing.storePath || DEFAULT_STORE_PATH };
     fs.mkdirSync(LOCAL_DIR, { recursive: true });
     atomicWrite(LOCAL_CONFIG_PATH, config);
     pendingCloudConfig = sharedDir;
-    console.log(`  Initialized cloud config: ${provider} (folder ID: ${folderId || "pending"})`);
+    console.log(`  Initialized cloud config: ${provider} (${sharedDir.folderId ? `folder ID: ${sharedDir.folderId}` : sharedDir.path})`);
 }
 const DEFAULT_SETTINGS = {
     accounts: [],
@@ -1437,9 +1451,9 @@ export { DEFAULT_SETTINGS, DEFAULT_ALLOWLIST, DEFAULT_PREFERENCES, DEFAULT_AUTOC
  *  bearing — the app works without them.
  */
 export async function deployDocs(appVersion) {
-    if (!pendingCloudConfig?.folderId)
+    if (!pendingCloudConfig || (pendingCloudConfig.provider !== "onedrive" && !pendingCloudConfig.folderId))
         return;
-    const provider = getCloudProvider(pendingCloudConfig.provider, pendingCloudConfig.folderId);
+    const provider = getCloudProvider(pendingCloudConfig.provider, cloudLocator(pendingCloudConfig));
     if (!provider)
         return;
     // Resolve the source docs dir. In dev the workspace has `app/docs/`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx-settings",
-  "version": "0.1.34",
+  "version": "0.1.35",
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",
@@ -17,7 +17,7 @@
   },
   "license": "ISC",
   "dependencies": {
-    "@bobfrankston/mailx-types": "^0.1.22",
+    "@bobfrankston/mailx-types": "^0.1.24",
     "jsonc-parser": "^3.3.1"
   },
   "repository": {
@@ -33,7 +33,7 @@
   },
   ".transformedSnapshot": {
     "dependencies": {
-      "@bobfrankston/mailx-types": "^0.1.22",
+      "@bobfrankston/mailx-types": "^0.1.24",
       "jsonc-parser": "^3.3.1"
     }
   }