agent-relay 2.1.27-beta.0 → 2.1.27-beta.2

package/dist/src/cli/index.js

@@ -3648,7 +3648,14 @@ program
             return s;
         return `'${s.replace(/'/g, `'\"'\"'`)}'`;
     };
-    const remoteCommandFallback = [providerConfig.command, ...providerConfig.args].map(shellEscape).join(' ');
+    // Build the fallback command to run on the remote workspace.
+    // For Cursor, the installer creates both "agent" (primary) and "cursor-agent" (legacy)
+    // symlinks. Try the primary first, fall back to legacy if not found.
+    const primaryCmd = [providerConfig.command, ...providerConfig.args].map(shellEscape).join(' ');
+    const fallbackCmd = provider === 'cursor'
+        ? `command -v agent >/dev/null 2>&1 && ${primaryCmd} || cursor-agent ${providerConfig.args.map(shellEscape).join(' ')}`
+        : primaryCmd;
+    const remoteCommandFallback = fallbackCmd;
     // When --token is provided (from dashboard CLI command), skip cloud config requirement.
     // The token authenticates directly with the /start endpoint.
     const cliToken = options.token;
@@ -3856,6 +3863,18 @@ program
                 }
                 stdin.resume();
                 const onStdinData = (data) => {
+                    // Escape (0x1b) or Ctrl+C (0x03) after auth success → close session
+                    if (authDetected && (data[0] === 0x1b || data[0] === 0x03)) {
+                        cleanup();
+                        clearTimeout(timer);
+                        try {
+                            stream.close();
+                        }
+                        catch {
+                            // ignore
+                        }
+                        return;
+                    }
                     stream.write(data);
                 };
                 stdin.on('data', onStdinData);
@@ -3870,28 +3889,26 @@ program
                     }
                     stdin.pause();
                 };
-                // Auto-close the session when auth success is detected
+                // Notify user when auth success is detected
                 const closeOnAuthSuccess = () => {
                     authDetected = true;
-                    // Brief delay so the user sees the success message
-                    setTimeout(() => {
-                        cleanup();
-                        clearTimeout(timer);
-                        try {
-                            stream.close();
-                        }
-                        catch {
-                            // ignore
-                        }
-                    }, 1500);
+                    // Don't try to auto-navigate post-login prompts (trust directory,
+                    // bypass permissions, etc.) — they vary by CLI version and are fragile
+                    // to automate. Just tell the user they're done.
+                    stdout.write('\n');
+                    stdout.write(green('  ✓ Authentication successful!') + '\n');
+                    stdout.write(dim('  Press Escape or Ctrl+C to exit.') + '\n');
+                    stdout.write('\n');
                 };
                 stream.on('data', (data) => {
                     stdout.write(data);
-                    // Accumulate output for pattern matching (keep last 2KB to avoid memory growth)
+                    // Accumulate output for pattern matching (keep last 8KB to avoid memory growth)
+                    // Ink-based CLIs use heavy ANSI escape codes, so raw output is much
+                    // larger than visible text. 8KB ensures success patterns aren't truncated.
                     const text = data.toString();
                     outputBuffer += text;
-                    if (outputBuffer.length > 2048) {
-                        outputBuffer = outputBuffer.slice(-2048);
+                    if (outputBuffer.length > 8192) {
+                        outputBuffer = outputBuffer.slice(-8192);
                     }
                     // Check for auth success patterns
                     if (!authDetected && successPatterns.length > 0) {
@@ -3972,13 +3989,20 @@ program
         ? start.provider.trim()
         : provider;
     try {
+        const completeHeaders = { 'Content-Type': 'application/json' };
+        if (!cliToken && cloudConfig.apiKey) {
+            completeHeaders['Authorization'] = `Bearer ${cloudConfig.apiKey}`;
+        }
         const response = await fetch(`${CLOUD_URL}/api/auth/ssh/complete`, {
             method: 'POST',
-            headers: {
-                'Authorization': `Bearer ${cloudConfig.apiKey}`,
-                'Content-Type': 'application/json',
-            },
-            body: JSON.stringify({ sessionId: start.sessionId, workspaceId: start.workspaceId, provider: providerForComplete, success }),
+            headers: completeHeaders,
+            body: JSON.stringify({
+                sessionId: start.sessionId,
+                workspaceId: start.workspaceId,
+                provider: providerForComplete,
+                success,
+                ...(cliToken && { token: cliToken }),
+            }),
         });
         if (!response.ok) {
             let details = response.statusText;
@@ -4008,6 +4032,12 @@ program
             console.log('');
             console.log(red(`Remote auth command exited with code ${exitCode}.`));
         }
+        // Exit code 127 = command not found
+        if (execResult?.exitCode === 127) {
+            console.log('');
+            console.log(yellow(`The ${providerConfig.displayName} CLI ("${providerConfig.command}") is not installed on this workspace.`));
+            console.log(dim('Ask your workspace administrator to install it, or check the workspace Dockerfile.'));
+        }
         process.exit(1);
     }
     console.log('');