@comergehq/studio 0.1.26 → 0.1.28

package/dist/index.mjs

@@ -6,8 +6,8 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
 });
 
 // src/studio/ComergeStudio.tsx
-import * as React47 from "react";
-import { Platform as RNPlatform, View as View46 } from "react-native";
+import * as React49 from "react";
+import { Platform as RNPlatform, View as View48 } from "react-native";
 import { BottomSheetModalProvider } from "@gorhom/bottom-sheet";
 
 // src/studio/bootstrap/StudioBootstrap.tsx
@@ -278,6 +278,109 @@ async function ensureAnonymousSession() {
   return { user: data.user, isNew: true };
 }
 
+// src/studio/analytics/client.ts
+import { Platform } from "react-native";
+import { Mixpanel } from "mixpanel-react-native";
+
+// src/core/logger.ts
+import { logger, consoleTransport } from "react-native-logs";
+var log = logger.createLogger(
+  {
+    levels: {
+      debug: 0,
+      info: 1,
+      warn: 2,
+      error: 3
+    },
+    severity: "debug",
+    transport: consoleTransport,
+    transportOptions: {
+      colors: {
+        info: "blueBright",
+        warn: "yellowBright",
+        error: "redBright"
+      }
+    },
+    async: true,
+    dateFormat: "time",
+    printLevel: true,
+    printDate: true,
+    fixedExtLvlLength: false,
+    enabled: true
+  }
+);
+
+// src/studio/analytics/client.ts
+var studioMixpanel = null;
+var studioAnalyticsEnabled = false;
+var initPromise = null;
+async function initStudioAnalytics(options) {
+  if (initPromise) return initPromise;
+  initPromise = (async () => {
+    if (!options.enabled) {
+      studioAnalyticsEnabled = false;
+      return;
+    }
+    const token = (options.token ?? "").trim();
+    if (!token) {
+      studioAnalyticsEnabled = false;
+      log.warn("[studio-analytics] disabled: missing Mixpanel token");
+      return;
+    }
+    try {
+      const trackAutomaticEvents = false;
+      const useNative = false;
+      const serverUrl = (options.serverUrl ?? "").trim() || "https://api.mixpanel.com";
+      const superProperties = {
+        runtime: "comerge-studio",
+        platform: Platform.OS
+      };
+      studioMixpanel = new Mixpanel(token, trackAutomaticEvents, useNative);
+      await studioMixpanel.init(false, superProperties, serverUrl);
+      studioMixpanel.setLoggingEnabled(Boolean(options.debug));
+      studioMixpanel.setFlushBatchSize(50);
+      studioAnalyticsEnabled = true;
+    } catch (error) {
+      studioMixpanel = null;
+      studioAnalyticsEnabled = false;
+      log.warn("[studio-analytics] init failed", error);
+    }
+  })();
+  return initPromise;
+}
+async function trackStudioEvent(eventName, properties) {
+  if (!studioAnalyticsEnabled || !studioMixpanel) return;
+  try {
+    await studioMixpanel.track(eventName, properties);
+  } catch (error) {
+    log.warn("[studio-analytics] track failed", { eventName, error });
+  }
+}
+async function flushStudioAnalytics() {
+  if (!studioAnalyticsEnabled || !studioMixpanel) return;
+  try {
+    await studioMixpanel.flush();
+  } catch (error) {
+    log.warn("[studio-analytics] flush failed", error);
+  }
+}
+async function identifyStudioUser(userId) {
+  if (!studioAnalyticsEnabled || !studioMixpanel || !userId) return;
+  try {
+    await studioMixpanel.identify(userId);
+  } catch (error) {
+    log.warn("[studio-analytics] identify failed", error);
+  }
+}
+async function resetStudioAnalytics() {
+  if (!studioAnalyticsEnabled || !studioMixpanel) return;
+  try {
+    await studioMixpanel.reset();
+  } catch (error) {
+    log.warn("[studio-analytics] reset failed", error);
+  }
+}
+
 // src/studio/bootstrap/useStudioBootstrap.ts
 var SUPABASE_URL = "https://xtfxwbckjpfmqubnsusu.supabase.co";
 var SUPABASE_ANON_KEY = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6Inh0Znh3YmNranBmbXF1Ym5zdXN1Iiwicm9sZSI6ImFub24iLCJpYXQiOjE3NjA2MDEyMzAsImV4cCI6MjA3NjE3NzIzMH0.dzWGAWrK4CvrmHVHzf8w7JlUZohdap0ZPnLZnABMV8s";
@@ -292,11 +395,23 @@ function useStudioBootstrap(options) {
     (async () => {
       try {
         setClientKey(options.clientKey);
-        const requireAuth = isSupabaseClientInjected();
+        const hasInjectedSupabase = isSupabaseClientInjected();
+        const requireAuth = hasInjectedSupabase;
+        const analyticsEnabled = options.analyticsEnabled ?? hasInjectedSupabase;
+        await initStudioAnalytics({
+          enabled: analyticsEnabled,
+          token: process.env.EXPO_PUBLIC_MIXPANEL_TOKEN,
+          serverUrl: process.env.EXPO_PUBLIC_MIXPANEL_SERVER_URL,
+          debug: __DEV__
+        });
         if (!requireAuth) {
           setSupabaseConfig({ url: SUPABASE_URL, anonKey: SUPABASE_ANON_KEY });
+          await resetStudioAnalytics();
         }
         const { user } = requireAuth ? await ensureAuthenticatedSession() : await ensureAnonymousSession();
+        if (requireAuth) {
+          await identifyStudioUser(user.id);
+        }
         if (cancelled) return;
         setState({ ready: true, userId: user.id, error: null });
       } catch (e) {
@@ -308,14 +423,20 @@ function useStudioBootstrap(options) {
     return () => {
       cancelled = true;
     };
-  }, [options.clientKey]);
+  }, [options.analyticsEnabled, options.clientKey]);
   return state;
 }
 
 // src/studio/bootstrap/StudioBootstrap.tsx
 import { Fragment, jsx as jsx2 } from "react/jsx-runtime";
-function StudioBootstrap({ children, fallback, renderError, clientKey: clientKey2 }) {
-  const { ready, error, userId } = useStudioBootstrap({ clientKey: clientKey2 });
+function StudioBootstrap({
+  children,
+  fallback,
+  renderError,
+  clientKey: clientKey2,
+  analyticsEnabled
+}) {
+  const { ready, error, userId } = useStudioBootstrap({ clientKey: clientKey2, analyticsEnabled });
   if (error) {
     return /* @__PURE__ */ jsx2(View, { style: { flex: 1, justifyContent: "center", alignItems: "center", padding: 24 }, children: renderError ? renderError(error) : /* @__PURE__ */ jsx2(Text, { variant: "bodyMuted", children: error.message }) });
   }
@@ -333,36 +454,6 @@ import * as React3 from "react";
 
 // src/core/services/http/index.ts
 import axios2 from "axios";
-
-// src/core/logger.ts
-import { logger, consoleTransport } from "react-native-logs";
-var log = logger.createLogger(
-  {
-    levels: {
-      debug: 0,
-      info: 1,
-      warn: 2,
-      error: 3
-    },
-    severity: "debug",
-    transport: consoleTransport,
-    transportOptions: {
-      colors: {
-        info: "blueBright",
-        warn: "yellowBright",
-        error: "redBright"
-      }
-    },
-    async: true,
-    dateFormat: "time",
-    printLevel: true,
-    printDate: true,
-    fixedExtLvlLength: false,
-    enabled: true
-  }
-);
-
-// src/core/services/http/index.ts
 var RETRYABLE_MAX_ATTEMPTS = 3;
 var RETRYABLE_BASE_DELAY_MS = 500;
 var RETRYABLE_MAX_DELAY_MS = 4e3;
@@ -1177,6 +1268,154 @@ var BundlesRepositoryImpl = class extends BaseRepository {
 };
 var bundlesRepository = new BundlesRepositoryImpl(bundlesRemoteDataSource);
 
+// src/studio/analytics/events.ts
+var STUDIO_ANALYTICS_EVENT_VERSION = 1;
+
+// src/studio/analytics/track.ts
+function baseProps() {
+  return { event_version: STUDIO_ANALYTICS_EVENT_VERSION };
+}
+function normalizeError(error) {
+  if (!error) return {};
+  if (typeof error === "string") {
+    return { error_code: error.slice(0, 120), error_domain: "string" };
+  }
+  if (error instanceof Error) {
+    return {
+      error_code: error.message.slice(0, 120),
+      error_domain: error.name || "Error"
+    };
+  }
+  if (typeof error === "object") {
+    const candidate = error;
+    return {
+      error_code: String(candidate.code ?? candidate.message ?? "unknown_error").slice(0, 120),
+      error_domain: candidate.name ?? "object"
+    };
+  }
+  return { error_code: "unknown_error", error_domain: typeof error };
+}
+async function trackMutationEvent(name, payload) {
+  await trackStudioEvent(name, payload);
+  await flushStudioAnalytics();
+}
+var lastOpenCommentsKey = null;
+var lastOpenCommentsAt = 0;
+async function trackRemixApp(params) {
+  const errorProps = params.success ? {} : normalizeError(params.error);
+  await trackMutationEvent("remix_app", {
+    app_id: params.appId,
+    source_app_id: params.sourceAppId,
+    thread_id: params.threadId,
+    success: params.success,
+    ...errorProps,
+    ...baseProps()
+  });
+}
+async function trackEditApp(params) {
+  const errorProps = params.success ? {} : normalizeError(params.error);
+  await trackMutationEvent("edit_app", {
+    app_id: params.appId,
+    thread_id: params.threadId,
+    prompt_length: params.promptLength,
+    success: params.success,
+    ...errorProps,
+    ...baseProps()
+  });
+}
+async function trackShareApp(params) {
+  const errorProps = params.success ? {} : normalizeError(params.error);
+  await trackMutationEvent("share_app", {
+    app_id: params.appId,
+    success: params.success,
+    ...errorProps,
+    ...baseProps()
+  });
+}
+async function trackOpenMergeRequest(params) {
+  const errorProps = params.success ? {} : normalizeError(params.error);
+  await trackMutationEvent("open_merge_request", {
+    app_id: params.appId,
+    merge_request_id: params.mergeRequestId,
+    success: params.success,
+    ...errorProps,
+    ...baseProps()
+  });
+}
+async function trackApproveMergeRequest(params) {
+  const errorProps = params.success ? {} : normalizeError(params.error);
+  await trackMutationEvent("approve_merge_request", {
+    app_id: params.appId,
+    merge_request_id: params.mergeRequestId,
+    success: params.success,
+    ...errorProps,
+    ...baseProps()
+  });
+}
+async function trackRejectMergeRequest(params) {
+  const errorProps = params.success ? {} : normalizeError(params.error);
+  await trackMutationEvent("reject_merge_request", {
+    app_id: params.appId,
+    merge_request_id: params.mergeRequestId,
+    success: params.success,
+    ...errorProps,
+    ...baseProps()
+  });
+}
+async function trackTestBundle(params) {
+  const errorProps = params.success ? {} : normalizeError(params.error);
+  await trackMutationEvent("test_bundle", {
+    app_id: params.appId,
+    commit_id: params.commitId,
+    success: params.success,
+    ...errorProps,
+    ...baseProps()
+  });
+}
+async function trackLikeApp(params) {
+  const errorProps = params.success ? {} : normalizeError(params.error);
+  await trackMutationEvent("like_app", {
+    app_id: params.appId,
+    source: params.source ?? "unknown",
+    success: params.success,
+    ...errorProps,
+    ...baseProps()
+  });
+}
+async function trackUnlikeApp(params) {
+  const errorProps = params.success ? {} : normalizeError(params.error);
+  await trackMutationEvent("unlike_app", {
+    app_id: params.appId,
+    source: params.source ?? "unknown",
+    success: params.success,
+    ...errorProps,
+    ...baseProps()
+  });
+}
+async function trackOpenComments(params) {
+  const key = `${params.appId}:${params.source ?? "unknown"}`;
+  const now = Date.now();
+  if (lastOpenCommentsKey === key && now - lastOpenCommentsAt < 1e3) return;
+  lastOpenCommentsKey = key;
+  lastOpenCommentsAt = now;
+  await trackStudioEvent("open_comments", {
+    app_id: params.appId,
+    source: params.source ?? "unknown",
+    ...baseProps()
+  });
+}
+async function trackSubmitComment(params) {
+  const errorProps = params.success ? {} : normalizeError(params.error);
+  await trackMutationEvent("submit_comment", {
+    app_id: params.appId,
+    comment_type: "general",
+    comment_length: params.commentLength,
+    success: params.success,
+    ...errorProps,
+    ...baseProps()
+  });
+}
+
 // src/studio/hooks/useBundleManager.ts
 function sleep2(ms) {
   return new Promise((r) => setTimeout(r, ms));
@@ -1493,7 +1732,7 @@ async function pollBundle(appId, bundleId, opts) {
     await sleep2(opts.intervalMs);
   }
 }
-async function resolveBundlePath(src, platform, mode) {
+async function resolveBundlePath(src, platform, mode, onStatus) {
   const { appId, commitId } = src;
   const dir = bundlesCacheDir();
   await ensureDir(dir);
@@ -1507,7 +1746,9 @@ async function resolveBundlePath(src, platform, mode) {
     },
     { attempts: 3, baseDelayMs: 500, maxDelayMs: 4e3 }
   );
+  onStatus == null ? void 0 : onStatus(initiate.status);
   const finalBundle = initiate.status === "succeeded" || initiate.status === "failed" ? initiate : await pollBundle(appId, initiate.id, { timeoutMs: 3 * 60 * 1e3, intervalMs: 1200 });
+  onStatus == null ? void 0 : onStatus(finalBundle.status);
   if (finalBundle.status === "failed") {
     throw new Error("Bundle build failed.");
   }
@@ -1549,6 +1790,7 @@ function useBundleManager({
   const [renderToken, setRenderToken] = React5.useState(0);
   const [loading, setLoading] = React5.useState(false);
   const [loadingMode, setLoadingMode] = React5.useState(null);
+  const [bundleStatus, setBundleStatus] = React5.useState(null);
   const [statusLabel, setStatusLabel] = React5.useState(null);
   const [error, setError] = React5.useState(null);
   const [isTesting, setIsTesting] = React5.useState(false);
@@ -1660,16 +1902,20 @@ function useBundleManager({
     activeLoadModeRef.current = mode;
     setLoading(true);
     setLoadingMode(mode);
+    setBundleStatus(null);
     setError(null);
     setStatusLabel(mode === "test" ? "Loading test bundle\u2026" : "Loading latest build\u2026");
     if (mode === "base" && desiredModeRef.current === "base") {
       void activateCachedBase(src.appId);
     }
     try {
-      const { bundlePath: path, bundle } = await resolveBundlePath(src, platform, mode);
+      const { bundlePath: path, bundle } = await resolveBundlePath(src, platform, mode, (status) => {
+        setBundleStatus(status);
+      });
       if (mode === "base" && opId !== baseOpIdRef.current) return;
       if (mode === "test" && opId !== testOpIdRef.current) return;
       if (desiredModeRef.current !== mode) return;
+      setBundleStatus(bundle.status);
       setBundlePath(path);
       const fingerprint = bundle.checksumSha256 ?? `id:${bundle.id}`;
       const shouldSkipInitialBaseRemount = mode === "base" && initialHydratedBaseFromDiskRef.current && !hasCompletedFirstNetworkBaseLoadRef.current && Boolean(lastBaseFingerprintRef.current) && lastBaseFingerprintRef.current === fingerprint;
@@ -1705,6 +1951,7 @@ function useBundleManager({
     } catch (e) {
       if (mode === "base" && opId !== baseOpIdRef.current) return;
       if (mode === "test" && opId !== testOpIdRef.current) return;
+      setBundleStatus("failed");
       const msg = e instanceof Error ? e.message : String(e);
       setError(msg);
       setStatusLabel(null);
@@ -1720,7 +1967,22 @@ function useBundleManager({
     await load(baseRef.current, "base");
   }, [load]);
   const loadTest = React5.useCallback(async (src) => {
-    await load(src, "test");
+    try {
+      await load(src, "test");
+      await trackTestBundle({
+        appId: src.appId,
+        commitId: src.commitId ?? void 0,
+        success: true
+      });
+    } catch (error2) {
+      await trackTestBundle({
+        appId: src.appId,
+        commitId: src.commitId ?? void 0,
+        success: false,
+        error: error2
+      });
+      throw error2;
+    }
   }, [load]);
   const restoreBase = React5.useCallback(async () => {
     const src = baseRef.current;
@@ -1736,7 +1998,19 @@ function useBundleManager({
     if (!canRequestLatest) return;
     void loadBase();
   }, [base.appId, base.commitId, platform, canRequestLatest, loadBase]);
-  return { bundlePath, renderToken, loading, loadingMode, statusLabel, error, isTesting, loadBase, loadTest, restoreBase };
+  return {
+    bundlePath,
+    renderToken,
+    loading,
+    loadingMode,
+    bundleStatus,
+    statusLabel,
+    error,
+    isTesting,
+    loadBase,
+    loadTest,
+    restoreBase
+  };
 }
 
 // src/studio/hooks/useMergeRequests.ts
@@ -1946,24 +2220,68 @@ function useMergeRequests(params) {
   }, [appId]);
   React6.useEffect(() => {
     void refresh();
-  }, [refresh]);
+  }, [appId, refresh]);
   const openMergeRequest = React6.useCallback(async (sourceAppId) => {
-    const mr = await mergeRequestsRepository.open({ sourceAppId });
-    await refresh();
-    return mr;
+    try {
+      const mr = await mergeRequestsRepository.open({ sourceAppId });
+      await refresh();
+      await trackOpenMergeRequest({
+        appId,
+        mergeRequestId: mr.id,
+        success: true
+      });
+      return mr;
+    } catch (error2) {
+      await trackOpenMergeRequest({
+        appId,
+        success: false,
+        error: error2
+      });
+      throw error2;
+    }
   }, [refresh]);
   const approve = React6.useCallback(async (mrId) => {
-    const mr = await mergeRequestsRepository.update(mrId, { status: "approved" });
-    await refresh();
-    const merged = await pollUntilMerged(mrId);
-    await refresh();
-    return merged ?? mr;
-  }, [pollUntilMerged, refresh]);
+    try {
+      const mr = await mergeRequestsRepository.update(mrId, { status: "approved" });
+      await refresh();
+      const merged = await pollUntilMerged(mrId);
+      await refresh();
+      await trackApproveMergeRequest({
+        appId,
+        mergeRequestId: mrId,
+        success: true
+      });
+      return merged ?? mr;
+    } catch (error2) {
+      await trackApproveMergeRequest({
+        appId,
+        mergeRequestId: mrId,
+        success: false,
+        error: error2
+      });
+      throw error2;
+    }
+  }, [appId, pollUntilMerged, refresh]);
   const reject = React6.useCallback(async (mrId) => {
-    const mr = await mergeRequestsRepository.update(mrId, { status: "rejected" });
-    await refresh();
-    return mr;
-  }, [refresh]);
+    try {
+      const mr = await mergeRequestsRepository.update(mrId, { status: "rejected" });
+      await refresh();
+      await trackRejectMergeRequest({
+        appId,
+        mergeRequestId: mrId,
+        success: true
+      });
+      return mr;
+    } catch (error2) {
+      await trackRejectMergeRequest({
+        appId,
+        mergeRequestId: mrId,
+        success: false,
+        error: error2
+      });
+      throw error2;
+    }
+  }, [appId, refresh]);
   const toSummary = React6.useCallback((mr) => {
     const stats = creatorStatsById[mr.createdBy];
     return {
@@ -1999,7 +2317,7 @@ function useMergeRequests(params) {
 
 // src/studio/hooks/useAttachmentUpload.ts
 import * as React7 from "react";
-import { Platform } from "react-native";
+import { Platform as Platform2 } from "react-native";
 import * as FileSystem2 from "expo-file-system/legacy";
 
 // src/data/attachment/remote.ts
@@ -2086,7 +2404,7 @@ function useAttachmentUpload() {
       const blobs = await Promise.all(
         dataUrls.map(async (dataUrl, idx) => {
           const normalized = dataUrl.startsWith("data:") ? dataUrl : `data:image/png;base64,${dataUrl}`;
-          const blob = Platform.OS === "android" ? await dataUrlToBlobAndroid(normalized) : await (await fetch(normalized)).blob();
+          const blob = Platform2.OS === "android" ? await dataUrlToBlobAndroid(normalized) : await (await fetch(normalized)).blob();
           const mimeType = getMimeTypeFromDataUrl(normalized);
           return { blob, idx, mimeType };
         })
@@ -2204,13 +2522,21 @@ function useStudioActions({
       if (sending) return;
       setSending(true);
       setError(null);
+      let forkSucceeded = false;
       try {
         let targetApp = app;
+        const sourceAppId = app.id;
         if (shouldForkOnEdit) {
           setForking(true);
-          const sourceAppId = app.id;
           const forked = await appsRepository.fork(app.id, {});
           targetApp = forked;
+          await trackRemixApp({
+            appId: forked.id,
+            sourceAppId,
+            threadId: forked.threadId ?? void 0,
+            success: true
+          });
+          forkSucceeded = true;
           onForkedApp == null ? void 0 : onForkedApp(forked.id, { keepRenderingAppId: sourceAppId });
         }
         setForking(false);
@@ -2238,9 +2564,33 @@ function useStudioActions({
           queueItemId: editResult.queueItemId ?? null,
           queuePosition: editResult.queuePosition ?? null
         });
+        await trackEditApp({
+          appId: targetApp.id,
+          threadId,
+          promptLength: prompt.trim().length,
+          success: true
+        });
       } catch (e) {
         const err = e instanceof Error ? e : new Error(String(e));
         setError(err);
+        if (shouldForkOnEdit && !forkSucceeded && (app == null ? void 0 : app.id)) {
+          await trackRemixApp({
+            appId: app.id,
+            sourceAppId: app.id,
+            threadId: app.threadId ?? void 0,
+            success: false,
+            error: err
+          });
+        }
+        if ((app == null ? void 0 : app.id) && app.threadId) {
+          await trackEditApp({
+            appId: app.id,
+            threadId: app.threadId,
+            promptLength: prompt.trim().length,
+            success: false,
+            error: err
+          });
+        }
         throw err;
       } finally {
         setForking(false);
@@ -2261,6 +2611,7 @@ import { jsx as jsx3 } from "react/jsx-runtime";
 function RuntimeRenderer({
   appKey,
   bundlePath,
+  preparingText,
   forcePreparing,
   renderToken,
   style,
@@ -2276,7 +2627,7 @@ function RuntimeRenderer({
     if (!hasRenderedOnce && !forcePreparing && !allowInitialPreparing) {
       return /* @__PURE__ */ jsx3(View2, { style: [{ flex: 1 }, style] });
     }
-    return /* @__PURE__ */ jsx3(View2, { style: [{ flex: 1, justifyContent: "center", alignItems: "center", padding: 24 }, style], children: /* @__PURE__ */ jsx3(Text, { variant: "bodyMuted", children: "Preparing app\u2026" }) });
+    return /* @__PURE__ */ jsx3(View2, { style: [{ flex: 1, justifyContent: "center", alignItems: "center", padding: 24 }, style], children: /* @__PURE__ */ jsx3(Text, { variant: "bodyMuted", children: preparingText ?? "Preparing app\u2026" }) });
   }
   return /* @__PURE__ */ jsx3(View2, { style: [{ flex: 1 }, style], children: /* @__PURE__ */ jsx3(
     ComergeRuntimeRenderer,
@@ -2290,8 +2641,8 @@ function RuntimeRenderer({
 }
 
 // src/studio/ui/StudioOverlay.tsx
-import * as React44 from "react";
-import { Keyboard as Keyboard5, Platform as Platform10, View as View45, useWindowDimensions as useWindowDimensions4 } from "react-native";
+import * as React45 from "react";
+import { Keyboard as Keyboard5, Platform as Platform11, View as View47, useWindowDimensions as useWindowDimensions4 } from "react-native";
 
 // src/components/studio-sheet/StudioBottomSheet.tsx
 import * as React12 from "react";
@@ -2302,7 +2653,7 @@ import {
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 
 // src/components/studio-sheet/StudioSheetBackground.tsx
-import { Platform as Platform3, View as View3 } from "react-native";
+import { Platform as Platform4, View as View3 } from "react-native";
 import { isLiquidGlassSupported } from "@callstack/liquid-glass";
 
 // src/components/utils/ResettableLiquidGlassView.tsx
@@ -2311,7 +2662,7 @@ import { LiquidGlassView } from "@callstack/liquid-glass";
 
 // src/components/utils/liquidGlassReset.tsx
 import * as React10 from "react";
-import { AppState as AppState2, Platform as Platform2 } from "react-native";
+import { AppState as AppState2, Platform as Platform3 } from "react-native";
 import { jsx as jsx4 } from "react/jsx-runtime";
 var LiquidGlassResetContext = React10.createContext(0);
 function LiquidGlassResetProvider({
@@ -2320,7 +2671,7 @@ function LiquidGlassResetProvider({
 }) {
   const [token, setToken] = React10.useState(0);
   React10.useEffect(() => {
-    if (Platform2.OS !== "ios") return;
+    if (Platform3.OS !== "ios") return;
     const onChange = (state) => {
       if (state === "active") setToken((t) => t + 1);
     };
@@ -2361,7 +2712,7 @@ function StudioSheetBackground({
   renderBackground
 }) {
   const theme = useTheme();
-  const radius = Platform3.OS === "ios" ? 39 : 16;
+  const radius = Platform4.OS === "ios" ? 39 : 16;
   const fallbackBgColor = theme.scheme === "dark" ? "rgba(11, 8, 15, 0.85)" : "rgba(255, 255, 255, 0.85)";
   const secondaryBgBaseColor = theme.scheme === "dark" ? "rgb(24, 24, 27)" : "rgb(173, 173, 173)";
   const containerStyle = {
@@ -3421,7 +3772,7 @@ var styles3 = StyleSheet3.create({
 
 // src/components/comments/AppCommentsSheet.tsx
 import * as React24 from "react";
-import { ActivityIndicator as ActivityIndicator3, Keyboard as Keyboard3, Platform as Platform5, Pressable as Pressable5, View as View14 } from "react-native";
+import { ActivityIndicator as ActivityIndicator3, Keyboard as Keyboard3, Platform as Platform6, Pressable as Pressable5, View as View14 } from "react-native";
 import {
   BottomSheetBackdrop,
   BottomSheetModal as BottomSheetModal2,
@@ -3971,7 +4322,18 @@ function useAppComments(appId) {
       try {
         const newComment = await appCommentsRepository.create(appId, { body: trimmed, commentType: "general" });
         setComments((prev) => sortByCreatedAtAsc([...prev, newComment]));
+        await trackSubmitComment({
+          appId,
+          commentLength: trimmed.length,
+          success: true
+        });
       } catch (e) {
+        await trackSubmitComment({
+          appId,
+          commentLength: trimmed.length,
+          success: false,
+          error: e
+        });
         setError(e instanceof Error ? e : new Error(String(e)));
         throw e;
       } finally {
@@ -4014,11 +4376,11 @@ function useAppDetails(appId) {
 
 // src/components/comments/useIosKeyboardSnapFix.ts
 import * as React23 from "react";
-import { Keyboard as Keyboard2, Platform as Platform4 } from "react-native";
+import { Keyboard as Keyboard2, Platform as Platform5 } from "react-native";
 function useIosKeyboardSnapFix(sheetRef, options) {
   const [keyboardVisible, setKeyboardVisible] = React23.useState(false);
   React23.useEffect(() => {
-    if (Platform4.OS !== "ios") return;
+    if (Platform5.OS !== "ios") return;
     const show = Keyboard2.addListener("keyboardWillShow", () => setKeyboardVisible(true));
     const hide = Keyboard2.addListener("keyboardWillHide", () => {
       var _a;
@@ -4096,8 +4458,8 @@ function AppCommentsSheet({ appId, onClose, onCountChange, onPlayApp }) {
       onChange: handleChange,
       backgroundStyle: {
         backgroundColor: theme.scheme === "dark" ? "#0B080F" : "#FFFFFF",
-        borderTopLeftRadius: Platform5.OS === "ios" ? 39 : 16,
-        borderTopRightRadius: Platform5.OS === "ios" ? 39 : 16
+        borderTopLeftRadius: Platform6.OS === "ios" ? 39 : 16,
+        borderTopRightRadius: Platform6.OS === "ios" ? 39 : 16
       },
       handleIndicatorStyle: { backgroundColor: theme.colors.handleIndicator },
       keyboardBehavior: "interactive",
@@ -4203,7 +4565,7 @@ function AppCommentsSheet({ appId, onClose, onCountChange, onPlayApp }) {
               bottom: 0,
               paddingHorizontal: theme.spacing.lg,
               paddingTop: theme.spacing.sm,
-              paddingBottom: Platform5.OS === "ios" ? keyboardVisible ? theme.spacing.lg : insets.bottom : insets.bottom + 10,
+              paddingBottom: Platform6.OS === "ios" ? keyboardVisible ? theme.spacing.lg : insets.bottom : insets.bottom + 10,
               borderTopWidth: 1,
               borderTopColor: withAlpha(theme.colors.border, 0.1),
               backgroundColor: withAlpha(theme.colors.background, 0.8)
@@ -4230,7 +4592,7 @@ function AppCommentsSheet({ appId, onClose, onCountChange, onPlayApp }) {
 
 // src/studio/ui/PreviewPanel.tsx
 import * as React35 from "react";
-import { ActivityIndicator as ActivityIndicator7, Platform as Platform7, Share, View as View33 } from "react-native";
+import { ActivityIndicator as ActivityIndicator7, Platform as Platform8, Share, View as View33 } from "react-native";
 
 // src/components/preview/PreviewPage.tsx
 import { View as View15 } from "react-native";
@@ -5121,7 +5483,7 @@ import { Animated as Animated7, Pressable as Pressable10, View as View28 } from
 import { Ban, Check as Check3, CheckCheck, ChevronDown as ChevronDown2 } from "lucide-react-native";
 
 // src/components/primitives/MarkdownText.tsx
-import { Dimensions as Dimensions2, Keyboard as Keyboard4, Modal, Platform as Platform6, Pressable as Pressable9, Text as Text3, View as View27 } from "react-native";
+import { Dimensions as Dimensions2, Keyboard as Keyboard4, Modal, Platform as Platform7, Pressable as Pressable9, Text as Text3, View as View27 } from "react-native";
 import Markdown from "react-native-markdown-display";
 import { useEffect as useEffect22, useRef as useRef15, useState as useState21 } from "react";
 import { jsx as jsx39, jsxs as jsxs22 } from "react/jsx-runtime";
@@ -5209,7 +5571,7 @@ function MarkdownText({ markdown, variant = "chat", bodyColor, style }) {
             paddingHorizontal: variant === "mergeRequest" ? 6 : 4,
             paddingVertical: variant === "mergeRequest" ? 2 : 0,
             borderRadius: variant === "mergeRequest" ? 6 : 4,
-            fontFamily: Platform6.OS === "ios" ? "Menlo" : "monospace",
+            fontFamily: Platform7.OS === "ios" ? "Menlo" : "monospace",
             fontSize: 13
           },
           code_block: {
@@ -6051,7 +6413,8 @@ function useAppStats({
   initialComments = 0,
   initialForks = 0,
   initialIsLiked = false,
-  onOpenComments
+  onOpenComments,
+  interactionSource = "unknown"
 }) {
   const [likeCount, setLikeCount] = React33.useState(initialLikes);
   const [commentCount, setCommentCount] = React33.useState(initialComments);
@@ -6095,23 +6458,31 @@ function useAppStats({
       if (newIsLiked) {
         const res = await appLikesRepository.create(appId, {});
         if (typeof ((_a = res.stats) == null ? void 0 : _a.total) === "number") setLikeCount(Math.max(0, res.stats.total));
+        await trackLikeApp({ appId, source: interactionSource, success: true });
       } else {
         const res = await appLikesRepository.removeMine(appId);
         if (typeof ((_b = res.stats) == null ? void 0 : _b.total) === "number") setLikeCount(Math.max(0, res.stats.total));
+        await trackUnlikeApp({ appId, source: interactionSource, success: true });
       }
     } catch (e) {
       setIsLiked(!newIsLiked);
       setLikeCount((prev) => Math.max(0, prev + (newIsLiked ? -1 : 1)));
+      if (newIsLiked) {
+        await trackLikeApp({ appId, source: interactionSource, success: false, error: e });
+      } else {
+        await trackUnlikeApp({ appId, source: interactionSource, success: false, error: e });
+      }
     }
-  }, [appId, isLiked, likeCount]);
+  }, [appId, interactionSource, isLiked, likeCount]);
   const handleOpenComments = React33.useCallback(() => {
     if (!appId) return;
     try {
       void Haptics2.impactAsync(Haptics2.ImpactFeedbackStyle.Light);
     } catch {
     }
+    void trackOpenComments({ appId, source: interactionSource });
     onOpenComments == null ? void 0 : onOpenComments();
-  }, [appId, onOpenComments]);
+  }, [appId, interactionSource, onOpenComments]);
   return { likeCount, commentCount, forkCount, isLiked, setCommentCount, handleLike, handleOpenComments };
 }
 
@@ -6194,7 +6565,8 @@ function usePreviewPanelData(params) {
     initialForks: insights.forks,
     initialComments: commentCountOverride ?? insights.comments,
     initialIsLiked: Boolean(app == null ? void 0 : app.isLiked),
-    onOpenComments
+    onOpenComments,
+    interactionSource: "preview_panel"
   });
   const canSubmitMergeRequest = React34.useMemo(() => {
     if (!isOwner) return false;
@@ -6260,7 +6632,7 @@ ${shareUrl}` : `Check out this app on Remix
 ${shareUrl}`;
     try {
       const title = app.name ?? "Remix app";
-      const payload = Platform7.OS === "ios" ? {
+      const payload = Platform8.OS === "ios" ? {
         title,
         message
       } : {
@@ -6269,8 +6641,17 @@ ${shareUrl}`;
         url: shareUrl
       };
       await Share.share(payload);
+      await trackShareApp({
+        appId: app.id,
+        success: true
+      });
     } catch (error) {
       log.warn("PreviewPanel share failed", error);
+      await trackShareApp({
+        appId: app.id,
+        success: false,
+        error
+      });
     }
   }, [app]);
   const {
@@ -6364,20 +6745,21 @@ ${shareUrl}`;
 }
 
 // src/studio/ui/ChatPanel.tsx
-import * as React41 from "react";
-import { ActivityIndicator as ActivityIndicator9, View as View42 } from "react-native";
+import * as React42 from "react";
+import { ActivityIndicator as ActivityIndicator9, View as View44 } from "react-native";
 
 // src/components/chat/ChatPage.tsx
-import * as React38 from "react";
-import { Platform as Platform9, View as View37 } from "react-native";
+import * as React39 from "react";
+import { Platform as Platform10, View as View37 } from "react-native";
 import { useSafeAreaInsets as useSafeAreaInsets4 } from "react-native-safe-area-context";
 
 // src/components/chat/ChatMessageList.tsx
-import * as React37 from "react";
+import * as React38 from "react";
 import { View as View36 } from "react-native";
 import { BottomSheetFlatList } from "@gorhom/bottom-sheet";
 
 // src/components/chat/ChatMessageBubble.tsx
+import * as React36 from "react";
 import { View as View34 } from "react-native";
 import { CheckCheck as CheckCheck2, GitMerge as GitMerge2, RotateCcw } from "lucide-react-native";
 
@@ -6448,7 +6830,19 @@ function Button({
 
 // src/components/chat/ChatMessageBubble.tsx
 import { jsx as jsx47, jsxs as jsxs28 } from "react/jsx-runtime";
-function ChatMessageBubble({ message, renderContent, isLast, retrying, onRetry, style }) {
+function areMessageMetaEqual(a, b) {
+  if (a === b) return true;
+  if (!a || !b) return a === b;
+  return a.kind === b.kind && a.event === b.event && a.status === b.status && a.mergeRequestId === b.mergeRequestId && a.sourceAppId === b.sourceAppId && a.targetAppId === b.targetAppId && a.appId === b.appId && a.threadId === b.threadId;
+}
+function ChatMessageBubbleInner({
+  message,
+  renderContent,
+  isLast,
+  retrying,
+  onRetryMessage,
+  style
+}) {
   var _a, _b;
   const theme = useTheme();
   const metaEvent = ((_a = message.meta) == null ? void 0 : _a.event) ?? null;
@@ -6463,8 +6857,11 @@ function ChatMessageBubble({ message, renderContent, isLast, retrying, onRetry,
   const bubbleVariant = isHuman ? "surface" : "surfaceRaised";
   const cornerStyle = isHuman ? { borderTopRightRadius: 0 } : { borderTopLeftRadius: 0 };
   const bodyColor = metaStatus === "success" ? theme.colors.success : metaStatus === "error" ? theme.colors.danger : void 0;
-  const showRetry = Boolean(onRetry) && isLast && metaStatus === "error" && message.author === "human";
+  const showRetry = Boolean(onRetryMessage) && isLast && metaStatus === "error" && message.author === "human";
   const retryLabel = retrying ? "Retrying..." : "Retry";
+  const handleRetryPress = React36.useCallback(() => {
+    onRetryMessage == null ? void 0 : onRetryMessage(message.id);
+  }, [message.id, onRetryMessage]);
   return /* @__PURE__ */ jsxs28(View34, { style: [align, style], children: [
     /* @__PURE__ */ jsx47(
       Surface,
@@ -6493,7 +6890,7 @@ function ChatMessageBubble({ message, renderContent, isLast, retrying, onRetry,
       {
         variant: "ghost",
         size: "sm",
-        onPress: onRetry,
+        onPress: handleRetryPress,
         disabled: retrying,
         style: { borderColor: theme.colors.danger },
         accessibilityLabel: "Retry send",
@@ -6514,19 +6911,24 @@ function ChatMessageBubble({ message, renderContent, isLast, retrying, onRetry,
     ) }) : null
   ] });
 }
+function areEqual(prev, next) {
+  return prev.message.id === next.message.id && prev.message.author === next.message.author && prev.message.content === next.message.content && prev.message.kind === next.message.kind && String(prev.message.createdAt) === String(next.message.createdAt) && areMessageMetaEqual(prev.message.meta, next.message.meta) && prev.renderContent === next.renderContent && prev.isLast === next.isLast && prev.retrying === next.retrying && prev.onRetryMessage === next.onRetryMessage && prev.style === next.style;
+}
+var ChatMessageBubble = React36.memo(ChatMessageBubbleInner, areEqual);
+ChatMessageBubble.displayName = "ChatMessageBubble";
 
 // src/components/chat/TypingIndicator.tsx
-import * as React36 from "react";
+import * as React37 from "react";
 import { Animated as Animated10, View as View35 } from "react-native";
 import { jsx as jsx48 } from "react/jsx-runtime";
 function TypingIndicator({ style }) {
   const theme = useTheme();
   const dotColor = theme.colors.textSubtle;
-  const anims = React36.useMemo(
+  const anims = React37.useMemo(
     () => [new Animated10.Value(0.3), new Animated10.Value(0.3), new Animated10.Value(0.3)],
     []
   );
-  React36.useEffect(() => {
+  React37.useEffect(() => {
     const loops = [];
     anims.forEach((a, idx) => {
       const seq = Animated10.sequence([
@@ -6560,7 +6962,7 @@ function TypingIndicator({ style }) {
 
 // src/components/chat/ChatMessageList.tsx
 import { jsx as jsx49, jsxs as jsxs29 } from "react/jsx-runtime";
-var ChatMessageList = React37.forwardRef(
+var ChatMessageList = React38.forwardRef(
   ({
     messages,
     showTypingIndicator = false,
@@ -6573,21 +6975,22 @@ var ChatMessageList = React37.forwardRef(
     nearBottomThreshold = 200
   }, ref) => {
     const theme = useTheme();
-    const listRef = React37.useRef(null);
-    const nearBottomRef = React37.useRef(true);
-    const initialScrollDoneRef = React37.useRef(false);
-    const lastMessageIdRef = React37.useRef(null);
-    const data = React37.useMemo(() => {
+    const listRef = React38.useRef(null);
+    const nearBottomRef = React38.useRef(true);
+    const initialScrollDoneRef = React38.useRef(false);
+    const lastMessageIdRef = React38.useRef(null);
+    const data = React38.useMemo(() => {
       return [...messages].reverse();
     }, [messages]);
     const lastMessageId = messages.length > 0 ? messages[messages.length - 1].id : null;
-    const scrollToBottom = React37.useCallback((options) => {
+    const keyExtractor = React38.useCallback((m) => m.id, []);
+    const scrollToBottom = React38.useCallback((options) => {
       var _a;
       const animated = (options == null ? void 0 : options.animated) ?? true;
       (_a = listRef.current) == null ? void 0 : _a.scrollToOffset({ offset: 0, animated });
     }, []);
-    React37.useImperativeHandle(ref, () => ({ scrollToBottom }), [scrollToBottom]);
-    const handleScroll = React37.useCallback(
+    React38.useImperativeHandle(ref, () => ({ scrollToBottom }), [scrollToBottom]);
+    const handleScroll = React38.useCallback(
       (e) => {
         const { contentOffset, contentSize, layoutMeasurement } = e.nativeEvent;
         const distanceFromBottom = Math.max(contentOffset.y - Math.max(bottomInset, 0), 0);
@@ -6599,7 +7002,7 @@ var ChatMessageList = React37.forwardRef(
       },
       [bottomInset, nearBottomThreshold, onNearBottomChange]
     );
-    React37.useEffect(() => {
+    React38.useEffect(() => {
       if (!initialScrollDoneRef.current) return;
       const lastId = messages.length > 0 ? messages[messages.length - 1].id : null;
       const prevLastId = lastMessageIdRef.current;
@@ -6609,54 +7012,68 @@ var ChatMessageList = React37.forwardRef(
       const id = requestAnimationFrame(() => scrollToBottom({ animated: true }));
       return () => cancelAnimationFrame(id);
     }, [messages, scrollToBottom]);
-    React37.useEffect(() => {
+    React38.useEffect(() => {
       if (showTypingIndicator && nearBottomRef.current) {
         const id = requestAnimationFrame(() => scrollToBottom({ animated: true }));
         return () => cancelAnimationFrame(id);
       }
       return void 0;
     }, [showTypingIndicator, scrollToBottom]);
+    const handleContentSizeChange = React38.useCallback(() => {
+      if (initialScrollDoneRef.current) return;
+      initialScrollDoneRef.current = true;
+      lastMessageIdRef.current = messages.length > 0 ? messages[messages.length - 1].id : null;
+      nearBottomRef.current = true;
+      onNearBottomChange == null ? void 0 : onNearBottomChange(true);
+      requestAnimationFrame(() => scrollToBottom({ animated: false }));
+    }, [messages, onNearBottomChange, scrollToBottom]);
+    const contentContainerStyle = React38.useMemo(
+      () => [
+        {
+          paddingHorizontal: theme.spacing.lg,
+          paddingVertical: theme.spacing.sm
+        },
+        contentStyle
+      ],
+      [contentStyle, theme.spacing.lg, theme.spacing.sm]
+    );
+    const renderSeparator = React38.useCallback(() => /* @__PURE__ */ jsx49(View36, { style: { height: theme.spacing.sm } }), [theme.spacing.sm]);
+    const listHeader = React38.useMemo(
+      () => /* @__PURE__ */ jsxs29(View36, { children: [
+        showTypingIndicator ? /* @__PURE__ */ jsx49(View36, { style: { marginTop: theme.spacing.sm, alignSelf: "flex-start", paddingHorizontal: theme.spacing.lg }, children: /* @__PURE__ */ jsx49(TypingIndicator, {}) }) : null,
+        bottomInset > 0 ? /* @__PURE__ */ jsx49(View36, { style: { height: bottomInset } }) : null
+      ] }),
+      [bottomInset, showTypingIndicator, theme.spacing.lg, theme.spacing.sm]
+    );
+    const renderItem = React38.useCallback(
+      ({ item }) => /* @__PURE__ */ jsx49(
+        ChatMessageBubble,
+        {
+          message: item,
+          renderContent: renderMessageContent,
+          isLast: Boolean(lastMessageId && item.id === lastMessageId),
+          retrying: (isRetryingMessage == null ? void 0 : isRetryingMessage(item.id)) ?? false,
+          onRetryMessage
+        }
+      ),
+      [isRetryingMessage, lastMessageId, onRetryMessage, renderMessageContent]
+    );
     return /* @__PURE__ */ jsx49(
       BottomSheetFlatList,
       {
         ref: listRef,
         inverted: true,
         data,
-        keyExtractor: (m) => m.id,
+        keyExtractor,
         keyboardShouldPersistTaps: "handled",
         onScroll: handleScroll,
         scrollEventThrottle: 16,
         showsVerticalScrollIndicator: false,
-        onContentSizeChange: () => {
-          if (initialScrollDoneRef.current) return;
-          initialScrollDoneRef.current = true;
-          lastMessageIdRef.current = messages.length > 0 ? messages[messages.length - 1].id : null;
-          nearBottomRef.current = true;
-          onNearBottomChange == null ? void 0 : onNearBottomChange(true);
-          requestAnimationFrame(() => scrollToBottom({ animated: false }));
-        },
-        contentContainerStyle: [
-          {
-            paddingHorizontal: theme.spacing.lg,
-            paddingVertical: theme.spacing.sm
-          },
-          contentStyle
-        ],
-        ItemSeparatorComponent: () => /* @__PURE__ */ jsx49(View36, { style: { height: theme.spacing.sm } }),
-        renderItem: ({ item }) => /* @__PURE__ */ jsx49(
-          ChatMessageBubble,
-          {
-            message: item,
-            renderContent: renderMessageContent,
-            isLast: Boolean(lastMessageId && item.id === lastMessageId),
-            retrying: (isRetryingMessage == null ? void 0 : isRetryingMessage(item.id)) ?? false,
-            onRetry: onRetryMessage ? () => onRetryMessage(item.id) : void 0
-          }
-        ),
-        ListHeaderComponent: /* @__PURE__ */ jsxs29(View36, { children: [
-          showTypingIndicator ? /* @__PURE__ */ jsx49(View36, { style: { marginTop: theme.spacing.sm, alignSelf: "flex-start", paddingHorizontal: theme.spacing.lg }, children: /* @__PURE__ */ jsx49(TypingIndicator, {}) }) : null,
-          bottomInset > 0 ? /* @__PURE__ */ jsx49(View36, { style: { height: bottomInset } }) : null
-        ] })
+        onContentSizeChange: handleContentSizeChange,
+        contentContainerStyle,
+        ItemSeparatorComponent: renderSeparator,
+        renderItem,
+        ListHeaderComponent: listHeader
       }
     );
   }
@@ -6683,22 +7100,22 @@ function ChatPage({
 }) {
   const theme = useTheme();
   const insets = useSafeAreaInsets4();
-  const [composerHeight, setComposerHeight] = React38.useState(0);
-  const [composerTopHeight, setComposerTopHeight] = React38.useState(0);
-  const footerBottomPadding = Platform9.OS === "ios" ? insets.bottom - 24 : insets.bottom + 10;
+  const [composerHeight, setComposerHeight] = React39.useState(0);
+  const [composerTopHeight, setComposerTopHeight] = React39.useState(0);
+  const footerBottomPadding = Platform10.OS === "ios" ? insets.bottom - 24 : insets.bottom + 10;
   const totalComposerHeight = composerHeight + composerTopHeight;
   const overlayBottom = totalComposerHeight + footerBottomPadding + theme.spacing.lg;
   const bottomInset = totalComposerHeight + footerBottomPadding + theme.spacing.xl;
-  const resolvedOverlay = React38.useMemo(() => {
+  const resolvedOverlay = React39.useMemo(() => {
     var _a;
     if (!overlay) return null;
-    if (!React38.isValidElement(overlay)) return overlay;
+    if (!React39.isValidElement(overlay)) return overlay;
     const prevStyle = (_a = overlay.props) == null ? void 0 : _a.style;
-    return React38.cloneElement(overlay, {
+    return React39.cloneElement(overlay, {
       style: [prevStyle, { bottom: overlayBottom }]
     });
   }, [overlay, overlayBottom]);
-  React38.useEffect(() => {
+  React39.useEffect(() => {
     if (composerTop) return;
     setComposerTopHeight(0);
   }, [composerTop]);
@@ -6765,15 +7182,15 @@ function ChatPage({
 }
 
 // src/components/chat/ScrollToBottomButton.tsx
-import * as React39 from "react";
+import * as React40 from "react";
 import { Pressable as Pressable14, View as View38 } from "react-native";
 import Animated11, { Easing as Easing2, useAnimatedStyle as useAnimatedStyle2, useSharedValue as useSharedValue2, withTiming as withTiming2 } from "react-native-reanimated";
 import { jsx as jsx51 } from "react/jsx-runtime";
 function ScrollToBottomButton({ visible, onPress, children, style }) {
   const theme = useTheme();
   const progress = useSharedValue2(visible ? 1 : 0);
-  const [pressed, setPressed] = React39.useState(false);
-  React39.useEffect(() => {
+  const [pressed, setPressed] = React40.useState(false);
+  React40.useEffect(() => {
     progress.value = withTiming2(visible ? 1 : 0, { duration: 200, easing: Easing2.out(Easing2.ease) });
   }, [progress, visible]);
   const animStyle = useAnimatedStyle2(() => ({
@@ -6908,16 +7325,16 @@ function ForkNoticeBanner({ isOwner = true, title, description, style }) {
 }
 
 // src/components/chat/ChatQueue.tsx
-import * as React40 from "react";
+import * as React41 from "react";
 import { ActivityIndicator as ActivityIndicator8, Pressable as Pressable15, View as View41 } from "react-native";
 import { jsx as jsx54, jsxs as jsxs32 } from "react/jsx-runtime";
 function ChatQueue({ items, onRemove }) {
   const theme = useTheme();
-  const [expanded, setExpanded] = React40.useState({});
-  const [canExpand, setCanExpand] = React40.useState({});
-  const [collapsedText, setCollapsedText] = React40.useState({});
-  const [removing, setRemoving] = React40.useState({});
-  const buildCollapsedText = React40.useCallback((lines) => {
+  const [expanded, setExpanded] = React41.useState({});
+  const [canExpand, setCanExpand] = React41.useState({});
+  const [collapsedText, setCollapsedText] = React41.useState({});
+  const [removing, setRemoving] = React41.useState({});
+  const buildCollapsedText = React41.useCallback((lines) => {
     var _a, _b;
     const line1 = ((_a = lines[0]) == null ? void 0 : _a.text) ?? "";
     const line2 = ((_b = lines[1]) == null ? void 0 : _b.text) ?? "";
@@ -6933,7 +7350,7 @@ function ChatQueue({ items, onRemove }) {
     return `${line1}
 ${trimmedLine2}\u2026 `;
   }, []);
-  React40.useEffect(() => {
+  React41.useEffect(() => {
     if (items.length === 0) return;
     const ids = new Set(items.map((item) => item.id));
     setExpanded((prev) => Object.fromEntries(Object.entries(prev).filter(([id]) => ids.has(id))));
@@ -7053,8 +7470,137 @@ ${trimmedLine2}\u2026 `;
   );
 }
 
-// src/studio/ui/ChatPanel.tsx
+// src/components/chat/AgentProgressCard.tsx
+import { View as View42 } from "react-native";
 import { jsx as jsx55, jsxs as jsxs33 } from "react/jsx-runtime";
+function titleForPhase(phase) {
+  if (phase === "planning") return "Planning";
+  if (phase === "reasoning") return "Reasoning";
+  if (phase === "analyzing") return "Analyzing";
+  if (phase === "editing") return "Editing";
+  if (phase === "executing") return "Executing";
+  if (phase === "validating") return "Validating";
+  if (phase === "finalizing") return "Finalizing";
+  if (phase === "working") return "Working";
+  return "Working";
+}
+function titleForStatus(status) {
+  if (status === "succeeded") return "Completed";
+  if (status === "failed") return "Failed";
+  if (status === "cancelled") return "Cancelled";
+  return "In Progress";
+}
+function AgentProgressCard({ progress }) {
+  const theme = useTheme();
+  const statusLabel = titleForStatus(progress.status);
+  const phaseLabel = titleForPhase(progress.phase);
+  const subtitle = progress.latestMessage || `Agent is ${phaseLabel.toLowerCase()}...`;
+  const todo = progress.todoSummary;
+  return /* @__PURE__ */ jsxs33(
+    View42,
+    {
+      style: {
+        borderWidth: 1,
+        borderColor: theme.colors.border,
+        borderRadius: theme.radii.lg,
+        marginHorizontal: theme.spacing.md,
+        padding: theme.spacing.md,
+        backgroundColor: withAlpha(theme.colors.surface, theme.scheme === "dark" ? 0.84 : 0.94)
+      },
+      children: [
+        /* @__PURE__ */ jsxs33(View42, { style: { flexDirection: "row", alignItems: "center", justifyContent: "space-between", marginBottom: 4 }, children: [
+          /* @__PURE__ */ jsx55(Text, { variant: "caption", children: statusLabel }),
+          /* @__PURE__ */ jsx55(Text, { variant: "captionMuted", children: phaseLabel })
+        ] }),
+        /* @__PURE__ */ jsx55(Text, { variant: "bodyMuted", children: subtitle }),
+        progress.changedFilesCount > 0 ? /* @__PURE__ */ jsxs33(Text, { variant: "captionMuted", style: { marginTop: 8 }, children: [
+          "Updated files: ",
+          progress.changedFilesCount
+        ] }) : null,
+        progress.recentFiles.length > 0 ? /* @__PURE__ */ jsx55(View42, { style: { marginTop: 6 }, children: progress.recentFiles.map((path) => /* @__PURE__ */ jsxs33(Text, { variant: "captionMuted", numberOfLines: 1, children: [
+          "\u2022 ",
+          path
+        ] }, path)) }) : null,
+        todo ? /* @__PURE__ */ jsxs33(Text, { variant: "captionMuted", style: { marginTop: 8 }, children: [
+          "Todos: ",
+          todo.completed,
+          "/",
+          todo.total,
+          " complete",
+          todo.currentTask ? ` \u2022 ${todo.currentTask}` : ""
+        ] }) : null
+      ]
+    }
+  );
+}
+
+// src/components/chat/BundleProgressCard.tsx
+import { View as View43 } from "react-native";
+import { jsx as jsx56, jsxs as jsxs34 } from "react/jsx-runtime";
+function titleForStatus2(status) {
+  if (status === "succeeded") return "Completed";
+  if (status === "failed") return "Failed";
+  return "In Progress";
+}
+function BundleProgressCard({ progress }) {
+  const theme = useTheme();
+  const statusLabel = titleForStatus2(progress.status);
+  const percent = Math.round(Math.max(0, Math.min(1, progress.progressValue)) * 100);
+  const fillColor = progress.status === "failed" ? theme.colors.danger : progress.status === "succeeded" ? theme.colors.success : theme.colors.warning;
+  const detail = progress.errorMessage || progress.phaseLabel;
+  return /* @__PURE__ */ jsxs34(
+    View43,
+    {
+      accessible: true,
+      accessibilityRole: "progressbar",
+      accessibilityLabel: `Bundle progress ${statusLabel}`,
+      accessibilityValue: { min: 0, max: 100, now: percent, text: `${percent}%` },
+      style: {
+        borderWidth: 1,
+        borderColor: theme.colors.border,
+        borderRadius: theme.radii.lg,
+        marginHorizontal: theme.spacing.md,
+        padding: theme.spacing.md,
+        backgroundColor: withAlpha(theme.colors.surface, theme.scheme === "dark" ? 0.84 : 0.94)
+      },
+      children: [
+        /* @__PURE__ */ jsxs34(View43, { style: { flexDirection: "row", alignItems: "center", justifyContent: "space-between", marginBottom: 8 }, children: [
+          /* @__PURE__ */ jsx56(Text, { variant: "caption", children: statusLabel }),
+          /* @__PURE__ */ jsxs34(Text, { variant: "captionMuted", children: [
+            percent,
+            "%"
+          ] })
+        ] }),
+        /* @__PURE__ */ jsx56(
+          View43,
+          {
+            style: {
+              width: "100%",
+              height: 8,
+              borderRadius: 999,
+              backgroundColor: withAlpha(theme.colors.border, theme.scheme === "dark" ? 0.5 : 0.6),
+              overflow: "hidden"
+            },
+            children: /* @__PURE__ */ jsx56(
+              View43,
+              {
+                style: {
+                  width: `${percent}%`,
+                  height: "100%",
+                  backgroundColor: fillColor
+                }
+              }
+            )
+          }
+        ),
+        /* @__PURE__ */ jsx56(Text, { variant: "captionMuted", numberOfLines: 1, style: { marginTop: 8, minHeight: 16 }, children: detail })
+      ]
+    }
+  );
+}
+
+// src/studio/ui/ChatPanel.tsx
+import { jsx as jsx57, jsxs as jsxs35 } from "react/jsx-runtime";
 function ChatPanel({
   title = "Chat",
   messages,
@@ -7075,11 +7621,13 @@ function ChatPanel({
   onRetryMessage,
   isRetryingMessage,
   queueItems = [],
-  onRemoveQueueItem
+  onRemoveQueueItem,
+  progress = null
 }) {
-  const listRef = React41.useRef(null);
-  const [nearBottom, setNearBottom] = React41.useState(true);
-  const handleSend = React41.useCallback(
+  const theme = useTheme();
+  const listRef = React42.useRef(null);
+  const [nearBottom, setNearBottom] = React42.useState(true);
+  const handleSend = React42.useCallback(
     async (text, composerAttachments) => {
       const all = composerAttachments ?? attachments;
       await onSend(text, all.length > 0 ? all : void 0);
@@ -7093,25 +7641,25 @@ function ChatPanel({
     },
     [attachments, nearBottom, onClearAttachments, onSend]
   );
-  const handleScrollToBottom = React41.useCallback(() => {
+  const handleScrollToBottom = React42.useCallback(() => {
     var _a;
     (_a = listRef.current) == null ? void 0 : _a.scrollToBottom({ animated: true });
   }, []);
-  const header = /* @__PURE__ */ jsx55(
+  const header = /* @__PURE__ */ jsx57(
     ChatHeader,
     {
-      left: /* @__PURE__ */ jsxs33(View42, { style: { flexDirection: "row", alignItems: "center" }, children: [
-        /* @__PURE__ */ jsx55(StudioSheetHeaderIconButton, { onPress: onBack, accessibilityLabel: "Back", style: { marginRight: 8 }, children: /* @__PURE__ */ jsx55(IconBack, { size: 20, colorToken: "floatingContent" }) }),
-        onNavigateHome ? /* @__PURE__ */ jsx55(StudioSheetHeaderIconButton, { onPress: onNavigateHome, accessibilityLabel: "Home", children: /* @__PURE__ */ jsx55(IconHome, { size: 20, colorToken: "floatingContent" }) }) : null
+      left: /* @__PURE__ */ jsxs35(View44, { style: { flexDirection: "row", alignItems: "center" }, children: [
+        /* @__PURE__ */ jsx57(StudioSheetHeaderIconButton, { onPress: onBack, accessibilityLabel: "Back", style: { marginRight: 8 }, children: /* @__PURE__ */ jsx57(IconBack, { size: 20, colorToken: "floatingContent" }) }),
+        onNavigateHome ? /* @__PURE__ */ jsx57(StudioSheetHeaderIconButton, { onPress: onNavigateHome, accessibilityLabel: "Home", children: /* @__PURE__ */ jsx57(IconHome, { size: 20, colorToken: "floatingContent" }) }) : null
       ] }),
-      right: /* @__PURE__ */ jsxs33(View42, { style: { flexDirection: "row", alignItems: "center" }, children: [
-        onStartDraw ? /* @__PURE__ */ jsx55(StudioSheetHeaderIconButton, { onPress: onStartDraw, accessibilityLabel: "Draw", intent: "danger", style: { marginRight: 8 }, children: /* @__PURE__ */ jsx55(IconDraw, { size: 20, colorToken: "onDanger" }) }) : null,
-        /* @__PURE__ */ jsx55(StudioSheetHeaderIconButton, { onPress: onClose, accessibilityLabel: "Close", children: /* @__PURE__ */ jsx55(IconClose, { size: 20, colorToken: "floatingContent" }) })
+      right: /* @__PURE__ */ jsxs35(View44, { style: { flexDirection: "row", alignItems: "center" }, children: [
+        onStartDraw ? /* @__PURE__ */ jsx57(StudioSheetHeaderIconButton, { onPress: onStartDraw, accessibilityLabel: "Draw", intent: "danger", style: { marginRight: 8 }, children: /* @__PURE__ */ jsx57(IconDraw, { size: 20, colorToken: "onDanger" }) }) : null,
+        /* @__PURE__ */ jsx57(StudioSheetHeaderIconButton, { onPress: onClose, accessibilityLabel: "Close", children: /* @__PURE__ */ jsx57(IconClose, { size: 20, colorToken: "floatingContent" }) })
       ] }),
       center: null
     }
   );
-  const topBanner = shouldForkOnEdit ? /* @__PURE__ */ jsx55(
+  const topBanner = shouldForkOnEdit ? /* @__PURE__ */ jsx57(
     ForkNoticeBanner,
     {
       isOwner: !shouldForkOnEdit,
@@ -7120,18 +7668,22 @@ function ChatPanel({
   ) : null;
   const showMessagesLoading = Boolean(loading) && messages.length === 0 || forking;
   if (showMessagesLoading) {
-    return /* @__PURE__ */ jsxs33(View42, { style: { flex: 1 }, children: [
-      /* @__PURE__ */ jsx55(View42, { children: header }),
-      topBanner ? /* @__PURE__ */ jsx55(View42, { style: { paddingHorizontal: 16, paddingTop: 8 }, children: topBanner }) : null,
-      /* @__PURE__ */ jsxs33(View42, { style: { flex: 1, alignItems: "center", justifyContent: "center", paddingHorizontal: 24, paddingVertical: 12 }, children: [
-        /* @__PURE__ */ jsx55(ActivityIndicator9, {}),
-        /* @__PURE__ */ jsx55(View42, { style: { height: 12 } }),
-        /* @__PURE__ */ jsx55(Text, { variant: "bodyMuted", children: forking ? "Creating your copy\u2026" : "Loading messages\u2026" })
+    return /* @__PURE__ */ jsxs35(View44, { style: { flex: 1 }, children: [
+      /* @__PURE__ */ jsx57(View44, { children: header }),
+      topBanner ? /* @__PURE__ */ jsx57(View44, { style: { paddingHorizontal: 16, paddingTop: 8 }, children: topBanner }) : null,
+      /* @__PURE__ */ jsxs35(View44, { style: { flex: 1, alignItems: "center", justifyContent: "center", paddingHorizontal: 24, paddingVertical: 12 }, children: [
+        /* @__PURE__ */ jsx57(ActivityIndicator9, {}),
+        /* @__PURE__ */ jsx57(View44, { style: { height: 12 } }),
+        /* @__PURE__ */ jsx57(Text, { variant: "bodyMuted", children: forking ? "Creating your copy\u2026" : "Loading messages\u2026" })
       ] })
     ] });
   }
-  const queueTop = queueItems.length > 0 ? /* @__PURE__ */ jsx55(ChatQueue, { items: queueItems, onRemove: onRemoveQueueItem }) : null;
-  return /* @__PURE__ */ jsx55(
+  const bundleProgress = (progress == null ? void 0 : progress.bundle) ?? null;
+  const queueTop = progress || queueItems.length > 0 ? /* @__PURE__ */ jsxs35(View44, { style: { gap: theme.spacing.sm }, children: [
+    progress ? bundleProgress ? /* @__PURE__ */ jsx57(BundleProgressCard, { progress: bundleProgress }) : /* @__PURE__ */ jsx57(AgentProgressCard, { progress }) : null,
+    queueItems.length > 0 ? /* @__PURE__ */ jsx57(ChatQueue, { items: queueItems, onRemove: onRemoveQueueItem }) : null
+  ] }) : null;
+  return /* @__PURE__ */ jsx57(
     ChatPage,
     {
       header,
@@ -7144,13 +7696,13 @@ function ChatPanel({
       composerHorizontalPadding: 0,
       listRef,
       onNearBottomChange: setNearBottom,
-      overlay: /* @__PURE__ */ jsx55(
+      overlay: /* @__PURE__ */ jsx57(
         ScrollToBottomButton,
         {
           visible: !nearBottom,
           onPress: handleScrollToBottom,
           style: { bottom: 80 },
-          children: /* @__PURE__ */ jsx55(IconArrowDown, { size: 20, colorToken: "floatingContent" })
+          children: /* @__PURE__ */ jsx57(IconArrowDown, { size: 20, colorToken: "floatingContent" })
         }
       ),
       composer: {
@@ -7170,16 +7722,16 @@ function ChatPanel({
 }
 
 // src/components/dialogs/ConfirmMergeRequestDialog.tsx
-import * as React42 from "react";
-import { Pressable as Pressable17, View as View44 } from "react-native";
+import * as React43 from "react";
+import { Pressable as Pressable17, View as View46 } from "react-native";
 
 // src/components/primitives/Modal.tsx
 import {
   Modal as RNModal,
   Pressable as Pressable16,
-  View as View43
+  View as View45
 } from "react-native";
-import { jsx as jsx56, jsxs as jsxs34 } from "react/jsx-runtime";
+import { jsx as jsx58, jsxs as jsxs36 } from "react/jsx-runtime";
 function Modal2({
   visible,
   onRequestClose,
@@ -7188,15 +7740,15 @@ function Modal2({
   contentStyle
 }) {
   const theme = useTheme();
-  return /* @__PURE__ */ jsx56(
+  return /* @__PURE__ */ jsx58(
     RNModal,
     {
       visible,
       transparent: true,
       animationType: "fade",
       onRequestClose,
-      children: /* @__PURE__ */ jsxs34(View43, { style: { flex: 1, backgroundColor: theme.colors.backdrop, justifyContent: "center", padding: theme.spacing.lg }, children: [
-        /* @__PURE__ */ jsx56(
+      children: /* @__PURE__ */ jsxs36(View45, { style: { flex: 1, backgroundColor: theme.colors.backdrop, justifyContent: "center", padding: theme.spacing.lg }, children: [
+        /* @__PURE__ */ jsx58(
           Pressable16,
           {
             accessibilityRole: "button",
@@ -7204,14 +7756,14 @@ function Modal2({
             style: { position: "absolute", inset: 0 }
           }
         ),
-        /* @__PURE__ */ jsx56(Card, { variant: "surfaceRaised", padded: true, style: [{ borderRadius: theme.radii.xl }, contentStyle], children })
+        /* @__PURE__ */ jsx58(Card, { variant: "surfaceRaised", padded: true, style: [{ borderRadius: theme.radii.xl }, contentStyle], children })
       ] })
     }
   );
 }
 
 // src/components/dialogs/ConfirmMergeRequestDialog.tsx
-import { jsx as jsx57, jsxs as jsxs35 } from "react/jsx-runtime";
+import { jsx as jsx59, jsxs as jsxs37 } from "react/jsx-runtime";
 function ConfirmMergeRequestDialog({
   visible,
   onOpenChange,
@@ -7222,14 +7774,14 @@ function ConfirmMergeRequestDialog({
   onTestFirst
 }) {
   const theme = useTheme();
-  const close = React42.useCallback(() => onOpenChange(false), [onOpenChange]);
+  const close = React43.useCallback(() => onOpenChange(false), [onOpenChange]);
   const canConfirm = Boolean(mergeRequest) && !approveDisabled;
-  const handleConfirm = React42.useCallback(() => {
+  const handleConfirm = React43.useCallback(() => {
     if (!mergeRequest) return;
     onOpenChange(false);
     void onConfirm();
   }, [mergeRequest, onConfirm, onOpenChange]);
-  const handleTestFirst = React42.useCallback(() => {
+  const handleTestFirst = React43.useCallback(() => {
     if (!mergeRequest) return;
     onOpenChange(false);
     void onTestFirst(mergeRequest);
@@ -7241,7 +7793,7 @@ function ConfirmMergeRequestDialog({
     justifyContent: "center",
     alignSelf: "stretch"
   };
-  return /* @__PURE__ */ jsxs35(
+  return /* @__PURE__ */ jsxs37(
     Modal2,
     {
       visible,
@@ -7252,7 +7804,7 @@ function ConfirmMergeRequestDialog({
         backgroundColor: theme.colors.background
       },
       children: [
-        /* @__PURE__ */ jsx57(View44, { children: /* @__PURE__ */ jsx57(
+        /* @__PURE__ */ jsx59(View46, { children: /* @__PURE__ */ jsx59(
           Text,
           {
             style: {
@@ -7264,9 +7816,9 @@ function ConfirmMergeRequestDialog({
             children: "Are you sure you want to approve this merge request?"
           }
         ) }),
-        /* @__PURE__ */ jsxs35(View44, { style: { marginTop: 16 }, children: [
-          /* @__PURE__ */ jsx57(
-            View44,
+        /* @__PURE__ */ jsxs37(View46, { style: { marginTop: 16 }, children: [
+          /* @__PURE__ */ jsx59(
+            View46,
             {
               style: [
                 fullWidthButtonBase,
@@ -7275,7 +7827,7 @@ function ConfirmMergeRequestDialog({
                   opacity: canConfirm ? 1 : 0.5
                 }
               ],
-              children: /* @__PURE__ */ jsx57(
+              children: /* @__PURE__ */ jsx59(
                 Pressable17,
                 {
                   accessibilityRole: "button",
@@ -7283,14 +7835,14 @@ function ConfirmMergeRequestDialog({
                   disabled: !canConfirm,
                   onPress: handleConfirm,
                   style: [fullWidthButtonBase, { flex: 1 }],
-                  children: /* @__PURE__ */ jsx57(Text, { style: { textAlign: "center", color: theme.colors.onPrimary }, children: "Approve Merge" })
+                  children: /* @__PURE__ */ jsx59(Text, { style: { textAlign: "center", color: theme.colors.onPrimary }, children: "Approve Merge" })
                 }
               )
             }
           ),
-          /* @__PURE__ */ jsx57(View44, { style: { height: 8 } }),
-          /* @__PURE__ */ jsx57(
-            View44,
+          /* @__PURE__ */ jsx59(View46, { style: { height: 8 } }),
+          /* @__PURE__ */ jsx59(
+            View46,
             {
               style: [
                 fullWidthButtonBase,
@@ -7301,7 +7853,7 @@ function ConfirmMergeRequestDialog({
                   opacity: isBuilding || !mergeRequest ? 0.5 : 1
                 }
               ],
-              children: /* @__PURE__ */ jsx57(
+              children: /* @__PURE__ */ jsx59(
                 Pressable17,
                 {
                   accessibilityRole: "button",
@@ -7309,14 +7861,14 @@ function ConfirmMergeRequestDialog({
                   disabled: isBuilding || !mergeRequest,
                   onPress: handleTestFirst,
                   style: [fullWidthButtonBase, { flex: 1 }],
-                  children: /* @__PURE__ */ jsx57(Text, { style: { textAlign: "center", color: theme.colors.text }, children: isBuilding ? "Preparing\u2026" : "Test edits first" })
+                  children: /* @__PURE__ */ jsx59(Text, { style: { textAlign: "center", color: theme.colors.text }, children: isBuilding ? "Preparing\u2026" : "Test edits first" })
                 }
               )
             }
           ),
-          /* @__PURE__ */ jsx57(View44, { style: { height: 8 } }),
-          /* @__PURE__ */ jsx57(
-            View44,
+          /* @__PURE__ */ jsx59(View46, { style: { height: 8 } }),
+          /* @__PURE__ */ jsx59(
+            View46,
             {
               style: [
                 fullWidthButtonBase,
@@ -7326,14 +7878,14 @@ function ConfirmMergeRequestDialog({
                   borderColor: theme.colors.border
                 }
               ],
-              children: /* @__PURE__ */ jsx57(
+              children: /* @__PURE__ */ jsx59(
                 Pressable17,
                 {
                   accessibilityRole: "button",
                   accessibilityLabel: "Cancel",
                   onPress: close,
                   style: [fullWidthButtonBase, { flex: 1 }],
-                  children: /* @__PURE__ */ jsx57(Text, { style: { textAlign: "center", color: theme.colors.text }, children: "Cancel" })
+                  children: /* @__PURE__ */ jsx59(Text, { style: { textAlign: "center", color: theme.colors.text }, children: "Cancel" })
                 }
               )
             }
@@ -7345,7 +7897,7 @@ function ConfirmMergeRequestDialog({
 }
 
 // src/studio/ui/ConfirmMergeFlow.tsx
-import { jsx as jsx58 } from "react/jsx-runtime";
+import { jsx as jsx60 } from "react/jsx-runtime";
 function ConfirmMergeFlow({
   visible,
   onOpenChange,
@@ -7356,7 +7908,7 @@ function ConfirmMergeFlow({
   onConfirm,
   onTestFirst
 }) {
-  return /* @__PURE__ */ jsx58(
+  return /* @__PURE__ */ jsx60(
     ConfirmMergeRequestDialog,
     {
       visible,
@@ -7378,7 +7930,7 @@ function ConfirmMergeFlow({
 }
 
 // src/studio/hooks/useOptimisticChatMessages.ts
-import * as React43 from "react";
+import * as React44 from "react";
 function makeOptimisticId() {
   return `optimistic:${Date.now().toString(36)}:${Math.random().toString(36).slice(2, 10)}`;
 }
@@ -7417,11 +7969,11 @@ function useOptimisticChatMessages({
   chatMessages,
   onSendChat
 }) {
-  const [optimisticChat, setOptimisticChat] = React43.useState([]);
-  React43.useEffect(() => {
+  const [optimisticChat, setOptimisticChat] = React44.useState([]);
+  React44.useEffect(() => {
     setOptimisticChat([]);
   }, [threadId]);
-  const messages = React43.useMemo(() => {
+  const messages = React44.useMemo(() => {
     if (!optimisticChat || optimisticChat.length === 0) return chatMessages;
     const unresolved = optimisticChat.filter((o) => !isOptimisticResolvedByServer(chatMessages, o));
     if (unresolved.length === 0) return chatMessages;
@@ -7437,7 +7989,7 @@ function useOptimisticChatMessages({
     merged.sort((a, b) => String(a.createdAt).localeCompare(String(b.createdAt)));
     return merged;
   }, [chatMessages, optimisticChat]);
-  React43.useEffect(() => {
+  React44.useEffect(() => {
     if (optimisticChat.length === 0) return;
     setOptimisticChat((prev) => {
       if (prev.length === 0) return prev;
@@ -7445,7 +7997,7 @@ function useOptimisticChatMessages({
       return next.length === prev.length ? prev : next;
     });
   }, [chatMessages, optimisticChat.length]);
-  const onSend = React43.useCallback(
+  const onSend = React44.useCallback(
     async (text, attachments) => {
       if (shouldForkOnEdit || disableOptimistic) {
         await onSendChat(text, attachments);
@@ -7473,7 +8025,7 @@ function useOptimisticChatMessages({
     },
     [chatMessages, disableOptimistic, onSendChat, shouldForkOnEdit]
   );
-  const onRetry = React43.useCallback(
+  const onRetry = React44.useCallback(
     async (messageId) => {
       if (shouldForkOnEdit || disableOptimistic) return;
       const target = optimisticChat.find((m) => m.id === messageId);
@@ -7497,7 +8049,7 @@ function useOptimisticChatMessages({
     },
     [chatMessages, disableOptimistic, onSendChat, optimisticChat, shouldForkOnEdit]
   );
-  const isRetrying = React43.useCallback(
+  const isRetrying = React44.useCallback(
     (messageId) => {
       return optimisticChat.some((m) => m.id === messageId && m.retrying);
     },
@@ -7511,7 +8063,7 @@ import {
   publishComergeStudioUIState,
   startStudioControlPolling
 } from "@comergehq/studio-control";
-import { Fragment as Fragment6, jsx as jsx59, jsxs as jsxs36 } from "react/jsx-runtime";
+import { Fragment as Fragment6, jsx as jsx61, jsxs as jsxs38 } from "react/jsx-runtime";
 function StudioOverlay({
   captureTargetRef,
   app,
@@ -7544,19 +8096,20 @@ function StudioOverlay({
   onSendChat,
   chatQueueItems,
   onRemoveQueueItem,
+  chatProgress,
   onNavigateHome,
   showBubble,
   studioControlOptions
 }) {
   const theme = useTheme();
   const { width } = useWindowDimensions4();
-  const [sheetOpen, setSheetOpen] = React44.useState(false);
-  const sheetOpenRef = React44.useRef(sheetOpen);
-  const [activePage, setActivePage] = React44.useState("preview");
-  const [drawing, setDrawing] = React44.useState(false);
-  const [chatAttachments, setChatAttachments] = React44.useState([]);
-  const [commentsAppId, setCommentsAppId] = React44.useState(null);
-  const [commentsCount, setCommentsCount] = React44.useState(null);
+  const [sheetOpen, setSheetOpen] = React45.useState(false);
+  const sheetOpenRef = React45.useRef(sheetOpen);
+  const [activePage, setActivePage] = React45.useState("preview");
+  const [drawing, setDrawing] = React45.useState(false);
+  const [chatAttachments, setChatAttachments] = React45.useState([]);
+  const [commentsAppId, setCommentsAppId] = React45.useState(null);
+  const [commentsCount, setCommentsCount] = React45.useState(null);
   const threadId = (app == null ? void 0 : app.threadId) ?? null;
   const isForking = chatForking || (app == null ? void 0 : app.status) === "forking";
   const queueItemsForChat = isForking ? [] : chatQueueItems;
@@ -7568,25 +8121,25 @@ function StudioOverlay({
     chatMessages,
     onSendChat
   });
-  const [confirmMrId, setConfirmMrId] = React44.useState(null);
-  const confirmMr = React44.useMemo(
+  const [confirmMrId, setConfirmMrId] = React45.useState(null);
+  const confirmMr = React45.useMemo(
     () => confirmMrId ? incomingMergeRequests.find((m) => m.id === confirmMrId) ?? null : null,
     [confirmMrId, incomingMergeRequests]
   );
-  const handleSheetOpenChange = React44.useCallback((open) => {
+  const handleSheetOpenChange = React45.useCallback((open) => {
     setSheetOpen(open);
     if (!open) Keyboard5.dismiss();
   }, []);
-  const closeSheet = React44.useCallback(() => {
+  const closeSheet = React45.useCallback(() => {
     handleSheetOpenChange(false);
   }, [handleSheetOpenChange]);
-  const openSheet = React44.useCallback(() => setSheetOpen(true), []);
-  const goToChat = React44.useCallback(() => {
+  const openSheet = React45.useCallback(() => setSheetOpen(true), []);
+  const goToChat = React45.useCallback(() => {
     setActivePage("chat");
     openSheet();
   }, [openSheet]);
-  const backToPreview = React44.useCallback(() => {
-    if (Platform10.OS !== "ios") {
+  const backToPreview = React45.useCallback(() => {
+    if (Platform11.OS !== "ios") {
       Keyboard5.dismiss();
       setActivePage("preview");
       return;
@@ -7603,11 +8156,11 @@ function StudioOverlay({
     const t = setTimeout(finalize, 350);
     Keyboard5.dismiss();
   }, []);
-  const startDraw = React44.useCallback(() => {
+  const startDraw = React45.useCallback(() => {
     setDrawing(true);
     closeSheet();
   }, [closeSheet]);
-  const handleDrawCapture = React44.useCallback(
+  const handleDrawCapture = React45.useCallback(
     (dataUrl) => {
       setChatAttachments((prev) => [...prev, dataUrl]);
       setDrawing(false);
@@ -7616,7 +8169,7 @@ function StudioOverlay({
     },
     [openSheet]
   );
-  const toggleSheet = React44.useCallback(async () => {
+  const toggleSheet = React45.useCallback(async () => {
     if (!sheetOpen) {
       const shouldExitTest = Boolean(testingMrId) || isTesting;
       if (shouldExitTest) {
@@ -7628,7 +8181,7 @@ function StudioOverlay({
       closeSheet();
     }
   }, [closeSheet, isTesting, onRestoreBase, sheetOpen, testingMrId]);
-  const handleTestMr = React44.useCallback(
+  const handleTestMr = React45.useCallback(
     async (mr) => {
       if (!onTestMr) return;
       await onTestMr(mr);
@@ -7636,10 +8189,10 @@ function StudioOverlay({
     },
     [closeSheet, onTestMr]
   );
-  React44.useEffect(() => {
+  React45.useEffect(() => {
     sheetOpenRef.current = sheetOpen;
   }, [sheetOpen]);
-  React44.useEffect(() => {
+  React45.useEffect(() => {
     const poller = startStudioControlPolling((action) => {
       if (action === "show" && !sheetOpenRef.current) openSheet();
       if (action === "hide" && sheetOpenRef.current) closeSheet();
@@ -7647,17 +8200,17 @@ function StudioOverlay({
     }, studioControlOptions);
     return () => poller.stop();
   }, [closeSheet, openSheet, studioControlOptions, toggleSheet]);
-  React44.useEffect(() => {
+  React45.useEffect(() => {
     void publishComergeStudioUIState(sheetOpen, studioControlOptions);
   }, [sheetOpen, studioControlOptions]);
-  return /* @__PURE__ */ jsxs36(Fragment6, { children: [
-    /* @__PURE__ */ jsx59(EdgeGlowFrame, { visible: isTesting, role: "accent", thickness: 40, intensity: 1 }),
-    /* @__PURE__ */ jsx59(StudioBottomSheet, { open: sheetOpen, onOpenChange: handleSheetOpenChange, children: /* @__PURE__ */ jsx59(
+  return /* @__PURE__ */ jsxs38(Fragment6, { children: [
+    /* @__PURE__ */ jsx61(EdgeGlowFrame, { visible: isTesting, role: "accent", thickness: 40, intensity: 1 }),
+    /* @__PURE__ */ jsx61(StudioBottomSheet, { open: sheetOpen, onOpenChange: handleSheetOpenChange, children: /* @__PURE__ */ jsx61(
       StudioSheetPager,
       {
         activePage,
         width,
-        preview: /* @__PURE__ */ jsx59(
+        preview: /* @__PURE__ */ jsx61(
           PreviewPanel,
           {
             app,
@@ -7686,7 +8239,7 @@ function StudioOverlay({
             commentCountOverride: commentsCount ?? void 0
           }
         ),
-        chat: /* @__PURE__ */ jsx59(
+        chat: /* @__PURE__ */ jsx61(
           ChatPanel,
           {
             messages: optimistic.messages,
@@ -7707,12 +8260,13 @@ function StudioOverlay({
             onRetryMessage: optimistic.onRetry,
             isRetryingMessage: optimistic.isRetrying,
             queueItems: queueItemsForChat,
-            onRemoveQueueItem
+            onRemoveQueueItem,
+            progress: chatProgress
           }
         )
       }
     ) }),
-    showBubble && /* @__PURE__ */ jsx59(
+    showBubble && /* @__PURE__ */ jsx61(
       Bubble,
       {
         visible: !sheetOpen && !drawing,
@@ -7721,10 +8275,10 @@ function StudioOverlay({
         onPress: toggleSheet,
         isLoading: (app == null ? void 0 : app.status) === "editing" || isBaseBundleDownloading,
         loadingBorderTone: isBaseBundleDownloading ? "warning" : "default",
-        children: /* @__PURE__ */ jsx59(View45, { style: { width: 28, height: 28, alignItems: "center", justifyContent: "center" }, children: /* @__PURE__ */ jsx59(MergeIcon, { width: 24, height: 24, color: theme.colors.floatingContent }) })
+        children: /* @__PURE__ */ jsx61(View47, { style: { width: 28, height: 28, alignItems: "center", justifyContent: "center" }, children: /* @__PURE__ */ jsx61(MergeIcon, { width: 24, height: 24, color: theme.colors.floatingContent }) })
       }
     ),
-    /* @__PURE__ */ jsx59(
+    /* @__PURE__ */ jsx61(
       DrawModeOverlay,
       {
         visible: drawing,
@@ -7733,7 +8287,7 @@ function StudioOverlay({
         onCapture: handleDrawCapture
       }
     ),
-    /* @__PURE__ */ jsx59(
+    /* @__PURE__ */ jsx61(
       ConfirmMergeFlow,
       {
         visible: Boolean(confirmMr),
@@ -7747,7 +8301,7 @@ function StudioOverlay({
         onTestFirst: handleTestMr
       }
     ),
-    /* @__PURE__ */ jsx59(
+    /* @__PURE__ */ jsx61(
       AppCommentsSheet,
       {
         appId: commentsAppId,
@@ -7760,7 +8314,7 @@ function StudioOverlay({
 }
 
 // src/studio/hooks/useEditQueue.ts
-import * as React45 from "react";
+import * as React46 from "react";
 
 // src/data/apps/edit-queue/remote.ts
 var EditQueueRemoteDataSourceImpl = class extends BaseRemote {
@@ -7869,17 +8423,17 @@ var editQueueRepository = new EditQueueRepositoryImpl(
 
 // src/studio/hooks/useEditQueue.ts
 function useEditQueue(appId) {
-  const [items, setItems] = React45.useState([]);
-  const [loading, setLoading] = React45.useState(false);
-  const [error, setError] = React45.useState(null);
-  const activeRequestIdRef = React45.useRef(0);
+  const [items, setItems] = React46.useState([]);
+  const [loading, setLoading] = React46.useState(false);
+  const [error, setError] = React46.useState(null);
+  const activeRequestIdRef = React46.useRef(0);
   const foregroundSignal = useForegroundSignal(Boolean(appId));
-  const upsertSorted = React45.useCallback((prev, nextItem) => {
+  const upsertSorted = React46.useCallback((prev, nextItem) => {
     const next = prev.some((x) => x.id === nextItem.id) ? prev.map((x) => x.id === nextItem.id ? nextItem : x) : [...prev, nextItem];
     next.sort((a, b) => String(a.createdAt).localeCompare(String(b.createdAt)));
     return next;
   }, []);
-  const refetch = React45.useCallback(async () => {
+  const refetch = React46.useCallback(async () => {
     if (!appId) {
       setItems([]);
       return;
@@ -7899,10 +8453,10 @@ function useEditQueue(appId) {
       if (activeRequestIdRef.current === requestId) setLoading(false);
     }
   }, [appId]);
-  React45.useEffect(() => {
+  React46.useEffect(() => {
     void refetch();
   }, [refetch]);
-  React45.useEffect(() => {
+  React46.useEffect(() => {
     if (!appId) return;
     const unsubscribe = editQueueRepository.subscribeEditQueue(appId, {
       onInsert: (item) => setItems((prev) => upsertSorted(prev, item)),
@@ -7911,7 +8465,7 @@ function useEditQueue(appId) {
     });
     return unsubscribe;
   }, [appId, upsertSorted, foregroundSignal]);
-  React45.useEffect(() => {
+  React46.useEffect(() => {
     if (!appId) return;
     if (foregroundSignal <= 0) return;
     void refetch();
@@ -7920,16 +8474,16 @@ function useEditQueue(appId) {
 }
 
 // src/studio/hooks/useEditQueueActions.ts
-import * as React46 from "react";
+import * as React47 from "react";
 function useEditQueueActions(appId) {
-  const update = React46.useCallback(
+  const update = React47.useCallback(
     async (queueItemId, payload) => {
       if (!appId) return;
       await editQueueRepository.update(appId, queueItemId, payload);
     },
     [appId]
   );
-  const cancel = React46.useCallback(
+  const cancel = React47.useCallback(
     async (queueItemId) => {
       if (!appId) return;
       await editQueueRepository.cancel(appId, queueItemId);
@@ -7939,48 +8493,461 @@ function useEditQueueActions(appId) {
   return { update, cancel };
 }
 
+// src/studio/hooks/useAgentRunProgress.ts
+import * as React48 from "react";
+
+// src/data/agent-progress/repository.ts
+function mapRun(row) {
+  return {
+    id: row.id,
+    appId: row.app_id,
+    threadId: row.thread_id,
+    queueItemId: row.queue_item_id,
+    status: row.status,
+    currentPhase: row.current_phase,
+    lastSeq: Number(row.last_seq || 0),
+    summary: row.summary || {},
+    errorCode: row.error_code,
+    errorMessage: row.error_message,
+    startedAt: row.started_at,
+    finishedAt: row.finished_at,
+    createdAt: row.created_at,
+    updatedAt: row.updated_at
+  };
+}
+function mapEvent(row) {
+  return {
+    id: row.id,
+    runId: row.run_id,
+    appId: row.app_id,
+    threadId: row.thread_id,
+    queueItemId: row.queue_item_id,
+    seq: Number(row.seq || 0),
+    eventType: row.event_type,
+    phase: row.phase,
+    toolName: row.tool_name,
+    path: row.path,
+    payload: row.payload || {},
+    createdAt: row.created_at
+  };
+}
+var AgentProgressRepositoryImpl = class {
+  async getLatestRun(threadId) {
+    if (!threadId) return null;
+    const supabase = getSupabaseClient();
+    const { data, error } = await supabase.from("agent_run").select("*").eq("thread_id", threadId).order("started_at", { ascending: false }).limit(1).maybeSingle();
+    if (error) throw new Error(error.message || "Failed to fetch latest agent run");
+    if (!data) return null;
+    return mapRun(data);
+  }
+  async listEvents(runId, afterSeq) {
+    if (!runId) return [];
+    const supabase = getSupabaseClient();
+    let query = supabase.from("agent_run_event").select("*").eq("run_id", runId).order("seq", { ascending: true });
+    if (typeof afterSeq === "number" && Number.isFinite(afterSeq) && afterSeq > 0) {
+      query = query.gt("seq", afterSeq);
+    }
+    const { data, error } = await query;
+    if (error) throw new Error(error.message || "Failed to fetch agent run events");
+    const rows = Array.isArray(data) ? data : [];
+    return rows.map(mapEvent);
+  }
+  subscribeThreadRuns(threadId, handlers) {
+    return subscribeManagedChannel(`agent-progress:runs:thread:${threadId}`, (channel) => {
+      channel.on(
+        "postgres_changes",
+        { event: "INSERT", schema: "public", table: "agent_run", filter: `thread_id=eq.${threadId}` },
+        (payload) => {
+          var _a;
+          const row = payload.new;
+          (_a = handlers.onInsert) == null ? void 0 : _a.call(handlers, mapRun(row));
+        }
+      ).on(
+        "postgres_changes",
+        { event: "UPDATE", schema: "public", table: "agent_run", filter: `thread_id=eq.${threadId}` },
+        (payload) => {
+          var _a;
+          const row = payload.new;
+          (_a = handlers.onUpdate) == null ? void 0 : _a.call(handlers, mapRun(row));
+        }
+      );
+    });
+  }
+  subscribeRunEvents(runId, handlers) {
+    return subscribeManagedChannel(`agent-progress:events:run:${runId}`, (channel) => {
+      channel.on(
+        "postgres_changes",
+        { event: "INSERT", schema: "public", table: "agent_run_event", filter: `run_id=eq.${runId}` },
+        (payload) => {
+          var _a;
+          const row = payload.new;
+          (_a = handlers.onInsert) == null ? void 0 : _a.call(handlers, mapEvent(row));
+        }
+      ).on(
+        "postgres_changes",
+        { event: "UPDATE", schema: "public", table: "agent_run_event", filter: `run_id=eq.${runId}` },
+        (payload) => {
+          var _a;
+          const row = payload.new;
+          (_a = handlers.onUpdate) == null ? void 0 : _a.call(handlers, mapEvent(row));
+        }
+      );
+    });
+  }
+};
+var agentProgressRepository = new AgentProgressRepositoryImpl();
+
+// src/studio/hooks/useAgentRunProgress.ts
+function upsertBySeq(prev, next) {
+  const map = /* @__PURE__ */ new Map();
+  for (const item of prev) map.set(item.seq, item);
+  map.set(next.seq, next);
+  return Array.from(map.values()).sort((a, b) => a.seq - b.seq);
+}
+function mergeMany(prev, incoming) {
+  if (incoming.length === 0) return prev;
+  const map = /* @__PURE__ */ new Map();
+  for (const item of prev) map.set(item.seq, item);
+  for (const item of incoming) map.set(item.seq, item);
+  return Array.from(map.values()).sort((a, b) => a.seq - b.seq);
+}
+function toMs(v) {
+  if (!v) return 0;
+  const n = Date.parse(v);
+  return Number.isFinite(n) ? n : 0;
+}
+function shouldSwitchRun(current, candidate) {
+  if (!current) return true;
+  if (candidate.id === current.id) return true;
+  return toMs(candidate.startedAt) >= toMs(current.startedAt);
+}
+function toInt(value) {
+  const n = Number(value);
+  return Number.isFinite(n) ? n : 0;
+}
+function toBundleStage(value) {
+  if (value === "queued") return "queued";
+  if (value === "building") return "building";
+  if (value === "fixing") return "fixing";
+  if (value === "retrying") return "retrying";
+  if (value === "finalizing") return "finalizing";
+  if (value === "ready") return "ready";
+  if (value === "failed") return "failed";
+  return null;
+}
+function toBundlePlatform(value) {
+  if (value === "ios" || value === "android") return value;
+  return "both";
+}
+function clamp01(value) {
+  if (value <= 0) return 0;
+  if (value >= 1) return 1;
+  return value;
+}
+function defaultBundleLabel(stage) {
+  if (stage === "queued") return "Queued for build";
+  if (stage === "building") return "Building bundle";
+  if (stage === "fixing") return "Applying auto-fix";
+  if (stage === "retrying") return "Retrying bundle";
+  if (stage === "finalizing") return "Finalizing artifacts";
+  if (stage === "ready") return "Bundle ready";
+  if (stage === "failed") return "Bundle failed";
+  return "Building bundle";
+}
+function fallbackBundleProgress(stage, startedAtMs, nowMs) {
+  if (stage === "ready") return 1;
+  if (stage === "failed") return 0.96;
+  const elapsed = Math.max(0, nowMs - startedAtMs);
+  const expectedMs = 6e4;
+  if (elapsed <= expectedMs) {
+    const t = clamp01(elapsed / expectedMs);
+    return 0.05 + 0.85 * (1 - Math.pow(1 - t, 2));
+  }
+  const over = elapsed - expectedMs;
+  return Math.min(0.9 + 0.07 * (1 - Math.exp(-over / 25e3)), 0.97);
+}
+function deriveView(run, events, nowMs) {
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
+  const files = [];
+  const fileSeen = /* @__PURE__ */ new Set();
+  let todoSummary = null;
+  let latestMessage = null;
+  let phase = (run == null ? void 0 : run.currentPhase) ?? null;
+  let bundleStage = null;
+  let bundleLabel = null;
+  let bundleError = null;
+  let bundleProgressHint = null;
+  let bundlePlatform = "both";
+  let bundleStartedAtMs = null;
+  let lastBundleSig = null;
+  for (const ev of events) {
+    if (ev.eventType === "phase_changed") {
+      if (typeof ((_a = ev.payload) == null ? void 0 : _a.message) === "string") latestMessage = ev.payload.message;
+      if (ev.phase) phase = ev.phase;
+    }
+    if (ev.eventType === "file_changed") {
+      if (ev.path && !fileSeen.has(ev.path)) {
+        fileSeen.add(ev.path);
+        files.push(ev.path);
+      }
+    }
+    if (ev.eventType === "todo_updated") {
+      todoSummary = {
+        total: toInt((_b = ev.payload) == null ? void 0 : _b.total),
+        pending: toInt((_c = ev.payload) == null ? void 0 : _c.pending),
+        inProgress: toInt((_d = ev.payload) == null ? void 0 : _d.inProgress),
+        completed: toInt((_e = ev.payload) == null ? void 0 : _e.completed),
+        currentTask: typeof ((_f = ev.payload) == null ? void 0 : _f.currentTask) === "string" ? ev.payload.currentTask : null
+      };
+    }
+    const stageType = typeof ((_g = ev.payload) == null ? void 0 : _g.stage) === "string" ? ev.payload.stage : null;
+    if (stageType !== "bundle") continue;
+    const nextStage = toBundleStage((_h = ev.payload) == null ? void 0 : _h.bundlePhase);
+    if (!nextStage) continue;
+    const nextPlatform = toBundlePlatform((_i = ev.payload) == null ? void 0 : _i.platform);
+    const message = typeof ((_j = ev.payload) == null ? void 0 : _j.message) === "string" ? ev.payload.message : null;
+    const phaseLabel = message || (typeof ((_k = ev.payload) == null ? void 0 : _k.message) === "string" ? ev.payload.message : null);
+    const hintRaw = Number((_l = ev.payload) == null ? void 0 : _l.progressHint);
+    const progressHint = Number.isFinite(hintRaw) ? clamp01(hintRaw) : null;
+    const errorText = typeof ((_m = ev.payload) == null ? void 0 : _m.error) === "string" ? ev.payload.error : null;
+    const sig = `${ev.seq}:${nextStage}:${nextPlatform}:${progressHint ?? "none"}:${phaseLabel ?? "none"}:${errorText ?? "none"}`;
+    if (sig === lastBundleSig) continue;
+    lastBundleSig = sig;
+    bundleStage = nextStage;
+    bundlePlatform = nextPlatform;
+    if (phaseLabel) bundleLabel = phaseLabel;
+    if (progressHint != null) bundleProgressHint = progressHint;
+    if (errorText) bundleError = errorText;
+    const evMs = toMs(ev.createdAt);
+    if (!bundleStartedAtMs && evMs > 0) bundleStartedAtMs = evMs;
+  }
+  if (!latestMessage) {
+    if (phase === "planning") latestMessage = "Planning changes...";
+    else if (phase === "analyzing") latestMessage = "Analyzing relevant files...";
+    else if (phase === "editing") latestMessage = "Applying code updates...";
+    else if (phase === "validating") latestMessage = "Validating updates...";
+    else if (phase === "finalizing") latestMessage = "Finalizing response...";
+    else if (phase) latestMessage = `Working (${phase})...`;
+  }
+  const runFinished = (run == null ? void 0 : run.status) === "succeeded" || (run == null ? void 0 : run.status) === "failed" || (run == null ? void 0 : run.status) === "cancelled";
+  let bundle = null;
+  if (bundleStage && !runFinished) {
+    const baseTime = bundleStartedAtMs ?? toMs(run == null ? void 0 : run.startedAt) ?? nowMs;
+    const fallback = fallbackBundleProgress(bundleStage, baseTime || nowMs, nowMs);
+    const value = bundleProgressHint != null ? Math.max(fallback, bundleProgressHint) : fallback;
+    const status = bundleStage === "failed" ? "failed" : bundleStage === "ready" ? "succeeded" : "loading";
+    bundle = {
+      active: status === "loading",
+      status,
+      phaseLabel: bundleLabel || defaultBundleLabel(bundleStage),
+      progressValue: clamp01(value),
+      errorMessage: bundleError,
+      platform: bundlePlatform
+    };
+  }
+  return {
+    runId: (run == null ? void 0 : run.id) ?? null,
+    status: (run == null ? void 0 : run.status) ?? null,
+    phase,
+    latestMessage,
+    changedFilesCount: fileSeen.size,
+    recentFiles: files.slice(-5),
+    todoSummary,
+    bundle,
+    events
+  };
+}
+function useAgentRunProgress(threadId, opts) {
+  var _a;
+  const enabled = Boolean((opts == null ? void 0 : opts.enabled) ?? true);
+  const [run, setRun] = React48.useState(null);
+  const [events, setEvents] = React48.useState([]);
+  const [loading, setLoading] = React48.useState(false);
+  const [error, setError] = React48.useState(null);
+  const activeRequestIdRef = React48.useRef(0);
+  const lastSeqRef = React48.useRef(0);
+  const runRef = React48.useRef(null);
+  const foregroundSignal = useForegroundSignal(Boolean(threadId) && enabled);
+  const [bundleTick, setBundleTick] = React48.useState(0);
+  React48.useEffect(() => {
+    lastSeqRef.current = 0;
+    runRef.current = null;
+  }, [threadId]);
+  React48.useEffect(() => {
+    runRef.current = run;
+  }, [run]);
+  const refetch = React48.useCallback(async () => {
+    if (!threadId || !enabled) {
+      setRun(null);
+      setEvents([]);
+      setLoading(false);
+      setError(null);
+      return;
+    }
+    const requestId = ++activeRequestIdRef.current;
+    setLoading(true);
+    setError(null);
+    try {
+      const latestRun = await agentProgressRepository.getLatestRun(threadId);
+      if (activeRequestIdRef.current !== requestId) return;
+      if (!latestRun) {
+        setRun(null);
+        setEvents([]);
+        lastSeqRef.current = 0;
+        return;
+      }
+      const initialEvents = await agentProgressRepository.listEvents(latestRun.id);
+      if (activeRequestIdRef.current !== requestId) return;
+      const sorted = [...initialEvents].sort((a, b) => a.seq - b.seq);
+      setRun(latestRun);
+      setEvents(sorted);
+      lastSeqRef.current = sorted.length > 0 ? sorted[sorted.length - 1].seq : 0;
+    } catch (e) {
+      if (activeRequestIdRef.current !== requestId) return;
+      setError(e instanceof Error ? e : new Error(String(e)));
+      setRun(null);
+      setEvents([]);
+      lastSeqRef.current = 0;
+    } finally {
+      if (activeRequestIdRef.current === requestId) setLoading(false);
+    }
+  }, [enabled, threadId]);
+  React48.useEffect(() => {
+    void refetch();
+  }, [refetch]);
+  React48.useEffect(() => {
+    if (!threadId || !enabled) return;
+    if (foregroundSignal <= 0) return;
+    void refetch();
+  }, [enabled, foregroundSignal, refetch, threadId]);
+  React48.useEffect(() => {
+    if (!threadId || !enabled) return;
+    const unsubRuns = agentProgressRepository.subscribeThreadRuns(threadId, {
+      onInsert: (nextRun) => {
+        const currentRun = runRef.current;
+        if (!shouldSwitchRun(currentRun, nextRun)) return;
+        setRun(nextRun);
+        runRef.current = nextRun;
+        if (!currentRun || currentRun.id !== nextRun.id) {
+          lastSeqRef.current = 0;
+          setEvents([]);
+          void agentProgressRepository.listEvents(nextRun.id).then((initial) => {
+            var _a2;
+            if (((_a2 = runRef.current) == null ? void 0 : _a2.id) !== nextRun.id) return;
+            setEvents((prev) => mergeMany(prev, initial));
+            const maxSeq = initial.length > 0 ? initial[initial.length - 1].seq : 0;
+            if (maxSeq > lastSeqRef.current) lastSeqRef.current = maxSeq;
+          }).catch(() => {
+          });
+        }
+      },
+      onUpdate: (nextRun) => {
+        const currentRun = runRef.current;
+        if (!shouldSwitchRun(currentRun, nextRun)) return;
+        setRun(nextRun);
+        runRef.current = nextRun;
+      }
+    });
+    return unsubRuns;
+  }, [enabled, threadId, foregroundSignal]);
+  React48.useEffect(() => {
+    if (!enabled || !(run == null ? void 0 : run.id)) return;
+    const runId = run.id;
+    const processIncoming = (incoming) => {
+      var _a2;
+      if (((_a2 = runRef.current) == null ? void 0 : _a2.id) !== runId) return;
+      setEvents((prev) => upsertBySeq(prev, incoming));
+      if (incoming.seq > lastSeqRef.current) {
+        const expectedNext = lastSeqRef.current + 1;
+        const seenSeq = incoming.seq;
+        const currentLast = lastSeqRef.current;
+        lastSeqRef.current = seenSeq;
+        if (seenSeq > expectedNext) {
+          void agentProgressRepository.listEvents(runId, currentLast).then((missing) => {
+            var _a3;
+            if (((_a3 = runRef.current) == null ? void 0 : _a3.id) !== runId) return;
+            setEvents((prev) => mergeMany(prev, missing));
+            if (missing.length > 0) {
+              const maxSeq = missing[missing.length - 1].seq;
+              if (maxSeq > lastSeqRef.current) lastSeqRef.current = maxSeq;
+            }
+          }).catch(() => {
+          });
+        }
+      }
+    };
+    const unsubscribe = agentProgressRepository.subscribeRunEvents(runId, {
+      onInsert: processIncoming,
+      onUpdate: processIncoming
+    });
+    return unsubscribe;
+  }, [enabled, run == null ? void 0 : run.id, foregroundSignal]);
+  const view = React48.useMemo(() => deriveView(run, events, Date.now()), [bundleTick, events, run]);
+  React48.useEffect(() => {
+    var _a2;
+    if (!((_a2 = view.bundle) == null ? void 0 : _a2.active)) return;
+    const interval = setInterval(() => {
+      setBundleTick((v) => v + 1);
+    }, 300);
+    return () => clearInterval(interval);
+  }, [(_a = view.bundle) == null ? void 0 : _a.active]);
+  const hasLiveProgress = Boolean(run) && (run == null ? void 0 : run.status) === "running";
+  return { run, view, loading, error, hasLiveProgress, refetch };
+}
+
 // src/studio/ComergeStudio.tsx
-import { jsx as jsx60, jsxs as jsxs37 } from "react/jsx-runtime";
+import { jsx as jsx62, jsxs as jsxs39 } from "react/jsx-runtime";
 function ComergeStudio({
   appId,
   clientKey: clientKey2,
   appKey = "MicroMain",
+  analyticsEnabled,
   onNavigateHome,
   style,
   showBubble = true,
+  enableAgentProgress = true,
   studioControlOptions,
   embeddedBaseBundles
 }) {
-  const [activeAppId, setActiveAppId] = React47.useState(appId);
-  const [runtimeAppId, setRuntimeAppId] = React47.useState(appId);
-  const [pendingRuntimeTargetAppId, setPendingRuntimeTargetAppId] = React47.useState(null);
-  const platform = React47.useMemo(() => RNPlatform.OS === "ios" ? "ios" : "android", []);
-  React47.useEffect(() => {
+  const [activeAppId, setActiveAppId] = React49.useState(appId);
+  const [runtimeAppId, setRuntimeAppId] = React49.useState(appId);
+  const [pendingRuntimeTargetAppId, setPendingRuntimeTargetAppId] = React49.useState(null);
+  const platform = React49.useMemo(() => RNPlatform.OS === "ios" ? "ios" : "android", []);
+  React49.useEffect(() => {
     setActiveAppId(appId);
     setRuntimeAppId(appId);
     setPendingRuntimeTargetAppId(null);
   }, [appId]);
-  const captureTargetRef = React47.useRef(null);
-  return /* @__PURE__ */ jsx60(StudioBootstrap, { clientKey: clientKey2, fallback: /* @__PURE__ */ jsx60(View46, { style: { flex: 1 } }), children: ({ userId }) => /* @__PURE__ */ jsx60(BottomSheetModalProvider, { children: /* @__PURE__ */ jsx60(LiquidGlassResetProvider, { resetTriggers: [appId, activeAppId, runtimeAppId], children: /* @__PURE__ */ jsx60(
-    ComergeStudioInner,
+  const captureTargetRef = React49.useRef(null);
+  return /* @__PURE__ */ jsx62(
+    StudioBootstrap,
     {
-      userId,
-      activeAppId,
-      setActiveAppId,
-      runtimeAppId,
-      setRuntimeAppId,
-      pendingRuntimeTargetAppId,
-      setPendingRuntimeTargetAppId,
-      appKey,
-      platform,
-      onNavigateHome,
-      captureTargetRef,
-      style,
-      showBubble,
-      studioControlOptions,
-      embeddedBaseBundles
+      clientKey: clientKey2,
+      analyticsEnabled,
+      fallback: /* @__PURE__ */ jsx62(View48, { style: { flex: 1 } }),
+      children: ({ userId }) => /* @__PURE__ */ jsx62(BottomSheetModalProvider, { children: /* @__PURE__ */ jsx62(LiquidGlassResetProvider, { resetTriggers: [appId, activeAppId, runtimeAppId], children: /* @__PURE__ */ jsx62(
+        ComergeStudioInner,
+        {
+          userId,
+          activeAppId,
+          setActiveAppId,
+          runtimeAppId,
+          setRuntimeAppId,
+          pendingRuntimeTargetAppId,
+          setPendingRuntimeTargetAppId,
+          appKey,
+          platform,
+          onNavigateHome,
+          captureTargetRef,
+          style,
+          showBubble,
+          enableAgentProgress,
+          studioControlOptions,
+          embeddedBaseBundles
+        }
+      ) }) })
     }
-  ) }) }) });
+  );
 }
 function ComergeStudioInner({
   userId,
@@ -7996,17 +8963,19 @@ function ComergeStudioInner({
   captureTargetRef,
   style,
   showBubble,
+  enableAgentProgress,
   studioControlOptions,
   embeddedBaseBundles
 }) {
+  var _a;
   const { app, loading: appLoading } = useApp(activeAppId);
   const { app: runtimeAppFromHook } = useApp(runtimeAppId, { enabled: runtimeAppId !== activeAppId });
   const runtimeApp = runtimeAppId === activeAppId ? app : runtimeAppFromHook;
-  const sawEditingOnPendingTargetRef = React47.useRef(false);
-  React47.useEffect(() => {
+  const sawEditingOnPendingTargetRef = React49.useRef(false);
+  React49.useEffect(() => {
     sawEditingOnPendingTargetRef.current = false;
   }, [pendingRuntimeTargetAppId]);
-  React47.useEffect(() => {
+  React49.useEffect(() => {
     if (!pendingRuntimeTargetAppId) return;
     if (activeAppId !== pendingRuntimeTargetAppId) return;
     if ((app == null ? void 0 : app.status) === "editing") {
@@ -8024,13 +8993,13 @@ function ComergeStudioInner({
     canRequestLatest: (runtimeApp == null ? void 0 : runtimeApp.status) === "ready",
     embeddedBaseBundles
   });
-  const sawEditingOnActiveAppRef = React47.useRef(false);
-  const [showPostEditPreparing, setShowPostEditPreparing] = React47.useState(false);
-  React47.useEffect(() => {
+  const sawEditingOnActiveAppRef = React49.useRef(false);
+  const [showPostEditPreparing, setShowPostEditPreparing] = React49.useState(false);
+  React49.useEffect(() => {
     sawEditingOnActiveAppRef.current = false;
     setShowPostEditPreparing(false);
   }, [activeAppId]);
-  React47.useEffect(() => {
+  React49.useEffect(() => {
     if (!(app == null ? void 0 : app.id)) return;
     if (app.status === "editing") {
       sawEditingOnActiveAppRef.current = true;
@@ -8042,7 +9011,7 @@ function ComergeStudioInner({
       sawEditingOnActiveAppRef.current = false;
     }
   }, [app == null ? void 0 : app.id, app == null ? void 0 : app.status]);
-  React47.useEffect(() => {
+  React49.useEffect(() => {
     if (!showPostEditPreparing) return;
     const stillProcessingBaseBundle = bundle.loading && bundle.loadingMode === "base" && !bundle.isTesting;
     if (!stillProcessingBaseBundle) {
@@ -8052,20 +9021,21 @@ function ComergeStudioInner({
   const threadId = (app == null ? void 0 : app.threadId) ?? "";
   const thread = useThreadMessages(threadId);
   const editQueue = useEditQueue(activeAppId);
+  const agentProgress = useAgentRunProgress(threadId, { enabled: enableAgentProgress });
   const editQueueActions = useEditQueueActions(activeAppId);
-  const [lastEditQueueInfo, setLastEditQueueInfo] = React47.useState(null);
-  const lastEditQueueInfoRef = React47.useRef(null);
-  const [suppressQueueUntilResponse, setSuppressQueueUntilResponse] = React47.useState(false);
+  const [lastEditQueueInfo, setLastEditQueueInfo] = React49.useState(null);
+  const lastEditQueueInfoRef = React49.useRef(null);
+  const [suppressQueueUntilResponse, setSuppressQueueUntilResponse] = React49.useState(false);
   const mergeRequests = useMergeRequests({ appId: activeAppId });
-  const hasOpenOutgoingMr = React47.useMemo(() => {
+  const hasOpenOutgoingMr = React49.useMemo(() => {
     return mergeRequests.lists.outgoing.some((mr) => mr.status === "open");
   }, [mergeRequests.lists.outgoing]);
-  const incomingReviewMrs = React47.useMemo(() => {
+  const incomingReviewMrs = React49.useMemo(() => {
     if (!userId) return mergeRequests.lists.incoming;
     return mergeRequests.lists.incoming.filter((mr) => mr.createdBy !== userId);
   }, [mergeRequests.lists.incoming, userId]);
   const uploader = useAttachmentUpload();
-  const updateLastEditQueueInfo = React47.useCallback(
+  const updateLastEditQueueInfo = React49.useCallback(
     (info) => {
       lastEditQueueInfoRef.current = info;
       setLastEditQueueInfo(info);
@@ -8099,32 +9069,35 @@ function ComergeStudioInner({
       }
     },
     onEditFinished: () => {
-      var _a;
-      if (((_a = lastEditQueueInfoRef.current) == null ? void 0 : _a.queuePosition) !== 1) {
+      var _a2;
+      if (((_a2 = lastEditQueueInfoRef.current) == null ? void 0 : _a2.queuePosition) !== 1) {
         setSuppressQueueUntilResponse(false);
       }
     }
   });
   const chatSendDisabled = false;
-  const [processingMrId, setProcessingMrId] = React47.useState(null);
-  const [testingMrId, setTestingMrId] = React47.useState(null);
-  const [syncingUpstream, setSyncingUpstream] = React47.useState(false);
-  const [upstreamSyncStatus, setUpstreamSyncStatus] = React47.useState(null);
+  const [processingMrId, setProcessingMrId] = React49.useState(null);
+  const [testingMrId, setTestingMrId] = React49.useState(null);
+  const [syncingUpstream, setSyncingUpstream] = React49.useState(false);
+  const [upstreamSyncStatus, setUpstreamSyncStatus] = React49.useState(null);
   const isMrTestBuildInProgress = bundle.loading && bundle.loadingMode === "test";
   const isBaseBundleDownloading = bundle.loading && bundle.loadingMode === "base" && !bundle.isTesting;
-  const chatShowTypingIndicator = React47.useMemo(() => {
-    var _a;
+  const runtimePreparingText = bundle.bundleStatus === "pending" ? "Bundling app\u2026 this may take a few minutes" : "Preparing app\u2026";
+  const chatShowTypingIndicator = React49.useMemo(() => {
+    var _a2;
+    if (agentProgress.hasLiveProgress) return false;
     if (!thread.raw || thread.raw.length === 0) return false;
     const last = thread.raw[thread.raw.length - 1];
-    const payloadType = typeof ((_a = last.payload) == null ? void 0 : _a.type) === "string" ? String(last.payload.type) : void 0;
+    const payloadType = typeof ((_a2 = last.payload) == null ? void 0 : _a2.type) === "string" ? String(last.payload.type) : void 0;
     return payloadType !== "outcome";
-  }, [thread.raw]);
-  React47.useEffect(() => {
+  }, [agentProgress.hasLiveProgress, thread.raw]);
+  const showChatProgress = agentProgress.hasLiveProgress || Boolean((_a = agentProgress.view.bundle) == null ? void 0 : _a.active);
+  React49.useEffect(() => {
     updateLastEditQueueInfo(null);
     setSuppressQueueUntilResponse(false);
     setUpstreamSyncStatus(null);
   }, [activeAppId, updateLastEditQueueInfo]);
-  const handleSyncUpstream = React47.useCallback(async () => {
+  const handleSyncUpstream = React49.useCallback(async () => {
     if (!(app == null ? void 0 : app.id)) {
       throw new Error("Missing app");
     }
@@ -8137,7 +9110,7 @@ function ComergeStudioInner({
       setSyncingUpstream(false);
     }
   }, [activeAppId, app == null ? void 0 : app.id]);
-  React47.useEffect(() => {
+  React49.useEffect(() => {
     if (!(lastEditQueueInfo == null ? void 0 : lastEditQueueInfo.queueItemId)) return;
     const stillPresent = editQueue.items.some((item) => item.id === lastEditQueueInfo.queueItemId);
     if (!stillPresent) {
@@ -8145,31 +9118,32 @@ function ComergeStudioInner({
       setSuppressQueueUntilResponse(false);
     }
   }, [editQueue.items, lastEditQueueInfo == null ? void 0 : lastEditQueueInfo.queueItemId]);
-  const chatQueueItems = React47.useMemo(() => {
-    var _a;
+  const chatQueueItems = React49.useMemo(() => {
+    var _a2;
     if (suppressQueueUntilResponse && editQueue.items.length <= 1) {
       return [];
     }
     if (!lastEditQueueInfo || lastEditQueueInfo.queuePosition !== 1 || !lastEditQueueInfo.queueItemId) {
       return editQueue.items;
     }
-    if (editQueue.items.length === 1 && ((_a = editQueue.items[0]) == null ? void 0 : _a.id) === lastEditQueueInfo.queueItemId) {
+    if (editQueue.items.length === 1 && ((_a2 = editQueue.items[0]) == null ? void 0 : _a2.id) === lastEditQueueInfo.queueItemId) {
       return [];
     }
     return editQueue.items;
   }, [editQueue.items, lastEditQueueInfo, suppressQueueUntilResponse]);
-  return /* @__PURE__ */ jsx60(View46, { style: [{ flex: 1 }, style], children: /* @__PURE__ */ jsxs37(View46, { ref: captureTargetRef, style: { flex: 1 }, collapsable: false, children: [
-    /* @__PURE__ */ jsx60(
+  return /* @__PURE__ */ jsx62(View48, { style: [{ flex: 1 }, style], children: /* @__PURE__ */ jsxs39(View48, { ref: captureTargetRef, style: { flex: 1 }, collapsable: false, children: [
+    /* @__PURE__ */ jsx62(
       RuntimeRenderer,
       {
         appKey,
         bundlePath: bundle.bundlePath,
+        preparingText: runtimePreparingText,
         forcePreparing: showPostEditPreparing,
         renderToken: bundle.renderToken,
         allowInitialPreparing: !embeddedBaseBundles
       }
     ),
-    /* @__PURE__ */ jsx60(
+    /* @__PURE__ */ jsx62(
       StudioOverlay,
       {
         captureTargetRef,
@@ -8228,6 +9202,7 @@ function ComergeStudioInner({
         onSendChat: (text, attachments) => actions.sendEdit({ prompt: text, attachments }),
         chatQueueItems,
         onRemoveQueueItem: (id) => editQueueActions.cancel(id),
+        chatProgress: showChatProgress ? agentProgress.view : null,
         onNavigateHome,
         showBubble,
         studioControlOptions