Merge branch 'main' into setup-telegram-no-telegram-fallback

2026-05-05 23:40:48 +03:00
parent 306fa6f014 fc09b900ef
commit 87f75eed79
34 changed files with 717 additions and 371 deletions
--- a/setup/add-whatsapp.sh
+++ b/setup/add-whatsapp.sh
@@ -16,7 +16,7 @@ PROJECT_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 cd "$PROJECT_ROOT"

 # Keep in sync with .claude/skills/add-whatsapp/SKILL.md.
-BAILEYS_VERSION="@whiskeysockets/baileys@6.17.16"
+BAILEYS_VERSION="@whiskeysockets/baileys@7.0.0-rc.9"
 QRCODE_VERSION="qrcode@1.5.4"
 QRCODE_TYPES_VERSION="@types/qrcode@1.5.6"
 PINO_VERSION="pino@9.6.0"
--- a/setup/auto.ts
+++ b/setup/auto.ts
@@ -29,6 +29,7 @@ import path from 'path';
 import * as p from '@clack/prompts';
 import k from 'kleur';

+import { BACK_TO_CHANNEL_SELECTION } from './lib/back-nav.js';
 import { runDiscordChannel } from './channels/discord.js';
 import { runIMessageChannel } from './channels/imessage.js';
 import { runSignalChannel } from './channels/signal.js';
@@ -440,35 +441,45 @@ async function main(): Promise<void> {
  let channelChoice: ChannelChoice = 'skip';

  if (!skip.has('channel')) {
-    channelChoice = await askChannelChoice();
-    if (channelChoice !== 'skip' && channelChoice !== 'other') {
-      await resolveDisplayName();
-    }
-    if (channelChoice === 'telegram') {
-      await runTelegramChannel(displayName!);
-    } else if (channelChoice === 'discord') {
-      await runDiscordChannel(displayName!);
-    } else if (channelChoice === 'whatsapp') {
-      await runWhatsAppChannel(displayName!);
-    } else if (channelChoice === 'signal') {
-      await runSignalChannel(displayName!);
-    } else if (channelChoice === 'teams') {
-      await runTeamsChannel(displayName!);
-    } else if (channelChoice === 'slack') {
-      await runSlackChannel(displayName!);
-    } else if (channelChoice === 'imessage') {
-      await runIMessageChannel(displayName!);
-    } else if (channelChoice === 'other') {
-      await askOtherChannelName();
-    } else {
-      p.log.info(
-        brandBody(
-          wrapForGutter(
-            'No messaging app for now. You can add one later (like Telegram, Discord, WhatsApp, Teams, Slack, or iMessage).',
-            4,
+    // Loop so a channel sub-flow can return BACK_TO_CHANNEL_SELECTION on
+    // its first prompt and bounce the user back to the chooser without
+    // restarting setup. Channels not yet wired with the back option just
+    // return void and the loop exits after one pass.
+    let backed = true;
+    while (backed) {
+      backed = false;
+      channelChoice = await askChannelChoice();
+      if (channelChoice !== 'skip' && channelChoice !== 'other') {
+        await resolveDisplayName();
+      }
+      let result: void | typeof BACK_TO_CHANNEL_SELECTION;
+      if (channelChoice === 'telegram') {
+        result = await runTelegramChannel(displayName!);
+      } else if (channelChoice === 'discord') {
+        result = await runDiscordChannel(displayName!);
+      } else if (channelChoice === 'whatsapp') {
+        result = await runWhatsAppChannel(displayName!);
+      } else if (channelChoice === 'signal') {
+        result = await runSignalChannel(displayName!);
+      } else if (channelChoice === 'teams') {
+        result = await runTeamsChannel(displayName!);
+      } else if (channelChoice === 'slack') {
+        result = await runSlackChannel(displayName!);
+      } else if (channelChoice === 'imessage') {
+        result = await runIMessageChannel(displayName!);
+      } else if (channelChoice === 'other') {
+        await askOtherChannelName();
+      } else {
+        p.log.info(
+          brandBody(
+            wrapForGutter(
+              'No messaging app for now. You can add one later (like Telegram, Discord, WhatsApp, Teams, Slack, or iMessage).',
+              4,
+            ),
          ),
-        ),
-      );
+        );
+      }
+      if (result === BACK_TO_CHANNEL_SELECTION) backed = true;
    }
  }

--- a/setup/channels/discord.ts
+++ b/setup/channels/discord.ts
@@ -27,6 +27,7 @@ import * as p from '@clack/prompts';
 import k from 'kleur';

 import * as setupLog from '../logs.js';
+import { BACK_TO_CHANNEL_SELECTION, type ChannelFlowResult } from '../lib/back-nav.js';
 import { brightSelect } from '../lib/bright-select.js';
 import { confirmThenOpen, formatNoteLink } from '../lib/browser.js';
 import { askOperatorRole } from '../lib/role-prompt.js';
@@ -48,8 +49,10 @@ interface AppInfo {
  owner: { id: string; username: string } | null;
 }

-export async function runDiscordChannel(displayName: string): Promise<void> {
-  const hasBot = await askHasBotToken();
+export async function runDiscordChannel(displayName: string): Promise<ChannelFlowResult> {
+  const choice = await askHasBotToken();
+  if (choice === 'back') return BACK_TO_CHANNEL_SELECTION;
+  const hasBot = choice === 'yes';
  if (!hasBot) {
    await walkThroughBotCreation();
  }
@@ -142,17 +145,18 @@ export async function runDiscordChannel(displayName: string): Promise<void> {
  }
 }

-async function askHasBotToken(): Promise<boolean> {
+async function askHasBotToken(): Promise<'yes' | 'no' | 'back'> {
  const answer = ensureAnswer(
    await brightSelect({
      message: 'Do you already have a Discord bot?',
      options: [
        { value: 'yes', label: 'Yes, I have a bot token ready' },
        { value: 'no', label: "No, walk me through creating one" },
+        { value: 'back', label: '← Back to channel selection' },
      ],
    }),
  );
-  return answer === 'yes';
+  return answer as 'yes' | 'no' | 'back';
 }

 async function walkThroughBotCreation(): Promise<void> {
--- a/setup/channels/imessage.ts
+++ b/setup/channels/imessage.ts
@@ -33,6 +33,7 @@ import * as p from '@clack/prompts';
 import k from 'kleur';

 import * as setupLog from '../logs.js';
+import { BACK_TO_CHANNEL_SELECTION, type ChannelFlowResult } from '../lib/back-nav.js';
 import { brightSelect } from '../lib/bright-select.js';
 import { askOperatorRole } from '../lib/role-prompt.js';
 import { ensureAnswer, fail, runQuietChild } from '../lib/runner.js';
@@ -48,10 +49,11 @@ interface RemoteCreds {
  apiKey: string;
 }

-export async function runIMessageChannel(displayName: string): Promise<void> {
+export async function runIMessageChannel(displayName: string): Promise<ChannelFlowResult> {
  const isMac = os.platform() === 'darwin';

  const mode = await askMode(isMac);
+  if (mode === 'back') return BACK_TO_CHANNEL_SELECTION;
  let remoteCreds: RemoteCreds | null = null;

  if (mode === 'local') {
@@ -139,34 +141,38 @@ export async function runIMessageChannel(displayName: string): Promise<void> {
  }
 }

-async function askMode(isMac: boolean): Promise<Mode> {
+async function askMode(isMac: boolean): Promise<Mode | 'back'> {
+  const baseOptions = isMac
+    ? [
+        {
+          value: 'local' as const,
+          label: 'Local (this Mac)',
+          hint: "uses this machine's iMessage account",
+        },
+        {
+          value: 'remote' as const,
+          label: 'Remote (Photon API)',
+          hint: 'the bot lives on another server',
+        },
+      ]
+    : [
+        {
+          value: 'remote' as const,
+          label: 'Remote (Photon API)',
+          hint: 'only option off macOS',
+        },
+      ];
  const choice = ensureAnswer(
-    await brightSelect<Mode>({
+    await brightSelect<Mode | 'back'>({
      message: 'How should iMessage run?',
      initialValue: isMac ? 'local' : 'remote',
-      options: isMac
-        ? [
-            {
-              value: 'local',
-              label: 'Local (this Mac)',
-              hint: "uses this machine's iMessage account",
-            },
-            {
-              value: 'remote',
-              label: 'Remote (Photon API)',
-              hint: 'the bot lives on another server',
-            },
-          ]
-        : [
-            {
-              value: 'remote',
-              label: 'Remote (Photon API)',
-              hint: 'only option off macOS',
-            },
-          ],
+      options: [
+        ...baseOptions,
+        { value: 'back', label: '← Back to channel selection' },
+      ],
    }),
  );
-  setupLog.userInput('imessage_mode', String(choice));
+  if (choice !== 'back') setupLog.userInput('imessage_mode', String(choice));
  return choice;
 }

--- a/setup/channels/signal.ts
+++ b/setup/channels/signal.ts
@@ -33,6 +33,8 @@ import k from 'kleur';

 import * as setupLog from '../logs.js';
 import { getLaunchdLabel, getSystemdUnit } from '../../src/install-slug.js';
+import { BACK_TO_CHANNEL_SELECTION, type ChannelFlowResult } from '../lib/back-nav.js';
+import { brightSelect } from '../lib/bright-select.js';
 import {
  type Block,
  type StepResult,
@@ -48,7 +50,33 @@ import { accentGreen, fmtDuration, note } from '../lib/theme.js';

 const DEFAULT_AGENT_NAME = 'Nano';

-export async function runSignalChannel(displayName: string): Promise<void> {
+export async function runSignalChannel(displayName: string): Promise<ChannelFlowResult> {
+  note(
+    [
+      "NanoClaw links to Signal as a *secondary* device on your existing",
+      "phone — no new number needed. Your assistant will send and receive",
+      "messages as the number on that phone.",
+      '',
+      "Here's what's about to happen — no input needed for any of it:",
+      '',
+      '  1. Set up signal-cli (auto-installs if missing)',
+      '  2. Install the Signal adapter',
+      '  3. Show a QR code — scan it from Signal → Settings → Linked Devices',
+      '  4. Wire your assistant and send a welcome message',
+    ].join('\n'),
+    'Set up Signal',
+  );
+
+  const proceed = ensureAnswer(await brightSelect<'continue' | 'back'>({
+    message: 'Ready to set up Signal?',
+    options: [
+      { value: 'continue', label: 'Continue' },
+      { value: 'back', label: '← Back to channel selection' },
+    ],
+    initialValue: 'continue',
+  }));
+  if (proceed === 'back') return BACK_TO_CHANNEL_SELECTION;
+
  await ensureSignalCli();

  const install = await runQuietChild(
@@ -134,42 +162,74 @@ export async function runSignalChannel(displayName: string): Promise<void> {

 async function ensureSignalCli(): Promise<void> {
  const cli = process.env.SIGNAL_CLI_PATH || 'signal-cli';
-  const probe = spawnSync(cli, ['--version'], {
-    stdio: ['ignore', 'pipe', 'pipe'],
-  });
-  if (!probe.error && probe.status === 0) return;
+  const probeFor = (): boolean => {
+    const r = spawnSync(cli, ['--version'], {
+      stdio: ['ignore', 'pipe', 'pipe'],
+    });
+    return !r.error && r.status === 0;
+  };
+  if (probeFor()) return;

+  note(
+    [
+      "NanoClaw talks to Signal through signal-cli, which isn't installed yet.",
+      "We'll install it for you now — about 30 seconds, one-time only.",
+      '',
+      process.platform === 'darwin'
+        ? "On this Mac we'll use Homebrew (no admin password needed)."
+        : "On Linux we'll grab the native release binary (no Java needed) and install it to ~/.local/bin.",
+    ].join('\n'),
+    'Setting up signal-cli',
+  );
+
+  const install = await runQuietChild(
+    'install-signal-cli',
+    'bash',
+    ['setup/install-signal-cli.sh'],
+    {
+      running: 'Installing signal-cli…',
+      done: 'signal-cli installed.',
+    },
+  );
+
+  if (install.ok && probeFor()) return;
+
+  const reason = install.terminal?.fields.ERROR;
  if (process.platform === 'darwin') {
    note(
      [
-        "NanoClaw talks to Signal through signal-cli, which isn't installed yet.",
+        "We couldn't install signal-cli automatically.",
+        reason === 'homebrew_not_installed'
+          ? '  Reason: Homebrew is not installed.'
+          : `  Reason: ${reason ?? 'unknown'}.`,
        '',
-        'The quickest way on macOS is Homebrew:',
+        'You can install it manually:',
        '',
        k.cyan('  brew install signal-cli'),
        '',
-        "Install it in another terminal, then re-run setup.",
+        'Then re-run setup.',
      ].join('\n'),
-      'signal-cli not found',
+      "Couldn't install signal-cli",
    );
  } else {
    note(
      [
-        "NanoClaw talks to Signal through signal-cli, which isn't installed yet.",
+        "We couldn't install signal-cli automatically.",
+        `  Reason: ${reason ?? 'unknown'}.`,
        '',
-        'Grab the latest release from GitHub:',
+        'You can install it manually from GitHub:',
        '',
        k.cyan('  https://github.com/AsamK/signal-cli/releases'),
        '',
-        "Install it, make sure `signal-cli --version` works, then re-run setup.",
+        'Then re-run setup.',
      ].join('\n'),
-      'signal-cli not found',
+      "Couldn't install signal-cli",
    );
  }
  await fail(
-    'signal-install',
-    'signal-cli is required but not installed.',
-    'Install it and re-run setup.',
+    'install-signal-cli',
+    'signal-cli is required but the auto-install failed.',
+    'Install it manually and re-run setup.',
  );
 }

--- a/setup/channels/slack.ts
+++ b/setup/channels/slack.ts
@@ -25,7 +25,10 @@ import * as p from '@clack/prompts';
 import k from 'kleur';

 import * as setupLog from '../logs.js';
-import { confirmThenOpen, formatNoteLink } from '../lib/browser.js';
+import { BACK_TO_CHANNEL_SELECTION, type ChannelFlowResult } from '../lib/back-nav.js';
+import { brightSelect } from '../lib/bright-select.js';
+import { formatNoteLink, openUrl } from '../lib/browser.js';
+import { isHeadless } from '../platform.js';
 import { askOperatorRole } from '../lib/role-prompt.js';
 import { ensureAnswer, fail, runQuietChild } from '../lib/runner.js';
 import { readEnvKey } from '../environment.js';
@@ -42,8 +45,9 @@ interface WorkspaceInfo {
  botUserId: string;
 }

-export async function runSlackChannel(displayName: string): Promise<void> {
-  await walkThroughAppCreation();
+export async function runSlackChannel(displayName: string): Promise<ChannelFlowResult> {
+  const intro = await walkThroughAppCreation();
+  if (intro === 'back') return BACK_TO_CHANNEL_SELECTION;

  const token = await collectBotToken();
  const signingSecret = await collectSigningSecret();
@@ -121,7 +125,7 @@ export async function runSlackChannel(displayName: string): Promise<void> {
  showPostInstallChecklist(info);
 }

-async function walkThroughAppCreation(): Promise<void> {
+async function walkThroughAppCreation(): Promise<'continue' | 'back'> {
  note(
    [
      "You'll create a Slack app that the assistant talks through.",
@@ -140,7 +144,20 @@ async function walkThroughAppCreation(): Promise<void> {
    ].filter((line): line is string => line !== null).join('\n'),
    'Create a Slack app',
  );
-  await confirmThenOpen(SLACK_APPS_URL, 'Press Enter to open Slack app settings');
+
+  // Back-aware gate replacing the old `confirmThenOpen` "Press Enter to open
+  // Slack app settings" so users can bail out of Slack before we open the
+  // browser or ask for tokens.
+  const choice = ensureAnswer(await brightSelect<'open' | 'back'>({
+    message: 'Open Slack app settings in your browser?',
+    options: [
+      { value: 'open', label: 'Open Slack app settings' },
+      { value: 'back', label: '← Back to channel selection' },
+    ],
+    initialValue: 'open',
+  }));
+  if (choice === 'back') return 'back';
+  if (!isHeadless()) openUrl(SLACK_APPS_URL);

  ensureAnswer(
    await p.confirm({
@@ -148,6 +165,7 @@ async function walkThroughAppCreation(): Promise<void> {
      initialValue: true,
    }),
  );
+  return 'continue';
 }

 async function collectBotToken(): Promise<string> {
--- a/setup/channels/teams.ts
+++ b/setup/channels/teams.ts
@@ -30,6 +30,7 @@ import path from 'path';
 import * as p from '@clack/prompts';
 import k from 'kleur';

+import { BACK_TO_CHANNEL_SELECTION, type ChannelFlowResult } from '../lib/back-nav.js';
 import { brightSelect } from '../lib/bright-select.js';
 import { confirmThenOpen } from '../lib/browser.js';
 import {
@@ -57,18 +58,24 @@ interface Collected {
  agentName?: string;
 }

-export async function runTeamsChannel(_displayName: string): Promise<void> {
+export async function runTeamsChannel(_displayName: string): Promise<ChannelFlowResult> {
  const collected: Collected = {};
  const completed: string[] = [];

  const existingAppId = readEnvKey('TEAMS_APP_ID');
  const existingPassword = readEnvKey('TEAMS_APP_PASSWORD');
  if (existingAppId && existingPassword) {
-    const reuse = ensureAnswer(await p.confirm({
+    const choice = ensureAnswer(await brightSelect<'yes' | 'no' | 'back'>({
      message: `Found existing Teams credentials (App ID: ${existingAppId.slice(0, 8)}…). Use them?`,
-      initialValue: true,
+      options: [
+        { value: 'yes', label: 'Yes, use the existing credentials' },
+        { value: 'no', label: "No, set up new ones" },
+        { value: 'back', label: '← Back to channel selection' },
+      ],
+      initialValue: 'yes',
    }));
-    if (reuse) {
+    if (choice === 'back') return BACK_TO_CHANNEL_SELECTION;
+    if (choice === 'yes') {
      collected.appId = existingAppId;
      collected.appPassword = existingPassword;
      collected.appType = (readEnvKey('TEAMS_APP_TYPE') as 'SingleTenant' | 'MultiTenant') || 'MultiTenant';
@@ -85,7 +92,8 @@ export async function runTeamsChannel(_displayName: string): Promise<void> {

  printIntro();

-  await confirmPrereqs({ collected, completed });
+  const prereqsResult = await confirmPrereqs({ collected, completed });
+  if (prereqsResult === 'back') return BACK_TO_CHANNEL_SELECTION;
  await stepPublicUrl({ collected, completed });
  await stepAppRegistration({ collected, completed });
  await stepClientSecret({ collected, completed });
@@ -116,7 +124,7 @@ function printIntro(): void {
  );
 }

-async function confirmPrereqs(args: { collected: Collected; completed: string[] }): Promise<void> {
+async function confirmPrereqs(args: { collected: Collected; completed: string[] }): Promise<'continue' | 'back'> {
  note(
    [
      'Before we start, confirm you have:',
@@ -131,13 +139,36 @@ async function confirmPrereqs(args: { collected: Collected; completed: string[]
    'Prereqs',
  );

-  await stepGate({
-    stepName: 'teams-prereqs',
-    stepDescription: 'confirming they have the right Microsoft 365 tenant and tunnel',
-    reshow: () => confirmPrereqs(args),
-    args,
-  });
+  // Back-aware variant of stepGate — Back is only offered on the very first
+  // step of the Teams flow so users can bail out before any state is taken.
+  while (true) {
+    const choice = ensureAnswer(
+      await brightSelect<'done' | 'help' | 'reshow' | 'back'>({
+        message: 'How did that go?',
+        options: [
+          { value: 'done', label: "Done — let's continue" },
+          { value: 'help', label: 'Stuck — hand me off to Claude' },
+          { value: 'reshow', label: 'Show me the steps again' },
+          { value: 'back', label: '← Back to channel selection' },
+        ],
+      }),
+    );
+    if (choice === 'back') return 'back';
+    if (choice === 'done') break;
+    if (choice === 'help') {
+      await offerHandoff({
+        step: 'teams-prereqs',
+        stepDescription: 'confirming they have the right Microsoft 365 tenant and tunnel',
+        args,
+      });
+      continue;
+    }
+    if (choice === 'reshow') {
+      return confirmPrereqs(args);
+    }
+  }
  args.completed.push('Prereqs confirmed.');
+  return 'continue';
 }

 // ─── step: public URL ──────────────────────────────────────────────────
--- a/setup/channels/telegram.ts
+++ b/setup/channels/telegram.ts
@@ -21,8 +21,10 @@ import * as p from '@clack/prompts';
 import k from 'kleur';

 import * as setupLog from '../logs.js';
-import { openUrl } from '../lib/browser.js';
 import { isHeadless } from '../platform.js';
+import { BACK_TO_CHANNEL_SELECTION, type ChannelFlowResult } from '../lib/back-nav.js';
+import { confirmThenOpen, formatNoteLink, openUrl } from '../lib/browser.js';
+import { brightSelect } from '../lib/bright-select.js';
 import { askOperatorRole } from '../lib/role-prompt.js';
 import {
  type Block,
@@ -39,8 +41,10 @@ import { accentGreen, brandBold, fitToWidth, fmtDuration, note } from '../lib/th

 const DEFAULT_AGENT_NAME = 'Nano';

-export async function runTelegramChannel(displayName: string): Promise<void> {
-  const token = await collectTelegramToken();
+export async function runTelegramChannel(displayName: string): Promise<ChannelFlowResult> {
+  const tokenOrBack = await collectTelegramToken();
+  if (tokenOrBack === 'back') return BACK_TO_CHANNEL_SELECTION;
+  const token = tokenOrBack;
  const botUsername = await validateTelegramToken(token);

  // Deep-link the user into the bot's chat so they're on the right screen
@@ -155,17 +159,24 @@ export async function runTelegramChannel(displayName: string): Promise<void> {
  }
 }

-async function collectTelegramToken(): Promise<string> {
+async function collectTelegramToken(): Promise<string | 'back'> {
  const existing = readEnvKey('TELEGRAM_BOT_TOKEN');
  if (existing && /^[0-9]+:[A-Za-z0-9_-]{35,}$/.test(existing)) {
-    const reuse = ensureAnswer(await p.confirm({
+    const choice = ensureAnswer(await brightSelect<'yes' | 'no' | 'back'>({
      message: `Found an existing Telegram bot token (${existing.slice(0, 8)}…). Use it?`,
-      initialValue: true,
+      options: [
+        { value: 'yes', label: 'Yes, use the existing token' },
+        { value: 'no', label: 'No, paste a new one' },
+        { value: 'back', label: '← Back to channel selection' },
+      ],
+      initialValue: 'yes',
    }));
-    if (reuse) {
+    if (choice === 'back') return 'back';
+    if (choice === 'yes') {
      setupLog.userInput('telegram_token', 'reused-existing');
      return existing;
    }
+    // 'no' falls through to the paste flow below
  }

  note(
@@ -183,6 +194,19 @@ async function collectTelegramToken(): Promise<string> {
    'Set up your Telegram bot',
  );

+  // Back-aware gate before the password prompt — `p.password` doesn't
+  // accept extra options, so we offer Back as a separate brightSelect
+  // immediately after the BotFather instructions and before the paste.
+  const proceed = ensureAnswer(await brightSelect<'continue' | 'back'>({
+    message: 'Ready to paste your bot token?',
+    options: [
+      { value: 'continue', label: 'Yes, paste it on the next prompt' },
+      { value: 'back', label: '← Back to channel selection' },
+    ],
+    initialValue: 'continue',
+  }));
+  if (proceed === 'back') return 'back';
+
  const answer = ensureAnswer(
    await p.password({
      message: 'Paste your bot token',
--- a/setup/channels/whatsapp.ts
+++ b/setup/channels/whatsapp.ts
@@ -33,6 +33,7 @@ import * as p from '@clack/prompts';
 import k from 'kleur';

 import * as setupLog from '../logs.js';
+import { BACK_TO_CHANNEL_SELECTION, type ChannelFlowResult } from '../lib/back-nav.js';
 import { brightSelect } from '../lib/bright-select.js';
 import { getLaunchdLabel, getSystemdUnit } from '../../src/install-slug.js';
 import {
@@ -53,8 +54,9 @@ const AUTH_CREDS_PATH = path.join(process.cwd(), 'store', 'auth', 'creds.json');

 type AuthMethod = 'qr' | 'pairing-code';

-export async function runWhatsAppChannel(displayName: string): Promise<void> {
+export async function runWhatsAppChannel(displayName: string): Promise<ChannelFlowResult> {
  const method = await askAuthMethod();
+  if (method === 'back') return BACK_TO_CHANNEL_SELECTION;
  const phone = method === 'pairing-code' ? await askPhoneNumber() : undefined;

  const install = await runQuietChild(
@@ -148,7 +150,7 @@ export async function runWhatsAppChannel(displayName: string): Promise<void> {
  }
 }

-async function askAuthMethod(): Promise<AuthMethod> {
+async function askAuthMethod(): Promise<AuthMethod | 'back'> {
  const choice = ensureAnswer(
    await brightSelect({
      message: 'How would you like to authenticate with WhatsApp?',
@@ -163,10 +165,14 @@ async function askAuthMethod(): Promise<AuthMethod> {
          label: 'Enter a pairing code on your phone',
          hint: 'no camera needed',
        },
+        {
+          value: 'back',
+          label: '← Back to channel selection',
+        },
      ],
    }),
-  ) as AuthMethod;
-  setupLog.userInput('whatsapp_auth_method', choice);
+  ) as AuthMethod | 'back';
+  if (choice !== 'back') setupLog.userInput('whatsapp_auth_method', choice);
  return choice;
 }

@@ -312,7 +318,7 @@ async function renderQr(qr: string): Promise<string[]> {
    const QRCode = await import('qrcode');
    const qrText = await QRCode.toString(qr, { type: 'terminal', small: true });
    const caption = k.dim(
-      '   Open WhatsApp → Settings → Linked Devices → Link a Device → scan.',
+      '   Open WhatsApp → You / Settings → Linked Devices → Link a Device → scan.',
    );
    return [...qrText.trimEnd().split('\n'), '', caption];
  } catch {
@@ -328,7 +334,7 @@ function formatPairingCard(code: string): string {
    '',
    `   ${brandBold(spaced)}`,
    '',
-    k.dim('   Open WhatsApp → Settings → Linked Devices → Link a Device'),
+    k.dim('   Open WhatsApp → You / Settings → Linked Devices → Link a Device'),
    k.dim('   → "Link with phone number instead" → enter this code.'),
    k.dim('   It expires in ~60 seconds.'),
  ].join('\n');
--- a/setup/install-node.sh
+++ b/setup/install-node.sh
@@ -17,30 +17,40 @@ if command -v node >/dev/null 2>&1; then
  exit 0
 fi

-case "$(uname -s)" in
-  Darwin)
-    echo "STEP: brew-install-node"
-    if ! command -v brew >/dev/null 2>&1; then
+if command -v uvx >/dev/null 2>&1; then
+  echo "STEP: uvx-nodeenv"
+  uvx nodeenv -n lts ~/node
+  mkdir -p ~/.local/bin
+  ln -sf ~/node/bin/node ~/.local/bin/node
+  ln -sf ~/node/bin/npm ~/.local/bin/npm
+  ln -sf ~/node/bin/npx ~/.local/bin/npx
+  ln -sf ~/node/bin/pnpm ~/.local/bin/pnpm
+else
+  case "$(uname -s)" in
+    Darwin)
+      echo "STEP: brew-install-node"
+      if ! command -v brew >/dev/null 2>&1; then
+        echo "STATUS: failed"
+        echo "ERROR: Homebrew not installed. Install brew first (https://brew.sh) then re-run."
+        echo "=== END ==="
+        exit 1
+      fi
+      brew install node@22
+      ;;
+    Linux)
+      echo "STEP: nodesource-setup"
+      curl -fsSL https://deb.nodesource.com/setup_22.x | sudo -E bash -
+      echo "STEP: apt-install-nodejs"
+      sudo apt-get install -y nodejs
+      ;;
+    *)
      echo "STATUS: failed"
-      echo "ERROR: Homebrew not installed. Install brew first (https://brew.sh) then re-run."
+      echo "ERROR: Unsupported platform: $(uname -s)"
      echo "=== END ==="
      exit 1
-    fi
-    brew install node@22
-    ;;
-  Linux)
-    echo "STEP: nodesource-setup"
-    curl -fsSL https://deb.nodesource.com/setup_22.x | sudo -E bash -
-    echo "STEP: apt-install-nodejs"
-    sudo apt-get install -y nodejs
-    ;;
-  *)
-    echo "STATUS: failed"
-    echo "ERROR: Unsupported platform: $(uname -s)"
-    echo "=== END ==="
-    exit 1
-    ;;
-esac
+      ;;
+  esac
+fi

 if ! command -v node >/dev/null 2>&1; then
  echo "STATUS: failed"
--- a/setup/install-signal-cli.sh
+++ b/setup/install-signal-cli.sh
@@ -0,0 +1,78 @@
+#!/usr/bin/env bash
+# install-signal-cli.sh — auto-install signal-cli on the host.
+#
+# NanoClaw needs `signal-cli` on PATH to talk to Signal. Picks the right
+# install method per platform:
+#   macOS  → `brew install signal-cli` (bottled, no Java needed)
+#   Linux  → download latest native binary from GitHub releases to
+#            ~/.local/bin/signal-cli (no Java, no sudo)
+#
+# Emits the standard NanoClaw STATUS block on success or failure so the
+# `runQuietChild` driver can parse the outcome.
+
+set -euo pipefail
+
+VERSION="0.14.3"
+INSTALL_DIR="${HOME}/.local/bin"
+
+emit_status() {
+  local status=$1 error=${2:-}
+  echo "=== NANOCLAW SETUP: INSTALL_SIGNAL_CLI ==="
+  echo "STATUS: ${status}"
+  [ -n "$error" ] && echo "ERROR: ${error}"
+  echo "=== END ==="
+}
+
+log() { echo "[install-signal-cli] $*" >&2; }
+
+uname_s=$(uname)
+
+if [[ "${uname_s}" == "Darwin" ]]; then
+  if ! command -v brew >/dev/null 2>&1; then
+    emit_status failed "homebrew_not_installed"
+    exit 1
+  fi
+  log "Installing signal-cli via Homebrew…"
+  brew install signal-cli >&2 || {
+    emit_status failed "brew_install_failed"
+    exit 1
+  }
+  emit_status success
+  exit 0
+fi
+
+if [[ "${uname_s}" != "Linux" ]]; then
+  emit_status failed "unsupported_platform_${uname_s}"
+  exit 1
+fi
+
+# Linux native build (no Java required) → ~/.local/bin/signal-cli.
+URL="https://github.com/AsamK/signal-cli/releases/download/v${VERSION}/signal-cli-${VERSION}-Linux-native.tar.gz"
+TARBALL=$(mktemp -t signal-cli.XXXXXX.tar.gz)
+
+log "Downloading signal-cli v${VERSION} (~96MB)…"
+if ! curl -fLsS -o "${TARBALL}" "${URL}"; then
+  rm -f "${TARBALL}"
+  emit_status failed "download_failed"
+  exit 1
+fi
+
+log "Extracting…"
+EXTRACT_DIR=$(mktemp -d)
+if ! tar -xzf "${TARBALL}" -C "${EXTRACT_DIR}"; then
+  rm -rf "${TARBALL}" "${EXTRACT_DIR}"
+  emit_status failed "extract_failed"
+  exit 1
+fi
+
+mkdir -p "${INSTALL_DIR}"
+log "Installing to ${INSTALL_DIR}/signal-cli…"
+if ! mv "${EXTRACT_DIR}/signal-cli" "${INSTALL_DIR}/signal-cli"; then
+  rm -rf "${TARBALL}" "${EXTRACT_DIR}"
+  emit_status failed "install_failed"
+  exit 1
+fi
+chmod +x "${INSTALL_DIR}/signal-cli"
+rm -rf "${TARBALL}" "${EXTRACT_DIR}"
+
+emit_status success
--- a/setup/install-whatsapp.sh
+++ b/setup/install-whatsapp.sh
@@ -66,7 +66,7 @@ if ! grep -q "'whatsapp-auth':" setup/index.ts; then
 fi

 echo "STEP: pnpm-install"
-pnpm install @whiskeysockets/baileys@6.17.16 qrcode@1.5.4 @types/qrcode@1.5.6 pino@9.6.0
+pnpm install @whiskeysockets/baileys@7.0.0-rc.9 qrcode@1.5.4 @types/qrcode@1.5.6 pino@9.6.0

 echo "STEP: pnpm-build"
 pnpm run build
--- a/setup/lib/back-nav.ts
+++ b/setup/lib/back-nav.ts
@@ -0,0 +1,17 @@
+/**
+ * Channel-flow back-navigation sentinel.
+ *
+ * Each `runXxxChannel(displayName)` in `setup/channels/` may return either
+ * `void` (sub-flow completed normally) or `BACK_TO_CHANNEL_SELECTION` to
+ * signal "the user picked '← Back to channel selection' on my first
+ * prompt; please re-run the channel chooser." `setup/auto.ts` catches
+ * that signal and loops back to `askChannelChoice()`.
+ *
+ * Back is only offered on the *first* interactive prompt of each channel
+ * sub-flow — once the user has answered something, they're committed
+ * (subsequent steps may have side effects like opening browsers, hitting
+ * APIs, or installing adapter packages, none of which are easily undone).
+ */
+export const BACK_TO_CHANNEL_SELECTION = Symbol('BACK_TO_CHANNEL_SELECTION');
+
+export type ChannelFlowResult = void | typeof BACK_TO_CHANNEL_SELECTION;
--- a/setup/lib/windowed-runner.ts
+++ b/setup/lib/windowed-runner.ts
@@ -23,7 +23,7 @@ import { emit as phEmit } from './diagnostics.js';
 import type { StepResult, SpinnerLabels } from './runner.js';
 import { dumpTranscriptOnFailure, spawnStep, writeStepEntry } from './runner.js';
 import * as setupLog from '../logs.js';
-import { brandBody, fitToWidth } from './theme.js';
+import { brandBody, fitToWidth, fmtDuration } from './theme.js';

 const WINDOW_SIZE = 3;
 const SPINNER_FRAMES = ['◒', '◐', '◓', '◑'];
@@ -85,9 +85,8 @@ async function runUnderWindow(
  const redraw = (): void => {
    if (stallPromptActive) return;
    out.write(`\x1b[${WINDOW_SIZE + 1}A`);
-    const elapsed = Math.round((Date.now() - start) / 1000);
    const icon = SPINNER_FRAMES[frameIdx % SPINNER_FRAMES.length];
-    const suffix = ` (${elapsed}s)`;
+    const suffix = ` (${fmtDuration(Date.now() - start)})`;
    const header = fitToWidth(labels.running, suffix);
    out.write(`\x1b[2K${k.cyan(icon)}  ${header}${k.dim(suffix)}\n`);

@@ -164,8 +163,7 @@ async function runUnderWindow(
  out.write(SHOW_CURSOR);
  process.off('exit', restoreCursorOnExit);

-  const elapsed = Math.round((Date.now() - start) / 1000);
-  const suffix = ` (${elapsed}s)`;
+  const suffix = ` (${fmtDuration(Date.now() - start)})`;
  if (result.ok) {
    const isSkipped = result.terminal?.fields.STATUS === 'skipped';
    const msg = isSkipped && labels.skipped ? labels.skipped : labels.done;
--- a/setup/migrate-v2/whatsapp-resolve-lids.ts
+++ b/setup/migrate-v2/whatsapp-resolve-lids.ts
@@ -1,192 +0,0 @@
-/**
- * migrate-v2 step: resolve WhatsApp LIDs for migrated DM messaging_groups.
- *
- * Why this exists
- * ───────────────
- * v1 stored every WhatsApp DM as `<phone>@s.whatsapp.net`. v2's WA adapter
- * sometimes resolves the chat to `<lid>@lid` instead — when WhatsApp
- * delivers a message via the LID protocol and Baileys hasn't yet learned
- * a LID→phone mapping for that contact (cold cache after migration). The
- * router then can't find the phone-keyed messaging_group and silently
- * drops the message at router.ts:184 — until the LID is learned (which
- * happens lazily, message-by-message, via `chats.phoneNumberShare`).
- *
- * Baileys persists LID↔phone mappings to disk as
- * `store/auth/lid-mapping-<lid>_reverse.json` (LID → phone) and
- * `lid-mapping-<phone>.json` (phone → LID). v1 will already have populated
- * these for every contact it talked to. This step parses the reverse
- * files and writes paired LID-keyed `messaging_groups` +
- * `messaging_group_agents` rows so both `<phone>@s.whatsapp.net` and
- * `<lid>@lid` route to the same agent_group with the same engage rules.
- *
- * No Baileys boot, no network — pure filesystem read. If store/auth is
- * missing or has no reverse mappings, exits 0 with a SKIPPED. Runtime
- * fallback (WA adapter sets isMention=true on DMs → router auto-creates
- * with `unknown_sender_policy=request_approval`) handles anything we
- * miss.
- *
- * Usage: pnpm exec tsx setup/migrate-v2/whatsapp-resolve-lids.ts
- */
-import fs from 'fs';
-import path from 'path';
-
-import { DATA_DIR } from '../../src/config.js';
-import { initDb } from '../../src/db/connection.js';
-import {
-  createMessagingGroup,
-  createMessagingGroupAgent,
-  getMessagingGroupAgentByPair,
-  getMessagingGroupByPlatform,
-} from '../../src/db/messaging-groups.js';
-import { runMigrations } from '../../src/db/migrations/index.js';
-import { generateId } from './shared.js';
-
-interface RawMessagingGroup {
-  id: string;
-  channel_type: string;
-  platform_id: string;
-}
-
-interface RawWiring {
-  id: string;
-  messaging_group_id: string;
-  agent_group_id: string;
-  engage_mode: string;
-  engage_pattern: string | null;
-  sender_scope: string;
-  ignored_message_policy: string;
-  session_mode: string;
-  priority: number;
-}
-
-const REVERSE_FILE_RE = /^lid-mapping-(\d+)_reverse\.json$/;
-
-/**
- * Read store/auth/lid-mapping-*_reverse.json into a Map<lidUser, phoneUser>.
- * Returns an empty Map if the directory doesn't exist.
- */
-function readReverseMappings(authDir: string): Map<string, string> {
-  const out = new Map<string, string>();
-  if (!fs.existsSync(authDir)) return out;
-  for (const entry of fs.readdirSync(authDir)) {
-    const m = REVERSE_FILE_RE.exec(entry);
-    if (!m) continue;
-    const lidUser = m[1];
-    try {
-      const raw = fs.readFileSync(path.join(authDir, entry), 'utf-8').trim();
-      // The file content is a JSON-encoded string: `"<phone>"`
-      const phoneUser = JSON.parse(raw);
-      if (typeof phoneUser !== 'string' || phoneUser.length === 0) continue;
-      out.set(lidUser, phoneUser);
-    } catch {
-      // Skip malformed entries — best-effort.
-    }
-  }
-  return out;
-}
-
-function phoneUserOf(jid: string): string {
-  return jid.split('@')[0].split(':')[0];
-}
-
-function main(): void {
-  const authDir = path.join(process.cwd(), 'store', 'auth');
-  const reverse = readReverseMappings(authDir);
-
-  if (reverse.size === 0) {
-    console.log('SKIPPED:no lid-mapping-*_reverse.json files in store/auth');
-    process.exit(0);
-  }
-
-  // phoneUser → lidJid (the form we'll write to messaging_groups)
-  const phoneUserToLidJid = new Map<string, string>();
-  for (const [lidUser, phoneUser] of reverse) {
-    phoneUserToLidJid.set(phoneUser, `${lidUser}@lid`);
-  }
-
-  const v2DbPath = path.join(DATA_DIR, 'v2.db');
-  if (!fs.existsSync(v2DbPath)) {
-    console.error('FAIL:v2.db not found — run db step first');
-    process.exit(1);
-  }
-
-  const v2Db = initDb(v2DbPath);
-  runMigrations(v2Db);
-
-  const phoneRows = v2Db
-    .prepare(
-      `SELECT id, channel_type, platform_id FROM messaging_groups
-       WHERE channel_type='whatsapp' AND platform_id LIKE '%@s.whatsapp.net'`,
-    )
-    .all() as RawMessagingGroup[];
-
-  if (phoneRows.length === 0) {
-    console.log('SKIPPED:no whatsapp DM messaging_groups to resolve');
-    v2Db.close();
-    process.exit(0);
-  }
-
-  // Pull existing wirings so each new alias gets the same agent_group +
-  // engage rules as the phone-keyed row.
-  const placeholders = phoneRows.map(() => '?').join(',');
-  const wiringRows = v2Db
-    .prepare(`SELECT * FROM messaging_group_agents WHERE messaging_group_id IN (${placeholders})`)
-    .all(...phoneRows.map((r) => r.id)) as RawWiring[];
-
-  const wiringsByMg = new Map<string, RawWiring[]>();
-  for (const w of wiringRows) {
-    const arr = wiringsByMg.get(w.messaging_group_id) ?? [];
-    arr.push(w);
-    wiringsByMg.set(w.messaging_group_id, arr);
-  }
-
-  let resolved = 0;
-  let aliased = 0;
-  const createdAt = new Date().toISOString();
-
-  for (const row of phoneRows) {
-    const phoneUser = phoneUserOf(row.platform_id);
-    const lidJid = phoneUserToLidJid.get(phoneUser);
-    if (!lidJid) continue;
-    resolved++;
-
-    let lidMg = getMessagingGroupByPlatform('whatsapp', lidJid);
-    if (!lidMg) {
-      createMessagingGroup({
-        id: generateId('mg'),
-        channel_type: 'whatsapp',
-        platform_id: lidJid,
-        name: null,
-        is_group: 0,
-        unknown_sender_policy: 'public',
-        created_at: createdAt,
-      });
-      lidMg = getMessagingGroupByPlatform('whatsapp', lidJid)!;
-    }
-
-    const wirings = wiringsByMg.get(row.id) ?? [];
-    for (const w of wirings) {
-      if (getMessagingGroupAgentByPair(lidMg.id, w.agent_group_id)) continue;
-      createMessagingGroupAgent({
-        id: generateId('mga'),
-        messaging_group_id: lidMg.id,
-        agent_group_id: w.agent_group_id,
-        engage_mode: w.engage_mode as 'pattern' | 'mention' | 'mention-sticky',
-        engage_pattern: w.engage_pattern,
-        sender_scope: w.sender_scope as 'all' | 'admins',
-        ignored_message_policy: w.ignored_message_policy as 'drop' | 'queue',
-        session_mode: w.session_mode as 'shared' | 'thread',
-        priority: w.priority,
-        created_at: createdAt,
-      });
-      aliased++;
-    }
-  }
-
-  v2Db.close();
-  console.log(
-    `OK:reverse_mappings=${reverse.size},phone_dms=${phoneRows.length},lids_resolved=${resolved},aliased=${aliased}`,
-  );
-}
-
-main();