@anuma/sdk 6.3.1 → 6.4.0

package/dist/expo/index.cjs

@@ -14092,6 +14092,153 @@ async function cleanupConversationSummary(database, conversationId) {
   }
 }
 
+// src/lib/chat/toolResultMessage.ts
+var HEADER = "[Tool Execution Results]\n\n";
+var FOOTER = "\n\nBased on these results, continue with the task.";
+var ENTRY_SEPARATOR = "\n\n";
+var TOOL_RESULT_FOOTER_LINE = FOOTER.trim();
+var MAX_PERSISTED_TOOL_RESULT_CHARS = 1e5;
+function buildToolResultContent(results) {
+  const entries = results.map((r) => `Tool "${r.name}" returned: ${JSON.stringify(r.result)}`);
+  const framing = HEADER.length + FOOTER.length + ENTRY_SEPARATOR.length * Math.max(0, entries.length - 1);
+  const summary = capEntries(entries, MAX_PERSISTED_TOOL_RESULT_CHARS - framing).join(
+    ENTRY_SEPARATOR
+  );
+  return `${HEADER}${summary}${FOOTER}`;
+}
+function capToolResultEntries(entries, budget) {
+  return capEntries(entries, budget);
+}
+function capEntries(entries, budget) {
+  const smallestFirst = entries.map((_, index) => index).sort((a, b) => entries[a].length - entries[b].length);
+  const capped = [...entries];
+  let remaining = budget;
+  let unassigned = entries.length;
+  for (const index of smallestFirst) {
+    capped[index] = truncateEntry(entries[index], Math.floor(remaining / unassigned));
+    remaining -= capped[index].length;
+    unassigned--;
+  }
+  return capped;
+}
+function truncateEntry(entry, allowance) {
+  if (entry.length <= allowance) return entry;
+  const keep = allowance - truncationMarker(entry.length).length;
+  if (keep <= 0) return entry.slice(0, Math.max(0, allowance));
+  return `${entry.slice(0, keep)}${truncationMarker(entry.length - keep)}`;
+}
+function truncationMarker(omitted) {
+  return `
+
+... (tool output truncated, ${omitted} characters omitted)`;
+}
+
+// src/lib/chat/toolResults.ts
+var TOOL_RESULTS_PREFIX = "[Tool Execution Results]";
+var DISPLAY_CARD_PLACEHOLDER = "[displayed a card to the user with the tool result]";
+var TOOL_LINE = /^Tool "([^"]+)" returned: (.*)$/;
+var TOOL_RESULT_ORIGIN = "tool_result";
+function isToolResultsRow(row) {
+  if (row.origin === TOOL_RESULT_ORIGIN) return true;
+  if (typeof row.origin === "string") return false;
+  if (row.role !== "user" || !row.content.startsWith(TOOL_RESULTS_PREFIX)) return false;
+  return parseToolResultSegments(row.content).length > 0;
+}
+function parseToolResultSegments(content) {
+  const segments = [];
+  for (const raw of content.split("\n")) {
+    const line = raw.trim();
+    const match = TOOL_LINE.exec(line);
+    if (match) {
+      segments.push({ name: match[1], line });
+      continue;
+    }
+    const current = segments[segments.length - 1];
+    if (!current || line === "" || line === TOOL_RESULT_FOOTER_LINE) continue;
+    if (line === TOOL_RESULTS_PREFIX) continue;
+    current.line = `${current.line}
+${line}`;
+  }
+  return segments;
+}
+function prepareToolResultsForReplay(rows, options) {
+  if (options.fold) {
+    return foldToolResultsRows(rows, {
+      exclude: options.exclude,
+      placeholder: options.placeholder
+    });
+  }
+  return rows.filter((row) => !isToolResultsRow(row));
+}
+function foldToolResultsRows(rows, options) {
+  const exclude = new Set(options?.exclude ?? []);
+  const out = [];
+  const pending = [];
+  const assistantIndexById = /* @__PURE__ */ new Map();
+  for (const row of rows) {
+    if (isToolResultsRow(row)) {
+      pending.push({ row, insertionPoint: out.length });
+      continue;
+    }
+    out.push(row);
+    if (row.role === "assistant" && row.uniqueId) {
+      assistantIndexById.set(row.uniqueId, out.length - 1);
+    }
+  }
+  const byTarget = /* @__PURE__ */ new Map();
+  for (const { row, insertionPoint } of pending) {
+    const target = resolveFoldTarget(out, row, insertionPoint, assistantIndexById);
+    if (target === void 0) continue;
+    const group = byTarget.get(target);
+    if (group) group.push(row);
+    else byTarget.set(target, [row]);
+  }
+  for (const [target, groupedRows] of byTarget) {
+    const assistant = out[target];
+    const kept = groupedRows.flatMap((row) => parseToolResultSegments(row.content)).filter((segment) => !exclude.has(segment.name));
+    if (kept.length > 0) {
+      out[target] = { ...assistant, content: appendToolResults(assistant.content, kept) };
+    } else if (!assistant.content.trim() && options?.placeholder) {
+      out[target] = { ...assistant, content: options.placeholder };
+    }
+  }
+  return out;
+}
+function resolveFoldTarget(out, row, insertionPoint, assistantIndexById) {
+  const linked = row.parentMessageId ? assistantIndexById.get(row.parentMessageId) : void 0;
+  if (linked !== void 0) return linked;
+  let previous;
+  for (let i = insertionPoint - 1; i >= 0; i--) {
+    if (out[i].role === "assistant") {
+      previous = i;
+      break;
+    }
+  }
+  let next;
+  for (let i = insertionPoint; i < out.length; i++) {
+    if (out[i].role === "assistant") {
+      next = i;
+      break;
+    }
+  }
+  if (previous === void 0) return next;
+  if (next === void 0) return previous;
+  return next - insertionPoint < insertionPoint - previous ? next : previous;
+}
+var MAX_FOLDED_APPENDIX_CHARS = 2e4;
+function appendToolResults(assistantContent, kept) {
+  const framing = TOOL_RESULTS_PREFIX.length + 1 + (kept.length - 1);
+  const capped = capToolResultEntries(
+    kept.map((segment) => segment.line),
+    MAX_FOLDED_APPENDIX_CHARS - framing
+  );
+  const appendix = `${TOOL_RESULTS_PREFIX}
+${capped.join("\n")}`;
+  return assistantContent.trim() ? `${assistantContent}
+
+${appendix}` : appendix;
+}
+
 // src/lib/db/chat/lazyDecrypt.ts
 init_useEncryption();
 init_encryption_utils();
@@ -19749,11 +19896,17 @@ function useChatStorage(options) {
     onPiiRedacted,
     nerDetector,
     onServerToolCall,
-    onToolCallArgumentsDelta
+    onToolCallArgumentsDelta,
+    toolResultsHistoryExclude,
+    foldToolResultsInHistory
   } = options;
   const [currentConversationId, setCurrentConversationId] = (0, import_react4.useState)(
     initialConversationId || null
   );
+  const toolResultsHistoryExcludeRef = (0, import_react4.useRef)(toolResultsHistoryExclude);
+  toolResultsHistoryExcludeRef.current = toolResultsHistoryExclude;
+  const foldToolResultsInHistoryRef = (0, import_react4.useRef)(foldToolResultsInHistory);
+  foldToolResultsInHistoryRef.current = foldToolResultsInHistory;
   const nerDetectorRef = (0, import_react4.useRef)(nerDetector);
   nerDetectorRef.current = nerDetector;
   const resolvedPiiRedaction = (0, import_react4.useMemo)(
@@ -20621,7 +20774,13 @@ function useChatStorage(options) {
       }
       if (includeHistory) {
         const validMessages = storedMessages.filter((msg) => !msg.error);
-        const limitedMessages = validMessages.slice(-maxHistoryMessages);
+        const replayableMessages = prepareToolResultsForReplay(validMessages, {
+          fold: foldToolResultsInHistoryRef.current === true,
+          exclude: toolResultsHistoryExcludeRef.current,
+          placeholder: DISPLAY_CARD_PLACEHOLDER
+        });
+        const limitedMessages = replayableMessages.slice(-maxHistoryMessages);
+        const foldedHistory = limitedMessages;
         if (summarizeHistory && !getTokenRef.current) {
           getLogger().warn(
             "[summarize] summarizeHistory is enabled but getToken is not provided \u2014 summarization will be skipped"
@@ -20631,7 +20790,7 @@ function useChatStorage(options) {
         const { messagesToConvert, summarySystemMessage } = await maybeSummarizeHistory({
           database,
           conversationId: convId,
-          messages: limitedMessages,
+          messages: foldedHistory,
           summarizeHistory,
           summaryTokenThreshold,
           summaryMinWindowMessages,
@@ -21001,6 +21160,7 @@ function useChatStorage(options) {
         uniqueId: effectiveAssistantUniqueId
       };
       let storedAssistantMessage;
+      let assistantMsgQueueId;
       try {
         const assistantMsgResult = await writeOrQueue(
           "createMessage",
@@ -21010,6 +21170,7 @@ function useChatStorage(options) {
           userMsgQueueId ? [userMsgQueueId] : []
         );
         storedAssistantMessage = assistantMsgResult.result;
+        assistantMsgQueueId = assistantMsgResult.queueId;
         if (!assistantMsgResult.queued) {
           void embedMessageAsync(storedAssistantMessage, maskForCall);
         }
@@ -21020,6 +21181,29 @@ function useChatStorage(options) {
           userMessage: storedUserMessage
         };
       }
+      const autoToolResults = result.autoExecutedToolResults;
+      let storedToolResultsMessage;
+      if (autoToolResults && autoToolResults.length > 0) {
+        const toolResultsOpts = {
+          conversationId: convId,
+          role: "user",
+          content: buildToolResultContent(autoToolResults),
+          model: "",
+          parentMessageId: storedAssistantMessage.uniqueId,
+          origin: TOOL_RESULT_ORIGIN
+        };
+        try {
+          const toolResultsWrite = await writeOrQueue(
+            "createMessage",
+            toolResultsOpts,
+            () => createMessageOp(storageCtx, toolResultsOpts),
+            () => makeSyntheticStoredMessage(toolResultsOpts),
+            assistantMsgQueueId ? [assistantMsgQueueId] : []
+          );
+          storedToolResultsMessage = toolResultsWrite.result;
+        } catch {
+        }
+      }
       const refreshGetToken = getTokenRef.current;
       if (refreshGetToken) {
         Promise.resolve().then(() => shouldRefreshTools(getToolsChecksum(responseData), serverToolsConfig?.cache)).then((refresh) => {
@@ -21039,7 +21223,9 @@ function useChatStorage(options) {
         data: responseData,
         error: null,
         userMessage: storedUserMessage,
-        assistantMessage: storedAssistantMessage
+        assistantMessage: storedAssistantMessage,
+        autoExecutedToolResults: autoToolResults,
+        toolResultsMessage: storedToolResultsMessage
       };
     },
     [

package/dist/expo/index.d.mts

@@ -3777,6 +3777,40 @@ interface BaseUseChatStorageOptions {
      * Defaults to the hardcoded MCP_R2_DOMAIN from clientConfig.
      */
     mcpR2Domain?: string;
+    /**
+     * Tool names whose persisted results must never be replayed to the model.
+     *
+     * A turn's auto-executed tool results are stored as a synthetic
+     * `[Tool Execution Results]` row and, on a replayed send, folded back onto the
+     * assistant turn they belong to — that is what lets a follow-up question about a
+     * tool's output work after a reload. Name a tool here when its payload exists for
+     * the RENDERER rather than the model: a display card can carry data the model was
+     * deliberately never given (People Nearby's card holds third parties' snapped
+     * coordinates, which the search result strips), and replaying it would hand that
+     * data straight back.
+     *
+     * Hook-level rather than per-send on purpose: an exclusion that has to be
+     * remembered at every call site is one bad send away from leaking.
+     */
+    toolResultsHistoryExclude?: string[];
+    /**
+     * Fold persisted `[Tool Execution Results]` rows onto the assistant turn that produced them
+     * when replaying stored history, instead of dropping them.
+     *
+     * **Defaults to `false`, and that default is deliberate.** Folding is the better behaviour —
+     * it is what lets a follow-up about a tool's output work after a reload — but it moves the
+     * payload from a `role: "user"` row onto an `assistant` row. Any consumer that scrubs these
+     * rows by checking `role === "user"` plus the content prefix (which is how both apps did it
+     * before this option existed) stops catching them the moment folding turns on, and starts
+     * replaying whatever the row held. Opting in is therefore a statement that the caller has
+     * checked its own filters and set {@link toolResultsHistoryExclude} for any payload that must
+     * not reach the model.
+     *
+     * With it off, rows are dropped from the replayed history rather than sent verbatim. Verbatim
+     * would put two consecutive `user` turns on the wire, and the model answers the previous turn
+     * instead of the new prompt.
+     */
+    foldToolResultsInHistory?: boolean;
     /**
      * Pre-processors run after the last user message is received but before
      * the first LLM request. Each receives the prompt text and a shared
@@ -4126,6 +4160,20 @@ interface BaseSendMessageSuccessResult {
     error: null;
     userMessage: StoredMessage;
     assistantMessage: StoredMessage;
+    /** Results from tools the SDK auto-executed this turn (e.g. display tools). */
+    autoExecutedToolResults?: {
+        name: string;
+        result: unknown;
+    }[];
+    /**
+     * The synthetic `[Tool Execution Results]` row those results were persisted as.
+     *
+     * Returned so a caller can key its transient overlay on the id the SDK actually wrote instead of
+     * deriving one and hoping the two agree — that guesswork is what mobile's per-card persist
+     * workarounds existed to do (#5519). Absent when the turn executed no tools, or when the row write
+     * failed (non-fatal: the assistant reply is already stored).
+     */
+    toolResultsMessage?: StoredMessage;
 }
 interface BaseSendMessageSkippedResult {
     data: ApiResponse;

package/dist/expo/index.d.ts

@@ -3777,6 +3777,40 @@ interface BaseUseChatStorageOptions {
      * Defaults to the hardcoded MCP_R2_DOMAIN from clientConfig.
      */
     mcpR2Domain?: string;
+    /**
+     * Tool names whose persisted results must never be replayed to the model.
+     *
+     * A turn's auto-executed tool results are stored as a synthetic
+     * `[Tool Execution Results]` row and, on a replayed send, folded back onto the
+     * assistant turn they belong to — that is what lets a follow-up question about a
+     * tool's output work after a reload. Name a tool here when its payload exists for
+     * the RENDERER rather than the model: a display card can carry data the model was
+     * deliberately never given (People Nearby's card holds third parties' snapped
+     * coordinates, which the search result strips), and replaying it would hand that
+     * data straight back.
+     *
+     * Hook-level rather than per-send on purpose: an exclusion that has to be
+     * remembered at every call site is one bad send away from leaking.
+     */
+    toolResultsHistoryExclude?: string[];
+    /**
+     * Fold persisted `[Tool Execution Results]` rows onto the assistant turn that produced them
+     * when replaying stored history, instead of dropping them.
+     *
+     * **Defaults to `false`, and that default is deliberate.** Folding is the better behaviour —
+     * it is what lets a follow-up about a tool's output work after a reload — but it moves the
+     * payload from a `role: "user"` row onto an `assistant` row. Any consumer that scrubs these
+     * rows by checking `role === "user"` plus the content prefix (which is how both apps did it
+     * before this option existed) stops catching them the moment folding turns on, and starts
+     * replaying whatever the row held. Opting in is therefore a statement that the caller has
+     * checked its own filters and set {@link toolResultsHistoryExclude} for any payload that must
+     * not reach the model.
+     *
+     * With it off, rows are dropped from the replayed history rather than sent verbatim. Verbatim
+     * would put two consecutive `user` turns on the wire, and the model answers the previous turn
+     * instead of the new prompt.
+     */
+    foldToolResultsInHistory?: boolean;
     /**
      * Pre-processors run after the last user message is received but before
      * the first LLM request. Each receives the prompt text and a shared
@@ -4126,6 +4160,20 @@ interface BaseSendMessageSuccessResult {
     error: null;
     userMessage: StoredMessage;
     assistantMessage: StoredMessage;
+    /** Results from tools the SDK auto-executed this turn (e.g. display tools). */
+    autoExecutedToolResults?: {
+        name: string;
+        result: unknown;
+    }[];
+    /**
+     * The synthetic `[Tool Execution Results]` row those results were persisted as.
+     *
+     * Returned so a caller can key its transient overlay on the id the SDK actually wrote instead of
+     * deriving one and hoping the two agree — that guesswork is what mobile's per-card persist
+     * workarounds existed to do (#5519). Absent when the turn executed no tools, or when the row write
+     * failed (non-fatal: the assistant reply is already stored).
+     */
+    toolResultsMessage?: StoredMessage;
 }
 interface BaseSendMessageSkippedResult {
     data: ApiResponse;

package/dist/expo/index.mjs

@@ -4986,6 +4986,153 @@ async function cleanupConversationSummary(database, conversationId) {
   }
 }
 
+// src/lib/chat/toolResultMessage.ts
+var HEADER = "[Tool Execution Results]\n\n";
+var FOOTER = "\n\nBased on these results, continue with the task.";
+var ENTRY_SEPARATOR = "\n\n";
+var TOOL_RESULT_FOOTER_LINE = FOOTER.trim();
+var MAX_PERSISTED_TOOL_RESULT_CHARS = 1e5;
+function buildToolResultContent(results) {
+  const entries = results.map((r) => `Tool "${r.name}" returned: ${JSON.stringify(r.result)}`);
+  const framing = HEADER.length + FOOTER.length + ENTRY_SEPARATOR.length * Math.max(0, entries.length - 1);
+  const summary = capEntries(entries, MAX_PERSISTED_TOOL_RESULT_CHARS - framing).join(
+    ENTRY_SEPARATOR
+  );
+  return `${HEADER}${summary}${FOOTER}`;
+}
+function capToolResultEntries(entries, budget) {
+  return capEntries(entries, budget);
+}
+function capEntries(entries, budget) {
+  const smallestFirst = entries.map((_, index) => index).sort((a, b) => entries[a].length - entries[b].length);
+  const capped = [...entries];
+  let remaining = budget;
+  let unassigned = entries.length;
+  for (const index of smallestFirst) {
+    capped[index] = truncateEntry(entries[index], Math.floor(remaining / unassigned));
+    remaining -= capped[index].length;
+    unassigned--;
+  }
+  return capped;
+}
+function truncateEntry(entry, allowance) {
+  if (entry.length <= allowance) return entry;
+  const keep = allowance - truncationMarker(entry.length).length;
+  if (keep <= 0) return entry.slice(0, Math.max(0, allowance));
+  return `${entry.slice(0, keep)}${truncationMarker(entry.length - keep)}`;
+}
+function truncationMarker(omitted) {
+  return `
+
+... (tool output truncated, ${omitted} characters omitted)`;
+}
+
+// src/lib/chat/toolResults.ts
+var TOOL_RESULTS_PREFIX = "[Tool Execution Results]";
+var DISPLAY_CARD_PLACEHOLDER = "[displayed a card to the user with the tool result]";
+var TOOL_LINE = /^Tool "([^"]+)" returned: (.*)$/;
+var TOOL_RESULT_ORIGIN = "tool_result";
+function isToolResultsRow(row) {
+  if (row.origin === TOOL_RESULT_ORIGIN) return true;
+  if (typeof row.origin === "string") return false;
+  if (row.role !== "user" || !row.content.startsWith(TOOL_RESULTS_PREFIX)) return false;
+  return parseToolResultSegments(row.content).length > 0;
+}
+function parseToolResultSegments(content) {
+  const segments = [];
+  for (const raw of content.split("\n")) {
+    const line = raw.trim();
+    const match = TOOL_LINE.exec(line);
+    if (match) {
+      segments.push({ name: match[1], line });
+      continue;
+    }
+    const current = segments[segments.length - 1];
+    if (!current || line === "" || line === TOOL_RESULT_FOOTER_LINE) continue;
+    if (line === TOOL_RESULTS_PREFIX) continue;
+    current.line = `${current.line}
+${line}`;
+  }
+  return segments;
+}
+function prepareToolResultsForReplay(rows, options) {
+  if (options.fold) {
+    return foldToolResultsRows(rows, {
+      exclude: options.exclude,
+      placeholder: options.placeholder
+    });
+  }
+  return rows.filter((row) => !isToolResultsRow(row));
+}
+function foldToolResultsRows(rows, options) {
+  const exclude = new Set(options?.exclude ?? []);
+  const out = [];
+  const pending = [];
+  const assistantIndexById = /* @__PURE__ */ new Map();
+  for (const row of rows) {
+    if (isToolResultsRow(row)) {
+      pending.push({ row, insertionPoint: out.length });
+      continue;
+    }
+    out.push(row);
+    if (row.role === "assistant" && row.uniqueId) {
+      assistantIndexById.set(row.uniqueId, out.length - 1);
+    }
+  }
+  const byTarget = /* @__PURE__ */ new Map();
+  for (const { row, insertionPoint } of pending) {
+    const target = resolveFoldTarget(out, row, insertionPoint, assistantIndexById);
+    if (target === void 0) continue;
+    const group = byTarget.get(target);
+    if (group) group.push(row);
+    else byTarget.set(target, [row]);
+  }
+  for (const [target, groupedRows] of byTarget) {
+    const assistant = out[target];
+    const kept = groupedRows.flatMap((row) => parseToolResultSegments(row.content)).filter((segment) => !exclude.has(segment.name));
+    if (kept.length > 0) {
+      out[target] = { ...assistant, content: appendToolResults(assistant.content, kept) };
+    } else if (!assistant.content.trim() && options?.placeholder) {
+      out[target] = { ...assistant, content: options.placeholder };
+    }
+  }
+  return out;
+}
+function resolveFoldTarget(out, row, insertionPoint, assistantIndexById) {
+  const linked = row.parentMessageId ? assistantIndexById.get(row.parentMessageId) : void 0;
+  if (linked !== void 0) return linked;
+  let previous;
+  for (let i = insertionPoint - 1; i >= 0; i--) {
+    if (out[i].role === "assistant") {
+      previous = i;
+      break;
+    }
+  }
+  let next;
+  for (let i = insertionPoint; i < out.length; i++) {
+    if (out[i].role === "assistant") {
+      next = i;
+      break;
+    }
+  }
+  if (previous === void 0) return next;
+  if (next === void 0) return previous;
+  return next - insertionPoint < insertionPoint - previous ? next : previous;
+}
+var MAX_FOLDED_APPENDIX_CHARS = 2e4;
+function appendToolResults(assistantContent, kept) {
+  const framing = TOOL_RESULTS_PREFIX.length + 1 + (kept.length - 1);
+  const capped = capToolResultEntries(
+    kept.map((segment) => segment.line),
+    MAX_FOLDED_APPENDIX_CHARS - framing
+  );
+  const appendix = `${TOOL_RESULTS_PREFIX}
+${capped.join("\n")}`;
+  return assistantContent.trim() ? `${assistantContent}
+
+${appendix}` : appendix;
+}
+
 // src/lib/db/chat/lazyDecrypt.ts
 var LRU_CAPACITY = 256;
 var titleCache = /* @__PURE__ */ new Map();
@@ -10533,11 +10680,17 @@ function useChatStorage(options) {
     onPiiRedacted,
     nerDetector,
     onServerToolCall,
-    onToolCallArgumentsDelta
+    onToolCallArgumentsDelta,
+    toolResultsHistoryExclude,
+    foldToolResultsInHistory
   } = options;
   const [currentConversationId, setCurrentConversationId] = useState4(
     initialConversationId || null
   );
+  const toolResultsHistoryExcludeRef = useRef4(toolResultsHistoryExclude);
+  toolResultsHistoryExcludeRef.current = toolResultsHistoryExclude;
+  const foldToolResultsInHistoryRef = useRef4(foldToolResultsInHistory);
+  foldToolResultsInHistoryRef.current = foldToolResultsInHistory;
   const nerDetectorRef = useRef4(nerDetector);
   nerDetectorRef.current = nerDetector;
   const resolvedPiiRedaction = useMemo(
@@ -11405,7 +11558,13 @@ function useChatStorage(options) {
       }
       if (includeHistory) {
         const validMessages = storedMessages.filter((msg) => !msg.error);
-        const limitedMessages = validMessages.slice(-maxHistoryMessages);
+        const replayableMessages = prepareToolResultsForReplay(validMessages, {
+          fold: foldToolResultsInHistoryRef.current === true,
+          exclude: toolResultsHistoryExcludeRef.current,
+          placeholder: DISPLAY_CARD_PLACEHOLDER
+        });
+        const limitedMessages = replayableMessages.slice(-maxHistoryMessages);
+        const foldedHistory = limitedMessages;
         if (summarizeHistory && !getTokenRef.current) {
           getLogger().warn(
             "[summarize] summarizeHistory is enabled but getToken is not provided \u2014 summarization will be skipped"
@@ -11415,7 +11574,7 @@ function useChatStorage(options) {
         const { messagesToConvert, summarySystemMessage } = await maybeSummarizeHistory({
           database,
           conversationId: convId,
-          messages: limitedMessages,
+          messages: foldedHistory,
           summarizeHistory,
           summaryTokenThreshold,
           summaryMinWindowMessages,
@@ -11785,6 +11944,7 @@ function useChatStorage(options) {
         uniqueId: effectiveAssistantUniqueId
       };
       let storedAssistantMessage;
+      let assistantMsgQueueId;
       try {
         const assistantMsgResult = await writeOrQueue(
           "createMessage",
@@ -11794,6 +11954,7 @@ function useChatStorage(options) {
           userMsgQueueId ? [userMsgQueueId] : []
         );
         storedAssistantMessage = assistantMsgResult.result;
+        assistantMsgQueueId = assistantMsgResult.queueId;
         if (!assistantMsgResult.queued) {
           void embedMessageAsync(storedAssistantMessage, maskForCall);
         }
@@ -11804,6 +11965,29 @@ function useChatStorage(options) {
           userMessage: storedUserMessage
         };
       }
+      const autoToolResults = result.autoExecutedToolResults;
+      let storedToolResultsMessage;
+      if (autoToolResults && autoToolResults.length > 0) {
+        const toolResultsOpts = {
+          conversationId: convId,
+          role: "user",
+          content: buildToolResultContent(autoToolResults),
+          model: "",
+          parentMessageId: storedAssistantMessage.uniqueId,
+          origin: TOOL_RESULT_ORIGIN
+        };
+        try {
+          const toolResultsWrite = await writeOrQueue(
+            "createMessage",
+            toolResultsOpts,
+            () => createMessageOp(storageCtx, toolResultsOpts),
+            () => makeSyntheticStoredMessage(toolResultsOpts),
+            assistantMsgQueueId ? [assistantMsgQueueId] : []
+          );
+          storedToolResultsMessage = toolResultsWrite.result;
+        } catch {
+        }
+      }
       const refreshGetToken = getTokenRef.current;
       if (refreshGetToken) {
         Promise.resolve().then(() => shouldRefreshTools(getToolsChecksum(responseData), serverToolsConfig?.cache)).then((refresh) => {
@@ -11823,7 +12007,9 @@ function useChatStorage(options) {
         data: responseData,
         error: null,
         userMessage: storedUserMessage,
-        assistantMessage: storedAssistantMessage
+        assistantMessage: storedAssistantMessage,
+        autoExecutedToolResults: autoToolResults,
+        toolResultsMessage: storedToolResultsMessage
       };
     },
     [

package/dist/react/index.cjs

@@ -14936,6 +14936,7 @@ async function cleanupConversationSummary(database, conversationId) {
 var HEADER = "[Tool Execution Results]\n\n";
 var FOOTER = "\n\nBased on these results, continue with the task.";
 var ENTRY_SEPARATOR = "\n\n";
+var TOOL_RESULT_FOOTER_LINE = FOOTER.trim();
 var MAX_PERSISTED_TOOL_RESULT_CHARS = 1e5;
 function buildToolResultContent(results) {
   const entries = results.map((r) => `Tool "${r.name}" returned: ${JSON.stringify(r.result)}`);
@@ -14945,6 +14946,9 @@ function buildToolResultContent(results) {
   );
   return `${HEADER}${summary}${FOOTER}`;
 }
+function capToolResultEntries(entries, budget) {
+  return capEntries(entries, budget);
+}
 function capEntries(entries, budget) {
   const smallestFirst = entries.map((_, index) => index).sort((a, b) => entries[a].length - entries[b].length);
   const capped = [...entries];
@@ -14969,6 +14973,112 @@ function truncationMarker(omitted) {
 ... (tool output truncated, ${omitted} characters omitted)`;
 }
 
+// src/lib/chat/toolResults.ts
+var TOOL_RESULTS_PREFIX = "[Tool Execution Results]";
+var DISPLAY_CARD_PLACEHOLDER = "[displayed a card to the user with the tool result]";
+var TOOL_LINE = /^Tool "([^"]+)" returned: (.*)$/;
+var TOOL_RESULT_ORIGIN = "tool_result";
+function isToolResultsRow(row) {
+  if (row.origin === TOOL_RESULT_ORIGIN) return true;
+  if (typeof row.origin === "string") return false;
+  if (row.role !== "user" || !row.content.startsWith(TOOL_RESULTS_PREFIX)) return false;
+  return parseToolResultSegments(row.content).length > 0;
+}
+function parseToolResultSegments(content) {
+  const segments = [];
+  for (const raw of content.split("\n")) {
+    const line = raw.trim();
+    const match = TOOL_LINE.exec(line);
+    if (match) {
+      segments.push({ name: match[1], line });
+      continue;
+    }
+    const current = segments[segments.length - 1];
+    if (!current || line === "" || line === TOOL_RESULT_FOOTER_LINE) continue;
+    if (line === TOOL_RESULTS_PREFIX) continue;
+    current.line = `${current.line}
+${line}`;
+  }
+  return segments;
+}
+function prepareToolResultsForReplay(rows, options) {
+  if (options.fold) {
+    return foldToolResultsRows(rows, {
+      exclude: options.exclude,
+      placeholder: options.placeholder
+    });
+  }
+  return rows.filter((row) => !isToolResultsRow(row));
+}
+function foldToolResultsRows(rows, options) {
+  const exclude = new Set(options?.exclude ?? []);
+  const out = [];
+  const pending = [];
+  const assistantIndexById = /* @__PURE__ */ new Map();
+  for (const row of rows) {
+    if (isToolResultsRow(row)) {
+      pending.push({ row, insertionPoint: out.length });
+      continue;
+    }
+    out.push(row);
+    if (row.role === "assistant" && row.uniqueId) {
+      assistantIndexById.set(row.uniqueId, out.length - 1);
+    }
+  }
+  const byTarget = /* @__PURE__ */ new Map();
+  for (const { row, insertionPoint } of pending) {
+    const target = resolveFoldTarget(out, row, insertionPoint, assistantIndexById);
+    if (target === void 0) continue;
+    const group = byTarget.get(target);
+    if (group) group.push(row);
+    else byTarget.set(target, [row]);
+  }
+  for (const [target, groupedRows] of byTarget) {
+    const assistant = out[target];
+    const kept = groupedRows.flatMap((row) => parseToolResultSegments(row.content)).filter((segment) => !exclude.has(segment.name));
+    if (kept.length > 0) {
+      out[target] = { ...assistant, content: appendToolResults(assistant.content, kept) };
+    } else if (!assistant.content.trim() && options?.placeholder) {
+      out[target] = { ...assistant, content: options.placeholder };
+    }
+  }
+  return out;
+}
+function resolveFoldTarget(out, row, insertionPoint, assistantIndexById) {
+  const linked = row.parentMessageId ? assistantIndexById.get(row.parentMessageId) : void 0;
+  if (linked !== void 0) return linked;
+  let previous;
+  for (let i = insertionPoint - 1; i >= 0; i--) {
+    if (out[i].role === "assistant") {
+      previous = i;
+      break;
+    }
+  }
+  let next;
+  for (let i = insertionPoint; i < out.length; i++) {
+    if (out[i].role === "assistant") {
+      next = i;
+      break;
+    }
+  }
+  if (previous === void 0) return next;
+  if (next === void 0) return previous;
+  return next - insertionPoint < insertionPoint - previous ? next : previous;
+}
+var MAX_FOLDED_APPENDIX_CHARS = 2e4;
+function appendToolResults(assistantContent, kept) {
+  const framing = TOOL_RESULTS_PREFIX.length + 1 + (kept.length - 1);
+  const capped = capToolResultEntries(
+    kept.map((segment) => segment.line),
+    MAX_FOLDED_APPENDIX_CHARS - framing
+  );
+  const appendix = `${TOOL_RESULTS_PREFIX}
+${capped.join("\n")}`;
+  return assistantContent.trim() ? `${assistantContent}
+
+${appendix}` : appendix;
+}
+
 // src/lib/db/chat/lazyDecrypt.ts
 init_useEncryption();
 init_encryption_utils();
@@ -22324,11 +22434,17 @@ function useChatStorage(options) {
     preProcessors,
     piiRedaction,
     onPiiRedacted,
-    nerDetector
+    nerDetector,
+    toolResultsHistoryExclude,
+    foldToolResultsInHistory
   } = options;
   const [currentConversationId, setCurrentConversationId] = (0, import_react5.useState)(
     initialConversationId || null
   );
+  const toolResultsHistoryExcludeRef = (0, import_react5.useRef)(toolResultsHistoryExclude);
+  toolResultsHistoryExcludeRef.current = toolResultsHistoryExclude;
+  const foldToolResultsInHistoryRef = (0, import_react5.useRef)(foldToolResultsInHistory);
+  foldToolResultsInHistoryRef.current = foldToolResultsInHistory;
   const nerDetectorRef = (0, import_react5.useRef)(nerDetector);
   nerDetectorRef.current = nerDetector;
   const resolvedPiiRedaction = (0, import_react5.useMemo)(
@@ -23336,7 +23452,12 @@ function useChatStorage(options) {
       }
       if (includeHistory) {
         const validMessages = storedMessages.filter((msg) => !msg.error);
-        const limitedMessages = validMessages.slice(-maxHistoryMessages);
+        const replayableMessages = prepareToolResultsForReplay(validMessages, {
+          fold: foldToolResultsInHistoryRef.current === true,
+          exclude: toolResultsHistoryExcludeRef.current,
+          placeholder: DISPLAY_CARD_PLACEHOLDER
+        });
+        const limitedMessages = replayableMessages.slice(-maxHistoryMessages);
         if (!fileContextForRequest) {
           for (let i = limitedMessages.length - 1; i >= 0; i--) {
             const msg = limitedMessages[i];
@@ -23346,6 +23467,7 @@ function useChatStorage(options) {
             }
           }
         }
+        const foldedHistory = limitedMessages;
         let encryptionKey;
         if (walletAddress && hasEncryptionKey(walletAddress) && isOPFSSupported()) {
           try {
@@ -23362,7 +23484,7 @@ function useChatStorage(options) {
         const { messagesToConvert, summarySystemMessage } = await maybeSummarizeHistory({
           database,
           conversationId: convId,
-          messages: limitedMessages,
+          messages: foldedHistory,
           summarizeHistory,
           summaryTokenThreshold,
           summaryMinWindowMessages,
@@ -23820,37 +23942,25 @@ function useChatStorage(options) {
         }
       }
       const autoToolResults = result.autoExecutedToolResults;
+      let storedToolResultsMessage;
       if (autoToolResults && autoToolResults.length > 0) {
-        const toolResultContent = buildToolResultContent(autoToolResults);
+        const toolResultsOpts = {
+          conversationId: convId,
+          role: "user",
+          content: buildToolResultContent(autoToolResults),
+          model: "",
+          parentMessageId: storedAssistantMessage.uniqueId,
+          origin: TOOL_RESULT_ORIGIN
+        };
         try {
-          await writeOrQueue(
+          const toolResultsWrite = await writeOrQueue(
             "createMessage",
-            {
-              conversationId: convId,
-              role: "user",
-              content: toolResultContent,
-              model: "",
-              parentMessageId: storedAssistantMessage.uniqueId,
-              origin: "tool_result"
-            },
-            () => createMessageOp(storageCtx, {
-              conversationId: convId,
-              role: "user",
-              content: toolResultContent,
-              model: "",
-              parentMessageId: storedAssistantMessage.uniqueId,
-              origin: "tool_result"
-            }),
-            () => makeSyntheticStoredMessage({
-              conversationId: convId,
-              role: "user",
-              content: toolResultContent,
-              model: "",
-              parentMessageId: storedAssistantMessage.uniqueId,
-              origin: "tool_result"
-            }),
+            toolResultsOpts,
+            () => createMessageOp(storageCtx, toolResultsOpts),
+            () => makeSyntheticStoredMessage(toolResultsOpts),
             assistantMsgQueueId ? [assistantMsgQueueId] : []
           );
+          storedToolResultsMessage = toolResultsWrite.result;
         } catch {
         }
       }
@@ -23873,7 +23983,8 @@ function useChatStorage(options) {
         error: null,
         userMessage: storedUserMessage,
         assistantMessage: storedAssistantMessage,
-        autoExecutedToolResults: result.autoExecutedToolResults
+        autoExecutedToolResults: autoToolResults,
+        toolResultsMessage: storedToolResultsMessage
       };
     },
     // eslint-disable-next-line react-hooks/exhaustive-deps -- intentionally omitting stable refs and config values that don't change identity

package/dist/react/index.d.mts

@@ -5220,6 +5220,40 @@ interface BaseUseChatStorageOptions {
      * Defaults to the hardcoded MCP_R2_DOMAIN from clientConfig.
      */
     mcpR2Domain?: string;
+    /**
+     * Tool names whose persisted results must never be replayed to the model.
+     *
+     * A turn's auto-executed tool results are stored as a synthetic
+     * `[Tool Execution Results]` row and, on a replayed send, folded back onto the
+     * assistant turn they belong to — that is what lets a follow-up question about a
+     * tool's output work after a reload. Name a tool here when its payload exists for
+     * the RENDERER rather than the model: a display card can carry data the model was
+     * deliberately never given (People Nearby's card holds third parties' snapped
+     * coordinates, which the search result strips), and replaying it would hand that
+     * data straight back.
+     *
+     * Hook-level rather than per-send on purpose: an exclusion that has to be
+     * remembered at every call site is one bad send away from leaking.
+     */
+    toolResultsHistoryExclude?: string[];
+    /**
+     * Fold persisted `[Tool Execution Results]` rows onto the assistant turn that produced them
+     * when replaying stored history, instead of dropping them.
+     *
+     * **Defaults to `false`, and that default is deliberate.** Folding is the better behaviour —
+     * it is what lets a follow-up about a tool's output work after a reload — but it moves the
+     * payload from a `role: "user"` row onto an `assistant` row. Any consumer that scrubs these
+     * rows by checking `role === "user"` plus the content prefix (which is how both apps did it
+     * before this option existed) stops catching them the moment folding turns on, and starts
+     * replaying whatever the row held. Opting in is therefore a statement that the caller has
+     * checked its own filters and set {@link toolResultsHistoryExclude} for any payload that must
+     * not reach the model.
+     *
+     * With it off, rows are dropped from the replayed history rather than sent verbatim. Verbatim
+     * would put two consecutive `user` turns on the wire, and the model answers the previous turn
+     * instead of the new prompt.
+     */
+    foldToolResultsInHistory?: boolean;
     /**
      * Pre-processors run after the last user message is received but before
      * the first LLM request. Each receives the prompt text and a shared
@@ -10354,6 +10388,12 @@ type SendMessageWithStorageResult = {
         name: string;
         result: unknown;
     }[];
+    /**
+     * The synthetic `[Tool Execution Results]` row those results were persisted as, so a caller can
+     * key its transient overlay on the id the SDK actually wrote instead of deriving one (#5519).
+     * Absent when no tool ran, or when that (non-fatal) write failed.
+     */
+    toolResultsMessage?: StoredMessage;
 } | {
     data: ApiResponse;
     error: null;

package/dist/react/index.d.ts

@@ -5220,6 +5220,40 @@ interface BaseUseChatStorageOptions {
      * Defaults to the hardcoded MCP_R2_DOMAIN from clientConfig.
      */
     mcpR2Domain?: string;
+    /**
+     * Tool names whose persisted results must never be replayed to the model.
+     *
+     * A turn's auto-executed tool results are stored as a synthetic
+     * `[Tool Execution Results]` row and, on a replayed send, folded back onto the
+     * assistant turn they belong to — that is what lets a follow-up question about a
+     * tool's output work after a reload. Name a tool here when its payload exists for
+     * the RENDERER rather than the model: a display card can carry data the model was
+     * deliberately never given (People Nearby's card holds third parties' snapped
+     * coordinates, which the search result strips), and replaying it would hand that
+     * data straight back.
+     *
+     * Hook-level rather than per-send on purpose: an exclusion that has to be
+     * remembered at every call site is one bad send away from leaking.
+     */
+    toolResultsHistoryExclude?: string[];
+    /**
+     * Fold persisted `[Tool Execution Results]` rows onto the assistant turn that produced them
+     * when replaying stored history, instead of dropping them.
+     *
+     * **Defaults to `false`, and that default is deliberate.** Folding is the better behaviour —
+     * it is what lets a follow-up about a tool's output work after a reload — but it moves the
+     * payload from a `role: "user"` row onto an `assistant` row. Any consumer that scrubs these
+     * rows by checking `role === "user"` plus the content prefix (which is how both apps did it
+     * before this option existed) stops catching them the moment folding turns on, and starts
+     * replaying whatever the row held. Opting in is therefore a statement that the caller has
+     * checked its own filters and set {@link toolResultsHistoryExclude} for any payload that must
+     * not reach the model.
+     *
+     * With it off, rows are dropped from the replayed history rather than sent verbatim. Verbatim
+     * would put two consecutive `user` turns on the wire, and the model answers the previous turn
+     * instead of the new prompt.
+     */
+    foldToolResultsInHistory?: boolean;
     /**
      * Pre-processors run after the last user message is received but before
      * the first LLM request. Each receives the prompt text and a shared
@@ -10354,6 +10388,12 @@ type SendMessageWithStorageResult = {
         name: string;
         result: unknown;
     }[];
+    /**
+     * The synthetic `[Tool Execution Results]` row those results were persisted as, so a caller can
+     * key its transient overlay on the id the SDK actually wrote instead of deriving one (#5519).
+     * Absent when no tool ran, or when that (non-fatal) write failed.
+     */
+    toolResultsMessage?: StoredMessage;
 } | {
     data: ApiResponse;
     error: null;

package/dist/react/index.mjs

@@ -5350,6 +5350,7 @@ async function cleanupConversationSummary(database, conversationId) {
 var HEADER = "[Tool Execution Results]\n\n";
 var FOOTER = "\n\nBased on these results, continue with the task.";
 var ENTRY_SEPARATOR = "\n\n";
+var TOOL_RESULT_FOOTER_LINE = FOOTER.trim();
 var MAX_PERSISTED_TOOL_RESULT_CHARS = 1e5;
 function buildToolResultContent(results) {
   const entries = results.map((r) => `Tool "${r.name}" returned: ${JSON.stringify(r.result)}`);
@@ -5359,6 +5360,9 @@ function buildToolResultContent(results) {
   );
   return `${HEADER}${summary}${FOOTER}`;
 }
+function capToolResultEntries(entries, budget) {
+  return capEntries(entries, budget);
+}
 function capEntries(entries, budget) {
   const smallestFirst = entries.map((_, index) => index).sort((a, b) => entries[a].length - entries[b].length);
   const capped = [...entries];
@@ -5383,6 +5387,112 @@ function truncationMarker(omitted) {
 ... (tool output truncated, ${omitted} characters omitted)`;
 }
 
+// src/lib/chat/toolResults.ts
+var TOOL_RESULTS_PREFIX = "[Tool Execution Results]";
+var DISPLAY_CARD_PLACEHOLDER = "[displayed a card to the user with the tool result]";
+var TOOL_LINE = /^Tool "([^"]+)" returned: (.*)$/;
+var TOOL_RESULT_ORIGIN = "tool_result";
+function isToolResultsRow(row) {
+  if (row.origin === TOOL_RESULT_ORIGIN) return true;
+  if (typeof row.origin === "string") return false;
+  if (row.role !== "user" || !row.content.startsWith(TOOL_RESULTS_PREFIX)) return false;
+  return parseToolResultSegments(row.content).length > 0;
+}
+function parseToolResultSegments(content) {
+  const segments = [];
+  for (const raw of content.split("\n")) {
+    const line = raw.trim();
+    const match = TOOL_LINE.exec(line);
+    if (match) {
+      segments.push({ name: match[1], line });
+      continue;
+    }
+    const current = segments[segments.length - 1];
+    if (!current || line === "" || line === TOOL_RESULT_FOOTER_LINE) continue;
+    if (line === TOOL_RESULTS_PREFIX) continue;
+    current.line = `${current.line}
+${line}`;
+  }
+  return segments;
+}
+function prepareToolResultsForReplay(rows, options) {
+  if (options.fold) {
+    return foldToolResultsRows(rows, {
+      exclude: options.exclude,
+      placeholder: options.placeholder
+    });
+  }
+  return rows.filter((row) => !isToolResultsRow(row));
+}
+function foldToolResultsRows(rows, options) {
+  const exclude = new Set(options?.exclude ?? []);
+  const out = [];
+  const pending = [];
+  const assistantIndexById = /* @__PURE__ */ new Map();
+  for (const row of rows) {
+    if (isToolResultsRow(row)) {
+      pending.push({ row, insertionPoint: out.length });
+      continue;
+    }
+    out.push(row);
+    if (row.role === "assistant" && row.uniqueId) {
+      assistantIndexById.set(row.uniqueId, out.length - 1);
+    }
+  }
+  const byTarget = /* @__PURE__ */ new Map();
+  for (const { row, insertionPoint } of pending) {
+    const target = resolveFoldTarget(out, row, insertionPoint, assistantIndexById);
+    if (target === void 0) continue;
+    const group = byTarget.get(target);
+    if (group) group.push(row);
+    else byTarget.set(target, [row]);
+  }
+  for (const [target, groupedRows] of byTarget) {
+    const assistant = out[target];
+    const kept = groupedRows.flatMap((row) => parseToolResultSegments(row.content)).filter((segment) => !exclude.has(segment.name));
+    if (kept.length > 0) {
+      out[target] = { ...assistant, content: appendToolResults(assistant.content, kept) };
+    } else if (!assistant.content.trim() && options?.placeholder) {
+      out[target] = { ...assistant, content: options.placeholder };
+    }
+  }
+  return out;
+}
+function resolveFoldTarget(out, row, insertionPoint, assistantIndexById) {
+  const linked = row.parentMessageId ? assistantIndexById.get(row.parentMessageId) : void 0;
+  if (linked !== void 0) return linked;
+  let previous;
+  for (let i = insertionPoint - 1; i >= 0; i--) {
+    if (out[i].role === "assistant") {
+      previous = i;
+      break;
+    }
+  }
+  let next;
+  for (let i = insertionPoint; i < out.length; i++) {
+    if (out[i].role === "assistant") {
+      next = i;
+      break;
+    }
+  }
+  if (previous === void 0) return next;
+  if (next === void 0) return previous;
+  return next - insertionPoint < insertionPoint - previous ? next : previous;
+}
+var MAX_FOLDED_APPENDIX_CHARS = 2e4;
+function appendToolResults(assistantContent, kept) {
+  const framing = TOOL_RESULTS_PREFIX.length + 1 + (kept.length - 1);
+  const capped = capToolResultEntries(
+    kept.map((segment) => segment.line),
+    MAX_FOLDED_APPENDIX_CHARS - framing
+  );
+  const appendix = `${TOOL_RESULTS_PREFIX}
+${capped.join("\n")}`;
+  return assistantContent.trim() ? `${assistantContent}
+
+${appendix}` : appendix;
+}
+
 // src/lib/db/chat/lazyDecrypt.ts
 var LRU_CAPACITY = 256;
 var titleCache = /* @__PURE__ */ new Map();
@@ -12612,11 +12722,17 @@ function useChatStorage(options) {
     preProcessors,
     piiRedaction,
     onPiiRedacted,
-    nerDetector
+    nerDetector,
+    toolResultsHistoryExclude,
+    foldToolResultsInHistory
   } = options;
   const [currentConversationId, setCurrentConversationId] = useState4(
     initialConversationId || null
   );
+  const toolResultsHistoryExcludeRef = useRef4(toolResultsHistoryExclude);
+  toolResultsHistoryExcludeRef.current = toolResultsHistoryExclude;
+  const foldToolResultsInHistoryRef = useRef4(foldToolResultsInHistory);
+  foldToolResultsInHistoryRef.current = foldToolResultsInHistory;
   const nerDetectorRef = useRef4(nerDetector);
   nerDetectorRef.current = nerDetector;
   const resolvedPiiRedaction = useMemo3(
@@ -13624,7 +13740,12 @@ function useChatStorage(options) {
       }
       if (includeHistory) {
         const validMessages = storedMessages.filter((msg) => !msg.error);
-        const limitedMessages = validMessages.slice(-maxHistoryMessages);
+        const replayableMessages = prepareToolResultsForReplay(validMessages, {
+          fold: foldToolResultsInHistoryRef.current === true,
+          exclude: toolResultsHistoryExcludeRef.current,
+          placeholder: DISPLAY_CARD_PLACEHOLDER
+        });
+        const limitedMessages = replayableMessages.slice(-maxHistoryMessages);
         if (!fileContextForRequest) {
           for (let i = limitedMessages.length - 1; i >= 0; i--) {
             const msg = limitedMessages[i];
@@ -13634,6 +13755,7 @@ function useChatStorage(options) {
             }
           }
         }
+        const foldedHistory = limitedMessages;
         let encryptionKey;
         if (walletAddress && hasEncryptionKey(walletAddress) && isOPFSSupported()) {
           try {
@@ -13650,7 +13772,7 @@ function useChatStorage(options) {
         const { messagesToConvert, summarySystemMessage } = await maybeSummarizeHistory({
           database,
           conversationId: convId,
-          messages: limitedMessages,
+          messages: foldedHistory,
           summarizeHistory,
           summaryTokenThreshold,
           summaryMinWindowMessages,
@@ -14108,37 +14230,25 @@ function useChatStorage(options) {
         }
       }
       const autoToolResults = result.autoExecutedToolResults;
+      let storedToolResultsMessage;
       if (autoToolResults && autoToolResults.length > 0) {
-        const toolResultContent = buildToolResultContent(autoToolResults);
+        const toolResultsOpts = {
+          conversationId: convId,
+          role: "user",
+          content: buildToolResultContent(autoToolResults),
+          model: "",
+          parentMessageId: storedAssistantMessage.uniqueId,
+          origin: TOOL_RESULT_ORIGIN
+        };
         try {
-          await writeOrQueue(
+          const toolResultsWrite = await writeOrQueue(
             "createMessage",
-            {
-              conversationId: convId,
-              role: "user",
-              content: toolResultContent,
-              model: "",
-              parentMessageId: storedAssistantMessage.uniqueId,
-              origin: "tool_result"
-            },
-            () => createMessageOp(storageCtx, {
-              conversationId: convId,
-              role: "user",
-              content: toolResultContent,
-              model: "",
-              parentMessageId: storedAssistantMessage.uniqueId,
-              origin: "tool_result"
-            }),
-            () => makeSyntheticStoredMessage({
-              conversationId: convId,
-              role: "user",
-              content: toolResultContent,
-              model: "",
-              parentMessageId: storedAssistantMessage.uniqueId,
-              origin: "tool_result"
-            }),
+            toolResultsOpts,
+            () => createMessageOp(storageCtx, toolResultsOpts),
+            () => makeSyntheticStoredMessage(toolResultsOpts),
             assistantMsgQueueId ? [assistantMsgQueueId] : []
           );
+          storedToolResultsMessage = toolResultsWrite.result;
         } catch {
         }
       }
@@ -14161,7 +14271,8 @@ function useChatStorage(options) {
         error: null,
         userMessage: storedUserMessage,
         assistantMessage: storedAssistantMessage,
-        autoExecutedToolResults: result.autoExecutedToolResults
+        autoExecutedToolResults: autoToolResults,
+        toolResultsMessage: storedToolResultsMessage
       };
     },
     // eslint-disable-next-line react-hooks/exhaustive-deps -- intentionally omitting stable refs and config values that don't change identity

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anuma/sdk",
-  "version": "6.3.1",
+  "version": "6.4.0",
   "description": "",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",