blume 1.5.3 → 1.6.1

package/src/core/ui-packs/hi.ts

@@ -11,6 +11,7 @@ export const hi: UIStringsOverride = {
     copyClaudeCode: "Claude Code कमांड कॉपी करें",
     copyCode: "कोड कॉपी करें",
     copyCodex: "Codex कमांड कॉपी करें",
+    copyFailed: "कॉपी विफल रहा",
     copyMarkdown: "Markdown के रूप में कॉपी करें",
     copyServerUrl: "सर्वर URL कॉपी करें",
     edit: "GitHub पर संपादित करें",
@@ -20,6 +21,7 @@ export const hi: UIStringsOverride = {
     generating: "जनरेट हो रहा है…",
     openIn: "{name} में खोलें",
     openInChat: "चैट में खोलें",
+    openInChatPrompt: "{url} पढ़ें ताकि मैं इस पेज के बारे में प्रश्न पूछ सकूँ।",
     scrollToTop: "ऊपर जाएँ",
   },
   ask: {

package/src/core/ui-packs/hr.ts

@@ -11,6 +11,7 @@ export const hr: UIStringsOverride = {
     copyClaudeCode: "Kopiraj naredbu Claude Code",
     copyCode: "Kopiraj kôd",
     copyCodex: "Kopiraj naredbu Codex",
+    copyFailed: "Kopiranje nije uspjelo",
     copyMarkdown: "Kopiraj kao Markdown",
     copyServerUrl: "Kopiraj URL poslužitelja",
     edit: "Uredi na GitHubu",
@@ -20,6 +21,8 @@ export const hr: UIStringsOverride = {
     generating: "Generiranje…",
     openIn: "Otvori u {name}",
     openInChat: "Otvori u chatu",
+    openInChatPrompt:
+      "Pročitajte {url} — postavljat ću pitanja o ovoj stranici.",
     scrollToTop: "Natrag na vrh",
   },
   ask: {

package/src/core/ui-packs/hu.ts

@@ -11,6 +11,7 @@ export const hu: UIStringsOverride = {
     copyClaudeCode: "Claude Code parancs másolása",
     copyCode: "Kód másolása",
     copyCodex: "Codex parancs másolása",
+    copyFailed: "A másolás nem sikerült",
     copyMarkdown: "Másolás Markdownként",
     copyServerUrl: "Szerver URL másolása",
     edit: "Szerkesztés a GitHubon",
@@ -20,6 +21,8 @@ export const hu: UIStringsOverride = {
     generating: "Generálás…",
     openIn: "Megnyitás itt: {name}",
     openInChat: "Megnyitás a csevegésben",
+    openInChatPrompt:
+      "Olvasd el a következőt: {url}, hogy kérdéseket tehessek fel erről az oldalról.",
     scrollToTop: "Vissza a tetejére",
   },
   ask: {

package/src/core/ui-packs/id.ts

@@ -11,6 +11,7 @@ export const id: UIStringsOverride = {
     copyClaudeCode: "Salin perintah Claude Code",
     copyCode: "Salin kode",
     copyCodex: "Salin perintah Codex",
+    copyFailed: "Gagal menyalin",
     copyMarkdown: "Salin sebagai Markdown",
     copyServerUrl: "Salin URL server",
     edit: "Edit di GitHub",
@@ -20,6 +21,8 @@ export const id: UIStringsOverride = {
     generating: "Menghasilkan…",
     openIn: "Buka di {name}",
     openInChat: "Buka di obrolan",
+    openInChatPrompt:
+      "Baca {url} agar saya bisa mengajukan pertanyaan tentang halaman ini.",
     scrollToTop: "Kembali ke atas",
   },
   ask: {

package/src/core/ui-packs/it.ts

@@ -11,6 +11,7 @@ export const it: UIStringsOverride = {
     copyClaudeCode: "Copia comando di Claude Code",
     copyCode: "Copia codice",
     copyCodex: "Copia comando di Codex",
+    copyFailed: "Copia non riuscita",
     copyMarkdown: "Copia come Markdown",
     copyServerUrl: "Copia URL del server",
     edit: "Modifica su GitHub",
@@ -20,6 +21,7 @@ export const it: UIStringsOverride = {
     generating: "Generazione in corso…",
     openIn: "Apri in {name}",
     openInChat: "Apri nella chat",
+    openInChatPrompt: "Leggi {url} così posso farti domande su questa pagina.",
     scrollToTop: "Torna su",
   },
   ask: {

package/src/core/ui-packs/ja.ts

@@ -11,6 +11,7 @@ export const ja: UIStringsOverride = {
     copyClaudeCode: "Claude Code コマンドをコピー",
     copyCode: "コードをコピー",
     copyCodex: "Codex コマンドをコピー",
+    copyFailed: "コピーに失敗しました",
     copyMarkdown: "Markdown としてコピー",
     copyServerUrl: "サーバー URL をコピー",
     edit: "GitHub で編集",
@@ -20,6 +21,8 @@ export const ja: UIStringsOverride = {
     generating: "生成中…",
     openIn: "{name} で開く",
     openInChat: "チャットで開く",
+    openInChatPrompt:
+      "{url} を読んで、このページについての質問に答えられるようにしてください。",
     scrollToTop: "トップに戻る",
   },
   ask: {

package/src/core/ui-packs/ko.ts

@@ -11,6 +11,7 @@ export const ko: UIStringsOverride = {
     copyClaudeCode: "Claude Code 명령 복사",
     copyCode: "코드 복사",
     copyCodex: "Codex 명령 복사",
+    copyFailed: "복사 실패",
     copyMarkdown: "Markdown으로 복사",
     copyServerUrl: "서버 URL 복사",
     edit: "GitHub에서 편집",
@@ -20,6 +21,8 @@ export const ko: UIStringsOverride = {
     generating: "생성 중…",
     openIn: "{name}에서 열기",
     openInChat: "채팅에서 열기",
+    openInChatPrompt:
+      "{url} 페이지를 읽어 주세요. 이 페이지에 대해 질문하겠습니다.",
     scrollToTop: "맨 위로",
   },
   ask: {

package/src/core/ui-packs/nl.ts

@@ -11,6 +11,7 @@ export const nl: UIStringsOverride = {
     copyClaudeCode: "Claude Code-opdracht kopiëren",
     copyCode: "Code kopiëren",
     copyCodex: "Codex-opdracht kopiëren",
+    copyFailed: "Kopiëren mislukt",
     copyMarkdown: "Kopiëren als Markdown",
     copyServerUrl: "Server-URL kopiëren",
     edit: "Bewerken op GitHub",
@@ -20,6 +21,8 @@ export const nl: UIStringsOverride = {
     generating: "Genereren…",
     openIn: "Openen in {name}",
     openInChat: "Openen in chat",
+    openInChatPrompt:
+      "Lees {url}, zodat ik je vragen kan stellen over deze pagina.",
     scrollToTop: "Naar boven scrollen",
   },
   ask: {

package/src/core/ui-packs/no.ts

@@ -11,6 +11,7 @@ export const no: UIStringsOverride = {
     copyClaudeCode: "Kopier Claude Code-kommando",
     copyCode: "Kopier kode",
     copyCodex: "Kopier Codex-kommando",
+    copyFailed: "Kopiering mislyktes",
     copyMarkdown: "Kopier som Markdown",
     copyServerUrl: "Kopier server-URL",
     edit: "Rediger på GitHub",
@@ -20,6 +21,8 @@ export const no: UIStringsOverride = {
     generating: "Genererer…",
     openIn: "Åpne i {name}",
     openInChat: "Åpne i chat",
+    openInChatPrompt:
+      "Les {url}, slik at jeg kan stille spørsmål om denne siden.",
     scrollToTop: "Til toppen",
   },
   ask: {

package/src/core/ui-packs/pl.ts

@@ -11,6 +11,7 @@ export const pl: UIStringsOverride = {
     copyClaudeCode: "Kopiuj polecenie Claude Code",
     copyCode: "Kopiuj kod",
     copyCodex: "Kopiuj polecenie Codex",
+    copyFailed: "Kopiowanie nie powiodło się",
     copyMarkdown: "Kopiuj jako Markdown",
     copyServerUrl: "Kopiuj adres URL serwera",
     edit: "Edytuj na GitHubie",
@@ -20,6 +21,8 @@ export const pl: UIStringsOverride = {
     generating: "Generowanie…",
     openIn: "Otwórz w {name}",
     openInChat: "Otwórz w czacie",
+    openInChatPrompt:
+      "Przeczytaj {url}, aby móc odpowiadać na pytania dotyczące tej strony.",
     scrollToTop: "Wróć na górę",
   },
   ask: {

package/src/core/ui-packs/pt-br.ts

@@ -11,6 +11,7 @@ export const ptBR: UIStringsOverride = {
     copyClaudeCode: "Copiar comando do Claude Code",
     copyCode: "Copiar código",
     copyCodex: "Copiar comando do Codex",
+    copyFailed: "Falha ao copiar",
     copyMarkdown: "Copiar como Markdown",
     copyServerUrl: "Copiar URL do servidor",
     edit: "Editar no GitHub",
@@ -20,6 +21,8 @@ export const ptBR: UIStringsOverride = {
     generating: "Gerando…",
     openIn: "Abrir em {name}",
     openInChat: "Abrir no chat",
+    openInChatPrompt:
+      "Leia {url} para que eu possa fazer perguntas sobre esta página.",
     scrollToTop: "Voltar ao topo",
   },
   ask: {

package/src/core/ui-packs/pt.ts

@@ -11,6 +11,7 @@ export const pt: UIStringsOverride = {
     copyClaudeCode: "Copiar comando do Claude Code",
     copyCode: "Copiar código",
     copyCodex: "Copiar comando do Codex",
+    copyFailed: "Falha ao copiar",
     copyMarkdown: "Copiar como Markdown",
     copyServerUrl: "Copiar URL do servidor",
     edit: "Editar no GitHub",
@@ -20,6 +21,8 @@ export const pt: UIStringsOverride = {
     generating: "A gerar…",
     openIn: "Abrir em {name}",
     openInChat: "Abrir no chat",
+    openInChatPrompt:
+      "Leia {url} para que eu possa fazer perguntas sobre esta página.",
     scrollToTop: "Voltar ao topo",
   },
   ask: {

package/src/core/ui-packs/ro.ts

@@ -11,6 +11,7 @@ export const ro: UIStringsOverride = {
     copyClaudeCode: "Copiază comanda Claude Code",
     copyCode: "Copiază codul",
     copyCodex: "Copiază comanda Codex",
+    copyFailed: "Copierea a eșuat",
     copyMarkdown: "Copiază ca Markdown",
     copyServerUrl: "Copiază URL-ul serverului",
     edit: "Editează pe GitHub",
@@ -20,6 +21,8 @@ export const ro: UIStringsOverride = {
     generating: "Se generează…",
     openIn: "Deschide în {name}",
     openInChat: "Deschide în chat",
+    openInChatPrompt:
+      "Citește {url} ca să îți pot pune întrebări despre această pagină.",
     scrollToTop: "Sus de tot",
   },
   ask: {

package/src/core/ui-packs/ru.ts

@@ -11,6 +11,7 @@ export const ru: UIStringsOverride = {
     copyClaudeCode: "Скопировать команду Claude Code",
     copyCode: "Скопировать код",
     copyCodex: "Скопировать команду Codex",
+    copyFailed: "Не удалось скопировать",
     copyMarkdown: "Скопировать как Markdown",
     copyServerUrl: "Скопировать URL сервера",
     edit: "Редактировать на GitHub",
@@ -20,6 +21,8 @@ export const ru: UIStringsOverride = {
     generating: "Генерация…",
     openIn: "Открыть в {name}",
     openInChat: "Открыть в чате",
+    openInChatPrompt:
+      "Прочитайте {url} — я буду задавать вопросы об этой странице.",
     scrollToTop: "Наверх",
   },
   ask: {

package/src/core/ui-packs/sk.ts

@@ -11,6 +11,7 @@ export const sk: UIStringsOverride = {
     copyClaudeCode: "Kopírovať príkaz Claude Code",
     copyCode: "Kopírovať kód",
     copyCodex: "Kopírovať príkaz Codex",
+    copyFailed: "Kopírovanie zlyhalo",
     copyMarkdown: "Kopírovať ako Markdown",
     copyServerUrl: "Kopírovať URL servera",
     edit: "Upraviť na GitHube",
@@ -20,6 +21,7 @@ export const sk: UIStringsOverride = {
     generating: "Generovanie…",
     openIn: "Otvoriť v {name}",
     openInChat: "Otvoriť v chate",
+    openInChatPrompt: "Prečítajte si {url} — budem sa pýtať na túto stránku.",
     scrollToTop: "Späť nahor",
   },
   ask: {

package/src/core/ui-packs/sr.ts

@@ -11,6 +11,7 @@ export const sr: UIStringsOverride = {
     copyClaudeCode: "Копирај Claude Code команду",
     copyCode: "Копирај код",
     copyCodex: "Копирај Codex команду",
+    copyFailed: "Копирање није успело",
     copyMarkdown: "Копирај као Markdown",
     copyServerUrl: "Копирај URL сервера",
     edit: "Уреди на GitHub-у",
@@ -20,6 +21,7 @@ export const sr: UIStringsOverride = {
     generating: "Генерисање…",
     openIn: "Отвори у {name}",
     openInChat: "Отвори у ћаскању",
+    openInChatPrompt: "Прочитајте {url} — постављаћу питања о овој страници.",
     scrollToTop: "Назад на врх",
   },
   ask: {

package/src/core/ui-packs/sv.ts

@@ -11,6 +11,7 @@ export const sv: UIStringsOverride = {
     copyClaudeCode: "Kopiera Claude Code-kommando",
     copyCode: "Kopiera kod",
     copyCodex: "Kopiera Codex-kommando",
+    copyFailed: "Kopiering misslyckades",
     copyMarkdown: "Kopiera som Markdown",
     copyServerUrl: "Kopiera server-URL",
     edit: "Redigera på GitHub",
@@ -20,6 +21,8 @@ export const sv: UIStringsOverride = {
     generating: "Genererar…",
     openIn: "Öppna i {name}",
     openInChat: "Öppna i chatt",
+    openInChatPrompt:
+      "Läs {url} så att jag kan ställa frågor om den här sidan.",
     scrollToTop: "Till toppen",
   },
   ask: {

package/src/core/ui-packs/th.ts

@@ -11,6 +11,7 @@ export const th: UIStringsOverride = {
     copyClaudeCode: "คัดลอกคำสั่ง Claude Code",
     copyCode: "คัดลอกโค้ด",
     copyCodex: "คัดลอกคำสั่ง Codex",
+    copyFailed: "คัดลอกไม่สำเร็จ",
     copyMarkdown: "คัดลอกเป็น Markdown",
     copyServerUrl: "คัดลอก URL ของเซิร์ฟเวอร์",
     edit: "แก้ไขบน GitHub",
@@ -20,6 +21,7 @@ export const th: UIStringsOverride = {
     generating: "กำลังสร้าง…",
     openIn: "เปิดใน {name}",
     openInChat: "เปิดในแชท",
+    openInChatPrompt: "อ่าน {url} เพื่อให้ฉันถามคำถามเกี่ยวกับหน้านี้ได้",
     scrollToTop: "กลับไปด้านบน",
   },
   ask: {

package/src/core/ui-packs/tr.ts

@@ -11,6 +11,7 @@ export const tr: UIStringsOverride = {
     copyClaudeCode: "Claude Code komutunu kopyala",
     copyCode: "Kodu kopyala",
     copyCodex: "Codex komutunu kopyala",
+    copyFailed: "Kopyalama başarısız oldu",
     copyMarkdown: "Markdown olarak kopyala",
     copyServerUrl: "Sunucu URL'sini kopyala",
     edit: "GitHub'da düzenle",
@@ -20,6 +21,8 @@ export const tr: UIStringsOverride = {
     generating: "Oluşturuluyor…",
     openIn: "{name} içinde aç",
     openInChat: "Sohbette aç",
+    openInChatPrompt:
+      "Bu sayfa hakkında sorular sorabilmem için {url} adresini okuyun.",
     scrollToTop: "Başa dön",
   },
   ask: {

package/src/core/ui-packs/uk.ts

@@ -11,6 +11,7 @@ export const uk: UIStringsOverride = {
     copyClaudeCode: "Скопіювати команду Claude Code",
     copyCode: "Скопіювати код",
     copyCodex: "Скопіювати команду Codex",
+    copyFailed: "Не вдалося скопіювати",
     copyMarkdown: "Скопіювати як Markdown",
     copyServerUrl: "Скопіювати URL сервера",
     edit: "Редагувати на GitHub",
@@ -20,6 +21,8 @@ export const uk: UIStringsOverride = {
     generating: "Генерація…",
     openIn: "Відкрити в {name}",
     openInChat: "Відкрити в чаті",
+    openInChatPrompt:
+      "Прочитайте {url} — я ставитиму запитання щодо цієї сторінки.",
     scrollToTop: "Нагору",
   },
   ask: {

package/src/core/ui-packs/vi.ts

@@ -11,6 +11,7 @@ export const vi: UIStringsOverride = {
     copyClaudeCode: "Sao chép lệnh Claude Code",
     copyCode: "Sao chép mã",
     copyCodex: "Sao chép lệnh Codex",
+    copyFailed: "Sao chép thất bại",
     copyMarkdown: "Sao chép dưới dạng Markdown",
     copyServerUrl: "Sao chép URL máy chủ",
     edit: "Chỉnh sửa trên GitHub",
@@ -20,6 +21,7 @@ export const vi: UIStringsOverride = {
     generating: "Đang tạo…",
     openIn: "Mở trong {name}",
     openInChat: "Mở trong trò chuyện",
+    openInChatPrompt: "Hãy đọc {url} để tôi có thể đặt câu hỏi về trang này.",
     scrollToTop: "Lên đầu trang",
   },
   ask: {

package/src/core/ui-packs/zh-tw.ts

@@ -11,6 +11,7 @@ export const zhTW: UIStringsOverride = {
     copyClaudeCode: "複製 Claude Code 指令",
     copyCode: "複製程式碼",
     copyCodex: "複製 Codex 指令",
+    copyFailed: "複製失敗",
     copyMarkdown: "複製為 Markdown",
     copyServerUrl: "複製伺服器 URL",
     edit: "在 GitHub 上編輯",
@@ -20,6 +21,7 @@ export const zhTW: UIStringsOverride = {
     generating: "產生中…",
     openIn: "在 {name} 中開啟",
     openInChat: "在聊天中開啟",
+    openInChatPrompt: "請閱讀 {url} 以便我針對此頁面提問。",
     scrollToTop: "回到頂部",
   },
   ask: {

package/src/core/ui-packs/zh.ts

@@ -11,6 +11,7 @@ export const zh: UIStringsOverride = {
     copyClaudeCode: "复制 Claude Code 命令",
     copyCode: "复制代码",
     copyCodex: "复制 Codex 命令",
+    copyFailed: "复制失败",
     copyMarkdown: "复制为 Markdown",
     copyServerUrl: "复制服务器 URL",
     edit: "在 GitHub 上编辑",
@@ -20,6 +21,7 @@ export const zh: UIStringsOverride = {
     generating: "生成中…",
     openIn: "在 {name} 中打开",
     openInChat: "在聊天中打开",
+    openInChatPrompt: "请阅读 {url} 以便我就此页面提问。",
     scrollToTop: "回到顶部",
   },
   ask: {

package/src/core/version-cut.ts

@@ -7,7 +7,7 @@ import { stripBasePath } from "./base-path.ts";
 import { writeTextAtomic } from "./fs-atomic.ts";
 import { localizeRoute } from "./i18n.ts";
 import type { BlumeProject } from "./project-graph.ts";
-import { scanProject } from "./project-graph.ts";
+import { isWithin, scanProject } from "./project-graph.ts";
 import { VERSION_ID } from "./schema.ts";
 import { nextFenceState } from "./sources/normalize.ts";
 import type { FenceState } from "./sources/normalize.ts";
@@ -60,11 +60,16 @@ const buildRouteRewrites = (
   const { contentRoot } = project.context;
   const rewrites = new Map<string, string>();
   for (const page of project.graph.pages) {
-    // `sourcePath` is set by the filesystem adapter only, so its absence
-    // already excludes generated and remote pages.
+    // `sourcePath` marks a page backed by a local file, which excludes
+    // generated and remote pages; the content-root check below excludes local
+    // files that live outside the tree a version snapshot copies. A staged
+    // page (an Obsidian note) is served from its source, not from the copied
+    // tree, so it keeps publishing as current even when its file sits under
+    // the content root.
     const { sourcePath } = page;
     if (
       page.version !== "" ||
+      page.collection === "staged" ||
       !sourcePath ||
       relative(contentRoot, sourcePath).startsWith("..")
     ) {
@@ -172,12 +177,14 @@ export const insertArchivedVersion = async (
   const indent = text.slice(lineStart).match(/^\s*/u)?.[0] ?? "";
   const rest = text.slice(insertAt);
   // Match the array's authored shape: empty stays bare, an inline array gets
-  // an inline entry, a multiline array gets its own indented line.
+  // an inline entry, a multiline array gets its own indented line — on the
+  // file's own line ending, so a CRLF config doesn't gain a lone LF.
+  const eol = /^\r?\n/u.exec(rest)?.[0];
   let entry: string;
   if (rest.trimStart().startsWith("]")) {
     entry = `{ id: "${id}" }`;
-  } else if (rest.startsWith("\n")) {
-    entry = `\n${indent}  { id: "${id}" },`;
+  } else if (eol) {
+    entry = `${eol}${indent}  { id: "${id}" },`;
   } else {
     entry = `{ id: "${id}" }, `;
   }
@@ -240,6 +247,18 @@ export const cutVersion = async (
     "node_modules",
     ...(project.config.versions?.archived.map((version) => version.id) ?? []),
   ]);
+  // Another local source's tree under the content root — an Obsidian vault the
+  // filesystem source excludes — is that source's to publish. Copying it would
+  // republish its raw notes (wikilinks and `%%comments%%` intact) as
+  // filesystem pages of the snapshot, while the source itself keeps serving
+  // them as current.
+  const foreignRoots = project.sources
+    .flatMap((source) =>
+      source.staged && source.contentRoot ? [source.contentRoot] : []
+    )
+    .filter((tree) => isWithin(contentRoot, tree));
+  const isForeign = (path: string): boolean =>
+    foreignRoots.some((tree) => isWithin(tree, path));
   const entries = await readdir(contentRoot, { withFileTypes: true });
   let copied = 0;
   await Promise.all(
@@ -252,6 +271,7 @@ export const cutVersion = async (
         return;
       }
       await cp(join(contentRoot, entry.name), join(dir, entry.name), {
+        filter: (source) => !isForeign(source),
         recursive: true,
       });
     })

package/src/core/yaml.ts

@@ -0,0 +1,26 @@
+import {
+  binaryTag,
+  CORE_SCHEMA,
+  mergeTag,
+  omapTag,
+  pairsTag,
+  setTag,
+  timestampTag,
+} from "js-yaml";
+
+/**
+ * The schema js-yaml 4 loaded with by default: YAML 1.2 core scalars plus the
+ * `!!timestamp`, `!!merge`, `!!binary`, `!!omap`, `!!pairs`, and `!!set` tags.
+ * js-yaml 5 loads with the bare core schema instead, which turns
+ * `date: 2024-01-01` into a string and leaves `<<:` merge keys unresolved — a
+ * silent change to every page's front matter. Every Blume `load` call passes
+ * this schema so parsing stays identical across the upgrade.
+ */
+export const YAML_SCHEMA = CORE_SCHEMA.withTags(
+  timestampTag,
+  mergeTag,
+  binaryTag,
+  omapTag,
+  pairsTag,
+  setTag
+);