mstro-app 0.1.57 → 0.2.0

package/bin/commands/login.js

@@ -143,7 +143,7 @@ function openBrowser(url) {
 /**
  * Request device code from platform
  */
-async function requestDeviceCode(clientId, platformUrl) {
+async function requestDeviceCode(clientId, platformUrl, force = false) {
   const machineHostname = hostname();
   const osType = type().toLowerCase();
   const cpuArch = arch();
@@ -158,6 +158,7 @@ async function requestDeviceCode(clientId, platformUrl) {
       osType,
       cpuArch,
       nodeVersion,
+      ...(force ? { force: true } : {}),
     }),
   });
 
@@ -243,10 +244,8 @@ export async function login(args = []) {
   const devMode = args.includes('--dev');
   const platformUrl = devMode ? DEV_PLATFORM_URL : PROD_PLATFORM_URL;
 
-  log('\n  Mstro Login\n', colors.bold + colors.cyan);
-
   if (devMode) {
-    log(`  [DEV MODE] Using ${platformUrl}\n`, colors.yellow);
+    log(`[DEV MODE] Using ${platformUrl}\n`, colors.yellow);
   }
 
   // Check if already logged in
@@ -259,18 +258,35 @@ export async function login(args = []) {
 
   const clientId = getClientId();
 
-  log('  Requesting authorization...', colors.dim);
+  // If force re-auth and we have existing credentials, deregister the old device first
+  if (forceReauth) {
+    const existingCreds = getCredentials();
+    if (existingCreds?.token) {
+      try {
+        await fetch(`${platformUrl}/api/auth/device/deregister`, {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+            'Authorization': `Bearer ${existingCreds.token}`,
+          },
+        });
+      } catch {
+        // Deregister failed (e.g. network issue), force flag on request will handle it
+      }
+    }
+  }
+
+  log('Requesting authorization...', colors.dim);
 
   try {
     // Step 1: Request device code
-    const { deviceCode, userCode, verificationUrlComplete, interval } = await requestDeviceCode(clientId, platformUrl);
+    const { deviceCode, userCode, verificationUrlComplete, interval } = await requestDeviceCode(clientId, platformUrl, forceReauth);
 
     // Step 2: Show code and open browser
+    log(`Your authorization code: ${userCode}`, colors.bold);
     log('');
-    log(`  Your authorization code: ${userCode}`, colors.bold);
-    log('');
-    log('  Opening browser to complete login...', colors.dim);
-    log(`  If browser doesn't open, visit: ${verificationUrlComplete}`, colors.dim);
+    log('Opening browser to complete login...', colors.dim);
+    log(` If browser doesn't open, visit: ${verificationUrlComplete}`, colors.dim);
     log('');
 
     openBrowser(verificationUrlComplete);
@@ -297,10 +313,7 @@ export async function login(args = []) {
     log('');
     log(`  Logged in as ${result.user.email}`, colors.bold + colors.green);
     log('');
-    log('  This device is now connected to your mstro.app account.', colors.dim);
-    log('  Any "mstro" commands will sync with your web dashboard.', colors.dim);
-    log('');
-    log('  Run "mstro" to start an orchestra.', colors.cyan);
+    log('  Run "mstro" to start a machine.', colors.cyan);
     log('');
   } catch (err) {
     log('');

package/bin/commands/logout.js

@@ -8,6 +8,9 @@ import { existsSync, readFileSync, unlinkSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { join } from 'node:path';
 
+const PROD_PLATFORM_URL = 'https://api.mstro.app';
+const DEV_PLATFORM_URL = 'http://localhost:4102';
+
 const colors = {
   reset: '\x1b[0m',
   bold: '\x1b[1m',
@@ -39,10 +42,36 @@ function getCredentials() {
   }
 }
 
+/**
+ * Deregister device from the platform server
+ */
+async function deregisterDevice(token, platformUrl) {
+  try {
+    const response = await fetch(`${platformUrl}/api/auth/device/deregister`, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        'Authorization': `Bearer ${token}`,
+      },
+    });
+
+    if (!response.ok) {
+      const data = await response.json().catch(() => ({}));
+      log(`  Warning: Could not deregister device from server: ${data.error || response.statusText}`, colors.yellow);
+    }
+  } catch {
+    // Network error - proceed with local logout anyway
+    log('  Warning: Could not reach server to deregister device. Local credentials will still be removed.', colors.yellow);
+  }
+}
+
 /**
  * Main logout command
  */
-export async function logout() {
+export async function logout(args = []) {
+  const devMode = Array.isArray(args) && args.includes('--dev');
+  const platformUrl = devMode ? DEV_PLATFORM_URL : PROD_PLATFORM_URL;
+
   log('\n  Mstro Logout\n', colors.bold + colors.cyan);
 
   const creds = getCredentials();
@@ -56,6 +85,11 @@ export async function logout() {
   const email = creds.email;
 
   try {
+    // Deregister device from server so it can be re-registered later
+    if (creds.token) {
+      await deregisterDevice(creds.token, platformUrl);
+    }
+
     // Delete credentials file
     if (existsSync(CREDENTIALS_FILE)) {
       unlinkSync(CREDENTIALS_FILE);

package/bin/commands/status.js

@@ -187,7 +187,7 @@ export async function status() {
 
   // Quick commands
   log('  Commands', colors.bold);
-  log('    mstro           Start an orchestra', colors.dim);
+  log('    mstro           Start a machine', colors.dim);
   log('    mstro login     Sign in to your account', colors.dim);
   log('    mstro logout    Sign out', colors.dim);
   log('    mstro whoami    Show account details', colors.dim);

package/bin/mstro.js

@@ -13,15 +13,14 @@
  *   mstro logout              # Sign out
  *   mstro whoami              # Show current user
  *   mstro status              # Show connection status
- *   mstro setup-terminal      # Enable web terminal
  *   mstro -p 4105             # Start on specific port (overrides auto port)
  *   mstro configure-hooks     # Configure Claude Code security hooks
  *   mstro --help              # Show help
  */
 
-import { execSync, spawn } from 'node:child_process';
+import { spawn } from 'node:child_process';
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
-import { homedir, platform as osPlatform } from 'node:os';
+import { homedir } from 'node:os';
 import { dirname, join, resolve } from 'node:path';
 import { createInterface } from 'node:readline';
 import { fileURLToPath } from 'node:url';
@@ -47,7 +46,6 @@ const USER_CWD = process.cwd();
 // First-run detection paths
 const MSTRO_CONFIG_DIR = join(homedir(), '.mstro');
 const MSTRO_FIRST_RUN_FLAG = join(MSTRO_CONFIG_DIR, '.configured');
-const MSTRO_TERMINAL_CHECKED_FLAG = join(MSTRO_CONFIG_DIR, '.terminal-checked');
 const CLAUDE_SETTINGS_FILE = join(homedir(), '.claude', 'settings.json');
 const CLAUDE_HOOKS_DIR = join(homedir(), '.claude', 'hooks');
 const BOUNCER_HOOK_FILE = join(CLAUDE_HOOKS_DIR, 'bouncer.sh');
@@ -205,7 +203,6 @@ function showHelp() {
   log('    mstro whoami                Show current user and device info', colors.dim);
   log('    mstro status                Show connection and auth status', colors.dim);
   log('    mstro telemetry [on|off]    Enable/disable anonymous telemetry', colors.dim);
-  log('    mstro setup-terminal        Enable web terminal (compiles native module)', colors.dim);
   log('    mstro -p 4105               Start on specific port (overrides auto port)', colors.dim);
   log('    mstro configure-hooks       Configure Claude Code security hooks', colors.dim);
   log('    mstro --version             Show version number', colors.dim);
@@ -218,7 +215,7 @@ function showHelp() {
   log('');
   log('  Authentication:', colors.bold);
   log('    Run "mstro login" to connect this device to your mstro.app account.', colors.dim);
-  log('    Once logged in, orchestras sync automatically with your web dashboard.', colors.dim);
+  log('    Once logged in, machines sync automatically with your web dashboard.', colors.dim);
   log('');
   log('  Security:', colors.bold);
   log('    Mstro includes a Security Bouncer that automatically manages', colors.dim);
@@ -229,7 +226,7 @@ function showHelp() {
 
 function runNpmScript(script, args = [], envOverrides = {}) {
   const npmCmd = process.platform === 'win32' ? 'npm.cmd' : 'npm';
-  const child = spawn(npmCmd, ['run', script, ...args], {
+  const child = spawn(npmCmd, ['run', '--silent', script, ...args], {
     cwd: CLIENT_ROOT,
     stdio: 'inherit',
     env: { ...process.env, MSTRO_WORKING_DIR: USER_CWD, ...envOverrides },
@@ -291,7 +288,6 @@ function runConfigureHooks(andThenStart = false) {
       markConfigured();
       if (andThenStart) {
         // After configuring, start the server
-        log('\nStarting Mstro client...', colors.bold + colors.cyan);
         const requestedPort = parsePort(process.argv.slice(2));
         const envOverrides = requestedPort ? { PORT: String(requestedPort) } : {};
         runNpmScript('start', [], envOverrides);
@@ -366,95 +362,6 @@ function showLoginRequired() {
 /**
  * Check if node-pty is loadable (native module compiled correctly)
  */
-async function isNodePtyAvailable() {
-  try {
-    const pty = await import('node-pty');
-    // Verify the native module actually works, not just that it imports
-    const test = pty.spawn('/bin/echo', ['test'], { name: 'xterm', cols: 80, rows: 24 });
-    test.kill();
-    return true;
-  } catch {
-    return false;
-  }
-}
-
-/**
- * Try to rebuild node-pty silently. Returns true on success.
- */
-function tryRebuildNodePty() {
-  try {
-    execSync('npm rebuild node-pty', { cwd: CLIENT_ROOT, stdio: 'pipe' });
-    return true;
-  } catch {
-    return false;
-  }
-}
-
-/**
- * Get platform-specific build tool install instructions
- */
-function getBuildToolInstructions() {
-  const os = osPlatform();
-  if (os === 'darwin') {
-    return '    xcode-select --install';
-  } else if (os === 'win32') {
-    return '    npm install -g windows-build-tools';
-  } else {
-    return '    sudo apt install build-essential python3    # Debian/Ubuntu\n    sudo dnf install gcc-c++ make python3       # Fedora/RHEL';
-  }
-}
-
-/**
- * First-run terminal setup check (runs after bouncer setup).
- * Tries to rebuild node-pty automatically. If that fails, shows instructions.
- */
-async function checkTerminalSetup() {
-  if (await isNodePtyAvailable()) {
-    return; // Already working
-  }
-
-  log('\n  Web Terminal', colors.bold + colors.cyan);
-  log('  mstro includes a browser-based terminal (optional).\n', colors.dim);
-  log('  Attempting to compile native module...', colors.dim);
-
-  if (tryRebuildNodePty()) {
-    log('  Terminal support enabled!\n', colors.green);
-    return;
-  }
-
-  log('  Could not compile terminal module.\n', colors.yellow);
-  log('  To enable the web terminal later:', colors.dim);
-  log('  1. Install build tools:', colors.dim);
-  log(getBuildToolInstructions(), colors.dim);
-  log('  2. Run:', colors.dim);
-  log('    mstro setup-terminal\n', colors.dim);
-}
-
-/**
- * Explicit setup-terminal command
- */
-async function setupTerminal() {
-  log('\n  Setting up terminal support...\n', colors.bold + colors.cyan);
-
-  if (await isNodePtyAvailable()) {
-    log('  Terminal support is already enabled.\n', colors.green);
-    return;
-  }
-
-  log('  Rebuilding node-pty native module...', colors.dim);
-
-  if (tryRebuildNodePty()) {
-    log('\n  Terminal support enabled! Restart mstro to use it.\n', colors.green + colors.bold);
-    return;
-  }
-
-  log('\n  Failed to build node-pty.\n', colors.red);
-  log('  Install build tools first:', colors.dim);
-  log(getBuildToolInstructions(), colors.dim);
-  log('\n  Then re-run: mstro setup-terminal\n', colors.dim);
-  process.exit(1);
-}
-
 async function startServer(envOverrides) {
   if (!isLoggedIn()) {
     showLoginRequired();
@@ -473,16 +380,7 @@ async function startServer(envOverrides) {
     }
   }
 
-  if (!existsSync(MSTRO_TERMINAL_CHECKED_FLAG)) {
-    await checkTerminalSetup();
-    if (!existsSync(MSTRO_CONFIG_DIR)) {
-      mkdirSync(MSTRO_CONFIG_DIR, { recursive: true, mode: 0o700 });
-    }
-    writeFileSync(MSTRO_TERMINAL_CHECKED_FLAG, new Date().toISOString());
-  }
-
   showUpdateNotification();
-  log('\nStarting Mstro client...', colors.bold + colors.cyan);
   runNpmScript('start', [], envOverrides);
 }
 
@@ -504,7 +402,7 @@ async function main() {
     }],
     ['logout', async () => {
       const { logout } = await import('./commands/logout.js');
-      await logout();
+      await logout(args.slice(args.indexOf('logout') + 1));
     }],
     ['whoami', async () => {
       const { whoami } = await import('./commands/whoami.js');
@@ -518,7 +416,6 @@ async function main() {
       const { telemetry } = await import('./commands/config.js');
       await telemetry(args.slice(args.indexOf('telemetry') + 1));
     }],
-    ['setup-terminal', () => setupTerminal()],
     ['configure-hooks', () => runConfigureHooks(false)],
   ]);
 

package/dist/server/cli/headless/claude-invoker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"claude-invoker.d.ts","sourceRoot":"","sources":["../../../../server/cli/headless/claude-invoker.ts"],"names":[],"mappings":"AAGA;;;;GAIG;AAEH,OAAO,EAAE,KAAK,YAAY,EAAS,MAAM,oBAAoB,CAAC;AAK9D,OAAO,KAAK,EACV,eAAe,EACf,sBAAsB,EAEvB,MAAM,YAAY,CAAC;AAEpB,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,sBAAsB,CAAC;IAC/B,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;CAC7C;AA6WD;;;GAGG;AACH,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,eAAe,CAAC,CAgN1B"}
+{"version":3,"file":"claude-invoker.d.ts","sourceRoot":"","sources":["../../../../server/cli/headless/claude-invoker.ts"],"names":[],"mappings":"AAGA;;;;GAIG;AAEH,OAAO,EAAE,KAAK,YAAY,EAAS,MAAM,oBAAoB,CAAC;AAO9D,OAAO,KAAK,EACV,eAAe,EACf,sBAAsB,EAGvB,MAAM,YAAY,CAAC;AAEpB,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,sBAAsB,CAAC;IAC/B,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;CAC7C;AAm5BD;;;GAGG;AACH,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,eAAe,CAAC,CA0I1B"}