minivibe 0.2.3 → 0.2.9

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

@@ -9,7 +9,7 @@
  * - Stop running sessions
  *
  * Usage:
- *   vibe-agent --login    Sign in (one-time)
+ *   vibe-agent login      Sign in (one-time)
  *   vibe-agent            Start agent daemon
  */
 
@@ -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');
@@ -730,7 +736,7 @@ function handleMessage(msg) {
           authToken = newToken;
           send({ type: 'authenticate', token: newToken });
         } else {
-          log('Please re-login: vibe-agent --login', colors.red);
+          log('Please re-login: vibe-agent login', colors.red);
         }
       })();
       break;
@@ -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,30 +1345,44 @@ ${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 --logout       Sign out and clear credentials
-  vibe-agent --status       Show agent status
+  vibe-agent login          Sign in (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
-  --logout          Sign out and clear saved credentials
   --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,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "minivibe",
-  "version": "0.2.3",
+  "version": "0.2.9",
   "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

@@ -38,9 +38,9 @@ MiniVibe lets you control Claude Code from your iPhone.
 
 To get started:
   1. Download MiniVibe from the App Store
-  2. Run: vibe --login
+  2. Run: vibe login
 
-For help: vibe --help
+For help: vibe help
 `);
 }
 
@@ -55,7 +55,7 @@ Install Claude Code:
   https://claude.ai/download
 
 After installing, run:
-  vibe --login
+  vibe login
 `);
 }
 
@@ -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;
@@ -339,6 +353,7 @@ let skipPermissions = false;  // --dangerously-skip-permissions mode
 let listSessions = false;    // --list mode: list running sessions
 let remoteAttachMode = false;  // --remote with --bridge: pure remote control (no local Claude)
 let e2eEnabled = false;  // --e2e mode: enable end-to-end encryption
+let verboseMode = false;  // --verbose mode: show [vibe] debug messages
 
 for (let i = 0; i < args.length; i++) {
   if (args[i] === '--help' || args[i] === '-h') {
@@ -348,16 +363,21 @@ 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 (Apple or 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)
   --resume <id>    Resume a previous session
   --e2e            Enable end-to-end encryption
+  --verbose, -v    Show detailed [vibe] status messages
 
 Advanced:
   --bridge <url>   Override bridge URL (default: wss://ws.minivibeapp.com)
@@ -365,13 +385,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
@@ -382,6 +401,8 @@ For local-only use without remote control, run 'claude' directly.
     process.exit(0);
   } else if (args[i] === '--headless') {
     headlessMode = true;
+  } else if (args[i] === '--verbose' || args[i] === '-v') {
+    verboseMode = true;
   } else if (args[i] === '--login') {
     // Defer login handling until we know if --headless is also present
     // Will be handled after the loop
@@ -541,7 +562,11 @@ if (e2eEnabled) {
 // Note: E2E key exchange now works automatically since bridge is defaulted when authenticated
 
 // Session state
+// Support VIBE_SESSION_ID env var for fixed session IDs (e.g., playground)
+// Bridge session ID can be any string, but Claude needs a valid UUID
+const bridgeSessionId = process.env.VIBE_SESSION_ID;
 const sessionId = resumeSessionId || uuidv4();
+const effectiveSessionId = bridgeSessionId || sessionId;  // Use for bridge registration
 let claudeProcess = null;
 let isRunning = false;
 let isShuttingDown = false;
@@ -583,6 +608,9 @@ function logStderr(msg, color = '') {
 }
 
 function logStatus(msg) {
+  // Only log status messages in verbose mode
+  if (!verboseMode) return;
+
   // Use stderr when Claude is running to avoid corrupting PTY output
   if (isRunning) {
     logStderr(`[vibe] ${msg}`, colors.dim);
@@ -835,7 +863,7 @@ function connectToBridge() {
 Cannot connect to vibe-agent at ${targetUrl}
 
 Make sure vibe-agent is running:
-  vibe-agent --login   # First time
+  vibe-agent login     # First time
   vibe-agent           # Start daemon
 `);
       process.exit(1);
@@ -911,7 +939,7 @@ function handleBridgeMessage(msg) {
       // This is required before E2E key exchange so our keys can reach viewers
       bridgeSocket.send(JSON.stringify({
         type: 'register_session',
-        sessionId,
+        sessionId: effectiveSessionId,  // Use VIBE_SESSION_ID if set for fixed playground IDs
         path: process.cwd(),
         name: sessionName || path.basename(process.cwd()),  // Use --name or fallback to directory name
         e2e: e2eEnabled  // Indicate if this session has E2E enabled
@@ -925,7 +953,7 @@ function handleBridgeMessage(msg) {
       // Must be AFTER register_session so our type is 'provider' and keys reach viewers
       if (e2eEnabled && e2e.isEnabled()) {
         const keyExchangeMsg = e2e.createKeyExchangeMessage(true);  // needsResponse=true
-        keyExchangeMsg.sessionId = sessionId;  // Include sessionId for routing
+        keyExchangeMsg.sessionId = effectiveSessionId;  // Include sessionId for routing
         bridgeSocket.send(JSON.stringify(keyExchangeMsg));
         log('[E2E] Sent public key to bridge (waiting for peer)', colors.cyan);
       }
@@ -964,7 +992,7 @@ function handleBridgeMessage(msg) {
           log('║  Your token is invalid or expired.        ║', colors.red);
           log('║  Please re-login:                          ║', colors.red);
           log('║                                            ║', colors.red);
-          log('║    vibe --login                            ║', colors.red);
+          log('║    vibe login                              ║', colors.red);
           log('║                                            ║', colors.red);
           log('╚════════════════════════════════════════════╝', colors.red);
           log('', colors.red);
@@ -1025,7 +1053,7 @@ function handleBridgeMessage(msg) {
         if (!msg.data || msg.data.length === 0 || !msg.fileName) {
           sendToBridge({
             type: 'error',
-            sessionId: sessionId,
+            sessionId: effectiveSessionId,
             message: 'Invalid file upload: missing data or fileName'
           });
           break;
@@ -1036,7 +1064,7 @@ function handleBridgeMessage(msg) {
         if (msg.data.length > MAX_BASE64_SIZE) {
           sendToBridge({
             type: 'error',
-            sessionId: sessionId,
+            sessionId: effectiveSessionId,
             message: 'File too large (max 10MB)'
           });
           break;
@@ -1130,7 +1158,7 @@ function handleBridgeMessage(msg) {
           // Echo the message back using claude_message type (matches iOS handler)
           sendToBridge({
             type: 'claude_message',
-            sessionId: sessionId,
+            sessionId: effectiveSessionId,
             message: {
               id: uuidv4(),
               sender: 'user',
@@ -1150,7 +1178,7 @@ function handleBridgeMessage(msg) {
           // Also send file_received confirmation
           sendToBridge({
             type: 'file_received',
-            sessionId: sessionId,
+            sessionId: effectiveSessionId,
             fileName: safeName,
             localPath: filePath,
             size: fileBuffer.length
@@ -1160,7 +1188,7 @@ function handleBridgeMessage(msg) {
           log(`❌ Failed to save file: ${err.message}`, colors.red);
           sendToBridge({
             type: 'error',
-            sessionId: sessionId,
+            sessionId: effectiveSessionId,
             message: `Failed to upload file: ${err.message}`
           });
         }
@@ -1175,7 +1203,7 @@ function handleBridgeMessage(msg) {
         if (!msg.images || !Array.isArray(msg.images) || msg.images.length === 0) {
           sendToBridge({
             type: 'error',
-            sessionId: sessionId,
+            sessionId: effectiveSessionId,
             message: 'Invalid file upload: missing or empty images array'
           });
           break;
@@ -1187,7 +1215,7 @@ function handleBridgeMessage(msg) {
         if (totalBase64Size > MAX_TOTAL_BASE64_SIZE) {
           sendToBridge({
             type: 'error',
-            sessionId: sessionId,
+            sessionId: effectiveSessionId,
             message: 'Total file size too large (max 50MB combined)'
           });
           break;
@@ -1302,7 +1330,7 @@ function handleBridgeMessage(msg) {
           // Echo the message back with attachments array
           sendToBridge({
             type: 'claude_message',
-            sessionId: sessionId,
+            sessionId: effectiveSessionId,
             message: {
               id: uuidv4(),
               sender: 'user',
@@ -1315,7 +1343,7 @@ function handleBridgeMessage(msg) {
           // Send confirmation
           sendToBridge({
             type: 'files_received',
-            sessionId: sessionId,
+            sessionId: effectiveSessionId,
             count: savedFiles.length,
             files: savedFiles.map(f => ({ fileName: f.name, localPath: f.path }))
           });
@@ -1326,7 +1354,7 @@ function handleBridgeMessage(msg) {
           log(`❌ Failed to process files: ${err.message}`, colors.red);
           sendToBridge({
             type: 'error',
-            sessionId: sessionId,
+            sessionId: effectiveSessionId,
             message: `Failed to upload files: ${err.message}`
           });
         }
@@ -1455,7 +1483,7 @@ function handleBridgeMessage(msg) {
         log(`║  ${(msg.message || 'Invalid token').padEnd(42)}║`, colors.red);
         log('║                                            ║', colors.red);
         log('║  Please re-login:                          ║', colors.red);
-        log('║    vibe --login                            ║', colors.red);
+        log('║    vibe login                              ║', colors.red);
         log('║                                            ║', colors.red);
         log('╚════════════════════════════════════════════╝', colors.red);
         log('', colors.red);
@@ -1850,7 +1878,7 @@ function processSessionMessage(msg) {
 
     sendToBridge({
       type: 'permission_request',
-      sessionId: sessionId,
+      sessionId: effectiveSessionId,
       requestId: tool.id,
       command: tool.name,
       question: question,
@@ -1941,7 +1969,7 @@ function processSessionMessage(msg) {
     const usage = msg.message.usage;
     sendToBridge({
       type: 'token_usage',
-      sessionId: sessionId,
+      sessionId: effectiveSessionId,
       model: msg.message.model || null,
       usage: {
         input_tokens: usage.input_tokens || 0,
@@ -2283,7 +2311,7 @@ function handleRemoteAttachMessage(msg) {
 
     case 'auth_error':
       log(`✗ Authentication failed: ${msg.message}`, colors.red);
-      log('  Run: vibe --login --bridge ' + bridgeUrl, colors.dim);
+      log('  Run: vibe login --bridge ' + bridgeUrl, colors.dim);
       process.exit(1);
       break;
 
@@ -2438,7 +2466,7 @@ function setupRemoteAttachInput() {
       if (pendingPermission) {
         sendRemoteCommand({
           type: 'approve_permission',
-          sessionId: sessionId,
+          sessionId: effectiveSessionId,
           requestId: pendingPermission.id
         });
         log('Sent approval', colors.green);
@@ -2450,7 +2478,7 @@ function setupRemoteAttachInput() {
       if (pendingPermission) {
         sendRemoteCommand({
           type: 'deny_permission',
-          sessionId: sessionId,
+          sessionId: effectiveSessionId,
           requestId: pendingPermission.id
         });
         log('Sent denial', colors.yellow);
@@ -2486,7 +2514,7 @@ function setupRemoteAttachInput() {
       // Send message to Claude
       sendRemoteCommand({
         type: 'send_message',
-        sessionId: sessionId,
+        sessionId: effectiveSessionId,
         content: input
       });
       log(`📤 Sent: ${truncateText(input, 50)}`, colors.dim);