zdashboard 2.9.0 → 2.11.0

package/dist/cli.js

@@ -5,45 +5,11 @@ import path9 from "path";
 import fs9 from "fs";
 import { fileURLToPath as fileURLToPath2 } from "url";
 import { access, readdir } from "fs/promises";
-import { parseArgs as utilParseArgs } from "util";
-
-// src/server/detect.ts
-import fs from "fs";
-import path from "path";
-import { execFile } from "child_process";
-var JUST_PROBE_TIMEOUT_MS = 5e3;
-var JUST_FALLBACK_TIMEOUT_MS = 3e3;
-function justAvailable(cwd) {
-  const probe = (args, timeout) => new Promise((resolve) => {
-    const child = execFile("just", args, { cwd, timeout }, (err) => resolve(!err));
-    if (child.killed) resolve(false);
-  });
-  return probe(["--list", "--unsupported"], JUST_PROBE_TIMEOUT_MS).then((ok) => ok ? true : probe(["--version"], JUST_FALLBACK_TIMEOUT_MS));
-}
-async function detect(root) {
-  const hasOpenspec = fs.existsSync(path.join(root, "openspec"));
-  const hasDocs = fs.existsSync(path.join(root, "docs"));
-  const hasJust = await justAvailable(root);
-  return { hasOpenspec, hasDocs, hasJust };
-}
-async function detectLiveShape(root) {
-  return detect(root);
-}
-
-// src/cli.ts
-import { Context } from "cordis";
-
-// src/core/server.ts
-import http from "http";
-import fs3 from "fs";
-import path3 from "path";
-import crypto from "crypto";
-import { fileURLToPath } from "url";
 
 // package.json
 var package_default = {
   name: "zdashboard",
-  version: "2.9.0",
+  version: "2.11.0",
   description: "ZCode skill dashboard platform \u2014 pluggable viewers for zdesign/zview/zreview/zgoal",
   type: "module",
   bin: {
@@ -134,12 +100,47 @@ var package_default = {
   }
 };
 
+// src/cli.ts
+import { parseArgs as utilParseArgs } from "util";
+
+// src/server/detect.ts
+import fs from "fs";
+import path from "path";
+import { execFile } from "child_process";
+var JUST_PROBE_TIMEOUT_MS = 5e3;
+var JUST_FALLBACK_TIMEOUT_MS = 3e3;
+function justAvailable(cwd) {
+  const probe = (args, timeout) => new Promise((resolve) => {
+    const child = execFile("just", args, { cwd, timeout }, (err) => resolve(!err));
+    if (child.killed) resolve(false);
+  });
+  return probe(["--list", "--unsupported"], JUST_PROBE_TIMEOUT_MS).then((ok) => ok ? true : probe(["--version"], JUST_FALLBACK_TIMEOUT_MS));
+}
+async function detect(root) {
+  const hasOpenspec = fs.existsSync(path.join(root, "openspec"));
+  const hasDocs = fs.existsSync(path.join(root, "docs"));
+  const hasJust = await justAvailable(root);
+  return { hasOpenspec, hasDocs, hasJust };
+}
+async function detectLiveShape(root) {
+  return detect(root);
+}
+
+// src/cli.ts
+import { Context } from "cordis";
+
 // src/core/server.ts
+import http from "http";
+import fs3 from "fs";
+import path3 from "path";
+import crypto from "crypto";
+import { fileURLToPath } from "url";
 import { Service } from "cordis";
 
 // src/core/instance.ts
 import fs2 from "fs";
 import path2 from "path";
+var CURRENT_VERSION = package_default.version;
 var RECORD_FILE = ".zdev/dashboard.json";
 var VERIFY_TIMEOUT_MS = 1500;
 var STOP_POLL_MS = 2e3;
@@ -169,7 +170,8 @@ function writeRecord(root, port) {
     pid: process.pid,
     port,
     root,
-    startedAt: (/* @__PURE__ */ new Date()).toISOString()
+    startedAt: (/* @__PURE__ */ new Date()).toISOString(),
+    version: CURRENT_VERSION
   };
   if (old?.plugins && typeof old.plugins === "object") {
     rec.plugins = old.plugins;
@@ -269,20 +271,27 @@ async function fetchWithTimeout(url) {
 async function verifyRoot(port, root) {
   try {
     const res = await fetchWithTimeout(`http://127.0.0.1:${port}/__config`);
-    if (res.status !== 200) return false;
+    if (res.status !== 200) return { reusable: false };
     const body = await res.json();
-    if (typeof body.root !== "string") return false;
-    return body.root === root;
+    if (typeof body.root !== "string") return { reusable: false };
+    return {
+      reusable: body.root === root,
+      version: typeof body.version === "string" ? body.version : void 0
+    };
   } catch {
-    return false;
+    return { reusable: false };
   }
 }
-async function findReusable(root) {
+async function findReusable(root, currentVersion) {
   const rec = readRecord(root);
   if (!rec) return null;
   if (!isAlive(rec.pid)) return null;
-  if (!await verifyRoot(rec.port, root)) return null;
-  return rec;
+  const v = await verifyRoot(rec.port, root);
+  if (!v.reusable) return null;
+  if (v.version && v.version !== currentVersion) {
+    return { status: "stale-version", record: rec, liveVersion: v.version };
+  }
+  return { status: "reuse", record: rec };
 }
 async function stopInstance(record) {
   try {
@@ -377,6 +386,25 @@ function json(res, data, status = 200) {
   res.writeHead(status, { "Content-Type": "application/json; charset=utf-8", "Cache-Control": "no-cache" });
   res.end(JSON.stringify(data));
 }
+var ERROR_PAGE_TEXT = {
+  400: "\u8BF7\u6C42\u65E0\u6548",
+  403: "\u6CA1\u6709\u8BBF\u95EE\u6743\u9650",
+  404: "\u9875\u9762\u4E0D\u5B58\u5728"
+};
+function sendErrorPage(res, code) {
+  if (res.headersSent) {
+    try {
+      res.destroy();
+    } catch {
+    }
+    return;
+  }
+  const text = ERROR_PAGE_TEXT[code] ?? "\u51FA\u9519\u4E86";
+  res.writeHead(code, { "Content-Type": "text/html; charset=utf-8" });
+  res.end(
+    `<!doctype html><html lang="zh-CN"><head><meta charset="utf-8"><title>${code} ${text} \xB7 zdashboard</title></head><body><h1>${code} \xB7 ${text}</h1><p>\u8BF7\u6C42\u7684\u8D44\u6E90\u4E0D\u53EF\u7528\u6216\u5DF2\u88AB\u79FB\u52A8\u3002</p><p><a href="/">\u8FD4\u56DE\u9996\u9875</a></p></body></html>`
+  );
+}
 function guarded(req, res, token) {
   if (req.headers["x-stop-token"] !== token) {
     res.writeHead(403);
@@ -476,10 +504,14 @@ var ServerService = class extends Service {
     writePluginsConfig(this.root, merged);
   }
   serveFile(filePath, req, res, injectHtml) {
+    const apiPath = (req.url || "").startsWith("/__");
     fs3.stat(filePath, (err, stat) => {
       if (err) {
-        res.writeHead(404);
-        return res.end("Not found");
+        if (apiPath) {
+          res.writeHead(404);
+          return res.end("Not found");
+        }
+        return sendErrorPage(res, 404);
       }
       const ext = path3.extname(filePath).toLowerCase();
       const ct = MIME[ext] ?? "application/octet-stream";
@@ -517,8 +549,11 @@ var ServerService = class extends Service {
       }
       fs3.readFile(filePath, (err2, data) => {
         if (err2) {
-          res.writeHead(404);
-          return res.end("Not found");
+          if (apiPath) {
+            res.writeHead(404);
+            return res.end("Not found");
+          }
+          return sendErrorPage(res, 404);
         }
         let body = data;
         if (injectHtml && ext === ".html") {
@@ -585,22 +620,26 @@ var ServerService = class extends Service {
         if (url !== "/") fp2 = path3.join(this.appDir, this.safeDecode(url));
         if (url.indexOf("/__app/") === 0) fp2 = path3.join(this.appDir, url.slice(7));
         if (fp2 !== this.appDir && fp2.indexOf(this.appDir + path3.sep) !== 0) {
-          res.writeHead(403);
-          return res.end("Forbidden");
+          return sendErrorPage(res, 403);
         }
         if (url === "/") fp2 = path3.join(this.appDir, "index.html");
         return this.serveFile(fp2, req, res, false);
       }
       const fp = path3.join(this.root, this.safeDecode(url));
       if (fp !== this.root && fp.indexOf(this.root + path3.sep) !== 0) {
-        res.writeHead(403);
-        return res.end("Forbidden");
+        if ((req.url || "").startsWith("/__")) {
+          res.writeHead(403);
+          return res.end("Forbidden");
+        }
+        return sendErrorPage(res, 403);
       }
       return this.serveFile(fp, req, res, true);
     } catch (e) {
       try {
-        res.writeHead(400);
-        res.end("bad request");
+        if ((req.url || "").startsWith("/__")) {
+          res.writeHead(400);
+          res.end("bad request");
+        } else sendErrorPage(res, 400);
       } catch {
       }
       console.error("[zdashboard] handler error", e);
@@ -1046,9 +1085,66 @@ var DashboardService = class extends Service3 {
   }
 };
 
+// src/plugins/just/index.ts
+import { execFile as execFile6 } from "child_process";
+
 // src/server/just-runner.ts
 import { spawn, execFile as execFile5 } from "child_process";
 import iconv from "iconv-lite";
+
+// src/server/just-recipe-params.ts
+var NAME_RE = /^[A-Za-z_][A-Za-z0-9_-]*/;
+function parseRecipeSignature(line) {
+  let s = line.trim();
+  if (s.startsWith("@")) s = s.slice(1).trimStart();
+  const nameMatch = NAME_RE.exec(s);
+  if (!nameMatch) return null;
+  const name = nameMatch[0];
+  const params = [];
+  let i = name.length;
+  while (true) {
+    while (i < s.length && /\s/.test(s[i])) i++;
+    if (i >= s.length) return null;
+    if (s[i] === ":") {
+      const rest = s.slice(i + 1).trim();
+      if (rest === "" || rest.startsWith("#")) return { name, params };
+      return null;
+    }
+    let j = i;
+    if (s[j] === "+" || s[j] === "$") j++;
+    const pm = NAME_RE.exec(s.slice(j));
+    if (!pm) return null;
+    j += pm[0].length;
+    if (s[j] === "=") {
+      j++;
+      if (s[j] === '"' || s[j] === "'") {
+        const quote = s[j];
+        j++;
+        while (j < s.length && s[j] !== quote) j++;
+        if (j >= s.length) return null;
+        j++;
+      } else {
+        while (j < s.length && !/\s/.test(s[j]) && s[j] !== ":") j++;
+      }
+    }
+    params.push(pm[0]);
+    i = j;
+  }
+}
+function buildJustArgv(recipe, args) {
+  if (!args) return [recipe];
+  return [recipe, ...Object.entries(args).map(([k, v]) => `${k}=${v}`)];
+}
+function pickStringArgs(args) {
+  if (typeof args !== "object" || args === null) return void 0;
+  const out = {};
+  for (const [k, v] of Object.entries(args)) {
+    if (typeof v === "string") out[k] = v;
+  }
+  return Object.keys(out).length > 0 ? out : void 0;
+}
+
+// src/server/just-runner.ts
 var MAX_BUFFER = 1e3;
 var utf8Strict = new TextDecoder("utf-8", { fatal: true });
 function decodeLine(buf) {
@@ -1063,6 +1159,8 @@ var JustRunner = class {
   tasks = /* @__PURE__ */ new Map();
   clients = /* @__PURE__ */ new Set();
   recipesCache = null;
+  /** recipe 参数清单进程内缓存(含失败空数组),避免反复 just --show 探测 */
+  paramsCache = /* @__PURE__ */ new Map();
   constructor(cwd) {
     this.cwd = cwd;
   }
@@ -1092,6 +1190,24 @@ var JustRunner = class {
       });
     });
   }
+  /** 懒解析单 recipe 参数:just --show 输出中首个可解析签名行(跳过 recipe 上方注释/空行)→ 参数名;失败记空数组并缓存 */
+  recipeParams(name) {
+    const hit = this.paramsCache.get(name);
+    if (hit) return Promise.resolve(hit);
+    return new Promise((resolve) => {
+      execFile5("just", ["--show", name], { cwd: this.cwd, maxBuffer: 1 << 20, timeout: 8e3 }, (err, stdout) => {
+        const sig = err ? null : stdout.split(/\r?\n/).map((l) => parseRecipeSignature(l)).find(Boolean) ?? null;
+        const params = sig?.params ?? [];
+        this.paramsCache.set(name, params);
+        resolve(params);
+      });
+    });
+  }
+  /** recipes 列表附参数清单(参数探测逐 recipe 并发,进程内缓存后零开销) */
+  async recipesWithParams() {
+    const list = await this.recipes();
+    return Promise.all(list.map(async (r) => ({ ...r, params: await this.recipeParams(r.name) })));
+  }
   subscribe(fn) {
     this.clients.add(fn);
     for (const t of this.tasks.values()) {
@@ -1106,16 +1222,16 @@ var JustRunner = class {
   list() {
     return Array.from(this.tasks.values(), (t) => ({ recipe: t.recipe, state: t.state, code: t.code, startedAt: t.startedAt }));
   }
-  /** 启动 recipe:同名先停旧进程(重启语义),不影响其他任务;调用方须先用 recipes() 校验名字 */
-  start(recipe) {
+  /** 启动 recipe:同名先停旧进程(重启语义),不影响其他任务;调用方须先用 recipes() 校验名字;
+   *  args 为可选参数表,spawn 数组 argv 追加 k=v(不经 shell,特殊字符安全) */
+  start(recipe, args) {
     this.killOne(recipe);
     const task = { recipe, child: null, state: "running", code: null, startedAt: Date.now(), buffer: [], pending: Buffer.alloc(0) };
     this.tasks.set(recipe, task);
     this.emit({ type: "clear", recipe });
     this.emit({ type: "state", recipe, state: "running", code: null, startedAt: task.startedAt });
-    const child = spawn("just", [recipe], {
+    const child = spawn("just", buildJustArgv(recipe, args), {
       cwd: this.cwd,
-      shell: true,
       env: {
         ...process.env,
         FORCE_COLOR: "1",
@@ -1156,10 +1272,22 @@ var JustRunner = class {
       this.emit({ type: "state", recipe, state: "exited", code: task.code, startedAt: task.startedAt, signal: task.signal });
     });
   }
+  /** 行推送:行内 \r 再切分为多段独立行(进度条输出降级为分段渲染);
+   *  \r 空段丢弃,但整行全空仍推送一条空行(空行是日志内容,不静默丢弃) */
   pushLine(task, line) {
-    task.buffer.push(line);
+    const body = line.endsWith("\n") ? line.slice(0, -1) : line;
+    const segs = body.split("\r").filter(Boolean);
+    if (segs.length === 0) {
+      this.pushSegment(task, "");
+      return;
+    }
+    for (const seg of segs) this.pushSegment(task, seg);
+  }
+  pushSegment(task, seg) {
+    const text = seg + "\n";
+    task.buffer.push(text);
     if (task.buffer.length > MAX_BUFFER) task.buffer.shift();
-    this.emit({ type: "log", recipe: task.recipe, text: line });
+    this.emit({ type: "log", recipe: task.recipe, text });
   }
   /** 停单个任务;不传 recipe 停全部 */
   stop(recipe) {
@@ -1296,12 +1424,21 @@ var apply3 = defineBuiltin({
     ctx.onDispose(() => runner.stop());
     ctx.route("/__just/recipes", async () => {
       try {
-        return await runner.recipes();
+        return await runner.recipesWithParams();
       } catch {
         return [];
       }
     });
     ctx.route("/__just/tasks", async () => runner.list());
+    ctx.route("/__just/status", async () => {
+      return await new Promise((resolve) => {
+        execFile6("just", ["--list", "--unsorted"], { cwd: root, maxBuffer: 1 << 20, timeout: 8e3 }, (err) => {
+          if (!err) return resolve({ installed: true, hasJustfile: true });
+          if (err.code === "ENOENT") return resolve({ installed: false, hasJustfile: false });
+          resolve({ installed: true, hasJustfile: false });
+        });
+      });
+    });
     ctx.sse("/__just/logs", (res) => {
       const unsub = runner.subscribe((ev) => {
         try {
@@ -1317,8 +1454,11 @@ var apply3 = defineBuiltin({
     const handleAction = async (req, res, act) => {
       const body = await readBody(req);
       let recipe;
+      let rawArgs;
       try {
-        recipe = JSON.parse(body || "{}").recipe;
+        const parsed = JSON.parse(body || "{}");
+        recipe = parsed.recipe;
+        rawArgs = parsed.args;
       } catch {
       }
       if (act === "clear") {
@@ -1337,7 +1477,7 @@ var apply3 = defineBuiltin({
           res.end('{"error":"unknown recipe"}');
           return void 0;
         }
-        runner.start(recipe);
+        runner.start(recipe, pickStringArgs(rawArgs));
       } else {
         runner.stop(recipe || void 0);
       }
@@ -1471,7 +1611,7 @@ var apply5 = defineBuiltin({
 // src/plugins/stats/index.ts
 import fs8 from "fs";
 import path8 from "path";
-import { execFile as execFile6 } from "child_process";
+import { execFile as execFile7 } from "child_process";
 
 // src/plugins/stats/manifest.ts
 var manifest4 = {
@@ -1486,7 +1626,7 @@ var manifest4 = {
 var SKIP_DIRS = /* @__PURE__ */ new Set(["node_modules", ".git", "dist", "build", ".next", ".cache"]);
 function execFilePromise(file, args, opts) {
   return new Promise((resolve) => {
-    execFile6(file, args, opts, (err, stdout) => resolve(err ? "" : stdout));
+    execFile7(file, args, opts, (err, stdout) => resolve(err ? "" : stdout));
   });
 }
 function scan(root) {
@@ -1645,17 +1785,25 @@ async function loadExternal(ctx, dir, root) {
 async function main() {
   const args = parseArgs();
   const root = path9.resolve(args.dir);
-  const existing = await findReusable(root);
-  if (existing && !args.restart) {
+  const found = await findReusable(root, package_default.version);
+  const existing = found?.record ?? null;
+  const autoUpgrade = found?.status === "stale-version";
+  if (existing && !args.restart && !autoUpgrade) {
     const u = `http://localhost:${existing.port}` + (args.page ? `#${args.page}` : "");
     if (args.open) openUrl(u);
     console.log(`[zdashboard] \u5DF2\u590D\u7528\u5B9E\u4F8B ${u}\uFF08--restart \u53EF\u5F3A\u5236\u91CD\u5F00\uFF09`);
     await new Promise((resolve) => process.stdout.write("", () => resolve()));
     process.exit(0);
   }
-  const oldRecord = existing && args.restart ? existing : null;
+  const oldRecord = existing && (args.restart || autoUpgrade) ? existing : null;
   if (oldRecord) {
-    console.log(`[zdashboard] --restart\uFF1A\u505C\u6B62\u65E7\u5B9E\u4F8B pid=${oldRecord.pid}`);
+    if (autoUpgrade) {
+      console.log(
+        `[zdashboard] \u68C0\u6D4B\u5230\u65E7\u7248\u672C\u5B9E\u4F8B v${found.liveVersion ?? "unknown"}\uFF0C\u81EA\u52A8\u5347\u7EA7\u5230 v${package_default.version}\uFF08\u505C\u6B62\u65E7\u5B9E\u4F8B pid=${oldRecord.pid}\uFF09`
+      );
+    } else {
+      console.log(`[zdashboard] --restart\uFF1A\u505C\u6B62\u65E7\u5B9E\u4F8B pid=${oldRecord.pid}`);
+    }
     await stopInstance(oldRecord);
   }
   const appDir = path9.resolve(__dirname2, "web");