@comergehq/studio 0.1.19 → 0.1.21

package/dist/index.js

@@ -549,6 +549,12 @@ var AppsRemoteDataSourceImpl = class extends BaseRemote {
     );
     return data;
   }
+  async syncUpstream(appId) {
+    const { data } = await api.post(
+      `/v1/apps/${encodeURIComponent(appId)}/sync-upstream`
+    );
+    return data;
+  }
 };
 var appsRemoteDataSource = new AppsRemoteDataSourceImpl();
 
@@ -627,6 +633,10 @@ var AppsRepositoryImpl = class extends BaseRepository {
     const res = await this.remote.importFromGithub(payload);
     return this.unwrapOrThrow(res);
   }
+  async syncUpstream(appId) {
+    const res = await this.remote.syncUpstream(appId);
+    return this.unwrapOrThrow(res);
+  }
   subscribeCreatedApps(userId, handlers) {
     if (!userId) return () => {
     };
@@ -5390,6 +5400,9 @@ function ReviewMergeRequestCarousel({
 var import_jsx_runtime44 = require("react/jsx-runtime");
 function PreviewCollaborateSection({
   canSubmitMergeRequest,
+  canSyncUpstream,
+  syncingUpstream,
+  upstreamSyncStatus,
   incomingMergeRequests,
   outgoingMergeRequests,
   creatorStatsById,
@@ -5398,15 +5411,18 @@ function PreviewCollaborateSection({
   testingMrId,
   toMergeRequestSummary,
   onSubmitMergeRequest,
+  onSyncUpstream,
   onRequestApprove,
   onReject,
   onTestMr
 }) {
   const theme = useTheme();
   const [submittingMr, setSubmittingMr] = React32.useState(false);
-  const hasSection = canSubmitMergeRequest || incomingMergeRequests.length > 0 || outgoingMergeRequests.length > 0;
+  const [syncingLocal, setSyncingLocal] = React32.useState(false);
+  const hasSection = canSubmitMergeRequest || canSyncUpstream || incomingMergeRequests.length > 0 || outgoingMergeRequests.length > 0;
   if (!hasSection) return null;
-  const showActionsSubtitle = canSubmitMergeRequest && onSubmitMergeRequest || onTestMr && incomingMergeRequests.length > 0;
+  const isSyncing = Boolean(syncingUpstream || syncingLocal);
+  const showActionsSubtitle = canSubmitMergeRequest && onSubmitMergeRequest || canSyncUpstream && onSyncUpstream || onTestMr && incomingMergeRequests.length > 0;
   return /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)(import_jsx_runtime44.Fragment, { children: [
     /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(SectionTitle, { marginTop: theme.spacing.xl, children: "Collaborate" }),
     showActionsSubtitle ? /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(
@@ -5475,6 +5491,64 @@ function PreviewCollaborateSection({
         right: /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(import_lucide_react_native9.Send, { size: 16, color: "#03DAC6" })
       }
     ) : null,
+    canSyncUpstream && onSyncUpstream ? /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(
+      PressableCardRow,
+      {
+        accessibilityLabel: "Sync from original",
+        disabled: isSyncing,
+        onPress: () => {
+          import_react_native42.Alert.alert(
+            "Sync from Original",
+            "This will pull the latest upstream changes into your remix.",
+            [
+              { text: "Cancel", style: "cancel" },
+              {
+                text: "Sync",
+                style: "destructive",
+                onPress: () => {
+                  setSyncingLocal(true);
+                  Promise.resolve(onSyncUpstream()).then((result) => {
+                    if ((result == null ? void 0 : result.status) === "up-to-date") {
+                      import_react_native42.Alert.alert("Up to date", "Your remix already includes the latest upstream changes.");
+                    } else {
+                      import_react_native42.Alert.alert("Sync started", "Upstream changes are being merged into your remix.");
+                    }
+                  }).catch(() => {
+                    import_react_native42.Alert.alert("Sync failed", "We could not start the sync. Please try again.");
+                  }).finally(() => setSyncingLocal(false));
+                }
+              }
+            ]
+          );
+        },
+        style: {
+          padding: theme.spacing.lg,
+          borderRadius: theme.radii.lg,
+          backgroundColor: withAlpha(theme.colors.surfaceRaised, 0.5),
+          borderWidth: 1,
+          borderColor: withAlpha(theme.colors.primary, 0.25),
+          marginBottom: theme.spacing.sm
+        },
+        left: /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(
+          import_react_native42.View,
+          {
+            style: {
+              width: 40,
+              height: 40,
+              borderRadius: 999,
+              alignItems: "center",
+              justifyContent: "center",
+              backgroundColor: withAlpha(theme.colors.primary, 0.12),
+              marginRight: theme.spacing.lg
+            },
+            children: isSyncing ? /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(import_react_native42.ActivityIndicator, { color: theme.colors.primary, size: "small" }) : /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(import_lucide_react_native9.RefreshCw, { size: 18, color: theme.colors.primary })
+          }
+        ),
+        title: /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Text, { style: { color: theme.colors.text, fontSize: 16, lineHeight: 20, fontWeight: theme.typography.fontWeight.semibold }, children: "Sync from Original" }),
+        subtitle: /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Text, { style: { color: theme.colors.textMuted, fontSize: 12, lineHeight: 16, marginTop: 2 }, children: isSyncing ? "Syncing upstream changes..." : upstreamSyncStatus === "up-to-date" ? "You are already up to date with the original app" : "Pull the latest upstream changes into this remix" }),
+        right: /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(import_lucide_react_native9.RefreshCw, { size: 16, color: theme.colors.primary })
+      }
+    ) : null,
     onTestMr && incomingMergeRequests.length > 0 ? /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(
       ReviewMergeRequestCarousel,
       {
@@ -5782,6 +5856,12 @@ function usePreviewPanelData(params) {
     if (app.headCommitId && app.forkedFromCommitId && app.headCommitId !== app.forkedFromCommitId) return true;
     return false;
   }, [app, isOwner, outgoingMergeRequests]);
+  const canSyncUpstream = React34.useMemo(() => {
+    if (!isOwner) return false;
+    if (!app) return false;
+    if (!app.forkedFromAppId) return false;
+    return app.status === "ready";
+  }, [app, isOwner]);
   const showProcessing = app ? app.status !== "ready" : false;
   return {
     imageUrl,
@@ -5791,7 +5871,8 @@ function usePreviewPanelData(params) {
     insights,
     stats,
     showProcessing,
-    canSubmitMergeRequest
+    canSubmitMergeRequest,
+    canSyncUpstream
   };
 }
 
@@ -5814,6 +5895,9 @@ function PreviewPanel({
   onGoToChat,
   onStartDraw,
   onSubmitMergeRequest,
+  onSyncUpstream,
+  syncingUpstream,
+  upstreamSyncStatus,
   onRequestApprove,
   onReject,
   onTestMr,
@@ -5823,11 +5907,11 @@ function PreviewPanel({
   const handleShare = React35.useCallback(async () => {
     if (!app || !app.isPublic) return;
     const shareUrl = `https://remix.one/app/${app.id}`;
-    const message = app.name ? `${app.name} on Comerge
-${shareUrl}` : `Check out this app on Comerge
+    const message = app.name ? `${app.name} on Remix
+${shareUrl}` : `Check out this app on Remix
 ${shareUrl}`;
     try {
-      const title = app.name ?? "Comerge app";
+      const title = app.name ?? "Remix app";
       const payload = import_react_native43.Platform.OS === "ios" ? {
         title,
         message
@@ -5841,7 +5925,17 @@ ${shareUrl}`;
       log.warn("PreviewPanel share failed", error);
     }
   }, [app]);
-  const { imageUrl, imageLoaded, setImageLoaded, creator, insights, stats, showProcessing, canSubmitMergeRequest } = usePreviewPanelData({
+  const {
+    imageUrl,
+    imageLoaded,
+    setImageLoaded,
+    creator,
+    insights,
+    stats,
+    showProcessing,
+    canSubmitMergeRequest,
+    canSyncUpstream
+  } = usePreviewPanelData({
     app,
     isOwner,
     outgoingMergeRequests,
@@ -5901,6 +5995,9 @@ ${shareUrl}`;
       PreviewCollaborateSection,
       {
         canSubmitMergeRequest,
+        canSyncUpstream,
+        syncingUpstream,
+        upstreamSyncStatus,
         incomingMergeRequests,
         outgoingMergeRequests,
         creatorStatsById,
@@ -5909,6 +6006,7 @@ ${shareUrl}`;
         testingMrId,
         toMergeRequestSummary,
         onSubmitMergeRequest,
+        onSyncUpstream,
         onRequestApprove,
         onReject,
         onTestMr
@@ -5943,6 +6041,8 @@ function ChatMessageBubble({ message, renderContent, style }) {
   const isMergeApproved = metaEvent === "merge_request.approved";
   const isMergeRejected = metaEvent === "merge_request.rejected";
   const isMergeCompleted = metaEvent === "merge.completed";
+  const isSyncStarted = metaEvent === "sync.started";
+  const isSyncCompleted = metaEvent === "sync.completed";
   const isHuman = message.author === "human" || isMergeApproved || isMergeRejected;
   const align = { alignSelf: isHuman ? "flex-end" : "flex-start" };
   const bubbleVariant = isHuman ? "surface" : "surfaceRaised";
@@ -5964,8 +6064,8 @@ function ChatMessageBubble({ message, renderContent, style }) {
         cornerStyle
       ],
       children: /* @__PURE__ */ (0, import_jsx_runtime46.jsxs)(import_react_native44.View, { style: { flexDirection: "row", alignItems: "center" }, children: [
-        isMergeCompleted ? /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(import_lucide_react_native10.CheckCheck, { size: 16, color: theme.colors.success, style: { marginRight: theme.spacing.sm } }) : null,
-        isMergeApproved ? /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(import_lucide_react_native10.GitMerge, { size: 16, color: theme.colors.text, style: { marginRight: theme.spacing.sm } }) : null,
+        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 }) })
       ] })
     }
@@ -6928,6 +7028,9 @@ function StudioOverlay({
   testingMrId,
   toMergeRequestSummary,
   onSubmitMergeRequest,
+  onSyncUpstream,
+  syncingUpstream,
+  upstreamSyncStatus,
   onApprove,
   onReject,
   onTestMr,
@@ -7072,6 +7175,9 @@ function StudioOverlay({
             onGoToChat: goToChat,
             onStartDraw: isOwner ? startDraw : void 0,
             onSubmitMergeRequest,
+            onSyncUpstream,
+            syncingUpstream,
+            upstreamSyncStatus,
             onRequestApprove: (mr) => setConfirmMrId(mr.id),
             onReject,
             onTestMr: handleTestMr,
@@ -7500,6 +7606,8 @@ function ComergeStudioInner({
   const chatSendDisabled = false;
   const [processingMrId, setProcessingMrId] = React47.useState(null);
   const [testingMrId, setTestingMrId] = React47.useState(null);
+  const [syncingUpstream, setSyncingUpstream] = React47.useState(false);
+  const [upstreamSyncStatus, setUpstreamSyncStatus] = React47.useState(null);
   const chatShowTypingIndicator = React47.useMemo(() => {
     var _a;
     if (!thread.raw || thread.raw.length === 0) return false;
@@ -7510,7 +7618,21 @@ function ComergeStudioInner({
   React47.useEffect(() => {
     updateLastEditQueueInfo(null);
     setSuppressQueueUntilResponse(false);
+    setUpstreamSyncStatus(null);
   }, [activeAppId, updateLastEditQueueInfo]);
+  const handleSyncUpstream = React47.useCallback(async () => {
+    if (!(app == null ? void 0 : app.id)) {
+      throw new Error("Missing app");
+    }
+    setSyncingUpstream(true);
+    try {
+      const result = await appsRepository.syncUpstream(activeAppId);
+      setUpstreamSyncStatus(result.status);
+      return result;
+    } finally {
+      setSyncingUpstream(false);
+    }
+  }, [activeAppId, app == null ? void 0 : app.id]);
   React47.useEffect(() => {
     if (!(lastEditQueueInfo == null ? void 0 : lastEditQueueInfo.queueItemId)) return;
     const stillPresent = editQueue.items.some((item) => item.id === lastEditQueueInfo.queueItemId);
@@ -7566,6 +7688,9 @@ function ComergeStudioInner({
         onSubmitMergeRequest: (app == null ? void 0 : app.forkedFromAppId) && actions.isOwner && !hasOpenOutgoingMr ? async () => {
           await mergeRequests.actions.openMergeRequest(activeAppId);
         } : void 0,
+        onSyncUpstream: actions.isOwner && (app == null ? void 0 : app.forkedFromAppId) ? handleSyncUpstream : void 0,
+        syncingUpstream,
+        upstreamSyncStatus,
         onApprove: async (mr) => {
           if (processingMrId) return;
           setProcessingMrId(mr.id);