aui-agent-builder 0.3.121 → 0.3.123

package/dist/commands/integration-test.d.ts

@@ -0,0 +1,77 @@
+/**
+ * `aui integration test` — live-call an integration endpoint from the CLI.
+ *
+ * Thin, fully non-interactive wrapper over the Apollo integration test
+ * endpoint:
+ *
+ *   POST /apollo-api/v1/integrations/test
+ *
+ * It makes the REAL HTTP call described by the request body (the same body
+ * you'd hand-write for `curl`), then returns:
+ *
+ *   - `test_data`            — the RAW response the endpoint returned.
+ *   - `parsed_test_response` — that raw response after the JS
+ *                              `response_parser` snippet runs against it
+ *                              (i.e. exactly what the agent's `json_ry`
+ *                              parser would extract at runtime).
+ *
+ * This is the programmatic replacement for running `curl` by hand against
+ * every endpoint while authoring an integration — and it shows, in one
+ * call, both the raw payload and what the configured parser pulls out of
+ * it.
+ *
+ * ─── Design ──────────────────────────────────────────────────────────────
+ *
+ * - **Always JSON.** The payload is meant to be consumed by tooling (and by
+ *   coding agents like Claude/Cursor), so output is ALWAYS a JSON envelope —
+ *   the `--json` flag is implied. Errors are JSON too.
+ * - **Fully non-interactive.** Every input is a flag; no prompts, ever. Safe
+ *   to run inside the E2B sandbox (`agent-builder-bff`).
+ * - **`--raw`** returns ONLY the raw endpoint response (`test_data`),
+ *   skipping the parsed projection — handy when you just want the upstream
+ *   payload.
+ * - **Auth.** Uses the normal CLI session (access token + org headers); the
+ *   gateway validates it and forwards Apollo's `x-api-key` + `x-aui-*`
+ *   claims — see `api-client/apollo-client.ts`.
+ *
+ * ─── Input ───────────────────────────────────────────────────────────────
+ *
+ * The request body matches the integration's own configuration (the fields
+ * the user edits in the local `.aui.json` integration file): `url`,
+ * `method`, `request_body`, `authentication`, `response_parser`. Provide it
+ * either as one JSON blob via `--params` (recommended — copy it straight
+ * from the integration file) or piecemeal via the granular flags, which
+ * override matching keys from `--params`.
+ *
+ * Examples:
+ *   aui integration test --params '{"url":"https://api.perplexity.ai/chat/completions","method":"POST","request_body":{...},"authentication":{"type":"BEARER_TOKEN","token":"pplx-..."},"response_parser":"..."}'
+ *   aui integration test --params-file ./body.json
+ *   aui integration test --url https://api.example.com/v1/search --method POST \
+ *       --request-body '{"q":"tokyo"}' --auth-type BEARER_TOKEN --auth-token sk-... --raw
+ */
+export interface IntegrationTestOptions {
+    /** Full request body as a JSON string (url/method/request_body/…). */
+    params?: string;
+    /** Path to a file containing the request body JSON. */
+    paramsFile?: string;
+    /** Integration endpoint URL (overrides params.url). */
+    url?: string;
+    /** HTTP method (overrides params.method). */
+    method?: string;
+    /** Request body JSON string (overrides params.request_body). */
+    requestBody?: string;
+    /** Query params JSON string (overrides params.query_params). */
+    queryParams?: string;
+    /** Extra headers JSON string (overrides params.headers). */
+    headers?: string;
+    /** Authentication scheme, e.g. BEARER_TOKEN, API_KEY, BASIC, NONE. */
+    authType?: string;
+    /** Authentication token (used with --auth-type BEARER_TOKEN / API_KEY). */
+    authToken?: string;
+    /** JS response-parser snippet (overrides params.response_parser). */
+    responseParser?: string;
+    /** Return only the raw endpoint response (test_data). */
+    raw?: boolean;
+}
+export declare function integrationTest(options?: IntegrationTestOptions): Promise<void>;
+//# sourceMappingURL=integration-test.d.ts.map

package/dist/commands/integration-test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"integration-test.d.ts","sourceRoot":"","sources":["../../src/commands/integration-test.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkDG;AA6BH,MAAM,WAAW,sBAAsB;IACrC,sEAAsE;IACtE,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,uDAAuD;IACvD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,uDAAuD;IACvD,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,6CAA6C;IAC7C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,gEAAgE;IAChE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gEAAgE;IAChE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,4DAA4D;IAC5D,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,sEAAsE;IACtE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,2EAA2E;IAC3E,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,qEAAqE;IACrE,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,yDAAyD;IACzD,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAkHD,wBAAsB,eAAe,CACnC,OAAO,GAAE,sBAA2B,GACnC,OAAO,CAAC,IAAI,CAAC,CAyEf"}

package/dist/commands/integration-test.js

@@ -0,0 +1,207 @@
+/**
+ * `aui integration test` — live-call an integration endpoint from the CLI.
+ *
+ * Thin, fully non-interactive wrapper over the Apollo integration test
+ * endpoint:
+ *
+ *   POST /apollo-api/v1/integrations/test
+ *
+ * It makes the REAL HTTP call described by the request body (the same body
+ * you'd hand-write for `curl`), then returns:
+ *
+ *   - `test_data`            — the RAW response the endpoint returned.
+ *   - `parsed_test_response` — that raw response after the JS
+ *                              `response_parser` snippet runs against it
+ *                              (i.e. exactly what the agent's `json_ry`
+ *                              parser would extract at runtime).
+ *
+ * This is the programmatic replacement for running `curl` by hand against
+ * every endpoint while authoring an integration — and it shows, in one
+ * call, both the raw payload and what the configured parser pulls out of
+ * it.
+ *
+ * ─── Design ──────────────────────────────────────────────────────────────
+ *
+ * - **Always JSON.** The payload is meant to be consumed by tooling (and by
+ *   coding agents like Claude/Cursor), so output is ALWAYS a JSON envelope —
+ *   the `--json` flag is implied. Errors are JSON too.
+ * - **Fully non-interactive.** Every input is a flag; no prompts, ever. Safe
+ *   to run inside the E2B sandbox (`agent-builder-bff`).
+ * - **`--raw`** returns ONLY the raw endpoint response (`test_data`),
+ *   skipping the parsed projection — handy when you just want the upstream
+ *   payload.
+ * - **Auth.** Uses the normal CLI session (access token + org headers); the
+ *   gateway validates it and forwards Apollo's `x-api-key` + `x-aui-*`
+ *   claims — see `api-client/apollo-client.ts`.
+ *
+ * ─── Input ───────────────────────────────────────────────────────────────
+ *
+ * The request body matches the integration's own configuration (the fields
+ * the user edits in the local `.aui.json` integration file): `url`,
+ * `method`, `request_body`, `authentication`, `response_parser`. Provide it
+ * either as one JSON blob via `--params` (recommended — copy it straight
+ * from the integration file) or piecemeal via the granular flags, which
+ * override matching keys from `--params`.
+ *
+ * Examples:
+ *   aui integration test --params '{"url":"https://api.perplexity.ai/chat/completions","method":"POST","request_body":{...},"authentication":{"type":"BEARER_TOKEN","token":"pplx-..."},"response_parser":"..."}'
+ *   aui integration test --params-file ./body.json
+ *   aui integration test --url https://api.example.com/v1/search --method POST \
+ *       --request-body '{"q":"tokyo"}' --auth-type BEARER_TOKEN --auth-token sk-... --raw
+ */
+import { getConfig, loadSession, loadProjectConfig, findProjectRoot, } from "../config/index.js";
+import { ApolloClient, } from "../api-client/apollo-client.js";
+import { getTracer, SpanStatusCode, } from "../telemetry.js";
+import { AuthenticationError, ConfigError, ValidationError, } from "../errors/index.js";
+import { outputJson, setJsonMode, stderrLog, } from "../utils/json-output.js";
+function parseJsonOption(value, flag) {
+    if (value === undefined)
+        return undefined;
+    try {
+        return JSON.parse(value);
+    }
+    catch (e) {
+        throw new ValidationError(`Invalid JSON passed to ${flag}: ${e instanceof Error ? e.message : String(e)}`, {
+            suggestion: `Pass valid JSON to ${flag}. Wrap it in single quotes so your shell doesn't mangle it.`,
+        });
+    }
+}
+/** Build the ApolloClient from the current session + project scope. */
+function buildClient() {
+    const projectRoot = findProjectRoot() || undefined;
+    const projectConfig = loadProjectConfig(projectRoot);
+    const config = getConfig(projectRoot);
+    const session = loadSession();
+    if (!config.authToken) {
+        throw new AuthenticationError("Not logged in.", {
+            suggestion: "Run `aui login` first.",
+        });
+    }
+    const organizationId = projectConfig?.organization_id || config.organizationId;
+    if (!organizationId) {
+        throw new ConfigError("No organization could be resolved.", {
+            suggestion: "Run `aui login` (and select an organization), or run inside an imported agent project so .auirc carries organization_id.",
+        });
+    }
+    return new ApolloClient({
+        authToken: config.authToken,
+        organizationId,
+        accountId: projectConfig?.account_id || config.accountId || "",
+        userId: session?.user_id,
+        environment: config.environment,
+    });
+}
+/**
+ * Assemble the test request body from `--params` (base) plus any granular
+ * flags (which take precedence). Validates that a URL is present.
+ */
+function assembleBody(options, fileContents) {
+    // Base: --params-file wins over --params if both are given (file is the
+    // more explicit source); granular flags then override individual keys.
+    const baseRaw = fileContents ?? options.params;
+    const base = parseJsonOption(baseRaw, fileContents ? "--params-file" : "--params") ?? {};
+    if (typeof base !== "object" || Array.isArray(base)) {
+        throw new ValidationError("The request body must be a JSON object.", { suggestion: 'Example: --params \'{"url":"https://...","method":"POST"}\'' });
+    }
+    const body = { ...base };
+    if (options.url)
+        body.url = options.url;
+    if (options.method)
+        body.method = options.method;
+    if (options.requestBody !== undefined) {
+        body.request_body = parseJsonOption(options.requestBody, "--request-body");
+    }
+    if (options.queryParams !== undefined) {
+        body.query_params = parseJsonOption(options.queryParams, "--query-params");
+    }
+    if (options.headers !== undefined) {
+        body.headers = parseJsonOption(options.headers, "--headers");
+    }
+    if (options.authType) {
+        body.authentication = {
+            ...(typeof body.authentication === "object" && body.authentication
+                ? body.authentication
+                : {}),
+            type: options.authType,
+            ...(options.authToken ? { token: options.authToken } : {}),
+        };
+    }
+    else if (options.authToken && body.authentication) {
+        body.authentication = { ...body.authentication, token: options.authToken };
+    }
+    if (options.responseParser !== undefined) {
+        body.response_parser = options.responseParser;
+    }
+    if (!body.url || typeof body.url !== "string") {
+        throw new ValidationError("Missing required value: url.", {
+            suggestion: 'Provide it via --params \'{"url":"https://..."}\' or --url <endpoint>.',
+        });
+    }
+    if (!body.method)
+        body.method = "GET";
+    return body;
+}
+export async function integrationTest(options = {}) {
+    // JSON-only command: its payload (raw + parsed endpoint response) is meant
+    // for tooling / coding agents, not a TTY. Force JSON mode so output is
+    // always a JSON envelope, regardless of whether `--json` was passed.
+    setJsonMode(true);
+    const tracer = getTracer();
+    await tracer.startActiveSpan("aui.integration.test", async (span) => {
+        try {
+            let fileContents;
+            if (options.paramsFile) {
+                const fs = await import("node:fs");
+                try {
+                    fileContents = fs.readFileSync(options.paramsFile, "utf-8");
+                }
+                catch (e) {
+                    throw new ValidationError(`Could not read --params-file: ${options.paramsFile}`, {
+                        suggestion: `Check the path exists and is readable (${e instanceof Error ? e.message : String(e)}).`,
+                    });
+                }
+            }
+            const body = assembleBody(options, fileContents);
+            span.setAttribute("integration.url", body.url);
+            span.setAttribute("integration.method", body.method || "GET");
+            span.setAttribute("integration.has_parser", !!body.response_parser);
+            span.setAttribute("integration.raw", !!options.raw);
+            const client = buildClient();
+            stderrLog(`Calling integration endpoint: ${body.method} ${body.url} ...`);
+            const result = await client.testIntegration(body);
+            span.setStatus({ code: SpanStatusCode.OK });
+            if (options.raw) {
+                // Only the raw upstream response. Fall back to the whole envelope if
+                // the endpoint didn't split it out under `test_data`.
+                const rawData = result && typeof result === "object" && "test_data" in result
+                    ? result.test_data
+                    : result;
+                outputJson({
+                    url: body.url,
+                    method: body.method,
+                    raw: true,
+                    test_data: rawData,
+                });
+                return;
+            }
+            // Default: both the raw response and the parser projection, mirroring
+            // the endpoint's own shape so callers can compare them.
+            outputJson({
+                url: body.url,
+                method: body.method,
+                test_data: result?.test_data ?? null,
+                parsed_test_response: result?.parsed_test_response ?? null,
+            });
+        }
+        catch (error) {
+            const msg = error instanceof Error ? error.message : String(error);
+            span.setStatus({ code: SpanStatusCode.ERROR, message: msg });
+            span.recordException(error instanceof Error ? error : new Error(msg));
+            throw error;
+        }
+        finally {
+            span.end();
+        }
+    });
+}
+//# sourceMappingURL=integration-test.js.map

package/dist/commands/integration-test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"integration-test.js","sourceRoot":"","sources":["../../src/commands/integration-test.tsx"],"names":[],"mappings":"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"}

package/dist/commands/integration-toolkits.d.ts

@@ -0,0 +1,35 @@
+/**
+ * `aui integration toolkits` — list native (Composio) toolkits.
+ *
+ * Wraps the same endpoint the Composio dashboard hits:
+ *   GET https://backend.composio.dev/api/v3.1/toolkits?sort_by=usage&limit=<n>
+ *
+ * Designed to be safely consumed from the E2B sandbox (`agent-builder-bff`)
+ * as well as from a developer's terminal:
+ *
+ *   - Fully non-interactive: no prompts, no Ink layouts that block on input.
+ *   - `--json` emits the canonical structured envelope and exits with the
+ *     standard CLI exit code (0 success, 2 validation, 1 runtime).
+ *   - `--all` follows the pagination cursor and returns every toolkit in one
+ *     call (otherwise a single page is returned).
+ *   - The Composio API key is the same one already used for native MCP
+ *     integrations. Resolution precedence:
+ *       1. `--composio-api-key <key>`
+ *       2. `COMPOSIO_API_KEY` env var
+ *       3. Backend-issued key fetched via `fetchComposioApiKey` (requires
+ *          an authenticated AUI session)
+ *
+ * Examples:
+ *   aui integration toolkits
+ *   aui integration toolkits --search notion --json
+ *   aui integration toolkits --all --json
+ */
+export interface IntegrationToolkitsOptions {
+    search?: string;
+    limit?: string;
+    cursor?: string;
+    composioApiKey?: string;
+    all?: boolean;
+}
+export declare function integrationToolkits(options?: IntegrationToolkitsOptions): Promise<void>;
+//# sourceMappingURL=integration-toolkits.d.ts.map

package/dist/commands/integration-toolkits.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"integration-toolkits.d.ts","sourceRoot":"","sources":["../../src/commands/integration-toolkits.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAyBH,MAAM,WAAW,0BAA0B;IACzC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAOD,wBAAsB,mBAAmB,CACvC,OAAO,GAAE,0BAA+B,GACvC,OAAO,CAAC,IAAI,CAAC,CA0Ff"}

package/dist/commands/integration-toolkits.js

@@ -0,0 +1,101 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { render, Box, Text } from "ink";
+import { getAuthenticatedSession, fetchComposioApiKey, listComposioToolkits, } from "../services/integration.service.js";
+import { Header, Section, StatusLine, KeyValue, Spinner, } from "../ui/components/index.js";
+import { colors } from "../ui/theme.js";
+import { isJsonMode, outputJson, stderrLog, } from "../utils/json-output.js";
+import { ValidationError, ConfigError, CLIError } from "../errors/index.js";
+function log(node) {
+    const { unmount } = render(node);
+    unmount();
+}
+export async function integrationToolkits(options = {}) {
+    const limit = options.limit ? parseInt(options.limit, 10) : 50;
+    if (Number.isNaN(limit) || limit <= 0) {
+        throw new ValidationError("Invalid --limit value", {
+            suggestion: "Pass a positive integer (e.g. --limit 100).",
+        });
+    }
+    const search = options.search?.trim() || undefined;
+    // ── Resolve API key ──
+    let apiKey = (options.composioApiKey && options.composioApiKey.trim()) ||
+        process.env.COMPOSIO_API_KEY ||
+        "";
+    if (!apiKey) {
+        if (isJsonMode()) {
+            stderrLog("Fetching integration configuration...");
+        }
+        const session = await getAuthenticatedSession();
+        const fetched = await fetchComposioApiKey(session);
+        if (fetched)
+            apiKey = fetched;
+    }
+    if (!apiKey) {
+        throw new ConfigError("Composio API key not available.", {
+            suggestion: "Pass --composio-api-key, set COMPOSIO_API_KEY, or have your administrator configure it on the backend.",
+        });
+    }
+    // ── Fetch ──
+    if (isJsonMode()) {
+        stderrLog(`Fetching toolkits from Composio${search ? ` (search="${search}")` : ""}${options.all ? " [all pages]" : ""}...`);
+    }
+    let spinner = null;
+    if (!isJsonMode()) {
+        spinner = render(_jsx(Spinner, { label: "Fetching toolkits from Composio..." }));
+    }
+    try {
+        const toolkits = [];
+        let nextCursor = options.cursor;
+        do {
+            const result = await listComposioToolkits(apiKey, {
+                search,
+                limit,
+                cursor: nextCursor,
+            });
+            toolkits.push(...result.items);
+            nextCursor = result.nextCursor;
+        } while (options.all && nextCursor);
+        spinner?.unmount();
+        if (isJsonMode()) {
+            outputJson({
+                search: search ?? null,
+                count: toolkits.length,
+                next_cursor: options.all ? null : (nextCursor ?? null),
+                toolkits: toolkits.map((tk) => ({
+                    slug: tk.slug,
+                    name: tk.name,
+                    description: tk.description ?? null,
+                    tools_count: tk.toolsCount ?? null,
+                    no_auth: tk.isNoAuth ?? null,
+                    auth_schemes: tk.authSchemes ?? [],
+                })),
+            });
+            return;
+        }
+        renderToolkitsView(toolkits, search, options.all ? undefined : nextCursor);
+    }
+    catch (err) {
+        spinner?.unmount();
+        if (err instanceof CLIError)
+            throw err;
+        throw new CLIError(`Failed to fetch Composio toolkits: ${err instanceof Error ? err.message : String(err)}`, {
+            code: "API_CLIENT_ERROR",
+            cause: err,
+            suggestion: "Verify the Composio API key has access to the toolkit directory.",
+        });
+    }
+}
+function renderToolkitsView(toolkits, search, nextCursor) {
+    log(_jsx(Box, { flexDirection: "column", paddingX: 1, children: _jsx(Header, { title: "Composio Toolkits", subtitle: `${toolkits.length} toolkit(s)${search ? `  ·  search="${search}"` : ""}` }) }));
+    if (toolkits.length === 0) {
+        log(_jsx(StatusLine, { kind: "warning", label: search
+                ? `No toolkits found matching "${search}".`
+                : "No toolkits returned." }));
+        return;
+    }
+    log(_jsx(Box, { flexDirection: "column", paddingX: 1, children: _jsx(Section, { title: `Toolkits (${toolkits.length})`, children: toolkits.map((tk, i) => (_jsxs(Box, { flexDirection: "column", marginBottom: i < toolkits.length - 1 ? 1 : 0, children: [_jsx(Text, { bold: true, color: colors.brand, children: tk.slug }), tk.name && tk.name !== tk.slug && (_jsx(KeyValue, { label: "Name", value: tk.name })), tk.toolsCount !== undefined && (_jsx(KeyValue, { label: "Tools", value: String(tk.toolsCount) })), tk.isNoAuth !== undefined && (_jsx(KeyValue, { label: "Auth", value: tk.isNoAuth ? "none" : "required" })), tk.description && (_jsx(Box, { marginLeft: 2, children: _jsx(Text, { color: colors.muted, children: tk.description }) }))] }, tk.slug || `toolkit-${i}`))) }) }));
+    if (nextCursor) {
+        log(_jsx(Box, { paddingX: 1, children: _jsx(StatusLine, { kind: "info", label: `More toolkits available — pass --all to fetch everything, or --cursor ${nextCursor}.` }) }));
+    }
+}
+//# sourceMappingURL=integration-toolkits.js.map

package/dist/commands/integration-toolkits.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"integration-toolkits.js","sourceRoot":"","sources":["../../src/commands/integration-toolkits.tsx"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -24,11 +24,14 @@ import { addIntegration } from "./commands/add-integration.js";
 import { apolloMenu, apolloCreateTask, apolloSendMessage, apolloRerun, apolloTrace, } from "./commands/apollo.js";
 import { integration, integrationCreate, integrationDiscover, } from "./commands/integration.js";
 import { integrationTools } from "./commands/integration-tools.js";
+import { integrationToolkits } from "./commands/integration-toolkits.js";
+import { integrationTest } from "./commands/integration-test.js";
 import { curl } from "./commands/curl.js";
 import { versionMenu, versionList, versionCreate, versionGet, versionPublish, versionActivate, versionArchive, versionUpdate, } from "./commands/version.js";
 import { versionSnapshotMenu, versionSnapshotList, versionSnapshotGet, versionSnapshotDiff, } from "./commands/version-snapshot.js";
 import { initUpdateCheck, printUpdateBannerOnExit, } from "./utils/update-notifier.js";
-import { setJsonMode } from "./utils/json-output.js";
+import { setJsonMode, outputJson } from "./utils/json-output.js";
+import { serializeCommand, resolveCommandFromArgv, } from "./utils/help-json.js";
 import { enableCapture, flushCapture } from "./utils/request-capture.js";
 import { createRequire } from "module";
 import { randomUUID } from "node:crypto";
@@ -179,15 +182,38 @@ program
 \x1b[31m\x1b[1m  Widgets\x1b[0m
     widget generate <TOOL>   Create or modify a tool's widget
 
+\x1b[36m\x1b[1m  Integrations — MCP (manual) & Composio (native)\x1b[0m
+    integration                      Interactive menu (create / discover)
+    add-integration                  Guided add of an integration (API, RAG, or MCP)
+
+    \x1b[1mDiscovery (non-interactive, --json)\x1b[0m
+    integration toolkits             List native Composio toolkits
+                                       [--search <q>] [--all] [--limit <n>] [--cursor <c>] [--json]
+    integration tools --slugs <A,B>  Fetch Composio tool descriptors by slug
+                                       [--toolkit-versions <v>] [--limit <n>] [--cursor <c>] [--json]
+    integration discover --url <url> Discover tools from a manual MCP server
+                                       [--auth-type token --auth-token <tok>] [--json]
+
+    \x1b[1mCreate (fully non-interactive with --full)\x1b[0m
+    integration create --full --name <n> --url <mcp-url> --all-tools
+                                     Manual MCP integration (your own server)
+                                       [--auth-type token --auth-token <tok>] [--tools a,b]
+    integration create --full --name <n> --toolkit <slug> --all-tools
+                                     Native Composio integration (toolkit from the directory)
+                                       [--composio-api-key <key>] [--tools a,b]
+                                       (scope: [--organization-id] [--account-id] [--network-id] [--version-id])
+
+    \x1b[1mTest (always JSON, non-interactive)\x1b[0m
+    integration test --params '<json>'
+                                     Live-call an endpoint → raw response + parser projection
+                                       --params has url/method/request_body/authentication/response_parser
+                                       (or use --url/--method/--request-body/--auth-type/--auth-token/--response-parser)
+                                       [--raw] returns only the raw response (test_data)
+
 \x1b[34m\x1b[1m  Configuration\x1b[0m
     account                  Manage accounts (projects)
     env [environment]        Show or switch environment
     pull-schema              Fetch domain schemas from backend
-    add-integration          Add an integration (API, RAG, or MCP)
-    integration              Create/manage MCP integrations
-    integration create       Create MCP integration (manual or native)
-    integration discover     Discover tools from an MCP server
-    integration tools        Fetch Composio tool descriptors by slug (non-interactive, supports --json)
     rag                      Manage RAG knowledge bases and files
 
 \x1b[37m\x1b[1m  Tools\x1b[0m
@@ -464,7 +490,7 @@ program
 const integrationCmd = program
     .command("integration")
     .alias("integrations")
-    .description("Create and manage MCP integrations — create, discover, tools")
+    .description("Create and manage MCP integrations — create, discover, tools, toolkits, test")
     .action(async () => {
     try {
         await integration();
@@ -473,6 +499,46 @@ const integrationCmd = program
         await handleError(e);
     }
 });
+// The CLI's custom root `formatHelp` only renders usage/description/options,
+// so subcommands wouldn't otherwise appear under `aui integration --help`.
+// Append a detailed, flag-level listing (Commander concatenates it after the
+// formatted help, same mechanism the root + apollo help use).
+integrationCmd.addHelpText("after", `
+\x1b[1mCommands\x1b[0m
+
+  \x1b[1mDiscovery (non-interactive, --json)\x1b[0m
+  toolkits          List native (Composio) toolkits
+                      [--search <q>] [--all] [--limit <n>] [--cursor <c>] [--composio-api-key <key>] [--json]
+  tools             Fetch Composio tool descriptors by slug
+                      --slugs <SLUG_A,SLUG_B> [--toolkit-versions <v>] [--limit <n>] [--cursor <c>] [--composio-api-key <key>] [--json]
+  discover          Discover tools exposed by a manual MCP server
+                      --url <mcp-url> [--auth-type none|token] [--auth-token <tok>]
+                      [--organization-id <id>] [--account-id <id>] [--network-id <id>] [--json]
+
+  \x1b[1mCreate (fully non-interactive with --full)\x1b[0m
+  create            Create an MCP integration. Manual (your own MCP server) or native (Composio toolkit).
+                      Manual:  --name <n> --url <mcp-url> (--tools a,b | --all-tools) --full
+                               [--auth-type token --auth-token <tok>] [--description <d>]
+                      Native:  --name <n> --toolkit <slug> (--tools a,b | --all-tools) --full
+                               [--composio-api-key <key>]
+                      Scope:   [--organization-id <id>] [--account-id <id>] [--network-id <id>]
+                               [--network-category-id <id>] [--version-id <id>]
+                      --full makes it skip every prompt (org/account/agent + confirm); missing
+                      required flags fail with a JSON validation error instead of prompting.
+                      Native auth (OAuth) still opens a browser unless the toolkit is no-auth.
+
+  \x1b[1mTest (always JSON, non-interactive)\x1b[0m
+  test              Live-call an integration endpoint: real HTTP request → returns the RAW
+                    response (test_data) AND what the response_parser extracts (parsed_test_response).
+                      --params '<json>'  (full body: url, method, request_body, authentication, response_parser)
+                      --params-file <path>
+                      or granular: --url <u> --method <M> --request-body '<json>'
+                                   --auth-type BEARER_TOKEN --auth-token <tok> --response-parser '<js>'
+                      [--query-params '<json>'] [--headers '<json>'] [--raw]
+                      --raw returns ONLY the raw response (test_data). Replaces hand-running curl per endpoint.
+
+\x1b[90m  Run aui integration <command> --help for the full options of each command.\x1b[0m
+`);
 integrationCmd
     .command("create")
     .description("Create a new MCP integration (interactive or non-interactive)")
@@ -538,6 +604,47 @@ integrationCmd
         await handleError(e);
     }
 });
+integrationCmd
+    .command("toolkits")
+    .description("List native (Composio) toolkits (fully non-interactive; supports --json)")
+    .option("--search <query>", "Filter toolkits by search term")
+    .option("--all", "Follow pagination and return every toolkit (otherwise a single page)")
+    .option("--limit <n>", "Page size (default: 50)", "50")
+    .option("--cursor <cursor>", "Pagination cursor")
+    .option("--composio-api-key <key>", "Override Composio API key (otherwise: COMPOSIO_API_KEY env var or backend-issued key)")
+    .action(async (options) => {
+    try {
+        await integrationToolkits(options);
+    }
+    catch (e) {
+        await handleError(e);
+    }
+});
+integrationCmd
+    .command("test")
+    .description("Live-call an integration endpoint and return the raw response + the parser projection (always JSON; fully non-interactive)")
+    // Plain `--option` (not requiredOption) so a missing/invalid body surfaces
+    // through our ValidationError → JSON error envelope instead of Commander's
+    // pre-action exit. Same rationale as `integration tools` / `apollo send-message`.
+    .option("--params <json>", 'Full request body as a JSON string — the integration\'s own config fields: {"url","method","request_body","authentication","response_parser"}. Copy it straight from the integration .aui.json file.')
+    .option("--params-file <path>", "Read the request body JSON from a file instead of --params (file wins if both are given).")
+    .option("--url <url>", "Integration endpoint URL (overrides params.url)")
+    .option("--method <method>", "HTTP method: GET, POST, PATCH, … (overrides params.method; default GET)")
+    .option("--request-body <json>", "Request body as a JSON string (overrides params.request_body)")
+    .option("--query-params <json>", "Query params as a JSON string (overrides params.query_params)")
+    .option("--headers <json>", "Extra request headers as a JSON string (overrides params.headers)")
+    .option("--auth-type <type>", "Auth scheme: BEARER_TOKEN, API_KEY, BASIC, NONE (overrides params.authentication.type)")
+    .option("--auth-token <token>", "Auth token/secret used with --auth-type")
+    .option("--response-parser <js>", "JS snippet run against `response` (overrides params.response_parser)")
+    .option("--raw", "Return ONLY the raw endpoint response (test_data), skipping the parser projection")
+    .action(async (options) => {
+    try {
+        await integrationTest(options);
+    }
+    catch (e) {
+        await handleError(e);
+    }
+});
 // ─── apollo (runtime messaging) ───
 //
 // Four commands wrapping the Apollo runtime endpoints (create task / send
@@ -998,6 +1105,24 @@ process.on("beforeExit", shutdown);
 //                                          no-op; commands hang
 //                                          straight off the session.
 // So `aui login` and `aui --version` keep working exactly as before.
+// `aui --help --json` (and `aui <command> --help --json`): emit the command
+// tree as a structured JSON envelope instead of the human help text. Handled
+// BEFORE `program.parse()` because Commander prints its own help and exits on
+// `--help`/`-h`, which would otherwise pre-empt this. Scoped to the deepest
+// command named in argv so subcommand help is JSON-serializable too.
+const argvTokens = process.argv.slice(2);
+const wantsHelp = argvTokens.includes("--help") || argvTokens.includes("-h");
+const wantsJson = argvTokens.includes("--json");
+if (wantsHelp && wantsJson) {
+    setJsonMode(true);
+    const target = resolveCommandFromArgv(program, argvTokens);
+    outputJson({
+        name: program.name(),
+        version: pkg.version,
+        command: serializeCommand(target),
+    });
+    process.exit(0);
+}
 withSessionContext(() => withAgentContext(() => program.parse()));
 // Register exit handler AFTER parse so it fires after ink's cleanup.
 // The banner appears below all command output via process.stdout.write().