claudmax 1.0.3 → 1.0.6

package/index.js

@@ -231,32 +231,46 @@ function configureSystem(apiKey) {
     apiKey,
     baseUrl: API_BASE,
     configuredAt: new Date().toISOString(),
-    version: '1.0.0',
+    version: '1.0.5',
   });
   console.log(`  ${CHECK} Saved config to ${C.magenta(CONFIG_FILE)}`);
 
   // 2. Write environment variables to shell profile
   const profile = getShellProfile();
+
+  // Remove any existing ClaudMax/OpusCode/OpusMax blocks first
+  const existing = fs.existsSync(profile) ? fs.readFileSync(profile, 'utf8') : '';
+  let cleaned = existing
+    .split('\n')
+    .filter(line => {
+      const trimmed = line.trim();
+      return (
+        !trimmed.startsWith('# ClaudMax') &&
+        !trimmed.startsWith('export ANTHROPIC_API_KEY=') &&
+        !trimmed.startsWith('export ANTHROPIC_BASE_URL=') &&
+        !trimmed.startsWith('export OPUSCODE') &&
+        !trimmed.startsWith('export OPUSMAX') &&
+        !trimmed.startsWith('# OpusCode') &&
+        !trimmed.startsWith('# OpusMax')
+      );
+    })
+    .join('\n');
+
   const envBlock = [
     '# ClaudMax Configuration',
-    `export ANTHROPIC_BASE_URL="${API_BASE}/v1/messages"`,
     `export ANTHROPIC_API_KEY="${apiKey}"`,
-    '# Alias for quick access',
-    'alias claude="claude"',
+    `export ANTHROPIC_BASE_URL="${API_BASE}/v1/messages"`,
     '',
   ].join('\n');
 
-  const appended = appendToFile(profile, envBlock);
-  if (appended) {
-    console.log(`  ${CHECK} Added environment variables to ${C.magenta(profile)}`);
-    console.log(`  ${INFO} ${C.dim('Run: source ' + profile + ' or restart your terminal')}`);
-  } else {
-    console.log(`  ${INFO} Environment variables already configured in ${C.magenta(profile)}`);
-  }
+  const newContent = cleaned.trimEnd() + '\n' + envBlock;
+  fs.writeFileSync(profile, newContent);
+  console.log(`  ${CHECK} Updated environment variables in ${C.magenta(profile)}`);
+  console.log(`  ${INFO} ${C.dim('Run: source ' + profile + ' or restart your terminal')}`);
 
   // Set for current process too
-  process.env.ANTHROPIC_BASE_URL = `${API_BASE}/v1/messages`;
   process.env.ANTHROPIC_API_KEY = apiKey;
+  process.env.ANTHROPIC_BASE_URL = `${API_BASE}/v1/messages`;
 
   return profile;
 }
@@ -270,9 +284,8 @@ function configureClaudeCLI(apiKey) {
 
   ensureDir(path.dirname(settingsPath));
 
-  // settings.json
-  const settings = readJson(settingsPath) || {};
-  deepMerge(settings, {
+  // settings.json — start fresh to override OpusCode settings
+  const settings = {
     env: {
       ANTHROPIC_AUTH_TOKEN: apiKey,
       ANTHROPIC_BASE_URL: `${API_BASE}/v1/messages`,
@@ -283,7 +296,7 @@ function configureClaudeCLI(apiKey) {
       ANTHROPIC_DEFAULT_HAIKU_MODEL: 'claude-haiku-4-5-20251001',
     },
     hasCompletedOnboarding: true,
-  });
+  };
   writeJson(settingsPath, settings);
   console.log(`  ${CHECK} Wrote Claude Code settings: ${C.magenta(settingsPath)}`);
 
@@ -398,7 +411,8 @@ function installMCPServer() {
     console.log(`  ${CHECK} ${C.green(MCP_PKG + ' installed successfully.')}`);
     return true;
   } catch (err) {
-    console.log(`  ${WARN} Could not install ${MCP_PKG}: ${C.dim((err.stderr || err.message || '').trim())}`);
+    const errMsg = String(err.stderr || err.message || '');
+    console.log(`  ${WARN} Could not install ${MCP_PKG}: ${C.dim(errMsg.trim())}`);
     console.log(`  ${INFO} Install manually later: ${C.bold('npm install -g ' + MCP_PKG)}`);
     return false;
   }
@@ -407,9 +421,9 @@ function installMCPServer() {
 // ── Banner ────────────────────────────────────────────────────────────────────
 function printBanner() {
   console.log('');
-  console.log(C.magenta('\u2554' + '\u2550'.repeat(48) + '\u2557'));
-  console.log(C.magenta('\u2551') + C.bold('       \u2726 ClaudMax Setup Wizard \u2726            ') + C.magenta('\u2551'));
-  console.log(C.magenta('\u255A' + '\u2550'.repeat(48) + '\u255D'));
+  console.log(C.magenta('\u2554' + '\u2550'.repeat(44) + '\u2557'));
+  console.log(C.magenta('\u2551') + C.bold('         \u26A1 ClaudMax Setup               ') + C.magenta('\u2551'));
+  console.log(C.magenta('\u255A' + '\u2550'.repeat(44) + '\u255D'));
   console.log('');
 }
 
@@ -552,30 +566,8 @@ async function main() {
     }
   }
 
-  if (nodeOk && !gitOk) {
-    if (!installDep('Git', installGit)) {
-      console.log(`\n${C.yellow('Git installation failed. You can install it manually.')}`);
-    } else {
-      gitOk = isCommandAvailable('git');
-    }
-  }
-
-  if (nodeOk && !claudeOk) {
-    const installClaude = await ask(rl, `\n${WARN} Claude CLI not found. Install it? ${C.bold('[Y/n]: ')}`);
-    if (!installClaude || installClaude.toLowerCase() === 'y' || installClaude.toLowerCase() === 'yes') {
-      if (!installDep('Claude CLI', installClaudeCLI)) {
-        console.log(`\n${C.yellow('Claude CLI installation failed. You can install it with: npm i -g @anthropic-ai/claude-code')}`);
-      } else {
-        claudeOk = isCommandAvailable('claude');
-      }
-    }
-  }
-
-  console.log('');
-
-  // ── Step 2: API key prompt ───────────────────────────────────────────────
-  console.log(C.bold('Step 2: Enter your ClaudMax API key\n'));
-  console.log('');
+  // ── Step 1: API key prompt ───────────────────────────────────────────────
+  console.log(C.bold('\nStep 1: Enter your ClaudMax API key\n'));
 
   let apiKey = '';
   while (!apiKey.trim()) {
@@ -587,42 +579,17 @@ async function main() {
   apiKey = apiKey.trim();
   console.log('');
 
-  // ── Step 3: Verify API key ───────────────────────────────────────────────
-  console.log(C.bold('Step 3: Verifying API key...\n'));
-  const result = await verifyConnection(apiKey);
-
-  if (result.ok) {
-    const data = result.data;
-    if (result.status === 401) {
-      console.log(`  ${CROSS} ${C.red('Invalid API key. Please check and try again.')}`);
-      console.log(`  ${INFO} ${C.dim(data.error || 'Authentication failed')}`);
-      rl.close();
-      process.exit(1);
-    } else {
-      console.log(`  ${CHECK} ${C.green('API key is valid!')}`);
-      const tier = (data.tier || 'free').toUpperCase();
-      const limit = data.requestsLimit?.toLocaleString() || 'N/A';
-      const tokenLimit = data.tokensLimit ? (data.tokensLimit >= 1e9 ? 'Unlimited' : (data.tokensLimit / 1e6).toFixed(0) + 'M tokens/5h') : 'N/A';
-      console.log(`  ${INFO} Plan: ${C.magenta(tier)} | Requests: ${C.cyan(limit)} | Tokens: ${C.cyan(tokenLimit)}`);
-    }
-  } else {
-    console.log(`  ${WARN} ${C.yellow('Could not verify API key (network error). Continuing with setup anyway...')}`);
-    console.log(`  ${INFO} ${C.dim(result.error || 'Connection failed')}`);
-  }
-
-  // ── Step 4: Configure system ──────────────────────────────────────────────
-  console.log('');
+  // ── Configure system ──────────────────────────────────────────────────────
   const profile = configureSystem(apiKey);
 
-  // ── Step 5: IDE selection ─────────────────────────────────────────────────
-  console.log('');
-  console.log(C.bold('Step 5: Select IDEs to configure\n'));
+  // ── Step 2: IDE selection ─────────────────────────────────────────────────
+  console.log(C.bold('Step 2: Select IDEs to configure\n'));
 
   const IDES = [
-    { id: 1, name: 'Claude Code CLI', shortName: 'Claude Code', configure: configureClaudeCLI },
+    { id: 1, name: 'Claude Code (CLI)',        shortName: 'Claude Code', configure: configureClaudeCLI },
     { id: 2, name: 'VS Code (Claude Extension)', shortName: 'VS Code', configure: configureVSCodeClaude },
-    { id: 3, name: 'Cursor', shortName: 'Cursor', configure: configureCursor },
-    { id: 4, name: 'Windsurf', shortName: 'Windsurf', configure: configureWindsurf },
+    { id: 3, name: 'Cursor',                   shortName: 'Cursor', configure: configureCursor },
+    { id: 4, name: 'Windsurf',                 shortName: 'Windsurf', configure: configureWindsurf },
     { id: 5, name: 'Cline (VS Code Extension)', shortName: 'Cline', configure: configureCline },
     { id: 6, name: 'Roo Code (VS Code Extension)', shortName: 'Roo Code', configure: configureRooCode },
   ];
@@ -631,7 +598,7 @@ async function main() {
     console.log(`  ${C.purple('[' + ide.id + ']')} ${ide.name}`);
   }
   console.log('');
-  console.log(`  ${C.dim("Enter numbers separated by spaces (e.g. 1 3 4), " + C.bold("'a'") + " for all, or press Enter to skip")}`);
+  console.log(`  ${C.dim("Enter numbers separated by spaces (e.g. 1 3 4), or " + C.bold("'a'") + " for all")}`);
 
   const choice = await ask(rl, `  ${C.bold('Your choice')}: `);
   let selectedIds = [];
@@ -642,42 +609,66 @@ async function main() {
     selectedIds = choice.trim().split(/[\s,]+/).map(Number).filter((n) => n >= 1 && n <= IDES.length);
   }
 
+  console.log('');
+
+  // ── Configure selected IDEs ──────────────────────────────────────────────
   if (selectedIds.length > 0) {
     const selectedIDEs = IDES.filter((ide) => selectedIds.includes(ide.id));
     for (const ide of selectedIDEs) {
       try {
         ide.configure(apiKey);
       } catch (err) {
-        console.log(`  ${CROSS} Failed to configure ${ide.name}: ${err.message}`);
+        console.log(`  ${CROSS} Failed to configure ${ide.name}: ${String(err && err.message ? err.message : err)}`);
       }
     }
   } else {
-    console.log(`\n  ${WARN} ${C.yellow('No IDEs selected. You can configure them manually later.')}`);
+    console.log(`  ${WARN} ${C.yellow('No IDEs selected. Skipping IDE configuration.')}`);
   }
 
-  // ── Step 6: Install MCP server ───────────────────────────────────────────
+  // ── Install MCP server ───────────────────────────────────────────────────
   installMCPServer();
 
+  // ── Verify connection ─────────────────────────────────────────────────────
+  console.log(`\n${ARROW} ${C.bold('Verifying connection to ClaudMax API...')}`);
+  const result = await verifyConnection(apiKey);
+
+  if (result.ok) {
+    const data = result.data;
+    if (result.status === 401) {
+      console.log(`  ${CROSS} ${C.red('Invalid API key. Please check and try again.')}`);
+      console.log(`  ${INFO} ${C.dim(data.error || 'Authentication failed')}`);
+      rl.close();
+      process.exit(1);
+    } else {
+      console.log(`  ${CHECK} ${C.green('Connected — API key is valid.')}`);
+      const tier = (data.tier || 'free').toUpperCase();
+      const limit = data.requestsLimit?.toLocaleString() || 'N/A';
+      const tokenLimit = data.tokensLimit ? (data.tokensLimit >= 1e9 ? 'Unlimited' : (data.tokensLimit / 1e6).toFixed(0) + 'M tokens/5h') : 'N/A';
+      console.log(`  ${INFO} Plan: ${C.magenta(tier)} | Requests: ${C.cyan(limit)} | Tokens: ${C.cyan(tokenLimit)}`);
+    }
+  } else {
+    console.log(`  ${WARN} ${C.yellow('Could not verify API key (network error).')}`);
+    console.log(`  ${INFO} ${C.dim(result.error || 'Connection failed')}`);
+  }
+
   // ── Summary ───────────────────────────────────────────────────────────────
   console.log('');
-  console.log(C.magenta('\u2554' + '\u2550'.repeat(48) + '\u2557'));
-  console.log(C.magenta('\u2551') + C.bold('  \u2713 Setup complete!                        ') + C.magenta('\u2551'));
-  console.log(C.magenta('\u2551') + C.green('  All systems configured successfully.         ') + C.magenta('\u2551'));
-  console.log(C.magenta('\u255A' + '\u2550'.repeat(48) + '\u255D'));
+  console.log(C.magenta('\u2554' + '\u2550'.repeat(44) + '\u2557'));
+  console.log(C.magenta('\u2551') + C.bold('  \u2713 Setup complete!                         ') + C.magenta('\u2551'));
+  console.log(C.magenta('\u2551') + C.green('  Restart your IDE(s) to apply.               ') + C.magenta('\u2551'));
+  console.log(C.magenta('\u255A' + '\u2550'.repeat(44) + '\u255D'));
   console.log('');
   console.log(`  ${INFO} ${C.bold('Next steps:')}`);
-  console.log(`  1. ${C.dim('Run:')} ${C.bold('source ' + profile)} ${C.dim('(or restart your terminal)')}`);
+  console.log(`  1. ${C.dim('Restart your IDE(s) to apply.')}`);
   console.log(`  2. ${C.dim('Verify with:')} ${C.bold('claude --version')}`);
   console.log(`  3. ${C.dim('Start chatting:')} ${C.bold('claude')}`);
   console.log(`  4. ${C.dim('Check usage:')} ${C.bold('npx claudmax status')}`);
   console.log('');
-  console.log(`  ${INFO} Config saved at: ${C.magenta(CONFIG_FILE)}`);
-  console.log('');
 
   rl.close();
 }
 
 main().catch((err) => {
-  console.error('\n' + C.red('\u2717 Fatal error: ' + err.message));
+  console.error('\n' + C.red('\u2717 Fatal error: ' + String(err.message || err)));
   process.exit(1);
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claudmax",
-  "version": "1.0.3",
+  "version": "1.0.6",
   "description": "ClaudMax CLI — Configure Claude Code, Cursor, Windsurf, Cline, and Roo Code to use ClaudMax API gateway with one command",
   "main": "index.js",
   "bin": {