@zqagent/core 0.2.7 → 0.2.10

package/dist/server/index.js

@@ -5147,10 +5147,10 @@ var OpenAIProvider = class {
     let timer;
     try {
       for (; ; ) {
-        const idle = new Promise((resolve18) => {
+        const idle = new Promise((resolve19) => {
           timer = setTimeout(() => {
             onIdle();
-            resolve18({ timedOut: true });
+            resolve19({ timedOut: true });
           }, idleMs);
         });
         const next = iter.next();
@@ -5778,12 +5778,12 @@ function makeSink(maxBuffer) {
   };
 }
 function execAsync(file, argv, opts = {}) {
-  return new Promise((resolve18) => {
+  return new Promise((resolve19) => {
     const maxBuffer = opts.maxBuffer ?? DEFAULT_MAX_BUFFER;
     const out = makeSink(maxBuffer);
     const err = makeSink(maxBuffer);
     if (opts.signal?.aborted) {
-      resolve18({
+      resolve19({
         status: null,
         stdout: Buffer.alloc(0),
         stderr: Buffer.alloc(0),
@@ -5804,7 +5804,7 @@ function execAsync(file, argv, opts = {}) {
         windowsHide: true
       });
     } catch (e) {
-      resolve18({
+      resolve19({
         status: null,
         stdout: Buffer.alloc(0),
         stderr: Buffer.alloc(0),
@@ -5841,7 +5841,7 @@ function execAsync(file, argv, opts = {}) {
       };
       if (aborted) result.aborted = true;
       if (spawnError) result.error = spawnError;
-      resolve18(result);
+      resolve19(result);
     };
     const killAndSettle = () => {
       killTree(child.pid);
@@ -9840,11 +9840,11 @@ function isAffirmative(answer) {
   return /^(yes|approve|同意|批准|允许|确定|可以|好的|确认)/.test(a);
 }
 function defer() {
-  let resolve18;
+  let resolve19;
   const promise = new Promise((r) => {
-    resolve18 = r;
+    resolve19 = r;
   });
-  return { promise, resolve: resolve18 };
+  return { promise, resolve: resolve19 };
 }
 var SessionManager = class {
   constructor(store, approvalTimeoutMs = APPROVAL_TIMEOUT_MS, opts = {}) {
@@ -10416,11 +10416,11 @@ data: ${JSON.stringify({ sessionId, seq: entry.seq, ts: entry.ts, data: entry.da
         status: "pending",
         createdAt: (/* @__PURE__ */ new Date()).toISOString()
       };
-      const { promise, resolve: resolve18 } = defer();
+      const { promise, resolve: resolve19 } = defer();
       const timer = setTimeout(() => {
         this._recycleApproval(rt, id);
       }, this.approvalTimeoutMs);
-      rt.pendingApprovals.set(id, { promise, resolve: resolve18, record, timer });
+      rt.pendingApprovals.set(id, { promise, resolve: resolve19, record, timer });
       rt.approvals.set(id, record);
       this._setStatus(rt, "waiting_approval");
       this._persist(rt);
@@ -10498,11 +10498,11 @@ data: ${JSON.stringify({ sessionId, seq: entry.seq, ts: entry.ts, data: entry.da
       status: "pending",
       createdAt: (/* @__PURE__ */ new Date()).toISOString()
     };
-    const { promise, resolve: resolve18 } = defer();
+    const { promise, resolve: resolve19 } = defer();
     const timer = setTimeout(() => {
       this._recycleQuestion(rt, qid);
     }, this.approvalTimeoutMs);
-    rt.pendingQuestions.set(qid, { promise, resolve: resolve18, record, timer });
+    rt.pendingQuestions.set(qid, { promise, resolve: resolve19, record, timer });
     rt.questions.set(qid, record);
     this._setStatus(rt, "waiting_question");
     this._persist(rt);
@@ -10811,7 +10811,7 @@ data: ${JSON.stringify(entry.data)}
         if (rt.mcpReady) {
           await Promise.race([
             rt.mcpReady,
-            new Promise((resolve18) => setTimeout(resolve18, 15e3))
+            new Promise((resolve19) => setTimeout(resolve19, 15e3))
           ]).catch(() => void 0);
         }
         for await (const event of gen) {
@@ -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.7",
+    version: "0.2.10",
     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.7",
+    version: "0.2.10",
     mode: process.env.NODE_MODE ?? "standalone",
     cpu: {
       count: cpus2.length,
@@ -12433,7 +12433,7 @@ function saveNotifications(tenant, secretBox, notifications) {
 var API_PREFIX = "/api/v1";
 var MAX_BODY_BYTES = 10 * 1024 * 1024;
 function readBody(req2) {
-  return new Promise((resolve18, reject) => {
+  return new Promise((resolve19, reject) => {
     const chunks = [];
     let size = 0;
     req2.on("data", (c) => {
@@ -12446,9 +12446,9 @@ function readBody(req2) {
       chunks.push(c);
     });
     req2.on("end", () => {
-      if (chunks.length === 0) return resolve18(void 0);
+      if (chunks.length === 0) return resolve19(void 0);
       try {
-        resolve18(JSON.parse(Buffer.concat(chunks).toString("utf-8")));
+        resolve19(JSON.parse(Buffer.concat(chunks).toString("utf-8")));
       } catch {
         reject(new ApiError(400, "bad_request", "\u8BF7\u6C42\u4F53\u4E0D\u662F\u5408\u6CD5 JSON"));
       }
@@ -12964,8 +12964,18 @@ function createApp(store, manager, opts = {}) {
         applyProvidersPatch(tenant, raw);
         if (typeof raw.workspaceRoot === "string") {
           const ws = raw.workspaceRoot.trim();
-          if (ws) tenant.workspaceRoot = path26.resolve(ws);
-          else delete tenant.workspaceRoot;
+          const next = ws ? path26.resolve(ws) : void 0;
+          if (tenant.workspaceRoot) {
+            if (next !== tenant.workspaceRoot) {
+              throw new ApiError(
+                409,
+                "workspace_locked",
+                "\u8BE5\u9879\u76EE\u5DF2\u8BBE\u7F6E\u5DE5\u4F5C\u76EE\u5F55\uFF0C\u4E0D\u80FD\u518D\u4FEE\u6539"
+              );
+            }
+          } else if (next) {
+            tenant.workspaceRoot = next;
+          }
         }
         if (typeof raw.name === "string" && raw.name.trim()) {
           tenant.name = raw.name.trim();
@@ -13941,7 +13951,7 @@ function createApp(store, manager, opts = {}) {
       json(res, 200, {
         status: "ok",
         // 版本让运维/探针能确认线上跑的是哪个构建（更新与回滚据此判断）
-        version: "0.2.7",
+        version: "0.2.10",
         features: { mcp: hasServerMcpConfig() }
       });
       return;
@@ -14057,8 +14067,8 @@ async function cachedFetchModels(baseURL, apiKey) {
   try {
     result = await Promise.race([
       fetchModels(baseURL, apiKey),
-      new Promise((resolve18) => {
-        const t = setTimeout(() => resolve18(null), MODEL_FETCH_TIMEOUT_MS);
+      new Promise((resolve19) => {
+        const t = setTimeout(() => resolve19(null), MODEL_FETCH_TIMEOUT_MS);
         t.unref?.();
       })
     ]);
@@ -14083,8 +14093,8 @@ async function cachedFetchModelsEnriched(baseURL, apiKey, preferred) {
   if (!target) return r;
   const ctx = await Promise.race([
     fetchModelContext(baseURL, apiKey, target),
-    new Promise((resolve18) => {
-      const t = setTimeout(() => resolve18(void 0), MODEL_FETCH_TIMEOUT_MS);
+    new Promise((resolve19) => {
+      const t = setTimeout(() => resolve19(void 0), MODEL_FETCH_TIMEOUT_MS);
       t.unref?.();
     })
   ]);
@@ -15278,13 +15288,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((resolve18, reject) => {
+  return new Promise((resolve19, reject) => {
     const timer = setTimeout(() => reject(new Error(`\u5B50\u6307\u4EE4\u8D85\u65F6\uFF08${ms}ms\uFF09`)), ms);
     timer.unref?.();
     p.then(
       (v) => {
         clearTimeout(timer);
-        resolve18(v);
+        resolve19(v);
       },
       (e) => {
         clearTimeout(timer);
@@ -15644,7 +15654,7 @@ var FleetNodeBridge = class {
       label: this.opts.deps.store.loadNodeLabel() ?? void 0,
       platform: process.platform,
       mode: process.env.NODE_MODE ?? "standalone",
-      version: "0.2.7",
+      version: "0.2.10",
       ip: primaryIp()
     };
   }
@@ -15699,7 +15709,7 @@ var FleetNodeBridge = class {
         label: this.opts.deps.store.loadNodeLabel() ?? void 0,
         platform: process.platform,
         mode: process.env.NODE_MODE ?? "standalone",
-        version: "0.2.7",
+        version: "0.2.10",
         ip: primaryIp(),
         projects,
         totals,
@@ -17228,8 +17238,10 @@ var PLATFORM_NAMES = {
   linux: "linux",
   win32: "windows"
 };
+var LIBC_VARIANT = "";
 function platformKey(platform = process.platform, arch = process.arch) {
-  return `${PLATFORM_NAMES[platform] ?? platform}-${arch}`;
+  const base = `${PLATFORM_NAMES[platform] ?? platform}-${arch}`;
+  return LIBC_VARIANT ? `${base}-${LIBC_VARIANT}` : base;
 }
 var SHA256_HEX = /^[0-9a-f]{64}$/;
 function isRecord(v) {
@@ -17416,10 +17428,12 @@ function selfCheck(binPath, expectedVersion) {
 // src/update/platform.ts
 init_esm_shims();
 import * as fs25 from "fs";
+import * as os8 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.7"?.trim();
+  const injected = "0.2.10"?.trim();
   if (injected) return injected;
   try {
     const req2 = createRequire3(import.meta.url);
@@ -17435,6 +17449,7 @@ function isSeaRuntime() {
   return base !== "node" && base !== "nodejs";
 }
 var DEFAULT_SERVICE_NAME = "zqagent";
+var DEFAULT_SERVICE_LABEL = "com.zqagent.node";
 function serviceManagerFromCgroup(cgroup, serviceName = DEFAULT_SERVICE_NAME) {
   const unitName = `${serviceName}.service`;
   for (const line of cgroup.split("\n")) {
@@ -17445,7 +17460,46 @@ function serviceManagerFromCgroup(cgroup, serviceName = DEFAULT_SERVICE_NAME) {
   }
   return null;
 }
+function launchdDomain() {
+  const uid = typeof process.getuid === "function" ? process.getuid() : -1;
+  return uid === 0 ? "system" : `gui/${uid}`;
+}
+function launchdLabel() {
+  return process.env.ZQAGENT_SERVICE_LABEL?.trim() || DEFAULT_SERVICE_LABEL;
+}
+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`);
+}
+function serviceManagerFromLaunchctl(output, pid, execPath, sea = true) {
+  const pidMatch = /^\s*pid = (\d+)\s*$/m.exec(output);
+  if (pidMatch && Number(pidMatch[1]) === pid) return "launchd";
+  const program = /^\s*program = (.+?)\s*$/m.exec(output);
+  if (program) {
+    const shown = program[1].replace(/^"|"$/g, "");
+    if (path30.resolve(shown) === path30.resolve(execPath)) return "launchd";
+  }
+  if (!sea && /^\s*state = /m.test(output)) return "launchd";
+  return null;
+}
+function parseLaunchdEnvironment(xml) {
+  const out = {};
+  const marker = xml.indexOf("<key>EnvironmentVariables</key>");
+  if (marker < 0) return out;
+  const open = xml.indexOf("<dict>", marker);
+  if (open < 0) return out;
+  const close = xml.indexOf("</dict>", open);
+  if (close < 0) return out;
+  const body = xml.slice(open + "<dict>".length, close);
+  for (const m of body.matchAll(/<key>([^<]+)<\/key>\s*<string>([^<]*)<\/string>/g)) {
+    out[m[1]] = m[2];
+  }
+  return out;
+}
 function detectServiceManager() {
+  if (process.platform === "darwin") return detectLaunchd();
   if (process.platform !== "linux") return null;
   const serviceName = process.env.ZQAGENT_SERVICE_NAME?.trim() || DEFAULT_SERVICE_NAME;
   try {
@@ -17457,11 +17511,71 @@ function detectServiceManager() {
     return null;
   }
 }
+function detectLaunchd() {
+  try {
+    const res = spawnSync3(
+      "launchctl",
+      ["print", `${launchdDomain()}/${launchdLabel()}`],
+      { encoding: "utf8", timeout: 3e3 }
+    );
+    if (res.status !== 0 || !res.stdout) return null;
+    return serviceManagerFromLaunchctl(
+      res.stdout,
+      process.pid,
+      process.execPath,
+      isSeaRuntime()
+    );
+  } catch {
+    return null;
+  }
+}
 function serviceManager() {
   const v = process.env.ZQAGENT_SERVICE_MANAGER?.trim().toLowerCase();
   if (v === "systemd" || v === "launchd") return v;
   return detectServiceManager();
 }
+function parseServiceEnvironment(raw) {
+  const out = {};
+  for (const token of raw.trim().split(/\s+/)) {
+    const idx = token.indexOf("=");
+    if (idx > 0) out[token.slice(0, idx)] = token.slice(idx + 1);
+  }
+  return out;
+}
+var cachedServiceEnv = null;
+function readServiceEnvironment() {
+  const serviceName = process.env.ZQAGENT_SERVICE_NAME?.trim() || DEFAULT_SERVICE_NAME;
+  try {
+    const res = spawnSync3(
+      "systemctl",
+      ["show", serviceName, "--property=Environment", "--value", "--no-pager"],
+      { encoding: "utf8", timeout: 3e3 }
+    );
+    if (res.status !== 0 || !res.stdout) return {};
+    return parseServiceEnvironment(res.stdout);
+  } catch {
+    return {};
+  }
+}
+function serviceEnvValue(key) {
+  if (process.platform === "darwin") {
+    if (serviceManager() !== "launchd") return void 0;
+    cachedLaunchdEnv ??= readLaunchdEnvironment();
+    return cachedLaunchdEnv[key];
+  }
+  if (process.platform !== "linux") return void 0;
+  if (serviceManager() !== "systemd") return void 0;
+  cachedServiceEnv ??= readServiceEnvironment();
+  return cachedServiceEnv[key];
+}
+var cachedLaunchdEnv = null;
+function readLaunchdEnvironment() {
+  try {
+    return parseLaunchdEnvironment(fs25.readFileSync(launchdPlistPath(), "utf8"));
+  } catch {
+    return {};
+  }
+}
 function selfUpdateCapability(hasPublicKey) {
   if (!isSeaRuntime()) {
     return {
@@ -17614,7 +17728,9 @@ function readRollbackTarget(dataDir) {
 var DEFAULT_BASE = "https://agent.cd-zq.com/downloads/zqagent";
 function env(key) {
   const v = process.env[key]?.trim();
-  return v ? v : void 0;
+  if (v) return v;
+  const fromService = serviceEnvValue(key)?.trim();
+  return fromService ? fromService : void 0;
 }
 function num(key, fallback) {
   const n = Number(env(key));
@@ -17651,7 +17767,7 @@ var UpdateController = class {
     return parsePublicKey(env("ZQAGENT_UPDATE_PUBKEY") ?? "");
   }
   get autoUpdateOff() {
-    return process.env.ZQAGENT_AUTO_UPDATE?.trim() === "0";
+    return env("ZQAGENT_AUTO_UPDATE") === "0";
   }
   get enabled() {
     return !this.autoUpdateOff && selfUpdateCapability(Boolean(this.publicKey)).ok;
@@ -17844,11 +17960,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((resolve18) => {
+    return new Promise((resolve19) => {
       const timer = setInterval(() => {
         if (this.stopped) {
           clearInterval(timer);
-          resolve18(false);
+          resolve19(false);
           return;
         }
         if (Date.now() - this.startedAt < minUptime || !this.opts.isIdle()) {
@@ -17858,7 +17974,7 @@ var UpdateController = class {
         idleSince ??= Date.now();
         if (Date.now() - idleSince >= idleMs) {
           clearInterval(timer);
-          resolve18(true);
+          resolve19(true);
         }
       }, 1e3);
       timer.unref();
@@ -18039,6 +18155,46 @@ function exitWhenOrphaned() {
   }, 1500);
   timer.unref();
 }
+var PORT_FALLBACK_LIMIT = 20;
+function listenWithPortFallback(server, startPort, host, dataDir, limit = PORT_FALLBACK_LIMIT) {
+  return new Promise((resolve19, reject) => {
+    let attempts = 0;
+    const tryListen = (port) => {
+      server.removeAllListeners("listening");
+      const onError = (err) => {
+        if (err.code === "EADDRINUSE" && attempts < limit) {
+          attempts += 1;
+          const next = port + 1;
+          console.warn(`[server] \u7AEF\u53E3 ${port} \u5DF2\u88AB\u5360\u7528\uFF08EADDRINUSE\uFF09\uFF0C\u5C1D\u8BD5 ${next} \u2026`);
+          tryListen(next);
+          return;
+        }
+        server.removeListener("error", onError);
+        console.error(
+          `[server] \u65E0\u6CD5\u76D1\u542C ${host}:${port}\uFF1A${err.message}` + (err.code === "EADDRINUSE" ? `\uFF08\u5DF2\u5C1D\u8BD5 ${attempts + 1} \u4E2A\u7AEF\u53E3\u5747\u88AB\u5360\u7528\uFF09` : "")
+        );
+        reject(err);
+      };
+      server.once("error", onError);
+      server.listen(port, host, () => {
+        server.removeListener("error", onError);
+        const addr = server.address();
+        const actualPort = typeof addr === "object" && addr !== null ? addr.port : port;
+        if (actualPort !== startPort) {
+          console.warn(`[server] \u5DF2\u6539\u7528\u7AEF\u53E3 ${actualPort}\uFF08\u539F\u5B9A ${startPort} \u88AB\u5360\u7528\uFF09`);
+        }
+        try {
+          fs29.mkdirSync(dataDir, { recursive: true });
+          fs29.writeFileSync(path34.join(dataDir, "server-port"), `${actualPort}
+`);
+        } catch {
+        }
+        resolve19(actualPort);
+      });
+    };
+    tryListen(startPort);
+  });
+}
 function startServer(opts = {}) {
   const dataDir = path34.resolve(opts.dataDir ?? env2("DATA_DIR") ?? DEFAULT_DATA_DIR);
   const port = opts.port ?? Number(env2("PORT") ?? 8787);
@@ -18264,11 +18420,11 @@ function startServer(opts = {}) {
   server.timeout = 0;
   server.keepAliveTimeout = 65e3;
   server.headersTimeout = 66e3;
-  const ready = new Promise((resolve18) => {
-    server.listen(port, host, () => {
+  const ready = new Promise((resolve19, reject) => {
+    listenWithPortFallback(server, port, host, dataDir).then((actualPort) => {
       const info = {
         host,
-        port,
+        port: actualPort,
         dataDir,
         adminKey,
         fleetNodeId: fleet ? fleet.getNodeId() : void 0,
@@ -18281,8 +18437,8 @@ function startServer(opts = {}) {
         printReady(info, qq);
       }
       updater?.start();
-      resolve18(info);
-    });
+      resolve19(info);
+    }, reject);
   });
   return {
     store,
@@ -18418,7 +18574,7 @@ async function runWizard(rl, store, opts) {
 }
 async function askHidden(rl, prompt) {
   if (!process.stdin.isTTY) return (await rl.question(prompt)).trim();
-  return new Promise((resolve18) => {
+  return new Promise((resolve19) => {
     const saved = process.stdin.listeners("data");
     process.stdin.removeAllListeners("data");
     cliWrite(prompt);
@@ -18440,13 +18596,13 @@ async function askHidden(rl, prompt) {
         if (ch === "\r" || ch === "\n") {
           cleanup();
           cliWrite("\n");
-          resolve18(buf);
+          resolve19(buf);
           return;
         }
         if (ch === "") {
           cleanup();
           cliWrite("\n");
-          resolve18("");
+          resolve19("");
           return;
         }
         if (ch === "\x7F" || ch === "\b") {