chainlesschain 0.166.130 → 0.166.132

package/src/lib/usage-pricing-context.js

@@ -50,6 +50,25 @@ export function projectCacheCreationUsage(usage = {}) {
   const hasFlat =
     Object.hasOwn(usage, "cacheCreation5mTokens") ||
     Object.hasOwn(usage, "cacheCreation1hTokens");
+  const hasOpenAI =
+    Object.hasOwn(usage, "cacheCreation30mTokens") ||
+    Object.hasOwn(usage, "cacheCreation12hTokens");
+  if (hasOpenAI) {
+    const thirty = usage.cacheCreation30mTokens;
+    const twelve = usage.cacheCreation12hTokens;
+    const total =
+      usage.cache_creation_input_tokens ?? usage.cacheCreationTokens;
+    if (
+      hasFlat ||
+      Object.hasOwn(usage, "cache_creation") ||
+      ![thirty, twelve, total].every(
+        (n) => Number.isSafeInteger(n) && n >= 0,
+      ) ||
+      thirty + twelve !== total
+    )
+      return { cacheCreationInvalid: true };
+    return { cacheCreation30mTokens: thirty, cacheCreation12hTokens: twelve };
+  }
   if (!Object.hasOwn(usage, "cache_creation") && !hasFlat) return {};
   if (
     Object.hasOwn(usage, "cache_creation") &&
@@ -150,9 +169,17 @@ export function mergeUsagePricingBucket(entry, usage) {
   const cache = projectCacheCreationUsage(usage);
   const cacheEvidence = cache.cacheCreationInvalid
     ? "invalid"
-    : cache.cacheCreation5mTokens != null
-      ? "split"
-      : "missing";
+    : cache.cacheCreation30mTokens != null
+      ? "openai-split"
+      : cache.cacheCreation5mTokens != null
+        ? "split"
+        : "missing";
+  const cacheFields =
+    cacheEvidence === "openai-split"
+      ? ["cacheCreation30mTokens", "cacheCreation12hTokens"]
+      : cacheEvidence === "split"
+        ? ["cacheCreation5mTokens", "cacheCreation1hTokens"]
+        : [];
   const serviceTier = metadata.service_tier || "standard";
   const regionalProcessing = metadata.regional_processing === true;
   entry.pricingBuckets ||= [];
@@ -176,17 +203,9 @@ export function mergeUsagePricingBucket(entry, usage) {
       regionalProcessing,
       requestInputTokens: promptTokens,
       ...(pricingContextInvalid ? { pricingContextInvalid: true } : {}),
-      ...(provider === "anthropic"
-        ? {
-            cacheEvidence,
-            ...(cacheEvidence === "split"
-              ? { cacheCreation5mTokens: 0, cacheCreation1hTokens: 0 }
-              : {}),
-            ...(cacheEvidence === "invalid"
-              ? { cacheCreationInvalid: true }
-              : {}),
-          }
-        : {}),
+      cacheEvidence,
+      ...Object.fromEntries(cacheFields.map((key) => [key, 0])),
+      ...(cacheEvidence === "invalid" ? { cacheCreationInvalid: true } : {}),
     };
     entry.pricingBuckets.push(bucket);
   }
@@ -197,9 +216,7 @@ export function mergeUsagePricingBucket(entry, usage) {
     "cacheCreationTokens",
     "totalTokens",
     "calls",
-    ...(cacheEvidence === "split"
-      ? ["cacheCreation5mTokens", "cacheCreation1hTokens"]
-      : []),
+    ...cacheFields,
   ]) {
     const value = cache[key] ?? usage[key] ?? (key === "calls" ? 1 : 0);
     if (

package/src/repl/agent-repl.js

@@ -167,7 +167,14 @@ import {
 import { formatBackgroundTasks } from "./tasks-status.js";
 import { expandFileRefsAsync } from "../runtime/file-ref-expander.js";
 import { prepareVisionTurn, resolveVisionLlm } from "../lib/image-input.js";
-import { composeSystemPrompt } from "../runtime/system-prompt.js";
+import {
+  composeSystemPrompt,
+  hostProjectMemoryMode,
+} from "../runtime/system-prompt.js";
+import {
+  createCompactionHostContextRefresher,
+  refreshCompactionHostContext,
+} from "../runtime/compaction-host-context.js";
 import { installPipeSafety } from "../runtime/pipe-safety.js";
 import { installOutputBackpressure } from "../runtime/output-backpressure.js";
 import {
@@ -4212,7 +4219,10 @@ async function startAgentReplInWorkspaceOwned(
       {
         systemPrompt: options.systemPrompt,
         appendSystemPrompt: options.appendSystemPrompt,
-        projectMemory: _leanNoProjectMemory ? false : undefined,
+        cwd: process.cwd(),
+        projectMemory: _leanNoProjectMemory
+          ? false
+          : hostProjectMemoryMode(options.projectMemory),
         onInstructionsLoaded: (loaded) => {
           _loadedReplInstructions = loaded;
         },
@@ -4870,6 +4880,18 @@ async function startAgentReplInWorkspaceOwned(
   // any canonical/legacy replay is appended. Later live switches refresh only
   // entry 0 from the active base prompt; they never re-scan old session systems.
   _registerHostSystemMessages();
+  const _projectContextRefresher = createCompactionHostContextRefresher({
+    messages,
+    render: () => {
+      _replBaseSystem = _buildReplBaseSystem();
+      return _activeOutputStyle?.body
+        ? `${_replBaseSystem}\n\n${_activeOutputStyle.body}`
+        : _replBaseSystem;
+    },
+    onUpdated: () => _refreshHostSystemMessages(),
+  });
+  const _refreshProjectContext = () =>
+    refreshCompactionHostContext(_projectContextRefresher, messages);
 
   let _startupResumeCommitted = false;
   // Load resumed session messages
@@ -7448,6 +7470,13 @@ async function startAgentReplInWorkspaceOwned(
         return;
       }
 
+      try {
+        _refreshProjectContext();
+      } catch (error) {
+        logger.error(error.message);
+        prompt();
+        return;
+      }
       const expectedMessages = [...messages];
       if (_compressor && messages.length > 3) {
         let result;
@@ -9817,6 +9846,7 @@ async function startAgentReplInWorkspaceOwned(
       }
       const activeMcpRuntime = _activateMcpHostRuntime();
       const activeRawMcpClient = activeMcpRuntime.rawClient || undefined;
+      _refreshProjectContext();
       const {
         content: response,
         usageEvents,
@@ -9939,6 +9969,7 @@ async function startAgentReplInWorkspaceOwned(
         mcpClient: activeRawMcpClient,
         mcpHostClient: activeMcpRuntime.runtime.client,
         extraToolDefinitions: _adhocMcp?.extraToolDefinitions,
+        mcpToolCatalog: _adhocMcp?.mcpToolCatalog || null,
         externalToolExecutors: _adhocMcp?.externalToolExecutors,
         externalToolDescriptors: _adhocMcp?.externalToolDescriptors,
         // The recovery controller is required even when this legacy/ephemeral
@@ -10174,6 +10205,7 @@ async function startAgentReplInWorkspaceOwned(
         _compressor.shouldAutoCompact(messages)
       ) {
         try {
+          _refreshProjectContext();
           const expectedMessages = [...messages];
           const {
             messages: compacted,