billion-context 0.1.67-pr.415.252 → 0.1.67-pr.415.253

package/dist/index.js

@@ -47005,6 +47005,18 @@ var DEFAULT_ROLE_WEIGHTS = {
   block: 1
 };
 var DEFAULT_ALGORITHM = "hybrid";
+function messageDocs(msgs) {
+  return msgs.map((m2) => ({
+    kind: "message",
+    ref: m2.ref,
+    text: m2.text,
+    title: `${m2.role}: ${m2.text.slice(0, 60)}`,
+    role: m2.role,
+    blockId: m2.blockId,
+    tier: m2.tier,
+    tokens: m2.tokens
+  }));
+}
 function applyRoleWeight(scored, docs, rw) {
   if (docs.length === 0) return scored;
   const docByRef = new Map(docs.map((d) => [d.ref, d]));
@@ -50177,7 +50189,7 @@ async function flushAllSessions() {
 }
 
 // src/compress-tool.ts
-var SEARCH_CONTEXT_DESCRIPTION = "Searches the FOLDED ORIGINAL CONTENT of compressed blocks \u2014 error text, file paths, and variable names that summaries drop \u2014 plus each block's summary as a secondary signal (English + Chinese/CJK). Use BEFORE decompressing to find the right block; every hit is a decompressable blockId. Hits marked [summary-only] mean the block's originals are gone from every payload and only its summary was searched.";
+var SEARCH_CONTEXT_DESCRIPTION = "Searches the ORIGINAL text of folded-away messages across ALL compressed blocks (any tier, active or archived) plus block summaries as a secondary signal (English + Chinese/CJK). Visible messages are not indexed \u2014 they are already in context. Use to locate which block holds a detail (an exact error string, a path, a value); message hits name the owning block, then decompress it. Hits marked summary-only mean the block's originals are gone from every payload and only its summary was searched.";
 var SEARCH_CONTEXT_TOOL2 = { ...SEARCH_CONTEXT_TOOL, description: SEARCH_CONTEXT_DESCRIPTION };
 var SEARCH_CONTEXT_TOOL_OPENAI2 = {
   ...SEARCH_CONTEXT_TOOL_OPENAI,
@@ -50289,59 +50301,108 @@ function parseSearchContextArgs(args) {
   const limit = typeof args.limit === "number" && args.limit > 0 ? Math.floor(args.limit) : 5;
   return { query, limit };
 }
+function ownerOf(state, rawId) {
+  let best;
+  for (const b2 of state.blocks) {
+    if (!b2.effectiveMessageIds.includes(rawId)) continue;
+    if (!best || b2.tier < best.tier || b2.tier === best.tier && b2.effectiveMessageIds.length < best.effectiveMessageIds.length) {
+      best = b2;
+    }
+  }
+  return best;
+}
+function foldedMessageInputs(state, log2) {
+  const byRaw = state.messageRefs.byRaw;
+  const foldedRaw = /* @__PURE__ */ new Set();
+  for (const b2 of state.blocks) {
+    for (const id of b2.effectiveMessageIds) foldedRaw.add(id);
+  }
+  const out = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const m2 of log2) {
+    if (seen.has(m2.id)) continue;
+    seen.add(m2.id);
+    if (!foldedRaw.has(m2.id)) continue;
+    if (m2.role === "system") continue;
+    const text = m2.text ?? "";
+    if (text.length === 0) continue;
+    const ref = byRaw[m2.id];
+    if (typeof ref !== "string" || ref.length === 0) continue;
+    const owner = ownerOf(state, m2.id);
+    const role = m2.role === "tool" || m2.contentType === "tool-call" || m2.contentType === "tool-result" ? "tool" : m2.role;
+    out.push({ ref, role, text, blockId: owner?.blockId, tier: owner?.tier });
+  }
+  return out;
+}
 function hasSubstance(text) {
   return text.replace(/^\[[^\]]*\]\s*$/gm, "").trim().length > 0;
 }
-function collectFromSource(state, block, source) {
-  if (!source || source.length === 0) return "";
-  const collected = collectBlockContent(state, block, source, { full: true });
-  if (collected.count === 0 || !hasSubstance(collected.text)) return "";
-  return collected.text;
-}
-function blockOriginals(state, block, session, messages) {
-  const cached = session.blockContents.get(block.blockId)?.full.text;
-  if (cached && hasSubstance(cached)) return cached;
-  return collectFromSource(state, block, session.lastMessages) || collectFromSource(state, block, messages);
+function blockHasOriginals(blockId, byId, owners) {
+  const b2 = byId.get(blockId);
+  if (!b2) return false;
+  if (owners.has(blockId)) return true;
+  return b2.directBlockIds.some((id) => blockHasOriginals(id, byId, owners));
 }
 function handleSearchContext(args, session, messages) {
   const { query, limit } = parseSearchContextArgs(args);
   if (query.length === 0) return "[search_context FAILED: query is required]";
   const state = session.state;
-  const docs = [];
+  const log2 = session.lastMessages && session.lastMessages.length > 0 ? session.lastMessages : messages;
+  const messageInputs = foldedMessageInputs(state, log2);
+  const owners = new Set(
+    messageInputs.map((m2) => m2.blockId).filter((b2) => typeof b2 === "string")
+  );
+  const byId = new Map(state.blocks.map((b2) => [b2.blockId, b2]));
+  const docs = [...messageDocs(messageInputs)];
   const summaryOnly = /* @__PURE__ */ new Set();
-  let withOriginals = 0;
+  let cachedBlocks = 0;
   for (const b2 of state.blocks) {
-    if (!b2.active) continue;
     const base = {
       kind: "block",
       ref: b2.blockId,
       title: b2.topic ?? b2.blockId,
       blockId: b2.blockId,
-      tier: b2.tier ?? 1,
+      tier: b2.tier,
       tokens: b2.compressedTokens
     };
-    const originals = blockOriginals(state, b2, session, messages);
-    if (originals) {
-      withOriginals++;
-      docs.push({ ...base, text: `${originals}
+    const summaryText = `${b2.topic ?? ""} ${b2.summary ?? ""}`.trim();
+    if (blockHasOriginals(b2.blockId, byId, owners)) {
+      docs.push({ ...base, text: summaryText });
+      continue;
+    }
+    const cached = session.blockContents.get(b2.blockId)?.full;
+    if (cached && hasSubstance(cached.text)) {
+      cachedBlocks++;
+      docs.push({ ...base, text: `${cached.text}
 
-${b2.topic ?? ""} ${b2.summary ?? ""}`.trim() });
+${summaryText}`.trim() });
     } else {
       summaryOnly.add(b2.blockId);
-      docs.push({ ...base, text: `${b2.topic ?? ""} ${b2.summary ?? ""}`.trim() });
+      docs.push({ ...base, text: summaryText });
     }
   }
   const results = searchBlocks(docs, query, { limit });
   if (results.length === 0) {
-    return `[No matches for "${query}" \u2014 searched ${docs.length} active block(s) (${withOriginals} with folded originals, ${summaryOnly.size} summary-only). Try a broader term, or decompress the block you suspect holds it.]`;
+    return `[No matches for "${query}" \u2014 searched ${state.blocks.length} block(s) (${owners.size + cachedBlocks} with folded originals, ${summaryOnly.size} summary-only) and ${messageInputs.length} folded-away message(s). Folded originals are matched on full text. Try a broader term, or decompress the block you suspect holds it.]`;
   }
   const lines = results.map((r) => {
-    const topic = r.title === r.ref ? "(no topic)" : r.title;
-    const marker = summaryOnly.has(r.ref) ? " [summary-only]" : "";
-    return `${r.ref} (T${r.tier}) "${topic}"${marker}
+    if (r.kind === "block") {
+      const topic = r.title === r.ref ? "(no topic)" : r.title;
+      const mark = summaryOnly.has(r.ref) ? ", summary only" : "";
+      return `${r.ref} (T${r.tier}${mark}) "${topic}"
+  ${r.preview}`;
+    }
+    return r.blockId ? `${r.ref} (${r.role ?? "message"}, in ${r.blockId})
+  ${r.preview}` : `${r.ref} (${r.role ?? "message"})
   ${r.preview}`;
   });
-  return `Found ${results.length} block(s) for "${query}":
+  const blockHits = results.filter((r) => r.kind === "block").length;
+  const messageHits = results.length - blockHits;
+  const what = [
+    blockHits > 0 ? `${blockHits} block(s)` : "",
+    messageHits > 0 ? `${messageHits} message(s)` : ""
+  ].filter(Boolean).join(", ");
+  return `Found ${what} for "${query}":
 
 ${lines.join("\n\n")}`;
 }