billion-context 0.1.66 → 0.1.67-pr.379.234

package/dist/index.js

@@ -48880,21 +48880,6 @@ function coreToOpenai(messages) {
   flush();
   return out;
 }
-function injectOpenaiSystem(messages, parts) {
-  if (parts.length === 0) return messages;
-  const extra = parts.join("\n\n");
-  if (messages.length > 0 && (messages[0]?.role === "system" || messages[0]?.role === "developer")) {
-    const head = messages[0];
-    const base = stringContent(head.content);
-    const merged = base ? `${base}
-
----
-
-${extra}` : extra;
-    return [{ ...head, content: merged }, ...messages.slice(1)];
-  }
-  return [{ role: "system", content: extra }, ...messages];
-}
 function conversationSignalOpenai(body, headerValue3) {
   if (headerValue3 && headerValue3.trim()) return headerValue3.trim();
   const firstUser = body.messages.find((m2) => m2.role === "user");
@@ -51591,25 +51576,17 @@ function reserveOutputHeadroom(window2, maxOutput) {
   }
   return window2;
 }
-function hoistMidSystemMessages(messages) {
-  let lead = 0;
-  while (lead < messages.length && (messages[lead].role === "system" || messages[lead].role === "developer")) lead++;
-  if (lead === messages.length) return messages;
-  let midCount = 0;
-  for (let i = lead; i < messages.length; i++) {
-    const r = messages[i].role;
-    if (r === "system" || r === "developer") midCount++;
-  }
-  if (midCount === 0) return messages;
-  const head = messages.slice(0, lead);
-  const mid = [];
+function mergeSystemMessages(messages, sysParts) {
+  const sys = [];
   const rest = [];
-  for (let i = lead; i < messages.length; i++) {
-    const r = messages[i].role;
-    if (r === "system" || r === "developer") mid.push(messages[i]);
-    else rest.push(messages[i]);
+  for (const m2 of messages) {
+    if (m2.role === "system" || m2.role === "developer") sys.push(m2);
+    else rest.push(m2);
   }
-  return [...head, ...mid, ...rest];
+  const sysContents = sys.map((m2) => typeof m2.content === "string" ? m2.content : m2.content == null ? "" : JSON.stringify(m2.content));
+  const parts = [...sysParts, ...sysContents].filter((s3) => s3.length > 0);
+  if (parts.length === 0) return messages;
+  return [{ role: "system", content: parts.join("\n\n---\n\n") }, ...rest];
 }
 function shouldReserveOutputHeadroom(protocol) {
   return protocol !== "anthropic";
@@ -52272,8 +52249,8 @@ function createOpenaiAdapter(requestBody, clientSystem) {
   );
   return {
     buildRequest(coreMessages, systemPrompt, body) {
-      const messages = hoistMidSystemMessages(coreToOpenai(coreMessages));
-      const withSys = injectOpenaiSystem(messages, [clientSystem, systemPrompt].filter((p2) => typeof p2 === "string" && p2.length > 0));
+      const messages = coreToOpenai(coreMessages);
+      const withSys = mergeSystemMessages(messages, [clientSystem, systemPrompt].filter((p2) => typeof p2 === "string" && p2.length > 0));
       return { ...body, messages: withSys };
     },
     async *parseStream(upstream, _round) {
@@ -56338,11 +56315,11 @@ function prepareOpenai(parsed, req, opts, core, config, prompts, log2, session,
     log2("info", diagNudge(turn, sessionId, tokenCount, config.modelContextLimit, parsed.model));
     processedMessages = stripKernelSummaries(turn.messages, turn.state);
     reapOrphanBlocks(session, msgs, deactivateBlock);
-    rebuiltMessages = hoistMidSystemMessages(coreToOpenai(processedMessages));
+    rebuiltMessages = coreToOpenai(processedMessages);
     const sysParts = [];
     if (systemText) sysParts.push(systemText);
     if (shouldInject) sysParts.push(buildCompressSystemPrompt(prompts));
-    rebuiltMessages = injectOpenaiSystem(rebuiltMessages, sysParts);
+    rebuiltMessages = mergeSystemMessages(rebuiltMessages, sysParts);
     if (injectTools) {
       toolsOut = injectOpenaiTool(parsed.tools);
     }
@@ -61421,6 +61398,120 @@ function livePidHoldsOverlay(overlay) {
   }
   return pid;
 }
+function linkOverlayEntry(realHome, overlay, entry) {
+  const target = path13.join(realHome, entry);
+  const link = path13.join(overlay, entry);
+  try {
+    fs10.symlinkSync(target, link);
+    return true;
+  } catch (err2) {
+    const code = err2.code;
+    if (code !== "EPERM" && code !== "EACCES" && code !== "EINVAL") return false;
+  }
+  let st2;
+  try {
+    st2 = fs10.lstatSync(target);
+  } catch {
+    return false;
+  }
+  if (st2.isDirectory()) {
+    try {
+      fs10.symlinkSync(target, link, "junction");
+      return true;
+    } catch {
+      return false;
+    }
+  }
+  try {
+    fs10.linkSync(target, link);
+    return true;
+  } catch {
+    try {
+      fs10.copyFileSync(target, link);
+      return true;
+    } catch {
+      return false;
+    }
+  }
+}
+function isWriteThroughHardlink(overlayPath, realPath, st2) {
+  if (st2.isDirectory() || st2.isSymbolicLink() || st2.nlink <= 1) return false;
+  try {
+    const realSt = fs10.lstatSync(realPath);
+    return st2.dev === realSt.dev && st2.ino === realSt.ino;
+  } catch {
+    return false;
+  }
+}
+function sqliteSetMembers(base) {
+  return [base, `${base}-wal`, `${base}-shm`];
+}
+function mergeSqliteSet(overlay, realHome, base) {
+  const members = sqliteSetMembers(base).filter((m2) => {
+    try {
+      return fs10.lstatSync(path13.join(overlay, m2)).isFile();
+    } catch {
+      return false;
+    }
+  });
+  if (members.length === 0) return true;
+  const undo = [];
+  const rollback = () => {
+    for (const step of undo.reverse()) {
+      try {
+        step();
+      } catch {
+      }
+    }
+    undo.length = 0;
+  };
+  try {
+    for (const m2 of members) {
+      const src = path13.join(overlay, m2);
+      const dst = path13.join(realHome, m2);
+      let dstStat;
+      try {
+        dstStat = fs10.lstatSync(dst);
+      } catch {
+      }
+      if (dstStat && dstStat.isDirectory()) {
+        rollback();
+        return false;
+      }
+      const srcStat = fs10.lstatSync(src);
+      if (dstStat && dstStat.mtimeMs >= srcStat.mtimeMs) {
+        try {
+          fs10.renameSync(src, `${dst}.bili-conflict`);
+        } catch {
+          rollback();
+          return false;
+        }
+        undo.push(() => fs10.renameSync(`${dst}.bili-conflict`, src));
+        continue;
+      }
+      if (dstStat) {
+        try {
+          fs10.renameSync(dst, `${dst}.bili-conflict`);
+        } catch {
+          rollback();
+          return false;
+        }
+        undo.push(() => fs10.renameSync(`${dst}.bili-conflict`, dst));
+      }
+      try {
+        fs10.renameSync(src, dst);
+      } catch {
+        rollback();
+        return false;
+      }
+      undo.push(() => fs10.renameSync(dst, src));
+    }
+    return true;
+  } catch {
+    rollback();
+    return false;
+  }
+}
 function refreshOverlayHome(realHome, overlay, generatedFile) {
   try {
     fs10.mkdirSync(overlay, { recursive: true });
@@ -61444,7 +61535,32 @@ function refreshOverlayHome(realHome, overlay, generatedFile) {
   } catch {
   }
   try {
-    for (const entry of fs10.readdirSync(overlay)) {
+    let overlayEntries;
+    try {
+      overlayEntries = fs10.readdirSync(overlay);
+    } catch {
+      overlayEntries = [];
+    }
+    const dbSets = [];
+    for (const entry of overlayEntries) {
+      if (!entry.endsWith(".db") || entry === generatedFile) continue;
+      const members = sqliteSetMembers(entry);
+      if (!members.some((m2) => m2 !== entry && overlayEntries.includes(m2))) continue;
+      let mainSt;
+      try {
+        mainSt = fs10.lstatSync(path13.join(overlay, entry));
+      } catch {
+      }
+      const keepSidecars = mainSt !== void 0 && isWriteThroughHardlink(path13.join(overlay, entry), path13.join(realHome, entry), mainSt);
+      dbSets.push({ base: entry, keepSidecars });
+    }
+    const skipEntries = /* @__PURE__ */ new Set();
+    for (const { base, keepSidecars } of dbSets) {
+      for (const m2 of sqliteSetMembers(base)) {
+        if (keepSidecars ? m2 !== base : true) skipEntries.add(m2);
+      }
+    }
+    for (const entry of overlayEntries) {
       if (entry === generatedFile) continue;
       const overlayPath = path13.join(overlay, entry);
       if (entry.startsWith(`.${generatedFile}.`) && entry.endsWith(".tmp")) {
@@ -61454,6 +61570,7 @@ function refreshOverlayHome(realHome, overlay, generatedFile) {
         }
         continue;
       }
+      if (skipEntries.has(entry)) continue;
       let st2;
       try {
         st2 = fs10.lstatSync(overlayPath);
@@ -61474,7 +61591,13 @@ function refreshOverlayHome(realHome, overlay, generatedFile) {
           }
         }
       } else if (realEntries.has(entry)) {
-        if (mergeOverlayEntry(overlayPath, path13.join(realHome, entry))) {
+        const realPath = path13.join(realHome, entry);
+        if (isWriteThroughHardlink(overlayPath, realPath, st2)) {
+          try {
+            fs10.unlinkSync(overlayPath);
+          } catch {
+          }
+        } else if (mergeOverlayEntry(overlayPath, realPath)) {
           try {
             fs10.rmSync(overlayPath, { recursive: true, force: true });
           } catch {
@@ -61484,12 +61607,47 @@ function refreshOverlayHome(realHome, overlay, generatedFile) {
         }
       }
     }
+    for (const { base, keepSidecars } of dbSets) {
+      if (keepSidecars) continue;
+      if (!mergeSqliteSet(overlay, realHome, base)) {
+        console.error(
+          `bili: could not merge the SQLite set ${base} / ${base}-wal / ${base}-shm into ${realHome} (the real db is likely open/locked) \u2014 kept in the overlay, retry on the next launch.`
+        );
+      }
+    }
+    let accessible = 0;
+    let total = 0;
+    const linkFailures = [];
     for (const entry of realEntries) {
       if (entry === generatedFile) continue;
+      total += 1;
+      const overlayPath = path13.join(overlay, entry);
+      let present = false;
       try {
-        fs10.symlinkSync(path13.join(realHome, entry), path13.join(overlay, entry));
+        fs10.lstatSync(overlayPath);
+        present = true;
       } catch {
       }
+      if (present) {
+        accessible += 1;
+        continue;
+      }
+      if (linkOverlayEntry(realHome, overlay, entry)) {
+        accessible += 1;
+      } else {
+        linkFailures.push(entry);
+      }
+    }
+    if (total > 0 && accessible === 0) {
+      console.error(
+        `bili: overlay ${overlay} is HOLLOW \u2014 none of ${total} real-home entries is reachable (on Windows, symlink creation is denied without Developer Mode and the junction/hardlink/copy fallbacks also failed). The client will start from its real home without the bili config rewrite.`
+      );
+      return false;
+    }
+    if (linkFailures.length > 0) {
+      console.error(
+        `bili: overlay ${overlay} \u2014 could not link ${linkFailures.length} entr${linkFailures.length === 1 ? "y" : "ies"}: ${linkFailures.join(", ")}. The client may miss those (on Windows, enable Developer Mode for full symlink support).`
+      );
     }
   } catch {
   }