dual-brain 7.1.19 → 7.1.21

package/bin/dual-brain.mjs

@@ -672,7 +672,7 @@ function cmdBreakGlass(reason) {
  * 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) {
+function renderHeader(version, providerLines, dtVersion) {
   const W = 39; // inner width
   const pad = (s) => {
     // Strip ANSI codes for length calculation
@@ -683,11 +683,13 @@ function renderHeader(version, providerLines) {
   const sep    = `  ├${'─'.repeat(W)}┤`;
   const bottom = `  └${'─'.repeat(W)}┘`;
 
-  const title  = `DATA Tools - Dual Brain v${version}`;
+  const title  = dtVersion ? `DATA Tools v${dtVersion}` : `DATA Tools`;
+  const subTitle = `🧠 Dual Brain v${version}`;
   const credit = `by Steve Moraco + dual-brain`;
 
   const lines = [top];
   lines.push(`  │ ${pad(title)}│`);
+  lines.push(`  │ ${pad(subTitle)}│`);
   lines.push(`  │ ${pad(credit)}│`);
   lines.push(sep);
   for (const pl of providerLines) {
@@ -739,18 +741,20 @@ async function welcomeScreen(rl, ask) {
   const claudeReady = auth.claude.found;
   const openaiReady = auth.openai.found;
 
-  const claudePlanLabel = claudeReady
-    ? (CLAUDE_PLAN_LABELS[plans.claude] ?? plans.claude ?? 'plan unknown')
-    : null;
-  const openaiPlanLabel = openaiReady
-    ? (OPENAI_PLAN_LABELS[plans.openai] ?? plans.openai ?? 'plan unknown')
-    : null;
+  // Plan labels are inferred from auth config (rate-limit tier / JWT),
+  // not reported directly by the CLI. Suffix shows configured tier, not plan name.
+  const claudePlanSuffix = claudeReady && plans.claude
+    ? ` · ${plans.claude} configured`
+    : '';
+  const openaiPlanSuffix = openaiReady && plans.openai
+    ? ` · ${plans.openai} configured`
+    : '';
 
   const detectedLines = [];
-  if (claudeReady) detectedLines.push(`  Claude CLI ready${claudePlanLabel ? ` (${claudePlanLabel})` : ''}`);
-  else             detectedLines.push(`  Claude CLI not logged in`);
-  if (openaiReady) detectedLines.push(`  Codex CLI ready${openaiPlanLabel ? ` (${openaiPlanLabel})` : ''}`);
-  else             detectedLines.push(`  Codex CLI not logged in`);
+  if (claudeReady) detectedLines.push(`  Claude: authenticated${claudePlanSuffix}`);
+  else             detectedLines.push(`  Claude: not connected`);
+  if (openaiReady) detectedLines.push(`  Codex: authenticated${openaiPlanSuffix}`);
+  else             detectedLines.push(`  Codex: not connected`);
 
   console.log('');
   console.log('Detected:');
@@ -1031,7 +1035,15 @@ async function mainScreen(rl, ask) {
     subLine('OpenAI', openaiPlan, auth.openai.found, openaiExpired, openaiDays, openaiSub),
   ];
 
-  console.log(`📦 DATA Tools - Dual Brain v${version}`);
+  const rtMain = detectReplitTools(cwd);
+  const dtVersion = (rtMain.installed && rtMain.version) ? rtMain.version : null;
+  if (dtVersion) {
+    console.log(`📦 DATA Tools v${dtVersion}`);
+    console.log(`🧠 Dual Brain v${version}`);
+  } else {
+    console.log(`📦 DATA Tools`);
+    console.log(`🧠 Dual Brain v${version}`);
+  }
   const latestVersion = await checkForUpdates(version);
   if (latestVersion) {
     console.log(`  ⬆️  Update available: v${version} → v${latestVersion}`);
@@ -1039,36 +1051,11 @@ async function mainScreen(rl, ask) {
   }
   console.log('');
 
-  // Help shortcuts box (matching data-tools style)
-  const W = 37;
-  const helpTop    = `  ┌${'─'.repeat(W)}┐`;
-  const helpSep    = `  ├${'─'.repeat(W)}┤`;
-  const helpBottom = `  └${'─'.repeat(W)}┘`;
-  const helpPad = (s) => s + ' '.repeat(Math.max(0, W - s.length));
-
-  console.log(helpTop);
-  console.log(`  │ ${helpPad('At ~/workspace$ prompt:')}│`);
-  console.log(`  │ ${helpPad('db = show this menu')}│`);
-  console.log(`  │ ${helpPad('j  = login to claude')}│`);
-  console.log(`  │ ${helpPad('k  = login to codex')}│`);
-  console.log(helpSep);
-  console.log(`  │ ${helpPad('In Claude:')}│`);
-  console.log(`  │ ${helpPad('Ctrl+C x2 = back to menu')}│`);
-  console.log(`  │ ${helpPad('Ctrl+C x3 = exit to shell')}│`);
-  console.log(helpBottom);
-  console.log('');
-
   // Provider status (outside the box)
   for (const line of headerLines) {
     console.log(`  ${line}`);
   }
 
-  // replit-tools indicator
-  const rtMain = detectReplitTools(cwd);
-  if (rtMain.installed && rtMain.version) {
-    console.log(`  🔗 replit-tools v${rtMain.version}`);
-  }
-
   const sparkline = buildSparkline(cwd);
   if (sparkline) {
     console.log(`  Activity: ${sparkline}`);
@@ -1133,7 +1120,12 @@ async function mainScreen(rl, ask) {
       const active = sess.isActive ? ' ●' : '';
       const cat    = sess.category ? `  [${sess.category}]` : '';
       const tool = (sess.tool === 'codex') ? 'cdx' : 'cld';
-      const displayName = (sess.name && sess.name.length > 40) ? sess.name.slice(0, 37) + '...' : (sess.name || sess.id.slice(0, 8));
+      // If the name is still the "Session XXXXXXXX" fallback, try the project path instead
+      let rawName = sess.name || '';
+      if (/^Session [0-9a-f]{8,}$/i.test(rawName)) {
+        rawName = sess.project ? sess.project.replace(/^-/, '/').replace(/-/g, '/') : sess.id.slice(0, 8);
+      }
+      const displayName = rawName.length > 40 ? rawName.slice(0, 37) + '...' : (rawName || sess.id.slice(0, 8));
       console.log(`  [${i + 1}] ${pin}${tool}  ${sess.age.padEnd(8)} ${displayName}${active}${cat}`);
     });
     console.log('');
@@ -1171,15 +1163,41 @@ async function mainScreen(rl, ask) {
   console.log('  [r] Resume (full list)');
   console.log('  [/] Search sessions');
   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('  [?] Help & shortcuts');
+  console.log('');
+  console.log('  \x1b[2mreplit-tools:\x1b[0m');
+  console.log('  [i] Import sessions');
+  console.log('  [d] Switch to data-tools');
+  console.log('');
   console.log('  [q] Exit');
   console.log('');
 
   const choice = (await ask('  Choice: ')).trim().toLowerCase();
 
+  if (choice === '?') {
+    const W = 37;
+    const helpTop    = `  ┌${'─'.repeat(W)}┐`;
+    const helpSep    = `  ├${'─'.repeat(W)}┤`;
+    const helpBottom = `  └${'─'.repeat(W)}┘`;
+    const helpPad = (s) => s + ' '.repeat(Math.max(0, W - s.length));
+    console.log('');
+    console.log(helpTop);
+    console.log(`  │ ${helpPad('At ~/workspace$ prompt:')}│`);
+    console.log(`  │ ${helpPad('db = show this menu')}│`);
+    console.log(`  │ ${helpPad('j  = login to claude')}│`);
+    console.log(`  │ ${helpPad('k  = login to codex')}│`);
+    console.log(helpSep);
+    console.log(`  │ ${helpPad('In Claude:')}│`);
+    console.log(`  │ ${helpPad('Ctrl+C x2 = back to menu')}│`);
+    console.log(`  │ ${helpPad('Ctrl+C x3 = exit to shell')}│`);
+    console.log(helpBottom);
+    console.log('');
+    await ask('  Press Enter to continue...');
+    return { next: 'main' };
+  }
+
   if (choice === 'n') { return { next: 'new-session' }; }
 
   if (choice === 'c') {
@@ -1696,18 +1714,16 @@ async function runOnboardingWizard(detection, cwd, rl) {
   console.log(wRow(`Step 1 of 5: Detected providers`));
   console.log(wSep);
 
-  const claudePlanLabel = claudeReady
-    ? (CLAUDE_PLAN_LABELS[plans.claude] ?? plans.claude ?? 'plan unknown')
-    : null;
-  const openaiPlanLabel = openaiReady
-    ? (OPENAI_PLAN_LABELS[plans.openai] ?? plans.openai ?? 'plan unknown')
-    : null;
+  // Plan tier is inferred from auth config signals — not the actual plan name.
+  // Show the tier ($20/$100/$200) with "configured" suffix to be honest.
+  const claudePlanSuffix = claudeReady && plans.claude ? ` · ${plans.claude} configured` : '';
+  const openaiPlanSuffix = openaiReady && plans.openai ? ` · ${plans.openai} configured` : '';
 
   console.log(wRow(claudeReady
-    ? `✓ Claude CLI  ${claudePlanLabel ? `(${claudePlanLabel})` : ''}`
+    ? `✓ Claude CLI${claudePlanSuffix}`
     : `✗ Claude CLI  not logged in`));
   console.log(wRow(openaiReady
-    ? `✓ Codex CLI   ${openaiPlanLabel ? `(${openaiPlanLabel})` : ''}`
+    ? `✓ Codex CLI${openaiPlanSuffix}`
     : `✗ Codex CLI   not logged in`));
   if (existingSessions.length > 0) {
     console.log(wRow(`✓ ${existingSessions.length} data-tools session${existingSessions.length !== 1 ? 's' : ''} found`));
@@ -1747,31 +1763,33 @@ async function runOnboardingWizard(detection, cwd, rl) {
   console.log(wSep);
 
   if (claudeReady) {
-    const detectedClaudePlan = plans.claude || 'pro';
-    const detectedClaudeLabel = CLAUDE_PLAN_LABELS[detectedClaudePlan] ?? detectedClaudePlan;
-    console.log(wRow(`Claude — detected: ${detectedClaudeLabel}`));
+    // Plan tier is inferred from auth config (rate-limit signal), not the actual plan name.
+    const configuredClaudePlan = plans.claude || '$20';
+    const configuredClaudeDesc = configuredClaudePlan + ' configured';
+    console.log(wRow(`Claude — ${configuredClaudeDesc}`));
     console.log(wRow(`  [1] Pro ($20/mo)`));
     console.log(wRow(`  [2] Max x5 ($100/mo)`));
     console.log(wRow(`  [3] Max x20 ($200/mo)`));
-    console.log(wRow(`  [Enter] Keep detected (${detectedClaudeLabel})`));
+    console.log(wRow(`  [Enter] Keep configured (${configuredClaudePlan})`));
     console.log(wSep);
     const claudeChoice = (await ask('  Claude plan [1/2/3/Enter]: ')).trim();
     const claudePlanMap = { '1': 'pro', '2': 'max5', '3': 'max20' };
-    state.claudePlan = claudePlanMap[claudeChoice] || detectedClaudePlan;
+    state.claudePlan = claudePlanMap[claudeChoice] || configuredClaudePlan;
   }
 
   if (openaiReady) {
-    const detectedOpenaiPlan = plans.openai || 'plus';
-    const detectedOpenaiLabel = OPENAI_PLAN_LABELS[detectedOpenaiPlan] ?? detectedOpenaiPlan;
-    console.log(wRow(`OpenAI — detected: ${detectedOpenaiLabel}`));
+    // Plan tier is inferred from JWT claim in auth config, not the actual plan name.
+    const configuredOpenaiPlan = plans.openai || '$20';
+    const configuredOpenaiDesc = configuredOpenaiPlan + ' configured';
+    console.log(wRow(`OpenAI — ${configuredOpenaiDesc}`));
     console.log(wRow(`  [1] Plus ($20/mo)`));
     console.log(wRow(`  [2] Pro ($100/mo)`));
     console.log(wRow(`  [3] Pro ($200/mo higher limits)`));
-    console.log(wRow(`  [Enter] Keep detected (${detectedOpenaiLabel})`));
+    console.log(wRow(`  [Enter] Keep configured (${configuredOpenaiPlan})`));
     console.log(wSep);
     const openaiChoice = (await ask('  OpenAI plan [1/2/3/Enter]: ')).trim();
     const openaiPlanMap = { '1': 'plus', '2': 'pro', '3': 'pro200' };
-    state.openaiPlan = openaiPlanMap[openaiChoice] || detectedOpenaiPlan;
+    state.openaiPlan = openaiPlanMap[openaiChoice] || configuredOpenaiPlan;
   }
 
   console.log(wBottom);
@@ -2053,8 +2071,9 @@ async function diagnosticsScreen(rl, ask) {
 
   const claudeHealthBadge = auth.claude.found ? _providerBadge('claude') : 'not logged in';
   const openaiHealthBadge = auth.openai.found ? _providerBadge('openai') : 'not logged in';
-  const claudePlanStr     = plans.claude ? (CLAUDE_PLAN_LABELS[plans.claude] ?? plans.claude) : 'unknown';
-  const openaiPlanStr     = plans.openai ? (OPENAI_PLAN_LABELS[plans.openai] ?? plans.openai) : 'unknown';
+  // Plan tier is inferred from auth config signals — show tier with "configured" to be honest.
+  const claudePlanStr     = plans.claude ? `${plans.claude} configured` : 'unknown';
+  const openaiPlanStr     = plans.openai ? `${plans.openai} configured` : 'unknown';
 
   // ── Enforcement checks ────────────────────────────────────────────────────
   const hooksDir           = join(cwd, '.claude', 'hooks');

package/package.json

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

package/src/profile.mjs

@@ -240,9 +240,14 @@ function decodeJwtPayload(token) {
 }
 
 /**
- * Detect actual subscription plans from Claude Code and Codex config files.
+ * Infer plan tier from Claude Code and Codex auth config files.
  * Returns { claude: '$20'|'$100'|'$200'|null, openai: '$20'|'$100'|'$200'|null }.
  * Returns nulls for any provider whose config cannot be read — never throws.
+ *
+ * NOTE: This reads rate-limit tier signals (organizationRateLimitTier for Claude,
+ * chatgpt_plan_type JWT claim for OpenAI) and maps them to price tiers.
+ * It does NOT retrieve the actual subscription plan name from the provider —
+ * labels like "Max x5" or "Pro" are our own interpretations of those signals.
  */
 function detectPlans() {
   const plans = { claude: null, openai: null };
@@ -371,23 +376,19 @@ function loadProfile(cwd) {
   }
   if (!profile) profile = defaultProfile();
 
-  // Auto-detect plans from provider config files and apply if detected.
+  // Read plan tier from auth config files (JWT or organizationRateLimitTier) and
+  // apply if it differs from the stored profile value.
+  // NOTE: detectPlans() reads rate-limit tier data from the auth config — it infers
+  // a price tier ($20/$100/$200) from that signal, not from the subscription name itself.
+  // The plan label (e.g. "Max x5") comes from our own mapping, not from Claude/OpenAI.
   const detected = detectPlans();
   for (const [provider, detectedPlan] of Object.entries(detected)) {
     if (!detectedPlan) continue;
     if (!profile.providers[provider]) continue;
     const stored = profile.providers[provider].plan;
     if (stored !== detectedPlan) {
-      const labels = {
-        claude: {
-          '$20': 'Claude Pro ($20)', '$100': 'Claude Max x5 ($100)', '$200': 'Claude Max x20 ($200)',
-        },
-        openai: {
-          '$20': 'ChatGPT Plus ($20)', '$100': 'ChatGPT Pro ($100)', '$200': 'ChatGPT Pro ($200)',
-        },
-      };
-      const label = labels[provider]?.[detectedPlan] ?? `${provider} ${detectedPlan}`;
-      process.stderr.write(`[dual-brain] Detected ${label} plan\n`);
+      const providerName = provider === 'claude' ? 'Claude' : 'OpenAI';
+      process.stderr.write(`[dual-brain] ${providerName}: plan updated to ${detectedPlan} (from auth config)\n`);
       profile.providers[provider].plan = detectedPlan;
     }
   }
@@ -622,12 +623,10 @@ async function autoSetup(cwd) {
   if (auth.claude.found) {
     profile.providers.claude.enabled = true;
     profile.providers.claude.plan    = plans.claude || '$20';
-    const planLabel = {
-      '$20':  'Claude Pro ($20)',
-      '$100': 'Claude Max x5 ($100)',
-      '$200': 'Claude Max x20 ($200)',
-    }[profile.providers.claude.plan] || profile.providers.claude.plan;
-    result.actions.push(`${planLabel} (${auth.claude.source})`);
+    // Plan tier is inferred from auth config signal — show tier with "configured",
+    // not a plan name we didn't actually detect.
+    const claudeTierLabel = plans.claude ? `${plans.claude} configured` : 'connected';
+    result.actions.push(`Claude: ${claudeTierLabel} (${auth.claude.source})`);
   } else {
     profile.providers.claude.enabled = false;
     result.warnings.push('Claude CLI not logged in — run: claude login');
@@ -637,12 +636,10 @@ async function autoSetup(cwd) {
   if (auth.openai.found) {
     profile.providers.openai.enabled = true;
     profile.providers.openai.plan    = plans.openai || '$20';
-    const planLabel = {
-      '$20':  'ChatGPT Plus ($20)',
-      '$100': 'ChatGPT Pro ($100)',
-      '$200': 'ChatGPT Pro ($200)',
-    }[profile.providers.openai.plan] || profile.providers.openai.plan;
-    result.actions.push(`${planLabel} (${auth.openai.source})`);
+    // Plan tier is inferred from JWT claim in auth config — show tier with "configured",
+    // not a plan name we didn't actually detect.
+    const openaiTierLabel = plans.openai ? `${plans.openai} configured` : 'connected';
+    result.actions.push(`OpenAI: ${openaiTierLabel} (${auth.openai.source})`);
   } else {
     profile.providers.openai.enabled = false;
     result.warnings.push('Codex CLI not logged in — run: codex login');
@@ -938,7 +935,11 @@ async function detectExistingAuth(cwd) {
   }
 
   // -------------------------------------------------------------------------
-  // Plan detection (re-use detectPlans which reads the same config files)
+  // Plan tier inference (re-uses detectPlans which reads auth config files)
+  // NOTE: This is NOT subscription detection — we infer a price tier ($20/$100/$200)
+  // from rate-limit tier signals in the auth config (organizationRateLimitTier for
+  // Claude, JWT chatgpt_plan_type for OpenAI). The CLI does not report the actual
+  // plan name or price. Any plan label shown to the user comes from our own mapping.
   // -------------------------------------------------------------------------
   const plans = detectPlans();
   if (result.claude.found && plans.claude) result.claude.plan = plans.claude;