@zqagent/core 0.2.12 → 0.2.15

package/dist/server/index.js

@@ -11396,7 +11396,7 @@ function buildNodeInfo(store, opts) {
     nodeId: opts.nodeId ?? ensureNodeId(store),
     platform: process.platform,
     mode: process.env.NODE_MODE ?? "standalone",
-    version: "0.2.12",
+    version: "0.2.15",
     admin: opts.admin,
     projects: opts.projects
   };
@@ -12389,7 +12389,7 @@ function buildNodeHost(store, manager, diskPath) {
     arch: process.arch,
     release: os6.release(),
     uptimeSec: Math.round(os6.uptime()),
-    version: "0.2.12",
+    version: "0.2.15",
     mode: process.env.NODE_MODE ?? "standalone",
     cpu: {
       count: cpus2.length,
@@ -12759,6 +12759,24 @@ function createApp(store, manager, opts = {}) {
         ok(res, opts.fleet.status());
       }
     },
+    // 修改本机节点显示名：写本地配置并立即上报；已接入 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",
@@ -13978,7 +13996,7 @@ function createApp(store, manager, opts = {}) {
       json(res, 200, {
         status: "ok",
         // 版本让运维/探针能确认线上跑的是哪个构建（更新与回滚据此判断）
-        version: "0.2.12",
+        version: "0.2.15",
         features: { mcp: hasServerMcpConfig() }
       });
       return;
@@ -15672,6 +15690,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 {
@@ -15681,7 +15704,7 @@ var FleetNodeBridge = class {
       label: this.opts.deps.store.loadNodeLabel() ?? void 0,
       platform: process.platform,
       mode: process.env.NODE_MODE ?? "standalone",
-      version: "0.2.12",
+      version: "0.2.15",
       ip: primaryIp()
     };
   }
@@ -15700,7 +15723,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) => {
@@ -15727,7 +15766,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",
@@ -15736,7 +15783,7 @@ var FleetNodeBridge = class {
         label: this.opts.deps.store.loadNodeLabel() ?? void 0,
         platform: process.platform,
         mode: process.env.NODE_MODE ?? "standalone",
-        version: "0.2.12",
+        version: "0.2.15",
         ip: primaryIp(),
         projects,
         totals,
@@ -15946,6 +15993,14 @@ function resolveFleetConfig(store) {
   return fleetConfigFromEnv(store);
 }
 
+// src/node-name.ts
+init_esm_shims();
+import * as os8 from "os";
+function defaultNodeLabel() {
+  const name = os8.hostname().trim();
+  return name || "zqagent-node";
+}
+
 // src/server/notify/index.ts
 init_esm_shims();
 
@@ -17196,6 +17251,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_esm_shims();
@@ -17455,12 +17516,12 @@ function selfCheck(binPath, expectedVersion) {
 // src/update/platform.ts
 init_esm_shims();
 import * as fs25 from "fs";
-import * as os8 from "os";
+import * as os9 from "os";
 import * as path30 from "path";
 import { spawnSync as spawnSync3 } from "child_process";
 import { createRequire as createRequire3 } from "module";
 function currentVersion() {
-  const injected = "0.2.12"?.trim();
+  const injected = "0.2.15"?.trim();
   if (injected) return injected;
   try {
     const req2 = createRequire3(import.meta.url);
@@ -17498,7 +17559,7 @@ function launchdPlistPath() {
   const label2 = launchdLabel();
   const uid = typeof process.getuid === "function" ? process.getuid() : -1;
   if (uid === 0) return `/Library/LaunchDaemons/${label2}.plist`;
-  return path30.join(os8.homedir(), "Library", "LaunchAgents", `${label2}.plist`);
+  return path30.join(os9.homedir(), "Library", "LaunchAgents", `${label2}.plist`);
 }
 function serviceManagerFromLaunchctl(output, pid, execPath, sea = true) {
   const pidMatch = /^\s*pid = (\d+)\s*$/m.exec(output);
@@ -18294,7 +18355,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
     };
@@ -18303,27 +18364,53 @@ function startServer(opts = {}) {
     status: fleetStatus,
     async enroll(input) {
       const nodeId = ensureNodeId(store);
+      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: input.label
+        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;
@@ -18618,16 +18705,18 @@ async function runWizard(rl, store, opts) {
   const prompted = await promptLinkAccount(rl, opts.hubUrl);
   if (!prompted) return;
   const nodeId = ensureNodeId(store);
+  const label2 = opts.label?.trim() || defaultNodeLabel();
   const cred = await hubEnrollByAccount(prompted.hubUrl, {
     ...prompted.auth,
     nodeId,
-    label: opts.label
+    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");
 }
@@ -18687,7 +18776,7 @@ import * as readline2 from "readline";
 init_esm_shims();
 import { spawnSync as spawnSync4 } from "child_process";
 import * as fs30 from "fs";
-import * as os9 from "os";
+import * as os10 from "os";
 import * as path36 from "path";
 
 // src/cli/link.ts