madarx 2.14.0 → 2.15.0

package/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 All notable changes to Madarx OS. Newest first.
 
+## [2.15.0] - 2026-06-04
+
+### Added
+
+- **Guided `madarx setup` wizard.** Setup is now an arrow-key experience (↑/↓ or j/k, Enter, number keys) that decides what shapes the whole install up front: **usage mode** — Personal (local-only) or Team (Supabase shared layer, with credential capture) — then the **main agent model** and the **default sub-agent model**, chosen from the engines actually available on your machine (it probes the Claude Code and Codex CLIs and a running Ollama, and always lists the Anthropic models). It then walks the secrets-vault master key, API keys (masked, and only flags Anthropic as *required* when your selected engine needs it), folder permissions, the WhatsApp toggle, and the auto-update policy. Re-running is safe — every step shows your current value as the default. New zero-dependency `lib/cli/prompt.js` (`select`/`confirm`).
+- The sub-agent default model picked at setup is honored at runtime: `createAgent` now falls back to the `default_agent_engine` / `default_agent_model` config when a caller doesn't specify one.
+
+### Fixed
+
+- **WhatsApp could get stuck "logged out" with no way to re-pair.** When WhatsApp unlinked the device server-side (you removed it from Linked Devices, the number got flagged, or its anti-unofficial-client sweep caught a fresh Baileys session), the bridge left the now-invalid credentials on disk and stopped — which silently blocked a new pairing QR (Baileys only offers a QR on an empty session). The Pairing screen sat on "Waiting for QR" forever, and the only recovery control lived in the *paired* branch of the UI, so there was no visible button to reset. The logged-out state now shows a **Reset session** button (with a confirm step) that wipes the dead session and brings up a fresh QR — the same recovery the dashboard already offered after a deliberate disconnect.
+- **`npm run whatsapp:reset` wiped the wrong directory on global installs.** It hardcoded `<cwd>/data/whatsapp/session`, so for a `npm i -g madarx` install (whose data lives under `$MADARX_HOME`, default `~/.madarx`) it deleted a repo-relative path that didn't exist and never touched the real session. It now resolves the session directory from `lib/paths.js`, honoring `MADARX_HOME` / `MADARX_DATA_DIR`, via the new `scripts/whatsapp-reset.mjs`.
+
 ## [2.14.0] - 2026-06-04
 
 ### Changed

package/app/components/dashboard/whatsapp-section.jsx

@@ -221,23 +221,64 @@ export default function WhatsAppSection() {
             <div className="config-secrets-panel" style={{ marginTop: 0 }}>
               <div className="config-secrets-head">
                 <div>
-                  <span className="config-section-title">Pair device</span>
-                  <p>Open WhatsApp → Settings → Linked Devices → Link a Device, then scan the code.</p>
+                  <span className="config-section-title">
+                    {pairingState === 'logged_out' ? 'Session logged out' : 'Pair device'}
+                  </span>
+                  <p>
+                    {pairingState === 'logged_out'
+                      ? 'WhatsApp unlinked this device server-side, so the stale credentials block a fresh QR. Reset the session to wipe them and generate a new pairing code.'
+                      : 'Open WhatsApp → Settings → Linked Devices → Link a Device, then scan the code.'}
+                  </p>
                 </div>
+                {pairingState === 'logged_out' && (
+                  !confirmDisconnect ? (
+                    <button
+                      type="button"
+                      className="secrets-action-btn danger"
+                      onClick={() => setConfirmDisconnect(true)}
+                      disabled={disconnectBusy}
+                    >
+                      Reset session
+                    </button>
+                  ) : (
+                    <div className="wa-disconnect-confirm">
+                      <button
+                        type="button"
+                        className="secrets-action-btn danger"
+                        onClick={handleDisconnect}
+                        disabled={disconnectBusy}
+                      >
+                        {disconnectBusy ? 'Resetting…' : 'Confirm reset'}
+                      </button>
+                      <button
+                        type="button"
+                        className="secrets-action-btn"
+                        onClick={() => setConfirmDisconnect(false)}
+                        disabled={disconnectBusy}
+                      >
+                        Cancel
+                      </button>
+                    </div>
+                  )
+                )}
               </div>
-              <div className="whatsapp-pair-row">
-                {qrDataUrl ? (
-                  <div className="whatsapp-qr-box">
-                    <img src={qrDataUrl} alt="WhatsApp pairing QR code" width={220} height={220} />
+              {pairingState === 'logged_out' ? (
+                <div className="whatsapp-pair-copy">{dedicatedNumberWarning}</div>
+              ) : (
+                <div className="whatsapp-pair-row">
+                  {qrDataUrl ? (
+                    <div className="whatsapp-qr-box">
+                      <img src={qrDataUrl} alt="WhatsApp pairing QR code" width={220} height={220} />
+                    </div>
+                  ) : (
+                    <div className="whatsapp-qr-pending">Waiting for QR — make sure the daemon is running.</div>
+                  )}
+                  <div className="whatsapp-pair-copy">
+                    <p>Code rotates roughly every 20 seconds. The dashboard re-fetches automatically. The session is saved at <code>data/whatsapp/session/</code>.</p>
+                    {dedicatedNumberWarning}
                   </div>
-                ) : (
-                  <div className="whatsapp-qr-pending">Waiting for QR — make sure the daemon is running.</div>
-                )}
-                <div className="whatsapp-pair-copy">
-                  <p>Code rotates roughly every 20 seconds. The dashboard re-fetches automatically. The session is saved at <code>data/whatsapp/session/</code>.</p>
-                  {dedicatedNumberWarning}
                 </div>
-              </div>
+              )}
             </div>
           ) : (
             <div className="config-secrets-panel" style={{ marginTop: 0 }}>

package/lib/cli/prompt.js

@@ -0,0 +1,110 @@
+/**
+ * Interactive terminal prompts for the madarX CLI wizard.
+ *
+ * Zero dependencies — node builtins + the brand stylers in ./banner.js only.
+ * The headline piece is `select()`: an arrow-key menu (↑/↓ or j/k, number keys,
+ * Enter to choose) in the Sovereign-Mono palette with a single Mars cursor.
+ *
+ * Degrades safely: with no TTY it returns the default option without drawing.
+ */
+
+import { emitKeypressEvents } from 'node:readline';
+import { _palette as P, fg, bold, dim } from './banner.js';
+
+const isTTY = () => Boolean(process.stdin.isTTY && process.stdout.isTTY);
+const write = (s) => process.stdout.write(s);
+const hideCursor = () => write('\x1b[?25l');
+const showCursor = () => write('\x1b[?25h');
+
+/**
+ * Render one menu option line.
+ * @param {{label:string, hint?:string, tag?:string}} opt
+ * @param {boolean} active
+ */
+function optionLine(opt, active) {
+  const cursor = active ? fg(P.mars, '→ ') : '  ';
+  const label = active ? bold(fg(P.mars, opt.label)) : fg(P.bone, opt.label);
+  const tag = opt.tag ? ' ' + fg(opt.tag === 'recommended' ? P.platinum : P.muted, `(${opt.tag})`) : '';
+  const hint = opt.hint ? '  ' + dim(fg(P.muted, opt.hint)) : '';
+  return `  ${cursor}${label}${tag}${hint}`;
+}
+
+/**
+ * Arrow-key single-select menu.
+ *
+ * @param {string} title    bold Mars header (e.g. "Select default model")
+ * @param {Array<{label:string, value:any, hint?:string, tag?:string}>} options
+ * @param {object} [opts]
+ * @param {number} [opts.default=0]  initially highlighted index
+ * @param {string} [opts.help]       a dim help line under the title
+ * @returns {Promise<any>} the chosen option's `value`
+ */
+export function select(title, options, opts = {}) {
+  const def = Math.max(0, Math.min(opts.default ?? 0, options.length - 1));
+  if (!isTTY() || options.length === 0) {
+    return Promise.resolve(options[def]?.value);
+  }
+
+  return new Promise((resolve) => {
+    let idx = def;
+    const headerLines = [
+      fg(P.mars, bold(title)),
+      ...(opts.help ? [dim(fg(P.muted, opts.help))] : []),
+      '',
+    ];
+    const total = headerLines.length + options.length + 1; // +1 footer
+
+    const footer = dim(fg(P.muted, '↑/↓ move · enter select · ⌃C cancel'));
+
+    const draw = (first) => {
+      if (!first) write(`\x1b[${total}A`); // jump to top of the block
+      const lines = [
+        ...headerLines,
+        ...options.map((o, i) => optionLine(o, i === idx)),
+        footer,
+      ];
+      write('\r' + lines.map((l) => '\x1b[2K' + l).join('\n') + '\n');
+    };
+
+    emitKeypressEvents(process.stdin);
+    const wasRaw = process.stdin.isRaw;
+    process.stdin.setRawMode(true);
+    process.stdin.resume();
+    hideCursor();
+    draw(true);
+
+    const cleanup = () => {
+      process.stdin.removeListener('keypress', onKey);
+      process.stdin.setRawMode(wasRaw);
+      process.stdin.pause();
+      showCursor();
+    };
+
+    const onKey = (str, key = {}) => {
+      if (key.name === 'up' || key.name === 'k' || (key.name === 'p' && key.ctrl)) {
+        idx = (idx - 1 + options.length) % options.length; draw(false);
+      } else if (key.name === 'down' || key.name === 'j' || (key.name === 'n' && key.ctrl)) {
+        idx = (idx + 1) % options.length; draw(false);
+      } else if (str && /^[1-9]$/.test(str) && Number(str) <= options.length) {
+        idx = Number(str) - 1; draw(false);
+      } else if (key.name === 'return' || key.name === 'enter') {
+        cleanup(); resolve(options[idx].value);
+      } else if (key.name === 'escape') {
+        cleanup(); resolve(options[def].value);
+      } else if (key.ctrl && key.name === 'c') {
+        cleanup(); write('\n'); process.exit(130);
+      }
+    };
+
+    process.stdin.on('keypress', onKey);
+  });
+}
+
+/** Yes/No as a two-item arrow menu (returns boolean). */
+export async function confirm(title, { default: dflt = true, help } = {}) {
+  const value = await select(title, [
+    { label: 'Yes', value: true },
+    { label: 'No', value: false },
+  ], { default: dflt ? 0 : 1, help });
+  return value;
+}

package/lib/cli/setup.js

@@ -1,10 +1,17 @@
 /**
  * `madarx setup` — interactive first-run wizard.
  *
- * Walks the operator through: data home, secrets-vault master key, the folder
- * permissions the bundled agent may read/write (MADARX_ALLOWED_ROOTS), optional
- * API keys (stored in the encrypted vault), the WhatsApp toggle, and the weekly
- * auto-update preference (consumed by T3's self-update).
+ * An arrow-key guided setup that decides the things that shape the whole
+ * install up front, then fills in credentials and preferences:
+ *
+ *   1. Usage mode      personal (local-only) vs team (Supabase shared layer)
+ *   2. Main agent      which model/engine the orchestrator runs on
+ *   3. Sub-agents      default model/engine new agents inherit
+ *   4. Secrets vault   master key (generated + persisted on first run)
+ *   5. API keys        Anthropic / OpenAI → encrypted vault
+ *   6. Folder grants   MADARX_ALLOWED_ROOTS (the agent's file/exec boundary)
+ *   7. WhatsApp        bridge on/off
+ *   8. Auto-update     weekly notify / hands-off / off
  *
  * Sets MADARX_DISABLE_INPROC_DAEMON=1 before importing the runtime — a setup run
  * must not spin up cron/heartbeat loops.
@@ -13,42 +20,33 @@
 import { createInterface } from 'node:readline/promises';
 import { applyHomeEnv } from './home.js';
 import { upsertEnvVar, removeEnvVar, readEnvFile } from './env-file.js';
-import { renderHeader } from './banner.js';
+import { renderHeader, _palette as P, fg, bold, dim } from './banner.js';
 import { readVersion } from './dispatch.js';
+import { select, confirm } from './prompt.js';
 
 function isInteractive() {
   return Boolean(process.stdin.isTTY && process.stdout.isTTY);
 }
 
-/** readline with a muted variant for secret entry (echoes `*`). */
-function makeReader() {
-  const rl = createInterface({ input: process.stdin, output: process.stdout, terminal: true });
-  rl.stdoutMuted = false;
-  rl._writeToOutput = function (str) {
-    if (rl.stdoutMuted) rl.output.write('*');
-    else rl.output.write(str);
-  };
-  return rl;
-}
-
-async function ask(rl, prompt, dflt = '') {
-  const suffix = dflt ? ` [${dflt}]` : '';
-  const ans = (await rl.question(`${prompt}${suffix}: `)).trim();
-  return ans || dflt;
-}
-
-async function askYesNo(rl, prompt, dfltYes = true) {
-  const ans = (await rl.question(`${prompt} ${dfltYes ? '[Y/n]' : '[y/N]'}: `)).trim().toLowerCase();
-  if (!ans) return dfltYes;
-  return ans === 'y' || ans === 'yes';
-}
+const h2 = (s) => console.log('\n' + bold(fg(P.platinum, s)));
+const note = (s) => console.log('  ' + dim(fg(P.muted, s)));
+const ok = (s) => console.log('  ' + fg(P.mars, '●') + ' ' + fg(P.bone, s));
 
-async function askSecret(rl, prompt) {
-  rl.stdoutMuted = true;
-  const val = (await rl.question(`${prompt}: `)).trim();
+/** Open an ephemeral readline for one text prompt, then close it (so it never
+ *  competes with the raw-mode arrow menus). `secret` echoes `*`. */
+async function ask(prompt, { dflt = '', secret = false } = {}) {
+  const rl = createInterface({ input: process.stdin, output: process.stdout, terminal: true });
   rl.stdoutMuted = false;
-  rl.output.write('\n');
-  return val;
+  rl._writeToOutput = function (str) { rl.output.write(rl.stdoutMuted ? '*' : str); };
+  try {
+    rl.stdoutMuted = secret;
+    const suffix = dflt ? ` [${dflt}]` : '';
+    const ans = (await rl.question(`  ${fg(P.bone, prompt)}${dim(suffix)}: `)).trim();
+    if (secret) rl.output.write('\n');
+    return ans || dflt;
+  } finally {
+    rl.close();
+  }
 }
 
 export async function setup() {
@@ -57,87 +55,154 @@ export async function setup() {
     return 1;
   }
 
-  // Management command — never run the in-process daemons.
-  process.env.MADARX_DISABLE_INPROC_DAEMON = '1';
-
+  process.env.MADARX_DISABLE_INPROC_DAEMON = '1'; // management command — no daemons
   const layout = applyHomeEnv();
-  const rl = makeReader();
 
   try {
     console.log(renderHeader('setup', readVersion()));
-    console.log(`Data home: ${layout.home}`);
-    console.log('(override anytime with the MADARX_HOME env var)\n');
+    console.log(`Data home: ${fg(P.bone, layout.home)}`);
+    note('override anytime with the MADARX_HOME env var');
 
-    // 1. Master key — delegate to the canonical resolver (generates + persists
-    //    to $MADARX_HOME/.env.local on first run, prints the backup instruction).
-    console.log('1) Secrets vault');
-    const { resolveMasterKey } = await import('../master-key.js');
+    // Open the DB once so vault + config tables exist for the steps below.
     const { getDb } = await import('../db.js');
-    getDb(); // open/create the DB so the vault + config tables exist
-    resolveMasterKey({ allowGenerate: true });
-    console.log('   Master key ready.\n');
+    getDb();
+    const { setConfig } = await import('../config.js');
 
-    // 2. Folder permissions for the bundled agent.
-    console.log('2) Folder permissions');
-    console.log('   The agent can read/write/run commands ONLY inside roots you grant here.');
-    console.log('   (The repo root and workspace/ are always allowed. Leave blank to skip.)');
-    const existingRoots = readEnvFile(layout.envFile).MADARX_ALLOWED_ROOTS || '';
-    const roots = await ask(rl, '   Extra allowed roots (comma-separated absolute paths)', existingRoots);
-    if (roots) {
-      const cleaned = roots.split(',').map((r) => r.trim()).filter(Boolean).join(',');
-      upsertEnvVar(layout.envFile, 'MADARX_ALLOWED_ROOTS', cleaned);
-      console.log(`   Granted: ${cleaned}\n`);
+    // ── 1. Usage mode ────────────────────────────────────────────────────────
+    h2('1 · How will you use madarX?');
+    const mode = await select('Choose a setup', [
+      { label: 'Personal', value: 'local', tag: 'recommended', hint: 'local-only, everything on this machine' },
+      { label: 'Team', value: 'supabase', hint: 'shared with a team via Supabase (auth, orgs, sharing)' },
+    ], { default: 0 });
+
+    if (mode === 'supabase') {
+      setConfig('auth_mode', 'supabase');
+      note('Enter your Supabase project credentials (stored in ' + layout.envFile + ').');
+      const existing = readEnvFile(layout.envFile);
+      const url = await ask('Supabase URL', { dflt: existing.SUPABASE_URL || existing.NEXT_PUBLIC_SUPABASE_URL || '' });
+      const anon = await ask('Supabase anon key', { dflt: existing.SUPABASE_ANON_KEY || '' });
+      const service = await ask('Supabase service-role key', { secret: true });
+      if (url) { upsertEnvVar(layout.envFile, 'SUPABASE_URL', url); upsertEnvVar(layout.envFile, 'NEXT_PUBLIC_SUPABASE_URL', url); }
+      if (anon) { upsertEnvVar(layout.envFile, 'SUPABASE_ANON_KEY', anon); upsertEnvVar(layout.envFile, 'NEXT_PUBLIC_SUPABASE_ANON_KEY', anon); }
+      if (service) upsertEnvVar(layout.envFile, 'SUPABASE_SERVICE_ROLE_KEY', service);
+      ok('Team mode (Supabase) configured.');
+      note('Apply the cloud schema once: see supabase/README.md.');
+    } else {
+      setConfig('auth_mode', 'local');
+      ok('Personal mode — local-only.');
+    }
+
+    // ── Model catalog (probes installed CLIs + Ollama; Anthropic always listed) ─
+    const { getModels, setModel, getModel } = await import('../agent-config.js');
+    const { defaultModelForEngine } = await import('../agent-engines.js');
+    let models = [];
+    try { models = await getModels(); } catch { models = []; }
+    const recommendedId = models.find((m) => m.engine === 'claude-code') ? 'claude-code'
+      : (models.find((m) => m.id === 'claude-sonnet-4-6') ? 'claude-sonnet-4-6' : models[0]?.id);
+    const modelOption = (m) => ({
+      label: m.label,
+      value: { id: m.id, engine: m.engine },
+      hint: m.engine,
+      tag: m.id === recommendedId ? 'recommended' : undefined,
+    });
+    const orderedModels = [
+      ...models.filter((m) => m.id === recommendedId),
+      ...models.filter((m) => m.id !== recommendedId),
+    ];
+
+    // ── 2. Main agent model ──────────────────────────────────────────────────
+    h2('2 · Main agent model');
+    note('the orchestrator that plans your work and dispatches sub-agents');
+    const current = getModel();
+    const mainChoice = await select('Select the main agent model', [
+      ...orderedModels.map(modelOption),
+      { label: `Keep current (${current})`, value: { keep: true } },
+    ], { default: 0 });
+    if (!mainChoice.keep) { setModel(mainChoice.id); ok(`Main agent → ${mainChoice.id}`); }
+    else ok(`Main agent unchanged (${current})`);
+    const mainEngine = mainChoice.keep ? null : mainChoice.engine;
+
+    // ── 3. Sub-agent default model ───────────────────────────────────────────
+    h2('3 · Sub-agent default model');
+    note('what newly created agents inherit unless you pick another at creation');
+    const subChoice = await select('Select the default sub-agent model', [
+      { label: 'Same as main agent', value: { same: true }, tag: 'recommended' },
+      ...orderedModels.map(modelOption),
+    ], { default: 0 });
+    let subEngine, subModel;
+    if (subChoice.same) {
+      subEngine = mainEngine || (orderedModels.find((m) => m.id === current)?.engine) || 'claude-code';
+      subModel = mainChoice.keep ? current : mainChoice.id;
     } else {
-      console.log('   No extra roots granted.\n');
+      subEngine = subChoice.engine;
+      subModel = subChoice.engine === 'anthropic' ? subChoice.id : defaultModelForEngine(subChoice.engine);
     }
+    setConfig('default_agent_engine', subEngine);
+    setConfig('default_agent_model', subModel);
+    ok(`Sub-agents → ${subEngine}${subModel ? ' · ' + subModel : ''}`);
+
+    // ── 4. Secrets vault master key ──────────────────────────────────────────
+    h2('4 · Secrets vault');
+    const { resolveMasterKey } = await import('../master-key.js');
+    resolveMasterKey({ allowGenerate: true });
+    ok('Master key ready (AES-256-GCM).');
 
-    // 3. API keys → encrypted vault.
-    console.log('3) API keys (stored encrypted in the vault; press Enter to skip any)');
-    const { setSecret } = await import('../secrets.js');
+    // ── 5. API keys → encrypted vault ────────────────────────────────────────
+    h2('5 · API keys');
+    note('stored encrypted in the vault · press Enter to skip any');
+    const { setSecret, getSecret } = await import('../secrets.js');
+    const usesAnthropic = [mainEngine, subEngine].includes('anthropic');
     const keyPrompts = [
-      ['ANTHROPIC_API_KEY', 'Anthropic API key (Claude)'],
+      ['ANTHROPIC_API_KEY', 'Anthropic API key (Claude)' + (usesAnthropic ? ' — required for your selection' : '')],
       ['OPENAI_API_KEY', 'OpenAI API key (voice/realtime, optional)'],
     ];
     for (const [name, label] of keyPrompts) {
-      const val = await askSecret(rl, `   ${label}`);
+      let have = false;
+      try { have = Boolean(getSecret(name)); } catch { /* vault may be empty */ }
+      const val = await ask(label + (have ? ' (set — Enter to keep)' : ''), { secret: true });
       if (val) {
-        try { setSecret(name, val, { scope: 'global' }); console.log(`   Stored ${name}.`); }
-        catch (err) { console.error(`   Could not store ${name}: ${err.message}`); }
+        try { setSecret(name, val, { scope: 'global' }); ok(`Stored ${name}.`); }
+        catch (err) { console.error('  ' + fg(P.mars, '✗') + ` Could not store ${name}: ${err.message}`); }
       }
     }
-    console.log('');
-
-    // 4. WhatsApp bridge toggle.
-    console.log('4) WhatsApp bridge');
-    const enableWa = await askYesNo(rl, '   Run the WhatsApp bridge with `madarx`?', true);
-    if (enableWa) {
-      removeEnvVar(layout.envFile, 'MADARX_DISABLE_WHATSAPP');
-      console.log('   Enabled (idles until you pair a dedicated number).\n');
+
+    // ── 6. Folder permissions ────────────────────────────────────────────────
+    h2('6 · Folder permissions');
+    note('the agent can read/write/run ONLY inside roots you grant (repo + workspace/ always allowed)');
+    const existingRoots = readEnvFile(layout.envFile).MADARX_ALLOWED_ROOTS || '';
+    const roots = await ask('Extra allowed roots (comma-separated absolute paths)', { dflt: existingRoots });
+    if (roots) {
+      const cleaned = roots.split(',').map((r) => r.trim()).filter(Boolean).join(',');
+      upsertEnvVar(layout.envFile, 'MADARX_ALLOWED_ROOTS', cleaned);
+      ok(`Granted: ${cleaned}`);
     } else {
-      upsertEnvVar(layout.envFile, 'MADARX_DISABLE_WHATSAPP', '1');
-      console.log('   Disabled.\n');
+      note('no extra roots granted');
     }
 
-    // 5. Auto-update preference (consumed by T3 self-update).
-    console.log('5) Auto-update');
-    const weekly = await askYesNo(rl, '   Check weekly for updates?', true);
-    const { setConfig } = await import('../config.js');
-    if (weekly) {
-      const handsOff = await askYesNo(rl, '   Apply updates automatically (hands-off) instead of just notifying?', false);
+    // ── 7. WhatsApp bridge ───────────────────────────────────────────────────
+    h2('7 · WhatsApp bridge');
+    const enableWa = await confirm('Run the WhatsApp bridge with `madarx`?', { default: true });
+    if (enableWa) { removeEnvVar(layout.envFile, 'MADARX_DISABLE_WHATSAPP'); ok('Enabled — idles until you pair a dedicated number.'); }
+    else { upsertEnvVar(layout.envFile, 'MADARX_DISABLE_WHATSAPP', '1'); ok('Disabled.'); }
+
+    // ── 8. Auto-update ───────────────────────────────────────────────────────
+    h2('8 · Auto-update');
+    const upd = await select('How should madarX handle updates?', [
+      { label: 'Notify weekly', value: 'notify', tag: 'recommended', hint: 'check weekly, tell me — I apply' },
+      { label: 'Auto-apply weekly', value: 'auto', hint: 'hands-off, gated by the approval/trust tier' },
+      { label: 'Off', value: 'off', hint: 'I will run `madarx update` myself' },
+    ], { default: 0 });
+    if (upd === 'off') { setConfig('auto_update_mode', 'off'); ok('Auto-update off.'); }
+    else {
       setConfig('auto_update_mode', 'weekly');
-      setConfig('auto_update_apply', handsOff ? 'auto' : 'notify');
-      console.log(`   Weekly check on; updates will ${handsOff ? 'auto-apply (gated by the approval/trust tier)' : 'notify only'}.\n`);
-    } else {
-      setConfig('auto_update_mode', 'off');
-      console.log('   Auto-update off. Run `madarx update` manually.\n');
+      setConfig('auto_update_apply', upd === 'auto' ? 'auto' : 'notify');
+      ok(`Weekly check on — ${upd === 'auto' ? 'auto-apply' : 'notify only'}.`);
     }
 
-    console.log('Setup complete.  Start everything with:  madarx\n');
+    console.log('\n' + bold(fg(P.platinum, 'Setup complete.')) + '  Start everything with:  ' + fg(P.mars, 'madarx') + '\n');
     return 0;
   } catch (err) {
     console.error(`\nsetup failed: ${err?.stack || err}`);
     return 1;
-  } finally {
-    rl.close();
   }
 }

package/lib/runtime.js

@@ -14,6 +14,7 @@ import { DEFAULT_PROJECT_ID, appendProjectChangelog, getProject } from './projec
 import { listActivity, listTasks, reportingSnapshot } from './delegation.js';
 import { getMainAgentTrustMode } from './tools/registry.js';
 import { defaultSkillsMarkdown } from './marketplace-seeds.js';
+import { getConfig } from './config.js';
 import { publishLiveEvent, publishStateChanged } from './live-events.js';
 import { resolveTargetSpace } from './dashboard-spaces.js';
 
@@ -862,9 +863,14 @@ export function createAgent(payload = {}) {
   const type = payload.type || 'custom';
   const mission = payload.mission || 'Support Client Workspace operations as a local sub-agent.';
   const schedule = payload.schedule || 'on demand';
-  const engine = payload.engine || 'claude-code';
+  // Default engine/model come from the setup wizard's choices (config keys
+  // default_agent_engine / default_agent_model) when the caller didn't specify.
+  let cfgEngine = null;
+  let cfgModel = null;
+  try { cfgEngine = getConfig('default_agent_engine', null); cfgModel = getConfig('default_agent_model', null); } catch { /* config optional */ }
+  const engine = payload.engine || cfgEngine || 'claude-code';
   const normalizedEngine = normalizeAgentEngine(engine);
-  const model = payload.model || defaultModelForEngine(normalizedEngine);
+  const model = payload.model || (!payload.engine && cfgModel) || defaultModelForEngine(normalizedEngine);
   const tools = Array.isArray(payload.tools)
     ? payload.tools
     : String(payload.tools || 'web-search,browser,files,cron')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "madarx",
-  "version": "2.14.0",
+  "version": "2.15.0",
   "type": "module",
   "description": "Madarx OS — Next.js product with SQLite-backed runtime, scheduled cron daemon, and approval-gated local runners.",
   "license": "MIT",
@@ -56,7 +56,7 @@
     "hermes:job": "node --no-warnings --env-file-if-exists=.env.local scripts/hermes-job-runner.mjs",
     "whatsapp:bridge": "node --no-warnings --env-file-if-exists=.env.local scripts/whatsapp-daemon.mjs",
     "whatsapp:once": "WHATSAPP_DAEMON_ONCE=1 node --no-warnings --env-file-if-exists=.env.local scripts/whatsapp-daemon.mjs",
-    "whatsapp:reset": "node -e \"const fs=require('node:fs');const p=require('node:path');const dir=p.join(process.cwd(),'data','whatsapp','session');fs.rmSync(dir,{recursive:true,force:true});console.log('Wiped',dir);\"",
+    "whatsapp:reset": "node --no-warnings --env-file-if-exists=.env.local scripts/whatsapp-reset.mjs",
     "smoke:routes": "node --no-warnings scripts/smoke-routes.mjs",
     "vendor:open-design": "node --no-warnings scripts/vendor-open-design.mjs",
     "check:disk-enc": "node --no-warnings scripts/check-disk-encryption.mjs",

package/scripts/whatsapp-reset.mjs

@@ -0,0 +1,15 @@
+#!/usr/bin/env node
+// Wipe the WhatsApp Baileys session so the bridge offers a fresh pairing QR.
+// Resolves the session dir from lib/paths.js so it honours $MADARX_HOME /
+// MADARX_DATA_DIR (global installs live under ~/.madarx, not the repo cwd).
+import fs from 'node:fs';
+import { WHATSAPP_SESSION_DIR } from '../lib/paths.js';
+
+try {
+  fs.rmSync(WHATSAPP_SESSION_DIR, { recursive: true, force: true });
+  console.log('[whatsapp:reset] wiped', WHATSAPP_SESSION_DIR);
+  console.log('[whatsapp:reset] restart madarx (or the WhatsApp bridge) to generate a fresh pairing QR.');
+} catch (err) {
+  console.error('[whatsapp:reset] failed to wipe', WHATSAPP_SESSION_DIR, '—', err.message);
+  process.exit(1);
+}

package/.next/standalone/.next/server/chunks/6474.js

@@ -1 +0,0 @@
-exports.id=6474,exports.ids=[6474],exports.modules={6974:(a,b,c)=>{Promise.resolve().then(c.bind(c,35271))},14420:(a,b,c)=>{"use strict";c.a(a,async(a,d)=>{try{c.r(b),c.d(b,{"4045b474fc63a6a572f3ca03f813d3525209e55e2b":()=>e.$$RSC_SERVER_ACTION_0});var e=c(91845),f=a([e]);e=(f.then?(await f)():f)[0],d()}catch(a){d(a)}})},35271:(a,b,c)=>{"use strict";c.d(b,{default:()=>d});let d=(0,c(97954).registerClientReference)(function(){throw Error("Attempted to call the default export of \"/home/runner/work/madarx-os/madarx-os/app/components/admin/project-switcher.jsx\" from the server, but it's on the client. It's not possible to invoke a client function from the server, it can only be rendered as a Component or passed to props of a Client Component.")},"/home/runner/work/madarx-os/madarx-os/app/components/admin/project-switcher.jsx","default")},86893:(a,b,c)=>{"use strict";c.d(b,{hI:()=>g,iN:()=>f,pp:()=>i,qs:()=>h});var d=c(75338),e=c(35271);function f({kicker:a="madarX OS v1.0",title:b,description:c,actions:f,hideProjectSwitcher:g,children:h}){return(0,d.jsxs)("main",{className:"admin-shell",children:[(0,d.jsxs)("header",{className:"admin-header",children:[(0,d.jsxs)("div",{children:[(0,d.jsx)("span",{className:"admin-kicker",children:a}),(0,d.jsx)("h1",{children:b}),c?(0,d.jsx)("p",{children:c}):null]}),(0,d.jsxs)("div",{className:"admin-header-actions",children:[g?null:(0,d.jsx)(e.default,{}),f]})]}),h]})}function g({label:a,value:b,tone:c}){return(0,d.jsxs)("div",{className:`admin-stat ${c||""}`,children:[(0,d.jsx)("b",{children:b}),(0,d.jsx)("span",{children:a})]})}function h({children:a,tone:b="neutral"}){return(0,d.jsx)("span",{className:`admin-pill ${b}`,children:a})}function i({title:a,children:b}){return(0,d.jsxs)("div",{className:"admin-empty",children:[(0,d.jsx)("b",{children:a}),(0,d.jsx)("p",{children:b})]})}},89670:(a,b,c)=>{Promise.resolve().then(c.bind(c,94657))},91845:(a,b,c)=>{"use strict";c.a(a,async(a,d)=>{try{c.r(b),c.d(b,{$$RSC_SERVER_ACTION_0:()=>u,default:()=>p,dynamic:()=>q,runtime:()=>r});var e=c(75338),f=c(75879);c(68633);var g=c(16780),h=c(82161),i=c(86893),j=c(83963),k=c(60105),l=a([j,k]);[j,k]=l.then?(await l)():l;let q="force-dynamic",r="nodejs",s={executive:"Executive",manager:"Manager",team_lead:"Team Lead",individual_contributor:"Contributor"},t={executive:"mars",manager:"ready",team_lead:"warn",individual_contributor:"neutral"};function m(a=""){return a.split(/\s+/).map(a=>a[0]).filter(Boolean).slice(0,2).join("").toUpperCase()||"\xb7"}let u=async function(a){let b=String(a.get("agent_id")||"").trim();if(!b)return;let c=String(a.get("reports_to")||"").trim(),d={reports_to:""===c?null:c},e=String(a.get("role")||"").trim();e&&(d.role=e);let f=String(a.get("title")||"").trim();(f||a.has("title"))&&(d.title=f||null);try{(0,j.jN)(b,d)}catch(a){console.warn("updateAgentOrg failed",a?.message)}(0,g.revalidatePath)("/org"),(0,g.revalidatePath)("/agents"),(0,h.redirect)("/org")};function n({node:a,workloadById:b}){let c=function(a){if(a.role&&s[a.role])return a.role;let b=a.reports?.length||0;return b>=4?"executive":b>=2?"manager":1===b?"team_lead":"individual_contributor"}(a),d=s[c],f=t[c],g=a.reports?.length||0,h=b.get(a.id),j=Number(h?.active_tasks||0),k=Number(h?.blocked_tasks||0),l=Number(h?.completed_tasks||0),n=a.status||"created";return(0,e.jsxs)("article",{className:`org-card org-card--${c}`,"data-reports":g>0?"has":"none",children:[(0,e.jsxs)("div",{className:"org-card-head",children:[(0,e.jsx)("div",{className:"org-card-avatar","aria-hidden":"true",children:m(a.name)}),(0,e.jsxs)("div",{className:"org-card-identity",children:[(0,e.jsx)("div",{className:"org-card-name",children:a.name}),(0,e.jsx)("div",{className:"org-card-title",children:a.title||a.mission?.slice(0,64)||"No title set"})]})]}),(0,e.jsxs)("div",{className:"org-card-meta",children:[(0,e.jsx)(i.qs,{tone:f,children:d}),(0,e.jsx)(i.qs,{tone:"heartbeat ok"===n?"ready":"terminated"===n?"danger":"neutral",children:n}),g>0?(0,e.jsxs)(i.qs,{tone:"neutral",children:[g," report",1===g?"":"s"]}):null]}),(0,e.jsxs)("dl",{className:"org-card-stats",children:[(0,e.jsxs)("div",{children:[(0,e.jsx)("dt",{children:"Active"}),(0,e.jsx)("dd",{children:j})]}),(0,e.jsxs)("div",{children:[(0,e.jsx)("dt",{children:"Blocked"}),(0,e.jsx)("dd",{className:k?"is-warn":"",children:k})]}),(0,e.jsxs)("div",{children:[(0,e.jsx)("dt",{children:"Done"}),(0,e.jsx)("dd",{children:l})]})]})]})}function o({node:a,workloadById:b}){let c=(a.reports||[]).length>0;return(0,e.jsxs)("li",{className:"org-branch",children:[(0,e.jsx)(n,{node:a,workloadById:b}),c?(0,e.jsx)("ul",{className:"org-children",children:a.reports.map(a=>(0,e.jsx)(o,{node:a,workloadById:b},a.id))}):null]})}function p(){let a=(0,j.zP)(),b=(0,j.hC)(),c=(0,k.vc)(),d=new Map((b.workload||[]).map(a=>[a.agent_id,a])),f=c.filter(a=>c.some(b=>b.reports_to===a.id)).length,g=c.filter(a=>!a.reports_to&&a.id).length;return(0,e.jsxs)(i.iN,{title:"Agent chart",description:"Company-style structure for your agent workforce. Set managers, define roles, and see workload at a glance.",children:[(0,e.jsxs)("section",{className:"admin-stats",children:[(0,e.jsx)(i.hI,{label:"Headcount",value:b.totals.active_agents}),(0,e.jsx)(i.hI,{label:"Leaders",value:f}),(0,e.jsx)(i.hI,{label:"Root nodes",value:g}),(0,e.jsx)(i.hI,{label:"Active tasks",value:b.totals.active_tasks})]}),(0,e.jsxs)("section",{className:"admin-panel",children:[(0,e.jsxs)("div",{className:"admin-panel-head",children:[(0,e.jsx)("span",{children:"Agent chart"}),(0,e.jsx)("small",{children:"Top-down hierarchy. Each card shows role, status, and current workload."})]}),a.length?(0,e.jsx)("div",{className:"org-chart-scroll",children:(0,e.jsx)("ul",{className:"org-chart",children:a.map(a=>(0,e.jsx)(o,{node:a,workloadById:d},a.id))})}):(0,e.jsx)(i.pp,{title:"No agents yet",children:"Create an agent on the Agents page, then come back here to assign managers."})]}),(0,e.jsxs)("section",{className:"admin-grid reports-layout",children:[(0,e.jsxs)("div",{className:"admin-panel",children:[(0,e.jsxs)("div",{className:"admin-panel-head",children:[(0,e.jsx)("span",{children:"Reporting lines"}),(0,e.jsx)("small",{children:"Re-parent any agent. Cycles are blocked automatically."})]}),c.length?(0,e.jsx)("div",{className:"admin-card-list compact",children:c.map(a=>{let b=a.reports_to?c.find(b=>b.id===a.reports_to):null,d=c.filter(b=>b.id!==a.id),f=a.role&&s[a.role]?a.role:"individual_contributor";return(0,e.jsxs)("form",{action:u,className:"org-reporting-row",children:[(0,e.jsx)("input",{type:"hidden",name:"agent_id",value:a.id}),(0,e.jsxs)("div",{className:"org-reporting-identity",children:[(0,e.jsx)("div",{className:"org-card-avatar small","aria-hidden":"true",children:m(a.name)}),(0,e.jsxs)("div",{children:[(0,e.jsx)("div",{className:"org-reporting-name",children:a.name}),(0,e.jsx)("div",{className:"org-reporting-sub",children:b?`Reports to ${b.name}`:"Top of chain"})]})]}),(0,e.jsxs)("div",{className:"org-reporting-fields",children:[(0,e.jsxs)("label",{className:"org-reporting-field",children:[(0,e.jsx)("span",{children:"Title"}),(0,e.jsx)("input",{type:"text",name:"title",defaultValue:a.title||"",placeholder:"e.g. Marketing Manager"})]}),(0,e.jsxs)("label",{className:"org-reporting-field",children:[(0,e.jsx)("span",{children:"Role"}),(0,e.jsx)("select",{name:"role",defaultValue:f,children:Object.entries(s).map(([a,b])=>(0,e.jsx)("option",{value:a,children:b},a))})]}),(0,e.jsxs)("label",{className:"org-reporting-field",children:[(0,e.jsx)("span",{children:"Manager"}),(0,e.jsxs)("select",{name:"reports_to",defaultValue:a.reports_to||"",children:[(0,e.jsx)("option",{value:"",children:"— None (top of chain)"}),d.map(a=>(0,e.jsx)("option",{value:a.id,children:a.name},a.id))]})]}),(0,e.jsx)("button",{className:"admin-button",type:"submit",children:"Save"})]})]},a.id)})}):(0,e.jsx)(i.pp,{title:"No agents yet",children:"Create agents to start building your org."})]}),(0,e.jsxs)("div",{className:"admin-panel",children:[(0,e.jsxs)("div",{className:"admin-panel-head",children:[(0,e.jsx)("span",{children:"Workload by agent"}),(0,e.jsx)("small",{children:"Derived from active tasks."})]}),b.workload.length?(0,e.jsx)("div",{className:"admin-card-list compact",children:b.workload.map(a=>(0,e.jsxs)("div",{className:"admin-record compact",children:[(0,e.jsxs)("div",{className:"admin-record-top",children:[(0,e.jsx)("b",{children:a.agent_name||a.agent_id}),(0,e.jsxs)(i.qs,{tone:a.blocked_tasks?"danger":a.active_tasks?"ready":"neutral",children:[a.active_tasks," active"]})]}),(0,e.jsxs)("p",{children:[a.total_tasks," total \xb7 ",a.blocked_tasks," blocked \xb7 ",a.completed_tasks," complete"]})]},a.agent_id))}):(0,e.jsx)(i.pp,{title:"No workload data",children:"Assign tasks to see workload distribution."})]})]})]})}(0,f.A)(u,"4045b474fc63a6a572f3ca03f813d3525209e55e2b",null),d()}catch(a){d(a)}})},94657:(a,b,c)=>{"use strict";c.d(b,{default:()=>f});var d=c(21124),e=c(38301);function f(){let[a,b]=(0,e.useState)([]),[c,f]=(0,e.useState)("");return(0,d.jsx)("div",{className:"project-switcher","data-project-switcher":!0,children:(0,d.jsxs)("select",{value:c,onChange:a=>{var b;f(b=a.target.value),b?localStorage.setItem("madarx.activeProjectId",b):localStorage.removeItem("madarx.activeProjectId"),window.dispatchEvent(new CustomEvent("madarx:project-change",{detail:{project_id:b||null}}))},"aria-label":"Active project",children:[(0,d.jsx)("option",{value:"",children:"All projects"}),a.map(a=>(0,d.jsx)("option",{value:a.id,children:a.name},a.id))]})})}}};