From e668587b40868c05fa30346d3b421372761643e0 Mon Sep 17 00:00:00 2001
From: Haakam Aujla <haakamsingh21@gmail.com>
Date: Tue, 27 Jan 2026 14:01:29 -0800
Subject: [PATCH] Onboarding

---
 extensions/agentmail/package.json      |  2 +-
 extensions/agentmail/src/onboarding.ts | 10 +++++++---
 src/channels/registry.ts               | 12 ++++++++++++
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/extensions/agentmail/package.json b/extensions/agentmail/package.json
index 09134a8e2..ba7cf13d8 100644
--- a/extensions/agentmail/package.json
+++ b/extensions/agentmail/package.json
@@ -14,7 +14,7 @@
       "docsPath": "/channels/agentmail",
       "docsLabel": "agentmail",
       "blurb": "Email channel via AgentMail; configure API key and inbox.",
-      "order": 80,
+      "order": 0,
       "quickstartAllowFrom": true
     },
     "install": {
diff --git a/extensions/agentmail/src/onboarding.ts b/extensions/agentmail/src/onboarding.ts
index 2274a0333..050f5a366 100644
--- a/extensions/agentmail/src/onboarding.ts
+++ b/extensions/agentmail/src/onboarding.ts
@@ -136,9 +136,10 @@ export const agentmailOnboardingAdapter: ChannelOnboardingAdapter = {
     // Show help
     await prompter.note(
       [
-        "You'll need an AgentMail API token from https://agentmail.to",
+        "AgentMail is free to use at https://agentmail.to",
         "",
-        "We'll help you create an inbox after you enter your token.",
+        "Get your API token from the dashboard, then we'll help you",
+        "create an inbox.",
       ].join("\n"),
       "AgentMail Setup"
     );
@@ -207,7 +208,10 @@ export const agentmailOnboardingAdapter: ChannelOnboardingAdapter = {
           eventTypes: ["message.received"],
           clientId: `clawdbot-${emailAddress}`, // Idempotent per inbox
         });
-        await prompter.note(`Webhook registered: ${webhookUrl}`, "Webhook Created");
+        await prompter.note(
+          `Webhook registered: ${webhookUrl}`,
+          "Webhook Created"
+        );
       } catch (err) {
         // Webhook may already exist or API error - show warning but continue
         await prompter.note(
diff --git a/src/channels/registry.ts b/src/channels/registry.ts
index 6afe1996c..5835f56ef 100644
--- a/src/channels/registry.ts
+++ b/src/channels/registry.ts
@@ -8,6 +8,7 @@ export const CHAT_CHANNEL_ORDER = [
   "telegram",
   "whatsapp",
   "discord",
+  "agentmail",
   "googlechat",
   "slack",
   "signal",
@@ -58,6 +59,17 @@ const CHAT_CHANNEL_META: Record<ChatChannelId, ChannelMeta> = {
     blurb: "very well supported right now.",
     systemImage: "bubble.left.and.bubble.right",
   },
+  agentmail: {
+    id: "agentmail",
+    label: "AgentMail",
+    selectionLabel: "AgentMail (Email Inbox API)",
+    detailLabel: "AgentMail",
+    docsPath: "/channels/agentmail",
+    docsLabel: "agentmail",
+    blurb: "email channel via AgentMail; configure API key and inbox.",
+    systemImage: "envelope",
+    quickstartAllowFrom: true,
+  },
   googlechat: {
     id: "googlechat",
     label: "Google Chat",