@epic-cloudcontrol/daemon 0.3.0 → 0.4.0

package/dist/cli.js

@@ -27,113 +27,111 @@ program
 // ── login ─────────────────────────────────────────────
 program
     .command("login")
-    .description("Log in and sync all your company profiles")
-    .option("--email <email>", "Log in with email (syncs all companies automatically)")
-    .option("--profile <name>", "Profile name for single-key setup", "default")
+    .description("Log in via browser (device code flow)")
     .option("--api-url <url>", "CloudControl API URL")
-    .option("--api-key <key>", "API key (for single-company manual setup)")
+    .option("--api-key <key>", "Manual API key setup (skip browser)")
+    .option("--no-browser", "Don't open browser automatically (print URL instead)")
     .option("--name <name>", "Worker name")
+    .option("--profile <name>", "Profile name for manual key setup", "default")
     .action(async (opts) => {
-    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-    const ask = (q, defaultVal) => new Promise((resolve) => {
-        const prompt = defaultVal ? `${q} [${defaultVal}]: ` : `${q}: `;
-        rl.question(prompt, (answer) => resolve(answer.trim() || defaultVal || ""));
-    });
-    let apiUrl = opts.apiUrl;
-    if (!apiUrl) {
-        const existing = loadProfile();
-        apiUrl = await ask("CloudControl API URL", existing?.apiUrl || "https://cloudcontrol.onrender.com");
-    }
-    // Email login mode — sync all companies
-    const email = opts.email || await ask("Email (or leave blank for API key setup)");
-    if (email) {
-        const password = await ask("Password");
+    const existing = loadProfile();
+    const apiUrl = opts.apiUrl || existing?.apiUrl || "https://cloudcontrol.onrender.com";
+    const workerName = opts.name || existing?.workerName || `worker-${os.hostname()}`;
+    // Manual API key mode (backwards compat)
+    if (opts.apiKey) {
+        const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+        const ask = (q, def) => new Promise((r) => rl.question(def ? `${q} [${def}]: ` : `${q}: `, (a) => r(a.trim() || def || "")));
+        const teamName = await ask("Company name", opts.profile);
         rl.close();
-        if (!password) {
-            console.error("Error: Password required.");
-            process.exit(1);
+        saveProfile({ apiUrl, apiKey: opts.apiKey, workerName, teamName }, opts.profile);
+        console.log(`\nProfile "${opts.profile}" saved.`);
+        return;
+    }
+    // Device code flow
+    console.log("\nRequesting device code...");
+    let code;
+    let deviceUrl;
+    try {
+        const res = await fetch(`${apiUrl}/api/auth/device`, {
+            method: "POST",
+            headers: { "content-type": "application/json" },
+            body: JSON.stringify({ action: "create" }),
+        });
+        if (!res.ok)
+            throw new Error(`HTTP ${res.status}`);
+        const data = await res.json();
+        code = data.code;
+        deviceUrl = data.url;
+    }
+    catch (err) {
+        console.error(`Failed to connect to ${apiUrl}: ${err.message}`);
+        process.exit(1);
+    }
+    // Open browser
+    const fullUrl = `${deviceUrl}?code=${code}`;
+    if (opts.browser !== false) {
+        console.log("\nOpening browser for authentication...\n");
+        try {
+            const { exec } = await import("child_process");
+            const cmd = process.platform === "darwin" ? `open "${fullUrl}"`
+                : process.platform === "win32" ? `start "" "${fullUrl}"`
+                    : `xdg-open "${fullUrl}"`;
+            exec(cmd);
         }
-        console.log("\nAuthenticating...");
+        catch {
+            // Browser open failed — user will use the URL
+        }
+    }
+    console.log(`If the browser didn't open, go to:`);
+    console.log(`  ${deviceUrl}\n`);
+    console.log(`Enter code: ${code}\n`);
+    console.log("Waiting for authorization...");
+    // Poll until authorized or expired
+    const pollInterval = 5000;
+    const maxAttempts = 120; // 10 minutes at 5s intervals
+    for (let i = 0; i < maxAttempts; i++) {
+        await new Promise((r) => setTimeout(r, pollInterval));
         try {
-            const res = await fetch(`${apiUrl}/api/auth/teams`, {
+            const res = await fetch(`${apiUrl}/api/auth/device`, {
                 method: "POST",
                 headers: { "content-type": "application/json" },
-                body: JSON.stringify({ email, password, generateKeys: true }),
+                body: JSON.stringify({ action: "poll", code }),
             });
             if (!res.ok) {
-                const data = await res.json();
-                console.error(`Login failed: ${data.error || res.status}`);
-                process.exit(1);
+                if (res.status === 404) {
+                    console.error("\nCode expired. Run 'cloudcontrol login' again.");
+                    process.exit(1);
+                }
+                continue;
             }
             const data = await res.json();
-            const workerName = opts.name || `worker-${os.hostname()}`;
-            console.log(`\nLogged in as ${data.user.email}`);
-            console.log(`Found ${data.teams.length} company(s):\n`);
-            for (const team of data.teams) {
-                // Generate slug from team name
-                const slug = team.teamName
-                    .toLowerCase()
-                    .replace(/[^a-z0-9]+/g, "-")
-                    .replace(/^-|-$/g, "");
-                saveProfile({
-                    apiUrl,
-                    apiKey: team.apiKey,
-                    workerName,
-                    teamName: team.teamName,
-                }, slug);
-                console.log(`  ✓ ${team.teamName} → profile "${slug}" (${team.role})`);
+            if (data.status === "pending") {
+                continue;
             }
-            // Also save the first team as default
-            if (data.teams.length > 0) {
-                const first = data.teams[0];
-                saveProfile({
-                    apiUrl,
-                    apiKey: first.apiKey,
-                    workerName,
-                    teamName: first.teamName,
-                });
+            if (data.status === "authorized" && data.user && data.teams) {
+                console.log(`\n✓ Logged in as ${data.user.email}`);
+                console.log(`  Found ${data.teams.length} company(s):\n`);
+                for (const team of data.teams) {
+                    const slug = team.teamName.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "");
+                    saveProfile({ apiUrl, apiKey: team.apiKey, workerName, teamName: team.teamName }, slug);
+                    console.log(`  ✓ ${team.teamName} → profile "${slug}" (${team.role})`);
+                }
+                // Save first team as default
+                if (data.teams.length > 0) {
+                    const first = data.teams[0];
+                    saveProfile({ apiUrl, apiKey: first.apiKey, workerName, teamName: first.teamName });
+                }
+                console.log(`\n${data.teams.length} profile(s) saved to ${getConfigDir()}/`);
+                console.log("Run 'cloudcontrol start --all' to begin processing tasks.");
+                return;
             }
-            console.log(`\n${data.teams.length} profile(s) saved to ${getConfigDir()}/`);
-            console.log("Run 'cloudcontrol profiles' to see them.");
-            console.log("Run 'cloudcontrol start --profile <name>' to start working.");
-        }
-        catch (err) {
-            console.error(`Error: ${err.message}`);
-            process.exit(1);
         }
-    }
-    else {
-        // Manual API key mode (original flow)
-        const profileName = opts.profile;
-        let apiKey = opts.apiKey;
-        let workerName = opts.name;
-        let teamName;
-        const existing = loadProfile(profileName);
-        if (!teamName)
-            teamName = await ask("Company name", existing?.teamName || profileName);
-        if (!apiKey)
-            apiKey = await ask("API Key (cc_...)", existing?.apiKey);
-        if (!workerName)
-            workerName = await ask("Worker name", existing?.workerName || `worker-${os.hostname()}`);
-        rl.close();
-        if (!apiKey) {
-            console.error("Error: API key is required.");
-            process.exit(1);
-        }
-        console.log("\nVerifying connection...");
-        try {
-            const res = await fetch(`${apiUrl}/api/health`);
-            if (!res.ok)
-                throw new Error(`HTTP ${res.status}`);
-            console.log("Connected to CloudControl.");
-        }
-        catch (err) {
-            console.error(`Warning: Could not reach ${apiUrl} — ${err.message}`);
+        catch {
+            // Poll error — retry
         }
-        saveProfile({ apiUrl, apiKey, workerName, teamName }, profileName);
-        console.log(`\nProfile "${profileName}" saved to ${getConfigDir()}/`);
-        console.log("Run 'cloudcontrol start' to begin processing tasks.");
     }
+    console.error("\nAuthorization timed out. Run 'cloudcontrol login' again.");
+    process.exit(1);
 });
 // ── profiles ──────────────────────────────────────────
 program

package/dist/service-manager.js

@@ -59,7 +59,7 @@ ${argStrings}
   <key>EnvironmentVariables</key>
   <dict>
     <key>PATH</key>
-    <string>/usr/local/bin:/usr/bin:/bin:/opt/homebrew/bin:${process.env.HOME}/.nvm/versions/node/${process.version}/bin</string>
+    <string>${process.env.PATH || "/usr/local/bin:/usr/bin:/bin:/opt/homebrew/bin"}</string>
     <key>HOME</key>
     <string>${os.homedir()}</string>
   </dict>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@epic-cloudcontrol/daemon",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "CloudControl local daemon — executes AI agent tasks on worker machines",
   "type": "module",
   "main": "dist/cli.js",