@inceptionstack/roundhouse 0.3.16 → 0.3.18

package/src/cli/setup.ts

@@ -32,6 +32,12 @@ import {
   writeServiceUnit,
   hasSudoAccess,
 } from "./systemd";
+import {
+  getAgentDefinition,
+  listAvailableAgentTypes,
+  type AgentDefinition,
+  type AgentSetupContext,
+} from "../agents/registry";
 import {
   validateBotToken,
   checkWebhook,
@@ -41,6 +47,16 @@ import {
   type BotInfo,
   type PairResult,
 } from "./setup-telegram";
+import { promptText, promptMasked } from "./setup-prompts";
+import { createTextLogger, createJsonLogger, type SetupLogger, type SetupDiagnostics, printDiagnosticError } from "./setup-logger";
+import { printQr } from "./qr";
+import {
+  createPairingNonce,
+  createPairingLink,
+  readPendingPairing,
+  writePendingPairing,
+  type PendingPairing,
+} from "../pairing";
 
 // ── Types ────────────────────────────────────────────
 
@@ -58,6 +74,14 @@ interface SetupOptions {
   nonInteractive: boolean;
   force: boolean;
   dryRun: boolean;
+  /** Telegram-focused setup flow */
+  telegram: boolean;
+  /** Fully headless automation (no TTY prompts) */
+  headless: boolean;
+  /** QR code display mode */
+  qr: "auto" | "always" | "never";
+  /** Agent type (default: pi) */
+  agent: string;
 }
 
 type StepStatus = "ok" | "warn" | "skip" | "fail";
@@ -71,13 +95,69 @@ const DEFAULT_MODEL = "us.anthropic.claude-opus-4-6-v1";
 
 const EXTENSION_NAME_RE = /^@?[a-z0-9][\w.\-/]*$/i;
 
+/**
+ * Resolve agent definition and wire up setup-specific functions.
+ * Pi: configure writes ~/.pi/agent/settings.json, installExtension calls pi install.
+ */
+function resolveAgentForSetup(opts: SetupOptions): AgentDefinition {
+  const agent = { ...getAgentDefinition(opts.agent) };
+
+  if (agent.type === "pi") {
+    agent.configure = async (ctx: AgentSetupContext) => {
+      // Read existing settings if present
+      let existing: Record<string, unknown> = {};
+      try {
+        existing = JSON.parse(await readFile(PI_SETTINGS_PATH, "utf8"));
+      } catch {}
+
+      const settings: Record<string, unknown> = { ...existing };
+
+      if (ctx.force) {
+        settings.defaultProvider = ctx.provider;
+        settings.defaultModel = ctx.model;
+      } else {
+        if (existing.defaultProvider && existing.defaultProvider !== ctx.provider) {
+          warn(`Pi provider already set to '${existing.defaultProvider}' (keeping, use --force to override)`);
+        } else {
+          settings.defaultProvider = ctx.provider;
+        }
+        if (existing.defaultModel && existing.defaultModel !== ctx.model) {
+          warn(`Pi model already set to '${existing.defaultModel}' (keeping, use --force to override)`);
+        } else {
+          settings.defaultModel = ctx.model;
+        }
+      }
+
+      // Ensure packages array exists
+      if (!Array.isArray(settings.packages)) settings.packages = [];
+
+      // Add pi-psst if using psst
+      if (ctx.psst) {
+        const psstPkg = "npm:@miclivs/pi-psst";
+        const pkgs = settings.packages as string[];
+        if (!pkgs.includes(psstPkg)) pkgs.push(psstPkg);
+      }
+
+      await mkdir(dirname(PI_SETTINGS_PATH), { recursive: true });
+      await atomicWriteJson(PI_SETTINGS_PATH, settings);
+      ok(`~/.pi/agent/settings.json (${settings.defaultProvider}, ${settings.defaultModel})`);
+    };
+
+    agent.installExtension = async (ext: string) => {
+      execOrFail("pi", ["install", `npm:${ext}`], `extension ${ext}`);
+    };
+  }
+
+  return agent;
+}
+
 // ── Helpers ──────────────────────────────────────────
 
-function log(msg: string) { console.log(msg); }
-function step(n: string, label: string) { log(`\n${n} ${label}`); }
-function ok(msg: string) { log(`   ✓ ${msg}`); }
-function warn(msg: string) { log(`   ⚠ ${msg}`); }
-function fail(msg: string) { log(`   ✗ ${msg}`); }
+let log = (msg: string) => { console.log(msg); };
+let step = (n: string, label: string) => { log(`\n${n} ${label}`); };
+let ok = (msg: string) => { log(`   ✓ ${msg}`); };
+let warn = (msg: string) => { log(`   ⚠ ${msg}`); };
+let fail = (msg: string) => { log(`   ✗ ${msg}`); };
 
 async function atomicWriteJson(path: string, data: unknown): Promise<void> {
   const tmp = `${path}.tmp.${randomBytes(4).toString("hex")}`;
@@ -140,6 +220,10 @@ export function parseSetupArgs(argv: string[]): SetupOptions {
     nonInteractive: false,
     force: false,
     dryRun: false,
+    telegram: false,
+    headless: false,
+    qr: "auto",
+    agent: "pi",
   };
 
   for (let i = 0; i < argv.length; i++) {
@@ -161,6 +245,11 @@ export function parseSetupArgs(argv: string[]): SetupOptions {
       case "--no-voice": opts.voice = false; break;
       case "--with-psst": opts.psst = true; break;
       case "--non-interactive": opts.nonInteractive = true; break;
+      case "--telegram": opts.telegram = true; break;
+      case "--headless": opts.headless = true; opts.nonInteractive = true; break;
+      case "--agent": opts.agent = next().toLowerCase(); break;
+      case "--qr": opts.qr = "always"; break;
+      case "--no-qr": opts.qr = "never"; break;
       case "--force": opts.force = true; break;
       case "--dry-run": opts.dryRun = true; break;
       default:
@@ -174,15 +263,33 @@ export function parseSetupArgs(argv: string[]): SetupOptions {
     opts.botToken = process.env.TELEGRAM_BOT_TOKEN ?? "";
   }
 
+  // Headless: reject --bot-token (argv visible in process listings)
+  if (opts.headless && argv.some((a) => a === "--bot-token")) {
+    throw new Error(
+      "--bot-token is not accepted in --headless mode (argv visible in process listings).\n" +
+      "Use: TELEGRAM_BOT_TOKEN=... roundhouse setup --telegram --headless --user USERNAME",
+    );
+  }
+
+  // Validate agent type
+  try {
+    getAgentDefinition(opts.agent);
+  } catch (err: any) {
+    throw new Error(err.message);
+  }
+
+  // Interactive --telegram defers token/user prompting to the wizard
+  const isInteractiveTelegram = opts.telegram && !opts.headless && !opts.nonInteractive && process.stdin.isTTY;
+
   // Validate
-  if (!opts.botToken && !opts.dryRun) {
+  if (!opts.botToken && !opts.dryRun && !isInteractiveTelegram) {
     throw new Error(
       "Bot token required. Provide via:\n" +
       "  TELEGRAM_BOT_TOKEN=... roundhouse setup --user USERNAME\n" +
       "  roundhouse setup --bot-token TOKEN --user USERNAME",
     );
   }
-  if (opts.users.length === 0) {
+  if (opts.users.length === 0 && !isInteractiveTelegram) {
     throw new Error(
       "At least one --user USERNAME is required.\n" +
       "This is your Telegram username (without @).",
@@ -202,7 +309,7 @@ export function parseSetupArgs(argv: string[]): SetupOptions {
 
 // ── Steps ────────────────────────────────────────────
 
-async function stepPreflight(opts: SetupOptions): Promise<void> {
+async function stepPreflight(opts: SetupOptions, agent: AgentDefinition): Promise<void> {
   step("①", "Preflight checks...");
 
   // Node version
@@ -222,7 +329,8 @@ async function stepPreflight(opts: SetupOptions): Promise<void> {
   ok("npm available");
 
   // Config dirs writable
-  for (const dir of [ROUNDHOUSE_DIR, dirname(PI_SETTINGS_PATH)]) {
+  const dirs = [ROUNDHOUSE_DIR, ...(agent.configDirs ?? [])];
+  for (const dir of dirs) {
     try {
       await mkdir(dir, { recursive: true });
       ok(`Writable: ${dir.replace(homedir(), "~")}`);
@@ -232,6 +340,22 @@ async function stepPreflight(opts: SetupOptions): Promise<void> {
     }
   }
 
+  // Seed .env with commented-out example if it doesn't exist yet
+  if (!(await fileExists(ENV_PATH))) {
+    const seed = [
+      "# Roundhouse environment file",
+      "# Uncomment and set values, or use: roundhouse setup",
+      "#",
+      "# TELEGRAM_BOT_TOKEN=\"your-bot-token\"",
+      "# BOT_USERNAME=\"your_bot_username\"",
+      "# ALLOWED_USERS=\"your_telegram_username\"",
+      "# AWS_PROFILE=\"default\"",
+      "# AWS_REGION=\"us-east-1\"",
+      "",
+    ].join("\n");
+    await writeFile(ENV_PATH, seed, { mode: 0o600 });
+  }
+
   // Disk space (rough check)
   try {
     const dfOut = execSafe("df", ["-BG", "--output=avail", homedir()], { silent: true });
@@ -323,7 +447,7 @@ async function stepStopGateway(): Promise<void> {
   }
 }
 
-async function stepInstallPackages(opts: SetupOptions): Promise<void> {
+async function stepInstallPackages(opts: SetupOptions, agent: AgentDefinition): Promise<void> {
   step("④", "Installing packages...");
 
   // Roundhouse
@@ -336,14 +460,20 @@ async function stepInstallPackages(opts: SetupOptions): Promise<void> {
     ok("@inceptionstack/roundhouse");
   }
 
-  // Pi agent
-  const piInstalled = whichSync("pi");
-  if (piInstalled && !opts.force) {
-    ok(`@mariozechner/pi-coding-agent (already installed)`);
-  } else {
-    log("   Installing @mariozechner/pi-coding-agent...");
-    execOrFail("npm", ["install", "-g", "@mariozechner/pi-coding-agent"], "pi install");
-    ok("@mariozechner/pi-coding-agent");
+  // Agent packages (driven by agent definition)
+  for (const pkg of agent.packages) {
+    const label = pkg.name ?? pkg.packageName;
+    const installed = pkg.binary ? whichSync(pkg.binary) : false;
+    if (installed && !opts.force) {
+      ok(`${label} (already installed)`);
+    } else {
+      log(`   Installing ${label}...`);
+      const args = pkg.install === "global"
+        ? ["install", "-g", pkg.packageName]
+        : ["install", pkg.packageName];
+      execOrFail("npm", args, `${label} install`);
+      ok(label);
+    }
   }
 
   // psst-cli (requires bun runtime)
@@ -424,21 +554,26 @@ async function stepInstallPackages(opts: SetupOptions): Promise<void> {
       }
     }
 
-    // Install pi-psst extension
-    log("   Installing pi-psst extension...");
-    try {
-      execFileSync("pi", ["install", "npm:@miclivs/pi-psst"], { encoding: "utf8", stdio: "pipe", timeout: 120_000 });
-      ok("@miclivs/pi-psst extension");
-    } catch {
-      // May already be installed
-      ok("@miclivs/pi-psst extension (already installed)");
+    // Install agent-specific psst extension (Pi: pi-psst)
+    if (agent.installExtension) {
+      log("   Installing agent psst extension...");
+      try {
+        await agent.installExtension("@miclivs/pi-psst");
+        ok("@miclivs/pi-psst extension");
+      } catch {
+        ok("@miclivs/pi-psst extension (already installed)");
+      }
     }
   }
 
   // User extensions
   for (const ext of opts.extensions) {
+    if (!agent.installExtension) {
+      fail(`--extension is not supported for agent "${agent.type}"`);
+      throw new Error(`Agent "${agent.type}" does not support extensions`);
+    }
     log(`   Installing extension: ${ext}...`);
-    execOrFail("pi", ["install", `npm:${ext}`], `extension ${ext}`);
+    await agent.installExtension(ext);
     ok(ext);
   }
 }
@@ -490,45 +625,24 @@ async function stepConfigure(
   opts: SetupOptions,
   botInfo: BotInfo,
   pairResult: PairResult | null,
+  agent: AgentDefinition,
 ): Promise<void> {
   step("⑦", "Configuring...");
 
   await mkdir(ROUNDHOUSE_DIR, { recursive: true });
-  await mkdir(dirname(PI_SETTINGS_PATH), { recursive: true });
-
-  // ── Pi settings ──
-  let piSettings: Record<string, any> = {};
-  try {
-    piSettings = JSON.parse(await readFile(PI_SETTINGS_PATH, "utf8"));
-  } catch { /* doesn't exist */ }
 
-  if (opts.force) {
-    piSettings.defaultProvider = opts.provider;
-    piSettings.defaultModel = opts.model;
-  } else {
-    const existingProvider = piSettings.defaultProvider;
-    const existingModel = piSettings.defaultModel;
-    if (existingProvider && existingProvider !== opts.provider) {
-      warn(`Pi provider already set to '${existingProvider}' (keeping, use --force to override)`);
-    } else {
-      piSettings.defaultProvider = opts.provider;
-    }
-    if (existingModel && existingModel !== opts.model) {
-      warn(`Pi model already set to '${existingModel}' (keeping, use --force to override)`);
-    } else {
-      piSettings.defaultModel = opts.model;
-    }
-  }
-
-  // Ensure packages array includes pi-psst if using psst
-  if (!piSettings.packages) piSettings.packages = [];
-  if (opts.psst && !piSettings.packages.includes("npm:@miclivs/pi-psst")) {
-    piSettings.packages.push("npm:@miclivs/pi-psst");
+  // Agent-specific config (Pi: ~/.pi/agent/settings.json)
+  if (agent.configure) {
+    await agent.configure({
+      provider: opts.provider,
+      model: opts.model,
+      cwd: opts.cwd,
+      force: opts.force,
+      psst: opts.psst,
+      extensions: opts.extensions,
+    });
   }
 
-  await atomicWriteJson(PI_SETTINGS_PATH, piSettings);
-  ok(`~/.pi/agent/settings.json (${piSettings.defaultProvider}, ${piSettings.defaultModel})`);
-
   // ── Gateway config ──
   let gatewayConfig: Record<string, any> = {};
   if (!opts.force) {
@@ -559,7 +673,7 @@ async function stepConfigure(
   gatewayConfig = {
     ...gatewayConfig,
     _version: 1, // Config schema version — for future migration support
-    agent: { ...gatewayConfig.agent, type: "pi", cwd: opts.cwd },
+    agent: { ...gatewayConfig.agent, ...agent.configDefaults, type: agent.type, cwd: opts.cwd },
     chat: {
       ...gatewayConfig.chat,
       botUsername: botInfo.username,
@@ -752,6 +866,252 @@ async function stepPostflight(): Promise<void> {
   }
 }
 
+// ── BotFather Guide ──────────────────────────────────
+
+function printBotFatherGuide(): void {
+  log("");
+  log("  🤖 Create a Telegram Bot");
+  log("  ────────────────────────");
+  log("  1. Open https://t.me/BotFather");
+  log("  2. Send /newbot");
+  log("  3. Choose a display name (e.g. 'My Roundhouse')");
+  log("  4. Choose a username ending in 'bot' (e.g. 'my_roundhouse_bot')");
+  log("  5. Copy the token BotFather returns");
+  log("");
+}
+
+// ── Interactive Telegram Setup ───────────────────────
+
+async function runInteractiveTelegramSetup(opts: SetupOptions): Promise<void> {
+  const agent = resolveAgentForSetup(opts);
+  log("\n🔧 Roundhouse Telegram Setup");
+  log("━━━━━━━━━━━━━━━━━━━━━━━━━━━");
+
+  try {
+    // Step 1: Preflight
+    await stepPreflight(opts, agent);
+
+    // Step 2: Get bot token (prompt if not provided)
+    if (!opts.botToken) {
+      log("");
+      printBotFatherGuide();
+      opts.botToken = await promptMasked("  Paste your bot token");
+      if (!opts.botToken) {
+        fail("No token provided");
+        process.exit(2);
+      }
+    }
+    const botInfo = await stepValidateToken(opts);
+
+    // Step 3: Get username (prompt if not provided)
+    if (opts.users.length === 0) {
+      step("③", "Telegram username...");
+      const username = await promptText("  Your Telegram username (without @)");
+      if (!username) {
+        fail("Username required");
+        process.exit(2);
+      }
+      opts.users.push(username.replace(/^@/, ""));
+      ok(`Allowed: ${opts.users.map(u => `@${u}`).join(", ")}`);
+    }
+
+    // Step 4: Stop existing gateway
+    await stepStopGateway();
+
+    // Step 5: Install packages
+    await stepInstallPackages(opts, agent);
+
+    // Step 6: Pair via Telegram
+    step("⑥", "Pairing with Telegram...");
+    const nonce = createPairingNonce();
+    const pairingLink = createPairingLink(botInfo.username, nonce);
+    log(`\n  Open this link to pair:\n`);
+    log(`  🔗 ${pairingLink}\n`);
+    printQr(pairingLink, opts.qr);
+    log(`  Or send /start ${nonce} to @${botInfo.username}`);
+    log("");
+
+    const pairResult = await pairTelegram(
+      opts.botToken, botInfo.username, opts.users,
+      300_000, log, { nonce, showLink: false },
+    );
+    if (!pairResult) {
+      warn("Pairing timed out. Run 'roundhouse pair' later.");
+    } else {
+      ok(`Paired with @${pairResult.username} (chat: ${pairResult.chatId})`);
+      if (!opts.notifyChatIds.includes(pairResult.chatId)) {
+        opts.notifyChatIds.push(pairResult.chatId);
+      }
+    }
+
+    // Step 7: Store secrets
+    await stepStoreSecrets(opts, botInfo);
+
+    // Step 8: Write config
+    await stepConfigure(opts, botInfo, pairResult, agent);
+
+    // Step 9: Register commands + install service
+    await stepRegisterCommands(opts);
+    await stepInstallSystemd(opts);
+
+    // Step 10: Verify
+    await stepPostflight();
+
+    // Done!
+    log("\n━━━━━━━━━━━━━━━━━━━━━━━━━━━");
+    log("✅ Roundhouse is ready!");
+    log(`   Bot: @${botInfo.username}`);
+    log(`   Send /status to @${botInfo.username} on Telegram.\n`);
+  } catch (err: any) {
+    log("\n━━━━━━━━━━━━━━━━━━━━━━━━━━━");
+    log(`❌ Setup failed: ${err.message}`);
+    log("   Re-run: roundhouse setup --telegram\n");
+    process.exit(1);
+  }
+}
+
+// ── Headless Telegram Setup ─────────────────────────
+
+async function runHeadlessTelegramSetup(opts: SetupOptions): Promise<void> {
+  const agent = resolveAgentForSetup(opts);
+  const logger = createJsonLogger();
+
+  // Override module-level log helpers to emit JSON instead of text
+  const savedLog = log, savedStep = step, savedOk = ok, savedWarn = warn, savedFail = fail;
+  log = (msg) => logger.info("log", msg);
+  step = (_n, label) => logger.info("step", label);
+  ok = (msg) => logger.ok(msg);
+  warn = (msg) => logger.warn("warn", msg);
+  fail = (msg) => logger.fail(msg);
+
+  try {
+    // Validate required inputs
+    if (!opts.botToken) {
+      logger.error("validation.failed", "TELEGRAM_BOT_TOKEN env var required for --headless");
+      process.exit(2);
+    }
+    if (opts.users.length === 0) {
+      logger.error("validation.failed", "--user is required for --headless");
+      process.exit(2);
+    }
+
+    // Step 1: Preflight
+    logger.step(1, 9, "preflight.start", "Running preflight checks");
+    await stepPreflight(opts, agent);
+    logger.ok("Preflight passed");
+
+    // Step 2: Validate token
+    logger.step(2, 9, "telegram.validate", "Validating Telegram bot token");
+    const botInfo = await stepValidateToken(opts);
+    logger.ok(`Bot: @${botInfo.username} (id: ${botInfo.id})`);
+
+    // Step 3: Stop existing gateway
+    logger.step(3, 9, "gateway.stop", "Checking for running gateway");
+    await stepStopGateway();
+
+    // Step 4: Install packages
+    logger.step(4, 9, "packages.install", "Installing packages");
+    await stepInstallPackages(opts, agent);
+    logger.ok("Packages installed");
+
+    // Step 5: Create pending pairing
+    logger.step(5, 9, "pairing.pending", "Creating pending pairing");
+    let nonce: string;
+    const existing = await readPendingPairing();
+    if (existing?.status === "pending" && !opts.force) {
+      nonce = existing.nonce;
+      logger.info("pairing.reuse", `Reusing existing nonce: ${nonce}`);
+    } else {
+      nonce = createPairingNonce();
+    }
+    const pairingLink = createPairingLink(botInfo.username, nonce);
+    const pendingPairing: PendingPairing = {
+      version: 1,
+      nonce,
+      botUsername: botInfo.username,
+      allowedUsers: opts.users,
+      createdAt: new Date().toISOString(),
+      status: "pending",
+    };
+    await writePendingPairing(pendingPairing);
+    logger.info("pairing.link", `Pairing link: ${pairingLink}`, { pairingLink, nonce });
+
+    // Step 6: Store secrets
+    logger.step(6, 9, "secrets.store", "Storing secrets");
+    await stepStoreSecrets(opts, botInfo);
+
+    // Step 7: Write config (no pair result yet — gateway will complete pairing)
+    logger.step(7, 9, "config.write", "Writing configuration");
+    await stepConfigure(opts, botInfo, null, agent);
+    logger.ok("Config written");
+
+    // Step 8: Register commands
+    logger.step(8, 9, "commands.register", "Registering bot commands");
+    await stepRegisterCommands(opts);
+    logger.ok("Bot commands registered");
+
+    // Step 9: Install and start service
+    logger.step(9, 9, "service.install", "Installing and starting service");
+    if (!opts.systemd) {
+      logger.warn("service.skip", "--no-systemd: service not installed. Start manually: roundhouse start");
+    } else {
+      await stepInstallSystemd(opts);
+      logger.ok("Service installed and started");
+
+      // Verify service is active
+      try {
+        const { execFileSync } = await import("node:child_process");
+        const state = execFileSync("systemctl", ["is-active", "roundhouse"], { encoding: "utf8" }).trim();
+        if (state === "active") {
+          logger.ok("Service is active");
+        } else {
+          logger.warn("service.state", `Service state: ${state}`);
+        }
+      } catch {
+        logger.warn("service.state", "Could not verify service state");
+      }
+    }
+
+    // Success
+    logger.info("setup.complete", "Headless setup complete", {
+      botUsername: botInfo.username,
+      pairingLink,
+      pairingStatus: "pending",
+      serviceInstalled: opts.systemd,
+    });
+    log("");
+    log(`━━━━━━━━━━━━━━━━━━━━━━━━━━━`);
+    log(`✅ Roundhouse installed and running!`);
+    log(``);
+    log(`   Bot: @${botInfo.username}`);
+    log(`   Pairing: Open ${pairingLink} to complete setup`);
+    log(`   Gateway is running and will accept pairing automatically.`);
+    log(``);
+  } catch (err: any) {
+    const diag: SetupDiagnostics = {
+      node: process.version,
+      platform: platform(),
+      arch: process.arch,
+      cwd: process.cwd(),
+      roundhouseDir: ROUNDHOUSE_DIR,
+      configExists: await fileExists(CONFIG_PATH).catch(() => false),
+      envExists: await fileExists(ENV_PATH).catch(() => false),
+      pairingStatus: (await readPendingPairing())?.status ?? "not found",
+      serviceState: "unknown",
+      error: { name: err.name, message: err.message, stack: err.stack },
+    };
+    try {
+      const { execFileSync } = await import("node:child_process");
+      diag.serviceState = execFileSync("systemctl", ["is-active", "roundhouse"], { encoding: "utf8" }).trim();
+    } catch {}
+    printDiagnosticError(diag, true);
+    process.exit(1);
+  } finally {
+    // Restore module-level log helpers
+    log = savedLog; step = savedStep; ok = savedOk; warn = savedWarn; fail = savedFail;
+  }
+}
+
 // ── Orchestrator ─────────────────────────────────────
 
 export async function cmdSetup(argv: string[]): Promise<void> {
@@ -769,17 +1129,29 @@ export async function cmdSetup(argv: string[]): Promise<void> {
     return;
   }
 
+  // Route to --telegram flows
+  if (opts.telegram) {
+    if (opts.headless) {
+      await runHeadlessTelegramSetup(opts);
+    } else {
+      await runInteractiveTelegramSetup(opts);
+    }
+    return;
+  }
+
+  // Legacy flow (no --telegram flag)
+  const agent = resolveAgentForSetup(opts);
   log("\n🔧 Roundhouse Setup");
   log("━━━━━━━━━━━━━━━━━━━");
 
   try {
     // Phase 1: Validate (no mutations)
-    await stepPreflight(opts);
+    await stepPreflight(opts, agent);
     const botInfo = await stepValidateToken(opts);
     await stepStopGateway();
 
     // Phase 2: Install packages
-    await stepInstallPackages(opts);
+    await stepInstallPackages(opts, agent);
 
     // Phase 3: Pair (before secrets/config, so paired username is included)
     const pairResult = await stepPair(opts, botInfo);
@@ -788,7 +1160,7 @@ export async function cmdSetup(argv: string[]): Promise<void> {
     await stepStoreSecrets(opts, botInfo);
 
     // Phase 5: Write config (includes pair data)
-    await stepConfigure(opts, botInfo, pairResult);
+    await stepConfigure(opts, botInfo, pairResult, agent);
 
     // Phase 6: Remote setup
     await stepRegisterCommands(opts);
@@ -907,12 +1279,17 @@ export async function cmdPair(argv: string[]): Promise<void> {
 // ── Dry run ──────────────────────────────────────────
 
 function printDryRun(opts: SetupOptions): void {
+  const agent = getAgentDefinition(opts.agent);
   log("\n🔧 Roundhouse Setup (DRY RUN)");
   log("━━━━━━━━━━━━━━━━━━━\n");
+  log(`Agent: ${agent.name} (${agent.type})`);
   log("Would validate Telegram token");
   log("Would stop existing gateway (if running)");
   log(`Would install: npm install -g @inceptionstack/roundhouse`);
-  log(`Would install: npm install -g @mariozechner/pi-coding-agent`);
+  for (const pkg of agent.packages) {
+    const scope = pkg.install === "global" ? "-g " : "";
+    log(`Would install: npm install ${scope}${pkg.packageName}`);
+  }
   if (opts.psst) {
     log(`Would install: bun runtime (if not present)`);
     log(`Would install: npm install -g psst-cli`);
@@ -926,7 +1303,10 @@ function printDryRun(opts: SetupOptions): void {
   if (opts.psst) {
     log(`Would store TELEGRAM_BOT_TOKEN, BOT_USERNAME, ALLOWED_USERS in psst`);
   }
-  log(`Would configure: ~/.pi/agent/settings.json`);
+  if (agent.configDirs?.length) {
+    log(`Would configure: agent-specific settings`);
+    log(`  Agent: ${agent.name}`);
+  }
   log(`  Set defaultProvider: ${opts.provider}`);
   log(`  Set defaultModel: ${opts.model}`);
   log(`Would write: ~/.roundhouse/gateway.config.json`);
@@ -941,20 +1321,27 @@ function printDryRun(opts: SetupOptions): void {
 function printSetupHelp(): void {
   console.log(`
 Usage:
-  TELEGRAM_BOT_TOKEN=... roundhouse setup --user USERNAME
-  roundhouse setup --bot-token TOKEN --user USERNAME [options]
+  roundhouse setup --telegram                     Interactive wizard (recommended)
+  TELEGRAM_BOT_TOKEN=... roundhouse setup \\\n    --telegram --headless --user USERNAME          Headless automation (SSM/cloud-init)
+  TELEGRAM_BOT_TOKEN=... roundhouse setup \\\n    --user USERNAME                                Legacy (non-wizard) setup
 
-Required:
+Modes:
+  --telegram                 Telegram-focused setup (wizard or headless)
+  --headless                 Non-interactive automation (implies --non-interactive)
+                             Requires TELEGRAM_BOT_TOKEN env var and --user
+
+Required (or prompted in interactive --telegram):
   --user <username>          Telegram username (repeatable, strips @)
 
-Token (one required):
+Token:
   TELEGRAM_BOT_TOKEN env     Preferred — not in shell history
-  --bot-token <token>        Fallback for scripts
+  --bot-token <token>        Accepted in interactive mode only
 
 Agent:
+  --agent <type>             Agent type (default: pi; available: ${listAvailableAgentTypes().join(", ")})
   --provider <provider>      AI provider (default: amazon-bedrock)
   --model <model>            AI model (default: us.anthropic.claude-opus-4-6-v1)
-  --extension <pkg>          Pi extension (repeatable)
+  --extension <pkg>          Agent extension (repeatable)
   --cwd <path>               Agent working directory (default: ~)
 
 Channel:
@@ -965,6 +1352,10 @@ Service:
   --no-voice                 Disable voice/STT
   --with-psst                Use psst vault for secrets (default: .env file)
 
+Display:
+  --qr                       Force QR code display
+  --no-qr                    Disable QR code display
+
 Behavior:
   --non-interactive          No pairing, no prompts
   --force                    Overwrite existing configs