@trops/dash-core 0.1.259 → 0.1.261

package/dist/electron/index.js

@@ -33166,6 +33166,14 @@ async function processDashboardConfig(
     DASHBOARD_CONFIG_INSTALL_PROGRESS,
   } = requireDashboardConfigEvents();
 
+  // Compute total progress items (widgets + optional theme)
+  const hasTheme = !!(dashboardConfig.theme && dashboardConfig.theme.key);
+  const widgetTotal = dashboardConfig.widgets
+    ? dashboardConfig.widgets.length
+    : 0;
+  const themeIndex = widgetTotal;
+  const progressTotal = widgetTotal + (hasTheme ? 1 : 0);
+
   if (
     widgetRegistry &&
     dashboardConfig.widgets &&
@@ -33173,21 +33181,38 @@ async function processDashboardConfig(
   ) {
     const installedWidgets = widgetRegistry.getWidgets();
     const installedPackages = new Set(installedWidgets.map((w) => w.name));
-    const total = dashboardConfig.widgets.length;
 
     // Emit initial "pending" state for all widgets
-    for (let i = 0; i < total; i++) {
+    for (let i = 0; i < widgetTotal; i++) {
       const dep = dashboardConfig.widgets[i];
       win.webContents.send(DASHBOARD_CONFIG_INSTALL_PROGRESS, {
         packageName: dep.package,
         displayName: dep.displayName || dep.name || dep.package,
         status: "pending",
         index: i,
-        total,
+        total: progressTotal,
       });
     }
 
-    for (let i = 0; i < total; i++) {
+    // Emit initial "pending" state for theme (if present)
+    if (hasTheme) {
+      const themeDisplay =
+        dashboardConfig.theme.name ||
+        dashboardConfig.theme.key ||
+        "Bundled Theme";
+      win.webContents.send(DASHBOARD_CONFIG_INSTALL_PROGRESS, {
+        packageName:
+          dashboardConfig.theme.registryPackage ||
+          dashboardConfig.theme.key ||
+          "theme",
+        displayName: themeDisplay,
+        status: "pending",
+        index: themeIndex,
+        total: progressTotal,
+      });
+    }
+
+    for (let i = 0; i < widgetTotal; i++) {
       const widgetDep = dashboardConfig.widgets[i];
       const packageName = widgetDep.package;
       const displayName =
@@ -33200,7 +33225,7 @@ async function processDashboardConfig(
           displayName,
           status: "already-installed",
           index: i,
-          total,
+          total: progressTotal,
         });
         continue;
       }
@@ -33211,7 +33236,7 @@ async function processDashboardConfig(
         displayName,
         status: "downloading",
         index: i,
-        total,
+        total: progressTotal,
       });
 
       // Try to find the widget in the registry and install it
@@ -33230,7 +33255,7 @@ async function processDashboardConfig(
             displayName,
             status: "installed",
             index: i,
-            total,
+            total: progressTotal,
           });
         } else {
           installSummary.failed.push({
@@ -33242,7 +33267,7 @@ async function processDashboardConfig(
             displayName,
             status: "failed",
             index: i,
-            total,
+            total: progressTotal,
             error: "Not found in registry",
           });
         }
@@ -33256,7 +33281,7 @@ async function processDashboardConfig(
           displayName,
           status: "failed",
           index: i,
-          total,
+          total: progressTotal,
           error: installError.message,
         });
       }
@@ -33285,61 +33310,138 @@ async function processDashboardConfig(
   let themeInstalled = null;
   if (dashboardConfig.theme) {
     const bundledTheme = dashboardConfig.theme;
+    const themeDisplay =
+      bundledTheme.name || bundledTheme.key || "Bundled Theme";
+    const themePackageName =
+      bundledTheme.registryPackage || bundledTheme.key || "theme";
+
     try {
       const themeResult = themeController$3.listThemesForApplication(win, appId);
       const existingThemes = themeResult.themes || {};
       const themeKey = bundledTheme.key;
 
-      if (bundledTheme.data && themeKey && !existingThemes[themeKey]) {
-        // Embed registry origin metadata if present
-        const themeData = { ...bundledTheme.data };
-        if (bundledTheme.registryPackage) {
-          themeData._registryMeta = {
-            source: "dashboard-import",
-            packageName: bundledTheme.registryPackage,
-            installedAt: new Date().toISOString(),
-          };
-        }
-        themeController$3.saveThemeForApplication(
-          win,
-          appId,
-          themeKey,
-          themeData,
-        );
-        themeInstalled = themeKey;
-        console.log(
-          `[DashboardConfigController] Installed bundled theme: ${themeKey}`,
-        );
-      } else if (
-        !bundledTheme.data &&
-        bundledTheme.registryPackage &&
-        themeKey &&
-        !existingThemes[themeKey]
-      ) {
-        // Fallback: try to install from registry by package name
-        try {
-          const {
-            installThemeFromRegistry,
-          } = themeRegistryController$1;
-          await installThemeFromRegistry(
+      if (themeKey) {
+        if (bundledTheme.data && !existingThemes[themeKey]) {
+          // Theme is new — install it
+          win.webContents.send(DASHBOARD_CONFIG_INSTALL_PROGRESS, {
+            packageName: themePackageName,
+            displayName: themeDisplay,
+            status: "downloading",
+            index: themeIndex,
+            total: progressTotal,
+          });
+
+          const themeData = { ...bundledTheme.data };
+          if (bundledTheme.registryPackage) {
+            themeData._registryMeta = {
+              source: "dashboard-import",
+              packageName: bundledTheme.registryPackage,
+              installedAt: new Date().toISOString(),
+            };
+          }
+          const saveResult = themeController$3.saveThemeForApplication(
             win,
             appId,
-            bundledTheme.registryPackage,
+            themeKey,
+            themeData,
           );
-          themeInstalled = themeKey;
+          if (saveResult.error) {
+            console.warn(
+              `[DashboardConfigController] Theme save failed: ${saveResult.message}`,
+            );
+            win.webContents.send(DASHBOARD_CONFIG_INSTALL_PROGRESS, {
+              packageName: themePackageName,
+              displayName: themeDisplay,
+              status: "failed",
+              index: themeIndex,
+              total: progressTotal,
+              error: saveResult.message,
+            });
+          } else {
+            console.log(
+              `[DashboardConfigController] Installed bundled theme: ${themeKey}`,
+            );
+            win.webContents.send(DASHBOARD_CONFIG_INSTALL_PROGRESS, {
+              packageName: themePackageName,
+              displayName: themeDisplay,
+              status: "installed",
+              index: themeIndex,
+              total: progressTotal,
+            });
+          }
+        } else if (
+          !bundledTheme.data &&
+          bundledTheme.registryPackage &&
+          !existingThemes[themeKey]
+        ) {
+          // Fallback: try to install from registry by package name
+          win.webContents.send(DASHBOARD_CONFIG_INSTALL_PROGRESS, {
+            packageName: themePackageName,
+            displayName: themeDisplay,
+            status: "downloading",
+            index: themeIndex,
+            total: progressTotal,
+          });
+
+          try {
+            const {
+              installThemeFromRegistry,
+            } = themeRegistryController$1;
+            await installThemeFromRegistry(
+              win,
+              appId,
+              bundledTheme.registryPackage,
+            );
+            console.log(
+              `[DashboardConfigController] Installed theme from registry: ${bundledTheme.registryPackage}`,
+            );
+            win.webContents.send(DASHBOARD_CONFIG_INSTALL_PROGRESS, {
+              packageName: themePackageName,
+              displayName: themeDisplay,
+              status: "installed",
+              index: themeIndex,
+              total: progressTotal,
+            });
+          } catch (registryErr) {
+            console.warn(
+              `[DashboardConfigController] Could not install theme from registry: ${registryErr.message}`,
+            );
+            win.webContents.send(DASHBOARD_CONFIG_INSTALL_PROGRESS, {
+              packageName: themePackageName,
+              displayName: themeDisplay,
+              status: "failed",
+              index: themeIndex,
+              total: progressTotal,
+              error: registryErr.message,
+            });
+          }
+        } else if (existingThemes[themeKey]) {
           console.log(
-            `[DashboardConfigController] Installed theme from registry: ${bundledTheme.registryPackage}`,
-          );
-        } catch (registryErr) {
-          console.warn(
-            `[DashboardConfigController] Could not install theme from registry: ${registryErr.message}`,
+            `[DashboardConfigController] Theme already exists: ${themeKey}`,
           );
+          win.webContents.send(DASHBOARD_CONFIG_INSTALL_PROGRESS, {
+            packageName: themePackageName,
+            displayName: themeDisplay,
+            status: "already-installed",
+            index: themeIndex,
+            total: progressTotal,
+          });
         }
+        // Always bind workspace to theme key
+        themeInstalled = themeKey;
       }
     } catch (themeErr) {
       console.warn(
         `[DashboardConfigController] Could not install bundled theme: ${themeErr.message}`,
       );
+      win.webContents.send(DASHBOARD_CONFIG_INSTALL_PROGRESS, {
+        packageName: themePackageName,
+        displayName: themeDisplay,
+        status: "failed",
+        index: themeIndex,
+        total: progressTotal,
+        error: themeErr.message,
+      });
     }
   }
 
@@ -33606,6 +33708,18 @@ async function installDashboardFromRegistry$1(
 
     dashboardConfig = applyDefaults(dashboardConfig);
 
+    // 5b. Inject theme metadata from registry if config has no theme section
+    if (
+      !dashboardConfig.theme &&
+      registryPkg.theme &&
+      registryPkg.theme.registryPackage
+    ) {
+      dashboardConfig.theme = {
+        key: registryPkg.theme.key || registryPkg.theme.name,
+        registryPackage: registryPkg.theme.registryPackage,
+      };
+    }
+
     // 6. Delegate to shared import pipeline
     return await processDashboardConfig(
       win,