@robota-sdk/agent-command 3.0.0-beta.70 → 3.0.0-beta.71

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@robota-sdk/agent-command",
-  "version": "3.0.0-beta.70",
+  "version": "3.0.0-beta.71",
   "description": "Consolidated command module implementations for Robota SDK CLI",
   "type": "module",
   "main": "dist/node/index.js",
@@ -24,8 +24,8 @@
     "src"
   ],
   "dependencies": {
-    "@robota-sdk/agent-core": "3.0.0-beta.70",
-    "@robota-sdk/agent-framework": "3.0.0-beta.70"
+    "@robota-sdk/agent-core": "3.0.0-beta.71",
+    "@robota-sdk/agent-framework": "3.0.0-beta.71"
   },
   "devDependencies": {
     "@types/node": "^22.14.0",

package/src/background/__tests__/background-command-module.test.ts

@@ -28,6 +28,7 @@ function createSessionRuntime(): ICommandSessionRuntime {
     getSessionAllowedTools: () => [],
     getAutoCompactThreshold: () => false,
     getFullHistory: () => [],
+    getHistory: () => [],
   };
 }
 

package/src/compact/__tests__/compact-command-module.test.ts

@@ -36,6 +36,7 @@ function createRuntime(beforeCount = 10, afterCount = 3): ICommandSessionRuntime
     getSessionAllowedTools: () => [],
     getAutoCompactThreshold: () => 0.835,
     getFullHistory: () => [],
+    getHistory: () => [],
   };
 }
 

package/src/context/__tests__/context-command-module.test.ts

@@ -76,6 +76,7 @@ function createRuntime(
     getSessionAllowedTools: () => [],
     getAutoCompactThreshold: () => state.threshold,
     getFullHistory: () => history,
+    getHistory: () => [],
     setAutoCompactThreshold: (threshold) => {
       state.threshold = threshold;
     },

package/src/context/context-command.ts

@@ -12,7 +12,7 @@ import {
   writeAutoCompactThresholdSetting,
 } from '@robota-sdk/agent-framework';
 
-import type { IHistoryEntry } from '@robota-sdk/agent-core';
+import type { IHistoryEntry, TUniversalMessage } from '@robota-sdk/agent-core';
 import type {
   ICommandHostContext,
   ICommandResult,
@@ -65,14 +65,14 @@ export async function executeContextCommand(
   const autoCompactThreshold = readAutoCompactThreshold(context);
   const autoCompactThresholdSource = readAutoCompactThresholdSource(context);
   const history = context.getSession().getFullHistory();
-  const analysis = analyzeHistory(history);
+  const display = buildToolDisplayList(history);
   const references = listCommandContextReferences(context);
   return {
     message: [
       `Context: ${state.usedTokens.toLocaleString()} / ${state.maxTokens.toLocaleString()} tokens (${Math.round(state.usedPercentage)}%)`,
       formatAutoCompactLine(autoCompactThreshold, autoCompactThresholdSource),
       formatContextReferenceSummary(references),
-      `History: ${analysis.turnCount} turn${analysis.turnCount !== 1 ? 's' : ''}`,
+      `History: ${display.turnCount} turn${display.turnCount !== 1 ? 's' : ''}`,
     ].join('\n'),
     success: true,
     data: {
@@ -304,19 +304,25 @@ function formatContextReferenceLine(reference: IContextReferenceItem): string {
 interface IToolResultSummary {
   toolName: string;
   displayArg: string;
-  tokens: number;
 }
 
-interface IHistoryAnalysis {
-  turnCount: number;
-  userCount: number;
+interface IMessageTokensByRole {
+  systemTokens: number;
   userTokens: number;
-  assistantCount: number;
+  userCount: number;
   assistantTokens: number;
-  toolResults: IToolResultSummary[];
+  assistantCount: number;
+  toolTokens: number;
+  toolCallCount: number;
   totalTokens: number;
 }
 
+interface IToolDisplayList {
+  turnCount: number;
+  toolResults: IToolResultSummary[];
+  totalToolCallCount: number;
+}
+
 function parseToolCallArgs(argsJson: string): Record<string, unknown> | null {
   try {
     return JSON.parse(argsJson) as Record<string, unknown>;
@@ -334,7 +340,44 @@ function extractFirstToolArg(argsJson: string): string {
   return raw.length > TOOL_ARG_MAX_LEN ? `${raw.slice(0, TOOL_ARG_MAX_LEN)}…` : raw;
 }
 
-function analyzeHistory(history: IHistoryEntry[]): IHistoryAnalysis {
+function computeMessageTokensByRole(rawMessages: TUniversalMessage[]): IMessageTokensByRole {
+  let systemTokens = 0;
+  let userTokens = 0;
+  let userCount = 0;
+  let assistantTokens = 0;
+  let assistantCount = 0;
+  let toolTokens = 0;
+  let toolCallCount = 0;
+
+  for (const msg of rawMessages) {
+    const t = Math.ceil(JSON.stringify(msg).length / CHARS_PER_TOKEN);
+    if (msg.role === 'system') {
+      systemTokens += t;
+    } else if (msg.role === 'user') {
+      userTokens += t;
+      userCount++;
+    } else if (msg.role === 'assistant') {
+      assistantTokens += t;
+      assistantCount++;
+    } else if (msg.role === 'tool') {
+      toolTokens += t;
+      toolCallCount++;
+    }
+  }
+
+  return {
+    systemTokens,
+    userTokens,
+    userCount,
+    assistantTokens,
+    assistantCount,
+    toolTokens,
+    toolCallCount,
+    totalTokens: systemTokens + userTokens + assistantTokens + toolTokens,
+  };
+}
+
+function buildToolDisplayList(history: IHistoryEntry[]): IToolDisplayList {
   type TToolCallEntry = { name: string; firstArg: string };
   const toolCallMap = new Map<string, TToolCallEntry>();
 
@@ -351,44 +394,28 @@ function analyzeHistory(history: IHistoryEntry[]): IHistoryAnalysis {
     }
   }
 
-  let userCount = 0;
-  let userTokens = 0;
-  let assistantCount = 0;
-  let assistantTokens = 0;
-  const toolResultMap = new Map<string, IToolResultSummary>();
+  let turnCount = 0;
+  let totalToolCallCount = 0;
+  const toolDisplayMap = new Map<string, IToolResultSummary>();
 
   for (const entry of history) {
     if (entry.category !== 'chat') continue;
     if (entry.type === 'user') {
-      const data = entry.data as { content?: string };
-      userCount++;
-      userTokens += estimateTokens((data.content ?? '').length);
-    } else if (entry.type === 'assistant') {
-      const data = entry.data as { content?: string | null; toolCalls?: unknown[] };
-      assistantCount++;
-      assistantTokens += estimateTokens(
-        (data.content ?? '').length + (data.toolCalls ? JSON.stringify(data.toolCalls).length : 0),
-      );
+      turnCount++;
     } else if (entry.type === 'tool') {
-      const data = entry.data as { content?: string; toolCallId?: string };
+      const data = entry.data as { toolCallId?: string };
       const tc = toolCallMap.get(data.toolCallId ?? '');
       const toolName = tc?.name ?? 'tool';
       const displayArg = tc?.firstArg ?? '';
-      const tokens = estimateTokens((data.content ?? '').length);
-      toolResultMap.set(`${toolName}:${displayArg}`, { toolName, displayArg, tokens });
+      totalToolCallCount++;
+      toolDisplayMap.set(`${toolName}:${displayArg}`, { toolName, displayArg });
     }
   }
 
-  const toolResults = [...toolResultMap.values()];
-  const toolTokens = toolResults.reduce((s, t) => s + t.tokens, 0);
   return {
-    turnCount: userCount,
-    userCount,
-    userTokens,
-    assistantCount,
-    assistantTokens,
-    toolResults,
-    totalTokens: userTokens + assistantTokens + toolTokens,
+    turnCount,
+    toolResults: [...toolDisplayMap.values()],
+    totalToolCallCount,
   };
 }
 
@@ -406,44 +433,53 @@ function formatFullContextBreakdown(context: ICommandHostContext): ICommandResul
   const state = readCommandContextState(context);
   const autoCompactThreshold = readAutoCompactThreshold(context);
   const autoCompactThresholdSource = readAutoCompactThresholdSource(context);
-  const history = context.getSession().getFullHistory();
-  const analysis = analyzeHistory(history);
+  const rawMessages = context.getSession().getHistory();
+  const msgTokens = computeMessageTokensByRole(rawMessages);
+  const display = buildToolDisplayList(context.getSession().getFullHistory());
   const references = listCommandContextReferences(context);
 
   const systemRefs = references.filter((r) => r.loadType === 'system');
   const manualRefs = references.filter((r) => r.loadType === 'manual');
   const promptRefs = references.filter((r) => r.loadType === 'prompt-reference');
 
-  const systemTokens = systemRefs.reduce((s, r) => s + estimateTokens(r.byteLength), 0);
+  const systemRefTokens = systemRefs.reduce((s, r) => s + estimateTokens(r.byteLength), 0);
   const manualTokens = manualRefs.reduce((s, r) => s + estimateTokens(r.byteLength), 0);
   const promptRefTokens = promptRefs.reduce((s, r) => s + estimateTokens(r.byteLength), 0);
 
   const convTurnLabel =
-    analysis.turnCount === 0
+    display.turnCount === 0
       ? 'Conversation history — 0 turns'
-      : `Conversation history — ${analysis.turnCount} turn${analysis.turnCount !== 1 ? 's' : ''} | ~${analysis.totalTokens.toLocaleString()} tokens`;
+      : `Conversation history — ${display.turnCount} turn${display.turnCount !== 1 ? 's' : ''} | ~${msgTokens.totalTokens.toLocaleString()} tokens`;
 
-  const toolResultLines = analysis.toolResults.map(
-    (t) =>
-      `${t.toolName}${t.displayArg ? `: ${t.displayArg}` : ''} — ~${t.tokens.toLocaleString()} tokens`,
+  const toolResultLines = display.toolResults.map(
+    (t) => `${t.toolName}${t.displayArg ? `: ${t.displayArg}` : ''}`,
   );
 
+  const uniqueToolCount = display.toolResults.length;
+  const totalToolCallCount = display.totalToolCallCount;
+  const toolResultsLabel =
+    totalToolCallCount === 0
+      ? 'Tool results (0): (none)'
+      : uniqueToolCount < totalToolCallCount
+        ? `Tool results (${uniqueToolCount} unique / ${totalToolCallCount} calls, ~${msgTokens.toolTokens.toLocaleString()} tokens):`
+        : `Tool results (${uniqueToolCount}, ~${msgTokens.toolTokens.toLocaleString()} tokens):`;
+
   const conversationLines: string[] =
-    analysis.turnCount === 0
+    display.turnCount === 0
       ? []
       : [
-          `User (${analysis.userCount}): ~${analysis.userTokens.toLocaleString()} tokens`,
-          `Assistant (${analysis.assistantCount}): ~${analysis.assistantTokens.toLocaleString()} tokens`,
-          analysis.toolResults.length > 0
-            ? [
-                `Tool results (${analysis.toolResults.length}):`,
-                ...toolResultLines.map((l) => `  ${l}`),
-              ].join('\n')
-            : `Tool results (0): (none)`,
+          `User (${msgTokens.userCount}): ~${msgTokens.userTokens.toLocaleString()} tokens`,
+          `Assistant (${msgTokens.assistantCount}): ~${msgTokens.assistantTokens.toLocaleString()} tokens`,
+          ...(msgTokens.systemTokens > 0
+            ? [`System messages: ~${msgTokens.systemTokens.toLocaleString()} tokens`]
+            : []),
+          totalToolCallCount > 0
+            ? [toolResultsLabel, ...toolResultLines.map((l) => `  ${l}`)].join('\n')
+            : toolResultsLabel,
         ];
 
   const convSection =
-    analysis.turnCount === 0
+    display.turnCount === 0
       ? `${convTurnLabel}:\n  (none)`
       : [`${convTurnLabel}:`, ...conversationLines.map((l) => `  ${l}`)].join('\n');
 
@@ -453,7 +489,7 @@ function formatFullContextBreakdown(context: ICommandHostContext): ICommandResul
     '',
     formatSection(
       'System prompt (active every turn)',
-      systemTokens,
+      systemRefTokens,
       systemRefs.map(formatContextReferenceLine),
     ),
     '',
@@ -473,7 +509,7 @@ function formatFullContextBreakdown(context: ICommandHostContext): ICommandResul
     message,
     data: {
       references,
-      history: { turnCount: analysis.turnCount, toolResults: analysis.toolResults },
+      history: { turnCount: display.turnCount, toolResults: display.toolResults },
     },
   };
 }

package/src/help/__tests__/help-command-module.test.ts

@@ -20,6 +20,7 @@ function createCommandSessionRuntime(): ICommandSessionRuntime {
     getSessionAllowedTools: () => [],
     getAutoCompactThreshold: () => false,
     getFullHistory: () => [],
+    getHistory: () => [],
   };
 }
 

package/src/help/__tests__/help-command.test.ts

@@ -23,6 +23,7 @@ function createCommandSessionRuntime(): ICommandSessionRuntime {
     getSessionAllowedTools: () => [],
     getAutoCompactThreshold: () => false,
     getFullHistory: () => [],
+    getHistory: () => [],
   };
 }
 

package/src/plugin/__tests__/plugin-command-module.test.ts

@@ -41,6 +41,7 @@ function createCommandSessionRuntime(): ICommandSessionRuntime {
     getSessionAllowedTools: () => [],
     getAutoCompactThreshold: () => false,
     getFullHistory: () => [],
+    getHistory: () => [],
   };
 }
 

package/src/session/__tests__/session-command-module.test.ts

@@ -20,6 +20,7 @@ function createRuntime(): ICommandSessionRuntime {
     getSessionAllowedTools: () => [],
     getAutoCompactThreshold: () => false,
     getFullHistory: () => [],
+    getHistory: () => [],
   };
 }