@andreprado/agentkit 0.1.0-alpha.17 → 0.1.0-alpha.19

package/src/cli/commands/channels.ts

@@ -14,8 +14,9 @@ type DeployState = LocalDeployState;
 type CloudChannel = {
   id: string;
   name: string;
-  type: "website" | "telegram" | "whatsapp";
-  provider: "agentkit" | "telegram" | "zapster" | "meta";
+  type: "website" | "telegram" | "whatsapp" | "discord";
+  provider: "agentkit" | "telegram" | "zapster" | "meta" | "discord";
+  mode?: "interactions" | "bot";
   status: string;
   webhook_url: string;
   required_secrets: Array<{ name: string; status: string }>;
@@ -128,6 +129,7 @@ export async function handleChannelsCommand(args: ParsedArgs): Promise<void> {
         name: channel.name,
         type: channel.type,
         provider: channel.provider,
+        ...(channel.type === "discord" ? { mode: channel.mode } : {}),
         status: "local_config",
         webhook_url: "",
         required_secrets: channel.secrets.map((name) => ({ name, status: "missing" })),
@@ -140,11 +142,11 @@ export async function handleChannelsCommand(args: ParsedArgs): Promise<void> {
     const type = first;
     const name = second;
 
-    if (!type || !name || (type !== "website" && type !== "telegram" && type !== "whatsapp")) {
-      throw new Error("Usage: agentkit channels add <website|telegram|whatsapp> <name> [--provider zapster|meta]");
+    if (!type || !name || (type !== "website" && type !== "telegram" && type !== "whatsapp" && type !== "discord")) {
+      throw new Error("Usage: agentkit channels add <website|telegram|whatsapp|discord> <name> [--provider zapster|meta] [--mode interactions|bot]");
     }
 
-    const response = await createHostedChannel(type, name, args.flags.provider, args.flags.api);
+    const response = await createHostedChannel(type, name, args.flags.provider, args.flags.mode, args.flags.api);
     printChannelStatus(response.channel);
     printSecretRepairHint(response.channel);
     return;
@@ -154,11 +156,11 @@ export async function handleChannelsCommand(args: ParsedArgs): Promise<void> {
     const type = first;
     const name = second;
 
-    if (!type || !name || (type !== "website" && type !== "telegram" && type !== "whatsapp")) {
-      throw new Error("Usage: agentkit channels connect <website|telegram|whatsapp> <name> [--provider zapster|meta]");
+    if (!type || !name || (type !== "website" && type !== "telegram" && type !== "whatsapp" && type !== "discord")) {
+      throw new Error("Usage: agentkit channels connect <website|telegram|whatsapp|discord> <name> [--provider zapster|meta] [--mode interactions|bot]");
     }
 
-    const created = await createHostedChannel(type, name, args.flags.provider, args.flags.api);
+    const created = await createHostedChannel(type, name, args.flags.provider, args.flags.mode, args.flags.api);
     let channel = created.channel;
     printChannelStatus(channel);
     printSecretRepairHint(channel);
@@ -192,6 +194,15 @@ export async function handleChannelsCommand(args: ParsedArgs): Promise<void> {
       return;
     }
 
+    if (channel.type === "discord") {
+      const smoke = await runConnectSmoke(() => runChannelSmoke(channel, args.flags.api, args.flags.message));
+      printDiscordHumanNextStep(channel);
+      if (!smoke) {
+        process.exitCode = 1;
+      }
+      return;
+    }
+
     if (channel.type === "whatsapp" && channel.provider === "zapster") {
       const smoke = await runConnectSmoke(() => runChannelSmoke(channel, args.flags.api, args.flags.message));
       console.log(`Next human step: paste ${channel.webhook_url} into ${channel.provider}'s webhook settings.`);
@@ -230,6 +241,8 @@ export async function handleChannelsCommand(args: ParsedArgs): Promise<void> {
       }
     } else if (channel.type === "whatsapp") {
       console.log(`Next step: paste this URL into ${channel.provider}'s webhook settings.`);
+    } else if (channel.type === "discord") {
+      printDiscordHumanNextStep(channel);
     } else {
       console.log(`Website endpoint: ${channel.webhook_url}`);
       console.log("Use this endpoint from the AgentKit website client or a signed server-to-server test.");
@@ -402,19 +415,22 @@ export async function handleChannelsCommand(args: ParsedArgs): Promise<void> {
 }
 
 async function createHostedChannel(
-  type: "website" | "telegram" | "whatsapp",
+  type: "website" | "telegram" | "whatsapp" | "discord",
   name: string,
   providerFlag: string | boolean | undefined,
+  modeFlag: string | boolean | undefined,
   apiFlag: string | boolean | undefined,
 ): Promise<{ channel: CloudChannel }> {
   const deployState = await readDeployStateRequired(process.cwd());
   const provider = channelProviderForCli(type, providerFlag);
   const localChannel = await readLocalChannelConfig(process.cwd(), type, provider, name);
+  const mode = discordModeForCli(type, modeFlag, localChannel);
   const payload = {
     name,
     type,
     provider,
-    secrets: localChannel?.secrets ?? defaultChannelSecretsForCli(type, provider),
+    ...(mode ? { mode } : {}),
+    secrets: localChannel?.secrets ?? defaultChannelSecretsForCli(type, provider, mode),
     ...(localChannel?.limits ? { limits: channelLimitsForApi(localChannel.limits) } : {}),
     ...(localChannel?.buffer ? { buffer: localChannel.buffer } : {}),
     ...(localChannel?.audio ? { audio: localChannel.audio } : {}),
@@ -641,6 +657,26 @@ function printTelegramHumanNextStep(channelName: string, botUsername: string | u
   console.log(`  Then run: npm run agentkit -- channels deliveries list ${channelName}`);
 }
 
+function printDiscordHumanNextStep(channel: CloudChannel): void {
+  console.log("");
+  console.log("Next human step:");
+
+  if (channel.mode === "bot") {
+    console.log("  Open the Discord Developer Portal for your application");
+    console.log("  Bot page: enable Message Content Intent");
+    console.log("  Installation page: install the app into your server with bot permissions");
+    console.log("  Grant the bot View Channel, Read Message History, and Send Messages in the channels it should answer");
+    console.log('  Send "hello" in an allowed server channel');
+    console.log(`  Then run: npm run agentkit -- channels deliveries list ${channel.name}`);
+    return;
+  }
+
+  console.log("  Open the Discord Developer Portal for your application");
+  console.log(`  Paste ${channel.webhook_url} into Interactions Endpoint URL`);
+  console.log("  Register a slash command with a string option named message, text, prompt, question, query, or input");
+  console.log(`  Then run: npm run agentkit -- channels deliveries list ${channel.name}`);
+}
+
 function isRecord(value: unknown): value is Record<string, unknown> {
   return Boolean(value && typeof value === "object" && !Array.isArray(value));
 }
@@ -682,12 +718,18 @@ function printChannelStatus(channel: CloudChannel): void {
   }
   console.log(`Type: ${channel.type}`);
   console.log(`Provider: ${channel.provider}`);
+  if (channel.type === "discord") {
+    console.log(`Mode: ${channel.mode ?? "interactions"}`);
+  }
   console.log(`Status: ${channel.status}`);
   if (channel.webhook_url) {
     console.log(`Webhook URL: ${channel.webhook_url}`);
   }
   console.log("Required secrets:");
-  if (channel.required_secrets.length === 0 && defaultChannelSecretsForCli(channel.type, channel.provider).length > 0) {
+  if (
+    channel.required_secrets.length === 0 &&
+    defaultChannelSecretsForCli(channel.type, channel.provider, channel.mode).length > 0
+  ) {
     console.log(
       `  control-plane channel metadata bug: required_secrets is empty for ${channel.type}/${channel.provider}`,
     );
@@ -708,7 +750,10 @@ function printChannelStatus(channel: CloudChannel): void {
 }
 
 function printSecretRepairHint(channel: CloudChannel): void {
-  if (channel.required_secrets.length > 0 || defaultChannelSecretsForCli(channel.type, channel.provider).length === 0) {
+  if (
+    channel.required_secrets.length > 0 ||
+    defaultChannelSecretsForCli(channel.type, channel.provider, channel.mode).length === 0
+  ) {
     return;
   }
 
@@ -718,7 +763,7 @@ function printSecretRepairHint(channel: CloudChannel): void {
 }
 
 function hasMissingRequiredSecrets(channel: CloudChannel): boolean {
-  const expected = defaultChannelSecretsForCli(channel.type, channel.provider);
+  const expected = defaultChannelSecretsForCli(channel.type, channel.provider, channel.mode);
 
   if (channel.required_secrets.length === 0 && expected.length > 0) {
     return true;
@@ -923,6 +968,10 @@ function channelProviderForCli(type: string, providerFlag: string | boolean | un
     return "telegram";
   }
 
+  if (type === "discord") {
+    return "discord";
+  }
+
   const provider = providerFlag ?? "zapster";
 
   if (provider !== "zapster" && provider !== "meta") {
@@ -932,7 +981,31 @@ function channelProviderForCli(type: string, providerFlag: string | boolean | un
   return provider;
 }
 
-function defaultChannelSecretsForCli(type: string, provider: string): string[] {
+function discordModeForCli(
+  type: string,
+  modeFlag: string | boolean | undefined,
+  localChannel: AgentChannel | null,
+): "interactions" | "bot" | undefined {
+  if (type !== "discord") {
+    if (modeFlag !== undefined) {
+      throw new Error("--mode is only supported for Discord channels.");
+    }
+
+    return undefined;
+  }
+
+  if (modeFlag !== undefined) {
+    if (modeFlag !== "interactions" && modeFlag !== "bot") {
+      throw new Error('Discord mode must be "interactions" or "bot".');
+    }
+
+    return modeFlag;
+  }
+
+  return localChannel?.type === "discord" ? localChannel.mode : "interactions";
+}
+
+function defaultChannelSecretsForCli(type: string, provider: string, mode?: "interactions" | "bot"): string[] {
   if (type === "website") {
     return ["AGENTKIT_WEBSITE_CHANNEL_TOKEN"];
   }
@@ -949,6 +1022,10 @@ function defaultChannelSecretsForCli(type: string, provider: string): string[] {
     return ["META_WHATSAPP_ACCESS_TOKEN", "META_WHATSAPP_APP_SECRET", "META_WHATSAPP_VERIFY_TOKEN"];
   }
 
+  if (type === "discord") {
+    return mode === "bot" ? ["DISCORD_BOT_TOKEN"] : ["DISCORD_PUBLIC_KEY"];
+  }
+
   return [];
 }
 
@@ -1012,6 +1089,54 @@ async function channelTestBody(
     });
   }
 
+  if (channel.type === "discord") {
+    if (channel.mode === "bot") {
+      return JSON.stringify({
+        id: `discord_message_${Date.now()}`,
+        guild_id: "agentkit_guild",
+        channel_id: "agentkit_channel",
+        author: {
+          id: "agentkit_user",
+          username: "agentkit",
+        },
+        member: {
+          nick: "AgentKit",
+        },
+        content: message,
+        mentions: [],
+        timestamp: new Date().toISOString(),
+      });
+    }
+
+    return JSON.stringify({
+      id: `discord_interaction_${Date.now()}`,
+      application_id: "agentkit_discord_app",
+      type: 2,
+      data: {
+        id: "agentkit_command",
+        name: "ask",
+        type: 1,
+        options: [
+          {
+            name: "message",
+            type: 3,
+            value: message,
+          },
+        ],
+      },
+      guild_id: "agentkit_guild",
+      channel_id: "agentkit_channel",
+      member: {
+        user: {
+          id: "agentkit_user",
+          username: "agentkit",
+        },
+      },
+      token: `agentkit_interaction_token_${Date.now()}`,
+      version: 1,
+    });
+  }
+
   return JSON.stringify({
     event_id: `web_${Date.now()}`,
     visitor_id: "visitor_test",

package/src/cli/deploy-chat-ui.ts

@@ -70,6 +70,27 @@ export async function startDeployChatUiServer(
         return;
       }
 
+      if (
+        request.method === "GET" &&
+        (requestUrl.pathname === "/v1/conversations" ||
+          /^\/v1\/conversations\/[^/]+(?:\/trace)?$/.test(requestUrl.pathname))
+      ) {
+        const token = await readDeployAccessTokenForUi(tokenPath);
+        const upstream = await fetch(new URL(requestUrl.pathname, deployUrl).href, {
+          method: "GET",
+          headers: {
+            Authorization: `Bearer ${token}`,
+          },
+        });
+        const text = await upstream.text();
+
+        response.writeHead(upstream.status, {
+          "content-type": upstream.headers.get("content-type") ?? "application/json",
+        });
+        response.end(text);
+        return;
+      }
+
       sendJson(response, 404, { error: { code: "not_found", message: "Route not found." } });
     } catch (error) {
       sendJson(response, 500, {
@@ -196,6 +217,8 @@ function renderDeployChatUi(input: { deployUrl: string }): string {
       header {
         border-bottom: 1px solid var(--line);
         padding: 18px 22px;
+        display: grid;
+        gap: 10px;
       }
 
       h1 {
@@ -204,12 +227,27 @@ function renderDeployChatUi(input: { deployUrl: string }): string {
         line-height: 1.2;
       }
 
+      .topline {
+        display: flex;
+        align-items: start;
+        justify-content: space-between;
+        gap: 12px;
+      }
+
       code {
         color: var(--muted);
         font-size: 12px;
         overflow-wrap: anywhere;
       }
 
+      .meta {
+        display: flex;
+        flex-wrap: wrap;
+        gap: 8px 14px;
+        color: var(--muted);
+        font-size: 12px;
+      }
+
       #messages {
         padding: 22px;
         overflow: auto;
@@ -255,6 +293,39 @@ function renderDeployChatUi(input: { deployUrl: string }): string {
         background: #fff6f6;
       }
 
+      #trace {
+        border-top: 1px solid var(--line);
+        padding: 12px 22px;
+        display: grid;
+        gap: 8px;
+        background: #fbfbfa;
+      }
+
+      .tool-call {
+        border: 1px solid var(--line);
+        border-radius: 8px;
+        padding: 10px 12px;
+        display: grid;
+        gap: 6px;
+        font-size: 12px;
+      }
+
+      .tool-head {
+        display: flex;
+        flex-wrap: wrap;
+        gap: 8px;
+        align-items: center;
+        color: var(--muted);
+        font-weight: 700;
+      }
+
+      .tool-call pre {
+        margin: 0;
+        max-height: 180px;
+        overflow: auto;
+        white-space: pre-wrap;
+      }
+
       form {
         border-top: 1px solid var(--line);
         padding: 14px;
@@ -286,6 +357,13 @@ function renderDeployChatUi(input: { deployUrl: string }): string {
         cursor: pointer;
       }
 
+      button.secondary {
+        min-height: 34px;
+        color: var(--ink);
+        background: #eef1ee;
+        border: 1px solid var(--line);
+      }
+
       button:disabled {
         cursor: wait;
         opacity: 0.65;
@@ -305,10 +383,20 @@ function renderDeployChatUi(input: { deployUrl: string }): string {
   <body>
     <main>
       <header>
-        <h1>AgentKit Hosted Chat</h1>
-        <code>${deployUrl}</code>
+        <div class="topline">
+          <div>
+            <h1>AgentKit Hosted Chat</h1>
+            <code>${deployUrl}</code>
+          </div>
+          <button class="secondary" id="new-conversation" type="button">New conversation</button>
+        </div>
+        <div class="meta">
+          <span>Conversation: <code id="conversation-id">none</code></span>
+          <span>Tool calls: <code id="tool-count">0</code></span>
+        </div>
       </header>
       <section id="messages" aria-live="polite"></section>
+      <section id="trace" aria-live="polite"></section>
       <form id="form">
         <textarea id="message" name="message" placeholder="Type a message" required autofocus></textarea>
         <button id="send" type="submit">Send</button>
@@ -319,6 +407,10 @@ function renderDeployChatUi(input: { deployUrl: string }): string {
       const textarea = document.querySelector("#message");
       const send = document.querySelector("#send");
       const messages = document.querySelector("#messages");
+      const trace = document.querySelector("#trace");
+      const conversationLabel = document.querySelector("#conversation-id");
+      const toolCount = document.querySelector("#tool-count");
+      const newConversation = document.querySelector("#new-conversation");
       let conversationId = null;
 
       function addMessage(role, content, className = "") {
@@ -335,6 +427,55 @@ function renderDeployChatUi(input: { deployUrl: string }): string {
         messages.scrollTop = messages.scrollHeight;
       }
 
+      function setConversationId(value) {
+        conversationId = value || null;
+        conversationLabel.textContent = conversationId || "none";
+      }
+
+      function renderTrace(payload) {
+        const calls = [];
+        for (const run of payload.runs || []) {
+          for (const call of run.toolCalls || []) {
+            calls.push(call);
+          }
+        }
+
+        toolCount.textContent = String(calls.length);
+        trace.innerHTML = "";
+
+        for (const call of calls.slice(-8)) {
+          const item = document.createElement("article");
+          item.className = "tool-call";
+          const head = document.createElement("div");
+          head.className = "tool-head";
+          head.textContent = [call.name, call.status, call.errorMessage].filter(Boolean).join(" · ");
+          const input = document.createElement("pre");
+          input.textContent = JSON.stringify(call.input || {}, null, 2);
+          item.append(head, input);
+          trace.append(item);
+        }
+      }
+
+      async function refreshTrace() {
+        if (!conversationId) {
+          toolCount.textContent = "0";
+          trace.innerHTML = "";
+          return;
+        }
+
+        const response = await fetch("/v1/conversations/" + encodeURIComponent(conversationId) + "/trace");
+        const payload = await response.json();
+        if (response.ok) renderTrace(payload);
+      }
+
+      newConversation.addEventListener("click", () => {
+        setConversationId(null);
+        messages.innerHTML = "";
+        trace.innerHTML = "";
+        toolCount.textContent = "0";
+        textarea.focus();
+      });
+
       textarea.addEventListener("keydown", (event) => {
         if (event.key !== "Enter" || event.shiftKey || event.isComposing) return;
         event.preventDefault();
@@ -363,10 +504,12 @@ function renderDeployChatUi(input: { deployUrl: string }): string {
             throw new Error(payload.error?.message || "Request failed");
           }
 
-          conversationId = payload.conversationId || conversationId;
+          setConversationId(payload.conversationId || conversationId);
           addMessage("assistant", payload.message?.content || "");
+          await refreshTrace();
         } catch (error) {
           addMessage("error", error instanceof Error ? error.message : String(error), "error");
+          await refreshTrace().catch(() => {});
         } finally {
           send.disabled = false;
           textarea.focus();

package/src/cli/deploy-readiness.ts

@@ -2,13 +2,14 @@ import { findAgentCapsuleRoot, loadAgentCapsule } from "../runtime/config";
 import { loadDeployReadinessContext, type DeployReadinessContext } from "../runtime/deploy-readiness";
 import { loadCapsuleEnv } from "../runtime/env";
 import { isAgentKitError } from "../runtime/errors";
-import { MANAGED_COMPOSIO_ENTITLEMENT } from "../runtime/integrations/composio";
+import { MANAGED_COMPOSIO_API_KEY_SECRET, MANAGED_COMPOSIO_ENTITLEMENT } from "../runtime/integrations/composio";
 import {
   cloudApiRequest,
   formatCloudAuthSource,
   readCloudAuthForApiUrl,
   type CloudCapabilitiesResponse,
   type CloudLimitsResponse,
+  type CloudManagedComposioResponse,
   type CloudMeResponse,
   type CloudProjectResolveResponse,
   type CloudSecretsResponse,
@@ -203,6 +204,61 @@ export async function checkDeployReadiness(options: {
         message: `Could not verify online deploy capacity. ${formatReadinessError(error)}`,
       });
     }
+
+    if (context.integrations.managedComposio.enabled) {
+      try {
+        const payload = (await cloudApiRequest(
+          options.apiUrl,
+          `/v1/me/managed-composio?toolkits=${encodeURIComponent(context.integrations.managedComposio.toolkits.join(","))}`,
+          {
+            method: "GET",
+          },
+        )) as CloudManagedComposioResponse;
+        const managed = payload.managed_composio;
+        const missingToolkits = (managed?.toolkits ?? []).filter((toolkit) => toolkit.auth_config !== "set");
+
+        if (managed?.api_key !== "set") {
+          checks.push({
+            status: "fail",
+            title: "Managed Composio API key",
+            message: `AgentKit Cloud is missing AGENTKIT_SECRET_${MANAGED_COMPOSIO_API_KEY_SECRET}.`,
+            action: "ask the AgentKit Cloud operator to configure managed Composio",
+          });
+        } else {
+          checks.push({
+            status: "pass",
+            title: "Managed Composio API key",
+            message: "AgentKit Cloud has the managed COMPOSIO_API_KEY.",
+          });
+        }
+
+        if (missingToolkits.length > 0) {
+          checks.push({
+            status: "fail",
+            title: "Managed Composio auth configs",
+            message: `Missing ${missingToolkits
+              .map((toolkit) => `${toolkit.auth_config_env ?? "auth config"} for ${toolkit.toolkit ?? "unknown"}`)
+              .join(", ")}.`,
+            action: "ask the AgentKit Cloud operator to configure the Composio auth config registry or fallback env",
+          });
+        } else {
+          const toolkitSources = (managed?.toolkits ?? []).map((toolkit) =>
+            `${toolkit.toolkit ?? "unknown"}${toolkit.auth_config_source ? ` via ${toolkit.auth_config_source}` : ""}`,
+          );
+          checks.push({
+            status: "pass",
+            title: "Managed Composio auth configs",
+            message: `Auth configs are available for ${toolkitSources.join(", ")}.`,
+          });
+        }
+      } catch (error) {
+        checks.push({
+          status: "warn",
+          title: "Managed Composio auth configs",
+          message: `Could not verify managed Composio auth configs. ${formatReadinessError(error)}`,
+        });
+      }
+    }
   }
 
   if (context.agentKitManagedSecrets.length > 0) {

package/src/cli/help.ts

@@ -29,6 +29,8 @@ Build:
   agentkit db migrate
   agentkit eval run
   agentkit eval from-conversation <id>
+  agentkit improve collect --deploy --since 24h
+  agentkit replay <bundle-dir> --against local
   agentkit conversations list
 
 Deploy:
@@ -42,6 +44,8 @@ Deploy:
 More:
   agentkit channels ...
   agentkit integrations status
+  agentkit billing checkout --slots <count>
+  agentkit account token ...
   agentkit access token ...
   agentkit env ...
   agentkit docs full
@@ -73,12 +77,15 @@ Usage:
   agentkit db seed [--file <path>]
   agentkit eval run
   agentkit eval from-conversation <conversation-id> [--out <path>] [--force]
-  agentkit conversations list
-  agentkit conversations show <conversation-id>
-  agentkit conversations trace <conversation-id>
+  agentkit improve collect [--deploy] [--since <duration|iso>] [--conversation-id <id>] [--out <directory>]
+  agentkit improve evals <bundle-dir-or-json> [--force]
+  agentkit replay <bundle-dir-or-json> --against local
+  agentkit conversations list [--deploy]
+  agentkit conversations show <conversation-id> [--deploy]
+  agentkit conversations trace <conversation-id> [--deploy]
   agentkit channels list
-  agentkit channels add <website|telegram|whatsapp> <name> [--provider zapster|meta] [--api <url>]
-  agentkit channels connect <website|telegram|whatsapp> <name> [--provider zapster|meta] [--api <url>]
+  agentkit channels add <website|telegram|whatsapp|discord> <name> [--provider zapster|meta] [--mode interactions|bot] [--api <url>]
+  agentkit channels connect <website|telegram|whatsapp|discord> <name> [--provider zapster|meta] [--mode interactions|bot] [--api <url>]
   agentkit channels setup <name> [--apply] [--api <url>]
   agentkit channels status <name> [--api <url>]
   agentkit channels doctor <name> [--api <url>]
@@ -91,7 +98,7 @@ Usage:
   agentkit channels buffers flush [<name>] <conversation-id> [--api <url>]
   agentkit channels buffers clear [<name>] <conversation-id> [--api <url>]
   agentkit channels buffers retry [<name>] <conversation-id> [--api <url>]
-  agentkit integrations status [--api <url>]
+  agentkit integrations status [--toolkit <slug>] [--api <url>]
   agentkit integrations connect composio [--toolkit <slug>] [--callback-url <url>] [--api <url>]
   agentkit skills status
   agentkit skills sync
@@ -99,6 +106,13 @@ Usage:
   agentkit build [--target cloudflare|container]
   agentkit login --token <token> [--api <url>]
   agentkit logout
+  agentkit billing checkout --slots <count> [--email <email>] [--api <url>]
+  agentkit billing status <billing-intent-id> --secret <secret> [--api <url>]
+  agentkit billing claim <billing-intent-id> --secret <secret> [--token-name <name>] [--api <url>]
+  agentkit billing portal [--api <url>]
+  agentkit account token create <name> [--api <url>] [--use] [--out <path>]
+  agentkit account token list [--api <url>]
+  agentkit account token revoke <token-id> [--api <url>]
   agentkit deploy [--target cloudflare|vps] [--host <host>] [--api <url>] [--dry-run] [--anonymous] [--local-wrangler] [--smoke <message>]
   agentkit deploy doctor [--api <url>] [--anonymous]
   agentkit deploy smoke [--message <text>] [--api <url>]
@@ -140,6 +154,8 @@ Commands:
   sync            Run or scaffold catalog/data synchronization
   db              Manage the local SQLite database
   eval            Run local eval files or create one from a conversation
+  improve         Collect production or local traces and generate regression evals
+  replay          Replay an improve bundle against the local Agent Capsule
   conversations   List, inspect, and trace stored local conversations
   channels        Manage hosted channel resources
   integrations    Manage hosted AgentKit-managed integrations
@@ -149,6 +165,8 @@ Commands:
   build           Build a hosted deploy artifact
   login           Store an AgentKit Cloud alpha token outside the capsule
   logout          Remove the stored AgentKit Cloud alpha token
+  billing         Buy deploy slots, claim checkout tokens, and open the billing portal
+  account         Manage AgentKit Cloud account tokens
   deploy          Build and send a hosted artifact to AgentKit Cloud
   secret          Manage hosted AgentKit Cloud secrets without readback
   access          Manage hosted deploy access tokens
@@ -181,8 +199,11 @@ export function renderCommandHelp(command: string): string {
     spec: 'agentkit spec init --brief "owner request" | agentkit spec check',
     sync: "agentkit sync init [--force] | agentkit sync run [--file <path>]",
     eval: "agentkit eval run | agentkit eval from-conversation <conversation-id> [--out <path>] [--force]",
+    improve:
+      "agentkit improve collect [--deploy] [--since <duration|iso>] [--conversation-id <id>] [--out <directory>] | agentkit improve evals <bundle-dir-or-json> [--force]",
+    replay: "agentkit replay <bundle-dir-or-json> --against local",
     conversations:
-      "agentkit conversations list | agentkit conversations show <conversation-id> | agentkit conversations trace <conversation-id>",
+      "agentkit conversations list [--deploy] | agentkit conversations show <conversation-id> [--deploy] | agentkit conversations trace <conversation-id> [--deploy]",
     channels:
       "agentkit channels list | add | connect | setup | status | doctor | test | test-audio | deliveries | buffers",
     skills: "agentkit skills status | agentkit skills sync",
@@ -192,7 +213,10 @@ export function renderCommandHelp(command: string): string {
     secret:
       "agentkit secret set <NAME> --stdin | --from-env [ENV_NAME] | --from-local-env | agentkit secret sync --from-local | list | unset <NAME>",
     access: "agentkit access token create <name> [--out <path>] | list | revoke <token-id>",
-    integrations: "agentkit integrations status | agentkit integrations connect composio [--toolkit <slug>]",
+    account: "agentkit account token create <name> [--use] [--out <path>] | list | revoke <token-id>",
+    billing:
+      "agentkit billing checkout --slots <count> [--email <email>] | status <intent-id> --secret <secret> | claim <intent-id> --secret <secret> | portal",
+    integrations: "agentkit integrations status [--toolkit <slug>] | agentkit integrations connect composio [--toolkit <slug>]",
     env: "agentkit env set <NAME> --stdin | --from-env [ENV_NAME] | list | unset <NAME>",
     docs: "agentkit docs path | llms | full",
     handoff: "agentkit handoff codex [goal] | agentkit handoff claude [goal]",