minivibe 0.2.2 → 0.2.6

package/README.md

@@ -20,7 +20,7 @@ CLI wrapper for Claude Code with mobile remote control via MiniVibe iOS app.
 npm install -g minivibe
 
 # Login (one-time)
-vibe --login
+vibe login
 
 # Start coding with remote control!
 vibe
@@ -55,7 +55,7 @@ npm link
 ### Browser Login (Desktop)
 
 ```bash
-vibe --login
+vibe login
 ```
 
 Opens browser for Google sign-in. Token is saved to `~/.vibe/auth.json`.
@@ -63,7 +63,7 @@ Opens browser for Google sign-in. Token is saved to `~/.vibe/auth.json`.
 ### Headless Login (Servers/EC2)
 
 ```bash
-vibe --login --headless
+vibe login --headless
 ```
 
 Displays a device code. Visit the URL on any device to authenticate.
@@ -94,7 +94,7 @@ Use a local agent to manage multiple sessions:
 
 ```bash
 # Terminal 1: Start the agent (runs continuously)
-vibe-agent --login       # First time only
+vibe-agent login         # First time only
 vibe-agent               # Start daemon
 
 # Terminal 2+: Create sessions via agent

package/agent/agent.js

@@ -25,9 +25,13 @@ const os = require('os');
 // Configuration
 // ====================
 
+// Shared auth directory (same as vibe CLI)
+const SHARED_AUTH_DIR = path.join(os.homedir(), '.vibe');
+const AUTH_FILE = path.join(SHARED_AUTH_DIR, 'auth.json');
+
+// Agent-specific config directory
 const CONFIG_DIR = path.join(os.homedir(), '.vibe-agent');
 const CONFIG_FILE = path.join(CONFIG_DIR, 'config.json');
-const AUTH_FILE = path.join(CONFIG_DIR, 'auth.json');
 const SESSION_HISTORY_FILE = path.join(CONFIG_DIR, 'session-history.json');
 
 const RECONNECT_DELAY_MS = 5000;
@@ -36,6 +40,7 @@ const LOCAL_SERVER_PORT = 9999;
 const PORT_FILE = path.join(os.homedir(), '.vibe-agent', 'port');
 const MAX_SESSION_HISTORY_AGE_DAYS = 30;
 const DEFAULT_BRIDGE_URL = 'wss://ws.minivibeapp.com';
+const PAIRING_URL = 'https://minivibeapp.com/pair';
 
 // Show welcome message for first-time users (no auth)
 function showWelcomeMessage() {
@@ -46,9 +51,10 @@ vibe-agent lets you manage Claude Code sessions from your iPhone.
 
 To get started:
   1. Download MiniVibe from the App Store
-  2. Run: vibe-agent --login
+  2. Run: vibe-agent login
+     (or 'vibe login' - auth is shared between vibe and vibe-agent)
 
-For help: vibe-agent --help
+For help: vibe-agent help
 `);
 }
 
@@ -111,8 +117,8 @@ function loadAuth() {
 
 function saveAuth(idToken, refreshToken = null) {
   try {
-    if (!fs.existsSync(CONFIG_DIR)) {
-      fs.mkdirSync(CONFIG_DIR, { recursive: true });
+    if (!fs.existsSync(SHARED_AUTH_DIR)) {
+      fs.mkdirSync(SHARED_AUTH_DIR, { recursive: true });
     }
     const data = { idToken, refreshToken, updatedAt: new Date().toISOString() };
     fs.writeFileSync(AUTH_FILE, JSON.stringify(data, null, 2), 'utf8');
@@ -1282,7 +1288,7 @@ ${'='.repeat(40)}
 
     const { deviceId, code, expiresIn } = await codeRes.json();
 
-    console.log(`   Visit:  ${bridgeHttpUrl}/device`);
+    console.log(`   Visit:  ${PAIRING_URL}`);
     console.log(`   Code:   ${colors.bold}${code}${colors.reset}`);
     console.log('');
     console.log(`   Code expires in ${Math.floor(expiresIn / 60)} minutes.`);
@@ -1339,32 +1345,49 @@ ${colors.cyan}${colors.bold}vibe-agent${colors.reset} - Persistent daemon for re
 
 ${colors.bold}Usage:${colors.reset}
   vibe-agent                Start agent daemon
-  vibe-agent --login        Sign in with Google (one-time)
-  vibe-agent --status       Show agent status
+  vibe-agent login          Sign in with Google (one-time)
+  vibe-agent logout         Sign out and clear credentials
+  vibe-agent status         Show agent status
+
+${colors.bold}Commands:${colors.reset}
+  login             Sign in via device code flow
+  logout            Sign out and clear saved credentials
+  status            Show current status and exit
+  help              Show this help
 
 ${colors.bold}Options:${colors.reset}
-  --login           Sign in via device code flow
   --name <name>     Set host display name
-  --status          Show current status and exit
-  --help, -h        Show this help
-
-${colors.bold}Advanced:${colors.reset}
   --bridge <url>    Override bridge URL (default: wss://ws.minivibeapp.com)
   --token <token>   Use specific Firebase token
 
 ${colors.bold}Examples:${colors.reset}
-  vibe-agent --login        Sign in (one-time setup)
+  vibe-agent login          Sign in (one-time setup)
   vibe-agent                Start agent
   vibe-agent --name "EC2"   Start with custom name
 `);
 }
 
 function parseArgs() {
-  const args = process.argv.slice(2);
+  const rawArgs = process.argv.slice(2);
+
+  // Support subcommand style (vibe-agent login) alongside flag style (vibe-agent --login)
+  const subcommands = {
+    'login': '--login',
+    'logout': '--logout',
+    'status': '--status',
+    'help': '--help'
+  };
+
+  // Transform first arg if it's a subcommand
+  const args = rawArgs.length > 0 && subcommands[rawArgs[0]]
+    ? [subcommands[rawArgs[0]], ...rawArgs.slice(1)]
+    : rawArgs;
+
   const options = {
     bridge: null,
     token: null,
     login: false,
+    logout: false,
     name: null,
     status: false,
     help: false
@@ -1382,6 +1405,9 @@ function parseArgs() {
       case '--login':
         options.login = true;
         break;
+      case '--logout':
+        options.logout = true;
+        break;
       case '--name':
         options.name = args[++i];
         break;
@@ -1443,6 +1469,21 @@ async function main() {
     process.exit(0);
   }
 
+  // Logout flow
+  if (options.logout) {
+    try {
+      if (fs.existsSync(AUTH_FILE)) {
+        fs.unlinkSync(AUTH_FILE);
+        log('Logged out successfully', colors.green);
+      } else {
+        log('Not logged in', colors.yellow);
+      }
+    } catch (err) {
+      log(`Logout failed: ${err.message}`, colors.red);
+    }
+    process.exit(0);
+  }
+
   // Login flow
   if (options.login) {
     const httpUrl = bridgeUrl.replace('wss://', 'https://').replace('ws://', 'http://');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "minivibe",
-  "version": "0.2.2",
+  "version": "0.2.6",
   "description": "CLI wrapper for Claude Code with mobile remote control via MiniVibe iOS app",
   "author": "MiniVibe <hello@minivibeapp.com>",
   "homepage": "https://github.com/minivibeapp/minivibe",

package/vibe.js

@@ -326,7 +326,21 @@ async function startHeadlessLogin() {
 }
 
 // Parse arguments
-const args = process.argv.slice(2);
+const rawArgs = process.argv.slice(2);
+
+// Support subcommand style (vibe login) alongside flag style (vibe --login)
+const subcommands = {
+  'login': '--login',
+  'logout': '--logout',
+  'status': '--status',
+  'help': '--help'
+};
+
+// Transform first arg if it's a subcommand
+const args = rawArgs.length > 0 && subcommands[rawArgs[0]]
+  ? [subcommands[rawArgs[0]], ...rawArgs.slice(1)]
+  : rawArgs;
+
 let initialPrompt = null;
 let resumeSessionId = null;
 let bridgeUrl = null;
@@ -348,11 +362,15 @@ vibe - Claude Code with mobile remote control
 Usage:
   vibe                    Start session (connects to bridge)
   vibe "prompt"           Start with initial prompt
-  vibe --login            Sign in with Google
-  vibe --agent            Connect via local vibe-agent
+  vibe login              Sign in with Google
+  vibe logout             Sign out
+
+Commands:
+  login            Sign in via minivibeapp.com (opens browser)
+  logout           Sign out and remove stored auth
+  help             Show this help message
 
 Options:
-  --login          Sign in via minivibeapp.com (opens browser)
   --headless       Use device code flow for servers (no browser)
   --agent [url]    Connect via local vibe-agent (default: auto-discover)
   --name <name>    Name this session (shown in mobile app)
@@ -365,13 +383,12 @@ Advanced:
   --remote <id>    Remote control session via bridge (no local Claude needed)
   --list           List running sessions on local agent
   --token <token>  Set Firebase auth token manually
-  --logout         Remove stored auth token
   --node-pty       Use Node.js PTY wrapper (required for Windows)
   --dangerously-skip-permissions   Auto-approve all tool executions
   --help, -h       Show this help message
 
 Examples:
-  vibe --login            Sign in (one-time setup)
+  vibe login              Sign in (one-time setup)
   vibe                    Start session
   vibe "Fix the bug"      Start with prompt
   vibe --e2e              Enable encryption
@@ -428,15 +445,35 @@ For local-only use without remote control, run 'claude' directly.
     console.log('Token stored successfully');
     i++;
   } else if (args[i] === '--logout') {
-    try {
-      if (fs.existsSync(TOKEN_FILE)) {
+    let loggedOut = false;
+    let errors = [];
+
+    // Try to delete AUTH_FILE
+    if (fs.existsSync(AUTH_FILE)) {
+      try {
+        fs.unlinkSync(AUTH_FILE);
+        loggedOut = true;
+      } catch (err) {
+        errors.push(`auth.json: ${err.message}`);
+      }
+    }
+
+    // Try to delete TOKEN_FILE regardless of first result
+    if (fs.existsSync(TOKEN_FILE)) {
+      try {
         fs.unlinkSync(TOKEN_FILE);
-        console.log('Logged out successfully');
-      } else {
-        console.log('Not logged in');
+        loggedOut = true;
+      } catch (err) {
+        errors.push(`token: ${err.message}`);
       }
-    } catch (err) {
-      console.error('Logout failed:', err.message);
+    }
+
+    if (errors.length > 0) {
+      console.error('Logout partially failed:', errors.join(', '));
+    } else if (loggedOut) {
+      console.log('Logged out successfully');
+    } else {
+      console.log('Not logged in');
     }
     process.exit(0);
   } else if (args[i] === '--node-pty') {