@gafj/gafj 0.1.11 → 0.1.13

package/http/api.js

@@ -230,6 +230,7 @@ route("POST", "/api/run/:op", async (c, p, b, q) => {
   }
   const r = saveReply(c.db, { run_id: opened.run_id, content: reply.content, route: routeName, actor: ACTOR("run"), now: c.now(), provider: reply.provider, model: reply.model, tokens_in: reply.tokens_in, tokens_out: reply.tokens_out, latency_ms: reply.latency_ms });
   if (r.status !== "passed" && reply.stop_reason === "max_tokens") r.errors = [...(r.errors || []), "the reply was cut off at the token limit"];
+  Object.assign(r, { tokens_in: reply.tokens_in ?? null, tokens_out: reply.tokens_out ?? null, latency_ms: reply.latency_ms ?? null, model: reply.model || null });
   return reply.credits_left === undefined ? r : { ...r, charged: reply.charged, credits_left: reply.credits_left };
 });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gafj/gafj",
-  "version": "0.1.11",
+  "version": "0.1.13",
   "description": "GAF-J: a local campaign engine for job search. One SQLite file, one ingest door, your own AI subscription.",
   "homepage": "https://gaf-j.com",
   "repository": {

package/store/onboarding.js

@@ -96,11 +96,28 @@ function sourceText(db, source_document_id) {
 
 // ----- propose_from_source -----
 
+/**
+ * Excerpt or nothing, with the counting done here: a model quotes reliably but cannot count
+ * characters, so a span that does not match is relocated to where the quoted text actually
+ * sits in the source (the occurrence nearest the claimed start; whitespace runs may differ).
+ * A value that appears nowhere in the source, byte for byte and case for case, is refused.
+ */
 function checkAtom(atom, text, label, errors) {
   if (!atom) return;
   const { value, start, end } = atom;
-  if (!Number.isInteger(start) || !Number.isInteger(end) || start < 0 || end > text.length || end <= start) { errors.push(`${label}: span [${start}, ${end}) is not inside the source`); return; }
-  if (text.slice(start, end) !== value) errors.push(`${label}: "${String(value).slice(0, 40)}" is not the source text at [${start}, ${end})`);
+  if (!Number.isInteger(start) || !Number.isInteger(end)) { errors.push(`${label}: span [${start}, ${end}) is not inside the source`); return; }
+  if (start >= 0 && end <= text.length && end > start && text.slice(start, end) === value) return;
+  const v = String(value);
+  const near = Number.isInteger(start) ? Math.max(0, start) : 0;
+  let hits = [];
+  if (v.length) for (let i = text.indexOf(v); i !== -1; i = text.indexOf(v, i + 1)) hits.push([i, i + v.length]);
+  if (!hits.length && v.trim()) {
+    const re = new RegExp(v.trim().split(/\s+/).map((w) => w.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")).join("\\s+"), "g");
+    for (let m = re.exec(text); m; m = re.exec(text)) { hits.push([m.index, m.index + m[0].length]); if (!m[0].length) break; }
+  }
+  if (!hits.length) { errors.push(`${label}: "${v.slice(0, 40)}" is not the source text at [${start}, ${end})`); return; }
+  const [s, e] = hits.reduce((best, h) => (Math.abs(h[0] - near) < Math.abs(best[0] - near) ? h : best));
+  atom.start = s; atom.end = e; atom.value = text.slice(s, e);
 }
 
 /** Validate a draft against its source: every atom cited and verbatim, else the whole draft is rejected. */

package/ui/app.css

@@ -182,3 +182,7 @@ mark { background: var(--good-bg); color: var(--good-bright); border-radius: 3px
 .switch input:checked + .track { background: var(--accent); }
 .switch input:checked + .track::after { left: 18px; }
 .switch input:focus-visible + .track { outline: 2px solid var(--accent); outline-offset: 2px; }
+/* a small spinner beside anything that is with the model */
+.spin { display: inline-block; width: 10px; height: 10px; border: 2px solid var(--line-2); border-top-color: var(--accent); border-radius: 50%; animation: spin .8s linear infinite; vertical-align: -1px; }
+@keyframes spin { to { transform: rotate(360deg); } }
+@media (prefers-reduced-motion: reduce) { .spin { animation: none; border-top-color: var(--line-2); } }

package/ui/screens/kb.js

@@ -15,13 +15,21 @@ export function Onboarding({ d, reload, setErr, route, compact }) {
   const b = d.batch;
   const direct = route === "byo_key" || route === "credits";
   // with a provider or credits the extraction runs here; otherwise the packet opens for paste
+  // a ticking clock while a file is with the model, so a long call is visibly alive
+  const [, tick] = useState(0);
+  useEffect(() => { const t = setInterval(() => tick((n) => n + 1), 1000); return () => clearInterval(t); }, []);
+  const since = {};
+  const elapsed = (ms) => { const sec = Math.round(ms / 1000); return `${Math.floor(sec / 60)}:${String(sec % 60).padStart(2, "0")}`; };
   const runOne = async (s) => {
-    setRunning((r) => ({ ...r, [s.source_document_id]: "running" }));
+    const started = Date.now();
+    setRunning((r) => ({ ...r, [s.source_document_id]: { started } }));
     try {
       const r = await api.post(`/api/run/extract?source_document_id=${s.source_document_id}`, {});
-      setRunning((x) => ({ ...x, [s.source_document_id]: r.status === "passed" ? `${r.pending_ids.length} records proposed` : `refused: ${(r.errors || []).slice(0, 2).join("; ")}` }));
+      const took = `${elapsed(Date.now() - started)}${r.tokens_in ? ` · ${(r.tokens_in + (r.tokens_out || 0)).toLocaleString()} tokens` : ""}`;
+      setRunning((x) => ({ ...x, [s.source_document_id]: r.status === "passed" ? `${r.pending_ids.length} records proposed in ${took}` : `refused after ${took}: ${(r.errors || []).slice(0, 2).join("; ")}` }));
     } catch (e) { setRunning((x) => ({ ...x, [s.source_document_id]: "failed: " + e.message })); }
   };
+  const isRunning = (id) => running[id] && typeof running[id] === "object";
   const extract = async (s) => {
     if (!direct) { setModal({ source: s }); return; }
     await runOne(s);
@@ -57,9 +65,9 @@ export function Onboarding({ d, reload, setErr, route, compact }) {
     ${b ? html`<ul class="list">${b.sources.map((s) => html`<li key=${s.source_document_id}><b>${s.filename}</b> <span class="tag">${s.kind}</span>
       ${s.empty ? html`<span class="tag blocked">no text</span>` : html`<span class="muted small">${s.chars} chars</span>`}
       <span class="muted small">${s.pending} pending, ${s.runs} runs</span>
-      ${!s.empty ? html`<button class="small" disabled=${running[s.source_document_id] === "running"} onClick=${() => extract(s)}>${running[s.source_document_id] === "running" ? "extracting" : direct ? "Extract" : "Extract (paste)"}</button>` : ""}
+      ${!s.empty ? html`<button class="small" disabled=${isRunning(s.source_document_id)} onClick=${() => extract(s)}>${isRunning(s.source_document_id) ? html`<span class="spin"></span> extracting · ${elapsed(Date.now() - running[s.source_document_id].started)}` : direct ? "Extract" : "Extract (paste)"}</button>` : ""}
       <button class="small danger" title="remove this file and anything proposed from it; confirmed records stay" onClick=${async () => { if (!confirm(`Remove ${s.filename}? Records already confirmed stay; pending rows from this file go.`)) return; try { await api.del(`/api/sources/${s.source_document_id}`); await reload(); } catch (e) { setErr(e.message); } }}>remove</button>
-      ${running[s.source_document_id] && running[s.source_document_id] !== "running" ? html`<span class="small muted">${running[s.source_document_id]}</span>` : ""}</li>`)}
+      ${running[s.source_document_id] && !isRunning(s.source_document_id) ? html`<span class="small muted">${running[s.source_document_id]}</span>` : ""}</li>`)}
       ${b.sources.length ? "" : html`<li class="muted">upload a resume to start</li>`}</ul>` : ""}
     ${b && b.pending.length ? html`<div class="row"><button onClick=${() => post(`/api/onboarding/batches/${b.batch_id}/dedup`)}>Suggest duplicates</button><span class="small muted">same employer, overlapping dates, a shared figure; nothing merges without you</span></div>` : ""}
     ${groups.map((g) => html`<div class="block warn" key=${g.id}><b>These may be the same accomplishment</b>