nexo-code 0.1.1 → 0.1.3

package/nexo.mjs

@@ -14550,7 +14550,7 @@ var require_cross_spawn = __commonJS({
     var cp = __require("child_process");
     var parse4 = require_parse();
     var enoent = require_enoent();
-    function spawn5(command, args, options) {
+    function spawn6(command, args, options) {
       const parsed = parse4(command, args, options);
       const spawned = cp.spawn(parsed.command, parsed.args, parsed.options);
       enoent.hookChildProcess(spawned, parsed);
@@ -14562,8 +14562,8 @@ var require_cross_spawn = __commonJS({
       result.error = result.error || enoent.verifyENOENTSync(result.status, parsed);
       return result;
     }
-    module.exports = spawn5;
-    module.exports.spawn = spawn5;
+    module.exports = spawn6;
+    module.exports.spawn = spawn6;
     module.exports.sync = spawnSync3;
     module.exports._parse = parse4;
     module.exports._enoent = enoent;
@@ -14681,6 +14681,8 @@ var require_content_type = __commonJS({
 
 // dist/main.js
 import { spawnSync as spawnSync2 } from "node:child_process";
+import { rmSync } from "node:fs";
+import { join as join19 } from "node:path";
 import { createInterface } from "node:readline";
 
 // dist/update.js
@@ -14688,7 +14690,7 @@ import { mkdir, readFile, writeFile } from "node:fs/promises";
 import { join } from "node:path";
 
 // dist/version.js
-var VERSION = "0.1.1";
+var VERSION = "0.1.3";
 
 // dist/update.js
 var PACKAGE = "nexo-code";
@@ -35136,6 +35138,8 @@ var SpeakSchema = external_exports.strictObject({
 var loginEmail = external_exports.string().trim().toLowerCase().pipe(external_exports.email().max(320));
 var EmailLoginStartSchema = external_exports.strictObject({ email: loginEmail, adult: external_exports.literal(true) });
 var EmailLoginVerifySchema = external_exports.strictObject({ email: loginEmail, code: external_exports.string().trim().regex(/^\d{6}$/, "six digits") });
+var DeviceApproveSchema = external_exports.strictObject({ userCode: external_exports.string().trim().toUpperCase().regex(/^[A-Z]{4}-[A-Z]{4}$/, "a code like ABCD-EFGH") });
+var DevicePollSchema = external_exports.strictObject({ deviceCode: external_exports.string().regex(/^[A-Za-z0-9_-]{43}$/) });
 
 // ../../packages/core/dist/sse.js
 var MAX_SSE_FRAME_CHARS = 2e6;
@@ -37663,6 +37667,7 @@ async function errorFromResponse(res) {
 }
 
 // dist/commands.js
+import { spawn as spawn3 } from "node:child_process";
 import { join as join15 } from "node:path";
 
 // dist/project.js
@@ -44245,7 +44250,8 @@ async function login(io, opts) {
     io.err(`${s.error(s.sym.fail)} Use an https:// API URL (plain http is only allowed for localhost).`);
     return 2;
   }
-  const token = !opts.token && io.interactive && io.readLine ? await emailSignIn(io, apiUrl) : await io.readSecret(`Paste your Nexo token (input hidden): `);
+  const terminal = !opts.token && io.interactive && io.readLine;
+  const token = !terminal ? await io.readSecret(`Paste your Nexo token (input hidden): `) : opts.email ? await emailSignIn(io, apiUrl) : await browserSignIn(io, apiUrl);
   if (token === null)
     return 1;
   if (!TOKEN2.test(token)) {
@@ -44259,8 +44265,54 @@ async function login(io, opts) {
   io.out(s.dim(`  user ${me.userId}`));
   return 0;
 }
+async function browserSignIn(io, apiUrl) {
+  const { style: s } = io;
+  const post = (path2, body) => (io.fetch ?? fetch)(new URL(path2, apiUrl), { method: "POST", headers: { "content-type": "application/json", "x-nexo-client": "cli" }, body: JSON.stringify(body), signal: io.signal });
+  const res = await post("/v1/auth/device/start", {});
+  if (!res.ok)
+    throw await errorFromResponse(res);
+  const start = await res.json();
+  io.err(`${s.bold("Sign in to Nexo")} ${s.dim("(Ctrl+C to cancel)")}`);
+  io.err(`Your code: ${s.bold(s.primary(start.userCode))}  ${s.dim("(check that the browser shows the same)")}`);
+  const opened = /^https:\/\//.test(start.verifyUrl) && (io.openUrl ?? openInBrowser)(start.verifyUrl);
+  io.err(opened ? s.dim(`Opening your browser. If it did not open, go to ${start.verifyUrl}`) : `Open this page to approve: ${start.verifyUrl}`);
+  io.err(s.dim(`${s.sym.busy} waiting for you to approve in the browser`));
+  const until = Date.now() + start.expiresInMs;
+  while (Date.now() < until) {
+    await new Promise((resolve3) => {
+      const t = setTimeout(resolve3, Math.max(1e3, start.intervalMs));
+      io.signal.addEventListener("abort", () => (clearTimeout(t), resolve3()), { once: true });
+    });
+    if (io.signal.aborted)
+      return null;
+    const r = await post("/v1/auth/device/poll", { deviceCode: start.deviceCode }).catch(() => null);
+    if (!r)
+      continue;
+    const body = await r.json().catch(() => ({}));
+    if (body.status === "done" && body.token)
+      return body.token;
+    if (body.status === "expired" || r.status === 410)
+      break;
+  }
+  io.err(`${s.error(s.sym.fail)} The sign-in was not approved in time. Run nexo login again.`);
+  return null;
+}
+function openInBrowser(url2) {
+  try {
+    const [cmd, args] = process.platform === "win32" ? ["rundll32.exe", ["url.dll,FileProtocolHandler", url2]] : process.platform === "darwin" ? ["open", [url2]] : ["xdg-open", [url2]];
+    const child = spawn3(cmd, args, { stdio: "ignore", detached: true, windowsHide: true });
+    child.on("error", () => {
+    });
+    child.unref();
+    return true;
+  } catch {
+    return false;
+  }
+}
 async function emailSignIn(io, apiUrl) {
   const { style: s } = io;
+  io.err(`${s.bold("Sign in to Nexo")} ${s.dim("(Ctrl+C to cancel)")}`);
+  io.err("Type your email address and press Enter:");
   const email3 = (await io.readLine(`${s.primary("\u203A")} Your email: `))?.trim();
   if (!email3)
     return null;
@@ -44274,6 +44326,7 @@ async function emailSignIn(io, apiUrl) {
     throw await errorFromResponse(started);
   io.err(s.dim(`  If ${email3} has a Nexo account, a six-digit code is on its way. No account yet? Sign up at https://usenexoai.com`));
   for (let tries = 0; tries < 3; tries++) {
+    io.err("Type the six-digit code from the email and press Enter:");
     const code = (await io.readLine(`${s.primary("\u203A")} Code from the email: `))?.replace(/\s+/g, "");
     if (!code)
       return null;
@@ -44336,7 +44389,7 @@ async function logout(io) {
 }
 
 // dist/statusline.js
-import { spawn as spawn3 } from "node:child_process";
+import { spawn as spawn4 } from "node:child_process";
 var TIMEOUT_MS2 = 2e3;
 var MAX_CHARS = 160;
 function runStatusLine(command, input2, cwd) {
@@ -44352,7 +44405,7 @@ function runStatusLine(command, input2, cwd) {
     };
     let child;
     try {
-      child = spawn3(command, { cwd, shell: true, windowsHide: true, stdio: ["pipe", "pipe", "ignore"] });
+      child = spawn4(command, { cwd, shell: true, windowsHide: true, stdio: ["pipe", "pipe", "ignore"] });
     } catch {
       return end(null);
     }
@@ -44656,7 +44709,7 @@ function skillsText(skills) {
 }
 
 // dist/notify.js
-import { spawn as spawn4 } from "node:child_process";
+import { spawn as spawn5 } from "node:child_process";
 import { join as join18 } from "node:path";
 var NOTIFY_AFTER_MS = 3e4;
 function notificationCommand(title, body, platform = process.platform) {
@@ -44686,7 +44739,7 @@ function notify(write2, title, body) {
   if (!cmd)
     return;
   try {
-    const child = spawn4(cmd[0], cmd.slice(1), { stdio: "ignore", detached: true, windowsHide: true });
+    const child = spawn5(cmd[0], cmd.slice(1), { stdio: "ignore", detached: true, windowsHide: true });
     child.on("error", () => {
     });
     child.unref();
@@ -46472,7 +46525,7 @@ Usage:
   nexo remote                    Take tasks from the Nexo app (Code) in this folder: they run here, and
                                  every file change and command is approved on your phone
   nexo models                    The models you can put in a team (nexo run --team)
-  nexo login                     Sign in with your email and the code it receives (--token to paste a token)
+  nexo login                     Sign in: approve in your browser (--email for a code by email, --token to paste one)
   nexo auth status               Show login and this month's usage against your cap
   nexo logout                    Revoke the token and remove it from this machine
   nexo update                    Install the latest Nexo Code (npm install -g nexo-code@latest)
@@ -46575,6 +46628,7 @@ async function run2(argv, io) {
       output: { type: "string" },
       "api-url": { type: "string" },
       token: { type: "boolean" },
+      email: { type: "boolean" },
       "no-color": { type: "boolean" },
       debug: { type: "boolean" }
     }
@@ -46672,6 +46726,8 @@ async function run2(argv, io) {
       io.err(`${io.style.error(io.style.sym.fail)} Could not run npm. Install the update yourself: npm install -g ${PACKAGE}@latest`);
       return 1;
     }
+    if (npm.status === 0 && process.platform === "win32")
+      dropBlockedLauncher();
     return npm.status ?? 1;
   }
   if (cmd === "remote") {
@@ -46687,7 +46743,7 @@ async function run2(argv, io) {
     return remote(io, budget);
   }
   if (cmd === "login")
-    return login(io, { ...values["api-url"] ? { apiUrl: values["api-url"] } : {}, ...values.token ? { token: true } : {} });
+    return login(io, { ...values["api-url"] ? { apiUrl: values["api-url"] } : {}, ...values.token ? { token: true } : {}, ...values.email ? { email: true } : {} });
   if (cmd === "models")
     return listModels(io);
   if (cmd === "logout")
@@ -46764,6 +46820,17 @@ async function headless(io, words, format, yes) {
     line2({ type: "result", exitCode: code, answer: text2.trim(), ...result ?? { outcome: code === 0 ? "done" : "failed", filesChanged: [], costMicros: 0 } });
   return code;
 }
+function dropBlockedLauncher() {
+  try {
+    const policy = spawnSync2("powershell.exe", ["-NoProfile", "-Command", "Get-ExecutionPolicy"], { encoding: "utf8", windowsHide: true }).stdout.trim();
+    if (policy !== "Restricted" && policy !== "AllSigned")
+      return;
+    const prefix = spawnSync2("npm.cmd", ["prefix", "-g"], { encoding: "utf8", shell: true, windowsHide: true }).stdout.trim();
+    if (prefix)
+      rmSync(join19(prefix, "nexo.ps1"), { force: true });
+  } catch {
+  }
+}
 var isMain = true;
 if (isMain) {
   const settings = loadSettings(configDir(process.env));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nexo-code",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "Nexo Code: an AI coding agent for your terminal. Sign in with your Nexo account.",
   "homepage": "https://usenexoai.com",
   "license": "UNLICENSED",