Fix bulk of remaining issues with generalist profile (#26073)

packages/core/src/context/graph/render.ts

@@ -6,17 +6,14 @@
 
 import type { Content } from '@google/genai';
 import type { ConcreteNode } from './types.js';
-import { debugLogger } from '../../utils/debugLogger.js';
-import type {
-  ContextEnvironment,
-  ContextTracer,
-} from '../pipeline/environment.js';
-import type { PipelineOrchestrator } from '../pipeline/orchestrator.js';
+import type { ContextTracer } from '../tracer.js';
 import type { ContextProfile } from '../config/profiles.js';
+import type { PipelineOrchestrator } from '../pipeline/orchestrator.js';
+import type { ContextEnvironment } from '../pipeline/environment.js';
 
 /**
- * Orchestrates the final render: takes a working buffer view (The Nodes),
- * applies the Immediate Sanitization pipeline, and enforces token boundaries.
+ * Maps the Episodic Context Graph back into a raw Gemini Content[] array for transmission.
+ * It applies synchronous context management (GC backstop) if the budget is exceeded.
  */
 export async function render(
   nodes: readonly ConcreteNode[],
@@ -24,28 +21,40 @@ export async function render(
   sidecar: ContextProfile,
   tracer: ContextTracer,
   env: ContextEnvironment,
-  protectedIds: Set<string>,
-): Promise<Content[]> {
+  protectionReasons: Map<string, string> = new Map(),
+  headerTokens: number = 0,
+): Promise<{ history: Content[]; didApplyManagement: boolean }> {
   if (!sidecar.config.budget) {
     const contents = env.graphMapper.fromGraph(nodes);
     tracer.logEvent('Render', 'Render Context to LLM (No Budget)', {
       renderedContext: contents,
     });
-    return contents;
+    return { history: contents, didApplyManagement: false };
   }
 
   const maxTokens = sidecar.config.budget.maxTokens;
-  const currentTokens = env.tokenCalculator.calculateConcreteListTokens(nodes);
+  const graphTokens = env.tokenCalculator.calculateConcreteListTokens(nodes);
+  const currentTokens = graphTokens + headerTokens;
 
-  // V0: Always protect the first node (System Prompt) and the last turn
-  if (nodes.length > 0) {
-    protectedIds.add(nodes[0].id);
-    if (nodes[0].logicalParentId) protectedIds.add(nodes[0].logicalParentId);
+  const protectedIds = new Set(protectionReasons.keys());
 
-    const lastNode = nodes[nodes.length - 1];
-    protectedIds.add(lastNode.id);
-    if (lastNode.logicalParentId) protectedIds.add(lastNode.logicalParentId);
-  }
+  tracer.logEvent('Render', 'Budget Audit', {
+    maxTokens,
+    retainedTokens: sidecar.config.budget.retainedTokens,
+    graphTokens,
+    headerTokens,
+    currentTokens,
+    pressure: (currentTokens / maxTokens).toFixed(2),
+    isOverBudget: currentTokens > maxTokens,
+  });
+
+  tracer.logEvent('Render', 'Estimation Calibration', {
+    breakdown: env.tokenCalculator.calculateTokenBreakdown(nodes),
+  });
+
+  tracer.logEvent('Render', 'Protection Audit', {
+    reasons: Object.fromEntries(protectionReasons),
+  });
 
   if (currentTokens <= maxTokens) {
     tracer.logEvent(
@@ -56,15 +65,14 @@ export async function render(
     tracer.logEvent('Render', 'Render Context for LLM', {
       renderedContext: contents,
     });
-    return contents;
+    return { history: contents, didApplyManagement: false };
   }
 
+  const targetDelta = currentTokens - sidecar.config.budget.retainedTokens;
   tracer.logEvent(
     'Render',
     `View exceeds maxTokens (${currentTokens} > ${maxTokens}). Hitting Synchronous Pressure Barrier.`,
-  );
-  debugLogger.log(
-    `Context Manager Synchronous Barrier triggered: View at ${currentTokens} tokens (limit: ${maxTokens}).`,
+    { targetDelta },
   );
 
   // Calculate exactly which nodes aged out of the retainedTokens budget to form our target delta
@@ -87,16 +95,6 @@ export async function render(
     protectedIds,
   );
 
-  const finalTokens =
-    env.tokenCalculator.calculateConcreteListTokens(processedNodes);
-  tracer.logEvent(
-    'Render',
-    `Finished rendering. Final token count: ${finalTokens}.`,
-  );
-  debugLogger.log(
-    `Context Manager finished. Final actual token count: ${finalTokens}.`,
-  );
-
   // Apply skipList logic to abstract over summarized nodes
   const skipList = new Set<string>();
   for (const node of processedNodes) {
@@ -111,5 +109,5 @@ export async function render(
   tracer.logEvent('Render', 'Render Sanitized Context for LLM', {
     renderedContextSanitized: contents,
   });
-  return contents;
+  return { history: contents, didApplyManagement: true };
 }