@nurix/nustack 0.26.1 → 0.26.3

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/package.json

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