nexo-code 0.1.2 → 0.1.4

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;
@@ -14690,7 +14690,7 @@ import { mkdir, readFile, writeFile } from "node:fs/promises";
 import { join } from "node:path";
 
 // dist/version.js
-var VERSION = "0.1.2";
+var VERSION = "0.1.4";
 
 // dist/update.js
 var PACKAGE = "nexo-code";
@@ -35138,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;
@@ -35894,6 +35896,7 @@ function formatCost(micros2) {
   const shown = micros2 === 0 ? "0%" : pct < 0.1 ? "under 0.1%" : pct < 10 ? `${pct.toFixed(1)}%` : `${Math.round(pct)}%`;
   return `${shown} of your ${shareOf.label}`;
 }
+var tierLabel = (tier) => tier === "strong" ? "Strong" : tier === "cheap" ? "Auto" : tier;
 function formatUsd(micros2) {
   const dollars = micros2 / 1e6;
   return dollars !== 0 && Math.abs(dollars) < 0.01 ? `$${dollars.toFixed(4)}` : `$${dollars.toFixed(2)}`;
@@ -37269,7 +37272,7 @@ function summaryLine(s, r, opts = {}) {
   const cached2 = r.tokens.cacheRead + r.tokens.cacheWrite;
   const parts = [
     ...opts.quiet && r.outcome === "done" ? [] : [status],
-    s.accent(r.tier),
+    s.accent(tierLabel(r.tier)),
     `${formatTokens(r.tokens.input + cached2)} in${cached2 ? ` (${formatTokens(cached2)} cached)` : ""} / ${formatTokens(r.tokens.output)} out`,
     formatCost(r.costMicros),
     `${(r.elapsedMs / 1e3).toFixed(1)}s`
@@ -37503,7 +37506,7 @@ async function runCascade(task2, deps, opts, state = newCascadeState()) {
   }
   const reason = stoppedEarly ? "retry_limit" : "checks_failed";
   state.escalated = reason;
-  deps.log(s.accent(`${s.sym.busy} escalating to the strong model (${stoppedEarly ? "cheap attempt stopped early and checks fail" : "checks failed"})`));
+  deps.log(s.accent(`${s.sym.busy} switching to the Strong model (${stoppedEarly ? "the first try stopped early and checks fail" : "checks failed"})`));
   let second;
   try {
     second = await attempt(escalationPrompt(task2, first, checks), "strong", reason);
@@ -37514,7 +37517,7 @@ async function runCascade(task2, deps, opts, state = newCascadeState()) {
       throw err;
     attempts.pop();
     state.escalated = null;
-    deps.log(s.warning(`${s.sym.warn} ${err.message} Trying again on the cheap model with the failure output.`));
+    deps.log(s.warning(`${s.sym.warn} ${err.message} Trying again with Auto and the failure output.`));
     second = await attempt(escalationPrompt(task2, first, checks), "cheap");
   }
   const secondStopped = stoppedAt(second.outcome);
@@ -37554,7 +37557,7 @@ function cascadeLine(s, r, state) {
   const testFiles = files.filter((f) => TEST_FILE.test(f));
   const label = LABEL[r.outcome];
   const status = r.outcome === "passed" || r.outcome === "done_unchecked" ? s.success(`${s.sym.ok} ${label}`) : r.outcome === "failed" || r.outcome === "checks_failed" ? s.error(`${s.sym.fail} ${label}`) : s.warning(`${s.sym.warn} ${label}`);
-  const tiers = ran.map((a) => a.tier).join("\u2192") || r.attempts[0]?.tier || "cheap";
+  const tiers = ran.map((a) => tierLabel(a.tier)).join("\u2192") || tierLabel(r.attempts[0]?.tier ?? "cheap");
   const why2 = r.escalated ? ` (escalated: ${r.escalated.replace("_", " ")})` : state?.firstReason ? ` (${state.firstReason.replace("_", " ")})` : "";
   const parts = [
     status,
@@ -37665,6 +37668,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
@@ -44247,7 +44251,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)) {
@@ -44261,6 +44266,50 @@ 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)")}`);
@@ -44341,7 +44390,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) {
@@ -44357,7 +44406,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);
     }
@@ -44661,7 +44710,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) {
@@ -44691,7 +44740,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();
@@ -44759,7 +44808,7 @@ function header(s, opts) {
   const logo = logoRows(opts);
   const text2 = [
     `${s.bold("Nexo Code")} ${s.dim(`v${opts.version}`)}`,
-    s.dim(`cheap model first ${s.sym.dot} /strong for hard problems ${s.sym.dot} /help`),
+    s.dim(`Auto picks the model ${s.sym.dot} /strong for hard problems ${s.sym.dot} /help`),
     s.dim(opts.root),
     ""
   ];
@@ -45212,8 +45261,9 @@ function ttyLineReader(s, color, stdin = process.stdin, out = process.stderr, op
       }
       draw();
     };
+    const height = renderBox(s, state, columns(), status, "").lines.length;
     out.write(`
-${CSI}?2004h`);
+${CSI}?2004h${CSI}999B${height > 1 ? `${CSI}${height - 1}A` : ""}\r`);
     out.on?.("resize", draw);
     stdin.setRawMode(true);
     stdin.resume();
@@ -45430,7 +45480,7 @@ async function chat(io, opts) {
   let team = null;
   if (!checks.length)
     io.err(s.dim(`  Tip: add checks to ${PROJECT_FILE} so changes are tested.`));
-  const modelName = () => pinned?.name ?? tier;
+  const modelName = () => pinned?.name ?? tierLabel(tier);
   let customStatus = null;
   const refreshStatus = async () => {
     const command = io.settings?.statusLine;
@@ -45495,7 +45545,7 @@ async function chat(io, opts) {
   if (io.settings?.statusLine)
     await refreshStatus();
   for (; ; ) {
-    const prefix = `${mode === "plan" ? s.warning("plan ") : ""}${pinned ? s.accent(`${pinned.name} `) : tier === "strong" ? s.accent("strong ") : ""}`;
+    const prefix = `${mode === "plan" ? s.warning("plan ") : ""}${pinned ? s.accent(`${pinned.name} `) : tier === "strong" ? s.accent("Strong ") : ""}`;
     const line2 = await io.readLine(`
 ${prefix}${s.primary("\u203A")} `, statusLine(), () => {
       mode = nextMode(mode);
@@ -45537,7 +45587,7 @@ ${prefix}${s.primary("\u203A")} `, statusLine(), () => {
     if (command === "/strong") {
       pinned = null;
       tier = tier === "strong" ? "cheap" : "strong";
-      io.err(s.dim(`${s.sym.dot} Using the ${tier} model${tier === "strong" ? " (costs more; /strong again to switch back)" : ""}.`));
+      io.err(s.dim(`${s.sym.dot} ${tier === "strong" ? "Using the Strong model (uses more of your plan; /strong again to go back to Auto)" : "Back to Auto: Nexo picks the model"}.`));
       continue;
     }
     if (verb === "/theme" || command === "/vim" || verb === "/statusline") {
@@ -46105,7 +46155,7 @@ ${answer}` : ""}`
         if (err instanceof NexoError && err.code === "RATE_LIMITED") {
           const quota = (err.retryAfterMs ?? 0) > QUOTA_WAIT_MS;
           const wait = err.retryAfterMs ? formatWait(err.retryAfterMs) : "a minute";
-          io.err(s.dim(quota ? `  The ${tier} model's usage limit is used up for ${wait}.${tier === "strong" ? " Type /strong to switch back to the cheap model." : ""}` : `  Wait ${wait} and send your message again.`));
+          io.err(s.dim(quota ? `  Your ${tier === "strong" ? "Strong model " : ""}limit is used up for ${wait}.${tier === "strong" ? " Type /strong to go back to Auto." : ""}` : `  Wait ${wait} and send your message again.`));
         }
         if (!(err instanceof NexoError))
           throw err;
@@ -46477,7 +46527,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)
@@ -46580,6 +46630,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,7 +46723,7 @@ async function run2(argv, io) {
     });
   }
   if (cmd === "update") {
-    const npm = spawnSync2(process.platform === "win32" ? "npm.cmd" : "npm", ["install", "-g", `${PACKAGE}@latest`], { stdio: "inherit", shell: process.platform === "win32" });
+    const npm = process.platform === "win32" ? spawnSync2(`npm.cmd install -g --prefer-online ${PACKAGE}@latest`, { stdio: "inherit", shell: true }) : spawnSync2("npm", ["install", "-g", "--prefer-online", `${PACKAGE}@latest`], { stdio: "inherit" });
     if (npm.error) {
       io.err(`${io.style.error(io.style.sym.fail)} Could not run npm. Install the update yourself: npm install -g ${PACKAGE}@latest`);
       return 1;
@@ -46693,8 +46744,10 @@ async function run2(argv, io) {
     }
     return remote(io, budget);
   }
+  if (cmd === "login" && process.platform === "win32" && true)
+    dropBlockedLauncher();
   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")
@@ -46776,7 +46829,7 @@ function dropBlockedLauncher() {
     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();
+    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 {

package/package.json

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