@mdfriday/foundry 26.3.12 → 26.3.14

package/dist/cli.js

@@ -2571,26 +2571,44 @@ var init_user_factory = __esm({
       }
       /**
        * 保存用户到存储（合并保存 token, license, server config, sync config）
+       * 
+       * ⚠️ 采用合并策略：先加载现有数据，再用新数据覆盖，避免丢失其他字段
        */
       async save(user) {
         try {
+          const existingData = await this.storageProvider.loadUserData();
           const token = user.getToken();
           const license = user.getLicense();
           const syncConfig = user.getSyncConfig();
           const serverConfig = user.getServerConfig();
           const email = user.getEmail().getValue();
-          await this.storageProvider.saveUserData({
-            token,
-            license,
-            syncConfig,
-            serverConfig,
+          const mergedData = {
+            // 保留现有数据（如果有）
+            ...existingData || {},
+            // 用新数据覆盖（只覆盖存在的字段）
+            ...token ? { token } : {},
+            ...license ? { license } : {},
+            ...syncConfig ? { syncConfig } : {},
+            ...serverConfig ? { serverConfig } : {},
             email
-          });
-          log4.debug("User saved to storage", {
+            // email 始终更新
+          };
+          if (!license && existingData?.license) {
+            mergedData.license = existingData.license;
+            log4.debug("Preserved existing license data during save");
+          }
+          if (!syncConfig && existingData?.syncConfig) {
+            mergedData.syncConfig = existingData.syncConfig;
+            log4.debug("Preserved existing syncConfig data during save");
+          }
+          await this.storageProvider.saveUserData(mergedData);
+          log4.debug("User saved to storage (merged)", {
             email,
-            hasToken: !!token,
-            hasLicense: !!license,
-            hasSyncConfig: !!syncConfig
+            hasToken: !!mergedData.token,
+            hasLicense: !!mergedData.license,
+            hasSyncConfig: !!mergedData.syncConfig,
+            preservedLicense: !license && !!existingData?.license,
+            preservedSyncConfig: !syncConfig && !!existingData?.syncConfig
           });
         } catch (error) {
           log4.error("Failed to save user to storage", error);
@@ -3980,9 +3998,10 @@ var init_workspace_factory = __esm({
           async saveUserData(data) {
             const userDataPath = import_path3.default.join(workspacePath, ".mdfriday", "user-data.json");
             await fsRepo.createDirectory(import_path3.default.dirname(userDataPath), true);
-            const jsonData = {
-              serverConfig: data.serverConfig.toJSON()
-            };
+            const jsonData = {};
+            if (data.serverConfig) {
+              jsonData.serverConfig = data.serverConfig.toJSON();
+            }
             if (data.token) {
               jsonData.token = data.token.toJSON();
               authentication.markAuthExists();
@@ -3990,6 +4009,9 @@ var init_workspace_factory = __esm({
             if (data.license) {
               jsonData.license = data.license.toJSON();
             }
+            if (data.syncConfig) {
+              jsonData.syncConfig = data.syncConfig.toJSON();
+            }
             if (data.email) {
               jsonData.email = data.email;
             }
@@ -4000,7 +4022,7 @@ var init_workspace_factory = __esm({
             try {
               const content = await fsRepo.readFile(userDataPath, "utf-8");
               const data = JSON.parse(content);
-              const { Token: Token3, ServerConfig: ServerConfig2, License: License2 } = await Promise.resolve().then(() => (init_identity(), identity_exports));
+              const { Token: Token3, ServerConfig: ServerConfig2, License: License2, SyncConfig: SyncConfig2 } = await Promise.resolve().then(() => (init_identity(), identity_exports));
               const result = {};
               if (data.serverConfig) {
                 result.serverConfig = ServerConfig2.create(data.serverConfig.apiUrl, data.serverConfig.websiteUrl);
@@ -4014,9 +4036,14 @@ var init_workspace_factory = __esm({
                   data.license.plan,
                   data.license.expiresAt,
                   data.license.features,
-                  data.license.activatedAt
+                  data.license.activatedAt,
+                  data.license.activated,
+                  data.license.firstTime
                 );
               }
+              if (data.syncConfig) {
+                result.syncConfig = SyncConfig2.fromJSON(data.syncConfig);
+              }
               if (data.email) {
                 result.email = data.email;
               }
@@ -55087,7 +55114,7 @@ For more information, visit: https://help.mdfriday.com
    * Show version
    */
   showVersion() {
-    const version = "26.3.12";
+    const version = "26.3.14";
     return {
       success: true,
       message: `MDFriday CLI v${version}`