@comergehq/studio 0.1.32 → 0.1.34

package/dist/index.d.mts

@@ -26,6 +26,7 @@ type BaseBundleMeta = {
     updatedAt: string;
 };
 
+type ActiveAppChangedSource = 'initial' | 'fork_edit' | 'related_apps' | 'host_route_sync';
 type ComergeStudioProps = {
     appId: string;
     clientKey: string;
@@ -38,6 +39,11 @@ type ComergeStudioProps = {
         threadId?: string;
         source?: string;
     }) => void;
+    onActiveAppChanged?: (params: {
+        appId: string;
+        appKey?: string;
+        source: ActiveAppChangedSource;
+    }) => void;
     style?: ViewStyle;
     showBubble?: boolean;
     enableAgentProgress?: boolean;
@@ -45,7 +51,7 @@ type ComergeStudioProps = {
     embeddedBaseBundles?: EmbeddedBaseBundles;
     onSystemEvent?: (event: ComergeRuntimeSystemEventEnvelope) => void;
 };
-declare function ComergeStudio({ appId, clientKey, appKey, analyticsEnabled, onNavigateHome, onOpenAppRequested, style, showBubble, enableAgentProgress, studioControlOptions, embeddedBaseBundles, onSystemEvent, }: ComergeStudioProps): react_jsx_runtime.JSX.Element;
+declare function ComergeStudio({ appId, clientKey, appKey, analyticsEnabled, onNavigateHome, onOpenAppRequested, onActiveAppChanged, style, showBubble, enableAgentProgress, studioControlOptions, embeddedBaseBundles, onSystemEvent, }: ComergeStudioProps): react_jsx_runtime.JSX.Element;
 
 declare function setSupabaseClient(client: SupabaseClient): void;
 

package/dist/index.d.ts

@@ -26,6 +26,7 @@ type BaseBundleMeta = {
     updatedAt: string;
 };
 
+type ActiveAppChangedSource = 'initial' | 'fork_edit' | 'related_apps' | 'host_route_sync';
 type ComergeStudioProps = {
     appId: string;
     clientKey: string;
@@ -38,6 +39,11 @@ type ComergeStudioProps = {
         threadId?: string;
         source?: string;
     }) => void;
+    onActiveAppChanged?: (params: {
+        appId: string;
+        appKey?: string;
+        source: ActiveAppChangedSource;
+    }) => void;
     style?: ViewStyle;
     showBubble?: boolean;
     enableAgentProgress?: boolean;
@@ -45,7 +51,7 @@ type ComergeStudioProps = {
     embeddedBaseBundles?: EmbeddedBaseBundles;
     onSystemEvent?: (event: ComergeRuntimeSystemEventEnvelope) => void;
 };
-declare function ComergeStudio({ appId, clientKey, appKey, analyticsEnabled, onNavigateHome, onOpenAppRequested, style, showBubble, enableAgentProgress, studioControlOptions, embeddedBaseBundles, onSystemEvent, }: ComergeStudioProps): react_jsx_runtime.JSX.Element;
+declare function ComergeStudio({ appId, clientKey, appKey, analyticsEnabled, onNavigateHome, onOpenAppRequested, onActiveAppChanged, style, showBubble, enableAgentProgress, studioControlOptions, embeddedBaseBundles, onSystemEvent, }: ComergeStudioProps): react_jsx_runtime.JSX.Element;
 
 declare function setSupabaseClient(client: SupabaseClient): void;
 

package/dist/index.js

@@ -5966,9 +5966,9 @@ function PreviewRelatedAppsSection({
   const renderRelatedCard = React27.useCallback(
     (item, options) => {
       const isCurrent = item.app.id === currentAppId;
-      const isReady = item.app.status === "ready";
+      const isArchived = item.app.status === "archived";
       const isSwitching = switchingRelatedAppId === item.app.id;
-      const disabled = isCurrent || !isReady || Boolean(switchingRelatedAppId);
+      const disabled = isCurrent || isArchived || Boolean(switchingRelatedAppId);
       return /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(
         import_react_native35.Pressable,
         {
@@ -6008,7 +6008,7 @@ function PreviewRelatedAppsSection({
               )
             ] }),
             /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)(import_react_native35.View, { style: { alignItems: "flex-end", gap: 6 }, children: [
-              /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(import_react_native35.View, { style: { minHeight: 20, justifyContent: "center" }, children: !isReady ? /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(PreviewStatusBadge, { status: item.app.status }) : null }),
+              /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(import_react_native35.View, { style: { minHeight: 20, justifyContent: "center" }, children: item.app.status !== "ready" ? /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(PreviewStatusBadge, { status: item.app.status }) : null }),
               isSwitching ? /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(import_react_native35.ActivityIndicator, { size: "small", color: theme.colors.primary }) : null
             ] })
           ] })
@@ -9891,6 +9891,7 @@ function ComergeStudio({
   analyticsEnabled,
   onNavigateHome,
   onOpenAppRequested,
+  onActiveAppChanged,
   style,
   showBubble = true,
   enableAgentProgress = true,
@@ -9901,12 +9902,36 @@ function ComergeStudio({
   const [activeAppId, setActiveAppId] = React51.useState(appId);
   const [runtimeAppId, setRuntimeAppId] = React51.useState(appId);
   const [pendingRuntimeTargetAppId, setPendingRuntimeTargetAppId] = React51.useState(null);
+  const didSyncFromHostRef = React51.useRef(false);
+  const lastNotifiedRef = React51.useRef(null);
   const platform = React51.useMemo(() => import_react_native61.Platform.OS === "ios" ? "ios" : "android", []);
+  const notifyActiveAppChanged = React51.useCallback(
+    (nextAppId, source) => {
+      if (!onActiveAppChanged) return;
+      const trimmedAppId = nextAppId.trim();
+      if (!trimmedAppId) return;
+      const nextAppKey = (appKey == null ? void 0 : appKey.trim()) || "MicroMain";
+      const dedupeKey = `${trimmedAppId}:${nextAppKey}`;
+      if (lastNotifiedRef.current === dedupeKey) return;
+      lastNotifiedRef.current = dedupeKey;
+      onActiveAppChanged({ appId: trimmedAppId, appKey: nextAppKey, source });
+    },
+    [appKey, onActiveAppChanged]
+  );
+  const setActiveAppIdWithSource = React51.useCallback(
+    (nextAppId, source) => {
+      setActiveAppId(nextAppId);
+      notifyActiveAppChanged(nextAppId, source);
+    },
+    [notifyActiveAppChanged]
+  );
   React51.useEffect(() => {
-    setActiveAppId(appId);
+    const source = didSyncFromHostRef.current ? "host_route_sync" : "initial";
+    didSyncFromHostRef.current = true;
+    setActiveAppIdWithSource(appId, source);
     setRuntimeAppId(appId);
     setPendingRuntimeTargetAppId(null);
-  }, [appId]);
+  }, [appId, setActiveAppIdWithSource]);
   const captureTargetRef = React51.useRef(null);
   return /* @__PURE__ */ (0, import_jsx_runtime65.jsx)(
     StudioBootstrap,
@@ -9919,7 +9944,7 @@ function ComergeStudio({
         {
           userId,
           activeAppId,
-          setActiveAppId,
+          setActiveAppId: setActiveAppIdWithSource,
           runtimeAppId,
           setRuntimeAppId,
           pendingRuntimeTargetAppId,
@@ -10039,7 +10064,7 @@ function ComergeStudioInner({
     userId,
     app,
     onForkedApp: (id, opts) => {
-      setActiveAppId(id);
+      setActiveAppId(id, "fork_edit");
       const keepRenderingAppId = opts == null ? void 0 : opts.keepRenderingAppId;
       if (keepRenderingAppId) {
         setRuntimeAppId(keepRenderingAppId);
@@ -10076,7 +10101,26 @@ function ComergeStudioInner({
   const [upstreamSyncStatus, setUpstreamSyncStatus] = React51.useState(null);
   const isMrTestBuildInProgress = bundle.loading && bundle.loadingMode === "test";
   const isBaseBundleDownloading = bundle.loading && bundle.loadingMode === "base" && !bundle.isTesting;
-  const runtimePreparingText = bundle.bundleStatus === "pending" ? "Bundling app\u2026 this may take a few minutes" : "Preparing app\u2026";
+  const runtimePreparingText = React51.useMemo(() => {
+    const status = app == null ? void 0 : app.status;
+    if (status === "ready" && bundle.bundleStatus === "pending") {
+      return "Bundling app\u2026 this may take a few minutes";
+    }
+    switch (status) {
+      case "creating":
+        return "Creating your app\u2026 this may take a moment";
+      case "forking":
+        return "Forking your app\u2026";
+      case "editing":
+        return "Applying your latest changes\u2026";
+      case "merging":
+        return "Merging app updates\u2026";
+      case "error":
+        return "This app hit an error while preparing.";
+      default:
+        return "Preparing app\u2026";
+    }
+  }, [app == null ? void 0 : app.status, bundle.bundleStatus]);
   const chatShowTypingIndicator = React51.useMemo(() => {
     var _a2;
     if (agentProgress.hasLiveProgress) return false;
@@ -10143,9 +10187,9 @@ function ComergeStudioInner({
       setSwitchingRelatedAppId(targetAppId);
       try {
         const targetApp = await appsRepository.getById(targetAppId);
-        if (targetApp.status !== "ready") {
-          const reason = `target_not_ready:${targetApp.status}`;
-          log.warn("[related-apps] switch blocked: target app not ready", {
+        if (targetApp.status === "archived") {
+          const reason = "target_archived";
+          log.warn("[related-apps] switch blocked: target app archived", {
             fromAppId: activeAppId,
             toAppId: targetAppId,
             status: targetApp.status
@@ -10165,7 +10209,7 @@ function ComergeStudioInner({
             source: "related_apps_switcher"
           });
         } else {
-          setActiveAppId(targetAppId);
+          setActiveAppId(targetAppId, "related_apps");
           setRuntimeAppId(targetAppId);
           setPendingRuntimeTargetAppId(null);
         }