alink-cli 0.11.6 → 0.11.7

package/dist/ui.js

@@ -48138,6 +48138,11 @@ var DAEMON_LOCK_FILE = join(
   "userdata",
   "daemon.lock"
 );
+function hubConnectionStatus(running, status, expectedHub) {
+  if (!running) return "\u672A\u8FDE\u63A5";
+  if (expectedHub && typeof status?.hub === "string" && normalizeHub(status.hub) !== normalizeHub(expectedHub)) return "\u672A\u8FDE\u63A5";
+  return status?.hubConnected ? "\u5DF2\u8FDE\u63A5" : "\u8FDE\u63A5\u4E2D";
+}
 function normalizeHub(hub) {
   const url = new URL(hub);
   if (url.protocol === "http:") url.protocol = "ws:";
@@ -48349,9 +48354,6 @@ function loadConfig() {
     };
   }
 }
-function saveConfig(config) {
-  writeFileSync2(CONFIG_FILE, JSON.stringify(config, null, 2));
-}
 function quit(exit) {
   exit();
   process.exit(0);
@@ -48374,6 +48376,7 @@ function StatusBar({ running, status }) {
   const loggedIn = isLoggedIn(hub);
   const upTime = running && status?.startedAt ? formatDuration(Date.now() - status.startedAt) : void 0;
   const machineTag = status?.machineId ? status.machineId.slice(-6) : void 0;
+  const hubStatus = hubConnectionStatus(running, status, hub);
   return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box_default, { flexDirection: "column", borderStyle: "round", borderColor: "cyan", paddingX: 1, marginBottom: 1, children: [
     /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { bold: true, color: "cyanBright", children: "\u25C6 AgentLink CLI" }),
     /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box_default, { gap: 2, children: [
@@ -48393,7 +48396,11 @@ function StatusBar({ running, status }) {
     /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box_default, { gap: 2, children: [
       /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, { color: "gray", children: [
         "Hub: ",
-        /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: "blue", children: hub })
+        /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, { color: hubStatus === "\u5DF2\u8FDE\u63A5" ? "green" : hubStatus === "\u8FDE\u63A5\u4E2D" ? "yellow" : "red", children: [
+          hubStatus === "\u5DF2\u8FDE\u63A5" ? "\u25CF" : "\u25CB",
+          " ",
+          hubStatus
+        ] })
       ] }),
       /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, { color: "gray", children: [
         "\u8D26\u53F7: ",
@@ -48420,69 +48427,27 @@ function Menu({ items, selectedIndex }) {
     ] }, item.value);
   }) });
 }
-function SimpleInput({ label, value, onChange, onSubmit, onCancel, mask }) {
-  use_input_default((input, key) => {
-    if (key.return) {
-      onSubmit();
-      return;
-    }
-    if (key.escape || key.ctrl && input === "c") {
-      onCancel();
-      return;
-    }
-    if (key.backspace || key.delete) {
-      onChange(value.slice(0, -1));
-      return;
-    }
-    if (input && !key.ctrl && !key.meta) {
-      onChange(value + input);
-    }
-  });
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box_default, { flexDirection: "column", borderStyle: "round", borderColor: "cyan", paddingX: 1, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { bold: true, color: "cyanBright", children: label }),
-    /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, { color: "white", children: [
-      mask ? "*".repeat(value.length) : value,
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: "cyanBright", children: "\u258F" })
-    ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: "gray", children: "Enter \u786E\u8BA4 \xB7 Esc \u53D6\u6D88" })
-  ] });
-}
 function StatusDetail({ status, running, onBack }) {
   const { exit } = use_app_default();
+  const hubStatus = hubConnectionStatus(running, status);
   use_input_default((input, key) => {
     if (key.return || key.escape) onBack();
     if (key.ctrl && input === "c") quit(exit);
   });
   return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box_default, { flexDirection: "column", borderStyle: "round", borderColor: "cyan", paddingX: 1, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { bold: true, color: "cyanBright", children: "\u25C6 Daemon \u72B6\u6001\u8BE6\u60C5" }),
+    /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { bold: true, color: "cyanBright", children: "\u25C6 AgentLink \u72B6\u6001" }),
     /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, { color: "gray", children: [
-      "\u8FD0\u884C\u4E2D: ",
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: running ? "green" : "red", children: running ? "\u662F" : "\u5426" })
+      "\u672C\u673A\u670D\u52A1: ",
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: running ? "green" : "red", children: running ? "\u8FD0\u884C\u4E2D" : "\u5DF2\u505C\u6B62" })
+    ] }),
+    /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, { color: "gray", children: [
+      "Hub \u8FDE\u63A5: ",
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: hubStatus === "\u5DF2\u8FDE\u63A5" ? "green" : hubStatus === "\u8FDE\u63A5\u4E2D" ? "yellow" : "red", children: hubStatus })
     ] }),
-    status?.pid ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, { color: "gray", children: [
-      "PID: ",
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: "white", children: status.pid })
-    ] }) : null,
-    status?.state ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, { color: "gray", children: [
-      "State: ",
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: "white", children: status.state })
-    ] }) : null,
-    status?.hub ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, { color: "gray", children: [
-      "Hub: ",
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: "blue", children: status.hub })
-    ] }) : null,
-    status?.machineId ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, { color: "gray", children: [
-      "Machine ID: ",
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: "white", children: status.machineId })
-    ] }) : null,
     status?.daemonVersion ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, { color: "gray", children: [
       "\u7248\u672C: ",
       /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: "white", children: status.daemonVersion })
     ] }) : null,
-    status?.startedAt ? /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, { color: "gray", children: [
-      "\u542F\u52A8\u65F6\u95F4: ",
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: "white", children: new Date(status.startedAt).toLocaleString() })
-    ] }) : null,
     /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: "gray", dimColor: true, children: "\u6309 Enter / Esc \u8FD4\u56DE" })
   ] });
 }
@@ -48527,19 +48492,23 @@ function HelpView({ onBack }) {
     ] }),
     /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, { color: "gray", children: [
       /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: "cyan", children: "\u2022" }),
-      " \u542F\u52A8\u540E daemon \u5728\u540E\u53F0\u8FD0\u884C\uFF0C\u9000\u51FA TUI \u4E0D\u5F71\u54CD\u5B83"
-    ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, { color: "gray", children: [
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: "cyan", children: "\u2022" }),
-      " alink-cli status / login / logout / machines \u4ECD\u53EF\u547D\u4EE4\u884C\u4F7F\u7528"
+      " \u9000\u51FA\u6B64\u754C\u9762\u540E\uFF0CAgentLink \u4ECD\u4F1A\u5728\u540E\u53F0\u8FD0\u884C"
     ] }),
     /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, { color: "gray", children: [
       /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: "cyan", children: "\u2022" }),
-      " alink-cli --legacy \u8FD0\u884C\u65E7\u7248\u524D\u53F0 daemon"
+      " alink-cli status \u53EF\u968F\u65F6\u67E5\u770B\u8FDE\u63A5\u72B6\u6001"
     ] }),
     /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: "gray", dimColor: true, children: "\u6309 Enter / Esc \u8FD4\u56DE" })
   ] });
 }
+async function waitForHubConnection(hub, timeoutMs = 15e3, pollMs = 200) {
+  const deadline = Date.now() + timeoutMs;
+  while (Date.now() < deadline) {
+    if (hubConnectionStatus(isDaemonRunning(), readDaemonStatus(), hub) === "\u5DF2\u8FDE\u63A5") return true;
+    await new Promise((resolve2) => setTimeout(resolve2, pollMs));
+  }
+  return false;
+}
 function App2() {
   const { exit } = use_app_default();
   const [running, setRunning] = (0, import_react22.useState)(isDaemonRunning());
@@ -48548,9 +48517,6 @@ function App2() {
   const [selectedIndex, setSelectedIndex] = (0, import_react22.useState)(0);
   const [message, setMessage] = (0, import_react22.useState)("");
   const [confirmAction, setConfirmAction] = (0, import_react22.useState)(null);
-  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)(() => {
@@ -48562,12 +48528,13 @@ function App2() {
   }, []);
   const menuItems = (0, import_react22.useMemo)(() => {
     void authTick;
-    const loggedIn = isLoggedIn(loadConfig().hub);
+    const config = loadConfig();
+    const loggedIn = isLoggedIn(config.hub);
     const items = [];
     if (!running) {
-      items.push({ label: "\u542F\u52A8 daemon", value: "start" });
+      items.push({ label: "\u542F\u52A8 AgentLink", value: "start" });
     } else {
-      items.push({ label: "\u505C\u6B62 daemon", value: "stop" });
+      items.push({ label: "\u505C\u6B62 AgentLink", value: "stop" });
       items.push({ label: "\u91CD\u65B0\u8FDE\u63A5 AgentLink", value: "restart" });
     }
     items.push({ label: "\u67E5\u770B\u72B6\u6001\u8BE6\u60C5", value: "status" });
@@ -48575,7 +48542,6 @@ function App2() {
     const isOfficialHub = normalizeHub(config.hub) === normalizeHub(OFFICIAL_HUB);
     if (!loggedIn && !isOfficialHub) items.push({ label: "\u514D\u767B\u5F55\u914D\u5BF9\uFF08\u65E0\u9700\u8D26\u53F7\uFF0C\u7AEF\u5230\u7AEF\u52A0\u5BC6\uFF09", value: "pair" });
     items.push({ label: "\u67E5\u770B\u673A\u5668", value: "machines", disabled: !loggedIn });
-    items.push({ label: "\u8BBE\u7F6E", value: "settings" });
     items.push({ label: "\u5E2E\u52A9", value: "help" });
     items.push({ label: "\u9000\u51FA TUI", value: "exit" });
     return items;
@@ -48613,7 +48579,7 @@ function App2() {
     switch (value) {
       case "start": {
         if (running) {
-          setNotice("daemon \u5DF2\u5728\u8FD0\u884C");
+          setNotice("AgentLink \u5DF2\u5728\u8FD0\u884C");
           return;
         }
         const credential = readCredential(cfg.hub);
@@ -48634,7 +48600,7 @@ function App2() {
             approval: cfg.approval,
             approvalRenotifyMin: cfg.approvalRenotifyMin
           });
-          setNotice(`daemon \u5DF2\u540E\u53F0\u542F\u52A8 (PID ${pid})`);
+          setNotice("AgentLink \u5DF2\u5728\u540E\u53F0\u542F\u52A8");
           setRunning(true);
         } catch (err) {
           setNotice(`\u542F\u52A8\u5931\u8D25: ${err instanceof Error ? err.message : String(err)}`);
@@ -48643,7 +48609,7 @@ function App2() {
       }
       case "stop": {
         if (!running) {
-          setNotice("daemon \u672A\u8FD0\u884C");
+          setNotice("AgentLink \u672A\u8FD0\u884C");
           return;
         }
         setConfirmAction({ type: "stop" });
@@ -48672,10 +48638,6 @@ function App2() {
         setView("machines");
         return;
       }
-      case "settings": {
-        setView("settings");
-        return;
-      }
       case "help": {
         setView("help");
         return;
@@ -48692,7 +48654,7 @@ function App2() {
     if (confirmAction.type === "stop") {
       stopDaemon().then(() => {
         setRunning(false);
-        setNotice("daemon \u5DF2\u505C\u6B62");
+        setNotice("AgentLink \u5DF2\u505C\u6B62");
       }).catch((err) => setNotice(`\u505C\u6B62\u5931\u8D25: ${err instanceof Error ? err.message : String(err)}`));
     } else if (confirmAction.type === "restart") {
       const credential = readCredential(cfg.hub);
@@ -48706,15 +48668,17 @@ function App2() {
       setConfirmAction(null);
       setReconnecting(true);
       try {
-        const pid = await restartDaemon({
+        await restartDaemon({
           hub: cfg.hub,
           credential,
           cwd: cfg.dir,
           approval: cfg.approval,
           approvalRenotifyMin: cfg.approvalRenotifyMin
         });
-        setNotice(`AgentLink \u5DF2\u5F00\u59CB\u91CD\u65B0\u8FDE\u63A5 (PID ${pid})`);
         setRunning(true);
+        const connected = await waitForHubConnection(cfg.hub);
+        setStatus(readDaemonStatus());
+        setNotice(connected ? "AgentLink \u5DF2\u91CD\u65B0\u8FDE\u63A5" : "AgentLink \u5DF2\u542F\u52A8\uFF0CHub \u6B63\u5728\u540E\u53F0\u7EE7\u7EED\u8FDE\u63A5");
       } catch (err) {
         setNotice(`\u91CD\u65B0\u8FDE\u63A5\u5931\u8D25: ${err instanceof Error ? err.message : String(err)}`);
       } finally {
@@ -48725,7 +48689,7 @@ function App2() {
       clearCredential();
       setRunning(false);
       setAuthTick((t) => t + 1);
-      setNotice("\u5DF2\u9000\u51FA\u8D26\u53F7\u5E76\u505C\u6B62 daemon");
+      setNotice("\u5DF2\u9000\u51FA\u8D26\u53F7\u5E76\u505C\u6B62 AgentLink");
     }
     setView("menu");
     setConfirmAction(null);
@@ -48738,7 +48702,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\u65B0\u8FDE\u63A5 AgentLink \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 AgentLink \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 AgentLink\u3002",
             onConfirm: handleConfirm,
             onCancel: () => {
               setView("menu");
@@ -48748,19 +48712,6 @@ function App2() {
         );
       case "help":
         return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(HelpView, { onBack: () => setView("menu") });
-      case "settings":
-        return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-          SettingsPanel,
-          {
-            config,
-            onChange: setConfig,
-            field: settingsField,
-            setField: setSettingsField,
-            inputValue,
-            setInputValue,
-            onBack: () => setView("menu")
-          }
-        );
       case "login":
         return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
           LoginView,
@@ -48789,7 +48740,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..." });
+        if (reconnecting) return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Loading, { label: "\u6B63\u5728\u91CD\u542F\u5E76\u8FDE\u63A5 Hub..." });
         return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box_default, { flexDirection: "column", children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Menu, { items: menuItems, selectedIndex }) });
     }
   }
@@ -48802,79 +48753,6 @@ function App2() {
     ] }) }) : null
   ] });
 }
-function SettingsPanel({
-  config,
-  onChange,
-  field,
-  setField,
-  inputValue,
-  setInputValue,
-  onBack
-}) {
-  const [selected, setSelected] = (0, import_react22.useState)(0);
-  const options = [
-    { label: `Hub URL: ${config.hub}`, value: "hub" },
-    { label: `\u5DE5\u4F5C\u76EE\u5F55: ${config.dir}`, value: "dir" },
-    { label: `\u5BA1\u6279\u6A21\u5F0F: ${config.approval ? "\u5F00\u542F" : "\u5173\u95ED"}`, value: "approval" },
-    { label: `\u5BA1\u6279\u91CD\u901A\u77E5: ${config.approvalRenotifyMin} \u5206\u949F`, value: "approvalRenotifyMin" },
-    { label: "\u8FD4\u56DE", value: "back" }
-  ];
-  use_input_default((input, key) => {
-    if (field) return;
-    if (key.upArrow || input === "k") {
-      setSelected((s) => s <= 0 ? options.length - 1 : s - 1);
-    } else if (key.downArrow || input === "j") {
-      setSelected((s) => s >= options.length - 1 ? 0 : s + 1);
-    } else if (key.return) {
-      const opt = options[selected];
-      if (opt.value === "back") {
-        onBack();
-      } else if (opt.value === "approval") {
-        const next = { ...config, approval: !config.approval };
-        onChange(next);
-        saveConfig(next);
-      } else if (opt.value === "hub" || opt.value === "dir" || opt.value === "approvalRenotifyMin") {
-        setField(opt.value);
-        setInputValue(
-          opt.value === "approvalRenotifyMin" ? String(config.approvalRenotifyMin) : config[opt.value]
-        );
-      }
-    } else if (key.escape || key.ctrl && input === "c") {
-      onBack();
-    }
-  });
-  if (field) {
-    const label = field === "hub" ? "Hub URL (\u4F8B\u5982 wss://link.harmopath.com):" : field === "dir" ? "\u9ED8\u8BA4\u5DE5\u4F5C\u76EE\u5F55:" : "\u5BA1\u6279\u91CD\u901A\u77E5\u95F4\u9694 (\u5206\u949F\uFF0C0=\u5173\u95ED):";
-    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-      SimpleInput,
-      {
-        label,
-        value: inputValue,
-        onChange: setInputValue,
-        onSubmit: () => {
-          const next = { ...config };
-          if (field === "approvalRenotifyMin") {
-            const n = Number(inputValue);
-            if (Number.isInteger(n) && n >= 0) next.approvalRenotifyMin = n;
-          } else {
-            next[field] = inputValue;
-          }
-          onChange(next);
-          saveConfig(next);
-          setField(null);
-        },
-        onCancel: () => setField(null)
-      }
-    );
-  }
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box_default, { flexDirection: "column", borderStyle: "round", borderColor: "cyan", paddingX: 1, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { bold: true, color: "cyanBright", children: "\u25C6 \u8BBE\u7F6E" }),
-    options.map((opt, i) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, { bold: i === selected, color: i === selected ? "cyanBright" : "white", children: [
-      i === selected ? "\u276F " : "  ",
-      opt.label
-    ] }, opt.value))
-  ] });
-}
 function runDetachedScript(args, options = {}) {
   return new Promise((resolve2) => {
     const binPath = fileURLToPath2(new URL("../bin/agentlink.js", import.meta.url));
@@ -49089,7 +48967,7 @@ function MachinesView({ onDone }) {
     /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: "gray", dimColor: true, children: "\u6309 Esc \u8FD4\u56DE \xB7 Ctrl+C \u9000\u51FA" })
   ] });
 }
-if (process.env.AGENTLINK_RENDER_TUI === "1") {
+if (process.env.AGENTLINK_RENDER_TUI === "1" && process.stdin.isTTY) {
   render_default(/* @__PURE__ */ (0, import_jsx_runtime.jsx)(App2, {}));
 }
 export {
@@ -49104,7 +48982,8 @@ export {
   restartDaemon,
   saveCredential,
   startDaemon,
-  stopDaemon
+  stopDaemon,
+  waitForHubConnection
 };
 /*! Bundled license information:
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alink-cli",
-  "version": "0.11.6",
+  "version": "0.11.7",
   "description": "一条命令把工作机接入 AgentLink，随时随地遥控本机的编码 agent。One command to link your machine to AgentLink and control your coding agents from anywhere.",
   "keywords": [
     "acp",
@@ -21,6 +21,7 @@
   },
   "bin": {
     "agentlink": "bin/agentlink.js",
+    "alink": "bin/agentlink.js",
     "alink-cli": "bin/agentlink.js"
   },
   "files": [