@comergehq/studio 0.1.13 → 0.1.16

package/dist/index.mjs

@@ -6,8 +6,8 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
 });
 
 // src/studio/ComergeStudio.tsx
-import * as React43 from "react";
-import { Platform as RNPlatform, View as View45 } from "react-native";
+import * as React46 from "react";
+import { Platform as RNPlatform, View as View46 } from "react-native";
 import { BottomSheetModalProvider } from "@gorhom/bottom-sheet";
 
 // src/studio/bootstrap/StudioBootstrap.tsx
@@ -816,6 +816,35 @@ function extractMeta(payload) {
     threadId: typeof obj.threadId === "string" ? obj.threadId : void 0
   };
 }
+function getPayloadMeta(payload) {
+  const meta = payload == null ? void 0 : payload.meta;
+  if (!meta || typeof meta !== "object") return null;
+  return meta;
+}
+function isQueuedHiddenMessage(m) {
+  if (m.authorType !== "human") return false;
+  const meta = getPayloadMeta(m.payload);
+  return (meta == null ? void 0 : meta.visibility) === "queued";
+}
+function toEpochMs(value) {
+  if (value == null) return 0;
+  if (typeof value === "number") return value;
+  if (value instanceof Date) return value.getTime();
+  const parsed = Date.parse(String(value));
+  return Number.isFinite(parsed) ? parsed : 0;
+}
+function getEffectiveSortMs(m) {
+  const meta = getPayloadMeta(m.payload);
+  const runStartedAt = meta == null ? void 0 : meta.runStartedAt;
+  const runMs = toEpochMs(runStartedAt);
+  return runMs > 0 ? runMs : toEpochMs(m.createdAt);
+}
+function compareMessages(a, b) {
+  const aMs = getEffectiveSortMs(a);
+  const bMs = getEffectiveSortMs(b);
+  if (aMs !== bMs) return aMs - bMs;
+  return String(a.createdAt).localeCompare(String(b.createdAt));
+}
 function mapMessageToChatMessage(m) {
   var _a, _b;
   const kind = typeof ((_a = m.payload) == null ? void 0 : _a.type) === "string" ? String(m.payload.type) : null;
@@ -835,8 +864,10 @@ function useThreadMessages(threadId) {
   const activeRequestIdRef = React4.useRef(0);
   const foregroundSignal = useForegroundSignal(Boolean(threadId));
   const upsertSorted = React4.useCallback((prev, m) => {
-    const next = prev.some((x) => x.id === m.id) ? prev.map((x) => x.id === m.id ? m : x) : [...prev, m];
-    next.sort((a, b) => String(a.createdAt).localeCompare(String(b.createdAt)));
+    const include = !isQueuedHiddenMessage(m);
+    const next = prev.filter((x) => x.id !== m.id);
+    if (include) next.push(m);
+    next.sort(compareMessages);
     return next;
   }, []);
   const refetch = React4.useCallback(async () => {
@@ -850,7 +881,7 @@ function useThreadMessages(threadId) {
     try {
       const list = await messagesRepository.list(threadId);
       if (activeRequestIdRef.current !== requestId) return;
-      setRaw([...list].sort((a, b) => String(a.createdAt).localeCompare(String(b.createdAt))));
+      setRaw([...list].filter((m) => !isQueuedHiddenMessage(m)).sort(compareMessages));
     } catch (e) {
       if (activeRequestIdRef.current !== requestId) return;
       setError(e instanceof Error ? e : new Error(String(e)));
@@ -884,6 +915,7 @@ function useThreadMessages(threadId) {
 import * as React5 from "react";
 import * as FileSystem from "expo-file-system/legacy";
 import { Asset } from "expo-asset";
+import { unzip } from "react-native-zip-archive";
 
 // src/data/apps/bundles/remote.ts
 var BundlesRemoteDataSourceImpl = class extends BaseRemote {
@@ -907,6 +939,13 @@ var BundlesRemoteDataSourceImpl = class extends BaseRemote {
     );
     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 } }
+    );
+    return data;
+  }
 };
 var bundlesRemoteDataSource = new BundlesRemoteDataSourceImpl();
 
@@ -928,6 +967,10 @@ var BundlesRepositoryImpl = class extends BaseRepository {
     const res = await this.remote.getSignedDownloadUrl(appId, bundleId, options);
     return this.unwrapOrThrow(res);
   }
+  async getSignedAssetsDownloadUrl(appId, bundleId, options) {
+    const res = await this.remote.getSignedAssetsDownloadUrl(appId, bundleId, options);
+    return this.unwrapOrThrow(res);
+  }
 };
 var bundlesRepository = new BundlesRepositoryImpl(bundlesRemoteDataSource);
 
@@ -979,20 +1022,40 @@ async function ensureDir(path) {
   if (info.exists) return;
   await FileSystem.makeDirectoryAsync(path, { intermediates: true });
 }
+async function ensureBundleDir(key) {
+  await ensureDir(bundlesCacheDir());
+  await ensureDir(bundleDir(key));
+}
 function baseBundleKey(appId, platform) {
   return `base:${appId}:${platform}`;
 }
 function testBundleKey(appId, commitId, platform, bundleId) {
   return `test:${appId}:${commitId ?? "head"}:${platform}:${bundleId}`;
 }
-function toBundleFileUri(key) {
+function legacyBundleFileUri(key) {
   const dir = bundlesCacheDir();
   return `${dir}${safeName(key)}.jsbundle`;
 }
-function toBundleMetaFileUri(key) {
+function legacyBundleMetaFileUri(key) {
   const dir = bundlesCacheDir();
   return `${dir}${safeName(key)}.meta.json`;
 }
+function bundleDir(key) {
+  const dir = bundlesCacheDir();
+  return `${dir}${safeName(key)}/`;
+}
+function toBundleFileUri(key, platform) {
+  return `${bundleDir(key)}index.${platform}.jsbundle`;
+}
+function toBundleMetaFileUri(key) {
+  return `${bundleDir(key)}bundle.meta.json`;
+}
+function toAssetsMetaFileUri(key) {
+  return `${bundleDir(key)}assets.meta.json`;
+}
+function toAssetsDir(key) {
+  return `${bundleDir(key)}assets/`;
+}
 async function readJsonFile(fileUri) {
   try {
     const info = await FileSystem.getInfoAsync(fileUri);
@@ -1019,6 +1082,14 @@ async function getExistingNonEmptyFileUri(fileUri) {
     return null;
   }
 }
+async function getExistingBundleFileUri(key, platform) {
+  const nextPath = toBundleFileUri(key, platform);
+  const next = await getExistingNonEmptyFileUri(nextPath);
+  if (next) return next;
+  const legacyPath = legacyBundleFileUri(key);
+  const legacy = await getExistingNonEmptyFileUri(legacyPath);
+  return legacy;
+}
 async function downloadIfMissing(url, fileUri) {
   const existing = await getExistingNonEmptyFileUri(fileUri);
   if (existing) return existing;
@@ -1045,9 +1116,12 @@ async function deleteFileIfExists(fileUri) {
 async function hydrateBaseFromEmbeddedAsset(appId, platform, embedded) {
   if (!(embedded == null ? void 0 : embedded.module)) return null;
   const key = baseBundleKey(appId, platform);
-  const targetUri = toBundleFileUri(key);
-  const existing = await getExistingNonEmptyFileUri(targetUri);
-  if (existing) return { bundlePath: existing, meta: embedded.meta ?? null };
+  const existing = await getExistingBundleFileUri(key, platform);
+  if (existing) {
+    return { bundlePath: existing, meta: embedded.meta ?? null };
+  }
+  await ensureBundleDir(key);
+  const targetUri = toBundleFileUri(key, platform);
   const asset = Asset.fromModule(embedded.module);
   await asset.downloadAsync();
   const sourceUri = asset.localUri ?? asset.uri;
@@ -1060,8 +1134,50 @@ async function hydrateBaseFromEmbeddedAsset(appId, platform, embedded) {
   if (!finalUri) return null;
   return { bundlePath: finalUri, meta: embedded.meta ?? null };
 }
-async function safeReplaceFileFromUrl(url, targetUri, tmpKey) {
-  const tmpUri = toBundleFileUri(`tmp:${tmpKey}:${Date.now()}`);
+async function hydrateAssetsFromEmbeddedAsset(appId, platform, key, embedded) {
+  var _a;
+  const moduleId = embedded == null ? void 0 : embedded.assetsModule;
+  if (!moduleId) return false;
+  const assetsMeta = (embedded == null ? void 0 : embedded.assetsMeta) ?? null;
+  const assetsDir = toAssetsDir(key);
+  const metaUri = toAssetsMetaFileUri(key);
+  const existingMeta = await readJsonFile(metaUri);
+  const assetsDirInfo = await FileSystem.getInfoAsync(assetsDir);
+  const assetsDirExists = assetsDirInfo.exists && assetsDirInfo.isDirectory;
+  const checksumMatches = Boolean(existingMeta == null ? void 0 : existingMeta.checksumSha256) && Boolean(assetsMeta == null ? void 0 : assetsMeta.checksumSha256) && (existingMeta == null ? void 0 : existingMeta.checksumSha256) === (assetsMeta == null ? void 0 : assetsMeta.checksumSha256);
+  const embeddedMetaMatches = (_a = existingMeta == null ? void 0 : existingMeta.storageKey) == null ? void 0 : _a.startsWith("embedded:");
+  if (assetsDirExists && checksumMatches && embeddedMetaMatches) {
+    return true;
+  }
+  await ensureBundleDir(key);
+  await ensureDir(assetsDir);
+  const asset = Asset.fromModule(moduleId);
+  await asset.downloadAsync();
+  const sourceUri = asset.localUri ?? asset.uri;
+  if (!sourceUri) return false;
+  const info = await FileSystem.getInfoAsync(sourceUri);
+  if (!info.exists) return false;
+  const zipUri = `${bundleDir(key)}assets.zip`;
+  await deleteFileIfExists(zipUri);
+  await FileSystem.copyAsync({ from: sourceUri, to: zipUri });
+  try {
+    await FileSystem.deleteAsync(assetsDir, { idempotent: true }).catch(() => {
+    });
+  } catch {
+  }
+  await ensureDir(assetsDir);
+  await unzipArchive(zipUri, assetsDir);
+  await writeJsonFile(metaUri, {
+    checksumSha256: (assetsMeta == null ? void 0 : assetsMeta.checksumSha256) ?? null,
+    storageKey: `embedded:${(assetsMeta == null ? void 0 : assetsMeta.checksumSha256) ?? "unknown"}`,
+    updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+  });
+  return true;
+}
+async function safeReplaceFileFromUrl(url, targetUri, tmpKey, platform) {
+  const tmpKeySafe = `tmp:${tmpKey}:${Date.now()}`;
+  const tmpUri = toBundleFileUri(tmpKeySafe, platform);
+  await ensureDir(bundleDir(tmpKeySafe));
   try {
     await withRetry(
       async () => {
@@ -1081,6 +1197,82 @@ async function safeReplaceFileFromUrl(url, targetUri, tmpKey) {
     await deleteFileIfExists(tmpUri);
   }
 }
+async function safeReplaceFileFromUrlToPath(url, targetUri, tmpKey) {
+  const tmpDir = `${bundlesCacheDir()}tmp/`;
+  await ensureDir(tmpDir);
+  const tmpUri = `${tmpDir}${safeName(tmpKey)}.tmp`;
+  try {
+    await withRetry(
+      async () => {
+        await deleteFileIfExists(tmpUri);
+        await FileSystem.downloadAsync(url, tmpUri);
+        const tmpOk = await getExistingNonEmptyFileUri(tmpUri);
+        if (!tmpOk) throw new Error("Downloaded file is empty.");
+      },
+      { attempts: 3, baseDelayMs: 500, maxDelayMs: 4e3 }
+    );
+    await deleteFileIfExists(targetUri);
+    await FileSystem.moveAsync({ from: tmpUri, to: targetUri });
+    const finalOk = await getExistingNonEmptyFileUri(targetUri);
+    if (!finalOk) throw new Error("File replacement failed.");
+    return targetUri;
+  } finally {
+    await deleteFileIfExists(tmpUri);
+  }
+}
+function getMetroAssets(bundle) {
+  const assets = bundle.assets ?? [];
+  return assets.find((asset) => asset.kind === "metro-assets") ?? null;
+}
+async function ensureAssetsForBundle(appId, bundle, key, platform) {
+  var _a;
+  const asset = getMetroAssets(bundle);
+  if (!(asset == null ? void 0 : asset.storageKey)) return;
+  await ensureBundleDir(key);
+  const assetsDir = toAssetsDir(key);
+  await ensureDir(assetsDir);
+  const metaUri = toAssetsMetaFileUri(key);
+  const existingMeta = await readJsonFile(metaUri);
+  const assetsDirInfo = await FileSystem.getInfoAsync(assetsDir);
+  const assetsDirExists = assetsDirInfo.exists && assetsDirInfo.isDirectory;
+  if ((existingMeta == null ? void 0 : existingMeta.checksumSha256) && asset.checksumSha256 && existingMeta.checksumSha256 === asset.checksumSha256 && (existingMeta.storageKey === asset.storageKey || ((_a = existingMeta.storageKey) == null ? void 0 : _a.startsWith("embedded:"))) && assetsDirExists) {
+    return;
+  }
+  const signed = await withRetry(
+    async () => {
+      return await bundlesRepository.getSignedAssetsDownloadUrl(appId, bundle.id, {
+        redirect: false,
+        kind: asset.kind
+      });
+    },
+    { attempts: 3, baseDelayMs: 500, maxDelayMs: 4e3 }
+  );
+  const zipUri = `${bundleDir(key)}assets.zip`;
+  await safeReplaceFileFromUrlToPath(signed.url, zipUri, `${appId}:${bundle.id}:${platform}:${asset.kind}`);
+  try {
+    await FileSystem.deleteAsync(assetsDir, { idempotent: true }).catch(() => {
+    });
+  } catch {
+  }
+  await ensureDir(assetsDir);
+  await unzipArchive(zipUri, assetsDir);
+  await writeJsonFile(metaUri, {
+    checksumSha256: asset.checksumSha256 ?? null,
+    storageKey: asset.storageKey,
+    updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+  });
+}
+async function unzipArchive(sourceUri, destDir) {
+  try {
+    await unzip(sourceUri, destDir);
+  } catch (e) {
+    throw new Error(
+      `Failed to extract assets archive. Ensure 'react-native-zip-archive' is installed in the host app. ${String(
+        (e == null ? void 0 : e.message) ?? e
+      )}`
+    );
+  }
+}
 async function pollBundle(appId, bundleId, opts) {
   const start = Date.now();
   while (true) {
@@ -1116,18 +1308,33 @@ async function resolveBundlePath(src, platform, mode) {
   if (finalBundle.status === "failed") {
     throw new Error("Bundle build failed.");
   }
+  let bundleWithAssets = finalBundle;
+  if (finalBundle.status === "succeeded" && (!finalBundle.assets || finalBundle.assets.length === 0)) {
+    try {
+      bundleWithAssets = await bundlesRepository.getById(appId, finalBundle.id);
+    } catch {
+      bundleWithAssets = finalBundle;
+    }
+  }
   const signed = await withRetry(
     async () => {
       return await bundlesRepository.getSignedDownloadUrl(appId, finalBundle.id, { redirect: false });
     },
     { attempts: 3, baseDelayMs: 500, maxDelayMs: 4e3 }
   );
+  const key = mode === "base" ? baseBundleKey(appId, platform) : testBundleKey(appId, commitId, platform, finalBundle.id);
+  await ensureBundleDir(key);
   const bundlePath = mode === "base" ? await safeReplaceFileFromUrl(
     signed.url,
-    toBundleFileUri(baseBundleKey(appId, platform)),
-    `${appId}:${commitId ?? "head"}:${platform}:${finalBundle.id}`
-  ) : await downloadIfMissing(signed.url, toBundleFileUri(testBundleKey(appId, commitId, platform, finalBundle.id)));
-  return { bundlePath, label: "Ready", bundle: finalBundle };
+    toBundleFileUri(key, platform),
+    `${appId}:${commitId ?? "head"}:${platform}:${finalBundle.id}`,
+    platform
+  ) : await downloadIfMissing(signed.url, toBundleFileUri(key, platform));
+  try {
+    await ensureAssetsForBundle(appId, bundleWithAssets, key, platform);
+  } catch {
+  }
+  return { bundlePath, label: "Ready", bundle: bundleWithAssets };
 }
 function useBundleManager({
   base,
@@ -1168,13 +1375,12 @@ function useBundleManager({
   const hasCompletedFirstNetworkBaseLoadRef = React5.useRef(false);
   const hydrateBaseFromDisk = React5.useCallback(
     async (appId, reason) => {
-      var _a;
+      var _a, _b, _c;
       try {
         const dir = bundlesCacheDir();
         await ensureDir(dir);
         const key = baseBundleKey(appId, platform);
-        const uri = toBundleFileUri(key);
-        let existing = await getExistingNonEmptyFileUri(uri);
+        let existing = await getExistingBundleFileUri(key, platform);
         let embeddedMeta = null;
         if (!existing) {
           const embedded = (_a = embeddedBaseBundlesRef.current) == null ? void 0 : _a[platform];
@@ -1183,14 +1389,25 @@ function useBundleManager({
             existing = hydrated.bundlePath;
             embeddedMeta = hydrated.meta ?? null;
             if (embeddedMeta) {
+              await ensureBundleDir(key);
               await writeJsonFile(toBundleMetaFileUri(key), embeddedMeta);
+              await writeJsonFile(legacyBundleMetaFileUri(key), embeddedMeta);
             }
           }
         }
         if (existing) {
           lastBaseBundlePathRef.current = existing;
           setBundlePath(existing);
-          const meta = embeddedMeta ?? await readJsonFile(toBundleMetaFileUri(key));
+          const meta = embeddedMeta ?? await readJsonFile(toBundleMetaFileUri(key)) ?? await readJsonFile(legacyBundleMetaFileUri(key));
+          const embedded = (_b = embeddedBaseBundlesRef.current) == null ? void 0 : _b[platform];
+          const embeddedFingerprint = ((_c = embedded == null ? void 0 : embedded.meta) == null ? void 0 : _c.fingerprint) ?? null;
+          const actualFingerprint = (meta == null ? void 0 : meta.fingerprint) ?? (embeddedMeta == null ? void 0 : embeddedMeta.fingerprint) ?? null;
+          if ((embedded == null ? void 0 : embedded.assetsModule) && embeddedFingerprint && actualFingerprint === embeddedFingerprint) {
+            try {
+              await hydrateAssetsFromEmbeddedAsset(appId, platform, key, embedded);
+            } catch {
+            }
+          }
           if (meta == null ? void 0 : meta.fingerprint) {
             lastBaseFingerprintRef.current = meta.fingerprint;
           }
@@ -1255,7 +1472,16 @@ function useBundleManager({
         lastBaseFingerprintRef.current = fingerprint;
         hasCompletedFirstNetworkBaseLoadRef.current = true;
         initialHydratedBaseFromDiskRef.current = false;
-        void writeJsonFile(toBundleMetaFileUri(baseBundleKey(src.appId, platform)), {
+        const metaKey = baseBundleKey(src.appId, platform);
+        await ensureBundleDir(metaKey);
+        void writeJsonFile(toBundleMetaFileUri(metaKey), {
+          fingerprint,
+          bundleId: bundle.id,
+          checksumSha256: bundle.checksumSha256 ?? null,
+          size: bundle.size ?? null,
+          updatedAt: (/* @__PURE__ */ new Date()).toISOString()
+        });
+        void writeJsonFile(legacyBundleMetaFileUri(metaKey), {
           fingerprint,
           bundleId: bundle.id,
           checksumSha256: bundle.checksumSha256 ?? null,
@@ -1707,6 +1933,9 @@ function useStudioActions({
   userId,
   app,
   onForkedApp,
+  onEditStart,
+  onEditQueued,
+  onEditFinished,
   uploadAttachments
 }) {
   const [forking, setForking] = React8.useState(false);
@@ -1722,6 +1951,7 @@ function useStudioActions({
       setSending(true);
       setError(null);
       try {
+        onEditStart == null ? void 0 : onEditStart();
         let targetApp = app;
         if (shouldForkOnEdit) {
           setForking(true);
@@ -1737,12 +1967,16 @@ function useStudioActions({
         if (attachments && attachments.length > 0 && uploadAttachments) {
           attachmentMetas = await uploadAttachments({ threadId, appId: targetApp.id, dataUrls: attachments });
         }
-        await agentRepository.editApp({
+        const editResult = await agentRepository.editApp({
           prompt,
           thread_id: threadId,
           app_id: targetApp.id,
           attachments: attachmentMetas && attachmentMetas.length > 0 ? attachmentMetas : void 0
         });
+        onEditQueued == null ? void 0 : onEditQueued({
+          queueItemId: editResult.queueItemId ?? null,
+          queuePosition: editResult.queuePosition ?? null
+        });
       } catch (e) {
         const err = e instanceof Error ? e : new Error(String(e));
         setError(err);
@@ -1750,32 +1984,14 @@ function useStudioActions({
       } finally {
         setForking(false);
         setSending(false);
+        onEditFinished == null ? void 0 : onEditFinished();
       }
     },
-    [app, onForkedApp, sending, shouldForkOnEdit, uploadAttachments, userId]
+    [app, onEditFinished, onEditQueued, onEditStart, onForkedApp, sending, shouldForkOnEdit, uploadAttachments, userId]
   );
   return { isOwner, shouldForkOnEdit, forking, sending, error, sendEdit };
 }
 
-// src/studio/lib/chat.ts
-function hasNoOutcomeAfterLastHuman(messages) {
-  if (!messages || messages.length === 0) return false;
-  let lastHumanIndex = -1;
-  for (let i = messages.length - 1; i >= 0; i -= 1) {
-    if (messages[i].authorType === "human") {
-      lastHumanIndex = i;
-      break;
-    }
-  }
-  if (lastHumanIndex === -1) return false;
-  for (let i = lastHumanIndex + 1; i < messages.length; i += 1) {
-    const m = messages[i];
-    const payload = m.payload;
-    if (m.authorType === "ai" && (payload == null ? void 0 : payload.type) === "outcome") return false;
-  }
-  return true;
-}
-
 // src/studio/ui/RuntimeRenderer.tsx
 import * as React9 from "react";
 import { View as View2 } from "react-native";
@@ -1813,8 +2029,8 @@ function RuntimeRenderer({
 }
 
 // src/studio/ui/StudioOverlay.tsx
-import * as React42 from "react";
-import { Keyboard as Keyboard5, Platform as Platform10, View as View44, useWindowDimensions as useWindowDimensions4 } from "react-native";
+import * as React43 from "react";
+import { Keyboard as Keyboard5, Platform as Platform10, View as View45, useWindowDimensions as useWindowDimensions4 } from "react-native";
 
 // src/components/studio-sheet/StudioBottomSheet.tsx
 import * as React12 from "react";
@@ -5674,8 +5890,8 @@ function PreviewPanel({
 }
 
 // src/studio/ui/ChatPanel.tsx
-import * as React39 from "react";
-import { ActivityIndicator as ActivityIndicator8, View as View41 } from "react-native";
+import * as React40 from "react";
+import { ActivityIndicator as ActivityIndicator9, View as View42 } from "react-native";
 
 // src/components/chat/ChatPage.tsx
 import * as React37 from "react";
@@ -5872,6 +6088,7 @@ function ChatPage({
   showTypingIndicator,
   renderMessageContent,
   topBanner,
+  composerTop,
   composer,
   overlay,
   style,
@@ -5882,6 +6099,7 @@ function ChatPage({
   const theme = useTheme();
   const insets = useSafeAreaInsets4();
   const [composerHeight, setComposerHeight] = React37.useState(0);
+  const [composerTopHeight, setComposerTopHeight] = React37.useState(0);
   const [keyboardVisible, setKeyboardVisible] = React37.useState(false);
   React37.useEffect(() => {
     if (Platform9.OS !== "ios") return;
@@ -5893,8 +6111,9 @@ function ChatPage({
     };
   }, []);
   const footerBottomPadding = Platform9.OS === "ios" ? keyboardVisible ? 0 : insets.bottom : insets.bottom + 10;
-  const overlayBottom = composerHeight + footerBottomPadding + theme.spacing.lg;
-  const bottomInset = composerHeight + footerBottomPadding + theme.spacing.xl;
+  const totalComposerHeight = composerHeight + composerTopHeight;
+  const overlayBottom = totalComposerHeight + footerBottomPadding + theme.spacing.lg;
+  const bottomInset = totalComposerHeight + footerBottomPadding + theme.spacing.xl;
   const resolvedOverlay = React37.useMemo(() => {
     var _a;
     if (!overlay) return null;
@@ -5904,6 +6123,10 @@ function ChatPage({
       style: [prevStyle, { bottom: overlayBottom }]
     });
   }, [overlay, overlayBottom]);
+  React37.useEffect(() => {
+    if (composerTop) return;
+    setComposerTopHeight(0);
+  }, [composerTop]);
   return /* @__PURE__ */ jsxs29(View37, { style: [{ flex: 1 }, style], children: [
     header ? /* @__PURE__ */ jsx49(View37, { children: header }) : null,
     topBanner ? /* @__PURE__ */ jsx49(View37, { style: { paddingHorizontal: theme.spacing.lg, paddingTop: theme.spacing.sm }, children: topBanner }) : null,
@@ -5928,7 +6151,7 @@ function ChatPage({
           ]
         }
       ),
-      /* @__PURE__ */ jsx49(
+      /* @__PURE__ */ jsxs29(
         View37,
         {
           style: {
@@ -5940,14 +6163,24 @@ function ChatPage({
             paddingTop: theme.spacing.sm,
             paddingBottom: footerBottomPadding
           },
-          children: /* @__PURE__ */ jsx49(
-            ChatComposer,
-            {
-              ...composer,
-              attachments: composer.attachments ?? [],
-              onLayout: ({ height }) => setComposerHeight(height)
-            }
-          )
+          children: [
+            composerTop ? /* @__PURE__ */ jsx49(
+              View37,
+              {
+                style: { marginBottom: theme.spacing.sm },
+                onLayout: (e) => setComposerTopHeight(e.nativeEvent.layout.height),
+                children: composerTop
+              }
+            ) : null,
+            /* @__PURE__ */ jsx49(
+              ChatComposer,
+              {
+                ...composer,
+                attachments: composer.attachments ?? [],
+                onLayout: ({ height }) => setComposerHeight(height)
+              }
+            )
+          ]
         }
       )
     ] })
@@ -6097,8 +6330,154 @@ function ForkNoticeBanner({ isOwner = true, title, description, style }) {
   );
 }
 
-// src/studio/ui/ChatPanel.tsx
+// src/components/chat/ChatQueue.tsx
+import * as React39 from "react";
+import { ActivityIndicator as ActivityIndicator8, Pressable as Pressable13, View as View41 } from "react-native";
 import { jsx as jsx53, jsxs as jsxs31 } from "react/jsx-runtime";
+function ChatQueue({ items, onRemove }) {
+  const theme = useTheme();
+  const [expanded, setExpanded] = React39.useState({});
+  const [canExpand, setCanExpand] = React39.useState({});
+  const [collapsedText, setCollapsedText] = React39.useState({});
+  const [removing, setRemoving] = React39.useState({});
+  const buildCollapsedText = React39.useCallback((lines) => {
+    var _a, _b;
+    const line1 = ((_a = lines[0]) == null ? void 0 : _a.text) ?? "";
+    const line2 = ((_b = lines[1]) == null ? void 0 : _b.text) ?? "";
+    const moreLabel = "more";
+    const reserve = `\u2026 ${moreLabel}`.length;
+    let trimmedLine2 = line2;
+    if (trimmedLine2.length > reserve) {
+      trimmedLine2 = trimmedLine2.slice(0, Math.max(0, trimmedLine2.length - reserve));
+    } else {
+      trimmedLine2 = "";
+    }
+    trimmedLine2 = trimmedLine2.replace(/\s+$/, "");
+    return `${line1}
+${trimmedLine2}\u2026 `;
+  }, []);
+  React39.useEffect(() => {
+    if (items.length === 0) return;
+    const ids = new Set(items.map((item) => item.id));
+    setExpanded((prev) => Object.fromEntries(Object.entries(prev).filter(([id]) => ids.has(id))));
+    setCanExpand((prev) => Object.fromEntries(Object.entries(prev).filter(([id]) => ids.has(id))));
+    setCollapsedText((prev) => Object.fromEntries(Object.entries(prev).filter(([id]) => ids.has(id))));
+    setRemoving((prev) => Object.fromEntries(Object.entries(prev).filter(([id]) => ids.has(id))));
+  }, [items]);
+  if (items.length === 0) return null;
+  return /* @__PURE__ */ jsxs31(
+    View41,
+    {
+      style: {
+        borderWidth: 1,
+        borderColor: theme.colors.border,
+        borderRadius: theme.radii.lg,
+        marginHorizontal: theme.spacing.md,
+        padding: theme.spacing.md,
+        backgroundColor: "transparent"
+      },
+      children: [
+        /* @__PURE__ */ jsx53(Text, { variant: "caption", style: { marginBottom: theme.spacing.sm }, children: "Queue" }),
+        /* @__PURE__ */ jsx53(View41, { 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__ */ jsxs31(
+            View41,
+            {
+              style: {
+                flexDirection: "row",
+                alignItems: "flex-start",
+                gap: theme.spacing.sm,
+                paddingHorizontal: theme.spacing.md,
+                paddingVertical: theme.spacing.sm,
+                borderRadius: theme.radii.md,
+                backgroundColor: withAlpha(theme.colors.surface, theme.scheme === "dark" ? 0.8 : 0.9)
+              },
+              children: [
+                /* @__PURE__ */ jsxs31(View41, { style: { flex: 1 }, children: [
+                  !canExpand[item.id] ? /* @__PURE__ */ jsx53(
+                    Text,
+                    {
+                      style: { position: "absolute", opacity: 0, zIndex: -1, width: "100%" },
+                      onTextLayout: (e) => {
+                        var _a;
+                        const lines = (_a = e.nativeEvent) == null ? void 0 : _a.lines;
+                        if (!lines) return;
+                        if (lines.length > 2) {
+                          setCanExpand((prev) => ({ ...prev, [item.id]: true }));
+                          setCollapsedText((prev) => ({
+                            ...prev,
+                            [item.id]: buildCollapsedText(lines)
+                          }));
+                        }
+                      },
+                      children: prompt
+                    }
+                  ) : null,
+                  /* @__PURE__ */ jsxs31(
+                    Text,
+                    {
+                      variant: "bodyMuted",
+                      numberOfLines: isExpanded ? void 0 : 2,
+                      children: [
+                        displayPrompt,
+                        !isExpanded && showToggle ? /* @__PURE__ */ jsx53(
+                          Text,
+                          {
+                            color: theme.colors.text,
+                            onPress: () => setExpanded((prev) => ({ ...prev, [item.id]: true })),
+                            suppressHighlighting: true,
+                            children: moreLabel
+                          }
+                        ) : null
+                      ]
+                    }
+                  ),
+                  showToggle && isExpanded ? /* @__PURE__ */ jsx53(
+                    Pressable13,
+                    {
+                      onPress: () => setExpanded((prev) => ({ ...prev, [item.id]: false })),
+                      hitSlop: 6,
+                      style: { alignSelf: "flex-start", marginTop: 4 },
+                      children: /* @__PURE__ */ jsx53(Text, { variant: "captionMuted", color: theme.colors.text, children: "less" })
+                    }
+                  ) : null
+                ] }),
+                /* @__PURE__ */ jsx53(
+                  Pressable13,
+                  {
+                    onPress: () => {
+                      if (!onRemove || isRemoving) return;
+                      setRemoving((prev) => ({ ...prev, [item.id]: true }));
+                      Promise.resolve(onRemove(item.id)).finally(() => {
+                        setRemoving((prev) => {
+                          if (!prev[item.id]) return prev;
+                          const { [item.id]: _removed, ...rest } = prev;
+                          return rest;
+                        });
+                      });
+                    },
+                    hitSlop: 8,
+                    style: { alignSelf: "center" },
+                    children: isRemoving ? /* @__PURE__ */ jsx53(ActivityIndicator8, { size: "small", color: theme.colors.text }) : /* @__PURE__ */ jsx53(IconClose, { size: 14, colorToken: "text" })
+                  }
+                )
+              ]
+            },
+            item.id
+          );
+        }) })
+      ]
+    }
+  );
+}
+
+// src/studio/ui/ChatPanel.tsx
+import { jsx as jsx54, jsxs as jsxs32 } from "react/jsx-runtime";
 function ChatPanel({
   title = "Chat",
   autoFocusComposer = false,
@@ -6116,11 +6495,13 @@ function ChatPanel({
   onClose,
   onNavigateHome,
   onStartDraw,
-  onSend
+  onSend,
+  queueItems = [],
+  onRemoveQueueItem
 }) {
-  const listRef = React39.useRef(null);
-  const [nearBottom, setNearBottom] = React39.useState(true);
-  const handleSend = React39.useCallback(
+  const listRef = React40.useRef(null);
+  const [nearBottom, setNearBottom] = React40.useState(true);
+  const handleSend = React40.useCallback(
     async (text, composerAttachments) => {
       const all = composerAttachments ?? attachments;
       await onSend(text, all.length > 0 ? all : void 0);
@@ -6134,25 +6515,25 @@ function ChatPanel({
     },
     [attachments, nearBottom, onClearAttachments, onSend]
   );
-  const handleScrollToBottom = React39.useCallback(() => {
+  const handleScrollToBottom = React40.useCallback(() => {
     var _a;
     (_a = listRef.current) == null ? void 0 : _a.scrollToBottom({ animated: true });
   }, []);
-  const header = /* @__PURE__ */ jsx53(
+  const header = /* @__PURE__ */ jsx54(
     ChatHeader,
     {
-      left: /* @__PURE__ */ jsxs31(View41, { style: { flexDirection: "row", alignItems: "center" }, children: [
-        /* @__PURE__ */ jsx53(StudioSheetHeaderIconButton, { onPress: onBack, accessibilityLabel: "Back", style: { marginRight: 8 }, children: /* @__PURE__ */ jsx53(IconBack, { size: 20, colorToken: "floatingContent" }) }),
-        onNavigateHome ? /* @__PURE__ */ jsx53(StudioSheetHeaderIconButton, { onPress: onNavigateHome, accessibilityLabel: "Home", children: /* @__PURE__ */ jsx53(IconHome, { size: 20, colorToken: "floatingContent" }) }) : null
+      left: /* @__PURE__ */ jsxs32(View42, { style: { flexDirection: "row", alignItems: "center" }, children: [
+        /* @__PURE__ */ jsx54(StudioSheetHeaderIconButton, { onPress: onBack, accessibilityLabel: "Back", style: { marginRight: 8 }, children: /* @__PURE__ */ jsx54(IconBack, { size: 20, colorToken: "floatingContent" }) }),
+        onNavigateHome ? /* @__PURE__ */ jsx54(StudioSheetHeaderIconButton, { onPress: onNavigateHome, accessibilityLabel: "Home", children: /* @__PURE__ */ jsx54(IconHome, { size: 20, colorToken: "floatingContent" }) }) : null
       ] }),
-      right: /* @__PURE__ */ jsxs31(View41, { style: { flexDirection: "row", alignItems: "center" }, children: [
-        onStartDraw ? /* @__PURE__ */ jsx53(StudioSheetHeaderIconButton, { onPress: onStartDraw, accessibilityLabel: "Draw", intent: "danger", style: { marginRight: 8 }, children: /* @__PURE__ */ jsx53(IconDraw, { size: 20, colorToken: "onDanger" }) }) : null,
-        /* @__PURE__ */ jsx53(StudioSheetHeaderIconButton, { onPress: onClose, accessibilityLabel: "Close", children: /* @__PURE__ */ jsx53(IconClose, { size: 20, colorToken: "floatingContent" }) })
+      right: /* @__PURE__ */ jsxs32(View42, { style: { flexDirection: "row", alignItems: "center" }, children: [
+        onStartDraw ? /* @__PURE__ */ jsx54(StudioSheetHeaderIconButton, { onPress: onStartDraw, accessibilityLabel: "Draw", intent: "danger", style: { marginRight: 8 }, children: /* @__PURE__ */ jsx54(IconDraw, { size: 20, colorToken: "onDanger" }) }) : null,
+        /* @__PURE__ */ jsx54(StudioSheetHeaderIconButton, { onPress: onClose, accessibilityLabel: "Close", children: /* @__PURE__ */ jsx54(IconClose, { size: 20, colorToken: "floatingContent" }) })
       ] }),
       center: null
     }
   );
-  const topBanner = shouldForkOnEdit ? /* @__PURE__ */ jsx53(
+  const topBanner = shouldForkOnEdit ? /* @__PURE__ */ jsx54(
     ForkNoticeBanner,
     {
       isOwner: !shouldForkOnEdit,
@@ -6161,33 +6542,35 @@ function ChatPanel({
   ) : null;
   const showMessagesLoading = Boolean(loading) && messages.length === 0 || forking;
   if (showMessagesLoading) {
-    return /* @__PURE__ */ jsxs31(View41, { style: { flex: 1 }, children: [
-      /* @__PURE__ */ jsx53(View41, { children: header }),
-      topBanner ? /* @__PURE__ */ jsx53(View41, { style: { paddingHorizontal: 16, paddingTop: 8 }, children: topBanner }) : null,
-      /* @__PURE__ */ jsxs31(View41, { style: { flex: 1, alignItems: "center", justifyContent: "center", paddingHorizontal: 24, paddingVertical: 12 }, children: [
-        /* @__PURE__ */ jsx53(ActivityIndicator8, {}),
-        /* @__PURE__ */ jsx53(View41, { style: { height: 12 } }),
-        /* @__PURE__ */ jsx53(Text, { variant: "bodyMuted", children: forking ? "Creating your copy\u2026" : "Loading messages\u2026" })
+    return /* @__PURE__ */ jsxs32(View42, { style: { flex: 1 }, children: [
+      /* @__PURE__ */ jsx54(View42, { children: header }),
+      topBanner ? /* @__PURE__ */ jsx54(View42, { style: { paddingHorizontal: 16, paddingTop: 8 }, children: topBanner }) : null,
+      /* @__PURE__ */ jsxs32(View42, { style: { flex: 1, alignItems: "center", justifyContent: "center", paddingHorizontal: 24, paddingVertical: 12 }, children: [
+        /* @__PURE__ */ jsx54(ActivityIndicator9, {}),
+        /* @__PURE__ */ jsx54(View42, { style: { height: 12 } }),
+        /* @__PURE__ */ jsx54(Text, { variant: "bodyMuted", children: forking ? "Creating your copy\u2026" : "Loading messages\u2026" })
       ] })
     ] });
   }
-  return /* @__PURE__ */ jsx53(
+  const queueTop = queueItems.length > 0 ? /* @__PURE__ */ jsx54(ChatQueue, { items: queueItems, onRemove: onRemoveQueueItem }) : null;
+  return /* @__PURE__ */ jsx54(
     ChatPage,
     {
       header,
       messages,
       showTypingIndicator,
       topBanner,
+      composerTop: queueTop,
       composerHorizontalPadding: 0,
       listRef,
       onNearBottomChange: setNearBottom,
-      overlay: /* @__PURE__ */ jsx53(
+      overlay: /* @__PURE__ */ jsx54(
         ScrollToBottomButton,
         {
           visible: !nearBottom,
           onPress: handleScrollToBottom,
           style: { bottom: 80 },
-          children: /* @__PURE__ */ jsx53(IconArrowDown, { size: 20, colorToken: "floatingContent" })
+          children: /* @__PURE__ */ jsx54(IconArrowDown, { size: 20, colorToken: "floatingContent" })
         }
       ),
       composer: {
@@ -6208,16 +6591,16 @@ function ChatPanel({
 }
 
 // src/components/dialogs/ConfirmMergeRequestDialog.tsx
-import * as React40 from "react";
-import { Pressable as Pressable14, View as View43 } from "react-native";
+import * as React41 from "react";
+import { Pressable as Pressable15, View as View44 } from "react-native";
 
 // src/components/primitives/Modal.tsx
 import {
   Modal as RNModal,
-  Pressable as Pressable13,
-  View as View42
+  Pressable as Pressable14,
+  View as View43
 } from "react-native";
-import { jsx as jsx54, jsxs as jsxs32 } from "react/jsx-runtime";
+import { jsx as jsx55, jsxs as jsxs33 } from "react/jsx-runtime";
 function Modal({
   visible,
   onRequestClose,
@@ -6226,30 +6609,30 @@ function Modal({
   contentStyle
 }) {
   const theme = useTheme();
-  return /* @__PURE__ */ jsx54(
+  return /* @__PURE__ */ jsx55(
     RNModal,
     {
       visible,
       transparent: true,
       animationType: "fade",
       onRequestClose,
-      children: /* @__PURE__ */ jsxs32(View42, { style: { flex: 1, backgroundColor: theme.colors.backdrop, justifyContent: "center", padding: theme.spacing.lg }, children: [
-        /* @__PURE__ */ jsx54(
-          Pressable13,
+      children: /* @__PURE__ */ jsxs33(View43, { style: { flex: 1, backgroundColor: theme.colors.backdrop, justifyContent: "center", padding: theme.spacing.lg }, children: [
+        /* @__PURE__ */ jsx55(
+          Pressable14,
           {
             accessibilityRole: "button",
             onPress: dismissOnBackdropPress ? onRequestClose : void 0,
             style: { position: "absolute", inset: 0 }
           }
         ),
-        /* @__PURE__ */ jsx54(Card, { variant: "surfaceRaised", padded: true, style: [{ borderRadius: theme.radii.xl }, contentStyle], children })
+        /* @__PURE__ */ jsx55(Card, { variant: "surfaceRaised", padded: true, style: [{ borderRadius: theme.radii.xl }, contentStyle], children })
       ] })
     }
   );
 }
 
 // src/components/dialogs/ConfirmMergeRequestDialog.tsx
-import { jsx as jsx55, jsxs as jsxs33 } from "react/jsx-runtime";
+import { jsx as jsx56, jsxs as jsxs34 } from "react/jsx-runtime";
 function ConfirmMergeRequestDialog({
   visible,
   onOpenChange,
@@ -6260,14 +6643,14 @@ function ConfirmMergeRequestDialog({
   onTestFirst
 }) {
   const theme = useTheme();
-  const close = React40.useCallback(() => onOpenChange(false), [onOpenChange]);
+  const close = React41.useCallback(() => onOpenChange(false), [onOpenChange]);
   const canConfirm = Boolean(mergeRequest) && !approveDisabled;
-  const handleConfirm = React40.useCallback(() => {
+  const handleConfirm = React41.useCallback(() => {
     if (!mergeRequest) return;
     onOpenChange(false);
     void onConfirm();
   }, [mergeRequest, onConfirm, onOpenChange]);
-  const handleTestFirst = React40.useCallback(() => {
+  const handleTestFirst = React41.useCallback(() => {
     if (!mergeRequest) return;
     onOpenChange(false);
     void onTestFirst(mergeRequest);
@@ -6279,7 +6662,7 @@ function ConfirmMergeRequestDialog({
     justifyContent: "center",
     alignSelf: "stretch"
   };
-  return /* @__PURE__ */ jsxs33(
+  return /* @__PURE__ */ jsxs34(
     Modal,
     {
       visible,
@@ -6290,7 +6673,7 @@ function ConfirmMergeRequestDialog({
         backgroundColor: theme.colors.background
       },
       children: [
-        /* @__PURE__ */ jsx55(View43, { children: /* @__PURE__ */ jsx55(
+        /* @__PURE__ */ jsx56(View44, { children: /* @__PURE__ */ jsx56(
           Text,
           {
             style: {
@@ -6302,9 +6685,9 @@ function ConfirmMergeRequestDialog({
             children: "Are you sure you want to approve this merge request?"
           }
         ) }),
-        /* @__PURE__ */ jsxs33(View43, { style: { marginTop: 16 }, children: [
-          /* @__PURE__ */ jsx55(
-            View43,
+        /* @__PURE__ */ jsxs34(View44, { style: { marginTop: 16 }, children: [
+          /* @__PURE__ */ jsx56(
+            View44,
             {
               style: [
                 fullWidthButtonBase,
@@ -6313,22 +6696,22 @@ function ConfirmMergeRequestDialog({
                   opacity: canConfirm ? 1 : 0.5
                 }
               ],
-              children: /* @__PURE__ */ jsx55(
-                Pressable14,
+              children: /* @__PURE__ */ jsx56(
+                Pressable15,
                 {
                   accessibilityRole: "button",
                   accessibilityLabel: "Approve Merge",
                   disabled: !canConfirm,
                   onPress: handleConfirm,
                   style: [fullWidthButtonBase, { flex: 1 }],
-                  children: /* @__PURE__ */ jsx55(Text, { style: { textAlign: "center", color: theme.colors.onPrimary }, children: "Approve Merge" })
+                  children: /* @__PURE__ */ jsx56(Text, { style: { textAlign: "center", color: theme.colors.onPrimary }, children: "Approve Merge" })
                 }
               )
             }
           ),
-          /* @__PURE__ */ jsx55(View43, { style: { height: 8 } }),
-          /* @__PURE__ */ jsx55(
-            View43,
+          /* @__PURE__ */ jsx56(View44, { style: { height: 8 } }),
+          /* @__PURE__ */ jsx56(
+            View44,
             {
               style: [
                 fullWidthButtonBase,
@@ -6339,22 +6722,22 @@ function ConfirmMergeRequestDialog({
                   opacity: isBuilding || !mergeRequest ? 0.5 : 1
                 }
               ],
-              children: /* @__PURE__ */ jsx55(
-                Pressable14,
+              children: /* @__PURE__ */ jsx56(
+                Pressable15,
                 {
                   accessibilityRole: "button",
                   accessibilityLabel: isBuilding ? "Preparing\u2026" : "Test edits first",
                   disabled: isBuilding || !mergeRequest,
                   onPress: handleTestFirst,
                   style: [fullWidthButtonBase, { flex: 1 }],
-                  children: /* @__PURE__ */ jsx55(Text, { style: { textAlign: "center", color: theme.colors.text }, children: isBuilding ? "Preparing\u2026" : "Test edits first" })
+                  children: /* @__PURE__ */ jsx56(Text, { style: { textAlign: "center", color: theme.colors.text }, children: isBuilding ? "Preparing\u2026" : "Test edits first" })
                 }
               )
             }
           ),
-          /* @__PURE__ */ jsx55(View43, { style: { height: 8 } }),
-          /* @__PURE__ */ jsx55(
-            View43,
+          /* @__PURE__ */ jsx56(View44, { style: { height: 8 } }),
+          /* @__PURE__ */ jsx56(
+            View44,
             {
               style: [
                 fullWidthButtonBase,
@@ -6364,14 +6747,14 @@ function ConfirmMergeRequestDialog({
                   borderColor: theme.colors.border
                 }
               ],
-              children: /* @__PURE__ */ jsx55(
-                Pressable14,
+              children: /* @__PURE__ */ jsx56(
+                Pressable15,
                 {
                   accessibilityRole: "button",
                   accessibilityLabel: "Cancel",
                   onPress: close,
                   style: [fullWidthButtonBase, { flex: 1 }],
-                  children: /* @__PURE__ */ jsx55(Text, { style: { textAlign: "center", color: theme.colors.text }, children: "Cancel" })
+                  children: /* @__PURE__ */ jsx56(Text, { style: { textAlign: "center", color: theme.colors.text }, children: "Cancel" })
                 }
               )
             }
@@ -6383,7 +6766,7 @@ function ConfirmMergeRequestDialog({
 }
 
 // src/studio/ui/ConfirmMergeFlow.tsx
-import { jsx as jsx56 } from "react/jsx-runtime";
+import { jsx as jsx57 } from "react/jsx-runtime";
 function ConfirmMergeFlow({
   visible,
   onOpenChange,
@@ -6394,7 +6777,7 @@ function ConfirmMergeFlow({
   onConfirm,
   onTestFirst
 }) {
-  return /* @__PURE__ */ jsx56(
+  return /* @__PURE__ */ jsx57(
     ConfirmMergeRequestDialog,
     {
       visible,
@@ -6416,11 +6799,11 @@ function ConfirmMergeFlow({
 }
 
 // src/studio/hooks/useOptimisticChatMessages.ts
-import * as React41 from "react";
+import * as React42 from "react";
 function makeOptimisticId() {
   return `optimistic:${Date.now().toString(36)}:${Math.random().toString(36).slice(2, 10)}`;
 }
-function toEpochMs(createdAt) {
+function toEpochMs2(createdAt) {
   if (createdAt == null) return 0;
   if (typeof createdAt === "number") return createdAt;
   if (createdAt instanceof Date) return createdAt.getTime();
@@ -6439,7 +6822,7 @@ function isOptimisticResolvedByServer(chatMessages, o) {
   for (const m of candidates) {
     if (m.author !== "human") continue;
     if (normalize(m.content) !== target) continue;
-    const serverMs = toEpochMs(m.createdAt);
+    const serverMs = toEpochMs2(m.createdAt);
     const optimisticMs = Date.parse(o.createdAtIso);
     if (Number.isFinite(optimisticMs) && optimisticMs > 0 && serverMs > 0) {
       if (serverMs + 12e4 < optimisticMs) continue;
@@ -6451,14 +6834,15 @@ function isOptimisticResolvedByServer(chatMessages, o) {
 function useOptimisticChatMessages({
   threadId,
   shouldForkOnEdit,
+  disableOptimistic = false,
   chatMessages,
   onSendChat
 }) {
-  const [optimisticChat, setOptimisticChat] = React41.useState([]);
-  React41.useEffect(() => {
+  const [optimisticChat, setOptimisticChat] = React42.useState([]);
+  React42.useEffect(() => {
     setOptimisticChat([]);
   }, [threadId]);
-  const messages = React41.useMemo(() => {
+  const messages = React42.useMemo(() => {
     if (!optimisticChat || optimisticChat.length === 0) return chatMessages;
     const unresolved = optimisticChat.filter((o) => !isOptimisticResolvedByServer(chatMessages, o));
     if (unresolved.length === 0) return chatMessages;
@@ -6474,7 +6858,7 @@ function useOptimisticChatMessages({
     merged.sort((a, b) => String(a.createdAt).localeCompare(String(b.createdAt)));
     return merged;
   }, [chatMessages, optimisticChat]);
-  React41.useEffect(() => {
+  React42.useEffect(() => {
     if (optimisticChat.length === 0) return;
     setOptimisticChat((prev) => {
       if (prev.length === 0) return prev;
@@ -6482,9 +6866,9 @@ function useOptimisticChatMessages({
       return next.length === prev.length ? prev : next;
     });
   }, [chatMessages, optimisticChat.length]);
-  const onSend = React41.useCallback(
+  const onSend = React42.useCallback(
     async (text, attachments) => {
-      if (shouldForkOnEdit) {
+      if (shouldForkOnEdit || disableOptimistic) {
         await onSendChat(text, attachments);
         return;
       }
@@ -6496,7 +6880,7 @@ function useOptimisticChatMessages({
         setOptimisticChat((prev) => prev.map((m) => m.id === id ? { ...m, failed: true } : m));
       });
     },
-    [chatMessages, onSendChat, shouldForkOnEdit]
+    [chatMessages, disableOptimistic, onSendChat, shouldForkOnEdit]
   );
   return { messages, onSend };
 }
@@ -6506,7 +6890,7 @@ import {
   publishComergeStudioUIState,
   startStudioControlPolling
 } from "@comergehq/studio-control";
-import { Fragment as Fragment6, jsx as jsx57, jsxs as jsxs34 } from "react/jsx-runtime";
+import { Fragment as Fragment6, jsx as jsx58, jsxs as jsxs35 } from "react/jsx-runtime";
 function StudioOverlay({
   captureTargetRef,
   app,
@@ -6533,44 +6917,48 @@ function StudioOverlay({
   chatSending,
   chatShowTypingIndicator,
   onSendChat,
+  chatQueueItems,
+  onRemoveQueueItem,
   onNavigateHome,
   showBubble,
   studioControlOptions
 }) {
   const theme = useTheme();
   const { width } = useWindowDimensions4();
-  const [sheetOpen, setSheetOpen] = React42.useState(false);
-  const sheetOpenRef = React42.useRef(sheetOpen);
-  const [activePage, setActivePage] = React42.useState("preview");
-  const [drawing, setDrawing] = React42.useState(false);
-  const [chatAttachments, setChatAttachments] = React42.useState([]);
-  const [commentsAppId, setCommentsAppId] = React42.useState(null);
-  const [commentsCount, setCommentsCount] = React42.useState(null);
+  const [sheetOpen, setSheetOpen] = React43.useState(false);
+  const sheetOpenRef = React43.useRef(sheetOpen);
+  const [activePage, setActivePage] = React43.useState("preview");
+  const [drawing, setDrawing] = React43.useState(false);
+  const [chatAttachments, setChatAttachments] = React43.useState([]);
+  const [commentsAppId, setCommentsAppId] = React43.useState(null);
+  const [commentsCount, setCommentsCount] = React43.useState(null);
   const threadId = (app == null ? void 0 : app.threadId) ?? null;
+  const disableOptimistic = Boolean(chatQueueItems && chatQueueItems.length > 0) || (app == null ? void 0 : app.status) === "editing";
   const optimistic = useOptimisticChatMessages({
     threadId,
     shouldForkOnEdit,
+    disableOptimistic,
     chatMessages,
     onSendChat
   });
-  const [confirmMrId, setConfirmMrId] = React42.useState(null);
-  const confirmMr = React42.useMemo(
+  const [confirmMrId, setConfirmMrId] = React43.useState(null);
+  const confirmMr = React43.useMemo(
     () => confirmMrId ? incomingMergeRequests.find((m) => m.id === confirmMrId) ?? null : null,
     [confirmMrId, incomingMergeRequests]
   );
-  const handleSheetOpenChange = React42.useCallback((open) => {
+  const handleSheetOpenChange = React43.useCallback((open) => {
     setSheetOpen(open);
     if (!open) Keyboard5.dismiss();
   }, []);
-  const closeSheet = React42.useCallback(() => {
+  const closeSheet = React43.useCallback(() => {
     handleSheetOpenChange(false);
   }, [handleSheetOpenChange]);
-  const openSheet = React42.useCallback(() => setSheetOpen(true), []);
-  const goToChat = React42.useCallback(() => {
+  const openSheet = React43.useCallback(() => setSheetOpen(true), []);
+  const goToChat = React43.useCallback(() => {
     setActivePage("chat");
     openSheet();
   }, [openSheet]);
-  const backToPreview = React42.useCallback(() => {
+  const backToPreview = React43.useCallback(() => {
     if (Platform10.OS !== "ios") {
       Keyboard5.dismiss();
       setActivePage("preview");
@@ -6588,11 +6976,11 @@ function StudioOverlay({
     const t = setTimeout(finalize, 350);
     Keyboard5.dismiss();
   }, []);
-  const startDraw = React42.useCallback(() => {
+  const startDraw = React43.useCallback(() => {
     setDrawing(true);
     closeSheet();
   }, [closeSheet]);
-  const handleDrawCapture = React42.useCallback(
+  const handleDrawCapture = React43.useCallback(
     (dataUrl) => {
       setChatAttachments((prev) => [...prev, dataUrl]);
       setDrawing(false);
@@ -6601,7 +6989,7 @@ function StudioOverlay({
     },
     [openSheet]
   );
-  const toggleSheet = React42.useCallback(async () => {
+  const toggleSheet = React43.useCallback(async () => {
     if (!sheetOpen) {
       const shouldExitTest = Boolean(testingMrId) || isTesting;
       if (shouldExitTest) {
@@ -6613,7 +7001,7 @@ function StudioOverlay({
       closeSheet();
     }
   }, [closeSheet, isTesting, onRestoreBase, sheetOpen, testingMrId]);
-  const handleTestMr = React42.useCallback(
+  const handleTestMr = React43.useCallback(
     async (mr) => {
       if (!onTestMr) return;
       await onTestMr(mr);
@@ -6621,10 +7009,10 @@ function StudioOverlay({
     },
     [closeSheet, onTestMr]
   );
-  React42.useEffect(() => {
+  React43.useEffect(() => {
     sheetOpenRef.current = sheetOpen;
   }, [sheetOpen]);
-  React42.useEffect(() => {
+  React43.useEffect(() => {
     const poller = startStudioControlPolling((action) => {
       if (action === "show" && !sheetOpenRef.current) openSheet();
       if (action === "hide" && sheetOpenRef.current) closeSheet();
@@ -6632,17 +7020,17 @@ function StudioOverlay({
     }, studioControlOptions);
     return () => poller.stop();
   }, [closeSheet, openSheet, studioControlOptions, toggleSheet]);
-  React42.useEffect(() => {
+  React43.useEffect(() => {
     void publishComergeStudioUIState(sheetOpen, studioControlOptions);
   }, [sheetOpen, studioControlOptions]);
-  return /* @__PURE__ */ jsxs34(Fragment6, { children: [
-    /* @__PURE__ */ jsx57(EdgeGlowFrame, { visible: isTesting, role: "accent", thickness: 40, intensity: 1 }),
-    /* @__PURE__ */ jsx57(StudioBottomSheet, { open: sheetOpen, onOpenChange: handleSheetOpenChange, children: /* @__PURE__ */ jsx57(
+  return /* @__PURE__ */ jsxs35(Fragment6, { children: [
+    /* @__PURE__ */ jsx58(EdgeGlowFrame, { visible: isTesting, role: "accent", thickness: 40, intensity: 1 }),
+    /* @__PURE__ */ jsx58(StudioBottomSheet, { open: sheetOpen, onOpenChange: handleSheetOpenChange, children: /* @__PURE__ */ jsx58(
       StudioSheetPager,
       {
         activePage,
         width,
-        preview: /* @__PURE__ */ jsx57(
+        preview: /* @__PURE__ */ jsx58(
           PreviewPanel,
           {
             app,
@@ -6668,7 +7056,7 @@ function StudioOverlay({
             commentCountOverride: commentsCount ?? void 0
           }
         ),
-        chat: /* @__PURE__ */ jsx57(
+        chat: /* @__PURE__ */ jsx58(
           ChatPanel,
           {
             messages: optimistic.messages,
@@ -6686,12 +7074,14 @@ function StudioOverlay({
             onClose: closeSheet,
             onNavigateHome,
             onStartDraw: startDraw,
-            onSend: optimistic.onSend
+            onSend: optimistic.onSend,
+            queueItems: chatQueueItems,
+            onRemoveQueueItem
           }
         )
       }
     ) }),
-    showBubble && /* @__PURE__ */ jsx57(
+    showBubble && /* @__PURE__ */ jsx58(
       Bubble,
       {
         visible: !sheetOpen && !drawing,
@@ -6699,10 +7089,10 @@ function StudioOverlay({
         badgeCount: incomingMergeRequests.length,
         onPress: toggleSheet,
         isLoading: (app == null ? void 0 : app.status) === "editing",
-        children: /* @__PURE__ */ jsx57(View44, { style: { width: 28, height: 28, alignItems: "center", justifyContent: "center" }, children: /* @__PURE__ */ jsx57(MergeIcon, { width: 24, height: 24, color: theme.colors.floatingContent }) })
+        children: /* @__PURE__ */ jsx58(View45, { style: { width: 28, height: 28, alignItems: "center", justifyContent: "center" }, children: /* @__PURE__ */ jsx58(MergeIcon, { width: 24, height: 24, color: theme.colors.floatingContent }) })
       }
     ),
-    /* @__PURE__ */ jsx57(
+    /* @__PURE__ */ jsx58(
       DrawModeOverlay,
       {
         visible: drawing,
@@ -6711,7 +7101,7 @@ function StudioOverlay({
         onCapture: handleDrawCapture
       }
     ),
-    /* @__PURE__ */ jsx57(
+    /* @__PURE__ */ jsx58(
       ConfirmMergeFlow,
       {
         visible: Boolean(confirmMr),
@@ -6724,7 +7114,7 @@ function StudioOverlay({
         onTestFirst: handleTestMr
       }
     ),
-    /* @__PURE__ */ jsx57(
+    /* @__PURE__ */ jsx58(
       AppCommentsSheet,
       {
         appId: commentsAppId,
@@ -6736,8 +7126,190 @@ function StudioOverlay({
   ] });
 }
 
+// src/studio/hooks/useEditQueue.ts
+import * as React44 from "react";
+
+// src/data/apps/edit-queue/remote.ts
+var EditQueueRemoteDataSourceImpl = class extends BaseRemote {
+  async list(appId) {
+    const { data } = await api.get(
+      `/v1/apps/${encodeURIComponent(appId)}/edit-queue`
+    );
+    return data;
+  }
+  async update(appId, queueItemId, payload) {
+    const { data } = await api.patch(
+      `/v1/apps/${encodeURIComponent(appId)}/edit-queue/${encodeURIComponent(queueItemId)}`,
+      payload
+    );
+    return data;
+  }
+  async cancel(appId, queueItemId) {
+    const { data } = await api.delete(
+      `/v1/apps/${encodeURIComponent(appId)}/edit-queue/${encodeURIComponent(queueItemId)}`
+    );
+    return data;
+  }
+};
+var editQueueRemoteDataSource = new EditQueueRemoteDataSourceImpl();
+
+// src/data/apps/edit-queue/repository.ts
+var ACTIVE_STATUSES = ["pending"];
+function toString(value) {
+  return typeof value === "string" && value.trim().length > 0 ? value : null;
+}
+function toAttachments(value) {
+  return Array.isArray(value) ? value : [];
+}
+function mapQueueItem(row) {
+  const payload = row.payload ?? {};
+  return {
+    id: row.id,
+    status: row.status,
+    prompt: toString(payload.trimmedPrompt),
+    messageId: toString(payload.messageId),
+    attachments: toAttachments(payload.attachments),
+    createdAt: row.created_at,
+    updatedAt: row.updated_at,
+    runAfter: row.run_after,
+    priority: row.priority
+  };
+}
+var EditQueueRepositoryImpl = class extends BaseRepository {
+  constructor(remote) {
+    super();
+    this.remote = remote;
+  }
+  async list(appId) {
+    const res = await this.remote.list(appId);
+    const data = this.unwrapOrThrow(res);
+    return data.items ?? [];
+  }
+  async update(appId, queueItemId, payload) {
+    const res = await this.remote.update(appId, queueItemId, payload);
+    return this.unwrapOrThrow(res);
+  }
+  async cancel(appId, queueItemId) {
+    const res = await this.remote.cancel(appId, queueItemId);
+    return this.unwrapOrThrow(res);
+  }
+  subscribeEditQueue(appId, handlers) {
+    const supabase = getSupabaseClient();
+    const channel = supabase.channel(`edit-queue:app:${appId}`).on(
+      "postgres_changes",
+      { event: "INSERT", schema: "public", table: "app_job_queue", filter: `app_id=eq.${appId}` },
+      (payload) => {
+        var _a;
+        const row = payload.new;
+        if (row.kind !== "edit") return;
+        const item = mapQueueItem(row);
+        if (!ACTIVE_STATUSES.includes(item.status)) return;
+        (_a = handlers.onInsert) == null ? void 0 : _a.call(handlers, item);
+      }
+    ).on(
+      "postgres_changes",
+      { event: "UPDATE", schema: "public", table: "app_job_queue", filter: `app_id=eq.${appId}` },
+      (payload) => {
+        var _a, _b;
+        const row = payload.new;
+        if (row.kind !== "edit") return;
+        const item = mapQueueItem(row);
+        if (ACTIVE_STATUSES.includes(item.status)) (_a = handlers.onUpdate) == null ? void 0 : _a.call(handlers, item);
+        else (_b = handlers.onDelete) == null ? void 0 : _b.call(handlers, item);
+      }
+    ).on(
+      "postgres_changes",
+      { event: "DELETE", schema: "public", table: "app_job_queue", filter: `app_id=eq.${appId}` },
+      (payload) => {
+        var _a;
+        const row = payload.old;
+        if (row.kind !== "edit") return;
+        (_a = handlers.onDelete) == null ? void 0 : _a.call(handlers, mapQueueItem(row));
+      }
+    ).subscribe();
+    return () => {
+      supabase.removeChannel(channel);
+    };
+  }
+};
+var editQueueRepository = new EditQueueRepositoryImpl(
+  editQueueRemoteDataSource
+);
+
+// src/studio/hooks/useEditQueue.ts
+function useEditQueue(appId) {
+  const [items, setItems] = React44.useState([]);
+  const [loading, setLoading] = React44.useState(false);
+  const [error, setError] = React44.useState(null);
+  const activeRequestIdRef = React44.useRef(0);
+  const foregroundSignal = useForegroundSignal(Boolean(appId));
+  const upsertSorted = React44.useCallback((prev, nextItem) => {
+    const next = prev.some((x) => x.id === nextItem.id) ? prev.map((x) => x.id === nextItem.id ? nextItem : x) : [...prev, nextItem];
+    next.sort((a, b) => String(a.createdAt).localeCompare(String(b.createdAt)));
+    return next;
+  }, []);
+  const refetch = React44.useCallback(async () => {
+    if (!appId) {
+      setItems([]);
+      return;
+    }
+    const requestId = ++activeRequestIdRef.current;
+    setLoading(true);
+    setError(null);
+    try {
+      const list = await editQueueRepository.list(appId);
+      if (activeRequestIdRef.current !== requestId) return;
+      setItems([...list].sort((a, b) => String(a.createdAt).localeCompare(String(b.createdAt))));
+    } catch (e) {
+      if (activeRequestIdRef.current !== requestId) return;
+      setError(e instanceof Error ? e : new Error(String(e)));
+      setItems([]);
+    } finally {
+      if (activeRequestIdRef.current === requestId) setLoading(false);
+    }
+  }, [appId]);
+  React44.useEffect(() => {
+    void refetch();
+  }, [refetch]);
+  React44.useEffect(() => {
+    if (!appId) return;
+    const unsubscribe = editQueueRepository.subscribeEditQueue(appId, {
+      onInsert: (item) => setItems((prev) => upsertSorted(prev, item)),
+      onUpdate: (item) => setItems((prev) => upsertSorted(prev, item)),
+      onDelete: (item) => setItems((prev) => prev.filter((x) => x.id !== item.id))
+    });
+    return unsubscribe;
+  }, [appId, upsertSorted, foregroundSignal]);
+  React44.useEffect(() => {
+    if (!appId) return;
+    if (foregroundSignal <= 0) return;
+    void refetch();
+  }, [appId, foregroundSignal, refetch]);
+  return { items, loading, error, refetch };
+}
+
+// src/studio/hooks/useEditQueueActions.ts
+import * as React45 from "react";
+function useEditQueueActions(appId) {
+  const update = React45.useCallback(
+    async (queueItemId, payload) => {
+      if (!appId) return;
+      await editQueueRepository.update(appId, queueItemId, payload);
+    },
+    [appId]
+  );
+  const cancel = React45.useCallback(
+    async (queueItemId) => {
+      if (!appId) return;
+      await editQueueRepository.cancel(appId, queueItemId);
+    },
+    [appId]
+  );
+  return { update, cancel };
+}
+
 // src/studio/ComergeStudio.tsx
-import { jsx as jsx58, jsxs as jsxs35 } from "react/jsx-runtime";
+import { jsx as jsx59, jsxs as jsxs36 } from "react/jsx-runtime";
 function ComergeStudio({
   appId,
   clientKey: clientKey2,
@@ -6748,17 +7320,17 @@ function ComergeStudio({
   studioControlOptions,
   embeddedBaseBundles
 }) {
-  const [activeAppId, setActiveAppId] = React43.useState(appId);
-  const [runtimeAppId, setRuntimeAppId] = React43.useState(appId);
-  const [pendingRuntimeTargetAppId, setPendingRuntimeTargetAppId] = React43.useState(null);
-  const platform = React43.useMemo(() => RNPlatform.OS === "ios" ? "ios" : "android", []);
-  React43.useEffect(() => {
+  const [activeAppId, setActiveAppId] = React46.useState(appId);
+  const [runtimeAppId, setRuntimeAppId] = React46.useState(appId);
+  const [pendingRuntimeTargetAppId, setPendingRuntimeTargetAppId] = React46.useState(null);
+  const platform = React46.useMemo(() => RNPlatform.OS === "ios" ? "ios" : "android", []);
+  React46.useEffect(() => {
     setActiveAppId(appId);
     setRuntimeAppId(appId);
     setPendingRuntimeTargetAppId(null);
   }, [appId]);
-  const captureTargetRef = React43.useRef(null);
-  return /* @__PURE__ */ jsx58(StudioBootstrap, { clientKey: clientKey2, fallback: /* @__PURE__ */ jsx58(View45, { style: { flex: 1 } }), children: ({ userId }) => /* @__PURE__ */ jsx58(BottomSheetModalProvider, { children: /* @__PURE__ */ jsx58(LiquidGlassResetProvider, { resetTriggers: [appId, activeAppId, runtimeAppId], children: /* @__PURE__ */ jsx58(
+  const captureTargetRef = React46.useRef(null);
+  return /* @__PURE__ */ jsx59(StudioBootstrap, { clientKey: clientKey2, fallback: /* @__PURE__ */ jsx59(View46, { style: { flex: 1 } }), children: ({ userId }) => /* @__PURE__ */ jsx59(BottomSheetModalProvider, { children: /* @__PURE__ */ jsx59(LiquidGlassResetProvider, { resetTriggers: [appId, activeAppId, runtimeAppId], children: /* @__PURE__ */ jsx59(
     ComergeStudioInner,
     {
       userId,
@@ -6799,11 +7371,11 @@ function ComergeStudioInner({
   const { app, loading: appLoading } = useApp(activeAppId);
   const { app: runtimeAppFromHook } = useApp(runtimeAppId, { enabled: runtimeAppId !== activeAppId });
   const runtimeApp = runtimeAppId === activeAppId ? app : runtimeAppFromHook;
-  const sawEditingOnPendingTargetRef = React43.useRef(false);
-  React43.useEffect(() => {
+  const sawEditingOnPendingTargetRef = React46.useRef(false);
+  React46.useEffect(() => {
     sawEditingOnPendingTargetRef.current = false;
   }, [pendingRuntimeTargetAppId]);
-  React43.useEffect(() => {
+  React46.useEffect(() => {
     if (!pendingRuntimeTargetAppId) return;
     if (activeAppId !== pendingRuntimeTargetAppId) return;
     if ((app == null ? void 0 : app.status) === "editing") {
@@ -6821,13 +7393,13 @@ function ComergeStudioInner({
     canRequestLatest: (runtimeApp == null ? void 0 : runtimeApp.status) === "ready",
     embeddedBaseBundles
   });
-  const sawEditingOnActiveAppRef = React43.useRef(false);
-  const [showPostEditPreparing, setShowPostEditPreparing] = React43.useState(false);
-  React43.useEffect(() => {
+  const sawEditingOnActiveAppRef = React46.useRef(false);
+  const [showPostEditPreparing, setShowPostEditPreparing] = React46.useState(false);
+  React46.useEffect(() => {
     sawEditingOnActiveAppRef.current = false;
     setShowPostEditPreparing(false);
   }, [activeAppId]);
-  React43.useEffect(() => {
+  React46.useEffect(() => {
     if (!(app == null ? void 0 : app.id)) return;
     if (app.status === "editing") {
       sawEditingOnActiveAppRef.current = true;
@@ -6839,7 +7411,7 @@ function ComergeStudioInner({
       sawEditingOnActiveAppRef.current = false;
     }
   }, [app == null ? void 0 : app.id, app == null ? void 0 : app.status]);
-  React43.useEffect(() => {
+  React46.useEffect(() => {
     if (!showPostEditPreparing) return;
     const stillProcessingBaseBundle = bundle.loading && bundle.loadingMode === "base" && !bundle.isTesting;
     if (!stillProcessingBaseBundle) {
@@ -6848,15 +7420,27 @@ function ComergeStudioInner({
   }, [showPostEditPreparing, bundle.loading, bundle.loadingMode, bundle.isTesting]);
   const threadId = (app == null ? void 0 : app.threadId) ?? "";
   const thread = useThreadMessages(threadId);
+  const editQueue = useEditQueue(activeAppId);
+  const editQueueActions = useEditQueueActions(activeAppId);
+  const [lastEditQueueInfo, setLastEditQueueInfo] = React46.useState(null);
+  const lastEditQueueInfoRef = React46.useRef(null);
+  const [suppressQueueUntilResponse, setSuppressQueueUntilResponse] = React46.useState(false);
   const mergeRequests = useMergeRequests({ appId: activeAppId });
-  const hasOpenOutgoingMr = React43.useMemo(() => {
+  const hasOpenOutgoingMr = React46.useMemo(() => {
     return mergeRequests.lists.outgoing.some((mr) => mr.status === "open");
   }, [mergeRequests.lists.outgoing]);
-  const incomingReviewMrs = React43.useMemo(() => {
+  const incomingReviewMrs = React46.useMemo(() => {
     if (!userId) return mergeRequests.lists.incoming;
     return mergeRequests.lists.incoming.filter((mr) => mr.createdBy !== userId);
   }, [mergeRequests.lists.incoming, userId]);
   const uploader = useAttachmentUpload();
+  const updateLastEditQueueInfo = React46.useCallback(
+    (info) => {
+      lastEditQueueInfoRef.current = info;
+      setLastEditQueueInfo(info);
+    },
+    []
+  );
   const actions = useStudioActions({
     userId,
     app,
@@ -6871,20 +7455,62 @@ function ComergeStudioInner({
         setPendingRuntimeTargetAppId(null);
       }
     },
-    uploadAttachments: uploader.uploadBase64Images
+    uploadAttachments: uploader.uploadBase64Images,
+    onEditStart: () => {
+      if (editQueue.items.length === 0) {
+        setSuppressQueueUntilResponse(true);
+      }
+    },
+    onEditQueued: (info) => {
+      updateLastEditQueueInfo(info);
+      if (info.queuePosition !== 1) {
+        setSuppressQueueUntilResponse(false);
+      }
+    },
+    onEditFinished: () => {
+      var _a;
+      if (((_a = lastEditQueueInfoRef.current) == null ? void 0 : _a.queuePosition) !== 1) {
+        setSuppressQueueUntilResponse(false);
+      }
+    }
   });
-  const chatSendDisabled = hasNoOutcomeAfterLastHuman(thread.raw);
-  const [processingMrId, setProcessingMrId] = React43.useState(null);
-  const [testingMrId, setTestingMrId] = React43.useState(null);
-  const chatShowTypingIndicator = React43.useMemo(() => {
+  const chatSendDisabled = false;
+  const [processingMrId, setProcessingMrId] = React46.useState(null);
+  const [testingMrId, setTestingMrId] = React46.useState(null);
+  const chatShowTypingIndicator = React46.useMemo(() => {
     var _a;
     if (!thread.raw || thread.raw.length === 0) return false;
     const last = thread.raw[thread.raw.length - 1];
     const payloadType = typeof ((_a = last.payload) == null ? void 0 : _a.type) === "string" ? String(last.payload.type) : void 0;
     return payloadType !== "outcome";
   }, [thread.raw]);
-  return /* @__PURE__ */ jsx58(View45, { style: [{ flex: 1 }, style], children: /* @__PURE__ */ jsxs35(View45, { ref: captureTargetRef, style: { flex: 1 }, collapsable: false, children: [
-    /* @__PURE__ */ jsx58(
+  React46.useEffect(() => {
+    updateLastEditQueueInfo(null);
+    setSuppressQueueUntilResponse(false);
+  }, [activeAppId, updateLastEditQueueInfo]);
+  React46.useEffect(() => {
+    if (!(lastEditQueueInfo == null ? void 0 : lastEditQueueInfo.queueItemId)) return;
+    const stillPresent = editQueue.items.some((item) => item.id === lastEditQueueInfo.queueItemId);
+    if (!stillPresent) {
+      updateLastEditQueueInfo(null);
+      setSuppressQueueUntilResponse(false);
+    }
+  }, [editQueue.items, lastEditQueueInfo == null ? void 0 : lastEditQueueInfo.queueItemId]);
+  const chatQueueItems = React46.useMemo(() => {
+    var _a;
+    if (suppressQueueUntilResponse && editQueue.items.length <= 1) {
+      return [];
+    }
+    if (!lastEditQueueInfo || lastEditQueueInfo.queuePosition !== 1 || !lastEditQueueInfo.queueItemId) {
+      return editQueue.items;
+    }
+    if (editQueue.items.length === 1 && ((_a = editQueue.items[0]) == null ? void 0 : _a.id) === lastEditQueueInfo.queueItemId) {
+      return [];
+    }
+    return editQueue.items;
+  }, [editQueue.items, lastEditQueueInfo, suppressQueueUntilResponse]);
+  return /* @__PURE__ */ jsx59(View46, { style: [{ flex: 1 }, style], children: /* @__PURE__ */ jsxs36(View46, { ref: captureTargetRef, style: { flex: 1 }, collapsable: false, children: [
+    /* @__PURE__ */ jsx59(
       RuntimeRenderer,
       {
         appKey,
@@ -6894,7 +7520,7 @@ function ComergeStudioInner({
         allowInitialPreparing: !embeddedBaseBundles
       }
     ),
-    /* @__PURE__ */ jsx58(
+    /* @__PURE__ */ jsx59(
       StudioOverlay,
       {
         captureTargetRef,
@@ -6946,6 +7572,8 @@ function ComergeStudioInner({
         chatSending: actions.sending,
         chatShowTypingIndicator,
         onSendChat: (text, attachments) => actions.sendEdit({ prompt: text, attachments }),
+        chatQueueItems,
+        onRemoveQueueItem: (id) => editQueueActions.cancel(id),
         onNavigateHome,
         showBubble,
         studioControlOptions