@ponythewhite/base-context 1.0.5 → 1.0.7

package/dist/core/agent-session.js

@@ -592,7 +592,9 @@ export class AgentSession {
             try {
                 const messages = await captured.readHistory(async (view) => {
                     const sameSource = controls?.sessionId === view.source.sessionId && controls?.sessionFile === view.source.sessionFile;
-                    const result = await this._contextCompiler.compile(view, limits, sameSource ? omitted : undefined, {}, resource, this._initialContextMode, contextEpochsEnabled);
+                    const result = await this._contextCompiler.compile(view, limits, sameSource ? omitted : undefined, {}, resource, this._initialContextMode, 
+                    // This MAIN owner binds public admission below, independently of optional token budgets.
+                    true);
                     if (sameSource && this._contextOmissions === controls) {
                         // Only prune this captured set. A newer control or source switch must survive this read.
                         for (const id of omitted)
@@ -608,7 +610,8 @@ export class AgentSession {
                 const epochContext = getCanonicalEpochContext(messages);
                 if (epochContext)
                     this._contextMode = epochContext.mode;
-                const nativeSkills = Boolean(contextEpochsEnabled || epochContext?.checkpoint);
+                const unbudgetedPublic = !contextEpochsEnabled && Boolean(epochContext?.toolContinuations?.length);
+                const nativeSkills = Boolean(contextEpochsEnabled || epochContext?.checkpoint || unbudgetedPublic);
                 const skillPolicy = nativeSkills ? (this._nativeRecoveryEnabled() ? "enabled" : "unavailable") : undefined;
                 if (this._baseSystemPromptOptions.nativeSkillSelection !== skillPolicy) {
                     const previousBase = this._baseSystemPrompt;
@@ -618,14 +621,16 @@ export class AgentSession {
                 if (epochContext?.resourceRevision !== undefined &&
                     getCanonicalViewUnits(messages)?.length !== messages.length)
                     throw new Error("Current resource view requires tracked canonical context");
-                if (epochContext?.checkpoint && getCanonicalViewUnits(messages)?.length !== messages.length)
+                if ((epochContext?.checkpoint || unbudgetedPublic) &&
+                    getCanonicalViewUnits(messages)?.length !== messages.length)
                     throw new Error("Committed context epoch cannot admit untracked transient messages");
                 if (epochContext &&
-                    (contextEpochsEnabled || epochContext.checkpoint) &&
+                    (contextEpochsEnabled || epochContext.checkpoint || unbudgetedPublic) &&
                     getCanonicalViewUnits(messages)?.length === messages.length) {
                     let committed = epochContext.checkpoint;
                     let committedEntry = epochContext.checkpointEntry;
-                    const fixed = epochContext.mode === "off" || (committed?.policyOnly === true && !contextEpochsEnabled);
+                    const fixed = epochContext.mode === "off" ||
+                        (committed?.policyOnly === true && !contextEpochsEnabled && !unbudgetedPublic);
                     let requestContract = fixed ? retainedContextRequestContract(committed) : undefined;
                     const nativeTail = messages.some((message) => message.role === "toolResult" ||
                         (message.role === "assistant" &&
@@ -651,7 +656,7 @@ export class AgentSession {
                                 candidate.projection.pendingPublicMessageGroups?.length))
                             throw new Error("Tool continuation requires its exact public candidate before epoch ACK");
                         assertResourceCurrent(resource);
-                        const representation = contextEpochRepresentation(candidate.request, candidate.assessment, limits.maxSourceBytes);
+                        const representation = contextEpochRepresentation(candidate.request, candidate.assessment, limits.maxSourceBytes, unbudgetedPublic);
                         const replayContract = "replayContract" in candidate.projection &&
                             candidate.projection.replayContract === "message-groups"
                             ? "message-groups"
@@ -691,7 +696,7 @@ export class AgentSession {
                         const prepared = prepareCanonicalEpoch(candidate.publicMessages ?? messages, candidate.selectedUnitIds, representation, limits.maxSourceBytes, replayContract, publicWindow);
                         if (JSON.stringify(prepared.checkpoint.source) !== JSON.stringify(candidate.source))
                             throw new Error("Context epoch candidate does not match its captured source");
-                        const tokensBefore = candidate.originalAssessment.estimatedInputTokens;
+                        const tokensBefore = candidate.originalAssessment?.estimatedInputTokens ?? null;
                         const result = {
                             summary: "",
                             firstKeptEntryId: prepared.checkpoint.literalTailId,
@@ -737,7 +742,7 @@ export class AgentSession {
                                 return;
                             if (acceptedBody === undefined || request.body !== acceptedBody)
                                 throw new Error("Committed context epoch requires a compatible final provider projection");
-                            if (contextEpochRepresentation(request, assessment, limits.maxSourceBytes) !==
+                            if (contextEpochRepresentation(request, assessment, limits.maxSourceBytes, unbudgetedPublic) !==
                                 committed.representation)
                                 throw new Error("Context epoch representation changed without a committed boundary");
                             if (committed.resourceRevision !== epochContext.resourceRevision)
@@ -4479,7 +4484,10 @@ export class AgentSession {
         }
         const limits = this.settingsManager.getCanonicalContextLimits();
         const outcomes = structuredClone(this._unpersistedOutcomes);
-        const { context } = await readSessionBootstrap(this.sessionManager, limits);
+        const { context } = await readSessionBootstrap(this.sessionManager, limits, {
+            initialContextMode: this._initialContextMode,
+            purpose: "read",
+        });
         this._mergeUnpersistedOutcomes(context.messages, outcomes);
         if (context.messages.length > limits.maxMessages)
             throw new Error("Canonical context message budget exceeded");
@@ -7647,7 +7655,7 @@ export class AgentSession {
                 maxSourceBytes: limits.maxSourceBytes,
             };
         return requests.readHistory(async (view) => {
-            const messages = await new CanonicalContextCompiler().compile(view, limits, undefined, {}, resource);
+            const messages = await new CanonicalContextCompiler().compile(view, limits, undefined, {}, resource, this._initialContextMode, false, "read");
             this._assertCompactionOwner(owner);
             const context = getCanonicalEpochContext(messages);
             if (context.checkpoint?.includeSummary && pathEntries.at(-1)?.type === "compaction")
@@ -7812,7 +7820,10 @@ export class AgentSession {
         }
         try {
             this._assertCompactionOwner(owner);
-            const bootstrap = await readSessionBootstrap(owner.manager, this.settingsManager.getCanonicalContextLimits());
+            const bootstrap = await readSessionBootstrap(owner.manager, this.settingsManager.getCanonicalContextLimits(), {
+                purpose: "read",
+                initialContextMode: this._initialContextMode,
+            });
             this._assertCompactionOwner(owner);
             owner.agent.state.messages = bootstrap.context.messages;
             this._contextOmissions = undefined;
@@ -11971,7 +11982,7 @@ export class AgentSession {
             if (label && !summaryText) {
                 await this.sessionManager.appendLabelChange(targetId, label);
             }
-            const { context: sessionContext } = await readSessionBootstrap(this.sessionManager, this.settingsManager.getCanonicalContextLimits(), { allowPendingToolPublic: this._contextEpochsEnabled, initialContextMode: this._initialContextMode });
+            const { context: sessionContext } = await readSessionBootstrap(this.sessionManager, this.settingsManager.getCanonicalContextLimits(), { purpose: "read", initialContextMode: this._initialContextMode });
             this.agent.state.messages = sessionContext.messages;
             this._contextOmissions = undefined;
             this._mergeUnpersistedOutcomes(this.agent.state.messages);