scribe-cms 0.0.14 → 0.0.16

package/dist/cli/index.js

@@ -2530,6 +2530,13 @@ function defaultLocalizationPrompt(localeName, locale) {
     "Write as if a native speaker authored it for the target market."
   ].join(" ");
 }
+function buildLocalizationPrompt(promptOverride, localeName, locale) {
+  const localeDirective = defaultLocalizationPrompt(localeName, locale);
+  if (!promptOverride) return localeDirective;
+  return `${promptOverride}
+
+${localeDirective}`;
+}
 var TASK_FRAMING = "You are localizing the content below into a target language specified at the end of this prompt.";
 function buildOutputFormatLine(hasFrontmatter, slugStrategy) {
   if (!hasFrontmatter) {
@@ -2537,9 +2544,20 @@ function buildOutputFormatLine(hasFrontmatter, slugStrategy) {
   }
   return slugStrategy === "localized" ? "`frontmatter` (object with translated frontmatter fields), `body` (string, full MDX body), `slug` (string)." : "`frontmatter` (object), `body` (string).";
 }
+function buildRetryContextSection(previousError) {
+  return [
+    "",
+    "## Previous attempt",
+    `A previous attempt at this translation was rejected with the following validation errors: ${previousError}. Produce a corrected translation that fixes these issues while re-checking every schema constraint (required fields, array minimums, maximum lengths).`
+  ];
+}
 function buildPageTranslationPrompt(input) {
   const localeName = LOCALE_NAMES[input.targetLocale] ?? input.targetLocale;
-  const localizationPrompt = input.resolved.promptOverride ?? defaultLocalizationPrompt(localeName, input.targetLocale);
+  const localizationPrompt = buildLocalizationPrompt(
+    input.resolved.promptOverride,
+    localeName,
+    input.targetLocale
+  );
   const prefix = [
     TASK_FRAMING,
     "",
@@ -2567,7 +2585,10 @@ function buildPageTranslationPrompt(input) {
     buildOutputFormatLine(
       Object.keys(input.translatableFrontmatter).length > 0,
       input.slugStrategy
-    )
+    ),
+    // Retry context is locale-specific suffix material: it MUST stay after the
+    // EN body so the cacheable prefix is byte-identical with and without it.
+    ...input.previousError ? buildRetryContextSection(input.previousError) : []
   ];
   return [...prefix, ...suffix].join("\n");
 }
@@ -2787,7 +2808,8 @@ function prepareTranslation(config, item, options, startedAt) {
     contextLabel: resolveContextLabel(enDoc, item.enSlug),
     translatableFrontmatter: payload.frontmatter,
     enBody: payload.body,
-    slugStrategy: type.slugStrategy
+    slugStrategy: type.slugStrategy,
+    previousError: item.previousError
   });
   const responseSchema = buildGeminiResponseSchema(type.schema, type.slugStrategy);
   return {
@@ -3199,6 +3221,82 @@ async function runPool(items, concurrency, worker) {
 function labelForItem(item) {
   return `${item.contentType}/${item.enSlug}@${item.locale}`;
 }
+function buildRetryWorklist(failed, originalByKey) {
+  return failed.map((result) => {
+    const key = translationItemKey(result);
+    const original = originalByKey.get(key);
+    return {
+      contentType: result.contentType,
+      enSlug: result.enSlug,
+      locale: result.locale,
+      reason: original?.reason ?? "missing",
+      currentEnHash: original?.currentEnHash ?? "",
+      storedEnHash: original?.storedEnHash,
+      previousError: result.error ?? "Translation failed"
+    };
+  });
+}
+async function runRetryRound(config, retryItems, options) {
+  const startedAt = Date.now();
+  const translateOne = options.translateOne ?? ((item) => translatePage(config, item, { model: options.model, force: true }));
+  if (options.mode === "direct") {
+    const active = /* @__PURE__ */ new Set();
+    await runPool(retryItems, options.concurrency, async (item) => {
+      const label = labelForItem(item);
+      active.add(label);
+      options.onProgress?.({ type: "item-start", item, active: [...active] });
+      const result = await translateOne(item);
+      active.delete(label);
+      options.onResult(result);
+    });
+    return;
+  }
+  const entries = [];
+  for (const item of retryItems) {
+    const itemStartedAt = Date.now();
+    try {
+      const outcome = prepareTranslation(config, item, { model: options.model, force: true }, itemStartedAt);
+      if (outcome.status === "done") {
+        options.onResult(outcome.result);
+      } else {
+        entries.push({
+          apiModel: resolveGeminiModelId(displayModelFor(outcome.prepared)),
+          prompt: outcome.prepared.prompt,
+          prepared: outcome.prepared
+        });
+      }
+    } catch (error) {
+      options.onResult(failedResultForItem(item, error, itemStartedAt));
+    }
+  }
+  const plans = planBatchJobs(entries);
+  const submitted = await Promise.all(
+    plans.map(async (plan, planIndex) => {
+      try {
+        return await submitBatchJobPlan(config, {
+          plan,
+          displayModel: normalizeGeminiDisplayName(plan.apiModel),
+          jobIndex: planIndex,
+          jobCount: plans.length,
+          onProgress: options.onProgress
+        });
+      } catch (error) {
+        for (const entry of plan.entries) {
+          options.onResult(failedResultForItem(entry.prepared.item, error, startedAt));
+        }
+        return void 0;
+      }
+    })
+  );
+  const jobsToPoll = submitted.filter((row) => row !== void 0);
+  if (jobsToPoll.length > 0) {
+    await pollAndIngestBatchJobs(config, jobsToPoll, {
+      jobCount: jobsToPoll.length,
+      onProgress: options.onProgress,
+      onResult: options.onResult
+    });
+  }
+}
 async function translatePage(config, item, options = {}) {
   const startedAt = Date.now();
   let outcome;
@@ -3371,9 +3469,40 @@ async function translateWorklist(config, items, options = {}) {
       });
     }
   }
-  const results = collector.assemble();
+  const mainResults = collector.assemble();
+  const failed = mainResults.filter((result) => result.failed);
+  if (failed.length === 0) {
+    const totals2 = summarizeResults(mainResults, Date.now() - startedAt);
+    options.onProgress?.({ type: "done", results: mainResults, totals: totals2 });
+    return mainResults;
+  }
+  options.onProgress?.({ type: "retry-start", failed });
+  const originalByKey = new Map(
+    items.map((item) => [translationItemKey(item), item])
+  );
+  const retryItems = buildRetryWorklist(failed, originalByKey);
+  const retryByKey = /* @__PURE__ */ new Map();
+  await runRetryRound(config, retryItems, {
+    model: options.model,
+    force: options.force,
+    concurrency,
+    mode,
+    onProgress: options.onProgress,
+    onResult: (result) => {
+      retryByKey.set(translationItemKey(result), result);
+      options.onProgress?.({ type: "item-done", result });
+    }
+  });
+  const results = mainResults.map((result) => {
+    if (!result.failed) return result;
+    return retryByKey.get(translationItemKey(result)) ?? result;
+  });
+  const retriedTranslated = failed.filter((original) => {
+    const retried = retryByKey.get(translationItemKey(original));
+    return retried !== void 0 && !retried.failed && !retried.skipped;
+  }).length;
   const totals = summarizeResults(results, Date.now() - startedAt);
-  options.onProgress?.({ type: "done", results, totals });
+  options.onProgress?.({ type: "done", results, totals, retriedTranslated });
   return results;
 }
 function countPendingItems(config, jobs) {
@@ -4195,10 +4324,11 @@ function detailForResult(result) {
   if (result.error) parts.push(red(result.error));
   return parts.length > 0 ? dim(parts.join(" \xB7 ")) : "";
 }
-function formatSummaryLine(totals, dryRun) {
+function formatSummaryLine(totals, dryRun, retriedTranslated = 0) {
   const action = dryRun ? "Would translate" : "Translated";
+  const base = totals.translated - retriedTranslated;
   const parts = [
-    `${action} ${totals.translated}`,
+    retriedTranslated > 0 ? `${action} ${base} +${retriedTranslated} on retry` : `${action} ${totals.translated}`,
     `skipped ${totals.skipped}`
   ];
   if (totals.failed > 0) parts.push(red(`failed ${totals.failed}`));
@@ -4247,8 +4377,18 @@ function createTranslateProgressReporter(options = {}) {
           }
           return;
         }
+        if (event.type === "retry-start") {
+          for (const result of event.failed) {
+            console.log(`${labelForResult(result)}: ${result.error ?? "failed"}`);
+          }
+          console.log(`Retrying ${event.failed.length} failed items with validation context...`);
+          return;
+        }
         if (event.type === "done") {
-          console.log(formatSummaryLine(event.totals, dryRun));
+          console.log(formatSummaryLine(event.totals, dryRun, event.retriedTranslated));
+          for (const result of event.results.filter((entry) => entry.failed)) {
+            console.error(`${labelForResult(result)}: ${result.error ?? "failed"}`);
+          }
         }
       },
       finish() {
@@ -4415,12 +4555,25 @@ function createTranslateProgressReporter(options = {}) {
           render();
           break;
         }
+        case "retry-start": {
+          total += event.failed.length;
+          printPersistent([
+            ...event.failed.map(
+              (result) => red(`${labelForResult(result)}: ${result.error ?? "failed"}`)
+            ),
+            cyan(`Retrying ${event.failed.length} failed items with validation context...`)
+          ]);
+          render();
+          break;
+        }
         case "done":
           showCursor();
           if (renderedLines > 0) {
             process.stdout.write(`\x1B[${renderedLines}A`);
           }
-          process.stdout.write("\x1B[2K" + green("Done") + " \xB7 " + formatSummaryLine(event.totals, dryRun) + "\n");
+          process.stdout.write(
+            "\x1B[2K" + green("Done") + " \xB7 " + formatSummaryLine(event.totals, dryRun, event.retriedTranslated) + "\n"
+          );
           renderedLines = 0;
           for (const result of event.results.filter((entry) => entry.failed)) {
             process.stdout.write("\x1B[2K" + red(`${labelForResult(result)}: ${result.error ?? "failed"}`) + "\n");