@comergehq/studio 0.1.31 → 0.1.33

package/dist/index.js

@@ -2899,6 +2899,13 @@ var AttachmentRemoteDataSourceImpl = class extends BaseRemote {
     );
     return data;
   }
+  async stagePresign(payload) {
+    const { data } = await api.post(
+      "/v1/attachments/stage/presign",
+      payload
+    );
+    return data;
+  }
 };
 var attachmentRemoteDataSource = new AttachmentRemoteDataSourceImpl();
 
@@ -2912,6 +2919,10 @@ var AttachmentRepositoryImpl = class extends BaseRepository {
     const res = await this.remote.presign(payload);
     return this.unwrapOrThrow(res);
   }
+  async stagePresign(payload) {
+    const res = await this.remote.stagePresign(payload);
+    return this.unwrapOrThrow(res);
+  }
   async upload(upload, file) {
     const resp = await fetch(upload.uploadUrl, {
       method: "PUT",
@@ -2922,6 +2933,16 @@ var AttachmentRepositoryImpl = class extends BaseRepository {
       throw new Error(`upload failed: ${resp.status}`);
     }
   }
+  async uploadStaged(upload, file) {
+    const resp = await fetch(upload.uploadUrl, {
+      method: "PUT",
+      headers: upload.headers,
+      body: file
+    });
+    if (!resp.ok) {
+      throw new Error(`staged upload failed: ${resp.status}`);
+    }
+  }
 };
 var attachmentRepository = new AttachmentRepositoryImpl(
   attachmentRemoteDataSource
@@ -2995,7 +3016,36 @@ function useAttachmentUpload() {
       setUploading(false);
     }
   }, []);
-  return { uploadBase64Images, uploading, error };
+  const stageBase64Images = React7.useCallback(async ({ dataUrls }) => {
+    if (!dataUrls || dataUrls.length === 0) return [];
+    setUploading(true);
+    setError(null);
+    try {
+      const blobs = await Promise.all(
+        dataUrls.map(async (dataUrl) => {
+          const normalized = dataUrl.startsWith("data:") ? dataUrl : `data:image/png;base64,${dataUrl}`;
+          const blob = import_react_native6.Platform.OS === "android" ? await dataUrlToBlobAndroid(normalized) : await (await fetch(normalized)).blob();
+          const mimeType = getMimeTypeFromDataUrl(normalized);
+          return { blob, mimeType };
+        })
+      );
+      const files = blobs.map(({ blob, mimeType }, idx) => ({
+        name: `attachment-${Date.now()}-${idx}.png`,
+        size: blob.size,
+        mimeType
+      }));
+      const presign = await attachmentRepository.stagePresign({ files });
+      await Promise.all(presign.uploads.map((u, index) => attachmentRepository.uploadStaged(u, blobs[index].blob)));
+      return presign.uploads.map((u) => u.attachmentToken);
+    } catch (e) {
+      const err = e instanceof Error ? e : new Error(String(e));
+      setError(err);
+      throw err;
+    } finally {
+      setUploading(false);
+    }
+  }, []);
+  return { uploadBase64Images, stageBase64Images, uploading, error };
 }
 
 // src/studio/hooks/useStudioActions.ts
@@ -3011,6 +3061,10 @@ var AgentRemoteDataSourceImpl = class extends BaseRemote {
     const { data } = await api.post("/v1/agent/editApp", payload);
     return data;
   }
+  async forkEditStart(payload) {
+    const { data } = await api.post("/v1/agent/forkEditStart", payload);
+    return data;
+  }
 };
 var agentRemoteDataSource = new AgentRemoteDataSourceImpl();
 
@@ -3028,6 +3082,10 @@ var AgentRepositoryImpl = class extends BaseRepository {
     const res = await this.remote.editApp(payload);
     return this.unwrapOrThrow(res);
   }
+  async forkEditStart(payload) {
+    const res = await this.remote.forkEditStart(payload);
+    return this.unwrapOrThrow(res);
+  }
 };
 var agentRepository = new AgentRepositoryImpl(agentRemoteDataSource);
 
@@ -3078,7 +3136,8 @@ function useStudioActions({
   onEditStart,
   onEditQueued,
   onEditFinished,
-  uploadAttachments
+  uploadAttachments,
+  stageAttachments
 }) {
   const [forking, setForking] = React8.useState(false);
   const [sending, setSending] = React8.useState(false);
@@ -3098,16 +3157,46 @@ function useStudioActions({
         const sourceAppId = app.id;
         if (shouldForkOnEdit) {
           setForking(true);
-          const forked = await appsRepository.fork(app.id, {});
-          targetApp = forked;
+          let attachmentTokens;
+          if (attachments && attachments.length > 0 && stageAttachments) {
+            attachmentTokens = await stageAttachments({ dataUrls: attachments });
+          }
+          const idempotencyKey2 = generateIdempotencyKey();
+          const startResult = await withRetry2(
+            async () => await agentRepository.forkEditStart({
+              source_app_id: sourceAppId,
+              prompt,
+              attachmentTokens,
+              idempotencyKey: idempotencyKey2
+            }),
+            { attempts: 3, baseDelayMs: 500, maxDelayMs: 4e3 }
+          );
+          targetApp = {
+            ...app,
+            id: startResult.targetAppId,
+            threadId: startResult.targetThreadId
+          };
           await trackRemixApp({
-            appId: forked.id,
+            appId: startResult.targetAppId,
             sourceAppId,
-            threadId: forked.threadId ?? void 0,
+            threadId: startResult.targetThreadId ?? void 0,
             success: true
           });
           forkSucceeded = true;
-          onForkedApp == null ? void 0 : onForkedApp(forked.id, { keepRenderingAppId: sourceAppId });
+          onForkedApp == null ? void 0 : onForkedApp(startResult.targetAppId, { keepRenderingAppId: sourceAppId });
+          onEditStart == null ? void 0 : onEditStart();
+          onEditQueued == null ? void 0 : onEditQueued({
+            queueItemId: startResult.queueItemId ?? null,
+            queuePosition: startResult.queuePosition ?? null
+          });
+          await trackEditApp({
+            appId: startResult.targetAppId,
+            threadId: startResult.targetThreadId,
+            promptLength: prompt.trim().length,
+            success: true
+          });
+          setForking(false);
+          return;
         }
         setForking(false);
         const threadId = targetApp.threadId;
@@ -3168,7 +3257,18 @@ function useStudioActions({
         onEditFinished == null ? void 0 : onEditFinished();
       }
     },
-    [app, onEditFinished, onEditQueued, onEditStart, onForkedApp, sending, shouldForkOnEdit, uploadAttachments, userId]
+    [
+      app,
+      onEditFinished,
+      onEditQueued,
+      onEditStart,
+      onForkedApp,
+      sending,
+      shouldForkOnEdit,
+      stageAttachments,
+      uploadAttachments,
+      userId
+    ]
   );
   return { isOwner, shouldForkOnEdit, forking, sending, error, sendEdit };
 }
@@ -5866,9 +5966,9 @@ function PreviewRelatedAppsSection({
   const renderRelatedCard = React27.useCallback(
     (item, options) => {
       const isCurrent = item.app.id === currentAppId;
-      const isReady = item.app.status === "ready";
+      const isArchived = item.app.status === "archived";
       const isSwitching = switchingRelatedAppId === item.app.id;
-      const disabled = isCurrent || !isReady || Boolean(switchingRelatedAppId);
+      const disabled = isCurrent || isArchived || Boolean(switchingRelatedAppId);
       return /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(
         import_react_native35.Pressable,
         {
@@ -5908,7 +6008,7 @@ function PreviewRelatedAppsSection({
               )
             ] }),
             /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)(import_react_native35.View, { style: { alignItems: "flex-end", gap: 6 }, children: [
-              /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(import_react_native35.View, { style: { minHeight: 20, justifyContent: "center" }, children: !isReady ? /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(PreviewStatusBadge, { status: item.app.status }) : null }),
+              /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(import_react_native35.View, { style: { minHeight: 20, justifyContent: "center" }, children: item.app.status !== "ready" ? /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(PreviewStatusBadge, { status: item.app.status }) : null }),
               isSwitching ? /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(import_react_native35.ActivityIndicator, { size: "small", color: theme.colors.primary }) : null
             ] })
           ] })
@@ -8396,7 +8496,7 @@ function ChatPanel({
   showTypingIndicator,
   loading,
   sendDisabled,
-  forking = false,
+  forking: _forking = false,
   sending,
   shouldForkOnEdit,
   attachments = [],
@@ -8455,7 +8555,7 @@ function ChatPanel({
       style: { marginBottom: 12 }
     }
   ) : null;
-  const showMessagesLoading = Boolean(loading) && messages.length === 0 || forking;
+  const showMessagesLoading = Boolean(loading) && messages.length === 0;
   if (showMessagesLoading) {
     return /* @__PURE__ */ (0, import_jsx_runtime59.jsxs)(import_react_native58.View, { style: { flex: 1 }, children: [
       /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(import_react_native58.View, { children: header }),
@@ -8463,14 +8563,14 @@ function ChatPanel({
       /* @__PURE__ */ (0, import_jsx_runtime59.jsxs)(import_react_native58.View, { style: { flex: 1, alignItems: "center", justifyContent: "center", paddingHorizontal: 24, paddingVertical: 12 }, children: [
         /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(import_react_native58.ActivityIndicator, {}),
         /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(import_react_native58.View, { style: { height: 12 } }),
-        /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(Text, { variant: "bodyMuted", children: forking ? "Creating your copy\u2026" : "Loading messages\u2026" })
+        /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(Text, { variant: "bodyMuted", children: "Loading messages\u2026" })
       ] })
     ] });
   }
   const bundleProgress = (progress == null ? void 0 : progress.bundle) ?? null;
   const queueTop = progress || queueItems.length > 0 ? /* @__PURE__ */ (0, import_jsx_runtime59.jsxs)(import_react_native58.View, { style: { gap: theme.spacing.sm }, children: [
     progress ? bundleProgress ? /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(BundleProgressCard, { progress: bundleProgress }) : /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(AgentProgressCard, { progress }) : null,
-    queueItems.length > 0 ? /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(ChatQueue, { items: queueItems, onRemove: onRemoveQueueItem }) : null
+    !progress && queueItems.length > 0 ? /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(ChatQueue, { items: queueItems, onRemove: onRemoveQueueItem }) : null
   ] }) : null;
   return /* @__PURE__ */ (0, import_jsx_runtime59.jsx)(
     ChatPage,
@@ -8497,8 +8597,8 @@ function ChatPanel({
       composer: {
         // Keep the input editable even when sending is disallowed (e.g. agent still working),
         // otherwise iOS will drop focus/keyboard and BottomSheet can get "stuck" with a keyboard-sized gap.
-        disabled: Boolean(loading) || Boolean(forking),
-        sendDisabled: Boolean(sendDisabled) || Boolean(loading) || Boolean(forking),
+        disabled: Boolean(loading),
+        sendDisabled: Boolean(sendDisabled) || Boolean(loading),
         sending: Boolean(sending),
         onSend: handleSend,
         attachments,
@@ -8714,7 +8814,7 @@ function isOptimisticResolvedByServer(chatMessages, o) {
 }
 function useOptimisticChatMessages({
   threadId,
-  shouldForkOnEdit,
+  shouldForkOnEdit: _shouldForkOnEdit,
   disableOptimistic = false,
   chatMessages,
   onSendChat
@@ -8749,7 +8849,7 @@ function useOptimisticChatMessages({
   }, [chatMessages, optimisticChat.length]);
   const onSend = React45.useCallback(
     async (text, attachments) => {
-      if (shouldForkOnEdit || disableOptimistic) {
+      if (disableOptimistic) {
         await onSendChat(text, attachments);
         return;
       }
@@ -8773,11 +8873,11 @@ function useOptimisticChatMessages({
         setOptimisticChat((prev) => prev.map((m) => m.id === id ? { ...m, failed: true } : m));
       });
     },
-    [chatMessages, disableOptimistic, onSendChat, shouldForkOnEdit]
+    [chatMessages, disableOptimistic, onSendChat]
   );
   const onRetry = React45.useCallback(
     async (messageId) => {
-      if (shouldForkOnEdit || disableOptimistic) return;
+      if (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;
@@ -8797,7 +8897,7 @@ function useOptimisticChatMessages({
         );
       }
     },
-    [chatMessages, disableOptimistic, onSendChat, optimisticChat, shouldForkOnEdit]
+    [chatMessages, disableOptimistic, onSendChat, optimisticChat]
   );
   const isRetrying = React45.useCallback(
     (messageId) => {
@@ -9950,6 +10050,7 @@ function ComergeStudioInner({
       }
     },
     uploadAttachments: uploader.uploadBase64Images,
+    stageAttachments: uploader.stageBase64Images,
     onEditStart: () => {
       if (editQueue.items.length === 0) {
         setSuppressQueueUntilResponse(true);
@@ -9975,7 +10076,26 @@ function ComergeStudioInner({
   const [upstreamSyncStatus, setUpstreamSyncStatus] = React51.useState(null);
   const isMrTestBuildInProgress = bundle.loading && bundle.loadingMode === "test";
   const isBaseBundleDownloading = bundle.loading && bundle.loadingMode === "base" && !bundle.isTesting;
-  const runtimePreparingText = bundle.bundleStatus === "pending" ? "Bundling app\u2026 this may take a few minutes" : "Preparing app\u2026";
+  const runtimePreparingText = React51.useMemo(() => {
+    const status = app == null ? void 0 : app.status;
+    if (status === "ready" && bundle.bundleStatus === "pending") {
+      return "Bundling app\u2026 this may take a few minutes";
+    }
+    switch (status) {
+      case "creating":
+        return "Creating your app\u2026 this may take a moment";
+      case "forking":
+        return "Forking your app\u2026";
+      case "editing":
+        return "Applying your latest changes\u2026";
+      case "merging":
+        return "Merging app updates\u2026";
+      case "error":
+        return "This app hit an error while preparing.";
+      default:
+        return "Preparing app\u2026";
+    }
+  }, [app == null ? void 0 : app.status, bundle.bundleStatus]);
   const chatShowTypingIndicator = React51.useMemo(() => {
     var _a2;
     if (agentProgress.hasLiveProgress) return false;
@@ -10042,9 +10162,9 @@ function ComergeStudioInner({
       setSwitchingRelatedAppId(targetAppId);
       try {
         const targetApp = await appsRepository.getById(targetAppId);
-        if (targetApp.status !== "ready") {
-          const reason = `target_not_ready:${targetApp.status}`;
-          log.warn("[related-apps] switch blocked: target app not ready", {
+        if (targetApp.status === "archived") {
+          const reason = "target_archived";
+          log.warn("[related-apps] switch blocked: target app archived", {
             fromAppId: activeAppId,
             toAppId: targetAppId,
             status: targetApp.status