@tutti-os/workspace-app-center 0.0.12 → 0.0.13

package/dist/{chunk-PD2WLRHE.js → chunk-7BJAJ7F3.js}

@@ -13,4 +13,4 @@ var workspaceAppRuntimeStatuses = [
 export {
   workspaceAppRuntimeStatuses
 };
-//# sourceMappingURL=chunk-PD2WLRHE.js.map
+//# sourceMappingURL=chunk-7BJAJ7F3.js.map

package/dist/chunk-7BJAJ7F3.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/contracts/runtime.ts"],"sourcesContent":["export const workspaceAppRuntimeStatuses = [\n  \"idle\",\n  \"installing\",\n  \"preparing\",\n  \"starting\",\n  \"running\",\n  \"failed\",\n  \"stopping\",\n  \"unavailable\"\n] as const;\n\nexport type WorkspaceAppRuntimeStatus =\n  (typeof workspaceAppRuntimeStatuses)[number];\n\nexport interface WorkspaceAppRuntimeError {\n  readonly code?: string;\n  readonly message: string;\n}\n\nexport type WorkspaceAppInstallUserPhase =\n  | \"downloading\"\n  | \"installing\"\n  | \"starting\";\n\nexport interface WorkspaceAppInstallProgress {\n  readonly userPhase: WorkspaceAppInstallUserPhase;\n  readonly overallPercent: number;\n  readonly downloadedBytes?: number | null;\n  readonly totalBytes?: number | null;\n  readonly indeterminate: boolean;\n}\n\nexport interface WorkspaceAppRuntimeState {\n  readonly runtimeId?: string;\n  readonly installationId?: string;\n  readonly appId: string;\n  readonly status: WorkspaceAppRuntimeStatus;\n  readonly launchUrl?: string | null;\n  readonly installProgress?: WorkspaceAppInstallProgress | null;\n  readonly error?: WorkspaceAppRuntimeError | null;\n  readonly startedAt?: string | null;\n  readonly updatedAt?: string | null;\n}\n"],"mappings":";AAAO,IAAM,8BAA8B;AAAA,EACzC;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF;","names":[]}

package/dist/{chunk-O3XCZVHE.js → chunk-DPJRK63W.js}

@@ -30,13 +30,25 @@ function mergeWorkspaceAppCatalogFields(currentApp, snapshotApp) {
     updateAvailable: snapshotApp.updateAvailable
   };
 }
+function areWorkspaceAppInstallProgressEqual(left, right) {
+  if (left == null && right == null) {
+    return true;
+  }
+  if (left == null || right == null) {
+    return false;
+  }
+  return left.userPhase === right.userPhase && left.overallPercent === right.overallPercent && left.downloadedBytes === right.downloadedBytes && left.totalBytes === right.totalBytes && left.indeterminate === right.indeterminate;
+}
 function areWorkspaceAppCenterAppsEqual(left, right) {
   if (left.length !== right.length) {
     return false;
   }
   return left.every((leftApp, index) => {
     const rightApp = right[index];
-    return rightApp !== void 0 && leftApp.appId === rightApp.appId && leftApp.availableIconUrl === rightApp.availableIconUrl && leftApp.availableVersion === rightApp.availableVersion && leftApp.createdAtUnixMs === rightApp.createdAtUnixMs && leftApp.description === rightApp.description && leftApp.enabled === rightApp.enabled && leftApp.exportable === rightApp.exportable && leftApp.iconUrl === rightApp.iconUrl && leftApp.installed === rightApp.installed && leftApp.installationId === rightApp.installationId && areWorkspaceAppCenterLocalizationsEqual(
+    return rightApp !== void 0 && leftApp.appId === rightApp.appId && leftApp.availableIconUrl === rightApp.availableIconUrl && leftApp.availableVersion === rightApp.availableVersion && leftApp.createdAtUnixMs === rightApp.createdAtUnixMs && leftApp.description === rightApp.description && leftApp.enabled === rightApp.enabled && leftApp.exportable === rightApp.exportable && leftApp.iconUrl === rightApp.iconUrl && leftApp.installed === rightApp.installed && areWorkspaceAppInstallProgressEqual(
+      leftApp.installProgress,
+      rightApp.installProgress
+    ) && leftApp.installationId === rightApp.installationId && areWorkspaceAppCenterLocalizationsEqual(
       leftApp.localizations ?? [],
       rightApp.localizations ?? []
     ) && leftApp.minimizeBehavior === rightApp.minimizeBehavior && leftApp.name === rightApp.name && leftApp.references.listSupported === rightApp.references.listSupported && leftApp.runtimeId === rightApp.runtimeId && leftApp.runtimeStatus === rightApp.runtimeStatus && leftApp.source === rightApp.source && leftApp.stateRevision === rightApp.stateRevision && areStringArraysEqual(leftApp.tags ?? [], rightApp.tags ?? []) && (leftApp.updateAvailable ?? false) === (rightApp.updateAvailable ?? false) && leftApp.launchUrl === rightApp.launchUrl && leftApp.version === rightApp.version && leftApp.windowMinHeight === rightApp.windowMinHeight && leftApp.windowMinWidth === rightApp.windowMinWidth;
@@ -276,6 +288,85 @@ var WorkspaceAppCenterControllerBase = class {
   }
 };
 
+// src/core/installProgressMerge.ts
+var installUserPhaseOrder = {
+  downloading: 0,
+  installing: 1,
+  starting: 2
+};
+var defaultDownloadCompletePercent = 70;
+var defaultInstallingPartialPercent = 79;
+var defaultStartingPartialPercent = 96;
+function reconcilePendingInstallProgress(input) {
+  const runtimePhase = runtimeStatusToInstallUserPhase(input.runtimeStatus);
+  const progress = input.incoming ?? input.previous ?? (runtimePhase == null ? null : createProgressForRuntimePhase(runtimePhase));
+  if (progress == null) {
+    return null;
+  }
+  if (runtimePhase == null) {
+    return clearDownloadBytesUnlessDownloading(progress);
+  }
+  if (compareInstallUserPhase(progress.userPhase, runtimePhase) >= 0) {
+    return clearDownloadBytesUnlessDownloading(progress);
+  }
+  return advanceInstallProgressToPhase(progress, runtimePhase);
+}
+function runtimeStatusToInstallUserPhase(runtimeStatus) {
+  switch (runtimeStatus) {
+    case "preparing":
+      return "installing";
+    case "starting":
+      return "starting";
+    default:
+      return null;
+  }
+}
+function compareInstallUserPhase(left, right) {
+  return installUserPhaseOrder[left] - installUserPhaseOrder[right];
+}
+function advanceInstallProgressToPhase(progress, targetPhase) {
+  let overallPercent = progress.overallPercent;
+  let userPhase = progress.userPhase;
+  if (targetPhase === "installing" || targetPhase === "starting") {
+    overallPercent = Math.max(overallPercent, defaultDownloadCompletePercent);
+    userPhase = "installing";
+  }
+  if (targetPhase === "starting") {
+    overallPercent = Math.max(overallPercent, defaultStartingPartialPercent);
+    userPhase = "starting";
+  } else if (targetPhase === "installing") {
+    overallPercent = Math.max(overallPercent, defaultInstallingPartialPercent);
+  }
+  return clearDownloadBytesUnlessDownloading({
+    ...progress,
+    indeterminate: false,
+    overallPercent,
+    userPhase
+  });
+}
+function createProgressForRuntimePhase(userPhase) {
+  return advanceInstallProgressToPhase(
+    {
+      downloadedBytes: null,
+      indeterminate: false,
+      overallPercent: 0,
+      totalBytes: null,
+      userPhase: "downloading"
+    },
+    userPhase
+  );
+}
+function clearDownloadBytesUnlessDownloading(progress) {
+  if (progress.userPhase === "downloading") {
+    return progress;
+  }
+  return {
+    ...progress,
+    downloadedBytes: null,
+    totalBytes: null
+  };
+}
+
 // src/core/appCenterControllerState.ts
 var WorkspaceAppCenterControllerState = class extends WorkspaceAppCenterControllerBase {
   applySnapshot(workspaceId, snapshot) {
@@ -371,11 +462,16 @@ var WorkspaceAppCenterControllerState = class extends WorkspaceAppCenterControll
       return;
     }
     const appIdsToClose = currentApp?.installed === true && !nextApp.installed ? [nextApp.appId] : [];
+    const mergedApp = this.mergeActiveInstallAppState(
+      workspaceId,
+      nextApp,
+      currentApp
+    );
     const nextApps = sortWorkspaceAppCenterApps([
       ...this.store.apps.filter(
         (candidate) => candidate.appId !== nextApp.appId
       ),
-      nextApp
+      mergedApp
     ]);
     if (areWorkspaceAppCenterAppsEqual(this.store.apps, nextApps)) {
       return;
@@ -385,8 +481,8 @@ var WorkspaceAppCenterControllerState = class extends WorkspaceAppCenterControll
     this.store.loadStatus = "ready";
     this.bumpRevision();
     this.settlePendingInstallReport({
-      app: nextApp,
-      failureReason: options.installFailureReason ?? nextApp.failureReason ?? nextApp.lastError ?? null,
+      app: mergedApp,
+      failureReason: options.installFailureReason ?? mergedApp.failureReason ?? mergedApp.lastError ?? null,
       workspaceId
     });
     this.closeWorkspaceAppViews(workspaceId, appIdsToClose);
@@ -495,15 +591,24 @@ var WorkspaceAppCenterControllerState = class extends WorkspaceAppCenterControll
       this.bumpRevision();
     }
   }
-  isPendingInstallSettled(installKey, app) {
+  isPendingInstallSettled(installKey, app, previousApp) {
+    if (this.isPendingInstallAbandoned(installKey, app, previousApp)) {
+      return true;
+    }
     if (app.runtimeStatus === "failed") {
       return true;
     }
+    if (this.isRuntimeInstallBusy(app.runtimeStatus)) {
+      return false;
+    }
     if (this.pendingInstallReportKeys.has(installKey)) {
       return app.installed;
     }
     return app.installed && !app.updateAvailable && !app.availableVersion;
   }
+  isRuntimeInstallBusy(runtimeStatus) {
+    return runtimeStatus === "installing" || runtimeStatus === "preparing" || runtimeStatus === "starting";
+  }
   mergeSnapshotAppsByStateRevision(workspaceId, snapshotApps) {
     if (this.store.workspaceId !== workspaceId) {
       return [...snapshotApps];
@@ -520,7 +625,8 @@ var WorkspaceAppCenterControllerState = class extends WorkspaceAppCenterControll
       if (this.pendingInstallKeys.has(installKey)) {
         const pendingSettled = this.isPendingInstallSettled(
           installKey,
-          snapshotApp
+          snapshotApp,
+          currentApp
         );
         if (pendingSettled && currentApp.stateRevision <= snapshotApp.stateRevision) {
           return snapshotApp;
@@ -545,22 +651,50 @@ var WorkspaceAppCenterControllerState = class extends WorkspaceAppCenterControll
       void this.refresh(workspaceId);
     }, this.dependencies.catalogLoadingRefreshDelayMs ?? defaultCatalogLoadingRefreshDelayMs);
   }
+  mergeActiveInstallAppState(workspaceId, app, previousApp) {
+    const installKey = appRuntimeKey(workspaceId, app.appId);
+    if (!this.pendingInstallKeys.has(installKey)) {
+      return app;
+    }
+    if (this.isPendingInstallSettled(installKey, app, previousApp)) {
+      return app;
+    }
+    const incomingRuntimeStatus = app.runtimeStatus;
+    const runtimeStatus = this.isRuntimeInstallLifecycleStatus(
+      incomingRuntimeStatus
+    ) ? incomingRuntimeStatus : "installing";
+    return {
+      ...app,
+      enabled: true,
+      installed: this.pendingInstallReportKeys.has(installKey) ? false : app.installed,
+      installProgress: reconcilePendingInstallProgress({
+        incoming: app.installProgress,
+        previous: previousApp?.installProgress ?? null,
+        runtimeStatus: incomingRuntimeStatus
+      }),
+      runtimeStatus
+    };
+  }
+  isRuntimeInstallLifecycleStatus(runtimeStatus) {
+    return runtimeStatus === "installing" || runtimeStatus === "preparing" || runtimeStatus === "starting";
+  }
+  isPendingInstallAbandoned(installKey, app, previousApp) {
+    return this.pendingInstallReportKeys.has(installKey) && !app.installed && app.runtimeStatus === "idle" && app.installProgress == null && this.hasObservedInstallActivity(previousApp);
+  }
+  hasObservedInstallActivity(app) {
+    return app?.installProgress != null || app?.runtimeStatus === "preparing" || app?.runtimeStatus === "starting";
+  }
   withPendingInstallState(workspaceId, apps) {
-    return apps.map((app) => {
-      const installKey = appRuntimeKey(workspaceId, app.appId);
-      if (!this.pendingInstallKeys.has(installKey)) {
-        return app;
-      }
-      if (this.isPendingInstallSettled(installKey, app)) {
-        return app;
-      }
-      return {
-        ...app,
-        enabled: true,
-        installed: this.pendingInstallReportKeys.has(installKey) ? false : app.installed,
-        runtimeStatus: "installing"
-      };
-    });
+    const previousAppsById = new Map(
+      this.store.apps.map((app) => [app.appId, app])
+    );
+    return apps.map(
+      (app) => this.mergeActiveInstallAppState(
+        workspaceId,
+        app,
+        previousAppsById.get(app.appId)
+      )
+    );
   }
   async refreshInstallState(workspaceId, appId) {
     try {
@@ -595,6 +729,9 @@ var WorkspaceAppCenterControllerState = class extends WorkspaceAppCenterControll
       this.dependencies.hooks?.onAppInstalled?.(input.app);
       return;
     }
+    if (input.app.runtimeStatus === "idle" && input.app.installProgress == null && input.failureReason == null && input.app.failureReason == null && input.app.lastError == null) {
+      return;
+    }
     this.dependencies.hooks?.onAppInstallFailed?.({
       app: input.app,
       appId: input.app.appId,
@@ -954,11 +1091,16 @@ var WorkspaceAppCenterController = class extends WorkspaceAppCenterControllerSta
     this.pendingInstallKeys.add(installKey);
     this.markAppInstalling(input.appId, { preserveInstalled: true });
     try {
+      const restartRunning = app?.installed === true && app.runtimeStatus === "running";
       const snapshot = await this.dependencies.gateway.installWorkspaceApp(
         input.workspaceId,
-        input.appId
+        input.appId,
+        restartRunning ? { restartRunning: true } : void 0
       );
       this.applySnapshot(input.workspaceId, snapshot);
+      if (restartRunning) {
+        this.closeWorkspaceAppViews(input.workspaceId, [input.appId]);
+      }
       this.dependencies.hooks?.onAppUpdated?.({
         app,
         trigger: input.trigger
@@ -1600,9 +1742,11 @@ function createAppCenterViewModel({
       manifest: app.manifest
     });
     const factoryAgentSessionId = factoryJob?.agentSessionId?.trim() || null;
-    const status = runtime?.status ?? "idle";
+    const factoryEditAction = factoryJob && factoryAgentSessionId ? factoryJob.status === "published" ? "prepare_modification" : "open_session" : null;
+    const status = resolveRuntimeStatusForViewModel(runtime);
     const presentation = resolveWorkspaceAppStatusPresentation(status);
     const installed = Boolean(app.install);
+    const installBusy = runtime?.installProgress != null || status === "installing";
     const sourceKind = resolveCatalogSourceKind(app.catalog);
     const localApp = sourceKind === "local";
     const runtimeId = normalizeOptionalString(runtime?.runtimeId);
@@ -1624,6 +1768,7 @@ function createAppCenterViewModel({
       installed,
       status
     });
+    const iconUrl = resolveWorkspaceAppIconUrl(app);
     return {
       id: app.manifest.appId,
       installationId,
@@ -1636,30 +1781,37 @@ function createAppCenterViewModel({
       ...app.availableVersion && !comingSoon ? { availableVersion: app.availableVersion } : {},
       ...app.category?.trim() ? { category: app.category.trim() } : {},
       updateAvailable: app.updateAvailable ?? false,
-      ...app.manifest.icon ? { icon: app.manifest.icon } : {},
+      ...iconUrl ? {
+        icon: {
+          type: "asset",
+          src: iconUrl
+        }
+      } : {},
       tags: metadata.tags,
       installed,
       status,
       statusLabelKey: comingSoon ? "status.comingSoon" : resolvePrimaryActionLabelKey(primaryAction, presentation.labelKey),
       statusTone: presentation.tone,
-      statusPulse: presentation.pulse,
+      statusPulse: runtime?.installProgress ? false : presentation.pulse,
       primaryAction,
       sourceKind,
       canOpen,
       canExport: localApp,
       canDelete: localApp,
       canReplaceIcon: replaceableIconAppIdSet.has(app.manifest.appId),
-      canOpenFolder: installed,
-      canOpenPackageFolder: installed && localApp && Boolean(displayVersion),
+      canOpenFolder: installed && !installBusy,
+      canOpenPackageFolder: installed && localApp && Boolean(displayVersion) && !installBusy,
       canOpenFactorySession: Boolean(factoryAgentSessionId),
       canPublishFactoryUpdate: installed && factoryJob?.status === "ready" && Boolean(factoryJob.publishedVersion?.trim()),
-      canUninstall: installed,
+      canUninstall: installed && !installBusy,
       canRetry,
       canUpdate,
       ...factoryAgentSessionId ? { factoryAgentSessionId } : {},
+      ...factoryEditAction ? { factoryEditAction } : {},
       ...factoryJob?.jobId ? { factoryJobId: factoryJob.jobId } : {},
       ...factoryJob?.provider ? { factoryProvider: factoryJob.provider } : {},
-      ...runtime?.error?.message ? { errorMessage: runtime.error.message } : {}
+      ...runtime?.error?.message ? { errorMessage: runtime.error.message } : {},
+      ...runtime?.installProgress ? { installProgress: runtime.installProgress } : {}
     };
   }).sort((left, right) => left.name.localeCompare(right.name));
   return {
@@ -1677,7 +1829,8 @@ function createRuntimeStateMaps(runtimeStates) {
   for (const state of runtimeStates) {
     const runtime = {
       ...state,
-      status: mapWorkspaceAppRuntimeStatus(state.status)
+      status: mapWorkspaceAppRuntimeStatus(state.status),
+      installProgress: state.installProgress ?? null
     };
     const installationId = normalizeOptionalString(runtime.installationId);
     if (installationId) {
@@ -1703,6 +1856,15 @@ function findRuntimeStateForApp(maps, appId, installationId) {
   }
   return maps.fallbackByAppId.get(appId);
 }
+function resolveRuntimeStatusForViewModel(runtime) {
+  if (!runtime) {
+    return "idle";
+  }
+  if (runtime.installProgress != null && runtime.status === "idle") {
+    return "installing";
+  }
+  return runtime.status;
+}
 function resolveCatalogSourceKind(catalog) {
   return catalog?.source?.kind ?? "bundled";
 }
@@ -1749,6 +1911,16 @@ function normalizeOptionalString(value) {
   const normalized = value?.trim() ?? "";
   return normalized.length > 0 ? normalized : null;
 }
+function resolveWorkspaceAppIconUrl(app) {
+  const manifestIconUrl = normalizeOptionalString(app.manifest.icon?.src);
+  if (manifestIconUrl && isResolvedIconUrl(manifestIconUrl)) {
+    return manifestIconUrl;
+  }
+  return normalizeOptionalString(app.availableIconUrl) ?? manifestIconUrl;
+}
+function isResolvedIconUrl(value) {
+  return /^[a-z][a-z0-9+.-]*:/iu.test(value) || value.startsWith("/");
+}
 function resolvePrimaryAction(input) {
   if (input.comingSoon) {
     return "none";
@@ -1869,4 +2041,4 @@ export {
   resolveWorkspaceAppCatalogMetadata,
   createWorkspaceAppRecord
 };
-//# sourceMappingURL=chunk-O3XCZVHE.js.map
+//# sourceMappingURL=chunk-DPJRK63W.js.map