dual-brain 7.1.9 → 7.1.11

package/bin/dual-brain.mjs

@@ -126,7 +126,7 @@ function printSubscriptionTable(auth, profile) {
 
   const claudeLine1 = auth.claude.found
     ? `  Claude:  logged in (${auth.claude.source})`
-    : `  Claude:  not logged in — run: claude login`;
+    : `  Claude:  not logged in — run: claude auth login`;
   const claudeLine2 = `           plan: ${claudePlanLabel}${claudeLabel}`;
 
   const openaiLine1 = auth.openai.found
@@ -156,7 +156,7 @@ async function cmdInit(rl) {
   const noneFound = !auth.claude.found && !auth.openai.found;
   if (noneFound) {
     console.log('\nNo AI provider found. Log in first:');
-    console.log('  Claude:  claude login');
+    console.log('  Claude:  claude auth login');
     console.log('  OpenAI:  codex login\n');
     console.log('Then re-run: dual-brain init');
     return;
@@ -189,7 +189,7 @@ async function cmdAuth(subArgs = []) {
 
   if (!auth.claude.found || !auth.openai.found) {
     console.log('');
-    if (!auth.claude.found) console.log('  Claude not logged in. Run: claude login');
+    if (!auth.claude.found) console.log('  Claude not logged in. Run: claude auth login');
     if (!auth.openai.found) console.log('  OpenAI not logged in. Run: codex login');
   }
 }
@@ -525,6 +525,35 @@ function cmdForget(text) {
 
 // ─── Screen helpers ───────────────────────────────────────────────────────────
 
+/**
+ * Render the data-tools-style rounded header box for the main screen.
+ * Inner width is 39 chars. Lines are padded with spaces to fill the box.
+ */
+function renderHeader(version, providerLines) {
+  const W = 39; // inner width
+  const pad = (s) => {
+    // Strip ANSI codes for length calculation
+    const visible = s.replace(/\x1b\[[0-9;]*m/g, '');
+    return s + ' '.repeat(Math.max(0, W - visible.length));
+  };
+  const top    = `  ┌${'─'.repeat(W)}┐`;
+  const sep    = `  ├${'─'.repeat(W)}┤`;
+  const bottom = `  └${'─'.repeat(W)}┘`;
+
+  const title  = `DATA Tools - Dual Brain v${version}`;
+  const credit = `by Steve Moraco + dual-brain`;
+
+  const lines = [top];
+  lines.push(`  │ ${pad(title)}│`);
+  lines.push(`  │ ${pad(credit)}│`);
+  lines.push(sep);
+  for (const pl of providerLines) {
+    lines.push(`  │ ${pad(pl)}│`);
+  }
+  lines.push(bottom);
+  return lines.join('\n');
+}
+
 function profileExists(cwd) {
   const dir = cwd || process.cwd();
   const globalPath  = join(process.env.HOME || '/root', '.config', 'dual-brain', 'profile.json');
@@ -609,8 +638,8 @@ async function welcomeScreen(rl, ask) {
 
   if (!claudeReady && !openaiReady) {
     console.log('No CLI login found. Log in first:');
-    console.log('  claude login   — for Claude');
-    console.log('  codex login    — for OpenAI/Codex\n');
+    console.log('  claude auth login   — for Claude');
+    console.log('  codex login         — for OpenAI/Codex\n');
     console.log('Then re-run: dual-brain init');
     return { next: 'exit' };
   }
@@ -777,7 +806,13 @@ async function mainScreen(rl, ask) {
 
   function subLine(name, plan, found, expired, days, sub) {
     const label = sub?.label ? ` [${sub.label}]` : '';
-    if (!found) return `⚠️  ${name}: not logged in — run: ${name === 'Claude' ? 'claude login' : 'codex login'}`;
+    if (!found) return `⚠️  ${name}: not logged in — run: ${name === 'Claude' ? 'claude auth login' : 'codex login'}`;
+    // Multi-sub: show aggregated counts when more than one sub exists
+    const subs = sub?.subs;
+    if (subs && subs.length > 1) {
+      const aggregate = aggregatePlans(subs);
+      return `✅ ${name}: ${aggregate}  [${subs.length} subs]`;
+    }
     if (expired) return `🔴 ${name}: ${plan} expired${label} — will re-auth`;
     const daysNote = (days !== null && days <= 7) ? ` (${days}d left)` : '';
     return `✅ ${name}: ${plan}${label}${daysNote}`;
@@ -789,7 +824,7 @@ async function mainScreen(rl, ask) {
   ];
 
   console.log('');
-  console.log(box(`🧠 dual-brain v${version}`, headerLines));
+  console.log(renderHeader(version, headerLines));
 
   // Auto-refresh expired subscriptions
   if (claudeExpired || openaiExpired) {
@@ -799,7 +834,7 @@ async function mainScreen(rl, ask) {
     if (openaiExpired) expired.push('OpenAI');
     console.log(`\n  ${expired.join(' & ')} subscription expired. Re-authenticating...`);
     if (claudeExpired) {
-      const r = spawnSync('claude', ['login'], { stdio: 'inherit', timeout: 30000 });
+      const r = spawnSync('claude', ['auth', 'login'], { stdio: 'inherit', timeout: 30000 });
       if (r.status === 0) {
         claudeSub.expiresAt = null;
         saveProfile(profile, { cwd });
@@ -820,7 +855,7 @@ async function mainScreen(rl, ask) {
   const recentSessions = enrichSessions(importReplitSessions(cwd), cwd).slice(0, 7);
 
   if (recentSessions.length > 0) {
-    console.log(separator('Recent Sessions'));
+    console.log('  Recent Sessions:');
     recentSessions.forEach((sess, i) => {
       const pin    = sess.pinned ? '📌 ' : '   ';
       const active = sess.isActive ? ' ●' : '';
@@ -830,19 +865,17 @@ async function mainScreen(rl, ask) {
     console.log('');
   }
 
-  const menuOpts = [];
-  menuOpts.push({ key: 'c', label: 'Continue last session', section: 'Sessions' });
-  menuOpts.push({ key: 'n', label: 'New session',           section: 'Sessions' });
+  console.log('  [c] Continue last session');
+  console.log('  [n] New session');
   if (recentSessions.length > 0) {
-    menuOpts.push({ key: '1-9', label: 'Resume numbered above', section: 'Sessions' });
-  }
-  menuOpts.push({ key: 'e', label: 'Manage sessions',       section: 'Sessions' });
-  menuOpts.push({ key: 'd', label: 'Switch to data-tools',  section: 'Tools' });
-  menuOpts.push({ key: 'j', label: 'Login to Claude',       section: 'Auth' });
-  menuOpts.push({ key: 'k', label: 'Login to Codex',        section: 'Auth' });
-  menuOpts.push({ key: 's', label: 'Settings',              section: '' });
-  menuOpts.push({ key: 'q', label: 'Exit',                  section: '' });
-  console.log(menu(menuOpts));
+    console.log('  [1-9] Resume numbered above');
+  }
+  console.log('  [e] Manage sessions');
+  console.log('  [i] Import from replit-tools');
+  console.log('  [m] Manage subscriptions');
+  console.log('  [d] Switch to data-tools');
+  console.log('  [s] Settings');
+  console.log('  [q] Exit');
   console.log('');
 
   const choice = (await ask('  Choice: ')).trim().toLowerCase();
@@ -873,6 +906,18 @@ async function mainScreen(rl, ask) {
 
   if (choice === 'e') { return { next: 'sessions' }; }
 
+  if (choice === 'i') {
+    const sessions = importReplitSessions(cwd);
+    if (sessions.length === 0) {
+      console.log('\n  No replit-tools sessions found to import.\n');
+    } else {
+      console.log(`\n  ✅ Found ${sessions.length} sessions from replit-tools.`);
+      console.log('  Sessions are automatically available in the list above.\n');
+    }
+    await ask('  Press Enter to continue...');
+    return { next: 'main' };
+  }
+
   if (choice === 'd') {
     const { spawnSync } = await import('node:child_process');
     const which = spawnSync('which', ['claude-menu'], { encoding: 'utf8' });
@@ -885,17 +930,7 @@ async function mainScreen(rl, ask) {
     return { next: 'main' };
   }
 
-  if (choice === 'j') {
-    const { spawnSync } = await import('node:child_process');
-    spawnSync('claude', ['login'], { stdio: 'inherit' });
-    return { next: 'main' };
-  }
-
-  if (choice === 'k') {
-    const { spawnSync } = await import('node:child_process');
-    spawnSync('codex', ['login'], { stdio: 'inherit' });
-    return { next: 'main' };
-  }
+  if (choice === 'm') { return { next: 'subscriptions' }; }
 
   if (choice === 's') { return { next: 'settings' }; }
   if (choice === 'q' || choice === 'exit') { return { next: 'exit' }; }
@@ -1011,119 +1046,190 @@ async function settingsScreen(rl, ask) {
   return { next: 'settings' };
 }
 
+// ─── Helper: aggregatePlans ───────────────────────────────────────────────────
+
+const PLAN_PRICES = {
+  pro: '$20', max5: '$100', max20: '$200',
+  plus: '$20', pro100: '$100', pro200: '$200',
+};
+
+function aggregatePlans(subs) {
+  if (!subs || subs.length === 0) return '';
+  const counts = {};
+  for (const s of subs) {
+    const price = PLAN_PRICES[s.plan] || s.plan;
+    counts[price] = (counts[price] || 0) + 1;
+  }
+  return Object.entries(counts)
+    .sort((a, b) => parseInt(b[0].slice(1)) - parseInt(a[0].slice(1)))
+    .map(([price, count]) => `${price}×${count}`)
+    .join('  ');
+}
+
 // ─── Screen: subscriptionsScreen ─────────────────────────────────────────────
 
 async function subscriptionsScreen(rl, ask) {
+  console.clear();
   const cwd = process.cwd();
   const profile = loadProfile(cwd);
   const auth    = await detectAuth();
-  const plans   = detectPlans();
 
-  const claudeSub = profile?.providers?.claude;
-  const openaiSub = profile?.providers?.openai;
+  // Backward compat: migrate old single-sub format to subs array
+  for (const prov of ['claude', 'openai']) {
+    const p = profile?.providers?.[prov];
+    if (p && !p.subs && p.plan) {
+      p.subs = [{ plan: p.plan, label: p.label || null, expiresAt: p.expiresAt || null }];
+    }
+  }
 
-  const claudePlanLabel = claudeSub?.enabled
-    ? (CLAUDE_PLAN_LABELS[claudeSub.plan] ?? claudeSub.plan ?? 'n/a')
-    : 'disabled';
-  const openaiPlanLabel = openaiSub?.enabled
-    ? (OPENAI_PLAN_LABELS[openaiSub.plan] ?? openaiSub.plan ?? 'n/a')
-    : 'disabled';
+  // Build status lines — roster format
+  const lines = [];
 
-  const subLines = [
-    `Claude:  ${auth.claude.found ? 'logged in' : 'not logged in'} — ${claudePlanLabel}`,
-    claudeSub?.label ? `         label: ${claudeSub.label}` : '',
-    claudeSub?.expiresAt ? `         expires: ${claudeSub.expiresAt.slice(0, 10)}` : '',
-    '',
-    `OpenAI:  ${auth.openai.found ? 'logged in' : 'not logged in'} — ${openaiPlanLabel}`,
-    openaiSub?.label ? `         label: ${openaiSub.label}` : '',
-    openaiSub?.expiresAt ? `         expires: ${openaiSub.expiresAt.slice(0, 10)}` : '',
-  ].filter(line => line !== '');
+  function buildProviderLines(provKey, displayName, authFound) {
+    const sub = profile?.providers?.[provKey];
+    const subs = sub?.subs || [];
+    if (!authFound && subs.length === 0) {
+      lines.push(`  ⚠️  ${displayName}: not linked`);
+      return;
+    }
+    const aggregate = aggregatePlans(subs);
+    const prefix = authFound ? '✅' : '⚠️ ';
+    lines.push(`  ${prefix} ${displayName}:${aggregate ? '  ' + aggregate : '  (no subs)'}`);
+    subs.forEach((s, i) => {
+      const planLabels = provKey === 'claude' ? CLAUDE_PLAN_LABELS : OPENAI_PLAN_LABELS;
+      const planLabel = planLabels[s.plan] ?? s.plan ?? 'unknown';
+      const nameStr = (s.label || '(no label)').padEnd(22);
+      const d = s.expiresAt ? daysUntil(s.expiresAt) : null;
+      const expiry = d === null ? '' : d < 0 ? '  (expired)' : d === 0 ? '  (today)' : `  (${d}d left)`;
+      lines.push(`    ${i + 1}. ${nameStr} ${planLabel}${expiry}`);
+    });
+  }
 
+  buildProviderLines('claude', 'Claude', auth.claude.found);
+  lines.push('');
+  buildProviderLines('openai', 'OpenAI', auth.openai.found);
+
+  console.log(box('Subscriptions', lines));
   console.log('');
-  console.log(box('Subscriptions', subLines));
-  console.log('');
-  console.log(menu([
-    { key: 'd', label: 'Re-detect from CLI',   section: '' },
-    { key: 'c', label: 'Set Claude plan tier', section: '' },
-    { key: 'o', label: 'Set OpenAI plan tier', section: '' },
-    { key: 't', label: 'Set team label/expiry',section: '' },
-    { key: 'b', label: 'Back to settings',     section: '' },
-  ]));
+
+  const menuOpts = [
+    { key: '1', label: 'Add Claude sub', section: 'Link' },
+    { key: '2', label: 'Add Codex sub',  section: 'Link' },
+    { key: 'r', label: 'Remove a sub',   section: 'Link' },
+    { key: 'b', label: 'Back to home',   section: '' },
+  ];
+  console.log(menu(menuOpts));
   console.log('');
 
   const choice = (await ask('  Choice: ')).trim().toLowerCase();
 
-  if (choice === 'd') {
-    // Re-detect from CLI config files
-    if (plans.claude && claudeSub) {
-      profile.providers.claude.plan = plans.claude;
-      console.log(`  Detected Claude: ${CLAUDE_PLAN_LABELS[plans.claude] ?? plans.claude}`);
-    }
-    if (plans.openai && openaiSub) {
-      profile.providers.openai.plan = plans.openai;
-      console.log(`  Detected OpenAI: ${OPENAI_PLAN_LABELS[plans.openai] ?? plans.openai}`);
-    }
-    saveProfile(profile, { cwd });
-    return { next: 'subscriptions' };
-  }
-
-  if (choice === 'c') {
-    console.log('');
-    console.log('  Claude plan:');
-    console.log('  (1) Pro ($20/mo)');
-    console.log('  (2) Max x5 ($100/mo)');
-    console.log('  (3) Max x20 ($200/mo)');
-    const c = (await ask('  > ')).trim();
-    const planMap = { '1': 'pro', '2': 'max5', '3': 'max20' };
-    if (planMap[c]) {
+  if (choice === '1') {
+    console.log('\n  Linking Claude subscription...');
+    console.log('  A browser window will open — paste the code below when prompted.\n');
+    const { spawnSync } = await import('node:child_process');
+    const r = spawnSync('claude', ['auth', 'login'], { stdio: 'inherit', timeout: 60000 });
+    if (r.status === 0) {
+      console.log('\n  ✅ Claude linked successfully!\n');
+      const label = (await ask("  Label (e.g. \"Josh's $100 sub\", or Enter to skip): ")).trim();
+      const expiry = await askExpiry(ask, 'Claude');
+      const newPlans = detectPlans();
+      const plan = newPlans.claude?.plan || 'pro';
+      if (!profile.providers) profile.providers = {};
       if (!profile.providers.claude) profile.providers.claude = { enabled: true };
-      profile.providers.claude.plan = planMap[c];
+      profile.providers.claude.plan = plan;
       profile.providers.claude.enabled = true;
+      // Push to subs array instead of overwriting
+      if (!profile.providers.claude.subs) profile.providers.claude.subs = [];
+      profile.providers.claude.subs.push({ plan, label: label || null, expiresAt: expiry || null });
       saveProfile(profile, { cwd });
-      console.log(`  Claude plan set to: ${CLAUDE_PLAN_LABELS[planMap[c]]}`);
+      console.log('  ✓ Saved\n');
+      await ask('  Press Enter to continue...');
+    } else {
+      console.log('\n  ❌ Claude login failed or was cancelled.\n');
+      await ask('  Press Enter to continue...');
     }
     return { next: 'subscriptions' };
   }
 
-  if (choice === 'o') {
-    console.log('');
-    console.log('  OpenAI plan:');
-    console.log('  (1) Plus ($20/mo)');
-    console.log('  (2) Pro ($100/mo)');
-    console.log('  (3) Pro ($200/mo higher limits)');
-    const c = (await ask('  > ')).trim();
-    const planMap = { '1': 'plus', '2': 'pro', '3': 'pro200' };
-    if (planMap[c]) {
+  if (choice === '2') {
+    console.log('\n  Linking Codex subscription...');
+    console.log('  A browser window will open — paste the code below when prompted.\n');
+    const { spawnSync } = await import('node:child_process');
+    const r = spawnSync('codex', ['login'], { stdio: 'inherit', timeout: 60000 });
+    if (r.status === 0) {
+      console.log('\n  ✅ Codex linked successfully!\n');
+      const label = (await ask('  Label (e.g. "Team Codex Pro", or Enter to skip): ')).trim();
+      const expiry = await askExpiry(ask, 'Codex');
+      const newPlans = detectPlans();
+      const plan = newPlans.openai?.plan || 'plus';
+      if (!profile.providers) profile.providers = {};
       if (!profile.providers.openai) profile.providers.openai = { enabled: true };
-      profile.providers.openai.plan = planMap[c];
+      profile.providers.openai.plan = plan;
       profile.providers.openai.enabled = true;
+      // Push to subs array instead of overwriting
+      if (!profile.providers.openai.subs) profile.providers.openai.subs = [];
+      profile.providers.openai.subs.push({ plan, label: label || null, expiresAt: expiry || null });
       saveProfile(profile, { cwd });
-      console.log(`  OpenAI plan set to: ${OPENAI_PLAN_LABELS[planMap[c]]}`);
+      console.log('  ✓ Saved\n');
+      await ask('  Press Enter to continue...');
+    } else {
+      console.log('\n  ❌ Codex login failed or was cancelled.\n');
+      await ask('  Press Enter to continue...');
     }
     return { next: 'subscriptions' };
   }
 
-  if (choice === 't') {
-    // Team label/expiry for each provider
-    for (const provider of ['claude', 'openai']) {
-      const prov = profile.providers[provider];
-      if (!prov?.enabled) continue;
-      const provLabel = provider === 'claude' ? 'Claude' : 'OpenAI';
-      const currentLabel = prov.label || '';
-      const label = (await ask(`  ${provLabel} label [${currentLabel || 'none'}]: `)).trim();
-      if (label === '-') { delete prov.label; }
-      else if (label) { prov.label = label; }
-      const expiry = await askExpiry(ask, provLabel);
-      if (expiry) { prov.expiresAt = expiry; }
+  if (choice === 'r') {
+    // Build a flat numbered list of all subs across both providers
+    const allSubs = [];
+    for (const [provKey, displayName] of [['claude', 'Claude'], ['openai', 'OpenAI']]) {
+      const subs = profile?.providers?.[provKey]?.subs || [];
+      for (const s of subs) {
+        allSubs.push({ provKey, displayName, sub: s });
+      }
     }
-    saveProfile(profile, { cwd });
-    console.log('  Team config saved.');
+
+    if (allSubs.length === 0) {
+      console.log('\n  No subscriptions to remove.\n');
+      await ask('  Press Enter to continue...');
+      return { next: 'subscriptions' };
+    }
+
+    console.log('\n  Remove a subscription:\n');
+    allSubs.forEach(({ displayName, sub }, i) => {
+      const planLabels = displayName === 'Claude' ? CLAUDE_PLAN_LABELS : OPENAI_PLAN_LABELS;
+      const planLabel = planLabels[sub.plan] ?? sub.plan ?? 'unknown';
+      const labelStr = sub.label ? ` [${sub.label}]` : '';
+      console.log(`  (${i + 1}) ${displayName}: ${planLabel}${labelStr}`);
+    });
+    console.log('  (Enter) Cancel\n');
+
+    const numStr = (await ask('  Remove #: ')).trim();
+    const numChoice = parseInt(numStr, 10);
+    if (!isNaN(numChoice) && numChoice >= 1 && numChoice <= allSubs.length) {
+      const { provKey, sub } = allSubs[numChoice - 1];
+      const confirm = (await ask(`  Remove "${sub.label || sub.plan}" from ${provKey}? (y/N): `)).trim().toLowerCase();
+      if (confirm === 'y') {
+        const subs = profile.providers[provKey].subs;
+        const idx = subs.indexOf(sub);
+        if (idx !== -1) subs.splice(idx, 1);
+        // Update top-level plan to first remaining sub (or keep as-is)
+        if (subs.length > 0) {
+          profile.providers[provKey].plan = subs[0].plan;
+        }
+        saveProfile(profile, { cwd });
+        console.log('  ✓ Removed\n');
+      } else {
+        console.log('  Cancelled.\n');
+      }
+    } else {
+      console.log('  Cancelled.\n');
+    }
+    await ask('  Press Enter to continue...');
     return { next: 'subscriptions' };
   }
 
-  if (choice === 'b' || choice === 'back') { return { next: 'settings' }; }
-
-  return { next: 'subscriptions' };
+  return { next: 'main' };
 }
 
 // ─── Screen: dashboardScreen (kept for internal reference, unreachable) ───────
@@ -1152,7 +1258,7 @@ async function authScreen(rl, ask) {
     'Claude:',
     auth.claude.found
       ? `  logged in via ${auth.claude.source}`
-      : `  not logged in — run: claude login`,
+      : `  not logged in — run: claude auth login`,
     `  plan: ${claudePlanLabel}${claudeSub?.label ? ` [${claudeSub.label}]` : ''}`,
     '',
     'OpenAI:',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dual-brain",
-  "version": "7.1.9",
+  "version": "7.1.11",
   "description": "AI orchestration across Claude + OpenAI subscriptions — smart routing, budget awareness, and dual-brain collaboration",
   "type": "module",
   "bin": {