aui-agent-builder 0.4.6 → 0.4.7

package/dist/commands/integration.js

@@ -1,43 +1,8 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-/**
- * integration command - Create and manage MCP integrations
- *
- * Supports interactive, scripted (some flags), and fully non-interactive
- * (`--full` or `--json`) modes.
- *
- * Interactive flow: type → config method → org → account → agent → name →
- *   URL → auth → discover → select tools → confirm → save
- *
- * Usage:
- *   aui integration                              Interactive menu
- *   aui integration create                       Interactive MCP integration creation
- *   aui integration create --name "My MCP" --url <url> --tools tool1,tool2
- *   aui integration create --name "My MCP" --url <url> --all-tools --full
- *   aui integration create --toolkit notion --name "Notion" --all-tools --full
- *   aui integration discover --url <url>         Discover tools from an MCP server
- *
- * `--full` makes the command fully non-interactive: it skips org/account/agent
- * selection prompts (uses session defaults) and the final confirmation
- * prompt. Required flags (`--name` + `--url` for manual; `--name` +
- * `--toolkit` for native; plus `--tools` or `--all-tools`) must be supplied;
- * missing values produce a clean validation error instead of a prompt.
- *
- * `--json` implies non-interactive and emits machine-readable output via
- * `outputJson` / `outputJsonError`.
- *
- * Composio (native) settings: `settings.composio.user_id` is the agent's
- * `network_id` (per backend `ComposioIntegrationSchema` →
- * `IntegrationMCPSettings`), so each agent owns its own Composio user
- * namespace. The MCP server is provisioned once on create; its caller-
- * stable id is persisted at `settings.composio.server_id` and the
- * provisioned HTTP URL is persisted at `settings.server_url` so the
- * runtime can hit the MCP endpoint without round-tripping Composio.
- */
-import { readFileSync } from "fs";
 import { render, Box, Text } from "ink";
 import inquirer from "inquirer";
 import chalk from "chalk";
-import { getAuthenticatedSession, discoverMCPTools, discoverComposioTools, saveIntegration as saveIntegrationSvc, resolveScopeIds, resolveNetworkCategoryId, listComposioToolkits, connectComposioToolkit, waitForComposioConnection, resetComposioClient, fetchComposioApiKey, getComposioToolkitAuthInfo, getComposioServerUrl, buildAuthFromFlags, parseTransportType, } from "../services/integration.service.js";
+import { getAuthenticatedSession, discoverMCPTools, discoverComposioTools, saveIntegration as saveIntegrationSvc, resolveScopeIds, resolveNetworkCategoryId, listComposioToolkits, connectComposioToolkit, waitForComposioConnection, getComposioToolkitAuthInfo, getComposioServerUrl, buildAuthFromFlags, loadComposioCredentialsFile, parseTransportType, composioFailureLabel, composioFailureJson, } from "../services/integration.service.js";
 import { MCPToolList, IntegrationCreatedView, NativeIntegrationCreatedView, } from "../ui/views/IntegrationView.js";
 import { Header, Spinner, StatusLine, ErrorDisplay, } from "../ui/components/index.js";
 import { AUIClient } from "../api-client/index.js";
@@ -162,31 +127,6 @@ export async function promptDirectMCPAuth() {
         },
     };
 }
-// ─── BYO Credentials File Loader ───
-function loadCredentialsFile(filePath) {
-    let raw;
-    try {
-        raw = JSON.parse(readFileSync(filePath, "utf-8"));
-    }
-    catch (err) {
-        throw new Error(`Cannot read credentials file '${filePath}': ${err instanceof Error ? err.message : String(err)}`);
-    }
-    if (!raw || typeof raw !== "object" || Array.isArray(raw)) {
-        throw new Error(`Credentials file '${filePath}' must be a JSON object.`);
-    }
-    const obj = raw;
-    const creds = {};
-    if (obj.client_id)
-        creds.clientId = String(obj.client_id);
-    if (obj.client_secret)
-        creds.clientSecret = String(obj.client_secret);
-    if (obj.bearer_token)
-        creds.bearerToken = String(obj.bearer_token);
-    if (!creds.clientId && !creds.clientSecret && !creds.bearerToken) {
-        throw new Error(`Credentials file '${filePath}' must contain at least one of: client_id, client_secret, bearer_token.`);
-    }
-    return creds;
-}
 // ─── Ink Rendering Helpers ───
 function log(node) {
     const { unmount } = render(node);
@@ -208,6 +148,22 @@ function startSpinner(label) {
         },
     };
 }
+function saveIntegrationSuccessLabel(result) {
+    if (result.persistedVia === "local") {
+        return "Integration saved to integrations.aui.json";
+    }
+    if (result.persistedVia === "local_and_server") {
+        return "Integration created and saved to integrations.aui.json";
+    }
+    return "Integration created";
+}
+function saveIntegrationJsonExtras(result) {
+    return {
+        ...(result.persistedVia ? { persisted_via: result.persistedVia } : {}),
+        ...(result.agentMode ? { agent_mode: result.agentMode } : {}),
+        ...(result.suggestion ? { suggestion: result.suggestion } : {}),
+    };
+}
 // ─── Shared: paginate-everything fetch helpers ───
 //
 // The org / account / agent / version pickers below list EVERY option
@@ -654,7 +610,7 @@ export async function integrationCreate(options = {}) {
         if (isManualNonInteractive) {
             configMethod = "manual";
         }
-        else if (isNativeNonInteractive || options.toolkit || options.composioApiKey) {
+        else if (isNativeNonInteractive || options.toolkit) {
             configMethod = "native";
         }
         else if (isFull && options.url) {
@@ -964,10 +920,14 @@ async function manualIntegrationFlow(session, options, target) {
                     },
                 },
                 response: result.data,
+                ...saveIntegrationJsonExtras(result),
             });
             return;
         }
-        saveSpinner?.succeed("Integration created");
+        saveSpinner?.succeed(saveIntegrationSuccessLabel(result));
+        if (result.suggestion) {
+            log(_jsx(StatusLine, { kind: "info", label: result.suggestion }));
+        }
         log(_jsx(IntegrationCreatedView, { name: integrationName, serverUrl: serverUrl, toolCount: selectedToolNames.length, toolNames: selectedToolNames }));
     }
     catch (error) {
@@ -985,39 +945,6 @@ async function nativeIntegrationFlow(session, options, target) {
     const isNonInteractive = isFull ||
         !!(options.toolkit && options.name && (options.tools || options.allTools));
     const noPrompt = isJsonMode() || isFull;
-    // ── Composio API Key (auto-fetched from backend, prompt as fallback) ──
-    let apiKey = options.composioApiKey || process.env.COMPOSIO_API_KEY || "";
-    if (!apiKey) {
-        const fetchedKey = await fetchComposioApiKey(session);
-        if (fetchedKey) {
-            apiKey = fetchedKey;
-            if (!isJsonMode()) {
-                log(_jsx(StatusLine, { kind: "success", label: "Integration configuration loaded" }));
-            }
-        }
-        else {
-            if (noPrompt) {
-                const msg = "Integration API key not configured. Contact your administrator.";
-                if (isJsonMode()) {
-                    outputJsonError({ code: "CONFIG_ERROR", message: msg });
-                }
-                else {
-                    log(_jsx(ErrorDisplay, { message: msg, suggestion: "Pass --composio-api-key or have your administrator configure it." }));
-                }
-                return;
-            }
-            const { key } = await inquirer.prompt([
-                {
-                    type: "password",
-                    name: "key",
-                    message: "Integration API Key:",
-                    mask: "*",
-                    validate: (input) => input.trim().length > 0 || "API key is required",
-                },
-            ]);
-            apiKey = key.trim();
-        }
-    }
     // ── List & Select Toolkit ──
     let selectedToolkit = null;
     let toolkitSlug = options.toolkit || "";
@@ -1045,7 +972,7 @@ async function nativeIntegrationFlow(session, options, target) {
         let toolkits;
         let nextCursor;
         try {
-            const result = await listComposioToolkits(apiKey, {
+            const result = await listComposioToolkits(session, scope, {
                 limit: 50,
                 search: searchTerm,
             });
@@ -1054,20 +981,17 @@ async function nativeIntegrationFlow(session, options, target) {
             toolkitSpinner.succeed(`Found ${toolkits.length} toolkits`);
         }
         catch (error) {
-            toolkitSpinner.fail("Failed to fetch toolkits");
-            const msg = error instanceof Error ? error.message : String(error);
-            if (msg.includes("401") || msg.includes("Unauthorized") || msg.includes("invalid")) {
-                log(_jsx(ErrorDisplay, { message: "Invalid API key.", suggestion: "Contact your administrator for a valid key." }));
+            toolkitSpinner.fail(composioFailureLabel(error, "Failed to fetch toolkits"));
+            if (isJsonMode()) {
+                outputJsonError(composioFailureJson(error));
             }
             else {
-                log(_jsx(ErrorDisplay, { error: error, message: "Failed to fetch toolkits." }));
+                log(_jsx(ErrorDisplay, { error: error }));
             }
-            resetComposioClient();
             return;
         }
         if (toolkits.length === 0) {
-            log(_jsx(ErrorDisplay, { message: searchTerm ? `No toolkits found matching "${searchTerm}".` : "No toolkits found.", suggestion: searchTerm ? "Try a different search term." : "Verify your API key is valid." }));
-            resetComposioClient();
+            log(_jsx(ErrorDisplay, { message: searchTerm ? `No toolkits found matching "${searchTerm}".` : "No toolkits found.", suggestion: searchTerm ? "Try a different search term." : "Verify your `aui login` session is still valid." }));
             return;
         }
         // Load all pages upfront if user wants more, then present one list
@@ -1109,7 +1033,7 @@ async function nativeIntegrationFlow(session, options, target) {
                 const previousCount = toolkits.length;
                 const moreSpinner = startSpinner("Loading more toolkits...");
                 try {
-                    const more = await listComposioToolkits(apiKey, {
+                    const more = await listComposioToolkits(session, scope, {
                         limit: 50,
                         cursor: nextCursor,
                         search: searchTerm,
@@ -1137,7 +1061,7 @@ async function nativeIntegrationFlow(session, options, target) {
                 searchTerm = q;
                 const searchSpinner = startSpinner(q ? `Searching for "${q}"...` : "Fetching toolkits...");
                 try {
-                    const result = await listComposioToolkits(apiKey, { limit: 50, search: q });
+                    const result = await listComposioToolkits(session, scope, { limit: 50, search: q });
                     toolkits = result.items;
                     nextCursor = result.nextCursor;
                     searchSpinner.succeed(`Found ${toolkits.length} toolkits`);
@@ -1171,7 +1095,6 @@ async function nativeIntegrationFlow(session, options, target) {
             else {
                 log(_jsx(ErrorDisplay, { message: msg, suggestion: "Pass --name when using --full." }));
             }
-            resetComposioClient();
             return;
         }
         const defaultName = selectedToolkit
@@ -1206,11 +1129,10 @@ async function nativeIntegrationFlow(session, options, target) {
     // ── Step 5: Auth Scheme Selection + BYO Credentials ──
     let authCredentials;
     let selectedAuthScheme;
-    let selectedSchemeIsManaged;
     {
         let authInfo = null;
         try {
-            authInfo = await getComposioToolkitAuthInfo(apiKey, toolkitSlug);
+            authInfo = await getComposioToolkitAuthInfo(session, scope, toolkitSlug);
         }
         catch (err) {
             if (process.env.AUI_DEBUG) {
@@ -1231,7 +1153,6 @@ async function nativeIntegrationFlow(session, options, target) {
                     else {
                         log(_jsx(ErrorDisplay, { message: msg }));
                     }
-                    resetComposioClient();
                     return;
                 }
                 pickedScheme = found;
@@ -1257,14 +1178,13 @@ async function nativeIntegrationFlow(session, options, target) {
                 pickedScheme = chosen;
             }
             selectedAuthScheme = pickedScheme.scheme;
-            selectedSchemeIsManaged = pickedScheme.isManaged;
             // ── BYO credentials (only when scheme is not Composio-managed) ────────
             if (!pickedScheme.isManaged && pickedScheme.isOAuth) {
                 if (noPrompt) {
                     // Non-interactive: credentials file takes precedence over individual flags.
                     if (options.composioCredentialsFile) {
                         try {
-                            authCredentials = loadCredentialsFile(options.composioCredentialsFile);
+                            authCredentials = loadComposioCredentialsFile(options.composioCredentialsFile);
                         }
                         catch (err) {
                             const msg = err instanceof Error ? err.message : String(err);
@@ -1274,7 +1194,6 @@ async function nativeIntegrationFlow(session, options, target) {
                             else {
                                 log(_jsx(ErrorDisplay, { message: msg }));
                             }
-                            resetComposioClient();
                             return;
                         }
                     }
@@ -1293,7 +1212,6 @@ async function nativeIntegrationFlow(session, options, target) {
                         else {
                             log(_jsx(ErrorDisplay, { message: msg }));
                         }
-                        resetComposioClient();
                         return;
                     }
                 }
@@ -1321,11 +1239,10 @@ async function nativeIntegrationFlow(session, options, target) {
                             },
                         ]);
                         try {
-                            authCredentials = loadCredentialsFile(filePath.trim());
+                            authCredentials = loadComposioCredentialsFile(filePath.trim());
                         }
                         catch (err) {
                             log(_jsx(ErrorDisplay, { message: err instanceof Error ? err.message : String(err) }));
-                            resetComposioClient();
                             return;
                         }
                     }
@@ -1375,27 +1292,22 @@ async function nativeIntegrationFlow(session, options, target) {
         : startSpinner(`Connecting ${toolkitSlug}...`);
     let connectResult;
     try {
-        connectResult = await connectComposioToolkit(apiKey, composioUserId, toolkitSlug, {
+        connectResult = await connectComposioToolkit(session, scope, composioUserId, toolkitSlug, {
             authCredentials,
             authScheme: selectedAuthScheme,
-            isManaged: selectedSchemeIsManaged,
         });
         connectSpinner?.succeed(connectResult.redirectUrl
             ? "Authentication link ready"
             : `Already connected — account ${connectResult.id}`);
     }
     catch (error) {
-        connectSpinner?.fail("Failed to connect toolkit");
+        connectSpinner?.fail(composioFailureLabel(error, "Failed to connect toolkit"));
         if (isJsonMode()) {
-            outputJsonError({
-                code: "API_CLIENT_ERROR",
-                message: error instanceof Error ? error.message : String(error),
-            });
+            outputJsonError(composioFailureJson(error));
         }
         else {
-            log(_jsx(ErrorDisplay, { error: error, message: "Failed to connect toolkit." }));
+            log(_jsx(ErrorDisplay, { error: error }));
         }
-        resetComposioClient();
         return;
     }
     // ── Step 7: OAuth Authentication (if redirect required) ──
@@ -1415,7 +1327,6 @@ async function nativeIntegrationFlow(session, options, target) {
             else {
                 log(_jsx(ErrorDisplay, { message: msg, suggestion: `Visit: ${connectResult.redirectUrl}` }));
             }
-            resetComposioClient();
             return;
         }
         log(_jsxs(Box, { flexDirection: "column", marginY: 1, children: [_jsxs(Text, { color: "cyan", children: ["  ", "Opening browser for authentication..."] }), _jsxs(Text, { color: "gray", children: ["  ", "If the browser doesn't open, visit:", "\n", "  ", _jsx(Text, { color: "cyan", underline: true, children: connectResult.redirectUrl })] })] }));
@@ -1427,13 +1338,12 @@ async function nativeIntegrationFlow(session, options, target) {
         }
         const waitSpinner = startSpinner("Waiting for authentication (up to 2 minutes)...");
         try {
-            const connected = await waitForComposioConnection({ redirectUrl: connectResult.redirectUrl, connectionRequest: connectResult.connectionRequest }, 120000);
+            const connected = await waitForComposioConnection(session, scope, composioUserId, toolkitSlug, 120_000);
             waitSpinner.succeed(`Authenticated — account ${connected.id}`);
         }
-        catch (error) {
+        catch {
             waitSpinner.fail("Authentication timed out or failed");
             log(_jsx(ErrorDisplay, { message: "Authentication timed out.", suggestion: "Try again \u2014 make sure to complete the auth flow in the browser within 2 minutes." }));
-            resetComposioClient();
             return;
         }
     }
@@ -1446,33 +1356,25 @@ async function nativeIntegrationFlow(session, options, target) {
         : startSpinner(`Discovering tools for ${toolkitSlug}...`);
     let discoveredTools;
     try {
-        const result = await discoverComposioTools(apiKey, toolkitSlug);
+        const result = await discoverComposioTools(session, scope, composioUserId, toolkitSlug);
         discoveredTools = result.tools;
         if (discoveredTools.length === 0) {
             if (isJsonMode()) {
                 outputJsonError({ code: "API_CLIENT_ERROR", message: `No tools found for toolkit: ${toolkitSlug}` });
             }
             discoverSpinner?.fail("No tools found");
-            resetComposioClient();
             return;
         }
-        const totalLabel = result.totalItems
-            ? `${discoveredTools.length} of ${result.totalItems}`
-            : `${discoveredTools.length}`;
-        discoverSpinner?.succeed(`Discovered ${totalLabel} tools for ${toolkitSlug}`);
+        discoverSpinner?.succeed(`Discovered ${discoveredTools.length} tools for ${toolkitSlug}`);
     }
     catch (error) {
-        discoverSpinner?.fail("Discovery failed");
+        discoverSpinner?.fail(composioFailureLabel(error, "Discovery failed"));
         if (isJsonMode()) {
-            outputJsonError({
-                code: "API_CLIENT_ERROR",
-                message: `Discovery failed: ${error instanceof Error ? error.message : String(error)}`,
-            });
+            outputJsonError(composioFailureJson(error));
         }
         else {
-            log(_jsx(ErrorDisplay, { error: error, message: "Failed to discover tools." }));
+            log(_jsx(ErrorDisplay, { error: error }));
         }
-        resetComposioClient();
         return;
     }
     // ── Step 9: Select Tools ──
@@ -1489,7 +1391,6 @@ async function nativeIntegrationFlow(session, options, target) {
             else {
                 log(_jsx(StatusLine, { kind: "error", label: msg }));
             }
-            resetComposioClient();
             return;
         }
         selectedToolNames = requestedTools;
@@ -1507,7 +1408,6 @@ async function nativeIntegrationFlow(session, options, target) {
             else {
                 log(_jsx(ErrorDisplay, { message: msg, suggestion: suggestion }));
             }
-            resetComposioClient();
             return;
         }
         // Offer search before selecting if many tools
@@ -1538,16 +1438,14 @@ async function nativeIntegrationFlow(session, options, target) {
                     },
                 ]);
                 const searchSpinner = startSpinner(`Searching tools for "${toolSearch.trim()}"...`);
-                try {
-                    const searchResult = await discoverComposioTools(apiKey, toolkitSlug, {
-                        query: toolSearch.trim(),
-                    });
-                    toolsToShow = searchResult.tools;
-                    searchSpinner.succeed(`Found ${toolsToShow.length} matching tools`);
-                }
-                catch {
-                    searchSpinner.fail("Search failed, showing all tools");
-                }
+                // The new backend endpoint returns all tools for the (user, toolkit) pair
+                // — no server-side search — so we filter the already-discovered list
+                // locally rather than re-hitting the API.
+                const term = toolSearch.trim().toLowerCase();
+                const filtered = discoveredTools.filter((t) => t.name.toLowerCase().includes(term) ||
+                    (t.description || "").toLowerCase().includes(term));
+                searchSpinner.succeed(`Found ${filtered.length} matching tools`);
+                toolsToShow = filtered;
                 if (toolsToShow.length === 0) {
                     log(_jsx(StatusLine, { kind: "warning", label: "No tools match your search. Showing all tools." }));
                     toolsToShow = discoveredTools;
@@ -1592,7 +1490,6 @@ async function nativeIntegrationFlow(session, options, target) {
         ]);
         if (!confirm) {
             log(_jsx(StatusLine, { kind: "muted", label: "Cancelled." }));
-            resetComposioClient();
             return;
         }
     }
@@ -1613,7 +1510,7 @@ async function nativeIntegrationFlow(session, options, target) {
     let mcpServerUrl;
     let mcpServerId;
     try {
-        const provisioned = await getComposioServerUrl(apiKey, {
+        const provisioned = await getComposioServerUrl(session, scope, {
             composioUserId,
             toolkit: toolkitSlug,
             allowedTools: selectedToolNames,
@@ -1624,17 +1521,13 @@ async function nativeIntegrationFlow(session, options, target) {
         provisionSpinner?.succeed(`MCP server ready (${mcpServerId})`);
     }
     catch (error) {
-        provisionSpinner?.fail("Failed to provision MCP server");
+        provisionSpinner?.fail(composioFailureLabel(error, "Failed to provision MCP server"));
         if (isJsonMode()) {
-            outputJsonError({
-                code: "API_CLIENT_ERROR",
-                message: `Failed to provision Composio MCP server: ${error instanceof Error ? error.message : String(error)}`,
-            });
+            outputJsonError(composioFailureJson(error));
         }
         else {
-            log(_jsx(ErrorDisplay, { error: error, message: "Failed to provision Composio MCP server.", suggestion: "Re-run with AUI_DEBUG=1 to see the underlying Composio API call." }));
+            log(_jsx(ErrorDisplay, { error: error }));
         }
-        resetComposioClient();
         return;
     }
     // ── Step 12: Save Integration ──
@@ -1668,7 +1561,6 @@ async function nativeIntegrationFlow(session, options, target) {
             }
             saveSpinner?.fail("Failed to create integration");
             log(_jsx(ErrorDisplay, { message: result.error || "Unknown error" }));
-            resetComposioClient();
             return;
         }
         if (isJsonMode()) {
@@ -1691,11 +1583,14 @@ async function nativeIntegrationFlow(session, options, target) {
                     },
                 },
                 response: result.data,
+                ...saveIntegrationJsonExtras(result),
             });
-            resetComposioClient();
             return;
         }
-        saveSpinner?.succeed("Integration created");
+        saveSpinner?.succeed(saveIntegrationSuccessLabel(result));
+        if (result.suggestion) {
+            log(_jsx(StatusLine, { kind: "info", label: result.suggestion }));
+        }
         log(_jsx(NativeIntegrationCreatedView, { name: integrationName, toolkitSlug: toolkitSlug, toolCount: selectedToolNames.length, toolNames: selectedToolNames, serverUrl: mcpServerUrl, serverId: mcpServerId }));
     }
     catch (error) {
@@ -1708,6 +1603,5 @@ async function nativeIntegrationFlow(session, options, target) {
         saveSpinner?.fail("Failed to create integration");
         log(_jsx(ErrorDisplay, { error: error, message: "Failed to create integration." }));
     }
-    resetComposioClient();
 }
 //# sourceMappingURL=integration.js.map