@vibes.diy/api-svc 14.3.90 → 14.3.92

package/intern/repair-ladder.js

@@ -0,0 +1,318 @@
+import { exception2Result } from "@adviser/cement";
+import { Parser } from "acorn";
+import acornJsx from "acorn-jsx";
+import { asNode, childNodes, field, nodeAt, nodesAt, stringAt } from "./opens-ast.js";
+const JsxParser = Parser.extend(acornJsx());
+export function parseModule(src) {
+    const parsed = exception2Result(() => JsxParser.parse(src, { ecmaVersion: "latest", sourceType: "module", allowHashBang: true, allowAwaitOutsideFunction: true }));
+    return parsed.isErr() ? undefined : asNode(parsed.Ok());
+}
+export function parses(src) {
+    return parseModule(src) !== undefined;
+}
+function endOf(node) {
+    const end = field(node, "end");
+    return typeof end === "number" ? end : node.start;
+}
+function lineOf(src, offset) {
+    return src.slice(0, offset).split("\n").length;
+}
+export function offsetOf(src, line, column) {
+    let off = 0;
+    for (let l = 1; l < line; l++) {
+        const next = src.indexOf("\n", off);
+        if (next < 0)
+            return src.length;
+        off = next + 1;
+    }
+    if (column !== undefined)
+        return off + column;
+    while (src[off] === " " || src[off] === "\t")
+        off++;
+    return off;
+}
+export function chainAt(program, off) {
+    const chain = [];
+    let node = program;
+    while (node !== undefined) {
+        chain.unshift(node);
+        const inside = childNodes(node)
+            .map((c) => c.child)
+            .find((c) => c.start <= off && off < endOf(c));
+        node = inside;
+    }
+    return chain;
+}
+function isFn(node) {
+    return node.type === "FunctionDeclaration" || node.type === "FunctionExpression" || node.type === "ArrowFunctionExpression";
+}
+function isStmt(node) {
+    return (/Statement$|Declaration$/.test(node.type) &&
+        node.type !== "BlockStatement" &&
+        node.type !== "ExportNamedDeclaration" &&
+        node.type !== "ExportDefaultDeclaration");
+}
+function gapOf(src, start, end, level, node) {
+    return { level, node, start, end, startLine: lineOf(src, start), endLine: lineOf(src, end) };
+}
+function patternNames(pattern) {
+    if (pattern === undefined)
+        return [];
+    switch (pattern.type) {
+        case "Identifier": {
+            const name = stringAt(pattern, "name");
+            return name === undefined ? [] : [name];
+        }
+        case "ObjectPattern":
+            return nodesAt(pattern, "properties").flatMap((p) => patternNames(p.type === "RestElement" ? nodeAt(p, "argument") : nodeAt(p, "value")));
+        case "ArrayPattern":
+            return nodesAt(pattern, "elements").flatMap((e) => patternNames(e));
+        case "AssignmentPattern":
+            return patternNames(nodeAt(pattern, "left"));
+        case "RestElement":
+            return patternNames(nodeAt(pattern, "argument"));
+        default:
+            return [];
+    }
+}
+function bindingSites(program, name) {
+    const out = [];
+    const stack = [program];
+    for (let n = stack.pop(); n !== undefined; n = stack.pop()) {
+        const id = nodeAt(n, "id");
+        if (n.type === "VariableDeclarator" && patternNames(id).includes(name))
+            out.push(n);
+        else if ((n.type === "FunctionDeclaration" || n.type === "FunctionExpression") &&
+            id !== undefined &&
+            stringAt(id, "name") === name) {
+            out.push(n);
+        }
+        else if (isFn(n) && nodesAt(n, "params").some((p) => patternNames(p).includes(name)))
+            out.push(n);
+        stack.push(...childNodes(n).map((c) => c.child));
+    }
+    return out;
+}
+function siblingSpan(useChain, bindChain) {
+    const bindSet = new Set(bindChain.map((n) => `${n.type}@${n.start}:${endOf(n)}`));
+    const lca = useChain.find((n) => bindSet.has(`${n.type}@${n.start}:${endOf(n)}`));
+    if (lca === undefined || (lca.type !== "Program" && lca.type !== "BlockStatement"))
+        return undefined;
+    const list = nodesAt(lca, "body");
+    const holds = (chain) => list.find((st) => chain.some((n) => n.start === st.start && endOf(n) === endOf(st)));
+    const a = holds(useChain);
+    const b = holds(bindChain);
+    if (a === undefined || b === undefined)
+        return undefined;
+    return [Math.min(a.start, b.start), Math.max(endOf(a), endOf(b))];
+}
+export function gapLadder(src, program, finding) {
+    const off = offsetOf(src, finding.line, finding.column);
+    const chain = chainAt(program, off);
+    const rungs = [];
+    if (finding.class === "unknown-member" && finding.name !== undefined) {
+        const ident = chain.find((n) => n.type === "Identifier" && stringAt(n, "name") === finding.name);
+        if (ident !== undefined)
+            rungs.push(gapOf(src, ident.start, endOf(ident), "ident", "Identifier"));
+    }
+    const jsx = chain.find((n) => n.type === "JSXElement");
+    const stmt = chain.find(isStmt);
+    if (jsx !== undefined && (stmt === undefined || jsx.start >= stmt.start))
+        rungs.push(gapOf(src, jsx.start, endOf(jsx), "jsx", "JSXElement"));
+    if (finding.anchorLine !== undefined) {
+        const wrapper = chain.find((n) => n.type === "JSXElement" && lineOf(src, n.start) === finding.anchorLine);
+        if (wrapper !== undefined)
+            rungs.push(gapOf(src, wrapper.start, endOf(wrapper), "jsx", "JSXElement"));
+    }
+    if (stmt !== undefined)
+        rungs.push(gapOf(src, stmt.start, endOf(stmt), "statement", "Statement"));
+    for (const fn of chain.filter(isFn)) {
+        const body = nodeAt(fn, "body");
+        if (body === undefined)
+            continue;
+        if (body.type === "BlockStatement")
+            rungs.push(gapOf(src, body.start + 1, endOf(body) - 1, "fn-body", "FunctionBody"));
+        else
+            rungs.push(gapOf(src, body.start, endOf(body), "fn-body", "ArrowExpressionBody"));
+    }
+    const programIndex = chain.length - 1;
+    const top = programIndex > 0 ? chain[programIndex - 1] : undefined;
+    if (top !== undefined)
+        rungs.push(gapOf(src, top.start, endOf(top), "declaration", "Declaration"));
+    if (finding.name !== undefined && finding.class !== "unknown-member") {
+        for (const site of bindingSites(program, finding.name)) {
+            const span = siblingSpan(chain, chainAt(program, site.start));
+            if (span !== undefined)
+                rungs.push(gapOf(src, span[0], span[1], "span", "Run"));
+        }
+    }
+    rungs.sort((a, b) => a.end - a.start - (b.end - b.start));
+    const out = [];
+    for (const rung of rungs) {
+        const last = out[out.length - 1];
+        if (last !== undefined && rung.start === last.start && rung.end === last.end)
+            continue;
+        if (last !== undefined && (rung.start <= last.start && rung.end >= last.end) === false)
+            continue;
+        out.push(rung);
+    }
+    return out;
+}
+export function mergeGaps(src, gaps) {
+    const order = gaps.map((gap, index) => ({ gap, index })).sort((a, b) => a.gap.start - b.gap.start);
+    const out = [];
+    for (const item of order) {
+        const last = out[out.length - 1];
+        if (last !== undefined && item.gap.start < last.gap.end) {
+            const start = last.gap.start;
+            const end = Math.max(last.gap.end, item.gap.end);
+            const big = [last.gap, item.gap].find((g) => g.start === start && g.end === end);
+            last.gap = big ?? gapOf(src, start, end, "merged", "Run");
+            last.members.push(item.index);
+        }
+        else
+            out.push({ gap: item.gap, members: [item.index] });
+    }
+    return out;
+}
+export function splice(src, gaps, fills) {
+    const order = gaps.map((gap, i) => ({ gap, fill: fills[i] ?? "" })).sort((a, b) => b.gap.start - a.gap.start);
+    let out = src;
+    for (const { gap, fill } of order)
+        out = out.slice(0, gap.start) + fill + out.slice(gap.end);
+    return out;
+}
+export function placeholder(gap) {
+    switch (gap.node) {
+        case "Identifier":
+            return "x";
+        case "JSXElement":
+            return "<></>";
+        case "ArrowExpressionBody":
+            return "null";
+        case "FunctionBody":
+        case "Run":
+            return "";
+        default:
+            return ";";
+    }
+}
+export const REGION_START = "/* >>> REWRITE START >>> */";
+export const REGION_END = "/* <<< REWRITE END <<< */";
+function fenceLang(path) {
+    return /\.tsx?$/.test(path) ? "tsx" : "jsx";
+}
+export function regionMessages(args) {
+    const { src, gap } = args;
+    const marked = src.slice(0, gap.start) + REGION_START + src.slice(gap.start, gap.end) + REGION_END + src.slice(gap.end);
+    const file = args.path.replace(/^\/+/, "");
+    const rendered = `### \`${file}\`\n\n\`\`\`${fenceLang(args.path)}\n${marked.replace(/\n$/, "")}\n\`\`\`\n`;
+    const ask = `Opening the app in the browser reported:\n\n${args.findings.map((f) => `${file}:${f.line}: ${f.message}`).join("\n")}\n\n` +
+        `Fix it by rewriting only the code between \`${REGION_START}\` and \`${REGION_END}\` (lines ${gap.startLine}–${gap.endLine}). ` +
+        (gap.node === "Identifier"
+            ? "The region is a single method name. Reply with one ```jsx fence holding only the replacement name — one identifier, no dot, no call, no markers."
+            : "Reply with one ```jsx fence holding the complete replacement for that region — nothing before or after it, no markers. " +
+                "Keep everything in the region that already worked.");
+    const turn = (role, t) => ({ role, content: [{ type: "text", text: t }] });
+    return [
+        ...args.system,
+        ...(args.userFirst ? [turn("user", `This is \`${file}\` as it stands.`)] : []),
+        turn("assistant", rendered),
+        turn("user", ask),
+    ];
+}
+export function regionFill(reply, original) {
+    const m = /```[\w-]*\n([\s\S]*?)\n?```/.exec(reply);
+    const bare = reply.trim().replace(/^`|`$/g, "");
+    if (m === null)
+        return /^[A-Za-z_$][\w$]*$/.test(bare) && /^[A-Za-z_$][\w$]*$/.test(original.trim()) ? bare : undefined;
+    const body = (m[1] ?? "")
+        .replace(/^[ \t]*\/\* (?:>>> REWRITE START >>>|<<< REWRITE END <<<) \*\/[ \t]*\n?/gm, "")
+        .replace(/\/\* (?:>>> REWRITE START >>>|<<< REWRITE END <<<) \*\//g, "");
+    const lead = /^\s*/.exec(original)?.[0] ?? "";
+    const trail = /\s*$/.exec(original)?.[0] ?? "";
+    return lead + body.trim() + trail;
+}
+export function identFill(src, gap, fill) {
+    const text = fill.trim();
+    if (/^[A-Za-z_$][\w$]*$/.test(text))
+        return text;
+    const object = /([A-Za-z_$][\w$.]*)\.\s*$/.exec(src.slice(Math.max(0, gap.start - 200), gap.start))?.[1];
+    if (object === undefined || text.startsWith(`${object}.`) === false)
+        return text;
+    const name = /^([A-Za-z_$][\w$]*)/.exec(text.slice(object.length + 1))?.[1];
+    return name ?? text;
+}
+const KEYWORDS = new Set("const let var function return if else for while do switch case break continue new this typeof instanceof null undefined true false await async import export from default class extends super try catch finally throw delete void yield of in".split(" "));
+function namesIn(text) {
+    return new Set((text.match(/[A-Za-z_$][\w$]{2,}/g) ?? []).filter((w) => KEYWORDS.has(w) === false));
+}
+export function namesKept(original, text, exempt = new Set()) {
+    const before = new Set([...namesIn(original)].filter((name) => exempt.has(name) === false));
+    if (before.size === 0)
+        return 1;
+    const after = namesIn(text);
+    let kept = 0;
+    for (const name of before)
+        if (after.has(name))
+            kept++;
+    return kept / before.size;
+}
+export function loops(text) {
+    return /(^[ \t]*\S.*\n)(?:\1){3,}/m.test(text);
+}
+export function fillDefect(src, gap, fill) {
+    const original = src.slice(gap.start, gap.end);
+    if (/REWRITE (?:START|END)/.test(fill))
+        return "echo";
+    if (loops(fill))
+        return "loop";
+    if (original.length > 200 && fill.length < 0.6 * original.length)
+        return "shrank";
+    if (original.length > 200 && namesKept(original, fill) < 0.8)
+        return "rewrote";
+    if (gap.node === "Identifier" && /^[A-Za-z_$][\w$]*$/.test(fill.trim()) === false)
+        return "kind";
+    const spliced = src.slice(0, gap.start) + (gap.node === "Identifier" ? fill.trim() : fill) + src.slice(gap.end);
+    if (parses(spliced) === false)
+        return "kind";
+    if (gap.node === "JSXElement") {
+        const alone = parseModule(`(${fill.trim()});`);
+        const body = alone === undefined ? [] : nodesAt(alone, "body");
+        const expr = body[0] === undefined ? undefined : nodeAt(body[0], "expression");
+        if (body.length !== 1 || (expr?.type !== "JSXElement" && expr?.type !== "JSXFragment"))
+            return "kind";
+    }
+    return undefined;
+}
+export const INTACT_LINE_SLACK = 12;
+function lineCount(text) {
+    return text.split("\n").length;
+}
+export function referencedNamesKept(before, after, exempt = new Set()) {
+    const counts = new Map();
+    for (const word of before.match(/[A-Za-z_$][\w$]{2,}/g) ?? []) {
+        if (KEYWORDS.has(word) || exempt.has(word))
+            continue;
+        counts.set(word, (counts.get(word) ?? 0) + 1);
+    }
+    const required = [...counts].filter(([, n]) => n >= 2).map(([name]) => name);
+    if (required.length === 0)
+        return 1;
+    const now = namesIn(after);
+    return required.filter((name) => now.has(name)).length / required.length;
+}
+export function intactnessDefect(before, after, exempt = new Set(), lines = "both") {
+    const was = lineCount(before);
+    const now = lineCount(after);
+    if (lines !== "none" && now < Math.min(0.9 * was, was - INTACT_LINE_SLACK))
+        return "shrank";
+    if (lines === "both" && now > Math.max(1.25 * was, was + INTACT_LINE_SLACK))
+        return "grew";
+    if (referencedNamesKept(before, after, exempt) < 0.9)
+        return "names";
+    if (loops(after) && loops(before) === false)
+        return "loop";
+    return undefined;
+}
+//# sourceMappingURL=repair-ladder.js.map

package/intern/repair-ladder.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"repair-ladder.js","sourceRoot":"","sources":["../../jsr/intern/repair-ladder.ts"],"names":[],"mappings":"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"}

package/intern/save-build-pass.js

@@ -1,7 +1,7 @@
 import { exception2Result } from "@adviser/cement";
 import { validateAgentFiles } from "./agent-file-validation.js";
 import { countLintFindings, runInlineBuildPass } from "./inline-build-pass.js";
-import { checkOpens } from "./opens-check.js";
+import { checkOpens, collapseOpensFindings } from "./opens-check.js";
 export const OPENS_FINDINGS_RECORDED_MAX = 20;
 export async function runSaveBuildPass(vctx, args) {
     if (vctx.sthis.env.get("OPENS_CHECK") === "off")
@@ -84,7 +84,7 @@ export async function runSaveBuildPass(vctx, args) {
 function capped(verdict) {
     return {
         opens: verdict.opens,
-        findings: verdict.findings.slice(0, OPENS_FINDINGS_RECORDED_MAX),
+        findings: collapseOpensFindings(verdict.findings).slice(0, OPENS_FINDINGS_RECORDED_MAX),
         ...(verdict.lint === undefined ? {} : { lint: verdict.lint.slice(0, OPENS_FINDINGS_RECORDED_MAX) }),
         ...(verdict.lintUnavailable === undefined ? {} : { lintUnavailable: verdict.lintUnavailable.slice(0, 500) }),
         ...(verdict.fixes.length === 0 ? {} : { fixes: verdict.fixes.slice(0, OPENS_FINDINGS_RECORDED_MAX) }),

package/intern/save-build-pass.js.map

@@ -1 +1 @@
-{"version":3,"file":"save-build-pass.js","sourceRoot":"","sources":["../../jsr/intern/save-build-pass.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAInD,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE/E,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAI9C,MAAM,CAAC,MAAM,2BAA2B,GAAG,EAAE,CAAC;AAiC9C,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,IAAiE,EACjE,IAsBC;IAED,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC,KAAK,KAAK;QAAE,OAAO,SAAS,CAAC;IAClE,MAAM,GAAG,GAAG,MAAM,gBAAgB,CAAC,GAAG,EAAE,CACtC,kBAAkB,CAAC;QACjB,GAAG,EAAE,IAAI,CAAC,GAAG;QACb,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,GAAG,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;QACvD,GAAG,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;QACvD,KAAK,EAAE,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC;QAC5B,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,GAAG,CAAC,IAAI,CAAC,gBAAgB,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,KAAc,EAAE,CAAC;KACtF,CAAC,CACH,CAAC;IACF,IAAI,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC;QAChB,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;QAC3F,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,IAAI,GAAG,GAAG,CAAC,EAAE,EAAE,CAAC;IACtB,MAAM,UAAU,GAAG,IAAI,CAAC,gBAAgB,IAAI,EAAE,CAAC;IAE/C,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC;IACxF,MAAM,WAAW,GAAG,CAAC,KAAiC,EAAE,EAAE,CAAC,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;IAE7G,MAAM,OAAO,GAAG,IAAI,GAAG,CACrB,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,QAAQ,CAAC,CAC1G,CAAC;IACF,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC;IACjD,MAAM,YAAY,GAAG,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,QAAQ,CAAC,CAAC;IAE7F,IAAI,OAAO,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;QACrB,MAAM,WAAW,GAAG,MAAM,kBAAkB,CAAC,IAAI,EAAE;YACjD,GAAG,EAAE,KAAK;YACV,OAAO,EAAE,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBAC9C,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBACjC,OAAO,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;YAC5D,CAAC,CAAC;YACF,WAAW,EAAE,IAAI,CAAC,WAAW;SAC9B,CAAC,CAAC;QACH,IAAI,WAAW,CAAC,KAAK,EAAE,EAAE,CAAC;YACxB,IAAI,CAAC,MAAM;iBACR,IAAI,EAAE;iBACN,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC;iBAC9B,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC;iBAChD,GAAG,CAAC,+BAA+B,CAAC,CAAC;YACxC,OAAO;gBACL,OAAO,EAAE,MAAM,CAAC;oBACd,GAAG,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC;oBACvB,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;oBACvB,eAAe,EAAE,IAAI,CAAC,OAAO,CAAC,eAAe;oBAC7C,KAAK,EAAE,UAAU;iBAClB,CAAC;gBACF,OAAO,EAAE,IAAI,GAAG,EAAE;gBAClB,GAAG,UAAU;gBAEb,GAAG,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC;aAChC,CAAC;QACJ,CAAC;IACH,CAAC;IAKD,IAAI,YAAY,EAAE,CAAC;QACjB,OAAO;YACL,OAAO,EAAE,MAAM,CAAC,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC,GAAG,UAAU,EAAE,GAAG,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;YACrG,OAAO;YACP,GAAG,UAAU;YACb,GAAG,WAAW,CAAC,IAAI,CAAC,SAAS,CAAC;SAC/B,CAAC;IACJ,CAAC;IACD,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IACzH,MAAM,SAAS,GACb,IAAI,CAAC,OAAO,CAAC,IAAI,KAAK,SAAS;QAC7B,CAAC,CAAC,SAAS;QACX,CAAC,CAAC;YACE,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,KAAK,CAAC;YAClE,GAAG,CAAC,IAAI,CAAC,kBAAkB,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;SACvE,CAAC;IACR,OAAO;QACL,OAAO,EAAE,MAAM,CAAC;YACd,GAAG,UAAU,CAAC,KAAK,CAAC;YACpB,GAAG,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;YACvD,eAAe,EAAE,IAAI,CAAC,OAAO,CAAC,eAAe;YAC7C,KAAK,EAAE,CAAC,GAAG,UAAU,EAAE,GAAG,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;SAChE,CAAC;QACF,OAAO;QACP,GAAG,UAAU;QACb,GAAG,WAAW,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;KACnF,CAAC;AACJ,CAAC;AAED,SAAS,MAAM,CAAC,OAMf;IACC,OAAO;QACL,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,2BAA2B,CAAC;QAChE,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,2BAA2B,CAAC,EAAE,CAAC;QACnG,GAAG,CAAC,OAAO,CAAC,eAAe,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC;QAC5G,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,2BAA2B,CAAC,EAAE,CAAC;KACtG,CAAC;AACJ,CAAC"}
+{"version":3,"file":"save-build-pass.js","sourceRoot":"","sources":["../../jsr/intern/save-build-pass.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vibes.diy/api-svc",
-  "version": "14.3.90",
+  "version": "14.3.92",
   "license": "Apache-2.0",
   "type": "module",
   "main": "./index.js",
@@ -37,21 +37,21 @@
     "@neondatabase/serverless": "~1.1.0",
     "@noble/hashes": "~2.4.0",
     "@shadcn/lint": "~0.2.0",
-    "@vibes.diy/api-pkg": "14.3.90",
-    "@vibes.diy/api-sql": "14.3.90",
-    "@vibes.diy/api-types": "14.3.90",
-    "@vibes.diy/call-ai-v2": "14.3.90",
-    "@vibes.diy/identity": "14.3.90",
-    "@vibes.diy/look": "14.3.90",
-    "@vibes.diy/pouf": "14.3.90",
-    "@vibes.diy/prompts": "14.3.90",
-    "@vibes.diy/vibe-db-explorer": "14.3.90",
-    "@vibes.diy/vibe-runtime": "14.3.90",
-    "@vibes.diy/vibe-types": "14.3.90",
+    "@vibes.diy/api-pkg": "14.3.92",
+    "@vibes.diy/api-sql": "14.3.92",
+    "@vibes.diy/api-types": "14.3.92",
+    "@vibes.diy/call-ai-v2": "14.3.92",
+    "@vibes.diy/identity": "14.3.92",
+    "@vibes.diy/look": "14.3.92",
+    "@vibes.diy/pouf": "14.3.92",
+    "@vibes.diy/prompts": "14.3.92",
+    "@vibes.diy/vibe-db-explorer": "14.3.92",
+    "@vibes.diy/vibe-runtime": "14.3.92",
+    "@vibes.diy/vibe-types": "14.3.92",
     "acorn": "~8.17.0",
     "acorn-jsx": "~5.3.2",
     "arktype": "~2.2.6",
-    "call-ai": "14.3.90",
+    "call-ai": "14.3.92",
     "charwise": "~3.0.1",
     "cookie": "~2.0.1",
     "csv-parse": "~7.0.3",

package/public/ensure-user-settings.d.ts

@@ -1,5 +1,5 @@
 import { EventoHandler, Result } from "@adviser/cement";
 import { MsgBase, ReqEnsureUserSettings, ReqWithVerifiedAuth, ResEnsureUserSettings, VibesDiyError, W3CWebSocketEvent } from "@vibes.diy/api-types";
 import { VibesApiSQLCtx } from "../types.js";
-export declare function ensureUserSettings(vctx: VibesApiSQLCtx, req: ReqWithVerifiedAuth<ReqEnsureUserSettings>): Promise<Result<ResEnsureUserSettings>>;
+export declare function ensureUserSettings(vctx: VibesApiSQLCtx, req: ReqWithVerifiedAuth<ReqEnsureUserSettings>, attempt?: number): Promise<Result<ResEnsureUserSettings>>;
 export declare const ensureUserSettingsEvento: EventoHandler<W3CWebSocketEvent, MsgBase<ReqEnsureUserSettings>, ResEnsureUserSettings | VibesDiyError>;

package/public/ensure-user-settings.js

@@ -5,9 +5,17 @@ import { unwrapMsgBase } from "../unwrap-msg-base.js";
 import { checkAuth } from "../check-auth.js";
 import { migrateLegacyAvatar } from "./handle-settings.js";
 import { planDailyVisit, postDailyVisit } from "../intern/record-daily-visit.js";
-import { eq } from "drizzle-orm/sql/expressions";
+import { and, eq } from "drizzle-orm/sql/expressions";
 import { type } from "arktype";
-const SERVER_ONLY_SETTINGS = new Set(["geoCountry", "retentionDrip", "kyc", "metaClickId", "lastVisit", "goldDripPosted"]);
+const SERVER_ONLY_SETTINGS = new Set([
+    "geoCountry",
+    "retentionDrip",
+    "kyc",
+    "metaClickId",
+    "lastVisit",
+    "goldDripPosted",
+    "capiLeadCredited",
+]);
 const isWireVisible = (t) => !SERVER_ONLY_SETTINGS.has(t);
 let warnedGeoCountryMissing = false;
 function warnGeoCountryMissingOnce(vctx) {
@@ -18,7 +26,8 @@ function warnGeoCountryMissingOnce(vctx) {
         .Warn()
         .Msg("no edge country on this request — geoCountry unstamped, geo-gated lanes stay closed for these users");
 }
-export async function ensureUserSettings(vctx, req) {
+const SETTINGS_WRITE_ATTEMPTS = 3;
+export async function ensureUserSettings(vctx, req, attempt = 0) {
     const userId = req._auth.verifiedAuth.claims.userId;
     const existing = await vctx.sql.db
         .select()
@@ -68,13 +77,17 @@ export async function ensureUserSettings(vctx, req) {
     if (settingsWarning.length > 0) {
         ensureLogger(vctx.sthis, "ensureUserSettings").Warn().Any({ parseErrors: settingsWarning }).Msg("skip");
     }
-    await vctx.sql.db
-        .update(vctx.sql.tables.userSettings)
-        .set({
-        settings,
-        updated: now,
-    })
-        .where(eq(vctx.sql.tables.userSettings.userId, userId));
+    const tSettings = vctx.sql.tables.userSettings;
+    const written = await vctx.sql.db
+        .update(tSettings)
+        .set({ settings, updated: now })
+        .where(and(eq(tSettings.userId, userId), eq(tSettings.settings, existing.settings)))
+        .returning({ userId: tSettings.userId });
+    if (written.length === 0) {
+        if (attempt + 1 < SETTINGS_WRITE_ATTEMPTS)
+            return ensureUserSettings(vctx, req, attempt + 1);
+        return Result.Err(new Error(`user settings write kept conflicting for ${userId} — not writing a stale snapshot`));
+    }
     if (visit !== undefined) {
         postDailyVisit(vctx, visit, "ensure-user-settings");
     }

package/public/ensure-user-settings.js.map

@@ -1 +1 @@
-{"version":3,"file":"ensure-user-settings.js","sourceRoot":"","sources":["../../jsr/public/ensure-user-settings.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ensure-user-settings.js","sourceRoot":"","sources":["../../jsr/public/ensure-user-settings.ts"],"names":[],"mappings":"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"}

package/public/handle-prompt-context.js

@@ -122,8 +122,19 @@ export async function handlePromptContext({ vctx, req, resChat, promptId, blockS
                 ? {}
                 : {
                     instant: {
-                        candidates: instant.candidates.map((c) => ({ ...c })),
+                        candidates: instant.candidates.map(({ repairs, ...c }) => ({
+                            ...c,
+                            ...(repairs === undefined
+                                ? {}
+                                : {
+                                    repairs: repairs.map(({ gaps, ...r }) => ({
+                                        ...r,
+                                        ...(gaps === undefined ? {} : { gaps: gaps.map((g) => ({ ...g })) }),
+                                    })),
+                                }),
+                        })),
                         ...(instant.winner === undefined ? {} : { winner: instant.winner }),
+                        ...(instant.winnerCandidate === undefined ? {} : { winnerCandidate: instant.winnerCandidate }),
                     },
                 }),
             ...(byok === true ? { byok: true } : {}),