@agent-native/core 0.102.2 → 0.103.1

package/corpus/templates/content/app/i18n-data.ts

@@ -2750,6 +2750,8 @@ const editorSlashMessages = {
   heading2Description: "Medium heading",
   heading3Description: "Small heading",
   heading4Description: "Subheading",
+  heading5Description: "Smaller heading",
+  heading6Description: "Smallest heading",
   image: "Image",
   imageDescription: "Upload or embed image",
   inlineEquation: "Inline equation",
@@ -2795,6 +2797,9 @@ const localFilesMessages = {
   summaryUnchanged: "{{count}} unchanged",
   summarySkipped: "{{count}} skipped",
   summaryErrors: "{{count}} errors",
+  summaryConflicts: "{{count}} conflicts",
+  conflictNeedsReview:
+    "Content and the folder both changed; review is required.",
   pageTitle: "Local files",
   foldersRemembered: "Folders remembered",
   linkedCount: "{{count}} linked",
@@ -2947,6 +2952,8 @@ const enUS = {
     heading2: "Heading 2",
     heading3: "Heading 3",
     heading4: "Heading 4",
+    heading5: "Heading 5",
+    heading6: "Heading 6",
     link: "Link",
     comment: "Comment",
     pasteLink: "Paste link...",
@@ -3107,11 +3114,14 @@ const enUS = {
       "“{{title}}” and all its sub-pages will be permanently deleted. This cannot be undone.",
     deletePageQuestion: "Delete page?",
     localFiles: "Local files",
+    files: "Files",
+    loadingFiles: "Loading files…",
     localFilesActions: "Local files actions",
     localFilesRemoved: "Local files removed",
     localFilesRemovedDescription: "{{count}} items removed",
     manageLocalFolders: "Manage folders",
     new: "New",
+    newDatabase: "New database",
     newPage: "New page",
     nextStep: "Next step",
     notionConfigureOAuthAuthorize:
@@ -3143,6 +3153,7 @@ const enUS = {
       "Sync documents with your Notion workspace.",
     notionUploadCredentialsJson: "Upload credentials JSON",
     noFilesYet: "No files yet",
+    noWorkspaces: "No workspaces yet",
     noLocalFilesYet: "No local files yet",
     noOrganizationPagesYet: "No organization pages yet",
     noPagesFound: "No pages found",
@@ -3168,6 +3179,7 @@ const enUS = {
     trash: "Trash",
     favorites: "Favorites",
     untitled: "Untitled",
+    workspaces: "Workspaces",
   },
 };
 
@@ -5608,6 +5620,8 @@ const editorMessagesByLocale = {
       heading2Description: "中标题",
       heading3Description: "小标题",
       heading4Description: "副标题",
+      heading5Description: "较小标题",
+      heading6Description: "最小标题",
       image: "图片",
       imageDescription: "上传或嵌入图像",
       localComponents: "本地组件",
@@ -5944,6 +5958,8 @@ const editorMessagesByLocale = {
       heading2Description: "título medio",
       heading3Description: "título pequeño",
       heading4Description: "Subtítulo",
+      heading5Description: "Encabezado más pequeño",
+      heading6Description: "Encabezado mínimo",
       image: "Imagen",
       imageDescription: "Subir o insertar imagen",
       localComponents: "Componentes locales",
@@ -6292,6 +6308,8 @@ const editorMessagesByLocale = {
       heading2Description: "Titre moyen",
       heading3Description: "Petit titre",
       heading4Description: "Sous-titre",
+      heading5Description: "Titre plus petit",
+      heading6Description: "Titre le plus petit",
       image: "Images",
       imageDescription: "Télécharger ou intégrer une image",
       localComponents: "Composants locaux",
@@ -6640,6 +6658,8 @@ const editorMessagesByLocale = {
       heading2Description: "Mittlere Überschrift",
       heading3Description: "Kleine Überschrift",
       heading4Description: "Unterüberschrift",
+      heading5Description: "Kleinere Überschrift",
+      heading6Description: "Kleinste Überschrift",
       image: "Bild",
       imageDescription: "Bild hochladen oder einbetten",
       localComponents: "Lokale Komponenten",
@@ -6987,6 +7007,8 @@ const editorMessagesByLocale = {
       heading2Description: "中見出し",
       heading3Description: "小見出し",
       heading4Description: "小見出し",
+      heading5Description: "より小さい見出し",
+      heading6Description: "最小の見出し",
       image: "画像",
       imageDescription: "画像をアップロードまたは埋め込む",
       localComponents: "ローカルコンポーネント",
@@ -7327,6 +7349,8 @@ const editorMessagesByLocale = {
       heading2Description: "중간 제목",
       heading3Description: "작은 제목",
       heading4Description: "소제목",
+      heading5Description: "더 작은 제목",
+      heading6Description: "가장 작은 제목",
       image: "이미지",
       imageDescription: "이미지 업로드 또는 삽입",
       localComponents: "로컬 구성요소",
@@ -7670,6 +7694,8 @@ const editorMessagesByLocale = {
       heading2Description: "Título médio",
       heading3Description: "Título pequeno",
       heading4Description: "Subtítulo",
+      heading5Description: "Título menor",
+      heading6Description: "Título mínimo",
       image: "Imagem",
       imageDescription: "Carregar ou incorporar imagem",
       localComponents: "Componentes locais",
@@ -8012,6 +8038,8 @@ const editorMessagesByLocale = {
       heading2Description: "मध्यम शीर्षक",
       heading3Description: "छोटा शीर्षक",
       heading4Description: "उपशीर्षक",
+      heading5Description: "और छोटा शीर्षक",
+      heading6Description: "सबसे छोटा शीर्षक",
       image: "छवि",
       imageDescription: "छवि अपलोड या एम्बेड करें",
       localComponents: "स्थानीय घटक",
@@ -8348,6 +8376,8 @@ const editorMessagesByLocale = {
       heading2Description: "عنوان متوسط",
       heading3Description: "عنوان صغير",
       heading4Description: "عنوان فرعي",
+      heading5Description: "عنوان أصغر",
+      heading6Description: "أصغر عنوان",
       image: "صورة",
       imageDescription: "تحميل أو تضمين الصورة",
       localComponents: "المكونات المحلية",
@@ -8810,6 +8840,8 @@ export const messagesByLocale = {
       heading2: "标题 2",
       heading3: "标题 3",
       heading4: "标题 4",
+      heading5: "标题 5",
+      heading6: "标题 6",
       link: "链接",
       comment: "评论",
       pasteLink: "粘贴链接...",
@@ -8835,6 +8867,9 @@ export const messagesByLocale = {
     },
     sidebar: {
       cannotReorderPages: "无法重新排序页面",
+      loadingFiles: "正在加载文件…",
+      newDatabase: "新建数据库",
+      noWorkspaces: "还没有工作区",
       collapse: "折叠侧边栏",
       expand: "展开侧边栏",
       failedCreatePage: "创建页面失败",
@@ -8994,6 +9029,8 @@ export const messagesByLocale = {
       heading2: "Encabezado 2",
       heading3: "Encabezado 3",
       heading4: "Encabezado 4",
+      heading5: "Encabezado 5",
+      heading6: "Encabezado 6",
       link: "Enlace",
       comment: "Comentario",
       pasteLink: "Pegar enlace...",
@@ -9020,6 +9057,9 @@ export const messagesByLocale = {
     },
     sidebar: {
       cannotReorderPages: "No se pueden reordenar las páginas",
+      loadingFiles: "Cargando archivos…",
+      newDatabase: "Nueva base de datos",
+      noWorkspaces: "Aún no hay espacios de trabajo",
       collapse: "Contraer barra lateral",
       expand: "Expandir barra lateral",
       failedCreatePage: "No se pudo crear la página",
@@ -9180,6 +9220,8 @@ export const messagesByLocale = {
       heading2: "Titre 2",
       heading3: "Titre 3",
       heading4: "Titre 4",
+      heading5: "Titre 5",
+      heading6: "Titre 6",
       link: "Lien",
       comment: "Commentaire",
       pasteLink: "Coller le lien...",
@@ -9206,6 +9248,9 @@ export const messagesByLocale = {
     },
     sidebar: {
       cannotReorderPages: "Impossible de réordonner les pages",
+      loadingFiles: "Chargement des fichiers…",
+      newDatabase: "Nouvelle base de données",
+      noWorkspaces: "Aucun espace de travail pour le moment",
       collapse: "Réduire la barre latérale",
       expand: "Développer la barre latérale",
       failedCreatePage: "Échec de la création de la page",
@@ -9364,6 +9409,8 @@ export const messagesByLocale = {
       heading2: "Überschrift 2",
       heading3: "Überschrift 3",
       heading4: "Überschrift 4",
+      heading5: "Überschrift 5",
+      heading6: "Überschrift 6",
       link: "Link",
       comment: "Kommentar",
       pasteLink: "Link einfügen...",
@@ -9390,6 +9437,9 @@ export const messagesByLocale = {
     },
     sidebar: {
       cannotReorderPages: "Seiten können nicht neu angeordnet werden",
+      loadingFiles: "Dateien werden geladen…",
+      newDatabase: "Neue Datenbank",
+      noWorkspaces: "Noch keine Arbeitsbereiche",
       collapse: "Seitenleiste einklappen",
       expand: "Seitenleiste ausklappen",
       failedCreatePage: "Seite konnte nicht erstellt werden",
@@ -9548,6 +9598,8 @@ export const messagesByLocale = {
       heading2: "見出し 2",
       heading3: "見出し 3",
       heading4: "見出し 4",
+      heading5: "見出し 5",
+      heading6: "見出し 6",
       link: "リンク",
       comment: "コメント",
       pasteLink: "リンクを貼り付け...",
@@ -9574,6 +9626,9 @@ export const messagesByLocale = {
     },
     sidebar: {
       cannotReorderPages: "ページを並べ替えられません",
+      loadingFiles: "ファイルを読み込んでいます…",
+      newDatabase: "新しいデータベース",
+      noWorkspaces: "ワークスペースはまだありません",
       collapse: "サイドバーを折りたたむ",
       expand: "サイドバーを展開",
       failedCreatePage: "ページを作成できませんでした",
@@ -9722,6 +9777,8 @@ export const messagesByLocale = {
       heading2: "제목 2",
       heading3: "제목 3",
       heading4: "제목 4",
+      heading5: "제목 5",
+      heading6: "제목 6",
       link: "링크",
       comment: "댓글",
       pasteLink: "링크 붙여넣기...",
@@ -9747,6 +9804,9 @@ export const messagesByLocale = {
     },
     sidebar: {
       cannotReorderPages: "페이지 순서를 변경할 수 없습니다",
+      loadingFiles: "파일을 불러오는 중…",
+      newDatabase: "새 데이터베이스",
+      noWorkspaces: "아직 워크스페이스가 없습니다",
       collapse: "사이드바 접기",
       expand: "사이드바 펼치기",
       failedCreatePage: "페이지를 만들지 못했습니다",
@@ -9906,6 +9966,8 @@ export const messagesByLocale = {
       heading2: "Título 2",
       heading3: "Título 3",
       heading4: "Título 4",
+      heading5: "Título 5",
+      heading6: "Título 6",
       link: "Link",
       comment: "Comentário",
       pasteLink: "Cole o link...",
@@ -9932,6 +9994,9 @@ export const messagesByLocale = {
     },
     sidebar: {
       cannotReorderPages: "Não é possível reordenar páginas",
+      loadingFiles: "Carregando arquivos…",
+      newDatabase: "Novo banco de dados",
+      noWorkspaces: "Ainda não há espaços de trabalho",
       collapse: "Recolher barra lateral",
       expand: "Expandir barra lateral",
       failedCreatePage: "Falha ao criar página",
@@ -10078,6 +10143,8 @@ export const messagesByLocale = {
       heading2: "शीर्षक 2",
       heading3: "शीर्षक 3",
       heading4: "शीर्षक 4",
+      heading5: "शीर्षक 5",
+      heading6: "शीर्षक 6",
       link: "लिंक",
       comment: "टिप्पणी",
       pasteLink: "लिंक चिपकाएं...",
@@ -10103,6 +10170,9 @@ export const messagesByLocale = {
     },
     sidebar: {
       cannotReorderPages: "पेजों को फिर से क्रमबद्ध नहीं किया जा सकता",
+      loadingFiles: "फ़ाइलें लोड हो रही हैं…",
+      newDatabase: "नया डेटाबेस",
+      noWorkspaces: "अभी कोई कार्यस्थान नहीं है",
       collapse: "साइडबार संकुचित करें",
       expand: "साइडबार फैलाएं",
       failedCreatePage: "पेज नहीं बन सका",
@@ -10252,6 +10322,8 @@ export const messagesByLocale = {
       heading2: "عنوان 2",
       heading3: "عنوان 3",
       heading4: "عنوان 4",
+      heading5: "عنوان 5",
+      heading6: "عنوان 6",
       link: "رابط",
       comment: "تعليق",
       pasteLink: "الصق الرابط...",
@@ -10277,6 +10349,9 @@ export const messagesByLocale = {
     },
     sidebar: {
       cannotReorderPages: "تعذرت إعادة ترتيب الصفحات",
+      loadingFiles: "جارٍ تحميل الملفات…",
+      newDatabase: "قاعدة بيانات جديدة",
+      noWorkspaces: "لا توجد مساحات عمل بعد",
       collapse: "طي الشريط الجانبي",
       expand: "توسيع الشريط الجانبي",
       failedCreatePage: "فشل إنشاء الصفحة",

package/corpus/templates/content/app/routes/_app.local-files.tsx

@@ -15,7 +15,8 @@ import {
   IconUpload,
 } from "@tabler/icons-react";
 import { useQueryClient } from "@tanstack/react-query";
-import { useEffect, useMemo, useState } from "react";
+import { useEffect, useMemo, useRef, useState } from "react";
+import { useNavigate, useSearchParams } from "react-router";
 import { toast } from "sonner";
 
 import { Button } from "@/components/ui/button";
@@ -128,6 +129,18 @@ interface ImportContentSourceResult {
   unchanged: Array<{ id: string; path: string; title: string }>;
   skipped: Array<{ path: string; reason: string }>;
   errors: Array<{ path: string; reason: string }>;
+  conflicts?: Array<{ id: string; path: string; title: string }>;
+}
+
+interface LocalFolderConnectionResult {
+  connected: boolean;
+  sourceId: string | null;
+  spaceId: string | null;
+  filesDatabaseId: string | null;
+}
+
+interface ManifestFolderSyncResult extends ImportContentSourceResult {
+  requestedDocumentId: string | null;
 }
 
 interface RegisterLocalComponentWorkspaceResult {
@@ -234,11 +247,20 @@ function browserDirectoryId() {
   return `browser-${crypto.randomUUID()}`;
 }
 
+function opaqueDesktopDirectoryId(value: string) {
+  let hash = 2166136261;
+  for (let index = 0; index < value.length; index += 1) {
+    hash ^= value.charCodeAt(index);
+    hash = Math.imul(hash, 16777619);
+  }
+  return `desktop-folder-${(hash >>> 0).toString(16).padStart(8, "0")}`;
+}
+
 function desktopDirectoryFromFolder(
   folder: DesktopContentFilesFolder,
   directories: SelectedDirectory[] = [],
 ): SelectedDirectory {
-  const id = folder.id ?? `desktop-${folder.path ?? folder.name}`;
+  const id = folder.id ?? opaqueDesktopDirectoryId(folder.path ?? folder.name);
   return {
     id,
     kind: "desktop",
@@ -694,42 +716,6 @@ function upsertDirectory(
   );
 }
 
-function sourcePathForDirectoryFile(
-  directory: SelectedDirectory,
-  filePath: string,
-  directoryCount: number,
-) {
-  if (directoryCount <= 1) return filePath;
-  return `${directory.sourcePrefix}/${filePath}`;
-}
-
-function filesForImport(
-  directory: SelectedDirectory,
-  files: Record<string, string>,
-  directoryCount: number,
-) {
-  return Object.fromEntries(
-    Object.entries(files).map(([path, content]) => [
-      sourcePathForDirectoryFile(directory, path, directoryCount),
-      content,
-    ]),
-  );
-}
-
-function filesForDirectoryExport(
-  directory: SelectedDirectory,
-  files: Record<string, string>,
-  directoryCount: number,
-) {
-  if (directoryCount <= 1) return files;
-  const prefix = `${directory.sourcePrefix}/`;
-  return Object.fromEntries(
-    Object.entries(files)
-      .filter(([path]) => path.startsWith(prefix))
-      .map(([path, content]) => [path.slice(prefix.length), content]),
-  );
-}
-
 function resultSummary(
   result: ImportContentSourceResult,
   t: ReturnType<typeof useT>,
@@ -740,6 +726,7 @@ function resultSummary(
     t("localFiles.summaryUnchanged", { count: result.unchanged.length }),
     t("localFiles.summarySkipped", { count: result.skipped.length }),
     t("localFiles.summaryErrors", { count: result.errors.length }),
+    t("localFiles.summaryConflicts", { count: result.conflicts?.length ?? 0 }),
   ].join(" | ");
 }
 
@@ -750,12 +737,18 @@ export function meta() {
 export default function LocalFilesRoute() {
   const t = useT();
   const queryClient = useQueryClient();
+  const [searchParams] = useSearchParams();
+  const navigate = useNavigate();
+  const targetSpaceId = searchParams.get("spaceId") || undefined;
+  const manifestConnectionId = searchParams.get("connectionId") || undefined;
+  const manifestFile = searchParams.get("file") || undefined;
   const { data: documents = [] } = useDocuments();
   const [directories, setDirectories] = useState<SelectedDirectory[]>([]);
   const [status, setStatus] = useState<SyncStatus>({ kind: "idle" });
   const [busy, setBusy] = useState<BusyState | null>(null);
   const [restoringDirectory, setRestoringDirectory] = useState(false);
   const supported = useMemo(supportsLocalFolderSync, []);
+  const manifestBootstrapRef = useRef<string | null>(null);
   const documentSourceDirectories = useMemo(
     () =>
       directories.length === 0
@@ -786,6 +779,59 @@ export default function LocalFilesRoute() {
     });
   }, [localFolderRows]);
 
+  useEffect(() => {
+    if (!manifestConnectionId) return;
+    const key = `${manifestConnectionId}:${manifestFile ?? ""}:${targetSpaceId ?? ""}`;
+    if (manifestBootstrapRef.current === key) return;
+    manifestBootstrapRef.current = key;
+    setBusy("choose");
+    void callAction<ManifestFolderSyncResult>(
+      "sync-manifest-local-folder-source" as never,
+      {
+        connectionId: manifestConnectionId,
+        file: manifestFile,
+        spaceId: targetSpaceId,
+        dryRun: false,
+      } as never,
+    )
+      .then((result) => {
+        queryClient.invalidateQueries({
+          queryKey: ["action", "list-documents"],
+        });
+        queryClient.invalidateQueries({
+          queryKey: ["action", "list-content-spaces"],
+        });
+        setStatus(
+          result.conflicts?.length
+            ? { kind: "preview", result }
+            : {
+                kind: "success",
+                title: t("localFiles.foldersPulled"),
+                detail: resultSummary(result, t),
+              },
+        );
+        if (result.requestedDocumentId) {
+          navigate(`/page/${result.requestedDocumentId}`, { replace: true });
+        }
+      })
+      .catch((err) => {
+        manifestBootstrapRef.current = null;
+        setStatus({
+          kind: "error",
+          title: t("localFiles.pullFailed"),
+          detail: err instanceof Error ? err.message : t("localFiles.tryAgain"),
+        });
+      })
+      .finally(() => setBusy(null));
+  }, [
+    manifestConnectionId,
+    manifestFile,
+    navigate,
+    queryClient,
+    t,
+    targetSpaceId,
+  ]);
+
   useEffect(() => {
     if (!supported) return;
     let cancelled = false;
@@ -859,6 +905,23 @@ export default function LocalFilesRoute() {
     );
   }
 
+  async function ensureDirectoryConnection(
+    directory: SelectedDirectory,
+    dryRun = false,
+  ) {
+    return callAction<LocalFolderConnectionResult>(
+      "connect-local-folder-source" as never,
+      {
+        connectionId: directory.id,
+        label: directory.sourcePrefix || directory.name,
+        spaceId: targetSpaceId,
+        createSourceBackedSpace: !targetSpaceId,
+        truthPolicy: "source_primary",
+        dryRun,
+      } as never,
+    );
+  }
+
   async function pullDirectoryFiles(
     selected: SelectedDirectory,
     activeDirectories: SelectedDirectory[],
@@ -898,33 +961,53 @@ export default function LocalFilesRoute() {
         queryClient.invalidateQueries({ queryKey: ["resources"] });
       }
     }
-    if (Object.keys(files).length === 0) {
+    const connection = await ensureDirectoryConnection(
+      refreshedDirectory,
+      dryRun,
+    );
+    if (dryRun && !connection.connected) {
+      const created = Object.keys(files).map((path) => ({
+        id: "",
+        path,
+        title:
+          path
+            .split("/")
+            .pop()
+            ?.replace(/\.mdx?$/i, "") || path,
+      }));
       return {
         directories: nextDirectories,
         result: {
-          dryRun,
-          filesSeen: 0,
-          created: [],
+          dryRun: true,
+          filesSeen: created.length,
+          created,
           updated: [],
           unchanged: [],
           skipped: [],
           errors: [],
+          conflicts: [],
         },
       };
     }
+    if (!connection.sourceId) {
+      throw new Error("The local folder connection was not created");
+    }
     const result = await callAction<ImportContentSourceResult>(
-      "import-content-source" as never,
+      "sync-local-folder-source" as never,
       {
-        files: filesForImport(
-          refreshedDirectory,
-          files,
-          nextDirectories.length,
-        ),
+        sourceId: connection.sourceId,
+        files,
         dryRun,
       } as never,
     );
     if (!dryRun) {
       queryClient.invalidateQueries({ queryKey: ["action", "list-documents"] });
+      queryClient.invalidateQueries({
+        queryKey: ["action", "list-content-spaces"],
+      });
+      queryClient.invalidateQueries({
+        queryKey: ["action", "get-content-database"],
+      });
     }
     return { directories: nextDirectories, result };
   }
@@ -990,11 +1073,15 @@ export default function LocalFilesRoute() {
 
       setBusy(`pull:${selected.id}`);
       const { result } = await pullDirectoryFiles(selected, nextDirectories);
-      setStatus({
-        kind: "success",
-        title: t("localFiles.foldersPulled"),
-        detail: resultSummary(result, t),
-      });
+      setStatus(
+        result.conflicts?.length
+          ? { kind: "preview", result }
+          : {
+              kind: "success",
+              title: t("localFiles.foldersPulled"),
+              detail: resultSummary(result, t),
+            },
+      );
       toast.success(t("localFiles.pulledLocalFiles"));
       await connectLocalComponentWorkspaces([selected]);
     } catch (err) {
@@ -1020,16 +1107,13 @@ export default function LocalFilesRoute() {
       ) {
         throw new Error(t("localFiles.writePermissionNotGranted"));
       }
+      const connection = await ensureDirectoryConnection(directory);
       const bundle = await callAction<ExportContentSourceResult>(
         "export-content-source" as never,
-        {} as never,
+        { sourceId: connection.sourceId } as never,
         { method: "GET" },
       );
-      const files = filesForDirectoryExport(
-        directory,
-        bundle.files,
-        directories.length,
-      );
+      const files = bundle.files;
       if (directory.kind === "desktop") {
         const desktopFiles = getDesktopContentFiles();
         if (!desktopFiles) {
@@ -1099,11 +1183,15 @@ export default function LocalFilesRoute() {
     setBusy(`pull:${directory.id}`);
     try {
       const { result } = await pullDirectoryFiles(directory, directories);
-      setStatus({
-        kind: "success",
-        title: t("localFiles.pulledFromFolder"),
-        detail: resultSummary(result, t),
-      });
+      setStatus(
+        result.conflicts?.length
+          ? { kind: "preview", result }
+          : {
+              kind: "success",
+              title: t("localFiles.pulledFromFolder"),
+              detail: resultSummary(result, t),
+            },
+      );
       toast.success(t("localFiles.pulledLocalFiles"));
     } catch (err) {
       setStatus({
@@ -1119,6 +1207,11 @@ export default function LocalFilesRoute() {
   async function handleRemove(directory: SelectedDirectory) {
     setBusy(`remove:${directory.id}`);
     try {
+      const connection = await ensureDirectoryConnection(directory);
+      await callAction(
+        "disconnect-local-folder-source" as never,
+        { sourceId: connection.sourceId } as never,
+      );
       const nextDirectories = directories.filter(
         (candidate) => candidate.id !== directory.id,
       );
@@ -1132,6 +1225,12 @@ export default function LocalFilesRoute() {
         await persistSourceDirectories(nextDirectories);
       }
       setDirectories(nextDirectories);
+      queryClient.invalidateQueries({
+        queryKey: ["action", "list-content-spaces"],
+      });
+      queryClient.invalidateQueries({
+        queryKey: ["action", "get-content-database"],
+      });
       setStatus({
         kind: "success",
         title: t("localFiles.folderRemoved"),
@@ -1266,7 +1365,8 @@ export default function LocalFilesRoute() {
                   </div>
                 </div>
                 {(status.result.skipped.length > 0 ||
-                  status.result.errors.length > 0) && (
+                  status.result.errors.length > 0 ||
+                  (status.result.conflicts?.length ?? 0) > 0) && (
                   <>
                     <Separator />
                     <div className="grid gap-1 text-xs">
@@ -1284,6 +1384,15 @@ export default function LocalFilesRoute() {
                             </span>
                           </div>
                         ))}
+                      {status.result.conflicts?.slice(0, 6).map((item) => (
+                        <div key={`conflict:${item.id}`} className="min-w-0">
+                          <span className="font-medium">{item.path}</span>
+                          <span className="text-muted-foreground">
+                            {" "}
+                            - {t("localFiles.conflictNeedsReview")}
+                          </span>
+                        </div>
+                      ))}
                     </div>
                   </>
                 )}

package/corpus/templates/content/changelog/2026-07-16-content-callouts-can-now-be-reviewed-and-published-to-builder.md

@@ -0,0 +1,6 @@
+---
+title: Content callouts can now be reviewed and published to Builder
+type: fixed
+---
+
+Content callout blocks now convert into safe Builder text callouts instead of blocking the publication review.

package/corpus/templates/content/changelog/2026-07-16-heading-5-and-heading-6-are-available-from-the-editor-slash-.md

@@ -0,0 +1,6 @@
+---
+type: fixed
+date: 2026-07-16
+---
+
+Heading 5 and Heading 6 are available from the editor slash menu.