@zqagent/core 0.2.11 → 0.2.15

package/dist/server/index.cjs

@@ -2197,12 +2197,12 @@ var MUTATING_TOOLS = /* @__PURE__ */ new Set([
 ]);
 function parseReadFileSpan(content) {
   const body = content.replace(/^\[tool output truncated:[^\n]*\]\n\n/, "");
-  let path35;
+  let path36;
   let start;
   let end;
   try {
     const obj = JSON.parse(body);
-    path35 = obj.path;
+    path36 = obj.path;
     start = obj.start_line;
     end = obj.end_line;
   } catch {
@@ -2211,14 +2211,14 @@ function parseReadFileSpan(content) {
       const m = new RegExp(`"${key}"\\s*:\\s*(\\d+)`).exec(body);
       return m ? Number(m[1]) : void 0;
     };
-    path35 = str2("path");
+    path36 = str2("path");
     start = num2("start_line");
     end = num2("end_line");
   }
-  if (typeof path35 !== "string" || !path35) return null;
+  if (typeof path36 !== "string" || !path36) return null;
   if (typeof start !== "number" || typeof end !== "number") return null;
   if (!Number.isFinite(start) || !Number.isFinite(end)) return null;
-  return { path: path35, start, end };
+  return { path: path36, start, end };
 }
 function addSpan(spans, start, end) {
   spans.push([start, end]);
@@ -3835,9 +3835,9 @@ var TurnEngine = class _TurnEngine {
       return;
     }
     if (result && typeof result === "object") {
-      const path35 = result.path;
-      if (path35) {
-        this._producedFiles.push(path35);
+      const path36 = result.path;
+      if (path36) {
+        this._producedFiles.push(path36);
         return;
       }
       const changed = result.changed_files;
@@ -5164,10 +5164,10 @@ var OpenAIProvider = class {
     let timer;
     try {
       for (; ; ) {
-        const idle = new Promise((resolve19) => {
+        const idle = new Promise((resolve20) => {
           timer = setTimeout(() => {
             onIdle();
-            resolve19({ timedOut: true });
+            resolve20({ timedOut: true });
           }, idleMs);
         });
         const next = iter.next();
@@ -5795,12 +5795,12 @@ function makeSink(maxBuffer) {
   };
 }
 function execAsync(file, argv, opts = {}) {
-  return new Promise((resolve19) => {
+  return new Promise((resolve20) => {
     const maxBuffer = opts.maxBuffer ?? DEFAULT_MAX_BUFFER;
     const out = makeSink(maxBuffer);
     const err = makeSink(maxBuffer);
     if (opts.signal?.aborted) {
-      resolve19({
+      resolve20({
         status: null,
         stdout: Buffer.alloc(0),
         stderr: Buffer.alloc(0),
@@ -5821,7 +5821,7 @@ function execAsync(file, argv, opts = {}) {
         windowsHide: true
       });
     } catch (e) {
-      resolve19({
+      resolve20({
         status: null,
         stdout: Buffer.alloc(0),
         stderr: Buffer.alloc(0),
@@ -5858,7 +5858,7 @@ function execAsync(file, argv, opts = {}) {
       };
       if (aborted) result.aborted = true;
       if (spawnError) result.error = spawnError;
-      resolve19(result);
+      resolve20(result);
     };
     const killAndSettle = () => {
       killTree(child.pid);
@@ -7753,18 +7753,18 @@ function makeApplyPatch(workspace) {
     return { changed_files: changedFiles, added_files: addedFiles, deleted_files: deletedFiles, file_count: fileCount };
   };
 }
-function applyPatchHunks(oldLines, chunks, path35) {
+function applyPatchHunks(oldLines, chunks, path36) {
   let newLines = [...oldLines];
   let cursor = 0;
   for (const chunk of chunks) {
     const oldBlock = chunk.filter((l) => l[0] === " " || l[0] === "-").map((l) => l.slice(1));
     const newBlock = chunk.filter((l) => l[0] === " " || l[0] === "+").map((l) => l.slice(1));
     if (!oldBlock.length) {
-      throw new Error(`\u8865\u4E01 hunk \u5FC5\u987B\u5305\u542B\u4E0A\u4E0B\u6587\u6216\u5220\u9664\u884C: ${path35}`);
+      throw new Error(`\u8865\u4E01 hunk \u5FC5\u987B\u5305\u542B\u4E0A\u4E0B\u6587\u6216\u5220\u9664\u884C: ${path36}`);
     }
     const matchStart = findBlockMatch(newLines, oldBlock, cursor);
     if (matchStart === -1) {
-      throw new Error(`\u8865\u4E01\u4E0A\u4E0B\u6587\u4E0D\u5339\u914D: ${path35}`);
+      throw new Error(`\u8865\u4E01\u4E0A\u4E0B\u6587\u4E0D\u5339\u914D: ${path36}`);
     }
     const matchEnd = matchStart + oldBlock.length;
     newLines.splice(matchStart, oldBlock.length, ...newBlock);
@@ -9857,11 +9857,11 @@ function isAffirmative(answer) {
   return /^(yes|approve|同意|批准|允许|确定|可以|好的|确认)/.test(a);
 }
 function defer() {
-  let resolve19;
+  let resolve20;
   const promise = new Promise((r) => {
-    resolve19 = r;
+    resolve20 = r;
   });
-  return { promise, resolve: resolve19 };
+  return { promise, resolve: resolve20 };
 }
 var SessionManager = class {
   constructor(store, approvalTimeoutMs = APPROVAL_TIMEOUT_MS, opts = {}) {
@@ -10433,11 +10433,11 @@ data: ${JSON.stringify({ sessionId, seq: entry.seq, ts: entry.ts, data: entry.da
         status: "pending",
         createdAt: (/* @__PURE__ */ new Date()).toISOString()
       };
-      const { promise, resolve: resolve19 } = defer();
+      const { promise, resolve: resolve20 } = defer();
       const timer = setTimeout(() => {
         this._recycleApproval(rt, id);
       }, this.approvalTimeoutMs);
-      rt.pendingApprovals.set(id, { promise, resolve: resolve19, record, timer });
+      rt.pendingApprovals.set(id, { promise, resolve: resolve20, record, timer });
       rt.approvals.set(id, record);
       this._setStatus(rt, "waiting_approval");
       this._persist(rt);
@@ -10515,11 +10515,11 @@ data: ${JSON.stringify({ sessionId, seq: entry.seq, ts: entry.ts, data: entry.da
       status: "pending",
       createdAt: (/* @__PURE__ */ new Date()).toISOString()
     };
-    const { promise, resolve: resolve19 } = defer();
+    const { promise, resolve: resolve20 } = defer();
     const timer = setTimeout(() => {
       this._recycleQuestion(rt, qid);
     }, this.approvalTimeoutMs);
-    rt.pendingQuestions.set(qid, { promise, resolve: resolve19, record, timer });
+    rt.pendingQuestions.set(qid, { promise, resolve: resolve20, record, timer });
     rt.questions.set(qid, record);
     this._setStatus(rt, "waiting_question");
     this._persist(rt);
@@ -10828,7 +10828,7 @@ data: ${JSON.stringify(entry.data)}
         if (rt.mcpReady) {
           await Promise.race([
             rt.mcpReady,
-            new Promise((resolve19) => setTimeout(resolve19, 15e3))
+            new Promise((resolve20) => setTimeout(resolve20, 15e3))
           ]).catch(() => void 0);
         }
         for await (const event of gen) {
@@ -11413,7 +11413,7 @@ function buildNodeInfo(store, opts) {
     nodeId: opts.nodeId ?? ensureNodeId(store),
     platform: process.platform,
     mode: process.env.NODE_MODE ?? "standalone",
-    version: "0.2.11",
+    version: "0.2.15",
     admin: opts.admin,
     projects: opts.projects
   };
@@ -11497,8 +11497,8 @@ function hubProxyEnabled(host) {
   const h = (host ?? "127.0.0.1").trim();
   return h === "127.0.0.1" || h === "localhost" || h === "::1";
 }
-function isHubProxyPath(path35) {
-  return path35.startsWith(HUB_PROXY_PREFIX);
+function isHubProxyPath(path36) {
+  return path36.startsWith(HUB_PROXY_PREFIX);
 }
 function decodeTarget(enc) {
   try {
@@ -12406,7 +12406,7 @@ function buildNodeHost(store, manager, diskPath) {
     arch: process.arch,
     release: os6.release(),
     uptimeSec: Math.round(os6.uptime()),
-    version: "0.2.11",
+    version: "0.2.15",
     mode: process.env.NODE_MODE ?? "standalone",
     cpu: {
       count: cpus2.length,
@@ -12450,7 +12450,7 @@ function saveNotifications(tenant, secretBox, notifications) {
 var API_PREFIX = "/api/v1";
 var MAX_BODY_BYTES = 10 * 1024 * 1024;
 function readBody(req2) {
-  return new Promise((resolve19, reject) => {
+  return new Promise((resolve20, reject) => {
     const chunks = [];
     let size = 0;
     req2.on("data", (c) => {
@@ -12463,9 +12463,9 @@ function readBody(req2) {
       chunks.push(c);
     });
     req2.on("end", () => {
-      if (chunks.length === 0) return resolve19(void 0);
+      if (chunks.length === 0) return resolve20(void 0);
       try {
-        resolve19(JSON.parse(Buffer.concat(chunks).toString("utf-8")));
+        resolve20(JSON.parse(Buffer.concat(chunks).toString("utf-8")));
       } catch {
         reject(new ApiError(400, "bad_request", "\u8BF7\u6C42\u4F53\u4E0D\u662F\u5408\u6CD5 JSON"));
       }
@@ -12776,7 +12776,25 @@ function createApp(store, manager, opts = {}) {
         ok(res, opts.fleet.status());
       }
     },
-    // 运行时热接入：凭一次性注册码接入 Hub（落盘 fleet.json + 立即连接，免重启）
+    // 修改本机节点显示名：写本地配置并立即上报；已接入 Hub 时同步 Hub 记录。
+    // `zqagent rename` 在有 server 在跑时走这里（热生效，免重启）。
+    {
+      method: "POST",
+      pattern: ["fleet", "label"],
+      adminOnly: true,
+      fn: async (_req, res, { body }) => {
+        if (!opts.fleet) {
+          throw new ApiError(503, "fleet_disabled", "\u8282\u70B9\u7BA1\u7406\u63A7\u5236\u5668\u672A\u542F\u7528");
+        }
+        const raw = body ?? {};
+        const label2 = typeof raw.label === "string" ? raw.label.trim() : "";
+        if (!label2) {
+          throw new ApiError(400, "bad_request", "label \u4E0D\u80FD\u4E3A\u7A7A");
+        }
+        ok(res, await opts.fleet.rename(label2));
+      }
+    },
+    // 运行时热接入：凭一次性注册码或 Hub 账号接入（落盘 fleet.json + 立即连接，免重启）
     {
       method: "POST",
       pattern: ["fleet", "enroll"],
@@ -12788,15 +12806,42 @@ function createApp(store, manager, opts = {}) {
         const raw = body ?? {};
         const hubUrl2 = String(raw.hubUrl ?? "").trim().replace(/\/$/, "");
         const code = String(raw.code ?? "").trim();
-        if (!hubUrl2 || !code) {
-          throw new ApiError(400, "bad_request", "hubUrl \u4E0E code \u5FC5\u586B");
+        const email = String(raw.email ?? "").trim();
+        const phone = String(raw.phone ?? "").trim();
+        const password = String(raw.password ?? "");
+        const smsCode = String(raw.smsCode ?? "").trim();
+        const hasAccount = Boolean(email || phone);
+        if (!hubUrl2) {
+          throw new ApiError(400, "bad_request", "hubUrl \u5FC5\u586B");
+        }
+        if (code && hasAccount) {
+          throw new ApiError(400, "bad_request", "code \u4E0E\u8D26\u53F7\u51ED\u636E\u53EA\u80FD\u4E8C\u9009\u4E00");
+        }
+        if (!code && !hasAccount) {
+          throw new ApiError(400, "bad_request", "\u9700\u8981 code\uFF0C\u6216 email/phone + password/smsCode");
+        }
+        if (hasAccount && !password && !smsCode) {
+          throw new ApiError(400, "bad_request", "\u8D26\u53F7\u63A5\u5165\u9700\u8981 password \u6216 smsCode");
         }
         const label2 = typeof raw.label === "string" ? raw.label.trim() : void 0;
         try {
-          ok(res, await opts.fleet.enroll({ hubUrl: hubUrl2, code, label: label2 }));
+          ok(
+            res,
+            await opts.fleet.enroll({
+              hubUrl: hubUrl2,
+              code: code || void 0,
+              account: hasAccount ? {
+                email: email || void 0,
+                phone: phone || void 0,
+                password: password || void 0,
+                smsCode: smsCode || void 0
+              } : void 0,
+              label: label2
+            })
+          );
         } catch (e) {
           const code2 = e.code;
-          const status = code2 === "code_expired" ? 410 : code2 === "code_used" || code2 === "node_taken" ? 409 : code2 === "not_found" ? 404 : code2 === "plan_limit" || code2 === "subscription_required" ? 402 : 400;
+          const status = code2 === "code_expired" ? 410 : code2 === "unauthorized" ? 401 : code2 === "account_disabled" ? 403 : code2 === "code_used" || code2 === "node_taken" ? 409 : code2 === "not_found" ? 404 : code2 === "plan_limit" || code2 === "subscription_required" ? 402 : 400;
           const msg = e instanceof Error ? e.message : String(e);
           throw new ApiError(
             status,
@@ -13942,10 +13987,10 @@ function createApp(store, manager, opts = {}) {
   function handle(req2, res) {
     const startedAt = Date.now();
     const url = new URL(req2.url ?? "/", "http://localhost");
-    const path35 = url.pathname;
+    const path36 = url.pathname;
     const method = req2.method ?? "GET";
     console.log(
-      `[api] ${(/* @__PURE__ */ new Date()).toISOString()} \u2192 ${method} ${path35}${url.search}`
+      `[api] ${(/* @__PURE__ */ new Date()).toISOString()} \u2192 ${method} ${path36}${url.search}`
     );
     let tenantId = null;
     let logged = false;
@@ -13953,7 +13998,7 @@ function createApp(store, manager, opts = {}) {
       if (logged) return;
       logged = true;
       console.log(
-        `[api] ${(/* @__PURE__ */ new Date()).toISOString()} \u2190 ${method} ${path35} ${extra} (${Date.now() - startedAt}ms) tenant=${tenantId ?? "-"}`
+        `[api] ${(/* @__PURE__ */ new Date()).toISOString()} \u2190 ${method} ${path36} ${extra} (${Date.now() - startedAt}ms) tenant=${tenantId ?? "-"}`
       );
     };
     res.on("finish", () => logDone(`HTTP ${res.statusCode}`));
@@ -13964,16 +14009,16 @@ function createApp(store, manager, opts = {}) {
       res.end();
       return;
     }
-    if (req2.method === "GET" && path35 === "/healthz") {
+    if (req2.method === "GET" && path36 === "/healthz") {
       json(res, 200, {
         status: "ok",
         // 版本让运维/探针能确认线上跑的是哪个构建（更新与回滚据此判断）
-        version: "0.2.11",
+        version: "0.2.15",
         features: { mcp: hasServerMcpConfig() }
       });
       return;
     }
-    if (hubProxyEnabled(opts.host) && isHubProxyPath(path35)) {
+    if (hubProxyEnabled(opts.host) && isHubProxyPath(path36)) {
       void handleHubProxy(req2, res).catch(() => {
         if (!res.headersSent) {
           res.writeHead(502, { "Content-Type": "application/json; charset=utf-8" });
@@ -13984,11 +14029,11 @@ function createApp(store, manager, opts = {}) {
       });
       return;
     }
-    if (!path35.startsWith(API_PREFIX)) {
+    if (!path36.startsWith(API_PREFIX)) {
       json(res, 404, { error: { code: "not_found", message: "\u672A\u77E5\u8DEF\u5F84" } });
       return;
     }
-    const segs = path35.slice(API_PREFIX.length).split("/").filter(Boolean);
+    const segs = path36.slice(API_PREFIX.length).split("/").filter(Boolean);
     const apiKey = extractApiKey(req2);
     if (!apiKey) {
       json(res, 401, {
@@ -14053,7 +14098,7 @@ function createApp(store, manager, opts = {}) {
     ).catch((err) => {
       const msg = err instanceof Error ? err.message : String(err);
       console.log(
-        `[api] ${(/* @__PURE__ */ new Date()).toISOString()} ! ${method} ${path35} ERROR: ${msg}`
+        `[api] ${(/* @__PURE__ */ new Date()).toISOString()} ! ${method} ${path36} ERROR: ${msg}`
       );
       error(res, err);
     });
@@ -14084,8 +14129,8 @@ async function cachedFetchModels(baseURL, apiKey) {
   try {
     result = await Promise.race([
       fetchModels(baseURL, apiKey),
-      new Promise((resolve19) => {
-        const t = setTimeout(() => resolve19(null), MODEL_FETCH_TIMEOUT_MS);
+      new Promise((resolve20) => {
+        const t = setTimeout(() => resolve20(null), MODEL_FETCH_TIMEOUT_MS);
         t.unref?.();
       })
     ]);
@@ -14110,8 +14155,8 @@ async function cachedFetchModelsEnriched(baseURL, apiKey, preferred) {
   if (!target) return r;
   const ctx = await Promise.race([
     fetchModelContext(baseURL, apiKey, target),
-    new Promise((resolve19) => {
-      const t = setTimeout(() => resolve19(void 0), MODEL_FETCH_TIMEOUT_MS);
+    new Promise((resolve20) => {
+      const t = setTimeout(() => resolve20(void 0), MODEL_FETCH_TIMEOUT_MS);
       t.unref?.();
     })
   ]);
@@ -15305,13 +15350,13 @@ var EVENT_FLUSH_MAX_EVENTS = 60;
 var EVENT_FLUSH_MAX_BYTES = 200 * 1024;
 var LOOP_LAG_WARN_MS = 2e3;
 function withTimeout(p, ms) {
-  return new Promise((resolve19, reject) => {
+  return new Promise((resolve20, reject) => {
     const timer = setTimeout(() => reject(new Error(`\u5B50\u6307\u4EE4\u8D85\u65F6\uFF08${ms}ms\uFF09`)), ms);
     timer.unref?.();
     p.then(
       (v) => {
         clearTimeout(timer);
-        resolve19(v);
+        resolve20(v);
       },
       (e) => {
         clearTimeout(timer);
@@ -15662,6 +15707,11 @@ var FleetNodeBridge = class {
   refreshInfo() {
     this._publishInfo();
   }
+  /** 本地改名后把 status（含 label）与 info 立即重发，控制台不必等下一次周期上报 */
+  republishLabel() {
+    this._send({ kind: "status", status: this._status(this.isConnected()) });
+    this._publishInfo();
+  }
   // ===================== 内部 =====================
   _status(online) {
     return {
@@ -15671,7 +15721,7 @@ var FleetNodeBridge = class {
       label: this.opts.deps.store.loadNodeLabel() ?? void 0,
       platform: process.platform,
       mode: process.env.NODE_MODE ?? "standalone",
-      version: "0.2.11",
+      version: "0.2.15",
       ip: primaryIp()
     };
   }
@@ -15690,7 +15740,23 @@ var FleetNodeBridge = class {
       byDay: days
     };
   }
+  /**
+   * 上报 info（项目/会话快照）。
+   *
+   * 失败必须留痕：这是控制台「项目列表」的唯一数据源，静默失败会表现为
+   * 「这台节点永远没有任何项目」，且只能靠网关 detail=null 才发现。
+   * 同时用 try 包住，避免一次读盘异常中断 `_onUp` 后续的状态通知。
+   */
   _publishInfo() {
+    try {
+      this._publishInfoNow();
+    } catch (e) {
+      console.warn(
+        `[fleet] \u8282\u70B9 ${this.nodeId} \u4E0A\u62A5 info \u5931\u8D25: ${e instanceof Error ? e.message : String(e)}`
+      );
+    }
+  }
+  _publishInfoNow() {
     const totals = { projects: 0, sessions: 0, running: 0, waiting: 0 };
     const sessions = [];
     const projects = allProjectSummaries(this.opts.deps.store).map((p) => {
@@ -15717,7 +15783,15 @@ var FleetNodeBridge = class {
       totals.sessions += p.sessionCount;
       totals.running += running;
       totals.waiting += waiting;
-      return { id: p.id, name: p.name, sessionCount: p.sessionCount, running, waiting };
+      return {
+        id: p.id,
+        name: p.name,
+        sessionCount: p.sessionCount,
+        running,
+        waiting,
+        // 控制台项目列表要展示工作目录（Hub 落盘快照后即可离线查看）
+        workspaceRoot: p.workspaceRoot ?? null
+      };
     });
     this._send({
       kind: "info",
@@ -15726,7 +15800,7 @@ var FleetNodeBridge = class {
         label: this.opts.deps.store.loadNodeLabel() ?? void 0,
         platform: process.platform,
         mode: process.env.NODE_MODE ?? "standalone",
-        version: "0.2.11",
+        version: "0.2.15",
         ip: primaryIp(),
         projects,
         totals,
@@ -15936,6 +16010,14 @@ function resolveFleetConfig(store) {
   return fleetConfigFromEnv(store);
 }
 
+// src/node-name.ts
+init_cjs_shims();
+var os8 = __toESM(require("os"), 1);
+function defaultNodeLabel() {
+  const name = os8.hostname().trim();
+  return name || "zqagent-node";
+}
+
 // src/server/notify/index.ts
 init_cjs_shims();
 
@@ -17141,13 +17223,13 @@ var baseUrlResolver = null;
 function resolveBase(baseUrl) {
   return baseUrlResolver ? baseUrlResolver(baseUrl) : baseUrl;
 }
-async function req(baseUrl, token, path35, init = {}) {
+async function req(baseUrl, token, path36, init = {}) {
   const headers = {
     ...init.body ? { "Content-Type": "application/json" } : {},
     ...init.headers ?? {}
   };
   if (token) headers.Authorization = `Bearer ${token}`;
-  const res = await fetch(`${resolveBase(baseUrl).replace(/\/$/, "")}${path35}`, {
+  const res = await fetch(`${resolveBase(baseUrl).replace(/\/$/, "")}${path36}`, {
     ...init,
     headers
   });
@@ -17186,6 +17268,12 @@ async function hubEnrollByAccount(baseUrl, input) {
   });
   return { hubUrl: baseUrl.replace(/\/$/, ""), ...data };
 }
+async function hubUpdateNodeLabelSelf(baseUrl, fleetToken, input) {
+  return await req(baseUrl, fleetToken, "/api/hub/nodes/self/label", {
+    method: "POST",
+    body: JSON.stringify(input)
+  });
+}
 
 // src/update/controller.ts
 init_cjs_shims();
@@ -17445,12 +17533,12 @@ function selfCheck(binPath, expectedVersion) {
 // src/update/platform.ts
 init_cjs_shims();
 var fs25 = __toESM(require("fs"), 1);
-var os8 = __toESM(require("os"), 1);
+var os9 = __toESM(require("os"), 1);
 var path29 = __toESM(require("path"), 1);
 var import_node_child_process5 = require("child_process");
 var import_node_module3 = require("module");
 function currentVersion() {
-  const injected = "0.2.11"?.trim();
+  const injected = "0.2.15"?.trim();
   if (injected) return injected;
   try {
     const req2 = (0, import_node_module3.createRequire)(importMetaUrl);
@@ -17488,7 +17576,7 @@ function launchdPlistPath() {
   const label2 = launchdLabel();
   const uid = typeof process.getuid === "function" ? process.getuid() : -1;
   if (uid === 0) return `/Library/LaunchDaemons/${label2}.plist`;
-  return path29.join(os8.homedir(), "Library", "LaunchAgents", `${label2}.plist`);
+  return path29.join(os9.homedir(), "Library", "LaunchAgents", `${label2}.plist`);
 }
 function serviceManagerFromLaunchctl(output, pid, execPath, sea = true) {
   const pidMatch = /^\s*pid = (\d+)\s*$/m.exec(output);
@@ -17977,11 +18065,11 @@ var UpdateController = class {
     const minUptime = num("ZQAGENT_UPDATE_MIN_UPTIME_MS", 10 * 60 * 1e3);
     const idleMs = num("ZQAGENT_UPDATE_IDLE_MS", 60 * 1e3);
     let idleSince = null;
-    return new Promise((resolve19) => {
+    return new Promise((resolve20) => {
       const timer = setInterval(() => {
         if (this.stopped) {
           clearInterval(timer);
-          resolve19(false);
+          resolve20(false);
           return;
         }
         if (Date.now() - this.startedAt < minUptime || !this.opts.isIdle()) {
@@ -17991,7 +18079,7 @@ var UpdateController = class {
         idleSince ??= Date.now();
         if (Date.now() - idleSince >= idleMs) {
           clearInterval(timer);
-          resolve19(true);
+          resolve20(true);
         }
       }, 1e3);
       timer.unref();
@@ -18174,7 +18262,7 @@ function exitWhenOrphaned() {
 }
 var PORT_FALLBACK_LIMIT = 20;
 function listenWithPortFallback(server, startPort, host, dataDir, limit = PORT_FALLBACK_LIMIT) {
-  return new Promise((resolve19, reject) => {
+  return new Promise((resolve20, reject) => {
     let attempts = 0;
     const tryListen = (port) => {
       server.removeAllListeners("listening");
@@ -18206,7 +18294,7 @@ function listenWithPortFallback(server, startPort, host, dataDir, limit = PORT_F
 `);
         } catch {
         }
-        resolve19(actualPort);
+        resolve20(actualPort);
       });
     };
     tryListen(startPort);
@@ -18284,7 +18372,7 @@ function startServer(opts = {}) {
       hubUrl: fleetCred?.hubUrl,
       gatewayUrl: fleetCred?.gatewayUrl ?? env2("FLEET_GATEWAY_URL"),
       online: fleet?.isConnected() ?? false,
-      label: fleetCred?.label,
+      label: fleetCred?.label ?? store.loadNodeLabel() ?? void 0,
       lastError: fleet?.getLastError() ?? void 0,
       reconnectCount: fleet?.getErrorCount() ?? 0
     };
@@ -18293,20 +18381,53 @@ function startServer(opts = {}) {
     status: fleetStatus,
     async enroll(input) {
       const nodeId = ensureNodeId(store);
-      const cred = await hubEnrollByCode(input.hubUrl, {
+      const label2 = input.label?.trim() || defaultNodeLabel();
+      const cred = input.account ? await hubEnrollByAccount(input.hubUrl, {
+        email: input.account.email,
+        phone: input.account.phone,
+        password: input.account.password,
+        code: input.account.smsCode,
+        nodeId,
+        label: label2
+      }) : await hubEnrollByCode(input.hubUrl, {
         code: input.code,
         nodeId,
-        label: input.label
+        label: label2
       });
       const full = {
         ...cred,
-        label: input.label ?? cred.label,
+        label: label2,
         enrolledAt: (/* @__PURE__ */ new Date()).toISOString()
       };
       store.saveFleetCredential(full);
+      store.saveNodeLabel(label2);
       connectFleet(full);
       return fleetStatus();
     },
+    async rename(label2) {
+      const name = label2.trim();
+      store.saveNodeLabel(name);
+      if (fleetCred) {
+        fleetCred = { ...fleetCred, label: name };
+        store.saveFleetCredential(fleetCred);
+      }
+      fleet?.republishLabel();
+      let hubSynced = false;
+      let hubError;
+      const cred = fleetCred;
+      if (cred?.hubUrl && cred.fleetToken) {
+        try {
+          await hubUpdateNodeLabelSelf(cred.hubUrl, cred.fleetToken, {
+            nodeId: ensureNodeId(store),
+            label: name
+          });
+          hubSynced = true;
+        } catch (e) {
+          hubError = e instanceof Error ? e.message : String(e);
+        }
+      }
+      return { ...fleetStatus(), hubSynced, hubError };
+    },
     unlink() {
       fleet?.close();
       fleet = null;
@@ -18437,7 +18558,7 @@ function startServer(opts = {}) {
   server.timeout = 0;
   server.keepAliveTimeout = 65e3;
   server.headersTimeout = 66e3;
-  const ready = new Promise((resolve19, reject) => {
+  const ready = new Promise((resolve20, reject) => {
     listenWithPortFallback(server, port, host, dataDir).then((actualPort) => {
       const info = {
         host,
@@ -18454,7 +18575,7 @@ function startServer(opts = {}) {
         printReady(info, qq);
       }
       updater?.start();
-      resolve19(info);
+      resolve20(info);
     }, reject);
   });
   return {
@@ -18504,39 +18625,12 @@ function parseHubAnswer(answer, fallback) {
   if (SKIP_ANSWERS.has(a.toLowerCase())) return null;
   return (a || fallback).replace(/\/$/, "");
 }
-function resolveDataDir(dataDir) {
-  return path34.resolve(dataDir ?? process.env.DATA_DIR ?? DEFAULT_DATA_DIR);
-}
-async function maybeAccountEnroll(opts = {}) {
-  if (!process.stdin.isTTY || !process.stdout.isTTY) return;
-  let store;
-  try {
-    store = new Store(resolveDataDir(opts.dataDir));
-    if (resolveFleetConfig(store)) return;
-  } catch (e) {
-    cliErr(`\u63A5\u5165\u68C0\u67E5\u5931\u8D25\uFF1A${e instanceof Error ? e.message : String(e)}`);
-    return;
-  }
-  const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-  try {
-    await runWizard(rl, store, opts);
-  } catch (e) {
-    cliErr(`\u63A5\u5165\u5931\u8D25\uFF1A${e instanceof Error ? e.message : String(e)}`);
-    cliLog("  \u53EF\u7A0D\u540E\u5728\u63A7\u5236\u53F0\u751F\u6210\u63A5\u5165\u7801\uFF0C\u518D\u6267\u884C\uFF1Azqagent link --hub <Hub\u5730\u5740> --code <\u63A5\u5165\u7801>");
-  } finally {
-    rl.close();
-  }
-}
-async function runWizard(rl, store, opts) {
-  cliLog("");
-  cliLog("\u672C\u673A\u5C1A\u672A\u63A5\u5165 Hub\u3002\u53EF\u7528 Hub \u8D26\u53F7\u63A5\u5165\uFF08\u8282\u70B9\u9ED8\u8BA4\u8FDB\u5165\u300C\u672A\u5206\u7EC4\u300D\uFF09\uFF1B\u8F93\u5165 - \u8DF3\u8FC7\u4FDD\u6301\u7EAF\u672C\u5730\u3002");
-  const fallback = resolveDefaultHub(opts.hubUrl);
+async function promptHubUrl(rl, hubUrl2) {
+  const fallback = resolveDefaultHub(hubUrl2);
   const answer = await rl.question(`Hub \u5730\u5740 [${fallback}]\uFF1A`);
-  const hubUrl2 = parseHubAnswer(answer, fallback);
-  if (!hubUrl2) {
-    cliLog("\u5DF2\u8DF3\u8FC7\u63A5\u5165\uFF1A\u8282\u70B9\u4FDD\u6301\u7EAF\u672C\u5730\u8FD0\u884C\u3002");
-    return;
-  }
+  return parseHubAnswer(answer, fallback);
+}
+async function promptAccountLogin(rl, hubUrl2) {
   cliLog("\u767B\u5F55\u65B9\u5F0F\uFF1A1) \u90AE\u7BB1 + \u5BC6\u7801   2) \u624B\u673A\u53F7 + \u5BC6\u7801   3) \u624B\u673A\u53F7 + \u77ED\u4FE1\u9A8C\u8BC1\u7801");
   const mode = (await rl.question("\u8BF7\u9009\u62E9 [1]\uFF1A")).trim() || "1";
   const input = {};
@@ -18545,53 +18639,107 @@ async function runWizard(rl, store, opts) {
     input.password = await askHidden(rl, "\u5BC6\u7801\uFF1A");
     if (!input.email || !input.password) {
       cliErr("\u90AE\u7BB1\u4E0E\u5BC6\u7801\u4E0D\u80FD\u4E3A\u7A7A\uFF0C\u5DF2\u8DF3\u8FC7\u63A5\u5165\u3002");
-      return;
+      return null;
     }
   } else if (mode === "2") {
     input.phone = (await rl.question("\u624B\u673A\u53F7\uFF1A")).trim();
     input.password = await askHidden(rl, "\u5BC6\u7801\uFF1A");
     if (!input.phone || !input.password) {
       cliErr("\u624B\u673A\u53F7\u4E0E\u5BC6\u7801\u4E0D\u80FD\u4E3A\u7A7A\uFF0C\u5DF2\u8DF3\u8FC7\u63A5\u5165\u3002");
-      return;
+      return null;
     }
   } else if (mode === "3") {
     input.phone = (await rl.question("\u624B\u673A\u53F7\uFF1A")).trim();
     if (!input.phone) {
       cliErr("\u624B\u673A\u53F7\u4E0D\u80FD\u4E3A\u7A7A\uFF0C\u5DF2\u8DF3\u8FC7\u63A5\u5165\u3002");
-      return;
+      return null;
     }
     try {
-      const sent = await hubSendSms(hubUrl2, { phone: input.phone, purpose: "login" });
+      const sent = await hubSendSms(resolveDefaultHub(hubUrl2), {
+        phone: input.phone,
+        purpose: "login"
+      });
       if (sent.debugCode) cliLog(`\uFF08\u8C03\u8BD5\u6A21\u5F0F\u9A8C\u8BC1\u7801\uFF1A${sent.debugCode}\uFF09`);
       else cliLog("\u9A8C\u8BC1\u7801\u5DF2\u53D1\u9001\uFF0C5 \u5206\u949F\u5185\u6709\u6548\u3002");
     } catch (e) {
       cliErr(`\u77ED\u4FE1\u9A8C\u8BC1\u7801\u53D1\u9001\u5931\u8D25\uFF1A${e instanceof Error ? e.message : String(e)}`);
       cliLog("  \u53EF\u6539\u7528\u65B9\u5F0F 1/2\uFF08\u5BC6\u7801\u767B\u5F55\uFF09\uFF0C\u6216\u5728\u7F51\u9875\u7AEF\u751F\u6210\u63A5\u5165\u7801\u540E\u6267\u884C\uFF1A");
       cliLog("    zqagent link --hub <Hub\u5730\u5740> --code <\u63A5\u5165\u7801>");
-      return;
+      return null;
     }
     input.code = (await rl.question("\u77ED\u4FE1\u9A8C\u8BC1\u7801\uFF1A")).trim();
     if (!input.code) {
       cliErr("\u9A8C\u8BC1\u7801\u4E0D\u80FD\u4E3A\u7A7A\uFF0C\u5DF2\u8DF3\u8FC7\u63A5\u5165\u3002");
-      return;
+      return null;
     }
   } else {
     cliErr("\u672A\u77E5\u7684\u767B\u5F55\u65B9\u5F0F\uFF0C\u5DF2\u8DF3\u8FC7\u63A5\u5165\u3002");
+    return null;
+  }
+  return input;
+}
+async function promptLinkAccount(rl, hubUrl2, opts = {}) {
+  const fallback = resolveDefaultHub(hubUrl2);
+  let resolved = fallback;
+  if (opts.askHub !== false) {
+    const answer = await promptHubUrl(rl, fallback);
+    if (!answer) {
+      cliLog("\u5DF2\u8DF3\u8FC7\u63A5\u5165\uFF1A\u8282\u70B9\u4FDD\u6301\u7EAF\u672C\u5730\u8FD0\u884C\u3002");
+      return null;
+    }
+    resolved = answer;
+  }
+  const auth = await promptAccountLogin(rl, resolved);
+  if (!auth) return null;
+  return { hubUrl: resolved, auth };
+}
+function resolveDataDir(dataDir) {
+  return path34.resolve(dataDir ?? process.env.DATA_DIR ?? DEFAULT_DATA_DIR);
+}
+async function maybeAccountEnroll(opts = {}) {
+  if (!process.stdin.isTTY || !process.stdout.isTTY) return;
+  let store;
+  try {
+    store = new Store(resolveDataDir(opts.dataDir));
+    if (resolveFleetConfig(store)) return;
+  } catch (e) {
+    cliErr(`\u63A5\u5165\u68C0\u67E5\u5931\u8D25\uFF1A${e instanceof Error ? e.message : String(e)}`);
     return;
   }
+  const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+  try {
+    await runWizard(rl, store, opts);
+  } catch (e) {
+    cliErr(`\u63A5\u5165\u5931\u8D25\uFF1A${e instanceof Error ? e.message : String(e)}`);
+    cliLog("  \u53EF\u7A0D\u540E\u5728\u63A7\u5236\u53F0\u751F\u6210\u63A5\u5165\u7801\uFF0C\u518D\u6267\u884C\uFF1Azqagent link --hub <Hub\u5730\u5740> --code <\u63A5\u5165\u7801>");
+  } finally {
+    rl.close();
+  }
+}
+async function runWizard(rl, store, opts) {
+  cliLog("");
+  cliLog("\u672C\u673A\u5C1A\u672A\u63A5\u5165 Hub\u3002\u53EF\u7528 Hub \u8D26\u53F7\u63A5\u5165\uFF08\u8282\u70B9\u9ED8\u8BA4\u8FDB\u5165\u300C\u672A\u5206\u7EC4\u300D\uFF09\uFF1B\u8F93\u5165 - \u8DF3\u8FC7\u4FDD\u6301\u7EAF\u672C\u5730\u3002");
+  const prompted = await promptLinkAccount(rl, opts.hubUrl);
+  if (!prompted) return;
   const nodeId = ensureNodeId(store);
-  const cred = await hubEnrollByAccount(hubUrl2, { ...input, nodeId, label: opts.label });
+  const label2 = opts.label?.trim() || defaultNodeLabel();
+  const cred = await hubEnrollByAccount(prompted.hubUrl, {
+    ...prompted.auth,
+    nodeId,
+    label: label2
+  });
   store.saveFleetCredential({
     ...cred,
-    label: opts.label ?? cred.label,
+    label: label2,
     enrolledAt: (/* @__PURE__ */ new Date()).toISOString()
   });
+  store.saveNodeLabel(label2);
   cliLog(`\u2705 \u5DF2\u63A5\u5165 Hub\uFF1A\u8282\u70B9 ${cred.nodeId}\uFF08\u7F51\u5173 ${cred.gatewayUrl ?? "\u672A\u4E0B\u53D1"}\uFF09`);
   cliLog("   \u51ED\u636E\u5DF2\u4FDD\u5B58\u5230 fleet.json\uFF0C\u672C\u6B21\u542F\u52A8\u5373\u8FDE\u63A5 Hub\u3002");
 }
 async function askHidden(rl, prompt) {
   if (!process.stdin.isTTY) return (await rl.question(prompt)).trim();
-  return new Promise((resolve19) => {
+  return new Promise((resolve20) => {
     const saved = process.stdin.listeners("data");
     process.stdin.removeAllListeners("data");
     cliWrite(prompt);
@@ -18613,13 +18761,13 @@ async function askHidden(rl, prompt) {
         if (ch === "\r" || ch === "\n") {
           cleanup();
           cliWrite("\n");
-          resolve19(buf);
+          resolve20(buf);
           return;
         }
         if (ch === "") {
           cleanup();
           cliWrite("\n");
-          resolve19("");
+          resolve20("");
           return;
         }
         if (ch === "\x7F" || ch === "\b") {
@@ -18637,6 +18785,40 @@ async function askHidden(rl, prompt) {
   });
 }
 
+// src/cli/link.ts
+init_cjs_shims();
+var readline2 = __toESM(require("readline"), 1);
+
+// src/cli/serve-instances.ts
+init_cjs_shims();
+var import_node_child_process6 = require("child_process");
+var fs30 = __toESM(require("fs"), 1);
+var os10 = __toESM(require("os"), 1);
+var path35 = __toESM(require("path"), 1);
+
+// src/cli/link.ts
+function buildAccountAuth(flags, env3 = process.env) {
+  const username = (flags.username ?? env3.ZQAGENT_HUB_USERNAME ?? "").trim();
+  let email = (flags.email ?? "").trim();
+  let phone = (flags.phone ?? "").trim();
+  if (username && !email && !phone) {
+    if (username.includes("@")) email = username;
+    else phone = username;
+  }
+  if (!email && !phone) return null;
+  const password = flags.password ?? env3.ZQAGENT_HUB_PASSWORD ?? "";
+  const smsCode = (flags.smsCode ?? env3.ZQAGENT_HUB_SMS_CODE ?? "").trim();
+  return {
+    email: email ? email.toLowerCase() : void 0,
+    phone: phone || void 0,
+    password: password || void 0,
+    smsCode: smsCode || void 0
+  };
+}
+function isCompleteAccount(account2) {
+  return Boolean(account2 && (account2.password || account2.smsCode));
+}
+
 // src/server/index.ts
 function arg(name) {
   const i = process.argv.indexOf(`--${name}`);
@@ -18645,13 +18827,22 @@ function arg(name) {
 var hubUrl = (arg("hub") ?? process.env.HUB_URL ?? "").trim();
 var enrollCode = (arg("enroll-code") ?? process.env.HUB_ENROLL_CODE ?? "").trim();
 var label = arg("label")?.trim();
-void maybeAccountEnroll({ dataDir: arg("data-dir"), hubUrl: arg("hub"), label }).finally(() => {
+var account = buildAccountAuth({
+  username: arg("username") ?? arg("user"),
+  email: arg("email"),
+  phone: arg("phone"),
+  password: arg("password"),
+  smsCode: arg("sms-code")
+});
+var autoEnroll = hubUrl && enrollCode ? { hubUrl, code: enrollCode, label } : hubUrl && isCompleteAccount(account) ? { hubUrl, account, label } : null;
+var beforeStart = autoEnroll ? Promise.resolve() : maybeAccountEnroll({ dataDir: arg("data-dir"), hubUrl: arg("hub"), label });
+void beforeStart.finally(() => {
   startServer({
     dataDir: arg("data-dir"),
     port: arg("port") ? Number(arg("port")) : void 0,
     host: arg("host"),
-    // 仅当两者齐备时启用「启动即接入」；已有 fleet.json 时会在 runtime 内被忽略
-    autoEnroll: hubUrl && enrollCode ? { hubUrl, code: enrollCode, label } : null,
+    // 已有 fleet.json 时会在 runtime 内被忽略
+    autoEnroll,
     autoUpdate: true
   });
 });