billion-context-omp 0.2.0 → 0.2.2

package/dist/index.js

@@ -3166,6 +3166,15 @@ function freshSlot(preserveFrom) {
   }
   return slot;
 }
+function isViewFlip(foldedLen, lcp) {
+  return foldedLen > 0 && lcp >= Math.floor(foldedLen / 2);
+}
+function preserveCompressedSlot(prev) {
+  const slot = freshSlot(prev);
+  slot.state = { ...slot.state, blocks: prev.state.blocks, messageRefs: prev.state.messageRefs, stats: prev.state.stats };
+  slot.appliedCallIds = new Set(prev.appliedCallIds);
+  return slot;
+}
 function stateHasCompressCall(state, callId) {
   return state.blocks.some((b) => b.compressCallId === callId);
 }
@@ -3217,8 +3226,9 @@ function createRuntime(adapter) {
     let lcp = 0;
     while (lcp < Math.min(ids.length, slot.identities.length) && ids[lcp] === slot.identities[lcp]) lcp++;
     if (lcp < slot.foldedLen) {
-      debug.event("fold-refold", { sid, foldedLen: slot.foldedLen, lcp, streamLen: ids.length });
-      slot = freshSlot(slot);
+      const flip = isViewFlip(slot.foldedLen, lcp);
+      debug.event("fold-refold", { sid, foldedLen: slot.foldedLen, lcp, streamLen: ids.length, flip });
+      slot = flip ? preserveCompressedSlot(slot) : freshSlot(slot);
       slots.set(sid, slot);
       lcp = 0;
     }
@@ -3244,6 +3254,7 @@ function createRuntime(adapter) {
           debug.event("fold-replay-skipped", { sid, callId: call.id });
           continue;
         }
+        if (slot.appliedCallIds.has(call.id) || stateHasCompressCall(slot.state, call.id)) continue;
         const stale = call.ranges.map((r, ri) => staleRange(r, ri, resultText, coreMessages, i, slot.state.messageRefs.byRef, slot.state.blocks)).find((s) => s !== false);
         if (stale) {
           debug.event("fold-replay-stale", { sid, callId: call.id, reason: stale });
@@ -4497,7 +4508,7 @@ async function statusReport(runtime, ctx) {
   const coveredIds = collectCoveredMessageIds(state);
   const sentTokens = estimateTokens(coreMessages, coveredIds) + systemPromptTokens;
   const turn = runtime.core.processTurn({ messages: coreMessages, state, config, tokenCount: sentTokens });
-  const versionStr = "0.2.0" ? `billion-context-omp@${"0.2.0"}` : void 0;
+  const versionStr = "0.2.2" ? `billion-context-omp@${"0.2.2"}` : void 0;
   return buildStatusPanel({
     version: versionStr,
     tokenCount: sessionTokens,
@@ -5040,9 +5051,44 @@ function wireToolGuardrails(pi, runtime) {
   });
 }
 
+// src/instance-guard.ts
+import { readFileSync as readFileSync2, writeFileSync } from "fs";
+import { join as join4 } from "path";
+var MARKER_FILE = ".billion-context-omp-instance.json";
+var FRESH_MS = 6e4;
+function markerPath() {
+  return join4(homeDir(), ".omp", MARKER_FILE);
+}
+function readMarker() {
+  try {
+    const raw = JSON.parse(readFileSync2(markerPath(), "utf8"));
+    if (typeof raw?.path === "string" && typeof raw?.ts === "number") return raw;
+  } catch {
+  }
+  return void 0;
+}
+function detectDualInstance(selfPath, now = Date.now()) {
+  const m = readMarker();
+  if (!m) return void 0;
+  if (m.path === selfPath) return void 0;
+  if (now - m.ts > FRESH_MS) return void 0;
+  return m;
+}
+function stampInstance(selfPath, version, pid = process.pid, now = Date.now()) {
+  try {
+    writeFileSync(markerPath(), JSON.stringify({ path: selfPath, version, pid, ts: now }));
+  } catch {
+  }
+}
+function stampAndDetect(selfPath, version, now = Date.now()) {
+  const conflict = detectDualInstance(selfPath, now);
+  stampInstance(selfPath, version, void 0, now);
+  return conflict;
+}
+
 // src/update.ts
 import { readFile, writeFile as writeFile2, mkdir as mkdir2 } from "fs/promises";
-import { join as join4, dirname as dirname3 } from "path";
+import { join as join5, dirname as dirname3 } from "path";
 import { fileURLToPath } from "url";
 import { execFile } from "child_process";
 import { CONFIG_DIR_NAME as CONFIG_DIR_NAME3 } from "@oh-my-pi/pi-utils";
@@ -5050,7 +5096,7 @@ var PACKAGE_NAME = "billion-context-omp";
 var REGISTRY_URL = `https://registry.npmjs.org/${PACKAGE_NAME}/latest`;
 var SEMVER_RE = /^\d+\.\d+\.\d+(?:[-+][0-9A-Za-z-.]+)?$/;
 var CHECK_INTERVAL_MS = 3 * 60 * 1e3;
-var throttleFile = () => join4(homeDir(), CONFIG_DIR_NAME3, ".billion-context-omp-update-check");
+var throttleFile = () => join5(homeDir(), CONFIG_DIR_NAME3, ".billion-context-omp-update-check");
 var updateInFlight = false;
 function parseVersion(v) {
   return v.replace(/^v/, "").split(".").map((n) => parseInt(n, 10) || 0);
@@ -5100,7 +5146,7 @@ function findNpmRoot(extDir) {
 async function findExtensionDir() {
   let dir = dirname3(fileURLToPath(import.meta.url));
   for (; ; ) {
-    const pkg = await readPackageJson(join4(dir, "package.json"));
+    const pkg = await readPackageJson(join5(dir, "package.json"));
     if (pkg?.name === PACKAGE_NAME) return dir;
     const parent = dirname3(dir);
     if (parent === dir) return void 0;
@@ -5170,7 +5216,7 @@ async function checkForUpdate(autoUpdate, notify) {
     const data = await res.json();
     const latest = data.version;
     if (!latest) return;
-    const current = runtimeVersion ?? "0.2.0";
+    const current = runtimeVersion ?? "0.2.2";
     const hasUpdate = isNewer(latest, current);
     debug.event("update-check", {
       current,
@@ -5200,12 +5246,12 @@ async function checkForUpdate(autoUpdate, notify) {
 async function getRuntimeVersion() {
   const extDir = await findExtensionDir();
   if (!extDir) return void 0;
-  const pkg = await readPackageJson(join4(extDir, "package.json"));
+  const pkg = await readPackageJson(join5(extDir, "package.json"));
   return pkg?.version;
 }
 
 // src/dump.ts
-import { mkdirSync as mkdirSync2, writeFileSync, readdirSync, unlinkSync } from "fs";
+import { mkdirSync as mkdirSync2, writeFileSync as writeFileSync2, readdirSync, unlinkSync } from "fs";
 import * as path2 from "path";
 import { CONFIG_DIR_NAME as CONFIG_DIR_NAME4 } from "@oh-my-pi/pi-utils";
 var counters = {};
@@ -5250,7 +5296,7 @@ function dumpContextMessages(messages, meta) {
     counters[dir] = seq + 1;
     const name = `${String(seq).padStart(4, "0")}.json`;
     const fullPath = path2.join(dir, name);
-    writeFileSync(
+    writeFileSync2(
       fullPath,
       JSON.stringify({
         ts: (/* @__PURE__ */ new Date()).toISOString(),
@@ -5334,7 +5380,7 @@ function dumpProviderRequest(payload, meta) {
     const name = `req_${String(seq).padStart(4, "0")}.json`;
     const fullPath = path2.join(dir, name);
     const summary = summarizeProviderPayload(payload);
-    writeFileSync(
+    writeFileSync2(
       fullPath,
       JSON.stringify({
         ts: (/* @__PURE__ */ new Date()).toISOString(),
@@ -5359,8 +5405,8 @@ import { CONFIG_DIR_NAME as CONFIG_DIR_NAME5 } from "@oh-my-pi/pi-utils";
 async function loadUserConfig(cwd) {
   const home = homeDir();
   const merged = {};
-  for (const base of [join7(home, CONFIG_DIR_NAME5), join7(cwd, CONFIG_DIR_NAME5)]) {
-    const file = join7(base, "acp-omp.json");
+  for (const base of [join8(home, CONFIG_DIR_NAME5), join8(cwd, CONFIG_DIR_NAME5)]) {
+    const file = join8(base, "acp-omp.json");
     const allowPrompts = base.startsWith(home);
     try {
       const raw = await fs.readFile(file, "utf8");
@@ -5378,7 +5424,7 @@ async function loadUserConfig(cwd) {
   }
   return merged;
 }
-function join7(...parts) {
+function join8(...parts) {
   return path3.join(...parts);
 }
 var KNOWN = /* @__PURE__ */ new Set([
@@ -5486,7 +5532,18 @@ function wireCompactionDisable(pi, runtime) {
 function wireSessionLifecycle(pi, runtime) {
   pi.on("session_start", async (_event, ctx) => {
     const sid = ctx.sessionManager.getSessionId();
-    logInfo("session", { event: "start", sid, cwd: ctx.cwd, debug: runtime.adapter.debug ?? null, version: true ? "0.2.0" : null });
+    logInfo("session", { event: "start", sid, cwd: ctx.cwd, debug: runtime.adapter.debug ?? null, version: true ? "0.2.2" : null });
+    const selfPath = import.meta.url;
+    const conflict = stampAndDetect(selfPath, true ? "0.2.2" : null);
+    if (conflict) {
+      logWarn("instance", { event: "dual-instance", self: selfPath, other: conflict.path, otherPid: conflict.pid, otherVersion: conflict.version });
+      try {
+        if (ctx.hasUI) {
+          ctx.ui.notify(`\u26A0 billion-context-omp loaded TWICE (also from ${conflict.path}). Two instances corrupt compression state \u2014 remove one (check 'omp plugin list' vs config.yml extensions).`);
+        }
+      } catch {
+      }
+    }
     try {
       const user = await loadUserConfig(ctx.cwd);
       runtime.setAdapter(applyUserConfig(runtime.adapter, user));