blume 2.0.1 → 2.0.3

package/dist/cli/{chunk-kpf8rrjc.js → chunk-hm3vjy5s.js}

@@ -5,36 +5,40 @@ import {
   BlumeError,
   countBySeverity,
   logger,
-  flushStdout,
   reportDiagnostics
 } from "./index.js";
 import {
   AGENTS
-} from "./chunk-qwsrynx5.js";
+} from "./chunk-1d7ve1dm.js";
 import {
-  frontmatter_default,
   i18nEnabled,
   localeCodes,
   localeTargetPath,
+  frontmatter_default,
   folderMetaSchema,
   scanBody,
   createModuleLoader
-} from "./chunk-qkqwkpte.js";
-import"./chunk-jts8mvcz.js";
-import {
-  scanProject
-} from "./chunk-fs23ddbb.js";
+} from "./chunk-pv29h0wf.js";
 import {
   seconds,
   money,
   duration,
   DISALLOWED_TOOLS,
   runAgentHeadless,
+  CODEX_LOCKDOWN,
   readAgentOutput
-} from "./chunk-fa25z98p.js";
+} from "./chunk-ga0pf4aj.js";
 import {
   writeTextAtomic
 } from "./chunk-jq5n4avg.js";
+import {
+  findFolderMetaFiles,
+  scanProject
+} from "./chunk-j85vccga.js";
+import"./chunk-3em5wd2y.js";
+import {
+  parseTimeoutSeconds
+} from "./chunk-e04dxsz1.js";
 
 // src/cli/commands/translate.ts
 import { defineCommand } from "citty";
@@ -58,6 +62,7 @@ var codexArgs = (lastMessagePath) => [
   "--ephemeral",
   "--sandbox",
   "read-only",
+  ...CODEX_LOCKDOWN,
   "--output-last-message",
   lastMessagePath,
   "-"
@@ -78,11 +83,15 @@ var emptyLedger = () => ({
   files: {},
   version: 1
 });
-var hashSource = (text) => createHash("sha256").update(text).digest("hex").slice(0, 16);
+var hashSource = (text) => createHash("sha256").update(text.replaceAll(`\r
+`, `
+`)).digest("hex").slice(0, 16);
+var CONFLICT_MARKER = /^(?:<{7}|={7}|>{7})(?:[ \r]|$)/mu;
 var readLedger = async (root) => {
+  const path = join(root, LEDGER_FILE);
   let raw;
   try {
-    raw = await readFile(join(root, LEDGER_FILE), "utf-8");
+    raw = await readFile(path, "utf-8");
   } catch {
     return emptyLedger();
   }
@@ -90,6 +99,15 @@ var readLedger = async (root) => {
   try {
     data = JSON.parse(raw);
   } catch {
+    if (CONFLICT_MARKER.test(raw)) {
+      throw new BlumeError({
+        code: "BLUME_TRANSLATE_LEDGER_CONFLICT",
+        file: path,
+        message: `${LEDGER_FILE} has unresolved merge-conflict markers, so it can't say which translations are current.`,
+        severity: "error",
+        suggestion: `Resolve the merge conflict in ${LEDGER_FILE}, then rerun.`
+      });
+    }
     return emptyLedger();
   }
   const parsed = ledgerSchema.safeParse(data);
@@ -340,47 +358,57 @@ var createProgressRenderer = (options) => {
 };
 
 // src/translate/run.ts
-import { existsSync } from "node:fs";
+import { existsSync as existsSync2 } from "node:fs";
 import { mkdtemp, readFile as readFile3 } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import pLimit from "p-limit";
 import pMap from "p-map";
-import { join as join3 } from "pathe";
+import { dirname as dirname2, join as join3 } from "pathe";
 
 // src/translate/meta.ts
+import { existsSync } from "node:fs";
 import { readFile as readFile2 } from "node:fs/promises";
 import { dirname, join as join2, relative } from "pathe";
-import { glob } from "tinyglobby";
-var META_FILES = ["**/meta.ts", "**/meta.js", "**/meta.mjs"];
+var META_NAMES = ["meta.ts", "meta.js", "meta.mjs"];
+var META_FILES = META_NAMES.map((name) => `**/${name}`);
 var isFactoryModule = (value) => typeof value === "function";
-var metaTargetPath = (meta, locale) => join2(meta.contentRoot, locale, meta.dir, "meta.ts");
+var metaTargetPath = (meta, locale, i18n, folders) => {
+  const dir = join2(meta.contentRoot, dirname(localeTargetPath(join2(meta.dir, "meta.ts"), ".ts", locale, i18n, folders)));
+  const existing = META_NAMES.find((name) => existsSync(join2(dir, name)));
+  return join2(dir, existing ?? "meta.ts");
+};
 var discoverTranslatableMeta = async (project) => {
   const { i18n } = project.config;
   if (!i18n || i18n.parser !== "dir") {
     return { diagnostics: [], metas: [] };
   }
   const localeDirs = new Set(i18n.locales.flatMap((locale) => locale.code === i18n.defaultLocale ? [] : [locale.code.toLowerCase()]));
+  const versionDirs = new Set(project.config.versions?.archived.map((version) => version.id));
   const load = createModuleLoader();
   const metas = [];
   const diagnostics = [];
-  const roots = project.sources.flatMap((source) => source.staged || !source.contentRoot ? [] : [source.contentRoot]);
-  for (const contentRoot of roots) {
-    const files = await glob(META_FILES, {
-      absolute: true,
-      cwd: contentRoot,
-      ignore: ["**/node_modules/**", "**/.blume/**", "**/dist/**"],
-      onlyFiles: true
-    });
+  const roots = project.sources.flatMap((source) => source.staged || !source.contentRoot ? [] : [
+    {
+      contentRoot: source.contentRoot,
+      exclude: source.exclude,
+      include: source.include
+    }
+  ]);
+  for (const { contentRoot, exclude, include } of roots) {
+    const files = await findFolderMetaFiles({ exclude, include, root: contentRoot }, META_FILES);
     for (const file of files.toSorted()) {
       const dir = relative(contentRoot, dirname(file));
-      const first = dir.split("/")[0]?.toLowerCase();
-      if (first && localeDirs.has(first)) {
+      const [head] = dir.split("/");
+      if (head && (localeDirs.has(head.toLowerCase()) || versionDirs.has(head))) {
+        continue;
+      }
+      let mod;
+      try {
+        mod = await load(file);
+      } catch {
         continue;
       }
-      const [raw, mod] = await Promise.all([
-        readFile2(file, "utf-8"),
-        load(file)
-      ]);
+      const raw = await readFile2(file, "utf-8");
       if (isFactoryModule(mod)) {
         diagnostics.push({
           code: "BLUME_TRANSLATE_META_FACTORY",
@@ -517,7 +545,7 @@ var pinHeadingAnchors = (sourceText, translatedText) => {
 };
 
 // src/translate/validate.ts
-var FRONTMATTER_OPEN = /^---\r?\n/u;
+var FRONTMATTER_OPEN = /^?---\r?\n/u;
 var FENCE_LINE = /^\s*(?:```|~~~)/u;
 var stripOuterFence = (text) => {
   const trimmed = text.trim();
@@ -549,7 +577,8 @@ var ensureTrailingNewline = (text) => text.endsWith(`
 `) ? text : `${text}
 `;
 var validateTranslation = (sourceText, agentText) => {
-  const candidate = stripOuterFence(agentText);
+  const sourceIsFenced = stripOuterFence(sourceText) !== sourceText.trim();
+  const candidate = sourceIsFenced && countFenceLines(agentText) <= countFenceLines(sourceText) ? agentText.trim() : stripOuterFence(agentText);
   if (candidate === "") {
     return { ok: false, reason: "agent returned empty output" };
   }
@@ -622,7 +651,7 @@ var parseMetaTitles = (agentText, expectedKeys) => {
 };
 
 // src/translate/run.ts
-var metaDirKey = (dir) => dir === "" ? "." : dir;
+var metaKey = (meta) => dirname2(meta.sourceRel);
 var invokeAgent = async (context, prompt, index) => {
   const messagePath = join3(context.dir, `message-${index}.txt`);
   const result = await context.run(context.bin, translateAgentArgs(context.kind, messagePath), { cwd: context.dir, prompt, timeoutMs: context.timeoutMs });
@@ -644,7 +673,7 @@ var runPageItem = async (item, index, context, ledger) => {
     return done("translated");
   }
   const target = context.targets.get(item.locale);
-  const previousTranslation = existsSync(item.targetPath) ? await readFile3(item.targetPath, "utf-8") : undefined;
+  const previousTranslation = existsSync2(item.targetPath) ? await readFile3(item.targetPath, "utf-8") : undefined;
   const output = await invokeAgent(context, pagePrompt(sourceText, target, context.source, previousTranslation), index);
   if (output.isError) {
     return done("failed", output.detail ?? "agent failed", output.costUsd);
@@ -666,7 +695,7 @@ var runMetaItem = async (item, index, context, ledger) => {
     item,
     status
   });
-  const titles = Object.fromEntries(item.entries.map((entry) => [metaDirKey(entry.meta.dir), entry.meta.title]));
+  const titles = Object.fromEntries(item.entries.map((entry) => [metaKey(entry.meta), entry.meta.title]));
   const target = context.targets.get(item.locale);
   const output = await invokeAgent(context, metaPrompt(titles, target, context.source), index);
   if (output.isError) {
@@ -674,7 +703,7 @@ var runMetaItem = async (item, index, context, ledger) => {
   }
   const parsed = parseMetaTitles(output.text, Object.keys(titles));
   for (const entry of item.entries) {
-    const translated = parsed.titles[metaDirKey(entry.meta.dir)];
+    const translated = parsed.titles[metaKey(entry.meta)];
     if (translated === undefined) {
       continue;
     }
@@ -765,10 +794,23 @@ var runTranslate = async (options) => {
 };
 
 // src/translate/work-list.ts
-import { existsSync as existsSync2 } from "node:fs";
+import { existsSync as existsSync3, readdirSync } from "node:fs";
 import { readFile as readFile4 } from "node:fs/promises";
-import { dirname as dirname2, extname, join as join4, relative as relative2 } from "pathe";
+import { extname, join as join4, relative as relative2 } from "pathe";
 var PAGE_EXTENSIONS = new Set([".md", ".mdx"]);
+var rootFolders = () => {
+  const read = new Map;
+  return (contentRoot) => {
+    const cached = read.get(contentRoot);
+    if (cached) {
+      return cached;
+    }
+    const names = readdirSync(contentRoot);
+    read.set(contentRoot, names);
+    return names;
+  };
+};
+var scanForTranslation = (root) => scanProject(root, { mode: "dev" });
 var translatablePages = (project, i18n) => {
   const rootsByName = new Map(project.sources.flatMap((source) => source.staged || !source.contentRoot ? [] : [[source.name, source.contentRoot]]));
   const seen = new Set;
@@ -809,6 +851,7 @@ var partialWorkItems = async (universe, project, i18n, ledger, targetLocales, fo
   }
   const { root } = project.context;
   const pagePaths = new Set(project.graph.pages.flatMap((page) => page.sourcePath ? [page.sourcePath] : []));
+  const folders = rootFolders();
   const partials = new Map;
   for (const { page, contentRoot } of universe) {
     for (const partial of page.includes ?? []) {
@@ -825,7 +868,7 @@ var partialWorkItems = async (universe, project, i18n, ledger, targetLocales, fo
     const verbatim = !PAGE_EXTENSIONS.has(ext.toLowerCase());
     const contentRel = relative2(contentRoot, partialPath);
     for (const locale of targetLocales) {
-      const targetPath = join4(contentRoot, localeTargetPath(contentRel, ext, locale, i18n));
+      const targetPath = join4(contentRoot, localeTargetPath(contentRel, ext, locale, i18n, folders(contentRoot)));
       const item = (status) => {
         const partialItem = {
           kind: "page",
@@ -842,7 +885,7 @@ var partialWorkItems = async (universe, project, i18n, ledger, targetLocales, fo
         return partialItem;
       };
       const stamp = ledger.files[sourceRel]?.[locale];
-      const outcome = classifyPair(existsSync2(targetPath), stamp, hash, force);
+      const outcome = classifyPair(existsSync3(targetPath), stamp, hash, force);
       if (outcome === "untracked") {
         work.untracked.push({ hash, kind: "page", locale, sourceRel });
       } else if (outcome === "current") {
@@ -854,6 +897,18 @@ var partialWorkItems = async (universe, project, i18n, ledger, targetLocales, fo
   }
   return work;
 };
+var existingTranslations = (project) => {
+  const writableSources = new Set(project.sources.flatMap((source) => source.staged || !source.contentRoot ? [] : [source.name]));
+  const translated = new Map;
+  for (const page of project.graph.pages) {
+    const key = `${page.translationKey}\x00${page.locale}`;
+    if (page.fallback || translated.has(key)) {
+      continue;
+    }
+    translated.set(key, page.sourcePath && writableSources.has(page.source.name) ? page.sourcePath : undefined);
+  }
+  return translated;
+};
 var computeWorkList = async (project, ledger, options = {}) => {
   const { i18n } = project.config;
   if (!i18n) {
@@ -867,20 +922,22 @@ var computeWorkList = async (project, ledger, options = {}) => {
     };
   }
   const targetLocales = localeCodes(i18n).filter((code) => code !== i18n.defaultLocale && (options.locales === undefined || options.locales.includes(code)));
-  const translated = new Set(project.graph.pages.flatMap((page) => page.fallback ? [] : [`${page.translationKey}\x00${page.locale}`]));
+  const translated = existingTranslations(project);
   const { root } = project.context;
   const knownSources = new Set;
   const untracked = [];
   const pageItems = [];
   let upToDate = 0;
   const universe = translatablePages(project, i18n);
+  const folders = rootFolders();
   for (const { page, contentRoot, ext, sourcePath } of universe) {
     const sourceRel = relative2(root, sourcePath);
     knownSources.add(sourceRel);
     const hash = hashSource(await readFile4(sourcePath, "utf-8"));
     const contentRel = relative2(contentRoot, sourcePath);
     for (const locale of targetLocales) {
-      const targetPath = join4(contentRoot, localeTargetPath(contentRel, ext, locale, i18n));
+      const key = `${page.translationKey}\x00${locale}`;
+      const targetPath = translated.get(key) ?? join4(contentRoot, localeTargetPath(contentRel, ext, locale, i18n, folders(contentRoot)));
       const item = (status) => ({
         kind: "page",
         locale,
@@ -890,7 +947,7 @@ var computeWorkList = async (project, ledger, options = {}) => {
         targetPath,
         targetRel: relative2(root, targetPath)
       });
-      const exists = translated.has(`${page.translationKey}\x00${locale}`);
+      const exists = translated.has(key);
       const stamp = ledger.files[sourceRel]?.[locale];
       const outcome = classifyPair(exists, stamp, hash, options.force === true);
       if (outcome === "untracked") {
@@ -915,14 +972,14 @@ var computeWorkList = async (project, ledger, options = {}) => {
     const entries = [];
     for (const source of meta.metas) {
       knownSources.add(source.sourceRel);
-      const targetDir = dirname2(metaTargetPath(source, locale));
-      const exists = ["meta.ts", "meta.js", "meta.mjs"].some((name) => existsSync2(join4(targetDir, name)));
+      const targetPath = metaTargetPath(source, locale, i18n, folders(source.contentRoot));
+      const exists = existsSync3(targetPath);
       const hash = hashSource(source.raw);
       const stamp = ledger.files[source.sourceRel]?.[locale];
       const entry = (status) => ({
         meta: source,
         status,
-        targetPath: metaTargetPath(source, locale)
+        targetPath
       });
       const outcome = classifyPair(exists, stamp, hash, options.force === true);
       if (outcome === "untracked") {
@@ -972,11 +1029,7 @@ var parseFlags = (args) => {
     logger.error("Pass --codex or --claude to choose the agent CLI that translates.");
     process.exit(1);
   }
-  const timeoutS = args.timeout === undefined ? DEFAULT_TIMEOUT_S : Number(args.timeout);
-  if (!Number.isInteger(timeoutS) || timeoutS <= 0) {
-    logger.error(`Invalid --timeout "${args.timeout}" (whole seconds).`);
-    process.exit(1);
-  }
+  const timeoutS = parseTimeoutSeconds(args.timeout, DEFAULT_TIMEOUT_S);
   const concurrency = args.concurrency === undefined ? DEFAULT_CONCURRENCY : Number(args.concurrency);
   if (!Number.isInteger(concurrency) || concurrency < 1 || concurrency > MAX_CONCURRENCY) {
     logger.error(`Invalid --concurrency "${args.concurrency}" (use 1..${MAX_CONCURRENCY}).`);
@@ -1049,7 +1102,7 @@ var translateCommand = defineCommand({
     const root = process.cwd();
     const { agent, concurrency, timeoutS } = parseFlags(args);
     try {
-      const project = await scanProject(root, { mode: "build" });
+      const project = await scanForTranslation(root);
       if (!i18nEnabled(project.config)) {
         logger.error("i18n is not configured — add `i18n.locales` to blume.config to use `blume translate`.");
         process.exit(1);
@@ -1080,8 +1133,7 @@ var translateCommand = defineCommand({
           process.stdout.write(checkReportJson(workList));
         }
         if (hasDrift(workList)) {
-          await flushStdout();
-          process.exit(1);
+          process.exitCode = 1;
         }
         return;
       }
@@ -1122,8 +1174,7 @@ var translateCommand = defineCommand({
         process.stdout.write(translateReportJson(result, workList));
       }
       if (result.counts.failed > 0 || result.counts.partial > 0) {
-        await flushStdout();
-        process.exit(1);
+        process.exitCode = 1;
       }
     } catch (error) {
       if (error instanceof BlumeError) {
@@ -1142,5 +1193,5 @@ export {
   translateCommand
 };
 
-//# debugId=E056CB8AC06243D564756E2164756E21
-//# sourceMappingURL=chunk-kpf8rrjc.js.map
+//# debugId=FFF735A581A85E1364756E2164756E21
+//# sourceMappingURL=chunk-hm3vjy5s.js.map