npm - @papercraneai/cli - Versions diffs - 1.4.4 → 1.5.0 - Mend

@papercraneai/cli 1.4.4 → 1.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/bin/papercrane.js CHANGED Viewed

@@ -4,12 +4,61 @@ import { Command } from 'commander';
 import chalk from 'chalk';
 import readline from 'readline';
 import fs from 'fs/promises';
-import { http } from '../lib/axios-client.js';
+import http from 'http';
+import { http as httpClient } from '../lib/axios-client.js';
 import { setApiKey, clearConfig, isLoggedIn, setDefaultWorkspace, getDefaultWorkspace } from '../lib/config.js';
 import { validateApiKey } from '../lib/cloud-client.js';
 import { listFunctions, getFunction, runFunction, formatDescribe, formatDescribeRoot, formatFlat, formatResult, formatUnconnected } from '../lib/function-client.js';
 import { listWorkspaces, resolveWorkspaceId, getFileTree, readFile, writeFile, editFile, deleteFile, getLocalWorkspacePath, pullWorkspace, pushWorkspace } from '../lib/environment-client.js';
+/**
+ * Test if browser can actually open URLs by starting a local server and
+ * checking if we receive a request when we try to open it.
+ * @param {number} timeout - Max time to wait in ms
+ * @returns {Promise<boolean>} - true if browser can open URLs
+ */
+async function canOpenBrowser(timeout = 2500) {
+  return new Promise((resolve) => {
+    let resolved = false;
+    const done = (result) => {
+      if (!resolved) {
+        resolved = true;
+        resolve(result);
+      }
+    };
+    const server = http.createServer((req, res) => {
+      res.writeHead(200, { 'Content-Type': 'text/html' });
+      res.end('<html><body><script>window.close()</script>Checking browser... you can close this tab.</body></html>');
+      server.close();
+      done(true);
+    });
+    server.on('error', () => done(false));
+    server.listen(0, '127.0.0.1', async () => {
+      const port = server.address().port;
+      const checkUrl = `http://127.0.0.1:${port}/browser-check`;
+      try {
+        const open = (await import('open')).default;
+        await open(checkUrl);
+      } catch {
+        // open() threw an error
+        server.close();
+        done(false);
+        return;
+      }
+      // Wait for browser to hit our server
+      setTimeout(() => {
+        server.close();
+        done(false);
+      }, timeout);
+    });
+  });
+}
 const program = new Command();
 program
@@ -22,8 +71,8 @@ program
   .description('Login to Papercrane. Opens browser for authentication, or use --api-key for direct login.')
   .option('--api-key <key>', 'API key for direct login (skips browser)')
   .option('--url <url>', 'API base URL (saves to config)')
-  .option('--nowait', 'Print auth URL and exit immediately (for AI assistants)')
-  .option('--check', 'Check if pending login was completed')
+  .option('--print-url', 'Print auth URL and exit (use with --complete after authorizing)')
+  .option('--complete', 'Complete a pending login started with --print-url')
   .action(async (options) => {
     try {
       const { getApiBaseUrl, setApiBaseUrl, getPendingSession, setPendingSession, clearPendingSession } = await import('../lib/config.js');
@@ -54,15 +103,15 @@ program
         return;
       }
-      // --check: Check if pending login was completed
-      if (options.check) {
+      // --complete: Check if pending login was completed
+      if (options.complete) {
         const pending = await getPendingSession();
         if (!pending) {
-          console.log(chalk.yellow('No pending login session. Run: papercrane login --nowait'));
+          console.log(chalk.yellow('No pending login session. Run: papercrane login --print-url'));
           process.exit(1);
         }
-        const statusRes = await http.get(`${pending.baseUrl}/api/cli-auth/status?session=${encodeURIComponent(pending.session)}`, {
+        const statusRes = await httpClient.get(`${pending.baseUrl}/api/cli-auth/status?session=${encodeURIComponent(pending.session)}`, {
           validateStatus: () => true
         });
@@ -78,7 +127,22 @@ program
           }
         }
-        console.log(chalk.yellow('Not yet authorized. Please click the login URL, then run: papercrane login --check'));
+        console.log(chalk.yellow('Not yet authorized. Please click the login URL, then run: papercrane login --complete'));
+        process.exit(1);
+      }
+      // Check server connectivity before starting auth flow
+      // Extract domain from baseUrl for allowlist message
+      const urlDomain = new URL(baseUrl).hostname;
+      try {
+        await httpClient.get(`${baseUrl}/api/cli-auth/status?session=connectivity-check`, { timeout: 5000 });
+      } catch (connectError) {
+        console.log(chalk.yellow('\n⚠️  Cannot reach Papercrane server.'));
+        console.log(chalk.dim(`\nCould not connect to: ${baseUrl}`));
+        console.log(chalk.dim('\nIf you\'re using Claude Desktop or Claude app:'));
+        console.log(chalk.dim('  1. Go to Settings → Capabilities → Domain allowlist'));
+        console.log(chalk.dim(`  2. Add: ${urlDomain}`));
+        console.log(chalk.dim('  3. Try again\n'));
         process.exit(1);
       }
@@ -88,7 +152,7 @@ program
       const session = generateState();
       // Initialize session on server
-      const initRes = await http.post(`${baseUrl}/api/cli-auth/init`, { session }, {
+      const initRes = await httpClient.post(`${baseUrl}/api/cli-auth/init`, { session }, {
         headers: { 'Content-Type': 'application/json' },
         validateStatus: () => true
       });
@@ -99,25 +163,41 @@ program
       const authUrl = `${baseUrl}/cli-auth?session=${session}`;
-      // --nowait: Print URL and exit immediately (for AI assistants)
-      if (options.nowait) {
+      // --print-url: Print URL and exit immediately (for AI assistants)
+      if (options.printUrl) {
         await setPendingSession({ session, baseUrl });
         console.log(chalk.cyan('\nOpen this URL to authenticate:\n'));
         console.log(`  ${authUrl}\n`);
-        console.log(chalk.dim('After authorizing, run: papercrane login --check\n'));
+        console.log(chalk.dim('After authorizing, run: papercrane login --complete\n'));
         process.exit(0);
       }
+      // Test if browser can actually open URLs
+      console.log(chalk.dim('\nChecking browser availability...'));
+      const browserWorks = await canOpenBrowser();
       console.log(chalk.cyan('\nOpen this URL to authenticate:\n'));
       console.log(`  ${authUrl}\n`);
-      // Try to open browser automatically
+      if (!browserWorks) {
+        // Browser can't open - save session and exit (non-blocking)
+        await setPendingSession({ session, baseUrl });
+        console.log(chalk.yellow('Browser could not be opened automatically.'));
+        console.log(chalk.dim('\nPlease open the URL above manually, then run: papercrane login --complete\n'));
+        process.exit(0);
+      }
+      // Browser works - open the auth URL and poll
       try {
         const open = (await import('open')).default;
         await open(authUrl);
         console.log(chalk.dim('(Browser opened automatically)'));
       } catch {
-        console.log(chalk.yellow('Could not open browser automatically. Please click or copy the URL above.'));
+        // Shouldn't happen since canOpenBrowser passed, but handle it
+        await setPendingSession({ session, baseUrl });
+        console.log(chalk.yellow('Could not open browser.'));
+        console.log(chalk.dim('\nPlease open the URL above manually, then run: papercrane login --complete\n'));
+        process.exit(0);
       }
       console.log(chalk.dim('\nWaiting for authorization... (press Ctrl+C to cancel)\n'));
@@ -128,7 +208,7 @@ program
       const startTime = Date.now();
       while (Date.now() - startTime < timeout) {
-        const statusRes = await http.get(`${baseUrl}/api/cli-auth/status?session=${encodeURIComponent(session)}`, {
+        const statusRes = await httpClient.get(`${baseUrl}/api/cli-auth/status?session=${encodeURIComponent(session)}`, {
           validateStatus: () => true
         });

package/lib/config.js CHANGED Viewed

@@ -125,7 +125,7 @@ export async function clearDefaultWorkspace() {
 }
 /**
- * Get pending login session (for --nowait / --check flow)
+ * Get pending login session (for --print-url / --complete flow)
  * @returns {Promise<{session: string, baseUrl: string}|null>}
  */
 export async function getPendingSession() {

package/package.json CHANGED Viewed

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