@synergenius/flow-weaver 0.23.1 → 0.23.4

package/dist/cli/commands/auth.js

@@ -3,8 +3,9 @@ import { loadCredentials, saveCredentials, clearCredentials, getPlatformUrl } fr
 import { PlatformClient } from '../config/platform-client.js';
 export async function loginCommand(options) {
     const platformUrl = options.platformUrl ?? getPlatformUrl();
+    const displayUrl = platformUrl.replace(/^https?:\/\//, '');
     console.log('');
-    console.log('  \x1b[1mFlow Weaver Cloud\x1b[0m \x1b[2m(flowweaver.ai)\x1b[0m');
+    console.log(`  \x1b[1mFlow Weaver\x1b[0m \x1b[2m(${displayUrl})\x1b[0m`);
     console.log('');
     // API key mode (for CI/headless)
     if (options.apiKey) {
@@ -42,8 +43,8 @@ async function loginWithBrowser(platformUrl) {
         interval = data.interval ?? 5;
     }
     catch {
-        console.error('  \x1b[31m✗\x1b[0m Cannot connect to flowweaver.ai');
-        console.error('    Check your internet connection or set FW_PLATFORM_URL');
+        console.error(`  \x1b[31m✗\x1b[0m Cannot connect to ${platformUrl}`);
+        console.error('    Check the URL or set FW_PLATFORM_URL');
         process.exit(1);
         return;
     }
@@ -65,20 +66,24 @@ async function loginWithBrowser(platformUrl) {
     }
     console.log('');
     // Step 3: Poll for completion
-    process.stdout.write('  Waiting for authentication...');
+    process.stderr.write('  Waiting for approval');
     let cancelled = false;
     const sigHandler = () => { cancelled = true; };
     process.on('SIGINT', sigHandler);
     const maxAttempts = 120; // 10 minutes at 5s intervals
+    let networkErrors = 0;
     for (let i = 0; i < maxAttempts && !cancelled; i++) {
         await new Promise(r => setTimeout(r, interval * 1000));
         try {
             const resp = await fetch(`${platformUrl}/auth/device/poll?deviceCode=${deviceCode}`);
-            if (!resp.ok)
+            networkErrors = 0; // reset on successful connection
+            if (!resp.ok) {
+                process.stderr.write('.');
                 continue;
+            }
             const data = await resp.json();
             if (data.status === 'approved' && data.token && data.user) {
-                process.stdout.write(' \x1b[32m✓\x1b[0m\n\n');
+                process.stderr.write(' \x1b[32m✓\x1b[0m\n\n');
                 saveCredentials({
                     token: data.token,
                     email: data.user.email,
@@ -95,7 +100,7 @@ async function loginWithBrowser(platformUrl) {
                 return;
             }
             if (data.status === 'expired') {
-                process.stdout.write(' \x1b[31mtimed out\x1b[0m\n\n');
+                process.stderr.write(' \x1b[31mtimed out\x1b[0m\n\n');
                 console.log('  Code expired. Run \x1b[36mfw login\x1b[0m again.');
                 console.log('');
                 process.removeListener('SIGINT', sigHandler);
@@ -103,27 +108,30 @@ async function loginWithBrowser(platformUrl) {
                 return;
             }
             if (data.status === 'denied') {
-                process.stdout.write(' \x1b[31mdenied\x1b[0m\n\n');
+                process.stderr.write(' \x1b[31mdenied\x1b[0m\n\n');
                 console.log('  Access denied.');
                 console.log('');
                 process.removeListener('SIGINT', sigHandler);
                 process.exit(1);
                 return;
             }
-            // Still pending — show a dot for progress
-            if (i % 4 === 3)
-                process.stdout.write('.');
+            // Still pending — show a dot every poll
+            process.stderr.write('.');
         }
         catch {
-            // Network error — keep trying
+            networkErrors++;
+            if (networkErrors >= 3) {
+                process.stderr.write(' \x1b[33m!\x1b[0m');
+                networkErrors = 0;
+            }
         }
     }
     process.removeListener('SIGINT', sigHandler);
     if (cancelled) {
-        process.stdout.write(' \x1b[33mcancelled\x1b[0m\n\n');
+        process.stderr.write(' \x1b[33mcancelled\x1b[0m\n\n');
     }
     else {
-        process.stdout.write(' \x1b[31mtimed out\x1b[0m\n\n');
+        process.stderr.write(' \x1b[31mtimed out\x1b[0m\n\n');
         console.log('  Authentication timed out. Run \x1b[36mfw login\x1b[0m again.');
         console.log('');
     }
@@ -209,23 +217,24 @@ export async function authStatusCommand() {
     console.log('');
 }
 function prompt(message, hidden = false) {
-    return new Promise((resolve) => {
-        const rl = readline.createInterface({ input: process.stdin, output: process.stderr });
-        if (hidden && process.stdin.isTTY) {
-            // Hide password input
+    if (hidden && process.stdin.isTTY) {
+        // Raw-mode password input — no readline (it competes for stdin)
+        return new Promise((resolve) => {
             process.stderr.write(message);
             process.stdin.setRawMode(true);
+            process.stdin.resume();
             let input = '';
             const handler = (key) => {
                 const ch = key.toString();
                 if (ch === '\r' || ch === '\n') {
                     process.stdin.setRawMode(false);
+                    process.stdin.pause();
                     process.stdin.removeListener('data', handler);
                     process.stderr.write('\n');
-                    rl.close();
                     resolve(input);
                 }
                 else if (ch === '\x03') { // Ctrl+C
+                    process.stdin.setRawMode(false);
                     process.exit(1);
                 }
                 else if (ch === '\x7f') { // Backspace
@@ -236,10 +245,11 @@ function prompt(message, hidden = false) {
                 }
             };
             process.stdin.on('data', handler);
-        }
-        else {
-            rl.question(message, (answer) => { rl.close(); resolve(answer); });
-        }
+        });
+    }
+    return new Promise((resolve) => {
+        const rl = readline.createInterface({ input: process.stdin, output: process.stderr });
+        rl.question(message, (answer) => { rl.close(); resolve(answer); });
     });
 }
 //# sourceMappingURL=auth.js.map

package/dist/cli/commands/connect.d.ts

@@ -1,2 +1,4 @@
+import { DeviceConnection } from '../../agent/device-connection.js';
+export declare function loadPackDeviceHandlers(conn: DeviceConnection, projectDir: string): Promise<string[]>;
 export declare function handleConnect(projectDir: string): Promise<void>;
 //# sourceMappingURL=connect.d.ts.map

package/dist/cli/commands/connect.js

@@ -1,7 +1,42 @@
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 import * as os from 'node:os';
+import * as readline from 'node:readline';
 import { DeviceConnection } from '../../agent/device-connection.js';
+import { discoverDeviceHandlers } from '../../marketplace/registry.js';
+function promptYesNo(message) {
+    return new Promise((resolve) => {
+        const rl = readline.createInterface({ input: process.stdin, output: process.stderr });
+        rl.question(message, (answer) => {
+            rl.close();
+            const normalized = answer.trim().toLowerCase();
+            resolve(normalized === '' || normalized === 'y' || normalized === 'yes');
+        });
+    });
+}
+export async function loadPackDeviceHandlers(conn, projectDir) {
+    const loadedPacks = [];
+    try {
+        const handlers = await discoverDeviceHandlers(projectDir);
+        for (const handler of handlers) {
+            try {
+                const mod = await import(handler.entrypoint);
+                if (typeof mod.register === 'function') {
+                    await mod.register(conn, { projectDir });
+                    loadedPacks.push(handler.packageName);
+                    process.stderr.write(`  \x1b[2m+ ${handler.packageName} handlers\x1b[0m\n`);
+                }
+            }
+            catch (err) {
+                process.stderr.write(`  \x1b[33m⚠\x1b[0m Failed to load handlers from ${handler.packageName}: ${err instanceof Error ? err.message : err}\n`);
+            }
+        }
+    }
+    catch {
+        // Discovery failed — non-fatal
+    }
+    return loadedPacks;
+}
 export async function handleConnect(projectDir) {
     // Load credentials
     const credPath = path.join(os.homedir(), '.fw', 'credentials.json');
@@ -46,13 +81,72 @@ export async function handleConnect(projectDir) {
         const entries = fs.readdirSync(dirPath, { withFileTypes: true });
         return entries
             .filter(e => !e.name.startsWith('.') && e.name !== 'node_modules' && e.name !== 'dist')
-            .map(e => ({ name: e.name, type: e.isDirectory() ? 'directory' : 'file', path: path.relative(projectDir, path.join(dirPath, e.name)) }));
+            .map(e => ({ name: e.name, type: e.isDirectory() ? 'directory' : 'file', path: path.relative(projectDir, path.join(dirPath, e.name)), hasUnfetchedChildren: e.isDirectory() }));
     });
+    // Load pack device handlers (if any installed packs provide them)
+    const loadedPacks = await loadPackDeviceHandlers(conn, projectDir);
+    // Tell the platform which packs contributed handlers (for auto-install)
+    if (loadedPacks.length > 0) {
+        conn.setPacks(loadedPacks);
+    }
     console.log('');
     console.log('  \x1b[1mflow-weaver connect\x1b[0m');
     console.log(`  \x1b[2mProject: ${path.basename(projectDir)}\x1b[0m`);
     console.log(`  \x1b[2mPlatform: ${creds.platformUrl}\x1b[0m`);
     console.log('');
+    // Check if packs need to be installed in the Studio workspace
+    if (loadedPacks.length > 0) {
+        try {
+            const checkRes = await fetch(`${creds.platformUrl}/devices/check-packs`, {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json', 'Authorization': `Bearer ${creds.token}` },
+                body: JSON.stringify({ packs: loadedPacks }),
+            });
+            if (checkRes.ok) {
+                const { missing } = await checkRes.json();
+                if (missing.length > 0) {
+                    console.log('  The following packs need to be installed in Studio:');
+                    for (const p of missing) {
+                        console.log(`    \x1b[36m${p}\x1b[0m`);
+                    }
+                    console.log('');
+                    const answer = await promptYesNo('  Install now? (Y/n) ');
+                    if (answer) {
+                        process.stderr.write('  Installing...');
+                        const installRes = await fetch(`${creds.platformUrl}/devices/install-packs`, {
+                            method: 'POST',
+                            headers: { 'Content-Type': 'application/json', 'Authorization': `Bearer ${creds.token}` },
+                            body: JSON.stringify({ packs: missing }),
+                        });
+                        if (installRes.ok) {
+                            const { results } = await installRes.json();
+                            const allOk = results.every(r => r.ok);
+                            if (allOk) {
+                                process.stderr.write(' \x1b[32m✓\x1b[0m\n\n');
+                            }
+                            else {
+                                process.stderr.write(' \x1b[33mpartial\x1b[0m\n');
+                                for (const r of results) {
+                                    if (!r.ok)
+                                        console.log(`    \x1b[31m✗\x1b[0m ${r.pack}: ${r.error}`);
+                                }
+                                console.log('');
+                            }
+                        }
+                        else {
+                            process.stderr.write(' \x1b[31mfailed\x1b[0m\n\n');
+                        }
+                    }
+                    else {
+                        console.log('  \x1b[2mSkipped. Install manually via Studio marketplace.\x1b[0m\n');
+                    }
+                }
+            }
+        }
+        catch {
+            // Check failed — non-fatal, continue connecting
+        }
+    }
     try {
         await conn.connect();
         console.log('  \x1b[2mPress Ctrl+C to disconnect.\x1b[0m\n');