caveat-cli 0.19.7 → 0.19.9

package/dist/index.js

@@ -26,7 +26,7 @@ import {
   defaultSelfIdentityTokens,
   ensureUserConfig,
   environmentAppliesToTask,
-  extractPromptCandidates,
+  extractSearchWordCandidates,
   findCaveatHome,
   findCaveatsForHook,
   findCaveatsForHookSegments,
@@ -74,7 +74,7 @@ import {
   userPromptSubmitReminderText,
   writeDigestMarker,
   writeUserConfigPatch
-} from "./chunk-EMGYSGFX.js";
+} from "./chunk-ITQLGM4K.js";
 
 // ../../node_modules/.pnpm/ajv@8.18.0/node_modules/ajv/dist/compile/codegen/code.js
 var require_code = __commonJS({
@@ -8390,7 +8390,7 @@ function runStats(ctx) {
 
 // src/commands/serve.ts
 async function runServe(opts) {
-  const { startServer } = await import("./server-RSDQNLWE.js");
+  const { startServer } = await import("./server-H4BWLLZ2.js");
   const { port, host } = startServer({ port: opts.port });
   process.stdout.write(`[caveat] web portal: http://${host}:${port}/
 `);
@@ -33210,6 +33210,7 @@ var API_URL = "https://api.typesafe.ai/v1/systemone";
 var STRUGGLE_THRESHOLD = 0.85;
 var MATCH_THRESHOLD = 0.8;
 var MAX_TERMS = 48;
+var MAX_SEARCH_TERMS = 3;
 var MAX_CANDIDATES = 20;
 async function callJev(key, state, questions, fetcher = fetch) {
   const response = await fetcher(API_URL, {
@@ -33232,33 +33233,33 @@ function noul(answer) {
   }
   return answer.noul;
 }
-function choice(answer, allowed) {
-  if (answer?.type !== "choice" || !allowed.has(answer.choice)) throw new Error("jev_choice_invalid");
-  return answer.choice;
+function searchTermChoices(answer, terms) {
+  if (answer?.type !== "choice" || !isRecord(answer.probabilities)) throw new Error("jev_choice_invalid");
+  const keys = terms.map((_, index) => `term_${index}`);
+  const allowed = /* @__PURE__ */ new Set([...keys, "none"]);
+  if (!allowed.has(answer.choice) || Object.keys(answer.probabilities).length !== allowed.size || Object.entries(answer.probabilities).some(([key, probability]) => !allowed.has(key) || typeof probability !== "number" || !Number.isFinite(probability) || probability < 0 || probability > 1)) {
+    throw new Error("jev_choice_invalid");
+  }
+  if (answer.choice === "none") return [];
+  const noneProbability = answer.probabilities.none;
+  return keys.map((key, index) => ({ index, probability: answer.probabilities[key] })).filter(({ probability }) => probability > noneProbability).sort((a, b) => b.probability - a.probability || a.index - b.index).slice(0, MAX_SEARCH_TERMS).map(({ index }) => terms[index]);
 }
 function candidateTerms(turns) {
-  const seen = /* @__PURE__ */ new Set();
-  const terms = [];
-  const groups = [...turns].reverse().map((turn) => [turn.user, turn.thinking, turn.assistant].flatMap((part) => extractPromptCandidates(
-    part.replace(/(?<=[A-Za-z0-9])(?=[\u3040-\u30ff\u3400-\u9fff])|(?<=[\u3040-\u30ff\u3400-\u9fff])(?=[A-Za-z0-9])/gu, " ")
-  )));
-  const add = (term) => {
-    const key = term.toLocaleLowerCase();
-    if (seen.has(key) || terms.length >= MAX_TERMS) return;
-    seen.add(key);
-    terms.push(term);
-  };
-  for (const group of groups) {
-    let added = 0;
-    for (const term of group) {
-      const before = terms.length;
-      add(term);
-      if (terms.length > before) added++;
-      if (added === 12) break;
-    }
-  }
-  for (const group of groups) for (const term of group) add(term);
-  return terms;
+  const found = /* @__PURE__ */ new Map();
+  let position = 0;
+  for (let turnIndex = 0; turnIndex < turns.length; turnIndex++) {
+    const turn = turns[turnIndex];
+    for (const part of [turn.user, turn.thinking, turn.assistant]) {
+      for (const term of extractSearchWordCandidates(part)) {
+        const key = term.toLocaleLowerCase();
+        const item = found.get(key) ?? { term, turns: /* @__PURE__ */ new Set(), last: 0 };
+        item.turns.add(turnIndex);
+        item.last = position++;
+        found.set(key, item);
+      }
+    }
+  }
+  return [...found.values()].sort((a, b) => b.turns.size - a.turns.size || b.last - a.last).slice(0, MAX_TERMS).map((item) => item.term);
 }
 async function judgeStruggle(key, turns, ask = callJev) {
   const terms = candidateTerms(turns);
@@ -33269,14 +33270,13 @@ async function judgeStruggle(key, turns, ask = callJev) {
   };
   if (terms.length > 0) questions.search_term = {
     type: "choice",
-    instructions: "If the agent is struggling, which exact term from these options would best retrieve a useful Caveat knowledge entry about the concrete unresolved problem? Select none when no option identifies it.",
+    instructions: "If the agent is struggling, which exact term from these options would best retrieve a useful Caveat knowledge entry about the concrete unresolved problem? Select none when no option identifies it. The search will use up to three of your highest-ranked terms together as an AND query.",
     criteria: { ...options, none: "No listed term would retrieve useful knowledge about this problem." }
   };
   const response = await ask(key, { turns }, questions);
   const struggling = noul(response.answers.repeated_problem) >= STRUGGLE_THRESHOLD && noul(response.answers.clearly_stuck) >= STRUGGLE_THRESHOLD;
-  if (!struggling || terms.length === 0) return { struggling, term: null };
-  const selected = choice(response.answers.search_term, /* @__PURE__ */ new Set([...Object.keys(options), "none"]));
-  return { struggling, term: selected === "none" ? null : terms[Number(selected.slice(5))] ?? null };
+  if (!struggling || terms.length === 0) return { struggling, terms: [] };
+  return { struggling, terms: searchTermChoices(response.answers.search_term, terms) };
 }
 async function rankKnowledge(key, turns, candidates, ask = callJev) {
   if (candidates.length === 0) return null;
@@ -33380,21 +33380,22 @@ async function runJevStruggle(ctx, host, payload, deps = {}) {
     return null;
   }
   let candidates = [];
-  if (judgment.term) {
+  const query = judgment.terms.join(" ");
+  if (query) {
     if (!existsSync14(ctx.paths.dbPath)) throw new Error("jev_knowledge_index_missing");
     const db = openDb({ path: ctx.paths.dbPath });
     try {
       const taskText = context.turns.map((turn) => `${turn.user}
 ${turn.assistant}
 ${turn.thinking}`).join("\n");
-      candidates = search(db, { query: judgment.term, limit: MAX_CANDIDATES }).filter((hit) => environmentAppliesToTask(hit.environment, taskText, fingerprint().os)).map((hit) => ({ hit, entry: get(db, hit.id, hit.source) })).filter((item) => item.entry !== null).filter((item) => Boolean(item.entry.sections.Resolution));
+      candidates = search(db, { query, limit: MAX_CANDIDATES }).filter((hit) => environmentAppliesToTask(hit.environment, taskText, fingerprint().os)).map((hit) => ({ hit, entry: get(db, hit.id, hit.source) })).filter((item) => item.entry !== null).filter((item) => Boolean(item.entry.sections.Resolution));
     } finally {
       db.close();
     }
   }
   const selected = await rankKnowledge(key, context.turns, candidates, ask);
   const id = selected ? `${selected.hit.source}/${selected.hit.id}` : null;
-  const term = judgment.term ?? "_none";
+  const term = query || "_none";
   if (id && (state.deliveredIds.includes(id) || wasHitDelivered(ctx.caveatHome, sessionId, id)) || !id && state.notifiedTerms.includes(term)) {
     saveState(ctx.caveatHome, sessionId, state);
     return null;