@autohq/cli 0.1.234 → 0.1.235

package/dist/agent-bridge.js

@@ -23340,7 +23340,7 @@ Object.assign(lookup, {
 // package.json
 var package_default = {
   name: "@autohq/cli",
-  version: "0.1.234",
+  version: "0.1.235",
   license: "SEE LICENSE IN README.md",
   publishConfig: {
     access: "public"

package/dist/index.js

@@ -22339,7 +22339,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@autohq/cli",
-      version: "0.1.234",
+      version: "0.1.235",
       license: "SEE LICENSE IN README.md",
       publishConfig: {
         access: "public"
@@ -28598,6 +28598,12 @@ import { Box as Box13, Text as Text14, useApp as useApp2, useInput as useInput4,
 import TextInput3 from "ink-text-input";
 import { useCallback as useCallback2, useEffect as useEffect3, useMemo as useMemo3, useRef as useRef2, useState as useState3 } from "react";
 import { Fragment as Fragment3, jsx as jsx14, jsxs as jsxs12 } from "react/jsx-runtime";
+function shouldAutoStartBrowserLogin(input) {
+  return !input.startedServerUrls.has(browserLoginServerKey(input.serverUrl));
+}
+function browserLoginServerKey(serverUrl) {
+  return serverUrl.trim();
+}
 function resourceNavItem(input) {
   const definition = PROJECT_RESOURCE_TUI_DEFINITIONS_BY_SECTION.get(
     input.section
@@ -28661,11 +28667,18 @@ function inspectableResourceForSelection(input) {
   const selected = selectedNamedResourceForSection(input);
   return definition && selected ? { kind: definition.kind, name: selected.metadata.name, spec: null } : null;
 }
-function HomeView({ apiUrl, notice, returnToAgent }) {
+function HomeView({
+  apiUrl,
+  browserLoginAutoStartedServers,
+  configPath,
+  notice,
+  returnToAgent
+}) {
   const client = useApiClient();
   const queryClient = useQueryClient2();
   const { exit } = useApp2();
   const { stdout } = useStdout7();
+  const fallbackBrowserLoginAutoStartedServers = useRef2(/* @__PURE__ */ new Set());
   const [termSize, setTermSize] = useState3({
     width: stdout?.columns ?? 120,
     height: stdout?.rows ?? 24
@@ -29856,6 +29869,8 @@ function HomeView({ apiUrl, notice, returnToAgent }) {
     return /* @__PURE__ */ jsx14(
       BrowserLoginPrompt,
       {
+        autoStartedServerUrls: browserLoginAutoStartedServers ?? fallbackBrowserLoginAutoStartedServers.current,
+        configPath,
         error: authErrorMessage,
         height: termHeight,
         serverUrl: loginServerUrl
@@ -30324,6 +30339,8 @@ function shortSessionId2(id) {
   return tail ? tail.slice(0, 12) : id.slice(0, 12);
 }
 function BrowserLoginPrompt({
+  autoStartedServerUrls,
+  configPath,
   error: error51,
   height,
   serverUrl
@@ -30331,41 +30348,59 @@ function BrowserLoginPrompt({
   const queryClient = useQueryClient2();
   const { exit } = useApp2();
   const [loginError, setLoginError] = useState3(null);
-  const [status, setStatus] = useState3(
-    "opening"
-  );
+  const [status, setStatus] = useState3("idle");
+  const loginInFlight = useRef2(false);
+  const mounted = useRef2(true);
   useEffect3(() => {
-    let cancelled = false;
-    async function runBrowserLogin() {
-      try {
-        setStatus("opening");
-        await login({
-          options: { apiUrl: serverUrl },
-          fetch,
-          writeOutput: () => {
-          }
-        });
-        if (cancelled) return;
-        setStatus("done");
-        await queryClient.invalidateQueries();
-      } catch (err) {
-        if (!cancelled) {
-          setLoginError(err instanceof Error ? err.message : String(err));
+    return () => {
+      mounted.current = false;
+    };
+  }, []);
+  const startBrowserLogin = useCallback2(async () => {
+    if (loginInFlight.current) {
+      return;
+    }
+    loginInFlight.current = true;
+    setLoginError(null);
+    setStatus("waiting");
+    try {
+      await login({
+        options: { apiUrl: serverUrl },
+        env: process.env,
+        fetch,
+        configPath,
+        writeOutput: () => {
         }
+      });
+      if (!mounted.current) {
+        return;
       }
+      setStatus("done");
+      await queryClient.invalidateQueries();
+    } catch (err) {
+      if (!mounted.current) {
+        return;
+      }
+      setStatus("idle");
+      setLoginError(err instanceof Error ? err.message : String(err));
+    } finally {
+      loginInFlight.current = false;
     }
-    void runBrowserLogin();
-    return () => {
-      cancelled = true;
-    };
-  }, [queryClient, serverUrl]);
+  }, [configPath, queryClient, serverUrl]);
   useEffect3(() => {
-    if (status === "opening") {
-      setStatus("waiting");
-    }
-  }, [status]);
-  useInput4((input) => {
+    if (shouldAutoStartBrowserLogin({
+      serverUrl,
+      startedServerUrls: autoStartedServerUrls
+    })) {
+      autoStartedServerUrls.add(browserLoginServerKey(serverUrl));
+      void startBrowserLogin();
+    }
+  }, [autoStartedServerUrls, serverUrl, startBrowserLogin]);
+  useInput4((input, key) => {
     if (input === "q") exit();
+    if ((key.return || input === "l") && status !== "waiting") {
+      void startBrowserLogin();
+    }
   });
   return /* @__PURE__ */ jsxs12(
     Box13,
@@ -30379,14 +30414,29 @@ function BrowserLoginPrompt({
       children: [
         /* @__PURE__ */ jsx14(Text14, { color: "yellow", bold: true, children: "Login required" }),
         /* @__PURE__ */ jsx14(Text14, { children: error51 }),
-        /* @__PURE__ */ jsxs12(Box13, { marginTop: 1, flexDirection: "column", alignItems: "center", children: [
+        /* @__PURE__ */ jsx14(Box13, { marginTop: 1, flexDirection: "column", alignItems: "center", children: status === "waiting" ? /* @__PURE__ */ jsxs12(Fragment3, { children: [
           /* @__PURE__ */ jsxs12(Text14, { children: [
             "Opening ",
             /* @__PURE__ */ jsx14(Text14, { color: "cyan", children: serverUrl }),
             " in your browser."
           ] }),
           /* @__PURE__ */ jsx14(Text14, { dimColor: true, children: "Complete authorization there to return to Auto." })
-        ] }),
+        ] }) : status === "done" ? /* @__PURE__ */ jsxs12(Fragment3, { children: [
+          /* @__PURE__ */ jsxs12(Text14, { children: [
+            "Browser authorization completed for",
+            " ",
+            /* @__PURE__ */ jsx14(Text14, { color: "cyan", children: serverUrl }),
+            "."
+          ] }),
+          /* @__PURE__ */ jsx14(Text14, { dimColor: true, children: "Refreshing Auto data." })
+        ] }) : /* @__PURE__ */ jsxs12(Fragment3, { children: [
+          /* @__PURE__ */ jsxs12(Text14, { children: [
+            "Browser login is ready for ",
+            /* @__PURE__ */ jsx14(Text14, { color: "cyan", children: serverUrl }),
+            "."
+          ] }),
+          /* @__PURE__ */ jsx14(Text14, { dimColor: true, children: "Press Enter to open it again." })
+        ] }) }),
         status === "waiting" && /* @__PURE__ */ jsx14(Box13, { marginTop: 1, children: /* @__PURE__ */ jsx14(Spinner, { label: "waiting for browser authorization\u2026" }) }),
         status === "done" && /* @__PURE__ */ jsxs12(Box13, { marginTop: 1, flexDirection: "column", alignItems: "center", children: [
           /* @__PURE__ */ jsx14(Text14, { color: "green", children: "Logged in." }),
@@ -30394,9 +30444,9 @@ function BrowserLoginPrompt({
         ] }),
         loginError && /* @__PURE__ */ jsxs12(Box13, { marginTop: 1, flexDirection: "column", alignItems: "center", children: [
           /* @__PURE__ */ jsx14(Text14, { color: "red", children: loginError }),
-          /* @__PURE__ */ jsx14(Text14, { dimColor: true, children: "Press q to quit." })
+          /* @__PURE__ */ jsx14(Text14, { dimColor: true, children: "Press Enter to retry, or q to quit." })
         ] }),
-        !loginError && /* @__PURE__ */ jsx14(Box13, { marginTop: 1, children: /* @__PURE__ */ jsx14(Text14, { dimColor: true, children: "Press q to quit." }) })
+        !loginError && status !== "done" && /* @__PURE__ */ jsx14(Box13, { marginTop: 1, children: /* @__PURE__ */ jsx14(Text14, { dimColor: true, children: "Press Enter to retry, or q to quit." }) })
       ]
     }
   );
@@ -30735,12 +30785,15 @@ async function launch(opts) {
   );
   let returnToAgent;
   let notice;
+  const browserLoginAutoStartedServers = /* @__PURE__ */ new Set();
   try {
     while (true) {
       const { waitUntilExit } = render(
         providers(
           React.createElement(HomeView, {
             apiUrl,
+            browserLoginAutoStartedServers,
+            configPath: opts.configPath,
             notice,
             returnToAgent
           })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autohq/cli",
-  "version": "0.1.234",
+  "version": "0.1.235",
   "license": "SEE LICENSE IN README.md",
   "publishConfig": {
     "access": "public"