@myagentroam/agent 0.9.95 → 0.9.96

package/dist/sdk/agent.js

@@ -576,8 +576,7 @@ export async function createMarAgent(options) {
                             estimatedRequestTokens: estimatedRequestTokens(compactSystemPrompt, nativeMessages, executionTools),
                             contextWindowTokens: selectedModel.contextWindowTokens,
                             latestUsage: lastServerUsage,
-                            usageMatchesHistory: lastServerUsage?.historyMessageCount === undefined ||
-                                lastServerUsage.historyMessageCount === compactHistory.length,
+                            historyMessages: compactHistory,
                             appendedMessages: nativeMessages.slice(projectedHistory.length)
                         });
                         messages.splice(0, messages.length, ...(useNative ? nativeMessages : fallbackMessages()));
@@ -627,8 +626,7 @@ export async function createMarAgent(options) {
                             estimatedRequestTokens: estimatedRequestTokens(compactSystemPrompt, nativeCompactMessages, executionTools),
                             contextWindowTokens: selectedModel.contextWindowTokens,
                             latestUsage: lastServerUsage,
-                            usageMatchesHistory: lastServerUsage?.historyMessageCount === undefined ||
-                                lastServerUsage.historyMessageCount === compactHistory.length,
+                            historyMessages: compactHistory,
                             appendedMessages: nativeCompactMessages.slice(projectedHistory.length)
                         });
                         const fallbackMessages = () => buildCompactionMessages(buildCompactionInput(compactHistory, {
@@ -740,6 +738,7 @@ export async function createMarAgent(options) {
                         let stop;
                         let sawTool = false;
                         let latestUsage;
+                        let roundServerUsage;
                         const pendingTools = [];
                         let incompleteToolCall = false;
                         await ensureContextBudget();
@@ -885,14 +884,13 @@ export async function createMarAgent(options) {
                                         Number.isSafeInteger(reportedContext) &&
                                         reportedContext >= 0) {
                                         lastServerContextTokens = reportedContext;
-                                        lastServerUsage = {
+                                        roundServerUsage = {
                                             contextInputTokens: reportedContext,
                                             outputTokens: typeof event.usage.outputTokens === 'number' &&
                                                 Number.isSafeInteger(event.usage.outputTokens) &&
                                                 event.usage.outputTokens >= 0
                                                 ? event.usage.outputTokens
-                                                : undefined,
-                                            historyMessageCount: messages.length
+                                                : undefined
                                         };
                                     }
                                     await emit({ type: 'usage.updated', ...publicModelUsage(event.usage) });
@@ -973,6 +971,11 @@ export async function createMarAgent(options) {
                                 throw error;
                         }
                         recoveringFromContextOverflow = false;
+                        if (roundServerUsage !== undefined)
+                            lastServerUsage = {
+                                ...roundServerUsage,
+                                historyMessages: [...messages]
+                            };
                         if (pendingTools.length === 0 && mailbox.length > 0) {
                             await appendMailboxMessages();
                             finalAnswer = '';
@@ -1705,22 +1708,50 @@ function currentExecutionImages(modelInputImages, toolImages) {
 }
 function latestModelUsage(records, selectedModelId) {
     let usage;
+    const toolCallIds = new Set();
     // readContext starts at compact.completed, whose execution header is before the boundary.
     let activeModelId = selectedModelId;
     for (const record of records) {
         const payload = record.payload;
         if (compactSummaryFromCheckpoint(record) !== undefined) {
             usage = undefined;
+            toolCallIds.clear();
             activeModelId = modelIdFromPayload(payload);
             continue;
         }
         if (record.type === 'execution.header') {
             activeModelId = modelIdFromPayload(payload);
             usage = undefined;
+            toolCallIds.clear();
             continue;
         }
-        if (usage !== undefined && invalidatesUsageCalibration(record.type, payload.type))
-            usage = undefined;
+        if (record.type === 'model.context' && payload.role === 'tool_call') {
+            if (typeof payload.callId === 'string' && payload.callId.length > 0)
+                toolCallIds.add(payload.callId);
+            else
+                usage = undefined;
+        }
+        if (usage !== undefined) {
+            if (record.type === 'model.context') {
+                const role = payload.role;
+                if (role === 'tool') {
+                    if (typeof payload.callId !== 'string' || !toolCallIds.has(payload.callId))
+                        usage = undefined;
+                    else
+                        usage = {
+                            ...usage,
+                            appendedMessages: [
+                                ...(usage.appendedMessages ?? []),
+                                payload
+                            ]
+                        };
+                }
+                else if (role !== 'tool_call' && role !== 'assistant' && role !== 'provider')
+                    usage = undefined;
+            }
+            else if (invalidatesUsageCalibration(record.type, payload.type))
+                usage = undefined;
+        }
         if (payload.type === 'usage.updated' && activeModelId === selectedModelId) {
             const value = payload.contextInputTokens ?? payload.inputTokens;
             if (typeof value === 'number' && Number.isSafeInteger(value) && value >= 0)
@@ -1739,20 +1770,37 @@ function latestModelUsage(records, selectedModelId) {
 function shouldUseNativeCompaction(input) {
     if (input.estimatedRequestTokens <= input.contextWindowTokens)
         return true;
-    if (input.latestUsage === undefined ||
-        input.latestUsage.outputTokens === undefined ||
-        !input.usageMatchesHistory)
+    if (input.latestUsage === undefined || input.latestUsage.outputTokens === undefined)
+        return false;
+    const historyDelta = appendOnlyUsageDelta(input.latestUsage, input.historyMessages);
+    if (historyDelta === undefined)
         return false;
-    const appendedTokens = countModelTokens(stableJson(input.appendedMessages));
+    const appendedTokens = countModelTokens(stableJson([...historyDelta, ...input.appendedMessages]));
     return (input.latestUsage.contextInputTokens + input.latestUsage.outputTokens + appendedTokens <=
         input.contextWindowTokens);
 }
+function appendOnlyUsageDelta(usage, historyMessages) {
+    if (usage.historyMessages === undefined)
+        return usage.appendedMessages ?? [];
+    if (historyMessages.length < usage.historyMessages.length)
+        return undefined;
+    for (let index = 0; index < usage.historyMessages.length; index++)
+        if (!isDeepStrictEqual(usage.historyMessages[index], historyMessages[index]))
+            return undefined;
+    const appended = historyMessages.slice(usage.historyMessages.length);
+    const toolCallIds = new Set(usage.historyMessages
+        .filter((message) => message.role === 'tool_call')
+        .map((message) => message.callId));
+    return appended.every((message) => message.role === 'tool' && toolCallIds.has(message.callId))
+        ? appended
+        : undefined;
+}
 function invalidatesUsageCalibration(recordType, payloadType) {
-    if (recordType === 'turn.user' || recordType === 'context.environment')
+    if (recordType === 'turn.user' ||
+        recordType === 'context.environment' ||
+        recordType === 'context.gc.completed')
         return true;
-    return (payloadType === 'message.completed' ||
-        payloadType === 'tool.completed' ||
-        payloadType === 'tool.failed');
+    return payloadType === 'message.completed';
 }
 const PROVIDER_CONTEXT_OVERFLOW_CODES = new Set([
     'mar_agent_context_limit',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myagentroam/agent",
-  "version": "0.9.95",
+  "version": "0.9.96",
   "description": "Embeddable MAR coding agent SDK and CLI.",
   "license": "Apache-2.0",
   "type": "module",