billion-context 0.1.67-pr.398.237 → 0.1.67-pr.415.239

package/dist/index.js

@@ -46991,10 +46991,116 @@ var registry2 = /* @__PURE__ */ new Map();
 function registerSearchAlgorithm(algo) {
   registry2.set(algo.name, algo);
 }
+function getSearchAlgorithm(name) {
+  return registry2.get(name);
+}
 registerSearchAlgorithm(substringAlgorithm);
 registerSearchAlgorithm(bm25Algorithm);
 registerSearchAlgorithm(fuzzyAlgorithm);
 registerSearchAlgorithm(hybridAlgorithm);
+var DEFAULT_ROLE_WEIGHTS = {
+  user: 1.5,
+  assistant: 1,
+  tool: 0.6,
+  block: 1
+};
+var DEFAULT_ALGORITHM = "hybrid";
+function blockDocs(state) {
+  return state.blocks.map((b2) => ({
+    kind: "block",
+    ref: b2.blockId,
+    text: `${b2.topic ?? ""} ${b2.summary ?? ""}`,
+    title: b2.topic ?? b2.blockId,
+    blockId: b2.blockId,
+    tier: b2.tier ?? 1,
+    tokens: b2.compressedTokens
+  }));
+}
+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]));
+  return scored.map((s3) => {
+    const doc = docByRef.get(s3.ref);
+    if (!doc) return s3;
+    const w2 = doc.kind === "message" ? doc.role === "user" ? rw.user : doc.role === "assistant" ? rw.assistant : rw.tool : rw.block;
+    return { ref: s3.ref, score: s3.score * w2 };
+  });
+}
+function runSearch(docs, query, options) {
+  const limit = options.limit ?? 10;
+  const previewLength = options.previewLength ?? 200;
+  const minScore = options.minScore ?? 0.01;
+  const algoName = options.algorithm ?? DEFAULT_ALGORITHM;
+  const rw = { ...DEFAULT_ROLE_WEIGHTS, ...options.roleWeights };
+  const algo = getSearchAlgorithm(algoName);
+  if (!algo) return [];
+  if (docs.length === 0) return [];
+  const scoredOrPromise = algo.score(docs, query);
+  const buildResults = (weighted) => {
+    const byRef = new Map(docs.map((d) => [d.ref, d]));
+    return weighted.map((s3) => {
+      const doc = byRef.get(s3.ref);
+      if (!doc) return null;
+      return {
+        kind: doc.kind,
+        ref: doc.ref,
+        blockId: doc.blockId,
+        tier: doc.tier ?? 1,
+        score: s3.score,
+        title: doc.title,
+        preview: makePreview(doc.text, query, previewLength),
+        role: doc.role,
+        tokens: doc.tokens
+      };
+    }).filter((r) => r !== null && r.score >= minScore).sort((a, b2) => b2.score - a.score).slice(0, limit);
+  };
+  if (scoredOrPromise instanceof Promise) {
+    return scoredOrPromise.then((raw) => buildResults(applyRoleWeight(raw, docs, rw)));
+  }
+  return buildResults(applyRoleWeight(scoredOrPromise, docs, rw));
+}
+function searchBlocks(docs, query, options = {}) {
+  const result = runSearch(docs, query, options);
+  if (result instanceof Promise) {
+    throw new Error(
+      `searchBlocks: algorithm "${options.algorithm ?? DEFAULT_ALGORITHM}" is async (e.g. semantic). Use searchBlocksAsync() instead.`
+    );
+  }
+  return result;
+}
+function makePreview(text, query, len) {
+  if (!text) return "";
+  const terms = query.toLowerCase().trim().split(/\s+/).filter((t) => t.length > 1);
+  if (terms.length === 0) return text.slice(0, len);
+  const lower = text.toLowerCase();
+  let hitIdx = -1;
+  for (const term of terms) {
+    const idx = lower.indexOf(term);
+    if (idx >= 0) {
+      hitIdx = idx;
+      break;
+    }
+  }
+  if (hitIdx < 0) return text.slice(0, len);
+  const half = Math.max(0, Math.floor(len / 2) - 10);
+  const start = Math.max(0, hitIdx - half);
+  const end = Math.min(text.length, start + len);
+  const prefix = start > 0 ? "\u2026" : "";
+  const suffix = end < text.length ? "\u2026" : "";
+  return prefix + text.slice(start, end).trim() + suffix;
+}
 
 // src/config.ts
 import { readFileSync, existsSync, mkdirSync as mkdirSync2, writeFileSync } from "fs";
@@ -50097,6 +50203,25 @@ async function flushAllSessions() {
 }
 
 // src/compress-tool.ts
+var SEARCH_CONTEXT_DESCRIPTION = "Searches compressed block summaries AND visible conversation messages by keyword (English + Chinese/CJK). Use BEFORE decompressing to find the right block, or to locate content still in context.";
+var SEARCH_CONTEXT_TOOL2 = { ...SEARCH_CONTEXT_TOOL, description: SEARCH_CONTEXT_DESCRIPTION };
+var SEARCH_CONTEXT_TOOL_OPENAI2 = {
+  ...SEARCH_CONTEXT_TOOL_OPENAI,
+  function: { ...SEARCH_CONTEXT_TOOL_OPENAI.function, description: SEARCH_CONTEXT_DESCRIPTION }
+};
+var SEARCH_CONTEXT_TOOL_RESPONSES2 = { ...SEARCH_CONTEXT_TOOL_RESPONSES, description: SEARCH_CONTEXT_DESCRIPTION };
+var ACP_TOOLS_OPENAI2 = ACP_TOOLS_OPENAI.map(
+  (t) => t.function.name === SEARCH_CONTEXT_TOOL_NAME ? { ...t, function: { ...t.function, description: SEARCH_CONTEXT_DESCRIPTION } } : t
+);
+var ACP_TOOLS_ANTHROPIC2 = ACP_TOOLS_ANTHROPIC.map(
+  (t) => t.name === SEARCH_CONTEXT_TOOL_NAME ? { ...t, description: SEARCH_CONTEXT_DESCRIPTION } : t
+);
+var ACP_TOOLS_RESPONSES2 = ACP_TOOLS_RESPONSES.map(
+  (t) => t.name === SEARCH_CONTEXT_TOOL_NAME ? { ...t, description: SEARCH_CONTEXT_DESCRIPTION } : t
+);
+var ACP_READONLY_TOOLS_RESPONSES2 = ACP_READONLY_TOOLS_RESPONSES.map(
+  (t) => t.name === SEARCH_CONTEXT_TOOL_NAME ? { ...t, description: SEARCH_CONTEXT_DESCRIPTION } : t
+);
 function parseCompressInput(input, callId) {
   const { ranges, diagnostics } = parseCompressArgs(input, { callId });
   if (!diagnostics.ok && diagnostics.kind !== "ok") {
@@ -50188,6 +50313,56 @@ ${body.slice(0, 4e3)}...`;
 ${body}`;
 }
 
+// src/search-context.ts
+function parseSearchContextArgs(args) {
+  const query = typeof args.query === "string" ? args.query : "";
+  const limit = typeof args.limit === "number" && args.limit > 0 ? Math.floor(args.limit) : 5;
+  return { query, limit };
+}
+function visibleMessageInputs(state, messages) {
+  const byRaw = state.messageRefs.byRaw;
+  const out = [];
+  for (const m2 of messages) {
+    const ref = byRaw[m2.id];
+    if (typeof ref !== "string" || ref.length === 0) continue;
+    if (m2.role === "system") continue;
+    const text = m2.text ?? "";
+    if (text.length === 0) continue;
+    const role = m2.role === "tool" || m2.contentType === "tool-call" || m2.contentType === "tool-result" ? "tool" : m2.role;
+    out.push({ ref, role, text });
+  }
+  return out;
+}
+function handleSearchContext(args, state, messages) {
+  const { query, limit } = parseSearchContextArgs(args);
+  if (query.length === 0) return "[search_context FAILED: query is required]";
+  const activeBlockIds = new Set(state.blocks.filter((b2) => b2.active).map((b2) => b2.blockId));
+  const blockCorpus = blockDocs(state).filter((d) => activeBlockIds.has(d.ref));
+  const messageInputs = visibleMessageInputs(state, messages);
+  const results = searchBlocks([...blockCorpus, ...messageDocs(messageInputs)], query, { limit });
+  if (results.length === 0) {
+    return `[No matches for "${query}" \u2014 searched ${blockCorpus.length} block(s) and ${messageInputs.length} visible message(s). Compressed content is searchable only through its summary; try a broader term, or decompress the block you suspect holds it.]`;
+  }
+  const lines = results.map((r) => {
+    if (r.kind === "block") {
+      const topic = r.title === r.ref ? "(no topic)" : r.title;
+      return `${r.ref} (T${r.tier}) "${topic}"
+  ${r.preview}`;
+    }
+    return `${r.ref} (${r.role ?? "message"})
+  ${r.preview}`;
+  });
+  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")}`;
+}
+
 // src/sse-util.ts
 function normalizeSseLineEndings(buf) {
   if (buf.indexOf("\r") === -1) return buf;
@@ -50374,20 +50549,7 @@ function executeAnthropicProxyTool(toolName, args, ctx) {
     return resolveDecompress(args, ctx);
   }
   if (toolName === "search_context") {
-    const query = typeof args.query === "string" ? args.query : "";
-    if (query.length === 0) return "[search_context FAILED: query is required]";
-    const limit = typeof args.limit === "number" && args.limit > 0 ? Math.floor(args.limit) : 5;
-    const blocks = ctx.core.search(query, ctx.session.state).slice(0, limit);
-    if (blocks.length === 0) return `[No blocks matched "${query}"]`;
-    const lines = blocks.map((b2) => {
-      const topic = b2.topic ?? "(no topic)";
-      const preview = b2.summary.length > 200 ? b2.summary.slice(0, 200) + "..." : b2.summary;
-      return `${b2.blockId} (T${b2.tier}) "${topic}"
-  ${preview}`;
-    });
-    return `Found ${blocks.length} block(s) for "${query}":
-
-${lines.join("\n\n")}`;
+    return handleSearchContext(args, ctx.session.state, ctx.messages);
   }
   if (toolName === "acp_status") {
     return buildStatusReport(ctx.session.state, ctx.messages, estimateTokensFast);
@@ -51192,20 +51354,7 @@ function executeProxyTool(toolName, args, ctx, callId) {
     return resolveDecompress(args, ctx);
   }
   if (toolName === "search_context") {
-    const query = typeof args.query === "string" ? args.query : "";
-    if (query.length === 0) return "[search_context FAILED: query is required]";
-    const limit = typeof args.limit === "number" && args.limit > 0 ? Math.floor(args.limit) : 5;
-    const blocks = ctx.core.search(query, ctx.session.state).slice(0, limit);
-    if (blocks.length === 0) return `[No blocks matched "${query}"]`;
-    const lines = blocks.map((b2) => {
-      const topic = b2.topic ?? "(no topic)";
-      const preview = b2.summary.length > 200 ? b2.summary.slice(0, 200) + "..." : b2.summary;
-      return `${b2.blockId} (T${b2.tier}) "${topic}"
-  ${preview}`;
-    });
-    return `Found ${blocks.length} block(s) for "${query}":
-
-${lines.join("\n\n")}`;
+    return handleSearchContext(args, ctx.session.state, ctx.messages);
   }
   if (toolName === "acp_status") {
     return handleAcpStatus(args, ctx);
@@ -52885,20 +53034,7 @@ function executeProxyTool2(toolName, args, ctx) {
     return resolveDecompress(args, ctx);
   }
   if (toolName === "search_context") {
-    const query = typeof args.query === "string" ? args.query : "";
-    if (query.length === 0) return "[search_context FAILED: query is required]";
-    const limit = typeof args.limit === "number" && args.limit > 0 ? Math.floor(args.limit) : 5;
-    const blocks = ctx.core.search(query, ctx.session.state).slice(0, limit);
-    if (blocks.length === 0) return `[No blocks matched "${query}"]`;
-    const lines = blocks.map((b2) => {
-      const topic = b2.topic ?? "(no topic)";
-      const preview = b2.summary.length > 200 ? b2.summary.slice(0, 200) + "..." : b2.summary;
-      return `${b2.blockId} (T${b2.tier}) "${topic}"
-  ${preview}`;
-    });
-    return `Found ${blocks.length} block(s) for "${query}":
-
-${lines.join("\n\n")}`;
+    return handleSearchContext(args, ctx.session.state, ctx.messages);
   }
   if (toolName === "acp_status") {
     return buildStatusReport(ctx.session.state, ctx.messages, estimateTokensFast);
@@ -53796,9 +53932,9 @@ function handlePluginManifest(res) {
     version: VERSION,
     toolNames: [...ACP_TOOL_NAMES],
     tools: {
-      anthropic: ACP_TOOLS_ANTHROPIC,
-      openai: ACP_TOOLS_OPENAI,
-      responses: ACP_TOOLS_RESPONSES
+      anthropic: ACP_TOOLS_ANTHROPIC2,
+      openai: ACP_TOOLS_OPENAI2,
+      responses: ACP_TOOLS_RESPONSES2
     },
     headers: { agent: PLUGIN_AGENT_HEADER, conversation: PLUGIN_CONVERSATION_HEADER, contextWindow: PLUGIN_CONTEXT_WINDOW_HEADER },
     toolEndpoint: "/__bili/plugin/tool",
@@ -55775,13 +55911,6 @@ Content-Length: ${Buffer.byteLength(body)}\r
   }
   return server;
 }
-var SIDE_REQUEST_MAX_TOKENS = 200;
-function isSideRequest(parsed) {
-  if (!parsed || typeof parsed !== "object") return false;
-  const p2 = parsed;
-  const raw = p2.max_tokens ?? p2.max_completion_tokens ?? p2.max_output_tokens;
-  return typeof raw === "number" && raw > 0 && raw <= SIDE_REQUEST_MAX_TOKENS;
-}
 function isTrustedAdminOrigin(origin, host, trustedHosts) {
   if (!host || !trustedHosts.has(host.toLowerCase())) return false;
   if (!origin) return true;
@@ -56143,11 +56272,6 @@ ${bodyBuffer.toString("utf8")}`);
       }
     }
     const pluginMode = pluginAgent !== void 0;
-    if (!countTokens && !responsesCompact && protocol !== null && isSideRequest(parsed)) {
-      log2("info", `[${session.id}] side request (max_tokens<=${SIDE_REQUEST_MAX_TOKENS}) \u2192 pure passthrough, kernel state untouched`);
-      await forward(req, res, opts, bodyBuffer, null, core, reqConfig, log2, route, instanceId, affinity);
-      return;
-    }
     const reqModel = parsed.model;
     const learnedMap = session.metadata.learnedContextLimits;
     const learnedLimit = (reqModel && learnedMap ? learnedMap[reqModel] : void 0) ?? session.metadata.learnedContextLimit;
@@ -56446,7 +56570,7 @@ function prepareResponses(parsed, req, opts, core, config, prompts, log2, sessio
       const devContent = [...projection.systemParts, ...forgedSummaries, prompt].join("\n\n---\n\n");
       rebuiltInput = injectResponsesDeveloperMessage(rebuiltInput, devContent);
       if (!process.env.ACP_NO_INJECT_TOOL && injectTools) {
-        toolsOut = responsesTextProtocol ? injectResponsesTool(parsed.tools, ACP_READONLY_TOOLS_RESPONSES) : injectResponsesTool(parsed.tools);
+        toolsOut = responsesTextProtocol ? injectResponsesTool(parsed.tools, ACP_READONLY_TOOLS_RESPONSES2) : injectResponsesTool(parsed.tools);
       }
     } else if (projection.systemParts.length > 0 || forgedSummaries.length > 0) {
       const devContent = [...projection.systemParts, ...forgedSummaries].join("\n\n---\n\n");
@@ -56638,21 +56762,21 @@ ${parts.join("\n\n")}` : parts.join("\n\n");
   return buildSystem(full, parsed.system);
 }
 function injectTool(tools) {
-  if (!Array.isArray(tools)) return [...ACP_TOOLS_ANTHROPIC];
+  if (!Array.isArray(tools)) return [...ACP_TOOLS_ANTHROPIC2];
   const names = new Set(tools.map((t) => t?.name));
-  const missing = ACP_TOOLS_ANTHROPIC.filter((t) => !names.has(t.name));
+  const missing = ACP_TOOLS_ANTHROPIC2.filter((t) => !names.has(t.name));
   return missing.length === 0 ? tools : [...tools, ...missing];
 }
 function injectOpenaiTool(tools) {
-  if (!Array.isArray(tools)) return [...ACP_TOOLS_OPENAI];
+  if (!Array.isArray(tools)) return [...ACP_TOOLS_OPENAI2];
   const present = new Set(
     tools.map((t) => t?.function?.name).filter((n) => typeof n === "string")
   );
-  const additions = ACP_TOOLS_OPENAI.filter((t) => !present.has(t.function.name));
+  const additions = ACP_TOOLS_OPENAI2.filter((t) => !present.has(t.function.name));
   return [...tools, ...additions];
 }
 var FORCE_TEXT_PROTOCOL = process.env.ACP_COMPRESS_PROTOCOL === "text";
-function injectResponsesTool(tools, toolsToAdd = ACP_TOOLS_RESPONSES) {
+function injectResponsesTool(tools, toolsToAdd = ACP_TOOLS_RESPONSES2) {
   if (!Array.isArray(tools)) return [...toolsToAdd];
   const present = new Set(
     tools.map((t) => t?.name).filter((n) => typeof n === "string")