@psiclawops/hypermem 0.9.2 → 0.9.4

package/dist/compositor.js

@@ -27,7 +27,7 @@ import { KnowledgeStore } from './knowledge-store.js';
 import { TemporalStore, hasTemporalSignals } from './temporal-store.js';
 import { isOpenDomainQuery, searchOpenDomain } from './open-domain.js';
 import { TRIM_BUDGET_POLICY, resolveTrimBudgets } from './budget-policy.js';
-import { resolveAdaptiveLifecyclePolicy } from './adaptive-lifecycle.js';
+import { resolveAdaptiveLifecyclePolicy, countTopicBearingTurns } from './adaptive-lifecycle.js';
 import { formatToolChainStub, parseToolChainStub, formatArtifactRef, isArtifactRef } from './degradation.js';
 import { ToolArtifactStore } from './tool-artifact-store.js';
 import { insertCompositionSnapshot, getLatestValidCompositionSnapshot, listCompositionSnapshots, MAX_WARM_RESTORE_REPAIR_DEPTH, } from './composition-snapshot-store.js';
@@ -42,6 +42,8 @@ export const OPENCLAW_BOOTSTRAP_FILES = new Set([
     'AGENTS.md', 'HEARTBEAT.md', 'MEMORY.md', 'BOOTSTRAP.md',
 ]);
 const CACHE_PREFIX_BOUNDARY_SLOT = 'cache-prefix-boundary';
+const LITERAL_ANTECEDENT_GUARD_MAX_MESSAGES = 3;
+const LITERAL_ANTECEDENT_GUARD_MAX_TOKENS = 4_000;
 /**
  * Model context window sizes by provider/model string (or partial match).
  * Used as fallback when tokenBudget is not passed by the runtime.
@@ -419,6 +421,33 @@ const TOOL_RECENT_OVERSIZE_CHAR_THRESHOLD = 40_000;
 const TOOL_RECENT_OVERSIZE_TARGET_CHARS = 40_000;
 const TOOL_RECENT_OVERSIZE_MAX_TAIL_CHARS = 12_000;
 const TOOL_TRIM_NOTE_PREFIX = '[hypermem_tool_result_trim';
+// 0.9.4 Packet 3: afterTurn protected warming floor.
+// refreshRedisGradient only receives the resolved trim target, not the full
+// lifecycle policy. Keep this private and infer the early-session bands from
+// the canonical Packet 1 trim targets so no public API/export surface changes.
+// The floor is intentionally disabled once the lifecycle reaches elevated or
+// worse; pressure bands at/above elevated are allowed to reclaim warming.
+const AFTERTURN_PROTECTED_WARMING_ELEVATED_FLOOR_FRACTION = 0.34;
+const AFTERTURN_PROTECTED_WARMING_BOOTSTRAP_FLOOR_FRACTION = Math.max(AFTERTURN_PROTECTED_WARMING_ELEVATED_FLOOR_FRACTION, 0.62 * 0.60);
+const AFTERTURN_PROTECTED_WARMING_WARMUP_FLOOR_FRACTION = Math.max(AFTERTURN_PROTECTED_WARMING_ELEVATED_FLOOR_FRACTION, 0.55 * 0.60);
+const AFTERTURN_PROTECTED_WARMING_TRIM_EPSILON = 0.0001;
+function resolveAfterTurnProtectedWarmingFloor(tokenBudget, trimSoftTarget) {
+    const safeBudget = Math.max(0, Math.floor(tokenBudget || 0));
+    if (safeBudget <= 0 || trimSoftTarget == null) {
+        return { floorFraction: 0, floorTokens: 0, band: null };
+    }
+    // Packet 1 trim targets: bootstrap=0.72, warmup=0.68. Steady=0.65 and
+    // elevated=0.60 do not get this protected floor.
+    if (Math.abs(trimSoftTarget - 0.72) <= AFTERTURN_PROTECTED_WARMING_TRIM_EPSILON) {
+        const floorFraction = AFTERTURN_PROTECTED_WARMING_BOOTSTRAP_FLOOR_FRACTION;
+        return { floorFraction, floorTokens: Math.floor(safeBudget * floorFraction), band: 'bootstrap' };
+    }
+    if (Math.abs(trimSoftTarget - 0.68) <= AFTERTURN_PROTECTED_WARMING_TRIM_EPSILON) {
+        const floorFraction = AFTERTURN_PROTECTED_WARMING_WARMUP_FLOOR_FRACTION;
+        return { floorFraction, floorTokens: Math.floor(safeBudget * floorFraction), band: 'warmup' };
+    }
+    return { floorFraction: 0, floorTokens: 0, band: null };
+}
 // ─── Trigger Registry ────────────────────────────────────────────
 // Moved to src/trigger-registry.ts (W5).
 // CollectionTrigger, DEFAULT_TRIGGERS, matchTriggers imported above.
@@ -465,6 +494,57 @@ function clusterNeutralMessages(messages) {
     }
     return clusters;
 }
+function resolveLiteralAntecedentGuardClusterIndices(clusters, opts) {
+    const protectedIndices = new Set();
+    const currentPrompt = opts.currentPrompt?.trim() ?? '';
+    if (!opts.enabled || clusters.length < (currentPrompt ? 1 : 2))
+        return protectedIndices;
+    let boundaryClusterIdx;
+    if (currentPrompt) {
+        for (let i = clusters.length - 1; i >= 0; i--) {
+            const containsCurrentPrompt = clusters[i].messages.some(msg => msg.role === 'user' && (msg.textContent ?? '').trim() === currentPrompt);
+            if (containsCurrentPrompt) {
+                boundaryClusterIdx = i;
+                break;
+            }
+        }
+        // In the plugin compose path the current prompt is often request.prompt and
+        // is appended after compose, so it has no persisted cluster yet. Treat the
+        // end of persisted history as the prompt boundary in that case.
+        if (boundaryClusterIdx == null)
+            boundaryClusterIdx = clusters.length;
+    }
+    else {
+        const latestClusterIdx = clusters.length - 1;
+        const latestCluster = clusters[latestClusterIdx];
+        if (!latestCluster.messages.some(msg => msg.role === 'user'))
+            return protectedIndices;
+        boundaryClusterIdx = latestClusterIdx;
+    }
+    if (boundaryClusterIdx <= 0)
+        return protectedIndices;
+    const maxMessages = Math.max(0, Math.floor(opts.maxMessages ?? LITERAL_ANTECEDENT_GUARD_MAX_MESSAGES));
+    const maxTokens = Math.max(0, Math.floor(opts.maxTokens ?? LITERAL_ANTECEDENT_GUARD_MAX_TOKENS));
+    if (maxMessages <= 0 || maxTokens <= 0)
+        return protectedIndices;
+    let messageCount = 0;
+    let tokenCount = 0;
+    for (let i = boundaryClusterIdx - 1; i >= 0; i--) {
+        const cluster = clusters[i];
+        const nextMessageCount = messageCount + cluster.messages.length;
+        const nextTokenCount = tokenCount + cluster.tokenCost;
+        if (nextMessageCount > maxMessages)
+            break;
+        if (nextTokenCount > maxTokens)
+            break;
+        protectedIndices.add(i);
+        messageCount = nextMessageCount;
+        tokenCount = nextTokenCount;
+        if (messageCount >= maxMessages)
+            break;
+    }
+    return protectedIndices;
+}
 export function orderClustersForAdaptiveEviction(clusters, policy, opts = {}) {
     const plan = policy.evictionPlan;
     const protectedIndices = new Set();
@@ -1043,6 +1123,17 @@ export function resolveArtifactOversizeThreshold(effectiveBudget) {
 function isExplicitNewSessionPrompt(prompt) {
     return /^\/new(?:\s|$)/i.test((prompt ?? '').trim());
 }
+function parsePersistedTopicBearingTurnCount(raw) {
+    if (raw == null)
+        return null;
+    const trimmed = raw.trim();
+    if (trimmed.length === 0)
+        return null;
+    const parsed = Number.parseInt(trimmed, 10);
+    if (!Number.isFinite(parsed) || parsed < 0)
+        return null;
+    return Math.floor(parsed);
+}
 /**
  * C2: Degrade an oversized doc chunk to a canonical ArtifactRef string.
  *
@@ -1625,6 +1716,14 @@ export class Compositor {
         const s09SampleTokens = sampleMessages.reduce((sum, m) => sum + estimateMessageTokens(m), 0);
         const s09EvictionPressure = computeUnifiedPressure(s09SampleTokens, budget, PRESSURE_SOURCE.COMPOSE_PRE_RECALL);
         let s09ObservedUserTurnCount = sampleMessages.filter(m => m.role === 'user').length;
+        let s09PersistedTopicBearingTurnCount = null;
+        try {
+            s09PersistedTopicBearingTurnCount = parsePersistedTopicBearingTurnCount(await this.cache.getSlot(request.agentId, request.sessionKey, 'topicBearingTurnCount'));
+        }
+        catch {
+            s09PersistedTopicBearingTurnCount = null;
+        }
+        let s09TopicBearingTurnCount = s09PersistedTopicBearingTurnCount ?? countTopicBearingTurns(sampleMessages);
         const s09ForkedContextSeed = request.forkedContext?.enabled ? request.forkedContext : undefined;
         const s09ForkedParentPressure = typeof s09ForkedContextSeed?.parentPressureFraction === 'number'
             && Number.isFinite(s09ForkedContextSeed.parentPressureFraction)
@@ -1638,6 +1737,7 @@ export class Compositor {
         const evictionLifecyclePolicy = resolveAdaptiveLifecyclePolicy({
             pressureFraction: s09EvictionPolicyPressure,
             userTurnCount: s09ObservedUserTurnCount,
+            topicBearingTurnCount: s09TopicBearingTurnCount,
             explicitNewSession: isExplicitNewSessionPrompt(request.prompt ?? null),
             forkedContext: Boolean(s09ForkedContextSeed),
             forkedParentPressureFraction: s09ForkedParentPressure,
@@ -1775,6 +1875,9 @@ export class Compositor {
         // C1: total tool-chain degradation counters across history budget-fit and safety-valve passes.
         let c1CoEjections = 0;
         let c1StubReplacements = 0;
+        let literalAntecedentGuardHits = 0;
+        const literalAntecedentGuardMessages = new Set();
+        const literalAntecedentGuardHitMessages = new Set();
         // Hoisted: activeTopicId/name resolved inside history block, used for window dual-write (VS-1) and wiki page injection
         let composedActiveTopicId;
         let composedActiveTopicName;
@@ -1824,20 +1927,58 @@ export class Compositor {
             composedActiveTopicName = activeTopic?.name;
             const rawHistoryMessages = await this.getHistory(request.agentId, request.sessionKey, s4EffectiveDepth, // Sprint 4: adaptive depth (replaces fixed maxHistoryMessages)
             store, activeTopicId, fenceMessageId, activeContext);
+            // Continuity guard: force a small tail of meaningful transcript rows into
+            // the candidate window before budget selection. Tool carrier rows can have
+            // empty text_content; in dense tool loops they can consume raw history depth
+            // and push the immediate conversational antecedent out of the selected
+            // window. The full tool stream still comes from getHistory(); this guard
+            // only repairs the human-readable transcript tail.
+            let continuityTail = [];
+            try {
+                const conversation = store.getConversation(request.sessionKey);
+                if (conversation) {
+                    continuityTail = store.getRecentMeaningfulMessages(conversation.id, 8, fenceMessageId);
+                }
+            }
+            catch {
+                continuityTail = [];
+            }
+            const mergedRawHistory = continuityTail.length > 0
+                ? [...rawHistoryMessages, ...continuityTail].sort((a, b) => {
+                    const ai = a.messageIndex ?? 0;
+                    const bi = b.messageIndex ?? 0;
+                    return ai - bi;
+                })
+                : rawHistoryMessages;
             // Deduplicate history by StoredMessage.id (second line of defense after
             // pushHistory() tail-check dedup). Guards against any duplicates that
             // slipped through the warm path — e.g. bootstrap re-runs on existing sessions.
-            const seenIds = new Set();
-            const historyMessages = rawHistoryMessages.filter(m => {
+            // If the continuity transcript projection overlaps with full runtime
+            // history, prefer the full row. Transcript projections intentionally null
+            // tool_calls/tool_results and must never replace a tool-bearing history row.
+            const historyById = new Map();
+            const historyMessagesNoId = [];
+            const rowScore = (m) => (m.toolCalls != null ? 2 : 0) + (m.toolResults != null ? 2 : 0) + (m.textContent ? 1 : 0);
+            for (const m of mergedRawHistory) {
                 const sm = m;
-                if (sm.id != null) {
-                    if (seenIds.has(sm.id))
-                        return false;
-                    seenIds.add(sm.id);
+                if (sm.id == null) {
+                    historyMessagesNoId.push(m);
+                    continue;
+                }
+                const existing = historyById.get(sm.id);
+                if (!existing || rowScore(sm) > rowScore(existing)) {
+                    historyById.set(sm.id, sm);
                 }
-                return true;
+            }
+            const historyMessages = [...historyMessagesNoId, ...historyById.values()].sort((a, b) => {
+                const ai = a.messageIndex ?? 0;
+                const bi = b.messageIndex ?? 0;
+                return ai - bi;
             });
             s09ObservedUserTurnCount = Math.max(s09ObservedUserTurnCount, historyMessages.filter(m => m.role === 'user').length);
+            if (s09PersistedTopicBearingTurnCount == null) {
+                s09TopicBearingTurnCount = Math.max(s09TopicBearingTurnCount, countTopicBearingTurns(historyMessages));
+            }
             composeTopicMessageCount = historyMessages.length;
             composeTopicStampedMessageCount = historyMessages.filter(m => typeof m.topicId === 'string').length;
             // ── Transform-first: apply gradient tool treatment BEFORE budget math ──
@@ -1871,6 +2012,12 @@ export class Compositor {
             // drop inactive-topic non-tool clusters first when an active topic is
             // known. Bootstrap/warmup/steady reproduce the historical newest-first
             // sweep exactly (preferTopicAwareDrop=false → evictedByPlan stays empty).
+            const literalAntecedentGuardIndices = resolveLiteralAntecedentGuardClusterIndices(budgetClusters, {
+                enabled: evictionLifecyclePolicy.band !== 'critical',
+                currentPrompt: request.prompt,
+                maxMessages: LITERAL_ANTECEDENT_GUARD_MAX_MESSAGES,
+                maxTokens: LITERAL_ANTECEDENT_GUARD_MAX_TOKENS,
+            });
             const adaptiveOrdering = orderClustersForAdaptiveEviction(budgetClusters, evictionLifecyclePolicy, { activeTopicId });
             adaptiveEvictionTopicAwareEligibleClusters = adaptiveOrdering.telemetry.topicAwareEligibleClusters;
             adaptiveEvictionProtectedClusters = adaptiveOrdering.telemetry.protectedClusters;
@@ -1897,6 +2044,16 @@ export class Compositor {
                         break;
                     if (adaptiveOrdering.protectedIndices.has(idx))
                         continue;
+                    if (literalAntecedentGuardIndices.has(idx)) {
+                        for (const msg of budgetClusters[idx].messages) {
+                            literalAntecedentGuardMessages.add(msg);
+                            if (!literalAntecedentGuardHitMessages.has(msg)) {
+                                literalAntecedentGuardHitMessages.add(msg);
+                                literalAntecedentGuardHits++;
+                            }
+                        }
+                        continue;
+                    }
                     evictedByPlan.add(idx);
                     projectedTokens -= budgetClusters[idx].tokenCost;
                 }
@@ -1907,12 +2064,29 @@ export class Compositor {
                 if (evictedByPlan.has(i))
                     continue;
                 const cluster = budgetClusters[i];
+                const isLiteralAntecedentGuarded = literalAntecedentGuardIndices.has(i);
                 if (historyTokens + cluster.tokenCost > historyFillCap && includedClusters.length > 0) {
+                    if (isLiteralAntecedentGuarded) {
+                        includedClusters.unshift(cluster);
+                        historyTokens += cluster.tokenCost;
+                        for (const msg of cluster.messages) {
+                            literalAntecedentGuardMessages.add(msg);
+                            if (!literalAntecedentGuardHitMessages.has(msg)) {
+                                literalAntecedentGuardHitMessages.add(msg);
+                                literalAntecedentGuardHits++;
+                            }
+                        }
+                        continue;
+                    }
                     truncationCutIndex = i;
                     break;
                 }
                 includedClusters.unshift(cluster);
                 historyTokens += cluster.tokenCost;
+                if (isLiteralAntecedentGuarded) {
+                    for (const msg of cluster.messages)
+                        literalAntecedentGuardMessages.add(msg);
+                }
             }
             if (truncationCutIndex >= 0 || evictedByPlan.size > 0) {
                 const droppedIndices = [];
@@ -2403,6 +2577,7 @@ export class Compositor {
         const composeLifecyclePolicy = resolveAdaptiveLifecyclePolicy({
             pressureFraction: s09ComposePolicyPressure,
             userTurnCount: s09ObservedUserTurnCount,
+            topicBearingTurnCount: s09TopicBearingTurnCount,
             explicitNewSession: isExplicitNewSessionPrompt(request.prompt ?? this.getLastUserMessage(messages)),
             forkedContext: Boolean(s09ForkedContextSeed),
             forkedParentPressureFraction: s09ForkedParentPressure,
@@ -2411,6 +2586,8 @@ export class Compositor {
         const recallBreadth = scaleRecallBreadth(remaining, composeLifecyclePolicy.smartRecallMultiplier);
         let diagAdaptiveRecallBudgetTokens;
         let diagAdaptiveRecallCandidateLimit;
+        let diagComposeAdjacencyBoosted = 0;
+        let diagComposeAdjacencyDeltaTotalMs = 0;
         if (request.includeSemanticRecall !== false && remaining > 500 && (this.vectorStore || libDb)) {
             const lastUserMsg = request.prompt?.trim() || this.getLastUserMessage(messages);
             if (lastUserMsg) {
@@ -2435,6 +2612,9 @@ export class Compositor {
                         diagRerankerStatus = ev.status;
                         diagRerankerCandidates = ev.candidates;
                         diagRerankerProvider = ev.provider;
+                    }, (ev) => {
+                        diagComposeAdjacencyBoosted += ev.boostedCount;
+                        diagComposeAdjacencyDeltaTotalMs += ev.averageDeltaMs * ev.boostedCount;
                     }, recallBreadth.candidateLimit);
                     if (semanticContent) {
                         const tokens = estimateTokens(semanticContent);
@@ -2585,7 +2765,7 @@ export class Compositor {
                     }
                     const fallbackContent = await Promise.race([
                         this.buildSemanticRecall(lastMsg, request.agentId, recallBreadth.fallbackBudgetTokens, libDb || undefined, undefined, contextFingerprints, // C2: skip results already in Active Facts
-                        undefined, recallBreadth.candidateLimit),
+                        undefined, undefined, recallBreadth.candidateLimit),
                         new Promise((_, reject) => setTimeout(() => reject(new Error('fallback_knn_timeout')), 3000)),
                     ]);
                     if (fallbackContent) {
@@ -2768,6 +2948,15 @@ export class Compositor {
                     // Don't trim the last user message (current prompt).
                     if (i === messages.length - 1 && messages[i].role === 'user')
                         break;
+                    // Packet 5: preserve the bounded immediate antecedent for literal follow-ups.
+                    if (literalAntecedentGuardMessages.has(messages[i])) {
+                        if (!literalAntecedentGuardHitMessages.has(messages[i])) {
+                            literalAntecedentGuardHitMessages.add(messages[i]);
+                            literalAntecedentGuardHits++;
+                        }
+                        i++;
+                        continue;
+                    }
                     // Sprint 4: Don't trim the volatile context block (dynamicBoundary marker).
                     const meta = messages[i].metadata;
                     if (meta?.dynamicBoundary) {
@@ -3040,6 +3229,9 @@ export class Compositor {
             adaptiveSmartRecallMultiplier: composeLifecyclePolicy.smartRecallMultiplier,
             adaptiveTrimSoftTarget: composeLifecyclePolicy.trimSoftTarget,
             adaptiveCompactionTargetFraction: composeLifecyclePolicy.compactionTargetFraction,
+            adaptiveProtectedWarmingFraction: composeLifecyclePolicy.protectedWarmingMetadata.isProtected
+                ? composeLifecyclePolicy.protectedWarmingMetadata.floor
+                : undefined,
             adaptiveBreadcrumbPackage: composeLifecyclePolicy.emitBreadcrumbPackage,
             adaptiveTopicCentroidEviction: composeLifecyclePolicy.enableTopicCentroidEviction,
             adaptiveProactiveCompaction: composeLifecyclePolicy.triggerProactiveCompaction,
@@ -3053,6 +3245,11 @@ export class Compositor {
             adaptiveEvictionProtectedClusters,
             adaptiveEvictionTopicIdCoveragePct,
             adaptiveEvictionBypassReason,
+            composeAdjacencyBoosted: diagComposeAdjacencyBoosted > 0 ? diagComposeAdjacencyBoosted : undefined,
+            composeAdjacencyAverageDeltaMs: diagComposeAdjacencyBoosted > 0
+                ? Math.round(diagComposeAdjacencyDeltaTotalMs / diagComposeAdjacencyBoosted)
+                : undefined,
+            evictionAdjacencyGuardHits: literalAntecedentGuardHits > 0 ? literalAntecedentGuardHits : undefined,
             composeTopicSource,
             composeTopicState,
             composeTopicMessageCount,
@@ -3092,6 +3289,9 @@ export class Compositor {
             compactionEligibleRatio: diagCompactionEligibleRatio,
             compactionProcessedCount: diagCompactionProcessedCount,
         };
+        if (literalAntecedentGuardHits > 0) {
+            diagnostics.literalAntecedentGuardHits = literalAntecedentGuardHits;
+        }
         if (pressureHigh) {
             warnings.push(`SESSION_PRESSURE_HIGH: avg_turn_cost=${avgTurnCost} tokens, dynamic reserve capped at ${Math.round(dynamicReserve * 100)}%`);
         }
@@ -3203,7 +3403,7 @@ export class Compositor {
         catch (error) {
             console.warn(`[hypermem:compositor] composition snapshot write skipped: ${error.message}`);
         }
-        console.log(`[hypermem:compose] agent=${request.agentId} triggers=${diagTriggerHits} fallback=${diagTriggerFallbackUsed} facts=${diagFactsIncluded} semantic=${diagSemanticResults} chunks=${diagDocChunkCollections} scopeFiltered=${diagScopeFiltered} mode=${diagRetrievalMode} crossTopicKeystones=${diagCrossTopicKeystones} c2_degradations=${c2ArtifactDegradations} c2_threshold=${c2ArtifactThresholdTokens}`);
+        console.log(`[hypermem:compose] agent=${request.agentId} triggers=${diagTriggerHits} fallback=${diagTriggerFallbackUsed} facts=${diagFactsIncluded} semantic=${diagSemanticResults} chunks=${diagDocChunkCollections} scopeFiltered=${diagScopeFiltered} mode=${diagRetrievalMode} crossTopicKeystones=${diagCrossTopicKeystones} c2_degradations=${c2ArtifactDegradations} c2_threshold=${c2ArtifactThresholdTokens} literal_antecedent_guard_hits=${literalAntecedentGuardHits} adjacency_boosted=${diagComposeAdjacencyBoosted} adjacency_avg_delta_ms=${diagComposeAdjacencyBoosted > 0 ? Math.round(diagComposeAdjacencyDeltaTotalMs / diagComposeAdjacencyBoosted) : 0} eviction_adjacency_guard_hits=${literalAntecedentGuardHits}`);
         return {
             messages: outputMessages,
             tokenCount: totalTokens,
@@ -3454,23 +3654,37 @@ export class Compositor {
         let historyToWrite = transformedHistory;
         if (tokenBudget && tokenBudget > 0) {
             const budgetCap = gradientAssembleBudget;
+            const protectedFloor = resolveAfterTurnProtectedWarmingFloor(tokenBudget, trimSoftTarget);
             let runningTokens = 0;
+            let protectedClustersKept = 0;
             const clusters = clusterNeutralMessages(transformedHistory);
             const cappedClusters = [];
             // Walk newest-first, keep whole clusters so tool-call/result pairs survive together.
+            // Packet 3: during bootstrap/warmup, do not let cluster-boundary underfill
+            // cut the refreshed hot window below the protected warming floor. This may
+            // keep one or more whole older clusters past the soft cap, but only until
+            // the protected floor is satisfied. Elevated/high/critical bands get no
+            // floor, so the existing cap behavior remains intact under real pressure.
             for (let i = clusters.length - 1; i >= 0; i--) {
                 const cluster = clusters[i];
-                if (runningTokens + cluster.tokenCost > budgetCap && cappedClusters.length > 0)
+                const wouldExceedCap = runningTokens + cluster.tokenCost > budgetCap && cappedClusters.length > 0;
+                const belowProtectedFloor = protectedFloor.floorTokens > 0 && runningTokens < protectedFloor.floorTokens;
+                if (wouldExceedCap && !belowProtectedFloor)
                     break;
+                if (wouldExceedCap && belowProtectedFloor)
+                    protectedClustersKept++;
                 cappedClusters.unshift(cluster);
                 runningTokens += cluster.tokenCost;
-                if (runningTokens >= budgetCap)
+                if (runningTokens >= budgetCap && runningTokens >= protectedFloor.floorTokens)
                     break;
             }
             historyToWrite = cappedClusters.flatMap(cluster => cluster.messages);
             if (historyToWrite.length < transformedHistory.length) {
+                const protectedNote = protectedFloor.floorTokens > 0
+                    ? `, protectedFloor=${protectedFloor.floorTokens}, protectedClustersKept=${protectedClustersKept}`
+                    : '';
                 console.log(`[hypermem] refreshRedisGradient: cluster-capped ${transformedHistory.length}→${historyToWrite.length} messages ` +
-                    `for ${agentId}/${sessionKey} (budgetCap=${budgetCap}, tokenCost=${runningTokens})`);
+                    `for ${agentId}/${sessionKey} (budgetCap=${budgetCap}, tokenCost=${runningTokens}${protectedNote})`);
             }
         }
         await this.cache.replaceHistory(agentId, sessionKey, historyToWrite, refreshHistoryLimit);
@@ -3706,7 +3920,7 @@ export class Compositor {
      */
     async buildSemanticRecall(userMessage, agentId, maxTokens, libraryDb, precomputedEmbedding, existingFingerprints, // C2: skip results already in Active Facts
     onRerankerTelemetry, // Sprint 1: surface reranker status at assemble level
-    resultLimit) {
+    onAdjacencyTelemetry, resultLimit) {
         const libDb = libraryDb || this.libraryDb;
         if (!libDb && !this.vectorStore)
             return null;
@@ -3736,6 +3950,7 @@ export class Compositor {
                 rerankerTopK: this.rerankerTopK,
                 // Sprint 1: thread reranker telemetry into compose diagnostics
                 onRerankerTelemetry,
+                onAdjacencyTelemetry,
             });
             if (results.length === 0)
                 return null;
@@ -3861,9 +4076,6 @@ export class Compositor {
      * Build cross-session context by finding recent activity
      * in other sessions for this agent.
      */
-    // TODO Phase 1: buildCrossSessionContext queries OTHER conversations. Each has its
-    // own compaction fence. Per-conversation fence filtering should be added here so
-    // zombie messages from other sessions don't leak into cross-session context.
     buildCrossSessionContext(agentId, currentSessionKey, db, _libraryDb, existingFingerprints // C3: skip entries already in facts/semantic recall
     ) {
         const conversation = db.prepare('SELECT id FROM conversations WHERE session_key = ?').get(currentSessionKey);
@@ -3873,10 +4085,14 @@ export class Compositor {
       SELECT m.text_content, m.role, c.channel_type, m.created_at
       FROM messages m
       JOIN conversations c ON m.conversation_id = c.id
+      LEFT JOIN compaction_fences cf ON cf.conversation_id = m.conversation_id
       WHERE c.agent_id = ?
       AND m.conversation_id != ?
       AND c.status = 'active'
+      AND (cf.fence_message_id IS NULL OR m.id >= cf.fence_message_id)
+      AND m.role IN ('user', 'assistant')
       AND m.text_content IS NOT NULL
+      AND trim(m.text_content) != ''
       AND m.is_heartbeat = 0
       ORDER BY m.created_at DESC
       LIMIT 10
@@ -4014,9 +4230,10 @@ export class Compositor {
           AND m.id < ?
           ${fenceClause}
           ${contextClause}
+          AND m.role IN ('user', 'assistant')
           AND m.text_content IS NOT NULL
+          AND trim(m.text_content) != ''
           AND m.is_heartbeat = 0
-          AND m.text_content != ''
         LIMIT 200
       `;
             let candidateRows;
@@ -4046,9 +4263,10 @@ export class Compositor {
                 AND m.id < ?
                 ${fenceClause}
                 ${contextClause}
+                AND m.role IN ('user', 'assistant')
                 AND m.text_content IS NOT NULL
+                AND trim(m.text_content) != ''
                 AND m.is_heartbeat = 0
-                AND m.text_content != ''
                 AND m.id IN (
                   SELECT rowid FROM messages_fts
                   WHERE messages_fts MATCH ?
@@ -4187,8 +4405,9 @@ export class Compositor {
             AND m.topic_id = ?
             ${topicFenceClause}
             ${topicContextClause}
+            AND m.role IN ('user', 'assistant')
             AND m.text_content IS NOT NULL
-            AND m.text_content != ''
+            AND trim(m.text_content) != ''
             AND m.is_heartbeat = 0
           ORDER BY m.message_index DESC
           LIMIT 50

package/dist/hybrid-retrieval.d.ts

@@ -25,6 +25,12 @@ export interface RerankerTelemetry {
     /** Outcome for this invocation. */
     status: RerankerStatus;
 }
+export interface AdjacencyTelemetry {
+    /** Number of candidates boosted by adjacency scoring. */
+    boostedCount: number;
+    /** Average antecedent-to-successor wall-clock delta in milliseconds. */
+    averageDeltaMs: number;
+}
 export interface HybridSearchResult {
     sourceTable: string;
     sourceId: number;
@@ -86,6 +92,8 @@ export interface HybridSearchOptions {
     rerankerTimeoutMs?: number;
     /** Optional telemetry sink. When omitted, falls back to emitRerankerLog. */
     onRerankerTelemetry?: (ev: RerankerTelemetry) => void;
+    /** Optional metadata-only telemetry for adjacency boosts. */
+    onAdjacencyTelemetry?: (ev: AdjacencyTelemetry) => void;
 }
 /**
  * Build an FTS5 query from a natural language string.

package/dist/hybrid-retrieval.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hybrid-retrieval.d.ts","sourceRoot":"","sources":["../src/hybrid-retrieval.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,KAAK,EAAE,WAAW,EAAsB,MAAM,mBAAmB,CAAC;AACzE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAQtD,MAAM,MAAM,cAAc,GACtB,SAAS,GACT,oBAAoB,GACpB,wBAAwB,GACxB,QAAQ,GACR,SAAS,CAAC;AAEd,MAAM,WAAW,iBAAiB;IAChC,2FAA2F;IAC3F,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,4DAA4D;IAC5D,UAAU,EAAE,MAAM,CAAC;IACnB,mCAAmC;IACnC,MAAM,EAAE,cAAc,CAAC;CACxB;AAcD,MAAM,WAAW,kBAAkB;IACjC,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,wEAAwE;IACxE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,kDAAkD;IAClD,KAAK,EAAE,MAAM,CAAC;IACd,wCAAwC;IACxC,OAAO,EAAE,CAAC,KAAK,GAAG,KAAK,CAAC,EAAE,CAAC;CAC5B;AAED,MAAM,WAAW,mBAAmB;IAClC,2EAA2E;IAC3E,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,yCAAyC;IACzC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,mEAAmE;IACnE,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,qEAAqE;IACrE,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,sCAAsC;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,qDAAqD;IACrD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,qDAAqD;IACrD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iFAAiF;IACjF,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,uFAAuF;IACvF,oBAAoB,CAAC,EAAE,YAAY,CAAC;IACpC;;;;OAIG;IACH,QAAQ,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;IACnC;;;;OAIG;IACH,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B;;;OAGG;IACH,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,4EAA4E;IAC5E,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;;;OAKG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,4EAA4E;IAC5E,mBAAmB,CAAC,EAAE,CAAC,EAAE,EAAE,iBAAiB,KAAK,IAAI,CAAC;CACvD;AAqBD;;;GAGG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAiBnD;AA8ND;;;;;GAKG;AACH,wBAAsB,YAAY,CAChC,SAAS,EAAE,YAAY,EACvB,WAAW,EAAE,WAAW,GAAG,IAAI,EAC/B,KAAK,EAAE,MAAM,EACb,IAAI,CAAC,EAAE,mBAAmB,GACzB,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAgJ/B"}
+{"version":3,"file":"hybrid-retrieval.d.ts","sourceRoot":"","sources":["../src/hybrid-retrieval.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,KAAK,EAAE,WAAW,EAAsB,MAAM,mBAAmB,CAAC;AACzE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAQtD,MAAM,MAAM,cAAc,GACtB,SAAS,GACT,oBAAoB,GACpB,wBAAwB,GACxB,QAAQ,GACR,SAAS,CAAC;AAEd,MAAM,WAAW,iBAAiB;IAChC,2FAA2F;IAC3F,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,4DAA4D;IAC5D,UAAU,EAAE,MAAM,CAAC;IACnB,mCAAmC;IACnC,MAAM,EAAE,cAAc,CAAC;CACxB;AAED,MAAM,WAAW,kBAAkB;IACjC,yDAAyD;IACzD,YAAY,EAAE,MAAM,CAAC;IACrB,wEAAwE;IACxE,cAAc,EAAE,MAAM,CAAC;CACxB;AAcD,MAAM,WAAW,kBAAkB;IACjC,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,wEAAwE;IACxE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,kDAAkD;IAClD,KAAK,EAAE,MAAM,CAAC;IACd,wCAAwC;IACxC,OAAO,EAAE,CAAC,KAAK,GAAG,KAAK,CAAC,EAAE,CAAC;CAC5B;AAED,MAAM,WAAW,mBAAmB;IAClC,2EAA2E;IAC3E,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,yCAAyC;IACzC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,mEAAmE;IACnE,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,qEAAqE;IACrE,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,sCAAsC;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,qDAAqD;IACrD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,qDAAqD;IACrD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iFAAiF;IACjF,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,uFAAuF;IACvF,oBAAoB,CAAC,EAAE,YAAY,CAAC;IACpC;;;;OAIG;IACH,QAAQ,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;IACnC;;;;OAIG;IACH,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B;;;OAGG;IACH,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,4EAA4E;IAC5E,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;;;OAKG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,4EAA4E;IAC5E,mBAAmB,CAAC,EAAE,CAAC,EAAE,EAAE,iBAAiB,KAAK,IAAI,CAAC;IACtD,6DAA6D;IAC7D,oBAAoB,CAAC,EAAE,CAAC,EAAE,EAAE,kBAAkB,KAAK,IAAI,CAAC;CACzD;AAqBD;;;GAGG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAiBnD;AAkUD;;;;;GAKG;AACH,wBAAsB,YAAY,CAChC,SAAS,EAAE,YAAY,EACvB,WAAW,EAAE,WAAW,GAAG,IAAI,EAC/B,KAAK,EAAE,MAAM,EACb,IAAI,CAAC,EAAE,mBAAmB,GACzB,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAqJ/B"}