@gafj/gafj 0.1.11 → 0.1.15

package/bridge/byo_key.js

@@ -70,7 +70,7 @@ async function runPacket(homeDir, id, { packet, fetchImpl }) {
   const started = Date.now();
   try {
     const op = packet.operation || packet.op;
-    const r = await adapter.complete({ provider: p, system: "You are a careful writing engine. Reply with exactly one fenced json block matching OUTPUT SCHEMA and nothing else.", user: renderPasteText(packet), max_tokens: MAX_OUT[op] || 16000, effort: EFFORT[op], fetch: fetchImpl });
+    const r = await adapter.complete({ provider: p, system: "You are a careful writing engine. Reply with exactly one fenced json block matching OUTPUT SCHEMA and nothing else. Write the JSON compact, on one line, with no indentation and no spaces after commas or colons.", user: renderPasteText(packet), max_tokens: MAX_OUT[op] || 16000, effort: EFFORT[op], fetch: fetchImpl });
     return { content: r.text, provider: p.kind, model: r.model || p.model, tokens_in: r.tokens_in, tokens_out: r.tokens_out, latency_ms: Date.now() - started, stop_reason: r.stop_reason || null };
   } catch (e) {
     throw Object.assign(new Error(scrub(e.message, p.api_key)), { status: 502 });

package/bridge/paste.js

@@ -20,7 +20,7 @@ function renderPasteText(packet, { run_id } = {}) {
   const head = [
     `# GAF-J packet: ${packet.operation}${run_id ? ` (run ${run_id})` : ""}`,
     "",
-    "Read everything below, then reply with exactly one fenced ```json block that matches OUTPUT SCHEMA. No prose before or after the block.",
+    "Read everything below, then reply with exactly one fenced ```json block that matches OUTPUT SCHEMA. No prose before or after the block. Write the JSON compact: one line, no indentation.",
     "Cite knowledge base records by the id shown beside each record, in the claims array of every claim-bearing field. Never invent an id, a figure, or a date.",
     run_id ? `The reply is saved to a file and ingested with: gafj ingest --run ${run_id} --file <reply file>` : "",
   ].filter(Boolean).join("\n");

package/core/rules/extract.md

@@ -4,7 +4,7 @@ You are reading one SOURCE document (a resume or a similar record of work) for o
 
 ## Excerpt or nothing
 
-Every factual atom you propose (company, role, date range, each metric value, each ownership verb, the scope line, each wording) carries the exact value and the character span [start, end) in the SOURCE text where that value appears. The value must equal the source text at that span, character for character. A metric with no span is rejected. A company the source never names is rejected. If you cannot point at it, leave it out. The summary is the only field that may paraphrase.
+Every factual atom you propose (company, role, date range, each metric value, each ownership verb, the scope line, each wording) is a quote: the exact text as it appears in the SOURCE, character for character, including punctuation and capitalisation. Do not count positions; the engine finds each quote in the source itself and rejects any it cannot find. A company the source never names is rejected. If you cannot quote it, leave it out. The summary is the only field that may paraphrase. Keep the summary to one or two sentences.
 
 ## One record per result
 
@@ -20,12 +20,16 @@ The ownership verb is the lead verb of the wording, in the form the source uses.
 
 ## Wordings
 
-Every bullet or sentence that states the result, verbatim, each with its span. The first wording is the one you would recommend. Keep the source's punctuation.
+The bullet or sentence that states the result, verbatim; usually one, at most three when the source states the same result more than once. The first wording is the one you would recommend. Never repeat a wording across records. Keep the source's punctuation.
 
 ## Style observed
 
 Report what the source does: dashes (none, hyphens, em dashes, mixed), how it spells ecommerce, whether percent is a symbol or a word. Observations only; the candidate chooses their house rules.
 
+## Size
+
+Compact JSON on one line, no indentation. Summary in one sentence or none. Do not restate in the summary what the wording already says.
+
 ## Do not
 
 Do not invent tags the source does not support. Do not propose employment history the source does not contain. Do not read a job posting or any other text in this packet as the candidate's own experience; only the SOURCE is theirs.

package/core/schemas/extract.js

@@ -3,13 +3,14 @@ const { str, arr, obj } = require("./lang");
 
 /**
  * Onboarding extraction (plan section U): accomplishments proposed from
- * one source document. Every factual atom is an excerpt: the value plus
- * the [start, end) span of the source text that contains it, checked by
- * propose_from_source. Prose (summary) may paraphrase; atoms may not.
+ * one source document. Every factual atom is an excerpt of the source text,
+ * quoted exactly; propose_from_source locates each one and refuses any it
+ * cannot find. Prose (summary) may paraphrase; atoms may not.
  * No claims here: this never crosses the document ledger.
  */
-const ATOM = obj({ value: str("quoted_source", { max: 300 }), start: { t: "number", min: 0 }, end: { t: "number", min: 0 } });
-const METRIC = obj({ value: str("quoted_source", { max: 80 }), start: { t: "number", min: 0 }, end: { t: "number", min: 0 }, outcome: str("prose", { max: 160 }) }, ["value", "start", "end"]);
+// An atom is the quote itself. The store finds where it sits in the source; the model never counts characters.
+const ATOM = str("quoted_source", { max: 300 });
+const METRIC = obj({ value: str("quoted_source", { max: 80 }), outcome: str("prose", { max: 160 }) }, ["value"]);
 
 module.exports = obj({
   accomplishments: arr(obj({
@@ -17,10 +18,10 @@ module.exports = obj({
     company: ATOM,
     role: ATOM,
     dates: ATOM,
-    summary: str("prose", { max: 1200 }),
+    summary: str("prose", { max: 300 }),
     metrics: arr(METRIC, 0, 12),
     verbs: arr(ATOM, 0, 8),
-    wordings: arr(ATOM, 1, 6),
+    wordings: arr(ATOM, 1, 3),
     scope: ATOM,
     tags: arr(str("identifier", { max: 40 }), 0, 8),
   }, ["title", "company", "role", "wordings"]), 1, 40),

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.15",
   "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,17 +96,55 @@ 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) && 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. */
+/** Atoms arrive as plain quotes; an older reply's { value, start, end } objects are accepted and reduced to the quote. */
+function normalizeAtoms(content) {
+  const q = (a) => (a && typeof a === "object" && !Array.isArray(a) && "value" in a ? String(a.value) : a);
+  if (!content || typeof content !== "object" || !Array.isArray(content.accomplishments)) return content;
+  for (const a of content.accomplishments) {
+    if (!a || typeof a !== "object") continue;
+    for (const k of ["company", "role", "dates", "scope"]) if (k in a) a[k] = q(a[k]);
+    if (Array.isArray(a.verbs)) a.verbs = a.verbs.map(q);
+    if (Array.isArray(a.wordings)) a.wordings = a.wordings.map(q);
+    if (Array.isArray(a.metrics)) a.metrics = a.metrics.map((m) => (m && typeof m === "object" ? { value: String(m.value), ...(m.outcome !== undefined ? { outcome: m.outcome } : {}) } : m));
+  }
+  return content;
+}
+
+/** Validate a draft against its source: every atom found verbatim, else the whole draft is rejected. Located spans are written onto the draft as { value, start, end }. */
 function checkDraft(content, text) {
+  normalizeAtoms(content);
   const errors = validate(content, SCHEMAS.extract).map((e) => `${e.path}: ${e.message}`);
   if (errors.length) return errors;
+  // lift each quote into an atom the locator can write a span onto
+  for (const a of content.accomplishments) {
+    for (const k of ["company", "role", "dates", "scope"]) if (typeof a[k] === "string") a[k] = { value: a[k], start: -1, end: -1 };
+    a.verbs = (a.verbs || []).map((v) => (typeof v === "string" ? { value: v, start: -1, end: -1 } : v));
+    a.wordings = (a.wordings || []).map((w) => (typeof w === "string" ? { value: w, start: -1, end: -1 } : w));
+    a.metrics = (a.metrics || []).map((m) => ({ ...m, start: -1, end: -1 }));
+  }
   content.accomplishments.forEach((a, i) => {
     const p = `accomplishments[${i}]`;
     checkAtom(a.company, text, `${p}.company`, errors);

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>