alink-cli 0.8.4 → 0.8.5

package/dist/ui.js

@@ -48397,7 +48397,7 @@ function SimpleInput({ label, value, onChange, onSubmit, onCancel, mask }) {
       onSubmit();
       return;
     }
-    if (key.escape) {
+    if (key.escape || key.ctrl && input === "c") {
       onCancel();
       return;
     }
@@ -48419,8 +48419,10 @@ function SimpleInput({ label, value, onChange, onSubmit, onCancel, mask }) {
   ] });
 }
 function StatusDetail({ status, running, onBack }) {
-  use_input_default((_, key) => {
+  const { exit } = use_app_default();
+  use_input_default((input, key) => {
     if (key.return || key.escape) onBack();
+    if (key.ctrl && input === "c") 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" }),
@@ -48458,14 +48460,14 @@ function StatusDetail({ status, running, onBack }) {
 function ConfirmDialog({ title, onConfirm, onCancel }) {
   const [selected, setSelected] = (0, import_react22.useState)(0);
   const options = ["\u786E\u8BA4", "\u53D6\u6D88"];
-  use_input_default((_, key) => {
+  use_input_default((input, key) => {
     if (key.leftArrow || key.upArrow) setSelected((s) => s === 0 ? 1 : 0);
     if (key.rightArrow || key.downArrow) setSelected((s) => s === 0 ? 1 : 0);
     if (key.return) {
       if (selected === 0) onConfirm();
       else onCancel();
     }
-    if (key.escape) onCancel();
+    if (key.escape || key.ctrl && input === "c") onCancel();
   });
   return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box_default, { flexDirection: "column", borderStyle: "round", borderColor: "yellow", paddingX: 1, children: [
     /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, { bold: true, color: "yellow", children: [
@@ -48479,8 +48481,10 @@ function ConfirmDialog({ title, onConfirm, onCancel }) {
   ] });
 }
 function HelpView({ onBack }) {
-  use_input_default((_, key) => {
+  const { exit } = use_app_default();
+  use_input_default((input, key) => {
     if (key.return || key.escape) onBack();
+    if (key.ctrl && input === "c") 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 \u5FEB\u6377\u5E2E\u52A9" }),
@@ -48565,7 +48569,7 @@ function App2() {
     } else if (key.return) {
       const item = menuItems[selectedIndex];
       if (item && !item.disabled) handleMenu(item.value);
-    } else if (key.escape || input === "q") {
+    } else if (key.escape || input === "q" || key.ctrl && input === "c") {
       exit();
     }
   });
@@ -48583,7 +48587,7 @@ function App2() {
         }
         const credential = readCredential(cfg.hub);
         if (!credential) {
-          setNotice("\u672A\u767B\u5F55\uFF0C\u8BF7\u5148\u767B\u5F55\u6216\u914D\u5BF9");
+          setNotice("\u672A\u767B\u5F55\uFF0C\u8BF7\u5148\u767B\u5F55");
           return;
         }
         if (!existsSync3(daemonBundlePath())) {
@@ -48628,10 +48632,6 @@ function App2() {
         setView("login");
         return;
       }
-      case "pair": {
-        setView("pair");
-        return;
-      }
       case "logout": {
         setConfirmAction({ type: "logout" });
         setView("confirm");
@@ -48688,6 +48688,7 @@ function App2() {
       stopDaemon().catch(() => void 0);
       clearCredential();
       setRunning(false);
+      setAuthTick((t) => t + 1);
       setNotice("\u5DF2\u9000\u51FA\u8D26\u53F7\u5E76\u505C\u6B62 daemon");
     }
     setView("menu");
@@ -48738,7 +48739,16 @@ function App2() {
           }
         );
       case "pair":
-        return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(PairView, { onDone: () => setView("menu"), onCancel: () => setView("menu") });
+        return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+          PairView,
+          {
+            onDone: () => {
+              setAuthTick((t) => t + 1);
+              setView("menu");
+            },
+            onCancel: () => setView("menu")
+          }
+        );
       case "machines":
         return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(MachinesView, { onDone: () => setView("menu") });
       case "menu":
@@ -48792,7 +48802,7 @@ function SettingsPanel({
           opt.value === "approvalRenotifyMin" ? String(config.approvalRenotifyMin) : config[opt.value]
         );
       }
-    } else if (key.escape) {
+    } else if (key.escape || key.ctrl && input === "c") {
       onBack();
     }
   });
@@ -48831,17 +48841,40 @@ function SettingsPanel({
 function runDetachedScript(args, options = {}) {
   return new Promise((resolve2) => {
     const binPath = fileURLToPath2(new URL("../bin/agentlink.js", import.meta.url));
-    const parentRaw = process.stdin.isTTY && process.stdin.isRaw;
+    const stdin = process.stdin;
+    const parentRaw = stdin.isTTY ? stdin.isRaw ?? false : false;
+    let finished = false;
+    const cleanup = (code) => {
+      if (finished) return;
+      finished = true;
+      if (stdin.isTTY && typeof stdin.setRawMode === "function") {
+        try {
+          stdin.setRawMode(parentRaw);
+        } catch {
+        }
+      }
+      for (const s of signalHandlers) process.off(s, forwardSignal);
+      resolve2(code);
+    };
     const child = spawn2(process.execPath, [binPath, ...args, "--no-tui"], {
       stdio: "inherit",
       env: { ...process.env, ...options.env }
     });
-    child.on("exit", (code) => {
-      if (process.stdin.isTTY && typeof process.stdin.setRawMode === "function") {
-        process.stdin.setRawMode(parentRaw);
-      }
-      resolve2(code ?? 1);
+    child.on("exit", (code) => cleanup(code ?? 1));
+    child.on("error", (err) => {
+      console.error(`\u5B50\u8FDB\u7A0B\u542F\u52A8\u5931\u8D25: ${err instanceof Error ? err.message : String(err)}`);
+      cleanup(1);
     });
+    const signalHandlers = ["SIGINT", "SIGTERM"];
+    const forwardSignal = (signal) => {
+      if (child.pid) {
+        try {
+          child.kill(signal);
+        } catch {
+        }
+      }
+    };
+    for (const s of signalHandlers) process.on(s, forwardSignal);
   });
 }
 function LoginView({
@@ -48854,13 +48887,13 @@ function LoginView({
   const [identifier, setIdentifier] = (0, import_react22.useState)("");
   const [inputVal, setInputVal] = (0, import_react22.useState)("");
   const [error, setError] = (0, import_react22.useState)("");
-  use_input_default((_, key) => {
+  use_input_default((input, key) => {
     if (stage !== "error") return;
     if (key.return) {
       setError("");
       setInputVal("");
       setStage("password");
-    } else if (key.escape) {
+    } else if (key.escape || key.ctrl && input === "c") {
       onCancel();
     }
   });
@@ -48935,31 +48968,60 @@ function saveSessionJwt(jwt, hub) {
   const sessionFile = join2(STATE_DIR, "session");
   writeFileSync2(sessionFile, JSON.stringify({ hub: normalizeHub(hub), jwt }), { mode: 384 });
 }
+function savedSessionJwt(hub = OFFICIAL_HUB) {
+  const sessionFile = join2(STATE_DIR, "session");
+  try {
+    const raw = readFileSync3(sessionFile, "utf8").trim();
+    if (!raw) return void 0;
+    if (!raw.startsWith("{")) {
+      return normalizeHub(hub) === normalizeHub(OFFICIAL_HUB) ? raw : void 0;
+    }
+    const saved = JSON.parse(raw);
+    return saved.hub === normalizeHub(hub) && typeof saved.jwt === "string" ? saved.jwt : void 0;
+  } catch {
+    return void 0;
+  }
+}
 function PairView({ onDone, onCancel }) {
-  const { exit } = use_app_default();
   const [stage, setStage] = (0, import_react22.useState)("confirm");
-  use_input_default(async (_, key) => {
+  const [error, setError] = (0, import_react22.useState)("");
+  use_input_default(async (input, key) => {
     if (stage === "confirm") {
       if (key.return) {
         setStage("running");
-        await runDetachedScript(["--pair"]);
-        setStage("done");
-      } else if (key.escape) {
+        const code = await runDetachedScript(["--pair"]);
+        if (code === 0) {
+          onDone();
+        } else {
+          setError(`\u914D\u5BF9\u6D41\u7A0B\u5F02\u5E38\u7ED3\u675F\uFF08\u9000\u51FA\u7801 ${code}\uFF09\u3002`);
+          setStage("error");
+        }
+      } else if (key.escape || key.ctrl && input === "c") {
         onCancel();
       }
-    } else if (stage === "done") {
-      if (key.return || key.escape) {
-        exit();
+    } else if (stage === "error") {
+      if (key.return) {
+        setError("");
+        setStage("confirm");
+      } else if (key.escape || key.ctrl && input === "c") {
+        onCancel();
       }
     }
   });
   if (stage === "running") {
     return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: "cyan", children: "\u23F3 \u6B63\u5728\u6253\u5F00\u626B\u7801\u914D\u5BF9\u6D41\u7A0B..." });
   }
-  if (stage === "done") {
-    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box_default, { flexDirection: "column", borderStyle: "round", borderColor: "green", paddingX: 1, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: "green", children: "\u2714 \u914D\u5BF9\u6D41\u7A0B\u7ED3\u675F\u3002\u6309 Enter \u9000\u51FA CLI\u3002" }) });
+  if (stage === "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 ",
+        error
+      ] }),
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: "gray", children: "Enter \u91CD\u8BD5 \xB7 Esc \u8FD4\u56DE\u83DC\u5355" })
+    ] });
   }
   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 \u626B\u7801\u914D\u5BF9" }),
     /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: "white", children: "\u5C06\u9000\u51FA TUI \u5E76\u8FDB\u5165\u626B\u7801\u914D\u5BF9\u6D41\u7A0B\u3002" }),
     /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: "gray", children: "\u914D\u5BF9\u540E\u53EF\u5728\u6D4F\u89C8\u5668\u76F4\u63A5\u4F7F\u7528\uFF0C\u65E0\u9700\u6CE8\u518C\u6216\u767B\u5F55\u8D26\u53F7\u3002" }),
     /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: "gray", children: "\u4F1A\u8BDD\u5728\u6D4F\u89C8\u5668\u4E0E\u672C\u673A\u4E4B\u95F4\u7AEF\u5230\u7AEF\u52A0\u5BC6\uFF0C\u670D\u52A1\u5668\u53EA\u4E2D\u8F6C\u3001\u770B\u4E0D\u5230\u660E\u6587\u3002" }),
@@ -48969,31 +49031,78 @@ function PairView({ onDone, onCancel }) {
 }
 function MachinesView({ onDone }) {
   const { exit } = use_app_default();
-  const [stage, setStage] = (0, import_react22.useState)("confirm");
-  use_input_default(async (_, key) => {
-    if (stage === "confirm") {
-      if (key.return) {
-        setStage("running");
-        await runDetachedScript(["machines"]);
-        setStage("done");
-      } else if (key.escape) {
-        onDone();
-      }
-    } else if (stage === "done") {
-      if (key.return || key.escape) {
-        exit();
+  const [state, setState] = (0, import_react22.useState)("loading");
+  const [machines, setMachines] = (0, import_react22.useState)([]);
+  const [error, setError] = (0, import_react22.useState)("");
+  use_input_default((input, key) => {
+    if (key.escape) onDone();
+    if (key.ctrl && input === "c") exit();
+  });
+  (0, import_react22.useEffect)(() => {
+    let cancelled = false;
+    async function load() {
+      try {
+        const hub = loadConfig().hub;
+        const account = await import(new URL("../bin/agentlink-account.js", import.meta.url).href);
+        const config = await account.loadAgentLinkAccountConfig(hub);
+        if (config?.mode !== "multi") throw new Error("\u5F53\u524D Hub \u4E0D\u4F7F\u7528\u8D26\u53F7\u673A\u5668\u76EE\u5F55\u3002");
+        let jwt = savedSessionJwt(hub);
+        if (!jwt) {
+          const credential = readCredential(hub);
+          if (credential) {
+            jwt = await account.exchangeCredentialForSessionJwt({ hub, credential });
+          } else {
+            throw new Error("\u6CA1\u6709\u53EF\u7528\u7684\u767B\u5F55\u4F1A\u8BDD\u6216\u673A\u5668\u51ED\u8BC1\uFF0C\u8BF7\u5148\u767B\u5F55\u3002");
+          }
+        }
+        if (jwt) saveSessionJwt(jwt, hub);
+        const list = await account.listAgentLinkAccountMachinesFromHub({ hub, jwt });
+        if (!cancelled) {
+          setMachines(list);
+          setState("list");
+        }
+      } catch (err) {
+        if (!cancelled) {
+          setError(err instanceof Error ? err.message : String(err));
+          setState("error");
+        }
       }
     }
-  });
-  if (stage === "running") {
-    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: "cyan", children: "\u23F3 \u6B63\u5728\u6253\u5F00\u673A\u5668\u5217\u8868..." });
+    load();
+    return () => {
+      cancelled = true;
+    };
+  }, []);
+  if (state === "loading") {
+    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 \u673A\u5668\u5217\u8868" }),
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: "cyan", children: "\u23F3 \u6B63\u5728\u52A0\u8F7D..." }),
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: "gray", dimColor: true, children: "\u6309 Esc \u8FD4\u56DE \xB7 Ctrl+C \u9000\u51FA" })
+    ] });
   }
-  if (stage === "done") {
-    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box_default, { flexDirection: "column", borderStyle: "round", borderColor: "green", paddingX: 1, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: "green", children: "\u2714 \u673A\u5668\u5217\u8868\u5DF2\u5173\u95ED\u3002\u6309 Enter \u9000\u51FA CLI\u3002" }) });
+  if (state === "error") {
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box_default, { flexDirection: "column", borderStyle: "round", borderColor: "red", paddingX: 1, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { bold: true, color: "redBright", children: "\u2716 \u52A0\u8F7D\u5931\u8D25" }),
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: "white", children: error }),
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: "gray", dimColor: true, children: "\u6309 Esc \u8FD4\u56DE \xB7 Ctrl+C \u9000\u51FA" })
+    ] });
   }
   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, { color: "white", children: "\u5C06\u9000\u51FA TUI \u5E76\u663E\u793A\u8D26\u53F7\u4E0B\u7684\u673A\u5668\u5217\u8868\u3002" }),
-    /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: "gray", children: "Enter \u7EE7\u7EED \xB7 Esc \u53D6\u6D88" })
+    /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { bold: true, color: "cyanBright", children: "\u25C6 \u673A\u5668\u5217\u8868" }),
+    machines.length === 0 ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: "gray", children: "\u8D26\u53F7\u4E0B\u8FD8\u6CA1\u6709\u673A\u5668\u3002" }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Box_default, { flexDirection: "column", marginTop: 1, children: machines.map((m) => {
+      const label = m.name || m.hostname || m.machineId;
+      return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, { children: [
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: m.online ? "green" : "gray", children: m.online ? "\u25CF" : "\u25CB" }),
+        " ",
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: "white", children: label }),
+        /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Text, { color: "gray", children: [
+          " (#",
+          m.machineId.slice(-6),
+          ")"
+        ] })
+      ] }, m.machineId);
+    }) }),
+    /* @__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") {

package/package.json

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