@stackable-labs/cli-app-extension 1.99.2 → 1.100.1

package/dist/index.js

@@ -3732,7 +3732,7 @@ var performCLIOAuthFlow = async ({ dashboardUrl, adminApiBaseUrl }) => {
   await writeAuthState(authState);
   return { authState, loginUrl };
 };
-var AuthLogin = ({ dashboardUrl, adminApiBaseUrl }) => {
+var AuthLogin = ({ dashboardUrl, adminApiBaseUrl, reason, onSuccess, onError }) => {
   const { exit } = useApp();
   const [state, setState] = useState("waiting");
   const [loginUrl, setLoginUrl] = useState("");
@@ -3751,12 +3751,15 @@ var AuthLogin = ({ dashboardUrl, adminApiBaseUrl }) => {
         setUserIdLabel(result.authState.userId);
         setOrgIdLabel(result.authState.orgId);
         setState("success");
+        onSuccess?.(result.authState);
       } catch (err) {
         if (cancelled) {
           return;
         }
-        setErrorMessage(err instanceof Error ? err.message : String(err));
+        const error = err instanceof Error ? err : new Error(String(err));
+        setErrorMessage(error.message);
         setState("error");
+        onError?.(error);
       }
       exit();
     };
@@ -3766,16 +3769,19 @@ var AuthLogin = ({ dashboardUrl, adminApiBaseUrl }) => {
     };
   }, []);
   return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx(Banner, {}),
+    !reason && /* @__PURE__ */ jsx(Banner, {}),
     /* @__PURE__ */ jsxs(StepShell, { title: "Authenticate with Stackable", children: [
-      state === "waiting" && /* @__PURE__ */ jsxs(Box, { flexDirection: "column", gap: 1, children: [
-        /* @__PURE__ */ jsxs(Box, { gap: 1, children: [
-          /* @__PURE__ */ jsx(Text, { color: "cyan", children: /* @__PURE__ */ jsx(Spinner5, { type: "dots" }) }),
-          /* @__PURE__ */ jsx(Text, { children: "Waiting for browser authentication..." })
-        ] }),
-        loginUrl && /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
-          "  ",
-          loginUrl
+      state === "waiting" && /* @__PURE__ */ jsxs(Fragment, { children: [
+        reason && /* @__PURE__ */ jsx(Box, { marginBottom: 1, children: /* @__PURE__ */ jsx(Text, { color: "yellow", children: reason === "expired" ? "Session expired \u2014 re-authenticating before continuing\u2026" : "Not signed in \u2014 opening browser to authenticate\u2026" }) }),
+        /* @__PURE__ */ jsxs(Box, { flexDirection: "column", gap: 1, children: [
+          /* @__PURE__ */ jsxs(Box, { gap: 1, children: [
+            /* @__PURE__ */ jsx(Text, { color: "cyan", children: /* @__PURE__ */ jsx(Spinner5, { type: "dots" }) }),
+            /* @__PURE__ */ jsx(Text, { children: "Waiting for browser authentication..." })
+          ] }),
+          loginUrl && /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
+            "  ",
+            loginUrl
+          ] })
         ] })
       ] }),
       state === "success" && /* @__PURE__ */ jsxs(Box, { flexDirection: "column", gap: 1, children: [
@@ -3913,6 +3919,7 @@ var checkForUpdate = (currentVersion) => {
 var require2 = createRequire(import.meta.url);
 var { version } = require2("../package.json");
 checkForUpdate(version);
+var DASHBOARD_URL = process.env.ADMIN_DASHBOARD_URL ?? "https://admin.stackablelabs.com";
 var ensureToken = async () => {
   try {
     const token = await getToken();
@@ -3921,10 +3928,33 @@ var ensureToken = async () => {
   } catch (err) {
     const message = err instanceof Error ? err.message : String(err);
     const isExpired = message.toLowerCase().includes("expired");
-    render(
-      /* @__PURE__ */ jsx(AuthStatus, { state: isExpired ? "expired" : "not-logged-in" })
+    let recoveredState = null;
+    let flowError = null;
+    const instance = render(
+      /* @__PURE__ */ jsx(
+        AuthLogin,
+        {
+          dashboardUrl: DASHBOARD_URL,
+          adminApiBaseUrl: getAdminApiBaseUrl(),
+          reason: isExpired ? "expired" : "not-logged-in",
+          onSuccess: (authState) => {
+            recoveredState = authState;
+          },
+          onError: (err2) => {
+            flowError = err2;
+          }
+        }
+      )
     );
-    return null;
+    await instance.waitUntilExit();
+    if (flowError || !recoveredState) {
+      return null;
+    }
+    return {
+      token: recoveredState.token,
+      userId: recoveredState.userId,
+      orgId: recoveredState.orgId
+    };
   }
 };
 program.name("stackable-app-extension").description("Stackable Labs - App Extension developer CLI").version(version);
@@ -4007,7 +4037,6 @@ program.command("dev" /* DEV */).description("Start dev servers with a public tu
     { exitOnCtrlC: false }
   );
 });
-var DASHBOARD_URL = process.env.ADMIN_DASHBOARD_URL ?? "https://admin.stackablelabs.com";
 var auth = program.command("auth").description("Manage CLI authentication");
 auth.command("login").description("Authenticate with Stackable via browser").action(async () => {
   render(/* @__PURE__ */ jsx(AuthLogin, { dashboardUrl: DASHBOARD_URL, adminApiBaseUrl: getAdminApiBaseUrl() }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stackable-labs/cli-app-extension",
-  "version": "1.99.2",
+  "version": "1.100.1",
   "type": "module",
   "private": false,
   "bin": {