alink-cli 0.10.2 → 0.11.0

package/dist/ui.js

@@ -1378,7 +1378,7 @@ var require_react_development = __commonJS({
           var dispatcher = resolveDispatcher();
           return dispatcher.useReducer(reducer, initialArg, init);
         }
-        function useRef(initialValue) {
+        function useRef2(initialValue) {
           var dispatcher = resolveDispatcher();
           return dispatcher.useRef(initialValue);
         }
@@ -2172,7 +2172,7 @@ var require_react_development = __commonJS({
         exports.useLayoutEffect = useLayoutEffect2;
         exports.useMemo = useMemo4;
         exports.useReducer = useReducer;
-        exports.useRef = useRef;
+        exports.useRef = useRef2;
         exports.useState = useState3;
         exports.useSyncExternalStore = useSyncExternalStore;
         exports.useTransition = useTransition;
@@ -27090,7 +27090,7 @@ var require_backend = __commonJS({
                     return [initialArg, function() {
                     }];
                   },
-                  useRef: function useRef(initialValue) {
+                  useRef: function useRef2(initialValue) {
                     var hook = nextHook();
                     initialValue = null !== hook ? hook.memoizedState : {
                       current: initialValue
@@ -48305,8 +48305,8 @@ async function stopDaemon(timeoutMs = 1e4) {
   }
   rmSync(PID_FILE, { force: true });
 }
-function restartDaemon(options) {
-  stopDaemon();
+async function restartDaemon(options) {
+  await stopDaemon();
   return startDaemon(options);
 }
 function defaultMachineName() {
@@ -48356,6 +48356,19 @@ function quit(exit) {
   exit();
   process.exit(0);
 }
+var SPINNER_FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
+function Loading({ label }) {
+  const [frame, setFrame] = (0, import_react22.useState)(0);
+  (0, import_react22.useEffect)(() => {
+    const id = setInterval(() => setFrame((current) => current + 1), 80);
+    return () => clearInterval(id);
+  }, []);
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, { color: "cyan", children: [
+    SPINNER_FRAMES[frame % SPINNER_FRAMES.length],
+    " ",
+    label
+  ] });
+}
 function StatusBar({ running, status }) {
   const hub = status?.hub || loadConfig().hub;
   const loggedIn = isLoggedIn(hub);
@@ -48538,6 +48551,7 @@ function App2() {
   const [config, setConfig] = (0, import_react22.useState)(loadConfig());
   const [inputValue, setInputValue] = (0, import_react22.useState)("");
   const [settingsField, setSettingsField] = (0, import_react22.useState)(null);
+  const [reconnecting, setReconnecting] = (0, import_react22.useState)(false);
   const [authTick, setAuthTick] = (0, import_react22.useState)(0);
   (0, import_react22.useEffect)(() => {
     const id = setInterval(() => {
@@ -48554,7 +48568,7 @@ function App2() {
       items.push({ label: "\u542F\u52A8 daemon", value: "start" });
     } else {
       items.push({ label: "\u505C\u6B62 daemon", value: "stop" });
-      items.push({ label: "\u91CD\u542F daemon", value: "restart" });
+      items.push({ label: "\u91CD\u65B0\u8FDE\u63A5 AgentLink", value: "restart" });
     }
     items.push({ label: "\u67E5\u770B\u72B6\u6001\u8BE6\u60C5", value: "status" });
     items.push({ label: loggedIn ? "\u9000\u51FA\u8D26\u53F7" : "\u767B\u5F55\u8D26\u53F7", value: loggedIn ? "logout" : "login" });
@@ -48570,7 +48584,7 @@ function App2() {
     if (selectedIndex >= menuItems.length) setSelectedIndex(0);
   }, [menuItems, selectedIndex]);
   use_input_default((input, key) => {
-    if (view !== "menu") return;
+    if (view !== "menu" || reconnecting) return;
     if (key.upArrow || input === "k") {
       let next = selectedIndex;
       do {
@@ -48672,7 +48686,7 @@ function App2() {
       }
     }
   }
-  function handleConfirm() {
+  async function handleConfirm() {
     if (!confirmAction) return;
     const cfg = loadConfig();
     if (confirmAction.type === "stop") {
@@ -48688,18 +48702,23 @@ function App2() {
         setConfirmAction(null);
         return;
       }
+      setView("menu");
+      setConfirmAction(null);
+      setReconnecting(true);
       try {
-        const pid = restartDaemon({
+        const pid = await restartDaemon({
           hub: cfg.hub,
           credential,
           cwd: cfg.dir,
           approval: cfg.approval,
           approvalRenotifyMin: cfg.approvalRenotifyMin
         });
-        setNotice(`daemon \u5DF2\u91CD\u542F (PID ${pid})`);
+        setNotice(`AgentLink \u5DF2\u5F00\u59CB\u91CD\u65B0\u8FDE\u63A5 (PID ${pid})`);
         setRunning(true);
       } catch (err) {
-        setNotice(`\u91CD\u542F\u5931\u8D25: ${err instanceof Error ? err.message : String(err)}`);
+        setNotice(`\u91CD\u65B0\u8FDE\u63A5\u5931\u8D25: ${err instanceof Error ? err.message : String(err)}`);
+      } finally {
+        setReconnecting(false);
       }
     } else if (confirmAction.type === "logout") {
       stopDaemon().catch(() => void 0);
@@ -48719,7 +48738,7 @@ function App2() {
         return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
           ConfirmDialog,
           {
-            title: confirmAction?.type === "stop" ? "\u786E\u5B9A\u8981\u505C\u6B62 daemon \u5417\uFF1F" : confirmAction?.type === "restart" ? "\u786E\u5B9A\u8981\u91CD\u542F daemon \u5417\uFF1F" : "\u786E\u5B9A\u8981\u9000\u51FA\u8D26\u53F7\u5417\uFF1F\u9000\u51FA\u540E\u4F1A\u505C\u6B62 daemon\u3002",
+            title: confirmAction?.type === "stop" ? "\u786E\u5B9A\u8981\u505C\u6B62 daemon \u5417\uFF1F" : confirmAction?.type === "restart" ? "\u786E\u5B9A\u8981\u91CD\u65B0\u8FDE\u63A5 AgentLink \u5417\uFF1F" : "\u786E\u5B9A\u8981\u9000\u51FA\u8D26\u53F7\u5417\uFF1F\u9000\u51FA\u540E\u4F1A\u505C\u6B62 daemon\u3002",
             onConfirm: handleConfirm,
             onCancel: () => {
               setView("menu");
@@ -48770,6 +48789,7 @@ function App2() {
         return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(MachinesView, { onDone: () => setView("menu") });
       case "menu":
       default:
+        if (reconnecting) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Loading, { label: "\u6B63\u5728\u91CD\u65B0\u8FDE\u63A5 AgentLink..." });
         return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box_default, { flexDirection: "column", children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Menu, { items: menuItems, selectedIndex }) });
     }
   }
@@ -48900,86 +48920,33 @@ function LoginView({
   onCancel,
   setNotice
 }) {
-  const [stage, setStage] = (0, import_react22.useState)("identifier");
-  const [identifier, setIdentifier] = (0, import_react22.useState)("");
-  const [inputVal, setInputVal] = (0, import_react22.useState)("");
   const [error, setError] = (0, import_react22.useState)("");
+  const started = (0, import_react22.useRef)(false);
+  (0, import_react22.useEffect)(() => {
+    if (started.current) return;
+    started.current = true;
+    void runDetachedScript(["login", "--hub", hub]).then((code) => {
+      if (code === 0) {
+        setNotice("\u767B\u5F55\u6210\u529F\uFF0C\u8FD9\u53F0\u7535\u8111\u5DF2\u52A0\u5165\u8D26\u53F7\u3002");
+        onDone();
+      } else {
+        setError(`\u767B\u5F55\u6D41\u7A0B\u5F02\u5E38\u7ED3\u675F\uFF08\u9000\u51FA\u7801 ${code}\uFF09\u3002`);
+      }
+    });
+  }, [hub]);
   use_input_default((input, key) => {
-    if (stage !== "error") return;
-    if (key.return) {
-      setError("");
-      setInputVal("");
-      setStage("password");
-    } else if (key.escape || key.ctrl && input === "c") {
-      onCancel();
-    }
+    if (error && (key.escape || key.ctrl && input === "c")) onCancel();
   });
-  async function submit(id, pw) {
-    setStage("submitting");
-    try {
-      const { hostname: hostname2 } = await import("node:os");
-      const account = await import(new URL("../bin/agentlink-account.js", import.meta.url).href);
-      const config = await account.loadAgentLinkAccountConfig(hub);
-      const result = await account.registerAgentLinkAccountMachine({
-        hub,
-        config,
-        identifier: id,
-        password: pw,
-        machineName: hostname2()
-      });
-      saveCredential(result.credential, hub);
-      if (result.jwt) saveSessionJwt(result.jwt, hub);
-      setNotice("\u767B\u5F55\u6210\u529F\uFF0C\u8FD9\u53F0\u7535\u8111\u5DF2\u52A0\u5165\u8D26\u53F7\u3002");
-      onDone();
-    } catch (err) {
-      setError(err instanceof Error ? err.message : String(err));
-      setStage("error");
-    }
-  }
-  if (stage === "submitting") {
-    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: "cyan", children: "\u23F3 \u6B63\u5728\u767B\u5F55\u5E76\u6CE8\u518C\u8FD9\u53F0\u673A\u5668..." });
-  }
-  if (stage === "error") {
+  if (error) {
     return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box_default, { flexDirection: "column", borderStyle: "round", borderColor: "red", paddingX: 1, children: [
       /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, { color: "redBright", children: [
         "\u2716 \u767B\u5F55\u5931\u8D25\uFF1A",
         error
       ] }),
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: "gray", children: "Enter \u91CD\u8BD5 \xB7 Esc \u8FD4\u56DE\u83DC\u5355" })
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: "gray", children: "Esc \u8FD4\u56DE\u83DC\u5355" })
     ] });
   }
-  if (stage === "password") {
-    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-      SimpleInput,
-      {
-        label: "\u5BC6\u7801\uFF1A",
-        value: inputVal,
-        mask: true,
-        onChange: setInputVal,
-        onSubmit: () => {
-          const pw = inputVal;
-          setInputVal("");
-          void submit(identifier, pw);
-        },
-        onCancel
-      }
-    );
-  }
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-    SimpleInput,
-    {
-      label: "\u8D26\u53F7\uFF08\u7528\u6237\u540D\u6216\u90AE\u7BB1\uFF09\uFF1A",
-      value: inputVal,
-      onChange: setInputVal,
-      onSubmit: () => {
-        if (!inputVal.trim()) return;
-        setIdentifier(inputVal.trim());
-        setInputVal("");
-        setStage("password");
-      },
-      onCancel
-    }
-  );
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: "cyan", children: "\u23F3 \u8BF7\u5728\u6D4F\u89C8\u5668\u5B8C\u6210 GitHub \u767B\u5F55..." });
 }
 function saveSessionJwt(jwt, hub) {
   const sessionFile = join2(STATE_DIR, "session");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alink-cli",
-  "version": "0.10.2",
+  "version": "0.11.0",
   "description": "一条命令把工作机接入 AgentLink，随时随地遥控本机的编码 agent。One command to link your machine to AgentLink and control your coding agents from anywhere.",
   "keywords": [
     "acp",
@@ -11,7 +11,7 @@
     "coding-agent",
     "remote-control"
   ],
-  "homepage": "https://github.com/baichen99/agentlink#readme",
+  "homepage": "https://link.harmopath.com/marketing",
   "bugs": "https://github.com/baichen99/agentlink/issues",
   "license": "MIT",
   "repository": {