ai-or-die 0.1.46 → 0.1.47

package/e2e/fixtures/fake-devtunnel.cmd

@@ -3,7 +3,10 @@ REM Mock devtunnel CLI for E2E testing.
 REM Simulates the subcommands used by VSCodeTunnelManager's two-process model.
 
 REM --- user show: auth check (exit 0 = authenticated) ---
-if "%1"=="user" if "%2"=="show" exit /b 0
+if "%1"=="user" if "%2"=="show" (
+  echo Logged in as mock-user using GitHub.
+  exit /b 0
+)
 
 REM --- user login: authenticate (exit 0 = success) ---
 if "%1"=="user" if "%2"=="login" exit /b 0

package/e2e/fixtures/fake-devtunnel.sh

@@ -4,6 +4,7 @@
 
 # --- user show: auth check (exit 0 = authenticated) ---
 if [ "$1" = "user" ] && [ "$2" = "show" ]; then
+  echo "Logged in as mock-user using GitHub."
   exit 0
 fi
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-or-die",
-  "version": "0.1.46",
+  "version": "0.1.47",
   "description": "Universal AI coding terminal — Claude, Copilot, Gemini & more in your browser",
   "main": "src/server.js",
   "bin": {

package/src/tunnel-manager.js

@@ -21,7 +21,9 @@ class TunnelManager {
     this.stopping = false;
     this._restarting = false;
     this.retryCount = 0;
-    this.tunnelId = `aiordie-${os.hostname().toLowerCase().replace(/[^a-z0-9-]/g, '')}`;
+    this._hostnameSlug = os.hostname().toLowerCase().replace(/[^a-z0-9-]/g, '');
+    this.tunnelId = `aiordie-${this._hostnameSlug}`;
+    this._authProvider = null;
 
     // Resilience tracking
     this._lastSpawnTime = null;
@@ -183,15 +185,20 @@ class TunnelManager {
 
   /**
    * Check if user is logged in. If not, attempt interactive login.
+   * Detects auth provider (GitHub vs Entra) and adjusts tunnel ID to avoid
+   * cross-provider name collisions.
    */
   async _checkLogin() {
-    const isLoggedIn = await new Promise((resolve) => {
-      execFile('devtunnel', ['user', 'show'], { timeout: 10000 }, (err) => {
-        resolve(!err);
+    const result = await new Promise((resolve) => {
+      execFile('devtunnel', ['user', 'show'], { timeout: 10000 }, (err, stdout) => {
+        resolve({ ok: !err, stdout: (stdout || '').toString() });
       });
     });
 
-    if (isLoggedIn) return true;
+    if (result.ok) {
+      this._applyAuthSuffix(result.stdout);
+      return true;
+    }
 
     console.log('  DevTunnel requires authentication. Launching login...\n');
 
@@ -206,6 +213,13 @@ class TunnelManager {
 
     if (loginOk) {
       console.log('\n  Login successful. Connecting tunnel...');
+      // Re-check to detect which provider was used
+      const recheck = await new Promise((resolve) => {
+        execFile('devtunnel', ['user', 'show'], { timeout: 10000 }, (err, stdout) => {
+          resolve((stdout || '').toString());
+        });
+      });
+      this._applyAuthSuffix(recheck);
       return true;
     }
 
@@ -213,6 +227,19 @@ class TunnelManager {
     return false;
   }
 
+  /**
+   * Parse auth provider from `devtunnel user show` output and append
+   * a suffix to the tunnel ID when using GitHub auth. This prevents
+   * name collisions with tunnels created under a different provider.
+   */
+  _applyAuthSuffix(userShowOutput) {
+    const match = userShowOutput.match(/using\s+(GitHub)/i);
+    if (match) {
+      this._authProvider = 'github';
+      this.tunnelId = `aiordie-${this._hostnameSlug}-gh`;
+    }
+  }
+
   /**
    * Create the named tunnel and configure its port.
    * Steps: devtunnel create <id> → devtunnel port create <id> -p <port>

package/src/vscode-tunnel.js

@@ -45,6 +45,7 @@ class VSCodeTunnelManager {
 
     this._healthInterval = null;
     this._reservedPorts = new Set();
+    this._authProvider = null;
 
     // Kick off async command discovery at construction time
     this._initPromise = Promise.all([
@@ -123,7 +124,7 @@ class VSCodeTunnelManager {
       connectionToken,
       localUrl: null,
       publicUrl: null,
-      tunnelId: `aiordie-vscode-${sessionId.slice(0, 12).replace(/[^a-z0-9-]/gi, '')}`,
+      tunnelId: `aiordie-vscode-${sessionId.slice(0, 12).replace(/[^a-z0-9-]/gi, '')}${this._authProvider === 'github' ? '-gh' : ''}`,
       status: 'starting',
       sessionId,
       workingDir: workingDir || process.cwd(),
@@ -161,6 +162,13 @@ class VSCodeTunnelManager {
         return { success: false, error: 'Authentication failed or was cancelled' };
       }
       console.warn(`[VSCODE-TUNNEL] Session ${sessionId}: devtunnel login successful`);
+      // Re-check to detect auth provider after fresh login
+      await this._checkDevtunnelAuth();
+    }
+
+    // Update tunnel ID with auth-provider suffix after detection
+    if (this._authProvider === 'github') {
+      tunnel.tunnelId = `aiordie-vscode-${sessionId.slice(0, 12).replace(/[^a-z0-9-]/gi, '')}-gh`;
     }
 
     // Start health check interval (once)
@@ -241,7 +249,7 @@ class VSCodeTunnelManager {
 
     // Step 2: Clean up devtunnel (fire-and-forget)
     if (this._devtunnelCommand) {
-      execFile(this._devtunnelCommand, ['delete', tunnel.tunnelId, '-y'], { timeout: 10000 }, () => {});
+      execFile(this._devtunnelCommand, ['delete', tunnel.tunnelId, '-f'], { timeout: 10000 }, () => {});
     }
 
     // Step 3: Kill server process
@@ -457,12 +465,22 @@ class VSCodeTunnelManager {
 
   /**
    * Check if user is authenticated with devtunnel (OS-level credential store).
+   * Also detects auth provider (GitHub vs Entra) for tunnel name suffixing.
    */
   async _checkDevtunnelAuth() {
     if (!this._devtunnelCommand) return false;
     return new Promise((resolve) => {
-      execFile(this._devtunnelCommand, ['user', 'show'], { timeout: 10000 }, (err) => {
-        resolve(!err);
+      execFile(this._devtunnelCommand, ['user', 'show'], { timeout: 10000 }, (err, stdout) => {
+        if (err) {
+          resolve(false);
+        } else {
+          const output = (stdout || '').toString();
+          const match = output.match(/using\s+(GitHub)/i);
+          if (match) {
+            this._authProvider = 'github';
+          }
+          resolve(true);
+        }
       });
     });
   }