@sendblue/cli 0.2.0 → 0.4.0

package/dist/commands/add-contact.js

@@ -1,29 +1,27 @@
 import chalk from 'chalk';
+import ora from 'ora';
 import { getCredentials } from '../lib/config.js';
 import { addContact, getSharedContacts } from '../lib/api.js';
-import { formatPhoneNumber, printError, printInfo, printSuccess } from '../lib/format.js';
+import { formatPhoneNumber, normalizeNumber, printError } from '../lib/format.js';
 export async function addContactCommand(number) {
     const creds = getCredentials();
     if (!creds) {
         printError('No credentials found. Run `sendblue login` first.');
         process.exit(1);
     }
-    // Normalize number
-    const normalized = number.startsWith('+') ? number : `+${number}`;
-    console.log();
-    printInfo(`  Adding contact ${formatPhoneNumber(normalized)}...`);
+    const normalized = normalizeNumber(number);
+    const spinner = ora({ text: `Adding contact ${formatPhoneNumber(normalized)}...`, indent: 2 }).start();
     try {
         const result = await addContact(creds.apiKey, creds.apiSecret, normalized);
         if (result.verified) {
-            printSuccess(`  Contact ${formatPhoneNumber(normalized)} is already verified!`);
+            spinner.succeed(`Contact ${formatPhoneNumber(normalized)} is already verified!`);
             console.log();
             console.log(chalk.bold('  You can now send messages:'));
             console.log(chalk.cyan(`    sendblue send ${normalized} "Hello!"`));
             console.log();
             return;
         }
-        // Contact added but needs verification
-        console.log(chalk.green(`  Contact added!`));
+        spinner.succeed('Contact added!');
         console.log();
         // Get the shared number
         const contacts = await getSharedContacts(creds.apiKey, creds.apiSecret);
@@ -46,7 +44,7 @@ export async function addContactCommand(number) {
         console.log();
     }
     catch (err) {
-        printError(`  Failed: ${err instanceof Error ? err.message : String(err)}`);
+        spinner.fail(`Failed: ${err instanceof Error ? err.message : String(err)}`);
         process.exit(1);
     }
 }
@@ -56,8 +54,10 @@ export async function contactsCommand() {
         printError('No credentials found. Run `sendblue login` first.');
         process.exit(1);
     }
+    const spinner = ora({ text: 'Fetching contacts...', indent: 2 }).start();
     try {
         const result = await getSharedContacts(creds.apiKey, creds.apiSecret);
+        spinner.stop();
         console.log();
         console.log(chalk.bold('  Contacts'));
         if (result.sharedNumber) {
@@ -84,7 +84,7 @@ export async function contactsCommand() {
         console.log();
     }
     catch (err) {
-        printError(`  Failed: ${err instanceof Error ? err.message : String(err)}`);
+        spinner.fail(`Failed: ${err instanceof Error ? err.message : String(err)}`);
         process.exit(1);
     }
 }

package/dist/commands/login.d.ts

@@ -0,0 +1 @@
+export declare function loginCommand(): Promise<void>;

package/dist/commands/login.js

@@ -0,0 +1,84 @@
+import prompts from 'prompts';
+import chalk from 'chalk';
+import ora from 'ora';
+import { getCredentials, saveCredentials, credentialsPath } from '../lib/config.js';
+import { sendCode, verifyLogin } from '../lib/api.js';
+import { printError, formatPhoneNumber } from '../lib/format.js';
+const onCancel = () => {
+    console.log();
+    printError('Login cancelled.');
+    process.exit(0);
+};
+export async function loginCommand() {
+    console.log();
+    console.log(chalk.bold('  sendblue login'));
+    console.log(chalk.dim('  Log in to an existing Sendblue account'));
+    console.log();
+    // Check for existing credentials
+    const existing = getCredentials();
+    if (existing) {
+        const { overwrite } = await prompts({
+            type: 'confirm',
+            name: 'overwrite',
+            message: `You already have an account configured (${existing.email}). Overwrite?`,
+            initial: false
+        }, { onCancel });
+        if (!overwrite) {
+            console.log(chalk.dim('  Login cancelled.'));
+            return;
+        }
+    }
+    // Step 1: Collect email
+    const { email } = await prompts({
+        type: 'text',
+        name: 'email',
+        message: 'Email',
+        validate: (v) => /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(v) || 'Enter a valid email'
+    }, { onCancel });
+    // Step 2: Send verification code
+    const sendSpinner = ora({ text: 'Sending verification code...', indent: 2 }).start();
+    try {
+        await sendCode(email);
+        sendSpinner.succeed(`Code sent to ${email}`);
+    }
+    catch (err) {
+        sendSpinner.fail(`Failed to send code: ${err instanceof Error ? err.message : String(err)}`);
+        process.exit(1);
+    }
+    console.log();
+    // Step 3: Enter code
+    const { code } = await prompts({
+        type: 'text',
+        name: 'code',
+        message: 'Verification code',
+        validate: (v) => /^\d{8}$/.test(v) || 'Enter the 8-digit code from your email'
+    }, { onCancel });
+    // Step 4: Verify code + look up existing account
+    const loginSpinner = ora({ text: 'Logging in...', indent: 2 }).start();
+    try {
+        const result = await verifyLogin(email, code);
+        loginSpinner.succeed('Logged in!');
+        saveCredentials({
+            apiKey: result.apiKey,
+            apiSecret: result.apiSecret,
+            email: result.email,
+            assignedNumber: result.assignedNumber,
+            plan: result.plan,
+            createdAt: new Date().toISOString()
+        });
+        console.log();
+        console.log(`  ${chalk.bold('Email')}:         ${result.email}`);
+        console.log(`  ${chalk.bold('Company')}:       ${result.companyName}`);
+        if (result.assignedNumber) {
+            console.log(`  ${chalk.bold('Phone Number')}:  ${formatPhoneNumber(result.assignedNumber)}`);
+        }
+        console.log(`  ${chalk.bold('Plan')}:          ${result.plan}`);
+        console.log();
+        console.log(chalk.dim(`  Credentials saved to ${credentialsPath()}`));
+        console.log();
+    }
+    catch (err) {
+        loginSpinner.fail(`Login failed: ${err instanceof Error ? err.message : String(err)}`);
+        process.exit(1);
+    }
+}

package/dist/commands/send.js

@@ -1,22 +1,26 @@
 import chalk from 'chalk';
+import ora from 'ora';
 import { getCredentials } from '../lib/config.js';
 import { sendMessage } from '../lib/api.js';
-import { printError, printSuccess } from '../lib/format.js';
+import { normalizeNumber } from '../lib/format.js';
+import { printError } from '../lib/format.js';
 export async function sendCommand(number, message) {
     const creds = getCredentials();
     if (!creds) {
-        printError('No credentials found. Run `sendblue setup` first.');
+        printError('No credentials found. Run `sendblue login` first.');
         process.exit(1);
     }
+    const normalized = normalizeNumber(number);
+    const spinner = ora({ text: `Sending to ${normalized}...`, indent: 2 }).start();
     try {
-        const result = await sendMessage(creds.apiKey, creds.apiSecret, number, message);
-        printSuccess(`Message sent to ${number}`);
+        const result = await sendMessage(creds.apiKey, creds.apiSecret, normalized, message);
+        spinner.succeed(`Message sent to ${normalized}`);
         if (result.messageId) {
             console.log(chalk.dim(`  Message ID: ${result.messageId}`));
         }
     }
     catch (err) {
-        printError(`Send failed: ${err instanceof Error ? err.message : String(err)}`);
+        spinner.fail(`Send failed: ${err instanceof Error ? err.message : String(err)}`);
         process.exit(1);
     }
 }

package/dist/commands/setup.d.ts

@@ -1 +1 @@
-export declare function loginCommand(): Promise<void>;
+export declare function setupCommand(): Promise<void>;

package/dist/commands/setup.js

@@ -1,12 +1,18 @@
 import prompts from 'prompts';
 import chalk from 'chalk';
+import ora from 'ora';
 import { getCredentials, saveCredentials, credentialsPath } from '../lib/config.js';
-import { sendCode, verifyCode } from '../lib/api.js';
-import { printCredentials, printError, printInfo } from '../lib/format.js';
-export async function loginCommand() {
+import { sendCode, verifySetup } from '../lib/api.js';
+import { printCredentials, printError, formatPhoneNumber } from '../lib/format.js';
+const onCancel = () => {
     console.log();
-    console.log(chalk.bold('  sendblue login'));
-    console.log(chalk.dim('  iMessage numbers for agents'));
+    printError('Setup cancelled.');
+    process.exit(0);
+};
+export async function setupCommand() {
+    console.log();
+    console.log(chalk.bold('  sendblue setup'));
+    console.log(chalk.dim('  Create a new Sendblue account'));
     console.log();
     // Check for existing credentials
     const existing = getCredentials();
@@ -16,9 +22,9 @@ export async function loginCommand() {
             name: 'overwrite',
             message: `You already have an account configured (${existing.email}). Overwrite?`,
             initial: false
-        });
+        }, { onCancel });
         if (!overwrite) {
-            printInfo('Login cancelled.');
+            console.log(chalk.dim('  Setup cancelled.'));
             return;
         }
     }
@@ -28,46 +34,45 @@ export async function loginCommand() {
         name: 'email',
         message: 'Email',
         validate: (v) => /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(v) || 'Enter a valid email'
-    });
-    if (!email) {
-        printError('Login cancelled.');
-        return;
-    }
+    }, { onCancel });
     // Step 2: Send verification code
-    console.log();
-    printInfo('  Sending verification code...');
+    const sendSpinner = ora({ text: 'Sending verification code...', indent: 2 }).start();
     try {
         await sendCode(email);
+        sendSpinner.succeed(`Code sent to ${email}`);
     }
     catch (err) {
-        printError(`  Failed to send code: ${err instanceof Error ? err.message : String(err)}`);
+        sendSpinner.fail(`Failed to send code: ${err instanceof Error ? err.message : String(err)}`);
         process.exit(1);
     }
-    console.log(chalk.green(`  Code sent to ${email}`));
     console.log();
     // Step 3: Enter code
     const { code } = await prompts({
         type: 'text',
         name: 'code',
         message: 'Verification code',
-        validate: (v) => /^\d{6}$/.test(v) || 'Enter the 6-digit code from your email'
-    });
-    if (!code) {
-        printError('Login cancelled.');
-        return;
-    }
-    // Step 4: Optional company name
+        validate: (v) => /^\d{8}$/.test(v) || 'Enter the 8-digit code from your email'
+    }, { onCancel });
+    // Step 4: Company name (required for setup)
     const { companyName } = await prompts({
         type: 'text',
         name: 'companyName',
-        message: 'Company name (optional)',
-        initial: ''
-    });
-    console.log();
-    printInfo('  Setting up your account...');
+        message: 'Company name (lowercase, hyphens/underscores only)',
+        validate: (v) => {
+            if (!v)
+                return 'Company name is required';
+            if (!/^[a-z0-9_-]+$/.test(v))
+                return 'Only lowercase letters, numbers, hyphens, and underscores';
+            if (v.length < 3 || v.length > 64)
+                return 'Must be 3-64 characters';
+            return true;
+        }
+    }, { onCancel });
     // Step 5: Verify code + create account
+    const setupSpinner = ora({ text: 'Setting up your account...', indent: 2 }).start();
     try {
-        const result = await verifyCode(email, code, companyName || undefined);
+        const result = await verifySetup(email, code, companyName);
+        setupSpinner.succeed('Account created!');
         saveCredentials({
             apiKey: result.apiKey,
             apiSecret: result.apiSecret,
@@ -79,12 +84,16 @@ export async function loginCommand() {
         printCredentials(result);
         console.log(chalk.dim(`  Credentials saved to ${credentialsPath()}`));
         console.log();
-        console.log(chalk.bold('  Quick start:'));
-        console.log(chalk.cyan(`    sendblue send +15551234567 "Hello from Sendblue!"`));
+        console.log(chalk.bold('  Next step — add a contact:'));
+        console.log(chalk.cyan(`    sendblue add-contact +15551234567`));
         console.log();
+        if (result.assignedNumber) {
+            console.log(chalk.dim(`  Your contact will need to text ${formatPhoneNumber(result.assignedNumber)} to verify.`));
+            console.log();
+        }
     }
     catch (err) {
-        printError(`  Setup failed: ${err instanceof Error ? err.message : String(err)}`);
+        setupSpinner.fail(`Setup failed: ${err instanceof Error ? err.message : String(err)}`);
         process.exit(1);
     }
 }

package/dist/commands/status.js

@@ -1,15 +1,18 @@
 import chalk from 'chalk';
+import ora from 'ora';
 import { getCredentials } from '../lib/config.js';
 import { getAccount } from '../lib/api.js';
 import { formatPhoneNumber, printError } from '../lib/format.js';
 export async function statusCommand() {
     const creds = getCredentials();
     if (!creds) {
-        printError('No credentials found. Run `sendblue setup` first.');
+        printError('No credentials found. Run `sendblue login` first.');
         process.exit(1);
     }
+    const spinner = ora({ text: 'Fetching account status...', indent: 2 }).start();
     try {
         const account = await getAccount(creds.apiKey, creds.apiSecret);
+        spinner.stop();
         console.log();
         console.log(chalk.bold('  Account Status'));
         console.log();
@@ -19,7 +22,7 @@ export async function statusCommand() {
         console.log();
     }
     catch (err) {
-        printError(`Failed to fetch status: ${err instanceof Error ? err.message : String(err)}`);
+        spinner.fail(`Failed to fetch status: ${err instanceof Error ? err.message : String(err)}`);
         process.exit(1);
     }
 }

package/dist/commands/whoami.js

@@ -1,14 +1,23 @@
 import chalk from 'chalk';
+import ora from 'ora';
 import { getCredentials, credentialsPath } from '../lib/config.js';
 import { testKeys } from '../lib/api.js';
 import { formatPhoneNumber, printError } from '../lib/format.js';
 export async function whoamiCommand() {
     const creds = getCredentials();
     if (!creds) {
-        printError('No credentials found. Run `sendblue setup` first.');
+        printError('No credentials found. Run `sendblue login` first.');
         process.exit(1);
     }
-    const valid = await testKeys(creds.apiKey, creds.apiSecret);
+    const spinner = ora({ text: 'Validating keys...', indent: 2 }).start();
+    let valid = false;
+    try {
+        valid = await testKeys(creds.apiKey, creds.apiSecret);
+    }
+    catch {
+        // Network error — keys may still be valid
+    }
+    spinner.stop();
     console.log();
     console.log(chalk.bold('  Current Account'));
     console.log();

package/dist/index.js

@@ -1,18 +1,26 @@
 #!/usr/bin/env node
+import { createRequire } from 'node:module';
 import { Command } from 'commander';
-import { loginCommand } from './commands/setup.js';
+import { setupCommand } from './commands/setup.js';
+import { loginCommand } from './commands/login.js';
 import { sendCommand } from './commands/send.js';
 import { statusCommand } from './commands/status.js';
 import { whoamiCommand } from './commands/whoami.js';
 import { addContactCommand, contactsCommand } from './commands/add-contact.js';
+const require = createRequire(import.meta.url);
+const { version } = require('../package.json');
 const program = new Command();
 program
     .name('sendblue')
     .description('Sendblue CLI — iMessage numbers for agents')
-    .version('0.1.0');
+    .version(version);
+program
+    .command('setup')
+    .description('Create a new Sendblue account and get an iMessage number')
+    .action(setupCommand);
 program
     .command('login')
-    .description('Create an account and get an iMessage number')
+    .description('Log in to an existing Sendblue account')
     .action(loginCommand);
 program
     .command('add-contact')

package/dist/lib/api.d.ts

@@ -1,6 +1,7 @@
 interface SetupResponse {
     status: string;
     email: string;
+    companyName: string;
     apiKey: string;
     apiSecret: string;
     assignedNumber: string;
@@ -19,7 +20,8 @@ interface AccountResponse {
     [key: string]: unknown;
 }
 export declare function sendCode(email: string): Promise<void>;
-export declare function verifyCode(email: string, code: string, companyName?: string): Promise<SetupResponse>;
+export declare function verifySetup(email: string, code: string, companyName: string): Promise<SetupResponse>;
+export declare function verifyLogin(email: string, code: string): Promise<SetupResponse>;
 export declare function sendMessage(apiKey: string, apiSecret: string, number: string, content: string): Promise<SendMessageResponse>;
 export declare function getAccount(apiKey: string, apiSecret: string): Promise<AccountResponse>;
 interface ContactRoute {

package/dist/lib/api.js

@@ -11,15 +11,27 @@ export async function sendCode(email) {
         throw new Error(body.error || body.message || `Failed to send code (${res.status})`);
     }
 }
-export async function verifyCode(email, code, companyName) {
+export async function verifySetup(email, code, companyName) {
     const res = await fetch(`${SETUP_BASE}/api/v3/cli/setup`, {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({ email, code, companyName, action: 'verify' })
+        body: JSON.stringify({ email, code, companyName, action: 'verify-setup' })
     });
     if (!res.ok) {
         const body = await res.json().catch(() => ({}));
-        throw new Error(body.error || body.message || `Verification failed (${res.status})`);
+        throw new Error(body.error || body.message || `Setup failed (${res.status})`);
+    }
+    return res.json();
+}
+export async function verifyLogin(email, code) {
+    const res = await fetch(`${SETUP_BASE}/api/v3/cli/setup`, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ email, code, action: 'verify-login' })
+    });
+    if (!res.ok) {
+        const body = await res.json().catch(() => ({}));
+        throw new Error(body.error || body.message || `Login failed (${res.status})`);
     }
     return res.json();
 }

package/dist/lib/format.d.ts

@@ -1,3 +1,4 @@
+export declare function normalizeNumber(input: string): string;
 export declare function formatPhoneNumber(e164: string): string;
 export declare function printSuccess(message: string): void;
 export declare function printError(message: string): void;

package/dist/lib/format.js

@@ -1,4 +1,21 @@
 import chalk from 'chalk';
+export function normalizeNumber(input) {
+    // Strip non-digit chars except leading +
+    let num = input.replace(/[^\d+]/g, '');
+    // 10-digit US number: prepend +1
+    if (/^\d{10}$/.test(num)) {
+        num = `+1${num}`;
+    }
+    // 11-digit starting with 1: prepend +
+    else if (/^1\d{10}$/.test(num)) {
+        num = `+${num}`;
+    }
+    // Already has +: keep as-is
+    else if (!num.startsWith('+')) {
+        num = `+${num}`;
+    }
+    return num;
+}
 export function formatPhoneNumber(e164) {
     // +15551234567 -> +1 (555) 123-4567
     const match = e164.match(/^\+1(\d{3})(\d{3})(\d{4})$/);
@@ -22,7 +39,7 @@ export function printCredentials(data) {
     console.log();
     console.log(`  ${chalk.bold('Phone Number')}:  ${formatPhoneNumber(data.assignedNumber)}`);
     console.log(`  ${chalk.bold('API Key')}:       ${data.apiKey}`);
-    console.log(`  ${chalk.bold('API Secret')}:    ${data.apiSecret}`);
+    console.log(`  ${chalk.bold('API Secret')}:    ${'*'.repeat(data.apiSecret.length - 4)}${data.apiSecret.slice(-4)}`);
     console.log(`  ${chalk.bold('Plan')}:          ${data.plan}`);
     console.log();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sendblue/cli",
-  "version": "0.2.0",
+  "version": "0.4.0",
   "description": "Sendblue CLI — iMessage numbers for agents",
   "type": "module",
   "bin": {
@@ -29,6 +29,7 @@
   "dependencies": {
     "chalk": "^5.3.0",
     "commander": "^12.1.0",
+    "ora": "^9.3.0",
     "prompts": "^2.4.2"
   },
   "devDependencies": {