@aexol/spectral 0.9.183 → 0.9.185

package/dist/memory/tools/compact-context.js

@@ -4,9 +4,7 @@ import { defineTool } from "../../sdk/coding-agent/index.js";
 import { buildSessionContext } from "../../sdk/coding-agent/core/session-manager.js";
 import { rawTokensSinceLastCompaction } from "../branch.js";
 import { debugLog, withDebugLogContext } from "../debug-log.js";
-import { DEFAULTS } from "../config.js";
 export const COMPACT_CONTEXT_TOOL_NAME = "compact_context";
-const DCP_NUDGE_HEADING = "## DCP-lite context hygiene";
 const MAX_COMPACT_CONTEXT_TEXT_CHARS = 240;
 const MAX_CUSTOM_INSTRUCTIONS_CHARS = 640;
 const DEFAULT_COMPACT_CONTEXT_SCOPE = "closed_phase";
@@ -61,11 +59,9 @@ function getState(runtime) {
     if (!state) {
         state = {
             request: null,
-            nudgeTurnCount: 0,
-            lastNudgeTurn: 0,
+            turnCount: 0,
             lastAgentDrivenRequestTurn: null,
-            providerRequestCount: 0,
-            lastInRunNudgeRequest: 0,
+            autoPruneFrozen: null,
         };
         stateByRuntime.set(runtime, state);
     }
@@ -100,136 +96,6 @@ function buildCustomInstructions(params) {
 function formatTokenCount(tokens) {
     return Math.round(tokens).toLocaleString();
 }
-function formatSignals(rawTokens, contextTokens, percent, providerRequests) {
-    const parts = [`~${rawTokens.toLocaleString()} raw tokens since last compaction`];
-    if (typeof contextTokens === "number" && Number.isFinite(contextTokens)) {
-        parts.push(`~${formatTokenCount(contextTokens)} context tokens in the next request`);
-    }
-    if (typeof percent === "number" && Number.isFinite(percent)) {
-        parts.push(`${Math.round(percent)}% context window used`);
-    }
-    if (providerRequests !== undefined) {
-        parts.push(`${formatTokenCount(providerRequests)} provider requests since the last user prompt`);
-    }
-    return parts.join(", ");
-}
-function buildDcpNudge(rawTokens, contextTokens, percent, policy, providerRequests) {
-    return [
-        "",
-        DCP_NUDGE_HEADING,
-        `Context is accumulating (${formatSignals(rawTokens, contextTokens, percent, providerRequests)}).`,
-        "Use `compact_context` once when a safe compaction scope is available. When the agent is still working mid-run, the default is virtual `request_time` pruning that shrinks the next provider request without mutating session history; when the phase is closed or the agent is idle, persisted `after_turn` compaction runs after this run for cache-friendly future requests.",
-        "If the user explicitly asks to run/trigger `compact_context`, DCP, DCP-lite, context pruning, or context compression, call `compact_context` in the next step with the safest allowed scope; do not run shell tests, explain it away, or claim DCP was activated without a tool result. If guards reject the call, report that rejection.",
-        "When the current topic/phase is done, the user changes threads, or old tool output is no longer needed, call `compact_context({ scope: \"closed_phase\", focus: \"short topic/focus\", phaseComplete: true })` once and continue normally.",
-        `If the phase remains active/open, use \`compact_context({ scope: "older_history", keepRecentTokens: ${policy.agentDriven.olderHistoryKeepRecentTokens} })\` to prune older stale history in-flight while a recent raw suffix stays available for the next step.`,
-        "Prefer `mode: \"request_time\"` while the phase is active and context is growing (prunes the next request virtually); use `mode: \"after_turn\"` once the phase is closed (persists compaction after the run).",
-    ].join("\n");
-}
-function isRecord(value) {
-    return value !== null && typeof value === "object" && !Array.isArray(value);
-}
-function contentContainsDcpNudge(content) {
-    if (typeof content === "string")
-        return content.includes(DCP_NUDGE_HEADING);
-    if (!Array.isArray(content))
-        return false;
-    return content.some((part) => {
-        if (typeof part === "string")
-            return part.includes(DCP_NUDGE_HEADING);
-        return isRecord(part) && typeof part.text === "string" && part.text.includes(DCP_NUDGE_HEADING);
-    });
-}
-function payloadContainsDcpNudge(payload) {
-    if (!isRecord(payload))
-        return false;
-    if (contentContainsDcpNudge(payload.system))
-        return true;
-    const messages = payload.messages;
-    if (!Array.isArray(messages))
-        return false;
-    return messages.some((message) => isRecord(message) && contentContainsDcpNudge(message.content));
-}
-function appendNudgeToContent(content, nudge) {
-    if (typeof content === "string")
-        return `${content}${nudge}`;
-    if (Array.isArray(content))
-        return [...content, { type: "text", text: nudge.trimStart() }];
-    return nudge.trimStart();
-}
-function injectDcpNudgeIntoAnthropicPayload(payload, nudge) {
-    if (!("system" in payload))
-        return undefined;
-    const system = payload.system;
-    if (typeof system === "string")
-        return { ...payload, system: `${system}${nudge}` };
-    if (Array.isArray(system))
-        return { ...payload, system: [...system, { type: "text", text: nudge.trimStart() }] };
-    if (system === undefined || system === null)
-        return { ...payload, system: [{ type: "text", text: nudge.trimStart() }] };
-    return undefined;
-}
-function injectDcpNudgeIntoOpenAiPayload(payload, nudge) {
-    const messages = payload.messages;
-    if (!Array.isArray(messages))
-        return undefined;
-    const targetIndex = messages.findIndex((message) => {
-        if (!isRecord(message))
-            return false;
-        return message.role === "system" || message.role === "developer";
-    });
-    if (targetIndex === -1) {
-        return { ...payload, messages: [{ role: "system", content: nudge.trimStart() }, ...messages] };
-    }
-    const targetMessage = messages[targetIndex];
-    if (!isRecord(targetMessage))
-        return undefined;
-    const nextMessages = [...messages];
-    nextMessages[targetIndex] = {
-        ...targetMessage,
-        content: appendNudgeToContent(targetMessage.content, nudge),
-    };
-    return { ...payload, messages: nextMessages };
-}
-function injectDcpNudgeIntoProviderPayload(payload, nudge) {
-    if (!isRecord(payload) || payloadContainsDcpNudge(payload))
-        return undefined;
-    return injectDcpNudgeIntoAnthropicPayload(payload, nudge) ?? injectDcpNudgeIntoOpenAiPayload(payload, nudge);
-}
-function describeProviderPayload(payload) {
-    if (!isRecord(payload))
-        return typeof payload;
-    const keys = Object.keys(payload).sort();
-    if (Array.isArray(payload.messages))
-        return `messages:${keys.join(",")}`;
-    if (Array.isArray(payload.system))
-        return `anthropic:${keys.join(",")}`;
-    return `object:${keys.join(",")}`;
-}
-/**
- * Creates an invocation-local provider payload hook for isolated agent loops.
- * The values are snapshotted at invocation start; no Runtime, SessionManager, or
- * extension state is retained by the returned hook.
- */
-export function createIsolatedDcpNudgePayloadHook(options = {}) {
-    let providerRequestCount = 0;
-    let lastNudgeRequest = 0;
-    const config = options.config ?? DEFAULTS;
-    const policy = options.policy ?? DEFAULT_COMPACTION_POLICY;
-    return (payload) => {
-        providerRequestCount += 1;
-        const frequency = config.dcpInRunNudgeFrequency;
-        const hasSignal = providerRequestCount >= config.dcpInRunNudgeIterationThreshold;
-        const frequencyReady = lastNudgeRequest === 0 || providerRequestCount - lastNudgeRequest >= frequency;
-        if (!hasSignal || !frequencyReady || payloadContainsDcpNudge(payload))
-            return undefined;
-        const nudge = buildDcpNudge(0, undefined, undefined, policy, providerRequestCount);
-        const nextPayload = injectDcpNudgeIntoProviderPayload(payload, nudge);
-        if (nextPayload === undefined)
-            return undefined;
-        lastNudgeRequest = providerRequestCount;
-        return nextPayload;
-    };
-}
 function rawTokensForContext(ctx) {
     const entries = ctx.sessionManager.getBranch();
     return rawTokensSinceLastCompaction(entries);
@@ -342,7 +208,7 @@ function decideAutoCompaction(ctx, runtime, state, policy, rawTokens, contextTok
         cooldownActive: remainingCooldownTurns(state, policy) > 0,
         hasSufficientMaterial: rawTokens >= requestSettings.minRawTokens,
         contextRatioReached: isContextAtOrAboveRatio(percent, policy.autoOlderHistory.contextLimitRatio),
-        absoluteThresholdReached: isContextAtOrAboveTokenLimit(contextTokens, runtime.config.dcpNudgeMinContextTokens),
+        absoluteThresholdReached: isContextAtOrAboveTokenLimit(contextTokens, runtime.config.autoCompactionContextTokens),
         rawThresholdReached: rawTokens >= runtime.config.compactionThresholdTokens,
         iterationReached: iterationSignal,
     });
@@ -352,7 +218,7 @@ function maybeScheduleAutoOlderHistoryCompaction(ctx, runtime, state, policy, ra
     if (decision.mode === "none")
         return false;
     const requestSettings = getAutoOlderHistoryRequestSettings(policy);
-    state.lastAgentDrivenRequestTurn = state.nudgeTurnCount;
+    state.lastAgentDrivenRequestTurn = state.turnCount;
     state.request = { source: "auto", mode: decision.mode, ...requestSettings };
     if (decision.mode === "request_time")
         notifyRequestTimeActive(ctx, state.request, rawTokens);
@@ -363,7 +229,7 @@ function maybeScheduleAutoOlderHistoryCompaction(ctx, runtime, state, policy, ra
 function remainingCooldownTurns(state, policy) {
     if (state.lastAgentDrivenRequestTurn === null)
         return 0;
-    const elapsed = Math.max(0, state.nudgeTurnCount - state.lastAgentDrivenRequestTurn);
+    const elapsed = Math.max(0, state.turnCount - state.lastAgentDrivenRequestTurn);
     return Math.max(0, policy.agentDriven.cooldownTurns - elapsed);
 }
 function getRequestTimeCompactionSettings(request, policy) {
@@ -376,12 +242,31 @@ function getRequestTimeCompactionSettings(request, policy) {
 function getBranchEntries(ctx) {
     return ctx.sessionManager.getBranch();
 }
-function createVirtualCompactionEntry(pathEntries, result) {
+function getAutoPruneBranchId(ctx) {
+    try {
+        return ctx.sessionManager.getSessionId();
+    }
+    catch {
+        return "unknown-session";
+    }
+}
+function autoPruneIdentityMatches(frozen, branchId, currentMessages) {
+    if (frozen.branchId !== branchId)
+        return false;
+    if (frozen.frozenAtBoundaryEnd > currentMessages.length)
+        return false;
+    for (let index = 0; index < frozen.frozenAtBoundaryEnd; index += 1) {
+        if (currentMessages[index] !== frozen.leadingMessageRefs[index])
+            return false;
+    }
+    return true;
+}
+function createVirtualCompactionEntry(pathEntries, result, timestamp) {
     return {
         type: "compaction",
         id: REQUEST_TIME_VIRTUAL_COMPACTION_ID,
         parentId: pathEntries[pathEntries.length - 1]?.id ?? null,
-        timestamp: pathEntries[pathEntries.length - 1]?.timestamp ?? new Date().toISOString(),
+        timestamp: timestamp ?? pathEntries[pathEntries.length - 1]?.timestamp ?? new Date().toISOString(),
         summary: result.summary,
         firstKeptEntryId: result.firstKeptEntryId,
         tokensBefore: result.tokensBefore,
@@ -389,7 +274,7 @@ function createVirtualCompactionEntry(pathEntries, result) {
         fromHook: false,
     };
 }
-function buildRequestTimePrunedMessages(ctx, request, policy, currentMessages, onFailure) {
+function buildRequestTimePrunedMessages(ctx, request, policy, currentMessages, onFailure, frozen) {
     // During an active provider request the event payload is the source of truth.
     // The session branch can lag behind it (notably while a tool result or the
     // current assistant turn is still being appended), which used to make the
@@ -404,13 +289,24 @@ function buildRequestTimePrunedMessages(ctx, request, policy, currentMessages, o
         timestamp: new Date(index).toISOString(),
         message,
     }));
-    const fromCurrentMessages = buildRequestTimePrunedMessagesFromEntries(currentEntries, request, policy, currentMessages, onFailure);
+    const fromCurrentMessages = buildRequestTimePrunedMessagesFromEntries(currentEntries, request, policy, currentMessages, onFailure, frozen);
     if (fromCurrentMessages)
         return fromCurrentMessages;
-    return buildRequestTimePrunedMessagesFromEntries(getBranchEntries(ctx), request, policy, currentMessages, onFailure);
+    return buildRequestTimePrunedMessagesFromEntries(getBranchEntries(ctx), request, policy, currentMessages, onFailure, frozen);
 }
 /** Request-time DCP adapter for isolated loops: it borrows only pure policy helpers. */
 export function buildIsolatedRequestTimePrunedMessages(currentMessages, policy = DEFAULT_COMPACTION_POLICY, keepRecentTokens) {
+    return buildIsolatedRequestTimePrunedMessagesResult(currentMessages, policy, keepRecentTokens).messages;
+}
+/**
+ * Stateful per-run variant of {@link buildIsolatedRequestTimePrunedMessages}.
+ *
+ * The subagent loop owns the returned `frozen` value across provider requests.
+ * On the first prune we freeze the deterministic summary + cut, then reuse that
+ * exact prefix until the leading message references change (which can only
+ * happen at the end of the isolated run).
+ */
+export function buildIsolatedRequestTimePrunedMessagesResult(currentMessages, policy = DEFAULT_COMPACTION_POLICY, keepRecentTokens, frozen) {
     const syntheticEntries = currentMessages.map((message, index) => ({
         type: "message",
         id: `isolated-${index}`,
@@ -418,18 +314,89 @@ export function buildIsolatedRequestTimePrunedMessages(currentMessages, policy =
         timestamp: new Date(index).toISOString(),
         message,
     }));
-    return buildRequestTimePrunedMessagesFromEntries(syntheticEntries, { source: "auto", mode: "request_time", scope: "older_history", keepRecentTokens, phaseBoundary: false, minRawTokens: 0, pinLatestUserMessage: true }, policy, currentMessages)?.messages ?? currentMessages;
+    const request = {
+        source: "auto",
+        mode: "request_time",
+        scope: "older_history",
+        keepRecentTokens,
+        phaseBoundary: false,
+        minRawTokens: 0,
+        pinLatestUserMessage: true,
+    };
+    const branchId = "isolated-subagent-run";
+    if (frozen && autoPruneIdentityMatches(frozen, branchId, currentMessages)) {
+        const reused = buildRequestTimePrunedMessagesFromEntries(syntheticEntries, request, policy, currentMessages, undefined, frozen);
+        if (reused)
+            return { messages: reused.messages, frozen };
+    }
+    const pruned = buildRequestTimePrunedMessagesFromEntries(syntheticEntries, request, policy, currentMessages);
+    if (!pruned || typeof pruned.anchorEntryId !== "string" || typeof pruned.summary !== "string") {
+        return { messages: currentMessages, frozen: null };
+    }
+    const nextFrozen = {
+        branchId,
+        anchorEntryId: pruned.anchorEntryId,
+        summary: pruned.summary,
+        frozenAtBoundaryEnd: currentMessages.length,
+        rawTokensAtFreeze: rawTokensForCurrentMessages(currentMessages),
+        tokensBefore: pruned.tokensBefore ?? 0,
+        timestamp: pruned.timestamp ?? new Date().toISOString(),
+        leadingMessageRefs: currentMessages.slice(),
+    };
+    return { messages: pruned.messages, frozen: nextFrozen };
 }
-function buildRequestTimePrunedMessagesFromEntries(pathEntries, request, policy, currentMessages, onFailure) {
+function buildRequestTimePrunedMessagesFromEntries(pathEntries, request, policy, currentMessages, onFailure, frozen) {
     const settings = getRequestTimeCompactionSettings(request, policy);
-    const preparation = prepareCompaction(pathEntries, settings, { phaseBoundary: request.phaseBoundary, pinLatestUserMessage: request.pinLatestUserMessage });
-    if (!preparation) {
-        onFailure?.("prepare_compaction_returned_undefined");
-        return undefined;
+    let summary;
+    let firstKeptEntryId;
+    let tokensBefore;
+    let details;
+    let tokensRemoved;
+    if (frozen) {
+        // Reuse the frozen cut. We still run prepareCompaction with an explicit
+        // anchor so the fixed boundary is validated against the current path,
+        // but we intentionally do NOT regenerate the summary (that would change
+        // the prompt-cache prefix on every request).
+        const preparation = prepareCompaction(pathEntries, settings, {
+            phaseBoundary: request.phaseBoundary,
+            pinLatestUserMessage: request.pinLatestUserMessage,
+            anchorEntryId: frozen.anchorEntryId,
+        });
+        if (!preparation || preparation.firstKeptEntryId !== frozen.anchorEntryId) {
+            onFailure?.(`frozen_anchor_not_found:${frozen.anchorEntryId}`);
+            return undefined;
+        }
+        summary = frozen.summary;
+        firstKeptEntryId = frozen.anchorEntryId;
+        tokensBefore = frozen.tokensBefore;
+        details = undefined;
+        tokensRemoved = 0;
+    }
+    else {
+        const preparation = prepareCompaction(pathEntries, settings, {
+            phaseBoundary: request.phaseBoundary,
+            pinLatestUserMessage: request.pinLatestUserMessage,
+        });
+        if (!preparation) {
+            onFailure?.("prepare_compaction_returned_undefined");
+            return undefined;
+        }
+        const result = compactDcpLite(preparation);
+        summary = result.summary;
+        firstKeptEntryId = result.firstKeptEntryId;
+        tokensBefore = result.tokensBefore;
+        details = result.details;
+        tokensRemoved = Math.max(0, result.tokensRemoved ?? 0);
     }
-    const result = compactDcpLite(preparation);
-    const tokensRemoved = Math.max(0, result.tokensRemoved ?? 0);
-    const virtualCompaction = createVirtualCompactionEntry(pathEntries, result);
+    const virtualTimestamp = frozen?.timestamp ??
+        pathEntries[pathEntries.length - 1]?.timestamp ??
+        new Date().toISOString();
+    const virtualCompaction = createVirtualCompactionEntry(pathEntries, {
+        summary,
+        firstKeptEntryId,
+        tokensBefore,
+        details,
+    }, virtualTimestamp);
     const virtualContext = buildSessionContext([...pathEntries, virtualCompaction]);
     if (virtualContext.messages.length === 0) {
         onFailure?.("virtual_context_has_no_messages");
@@ -441,12 +408,21 @@ function buildRequestTimePrunedMessagesFromEntries(pathEntries, request, policy,
     const originalTokens = currentMessages.reduce((total, message) => total + estimateTokens(message), 0);
     const prunedTokens = virtualContext.messages.reduce((total, message) => total + estimateTokens(message), 0);
     if (prunedTokens >= originalTokens) {
-        onFailure?.(tokensRemoved <= 0
+        onFailure?.(!frozen && tokensRemoved <= 0
             ? `summary_removed_zero_tokens:${originalTokens}->${prunedTokens}`
             : `pruned_context_not_smaller:${originalTokens}->${prunedTokens}`);
         return undefined;
     }
-    return { messages: virtualContext.messages, tokensRemoved, originalTokens, prunedTokens };
+    const effectiveTokensRemoved = frozen
+        ? Math.max(0, originalTokens - prunedTokens)
+        : tokensRemoved;
+    return {
+        messages: virtualContext.messages,
+        tokensRemoved: effectiveTokensRemoved,
+        originalTokens,
+        prunedTokens,
+        ...(frozen ? {} : { anchorEntryId: firstKeptEntryId, summary, tokensBefore, timestamp: virtualTimestamp }),
+    };
 }
 function notifyDcp(ctx, message, level, telemetry) {
     const notify = ctx.ui?.notify;
@@ -581,7 +557,7 @@ function registerAgentCompactionTool(ext, runtime, state) {
                 };
             }
             const customInstructions = buildCustomInstructions(params);
-            state.lastAgentDrivenRequestTurn = state.nudgeTurnCount;
+            state.lastAgentDrivenRequestTurn = state.turnCount;
             state.request = { source: "tool", mode, customInstructions, ...requestSettings };
             if (mode === "request_time")
                 notifyRequestTimeActive(ctx, state.request, rawTokens);
@@ -625,9 +601,7 @@ export function registerCompactContextTool(ext, runtime) {
         const policy = getCompactionPolicy(ctx);
         if (!policy.agentDriven.enabled)
             return;
-        state.providerRequestCount = 0;
-        state.lastInRunNudgeRequest = 0;
-        state.nudgeTurnCount += 1;
+        state.turnCount += 1;
         let rawTokens = 0;
         try {
             rawTokens = rawTokensForContext(ctx);
@@ -638,21 +612,7 @@ export function registerCompactContextTool(ext, runtime) {
         const usage = ctx.getContextUsage();
         const contextTokens = usage?.tokens;
         const percent = usage?.percent;
-        const minRawTokens = runtime.config.dcpNudgeMinRawTokens;
-        const minContextTokens = runtime.config.dcpNudgeMinContextTokens;
-        const minPercent = runtime.config.dcpNudgeContextPercent;
-        const turnInterval = runtime.config.dcpNudgeTurnInterval;
-        const turnsSinceNudge = state.nudgeTurnCount - state.lastNudgeTurn;
-        const rawSignal = rawTokens >= minRawTokens;
-        const absoluteContextSignal = isContextAtOrAboveTokenLimit(contextTokens, minContextTokens);
-        const percentSignal = typeof percent === "number" && Number.isFinite(percent) && percent >= minPercent;
-        const intervalSignal = turnsSinceNudge >= turnInterval && rawTokens >= Math.floor(minRawTokens / 2);
         maybeScheduleAutoOlderHistoryCompaction(ctx, runtime, state, policy, rawTokens, contextTokens, percent);
-        if (!rawSignal && !absoluteContextSignal && !percentSignal && !intervalSignal)
-            return;
-        state.lastNudgeTurn = state.nudgeTurnCount;
-        const nudge = buildDcpNudge(rawTokens, contextTokens, percent, policy);
-        return { systemPrompt: `${_event.systemPrompt}${nudge}` };
     }));
     ext.on("context", withDebug((_event, ctx) => {
         runtime.ensureConfig(ctx.cwd);
@@ -722,6 +682,53 @@ export function registerCompactContextTool(ext, runtime) {
         const autoUsage = ctx.getContextUsage();
         const autoContextTokens = autoUsage?.tokens;
         const autoPercent = autoUsage?.percent;
+        const autoBranchId = getAutoPruneBranchId(ctx);
+        const autoHysteresisTokens = autoSettings.keepRecentTokens
+            ? autoSettings.keepRecentTokens * 2
+            : 0;
+        // 2a. Frozen cut reuse. Once the auto path has pruned, keep reusing the
+        //     exact summary + anchor so the provider prompt prefix stays byte
+        //     stable across requests. Only invalidate on identity mismatch or
+        //     when raw growth exceeds the hysteresis threshold.
+        let frozen = state.autoPruneFrozen ?? null;
+        if (frozen && isMidRun) {
+            const identityMatches = autoPruneIdentityMatches(frozen, autoBranchId, _event.messages);
+            const hysteresisExceeded = autoHysteresisTokens > 0 &&
+                autoRawTokens - frozen.rawTokensAtFreeze > autoHysteresisTokens;
+            if (!identityMatches || hysteresisExceeded) {
+                state.autoPruneFrozen = null;
+                frozen = null;
+            }
+            else {
+                const frozenRequest = { source: "auto", mode: "request_time", ...autoSettings };
+                let frozenFailure;
+                const frozenPruned = buildRequestTimePrunedMessages(ctx, frozenRequest, policy, _event.messages, (reason) => {
+                    frozenFailure = reason;
+                }, frozen);
+                if (frozenPruned) {
+                    debugLog("compact_context.request_time.auto_frozen_reuse", {
+                        rawTokens: autoRawTokens,
+                        contextTokens: autoContextTokens ?? null,
+                        percent: autoPercent ?? null,
+                        originalTokens: frozenPruned.originalTokens,
+                        prunedTokens: frozenPruned.prunedTokens,
+                        tokensRemoved: frozenPruned.tokensRemoved,
+                        anchorEntryId: frozen.anchorEntryId,
+                    });
+                    notifyRequestTimeApplied(ctx, frozenPruned, frozenRequest);
+                    return { messages: frozenPruned.messages };
+                }
+                debugLog("compact_context.request_time.auto_frozen_invalid", {
+                    rawTokens: autoRawTokens,
+                    contextTokens: autoContextTokens ?? null,
+                    percent: autoPercent ?? null,
+                    reason: frozenFailure ?? "unknown",
+                    anchorEntryId: frozen.anchorEntryId,
+                });
+                state.autoPruneFrozen = null;
+                frozen = null;
+            }
+        }
         const autoDecision = decideAutoCompaction(ctx, runtime, state, policy, autoRawTokens, autoContextTokens, autoPercent, false, isMidRun);
         if (autoDecision.mode !== "request_time")
             return;
@@ -748,84 +755,24 @@ export function registerCompactContextTool(ext, runtime) {
             originalTokens: autoPruned.originalTokens,
             prunedTokens: autoPruned.prunedTokens,
             tokensRemoved: autoPruned.tokensRemoved,
+            frozen: false,
         });
+        if (typeof autoPruned.anchorEntryId === "string" && typeof autoPruned.summary === "string") {
+            state.autoPruneFrozen = {
+                branchId: autoBranchId,
+                anchorEntryId: autoPruned.anchorEntryId,
+                summary: autoPruned.summary,
+                frozenAtBoundaryEnd: _event.messages.length,
+                rawTokensAtFreeze: autoRawTokens,
+                tokensBefore: autoPruned.tokensBefore ?? 0,
+                timestamp: autoPruned.timestamp ?? new Date().toISOString(),
+                leadingMessageRefs: _event.messages.slice(),
+            };
+        }
         notifyRequestTimeApplied(ctx, autoPruned, autoRequest);
         return { messages: autoPruned.messages };
     }));
-    ext.on("before_provider_request", withDebug((_event, ctx) => {
-        runtime.ensureConfig(ctx.cwd);
-        if (runtime.config.passive === true)
-            return;
-        const policy = getCompactionPolicy(ctx);
-        if (!policy.agentDriven.enabled)
-            return;
-        state.providerRequestCount += 1;
-        const rawTokens = safeRawTokensForContext(ctx);
-        const usage = ctx.getContextUsage();
-        const contextTokens = usage?.tokens;
-        const percent = usage?.percent;
-        const minRawTokens = runtime.config.dcpNudgeMinRawTokens;
-        const minContextTokens = runtime.config.dcpNudgeMinContextTokens;
-        const minPercent = runtime.config.dcpNudgeContextPercent;
-        const iterationThreshold = runtime.config.dcpInRunNudgeIterationThreshold;
-        const frequency = runtime.config.dcpInRunNudgeFrequency;
-        const rawSignal = rawTokens >= minRawTokens;
-        const absoluteContextSignal = isContextAtOrAboveTokenLimit(contextTokens, minContextTokens);
-        const percentSignal = typeof percent === "number" && Number.isFinite(percent) && percent >= minPercent;
-        const iterationSignal = state.providerRequestCount >= iterationThreshold;
-        const frequencyReady = state.lastInRunNudgeRequest === 0 ||
-            state.providerRequestCount - state.lastInRunNudgeRequest >= frequency;
-        const signalEligible = rawSignal || absoluteContextSignal || percentSignal || iterationSignal;
-        const payloadShape = describeProviderPayload(_event.payload);
-        const alreadyContainsNudge = payloadContainsDcpNudge(_event.payload);
-        debugLog("compact_context.before_provider_request", {
-            providerRequestCount: state.providerRequestCount,
-            rawTokens,
-            contextTokens: contextTokens ?? null,
-            percent: percent ?? null,
-            rawSignal,
-            absoluteContextSignal,
-            percentSignal,
-            iterationSignal,
-            frequencyReady,
-            signalEligible,
-            payloadShape,
-            alreadyContainsNudge,
-        });
-        // NOTE: maybeScheduleAutoOlderHistoryCompaction is intentionally NOT called
-        // here. This event fires AFTER the context event within the same provider
-        // request cycle, so any state.request set here would only be visible to
-        // the context event on the NEXT request — a one-request lag that lets the
-        // oversized request through unpruned. Auto request_time pruning is now
-        // decided inline in the context event handler (no lag).
-        if (!signalEligible || !frequencyReady) {
-            debugLog("compact_context.nudge_skipped", {
-                reason: !signalEligible ? "no_signal" : "frequency_cooldown",
-                payloadShape,
-            });
-            return;
-        }
-        if (alreadyContainsNudge) {
-            state.lastInRunNudgeRequest = state.providerRequestCount;
-            debugLog("compact_context.nudge_skipped", { reason: "already_present", payloadShape });
-            return;
-        }
-        const nudge = buildDcpNudge(rawTokens, contextTokens, percent, policy, state.providerRequestCount);
-        const payload = injectDcpNudgeIntoProviderPayload(_event.payload, nudge);
-        if (payload === undefined) {
-            debugLog("compact_context.nudge_skipped", { reason: "unsupported_payload_shape", payloadShape });
-            return;
-        }
-        state.lastInRunNudgeRequest = state.providerRequestCount;
-        debugLog("compact_context.nudge_injected", {
-            providerRequestCount: state.providerRequestCount,
-            payloadShape,
-        });
-        return payload;
-    }));
     ext.on("agent_end", withDebug((_event, ctx) => {
-        state.providerRequestCount = 0;
-        state.lastInRunNudgeRequest = 0;
         const request = state.request;
         if (!request || request.mode !== "after_turn")
             return;

package/dist/memory/tools/read-project-observations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"read-project-observations.d.ts","sourceRoot":"","sources":["../../../src/memory/tools/read-project-observations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAc,KAAK,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAGhF,eAAO,MAAM,mCAAmC,8BAA8B,CAAC;AAE/E,eAAO,MAAM,2BAA2B;;iFAqFtC,CAAC;AAEH,wBAAgB,mCAAmC,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI,CAE3E"}
+{"version":3,"file":"read-project-observations.d.ts","sourceRoot":"","sources":["../../../src/memory/tools/read-project-observations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAc,KAAK,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAGhF,eAAO,MAAM,mCAAmC,8BAA8B,CAAC;AAE/E,eAAO,MAAM,2BAA2B;;iFAwFtC,CAAC;AAEH,wBAAgB,mCAAmC,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI,CAE3E"}

package/dist/memory/tools/read-project-observations.js

@@ -5,13 +5,16 @@ export const READ_PROJECT_OBSERVATIONS_TOOL_NAME = "read_project_observations";
 export const readProjectObservationsTool = defineTool({
     name: READ_PROJECT_OBSERVATIONS_TOOL_NAME,
     label: "Search project observations",
-    description: "Search all past observations across ALL sessions in this project. " +
+    description: "Search past observations across sessions in this project, stored per-machine " +
+        "and per-working-directory (cwd). " +
         "Use this when you need to recall project conventions, past decisions, " +
         "file locations, or user preferences before editing or creating files. " +
         "Uses simple substring matching — be specific with your query terms. " +
-        "Returns up to 20 most recent matching observations with relevance tags.",
-    promptSnippet: "Use read_project_observations(<query>) to search past observations across ALL sessions in this project.",
+        "Returns up to 20 most recent matching observations with relevance tags. " +
+        "Results are local to this machine and cwd; they are NOT synced across machines or teams.",
+    promptSnippet: "Use read_project_observations(<query>) to search past observations across sessions in this local project working directory.",
     promptGuidelines: [
+        "Results are per-machine + per-cwd and cross-session; they are NOT shared across machines or teams.",
         "Use read_project_observations before creating new files to find conventions for that file kind.",
         "Use read_project_observations before editing a file to find past context about that file or its directory.",
         "Be specific: search for file paths, technology names, or pattern keywords.",

package/dist/memory/tools/recall-observation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"recall-observation.d.ts","sourceRoot":"","sources":["../../../src/memory/tools/recall-observation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAE7C,OAAO,EAAc,KAAK,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAEhF,OAAO,EAGN,KAAK,uBAAuB,EAE5B,MAAM,cAAc,CAAC;AAGtB,OAAO,KAAK,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEvE,eAAO,MAAM,4BAA4B,WAAW,CAAC;AAIrD,KAAK,2BAA2B,GAC7B,IAAI,GACJ,SAAS,GACT,YAAY,GACZ,WAAW,GACX,WAAW,GACX,oBAAoB,GACpB,eAAe,CAAC;AAEnB,KAAK,kBAAkB,GAAG,IAAI,CAAC,iBAAiB,EAAE,IAAI,GAAG,SAAS,GAAG,WAAW,GAAG,WAAW,CAAC,CAAC;AAChG,KAAK,iBAAiB,GAAG,IAAI,CAAC,gBAAgB,EAAE,IAAI,GAAG,SAAS,GAAG,0BAA0B,GAAG,QAAQ,CAAC,GAAG;IAAE,eAAe,EAAE,MAAM,CAAA;CAAE,CAAC;AAExI,MAAM,MAAM,wBAAwB,GAAG;IACtC,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,KAAK,6BAA6B,GAAG;IACpC,MAAM,EAAE,uBAAuB,CAAC,QAAQ,CAAC,CAAC;IAC1C,kBAAkB,EAAE,MAAM,CAAC;IAC3B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,WAAW,EAAE,kBAAkB,CAAC;IAChC,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,aAAa,CAAC,EAAE,wBAAwB,EAAE,CAAC;IAC3C,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAC;IACjC,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF,KAAK,6CAA6C,GAAG;IACpD,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,KAAK,4CAA4C,GAAG;IACnD,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,QAAQ,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG;IAC1C,MAAM,EAAE,2BAA2B,CAAC;IACpC,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,iBAAiB,EAAE,CAAC;IACjC,wBAAwB,EAAE,6BAA6B,EAAE,CAAC;IAC1D,YAAY,EAAE,6BAA6B,EAAE,CAAC;IAC9C,OAAO,EAAE,6BAA6B,EAAE,CAAC;IACzC,aAAa,EAAE,wBAAwB,EAAE,CAAC;IAC1C,iCAAiC,EAAE,6CAA6C,EAAE,CAAC;IACnF,+BAA+B,EAAE,4CAA4C,EAAE,CAAC;IAChF,qBAAqB,EAAE,MAAM,EAAE,CAAC;IAChC,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAuUF,eAAO,MAAM,qBAAqB;;iFAuChC,CAAC;AAEH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI,CAE1D"}
+{"version":3,"file":"recall-observation.d.ts","sourceRoot":"","sources":["../../../src/memory/tools/recall-observation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAE7C,OAAO,EAAc,KAAK,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAEhF,OAAO,EAGN,KAAK,uBAAuB,EAE5B,MAAM,cAAc,CAAC;AAItB,OAAO,KAAK,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEvE,eAAO,MAAM,4BAA4B,WAAW,CAAC;AAIrD,KAAK,2BAA2B,GAC7B,IAAI,GACJ,SAAS,GACT,YAAY,GACZ,WAAW,GACX,WAAW,GACX,oBAAoB,GACpB,eAAe,CAAC;AAEnB,KAAK,kBAAkB,GAAG,IAAI,CAAC,iBAAiB,EAAE,IAAI,GAAG,SAAS,GAAG,WAAW,GAAG,WAAW,CAAC,CAAC;AAChG,KAAK,iBAAiB,GAAG,IAAI,CAAC,gBAAgB,EAAE,IAAI,GAAG,SAAS,GAAG,0BAA0B,GAAG,QAAQ,CAAC,GAAG;IAAE,eAAe,EAAE,MAAM,CAAA;CAAE,CAAC;AAExI,MAAM,MAAM,wBAAwB,GAAG;IACtC,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,KAAK,6BAA6B,GAAG;IACpC,MAAM,EAAE,uBAAuB,CAAC,QAAQ,CAAC,CAAC;IAC1C,kBAAkB,EAAE,MAAM,CAAC;IAC3B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,WAAW,EAAE,kBAAkB,CAAC;IAChC,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,aAAa,CAAC,EAAE,wBAAwB,EAAE,CAAC;IAC3C,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAC;IACjC,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC9B,CAAC;AAEF,KAAK,6CAA6C,GAAG;IACpD,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,KAAK,4CAA4C,GAAG;IACnD,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,MAAM,EAAE,QAAQ,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG;IAC1C,MAAM,EAAE,2BAA2B,CAAC;IACpC,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,iBAAiB,EAAE,CAAC;IACjC,wBAAwB,EAAE,6BAA6B,EAAE,CAAC;IAC1D,YAAY,EAAE,6BAA6B,EAAE,CAAC;IAC9C,OAAO,EAAE,6BAA6B,EAAE,CAAC;IACzC,aAAa,EAAE,wBAAwB,EAAE,CAAC;IAC1C,iCAAiC,EAAE,6CAA6C,EAAE,CAAC;IACnF,+BAA+B,EAAE,4CAA4C,EAAE,CAAC;IAChF,qBAAqB,EAAE,MAAM,EAAE,CAAC;IAChC,iBAAiB,EAAE,MAAM,EAAE,CAAC;IAC5B,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAuUF,eAAO,MAAM,qBAAqB;;iFAqDhC,CAAC;AAEH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI,CAE1D"}

package/dist/memory/tools/recall-observation.js

@@ -1,6 +1,7 @@
 import { Type } from "../../sdk/ai/index.js";
 import { defineTool } from "../../sdk/coding-agent/index.js";
 import { recallMemorySources, } from "../branch.js";
+import { getProjectObsStore } from "../project-observations-store.js";
 import { renderRecallSourceEntries, renderRecallSourceEntry } from "../serialize.js";
 import { estimateEntryTokens } from "../tokens.js";
 export const RECALL_OBSERVATION_TOOL_NAME = "recall";
@@ -315,7 +316,8 @@ function renderFoundResult(result) {
 export const recallObservationTool = defineTool({
     name: RECALL_OBSERVATION_TOOL_NAME,
     label: "Recall memory evidence",
-    description: "Recover exact evidence and source context behind a compacted observational-memory observation or reflection id on the current branch. " +
+    description: "Recover exact evidence and source context behind a compacted observational-memory observation or reflection id " +
+        "from the current branch or an earlier session in the same working directory. " +
         "Use when compressed memory is important and original source context is needed before acting.",
     promptSnippet: "Use recall(<id>) to recover exact source context behind compacted memory observations/reflections when precision matters.",
     promptGuidelines: [
@@ -340,10 +342,22 @@ export const recallObservationTool = defineTool({
             return textResult(message, emptyDetails("invalid_id", memoryId, message));
         }
         const branchEntries = ctx.sessionManager.getBranch();
-        const result = recallMemorySources(branchEntries, memoryId);
+        let result = recallMemorySources(branchEntries, memoryId);
         if (result.status === "not_found") {
-            const message = `No observation or reflection with id ${memoryId} was found on the current branch.`;
-            return textResult(message, emptyDetails("not_found", memoryId, message));
+            const store = getProjectObsStore();
+            const projectId = store?.getProjectByCwd(ctx.cwd);
+            const archiveEntries = projectId ? store?.getProjectRecallSource?.(projectId, memoryId) : null;
+            if (archiveEntries && archiveEntries.length > 0) {
+                const archivedResult = recallMemorySources(archiveEntries, memoryId);
+                if (archivedResult.status === "found") {
+                    result = archivedResult;
+                }
+            }
+            if (result.status === "not_found") {
+                const message = `No observation or reflection with id ${memoryId} was found on the current branch ` +
+                    `or in this project's cross-session memory.`;
+                return textResult(message, emptyDetails("not_found", memoryId, message));
+            }
         }
         return renderFoundResult(result);
     },

package/dist/memory/tools/receive-agent-observations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"receive-agent-observations.d.ts","sourceRoot":"","sources":["../../../src/memory/tools/receive-agent-observations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAc,KAAK,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAIhF,eAAO,MAAM,oCAAoC,+BAA+B,CAAC;AAEjF,MAAM,WAAW,uBAAuB;IACvC,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,KAAK,GAAG,QAAQ,GAAG,MAAM,GAAG,UAAU,CAAC;IAClD,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,aAAa,GAAG,YAAY,CAAC;IACzC,SAAS,EAAE,MAAM,CAAC;CAClB;AAED,eAAO,MAAM,4BAA4B;;;iFAmEvC,CAAC;AAEH,wBAAgB,oCAAoC,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI,CAE5E"}
+{"version":3,"file":"receive-agent-observations.d.ts","sourceRoot":"","sources":["../../../src/memory/tools/receive-agent-observations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAc,KAAK,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAIhF,eAAO,MAAM,oCAAoC,+BAA+B,CAAC;AAEjF,MAAM,WAAW,uBAAuB;IACvC,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,KAAK,GAAG,QAAQ,GAAG,MAAM,GAAG,UAAU,CAAC;IAClD,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,aAAa,GAAG,YAAY,CAAC;IACzC,SAAS,EAAE,MAAM,CAAC;CAClB;AAED,eAAO,MAAM,4BAA4B;;;iFAqEvC,CAAC;AAEH,wBAAgB,oCAAoC,CAAC,GAAG,EAAE,YAAY,GAAG,IAAI,CAE5E"}