feat(onboarding): wire plugin-backed auth choices

src/commands/onboard-channels.ts

@@ -1,13 +1,20 @@
 import { resolveAgentWorkspaceDir, resolveDefaultAgentId } from "../agents/agent-scope.js";
 import { listChannelPluginCatalogEntries } from "../channels/plugins/catalog.js";
 import { listChannelPlugins, getChannelPlugin } from "../channels/plugins/index.js";
-import { formatChannelPrimerLine, formatChannelSelectionLine } from "../channels/registry.js";
+import type { ChannelMeta } from "../channels/plugins/types.js";
+import {
+  formatChannelPrimerLine,
+  formatChannelSelectionLine,
+  listChatChannels,
+} from "../channels/registry.js";
 import type { ClawdbotConfig } from "../config/config.js";
+import { isChannelConfigured } from "../config/plugin-auto-enable.js";
 import type { DmPolicy } from "../config/types.js";
 import { resolveChannelDefaultAccountId } from "../channels/plugins/helpers.js";
 import { DEFAULT_ACCOUNT_ID, normalizeAccountId } from "../routing/session-key.js";
 import type { RuntimeEnv } from "../runtime.js";
 import { formatDocsLink } from "../terminal/links.js";
+import { enablePluginInConfig } from "../plugins/enable.js";
 import type { WizardPrompter, WizardSelectOption } from "../wizard/prompts.js";
 import type { ChannelChoice } from "./onboard-types.js";
 import {
@@ -115,6 +122,20 @@ async function collectChannelStatus(params: {
       }),
     ),
   );
+  const statusByChannel = new Map(statusEntries.map((entry) => [entry.channel, entry]));
+  const fallbackStatuses = listChatChannels()
+    .filter((meta) => !statusByChannel.has(meta.id))
+    .map((meta) => {
+      const configured = isChannelConfigured(params.cfg, meta.id);
+      const statusLabel = configured ? "configured (plugin disabled)" : "not configured";
+      return {
+        channel: meta.id,
+        configured,
+        statusLines: [`${meta.label}: ${statusLabel}`],
+        selectionHint: configured ? "configured · plugin disabled" : "not configured",
+        quickstartScore: 0,
+      };
+    });
   const catalogStatuses = catalogEntries.map((entry) => ({
     channel: entry.id,
     configured: false,
@@ -122,13 +143,13 @@ async function collectChannelStatus(params: {
     selectionHint: "plugin · install",
     quickstartScore: 0,
   }));
-  const combinedStatuses = [...statusEntries, ...catalogStatuses];
-  const statusByChannel = new Map(combinedStatuses.map((entry) => [entry.channel, entry]));
+  const combinedStatuses = [...statusEntries, ...fallbackStatuses, ...catalogStatuses];
+  const mergedStatusByChannel = new Map(combinedStatuses.map((entry) => [entry.channel, entry]));
   const statusLines = combinedStatuses.flatMap((entry) => entry.statusLines);
   return {
     installedPlugins,
     catalogEntries,
-    statusByChannel,
+    statusByChannel: mergedStatusByChannel,
     statusLines,
   };
 }
@@ -270,17 +291,28 @@ export async function setupChannels(
       });
   if (!shouldConfigure) return cfg;
 
+  const corePrimer = listChatChannels().map((meta) => ({
+    id: meta.id as ChannelChoice,
+    label: meta.label,
+    blurb: meta.blurb,
+  }));
+  const coreIds = new Set(corePrimer.map((entry) => entry.id));
   const primerChannels = [
-    ...installedPlugins.map((plugin) => ({
-      id: plugin.id as ChannelChoice,
-      label: plugin.meta.label,
-      blurb: plugin.meta.blurb,
-    })),
-    ...catalogEntries.map((entry) => ({
-      id: entry.id as ChannelChoice,
-      label: entry.meta.label,
-      blurb: entry.meta.blurb,
-    })),
+    ...corePrimer,
+    ...installedPlugins
+      .filter((plugin) => !coreIds.has(plugin.id as ChannelChoice))
+      .map((plugin) => ({
+        id: plugin.id as ChannelChoice,
+        label: plugin.meta.label,
+        blurb: plugin.meta.blurb,
+      })),
+    ...catalogEntries
+      .filter((entry) => !coreIds.has(entry.id as ChannelChoice))
+      .map((entry) => ({
+        id: entry.id as ChannelChoice,
+        label: entry.meta.label,
+        blurb: entry.meta.blurb,
+      })),
   ];
   await noteChannelPrimer(prompter, primerChannels);
 
@@ -301,7 +333,11 @@ export async function setupChannels(
 
   const resolveDisabledHint = (channel: ChannelChoice): string | undefined => {
     const plugin = getChannelPlugin(channel);
-    if (!plugin) return undefined;
+    if (!plugin) {
+      if (next.plugins?.entries?.[channel]?.enabled === false) return "plugin disabled";
+      if (next.plugins?.enabled === false) return "plugins disabled";
+      return undefined;
+    }
     const accountId = resolveChannelDefaultAccountId({ plugin, cfg: next });
     const account = plugin.config.resolveAccount(next, accountId);
     let enabled: boolean | undefined;
@@ -336,21 +372,28 @@ export async function setupChannels(
     });
 
   const getChannelEntries = () => {
+    const core = listChatChannels();
     const installed = listChannelPlugins();
     const installedIds = new Set(installed.map((plugin) => plugin.id));
     const catalog = listChannelPluginCatalogEntries().filter(
       (entry) => !installedIds.has(entry.id),
     );
-    const entries = [
-      ...installed.map((plugin) => ({
-        id: plugin.id as ChannelChoice,
-        meta: plugin.meta,
-      })),
-      ...catalog.map((entry) => ({
-        id: entry.id as ChannelChoice,
-        meta: entry.meta,
-      })),
-    ];
+    const metaById = new Map<string, ChannelMeta>();
+    for (const meta of core) {
+      metaById.set(meta.id, meta);
+    }
+    for (const plugin of installed) {
+      metaById.set(plugin.id, plugin.meta);
+    }
+    for (const entry of catalog) {
+      if (!metaById.has(entry.id)) {
+        metaById.set(entry.id, entry.meta);
+      }
+    }
+    const entries = Array.from(metaById, ([id, meta]) => ({
+      id: id as ChannelChoice,
+      meta,
+    }));
     return {
       entries,
       catalog,
@@ -365,6 +408,31 @@ export async function setupChannels(
     statusByChannel.set(channel, status);
   };
 
+  const ensureBundledPluginEnabled = async (channel: ChannelChoice): Promise<boolean> => {
+    if (getChannelPlugin(channel)) return true;
+    const result = enablePluginInConfig(next, channel);
+    next = result.config;
+    if (!result.enabled) {
+      await prompter.note(
+        `Cannot enable ${channel}: ${result.reason ?? "plugin disabled"}.`,
+        "Channel setup",
+      );
+      return false;
+    }
+    const workspaceDir = resolveAgentWorkspaceDir(next, resolveDefaultAgentId(next));
+    reloadOnboardingPluginRegistry({
+      cfg: next,
+      runtime,
+      workspaceDir,
+    });
+    if (!getChannelPlugin(channel)) {
+      await prompter.note(`${channel} plugin not available.`, "Channel setup");
+      return false;
+    }
+    await refreshStatus(channel);
+    return true;
+  };
+
   const configureChannel = async (channel: ChannelChoice) => {
     const adapter = getChannelOnboardingAdapter(channel);
     if (!adapter) {
@@ -476,6 +544,9 @@ export async function setupChannels(
         workspaceDir,
       });
       await refreshStatus(channel);
+    } else {
+      const enabled = await ensureBundledPluginEnabled(channel);
+      if (!enabled) return;
     }
 
     const plugin = getChannelPlugin(channel);
@@ -531,10 +602,8 @@ export async function setupChannels(
   options?.onSelection?.(selection);
 
   const selectionNotes = new Map<string, string>();
-  for (const plugin of listChannelPlugins()) {
-    selectionNotes.set(plugin.id, formatChannelSelectionLine(plugin.meta, formatDocsLink));
-  }
-  for (const entry of listChannelPluginCatalogEntries()) {
+  const { entries: selectionEntries } = getChannelEntries();
+  for (const entry of selectionEntries) {
     selectionNotes.set(entry.id, formatChannelSelectionLine(entry.meta, formatDocsLink));
   }
   const selectedLines = selection