glotfile 0.4.0 → 0.4.2

package/dist/server/cli.js

@@ -1590,6 +1590,7 @@ function buildSystemPrompt(hasPluralItems) {
 function buildBatchPrompt(reqs) {
   const targetLocale = reqs[0]?.targetLocale ?? "";
   const hasPluralItems = reqs.some((r) => r.plural !== void 0);
+  const hasGlossaryItems = reqs.some((r) => r.glossary !== void 0 && r.glossary.length > 0);
   const items = reqs.map((r) => {
     const base = {
       id: r.id,
@@ -1599,7 +1600,7 @@ function buildBatchPrompt(reqs) {
       // Wrap in braces so the model sees "{site}" not "site" — makes the visual
       // connection to the source string obvious and reduces rename errors.
       placeholders: r.placeholders.map((p) => `{${p}}`),
-      glossary: r.glossary ?? [],
+      ...r.glossary?.length ? { glossary: r.glossary } : {},
       hasScreenshot: r.image !== void 0
     };
     if (r.plural) {
@@ -1609,7 +1610,7 @@ function buildBatchPrompt(reqs) {
   });
   const returnFormat = hasPluralItems ? 'For a scalar item (has `source`) return {"id","translation"}; for a plural item (has `plural`) return {"id","forms"} with one string per required category.' : 'Return {"id","translation"} for each item.';
   return `Translate every item below into the target locale: ${targetLocale}. All items share this one target language.
-Glossary entries are constraints you MUST apply. Items with hasScreenshot:true have a screenshot supplied as a separate image block above; use it for context. ${returnFormat} Return JSON {"items":[\u2026]}.
+` + (hasGlossaryItems ? "Glossary entries are constraints you MUST apply. " : "") + `Items with hasScreenshot:true have a screenshot supplied as a separate image block above; use it for context. ${returnFormat} Return JSON {"items":[\u2026]}.
 ` + JSON.stringify(items, null, 2);
 }
 function buildTranslateGemmaSystemPrompt(sourceLocale, targetLocale) {
@@ -2929,7 +2930,7 @@ function selectContextTargets(state, opts, cache2, lastRunAt) {
   let candidates = [];
   for (const key of Object.keys(state.keys).sort()) {
     const entry = state.keys[key];
-    if (entry.context) continue;
+    if (entry.context && !opts.force) continue;
     if (keySet && !keySet.has(key)) continue;
     if (keyRe && !keyRe.test(key)) continue;
     if (cutoff) {
@@ -2977,7 +2978,7 @@ ${s.lines}
   });
   return 'Write a context note for each key. Return JSON {"items":[{"id","context"}]}.\n' + JSON.stringify(items, null, 2);
 }
-function applyContext(state, reqs, results, clock = systemClock) {
+function applyContext(state, reqs, results, clock = systemClock, force = false) {
   const byId = new Map(reqs.map((r) => [r.id, r]));
   let written = 0;
   const errors = [];
@@ -2998,7 +2999,7 @@ function applyContext(state, reqs, results, clock = systemClock) {
       continue;
     }
     const entry = state.keys[req.key];
-    if (!entry || entry.context) continue;
+    if (!entry || entry.context && !force) continue;
     entry.context = context;
     entry.contextSource = "ai";
     entry.contextAt = clock();
@@ -4470,7 +4471,7 @@ function createApi(deps) {
         await stream.writeSSE({ event: "error", data: JSON.stringify({ error: e.message }) });
         return;
       }
-      const { skipped } = attachScreenshotsForProvider(reqs, s, projectRoot, provider.supportsVision());
+      const { skipped } = attachScreenshotsForProvider(reqs, s, dirname2(resolve9(deps.statePath)), provider.supportsVision());
       if (skipped) console.warn(`Model "${aiCfg.model}" has no vision support; ${skipped} screenshot(s) ignored.`);
       console.log(`[translate] ${reqs.length} string(s) \u2192 ${aiCfg.model}`);
       let totalWritten = 0;
@@ -4548,7 +4549,7 @@ function createApi(deps) {
       } catch (e) {
         return c.json({ error: e.message }, 400);
       }
-      const { skipped } = attachScreenshotsForProvider(toTranslate, s, projectRoot, provider.supportsVision());
+      const { skipped } = attachScreenshotsForProvider(toTranslate, s, dirname2(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 latest = load();
@@ -4643,7 +4644,8 @@ function createApi(deps) {
         keyGlob: body.keyGlob,
         limit: body.limit,
         since: body.since,
-        keys: body.keys
+        keys: body.keys,
+        force: body.force
       }, cache2, body.lastRunAt);
       if (!targets.length) {
         await stream.writeSSE({ event: "done", data: JSON.stringify({ requested: 0, written: 0, errors: [] }) });
@@ -4696,7 +4698,7 @@ function createApi(deps) {
           if (signal?.aborted) break;
           const batch = raw;
           const fresh = load();
-          const { written, errors } = applyContext(fresh, chunk2, batch.items ?? []);
+          const { written, errors } = applyContext(fresh, chunk2, batch.items ?? [], void 0, body.force === true);
           appendLog(projectRoot, {
             at: (/* @__PURE__ */ new Date()).toISOString(),
             kind: "context",
@@ -4776,12 +4778,12 @@ async function readFileResponse(absPath) {
 }
 function buildApp(opts) {
   const app = new Hono2();
-  app.route("/api", createApi({ statePath: opts.statePath, autoExport: true }));
-  const projectRoot = dirname3(resolve10(opts.statePath));
+  const apiDeps = { statePath: opts.statePath, autoExport: true };
+  app.route("/api", createApi(apiDeps));
   app.get("/:dir/*", async (c, next) => {
     const dirSeg = c.req.param("dir");
     if (!dirSeg.endsWith("-screenshots")) return next();
-    const shotsRoot = resolve10(projectRoot, dirSeg);
+    const shotsRoot = resolve10(dirname3(resolve10(apiDeps.statePath)), dirSeg);
     const pathname = decodeURIComponent(new URL(c.req.url).pathname);
     const rest = pathname.slice(`/${dirSeg}`.length);
     const target = resolve10(shotsRoot, "." + rest);

package/dist/server/server.js

@@ -1129,7 +1129,7 @@ function selectContextTargets(state, opts, cache2, lastRunAt) {
   let candidates = [];
   for (const key of Object.keys(state.keys).sort()) {
     const entry = state.keys[key];
-    if (entry.context) continue;
+    if (entry.context && !opts.force) continue;
     if (keySet && !keySet.has(key)) continue;
     if (keyRe && !keyRe.test(key)) continue;
     if (cutoff) {
@@ -1197,7 +1197,7 @@ var CONTEXT_BATCH_SCHEMA = {
   required: ["items"],
   additionalProperties: false
 };
-function applyContext(state, reqs, results, clock = systemClock) {
+function applyContext(state, reqs, results, clock = systemClock, force = false) {
   const byId = new Map(reqs.map((r) => [r.id, r]));
   let written = 0;
   const errors = [];
@@ -1218,7 +1218,7 @@ function applyContext(state, reqs, results, clock = systemClock) {
       continue;
     }
     const entry = state.keys[req.key];
-    if (!entry || entry.context) continue;
+    if (!entry || entry.context && !force) continue;
     entry.context = context;
     entry.contextSource = "ai";
     entry.contextAt = clock();
@@ -2376,6 +2376,7 @@ function buildSystemPrompt(hasPluralItems) {
 function buildBatchPrompt(reqs) {
   const targetLocale = reqs[0]?.targetLocale ?? "";
   const hasPluralItems = reqs.some((r) => r.plural !== void 0);
+  const hasGlossaryItems = reqs.some((r) => r.glossary !== void 0 && r.glossary.length > 0);
   const items = reqs.map((r) => {
     const base = {
       id: r.id,
@@ -2385,7 +2386,7 @@ function buildBatchPrompt(reqs) {
       // Wrap in braces so the model sees "{site}" not "site" — makes the visual
       // connection to the source string obvious and reduces rename errors.
       placeholders: r.placeholders.map((p) => `{${p}}`),
-      glossary: r.glossary ?? [],
+      ...r.glossary?.length ? { glossary: r.glossary } : {},
       hasScreenshot: r.image !== void 0
     };
     if (r.plural) {
@@ -2395,7 +2396,7 @@ function buildBatchPrompt(reqs) {
   });
   const returnFormat = hasPluralItems ? 'For a scalar item (has `source`) return {"id","translation"}; for a plural item (has `plural`) return {"id","forms"} with one string per required category.' : 'Return {"id","translation"} for each item.';
   return `Translate every item below into the target locale: ${targetLocale}. All items share this one target language.
-Glossary entries are constraints you MUST apply. Items with hasScreenshot:true have a screenshot supplied as a separate image block above; use it for context. ${returnFormat} Return JSON {"items":[\u2026]}.
+` + (hasGlossaryItems ? "Glossary entries are constraints you MUST apply. " : "") + `Items with hasScreenshot:true have a screenshot supplied as a separate image block above; use it for context. ${returnFormat} Return JSON {"items":[\u2026]}.
 ` + JSON.stringify(items, null, 2);
 }
 function buildTranslateGemmaSystemPrompt(sourceLocale, targetLocale) {
@@ -4100,7 +4101,7 @@ function createApi(deps) {
         await stream.writeSSE({ event: "error", data: JSON.stringify({ error: e.message }) });
         return;
       }
-      const { skipped } = attachScreenshotsForProvider(reqs, s, projectRoot, provider.supportsVision());
+      const { skipped } = attachScreenshotsForProvider(reqs, s, dirname2(resolve8(deps.statePath)), provider.supportsVision());
       if (skipped) console.warn(`Model "${aiCfg.model}" has no vision support; ${skipped} screenshot(s) ignored.`);
       console.log(`[translate] ${reqs.length} string(s) \u2192 ${aiCfg.model}`);
       let totalWritten = 0;
@@ -4178,7 +4179,7 @@ function createApi(deps) {
       } catch (e) {
         return c.json({ error: e.message }, 400);
       }
-      const { skipped } = attachScreenshotsForProvider(toTranslate, s, projectRoot, provider.supportsVision());
+      const { skipped } = attachScreenshotsForProvider(toTranslate, s, dirname2(resolve8(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 latest = load();
@@ -4273,7 +4274,8 @@ function createApi(deps) {
         keyGlob: body.keyGlob,
         limit: body.limit,
         since: body.since,
-        keys: body.keys
+        keys: body.keys,
+        force: body.force
       }, cache2, body.lastRunAt);
       if (!targets.length) {
         await stream.writeSSE({ event: "done", data: JSON.stringify({ requested: 0, written: 0, errors: [] }) });
@@ -4326,7 +4328,7 @@ function createApi(deps) {
           if (signal?.aborted) break;
           const batch = raw;
           const fresh = load();
-          const { written, errors } = applyContext(fresh, chunk2, batch.items ?? []);
+          const { written, errors } = applyContext(fresh, chunk2, batch.items ?? [], void 0, body.force === true);
           appendLog(projectRoot, {
             at: (/* @__PURE__ */ new Date()).toISOString(),
             kind: "context",
@@ -4385,12 +4387,12 @@ async function readFileResponse(absPath) {
 }
 function buildApp(opts) {
   const app = new Hono2();
-  app.route("/api", createApi({ statePath: opts.statePath, autoExport: true }));
-  const projectRoot = dirname3(resolve9(opts.statePath));
+  const apiDeps = { statePath: opts.statePath, autoExport: true };
+  app.route("/api", createApi(apiDeps));
   app.get("/:dir/*", async (c, next) => {
     const dirSeg = c.req.param("dir");
     if (!dirSeg.endsWith("-screenshots")) return next();
-    const shotsRoot = resolve9(projectRoot, dirSeg);
+    const shotsRoot = resolve9(dirname3(resolve9(apiDeps.statePath)), dirSeg);
     const pathname = decodeURIComponent(new URL(c.req.url).pathname);
     const rest = pathname.slice(`/${dirSeg}`.length);
     const target = resolve9(shotsRoot, "." + rest);