glotfile 0.4.4 → 0.4.5

package/dist/server/cli.js

@@ -1853,6 +1853,7 @@ function buildSystemPrompt(hasPluralItems) {
     "- Preserve ICU plural/select structure verbatim (e.g. {count, plural, one {\u2026} other {\u2026}}); translate only the human-readable text inside each branch.",
     "- Glossary: a term marked do-not-translate MUST appear unchanged in the translation. A term with a forced translation for the target locale MUST use that exact translation.",
     "- Respect the max length (characters) when given; prefer a shorter natural phrasing over exceeding it.",
+    `- Quotation marks inside a translation MUST use the target language's typographic quote characters (e.g. \u201EGerman\u201C, \xABFrench\xBB, \u201CEnglish\u201D, \u2019 for apostrophes). Never emit a raw ASCII double-quote (") inside a translated string \u2014 it corrupts the JSON reply. If the source uses ASCII quotes, convert them to the target language's typographic quotes.`,
     "- Match the register and capitalization conventions of the target language and of UI microcopy.",
     "- Return ONLY the translated string for each item \u2014 no quotes, notes, or explanations."
   ];
@@ -1942,6 +1943,16 @@ var init_provider = __esm({
 });
 
 // src/server/ai/batch.ts
+function parseReplyItems(text) {
+  let parsed;
+  try {
+    parsed = JSON.parse(text);
+  } catch {
+    throw new MalformedReplyError(text);
+  }
+  if (!Array.isArray(parsed.items)) throw new MalformedReplyError(text);
+  return parsed.items;
+}
 function chunk(items, size) {
   const out = [];
   for (let i = 0; i < items.length; i += size) out.push(items.slice(i, i + size));
@@ -1977,24 +1988,46 @@ function validatePlural(req, forms) {
 function validateReply(req, item) {
   return req.plural ? validatePlural(req, item?.forms) : validateTranslation(req, item?.translation);
 }
-async function runBatched(reqs, batchSize, callBatch, onBatchComplete, signal) {
+async function runBatched(reqs, batchSize, callBatch, onBatchComplete, signal, onMalformedReply) {
+  const failBatch = (batch) => batch.map((req) => ({ id: req.id, error: "Model returned malformed JSON for this string." }));
+  async function resolveBatch(batch, isRetry = false) {
+    let reply;
+    try {
+      reply = await callBatch(batch, signal);
+    } catch (err) {
+      if (!(err instanceof MalformedReplyError)) throw err;
+      onMalformedReply?.(err.raw, batch.length);
+      if (signal?.aborted) return failBatch(batch);
+      if (batch.length === 1) return isRetry ? failBatch(batch) : resolveBatch(batch, true);
+      const mid = Math.ceil(batch.length / 2);
+      return [...await resolveBatch(batch.slice(0, mid)), ...await resolveBatch(batch.slice(mid))];
+    }
+    const byId = new Map(reply.map((r) => [r.id, r]));
+    return batch.map((req) => validateReply(req, byId.get(req.id)));
+  }
   const results = [];
   const total = reqs.length;
   for (const batch of chunk(reqs, Math.max(1, batchSize))) {
     if (signal?.aborted) break;
-    const reply = await callBatch(batch, signal);
-    const byId = new Map(reply.map((r) => [r.id, r]));
-    const batchResults = [];
-    for (const req of batch) batchResults.push(validateReply(req, byId.get(req.id)));
+    const batchResults = await resolveBatch(batch);
     results.push(...batchResults);
     onBatchComplete?.(results.length, total, batchResults);
   }
   return results;
 }
+var MalformedReplyError;
 var init_batch = __esm({
   "src/server/ai/batch.ts"() {
     "use strict";
     init_placeholders();
+    MalformedReplyError = class extends Error {
+      constructor(raw) {
+        super("Model reply was not valid translation JSON.");
+        this.raw = raw;
+        this.name = "MalformedReplyError";
+      }
+      raw;
+    };
   }
 });
 
@@ -2023,8 +2056,8 @@ var init_anthropic = __esm({
       supportsVision() {
         return true;
       }
-      translate(reqs, onBatchComplete, signal) {
-        return runBatched(reqs, this.config.batchSize, (batch, sig) => this.callBatch(batch, sig), onBatchComplete, signal);
+      translate(reqs, onBatchComplete, signal, onMalformedReply) {
+        return runBatched(reqs, this.config.batchSize, (batch, sig) => this.callBatch(batch, sig), onBatchComplete, signal, onMalformedReply);
       }
       // Build the user message as content blocks: each unique key's screenshot is
       // sent once (a key recurs once per target locale in a batch — dedupe by key),
@@ -2071,13 +2104,8 @@ var init_anthropic = __esm({
           output_config: { format: { type: "json_schema", schema: BATCH_SCHEMA } },
           messages: [{ role: "user", content }]
         }, { signal });
-        const text = res.content.find((b) => b.type === "text")?.text ?? "{}";
-        try {
-          const parsed = JSON.parse(text);
-          return parsed.items ?? [];
-        } catch {
-          return [];
-        }
+        const text = res.content.find((b) => b.type === "text")?.text ?? "";
+        return parseReplyItems(text);
       }
     };
   }
@@ -2119,8 +2147,8 @@ var init_openai = __esm({
       supportsVision() {
         return true;
       }
-      translate(reqs, onBatchComplete, signal) {
-        return runBatched(reqs, this.config.batchSize, (batch, sig) => this.callBatch(batch, sig), onBatchComplete, signal);
+      translate(reqs, onBatchComplete, signal, onMalformedReply) {
+        return runBatched(reqs, this.config.batchSize, (batch, sig) => this.callBatch(batch, sig), onBatchComplete, signal, onMalformedReply);
       }
       // User content as an array of parts: each unique key's screenshot once (as an
       // image_url data URL), then the batch prompt text describing every item.
@@ -2169,13 +2197,8 @@ var init_openai = __esm({
             { role: "user", content: this.buildUserContent(batch) }
           ]
         }, { signal });
-        const text = res.choices?.[0]?.message?.content ?? "{}";
-        try {
-          const parsed = JSON.parse(text);
-          return parsed.items ?? [];
-        } catch {
-          return [];
-        }
+        const text = res.choices?.[0]?.message?.content ?? "";
+        return parseReplyItems(text);
       }
     };
   }
@@ -2228,8 +2251,8 @@ var init_bedrock = __esm({
       supportsVision() {
         return !this.isMeta();
       }
-      translate(reqs, onBatchComplete, signal) {
-        return runBatched(reqs, this.config.batchSize, (batch, sig) => this.callBatch(batch, sig), onBatchComplete, signal);
+      translate(reqs, onBatchComplete, signal, onMalformedReply) {
+        return runBatched(reqs, this.config.batchSize, (batch, sig) => this.callBatch(batch, sig), onBatchComplete, signal, onMalformedReply);
       }
       buildContentBlocks(batch) {
         const blocks = [];
@@ -2293,13 +2316,8 @@ var init_bedrock = __esm({
         const blocks = res.output?.message?.content ?? [];
         const tool = blocks.find((b) => b.toolUse)?.toolUse;
         if (tool?.input?.items) return tool.input.items;
-        const text = blocks.find((b) => b.text)?.text ?? "{}";
-        try {
-          const parsed = JSON.parse(text);
-          return parsed.items ?? [];
-        } catch {
-          return [];
-        }
+        const text = blocks.find((b) => b.text)?.text ?? "";
+        return parseReplyItems(text);
       }
     };
   }
@@ -2442,8 +2460,8 @@ var init_claudecode = __esm({
       supportsVision() {
         return false;
       }
-      translate(reqs, onBatchComplete, signal) {
-        return runBatched(reqs, this.config.batchSize, (batch, sig) => this.callBatch(batch, sig), onBatchComplete, signal);
+      translate(reqs, onBatchComplete, signal, onMalformedReply) {
+        return runBatched(reqs, this.config.batchSize, (batch, sig) => this.callBatch(batch, sig), onBatchComplete, signal, onMalformedReply);
       }
       async complete(req) {
         const systemParts = [req.system, `Respond with valid JSON matching this schema: ${JSON.stringify(req.schema)}`];
@@ -2466,12 +2484,7 @@ var init_claudecode = __esm({
           throw err;
         }
         if (signal?.aborted) return [];
-        try {
-          const parsed = JSON.parse(stripFences(result));
-          return parsed.items ?? [];
-        } catch {
-          return [];
-        }
+        return parseReplyItems(stripFences(result));
       }
     };
   }
@@ -2759,7 +2772,7 @@ async function runLocaleParallel(reqs, provider, hooks = {}, concurrency = DEFAU
       const localeResults = await provider.translate(group, (_localeDone, _localeTotal, batchResults) => {
         done += batchResults.length;
         hooks.onBatchComplete?.(done, total, batchResults, locale);
-      }, signal);
+      }, signal, (raw, batchSize) => hooks.onMalformedReply?.(raw, batchSize, locale));
       allResults.push(...localeResults);
       if (!signal?.aborted) hooks.onLocaleDone?.(locale);
     }
@@ -5266,6 +5279,19 @@ function createApi(deps) {
         },
         onLocaleDone: (locale) => {
           void stream.writeSSE({ event: "locale-done", data: JSON.stringify({ locale }) });
+        },
+        // Record the raw reply so an unparseable model response is diagnosable
+        // from the activity log instead of vanishing into per-item errors.
+        onMalformedReply: (raw, batchSize, locale) => {
+          console.error(`[translate] malformed model reply (${locale}, batch of ${batchSize})${batchSize > 1 ? " \u2014 splitting batch and retrying" : ""}`);
+          appendLog(projectRoot, {
+            at: (/* @__PURE__ */ new Date()).toISOString(),
+            kind: "translate",
+            summary: `Malformed model reply (${locale}, batch of ${batchSize})`,
+            model: aiCfg.model,
+            locale,
+            raw
+          });
         }
       }, aiCfg.concurrency, signal);
       if (!signal?.aborted) {
@@ -5298,7 +5324,19 @@ function createApi(deps) {
       }
       const { skipped } = attachScreenshotsForProvider(toTranslate, s, dirname3(resolve9(deps.statePath)), provider.supportsVision());
       if (skipped) console.warn(`Model "${aiCfg.model}" has no vision support; ${skipped} screenshot(s) ignored.`);
-      const results = await runLocaleParallel(toTranslate, provider, {}, aiCfg.concurrency);
+      const results = await runLocaleParallel(toTranslate, provider, {
+        onMalformedReply: (raw, batchSize, locale) => {
+          console.error(`[translate] malformed model reply (${locale}, batch of ${batchSize})${batchSize > 1 ? " \u2014 splitting batch and retrying" : ""}`);
+          appendLog(projectRoot, {
+            at: (/* @__PURE__ */ new Date()).toISOString(),
+            kind: "translate",
+            summary: `Malformed model reply (${locale}, batch of ${batchSize})`,
+            model: aiCfg.model,
+            locale,
+            raw
+          });
+        }
+      }, aiCfg.concurrency);
       const latest = load();
       ({ written, errors } = applyResults(latest, toTranslate, results, void 0, force));
       const entry = {
@@ -5906,6 +5944,20 @@ async function runTranslate(args) {
         errors.push(...batchApplied.errors);
         saveState(args.statePath, state);
         process.stdout.write(`\r  ${done}/${total} translated`);
+      },
+      // Record the raw reply so an unparseable model response is diagnosable
+      // from the activity log instead of vanishing into per-item errors.
+      onMalformedReply: (raw, batchSize, locale) => {
+        console.error(`
+  malformed model reply (${locale}, batch of ${batchSize})${batchSize > 1 ? " \u2014 splitting batch and retrying" : ""}`);
+        appendLog(projectRoot, {
+          at: (/* @__PURE__ */ new Date()).toISOString(),
+          kind: "translate",
+          summary: `Malformed model reply (${locale}, batch of ${batchSize})`,
+          model: ai.model,
+          locale,
+          raw
+        });
       }
     });
     process.stdout.write("\n");

package/dist/server/server.js

@@ -1560,7 +1560,7 @@ async function runLocaleParallel(reqs, provider, hooks = {}, concurrency = DEFAU
       const localeResults = await provider.translate(group, (_localeDone, _localeTotal, batchResults) => {
         done += batchResults.length;
         hooks.onBatchComplete?.(done, total, batchResults, locale);
-      }, signal);
+      }, signal, (raw, batchSize) => hooks.onMalformedReply?.(raw, batchSize, locale));
       allResults.push(...localeResults);
       if (!signal?.aborted) hooks.onLocaleDone?.(locale);
     }
@@ -2869,6 +2869,7 @@ function buildSystemPrompt(hasPluralItems) {
     "- Preserve ICU plural/select structure verbatim (e.g. {count, plural, one {\u2026} other {\u2026}}); translate only the human-readable text inside each branch.",
     "- Glossary: a term marked do-not-translate MUST appear unchanged in the translation. A term with a forced translation for the target locale MUST use that exact translation.",
     "- Respect the max length (characters) when given; prefer a shorter natural phrasing over exceeding it.",
+    `- Quotation marks inside a translation MUST use the target language's typographic quote characters (e.g. \u201EGerman\u201C, \xABFrench\xBB, \u201CEnglish\u201D, \u2019 for apostrophes). Never emit a raw ASCII double-quote (") inside a translated string \u2014 it corrupts the JSON reply. If the source uses ASCII quotes, convert them to the target language's typographic quotes.`,
     "- Match the register and capitalization conventions of the target language and of UI microcopy.",
     "- Return ONLY the translated string for each item \u2014 no quotes, notes, or explanations."
   ];
@@ -2952,6 +2953,24 @@ var BATCH_SCHEMA = {
 };
 
 // src/server/ai/batch.ts
+var MalformedReplyError = class extends Error {
+  constructor(raw) {
+    super("Model reply was not valid translation JSON.");
+    this.raw = raw;
+    this.name = "MalformedReplyError";
+  }
+  raw;
+};
+function parseReplyItems(text) {
+  let parsed;
+  try {
+    parsed = JSON.parse(text);
+  } catch {
+    throw new MalformedReplyError(text);
+  }
+  if (!Array.isArray(parsed.items)) throw new MalformedReplyError(text);
+  return parsed.items;
+}
 function chunk(items, size) {
   const out = [];
   for (let i = 0; i < items.length; i += size) out.push(items.slice(i, i + size));
@@ -2987,15 +3006,28 @@ function validatePlural(req, forms) {
 function validateReply(req, item) {
   return req.plural ? validatePlural(req, item?.forms) : validateTranslation(req, item?.translation);
 }
-async function runBatched(reqs, batchSize, callBatch, onBatchComplete, signal) {
+async function runBatched(reqs, batchSize, callBatch, onBatchComplete, signal, onMalformedReply) {
+  const failBatch = (batch) => batch.map((req) => ({ id: req.id, error: "Model returned malformed JSON for this string." }));
+  async function resolveBatch(batch, isRetry = false) {
+    let reply;
+    try {
+      reply = await callBatch(batch, signal);
+    } catch (err) {
+      if (!(err instanceof MalformedReplyError)) throw err;
+      onMalformedReply?.(err.raw, batch.length);
+      if (signal?.aborted) return failBatch(batch);
+      if (batch.length === 1) return isRetry ? failBatch(batch) : resolveBatch(batch, true);
+      const mid = Math.ceil(batch.length / 2);
+      return [...await resolveBatch(batch.slice(0, mid)), ...await resolveBatch(batch.slice(mid))];
+    }
+    const byId = new Map(reply.map((r) => [r.id, r]));
+    return batch.map((req) => validateReply(req, byId.get(req.id)));
+  }
   const results = [];
   const total = reqs.length;
   for (const batch of chunk(reqs, Math.max(1, batchSize))) {
     if (signal?.aborted) break;
-    const reply = await callBatch(batch, signal);
-    const byId = new Map(reply.map((r) => [r.id, r]));
-    const batchResults = [];
-    for (const req of batch) batchResults.push(validateReply(req, byId.get(req.id)));
+    const batchResults = await resolveBatch(batch);
     results.push(...batchResults);
     onBatchComplete?.(results.length, total, batchResults);
   }
@@ -3020,8 +3052,8 @@ var AnthropicProvider = class {
   supportsVision() {
     return true;
   }
-  translate(reqs, onBatchComplete, signal) {
-    return runBatched(reqs, this.config.batchSize, (batch, sig) => this.callBatch(batch, sig), onBatchComplete, signal);
+  translate(reqs, onBatchComplete, signal, onMalformedReply) {
+    return runBatched(reqs, this.config.batchSize, (batch, sig) => this.callBatch(batch, sig), onBatchComplete, signal, onMalformedReply);
   }
   // Build the user message as content blocks: each unique key's screenshot is
   // sent once (a key recurs once per target locale in a batch — dedupe by key),
@@ -3068,13 +3100,8 @@ var AnthropicProvider = class {
       output_config: { format: { type: "json_schema", schema: BATCH_SCHEMA } },
       messages: [{ role: "user", content }]
     }, { signal });
-    const text = res.content.find((b) => b.type === "text")?.text ?? "{}";
-    try {
-      const parsed = JSON.parse(text);
-      return parsed.items ?? [];
-    } catch {
-      return [];
-    }
+    const text = res.content.find((b) => b.type === "text")?.text ?? "";
+    return parseReplyItems(text);
   }
 };
 
@@ -3108,8 +3135,8 @@ var OpenAIProvider = class {
   supportsVision() {
     return true;
   }
-  translate(reqs, onBatchComplete, signal) {
-    return runBatched(reqs, this.config.batchSize, (batch, sig) => this.callBatch(batch, sig), onBatchComplete, signal);
+  translate(reqs, onBatchComplete, signal, onMalformedReply) {
+    return runBatched(reqs, this.config.batchSize, (batch, sig) => this.callBatch(batch, sig), onBatchComplete, signal, onMalformedReply);
   }
   // User content as an array of parts: each unique key's screenshot once (as an
   // image_url data URL), then the batch prompt text describing every item.
@@ -3158,13 +3185,8 @@ var OpenAIProvider = class {
         { role: "user", content: this.buildUserContent(batch) }
       ]
     }, { signal });
-    const text = res.choices?.[0]?.message?.content ?? "{}";
-    try {
-      const parsed = JSON.parse(text);
-      return parsed.items ?? [];
-    } catch {
-      return [];
-    }
+    const text = res.choices?.[0]?.message?.content ?? "";
+    return parseReplyItems(text);
   }
 };
 
@@ -3209,8 +3231,8 @@ var BedrockProvider = class {
   supportsVision() {
     return !this.isMeta();
   }
-  translate(reqs, onBatchComplete, signal) {
-    return runBatched(reqs, this.config.batchSize, (batch, sig) => this.callBatch(batch, sig), onBatchComplete, signal);
+  translate(reqs, onBatchComplete, signal, onMalformedReply) {
+    return runBatched(reqs, this.config.batchSize, (batch, sig) => this.callBatch(batch, sig), onBatchComplete, signal, onMalformedReply);
   }
   buildContentBlocks(batch) {
     const blocks = [];
@@ -3274,13 +3296,8 @@ var BedrockProvider = class {
     const blocks = res.output?.message?.content ?? [];
     const tool = blocks.find((b) => b.toolUse)?.toolUse;
     if (tool?.input?.items) return tool.input.items;
-    const text = blocks.find((b) => b.text)?.text ?? "{}";
-    try {
-      const parsed = JSON.parse(text);
-      return parsed.items ?? [];
-    } catch {
-      return [];
-    }
+    const text = blocks.find((b) => b.text)?.text ?? "";
+    return parseReplyItems(text);
   }
 };
 
@@ -3400,8 +3417,8 @@ var ClaudeCodeProvider = class {
   supportsVision() {
     return false;
   }
-  translate(reqs, onBatchComplete, signal) {
-    return runBatched(reqs, this.config.batchSize, (batch, sig) => this.callBatch(batch, sig), onBatchComplete, signal);
+  translate(reqs, onBatchComplete, signal, onMalformedReply) {
+    return runBatched(reqs, this.config.batchSize, (batch, sig) => this.callBatch(batch, sig), onBatchComplete, signal, onMalformedReply);
   }
   async complete(req) {
     const systemParts = [req.system, `Respond with valid JSON matching this schema: ${JSON.stringify(req.schema)}`];
@@ -3424,12 +3441,7 @@ var ClaudeCodeProvider = class {
       throw err;
     }
     if (signal?.aborted) return [];
-    try {
-      const parsed = JSON.parse(stripFences(result));
-      return parsed.items ?? [];
-    } catch {
-      return [];
-    }
+    return parseReplyItems(stripFences(result));
   }
 };
 
@@ -4836,6 +4848,19 @@ function createApi(deps) {
         },
         onLocaleDone: (locale) => {
           void stream.writeSSE({ event: "locale-done", data: JSON.stringify({ locale }) });
+        },
+        // Record the raw reply so an unparseable model response is diagnosable
+        // from the activity log instead of vanishing into per-item errors.
+        onMalformedReply: (raw, batchSize, locale) => {
+          console.error(`[translate] malformed model reply (${locale}, batch of ${batchSize})${batchSize > 1 ? " \u2014 splitting batch and retrying" : ""}`);
+          appendLog(projectRoot, {
+            at: (/* @__PURE__ */ new Date()).toISOString(),
+            kind: "translate",
+            summary: `Malformed model reply (${locale}, batch of ${batchSize})`,
+            model: aiCfg.model,
+            locale,
+            raw
+          });
         }
       }, aiCfg.concurrency, signal);
       if (!signal?.aborted) {
@@ -4868,7 +4893,19 @@ function createApi(deps) {
       }
       const { skipped } = attachScreenshotsForProvider(toTranslate, s, dirname3(resolve9(deps.statePath)), provider.supportsVision());
       if (skipped) console.warn(`Model "${aiCfg.model}" has no vision support; ${skipped} screenshot(s) ignored.`);
-      const results = await runLocaleParallel(toTranslate, provider, {}, aiCfg.concurrency);
+      const results = await runLocaleParallel(toTranslate, provider, {
+        onMalformedReply: (raw, batchSize, locale) => {
+          console.error(`[translate] malformed model reply (${locale}, batch of ${batchSize})${batchSize > 1 ? " \u2014 splitting batch and retrying" : ""}`);
+          appendLog(projectRoot, {
+            at: (/* @__PURE__ */ new Date()).toISOString(),
+            kind: "translate",
+            summary: `Malformed model reply (${locale}, batch of ${batchSize})`,
+            model: aiCfg.model,
+            locale,
+            raw
+          });
+        }
+      }, aiCfg.concurrency);
       const latest = load();
       ({ written, errors } = applyResults(latest, toTranslate, results, void 0, force));
       const entry = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "glotfile",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "description": "Local-first, git-native translation management.",
   "type": "module",
   "bin": {