billion-context-omp 0.2.1 → 0.2.3

package/README.md

@@ -77,7 +77,7 @@ omp's built-in `/compact` is intercepted and replaced by an ACP model-summarized
 |------|-------------|
 | `compress` | Replace a contiguous message range with a detailed summary |
 | `decompress` | Restore a previously compressed block's content (to file by default; `inline:true` for single messages) |
-| `search_context` | Search compressed block summaries (and visible messages) by keyword |
+| `search_context` | Search compressed block summaries and the original messages folded into them by keyword (visible messages are not indexed) |
 | `acp_status` | Show context usage, compressed blocks, compressible ranges |
 
 > The `acp_delegate` sub-agent subsystem from the Pi build is intentionally **not** registered — omp ships its own multi-agent orchestration, and duplicate delegation tools would conflict.

package/README.zh-CN.md

@@ -77,7 +77,7 @@ omp 内置的 `/compact` 被拦截，替换为 ACP 模型摘要式 compaction，
 |------|------|
 | `compress` | 把一段连续消息区间替换为详细摘要 |
 | `decompress` | 恢复之前压缩的块内容（默认写文件；单条消息可 `inline:true`） |
-| `search_context` | 按关键字搜索压缩块摘要（及可见消息） |
+| `search_context` | 按关键字搜索压缩块摘要及被折叠其中的原始消息（可见消息不建索引） |
 | `acp_status` | 显示上下文用量、压缩块、可压缩区间 |
 
 > Pi 版中的 `acp_delegate` 子代理系统在此**有意不注册**——omp 自带多代理编排，重复的委派工具会冲突。

package/dist/decompress-tool.d.ts

@@ -12,4 +12,5 @@ declare const DecompressParams: import("@oh-my-pi/omptype").FluentType<{
     toFile?: string | undefined;
 }>;
 export declare function makeDecompressTool(runtime: AcpRuntime): ToolDefinition<typeof DecompressParams>;
+export declare function pruneAutoFiles(): void;
 export {};

package/dist/index.js

@@ -2769,8 +2769,12 @@ function resolveConfig(adapter, liveContextLimit) {
   return config;
 }
 function parsePercent(v) {
-  const n = typeof v === "number" ? v : v.trim().endsWith("%") ? Number(v.trim().slice(0, -1)) / 100 : Number(v);
-  if (!Number.isFinite(n)) return 0;
+  const raw = typeof v === "number" ? v : v.trim().endsWith("%") ? Number(v.trim().slice(0, -1)) : Number(v);
+  if (!Number.isFinite(raw)) return 0;
+  const n = raw > 1 ? raw / 100 : raw;
+  if (n > 1 || n < 0) {
+    logWarn("config", { event: "percent-clamped", value: String(v), clamped: Math.min(1, Math.max(0, n)) });
+  }
   return Math.min(1, Math.max(0, n));
 }
 
@@ -3159,7 +3163,7 @@ function rangeFingerprints(ranges, coreMessages, byRef, blocks) {
 
 // src/runtime.ts
 function freshSlot(preserveFrom) {
-  const slot = { identities: [], foldedLen: 0, preview: false, state: createInitialState(), coreMessages: [], appliedCallIds: /* @__PURE__ */ new Set(), rejectStreak: 0 };
+  const slot = { identities: [], foldedLen: 0, preview: false, state: createInitialState(), coreMessages: [], appliedCallIds: /* @__PURE__ */ new Set(), rejectStreak: 0, lastRebuiltOutput: null };
   if (preserveFrom) {
     slot.state = { ...slot.state, nudge: preserveFrom.state.nudge };
     slot.rejectStreak = preserveFrom.rejectStreak;
@@ -3223,6 +3227,17 @@ function createRuntime(adapter) {
       slots.set(sid, slot);
     }
     const ids = stream.map(messageIdentity);
+    const lastOut = slot.lastRebuiltOutput;
+    if (lastOut !== null && ids.length === lastOut.length && ids.every((id, i) => id === lastOut[i])) {
+      const coreMessages2 = streamToCoreMessages(stream);
+      const originalById2 = /* @__PURE__ */ new Map();
+      stream.forEach((message, i) => originalById2.set(`p${i + 1}`, message));
+      slot.identities = ids;
+      slot.foldedLen = ids.length;
+      slot.coreMessages = coreMessages2;
+      debug.event("feedback-reuse", { sid, msgs: ids.length, blocks: slot.state.blocks.length });
+      return { state: slot.state, coreMessages: coreMessages2, originalById: originalById2, streamLen: ids.length };
+    }
     let lcp = 0;
     while (lcp < Math.min(ids.length, slot.identities.length) && ids[lcp] === slot.identities[lcp]) lcp++;
     if (lcp < slot.foldedLen) {
@@ -3311,6 +3326,10 @@ function createRuntime(adapter) {
     slot.state = state;
     if (toolCallId) slot.appliedCallIds.add(toolCallId);
   }
+  function recordRebuiltOutput(ctx, rebuilt) {
+    const slot = slotFor(sidOf(ctx));
+    slot.lastRebuiltOutput = rebuilt.map(messageIdentity);
+  }
   function noteCompressOutcome(ctx, ok) {
     const slot = slotFor(sidOf(ctx));
     slot.rejectStreak = ok ? 0 : slot.rejectStreak + 1;
@@ -3335,6 +3354,7 @@ function createRuntime(adapter) {
     foldStream,
     stateFor,
     commitFoldState,
+    recordRebuiltOutput,
     noteCompressOutcome,
     forgetSession,
     primeFold,
@@ -3435,11 +3455,13 @@ function makeCompressTool(runtime) {
 }
 async function handleCompress(args, runtime, ctx, toolCallId) {
   const ranges = args.content ?? [];
-  if (ranges.length === 0) return "No ranges provided.";
+  if (ranges.length === 0) {
+    return rejectionMessage(ctx, runtime, "No ranges provided. No changes applied \u2014 send content: [{ startId, endId, summary }].");
+  }
   const invalid = ranges.filter((r) => !r || typeof r.summary !== "string" || !r.summary.trim() || !r.startId || !r.endId);
   if (invalid.length > 0) {
     logWarn("compress", { sid: ctx.sessionManager.getSessionId(), event: "invalid-ranges", count: invalid.length });
-    return `Every range needs startId, endId and a summary (min 50 chars) \u2014 got ${invalid.length} range(s) missing fields. Re-send the FULL ranges array with summaries included.`;
+    return rejectionMessage(ctx, runtime, `Every range needs startId, endId and a summary (min 50 chars) \u2014 got ${invalid.length} range(s) missing fields. Re-send the FULL ranges array with summaries included. No changes applied \u2014 run acp_status for current refs.`);
   }
   const releaseLock = await runtime.acquireLock(ctx.sessionManager.getSessionId());
   try {
@@ -3550,10 +3572,12 @@ STOP: ${streak} compress calls rejected in a row. Do NOT retry the same range. R
 // src/decompress-tool.ts
 import { type as type2 } from "@oh-my-pi/omptype";
 import { writeFile, mkdir } from "fs/promises";
-import { realpathSync } from "fs";
+import { realpathSync, readdirSync, statSync as statSync2, unlinkSync } from "fs";
 import { resolve, relative, isAbsolute, join as join2, dirname as dirname2, basename } from "path";
 import { tmpdir } from "os";
-var AUTO_DIR = join2(homeDir() || tmpdir(), ".cache", "omp", "acp-decompress");
+function autoDir() {
+  return join2(homeDir() || tmpdir(), ".cache", "omp", "acp-decompress");
+}
 var PREVIEW_CHARS = 600;
 var MESSAGE_INLINE_THRESHOLD = 2e3;
 var DecompressParams = type2({
@@ -3618,7 +3642,31 @@ function resolveToFilePath(targetPath) {
   return resolved;
 }
 function autoFilePath(blockId) {
-  return join2(AUTO_DIR, `${blockId}-${Date.now()}.txt`);
+  return join2(autoDir(), `${blockId}-${Date.now()}.txt`);
+}
+var MAX_AUTO_FILES = 100;
+function pruneAutoFiles() {
+  const dir = autoDir();
+  try {
+    const files = readdirSync(dir).map((f) => {
+      try {
+        return { f, m: statSync2(join2(dir, f)).mtimeMs };
+      } catch {
+        return null;
+      }
+    }).filter((x) => x !== null);
+    if (files.length <= MAX_AUTO_FILES) return;
+    files.sort((a, b) => a.m - b.m);
+    const excess = files.slice(0, files.length - MAX_AUTO_FILES);
+    for (const { f } of excess) {
+      try {
+        unlinkSync(join2(dir, f));
+      } catch {
+      }
+    }
+    debug.event("decompress-pruned", { dir, removed: excess.length });
+  } catch {
+  }
 }
 function headPreview(text) {
   if (text.length <= PREVIEW_CHARS) return text;
@@ -3652,8 +3700,9 @@ ${text}`;
     logError("decompress", { sid: ctx.sessionManager.getSessionId(), event: "message-path-rejected", ref, toFile: args.toFile });
     return targetPath.error;
   }
-  await mkdir(AUTO_DIR, { recursive: true }).catch((e) => logError("decompress", { event: "mkdir-failed", dir: AUTO_DIR, error: e instanceof Error ? e.message : String(e) }));
+  await mkdir(autoDir(), { recursive: true }).catch((e) => logError("decompress", { event: "mkdir-failed", dir: autoDir(), error: e instanceof Error ? e.message : String(e) }));
   await writeFile(targetPath, text, "utf8");
+  if (!args.toFile) pruneAutoFiles();
   debug.event("decompress-message", { ref, ownerBlockId, mode: "file", path: targetPath, chars: text.length });
   logInfo("decompress", { sid: ctx.sessionManager.getSessionId(), event: "message", mode: "file", ref, ownerBlockId, path: targetPath, chars: text.length });
   return [
@@ -3695,8 +3744,9 @@ ${text}`;
     logError("decompress", { sid: ctx.sessionManager.getSessionId(), event: "block-path-rejected", blockId, toFile: args.toFile });
     return targetPath.error;
   }
-  await mkdir(AUTO_DIR, { recursive: true }).catch((e) => logError("decompress", { event: "mkdir-failed", dir: AUTO_DIR, error: e instanceof Error ? e.message : String(e) }));
+  await mkdir(autoDir(), { recursive: true }).catch((e) => logError("decompress", { event: "mkdir-failed", dir: autoDir(), error: e instanceof Error ? e.message : String(e) }));
   await writeFile(targetPath, text, "utf8");
+  if (!args.toFile) pruneAutoFiles();
   debug.event("decompress", { blockId, full, count, mode: "file", path: targetPath, chars: text.length });
   logInfo("decompress", { sid: ctx.sessionManager.getSessionId(), event: "block", mode: "file", blockId, full, count, path: targetPath, chars: text.length });
   const itemWord = count === 1 ? "item" : "items";
@@ -4508,7 +4558,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.1" ? `billion-context-omp@${"0.2.1"}` : void 0;
+  const versionStr = "0.2.3" ? `billion-context-omp@${"0.2.3"}` : void 0;
   return buildStatusPanel({
     version: versionStr,
     tokenCount: sessionTokens,
@@ -4893,7 +4943,7 @@ You have four context-management tools:
 
 - compress \u2014 Replace a contiguous range of older conversation with a single detailed summary you write. Use when content is genuinely consumed (no longer needed for the current task step). Single range: compress({ content: [{ topic: "Session Opener", startId: "m00150", endId: "m00220", summary: "..." }] }) \u2014 topic is recommended but optional. Batch (multiple unrelated ranges, each with its own topic): compress({ content: [{ topic: "Auth", startId: "m00150", endId: "m00220", summary: "..." }, { topic: "Deploy", startId: "m00300", endId: "m00350", summary: "..." }] }). Call it as a normal tool \u2014 summaries are plain string arguments.
 - decompress \u2014 Restore a previously compressed block's content. The block stays compressed \u2014 context and cache prefix are not disrupted. By DEFAULT content is written to an auto-generated file (avoids context bloat); use the read tool to view it. Pass inline:true to return content in the tool result instead (appends to context). full:true recurses to original messages. Example: decompress({ blockId: "b5" }) or decompress({ blockId: "b5", full: true }) or decompress({ blockId: "b5", inline: true }).
-- search_context \u2014 Search compressed block summaries (and optionally visible messages) by keyword. Use BEFORE decompressing to find the right block. Example: search_context({ query: "auth token refresh" }).
+- search_context \u2014 Search compressed block summaries AND the original messages folded into them by keyword (messages still visible in context are not indexed \u2014 you can already see them). Use BEFORE decompressing to find the right block. Example: search_context({ query: "auth token refresh" }).
 - acp_status \u2014 Context status with compressible ranges. No args = overview + totals. scope:"uncompressed" for range view; add view:"messages" for per-message listing. scope:"compressed" for block details.
 
 ${prompts.compressPhilosophy}
@@ -5051,9 +5101,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";
@@ -5061,7 +5146,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);
@@ -5111,7 +5196,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;
@@ -5181,7 +5266,7 @@ async function checkForUpdate(autoUpdate, notify) {
     const data = await res.json();
     const latest = data.version;
     if (!latest) return;
-    const current = runtimeVersion ?? "0.2.1";
+    const current = runtimeVersion ?? "0.2.3";
     const hasUpdate = isNewer(latest, current);
     debug.event("update-check", {
       current,
@@ -5211,25 +5296,25 @@ 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 as readdirSync2, unlinkSync as unlinkSync2 } from "fs";
 import * as path2 from "path";
 import { CONFIG_DIR_NAME as CONFIG_DIR_NAME4 } from "@oh-my-pi/pi-utils";
 var counters = {};
 var MAX_FILES_PER_PREFIX = 200;
 function pruneDumps(dir, prefixTest, seqOf) {
   try {
-    const files = readdirSync(dir).filter(prefixTest).map((f) => ({ f, n: seqOf(f) })).filter((x) => !Number.isNaN(x.n));
+    const files = readdirSync2(dir).filter(prefixTest).map((f) => ({ f, n: seqOf(f) })).filter((x) => !Number.isNaN(x.n));
     if (files.length <= MAX_FILES_PER_PREFIX) return;
     files.sort((a, b) => a.n - b.n);
     const excess = files.slice(0, files.length - MAX_FILES_PER_PREFIX);
     for (const { f } of excess) {
       try {
-        unlinkSync(path2.join(dir, f));
+        unlinkSync2(path2.join(dir, f));
       } catch {
       }
     }
@@ -5247,7 +5332,7 @@ function dumpContextMessages(messages, meta) {
     mkdirSync2(dir, { recursive: true });
     if (!(dir in counters)) {
       try {
-        const existing = readdirSync(dir).filter((f) => /^\d{4}\.json$/.test(f));
+        const existing = readdirSync2(dir).filter((f) => /^\d{4}\.json$/.test(f));
         const max = existing.reduce((mx, f) => {
           const n = parseInt(f, 10);
           return Number.isNaN(n) ? mx : Math.max(mx, n);
@@ -5261,7 +5346,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(),
@@ -5330,7 +5415,7 @@ function dumpProviderRequest(payload, meta) {
     mkdirSync2(dir, { recursive: true });
     if (!("req" in counters)) {
       try {
-        const existing = readdirSync(dir).filter((f) => /^req_\d+\.json$/.test(f));
+        const existing = readdirSync2(dir).filter((f) => /^req_\d+\.json$/.test(f));
         const max = existing.reduce((mx, f) => {
           const n = parseInt(f.slice(4, -5), 10);
           return Number.isNaN(n) ? mx : Math.max(mx, n);
@@ -5345,7 +5430,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(),
@@ -5369,10 +5454,11 @@ import * as path3 from "path";
 import { CONFIG_DIR_NAME as CONFIG_DIR_NAME5 } from "@oh-my-pi/pi-utils";
 async function loadUserConfig(cwd) {
   const home = homeDir();
+  const globalDir = join8(home, CONFIG_DIR_NAME5);
   const merged = {};
-  for (const base of [join7(home, CONFIG_DIR_NAME5), join7(cwd, CONFIG_DIR_NAME5)]) {
-    const file = join7(base, "acp-omp.json");
-    const allowPrompts = base.startsWith(home);
+  for (const base of [globalDir, join8(cwd, CONFIG_DIR_NAME5)]) {
+    const file = join8(base, "acp-omp.json");
+    const allowPrompts = base === globalDir;
     try {
       const raw = await fs.readFile(file, "utf8");
       const parsed = JSON.parse(raw);
@@ -5389,7 +5475,7 @@ async function loadUserConfig(cwd) {
   }
   return merged;
 }
-function join7(...parts) {
+function join8(...parts) {
   return path3.join(...parts);
 }
 var KNOWN = /* @__PURE__ */ new Set([
@@ -5497,7 +5583,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.1" : null });
+    logInfo("session", { event: "start", sid, cwd: ctx.cwd, debug: runtime.adapter.debug ?? null, version: true ? "0.2.3" : null });
+    const selfPath = import.meta.url;
+    const conflict = stampAndDetect(selfPath, true ? "0.2.3" : 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));
@@ -5527,6 +5624,7 @@ function wireSessionLifecycle(pi, runtime) {
 async function transformStream(ctx, runtime, input, mode) {
   const sid = ctx.sessionManager.getSessionId();
   const release = await runtime.acquireLock(sid);
+  let result;
   try {
     if (input.length === 0) {
       debug.event("empty-stream-bypass", { sid });
@@ -5632,21 +5730,25 @@ ${rendered.text}${example}`);
         }
       }
     }
+    if (mode === "context") {
+      runtime.recordRebuiltOutput(ctx, rebuilt);
+    }
     dumpContextMessages(rebuilt, {
       sid,
       injected: nudgeInjected,
       emergency: turn.nudge?.breakdown?.emergencyOverride === 1
     });
-    await checkForUpdate(runtime.adapter.autoUpdate ?? true, (msg) => {
-      if (ctx.hasUI) ctx.ui.notify(msg);
-    });
-    return { rebuilt, nudgeInjected };
+    result = { rebuilt, nudgeInjected };
   } catch (e) {
     logThrow("context", e, { sid, phase: "transform", mode });
     throw e;
   } finally {
     release();
   }
+  await checkForUpdate(runtime.adapter.autoUpdate ?? true, (msg) => {
+    if (ctx.hasUI) ctx.ui.notify(msg);
+  });
+  return result;
 }
 function wireContextTransform(pi, runtime) {
   pi.on("context", async (event, ctx) => {