@athenaintel/react 0.41.3 → 0.42.2

package/dist/agent-runtime/src/messages.js

@@ -10,11 +10,119 @@ import { DEEP_AGENT_COMPOSER_MARKDOWN_KEY } from "./composer-markdown.js";
 import { DEEP_AGENT_TRUNCATED_CONTENT_KEY } from "./generated/runconfig-contract.js";
 import { readTruncatedToolContent, ATHENA_TRUNCATED_TOOL_OUTPUT_ARTIFACT_KEY } from "./message-window.js";
 import { buildOptimisticHumanContent } from "./optimistic-content.js";
+import { isRunningToolPlaceholderArtifact } from "./running-tool-placeholder.js";
 import { readDeepAgentStreamValues } from "./statewire-state.js";
+import { QUIET_TOOL_NAMES } from "./tool-names.js";
 import { groupSpokenUserTurns } from "./voice-turn-grouping.js";
-const messageConverter = createMessageConverter(convertLangChainMessages);
+const CACHE_EXCLUSIVE_ADAPTERS = /* @__PURE__ */ new Set([
+  "amazon_bedrock",
+  "aws_bedrock",
+  "bedrock"
+]);
+const tokens = (value, fallback = 0) => typeof value === "number" && Number.isFinite(value) ? Math.trunc(value) : typeof value === "string" && /^\d+$/.test(value) ? Number(value) : fallback;
+const CACHE_READ_KEYS = ["cache_read", "cached", "cached_tokens", "cache_read_tokens"];
+const CACHE_CREATION_KEYS = [
+  "cache_creation",
+  "cache_creation_tokens",
+  "cache_write",
+  "cache_write_tokens"
+];
+const cacheCount = (details, keys) => {
+  for (const key of keys) {
+    if (details[key] != null) return tokens(details[key]);
+  }
+  return 0;
+};
+function nativeStepUsage(message) {
+  const { usage_metadata: usage, response_metadata: response } = message;
+  if (typeof usage !== "object" || usage === null) return void 0;
+  const input = tokens(usage.input_tokens);
+  const output = tokens(usage.output_tokens);
+  const total = tokens(usage.total_tokens, input + output);
+  const details = typeof usage.input_token_details === "object" && usage.input_token_details !== null ? usage.input_token_details : {};
+  const cached = cacheCount(details, CACHE_READ_KEYS) + cacheCount(details, CACHE_CREATION_KEYS);
+  const adapter = response == null ? void 0 : response.model_provider;
+  const excluded = cached !== 0 && (typeof adapter === "string" && CACHE_EXCLUSIVE_ADAPTERS.has(adapter.trim().toLowerCase().replace(/-/g, "_")) || total < cached + output);
+  return { inputTokens: excluded ? input + cached : input, outputTokens: output };
+}
+function nativeTurnTiming(message) {
+  var _a;
+  if (message.type !== "ai") return void 0;
+  const kwargs = message.additional_kwargs;
+  const start = kwargs == null ? void 0 : kwargs.agent_start_time;
+  const duration = kwargs == null ? void 0 : kwargs.agent_duration_seconds;
+  if (typeof start !== "number" || typeof duration !== "number" || !(start > 0 && duration >= 0)) {
+    return void 0;
+  }
+  return {
+    streamStartTime: start * 1e3,
+    totalStreamTime: duration * 1e3,
+    totalChunks: 0,
+    toolCallCount: ((_a = message.tool_calls) == null ? void 0 : _a.length) ?? 0
+  };
+}
+const convertDeepAgentLangChainMessage = (message, metadata) => {
+  const converted = convertLangChainMessages(message, metadata);
+  if (message.type !== "ai" || Array.isArray(converted) || converted.role !== "assistant") {
+    return converted;
+  }
+  const usage = nativeStepUsage(message);
+  const timing = nativeTurnTiming(message);
+  if (usage === void 0 && timing === void 0) return converted;
+  return {
+    ...converted,
+    metadata: {
+      ...converted.metadata,
+      ...usage !== void 0 && { steps: [{ messageId: message.id, usage }] },
+      ...timing !== void 0 && { timing }
+    }
+  };
+};
+function withoutQuietToolCalls(message) {
+  const calls = message.tool_calls ?? [];
+  const quietIds = new Set(
+    calls.filter((call) => QUIET_TOOL_NAMES.has(call.name)).map((call) => call.id)
+  );
+  const chunks = message.tool_call_chunks ?? [];
+  const quietChunk = (chunk) => QUIET_TOOL_NAMES.has(chunk.name) || quietIds.has(chunk.id);
+  if (quietIds.size === 0 && !chunks.some(quietChunk)) return message;
+  return {
+    ...message,
+    ...message.tool_calls && {
+      tool_calls: calls.filter((call) => !quietIds.has(call.id))
+    },
+    ...message.tool_call_chunks && {
+      tool_call_chunks: chunks.filter((chunk) => !quietChunk(chunk))
+    }
+  };
+}
+const convertDeepAgentMessage = (message, metadata) => {
+  if (message.type === "tool" && QUIET_TOOL_NAMES.has(message.name)) return [];
+  if (message.type === "ai") {
+    return convertDeepAgentLangChainMessage(withoutQuietToolCalls(message), metadata);
+  }
+  return convertDeepAgentLangChainMessage(message, metadata);
+};
+const messageConverter = createMessageConverter(convertDeepAgentMessage);
+const messageConverterShowingQuietTools = createMessageConverter(convertDeepAgentLangChainMessage);
+const preliminaryMarkedTurns = /* @__PURE__ */ new WeakMap();
+function markPreliminaryToolResults(message) {
+  if (message.role !== "assistant") return message;
+  const cached = preliminaryMarkedTurns.get(message);
+  if (cached !== void 0) return cached;
+  let content = null;
+  for (const [index, part] of message.content.entries()) {
+    if (part.type !== "tool-call" || part.isPreliminary === true) continue;
+    if (!isRunningToolPlaceholderArtifact(part.artifact)) continue;
+    content ?? (content = [...message.content]);
+    content[index] = { ...part, isPreliminary: true };
+  }
+  const marked = content === null ? message : { ...message, content };
+  preliminaryMarkedTurns.set(message, marked);
+  return marked;
+}
 class DeepAgentMessageConversionCache {
-  constructor() {
+  constructor({ showQuietTools = false } = {}) {
     __publicField(this, "cache", createExternalMessageConversionCache());
     /**
      * Every cached entry is rebuilt when the metadata object changes identity,
@@ -27,6 +135,8 @@ class DeepAgentMessageConversionCache {
     __publicField(this, "previous", null);
     /** `convertExternalMessages`' own rows for the previous pass, before parts were kept. */
     __publicField(this, "previousConverted", null);
+    __publicField(this, "callback");
+    this.callback = showQuietTools ? convertDeepAgentLangChainMessage : convertDeepAgentMessage;
   }
   /**
    * Convert one pass's LangChain messages. Returns the previous pass's array
@@ -39,11 +149,11 @@ class DeepAgentMessageConversionCache {
   convert(messages, isRunning) {
     const converted = convertExternalMessages(
       messages,
-      convertLangChainMessages,
+      this.callback,
       isRunning,
       this.metadata,
       this.cache
-    );
+    ).map(markPreliminaryToolResults);
     const next = this.previous !== null && this.previousConverted !== null ? keepUnchangedParts({
       previous: this.previous,
       previousConverted: this.previousConverted,
@@ -158,8 +268,8 @@ function withUnchangedParts({
   });
   return kept === 0 ? message : { ...message, content };
 }
-function createDeepAgentMessageConversionCache() {
-  return new DeepAgentMessageConversionCache();
+function createDeepAgentMessageConversionCache(options = {}) {
+  return new DeepAgentMessageConversionCache(options);
 }
 function isSameMessageList(a, b) {
   return a.length === b.length && a.every((message, index) => message === b[index]);
@@ -611,7 +721,8 @@ function convertDeepAgentState(state, {
   selfAuthor = null,
   toolOutputs,
   withdrawnTurns,
-  conversionCache
+  conversionCache,
+  showQuietTools = false
 } = {}) {
   var _a, _b;
   const values = readDeepAgentStreamValues(state);
@@ -631,7 +742,7 @@ function convertDeepAgentState(state, {
     ...laneTail
   ];
   return {
-    messages: conversionCache ? conversionCache.convert(sources, isRunning) : messageConverter.toThreadMessages(sources, isRunning),
+    messages: conversionCache ? conversionCache.convert(sources, isRunning) : (showQuietTools ? messageConverterShowingQuietTools : messageConverter).toThreadMessages(sources, isRunning).map(markPreliminaryToolResults),
     isRunning
   };
 }
@@ -649,6 +760,8 @@ export {
   ATHENA_TERMINATION_REASON_KEY,
   DeepAgentMessageConversionCache,
   PENDING_ASSISTANT_MESSAGE_ID,
+  convertDeepAgentLangChainMessage,
+  convertDeepAgentMessage,
   convertDeepAgentState,
   createDeepAgentMaterialize,
   createDeepAgentMessageConversionCache,
@@ -669,7 +782,9 @@ export {
   liftTerminationIntoMetadata,
   liftToolMessageMetadataIntoArtifact,
   liftTruncatedToolOutputIntoArtifact,
+  markPreliminaryToolResults,
   messageConverter,
+  nativeStepUsage,
   normalizeStringContentParts,
   readRunMarkerFromSourceMessages,
   sanitizeLangChainMessages,