octocms 0.4.12 → 0.4.13

package/dist/agent/index.cjs

@@ -270,7 +270,7 @@ var init_embedder = __esm({
             const msg = e instanceof Error ? e.message : String(e);
             if (/libonnxruntime|onnxruntime-node|ERR_DLOPEN_FAILED/i.test(msg)) {
               throw new Error(
-                `Embeddings unavailable: '@huggingface/transformers' loaded but its native dependency 'onnxruntime-node' could not load (${msg}). On Vercel, add './node_modules/onnxruntime-node/**' to 'outputFileTracingIncludes' for the relevant routes, or rely on offline 'npm run embeddings:gen'.`
+                `Embeddings unavailable: '@huggingface/transformers' loaded but its native dependency 'onnxruntime-node' could not load (${msg}). On Vercel, add './node_modules/onnxruntime-node/**' to 'outputFileTracingIncludes' for the relevant routes, or rely on offline 'npx octocms embeddings:gen'.`
               );
             }
             throw new Error(
@@ -1626,6 +1626,44 @@ var init_registerConfig = __esm({
   }
 });
 
+// lib/localReader.ts
+async function listLocalFilesRecursive(dirPath, ext) {
+  return listLocalFilesWithExtensions(dirPath, [ext], true);
+}
+async function listLocalFilesWithExtensions(dirPath, extensions, recursive = false) {
+  const fullDir = import_path4.default.join(process.cwd(), dirPath);
+  const normalizedExts = extensions.map((e) => e.startsWith(".") ? e : `.${e}`);
+  try {
+    if (recursive) {
+      const names = await import_promises.default.readdir(fullDir, { recursive: true });
+      return names.filter((n) => normalizedExts.some((e) => n.endsWith(e))).map((n) => `${dirPath}/${n}`.replace(/\\/g, "/")).sort();
+    }
+    const entries = await import_promises.default.readdir(fullDir, { withFileTypes: true });
+    return entries.filter((e) => e.isFile() && normalizedExts.some((ext) => e.name.endsWith(ext))).map((e) => `${dirPath}/${e.name}`).sort();
+  } catch (error) {
+    if ((error == null ? void 0 : error.code) === "ENOENT") return [];
+    throw error;
+  }
+}
+async function listLocalCollectionFiles(dirPath) {
+  const fullDir = import_path4.default.join(process.cwd(), dirPath);
+  try {
+    const entries = await import_promises.default.readdir(fullDir, { withFileTypes: true });
+    return entries.filter((e) => e.isFile() && e.name.endsWith(".json")).map((e) => `${dirPath}/${e.name}`);
+  } catch (error) {
+    if ((error == null ? void 0 : error.code) === "ENOENT") return [];
+    throw error;
+  }
+}
+var import_promises, import_path4;
+var init_localReader = __esm({
+  "lib/localReader.ts"() {
+    "use strict";
+    import_promises = __toESM(require("fs/promises"), 1);
+    import_path4 = __toESM(require("path"), 1);
+  }
+});
+
 // lib/branchHistory.ts
 var import_zod, BRANCH_HISTORY_FILE_PATH, branchWorkspaceSchema, rootSchema, parseBranchHistoryFile, serializeBranchHistoryFile, appendEntryPathToBranch, mergeHistoryContentWithAppendedEntry;
 var init_branchHistory = __esm({
@@ -2758,9 +2796,9 @@ async function getStoredContentFiles(collection, branch) {
   if (!store) return null;
   if (collection === "**") {
     const all = [];
-    for (const [path5] of store.entries) {
-      if (path5.endsWith(".json")) {
-        all.push(path5);
+    for (const [path6] of store.entries) {
+      if (path6.endsWith(".json")) {
+        all.push(path6);
       }
     }
     return all;
@@ -2898,6 +2936,7 @@ __export(files_exports, {
   assertFeatureBranchForWritesIfRequired: () => assertFeatureBranchForWritesIfRequired,
   getContentFiles: () => getContentFiles,
   getFile: () => getFile,
+  getFileJson: () => getFileJson,
   getMediaContentFiles: () => getMediaContentFiles,
   getMediaFiles: () => getMediaFiles,
   newFile: () => newFile,
@@ -2938,14 +2977,14 @@ async function persistBranchHistoryEntryIfNeeded(activeBranch, entryPath) {
     return;
   }
   try {
-    const abs = import_path4.default.join(
+    const abs = import_path5.default.join(
       /*turbopackIgnore: true*/
       process.cwd(),
       BRANCH_HISTORY_FILE_PATH
     );
     let raw = "";
     try {
-      raw = await import_promises.default.readFile(abs, { encoding: "utf8" });
+      raw = await import_promises2.default.readFile(abs, { encoding: "utf8" });
     } catch (e) {
       raw = "";
     }
@@ -2953,8 +2992,8 @@ async function persistBranchHistoryEntryIfNeeded(activeBranch, entryPath) {
     if (next == null) {
       return;
     }
-    await import_promises.default.mkdir(import_path4.default.dirname(abs), { recursive: true });
-    await import_promises.default.writeFile(abs, next, "utf8");
+    await import_promises2.default.mkdir(import_path5.default.dirname(abs), { recursive: true });
+    await import_promises2.default.writeFile(abs, next, "utf8");
   } catch (e) {
   }
 }
@@ -3066,7 +3105,7 @@ async function readCompanionMarkdownContent(filePath) {
     }
   }
   try {
-    return await import_promises.default.readFile(import_path4.default.join(
+    return await import_promises2.default.readFile(import_path5.default.join(
       /*turbopackIgnore: true*/
       process.cwd(),
       filePath
@@ -3077,17 +3116,17 @@ async function readCompanionMarkdownContent(filePath) {
     return "";
   }
 }
-var import_promises, import_path4, import_glob, import_headers, CMS_ACTIVE_BRANCH_COOKIE, MEDIA_UUID_RE, assertFeatureBranchForWritesIfRequired, waitForPublicReadConsistency, getContentFiles, getMediaContentFiles, getMediaFiles, getFile, saveFile, newFile, removeFile;
+var import_promises2, import_path5, import_headers, CMS_ACTIVE_BRANCH_COOKIE, MEDIA_UUID_RE, assertFeatureBranchForWritesIfRequired, waitForPublicReadConsistency, getContentFiles, getMediaContentFiles, getMediaFiles, getFileJson, getFile, saveFile, newFile, removeFile;
 var init_files = __esm({
   "admin/actions/files.ts"() {
     "use strict";
     "use server";
     init_registerConfig();
-    import_promises = __toESM(require("fs/promises"), 1);
-    import_path4 = __toESM(require("path"), 1);
-    import_glob = require("glob");
+    import_promises2 = __toESM(require("fs/promises"), 1);
+    import_path5 = __toESM(require("path"), 1);
     import_headers = require("next/headers");
     init_configStore2();
+    init_localReader();
     init_configStore();
     init_embeddingsHook();
     init_branchHistory();
@@ -3154,8 +3193,10 @@ var init_files = __esm({
           } catch (e) {
           }
         }
-        const files = await (0, import_glob.glob)(`${config.contentFolder}/${collection}/*.json`);
-        return files || [];
+        if (collection === "**") {
+          return await listLocalFilesRecursive(config.contentFolder, ".json");
+        }
+        return await listLocalCollectionFiles(`${config.contentFolder}/${collection}`);
       } catch (e) {
         return [];
       }
@@ -3171,8 +3212,7 @@ var init_files = __esm({
           } catch (_e) {
           }
         }
-        const files = await (0, import_glob.glob)(`${folder}/*.json`);
-        return files || [];
+        return await listLocalCollectionFiles(folder);
       } catch (_e) {
         return [];
       }
@@ -3184,19 +3224,56 @@ var init_files = __esm({
         if (isProductionMode()) {
           const activeBranch = (_a = (await (0, import_headers.cookies)()).get(CMS_ACTIVE_BRANCH_COOKIE)) == null ? void 0 : _a.value;
           try {
-            const dir = folder === "**" ? config.mediaFolder : `${config.mediaFolder}/${folder}`;
-            const allFiles = await listGitHubFilesRecursive(dir, void 0, activeBranch);
+            const dir2 = folder === "**" ? config.mediaFolder : `${config.mediaFolder}/${folder}`;
+            const allFiles = await listGitHubFilesRecursive(dir2, void 0, activeBranch);
             const extensions = config.mediaAllowedFormats;
             return allFiles.filter((f) => extensions.some((ext) => f.endsWith(`.${ext}`)));
           } catch (e) {
           }
         }
-        const files = await (0, import_glob.glob)(`${config.mediaFolder}/${folder}/*.{${config.mediaAllowedFormats.join(",")}}`);
-        return files || [];
+        const dir = folder === "**" ? config.mediaFolder : `${config.mediaFolder}/${folder}`;
+        return await listLocalFilesWithExtensions(dir, config.mediaAllowedFormats, folder === "**");
       } catch (e) {
         return [];
       }
     };
+    getFileJson = async (fileName) => {
+      var _a;
+      if (isProductionMode()) {
+        let activeBranch;
+        try {
+          activeBranch = (_a = (await (0, import_headers.cookies)()).get(CMS_ACTIVE_BRANCH_COOKIE)) == null ? void 0 : _a.value;
+        } catch (e) {
+        }
+        try {
+          const stored = await getStoredFile(fileName, activeBranch);
+          if (stored) return structuredClone(stored.content);
+        } catch (e) {
+        }
+        try {
+          const result = await getGitHubFile(fileName, activeBranch);
+          if (result) return JSON.parse(result.content);
+        } catch (e) {
+        }
+        try {
+          const raw = await readGitHubFilePublic(fileName, activeBranch);
+          if (raw) return JSON.parse(raw);
+        } catch (e) {
+        }
+        return null;
+      }
+      try {
+        const filePath = import_path5.default.join(
+          /*turbopackIgnore: true*/
+          process.cwd(),
+          fileName
+        );
+        const data = await import_promises2.default.readFile(filePath, { encoding: "utf8" });
+        return JSON.parse(data);
+      } catch (e) {
+        return null;
+      }
+    };
     getFile = async (fileName) => {
       var _a, _b, _c, _d;
       const config = getConfig();
@@ -3240,12 +3317,12 @@ var init_files = __esm({
           if (isProductionMode()) {
             return {};
           }
-          const filePath = import_path4.default.join(
+          const filePath = import_path5.default.join(
             /*turbopackIgnore: true*/
             process.cwd(),
             fileName
           );
-          const data = await import_promises.default.readFile(filePath, { encoding: "utf8" });
+          const data = await import_promises2.default.readFile(filePath, { encoding: "utf8" });
           entry = JSON.parse(data);
         }
         if (!entry) {
@@ -3372,16 +3449,16 @@ var init_files = __esm({
         }
         const cookieStore = await (0, import_headers.cookies)();
         const activeBranchDev = (_l = cookieStore.get(CMS_ACTIVE_BRANCH_COOKIE)) == null ? void 0 : _l.value;
-        const filePath = import_path4.default.join(
+        const filePath = import_path5.default.join(
           /*turbopackIgnore: true*/
           process.cwd(),
           fileName
         );
-        await import_promises.default.writeFile(filePath, normalizedData, "utf8");
+        await import_promises2.default.writeFile(filePath, normalizedData, "utf8");
         const mdPaths = typeof entryType === "string" ? companionMarkdownPathsForEntry(fileName, entryType, config.collections) : {};
         for (const [fieldName, mdPath] of Object.entries(mdPaths)) {
           const mdContent = (_m = markdownContents[fieldName]) != null ? _m : "";
-          await import_promises.default.writeFile(import_path4.default.join(
+          await import_promises2.default.writeFile(import_path5.default.join(
             /*turbopackIgnore: true*/
             process.cwd(),
             mdPath
@@ -3390,7 +3467,7 @@ var init_files = __esm({
         const rtPathsDev = typeof entryType === "string" ? companionRichTextPathsForEntry(fileName, entryType, config.collections) : {};
         for (const [fieldName, rtPath] of Object.entries(rtPathsDev)) {
           const rtContent = (_n = markdownContents[fieldName]) != null ? _n : "";
-          await import_promises.default.writeFile(import_path4.default.join(
+          await import_promises2.default.writeFile(import_path5.default.join(
             /*turbopackIgnore: true*/
             process.cwd(),
             rtPath
@@ -3441,13 +3518,13 @@ var init_files = __esm({
         }
         const cookieStore = await (0, import_headers.cookies)();
         const activeBranchDev = (_b = cookieStore.get(CMS_ACTIVE_BRANCH_COOKIE)) == null ? void 0 : _b.value;
-        const filePath = import_path4.default.join(
+        const filePath = import_path5.default.join(
           /*turbopackIgnore: true*/
           process.cwd(),
           file
         );
-        await import_promises.default.mkdir(import_path4.default.dirname(filePath), { recursive: true });
-        await import_promises.default.writeFile(filePath, normalizedData, "utf8");
+        await import_promises2.default.mkdir(import_path5.default.dirname(filePath), { recursive: true });
+        await import_promises2.default.writeFile(filePath, normalizedData, "utf8");
         await persistBranchHistoryEntryIfNeeded(activeBranchDev, file);
         await syncEmbeddingsForUpsertIfEnabled(file, values, {}, activeBranchDev, false);
         const built = await buildJsons(file);
@@ -3487,15 +3564,15 @@ var init_files = __esm({
           const built2 = await buildJsons(fileName);
           return built2.success ? actionOk() : built2;
         }
-        const filePath = import_path4.default.join(
+        const filePath = import_path5.default.join(
           /*turbopackIgnore: true*/
           process.cwd(),
           fileName
         );
-        await import_promises.default.unlink(filePath);
+        await import_promises2.default.unlink(filePath);
         for (const mdPath of companionPaths) {
           try {
-            await import_promises.default.unlink(import_path4.default.join(
+            await import_promises2.default.unlink(import_path5.default.join(
               /*turbopackIgnore: true*/
               process.cwd(),
               mdPath
@@ -4289,7 +4366,7 @@ var searchContentTool = {
     if (hits.length === 0) {
       return JSON.stringify({
         results: [],
-        note: "No results \u2014 verify the query, or try a broader phrasing. If embeddings.json is missing, run `npm run embeddings:gen` on your dev machine."
+        note: "No results \u2014 verify the query, or try a broader phrasing. If embeddings.json is missing, run `npx octocms embeddings:gen` on your dev machine."
       });
     }
     return JSON.stringify({
@@ -4622,17 +4699,17 @@ var findEntryForDocumentTool = {
   }
 };
 function matchRouteTemplate(template, url) {
-  let path5 = url;
-  const protoIdx = path5.indexOf("://");
+  let path6 = url;
+  const protoIdx = path6.indexOf("://");
   if (protoIdx !== -1) {
-    const slash = path5.indexOf("/", protoIdx + 3);
-    path5 = slash === -1 ? "/" : path5.slice(slash);
+    const slash = path6.indexOf("/", protoIdx + 3);
+    path6 = slash === -1 ? "/" : path6.slice(slash);
   }
-  const queryIdx = path5.indexOf("?");
-  if (queryIdx !== -1) path5 = path5.slice(0, queryIdx);
+  const queryIdx = path6.indexOf("?");
+  if (queryIdx !== -1) path6 = path6.slice(0, queryIdx);
   const norm = (s) => s.replace(/\/+$/, "") || "/";
   const tplParts = norm(template).split("/");
-  const urlParts = norm(path5).split("/");
+  const urlParts = norm(path6).split("/");
   if (tplParts.length !== urlParts.length) return null;
   const out = {};
   for (let i = 0; i < tplParts.length; i++) {