@nurix/nustack 0.26.0 → 0.26.2

package/dist/commands/login.js

@@ -1,10 +1,18 @@
 import * as p from "@clack/prompts";
-import { resolveNuStackUrl } from "../lib/nustack_client.js";
+import { resolveNuStackOrigin } from "../lib/nustack_client.js";
 import { launchBrowser } from "../lib/browser_opener.js";
 import { selectCredentialStore } from "../lib/credential_store.js";
 import { isInteractive } from "../lib/interactive.js";
 import { ensureAccessToken, ENV_TOKEN_VARIABLE, envToken, loginWithLoopback, loginWithPastedCode, prepareLogin, readStoredCredential, } from "../lib/auth_grant.js";
 import { isContractOrigin, nullUnlessOriginRefused, originMismatchError, refusedContractOrigin } from "../lib/origin_guard.js";
+function originOf(url) {
+    try {
+        return url ? new URL(url).origin : null;
+    }
+    catch {
+        return null;
+    }
+}
 async function readStdinLine() {
     return new Promise((resolve) => {
         let buffered = "";
@@ -96,7 +104,12 @@ export async function performDeviceLogin(baseUrl, _cwd = process.cwd(), flags =
         p.log.error(error instanceof Error ? error.message : String(error));
         return false;
     }
-    if (!flags.force && !flags.reauthorize) {
+    const heldOrigin = originOf((await readStoredCredential().catch(() => null))?.credential?.studioBaseUrl);
+    const isMoving = flags.isOriginStated === true && heldOrigin !== null && heldOrigin !== originOf(baseUrl);
+    if (isMoving) {
+        p.log.info(`This machine is signed in to ${heldOrigin}; signing in to ${originOf(baseUrl)} moves it there, and the desktop app shares the sign-in.`);
+    }
+    if (!flags.force && !flags.reauthorize && !isMoving) {
         const live = await ensureAccessToken().catch(nullUnlessOriginRefused);
         if (live) {
             p.log.success(`Signed in as ${live.userEmail || "this account"} — already signed in on this machine (use --force to sign in again).`);
@@ -140,9 +153,9 @@ export async function performDeviceLogin(baseUrl, _cwd = process.cwd(), flags =
     return true;
 }
 export async function runLogin(options, flags = {}) {
-    const baseUrl = resolveNuStackUrl(options);
+    const { url: baseUrl, source } = resolveNuStackOrigin(options, process.cwd());
     p.intro("nustack login");
-    const didLogin = await performDeviceLogin(baseUrl, process.cwd(), flags);
+    const didLogin = await performDeviceLogin(baseUrl, process.cwd(), { ...flags, isOriginStated: source === "flag" || source === "env" });
     if (!didLogin) {
         p.outro("Nothing was written.");
         process.exitCode = 1;

package/dist/lib/sync/client.js

@@ -18,7 +18,19 @@ const REQUEST_TIMEOUT_MS = 10_000;
 const MAX_PUSH_PASSES = 50;
 const MAX_PULL_PAGES = 500;
 const DEVICE_PROJECTION_FIELDS = ["origin", "type", "subject", "state", "outcome", "ownerAgentDefinitionId"];
-const outdatedMessage = (message) => `${message} — this CLI (${cliVersion()}) is behind the server. Update NuStack: ${UPGRADE_COMMAND}`;
+function releaseOf(version) {
+    const match = version ? /^v?(\d+)\.(\d+)/.exec(version.trim()) : null;
+    return match ? [Number(match[1]), Number(match[2])] : null;
+}
+export function outdatedMessage(message, serverVersion, clientVersion = cliVersion()) {
+    const client = releaseOf(clientVersion);
+    const server = releaseOf(serverVersion);
+    const isAhead = client !== null && server !== null && (client[0] > server[0] || (client[0] === server[0] && client[1] > server[1]));
+    if (isAhead) {
+        return `${message} — this CLI (${clientVersion}) is newer than the server (${serverVersion}); sync resumes once the server is updated, or install the server's release: npm i -g @nurix/nustack@${server[0]}.${server[1]}`;
+    }
+    return `${message} — this CLI (${clientVersion}) is behind the server. Update NuStack: ${UPGRADE_COMMAND}`;
+}
 async function request(url, init, bearer, timeoutMs) {
     try {
         await assertCredentialOrigin(url);
@@ -47,7 +59,8 @@ async function request(url, init, bearer, timeoutMs) {
     if (!response.ok) {
         const code = typeof body?.error?.code === "string" ? body.error.code : null;
         const detail = typeof body?.error?.message === "string" ? body.error.message : typeof body?.message === "string" ? body.message : `HTTP ${response.status}`;
-        return { ok: false, status: response.status, code, message: `${code ?? `HTTP ${response.status}`}: ${detail}` };
+        const serverVersion = typeof body?.error?.details?.minimumVersion === "string" ? body.error.details.minimumVersion : null;
+        return { ok: false, status: response.status, code, message: `${code ?? `HTTP ${response.status}`}: ${detail}`, serverVersion };
     }
     if (!body || body.data === undefined || body.data === null)
         return { ok: false, status: response.status, code: null, message: "the server answered no data" };
@@ -176,7 +189,7 @@ async function pushBatch(store, base, batch, bearer, summary, timeoutMs) {
     const now = Date.now();
     if (!answer.ok) {
         if (answer.status === 426) {
-            summary.outdated = outdatedMessage(answer.message);
+            summary.outdated = outdatedMessage(answer.message, answer.serverVersion);
             summary.lastError = summary.outdated;
             return false;
         }
@@ -311,7 +324,7 @@ export async function pullAll(store, globals, options = {}) {
                 withApplying(store.db, () => writeSyncState(store.db, "cursor", "0"));
                 continue;
             }
-            summary.lastError = answer.status === 426 ? outdatedMessage(answer.message) : answer.message;
+            summary.lastError = answer.status === 426 ? outdatedMessage(answer.message, answer.serverVersion) : answer.message;
             if (answer.status === 426)
                 summary.outdated = summary.lastError;
             return summary;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nurix/nustack",
-  "version": "0.26.0",
+  "version": "0.26.2",
   "description": "The nustack CLI — bootstrap NuStack services into a repo via the NuStack discovery plane.",
   "type": "module",
   "private": false,
@@ -34,10 +34,10 @@
     "@types/node": "^22.19.20",
     "typescript": "^5.7.2",
     "vitest": "^4.1.11",
-    "@nurix/contracts": "3.0.1",
-    "@nurix/harness": "0.0.0",
     "@nurix/nustack.studio": "0.0.0",
-    "@nurix/nustack.ui": "0.0.0"
+    "@nurix/contracts": "3.0.2",
+    "@nurix/nustack.ui": "0.0.0",
+    "@nurix/harness": "0.0.0"
   },
   "publishConfig": {
     "access": "public"