@comergehq/studio 0.1.22 → 0.1.24

package/dist/index.js

@@ -31,13 +31,14 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var index_exports = {};
 __export(index_exports, {
   ComergeStudio: () => ComergeStudio,
+  resetRealtimeState: () => resetRealtimeState,
   setSupabaseClient: () => setSupabaseClient
 });
 module.exports = __toCommonJS(index_exports);
 
 // src/studio/ComergeStudio.tsx
 var React47 = __toESM(require("react"));
-var import_react_native56 = require("react-native");
+var import_react_native57 = require("react-native");
 var import_bottom_sheet6 = require("@gorhom/bottom-sheet");
 
 // src/studio/bootstrap/StudioBootstrap.tsx
@@ -393,6 +394,41 @@ var log = import_react_native_logs.logger.createLogger(
 );
 
 // src/core/services/http/index.ts
+var RETRYABLE_MAX_ATTEMPTS = 3;
+var RETRYABLE_BASE_DELAY_MS = 500;
+var RETRYABLE_MAX_DELAY_MS = 4e3;
+var RETRYABLE_JITTER_MS = 250;
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+function isRetryableNetworkError(e) {
+  var _a;
+  const err = e;
+  const code = typeof (err == null ? void 0 : err.code) === "string" ? err.code : "";
+  const message = typeof (err == null ? void 0 : err.message) === "string" ? err.message : "";
+  if (code === "ERR_NETWORK" || code === "ECONNABORTED") return true;
+  if (message.toLowerCase().includes("network error")) return true;
+  if (message.toLowerCase().includes("timeout")) return true;
+  const status = typeof ((_a = err == null ? void 0 : err.response) == null ? void 0 : _a.status) === "number" ? err.response.status : void 0;
+  if (status && (status === 429 || status >= 500)) return true;
+  return false;
+}
+function computeBackoffDelay(attempt) {
+  const exp = Math.min(RETRYABLE_MAX_DELAY_MS, RETRYABLE_BASE_DELAY_MS * Math.pow(2, attempt - 1));
+  const jitter = Math.floor(Math.random() * RETRYABLE_JITTER_MS);
+  return exp + jitter;
+}
+function parseRetryAfterMs(value) {
+  if (typeof value !== "string") return null;
+  const trimmed = value.trim();
+  if (!trimmed) return null;
+  const seconds = Number(trimmed);
+  if (!Number.isNaN(seconds) && seconds >= 0) return seconds * 1e3;
+  const parsed = Date.parse(trimmed);
+  if (Number.isNaN(parsed)) return null;
+  const delta = parsed - Date.now();
+  return delta > 0 ? delta : 0;
+}
 var createApiClient = (baseURL) => {
   const apiClient = import_axios2.default.create({
     baseURL,
@@ -450,7 +486,7 @@ var createApiClient = (baseURL) => {
       return response;
     },
     async (error) => {
-      var _a, _b, _c, _d, _e, _f, _g;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
       const originalRequest = error.config;
       log.error("Response Error:", {
         message: error.message,
@@ -486,6 +522,23 @@ var createApiClient = (baseURL) => {
           return Promise.reject(refreshErr);
         }
       }
+      const method = ((_h = originalRequest.method) == null ? void 0 : _h.toLowerCase()) ?? "";
+      const isGet = method === "get";
+      const retryable = isRetryableNetworkError(error);
+      const retryCount = originalRequest._retryCount ?? 0;
+      const skipRetry = originalRequest.skipRetry === true;
+      if (isGet && retryable && !skipRetry && retryCount < RETRYABLE_MAX_ATTEMPTS) {
+        const retryAfterMs = parseRetryAfterMs((_j = (_i = error.response) == null ? void 0 : _i.headers) == null ? void 0 : _j["retry-after"]);
+        originalRequest._retryCount = retryCount + 1;
+        const delayMs = retryAfterMs ?? computeBackoffDelay(retryCount + 1);
+        log.warn("Retrying GET request after transient error", {
+          url: originalRequest.url,
+          attempt: originalRequest._retryCount,
+          delayMs
+        });
+        await sleep(delayMs);
+        return apiClient(originalRequest);
+      }
       return Promise.reject(error);
     }
   );
@@ -620,6 +673,25 @@ function subscribeChannel(entry) {
     scheduleResubscribe(entry, "SUBSCRIBE_FAILED");
   }
 }
+function unsubscribeChannel(entry) {
+  var _a, _b;
+  if (!entry.channel) return;
+  try {
+    (_b = (_a = entry.channel).unsubscribe) == null ? void 0 : _b.call(_a);
+  } catch (error) {
+    realtimeLog.warn("[realtime] unsubscribe failed", error);
+  }
+  entry.channel = null;
+}
+function resetRealtimeState(reason) {
+  realtimeLog.warn(`[realtime] reset state ${reason}`);
+  entries.forEach((entry) => {
+    clearTimer(entry);
+    entry.backoffMs = INITIAL_BACKOFF_MS;
+    unsubscribeChannel(entry);
+  });
+  entries.clear();
+}
 function subscribeManagedChannel(key, configure) {
   let entry = entries.get(key);
   if (!entry) {
@@ -777,14 +849,12 @@ function useForegroundSignal(enabled = true) {
   React2.useEffect(() => {
     if (!enabled) return;
     const sub = import_react_native4.AppState.addEventListener("change", (nextState) => {
-      var _a, _b;
       const prevState = lastStateRef.current;
       lastStateRef.current = nextState;
       const didResume = (prevState === "background" || prevState === "inactive") && nextState === "active";
       if (!didResume) return;
       try {
-        const supabase = getSupabaseClient();
-        (_b = (_a = supabase == null ? void 0 : supabase.realtime) == null ? void 0 : _a.connect) == null ? void 0 : _b.call(_a);
+        resetRealtimeState("APP_RESUME");
       } catch {
       }
       setSignal((s) => s + 1);
@@ -799,8 +869,13 @@ function useApp(appId, options) {
   const enabled = (options == null ? void 0 : options.enabled) ?? true;
   const [app, setApp] = React3.useState(null);
   const [loading, setLoading] = React3.useState(false);
+  const [refreshing, setRefreshing] = React3.useState(false);
   const [error, setError] = React3.useState(null);
   const foregroundSignal = useForegroundSignal(enabled && Boolean(appId));
+  const hasLoadedOnceRef = React3.useRef(false);
+  React3.useEffect(() => {
+    hasLoadedOnceRef.current = false;
+  }, [appId]);
   const mergeApp = React3.useCallback((prev, next) => {
     const merged = {
       ...prev ?? {},
@@ -810,21 +885,32 @@ function useApp(appId, options) {
     };
     return merged;
   }, []);
-  const fetchOnce = React3.useCallback(async () => {
+  const fetchOnce = React3.useCallback(async (opts) => {
     if (!enabled) return;
     if (!appId) return;
-    setLoading(true);
+    const isBackground = Boolean(opts == null ? void 0 : opts.background);
+    const useBackgroundRefresh = isBackground && hasLoadedOnceRef.current;
+    if (useBackgroundRefresh) {
+      setRefreshing(true);
+    } else {
+      setLoading(true);
+    }
     setError(null);
     try {
       const next = await appsRepository.getById(appId);
+      hasLoadedOnceRef.current = true;
       setApp((prev) => mergeApp(prev, next));
     } catch (e) {
       setError(e instanceof Error ? e : new Error(String(e)));
       setApp(null);
     } finally {
-      setLoading(false);
+      if (useBackgroundRefresh) {
+        setRefreshing(false);
+      } else {
+        setLoading(false);
+      }
     }
-  }, [appId, enabled]);
+  }, [appId, enabled, mergeApp]);
   React3.useEffect(() => {
     if (!enabled) return;
     void fetchOnce();
@@ -849,9 +935,9 @@ function useApp(appId, options) {
     if (!enabled) return;
     if (!appId) return;
     if (foregroundSignal <= 0) return;
-    void fetchOnce();
+    void fetchOnce({ background: true });
   }, [appId, enabled, fetchOnce, foregroundSignal]);
-  return { app, loading, error, refetch: fetchOnce };
+  return { app, loading, refreshing, error, refetch: fetchOnce };
 }
 
 // src/studio/hooks/useThreadMessages.ts
@@ -985,33 +1071,52 @@ function mapMessageToChatMessage(m) {
 function useThreadMessages(threadId) {
   const [raw, setRaw] = React4.useState([]);
   const [loading, setLoading] = React4.useState(false);
+  const [refreshing, setRefreshing] = React4.useState(false);
   const [error, setError] = React4.useState(null);
   const activeRequestIdRef = React4.useRef(0);
   const foregroundSignal = useForegroundSignal(Boolean(threadId));
+  const hasLoadedOnceRef = React4.useRef(false);
+  React4.useEffect(() => {
+    hasLoadedOnceRef.current = false;
+  }, [threadId]);
   const upsertSorted = React4.useCallback((prev, m) => {
     const next = prev.filter((x) => x.id !== m.id);
     next.push(m);
     next.sort(compareMessages);
     return next;
   }, []);
-  const refetch = React4.useCallback(async () => {
+  const refetch = React4.useCallback(async (opts) => {
     if (!threadId) {
       setRaw([]);
+      setLoading(false);
+      setRefreshing(false);
       return;
     }
     const requestId = ++activeRequestIdRef.current;
-    setLoading(true);
+    const isBackground = Boolean(opts == null ? void 0 : opts.background);
+    const useBackgroundRefresh = isBackground && hasLoadedOnceRef.current;
+    if (useBackgroundRefresh) {
+      setRefreshing(true);
+    } else {
+      setLoading(true);
+    }
     setError(null);
     try {
       const list = await messagesRepository.list(threadId);
       if (activeRequestIdRef.current !== requestId) return;
+      hasLoadedOnceRef.current = true;
       setRaw([...list].sort(compareMessages));
     } catch (e) {
       if (activeRequestIdRef.current !== requestId) return;
       setError(e instanceof Error ? e : new Error(String(e)));
       setRaw([]);
     } finally {
-      if (activeRequestIdRef.current === requestId) setLoading(false);
+      if (activeRequestIdRef.current !== requestId) return;
+      if (useBackgroundRefresh) {
+        setRefreshing(false);
+      } else {
+        setLoading(false);
+      }
     }
   }, [threadId]);
   React4.useEffect(() => {
@@ -1029,14 +1134,14 @@ function useThreadMessages(threadId) {
   React4.useEffect(() => {
     if (!threadId) return;
     if (foregroundSignal <= 0) return;
-    void refetch();
+    void refetch({ background: true });
   }, [foregroundSignal, refetch, threadId]);
   const messages = React4.useMemo(() => {
     const visible = raw.filter((m) => !isQueuedHiddenMessage(m));
     const resolved = visible.length > 0 ? visible : raw;
     return resolved.map(mapMessageToChatMessage);
   }, [raw]);
-  return { raw, messages, loading, error, refetch };
+  return { raw, messages, loading, refreshing, error, refetch };
 }
 
 // src/studio/hooks/useBundleManager.ts
@@ -1056,21 +1161,22 @@ var BundlesRemoteDataSourceImpl = class extends BaseRemote {
   }
   async getById(appId, bundleId) {
     const { data } = await api.get(
-      `/v1/apps/${encodeURIComponent(appId)}/bundles/${encodeURIComponent(bundleId)}`
+      `/v1/apps/${encodeURIComponent(appId)}/bundles/${encodeURIComponent(bundleId)}`,
+      { skipRetry: true }
     );
     return data;
   }
   async getSignedDownloadUrl(appId, bundleId, options) {
     const { data } = await api.get(
       `/v1/apps/${encodeURIComponent(appId)}/bundles/${encodeURIComponent(bundleId)}/download`,
-      { params: { redirect: (options == null ? void 0 : options.redirect) ?? false } }
+      { params: { redirect: (options == null ? void 0 : options.redirect) ?? false }, skipRetry: true }
     );
     return data;
   }
   async getSignedAssetsDownloadUrl(appId, bundleId, options) {
     const { data } = await api.get(
       `/v1/apps/${encodeURIComponent(appId)}/bundles/${encodeURIComponent(bundleId)}/assets/download`,
-      { params: { redirect: (options == null ? void 0 : options.redirect) ?? false, kind: options == null ? void 0 : options.kind } }
+      { params: { redirect: (options == null ? void 0 : options.redirect) ?? false, kind: options == null ? void 0 : options.kind }, skipRetry: true }
     );
     return data;
   }
@@ -1103,10 +1209,10 @@ var BundlesRepositoryImpl = class extends BaseRepository {
 var bundlesRepository = new BundlesRepositoryImpl(bundlesRemoteDataSource);
 
 // src/studio/hooks/useBundleManager.ts
-function sleep(ms) {
+function sleep2(ms) {
   return new Promise((r) => setTimeout(r, ms));
 }
-function isRetryableNetworkError(e) {
+function isRetryableNetworkError2(e) {
   var _a;
   const err = e;
   const code = typeof (err == null ? void 0 : err.code) === "string" ? err.code : "";
@@ -1125,13 +1231,13 @@ async function withRetry(fn, opts) {
       return await fn();
     } catch (e) {
       lastErr = e;
-      const retryable = isRetryableNetworkError(e);
+      const retryable = isRetryableNetworkError2(e);
       if (!retryable || attempt >= opts.attempts) {
         throw e;
       }
       const exp = Math.min(opts.maxDelayMs, opts.baseDelayMs * Math.pow(2, attempt - 1));
       const jitter = Math.floor(Math.random() * 250);
-      await sleep(exp + jitter);
+      await sleep2(exp + jitter);
     }
   }
   throw lastErr;
@@ -1408,14 +1514,14 @@ async function pollBundle(appId, bundleId, opts) {
       const bundle = await bundlesRepository.getById(appId, bundleId);
       if (bundle.status === "succeeded" || bundle.status === "failed") return bundle;
     } catch (e) {
-      if (!isRetryableNetworkError(e)) {
+      if (!isRetryableNetworkError2(e)) {
         throw e;
       }
     }
     if (Date.now() - start > opts.timeoutMs) {
       throw new Error("Bundle build timed out.");
     }
-    await sleep(opts.intervalMs);
+    await sleep2(opts.intervalMs);
   }
 }
 async function resolveBundlePath(src, platform, mode) {
@@ -1484,6 +1590,7 @@ function useBundleManager({
   const baseOpIdRef = React5.useRef(0);
   const testOpIdRef = React5.useRef(0);
   const activeLoadModeRef = React5.useRef(null);
+  const desiredModeRef = React5.useRef("base");
   const canRequestLatestRef = React5.useRef(canRequestLatest);
   React5.useEffect(() => {
     canRequestLatestRef.current = canRequestLatest;
@@ -1571,6 +1678,10 @@ function useBundleManager({
   );
   const load = React5.useCallback(async (src, mode) => {
     if (!src.appId) return;
+    if (mode === "test") {
+      desiredModeRef.current = "test";
+      baseOpIdRef.current += 1;
+    }
     const canRequestLatest2 = canRequestLatestRef.current;
     if (mode === "base" && !canRequestLatest2) {
       await activateCachedBase(src.appId);
@@ -1582,13 +1693,14 @@ function useBundleManager({
     setLoadingMode(mode);
     setError(null);
     setStatusLabel(mode === "test" ? "Loading test bundle\u2026" : "Loading latest build\u2026");
-    if (mode === "base") {
+    if (mode === "base" && desiredModeRef.current === "base") {
       void activateCachedBase(src.appId);
     }
     try {
       const { bundlePath: path, bundle } = await resolveBundlePath(src, platform, mode);
       if (mode === "base" && opId !== baseOpIdRef.current) return;
       if (mode === "test" && opId !== testOpIdRef.current) return;
+      if (desiredModeRef.current !== mode) return;
       setBundlePath(path);
       const fingerprint = bundle.checksumSha256 ?? `id:${bundle.id}`;
       const shouldSkipInitialBaseRemount = mode === "base" && initialHydratedBaseFromDiskRef.current && !hasCompletedFirstNetworkBaseLoadRef.current && Boolean(lastBaseFingerprintRef.current) && lastBaseFingerprintRef.current === fingerprint;
@@ -1644,6 +1756,8 @@ function useBundleManager({
   const restoreBase = React5.useCallback(async () => {
     const src = baseRef.current;
     if (!src.appId) return;
+    desiredModeRef.current = "base";
+    testOpIdRef.current += 1;
     await activateCachedBase(src.appId);
     if (canRequestLatestRef.current) {
       await load(src, "base");
@@ -1805,9 +1919,12 @@ function useMergeRequests(params) {
   const { appId } = params;
   const [incoming, setIncoming] = React6.useState([]);
   const [outgoing, setOutgoing] = React6.useState([]);
-  const [loading, setLoading] = React6.useState(false);
+  const [loading, setLoading] = React6.useState(() => Boolean(appId));
   const [error, setError] = React6.useState(null);
   const [creatorStatsById, setCreatorStatsById] = React6.useState({});
+  React6.useEffect(() => {
+    setLoading(Boolean(appId));
+  }, [appId]);
   const pollUntilMerged = React6.useCallback(async (mrId) => {
     const startedAt = Date.now();
     const timeoutMs = 2 * 60 * 1e3;
@@ -1823,6 +1940,7 @@ function useMergeRequests(params) {
       setIncoming([]);
       setOutgoing([]);
       setCreatorStatsById({});
+      setLoading(false);
       return;
     }
     setLoading(true);
@@ -2057,6 +2175,45 @@ var AgentRepositoryImpl = class extends BaseRepository {
 var agentRepository = new AgentRepositoryImpl(agentRemoteDataSource);
 
 // src/studio/hooks/useStudioActions.ts
+function sleep3(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+function isRetryableNetworkError3(e) {
+  var _a;
+  const err = e;
+  const code = typeof (err == null ? void 0 : err.code) === "string" ? err.code : "";
+  const message = typeof (err == null ? void 0 : err.message) === "string" ? err.message : "";
+  if (code === "ERR_NETWORK" || code === "ECONNABORTED") return true;
+  if (message.toLowerCase().includes("network error")) return true;
+  if (message.toLowerCase().includes("timeout")) return true;
+  const status = typeof ((_a = err == null ? void 0 : err.response) == null ? void 0 : _a.status) === "number" ? err.response.status : void 0;
+  if (status && (status === 429 || status >= 500)) return true;
+  return false;
+}
+async function withRetry2(fn, opts) {
+  let lastErr = null;
+  for (let attempt = 1; attempt <= opts.attempts; attempt += 1) {
+    try {
+      return await fn();
+    } catch (e) {
+      lastErr = e;
+      const retryable = isRetryableNetworkError3(e);
+      if (!retryable || attempt >= opts.attempts) {
+        throw e;
+      }
+      const exp = Math.min(opts.maxDelayMs, opts.baseDelayMs * Math.pow(2, attempt - 1));
+      const jitter = Math.floor(Math.random() * 250);
+      await sleep3(exp + jitter);
+    }
+  }
+  throw lastErr;
+}
+function generateIdempotencyKey() {
+  var _a, _b;
+  const rnd = (_b = (_a = globalThis.crypto) == null ? void 0 : _a.randomUUID) == null ? void 0 : _b.call(_a);
+  if (rnd) return `edit:${rnd}`;
+  return `edit:${Date.now()}-${Math.random().toString(16).slice(2)}`;
+}
 function useStudioActions({
   userId,
   app,
@@ -2095,12 +2252,19 @@ function useStudioActions({
         if (attachments && attachments.length > 0 && uploadAttachments) {
           attachmentMetas = await uploadAttachments({ threadId, appId: targetApp.id, dataUrls: attachments });
         }
-        const editResult = await agentRepository.editApp({
-          prompt,
-          thread_id: threadId,
-          app_id: targetApp.id,
-          attachments: attachmentMetas && attachmentMetas.length > 0 ? attachmentMetas : void 0
-        });
+        const idempotencyKey = generateIdempotencyKey();
+        const editResult = await withRetry2(
+          async () => {
+            return await agentRepository.editApp({
+              prompt,
+              thread_id: threadId,
+              app_id: targetApp.id,
+              attachments: attachmentMetas && attachmentMetas.length > 0 ? attachmentMetas : void 0,
+              idempotencyKey
+            });
+          },
+          { attempts: 3, baseDelayMs: 500, maxDelayMs: 4e3 }
+        );
         onEditQueued == null ? void 0 : onEditQueued({
           queueItemId: editResult.queueItemId ?? null,
           queuePosition: editResult.queuePosition ?? null
@@ -2158,12 +2322,12 @@ function RuntimeRenderer({
 
 // src/studio/ui/StudioOverlay.tsx
 var React44 = __toESM(require("react"));
-var import_react_native55 = require("react-native");
+var import_react_native56 = require("react-native");
 
 // src/components/studio-sheet/StudioBottomSheet.tsx
 var React12 = __toESM(require("react"));
 var import_react_native9 = require("react-native");
-var import_bottom_sheet = __toESM(require("@gorhom/bottom-sheet"));
+var import_bottom_sheet = require("@gorhom/bottom-sheet");
 var import_react_native_safe_area_context = require("react-native-safe-area-context");
 
 // src/components/studio-sheet/StudioSheetBackground.tsx
@@ -2282,25 +2446,16 @@ function StudioBottomSheet({
   const insets = (0, import_react_native_safe_area_context.useSafeAreaInsets)();
   const internalSheetRef = React12.useRef(null);
   const resolvedSheetRef = sheetRef ?? internalSheetRef;
-  const currentIndexRef = React12.useRef(open ? snapPoints.length - 1 : -1);
+  const resolvedSnapPoints = React12.useMemo(() => [...snapPoints], [snapPoints]);
+  const currentIndexRef = React12.useRef(open ? resolvedSnapPoints.length - 1 : -1);
   const lastAppStateRef = React12.useRef(import_react_native9.AppState.currentState);
   React12.useEffect(() => {
     const sub = import_react_native9.AppState.addEventListener("change", (state) => {
-      const prev = lastAppStateRef.current;
       lastAppStateRef.current = state;
       if (state === "background" || state === "inactive") {
         import_react_native9.Keyboard.dismiss();
         return;
       }
-      if (state !== "active") return;
-      const sheet = resolvedSheetRef.current;
-      if (!sheet) return;
-      const idx = currentIndexRef.current;
-      if (open && idx >= 0) {
-        import_react_native9.Keyboard.dismiss();
-        requestAnimationFrame(() => sheet.snapToIndex(idx));
-        setTimeout(() => sheet.snapToIndex(idx), 120);
-      }
     });
     return () => sub.remove();
   }, [open, resolvedSheetRef]);
@@ -2308,11 +2463,11 @@ function StudioBottomSheet({
     const sheet = resolvedSheetRef.current;
     if (!sheet) return;
     if (open) {
-      sheet.snapToIndex(snapPoints.length - 1);
+      sheet.present();
     } else {
-      sheet.close();
+      sheet.dismiss();
     }
-  }, [open, resolvedSheetRef, snapPoints.length]);
+  }, [open, resolvedSheetRef, resolvedSnapPoints.length]);
   const handleChange = React12.useCallback(
     (index) => {
       currentIndexRef.current = index;
@@ -2321,21 +2476,24 @@ function StudioBottomSheet({
     [onOpenChange]
   );
   return /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(
-    import_bottom_sheet.default,
+    import_bottom_sheet.BottomSheetModal,
     {
       ref: resolvedSheetRef,
-      index: open ? snapPoints.length - 1 : -1,
-      snapPoints,
+      index: resolvedSnapPoints.length - 1,
+      snapPoints: resolvedSnapPoints,
       enableDynamicSizing: false,
       enablePanDownToClose: true,
       enableContentPanningGesture: false,
+      keyboardBehavior: "interactive",
+      keyboardBlurBehavior: "restore",
       android_keyboardInputMode: "adjustResize",
       backgroundComponent: (props) => /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(StudioSheetBackground, { ...props, renderBackground: background == null ? void 0 : background.renderBackground }),
       topInset: insets.top,
       bottomInset: 0,
       handleIndicatorStyle: { backgroundColor: theme.colors.handleIndicator },
-      onChange: handleChange,
       ...bottomSheetProps,
+      onChange: handleChange,
+      onDismiss: () => onOpenChange == null ? void 0 : onOpenChange(false),
       children: /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(import_react_native9.View, { style: { flex: 1, overflow: "hidden" }, children })
     }
   );
@@ -2413,6 +2571,21 @@ var ENTER_SCALE_FROM = 0.3;
 var ENTER_ROTATION_FROM_DEG = -180;
 var PULSE_DURATION_MS = 900;
 
+// src/components/utils/color.ts
+function withAlpha(color, alpha) {
+  const a = Math.max(0, Math.min(1, alpha));
+  const hex = color.trim();
+  if (!hex.startsWith("#")) return color;
+  const raw = hex.slice(1);
+  const expanded = raw.length === 3 ? raw.split("").map((c) => c + c).join("") : raw;
+  if (expanded.length !== 6) return color;
+  const r = Number.parseInt(expanded.slice(0, 2), 16);
+  const g = Number.parseInt(expanded.slice(2, 4), 16);
+  const b = Number.parseInt(expanded.slice(4, 6), 16);
+  if ([r, g, b].some((n) => Number.isNaN(n))) return color;
+  return `rgba(${r}, ${g}, ${b}, ${a})`;
+}
+
 // src/components/bubble/Bubble.tsx
 var import_jsx_runtime9 = require("react/jsx-runtime");
 var HIDDEN_OFFSET_X = 20;
@@ -2441,6 +2614,7 @@ function Bubble({
   disabled = false,
   ariaLabel,
   isLoading = false,
+  loadingBorderTone = "default",
   visible = true,
   badgeCount = 0,
   offset = DEFAULT_OFFSET,
@@ -2464,6 +2638,10 @@ function Bubble({
     if (isDanger) return "rgba(239, 68, 68, 0.9)";
     return theme.scheme === "dark" ? "rgba(0, 0, 0, 0.6)" : "rgba(255, 255, 255, 0.6)";
   }, [backgroundColor, isDanger, theme.scheme]);
+  const warningRingColors = (0, import_react.useMemo)(
+    () => [withAlpha(theme.colors.warning, 0.35), withAlpha(theme.colors.warning, 1)],
+    [theme.colors.warning]
+  );
   const translateX = (0, import_react_native_reanimated.useSharedValue)(getHiddenTranslateX(size));
   const translateY = (0, import_react_native_reanimated.useSharedValue)(getHiddenTranslateY(height));
   const scale = (0, import_react_native_reanimated.useSharedValue)(ENTER_SCALE_FROM);
@@ -2484,18 +2662,15 @@ function Bubble({
     [height, rotation, scale, size, translateX, translateY]
   );
   const animateOut = (0, import_react.useCallback)(() => {
+    var _a;
     if (isAnimatingOut.current) return;
     isAnimatingOut.current = true;
     try {
       void Haptics.impactAsync(Haptics.ImpactFeedbackStyle.Medium);
     } catch {
     }
-    animateToHidden({
-      onFinish: () => {
-        var _a;
-        (_a = onPressRef.current) == null ? void 0 : _a.call(onPressRef);
-      }
-    });
+    (_a = onPressRef.current) == null ? void 0 : _a.call(onPressRef);
+    animateToHidden();
   }, [animateToHidden]);
   (0, import_react.useEffect)(() => {
     if (isLoading) {
@@ -2580,10 +2755,11 @@ function Bubble({
     ]
   }));
   const borderAnimatedStyle = (0, import_react_native_reanimated.useAnimatedStyle)(() => {
+    const isWarning = loadingBorderTone === "warning";
     const borderColor = (0, import_react_native_reanimated.interpolateColor)(
       borderPulse.value,
       [0, 1],
-      isDanger ? ["rgba(239,68,68,0.4)", "rgba(239,68,68,1)"] : theme.scheme === "dark" ? ["rgba(255,255,255,0.2)", "rgba(255,255,255,0.9)"] : ["rgba(55,0,179,0.2)", "rgba(55,0,179,0.9)"]
+      isDanger ? ["rgba(239,68,68,0.4)", "rgba(239,68,68,1)"] : isWarning ? warningRingColors : theme.scheme === "dark" ? ["rgba(255,255,255,0.2)", "rgba(255,255,255,0.9)"] : ["rgba(55,0,179,0.2)", "rgba(55,0,179,0.9)"]
     );
     return {
       borderWidth: isLoading ? 2 : 0,
@@ -2663,23 +2839,6 @@ var styles = import_react_native11.StyleSheet.create({
 var React14 = __toESM(require("react"));
 var import_react_native12 = require("react-native");
 var import_expo_linear_gradient = require("expo-linear-gradient");
-
-// src/components/utils/color.ts
-function withAlpha(color, alpha) {
-  const a = Math.max(0, Math.min(1, alpha));
-  const hex = color.trim();
-  if (!hex.startsWith("#")) return color;
-  const raw = hex.slice(1);
-  const expanded = raw.length === 3 ? raw.split("").map((c) => c + c).join("") : raw;
-  if (expanded.length !== 6) return color;
-  const r = Number.parseInt(expanded.slice(0, 2), 16);
-  const g = Number.parseInt(expanded.slice(2, 4), 16);
-  const b = Number.parseInt(expanded.slice(4, 6), 16);
-  if ([r, g, b].some((n) => Number.isNaN(n))) return color;
-  return `rgba(${r}, ${g}, ${b}, ${a})`;
-}
-
-// src/components/overlays/EdgeGlowFrame.tsx
 var import_jsx_runtime10 = require("react/jsx-runtime");
 function baseColor(role, theme) {
   switch (role) {
@@ -3401,7 +3560,6 @@ function ChatComposer({
   disabled = false,
   sendDisabled = false,
   sending = false,
-  autoFocus = false,
   onSend,
   attachments = [],
   onRemoveAttachment,
@@ -3424,18 +3582,6 @@ function ChatComposer({
   const maxInputHeight = React19.useMemo(() => import_react_native18.Dimensions.get("window").height * 0.5, []);
   const shakeAnim = React19.useRef(new import_react_native18.Animated.Value(0)).current;
   const [sendPressed, setSendPressed] = React19.useState(false);
-  const inputRef = React19.useRef(null);
-  const prevAutoFocusRef = React19.useRef(false);
-  React19.useEffect(() => {
-    const shouldFocus = autoFocus && !prevAutoFocusRef.current && !disabled && !sending;
-    prevAutoFocusRef.current = autoFocus;
-    if (!shouldFocus) return;
-    const t = setTimeout(() => {
-      var _a;
-      (_a = inputRef.current) == null ? void 0 : _a.focus();
-    }, 75);
-    return () => clearTimeout(t);
-  }, [autoFocus, disabled, sending]);
   const triggerShake = React19.useCallback(() => {
     shakeAnim.setValue(0);
     import_react_native18.Animated.sequence([
@@ -3466,7 +3612,7 @@ function ChatComposer({
       onLayout: (e) => onLayout == null ? void 0 : onLayout({ height: e.nativeEvent.layout.height }),
       children: /* @__PURE__ */ (0, import_jsx_runtime17.jsxs)(import_react_native18.View, { style: { flexDirection: "row", alignItems: "flex-end", gap: 8 }, children: [
         /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(import_react_native18.Animated.View, { style: { flex: 1, transform: [{ translateX: shakeAnim }] }, children: /* @__PURE__ */ (0, import_jsx_runtime17.jsxs)(
-          ResettableLiquidGlassView,
+          import_liquid_glass4.LiquidGlassView,
           {
             style: [
               // LiquidGlassView doesn't reliably auto-size to children; ensure enough height for the
@@ -3518,13 +3664,12 @@ function ChatComposer({
               /* @__PURE__ */ (0, import_jsx_runtime17.jsx)(
                 MultilineTextInput,
                 {
-                  ref: inputRef,
                   value: text,
                   onChangeText: setText,
                   placeholder,
                   editable: !disabled && !sending,
                   useBottomSheetTextInput,
-                  autoFocus,
+                  autoFocus: false,
                   placeholderTextColor,
                   scrollEnabled: true,
                   style: {
@@ -4950,10 +5095,42 @@ var import_lucide_react_native7 = require("lucide-react-native");
 // src/components/primitives/MarkdownText.tsx
 var import_react_native37 = require("react-native");
 var import_react_native_markdown_display = __toESM(require("react-native-markdown-display"));
+var import_react2 = require("react");
 var import_jsx_runtime39 = require("react/jsx-runtime");
+function copyMarkdownToClipboard(markdown) {
+  var _a;
+  if (!markdown) {
+    return;
+  }
+  const navigatorClipboard = (_a = globalThis == null ? void 0 : globalThis.navigator) == null ? void 0 : _a.clipboard;
+  if (navigatorClipboard == null ? void 0 : navigatorClipboard.writeText) {
+    void navigatorClipboard.writeText(markdown);
+    return;
+  }
+  try {
+    const expoClipboard = require("expo-clipboard");
+    if (expoClipboard == null ? void 0 : expoClipboard.setStringAsync) {
+      void expoClipboard.setStringAsync(markdown);
+      return;
+    }
+  } catch {
+  }
+  try {
+    const rnClipboard = require("@react-native-clipboard/clipboard");
+    if (rnClipboard == null ? void 0 : rnClipboard.setString) {
+      rnClipboard.setString(markdown);
+    }
+  } catch {
+  }
+}
 function MarkdownText({ markdown, variant = "chat", bodyColor, style }) {
   const theme = useTheme();
   const isDark = theme.scheme === "dark";
+  const [showCopied, setShowCopied] = (0, import_react2.useState)(false);
+  const [tooltipPosition, setTooltipPosition] = (0, import_react2.useState)(null);
+  const [tooltipWidth, setTooltipWidth] = (0, import_react2.useState)(0);
+  const hideTimerRef = (0, import_react2.useRef)(null);
+  const containerRef = (0, import_react2.useRef)(null);
   const baseBodyColor = variant === "mergeRequest" ? theme.colors.textMuted : theme.colors.text;
   const linkColor = variant === "mergeRequest" ? isDark ? theme.colors.primary : "#3700B3" : theme.colors.link;
   const linkWeight = variant === "mergeRequest" ? theme.typography.fontWeight.semibold : void 0;
@@ -4961,40 +5138,96 @@ function MarkdownText({ markdown, variant = "chat", bodyColor, style }) {
   const codeTextColor = isDark ? "#FFFFFF" : theme.colors.text;
   const paragraphBottom = variant === "mergeRequest" ? 8 : 6;
   const baseLineHeight = variant === "mergeRequest" ? 22 : 20;
-  return /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(import_react_native37.View, { style, children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
-    import_react_native_markdown_display.default,
-    {
-      style: {
-        body: { color: bodyColor ?? baseBodyColor, fontSize: 14, lineHeight: baseLineHeight },
-        paragraph: { marginTop: 0, marginBottom: paragraphBottom },
-        link: { color: linkColor, fontWeight: linkWeight },
-        code_inline: {
-          backgroundColor: codeBgColor,
-          color: codeTextColor,
-          paddingHorizontal: variant === "mergeRequest" ? 6 : 4,
-          paddingVertical: variant === "mergeRequest" ? 2 : 0,
-          borderRadius: variant === "mergeRequest" ? 6 : 4,
-          fontFamily: import_react_native37.Platform.OS === "ios" ? "Menlo" : "monospace",
-          fontSize: 13
+  (0, import_react2.useEffect)(() => {
+    return () => {
+      if (hideTimerRef.current) {
+        clearTimeout(hideTimerRef.current);
+      }
+    };
+  }, []);
+  const handleLongPress = (event) => {
+    var _a;
+    const { locationX, locationY, pageX, pageY } = event.nativeEvent;
+    if ((_a = containerRef.current) == null ? void 0 : _a.measureInWindow) {
+      containerRef.current.measureInWindow((x, y) => {
+        setTooltipPosition({ x: pageX - x, y: pageY - y });
+      });
+    } else {
+      setTooltipPosition({ x: locationX, y: locationY });
+    }
+    copyMarkdownToClipboard(markdown);
+    setShowCopied(true);
+    if (hideTimerRef.current) {
+      clearTimeout(hideTimerRef.current);
+    }
+    hideTimerRef.current = setTimeout(() => {
+      setShowCopied(false);
+    }, 1200);
+  };
+  return /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(import_react_native37.Pressable, { style, onLongPress: handleLongPress, children: /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)(import_react_native37.View, { ref: containerRef, style: { position: "relative" }, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
+      import_react_native_markdown_display.default,
+      {
+        style: {
+          body: { color: bodyColor ?? baseBodyColor, fontSize: 14, lineHeight: baseLineHeight },
+          paragraph: { marginTop: 0, marginBottom: paragraphBottom },
+          link: { color: linkColor, fontWeight: linkWeight },
+          code_inline: {
+            backgroundColor: codeBgColor,
+            color: codeTextColor,
+            paddingHorizontal: variant === "mergeRequest" ? 6 : 4,
+            paddingVertical: variant === "mergeRequest" ? 2 : 0,
+            borderRadius: variant === "mergeRequest" ? 6 : 4,
+            fontFamily: import_react_native37.Platform.OS === "ios" ? "Menlo" : "monospace",
+            fontSize: 13
+          },
+          code_block: {
+            backgroundColor: codeBgColor,
+            color: codeTextColor,
+            padding: variant === "mergeRequest" ? 12 : 8,
+            borderRadius: variant === "mergeRequest" ? 8 : 6,
+            marginVertical: variant === "mergeRequest" ? 8 : 0
+          },
+          fence: {
+            backgroundColor: codeBgColor,
+            color: codeTextColor,
+            padding: variant === "mergeRequest" ? 12 : 8,
+            borderRadius: variant === "mergeRequest" ? 8 : 6,
+            marginVertical: variant === "mergeRequest" ? 8 : 0
+          }
         },
-        code_block: {
-          backgroundColor: codeBgColor,
-          color: codeTextColor,
-          padding: variant === "mergeRequest" ? 12 : 8,
-          borderRadius: variant === "mergeRequest" ? 8 : 6,
-          marginVertical: variant === "mergeRequest" ? 8 : 0
+        children: markdown
+      }
+    ),
+    showCopied && tooltipPosition ? /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
+      import_react_native37.View,
+      {
+        pointerEvents: "none",
+        style: {
+          position: "absolute",
+          left: tooltipPosition.x,
+          top: tooltipPosition.y - theme.spacing.lg - 32,
+          backgroundColor: theme.colors.success,
+          borderRadius: theme.radii.pill,
+          paddingHorizontal: theme.spacing.sm,
+          paddingVertical: theme.spacing.xs,
+          transform: [{ translateX: tooltipWidth ? -tooltipWidth / 2 : 0 }]
         },
-        fence: {
-          backgroundColor: codeBgColor,
-          color: codeTextColor,
-          padding: variant === "mergeRequest" ? 12 : 8,
-          borderRadius: variant === "mergeRequest" ? 8 : 6,
-          marginVertical: variant === "mergeRequest" ? 8 : 0
-        }
-      },
-      children: markdown
-    }
-  ) });
+        onLayout: (event) => setTooltipWidth(event.nativeEvent.layout.width),
+        children: /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
+          import_react_native37.Text,
+          {
+            style: {
+              color: theme.colors.onSuccess,
+              fontSize: theme.typography.fontSize.xs,
+              fontWeight: theme.typography.fontWeight.medium
+            },
+            children: "Copied"
+          }
+        )
+      }
+    ) : null
+  ] }) });
 }
 
 // src/components/merge-requests/mergeRequestStatusDisplay.ts
@@ -5322,7 +5555,7 @@ function ReviewMergeRequestCard({
               children: status.text
             }
           ),
-          /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Text, { style: { color: theme.colors.textMuted, fontSize: 12, lineHeight: 16, marginBottom: 12 }, children: creator ? `${creator.approvedOpenedMergeRequests} approved merge${creator.approvedOpenedMergeRequests !== 1 ? "s" : ""}` : "Loading stats..." }),
+          /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Text, { style: { color: theme.colors.textMuted, fontSize: 12, lineHeight: 16, marginBottom: 12 }, children: creator ? `${creator.approvedOrMergedMergeRequests} approved merge${creator.approvedOrMergedMergeRequests !== 1 ? "s" : ""}` : "Loading stats..." }),
           mr.description ? /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(MarkdownText, { markdown: mr.description, variant: "mergeRequest" }) : null
         ] }) : null,
         /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(import_react_native40.View, { style: { height: 1, backgroundColor: withAlpha(theme.colors.borderStrong, 0.5), marginTop: 12, marginBottom: 12 } }),
@@ -6102,23 +6335,88 @@ ${shareUrl}`;
 
 // src/studio/ui/ChatPanel.tsx
 var React41 = __toESM(require("react"));
-var import_react_native52 = require("react-native");
+var import_react_native53 = require("react-native");
 
 // src/components/chat/ChatPage.tsx
 var React38 = __toESM(require("react"));
-var import_react_native47 = require("react-native");
+var import_react_native48 = require("react-native");
 var import_react_native_safe_area_context4 = require("react-native-safe-area-context");
 
 // src/components/chat/ChatMessageList.tsx
 var React37 = __toESM(require("react"));
-var import_react_native46 = require("react-native");
+var import_react_native47 = require("react-native");
 var import_bottom_sheet5 = require("@gorhom/bottom-sheet");
 
 // src/components/chat/ChatMessageBubble.tsx
-var import_react_native44 = require("react-native");
+var import_react_native45 = require("react-native");
 var import_lucide_react_native10 = require("lucide-react-native");
+
+// src/components/primitives/Button.tsx
+var import_react_native44 = require("react-native");
 var import_jsx_runtime46 = require("react/jsx-runtime");
-function ChatMessageBubble({ message, renderContent, style }) {
+function backgroundFor2(variant, theme, pressed, disabled) {
+  const { colors } = theme;
+  if (variant === "ghost") return "transparent";
+  if (disabled) {
+    return colors.neutral;
+  }
+  const base = variant === "primary" ? colors.primary : variant === "danger" ? colors.danger : colors.neutral;
+  if (!pressed) return base;
+  return base;
+}
+function borderFor(variant, theme) {
+  if (variant !== "ghost") return {};
+  return { borderWidth: 1, borderColor: theme.colors.border };
+}
+function paddingFor(size, theme) {
+  switch (size) {
+    case "sm":
+      return { paddingHorizontal: theme.spacing.md, paddingVertical: theme.spacing.sm, minHeight: 36 };
+    case "icon":
+      return { paddingHorizontal: 0, paddingVertical: 0, minHeight: 44, minWidth: 44 };
+    case "md":
+    default:
+      return { paddingHorizontal: theme.spacing.lg, paddingVertical: theme.spacing.md, minHeight: 44 };
+  }
+}
+function Button({
+  variant = "neutral",
+  size = "md",
+  disabled,
+  style,
+  children,
+  ...props
+}) {
+  const theme = useTheme();
+  const isDisabled = disabled ?? void 0;
+  return /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(
+    import_react_native44.Pressable,
+    {
+      ...props,
+      disabled: isDisabled,
+      style: (state) => {
+        const pressed = state.pressed;
+        const base = {
+          alignItems: "center",
+          justifyContent: "center",
+          flexDirection: "row",
+          borderRadius: size === "icon" ? theme.radii.pill : theme.radii.pill,
+          backgroundColor: backgroundFor2(variant, theme, pressed, isDisabled),
+          opacity: pressed && !isDisabled ? 0.92 : 1,
+          ...paddingFor(size, theme),
+          ...borderFor(variant, theme)
+        };
+        const resolved = typeof style === "function" ? style({ pressed, disabled: isDisabled }) : style;
+        return [base, resolved];
+      },
+      children
+    }
+  );
+}
+
+// src/components/chat/ChatMessageBubble.tsx
+var import_jsx_runtime47 = require("react/jsx-runtime");
+function ChatMessageBubble({ message, renderContent, isLast, retrying, onRetry, style }) {
   var _a, _b;
   const theme = useTheme();
   const metaEvent = ((_a = message.meta) == null ? void 0 : _a.event) ?? null;
@@ -6133,49 +6431,77 @@ function ChatMessageBubble({ message, renderContent, style }) {
   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;
-  return /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(import_react_native44.View, { style: [align, style], children: /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(
-    Surface,
-    {
-      variant: bubbleVariant,
-      style: [
-        {
-          maxWidth: "85%",
-          borderRadius: theme.radii.lg,
-          paddingHorizontal: theme.spacing.lg,
-          paddingVertical: theme.spacing.md,
-          borderWidth: 1,
-          borderColor: theme.colors.border
-        },
-        cornerStyle
-      ],
-      children: /* @__PURE__ */ (0, import_jsx_runtime46.jsxs)(import_react_native44.View, { style: { flexDirection: "row", alignItems: "center" }, children: [
-        isMergeCompleted || isSyncCompleted ? /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(import_lucide_react_native10.CheckCheck, { size: 16, color: theme.colors.success, style: { marginRight: theme.spacing.sm } }) : null,
-        isMergeApproved || isSyncStarted ? /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(import_lucide_react_native10.GitMerge, { size: 16, color: theme.colors.text, style: { marginRight: theme.spacing.sm } }) : null,
-        /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(import_react_native44.View, { style: { flexShrink: 1, minWidth: 0 }, children: renderContent ? renderContent(message) : /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(MarkdownText, { markdown: message.content, variant: "chat", bodyColor }) })
-      ] })
-    }
-  ) });
+  const showRetry = Boolean(onRetry) && isLast && metaStatus === "error";
+  const retryLabel = retrying ? "Retrying..." : "Retry";
+  return /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)(import_react_native45.View, { style: [align, style], children: [
+    /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(
+      Surface,
+      {
+        variant: bubbleVariant,
+        style: [
+          {
+            maxWidth: "85%",
+            borderRadius: theme.radii.lg,
+            paddingHorizontal: theme.spacing.lg,
+            paddingVertical: theme.spacing.md,
+            borderWidth: 1,
+            borderColor: theme.colors.border
+          },
+          cornerStyle
+        ],
+        children: /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)(import_react_native45.View, { style: { flexDirection: "row", alignItems: "center" }, children: [
+          isMergeCompleted || isSyncCompleted ? /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(import_lucide_react_native10.CheckCheck, { size: 16, color: theme.colors.success, style: { marginRight: theme.spacing.sm } }) : null,
+          isMergeApproved || isSyncStarted ? /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(import_lucide_react_native10.GitMerge, { size: 16, color: theme.colors.text, style: { marginRight: theme.spacing.sm } }) : null,
+          /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(import_react_native45.View, { style: { flexShrink: 1, minWidth: 0 }, children: renderContent ? renderContent(message) : /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(MarkdownText, { markdown: message.content, variant: "chat", bodyColor }) })
+        ] })
+      }
+    ),
+    showRetry ? /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(import_react_native45.View, { style: { marginTop: theme.spacing.xs, alignSelf: align.alignSelf }, children: /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(
+      Button,
+      {
+        variant: "ghost",
+        size: "sm",
+        onPress: onRetry,
+        disabled: retrying,
+        style: { borderColor: theme.colors.danger },
+        accessibilityLabel: "Retry send",
+        children: /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)(import_react_native45.View, { style: { flexDirection: "row", alignItems: "center" }, children: [
+          !retrying ? /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(import_lucide_react_native10.RotateCcw, { size: 14, color: theme.colors.danger }) : null,
+          /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(
+            Text,
+            {
+              variant: "caption",
+              color: theme.colors.danger,
+              style: { marginLeft: retrying ? 0 : theme.spacing.xs },
+              numberOfLines: 1,
+              children: retryLabel
+            }
+          )
+        ] })
+      }
+    ) }) : null
+  ] });
 }
 
 // src/components/chat/TypingIndicator.tsx
 var React36 = __toESM(require("react"));
-var import_react_native45 = require("react-native");
-var import_jsx_runtime47 = require("react/jsx-runtime");
+var import_react_native46 = require("react-native");
+var import_jsx_runtime48 = require("react/jsx-runtime");
 function TypingIndicator({ style }) {
   const theme = useTheme();
   const dotColor = theme.colors.textSubtle;
   const anims = React36.useMemo(
-    () => [new import_react_native45.Animated.Value(0.3), new import_react_native45.Animated.Value(0.3), new import_react_native45.Animated.Value(0.3)],
+    () => [new import_react_native46.Animated.Value(0.3), new import_react_native46.Animated.Value(0.3), new import_react_native46.Animated.Value(0.3)],
     []
   );
   React36.useEffect(() => {
     const loops = [];
     anims.forEach((a, idx) => {
-      const seq = import_react_native45.Animated.sequence([
-        import_react_native45.Animated.timing(a, { toValue: 1, duration: 420, useNativeDriver: true, delay: idx * 140 }),
-        import_react_native45.Animated.timing(a, { toValue: 0.3, duration: 420, useNativeDriver: true })
+      const seq = import_react_native46.Animated.sequence([
+        import_react_native46.Animated.timing(a, { toValue: 1, duration: 420, useNativeDriver: true, delay: idx * 140 }),
+        import_react_native46.Animated.timing(a, { toValue: 0.3, duration: 420, useNativeDriver: true })
       ]);
-      const loop = import_react_native45.Animated.loop(seq);
+      const loop = import_react_native46.Animated.loop(seq);
       loops.push(loop);
       loop.start();
     });
@@ -6183,8 +6509,8 @@ function TypingIndicator({ style }) {
       loops.forEach((l) => l.stop());
     };
   }, [anims]);
-  return /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(import_react_native45.View, { style: [{ flexDirection: "row", alignItems: "center" }, style], children: anims.map((a, i) => /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(
-    import_react_native45.Animated.View,
+  return /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(import_react_native46.View, { style: [{ flexDirection: "row", alignItems: "center" }, style], children: anims.map((a, i) => /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(
+    import_react_native46.Animated.View,
     {
       style: {
         width: 8,
@@ -6193,7 +6519,7 @@ function TypingIndicator({ style }) {
         marginHorizontal: 3,
         backgroundColor: dotColor,
         opacity: a,
-        transform: [{ translateY: import_react_native45.Animated.multiply(import_react_native45.Animated.subtract(a, 0.3), 2) }]
+        transform: [{ translateY: import_react_native46.Animated.multiply(import_react_native46.Animated.subtract(a, 0.3), 2) }]
       }
     },
     i
@@ -6201,12 +6527,14 @@ function TypingIndicator({ style }) {
 }
 
 // src/components/chat/ChatMessageList.tsx
-var import_jsx_runtime48 = require("react/jsx-runtime");
+var import_jsx_runtime49 = require("react/jsx-runtime");
 var ChatMessageList = React37.forwardRef(
   ({
     messages,
     showTypingIndicator = false,
     renderMessageContent,
+    onRetryMessage,
+    isRetryingMessage,
     contentStyle,
     bottomInset = 0,
     onNearBottomChange,
@@ -6220,6 +6548,7 @@ var ChatMessageList = React37.forwardRef(
     const data = React37.useMemo(() => {
       return [...messages].reverse();
     }, [messages]);
+    const lastMessageId = messages.length > 0 ? messages[messages.length - 1].id : null;
     const scrollToBottom = React37.useCallback((options) => {
       var _a;
       const animated = (options == null ? void 0 : options.animated) ?? true;
@@ -6255,7 +6584,7 @@ var ChatMessageList = React37.forwardRef(
       }
       return void 0;
     }, [showTypingIndicator, scrollToBottom]);
-    return /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(
       import_bottom_sheet5.BottomSheetFlatList,
       {
         ref: listRef,
@@ -6281,11 +6610,20 @@ var ChatMessageList = React37.forwardRef(
           },
           contentStyle
         ],
-        ItemSeparatorComponent: () => /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(import_react_native46.View, { style: { height: theme.spacing.sm } }),
-        renderItem: ({ item }) => /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(ChatMessageBubble, { message: item, renderContent: renderMessageContent }),
-        ListHeaderComponent: /* @__PURE__ */ (0, import_jsx_runtime48.jsxs)(import_react_native46.View, { children: [
-          showTypingIndicator ? /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(import_react_native46.View, { style: { marginTop: theme.spacing.sm, alignSelf: "flex-start", paddingHorizontal: theme.spacing.lg }, children: /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(TypingIndicator, {}) }) : null,
-          bottomInset > 0 ? /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(import_react_native46.View, { style: { height: bottomInset } }) : null
+        ItemSeparatorComponent: () => /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(import_react_native47.View, { style: { height: theme.spacing.sm } }),
+        renderItem: ({ item }) => /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(
+          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__ */ (0, import_jsx_runtime49.jsxs)(import_react_native47.View, { children: [
+          showTypingIndicator ? /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(import_react_native47.View, { style: { marginTop: theme.spacing.sm, alignSelf: "flex-start", paddingHorizontal: theme.spacing.lg }, children: /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(TypingIndicator, {}) }) : null,
+          bottomInset > 0 ? /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(import_react_native47.View, { style: { height: bottomInset } }) : null
         ] })
       }
     );
@@ -6294,12 +6632,14 @@ var ChatMessageList = React37.forwardRef(
 ChatMessageList.displayName = "ChatMessageList";
 
 // src/components/chat/ChatPage.tsx
-var import_jsx_runtime49 = require("react/jsx-runtime");
+var import_jsx_runtime50 = require("react/jsx-runtime");
 function ChatPage({
   header,
   messages,
   showTypingIndicator,
   renderMessageContent,
+  onRetryMessage,
+  isRetryingMessage,
   topBanner,
   composerTop,
   composer,
@@ -6313,17 +6653,7 @@ function ChatPage({
   const insets = (0, import_react_native_safe_area_context4.useSafeAreaInsets)();
   const [composerHeight, setComposerHeight] = React38.useState(0);
   const [composerTopHeight, setComposerTopHeight] = React38.useState(0);
-  const [keyboardVisible, setKeyboardVisible] = React38.useState(false);
-  React38.useEffect(() => {
-    if (import_react_native47.Platform.OS !== "ios") return;
-    const show = import_react_native47.Keyboard.addListener("keyboardWillShow", () => setKeyboardVisible(true));
-    const hide = import_react_native47.Keyboard.addListener("keyboardWillHide", () => setKeyboardVisible(false));
-    return () => {
-      show.remove();
-      hide.remove();
-    };
-  }, []);
-  const footerBottomPadding = import_react_native47.Platform.OS === "ios" ? keyboardVisible ? 0 : insets.bottom : insets.bottom + 10;
+  const footerBottomPadding = import_react_native48.Platform.OS === "ios" ? insets.bottom : insets.bottom + 10;
   const totalComposerHeight = composerHeight + composerTopHeight;
   const overlayBottom = totalComposerHeight + footerBottomPadding + theme.spacing.lg;
   const bottomInset = totalComposerHeight + footerBottomPadding + theme.spacing.xl;
@@ -6340,22 +6670,24 @@ function ChatPage({
     if (composerTop) return;
     setComposerTopHeight(0);
   }, [composerTop]);
-  return /* @__PURE__ */ (0, import_jsx_runtime49.jsxs)(import_react_native47.View, { style: [{ flex: 1 }, style], children: [
-    header ? /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(import_react_native47.View, { children: header }) : null,
-    topBanner ? /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(import_react_native47.View, { style: { paddingHorizontal: theme.spacing.lg, paddingTop: theme.spacing.sm }, children: topBanner }) : null,
-    /* @__PURE__ */ (0, import_jsx_runtime49.jsxs)(import_react_native47.View, { style: { flex: 1 }, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime49.jsxs)(
-        import_react_native47.View,
+  return /* @__PURE__ */ (0, import_jsx_runtime50.jsxs)(import_react_native48.View, { style: [{ flex: 1 }, style], children: [
+    header ? /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(import_react_native48.View, { children: header }) : null,
+    topBanner ? /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(import_react_native48.View, { style: { paddingHorizontal: theme.spacing.lg, paddingTop: theme.spacing.sm }, children: topBanner }) : null,
+    /* @__PURE__ */ (0, import_jsx_runtime50.jsxs)(import_react_native48.View, { style: { flex: 1 }, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime50.jsxs)(
+        import_react_native48.View,
         {
           style: { flex: 1 },
           children: [
-            /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(
+            /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(
               ChatMessageList,
               {
                 ref: listRef,
                 messages,
                 showTypingIndicator,
                 renderMessageContent,
+                onRetryMessage,
+                isRetryingMessage,
                 onNearBottomChange,
                 bottomInset
               }
@@ -6364,8 +6696,8 @@ function ChatPage({
           ]
         }
       ),
-      /* @__PURE__ */ (0, import_jsx_runtime49.jsxs)(
-        import_react_native47.View,
+      /* @__PURE__ */ (0, import_jsx_runtime50.jsxs)(
+        import_react_native48.View,
         {
           style: {
             position: "absolute",
@@ -6377,15 +6709,15 @@ function ChatPage({
             paddingBottom: footerBottomPadding
           },
           children: [
-            composerTop ? /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(
-              import_react_native47.View,
+            composerTop ? /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(
+              import_react_native48.View,
               {
                 style: { marginBottom: theme.spacing.sm },
                 onLayout: (e) => setComposerTopHeight(e.nativeEvent.layout.height),
                 children: composerTop
               }
             ) : null,
-            /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(
+            /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(
               ChatComposer,
               {
                 ...composer,
@@ -6402,9 +6734,9 @@ function ChatPage({
 
 // src/components/chat/ScrollToBottomButton.tsx
 var React39 = __toESM(require("react"));
-var import_react_native48 = require("react-native");
+var import_react_native49 = require("react-native");
 var import_react_native_reanimated2 = __toESM(require("react-native-reanimated"));
-var import_jsx_runtime50 = require("react/jsx-runtime");
+var import_jsx_runtime51 = require("react/jsx-runtime");
 function ScrollToBottomButton({ visible, onPress, children, style }) {
   const theme = useTheme();
   const progress = (0, import_react_native_reanimated2.useSharedValue)(visible ? 1 : 0);
@@ -6418,7 +6750,7 @@ function ScrollToBottomButton({ visible, onPress, children, style }) {
   }));
   const bg = theme.scheme === "dark" ? "rgba(39,39,42,0.9)" : "rgba(244,244,245,0.95)";
   const border = theme.scheme === "dark" ? withAlpha("#FFFFFF", 0.12) : withAlpha("#000000", 0.08);
-  return /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(
     import_react_native_reanimated2.default.View,
     {
       pointerEvents: visible ? "auto" : "none",
@@ -6432,8 +6764,8 @@ function ScrollToBottomButton({ visible, onPress, children, style }) {
         style,
         animStyle
       ],
-      children: /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(
-        import_react_native48.View,
+      children: /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(
+        import_react_native49.View,
         {
           style: {
             width: 44,
@@ -6451,8 +6783,8 @@ function ScrollToBottomButton({ visible, onPress, children, style }) {
             elevation: 5,
             opacity: pressed ? 0.85 : 1
           },
-          children: /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(
-            import_react_native48.Pressable,
+          children: /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(
+            import_react_native49.Pressable,
             {
               onPress,
               onPressIn: () => setPressed(true),
@@ -6469,16 +6801,16 @@ function ScrollToBottomButton({ visible, onPress, children, style }) {
 }
 
 // src/components/chat/ChatHeader.tsx
-var import_react_native49 = require("react-native");
-var import_jsx_runtime51 = require("react/jsx-runtime");
+var import_react_native50 = require("react-native");
+var import_jsx_runtime52 = require("react/jsx-runtime");
 function ChatHeader({ left, right, center, style }) {
-  const flattenedStyle = import_react_native49.StyleSheet.flatten([
+  const flattenedStyle = import_react_native50.StyleSheet.flatten([
     {
       paddingTop: 0
     },
     style
   ]);
-  return /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(
     StudioSheetHeader,
     {
       left,
@@ -6490,13 +6822,13 @@ function ChatHeader({ left, right, center, style }) {
 }
 
 // src/components/chat/ForkNoticeBanner.tsx
-var import_react_native50 = require("react-native");
-var import_jsx_runtime52 = require("react/jsx-runtime");
+var import_react_native51 = require("react-native");
+var import_jsx_runtime53 = require("react/jsx-runtime");
 function ForkNoticeBanner({ isOwner = true, title, description, style }) {
   const theme = useTheme();
   const resolvedTitle = title ?? (isOwner ? "Remixed app" : "Remix app");
   const resolvedDescription = description ?? (isOwner ? "Any changes you make will be a remix of the original app. You can view the edited version in the Remix tab in your apps page." : "Once you make edits, this remixed version will appear on your Remixed apps page.");
-  return /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime53.jsx)(
     Card,
     {
       variant: "surfaceRaised",
@@ -6511,8 +6843,8 @@ function ForkNoticeBanner({ isOwner = true, title, description, style }) {
         },
         style
       ],
-      children: /* @__PURE__ */ (0, import_jsx_runtime52.jsxs)(import_react_native50.View, { style: { minWidth: 0 }, children: [
-        /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(
+      children: /* @__PURE__ */ (0, import_jsx_runtime53.jsxs)(import_react_native51.View, { style: { minWidth: 0 }, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime53.jsx)(
           Text,
           {
             style: {
@@ -6526,7 +6858,7 @@ function ForkNoticeBanner({ isOwner = true, title, description, style }) {
             children: resolvedTitle
           }
         ),
-        /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(
+        /* @__PURE__ */ (0, import_jsx_runtime53.jsx)(
           Text,
           {
             style: {
@@ -6545,8 +6877,8 @@ function ForkNoticeBanner({ isOwner = true, title, description, style }) {
 
 // src/components/chat/ChatQueue.tsx
 var React40 = __toESM(require("react"));
-var import_react_native51 = require("react-native");
-var import_jsx_runtime53 = require("react/jsx-runtime");
+var import_react_native52 = require("react-native");
+var import_jsx_runtime54 = require("react/jsx-runtime");
 function ChatQueue({ items, onRemove }) {
   const theme = useTheme();
   const [expanded, setExpanded] = React40.useState({});
@@ -6578,8 +6910,8 @@ ${trimmedLine2}\u2026 `;
     setRemoving((prev) => Object.fromEntries(Object.entries(prev).filter(([id]) => ids.has(id))));
   }, [items]);
   if (items.length === 0) return null;
-  return /* @__PURE__ */ (0, import_jsx_runtime53.jsxs)(
-    import_react_native51.View,
+  return /* @__PURE__ */ (0, import_jsx_runtime54.jsxs)(
+    import_react_native52.View,
     {
       style: {
         borderWidth: 1,
@@ -6590,16 +6922,16 @@ ${trimmedLine2}\u2026 `;
         backgroundColor: "transparent"
       },
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime53.jsx)(Text, { variant: "caption", style: { marginBottom: theme.spacing.sm }, children: "Queue" }),
-        /* @__PURE__ */ (0, import_jsx_runtime53.jsx)(import_react_native51.View, { style: { gap: theme.spacing.sm }, children: items.map((item) => {
+        /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(Text, { variant: "caption", style: { marginBottom: theme.spacing.sm }, children: "Queue" }),
+        /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(import_react_native52.View, { style: { gap: theme.spacing.sm }, children: items.map((item) => {
           const isExpanded = Boolean(expanded[item.id]);
           const showToggle = Boolean(canExpand[item.id]);
           const prompt = item.prompt ?? "";
           const moreLabel = "more";
           const displayPrompt = !isExpanded && showToggle && collapsedText[item.id] ? collapsedText[item.id] : prompt;
           const isRemoving = Boolean(removing[item.id]);
-          return /* @__PURE__ */ (0, import_jsx_runtime53.jsxs)(
-            import_react_native51.View,
+          return /* @__PURE__ */ (0, import_jsx_runtime54.jsxs)(
+            import_react_native52.View,
             {
               style: {
                 flexDirection: "row",
@@ -6611,8 +6943,8 @@ ${trimmedLine2}\u2026 `;
                 backgroundColor: withAlpha(theme.colors.surface, theme.scheme === "dark" ? 0.8 : 0.9)
               },
               children: [
-                /* @__PURE__ */ (0, import_jsx_runtime53.jsxs)(import_react_native51.View, { style: { flex: 1 }, children: [
-                  !canExpand[item.id] ? /* @__PURE__ */ (0, import_jsx_runtime53.jsx)(
+                /* @__PURE__ */ (0, import_jsx_runtime54.jsxs)(import_react_native52.View, { style: { flex: 1 }, children: [
+                  !canExpand[item.id] ? /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(
                     Text,
                     {
                       style: { position: "absolute", opacity: 0, zIndex: -1, width: "100%" },
@@ -6631,14 +6963,14 @@ ${trimmedLine2}\u2026 `;
                       children: prompt
                     }
                   ) : null,
-                  /* @__PURE__ */ (0, import_jsx_runtime53.jsxs)(
+                  /* @__PURE__ */ (0, import_jsx_runtime54.jsxs)(
                     Text,
                     {
                       variant: "bodyMuted",
                       numberOfLines: isExpanded ? void 0 : 2,
                       children: [
                         displayPrompt,
-                        !isExpanded && showToggle ? /* @__PURE__ */ (0, import_jsx_runtime53.jsx)(
+                        !isExpanded && showToggle ? /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(
                           Text,
                           {
                             color: theme.colors.text,
@@ -6650,18 +6982,18 @@ ${trimmedLine2}\u2026 `;
                       ]
                     }
                   ),
-                  showToggle && isExpanded ? /* @__PURE__ */ (0, import_jsx_runtime53.jsx)(
-                    import_react_native51.Pressable,
+                  showToggle && isExpanded ? /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(
+                    import_react_native52.Pressable,
                     {
                       onPress: () => setExpanded((prev) => ({ ...prev, [item.id]: false })),
                       hitSlop: 6,
                       style: { alignSelf: "flex-start", marginTop: 4 },
-                      children: /* @__PURE__ */ (0, import_jsx_runtime53.jsx)(Text, { variant: "captionMuted", color: theme.colors.text, children: "less" })
+                      children: /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(Text, { variant: "captionMuted", color: theme.colors.text, children: "less" })
                     }
                   ) : null
                 ] }),
-                /* @__PURE__ */ (0, import_jsx_runtime53.jsx)(
-                  import_react_native51.Pressable,
+                /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(
+                  import_react_native52.Pressable,
                   {
                     onPress: () => {
                       if (!onRemove || isRemoving) return;
@@ -6676,7 +7008,7 @@ ${trimmedLine2}\u2026 `;
                     },
                     hitSlop: 8,
                     style: { alignSelf: "center" },
-                    children: isRemoving ? /* @__PURE__ */ (0, import_jsx_runtime53.jsx)(import_react_native51.ActivityIndicator, { size: "small", color: theme.colors.text }) : /* @__PURE__ */ (0, import_jsx_runtime53.jsx)(IconClose, { size: 14, colorToken: "text" })
+                    children: isRemoving ? /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(import_react_native52.ActivityIndicator, { size: "small", color: theme.colors.text }) : /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(IconClose, { size: 14, colorToken: "text" })
                   }
                 )
               ]
@@ -6690,10 +7022,9 @@ ${trimmedLine2}\u2026 `;
 }
 
 // src/studio/ui/ChatPanel.tsx
-var import_jsx_runtime54 = require("react/jsx-runtime");
+var import_jsx_runtime55 = require("react/jsx-runtime");
 function ChatPanel({
   title = "Chat",
-  autoFocusComposer = false,
   messages,
   showTypingIndicator,
   loading,
@@ -6709,6 +7040,8 @@ function ChatPanel({
   onNavigateHome,
   onStartDraw,
   onSend,
+  onRetryMessage,
+  isRetryingMessage,
   queueItems = [],
   onRemoveQueueItem
 }) {
@@ -6732,21 +7065,21 @@ function ChatPanel({
     var _a;
     (_a = listRef.current) == null ? void 0 : _a.scrollToBottom({ animated: true });
   }, []);
-  const header = /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(
+  const header = /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
     ChatHeader,
     {
-      left: /* @__PURE__ */ (0, import_jsx_runtime54.jsxs)(import_react_native52.View, { style: { flexDirection: "row", alignItems: "center" }, children: [
-        /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(StudioSheetHeaderIconButton, { onPress: onBack, accessibilityLabel: "Back", style: { marginRight: 8 }, children: /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(IconBack, { size: 20, colorToken: "floatingContent" }) }),
-        onNavigateHome ? /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(StudioSheetHeaderIconButton, { onPress: onNavigateHome, accessibilityLabel: "Home", children: /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(IconHome, { size: 20, colorToken: "floatingContent" }) }) : null
+      left: /* @__PURE__ */ (0, import_jsx_runtime55.jsxs)(import_react_native53.View, { style: { flexDirection: "row", alignItems: "center" }, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(StudioSheetHeaderIconButton, { onPress: onBack, accessibilityLabel: "Back", style: { marginRight: 8 }, children: /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(IconBack, { size: 20, colorToken: "floatingContent" }) }),
+        onNavigateHome ? /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(StudioSheetHeaderIconButton, { onPress: onNavigateHome, accessibilityLabel: "Home", children: /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(IconHome, { size: 20, colorToken: "floatingContent" }) }) : null
       ] }),
-      right: /* @__PURE__ */ (0, import_jsx_runtime54.jsxs)(import_react_native52.View, { style: { flexDirection: "row", alignItems: "center" }, children: [
-        onStartDraw ? /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(StudioSheetHeaderIconButton, { onPress: onStartDraw, accessibilityLabel: "Draw", intent: "danger", style: { marginRight: 8 }, children: /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(IconDraw, { size: 20, colorToken: "onDanger" }) }) : null,
-        /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(StudioSheetHeaderIconButton, { onPress: onClose, accessibilityLabel: "Close", children: /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(IconClose, { size: 20, colorToken: "floatingContent" }) })
+      right: /* @__PURE__ */ (0, import_jsx_runtime55.jsxs)(import_react_native53.View, { style: { flexDirection: "row", alignItems: "center" }, children: [
+        onStartDraw ? /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(StudioSheetHeaderIconButton, { onPress: onStartDraw, accessibilityLabel: "Draw", intent: "danger", style: { marginRight: 8 }, children: /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(IconDraw, { size: 20, colorToken: "onDanger" }) }) : null,
+        /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(StudioSheetHeaderIconButton, { onPress: onClose, accessibilityLabel: "Close", children: /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(IconClose, { size: 20, colorToken: "floatingContent" }) })
       ] }),
       center: null
     }
   );
-  const topBanner = shouldForkOnEdit ? /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(
+  const topBanner = shouldForkOnEdit ? /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
     ForkNoticeBanner,
     {
       isOwner: !shouldForkOnEdit,
@@ -6755,35 +7088,37 @@ function ChatPanel({
   ) : null;
   const showMessagesLoading = Boolean(loading) && messages.length === 0 || forking;
   if (showMessagesLoading) {
-    return /* @__PURE__ */ (0, import_jsx_runtime54.jsxs)(import_react_native52.View, { style: { flex: 1 }, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(import_react_native52.View, { children: header }),
-      topBanner ? /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(import_react_native52.View, { style: { paddingHorizontal: 16, paddingTop: 8 }, children: topBanner }) : null,
-      /* @__PURE__ */ (0, import_jsx_runtime54.jsxs)(import_react_native52.View, { style: { flex: 1, alignItems: "center", justifyContent: "center", paddingHorizontal: 24, paddingVertical: 12 }, children: [
-        /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(import_react_native52.ActivityIndicator, {}),
-        /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(import_react_native52.View, { style: { height: 12 } }),
-        /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(Text, { variant: "bodyMuted", children: forking ? "Creating your copy\u2026" : "Loading messages\u2026" })
+    return /* @__PURE__ */ (0, import_jsx_runtime55.jsxs)(import_react_native53.View, { style: { flex: 1 }, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(import_react_native53.View, { children: header }),
+      topBanner ? /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(import_react_native53.View, { style: { paddingHorizontal: 16, paddingTop: 8 }, children: topBanner }) : null,
+      /* @__PURE__ */ (0, import_jsx_runtime55.jsxs)(import_react_native53.View, { style: { flex: 1, alignItems: "center", justifyContent: "center", paddingHorizontal: 24, paddingVertical: 12 }, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(import_react_native53.ActivityIndicator, {}),
+        /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(import_react_native53.View, { style: { height: 12 } }),
+        /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(Text, { variant: "bodyMuted", children: forking ? "Creating your copy\u2026" : "Loading messages\u2026" })
       ] })
     ] });
   }
-  const queueTop = queueItems.length > 0 ? /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(ChatQueue, { items: queueItems, onRemove: onRemoveQueueItem }) : null;
-  return /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(
+  const queueTop = queueItems.length > 0 ? /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(ChatQueue, { items: queueItems, onRemove: onRemoveQueueItem }) : null;
+  return /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
     ChatPage,
     {
       header,
       messages,
       showTypingIndicator,
+      onRetryMessage,
+      isRetryingMessage,
       topBanner,
       composerTop: queueTop,
       composerHorizontalPadding: 0,
       listRef,
       onNearBottomChange: setNearBottom,
-      overlay: /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(
+      overlay: /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
         ScrollToBottomButton,
         {
           visible: !nearBottom,
           onPress: handleScrollToBottom,
           style: { bottom: 80 },
-          children: /* @__PURE__ */ (0, import_jsx_runtime54.jsx)(IconArrowDown, { size: 20, colorToken: "floatingContent" })
+          children: /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(IconArrowDown, { size: 20, colorToken: "floatingContent" })
         }
       ),
       composer: {
@@ -6792,7 +7127,6 @@ function ChatPanel({
         disabled: Boolean(loading) || Boolean(forking),
         sendDisabled: Boolean(sendDisabled) || Boolean(loading) || Boolean(forking),
         sending: Boolean(sending),
-        autoFocus: autoFocusComposer,
         onSend: handleSend,
         attachments,
         onRemoveAttachment,
@@ -6805,11 +7139,11 @@ function ChatPanel({
 
 // src/components/dialogs/ConfirmMergeRequestDialog.tsx
 var React42 = __toESM(require("react"));
-var import_react_native54 = require("react-native");
+var import_react_native55 = require("react-native");
 
 // src/components/primitives/Modal.tsx
-var import_react_native53 = require("react-native");
-var import_jsx_runtime55 = require("react/jsx-runtime");
+var import_react_native54 = require("react-native");
+var import_jsx_runtime56 = require("react/jsx-runtime");
 function Modal({
   visible,
   onRequestClose,
@@ -6818,30 +7152,30 @@ function Modal({
   contentStyle
 }) {
   const theme = useTheme();
-  return /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
-    import_react_native53.Modal,
+  return /* @__PURE__ */ (0, import_jsx_runtime56.jsx)(
+    import_react_native54.Modal,
     {
       visible,
       transparent: true,
       animationType: "fade",
       onRequestClose,
-      children: /* @__PURE__ */ (0, import_jsx_runtime55.jsxs)(import_react_native53.View, { style: { flex: 1, backgroundColor: theme.colors.backdrop, justifyContent: "center", padding: theme.spacing.lg }, children: [
-        /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(
-          import_react_native53.Pressable,
+      children: /* @__PURE__ */ (0, import_jsx_runtime56.jsxs)(import_react_native54.View, { style: { flex: 1, backgroundColor: theme.colors.backdrop, justifyContent: "center", padding: theme.spacing.lg }, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime56.jsx)(
+          import_react_native54.Pressable,
           {
             accessibilityRole: "button",
             onPress: dismissOnBackdropPress ? onRequestClose : void 0,
             style: { position: "absolute", inset: 0 }
           }
         ),
-        /* @__PURE__ */ (0, import_jsx_runtime55.jsx)(Card, { variant: "surfaceRaised", padded: true, style: [{ borderRadius: theme.radii.xl }, contentStyle], children })
+        /* @__PURE__ */ (0, import_jsx_runtime56.jsx)(Card, { variant: "surfaceRaised", padded: true, style: [{ borderRadius: theme.radii.xl }, contentStyle], children })
       ] })
     }
   );
 }
 
 // src/components/dialogs/ConfirmMergeRequestDialog.tsx
-var import_jsx_runtime56 = require("react/jsx-runtime");
+var import_jsx_runtime57 = require("react/jsx-runtime");
 function ConfirmMergeRequestDialog({
   visible,
   onOpenChange,
@@ -6871,7 +7205,7 @@ function ConfirmMergeRequestDialog({
     justifyContent: "center",
     alignSelf: "stretch"
   };
-  return /* @__PURE__ */ (0, import_jsx_runtime56.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime57.jsxs)(
     Modal,
     {
       visible,
@@ -6882,7 +7216,7 @@ function ConfirmMergeRequestDialog({
         backgroundColor: theme.colors.background
       },
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime56.jsx)(import_react_native54.View, { children: /* @__PURE__ */ (0, import_jsx_runtime56.jsx)(
+        /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(import_react_native55.View, { children: /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(
           Text,
           {
             style: {
@@ -6894,9 +7228,9 @@ function ConfirmMergeRequestDialog({
             children: "Are you sure you want to approve this merge request?"
           }
         ) }),
-        /* @__PURE__ */ (0, import_jsx_runtime56.jsxs)(import_react_native54.View, { style: { marginTop: 16 }, children: [
-          /* @__PURE__ */ (0, import_jsx_runtime56.jsx)(
-            import_react_native54.View,
+        /* @__PURE__ */ (0, import_jsx_runtime57.jsxs)(import_react_native55.View, { style: { marginTop: 16 }, children: [
+          /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(
+            import_react_native55.View,
             {
               style: [
                 fullWidthButtonBase,
@@ -6905,22 +7239,22 @@ function ConfirmMergeRequestDialog({
                   opacity: canConfirm ? 1 : 0.5
                 }
               ],
-              children: /* @__PURE__ */ (0, import_jsx_runtime56.jsx)(
-                import_react_native54.Pressable,
+              children: /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(
+                import_react_native55.Pressable,
                 {
                   accessibilityRole: "button",
                   accessibilityLabel: "Approve Merge",
                   disabled: !canConfirm,
                   onPress: handleConfirm,
                   style: [fullWidthButtonBase, { flex: 1 }],
-                  children: /* @__PURE__ */ (0, import_jsx_runtime56.jsx)(Text, { style: { textAlign: "center", color: theme.colors.onPrimary }, children: "Approve Merge" })
+                  children: /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(Text, { style: { textAlign: "center", color: theme.colors.onPrimary }, children: "Approve Merge" })
                 }
               )
             }
           ),
-          /* @__PURE__ */ (0, import_jsx_runtime56.jsx)(import_react_native54.View, { style: { height: 8 } }),
-          /* @__PURE__ */ (0, import_jsx_runtime56.jsx)(
-            import_react_native54.View,
+          /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(import_react_native55.View, { style: { height: 8 } }),
+          /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(
+            import_react_native55.View,
             {
               style: [
                 fullWidthButtonBase,
@@ -6931,22 +7265,22 @@ function ConfirmMergeRequestDialog({
                   opacity: isBuilding || !mergeRequest ? 0.5 : 1
                 }
               ],
-              children: /* @__PURE__ */ (0, import_jsx_runtime56.jsx)(
-                import_react_native54.Pressable,
+              children: /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(
+                import_react_native55.Pressable,
                 {
                   accessibilityRole: "button",
                   accessibilityLabel: isBuilding ? "Preparing\u2026" : "Test edits first",
                   disabled: isBuilding || !mergeRequest,
                   onPress: handleTestFirst,
                   style: [fullWidthButtonBase, { flex: 1 }],
-                  children: /* @__PURE__ */ (0, import_jsx_runtime56.jsx)(Text, { style: { textAlign: "center", color: theme.colors.text }, children: isBuilding ? "Preparing\u2026" : "Test edits first" })
+                  children: /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(Text, { style: { textAlign: "center", color: theme.colors.text }, children: isBuilding ? "Preparing\u2026" : "Test edits first" })
                 }
               )
             }
           ),
-          /* @__PURE__ */ (0, import_jsx_runtime56.jsx)(import_react_native54.View, { style: { height: 8 } }),
-          /* @__PURE__ */ (0, import_jsx_runtime56.jsx)(
-            import_react_native54.View,
+          /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(import_react_native55.View, { style: { height: 8 } }),
+          /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(
+            import_react_native55.View,
             {
               style: [
                 fullWidthButtonBase,
@@ -6956,14 +7290,14 @@ function ConfirmMergeRequestDialog({
                   borderColor: theme.colors.border
                 }
               ],
-              children: /* @__PURE__ */ (0, import_jsx_runtime56.jsx)(
-                import_react_native54.Pressable,
+              children: /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(
+                import_react_native55.Pressable,
                 {
                   accessibilityRole: "button",
                   accessibilityLabel: "Cancel",
                   onPress: close,
                   style: [fullWidthButtonBase, { flex: 1 }],
-                  children: /* @__PURE__ */ (0, import_jsx_runtime56.jsx)(Text, { style: { textAlign: "center", color: theme.colors.text }, children: "Cancel" })
+                  children: /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(Text, { style: { textAlign: "center", color: theme.colors.text }, children: "Cancel" })
                 }
               )
             }
@@ -6975,7 +7309,7 @@ function ConfirmMergeRequestDialog({
 }
 
 // src/studio/ui/ConfirmMergeFlow.tsx
-var import_jsx_runtime57 = require("react/jsx-runtime");
+var import_jsx_runtime58 = require("react/jsx-runtime");
 function ConfirmMergeFlow({
   visible,
   onOpenChange,
@@ -6986,7 +7320,7 @@ function ConfirmMergeFlow({
   onConfirm,
   onTestFirst
 }) {
-  return /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(
     ConfirmMergeRequestDialog,
     {
       visible,
@@ -7084,19 +7418,61 @@ function useOptimisticChatMessages({
       const createdAtIso = (/* @__PURE__ */ new Date()).toISOString();
       const baseServerLastId = chatMessages.length > 0 ? chatMessages[chatMessages.length - 1].id : null;
       const id = makeOptimisticId();
-      setOptimisticChat((prev) => [...prev, { id, content: text, createdAtIso, baseServerLastId, failed: false }]);
+      const normalizedAttachments = attachments && attachments.length > 0 ? [...attachments] : void 0;
+      setOptimisticChat((prev) => [
+        ...prev,
+        {
+          id,
+          content: text,
+          attachments: normalizedAttachments,
+          createdAtIso,
+          baseServerLastId,
+          failed: false,
+          retrying: false
+        }
+      ]);
       void Promise.resolve(onSendChat(text, attachments)).catch(() => {
         setOptimisticChat((prev) => prev.map((m) => m.id === id ? { ...m, failed: true } : m));
       });
     },
     [chatMessages, disableOptimistic, onSendChat, shouldForkOnEdit]
   );
-  return { messages, onSend };
+  const onRetry = React43.useCallback(
+    async (messageId) => {
+      if (shouldForkOnEdit || disableOptimistic) return;
+      const target = optimisticChat.find((m) => m.id === messageId);
+      if (!target || target.retrying) return;
+      const baseServerLastId = chatMessages.length > 0 ? chatMessages[chatMessages.length - 1].id : null;
+      setOptimisticChat(
+        (prev) => prev.map(
+          (m) => m.id === messageId ? { ...m, failed: false, retrying: true, baseServerLastId } : m
+        )
+      );
+      try {
+        await onSendChat(target.content, target.attachments);
+        setOptimisticChat(
+          (prev) => prev.map((m) => m.id === messageId ? { ...m, retrying: false } : m)
+        );
+      } catch {
+        setOptimisticChat(
+          (prev) => prev.map((m) => m.id === messageId ? { ...m, failed: true, retrying: false } : m)
+        );
+      }
+    },
+    [chatMessages, disableOptimistic, onSendChat, optimisticChat, shouldForkOnEdit]
+  );
+  const isRetrying = React43.useCallback(
+    (messageId) => {
+      return optimisticChat.some((m) => m.id === messageId && m.retrying);
+    },
+    [optimisticChat]
+  );
+  return { messages, onSend, onRetry, isRetrying };
 }
 
 // src/studio/ui/StudioOverlay.tsx
 var import_studio_control = require("@comergehq/studio-control");
-var import_jsx_runtime58 = require("react/jsx-runtime");
+var import_jsx_runtime59 = require("react/jsx-runtime");
 function StudioOverlay({
   captureTargetRef,
   app,
@@ -7104,6 +7480,7 @@ function StudioOverlay({
   isOwner,
   shouldForkOnEdit,
   isTesting,
+  isBaseBundleDownloading = false,
   onRestoreBase,
   incomingMergeRequests,
   outgoingMergeRequests,
@@ -7133,7 +7510,7 @@ function StudioOverlay({
   studioControlOptions
 }) {
   const theme = useTheme();
-  const { width } = (0, import_react_native55.useWindowDimensions)();
+  const { width } = (0, import_react_native56.useWindowDimensions)();
   const [sheetOpen, setSheetOpen] = React44.useState(false);
   const sheetOpenRef = React44.useRef(sheetOpen);
   const [activePage, setActivePage] = React44.useState("preview");
@@ -7159,7 +7536,7 @@ function StudioOverlay({
   );
   const handleSheetOpenChange = React44.useCallback((open) => {
     setSheetOpen(open);
-    if (!open) import_react_native55.Keyboard.dismiss();
+    if (!open) import_react_native56.Keyboard.dismiss();
   }, []);
   const closeSheet = React44.useCallback(() => {
     handleSheetOpenChange(false);
@@ -7170,8 +7547,8 @@ function StudioOverlay({
     openSheet();
   }, [openSheet]);
   const backToPreview = React44.useCallback(() => {
-    if (import_react_native55.Platform.OS !== "ios") {
-      import_react_native55.Keyboard.dismiss();
+    if (import_react_native56.Platform.OS !== "ios") {
+      import_react_native56.Keyboard.dismiss();
       setActivePage("preview");
       return;
     }
@@ -7183,9 +7560,9 @@ function StudioOverlay({
       clearTimeout(t);
       setActivePage("preview");
     };
-    const sub = import_react_native55.Keyboard.addListener("keyboardDidHide", finalize);
+    const sub = import_react_native56.Keyboard.addListener("keyboardDidHide", finalize);
     const t = setTimeout(finalize, 350);
-    import_react_native55.Keyboard.dismiss();
+    import_react_native56.Keyboard.dismiss();
   }, []);
   const startDraw = React44.useCallback(() => {
     setDrawing(true);
@@ -7234,14 +7611,14 @@ function StudioOverlay({
   React44.useEffect(() => {
     void (0, import_studio_control.publishComergeStudioUIState)(sheetOpen, studioControlOptions);
   }, [sheetOpen, studioControlOptions]);
-  return /* @__PURE__ */ (0, import_jsx_runtime58.jsxs)(import_jsx_runtime58.Fragment, { children: [
-    /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(EdgeGlowFrame, { visible: isTesting, role: "accent", thickness: 40, intensity: 1 }),
-    /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(StudioBottomSheet, { open: sheetOpen, onOpenChange: handleSheetOpenChange, children: /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime59.jsxs)(import_jsx_runtime59.Fragment, { children: [
+    /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(EdgeGlowFrame, { visible: isTesting, role: "accent", thickness: 40, intensity: 1 }),
+    /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(StudioBottomSheet, { open: sheetOpen, onOpenChange: handleSheetOpenChange, children: /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(
       StudioSheetPager,
       {
         activePage,
         width,
-        preview: /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(
+        preview: /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(
           PreviewPanel,
           {
             app,
@@ -7270,7 +7647,7 @@ function StudioOverlay({
             commentCountOverride: commentsCount ?? void 0
           }
         ),
-        chat: /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(
+        chat: /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(
           ChatPanel,
           {
             messages: optimistic.messages,
@@ -7279,7 +7656,6 @@ function StudioOverlay({
             sendDisabled: chatSendDisabled,
             forking: chatForking,
             sending: chatSending,
-            autoFocusComposer: sheetOpen && activePage === "chat",
             shouldForkOnEdit,
             attachments: chatAttachments,
             onRemoveAttachment: (idx) => setChatAttachments((prev) => prev.filter((_, i) => i !== idx)),
@@ -7289,24 +7665,27 @@ function StudioOverlay({
             onNavigateHome,
             onStartDraw: startDraw,
             onSend: optimistic.onSend,
+            onRetryMessage: optimistic.onRetry,
+            isRetryingMessage: optimistic.isRetrying,
             queueItems: queueItemsForChat,
             onRemoveQueueItem
           }
         )
       }
     ) }),
-    showBubble && /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(
+    showBubble && /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(
       Bubble,
       {
         visible: !sheetOpen && !drawing,
         ariaLabel: sheetOpen ? "Hide studio" : "Show studio",
         badgeCount: incomingMergeRequests.length,
         onPress: toggleSheet,
-        isLoading: (app == null ? void 0 : app.status) === "editing",
-        children: /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(import_react_native55.View, { style: { width: 28, height: 28, alignItems: "center", justifyContent: "center" }, children: /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(MergeIcon, { width: 24, height: 24, color: theme.colors.floatingContent }) })
+        isLoading: (app == null ? void 0 : app.status) === "editing" || isBaseBundleDownloading,
+        loadingBorderTone: isBaseBundleDownloading ? "warning" : "default",
+        children: /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(import_react_native56.View, { style: { width: 28, height: 28, alignItems: "center", justifyContent: "center" }, children: /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(MergeIcon, { width: 24, height: 24, color: theme.colors.floatingContent }) })
       }
     ),
-    /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(
+    /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(
       DrawModeOverlay,
       {
         visible: drawing,
@@ -7315,7 +7694,7 @@ function StudioOverlay({
         onCapture: handleDrawCapture
       }
     ),
-    /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(
+    /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(
       ConfirmMergeFlow,
       {
         visible: Boolean(confirmMr),
@@ -7324,11 +7703,12 @@ function StudioOverlay({
         },
         mergeRequest: confirmMr,
         toSummary: toMergeRequestSummary,
+        isBuilding: isBuildingMrTest,
         onConfirm: (mr) => onApprove == null ? void 0 : onApprove(mr),
         onTestFirst: handleTestMr
       }
     ),
-    /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(
+    /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(
       AppCommentsSheet,
       {
         appId: commentsAppId,
@@ -7521,7 +7901,7 @@ function useEditQueueActions(appId) {
 }
 
 // src/studio/ComergeStudio.tsx
-var import_jsx_runtime59 = require("react/jsx-runtime");
+var import_jsx_runtime60 = require("react/jsx-runtime");
 function ComergeStudio({
   appId,
   clientKey: clientKey2,
@@ -7535,14 +7915,14 @@ function ComergeStudio({
   const [activeAppId, setActiveAppId] = React47.useState(appId);
   const [runtimeAppId, setRuntimeAppId] = React47.useState(appId);
   const [pendingRuntimeTargetAppId, setPendingRuntimeTargetAppId] = React47.useState(null);
-  const platform = React47.useMemo(() => import_react_native56.Platform.OS === "ios" ? "ios" : "android", []);
+  const platform = React47.useMemo(() => import_react_native57.Platform.OS === "ios" ? "ios" : "android", []);
   React47.useEffect(() => {
     setActiveAppId(appId);
     setRuntimeAppId(appId);
     setPendingRuntimeTargetAppId(null);
   }, [appId]);
   const captureTargetRef = React47.useRef(null);
-  return /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(StudioBootstrap, { clientKey: clientKey2, fallback: /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(import_react_native56.View, { style: { flex: 1 } }), children: ({ userId }) => /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(import_bottom_sheet6.BottomSheetModalProvider, { children: /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(LiquidGlassResetProvider, { resetTriggers: [appId, activeAppId, runtimeAppId], children: /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime60.jsx)(StudioBootstrap, { clientKey: clientKey2, fallback: /* @__PURE__ */ (0, import_jsx_runtime60.jsx)(import_react_native57.View, { style: { flex: 1 } }), children: ({ userId }) => /* @__PURE__ */ (0, import_jsx_runtime60.jsx)(import_bottom_sheet6.BottomSheetModalProvider, { children: /* @__PURE__ */ (0, import_jsx_runtime60.jsx)(LiquidGlassResetProvider, { resetTriggers: [appId, activeAppId, runtimeAppId], children: /* @__PURE__ */ (0, import_jsx_runtime60.jsx)(
     ComergeStudioInner,
     {
       userId,
@@ -7691,6 +8071,8 @@ function ComergeStudioInner({
   const [testingMrId, setTestingMrId] = React47.useState(null);
   const [syncingUpstream, setSyncingUpstream] = React47.useState(false);
   const [upstreamSyncStatus, setUpstreamSyncStatus] = React47.useState(null);
+  const isMrTestBuildInProgress = bundle.loading && bundle.loadingMode === "test";
+  const isBaseBundleDownloading = bundle.loading && bundle.loadingMode === "base" && !bundle.isTesting;
   const chatShowTypingIndicator = React47.useMemo(() => {
     var _a;
     if (!thread.raw || thread.raw.length === 0) return false;
@@ -7737,8 +8119,8 @@ function ComergeStudioInner({
     }
     return editQueue.items;
   }, [editQueue.items, lastEditQueueInfo, suppressQueueUntilResponse]);
-  return /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(import_react_native56.View, { style: [{ flex: 1 }, style], children: /* @__PURE__ */ (0, import_jsx_runtime59.jsxs)(import_react_native56.View, { ref: captureTargetRef, style: { flex: 1 }, collapsable: false, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime60.jsx)(import_react_native57.View, { style: [{ flex: 1 }, style], children: /* @__PURE__ */ (0, import_jsx_runtime60.jsxs)(import_react_native57.View, { ref: captureTargetRef, style: { flex: 1 }, collapsable: false, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime60.jsx)(
       RuntimeRenderer,
       {
         appKey,
@@ -7748,7 +8130,7 @@ function ComergeStudioInner({
         allowInitialPreparing: !embeddedBaseBundles
       }
     ),
-    /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(
+    /* @__PURE__ */ (0, import_jsx_runtime60.jsx)(
       StudioOverlay,
       {
         captureTargetRef,
@@ -7757,6 +8139,7 @@ function ComergeStudioInner({
         isOwner: actions.isOwner,
         shouldForkOnEdit: actions.shouldForkOnEdit,
         isTesting: bundle.isTesting,
+        isBaseBundleDownloading,
         onRestoreBase: async () => {
           setTestingMrId(null);
           await bundle.restoreBase();
@@ -7765,10 +8148,10 @@ function ComergeStudioInner({
         outgoingMergeRequests: mergeRequests.lists.outgoing,
         creatorStatsById: mergeRequests.creatorStatsById,
         processingMrId,
-        isBuildingMrTest: bundle.loading,
+        isBuildingMrTest: isMrTestBuildInProgress,
         testingMrId,
         toMergeRequestSummary: mergeRequests.toSummary,
-        onSubmitMergeRequest: (app == null ? void 0 : app.forkedFromAppId) && actions.isOwner && !hasOpenOutgoingMr ? async () => {
+        onSubmitMergeRequest: (app == null ? void 0 : app.forkedFromAppId) && actions.isOwner && !mergeRequests.loading && !hasOpenOutgoingMr ? async () => {
           await mergeRequests.actions.openMergeRequest(activeAppId);
         } : void 0,
         onSyncUpstream: actions.isOwner && (app == null ? void 0 : app.forkedFromAppId) ? handleSyncUpstream : void 0,
@@ -7793,6 +8176,7 @@ function ComergeStudioInner({
           }
         },
         onTestMr: async (mr) => {
+          if (testingMrId === mr.id || bundle.loadingMode === "test") return;
           setTestingMrId(mr.id);
           await bundle.loadTest({ appId: mr.sourceAppId, commitId: mr.sourceTipCommitId ?? mr.sourceCommitId });
         },
@@ -7815,6 +8199,7 @@ function ComergeStudioInner({
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ComergeStudio,
+  resetRealtimeState,
   setSupabaseClient
 });
 //# sourceMappingURL=index.js.map