@gafj/gafj 0.1.15 → 0.1.16

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. 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 });
+    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], schema: packet.output_schema, 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/providers/anthropic.js

@@ -9,12 +9,31 @@ const DEFAULT_MODEL = "claude-sonnet-5";
  * passes effort ("low" for extraction) and it goes out as output_config.effort; the thinking
  * parameter itself is never sent, which is the setting every current model accepts.
  */
-async function complete({ provider, system, user, max_tokens = 4000, effort, fetch }) {
+/**
+ * The API's structured-output mode accepts a subset of JSON Schema: no length, range, or count
+ * limits, no vendor keys. This strips those so the schema the store validates against can be
+ * handed to the model as the shape it must produce. Enums, required, and additionalProperties
+ * stay, which is what makes the reply valid by construction.
+ */
+const DROP = new Set(["maxLength", "minLength", "minimum", "maximum", "minItems", "maxItems", "multipleOf", "pattern", "format"]);
+function strictSchema(node) {
+  if (Array.isArray(node)) return node.map(strictSchema);
+  if (!node || typeof node !== "object") return node;
+  const out = {};
+  for (const [k, v] of Object.entries(node)) {
+    if (DROP.has(k) || k.startsWith("x-")) continue;
+    out[k] = k === "properties" ? Object.fromEntries(Object.entries(v).map(([pk, pv]) => [pk, strictSchema(pv)])) : strictSchema(v);
+  }
+  return out;
+}
+
+async function complete({ provider, system, user, max_tokens = 4000, effort, schema, fetch }) {
   const { post } = require("./index");
   const base = (provider.base_url || DEFAULT_URL).replace(/\/$/, "");
   const model = provider.model || DEFAULT_MODEL;
   const body = { model, max_tokens, system, messages: [{ role: "user", content: user }] };
-  if (effort) body.output_config = { effort };
+  const usable = schema && typeof schema === "object" && schema.type === "object" && schema.properties && Object.keys(schema.properties).length;
+  if (effort || usable) body.output_config = { ...(effort ? { effort } : {}), ...(usable ? { format: { type: "json_schema", schema: strictSchema(schema) } } : {}) };
   const data = await post(fetch, `${base}/v1/messages`, { "x-api-key": provider.api_key || "", "anthropic-version": "2023-06-01" }, body);
   if (data.stop_reason === "refusal") throw new Error(`the model declined this request${data.stop_details && data.stop_details.category ? ` (${data.stop_details.category})` : ""}`);
   const text = (data.content || []).filter((c) => c.type === "text").map((c) => c.text).join("\n");
@@ -29,4 +48,4 @@ async function listModels({ provider, fetch }) {
   return (data.data || []).map((m) => ({ id: m.id, name: m.display_name || m.id, created: m.created_at || null }));
 }
 
-module.exports = { complete, listModels, DEFAULT_URL, DEFAULT_MODEL };
+module.exports = { complete, listModels, strictSchema, DEFAULT_URL, DEFAULT_MODEL };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gafj/gafj",
-  "version": "0.1.15",
+  "version": "0.1.16",
   "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

@@ -111,7 +111,9 @@ function checkAtom(atom, text, label, errors) {
   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");
+    // the model tends to straighten quotes and dashes; match either form in the source
+    const cls = (ch) => (/['\u2018\u2019]/.test(ch) ? "['\u2018\u2019]" : /["\u201c\u201d]/.test(ch) ? "[\"\u201c\u201d]" : /[-\u2013\u2014]/.test(ch) ? "[-\u2013\u2014]" : ch.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"));
+    const re = new RegExp(v.trim().split(/\s+/).map((w) => Array.from(w).map(cls).join("")).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; }