@papercraneai/cli 1.2.0 → 1.4.1

package/bin/papercrane.js

@@ -4,11 +4,19 @@ import { Command } from 'commander';
 import chalk from 'chalk';
 import readline from 'readline';
 import fs from 'fs/promises';
+import { ProxyAgent, setGlobalDispatcher } from 'undici';
 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';
 
+// Configure proxy support for environments like Claude's container
+// Node.js native fetch() doesn't respect HTTP_PROXY/HTTPS_PROXY env vars
+const proxyUrl = process.env.HTTPS_PROXY || process.env.HTTP_PROXY;
+if (proxyUrl) {
+  setGlobalDispatcher(new ProxyAgent(proxyUrl));
+}
+
 const program = new Command();
 
 program
@@ -21,9 +29,11 @@ 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('--no-wait', 'Print auth URL and exit immediately (for AI assistants)')
+  .option('--check', 'Check if pending login was completed')
   .action(async (options) => {
     try {
-      const { getApiBaseUrl, setApiBaseUrl } = await import('../lib/config.js');
+      const { getApiBaseUrl, setApiBaseUrl, getPendingSession, setPendingSession, clearPendingSession } = await import('../lib/config.js');
 
       // Resolve API base URL: --url flag > config > default
       let baseUrl;
@@ -51,40 +61,102 @@ program
         return;
       }
 
+      // --check: Check if pending login was completed
+      if (options.check) {
+        const pending = await getPendingSession();
+        if (!pending) {
+          console.log(chalk.yellow('No pending login session. Run: papercrane login --no-wait'));
+          process.exit(1);
+        }
+
+        const statusRes = await fetch(`${pending.baseUrl}/api/cli-auth/status?session=${encodeURIComponent(pending.session)}`);
+
+        if (statusRes.ok) {
+          const data = await statusRes.json();
+          if (data.status === 'authorized') {
+            await setApiKey(data.key);
+            await setApiBaseUrl(pending.baseUrl);
+            await clearPendingSession();
+            console.log(chalk.green(`✓ Logged in as ${data.email}`));
+            console.log(chalk.dim(`  API key saved to ~/.papercrane/config.json\n`));
+            return;
+          }
+        }
+
+        console.log(chalk.yellow('Not yet authorized. Please click the login URL, then run: papercrane login --check'));
+        process.exit(1);
+      }
+
       // Browser-based login flow
-      const { createAuthServer, generateState } = await import('../lib/auth-server.js');
-      const open = (await import('open')).default;
+      const { generateState } = await import('../lib/auth-server.js');
+
+      const session = generateState();
 
-      const state = generateState();
-      const authServer = await createAuthServer(state, baseUrl, 120000);
+      // 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');
+      }
 
-      const authUrl = `${baseUrl}/cli-auth?port=${authServer.port}&state=${state}`;
+      const authUrl = `${baseUrl}/cli-auth?session=${session}`;
+
+      // --no-wait: Print URL and exit immediately (for AI assistants)
+      if (options.noWait) {
+        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'));
+        return;
+      }
 
-      console.log(chalk.cyan('Opening browser for authentication...'));
-      console.log(chalk.dim(`  ${authUrl}\n`));
+      console.log(chalk.cyan('\nOpen this URL to authenticate:\n'));
+      console.log(`  ${authUrl}\n`);
 
-      // Try to open browser
+      // Try to open browser automatically
       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.'));
-        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'));
 
-      // Wait for callback
-      const { key, email } = await authServer.waitForAuth();
+      // Poll for authorization
+      const pollInterval = 2000; // 2 seconds
+      const timeout = 120000; // 2 minutes
+      const startTime = Date.now();
 
-      // Save the API key
-      await setApiKey(key);
+      while (Date.now() - startTime < timeout) {
+        const statusRes = await fetch(`${baseUrl}/api/cli-auth/status?session=${encodeURIComponent(session)}`);
 
-      // Also save the URL to config if not already there
-      await setApiBaseUrl(baseUrl);
+        if (statusRes.ok) {
+          const data = await statusRes.json();
+
+          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/lib/config.js

@@ -123,3 +123,31 @@ export async function clearDefaultWorkspace() {
   delete config.defaultWorkspaceId;
   await saveConfig(config);
 }
+
+/**
+ * Get pending login session (for --no-wait / --check flow)
+ * @returns {Promise<{session: string, baseUrl: string}|null>}
+ */
+export async function getPendingSession() {
+  const config = await loadConfig();
+  return config.pendingSession || null;
+}
+
+/**
+ * Set pending login session
+ * @param {{session: string, baseUrl: string}} pendingSession
+ */
+export async function setPendingSession(pendingSession) {
+  const config = await loadConfig();
+  config.pendingSession = pendingSession;
+  await saveConfig(config);
+}
+
+/**
+ * Clear pending login session
+ */
+export async function clearPendingSession() {
+  const config = await loadConfig();
+  delete config.pendingSession;
+  await saveConfig(config);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@papercraneai/cli",
-  "version": "1.2.0",
+  "version": "1.4.1",
   "description": "CLI tool for managing OAuth credentials for LLM integrations",
   "main": "index.js",
   "type": "module",
@@ -25,6 +25,7 @@
     "axios": "^1.6.0",
     "chalk": "^4.1.2",
     "inquirer": "^8.2.6",
-    "open": "^8.4.2"
+    "open": "^8.4.2",
+    "undici": "^6.0.0"
   }
 }