@anuma/sdk 6.26.2 → 6.27.1

package/dist/expo/index.cjs

@@ -1491,6 +1491,7 @@ __export(index_exports, {
   createMemoryVaultSearchTool: () => createMemoryVaultSearchTool,
   createMemoryVaultTool: () => createMemoryVaultTool,
   createMessageSourceResolver: () => createMessageSourceResolver,
+  createNotionProxyTools: () => createNotionProxyTools,
   createNotionTools: () => createNotionTools,
   createPlatformCursorStore: () => createPlatformCursorStore,
   createRecallTool: () => createRecallTool,
@@ -5533,6 +5534,36 @@ init_clientConfig();
 // src/lib/chat/toolLoop.ts
 init_clientConfig();
 init_redactor();
+
+// src/lib/storage/mcpImages.ts
+var IMAGE_TOOL_NAMES = /* @__PURE__ */ new Set([
+  "AnumaMediaMCP-anuma_create_image",
+  "anuma_create_image",
+  // Deprecated anuma-image-mcp tools, retained so images in already-stored
+  // conversations still re-materialize on replay.
+  "AnumaImageMCP-generate_cloud_image",
+  "AnumaImageMCP-edit_cloud_image",
+  "generate_cloud_image",
+  "edit_cloud_image"
+]);
+function toolOutputForModel(name, output) {
+  if (!name || !IMAGE_TOOL_NAMES.has(name)) return output;
+  try {
+    const {
+      imageUrl: _imageUrl,
+      url: _url,
+      output_images: _outputImages,
+      ...rest
+    } = JSON.parse(output);
+    return JSON.stringify(rest);
+  } catch {
+    return output;
+  }
+}
+var VIDEO_EXTENSIONS = ["mp4", "webm", "mov"];
+var VIDEO_EXTENSION_RE = new RegExp(`\\.(${VIDEO_EXTENSIONS.join("|")})(?:[?#]|$)`, "i");
+
+// src/lib/chat/toolLoop.ts
 init_endpointOverride();
 
 // src/lib/chat/runHooks.ts
@@ -7666,6 +7697,40 @@ function extractLastUserText(messages) {
 function isToolErrorResult(result) {
   return result !== null && typeof result === "object" && "error" in result && typeof result.error === "string";
 }
+function serverToolCallMessages(events, messages, skipIds) {
+  const seen = new Set(skipIds);
+  for (const m of messages) {
+    if (m.tool_call_id) seen.add(m.tool_call_id);
+    for (const tc of m.tool_calls ?? []) if (tc.id) seen.add(tc.id);
+  }
+  const executed = [];
+  for (const event of events ?? []) {
+    if (!event.id || event.output === void 0 || event.output === null || seen.has(event.id)) {
+      continue;
+    }
+    seen.add(event.id);
+    executed.push(event);
+  }
+  if (executed.length === 0) return [];
+  return [
+    {
+      role: "assistant",
+      content: void 0,
+      tool_calls: executed.map((event) => ({
+        id: event.id,
+        type: "function",
+        function: { name: event.name, arguments: event.arguments }
+      }))
+    },
+    ...executed.map(
+      (event) => ({
+        role: "tool",
+        tool_call_id: event.id,
+        content: [{ type: "text", text: toolOutputForModel(event.name, event.output ?? "") }]
+      })
+    )
+  ];
+}
 function getToolName(tool) {
   const func = tool.function;
   const nestedName = func?.name;
@@ -8435,7 +8500,14 @@ Executing tool: ${toolInfo}
           }
         }))
       };
-      const toolResultMessages = [assistantMessage];
+      const toolResultMessages = [
+        ...serverToolCallMessages(
+          currentAccumulator.toolCallEvents,
+          currentMessages,
+          new Set(toolCallsToExecute.map((tc) => tc.id))
+        ),
+        assistantMessage
+      ];
       for (const execResult of continueResults) {
         const resultContent = execResult.error ? `Error: ${execResult.error}` : safeJsonStringify(execResult.result);
         toolResultMessages.push({
@@ -10630,20 +10702,6 @@ function generateMediaId() {
 // src/lib/db/media/operations.ts
 var import_watermelondb7 = require("@nozbe/watermelondb");
 
-// src/lib/storage/mcpImages.ts
-var IMAGE_TOOL_NAMES = /* @__PURE__ */ new Set([
-  "AnumaMediaMCP-anuma_create_image",
-  "anuma_create_image",
-  // Deprecated anuma-image-mcp tools, retained so images in already-stored
-  // conversations still re-materialize on replay.
-  "AnumaImageMCP-generate_cloud_image",
-  "AnumaImageMCP-edit_cloud_image",
-  "generate_cloud_image",
-  "edit_cloud_image"
-]);
-var VIDEO_EXTENSIONS = ["mp4", "webm", "mov"];
-var VIDEO_EXTENSION_RE = new RegExp(`\\.(${VIDEO_EXTENSIONS.join("|")})(?:[?#]|$)`, "i");
-
 // src/lib/storage/opfs.ts
 function isOPFSSupported() {
   return typeof navigator !== "undefined" && "storage" in navigator && "getDirectory" in navigator.storage;
@@ -21189,24 +21247,10 @@ function storedToLlmapiMessage(stored) {
     });
     for (const event of stored.toolCallEvents) {
       if (event.id && event.output !== void 0 && event.output !== null) {
-        let toolOutput = event.output;
-        if (event.name && IMAGE_TOOL_NAMES.has(event.name)) {
-          try {
-            const parsed = JSON.parse(toolOutput);
-            const {
-              imageUrl: _imageUrl,
-              url: _url,
-              output_images: _outputImages,
-              ...rest
-            } = parsed;
-            toolOutput = JSON.stringify(rest);
-          } catch {
-          }
-        }
         messages.push({
           role: "tool",
           tool_call_id: event.id,
-          content: [{ type: "text", text: toolOutput }]
+          content: [{ type: "text", text: toolOutputForModel(event.name, event.output) }]
         });
       }
     }
@@ -24848,6 +24892,19 @@ async function refreshNotionAccessToken(params) {
   return result;
 }
 
+// src/lib/connectors/errors.ts
+function buildConnectorErrorResult(code, provider, connectUrl, extras) {
+  const payload = {
+    __anuma_connector_error_v1: true,
+    code,
+    provider,
+    connect_url: connectUrl,
+    missing_scopes: extras?.missingScopes,
+    required: extras?.required
+  };
+  return JSON.stringify(payload);
+}
+
 // src/tools/notion.ts
 var MCP_HTTP_ENDPOINT = "https://mcp.notion.com/mcp";
 var MAX_CONTENT_LENGTH2 = 5e4;
@@ -25020,8 +25077,83 @@ async function callMCPTool(accessToken, toolName, args) {
   }
   return truncateToolResult(jsonRpcResponse.result);
 }
-function createNotionSearchTool(getAccessToken, requestNotionAccess) {
+var NOTION_PROVIDER = "notion";
+function directRunner(getAccessToken, requestNotionAccess) {
+  return async (toolName, args) => {
+    let token = getAccessToken();
+    if (!token) {
+      token = await requestNotionAccess();
+    }
+    return callMCPTool(token, toolName, args);
+  };
+}
+function readField(json4, key) {
+  return typeof json4 === "object" && json4 !== null ? json4[key] : void 0;
+}
+function readString(json4, key) {
+  const value = readField(json4, key);
+  return typeof value === "string" ? value : void 0;
+}
+function notionConnectorError(status, json4) {
+  const code = readField(json4, "code");
+  if (status === 503) {
+    return code === "upstream_unavailable" ? buildConnectorErrorResult("upstream_unavailable", NOTION_PROVIDER) : null;
+  }
+  if (status !== 401 && status !== 403 && status !== 412) return null;
+  switch (code) {
+    case "scope_not_covered": {
+      const missingScopes = readField(json4, "missing_scopes");
+      return buildConnectorErrorResult(
+        "scope_not_covered",
+        NOTION_PROVIDER,
+        readString(json4, "connect_url"),
+        Array.isArray(missingScopes) ? { missingScopes } : void 0
+      );
+    }
+    case "insufficient_scope":
+      return buildConnectorErrorResult("insufficient_scope", NOTION_PROVIDER, void 0, {
+        required: readString(json4, "required")
+      });
+    case "upstream_unavailable":
+      return buildConnectorErrorResult("upstream_unavailable", NOTION_PROVIDER);
+    default:
+      return buildConnectorErrorResult(
+        "connector_not_connected",
+        NOTION_PROVIDER,
+        readString(json4, "connect_url")
+      );
+  }
+}
+function proxyRunner(callMcp) {
+  return async (toolName, args) => {
+    const { status, json: json4 } = await callMcp(toolName, args);
+    if (status >= 200 && status < 300) {
+      const result = readField(json4, "result");
+      if (result === void 0) {
+        throw new Error(`Notion returned no result (${status})`);
+      }
+      return truncateToolResult(result);
+    }
+    const connectorError = notionConnectorError(status, json4);
+    if (connectorError) return connectorError;
+    const message = readField(json4, "error");
+    throw new Error(`${typeof message === "string" ? message : JSON.stringify(json4)} (${status})`);
+  };
+}
+function withNotionExecutor(run, errorPrefix, tool) {
   return {
+    ...tool,
+    executor: async (args) => {
+      try {
+        return await run(tool.function.name, args);
+      } catch (error) {
+        return `${errorPrefix}: ${error instanceof Error ? error.message : String(error)}`;
+      }
+    }
+  };
+}
+function notionSearchTool(run) {
+  return withNotionExecutor(run, "Error searching Notion", {
     type: "function",
     function: {
       name: "notion-search",
@@ -25062,22 +25194,11 @@ function createNotionSearchTool(getAccessToken, requestNotionAccess) {
         },
         required: ["query"]
       }
-    },
-    executor: async (args) => {
-      let token = getAccessToken();
-      if (!token) {
-        token = await requestNotionAccess();
-      }
-      try {
-        return await callMCPTool(token, "notion-search", args);
-      } catch (error) {
-        return `Error searching Notion: ${error instanceof Error ? error.message : String(error)}`;
-      }
     }
-  };
+  });
 }
-function createNotionFetchTool(getAccessToken, requestNotionAccess) {
-  return {
+function notionFetchTool(run) {
+  return withNotionExecutor(run, "Error fetching Notion page", {
     type: "function",
     function: {
       name: "notion-fetch",
@@ -25100,22 +25221,11 @@ function createNotionFetchTool(getAccessToken, requestNotionAccess) {
         },
         required: ["id"]
       }
-    },
-    executor: async (args) => {
-      let token = getAccessToken();
-      if (!token) {
-        token = await requestNotionAccess();
-      }
-      try {
-        return await callMCPTool(token, "notion-fetch", args);
-      } catch (error) {
-        return `Error fetching Notion page: ${error instanceof Error ? error.message : String(error)}`;
-      }
     }
-  };
+  });
 }
-function createNotionCreatePagesTool(getAccessToken, requestNotionAccess) {
-  return {
+function notionCreatePagesTool(run) {
+  return withNotionExecutor(run, "Error creating Notion page", {
     type: "function",
     function: {
       name: "notion-create-pages",
@@ -25148,22 +25258,11 @@ function createNotionCreatePagesTool(getAccessToken, requestNotionAccess) {
         },
         required: ["pages"]
       }
-    },
-    executor: async (args) => {
-      let token = getAccessToken();
-      if (!token) {
-        token = await requestNotionAccess();
-      }
-      try {
-        return await callMCPTool(token, "notion-create-pages", args);
-      } catch (error) {
-        return `Error creating Notion page: ${error instanceof Error ? error.message : String(error)}`;
-      }
     }
-  };
+  });
 }
-function createNotionUpdatePageTool(getAccessToken, requestNotionAccess) {
-  return {
+function notionUpdatePageTool(run) {
+  return withNotionExecutor(run, "Error updating Notion page", {
     type: "function",
     function: {
       name: "notion-update-page",
@@ -25211,22 +25310,11 @@ function createNotionUpdatePageTool(getAccessToken, requestNotionAccess) {
         },
         required: ["data"]
       }
-    },
-    executor: async (args) => {
-      let token = getAccessToken();
-      if (!token) {
-        token = await requestNotionAccess();
-      }
-      try {
-        return await callMCPTool(token, "notion-update-page", args);
-      } catch (error) {
-        return `Error updating Notion page: ${error instanceof Error ? error.message : String(error)}`;
-      }
     }
-  };
+  });
 }
-function createNotionMovePagesTool(getAccessToken, requestNotionAccess) {
-  return {
+function notionMovePagesTool(run) {
+  return withNotionExecutor(run, "Error moving Notion pages", {
     type: "function",
     function: {
       name: "notion-move-pages",
@@ -25246,22 +25334,11 @@ function createNotionMovePagesTool(getAccessToken, requestNotionAccess) {
         },
         required: ["page_or_database_ids", "new_parent"]
       }
-    },
-    executor: async (args) => {
-      let token = getAccessToken();
-      if (!token) {
-        token = await requestNotionAccess();
-      }
-      try {
-        return await callMCPTool(token, "notion-move-pages", args);
-      } catch (error) {
-        return `Error moving Notion pages: ${error instanceof Error ? error.message : String(error)}`;
-      }
     }
-  };
+  });
 }
-function createNotionDuplicatePageTool(getAccessToken, requestNotionAccess) {
-  return {
+function notionDuplicatePageTool(run) {
+  return withNotionExecutor(run, "Error duplicating Notion page", {
     type: "function",
     function: {
       name: "notion-duplicate-page",
@@ -25276,22 +25353,11 @@ function createNotionDuplicatePageTool(getAccessToken, requestNotionAccess) {
         },
         required: ["page_id"]
       }
-    },
-    executor: async (args) => {
-      let token = getAccessToken();
-      if (!token) {
-        token = await requestNotionAccess();
-      }
-      try {
-        return await callMCPTool(token, "notion-duplicate-page", args);
-      } catch (error) {
-        return `Error duplicating Notion page: ${error instanceof Error ? error.message : String(error)}`;
-      }
     }
-  };
+  });
 }
-function createNotionCreateDatabaseTool(getAccessToken, requestNotionAccess) {
-  return {
+function notionCreateDatabaseTool(run) {
+  return withNotionExecutor(run, "Error creating Notion database", {
     type: "function",
     function: {
       name: "notion-create-database",
@@ -25320,22 +25386,11 @@ function createNotionCreateDatabaseTool(getAccessToken, requestNotionAccess) {
         },
         required: ["properties"]
       }
-    },
-    executor: async (args) => {
-      let token = getAccessToken();
-      if (!token) {
-        token = await requestNotionAccess();
-      }
-      try {
-        return await callMCPTool(token, "notion-create-database", args);
-      } catch (error) {
-        return `Error creating Notion database: ${error instanceof Error ? error.message : String(error)}`;
-      }
     }
-  };
+  });
 }
-function createNotionUpdateDataSourceTool(getAccessToken, requestNotionAccess) {
-  return {
+function notionUpdateDataSourceTool(run) {
+  return withNotionExecutor(run, "Error updating Notion data source", {
     type: "function",
     function: {
       name: "notion-update-data-source",
@@ -25372,22 +25427,11 @@ function createNotionUpdateDataSourceTool(getAccessToken, requestNotionAccess) {
         },
         required: ["data_source_id"]
       }
-    },
-    executor: async (args) => {
-      let token = getAccessToken();
-      if (!token) {
-        token = await requestNotionAccess();
-      }
-      try {
-        return await callMCPTool(token, "notion-update-data-source", args);
-      } catch (error) {
-        return `Error updating Notion data source: ${error instanceof Error ? error.message : String(error)}`;
-      }
     }
-  };
+  });
 }
-function createNotionCreateCommentTool(getAccessToken, requestNotionAccess) {
-  return {
+function notionCreateCommentTool(run) {
+  return withNotionExecutor(run, "Error creating Notion comment", {
     type: "function",
     function: {
       name: "notion-create-comment",
@@ -25427,22 +25471,11 @@ function createNotionCreateCommentTool(getAccessToken, requestNotionAccess) {
         },
         required: ["page_id", "rich_text"]
       }
-    },
-    executor: async (args) => {
-      let token = getAccessToken();
-      if (!token) {
-        token = await requestNotionAccess();
-      }
-      try {
-        return await callMCPTool(token, "notion-create-comment", args);
-      } catch (error) {
-        return `Error creating Notion comment: ${error instanceof Error ? error.message : String(error)}`;
-      }
     }
-  };
+  });
 }
-function createNotionGetCommentsTool(getAccessToken, requestNotionAccess) {
-  return {
+function notionGetCommentsTool(run) {
+  return withNotionExecutor(run, "Error retrieving Notion comments", {
     type: "function",
     function: {
       name: "notion-get-comments",
@@ -25469,22 +25502,11 @@ function createNotionGetCommentsTool(getAccessToken, requestNotionAccess) {
         },
         required: ["page_id"]
       }
-    },
-    executor: async (args) => {
-      let token = getAccessToken();
-      if (!token) {
-        token = await requestNotionAccess();
-      }
-      try {
-        return await callMCPTool(token, "notion-get-comments", args);
-      } catch (error) {
-        return `Error retrieving Notion comments: ${error instanceof Error ? error.message : String(error)}`;
-      }
     }
-  };
+  });
 }
-function createNotionGetUsersTool(getAccessToken, requestNotionAccess) {
-  return {
+function notionGetUsersTool(run) {
+  return withNotionExecutor(run, "Error listing Notion users", {
     type: "function",
     function: {
       name: "notion-get-users",
@@ -25510,22 +25532,11 @@ function createNotionGetUsersTool(getAccessToken, requestNotionAccess) {
           }
         }
       }
-    },
-    executor: async (args) => {
-      let token = getAccessToken();
-      if (!token) {
-        token = await requestNotionAccess();
-      }
-      try {
-        return await callMCPTool(token, "notion-get-users", args);
-      } catch (error) {
-        return `Error listing Notion users: ${error instanceof Error ? error.message : String(error)}`;
-      }
     }
-  };
+  });
 }
-function createNotionGetTeamsTool(getAccessToken, requestNotionAccess) {
-  return {
+function notionGetTeamsTool(run) {
+  return withNotionExecutor(run, "Error retrieving Notion teams", {
     type: "function",
     function: {
       name: "notion-get-teams",
@@ -25539,40 +25550,35 @@ function createNotionGetTeamsTool(getAccessToken, requestNotionAccess) {
           }
         }
       }
-    },
-    executor: async (args) => {
-      let token = getAccessToken();
-      if (!token) {
-        token = await requestNotionAccess();
-      }
-      try {
-        return await callMCPTool(token, "notion-get-teams", args);
-      } catch (error) {
-        return `Error retrieving Notion teams: ${error instanceof Error ? error.message : String(error)}`;
-      }
     }
-  };
+  });
 }
+var NOTION_TOOLS = [
+  // Search
+  notionSearchTool,
+  // Pages
+  notionFetchTool,
+  notionCreatePagesTool,
+  notionUpdatePageTool,
+  notionMovePagesTool,
+  notionDuplicatePageTool,
+  // Data Sources (Databases)
+  notionCreateDatabaseTool,
+  notionUpdateDataSourceTool,
+  // Comments
+  notionCreateCommentTool,
+  notionGetCommentsTool,
+  // Users & Teams
+  notionGetUsersTool,
+  notionGetTeamsTool
+];
 function createNotionTools(getAccessToken, requestNotionAccess) {
-  return [
-    // Search
-    createNotionSearchTool(getAccessToken, requestNotionAccess),
-    // Pages
-    createNotionFetchTool(getAccessToken, requestNotionAccess),
-    createNotionCreatePagesTool(getAccessToken, requestNotionAccess),
-    createNotionUpdatePageTool(getAccessToken, requestNotionAccess),
-    createNotionMovePagesTool(getAccessToken, requestNotionAccess),
-    createNotionDuplicatePageTool(getAccessToken, requestNotionAccess),
-    // Data Sources (Databases)
-    createNotionCreateDatabaseTool(getAccessToken, requestNotionAccess),
-    createNotionUpdateDataSourceTool(getAccessToken, requestNotionAccess),
-    // Comments
-    createNotionCreateCommentTool(getAccessToken, requestNotionAccess),
-    createNotionGetCommentsTool(getAccessToken, requestNotionAccess),
-    // Users & Teams
-    createNotionGetUsersTool(getAccessToken, requestNotionAccess),
-    createNotionGetTeamsTool(getAccessToken, requestNotionAccess)
-  ];
+  const run = directRunner(getAccessToken, requestNotionAccess);
+  return NOTION_TOOLS.map((tool) => tool(run));
+}
+function createNotionProxyTools(callMcp) {
+  const run = proxyRunner(callMcp);
+  return NOTION_TOOLS.map((tool) => tool(run));
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
@@ -25668,6 +25674,7 @@ function createNotionTools(getAccessToken, requestNotionAccess) {
   createMemoryVaultSearchTool,
   createMemoryVaultTool,
   createMessageSourceResolver,
+  createNotionProxyTools,
   createNotionTools,
   createPlatformCursorStore,
   createRecallTool,