omp-fabric 1.23.0 → 1.24.1

package/dist/chunks/{chunk-4J65SMNI.js → chunk-SWHJQ6XH.js}

@@ -8,7 +8,7 @@ import {
   loadTieredIndex,
   reconstructSessionLineage,
   searchMemoryIndex
-} from "./chunk-SDZXNTBF.js";
+} from "./chunk-B7HOWHPZ.js";
 import {
   compareLexical,
   normalizeMemoryPhrase,
@@ -23,17 +23,17 @@ import {
   overrideSessionDir,
   resolveScope,
   resolveSessionTarget
-} from "./chunk-MQSRZC2O.js";
+} from "./chunk-AEZ7VF5S.js";
 import {
   expandSessionEntriesChecked,
   normalizeSession
-} from "./chunk-BPMSLBX4.js";
+} from "./chunk-GE53G4VR.js";
 import {
   hash,
   hashLcmPayload,
   lcmRawAddress,
   lcmSummaryAddress
-} from "./chunk-NX2G7BRO.js";
+} from "./chunk-QW5LEEFV.js";
 
 // src/providers/memory-provider.ts
 import fs from "node:fs";
@@ -278,6 +278,33 @@ var isLowSurrogate = (code) => code >= 56320 && code <= 57343;
 var sourceKey = (entryId, contentHash) => `${entryId}:${contentHash}`;
 var activeBinding = (options, sessionId) => options.branchForSession?.(sessionId);
 var activeSourceSet = (binding) => binding?.activeSourceKeys === void 0 ? void 0 : new Set(binding.activeSourceKeys);
+var parseLcmRawAddress = (address) => {
+  const parts = address.split(":");
+  if (parts.length < 4 || parts[0] !== "lcm.raw") return void 0;
+  const revision = Number(parts.at(-1));
+  const entryId = parts.slice(2, -1).join(":");
+  const sessionId = parts[1];
+  if (!sessionId || !entryId || !Number.isSafeInteger(revision) || revision < 1) return void 0;
+  return { sessionId, entryId, revision };
+};
+var readTime = (value) => typeof value === "number" && Number.isFinite(value) ? value : void 0;
+var rawFilter = (args, query, mode) => {
+  const role = typeof args.role === "string" && args.role.length > 0 ? args.role : void 0;
+  const since = readTime(args.since);
+  const until = readTime(args.until);
+  const ranked = (query?.trim().length ?? 0) > 0 && mode !== "regex";
+  return {
+    search: {
+      ...role === void 0 ? { excludeRoles: ["custom"] } : { roles: [role] },
+      ...since === void 0 ? {} : { since },
+      ...until === void 0 ? {} : { until },
+      order: ranked ? "relevance" : "recent"
+    },
+    includeSummaries: role === void 0 || role === "compactionSummary",
+    ...since === void 0 ? {} : { since },
+    ...until === void 0 ? {} : { until }
+  };
+};
 var sessionScope = (args, currentSessionId) => {
   const scope = typeof args.scope === "string" && args.scope.startsWith("session:") ? args.scope.slice("session:".length) : void 0;
   return scope ?? currentSessionId;
@@ -384,29 +411,32 @@ var LcmMemoryAdapter = class {
     const branches = args.branches === "all" ? "all" : "active";
     const offset = typeof args.offset === "number" && args.offset >= 0 ? Math.floor(args.offset) : 0;
     const pageSize = typeof args.pageSize === "number" && args.pageSize >= 1 ? Math.min(50, Math.floor(args.pageSize)) : 10;
-    const selectedSession = sessionScope(args, this.options.currentSessionId);
+    const selectedSession = sessionScope(args, this.options.getCurrentSessionId?.());
+    const filter = rawFilter(args, query, mode);
     const reasons = /* @__PURE__ */ new Set();
     if (predicate.failure) reasons.add(predicate.failure);
-    const summaryHits = this.summaryHits(selectedSession, branches, predicate, reasons);
-    const raw = this.rawPage(selectedSession, branches, query, mode, match, predicate, offset, pageSize, reasons);
-    const hits = raw.hits;
-    const consumedPositions = offset + raw.consumed;
-    let summaryTaken = 0;
-    if (consumedPositions >= raw.total) {
-      const start = Math.max(0, consumedPositions - raw.total);
-      for (const hit of summaryHits.slice(start)) {
-        if (hits.length >= pageSize) break;
-        hits.push(hit);
-        summaryTaken += 1;
-      }
-    }
-    const total = raw.total + summaryHits.length;
-    const consumed = raw.consumed + summaryTaken;
-    const sessions = new Set(hits.map((hit) => hit.sessionId)).size;
+    const summaryHits = filter.includeSummaries ? this.summaryHits(selectedSession, branches, predicate, filter, reasons) : [];
+    const page = this.mergedPage({
+      search: {
+        ...selectedSession === void 0 ? {} : { sessionId: selectedSession },
+        ...query === void 0 ? {} : { query },
+        mode,
+        match,
+        ...filter.search
+      },
+      branches,
+      predicate,
+      summaryHits,
+      offset,
+      pageSize,
+      reasons
+    });
+    const total = page.rawTotal + summaryHits.length;
+    const sessions = new Set(page.hits.map((hit) => hit.sessionId)).size;
     return {
       total,
-      hits,
-      next: offset + consumed < total ? { ref: "memory.recall", args: { ...args, offset: offset + consumed } } : null,
+      hits: page.hits,
+      next: !page.exhausted && page.position < total ? { ref: "memory.recall", args: { ...args, offset: page.position } } : null,
       coverage: {
         complete: reasons.size === 0,
         indexedSessions: sessions,
@@ -417,48 +447,73 @@ var LcmMemoryAdapter = class {
       }
     };
   }
-  rawPage(selectedSession, branches, query, mode, match, predicate, offset, pageSize, reasons) {
-    const hits = [];
-    let consumed = 0;
-    let total = 0;
-    while (hits.length < pageSize && consumed < this.maxRaw) {
-      const limit = Math.min(Math.max(pageSize, 32), this.maxRaw - consumed);
-      const page = this.options.ledger.searchRaw({
-        ...selectedSession === void 0 ? {} : { sessionId: selectedSession },
-        ...query === void 0 ? {} : { query },
-        mode,
-        match,
-        offset: offset + consumed,
-        limit,
-        scanLimit: this.maxRaw
-      });
-      total = page.total;
+  mergedPage(input) {
+    const { search, branches, predicate, summaryHits, offset, pageSize, reasons } = input;
+    let batch = [];
+    let batchStart = 0;
+    let rawEnd = Number.POSITIVE_INFINITY;
+    let rawTotal = 0;
+    const rawAt = (position2) => {
+      if (position2 >= batchStart && position2 < batchStart + batch.length) return batch[position2 - batchStart];
+      if (position2 >= rawEnd) return void 0;
+      const limit = Math.max(pageSize, 32);
+      const page = this.options.ledger.searchRaw({ ...search, offset: position2, limit, scanLimit: this.maxRaw });
+      rawTotal = page.total;
       if (!page.complete) reasons.add("raw_search_incomplete");
-      if (page.rows.length === 0) break;
-      for (const entry of page.rows) {
-        consumed += 1;
-        const allowed = activeAllowed(branches, activeBinding(this.options, entry.sessionId), sourceKey(entry.entryId, entry.contentHash));
-        if (!allowed.allowed) {
-          if (allowed.reason) reasons.add(allowed.reason);
-          continue;
-        }
-        hits.push(this.rawHit(entry, predicate, branches));
-        if (hits.length >= pageSize) break;
+      batch = page.rows;
+      batchStart = position2;
+      if (page.rows.length < limit) rawEnd = position2 + page.rows.length;
+      return batch[0];
+    };
+    const hits = [];
+    let rawPosition = summaryHits.length === 0 ? offset : 0;
+    let summaryPosition = 0;
+    let position = rawPosition;
+    let emittedRaw = 0;
+    let headPosition = -1;
+    let headScore = 0;
+    let exhausted = false;
+    while (hits.length < pageSize) {
+      if (position >= offset && emittedRaw >= this.maxRaw) {
+        if (rawAt(rawPosition) !== void 0) reasons.add("raw_scan_limit");
+        break;
       }
-      if (page.rows.length < limit) break;
-    }
-    if (hits.length < pageSize && consumed >= this.maxRaw && offset + consumed < total) {
-      reasons.add("raw_scan_limit");
+      const entry = rawAt(rawPosition);
+      const summary = summaryHits[summaryPosition];
+      if (entry === void 0 && summary === void 0) {
+        exhausted = true;
+        break;
+      }
+      if (entry !== void 0 && headPosition !== rawPosition) {
+        headScore = predicate.scoreOf(entry.content);
+        headPosition = rawPosition;
+      }
+      const emit = position >= offset;
+      position += 1;
+      if (summary !== void 0 && (entry === void 0 || summary.score > headScore)) {
+        summaryPosition += 1;
+        if (emit) hits.push(summary);
+        continue;
+      }
+      rawPosition += 1;
+      if (!emit) continue;
+      emittedRaw += 1;
+      const allowed = activeAllowed(branches, activeBinding(this.options, entry.sessionId), sourceKey(entry.entryId, entry.contentHash));
+      if (!allowed.allowed) {
+        if (allowed.reason) reasons.add(allowed.reason);
+        continue;
+      }
+      hits.push(this.rawHit(entry, headScore, branches));
     }
-    return { hits, consumed, total };
+    return { hits, position, rawTotal, exhausted };
   }
-  rawHit(entry, predicate, branches) {
+  rawHit(entry, score, branches) {
     const preview = excerpt(entry.content);
     const address = lcmRawAddress(entry);
     return {
       kind: "lcm.raw",
       sessionId: entry.sessionId,
-      score: predicate.scoreOf(entry.content),
+      score,
       snippet: preview.snippet,
       truncated: preview.truncated,
       source: {
@@ -476,7 +531,7 @@ var LcmMemoryAdapter = class {
       }
     };
   }
-  summaryHits(selectedSession, branches, predicate, reasons) {
+  summaryHits(selectedSession, branches, predicate, filter, reasons) {
     const nodes = selectedSession === void 0 ? this.options.summaries.listNodes({ limit: this.maxSummary + 1 }) : this.options.summaries.listNodes({ sessionId: selectedSession, limit: this.maxSummary + 1 });
     if (nodes.length > this.maxSummary) reasons.add("summary_node_limit");
     const hits = [];
@@ -501,6 +556,8 @@ var LcmMemoryAdapter = class {
           continue;
         }
       }
+      if (filter.since !== void 0 && node.createdAt < filter.since) continue;
+      if (filter.until !== void 0 && node.createdAt > filter.until) continue;
       if (!predicate.matches(node.text)) continue;
       const preview = excerpt(node.text);
       hits.push({
@@ -731,12 +788,9 @@ var LcmMemoryAdapter = class {
     return { items, unavailable };
   }
   expandRaw(address, args, branches) {
-    const parts = address.split(":");
-    if (parts.length < 4 || parts[0] !== "lcm.raw") return { entries: [], next: null, error: { code: "invalid_address", message: "invalid LCM raw address" } };
-    const revision = Number(parts.at(-1));
-    const entryId = parts.slice(2, -1).join(":");
-    const sessionId = parts[1];
-    if (!sessionId || !entryId || !Number.isSafeInteger(revision) || revision < 1) return { entries: [], next: null, error: { code: "invalid_address", message: "invalid LCM raw address" } };
+    const parsed = parseLcmRawAddress(address);
+    if (!parsed) return { entries: [], next: null, error: { code: "invalid_address", message: "invalid LCM raw address" } };
+    const { sessionId, entryId, revision } = parsed;
     const entry = this.options.ledger.readRawEntry(sessionId, entryId, revision);
     if (!entry) return { entries: [], next: null, error: { code: "stale_pointer", message: "raw source is unavailable" } };
     const binding = activeBinding(this.options, sessionId);
@@ -1316,7 +1370,7 @@ var sessionsOutputSchema = {
 var descriptors = [
   {
     name: "recall",
-    description: "Search session memory as bounded ranked snippets. Literal queries rank any matching term by default; queryMatch all narrows to co-located terms. Call tools.call(hit.follow) for either an exact entry or a cold-session candidate, and tools.call(next) to continue.",
+    description: "Search session memory as bounded snippets. An empty query browses entries newest first; a literal or phrase query ranks by relevance, then recency. Literal queries accept any matching term by default; queryMatch all narrows to co-located terms. role:'user' finds the user's requests; since/until bound entry time in epoch ms. When the LCM ledger is active, recall reads it together with its summaries and skips tool bookkeeping entries (role custom) unless role:'custom' is given; entryRange, ref, provider, action, outcome, or tool switch recall to the session-file engine. Call tools.call(hit.follow) for either an exact entry or a cold-session candidate, and tools.call(next) to continue.",
     inputSchema: {
       type: "object",
       properties: {
@@ -1424,11 +1478,11 @@ var descriptors = [
   },
   {
     name: "expand",
-    description: "Read exact normalized session entries and nearby context as bounded lossless chunks. An lcm.summary: address returns the entries that summary was built from, each addressed for further expansion. Call tools.call(next) to continue, or use guest-side memory.walk(args, visitor) to traverse complete reassembled entries.",
+    description: "Read exact normalized session entries and nearby context as bounded lossless chunks. An lcm.raw: address reads that ledger entry; before/after add its neighbouring entries from the session file. An lcm.summary: address returns the entries that summary was built from, each addressed for further expansion. A bare session id or file path with indices, entryIds, entryRange, or operationAddresses reads absolute entry indices. Call tools.call(next) to continue, or use guest-side memory.walk(args, visitor) to traverse complete reassembled entries.",
     inputSchema: {
       type: "object",
       properties: {
-        session: { type: "string", description: "Exact session file path or unambiguous id." },
+        session: { type: "string", description: "Exact session file path, unambiguous session id, or an lcm.raw:/lcm.summary: address." },
         expectedSourceHash: {
           type: "string",
           description: "SHA-256 from a prior pointer; stale sources are refused."
@@ -1549,6 +1603,8 @@ var normalizeMemoryArgs = actionArgNormalizer(
   () => descriptors,
   MEMORY_ARG_NORMALIZATION
 );
+var SESSION_ENGINE_RECALL_KEYS = ["entryRange", "ref", "provider", "action", "outcome", "tool"];
+var isLcmAddress = (session) => typeof session === "string" && (session.startsWith("lcm.raw:") || session.startsWith("lcm.summary:"));
 var parseBranches = (value, action) => {
   if (value === void 0) return "active";
   if (value === "active" || value === "all") return value;
@@ -1725,12 +1781,14 @@ var MemoryProvider = class {
   }
   async invoke(actionName, args, invocationContext) {
     try {
-      if (this.context.lcm && (actionName === "recall" || actionName === "expand")) {
-        const adapter = this.lcmMemoryAdapter(this.context.lcm);
-        if (actionName === "expand") return adapter.expand(args);
+      const lcm = this.context.lcm;
+      if (lcm && actionName === "expand" && isLcmAddress(args.session)) {
+        return await this.expandLcm(this.lcmMemoryAdapter(lcm), args);
+      }
+      if (lcm && actionName === "recall" && !SESSION_ENGINE_RECALL_KEYS.some((key) => args[key] !== void 0)) {
         const queryMode = parseQueryMode(args.queryMode, "memory.recall");
         const queryMatch = parseQueryMatch(args.queryMatch, queryMode, "memory.recall");
-        return adapter.recall({ ...args, queryMode, queryMatch });
+        return this.lcmMemoryAdapter(lcm).recall({ ...args, queryMode, queryMatch });
       }
       switch (actionName) {
         case "recall":
@@ -1763,6 +1821,50 @@ var MemoryProvider = class {
       throw error;
     }
   }
+  async expandLcm(adapter, args) {
+    const single = adapter.expand(args);
+    const raw = parseLcmRawAddress(String(args.session));
+    const context = (value) => typeof value === "number" && Number.isSafeInteger(value) && value > 0 ? Math.min(value, EXPAND_MAX_CONTEXT) : 0;
+    const before = context(args.before);
+    const after = context(args.after);
+    if (!raw || before === 0 && after === 0 || single.error !== void 0) return single;
+    const unavailable = (message) => ({
+      ...single,
+      error: { code: "context_unavailable", message }
+    });
+    let ref;
+    try {
+      ref = resolveSessionTarget(this.context.agentDir, raw.sessionId, overrideSessionDir(this.context.sessionFile));
+    } catch (error) {
+      return unavailable(`Session ${raw.sessionId} did not resolve: ${error instanceof Error ? error.message : String(error)}`);
+    }
+    if (!ref) {
+      return unavailable(`Session file for ${raw.sessionId} is unavailable; returned the single ledger entry.`);
+    }
+    const {
+      session: _session,
+      expectedSourceHash: _expectedSourceHash,
+      expectedLineageFingerprint: _expectedLineageFingerprint,
+      indices: _indices,
+      entryIds: _entryIds,
+      operationAddresses: _operationAddresses,
+      entryRange: _entryRange,
+      entryOffset: _entryOffset,
+      textOffset: _textOffset,
+      ...rest
+    } = args;
+    let widened;
+    try {
+      widened = await this.expand({ ...rest, session: ref.file, entryIds: [raw.entryId], before, after });
+    } catch (error) {
+      return unavailable(`Context read failed: ${error instanceof Error ? error.message : String(error)}`);
+    }
+    if (widened.error !== void 0) {
+      const detail = widened.error;
+      return unavailable(`Entry ${raw.entryId} has no context in ${ref.file}: ${String(detail.message ?? "unreadable")}`);
+    }
+    return widened;
+  }
   async recall(args, invocationContext) {
     const query = typeof args.query === "string" ? args.query : void 0;
     const queryMode = parseQueryMode(args.queryMode, "memory.recall");
@@ -2467,4 +2569,4 @@ export {
   normalizeMemoryArgs,
   MemoryProvider
 };
-//# sourceMappingURL=chunk-4J65SMNI.js.map
+//# sourceMappingURL=chunk-SWHJQ6XH.js.map