@anuma/sdk 6.31.0 → 6.31.1

package/dist/expo/index.cjs

@@ -21438,14 +21438,14 @@ async function autoFilterClientTools(clientTools, promptEmbeddings, cache, embed
   const alwaysInclude = clientTools.filter(isAlwaysIncluded);
   const filterCandidates = clientTools.filter((t) => !isAlwaysIncluded(t));
   if (filterCandidates.length === 0) {
-    return { tools: clientTools, activatedSetNames: /* @__PURE__ */ new Set() };
+    return { tools: clientTools, activatedSetNames: /* @__PURE__ */ new Set(), matchedSetNames: /* @__PURE__ */ new Set() };
   }
   if (!promptEmbeddings && noEmbeddingsReason === "error") {
-    return { tools: clientTools, activatedSetNames: /* @__PURE__ */ new Set() };
+    return { tools: clientTools, activatedSetNames: /* @__PURE__ */ new Set(), matchedSetNames: /* @__PURE__ */ new Set() };
   }
   if (!promptEmbeddings) {
     if (activeToolSets.length === 0) {
-      return { tools: [], activatedSetNames: /* @__PURE__ */ new Set() };
+      return { tools: [], activatedSetNames: /* @__PURE__ */ new Set(), matchedSetNames: /* @__PURE__ */ new Set() };
     }
     const allSets = extraToolSets.length > 0 ? [...BUILT_IN_TOOL_SETS, ...extraToolSets] : BUILT_IN_TOOL_SETS;
     const activeSets = allSets.filter((s) => activeToolSets.includes(s.name));
@@ -21455,7 +21455,8 @@ async function autoFilterClientTools(clientTools, promptEmbeddings, cache, embed
         ...alwaysInclude,
         ...filterCandidates.filter((t) => stickyMembers.has(getToolName2(t)))
       ],
-      activatedSetNames: new Set(activeSets.map((s) => s.name))
+      activatedSetNames: new Set(activeSets.map((s) => s.name)),
+      matchedSetNames: /* @__PURE__ */ new Set()
     };
   }
   const toolsNeedingEmbeddings = [];
@@ -21473,7 +21474,7 @@ async function autoFilterClientTools(clientTools, promptEmbeddings, cache, embed
         cache.set(toolsNeedingEmbeddings[i].name, embeddings[i]);
       }
     } catch {
-      return { tools: clientTools, activatedSetNames: /* @__PURE__ */ new Set() };
+      return { tools: clientTools, activatedSetNames: /* @__PURE__ */ new Set(), matchedSetNames: /* @__PURE__ */ new Set() };
     }
   }
   const pseudoServerTools = [];
@@ -21519,16 +21520,171 @@ async function autoFilterClientTools(clientTools, promptEmbeddings, cache, embed
     activeSetNames
   );
   const activatedSetNames = activatedToolSetNames(scores, toolSets, activeSetNames);
+  const matchedSetNames = activatedToolSetNames(scores, toolSets);
   if (finalNames.size === 0) {
-    return { tools: alwaysInclude, activatedSetNames };
+    return { tools: alwaysInclude, activatedSetNames, matchedSetNames };
   }
   const filtered = filterCandidates.filter((t) => {
     const name = getToolName2(t);
     return name && finalNames.has(name);
   });
-  return { tools: [...alwaysInclude, ...filtered], activatedSetNames };
+  return { tools: [...alwaysInclude, ...filtered], activatedSetNames, matchedSetNames };
+}
+
+// src/lib/tools/toolCatalog.ts
+var TOOL_CATALOG = {
+  // Gmail (src/tools/gmail.ts)
+  gmail_search_messages: { label: "Search emails", provider: "gmail", connector: "Gmail" },
+  gmail_get_message: { label: "Read an email", provider: "gmail", connector: "Gmail" },
+  gmail_create_draft: { label: "Draft a reply", provider: "gmail", connector: "Gmail" },
+  gmail_send_message: { label: "Send an email", provider: "gmail", connector: "Gmail" },
+  // Google Calendar (src/tools/googleCalendar.ts)
+  google_calendar_list_events: {
+    label: "Search calendar events",
+    provider: "gcalendar",
+    connector: "Calendar"
+  },
+  google_calendar_create_event: {
+    label: "Create calendar event",
+    provider: "gcalendar",
+    connector: "Calendar"
+  },
+  google_calendar_update_event: {
+    label: "Update calendar event",
+    provider: "gcalendar",
+    connector: "Calendar"
+  },
+  // Google Drive (src/tools/googleDrive.ts)
+  google_drive_search: { label: "Search files", provider: "gdrive", connector: "Drive" },
+  google_drive_list_recent: { label: "List recent files", provider: "gdrive", connector: "Drive" },
+  google_drive_get_content: { label: "Read file content", provider: "gdrive", connector: "Drive" },
+  google_drive_create_file: {
+    label: "Create a file in Drive",
+    provider: "gdrive",
+    connector: "Drive"
+  },
+  google_drive_update_file: {
+    label: "Update a Drive file",
+    provider: "gdrive",
+    connector: "Drive"
+  },
+  // Notion (src/tools/notion.ts)
+  "notion-search": { label: "Search", provider: "notion", connector: "Notion" },
+  "notion-fetch": { label: "Read page", provider: "notion", connector: "Notion" },
+  "notion-create-pages": { label: "Create page", provider: "notion", connector: "Notion" },
+  "notion-update-page": { label: "Update page", provider: "notion", connector: "Notion" },
+  "notion-move-pages": { label: "Move pages", provider: "notion", connector: "Notion" },
+  "notion-duplicate-page": { label: "Duplicate page", provider: "notion", connector: "Notion" },
+  "notion-create-database": { label: "Create database", provider: "notion", connector: "Notion" },
+  "notion-update-data-source": {
+    label: "Update data source",
+    provider: "notion",
+    connector: "Notion"
+  },
+  "notion-create-comment": { label: "Add a comment", provider: "notion", connector: "Notion" },
+  "notion-get-comments": { label: "Read comments", provider: "notion", connector: "Notion" },
+  "notion-get-users": {
+    label: "List workspace members",
+    provider: "notion",
+    connector: "Notion"
+  },
+  "notion-get-teams": { label: "List teamspaces", provider: "notion", connector: "Notion" },
+  // GitHub (src/tools/github.ts)
+  github_api: { label: "Use GitHub", provider: "github", connector: "GitHub" },
+  github_get_authenticated_user: {
+    label: "Read GitHub profile",
+    provider: "github",
+    connector: "GitHub"
+  },
+  // X / Twitter (src/tools/x.ts)
+  x_get_me: { label: "Get my X profile", provider: "x", connector: "X" },
+  x_get_my_posts: { label: "Read my recent posts", provider: "x", connector: "X" },
+  // Dropbox (src/tools/dropbox.ts)
+  dropbox_list_folders: { label: "List files", provider: "dropbox", connector: "Dropbox" },
+  dropbox_get_file_content: {
+    label: "Read file content",
+    provider: "dropbox",
+    connector: "Dropbox"
+  },
+  dropbox_search: { label: "Search files", provider: "dropbox", connector: "Dropbox" },
+  // Slack (src/tools/slack.ts)
+  slack_get_me: { label: "Get my Slack profile", provider: "slack", connector: "Slack" },
+  slack_list_channels: { label: "List channels", provider: "slack", connector: "Slack" },
+  slack_list_dms: { label: "List direct messages", provider: "slack", connector: "Slack" },
+  slack_search_messages: { label: "Search messages", provider: "slack", connector: "Slack" },
+  slack_list_users: { label: "List members", provider: "slack", connector: "Slack" },
+  slack_get_channel_history: {
+    label: "Read channel history",
+    provider: "slack",
+    connector: "Slack"
+  },
+  slack_get_thread_replies: {
+    label: "Read thread replies",
+    provider: "slack",
+    connector: "Slack"
+  },
+  slack_post_message: { label: "Post a message", provider: "slack", connector: "Slack" }
+};
+
+// src/lib/tools/selection/activeToolSets.ts
+function mergeActiveToolSets(current, derived) {
+  if (derived.length === 0) return current;
+  const merged = Array.from(/* @__PURE__ */ new Set([...current, ...derived]));
+  return merged.length === current.length ? current : merged;
 }
 
+// src/lib/tools/selection/recentToolSets.ts
+var RECENT_TOOL_SET_TURNS = 2;
+var RECENT_TOOL_SET_CONVERSATION_LIMIT = 50;
+var CARRYABLE_TOOL_SETS = new Set(
+  BUILT_IN_TOOL_SETS.filter(
+    (s) => s.anchors.length > 0 && s.anchors.every((a) => a in TOOL_CATALOG)
+  ).map((s) => s.name)
+);
+var recentToolSets = /* @__PURE__ */ new WeakMap();
+function touch(conversations, conversationId) {
+  const turns = conversations.get(conversationId);
+  if (!turns) return void 0;
+  conversations.delete(conversationId);
+  conversations.set(conversationId, turns);
+  return turns;
+}
+function carriedToolSets(database, conversationId) {
+  if (!conversationId) return [];
+  const conversations = recentToolSets.get(database);
+  if (!conversations) return [];
+  return [...touch(conversations, conversationId)?.keys() ?? []];
+}
+function recordToolSetTurn(database, conversationId, matched) {
+  if (!conversationId) return;
+  let conversations = recentToolSets.get(database);
+  if (!conversations) {
+    conversations = /* @__PURE__ */ new Map();
+    recentToolSets.set(database, conversations);
+  }
+  const turns = touch(conversations, conversationId) ?? /* @__PURE__ */ new Map();
+  for (const [name, left] of turns) {
+    if (left > 1) turns.set(name, left - 1);
+    else turns.delete(name);
+  }
+  for (const name of matched) {
+    if (CARRYABLE_TOOL_SETS.has(name)) turns.set(name, RECENT_TOOL_SET_TURNS);
+  }
+  if (turns.size === 0) {
+    conversations.delete(conversationId);
+    return;
+  }
+  conversations.set(conversationId, turns);
+  if (conversations.size > RECENT_TOOL_SET_CONVERSATION_LIMIT) {
+    const oldest = conversations.keys().next().value;
+    if (oldest !== void 0) conversations.delete(oldest);
+  }
+}
+function resetRecentToolSets() {
+  recentToolSets = /* @__PURE__ */ new WeakMap();
+}
+onClearAllEncryptionState(resetRecentToolSets);
+
 // src/expo/useChatStorage.ts
 var CONVERSATION_REDACTOR_LIMIT = 50;
 var NO_CONVERSATION_KEY = "__no_conversation__";
@@ -22408,6 +22564,7 @@ function useChatStorage(options) {
         }
         let narrowedClientTools2 = clientTools;
         let clientActivatedSetNames2;
+        let matchedToolSets2 = /* @__PURE__ */ new Set();
         if (clientTools?.length) {
           try {
             if (!skipUserEmbedding && getTokenRef.current && messageContent.length >= MIN_CONTENT_LENGTH_FOR_TOOLS) {
@@ -22428,17 +22585,25 @@ function useChatStorage(options) {
                 narrowedClientTools2 = clientTools.filter((t) => keep.has(getToolName2(t)));
               }
             } else if (getTokenRef.current) {
-              const { tools: autoTools, activatedSetNames } = await autoFilterClientTools(
+              const {
+                tools: autoTools,
+                activatedSetNames,
+                matchedSetNames
+              } = await autoFilterClientTools(
                 clientTools,
                 skipUserEmbedding ?? null,
                 clientToolFilterCache,
                 { getToken: getTokenRef.current, baseUrl, model: embeddingModel },
                 extraToolSets ?? [],
-                activeToolSetsRef.current ?? [],
+                mergeActiveToolSets(
+                  activeToolSetsRef.current ?? [],
+                  carriedToolSets(database, currentConversationId)
+                ),
                 skipEmbeddingFailed ? "error" : "short-prompt"
               );
               narrowedClientTools2 = autoTools;
               clientActivatedSetNames2 = activatedSetNames;
+              matchedToolSets2 = matchedSetNames;
             }
           } catch (error) {
             getLogger().warn("[useChatStorage] client tool filtering failed (skipStorage):", error);
@@ -22490,6 +22655,7 @@ function useChatStorage(options) {
           headers
         });
         if ("detached" in result2 && result2.detached) {
+          recordToolSetTurn(database, currentConversationId, matchedToolSets2);
           return {
             data: result2.data,
             error: result2.error,
@@ -22503,6 +22669,7 @@ function useChatStorage(options) {
             error: result2.error || "Unknown error"
           };
         }
+        recordToolSetTurn(database, currentConversationId, matchedToolSets2);
         const skipRefreshGetToken = getTokenRef.current;
         const skipRefreshData = result2.data;
         if (skipRefreshGetToken) {
@@ -22718,6 +22885,7 @@ function useChatStorage(options) {
       }
       let narrowedClientTools = clientTools;
       let clientActivatedSetNames;
+      let matchedToolSets = /* @__PURE__ */ new Set();
       if (clientTools?.length) {
         try {
           if (!userMessageEmbedding && getTokenRef.current && contentForStorage.length >= MIN_CONTENT_LENGTH_FOR_TOOLS) {
@@ -22734,17 +22902,25 @@ function useChatStorage(options) {
               narrowedClientTools = clientTools.filter((t) => keep.has(getToolName2(t)));
             }
           } else if (getTokenRef.current) {
-            const { tools: autoTools, activatedSetNames } = await autoFilterClientTools(
+            const {
+              tools: autoTools,
+              activatedSetNames,
+              matchedSetNames
+            } = await autoFilterClientTools(
               clientTools,
               userMessageEmbedding ?? null,
               clientToolFilterCache,
               { getToken: getTokenRef.current, baseUrl, model: embeddingModel },
               extraToolSets ?? [],
-              activeToolSetsRef.current ?? [],
+              mergeActiveToolSets(
+                activeToolSetsRef.current ?? [],
+                carriedToolSets(database, convId)
+              ),
               userMessageEmbeddingFailed ? "error" : "short-prompt"
             );
             narrowedClientTools = autoTools;
             clientActivatedSetNames = activatedSetNames;
+            matchedToolSets = matchedSetNames;
           }
           mergedTools = filteredServerTools.length > 0 || (narrowedClientTools?.length ?? 0) > 0 ? mergeTools(
             filteredServerTools,
@@ -22831,6 +23007,7 @@ function useChatStorage(options) {
       const responseDuration = (Date.now() - startTime) / 1e3;
       const detachedResult = result;
       if (detachedResult.detached) {
+        recordToolSetTurn(database, convId, matchedToolSets);
         const rowId = effectiveAssistantUniqueId ?? `msg_${(0, import_uuid5.v7)()}`;
         pendingResumeRef.current = {
           handle: detachedResult.resume ?? null,
@@ -22899,6 +23076,7 @@ function useChatStorage(options) {
               ],
               usage: void 0
             };
+            recordToolSetTurn(database, convId, matchedToolSets);
             return {
               data: responseData2,
               error: null,
@@ -22937,6 +23115,7 @@ function useChatStorage(options) {
           userMessage: { ...storedUserMessage, error: errorMessage }
         };
       }
+      recordToolSetTurn(database, convId, matchedToolSets);
       const responseData = result.data;
       let assistantContent = "";
       let thinkingContent;

package/dist/expo/index.mjs

@@ -19722,14 +19722,14 @@ async function autoFilterClientTools(clientTools, promptEmbeddings, cache, embed
   const alwaysInclude = clientTools.filter(isAlwaysIncluded);
   const filterCandidates = clientTools.filter((t) => !isAlwaysIncluded(t));
   if (filterCandidates.length === 0) {
-    return { tools: clientTools, activatedSetNames: /* @__PURE__ */ new Set() };
+    return { tools: clientTools, activatedSetNames: /* @__PURE__ */ new Set(), matchedSetNames: /* @__PURE__ */ new Set() };
   }
   if (!promptEmbeddings && noEmbeddingsReason === "error") {
-    return { tools: clientTools, activatedSetNames: /* @__PURE__ */ new Set() };
+    return { tools: clientTools, activatedSetNames: /* @__PURE__ */ new Set(), matchedSetNames: /* @__PURE__ */ new Set() };
   }
   if (!promptEmbeddings) {
     if (activeToolSets.length === 0) {
-      return { tools: [], activatedSetNames: /* @__PURE__ */ new Set() };
+      return { tools: [], activatedSetNames: /* @__PURE__ */ new Set(), matchedSetNames: /* @__PURE__ */ new Set() };
     }
     const allSets = extraToolSets.length > 0 ? [...BUILT_IN_TOOL_SETS, ...extraToolSets] : BUILT_IN_TOOL_SETS;
     const activeSets = allSets.filter((s) => activeToolSets.includes(s.name));
@@ -19739,7 +19739,8 @@ async function autoFilterClientTools(clientTools, promptEmbeddings, cache, embed
         ...alwaysInclude,
         ...filterCandidates.filter((t) => stickyMembers.has(getToolName2(t)))
       ],
-      activatedSetNames: new Set(activeSets.map((s) => s.name))
+      activatedSetNames: new Set(activeSets.map((s) => s.name)),
+      matchedSetNames: /* @__PURE__ */ new Set()
     };
   }
   const toolsNeedingEmbeddings = [];
@@ -19757,7 +19758,7 @@ async function autoFilterClientTools(clientTools, promptEmbeddings, cache, embed
         cache.set(toolsNeedingEmbeddings[i].name, embeddings[i]);
       }
     } catch {
-      return { tools: clientTools, activatedSetNames: /* @__PURE__ */ new Set() };
+      return { tools: clientTools, activatedSetNames: /* @__PURE__ */ new Set(), matchedSetNames: /* @__PURE__ */ new Set() };
     }
   }
   const pseudoServerTools = [];
@@ -19803,16 +19804,171 @@ async function autoFilterClientTools(clientTools, promptEmbeddings, cache, embed
     activeSetNames
   );
   const activatedSetNames = activatedToolSetNames(scores, toolSets, activeSetNames);
+  const matchedSetNames = activatedToolSetNames(scores, toolSets);
   if (finalNames.size === 0) {
-    return { tools: alwaysInclude, activatedSetNames };
+    return { tools: alwaysInclude, activatedSetNames, matchedSetNames };
   }
   const filtered = filterCandidates.filter((t) => {
     const name = getToolName2(t);
     return name && finalNames.has(name);
   });
-  return { tools: [...alwaysInclude, ...filtered], activatedSetNames };
+  return { tools: [...alwaysInclude, ...filtered], activatedSetNames, matchedSetNames };
 }
 
+// src/lib/tools/toolCatalog.ts
+var TOOL_CATALOG = {
+  // Gmail (src/tools/gmail.ts)
+  gmail_search_messages: { label: "Search emails", provider: "gmail", connector: "Gmail" },
+  gmail_get_message: { label: "Read an email", provider: "gmail", connector: "Gmail" },
+  gmail_create_draft: { label: "Draft a reply", provider: "gmail", connector: "Gmail" },
+  gmail_send_message: { label: "Send an email", provider: "gmail", connector: "Gmail" },
+  // Google Calendar (src/tools/googleCalendar.ts)
+  google_calendar_list_events: {
+    label: "Search calendar events",
+    provider: "gcalendar",
+    connector: "Calendar"
+  },
+  google_calendar_create_event: {
+    label: "Create calendar event",
+    provider: "gcalendar",
+    connector: "Calendar"
+  },
+  google_calendar_update_event: {
+    label: "Update calendar event",
+    provider: "gcalendar",
+    connector: "Calendar"
+  },
+  // Google Drive (src/tools/googleDrive.ts)
+  google_drive_search: { label: "Search files", provider: "gdrive", connector: "Drive" },
+  google_drive_list_recent: { label: "List recent files", provider: "gdrive", connector: "Drive" },
+  google_drive_get_content: { label: "Read file content", provider: "gdrive", connector: "Drive" },
+  google_drive_create_file: {
+    label: "Create a file in Drive",
+    provider: "gdrive",
+    connector: "Drive"
+  },
+  google_drive_update_file: {
+    label: "Update a Drive file",
+    provider: "gdrive",
+    connector: "Drive"
+  },
+  // Notion (src/tools/notion.ts)
+  "notion-search": { label: "Search", provider: "notion", connector: "Notion" },
+  "notion-fetch": { label: "Read page", provider: "notion", connector: "Notion" },
+  "notion-create-pages": { label: "Create page", provider: "notion", connector: "Notion" },
+  "notion-update-page": { label: "Update page", provider: "notion", connector: "Notion" },
+  "notion-move-pages": { label: "Move pages", provider: "notion", connector: "Notion" },
+  "notion-duplicate-page": { label: "Duplicate page", provider: "notion", connector: "Notion" },
+  "notion-create-database": { label: "Create database", provider: "notion", connector: "Notion" },
+  "notion-update-data-source": {
+    label: "Update data source",
+    provider: "notion",
+    connector: "Notion"
+  },
+  "notion-create-comment": { label: "Add a comment", provider: "notion", connector: "Notion" },
+  "notion-get-comments": { label: "Read comments", provider: "notion", connector: "Notion" },
+  "notion-get-users": {
+    label: "List workspace members",
+    provider: "notion",
+    connector: "Notion"
+  },
+  "notion-get-teams": { label: "List teamspaces", provider: "notion", connector: "Notion" },
+  // GitHub (src/tools/github.ts)
+  github_api: { label: "Use GitHub", provider: "github", connector: "GitHub" },
+  github_get_authenticated_user: {
+    label: "Read GitHub profile",
+    provider: "github",
+    connector: "GitHub"
+  },
+  // X / Twitter (src/tools/x.ts)
+  x_get_me: { label: "Get my X profile", provider: "x", connector: "X" },
+  x_get_my_posts: { label: "Read my recent posts", provider: "x", connector: "X" },
+  // Dropbox (src/tools/dropbox.ts)
+  dropbox_list_folders: { label: "List files", provider: "dropbox", connector: "Dropbox" },
+  dropbox_get_file_content: {
+    label: "Read file content",
+    provider: "dropbox",
+    connector: "Dropbox"
+  },
+  dropbox_search: { label: "Search files", provider: "dropbox", connector: "Dropbox" },
+  // Slack (src/tools/slack.ts)
+  slack_get_me: { label: "Get my Slack profile", provider: "slack", connector: "Slack" },
+  slack_list_channels: { label: "List channels", provider: "slack", connector: "Slack" },
+  slack_list_dms: { label: "List direct messages", provider: "slack", connector: "Slack" },
+  slack_search_messages: { label: "Search messages", provider: "slack", connector: "Slack" },
+  slack_list_users: { label: "List members", provider: "slack", connector: "Slack" },
+  slack_get_channel_history: {
+    label: "Read channel history",
+    provider: "slack",
+    connector: "Slack"
+  },
+  slack_get_thread_replies: {
+    label: "Read thread replies",
+    provider: "slack",
+    connector: "Slack"
+  },
+  slack_post_message: { label: "Post a message", provider: "slack", connector: "Slack" }
+};
+
+// src/lib/tools/selection/activeToolSets.ts
+function mergeActiveToolSets(current, derived) {
+  if (derived.length === 0) return current;
+  const merged = Array.from(/* @__PURE__ */ new Set([...current, ...derived]));
+  return merged.length === current.length ? current : merged;
+}
+
+// src/lib/tools/selection/recentToolSets.ts
+var RECENT_TOOL_SET_TURNS = 2;
+var RECENT_TOOL_SET_CONVERSATION_LIMIT = 50;
+var CARRYABLE_TOOL_SETS = new Set(
+  BUILT_IN_TOOL_SETS.filter(
+    (s) => s.anchors.length > 0 && s.anchors.every((a) => a in TOOL_CATALOG)
+  ).map((s) => s.name)
+);
+var recentToolSets = /* @__PURE__ */ new WeakMap();
+function touch(conversations, conversationId) {
+  const turns = conversations.get(conversationId);
+  if (!turns) return void 0;
+  conversations.delete(conversationId);
+  conversations.set(conversationId, turns);
+  return turns;
+}
+function carriedToolSets(database, conversationId) {
+  if (!conversationId) return [];
+  const conversations = recentToolSets.get(database);
+  if (!conversations) return [];
+  return [...touch(conversations, conversationId)?.keys() ?? []];
+}
+function recordToolSetTurn(database, conversationId, matched) {
+  if (!conversationId) return;
+  let conversations = recentToolSets.get(database);
+  if (!conversations) {
+    conversations = /* @__PURE__ */ new Map();
+    recentToolSets.set(database, conversations);
+  }
+  const turns = touch(conversations, conversationId) ?? /* @__PURE__ */ new Map();
+  for (const [name, left] of turns) {
+    if (left > 1) turns.set(name, left - 1);
+    else turns.delete(name);
+  }
+  for (const name of matched) {
+    if (CARRYABLE_TOOL_SETS.has(name)) turns.set(name, RECENT_TOOL_SET_TURNS);
+  }
+  if (turns.size === 0) {
+    conversations.delete(conversationId);
+    return;
+  }
+  conversations.set(conversationId, turns);
+  if (conversations.size > RECENT_TOOL_SET_CONVERSATION_LIMIT) {
+    const oldest = conversations.keys().next().value;
+    if (oldest !== void 0) conversations.delete(oldest);
+  }
+}
+function resetRecentToolSets() {
+  recentToolSets = /* @__PURE__ */ new WeakMap();
+}
+onClearAllEncryptionState(resetRecentToolSets);
+
 // src/expo/useChatStorage.ts
 var CONVERSATION_REDACTOR_LIMIT = 50;
 var NO_CONVERSATION_KEY = "__no_conversation__";
@@ -20692,6 +20848,7 @@ function useChatStorage(options) {
         }
         let narrowedClientTools2 = clientTools;
         let clientActivatedSetNames2;
+        let matchedToolSets2 = /* @__PURE__ */ new Set();
         if (clientTools?.length) {
           try {
             if (!skipUserEmbedding && getTokenRef.current && messageContent.length >= MIN_CONTENT_LENGTH_FOR_TOOLS) {
@@ -20712,17 +20869,25 @@ function useChatStorage(options) {
                 narrowedClientTools2 = clientTools.filter((t) => keep.has(getToolName2(t)));
               }
             } else if (getTokenRef.current) {
-              const { tools: autoTools, activatedSetNames } = await autoFilterClientTools(
+              const {
+                tools: autoTools,
+                activatedSetNames,
+                matchedSetNames
+              } = await autoFilterClientTools(
                 clientTools,
                 skipUserEmbedding ?? null,
                 clientToolFilterCache,
                 { getToken: getTokenRef.current, baseUrl, model: embeddingModel },
                 extraToolSets ?? [],
-                activeToolSetsRef.current ?? [],
+                mergeActiveToolSets(
+                  activeToolSetsRef.current ?? [],
+                  carriedToolSets(database, currentConversationId)
+                ),
                 skipEmbeddingFailed ? "error" : "short-prompt"
               );
               narrowedClientTools2 = autoTools;
               clientActivatedSetNames2 = activatedSetNames;
+              matchedToolSets2 = matchedSetNames;
             }
           } catch (error) {
             getLogger().warn("[useChatStorage] client tool filtering failed (skipStorage):", error);
@@ -20774,6 +20939,7 @@ function useChatStorage(options) {
           headers
         });
         if ("detached" in result2 && result2.detached) {
+          recordToolSetTurn(database, currentConversationId, matchedToolSets2);
           return {
             data: result2.data,
             error: result2.error,
@@ -20787,6 +20953,7 @@ function useChatStorage(options) {
             error: result2.error || "Unknown error"
           };
         }
+        recordToolSetTurn(database, currentConversationId, matchedToolSets2);
         const skipRefreshGetToken = getTokenRef.current;
         const skipRefreshData = result2.data;
         if (skipRefreshGetToken) {
@@ -21002,6 +21169,7 @@ function useChatStorage(options) {
       }
       let narrowedClientTools = clientTools;
       let clientActivatedSetNames;
+      let matchedToolSets = /* @__PURE__ */ new Set();
       if (clientTools?.length) {
         try {
           if (!userMessageEmbedding && getTokenRef.current && contentForStorage.length >= MIN_CONTENT_LENGTH_FOR_TOOLS) {
@@ -21018,17 +21186,25 @@ function useChatStorage(options) {
               narrowedClientTools = clientTools.filter((t) => keep.has(getToolName2(t)));
             }
           } else if (getTokenRef.current) {
-            const { tools: autoTools, activatedSetNames } = await autoFilterClientTools(
+            const {
+              tools: autoTools,
+              activatedSetNames,
+              matchedSetNames
+            } = await autoFilterClientTools(
               clientTools,
               userMessageEmbedding ?? null,
               clientToolFilterCache,
               { getToken: getTokenRef.current, baseUrl, model: embeddingModel },
               extraToolSets ?? [],
-              activeToolSetsRef.current ?? [],
+              mergeActiveToolSets(
+                activeToolSetsRef.current ?? [],
+                carriedToolSets(database, convId)
+              ),
               userMessageEmbeddingFailed ? "error" : "short-prompt"
             );
             narrowedClientTools = autoTools;
             clientActivatedSetNames = activatedSetNames;
+            matchedToolSets = matchedSetNames;
           }
           mergedTools = filteredServerTools.length > 0 || (narrowedClientTools?.length ?? 0) > 0 ? mergeTools(
             filteredServerTools,
@@ -21115,6 +21291,7 @@ function useChatStorage(options) {
       const responseDuration = (Date.now() - startTime) / 1e3;
       const detachedResult = result;
       if (detachedResult.detached) {
+        recordToolSetTurn(database, convId, matchedToolSets);
         const rowId = effectiveAssistantUniqueId ?? `msg_${uuidv75()}`;
         pendingResumeRef.current = {
           handle: detachedResult.resume ?? null,
@@ -21183,6 +21360,7 @@ function useChatStorage(options) {
               ],
               usage: void 0
             };
+            recordToolSetTurn(database, convId, matchedToolSets);
             return {
               data: responseData2,
               error: null,
@@ -21221,6 +21399,7 @@ function useChatStorage(options) {
           userMessage: { ...storedUserMessage, error: errorMessage }
         };
       }
+      recordToolSetTurn(database, convId, matchedToolSets);
       const responseData = result.data;
       let assistantContent = "";
       let thinkingContent;