@cortexkit/opencode-magic-context 0.13.0 → 0.13.2

package/README.md

@@ -335,7 +335,7 @@ On startup, Magic Context checks for common configuration problems — OpenCode'
 A companion desktop app for browsing and managing Magic Context state outside of OpenCode.
 
 <p align="center">
-   <a href="https://github.com/cortexkit/opencode-magic-context/releases/tag/dashboard-v0.2.8"><strong>⬇️ Download for macOS · Windows · Linux</strong></a></p>
+   <a href="https://github.com/cortexkit/opencode-magic-context/releases/tag/dashboard-v0.3.0"><strong>⬇️ Download for macOS · Windows · Linux</strong></a></p>
 
 **Features:**
 - **Memory Browser** — search, filter, and edit project memories with category and project filtering

package/dist/cli/prompts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prompts.d.ts","sourceRoot":"","sources":["../../src/cli/prompts.ts"],"names":[],"mappings":"AAAA,OAAO,EAGH,KAAK,EAEL,GAAG,EACH,IAAI,EACJ,KAAK,EAEL,OAAO,EACV,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;AAS5C,wBAAsB,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,UAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAOlF;AAED,wBAAsB,IAAI,CACtB,OAAO,EAAE,MAAM,EACf,OAAO,GAAE;IACL,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC;CAC/C,GACP,OAAO,CAAC,MAAM,CAAC,CAejB;AAED,wBAAsB,SAAS,CAC3B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,OAAO,CAAA;CAAE,EAAE,GACnE,OAAO,CAAC,MAAM,CAAC,CAWjB"}
+{"version":3,"file":"prompts.d.ts","sourceRoot":"","sources":["../../src/cli/prompts.ts"],"names":[],"mappings":"AAAA,OAAO,EAGH,KAAK,EAEL,GAAG,EACH,IAAI,EACJ,KAAK,EAEL,OAAO,EACV,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;AAiC5C,wBAAsB,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,UAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAOlF;AAED,wBAAsB,IAAI,CACtB,OAAO,EAAE,MAAM,EACf,OAAO,GAAE;IACL,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC;CAC/C,GACP,OAAO,CAAC,MAAM,CAAC,CAejB;AAED,wBAAsB,SAAS,CAC3B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,OAAO,CAAA;CAAE,EAAE,GACnE,OAAO,CAAC,MAAM,CAAC,CAWjB"}

package/dist/features/magic-context/memory/embedding.d.ts

@@ -8,10 +8,29 @@ export declare function embedText(text: string): Promise<Float32Array | null>;
 export declare function embedBatch(texts: string[]): Promise<(Float32Array | null)[]>;
 export declare function embedUnembeddedMemories(db: Database, projectPath: string, config: EmbeddingConfig, batchSize?: number): Promise<number>;
 /**
- * Sweep ALL projects for unembedded memories, not just one project.
- * Used by the dream timer to ensure cross-project embedding coverage.
+ * Sweep ALL projects for unembedded memories, draining each fully before
+ * moving to the next. Projects are ordered by most-recent memory activity
+ * (MAX(updated_at)), so the project you're actively working in gets
+ * embedded first after a provider switch.
+ *
+ * Within one invocation:
+ *   - Each project is drained in batches of `batchSize` until `embedUnembeddedMemoriesForProject`
+ *     returns 0 (nothing left, or a batch failure).
+ *   - Wall-clock deadline + consecutive-empty fail-safe prevent runaway
+ *     or infinite looping when the provider is unhealthy.
+ *
+ * Between invocations:
+ *   - The module-level `sweepInProgress` flag guards against parallel runs
+ *     from the same process. If a sweep is still running when the next
+ *     15-min tick fires, that tick is a no-op.
+ *
+ * Used by the dream timer for proactive embedding coverage. After a
+ * provider change wipes embeddings, this path drains the full backlog on
+ * a single tick (bounded by wall clock) instead of trickling 10/15min.
  */
 export declare function embedAllUnembeddedMemories(db: Database, config: EmbeddingConfig, batchSize?: number): Promise<number>;
+/** Test-only: reset the in-progress guard. */
+export declare function _resetEmbeddingSweepGuard(): void;
 export declare function getEmbeddingModelId(): string;
 export { cosineSimilarity };
 export declare function disposeEmbeddingModel(): Promise<void>;

package/dist/features/magic-context/memory/embedding.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"embedding.d.ts","sourceRoot":"","sources":["../../../../src/features/magic-context/memory/embedding.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAG5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AA0GvD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,eAAe,GAAG,IAAI,CAmBjE;AAED,wBAAgB,kBAAkB,IAAI,OAAO,CAE5C;AAED,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,OAAO,CAAC,CAO7D;AAED,wBAAsB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAW1E;AAED,wBAAsB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,YAAY,GAAG,IAAI,CAAC,EAAE,CAAC,CAelF;AAED,wBAAsB,uBAAuB,CACzC,EAAE,EAAE,QAAQ,EACZ,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,eAAe,EACvB,SAAS,SAAK,GACf,OAAO,CAAC,MAAM,CAAC,CAEjB;AAED;;;GAGG;AACH,wBAAsB,0BAA0B,CAC5C,EAAE,EAAE,QAAQ,EACZ,MAAM,EAAE,eAAe,EACvB,SAAS,SAAK,GACf,OAAO,CAAC,MAAM,CAAC,CAwBjB;AAmDD,wBAAgB,mBAAmB,IAAI,MAAM,CAE5C;AAED,OAAO,EAAE,gBAAgB,EAAE,CAAC;AAE5B,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC,CAS3D"}
+{"version":3,"file":"embedding.d.ts","sourceRoot":"","sources":["../../../../src/features/magic-context/memory/embedding.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AAG5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AA0GvD,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,eAAe,GAAG,IAAI,CAmBjE;AAED,wBAAgB,kBAAkB,IAAI,OAAO,CAE5C;AAED,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,OAAO,CAAC,CAO7D;AAED,wBAAsB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC,CAW1E;AAED,wBAAsB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC,YAAY,GAAG,IAAI,CAAC,EAAE,CAAC,CAelF;AAED,wBAAsB,uBAAuB,CACzC,EAAE,EAAE,QAAQ,EACZ,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,eAAe,EACvB,SAAS,SAAK,GACf,OAAO,CAAC,MAAM,CAAC,CAEjB;AAgBD;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAsB,0BAA0B,CAC5C,EAAE,EAAE,QAAQ,EACZ,MAAM,EAAE,eAAe,EACvB,SAAS,SAAK,GACf,OAAO,CAAC,MAAM,CAAC,CAsEjB;AAED,8CAA8C;AAC9C,wBAAgB,yBAAyB,IAAI,IAAI,CAEhD;AAmDD,wBAAgB,mBAAmB,IAAI,MAAM,CAE5C;AAED,OAAO,EAAE,gBAAgB,EAAE,CAAC;AAE5B,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC,CAS3D"}

package/dist/hooks/magic-context/compartment-runner-compressor.d.ts

@@ -22,7 +22,6 @@ interface ScoredCompartment {
     index: number;
     tokenEstimate: number;
     averageDepth: number;
-    score: number;
 }
 /**
  * Check if the compartment block exceeds the history budget and run a compression pass if needed.
@@ -40,23 +39,44 @@ interface SelectionConstraints {
     floorHeadroom: number;
 }
 /**
- * Find the oldest contiguous band of compartments that share the same rounded depth.
+ * Pick a contiguous same-depth band of compartments to compress next.
  *
- * Strategy: scan oldest→newest (low index first). Skip compartments at max depth,
- * and skip the newest `graceCompartments` (grace period). Within the remaining
- * scope, find the oldest run of 2+ consecutive compartments with the SAME rounded
- * averageDepth. This keeps per-pass work uniform (same LLM prompt tier for all
- * inputs) and naturally progresses: depth 0 bands get compressed first, producing
- * depth 1 bands, which compress next, etc.
+ * Strategy (depth-first, oldest-within-tier):
+ *   1. Eligible scope = [0, scored.length - graceCompartments).
+ *      Newest `graceCompartments` are never compressed (protects just-published
+ *      historian output).
+ *   2. Within eligible scope, ignore compartments whose rounded depth is
+ *      already at `maxMergeDepth` — they're done.
+ *   3. Find the **minimum** depth tier that still exists in scope.
+ *   4. Anchor on the **oldest** compartment at that minimum depth (lowest
+ *      index). Extend forward while the next compartment has the same rounded
+ *      depth, stopping at maxPickable / floorHeadroom / scope end.
+ *   5. Require runLen ≥ 2. If the oldest minimum-depth compartment can't form
+ *      a run (neighbor has a different depth), the algorithm would stall —
+ *      so fall back to finding the *next* oldest compartment at minDepth and
+ *      retry. This preserves the old "skip singleton and move on" safety
+ *      without abandoning the min-depth invariant.
  *
- * Constraints:
- * - Skip compartments with averageDepth >= maxMergeDepth (already maxed out).
- * - Skip the newest graceCompartments (never compress fresh work).
- * - Cap picks at maxPickable to avoid huge LLM inputs.
- * - Cap picks at floorHeadroom to avoid violating min-compartment floor. Each
- *   merge reduces count by (input - output), so limiting picks to floorHeadroom
- *   guarantees we can't fall below floor even in the worst case (output = 1).
+ * Why this shape:
+ *   The previous algorithm was oldest-first regardless of depth. After the
+ *   first pass compressed seq 0-14 to depth 1, the next pass picked seq 0-X
+ *   AGAIN because they were still the oldest. The cascade ran depth 0→1→2→
+ *   3→4→5 on the same range within hours, crushing early compartments to
+ *   empty title-only shells while the rest of history stayed at depth 0.
+ *
+ *   Depth-first selection means: once seq 0-14 reach depth 1, the next pass
+ *   prefers any depth-0 band elsewhere (seq 15+) before touching seq 0-14
+ *   again. Old→new gets pushed down one tier at a time, producing a smooth
+ *   depth gradient (old = deeper, recent = shallower) like memory decay.
+ *
+ *   Grace window still protects the newest N from compression entirely so
+ *   freshly-published historian output has time to settle.
+ */
+export declare function selectCompressionBand(scored: ScoredCompartment[], constraints: SelectionConstraints): ScoredCompartment[];
+/**
+ * @deprecated Use {@link selectCompressionBand}. Kept as an export for the
+ * existing test suite that targets the older naming; semantics are identical.
  */
-export declare function findOldestContiguousSameDepthBand(scored: ScoredCompartment[], constraints: SelectionConstraints): ScoredCompartment[];
+export declare const findOldestContiguousSameDepthBand: typeof selectCompressionBand;
 export {};
 //# sourceMappingURL=compartment-runner-compressor.d.ts.map

package/dist/hooks/magic-context/compartment-runner-compressor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compartment-runner-compressor.d.ts","sourceRoot":"","sources":["../../../src/hooks/magic-context/compartment-runner-compressor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAS3C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kDAAkD,CAAC;AAQpF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAaxD,MAAM,WAAW,cAAc;IAC3B,MAAM,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAC;IAChC,EAAE,EAAE,QAAQ,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,wEAAwE;IACxE,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,2EAA2E;IAC3E,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,mEAAmE;IACnE,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,wEAAwE;IACxE,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAaD,UAAU,iBAAiB;IACvB,WAAW,EAAE,WAAW,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;CACjB;AAED;;;GAGG;AACH,wBAAsB,0BAA0B,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,CAqKvF;AAoCD,UAAU,oBAAoB;IAC1B,yDAAyD;IACzD,WAAW,EAAE,MAAM,CAAC;IACpB,2DAA2D;IAC3D,aAAa,EAAE,MAAM,CAAC;IACtB,oEAAoE;IACpE,iBAAiB,EAAE,MAAM,CAAC;IAC1B,uFAAuF;IACvF,aAAa,EAAE,MAAM,CAAC;CACzB;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,iCAAiC,CAC7C,MAAM,EAAE,iBAAiB,EAAE,EAC3B,WAAW,EAAE,oBAAoB,GAClC,iBAAiB,EAAE,CA6CrB"}
+{"version":3,"file":"compartment-runner-compressor.d.ts","sourceRoot":"","sources":["../../../src/hooks/magic-context/compartment-runner-compressor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAS3C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kDAAkD,CAAC;AAQpF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAkBxD,MAAM,WAAW,cAAc;IAC3B,MAAM,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAC;IAChC,EAAE,EAAE,QAAQ,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,wEAAwE;IACxE,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,2EAA2E;IAC3E,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,mEAAmE;IACnE,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,wEAAwE;IACxE,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC9B;AAaD,UAAU,iBAAiB;IACvB,WAAW,EAAE,WAAW,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;CACxB;AAED;;;GAGG;AACH,wBAAsB,0BAA0B,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,CAyLvF;AAiCD,UAAU,oBAAoB;IAC1B,yDAAyD;IACzD,WAAW,EAAE,MAAM,CAAC;IACpB,2DAA2D;IAC3D,aAAa,EAAE,MAAM,CAAC;IACtB,oEAAoE;IACpE,iBAAiB,EAAE,MAAM,CAAC;IAC1B,uFAAuF;IACvF,aAAa,EAAE,MAAM,CAAC;CACzB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,wBAAgB,qBAAqB,CACjC,MAAM,EAAE,iBAAiB,EAAE,EAC3B,WAAW,EAAE,oBAAoB,GAClC,iBAAiB,EAAE,CA4DrB;AAED;;;GAGG;AACH,eAAO,MAAM,iCAAiC,8BAAwB,CAAC"}

package/dist/index.js

@@ -16871,19 +16871,52 @@ async function embedBatch(texts) {
   return currentProvider.embedBatch(texts);
 }
 async function embedAllUnembeddedMemories(db, config2, batchSize = 10) {
-  const resolvedConfig = resolveEmbeddingConfig(config2);
-  if (resolvedConfig.provider === "off")
+  if (sweepInProgress) {
+    log("[magic-context] embedding sweep already in progress, skipping this tick");
     return 0;
-  const projects = db.prepare(`SELECT DISTINCT m.project_path FROM memories m
-             WHERE m.status IN ('active', 'permanent')
-             AND m.id NOT IN (SELECT memory_id FROM memory_embeddings)
-             LIMIT 20`).all();
-  let total = 0;
-  for (const row of projects) {
-    const count = await embedUnembeddedMemoriesForProject(db, row.project_path, config2, batchSize);
-    total += count;
   }
-  return total;
+  sweepInProgress = true;
+  const startedAt = Date.now();
+  const deadline = startedAt + SWEEP_MAX_WALL_CLOCK_MS;
+  try {
+    const resolvedConfig = resolveEmbeddingConfig(config2);
+    if (resolvedConfig.provider === "off")
+      return 0;
+    const projects = db.prepare(`SELECT m.project_path, MAX(m.updated_at) AS latest
+                 FROM memories m
+                 WHERE m.status IN ('active', 'permanent')
+                 AND m.id NOT IN (SELECT memory_id FROM memory_embeddings)
+                 GROUP BY m.project_path
+                 ORDER BY latest DESC
+                 LIMIT 20`).all();
+    let total = 0;
+    let consecutiveEmpty = 0;
+    outer:
+      for (const project of projects) {
+        while (Date.now() < deadline) {
+          const count = await embedUnembeddedMemoriesForProject(db, project.project_path, config2, batchSize);
+          if (count === 0) {
+            consecutiveEmpty += 1;
+            if (consecutiveEmpty >= SWEEP_MAX_CONSECUTIVE_EMPTY) {
+              log(`[magic-context] embedding sweep: ${SWEEP_MAX_CONSECUTIVE_EMPTY} consecutive empty batches, stopping (total=${total})`);
+              break outer;
+            }
+            break;
+          }
+          consecutiveEmpty = 0;
+          total += count;
+          if (count < batchSize)
+            break;
+        }
+        if (Date.now() >= deadline) {
+          log(`[magic-context] embedding sweep: wall-clock deadline reached after ${((Date.now() - startedAt) / 1000).toFixed(1)}s (total=${total})`);
+          break;
+        }
+      }
+    return total;
+  } finally {
+    sweepInProgress = false;
+  }
 }
 async function embedUnembeddedMemoriesForProject(db, projectPath, config2, batchSize = 10) {
   const normalizedBatchSize = Math.max(1, Math.floor(batchSize));
@@ -16922,7 +16955,7 @@ async function embedUnembeddedMemoriesForProject(db, projectPath, config2, batch
 function getEmbeddingModelId() {
   return getOrCreateProvider()?.modelId ?? "off";
 }
-var DEFAULT_EMBEDDING_CONFIG, embeddingConfig, provider = null, loadUnembeddedMemoriesStatements;
+var DEFAULT_EMBEDDING_CONFIG, embeddingConfig, provider = null, loadUnembeddedMemoriesStatements, SWEEP_MAX_WALL_CLOCK_MS, SWEEP_MAX_CONSECUTIVE_EMPTY = 3, sweepInProgress = false;
 var init_embedding = __esm(() => {
   init_magic_context();
   init_logger();
@@ -16935,6 +16968,7 @@ var init_embedding = __esm(() => {
   };
   embeddingConfig = DEFAULT_EMBEDDING_CONFIG;
   loadUnembeddedMemoriesStatements = new WeakMap;
+  SWEEP_MAX_WALL_CLOCK_MS = 10 * 60 * 1000;
 });
 
 // src/features/magic-context/compression-depth-storage.ts
@@ -153507,12 +153541,23 @@ ${c.content}
   const maxCompartmentsPerPass = deps.maxCompartmentsPerPass ?? DEFAULT_COMPRESSOR_MAX_COMPARTMENTS_PER_PASS;
   const graceCompartments = deps.graceCompartments ?? DEFAULT_COMPRESSOR_GRACE_COMPARTMENTS;
   const scored = scoreCompartments(db, sessionId, compartments);
+  const depthHistogram = new Map;
+  for (const s of scored) {
+    const bucket = Math.round(s.averageDepth);
+    depthHistogram.set(bucket, (depthHistogram.get(bucket) ?? 0) + 1);
+  }
+  const histText = [...depthHistogram.entries()].sort((a, b) => a[0] - b[0]).map(([d, n]) => `d${d}=${n}`).join(" ");
+  const histKey = `${scored.length}|${histText}`;
+  if (lastDepthHistogramBySession.get(sessionId) !== histKey) {
+    lastDepthHistogramBySession.set(sessionId, histKey);
+    sessionLog(sessionId, `compressor: depth histogram (${scored.length} total) ${histText}`);
+  }
   const floorHeadroom = compartments.length - floor;
   if (floorHeadroom < 1) {
     sessionLog(sessionId, `compressor: no floor headroom (${compartments.length} compartments, floor=${floor}), skipping`);
     return false;
   }
-  const contiguous = findOldestContiguousSameDepthBand(scored, {
+  const contiguous = selectCompressionBand(scored, {
     maxPickable: maxCompartmentsPerPass,
     maxMergeDepth,
     graceCompartments,
@@ -153588,25 +153633,16 @@ ${c.content}
   }
 }
 function scoreCompartments(db, sessionId, compartments) {
-  let maxDepthAcrossSession = 0;
-  for (const c of compartments) {
-    const d = getAverageCompressionDepth(db, sessionId, c.startMessage, c.endMessage);
-    if (d > maxDepthAcrossSession)
-      maxDepthAcrossSession = d;
-  }
   return compartments.map((compartment, index) => {
     const tokenEstimate = estimateTokens(`<compartment start="${compartment.startMessage}" end="${compartment.endMessage}" title="${compartment.title}">
 ${compartment.content}
 </compartment>
 `);
     const averageDepth = getAverageCompressionDepth(db, sessionId, compartment.startMessage, compartment.endMessage);
-    const normalizedAge = compartments.length > 1 ? 1 - index / (compartments.length - 1) : 1;
-    const normalizedDepth = maxDepthAcrossSession > 0 ? 1 - averageDepth / maxDepthAcrossSession : 1;
-    const score = 0.7 * normalizedAge + 0.3 * normalizedDepth;
-    return { compartment, index, tokenEstimate, averageDepth, score };
+    return { compartment, index, tokenEstimate, averageDepth };
   });
 }
-function findOldestContiguousSameDepthBand(scored, constraints) {
+function selectCompressionBand(scored, constraints) {
   const { maxPickable, maxMergeDepth, graceCompartments, floorHeadroom } = constraints;
   const hardMaxPick = Math.max(0, Math.min(maxPickable, floorHeadroom));
   if (hardMaxPick < 2)
@@ -153614,32 +153650,49 @@ function findOldestContiguousSameDepthBand(scored, constraints) {
   const scanEnd = Math.max(0, scored.length - graceCompartments);
   if (scanEnd < 2)
     return [];
-  let i = 0;
-  while (i < scanEnd) {
-    const c = scored[i];
-    if (!c || c.averageDepth >= maxMergeDepth) {
-      i++;
+  const tiers = new Set;
+  for (let i = 0;i < scanEnd; i++) {
+    const entry = scored[i];
+    if (!entry)
       continue;
+    if (entry.averageDepth >= maxMergeDepth)
+      continue;
+    tiers.add(Math.round(entry.averageDepth));
+  }
+  if (tiers.size === 0)
+    return [];
+  const orderedTiers = [...tiers].sort((a, b) => a - b);
+  for (const targetDepth of orderedTiers) {
+    let i = 0;
+    while (i < scanEnd) {
+      const anchor = scored[i];
+      if (!anchor) {
+        i++;
+        continue;
+      }
+      if (anchor.averageDepth >= maxMergeDepth || Math.round(anchor.averageDepth) !== targetDepth) {
+        i++;
+        continue;
+      }
+      let j = i;
+      while (j < scanEnd) {
+        const entry = scored[j];
+        if (!entry)
+          break;
+        if (entry.averageDepth >= maxMergeDepth)
+          break;
+        if (Math.round(entry.averageDepth) !== targetDepth)
+          break;
+        if (j - i >= hardMaxPick)
+          break;
+        j++;
+      }
+      const runLen = j - i;
+      if (runLen >= 2) {
+        return scored.slice(i, j);
+      }
+      i = Math.max(j, i + 1);
     }
-    const anchorDepth = Math.round(c.averageDepth);
-    let j = i;
-    while (j < scanEnd) {
-      const entry = scored[j];
-      if (!entry)
-        break;
-      if (entry.averageDepth >= maxMergeDepth)
-        break;
-      if (Math.round(entry.averageDepth) !== anchorDepth)
-        break;
-      if (j - i >= hardMaxPick)
-        break;
-      j++;
-    }
-    const runLen = j - i;
-    if (runLen >= 2) {
-      return scored.slice(i, j);
-    }
-    i = Math.max(j, i + 1);
   }
   return [];
 }
@@ -153823,7 +153876,7 @@ async function runCompressorPass(args) {
     }
   }
 }
-var HISTORIAN_AGENT2 = "historian";
+var HISTORIAN_AGENT2 = "historian", lastDepthHistogramBySession;
 var init_compartment_runner_compressor = __esm(() => {
   init_magic_context();
   init_storage();
@@ -153834,6 +153887,7 @@ var init_compartment_runner_compressor = __esm(() => {
   init_compartment_parser();
   init_compartment_prompt();
   init_read_session_formatting();
+  lastDepthHistogramBySession = new Map;
 });
 
 // src/hooks/magic-context/compartment-runner-drop-queue.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cortexkit/opencode-magic-context",
-  "version": "0.13.0",
+  "version": "0.13.2",
   "type": "module",
   "description": "OpenCode plugin for Magic Context — cross-session memory and context management",
   "main": "dist/index.js",