@papercraneai/cli 1.2.0 → 1.3.0

package/bin/papercrane.js

@@ -51,40 +51,67 @@ program
         return;
       }
 
-      // Browser-based login flow
-      const { createAuthServer, generateState } = await import('../lib/auth-server.js');
+      // Browser-based login flow (polling)
+      const { generateState } = await import('../lib/auth-server.js');
       const open = (await import('open')).default;
 
-      const state = generateState();
-      const authServer = await createAuthServer(state, baseUrl, 120000);
+      const session = generateState();
 
-      const authUrl = `${baseUrl}/cli-auth?port=${authServer.port}&state=${state}`;
+      // Initialize session on server
+      const initRes = await fetch(`${baseUrl}/api/cli-auth/init`, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ session })
+      });
+
+      if (!initRes.ok) {
+        throw new Error('Failed to initialize login session');
+      }
 
-      console.log(chalk.cyan('Opening browser for authentication...'));
-      console.log(chalk.dim(`  ${authUrl}\n`));
+      const authUrl = `${baseUrl}/cli-auth?session=${session}`;
 
-      // Try to open browser
+      console.log(chalk.cyan('\nOpen this URL to authenticate:\n'));
+      console.log(`  ${authUrl}\n`);
+
+      // Try to open browser automatically
       try {
         await open(authUrl);
+        console.log(chalk.dim('(Browser opened automatically)'));
       } catch {
-        console.log(chalk.yellow('Could not open browser automatically.'));
-        console.log(chalk.yellow('Please open this URL manually:\n'));
-        console.log(chalk.cyan(`  ${authUrl}\n`));
+        console.log(chalk.yellow('Could not open browser automatically. Please click or copy the URL above.'));
       }
 
-      console.log(chalk.dim('Waiting for authorization... (press Ctrl+C to cancel)\n'));
+      console.log(chalk.dim('\nWaiting for authorization... (press Ctrl+C to cancel)\n'));
+
+      // Poll for authorization
+      const pollInterval = 2000; // 2 seconds
+      const timeout = 120000; // 2 minutes
+      const startTime = Date.now();
 
-      // Wait for callback
-      const { key, email } = await authServer.waitForAuth();
+      while (Date.now() - startTime < timeout) {
+        const statusRes = await fetch(`${baseUrl}/api/cli-auth/status?session=${encodeURIComponent(session)}`);
 
-      // Save the API key
-      await setApiKey(key);
+        if (statusRes.ok) {
+          const data = await statusRes.json();
 
-      // Also save the URL to config if not already there
-      await setApiBaseUrl(baseUrl);
+          if (data.status === 'authorized') {
+            // Save the API key
+            await setApiKey(data.key);
+            await setApiBaseUrl(baseUrl);
+
+            console.log(chalk.green(`✓ Logged in as ${data.email}`));
+            console.log(chalk.dim(`  API key saved to ~/.papercrane/config.json\n`));
+            return;
+          }
+        } else if (statusRes.status === 404) {
+          throw new Error('Session expired. Please try again.');
+        }
+
+        // Wait before next poll
+        await new Promise(resolve => setTimeout(resolve, pollInterval));
+      }
 
-      console.log(chalk.green(`✓ Logged in as ${email}`));
-      console.log(chalk.dim(`  API key saved to ~/.papercrane/config.json\n`));
+      throw new Error('Authentication timed out');
     } catch (error) {
       if (error.message.includes('timed out')) {
         console.error(chalk.red('\nAuthentication timed out. Please try again.'));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@papercraneai/cli",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "CLI tool for managing OAuth credentials for LLM integrations",
   "main": "index.js",
   "type": "module",