diff --git a/gateway/gw/commands.mjs b/gateway/gw/commands.mjs index 696c9dd8..b37b9579 100644 --- a/gateway/gw/commands.mjs +++ b/gateway/gw/commands.mjs @@ -44,6 +44,16 @@ function cmdDir(scope, dir) { return cd; } +function cmdScalar(text) { + // 带引号的字段只认闭引号后面的注释。普通字段里的 C#、issue#1 都是文字。 + if (/^["']/.test(text)) { + const quoted = /^("(?:\\.|[^"\\])*"|'(?:''|[^'])*')\s+(#.*)$/.exec(text); + return quoted ? [quoted[1], quoted[2]] : [text, ""]; + } + const at = text.search(/(?:^|[ \t])#/); + return at < 0 ? [text, ""] : [text.slice(0, at).trimEnd(), text.slice(at).trimStart()]; +} + /** 拆 frontmatter:description / argument-hint 读出来给界面改,其余项原样留着。 * 一项 = 顶格的 key: 行 + 后面缩进的续行。以前只认单行,description: | 这种多行写法被读成「|」、 * 续行留进 extra,保存后成了非法 YAML(审查 B22) */ @@ -63,26 +73,35 @@ export function parseCmd(txt) { const key = kv && (kv[1] === "description" ? "description" : kv[1] === "argument-hint" ? "hint" : ""); if (!key) { while (it.length > 1 && !it[it.length - 1].trim()) it.pop(); if (it.some((l) => l.trim())) keep.push(it.join("\n")); continue; } const head = kv[2].trim(), rest = it.slice(1).map((l) => l.trim()).filter(Boolean); - let v; - if (/^[|>][+-]?\d*$/.test(head)) v = rest.join(head[0] === "|" ? "\n" : " "); // 块标量:界面上是一行,换行变空格见 saveCmd - else { + const block = /^([|>](?:[+-][1-9]?|[1-9][+-]?)?)(?:[ \t]+(#.*))?$/.exec(head); + let v, comment; + if (block) { + v = rest.join(head[0] === "|" ? "\n" : " "); // 块里的 # 是正文,只有头部可以跟注释 + comment = block[2]; + } else { // 引号里的要按 YAML 的规矩解开转义:只去掉外层引号,存一次多一层反斜杠,越存越多(#97 02-009) - const raw = [head, ...rest].filter(Boolean).join(" "); + const [raw, trailing] = cmdScalar([head, ...rest].filter(Boolean).join(" ")); + comment = trailing; if (/^"[\s\S]*"$/.test(raw)) { try { v = JSON.parse(raw); } catch { v = raw.slice(1, -1); } } else if (/^'[\s\S]*'$/.test(raw)) v = raw.slice(1, -1).replace(/''/g, "'"); else v = raw; } out[key] = v; + if (comment) (out.comments ||= {})[key] = comment; } out.extra = keep.join("\n"); return out; } // 开头是 [ ] - . 或数字的裸写会被 YAML 读成数组 / 列表 / 数字:一律加引号(DeepSeek 复核 低-3) -const yq = (s) => (/^[\w\s一-鿿,。、()()<>\[\].-]*$/.test(s) && !/^\s|\s$/.test(s) && !/^[\[\]\-.\d]/.test(s) ? s : JSON.stringify(s)); -export function formatCmd({ description, hint, body, extra }) { +const yq = (s) => (/^[\w\s一-鿿,。、()()<>\[\].-]*$/.test(s) && !/^\s|\s$/.test(s) && !/^[\[\]\-.\d]/.test(s) + && !/^(?:true|false|null|yes|no|on|off|y|n)$/i.test(s) ? s : JSON.stringify(s)); +export function formatCmd({ description, hint, body, extra, comments }) { const fm = []; - if (description) fm.push(`description: ${yq(description)}`); - if (hint) fm.push(`argument-hint: ${yq(hint)}`); + for (const [key, label, value] of [["description", "description", description], ["hint", "argument-hint", hint]]) { + const comment = comments?.[key]; + if (value) fm.push(label + ": " + yq(value) + (comment ? " " + comment : "")); + else if (comment) fm.push(comment); + } if (extra) fm.push(extra); const b = String(body || "").replace(/\r\n/g, "\n").replace(/\s+$/, "") + "\n"; return fm.length ? `---\n${fm.join("\n")}\n---\n${b}` : b; @@ -126,12 +145,12 @@ function saveCmd(b, builtin) { const desc = String(b.description || "").replace(/[\r\n]+/g, " ").trim().slice(0, 200); const hint = String(b.hint || "").replace(/[\r\n]+/g, " ").trim().slice(0, 80); // 改名 / 编辑时把我们不管的 frontmatter 项(allowed-tools 等)带过去 - let extra = ""; + let prior = {}; try { const p = path.join(d, (old || name) + ".md"), lst = fs.lstatSync(p); - if (lst.isFile()) extra = parseCmd(fs.readFileSync(p, "utf8")).extra; // 软链不跟(197-1.4) + if (lst.isFile()) prior = parseCmd(fs.readFileSync(p, "utf8")); // 软链不跟(197-1.4) } catch {} - const text = formatCmd({ description: desc, hint, body, extra }); + const text = formatCmd({ description: desc, hint, body, extra: prior.extra, comments: prior.comments }); if (Buffer.byteLength(text) > MAX_FILE) return { ok: false, message: "指令内容太长了(上限 64 KB)" }; // 临时名带进程号 + 随机:固定 .tmp 被人先放一个软链就能顺着写到别处;wx 不覆盖,rename 也不跟目标软链 const tmp = file + ".tmp-" + process.pid + "-" + Math.random().toString(16).slice(2, 8); diff --git a/gateway/gw/git.mjs b/gateway/gw/git.mjs index 662ef690..88adf697 100644 --- a/gateway/gw/git.mjs +++ b/gateway/gw/git.mjs @@ -332,7 +332,8 @@ async function handleGit(req, res, p, u) { let r; if (commit) { if (!/^[0-9a-f]{4,64}$/i.test(commit)) return sendJson(res, 400, { error: "bad commit" }); - r = await git(root, ["show", "--format=", "--patch", "-M", commit, ...(file ? ["--", file] : [])]); + // 与提交详情一样按第一父比较;单文件也要让 Git 在限制路径之前找出改名来源。 + r = await git(root, ["show", "--format=", "--patch", "--diff-merges=first-parent", "-M", ...(file ? ["--follow"] : []), commit, ...(file ? ["--", file] : [])]); } else { const st = file ? await git(root, ["status", "--porcelain=v1", "-z", "--", file]) : null; if (st && st.out.startsWith("??")) r = await git(root, ["diff", "--no-index", "--", "/dev/null", file]); @@ -342,7 +343,14 @@ async function handleGit(req, res, p, u) { // 对比里是旧的、提交时 add -A 进去的却是新的(#146-2)。sha256 仓库的空树是另一个哈希 let base = "HEAD"; if (head.code) { const fmt = await git(root, ["rev-parse", "--show-object-format"]); base = fmt.out.trim() === "sha256" ? EMPTY_TREE_256 : EMPTY_TREE; } - r = await git(root, ["diff", base, "-M", ...(file ? ["--", file] : [])]); + const paths = file ? [file] : []; + // 限定到新路径的 status 把暂存的改名报成 A。带上旧路径才能和整份对比得到同一组红绿行。 + if (st && /^[AR]/.test(st.out)) { + const renames = await gitRenames(root); + if (!renames) return sendJson(res, 500, { error: tz("读取失败") }); + if (renames.has(file)) paths.unshift(renames.get(file)); + } + r = await git(root, ["diff", base, "-M", ...(file ? ["--", ...paths] : [])]); } if (r.code === 1 && r.out) r.code = 0; // --no-index 有差异时退出码是 1 } diff --git a/gateway/gw/usage.mjs b/gateway/gw/usage.mjs index 727df966..55c81e0b 100644 --- a/gateway/gw/usage.mjs +++ b/gateway/gw/usage.mjs @@ -15,22 +15,27 @@ import { onShutdown } from "./crashguard.mjs"; // 电量、充电、亮屏和前台时长由 Java(Battery.java,经 Priv 套接字 op=battery)给,开发端没有这一层就只记 CPU。 // 每 5 分钟采一次,按「小时」「天」两级桶存(8 天 / 120 天),周由天现算。 // 系统自己的估算(dumpsys batterystats,按电源模型折成 mAh)要 Shizuku,只在用户点了才查一次 —— 那条命令本身就不轻。 -// ── 使用统计:每条发给 Claude 的消息、每轮回复、工具调用、token,按 UTC 小时分桶记下来 ── -// 键是「1970 年起第几个小时」,前端按本地时区自己汇总成日 / 周 / 月(换时区也不乱)。 +// ── 使用统计:按 UTC 刻钟记录,前端换时区后仍能按本地日期分组 ── +// hours 留给旧版只知道整点的记录;新记录和从会话补回的记录在 quarters,两个表不重复。 // since:开始实时记录的时刻;它之前的小时可以从历史会话补算(imported 记补算时间,null = 还没补过)。 // 桶:m 消息数、t 回复轮数、tl 工具调用、i 输入 token(含缓存)、o 输出 token、s 当时用过的会话、md 各模型的轮数;x = 补算来的 // (0.3.13 起)c 读缓存的输入 token(i 的一部分,算缓存命中)、mt 各模型的 token(i+o)、st 各会话的 token(i+o,用量页「最费的对话」) const USAGE_FILE = path.join(CFG.home, "ccapp-usage.json"); -const usageDefault = () => ({ v: 1, since: Date.now(), imported: null, off: false, hours: {} }); +const QUARTER_MS = 15 * 60_000; +const usageQuarter = (ts) => Math.floor(ts / QUARTER_MS); +const usageDefault = () => ({ v: 1, since: Date.now(), imported: null, off: false, hours: {}, quarters: {} }); const USAGE = usageDefault(); let USAGE_UNREADABLE = false, USAGE_WARNED = false; // hours 必须是普通对象:是数组/字符串时 usageAdd 会往它身上写属性,在 stdout data 回调里把网关带走(P1-14)。 // 语法坏、形状不对一律留底成 .bad-* 再按默认值起(195-Z.2;以前解析失败不加保护,下一次 5 秒防抖就把原文件盖了) const usageShape = (j) => { if (!isObj(j)) return undefined; - if (j.hours !== undefined && !isObj(j.hours)) return undefined; - const u = { ...j, hours: j.hours || {} }; - for (const [k, b] of Object.entries(u.hours)) if (!/^\d+$/.test(k) || !isObj(b)) delete u.hours[k]; + const u = { ...j }; + for (const name of ["hours", "quarters"]) { + if (j[name] !== undefined && !isObj(j[name])) return undefined; + u[name] = j[name] || {}; + for (const [k, b] of Object.entries(u[name])) if (!/^\d+$/.test(k) || !isObj(b)) delete u[name][k]; + } u.since = Number.isFinite(+u.since) ? +u.since : Date.now(); u.imported = Number.isFinite(+u.imported) ? +u.imported : null; u.off = !!u.off; @@ -61,8 +66,8 @@ onShutdown("用量", flushUsage); // 退出流程 runShutdown() 会调;不 if (!fs.existsSync(USAGE_FILE)) { USAGE.v = 2; usageSave(true); } // 0.3.13 前的数据没有 c / mt / st:启动一会儿后从会话记录补上(不动别的数) else if ((USAGE.v || 1) < 2 && USAGE.imported) setTimeout(() => usageImport(true).catch((e) => log("使用统计补算失败:" + e.message)), 20000); -function usageBucket(hours, h) { - return hours[h] || (hours[h] = { m: 0, t: 0, tl: 0, i: 0, o: 0, c: 0, s: [], md: {}, mt: {}, st: {} }); +function usageBucket(buckets, key) { + return buckets[key] || (buckets[key] = { m: 0, t: 0, tl: 0, i: 0, o: 0, c: 0, s: [], md: {}, mt: {}, st: {} }); } function usageMerge(dst, src, sign) { for (const k of ["m", "t", "tl", "i", "o", "c"]) dst[k] = Math.max(0, (dst[k] || 0) + sign * (src[k] || 0)); @@ -72,9 +77,26 @@ function usageMerge(dst, src, sign) { } if (sign > 0) for (const id of src.s || []) if (!(dst.s ||= []).includes(id) && dst.s.length < 200) dst.s.push(id); } +// 兼容原来的按小时接口,也用于给 v1 的整点记录补上后来增加的字段。 +function usageHourly(quarters, legacy = {}) { + const totals = {}; + for (const [q, b] of Object.entries(quarters)) usageMerge(usageBucket(totals, Math.floor(+q / 4)), b, 1); + for (const [h, b] of Object.entries(legacy)) { + if (totals[h]) usageMerge(totals[h], b, 1); + else totals[h] = b; + } + return totals; +} +function removeImportedEdge(buckets, key) { + const b = buckets[key]; + if (!b?.xi) return; + usageMerge(b, b.xi, -1); + delete b.xi; + if (!(b.m || b.t || b.tl || b.i || b.o || b.c)) delete buckets[key]; +} export function usageAdd(d, sid, model, ts) { if (USAGE.off) return; - const b = usageBucket(USAGE.hours, Math.floor((ts || Date.now()) / 3600e3)); + const b = usageBucket(USAGE.quarters, usageQuarter(ts || Date.now())); for (const k of ["m", "t", "tl", "i", "o", "c"]) if (d[k]) b[k] = (b[k] || 0) + d[k]; if (sid && !b.s.includes(sid) && b.s.length < 200) b.s.push(sid); if (model && d.t) b.md[model] = (b.md[model] || 0) + d.t; @@ -169,10 +191,9 @@ function usageImport(extraOnly) { return usageImporting || (usageImporting = (async () => { const gen = usageGen, since0 = USAGE.since; // extraOnly:老数据(v1)补上 c / mt / st 三项,别的照旧(实时记下的、后来删掉的会话也还在) - const until = Math.floor((extraOnly ? Date.now() : since0) / 3600e3); - // 实时统计从 since 那一刻起记:since 所在的那个小时,since 之前的部分也要补(以前按整点切,整小时丢了,#102 04-011) - const before = extraOnly ? (ts) => Math.floor(ts / 3600e3) < until : (ts) => ts < since0; - const hours = {}, seenU = new Set(), seenTool = new Set(), msgs = new Map(); + const until = usageQuarter(since0); + const cutoff = extraOnly ? Math.floor(Date.now() / 3600e3) * 3600e3 : since0; + const quarters = {}, seenU = new Set(), seenTool = new Set(), msgs = new Map(); let files = 0, prompts = 0; let dirs = []; try { dirs = fs.readdirSync(PATHS.projects); } catch {} @@ -187,22 +208,22 @@ function usageImport(extraOnly) { if (line.length < 20 || !/"type":"(user|assistant)"/.test(line)) continue; let e; try { e = JSON.parse(line); } catch { continue; } if (e.isSidechain || !e.timestamp) continue; - const ts = Date.parse(e.timestamp), h = Math.floor(ts / 3600e3); - if (!before(ts)) continue; + const ts = Date.parse(e.timestamp), q = usageQuarter(ts); + if (!(ts < cutoff)) continue; const m = e.message || {}; if (e.type === "user" && m.role === "user") { if (e.isMeta || e.isCompactSummary || (e.uuid && seenU.has(e.uuid))) continue; if (!usageIsPrompt(usageText(m.content))) continue; if (e.uuid) seenU.add(e.uuid); - const b = usageBucket(hours, h); + const b = usageBucket(quarters, q); b.m++; prompts++; if (e.sessionId && !b.s.includes(e.sessionId) && b.s.length < 200) b.s.push(e.sessionId); pending = b; } else if (e.type === "assistant" && m.model && m.model !== "") { if (pending) { pending.t++; pending.md[m.model] = (pending.md[m.model] || 0) + 1; pending = null; } - for (const c of m.content || []) if (c && c.type === "tool_use" && c.id && !seenTool.has(c.id)) { seenTool.add(c.id); usageBucket(hours, h).tl++; } + for (const c of m.content || []) if (c && c.type === "tool_use" && c.id && !seenTool.has(c.id)) { seenTool.add(c.id); usageBucket(quarters, q).tl++; } // 同一条回复流式拆成好几行、每行都带 usage:按 message.id 只算一次(取最后一行的) - if (m.id && m.usage) msgs.set(m.id, [h, m.usage, m.model, e.sessionId]); + if (m.id && m.usage) msgs.set(m.id, [q, m.usage, m.model, e.sessionId]); } } // 子代理的 token 记在 <会话>/subagents/*.jsonl:实时统计(usageMeter 的 scanSubs)算它们,补算也要算,不然历史偏低(审查 B29)。 @@ -217,14 +238,14 @@ function usageImport(extraOnly) { let e; try { e = JSON.parse(line); } catch { continue; } const m = e.message || {}; if (e.type !== "assistant" || !e.timestamp || !m.id || !m.usage || !m.model || m.model === "") continue; - const ts = Date.parse(e.timestamp), h = Math.floor(ts / 3600e3); - if (before(ts)) msgs.set(m.id, [h, m.usage, m.model, e.sessionId || sid]); + const ts = Date.parse(e.timestamp); + if (ts < cutoff) msgs.set(m.id, [usageQuarter(ts), m.usage, m.model, e.sessionId || sid]); } } } } - for (const [h, u, model, sid] of msgs.values()) { - const b = usageBucket(hours, h); + for (const [q, u, model, sid] of msgs.values()) { + const b = usageBucket(quarters, q); const i = (u.input_tokens || 0) + (u.cache_read_input_tokens || 0) + (u.cache_creation_input_tokens || 0), o = u.output_tokens || 0; b.i += i; b.o += o; b.c += u.cache_read_input_tokens || 0; if (model) b.mt[model] = (b.mt[model] || 0) + i + o; @@ -235,21 +256,22 @@ function usageImport(extraOnly) { return { files, prompts: 0, aborted: true }; } if (extraOnly) { - for (const [k, b] of Object.entries(hours)) { const o = USAGE.hours[k]; if (o) { o.c = b.c; o.mt = b.mt; o.st = b.st; } } + for (const [k, b] of Object.entries(usageHourly(quarters))) { const o = USAGE.hours[k]; if (o) { o.c = b.c; o.mt = b.mt; o.st = b.st; } } USAGE.v = 2; usageSave(true); log("使用统计:给老数据补上了缓存命中、按型号与按会话的 token"); return { files, prompts: 0 }; } // 换掉上次补算的(since 之前的实时数据——比如清空后重新补——也一并以这次为准) - for (const k of Object.keys(USAGE.hours)) if (+k < until) delete USAGE.hours[k]; - const edge = hours[until]; delete hours[until]; - for (const [k, b] of Object.entries(hours)) USAGE.hours[k] = { ...b, x: 1 }; - // 交界那个小时:实时记的(since 之后)加上补算的(since 之前)。上次补进去的记在 xi 里,重补时先减掉,不重复算 - const live = USAGE.hours[until]; - if (live?.xi) usageMerge(live, live.xi, -1); - if (edge) { const b = usageBucket(USAGE.hours, until); usageMerge(b, edge, 1); b.xi = edge; } - else if (live) delete live.xi; + const oldHour = Math.floor(until / 4); + for (const k of Object.keys(USAGE.hours)) if (+k < oldHour) delete USAGE.hours[k]; + removeImportedEdge(USAGE.hours, oldHour); + for (const k of Object.keys(USAGE.quarters)) if (+k < until) delete USAGE.quarters[k]; + const edge = quarters[until]; delete quarters[until]; + for (const [k, b] of Object.entries(quarters)) USAGE.quarters[k] = { ...b, x: 1 }; + // 交界刻钟里 since 之后是实时数据;重补时先减掉上次补入的那一份。 + removeImportedEdge(USAGE.quarters, until); + if (edge) { const b = usageBucket(USAGE.quarters, until); usageMerge(b, edge, 1); b.xi = edge; } USAGE.imported = Date.now(); USAGE.v = 2; usageSave(true); @@ -493,7 +515,12 @@ export async function routeUsage(req, res, u, p) { // 我们只转交用户在授权页拿到的一次性授权码(等同于在终端里粘贴),不读、不存任何凭据。 // ── Shizuku(调试提权)── // ── 使用统计 ── - if (req.method === "GET" && p === "/api/usage") return sendJson(res, 200, { since: USAGE.since, imported: USAGE.imported, off: !!USAGE.off, importing: !!usageImporting, hours: USAGE.hours, now: Date.now() }); + if (req.method === "GET" && p === "/api/usage") { + const buckets = u.searchParams.get("detail") === "quarter" + ? { hours: USAGE.hours, quarters: USAGE.quarters } + : { hours: usageHourly(USAGE.quarters, USAGE.hours) }; + return sendJson(res, 200, { since: USAGE.since, imported: USAGE.imported, off: !!USAGE.off, importing: !!usageImporting, ...buckets, now: Date.now() }); + } if (req.method === "POST" && p.startsWith("/api/usage/")) { let b; try { b = JSON.parse((await readBody(req)) || "{}"); } catch { return sendJson(res, 400, { error: "bad json" }); } const op = p.slice(11); @@ -505,13 +532,15 @@ export async function routeUsage(req, res, u, p) { } if (op === "clear") { usageGen++; // 旧补算的结果作废(#119-5) - const before = { hours: USAGE.hours, since: USAGE.since, imported: USAGE.imported }; - if (b.all) { USAGE.hours = {}; USAGE.since = Date.now(); USAGE.imported = Date.now(); } + const before = { hours: USAGE.hours, quarters: USAGE.quarters, since: USAGE.since, imported: USAGE.imported }; + if (b.all) { USAGE.hours = {}; USAGE.quarters = {}; USAGE.since = Date.now(); USAGE.imported = Date.now(); } else { const from = Number(b.from), to = Number(b.to); if (!(from < to)) return sendJson(res, 400, { error: "bad range" }); - USAGE.hours = { ...USAGE.hours }; - for (const k of Object.keys(USAGE.hours)) if (+k * 3600e3 >= from && +k * 3600e3 < to) delete USAGE.hours[k]; + // 旧整点记录跨越月界时无法拆开,只清完全落在所选月份里的桶。 + const outside = (buckets, ms) => Object.fromEntries(Object.entries(buckets).filter(([k]) => +k * ms < from || (+k + 1) * ms > to)); + USAGE.hours = outside(USAGE.hours, 3600e3); + USAGE.quarters = outside(USAGE.quarters, QUARTER_MS); } if (!usageSave(true)) { Object.assign(USAGE, before); return sendJson(res, 500, { ok: false, error: "write_failed", message: tz("没保存上:存储满了或没有权限") }); } return sendJson(res, 200, { ok: true }); diff --git a/gateway/tests/a0610-b3-shutdown-flush.test.mjs b/gateway/tests/a0610-b3-shutdown-flush.test.mjs index 9ebaae3e..c30ebfea 100644 --- a/gateway/tests/a0610-b3-shutdown-flush.test.mjs +++ b/gateway/tests/a0610-b3-shutdown-flush.test.mjs @@ -16,14 +16,14 @@ const SESS = path.join(CFG.home, "ccapp-session-models.json"); const readJson = (f) => { try { return JSON.parse(fs.readFileSync(f, "utf8")); } catch { return null; } }; test("runShutdown:usage 的 5 秒防抖、sessmodel 的 300ms 防抖都立刻落盘", () => { - const h = Math.floor(Date.now() / 3600e3); - const m0 = (readJson(USAGE)?.hours?.[h]?.m) || 0; - usageAdd({ m: 1 }, "b3-flush", "b3-model", Date.now()); + const ts = Date.now(), q = Math.floor(ts / 900e3); + const m0 = (readJson(USAGE)?.quarters?.[q]?.m) || 0; + usageAdd({ m: 1 }, "b3-flush", "b3-model", ts); setSessModel("b3-flush", { model: "b3-model" }); // 防抖还没到点:文件里还没有这一段 - assert.equal((readJson(USAGE)?.hours?.[h]?.m) || 0, m0, "5 秒防抖不该已经写"); + assert.equal((readJson(USAGE)?.quarters?.[q]?.m) || 0, m0, "5 秒防抖不该已经写"); assert.equal(readJson(SESS)?.["b3-flush"], undefined, "300ms 防抖不该已经写"); runShutdown(); // 等于 server.mjs 收到 SIGTERM 走的退出流程 - assert.equal(readJson(USAGE)?.hours?.[h]?.m, m0 + 1, "用量要写下去"); + assert.equal(readJson(USAGE)?.quarters?.[q]?.m, m0 + 1, "用量要写下去"); assert.equal(readJson(SESS)?.["b3-flush"]?.model, "b3-model", "会话模型要写下去"); }); diff --git a/gateway/tests/a0610-f2-git.test.mjs b/gateway/tests/a0610-f2-git.test.mjs index 556bb152..b5d7273a 100644 --- a/gateway/tests/a0610-f2-git.test.mjs +++ b/gateway/tests/a0610-f2-git.test.mjs @@ -24,6 +24,8 @@ async function serve(...routes) { const base = await serve(routeGit); const W = CFG.workspace; fs.mkdirSync(W, { recursive: true }); +const gitBin = path.join(process.env.CCAPP_PREFIX, "bin", "git"); +if (!fs.existsSync(gitBin)) fs.symlinkSync(execFileSync("sh", ["-c", "command -v git"], { encoding: "utf8" }).trim(), gitBin); const GIT_ENV = { ...process.env, GIT_TERMINAL_PROMPT: "0", LC_ALL: "C.UTF-8" }; const git = (cwd, ...args) => execFileSync("git", ["-c", "user.name=t", "-c", "user.email=t@t", ...args], { cwd, env: GIT_ENV, encoding: "utf8" }); const get = async (p) => { const r = await fetch(base + p); return { status: r.status, body: await r.json() }; }; @@ -84,6 +86,33 @@ test("196-7 合并提交的历史详情能看到文件(按第一父比较)", assert.equal(r.status, 200, JSON.stringify(r.body).slice(0, 300)); assert.ok(r.body.files.length >= 1, "合并提交的文件列表是空的"); assert.ok(r.body.files.some((f) => f.path === "b.txt")); + for (const suffix of ["", "&file=b.txt"]) { + const patch = await get("/api/git/diff?dir=" + enc(dir) + "&commit=" + hash + suffix); + assert.equal(patch.status, 200); + assert.match(patch.body.diff, /^\+b$/m); + assert.doesNotMatch(patch.body.diff, /^\+c$/m); + } +}); + +test("改名文件与整份对比一致,暂存和提交后都能找回旧路径", async () => { + const dir = fs.mkdtempSync(path.join(W, "rename-diff-")); + git(dir, "init", "-q"); + fs.writeFileSync(path.join(dir, "old.txt"), "one\ntwo\nthree\nfour\n"); + git(dir, "add", "old.txt"); git(dir, "commit", "-qm", "base"); + git(dir, "mv", "old.txt", "new name.txt"); + const url = "/api/git/diff?dir=" + enc(dir) + "&file=" + enc("new name.txt"); + const check = async (suffix, edited) => { + const r = await get(url + suffix); + assert.equal(r.status, 200); + assert.match(r.body.diff, /^rename from old\.txt$/m); + assert.doesNotMatch(r.body.diff, /^\+one$/m); + assert.equal(r.body.diff.includes("+five\n"), edited); + }; + await check("", false); + fs.appendFileSync(path.join(dir, "new name.txt"), "five\n"); + await check("", true); + git(dir, "add", "new name.txt"); git(dir, "commit", "-qm", "rename and edit"); + await check("&commit=" + git(dir, "rev-parse", "HEAD").trim(), true); }); test("196-2 未跟踪文件超过 1000 个时 status 仍能打开并标 truncated", async () => { diff --git a/gateway/tests/a0610-f3-frontend.test.mjs b/gateway/tests/a0610-f3-frontend.test.mjs index f6f02e15..fa67cd66 100644 --- a/gateway/tests/a0610-f3-frontend.test.mjs +++ b/gateway/tests/a0610-f3-frontend.test.mjs @@ -174,6 +174,6 @@ test("C28 195-O.5–O.7 / 197-5.12:跨午夜 / 换时区重算,补算进度 assert.ok(src11.includes("Intl.DateTimeFormat().resolvedOptions().timeZone"), "按运行时区判断"); assert.ok(src11.includes("document.addEventListener(\"visibilitychange\""), "回到前台重算"); assert.ok(src11.includes("x.importing, x.off, x.since"), "轮询比较补算 / 开关 / 起始时间"); - assert.ok(src11.includes("const clearFrom = Math.ceil(usMonth0(y, m).getTime() / 3600e3) * 3600e3;"), "清除区间对到整点桶"); + assert.ok(src11.includes("const clearFrom = usMonth0(y, m).getTime();"), "把准确的本地月界传给网关"); assert.ok(src11.includes("已过重置时间,下一轮对话后刷新"), "重置时间过了不再说够用"); }); diff --git a/gateway/tests/commands.test.mjs b/gateway/tests/commands.test.mjs index 429321a7..d535fc0a 100644 --- a/gateway/tests/commands.test.mjs +++ b/gateway/tests/commands.test.mjs @@ -30,3 +30,29 @@ test("名字:字母数字 - _,不许路径和空格", () => { for (const ok of ["issue", "pr-review", "a_b", "X1"]) assert.ok(CMD_NAME_RE.test(ok), ok); for (const bad of ["../x", "a b", "-x", "", "a/b", "中文", "x".repeat(41)]) assert.ok(!CMD_NAME_RE.test(bad), bad); }); + +test("编辑指令保留行尾注释以及引号、块标量里的井号", () => { + for (const [line, value] of [ + ["周报 # 编辑者", "周报"], + ['"a # b" # 编辑者', "a # b"], + ["'it''s #1' # 编辑者", "it's #1"], + ["C# # 编辑者", "C#"], + ["| # 编辑者\n 一行 # 正文", "一行 # 正文"], + ]) { + const input = "---\ndescription: " + line + "\n---\n正文\n"; + const cmd = parseCmd(input); + assert.equal(cmd.description, value); + const saved = formatCmd({ ...cmd, description: "新说明" }); + assert.match(saved, /^description: 新说明 # 编辑者$/m); + assert.equal(parseCmd(saved).description, "新说明"); + } +}); + +test("说明和参数提示中的 YAML 保留字写成字符串", () => { + for (const value of ["true", "false", "Null", "NULL", "yes", "off"]) { + const saved = formatCmd({ description: value, hint: value, body: "正文" }); + assert.ok(saved.includes("description: " + JSON.stringify(value) + "\n")); + assert.ok(saved.includes("argument-hint: " + JSON.stringify(value) + "\n")); + assert.equal(parseCmd(saved).hint, value); + } +}); diff --git a/gateway/tests/fixtures/stab2-h-run-harness.mjs b/gateway/tests/fixtures/stab2-h-run-harness.mjs index b7986e05..34c568c3 100644 --- a/gateway/tests/fixtures/stab2-h-run-harness.mjs +++ b/gateway/tests/fixtures/stab2-h-run-harness.mjs @@ -66,6 +66,6 @@ export async function runWith(id, steps, code = 0) { export const usageTotals = () => { const j = JSON.parse(fs.readFileSync(path.join(home, "ccapp-usage.json"), "utf8")); const sum = { t: 0, i: 0, o: 0 }; - for (const b of Object.values(j.hours || {})) { sum.t += b.t || 0; sum.i += b.i || 0; sum.o += b.o || 0; } + for (const b of [...Object.values(j.hours || {}), ...Object.values(j.quarters || {})]) { sum.t += b.t || 0; sum.i += b.i || 0; sum.o += b.o || 0; } return sum; }; diff --git a/gateway/tests/stab2-j-office-fetch.test.mjs b/gateway/tests/stab2-j-office-fetch.test.mjs index ada3de64..a74a67ba 100644 --- a/gateway/tests/stab2-j-office-fetch.test.mjs +++ b/gateway/tests/stab2-j-office-fetch.test.mjs @@ -16,6 +16,23 @@ const take = (src, start, end) => { return src.slice(a, b); }; +test("表格先打开保存的活动表,活动表隐藏或缺失时选第一张可见表", async () => { + const book = { SheetNames: ["隐藏", "封面", "本期"], Workbook: { Sheets: [{ Hidden: 1 }, {}, {}], WBView: [{ activeTab: 2 }] } }; + const VW = {}, opened = []; + const element = { querySelector() { return this; }, addEventListener() {} }; + const ctx = { + VW, window: { XLSX: { read: () => book } }, vwTake: () => () => true, + vwActs() {}, vwLoading() {}, t: (s) => s, esc: (s) => s, $: () => element, + loadScript: async () => {}, vwFetchBuf: async () => new ArrayBuffer(0), + VW_OFFICE_MAX: 1, zipExpandsTooMuch: () => false, vwSheetShow: (i) => opened.push(VW.sheets[i]), + }; + const show = vm.runInNewContext("(" + take(src17, " async function vwSheet()", " // Excel") + ")", ctx); + await show(); + book.Workbook.WBView[0].activeTab = 0; await show(); + delete book.Workbook.WBView; await show(); + assert.deepEqual(opened, ["本期", "封面", "封面"]); +}); + function load() { const code = ` const VW = { path: "/w/f.docx", size: 0 }; diff --git a/gateway/tests/usage-quarter.test.mjs b/gateway/tests/usage-quarter.test.mjs new file mode 100644 index 00000000..c1724d28 --- /dev/null +++ b/gateway/tests/usage-quarter.test.mjs @@ -0,0 +1,58 @@ +import "../gw/config.mjs"; +import test from "node:test"; +import assert from "node:assert/strict"; +import fs from "node:fs"; +import path from "node:path"; +import { Readable } from "node:stream"; +import { CFG, PATHS } from "../gw/config.mjs"; + +test("旧整点与新刻钟共存,重复补算和清除跨月边界不重复计数", async () => { + const since = Date.parse("2001-05-31T18:40:00Z"), hour = Math.floor(since / 3600e3); + const slot = (iso) => Math.floor(Date.parse(iso) / 900e3); + const file = path.join(CFG.home, "ccapp-usage.json"); + const backup = fs.existsSync(file) ? fs.readFileSync(file) : null; + const old = { m: 4, i: 139, xi: { m: 1, i: 9 } }; + fs.mkdirSync(PATHS.projects, { recursive: true }); + const dir = fs.mkdtempSync(path.join(PATHS.projects, "quarter-test-")); + try { + fs.writeFileSync(file, JSON.stringify({ v: 2, since, hours: { [hour]: old } })); + const { routeUsage, usageAdd, flushUsage } = await import("../gw/usage.mjs"); + const api = async (suffix, body) => { + const url = new URL("/api/usage" + suffix, "http://localhost"); + const req = Object.assign(Readable.from(body ? [Buffer.from(JSON.stringify(body))] : []), { method: body ? "POST" : "GET" }); + let data; + await routeUsage(req, { + writeHead(code) { assert.equal(code, 200); }, + end(json) { data = JSON.parse(json); }, + }, url, url.pathname); + return data; + }; + fs.writeFileSync(path.join(dir, "sample.jsonl"), ["18:05", "18:35"].map(time => JSON.stringify({ + timestamp: "2001-05-31T" + time + ":00Z", sessionId: "sample", type: "user", + message: { role: "user", content: "hello" }, + })).join("\n") + "\n"); + usageAdd({ m: 1, i: 5 }, "live", "demo", Date.parse("2001-05-31T18:41:00Z")); + usageAdd({ m: 1, i: 11 }, "live", "demo", Date.parse("2001-05-31T18:45:00Z")); + flushUsage(); + for (let i = 0; i < 2; i++) { + await api("/import", {}); + const { hours, quarters } = await api("?detail=quarter"); + assert.equal(hours[hour].m, 3); + assert.equal(quarters[slot("2001-05-31T18:35Z")].m, 2); + assert.equal(quarters[slot("2001-05-31T18:45Z")].i, 11); + const total = (await api("")).hours[hour]; + assert.equal(total.m, 7); + assert.equal(total.i, 146); + } + // 尼泊尔六月从 UTC 18:15 开始。旧记录横跨边界,18:05 的刻钟全部属于五月。 + await api("/clear", { from: Date.parse("2001-05-31T18:15Z"), to: Date.parse("2001-06-30T18:15Z") }); + const { hours, quarters } = await api("?detail=quarter"); + assert.equal(hours[hour].i, 130); + assert.equal(quarters[slot("2001-05-31T18:05Z")].m, 1); + assert.equal(quarters[slot("2001-05-31T18:35Z")], undefined); + assert.equal(quarters[slot("2001-05-31T18:45Z")], undefined); + } finally { + fs.rmSync(dir, { recursive: true, force: true }); + if (backup) fs.writeFileSync(file, backup); else fs.rmSync(file, { force: true }); + } +}); diff --git a/gateway/web/app/11-usage.js b/gateway/web/app/11-usage.js index 8897bd4a..12cb4181 100644 --- a/gateway/web/app/11-usage.js +++ b/gateway/web/app/11-usage.js @@ -1,4 +1,4 @@ - // ── 使用统计:网关按 UTC 小时记,这里按本地时区汇总成日 / 周 / 月;月报画在 canvas 上,看到的就是导出的 ── + // ── 使用统计:网关按 UTC 刻钟记,旧记录按小时;这里按本地时区汇总成日 / 周 / 月 ── const us = { raw: null, days: new Map(), month: null, busy: false }; const usDayKey = (d) => d.getFullYear() + "-" + String(d.getMonth() + 1).padStart(2, "0") + "-" + String(d.getDate()).padStart(2, "0"); const usMonthKey = (d) => d.getFullYear() + "-" + String(d.getMonth() + 1).padStart(2, "0"); @@ -14,10 +14,12 @@ } function usBuild() { us.days = new Map(); - for (const [k, b] of Object.entries(us.raw.hours || {})) { - const d = new Date(+k * 3600e3), key = usDayKey(d); - if (!us.days.has(key)) us.days.set(key, usEmpty()); - usMerge(us.days.get(key), b, d.getHours()); + for (const [buckets, ms] of [[us.raw.hours, 3600e3], [us.raw.quarters, 900e3]]) { + for (const [k, b] of Object.entries(buckets || {})) { + const d = new Date(+k * ms), key = usDayKey(d); + if (!us.days.has(key)) us.days.set(key, usEmpty()); + usMerge(us.days.get(key), b, d.getHours()); + } } } /** [a, b) 两个本地日期之间的合计 */ @@ -336,7 +338,7 @@ }); async function loadUsage() { try { - us.raw = await api("/api/usage"); us.err = ""; + us.raw = await api("/api/usage?detail=quarter"); us.err = ""; if (/^✗/.test($("us-result").textContent)) $("us-result").textContent = ""; // 恢复了:旧的失败提示别留着 if (!us.month) { const n = new Date(); us.month = [n.getFullYear(), n.getMonth()]; } usBuild(); usPaint(); @@ -357,11 +359,11 @@ } setInterval(async () => { if (curPage !== "usage" || document.hidden || us.busy || !us.raw) return; - let r = null; try { r = await api("/api/usage"); } catch {} + let r = null; try { r = await api("/api/usage?detail=quarter"); } catch {} if (curPage !== "usage") return; const moved = usDayMoved(); // 只比 hours 会漏掉补算进度 / 开关 / 起始时间的变化(195-O.7) - const sig = (x) => JSON.stringify([x.hours, x.imported, x.importing, x.off, x.since]); + const sig = (x) => JSON.stringify([x.hours, x.quarters, x.imported, x.importing, x.off, x.since]); if (!moved && (!r || sig(r) === sig(us.raw))) return; if (r) us.raw = r; usBuild(); usPaint(); @@ -436,10 +438,8 @@ if (confirm(t("按现存的会话记录重新补算 {d} 之前的统计?删掉的会话补不回来,那部分会变少。", { d: new Date(us.raw.since).toLocaleDateString(I18N.lang) }))) usImport(false); } else if (act === "clear-month") { if (!confirm(t("清除 {m} 的统计?", { m: usMonthName(y, m) }))) return; - // 统计按 UTC 整点桶存、只能整桶删:区间对到整点上。半小时 / 45 分时区里本地月初月末不在整点, - // 不这么对会把下个月(或上个月)边界那个桶一起删掉(195-O.5) - const clearFrom = Math.ceil(usMonth0(y, m).getTime() / 3600e3) * 3600e3; - const clearTo = Math.floor(usMonth0(y, m + 1).getTime() / 3600e3) * 3600e3; + const clearFrom = usMonth0(y, m).getTime(); + const clearTo = usMonth0(y, m + 1).getTime(); await post("/api/usage/clear", { from: clearFrom, to: clearTo }); loadUsage(); } else if (act === "clear-all") { diff --git a/gateway/web/app/17-office.js b/gateway/web/app/17-office.js index 56cb76c1..758f923d 100644 --- a/gateway/web/app/17-office.js +++ b/gateway/web/app/17-office.js @@ -173,7 +173,8 @@ const val = sheetText(cell, wb); box.querySelector(".vw-cellbar").textContent = `${addr} ${val}${cell && cell.f ? ` =${cell.f}` : ""}`; }); - vwSheetShow(0); + const active = wb.SheetNames[wb.Workbook?.WBView?.[0]?.activeTab]; + vwSheetShow(Math.max(0, VW.sheets.indexOf(active))); } // Excel 的默认日期格式(编号 14)各地显示不同,SheetJS 一律写成美式 m/d/yy —— 这种按年-月-日显示 // wb:认工作簿的日期系统。1904 系统(Mac 版 Excel 的老文件)同一个数差 1462 天(#106 07-005); diff --git a/gateway/web/index.html b/gateway/web/index.html index 45c69fef..237a31c6 100644 --- a/gateway/web/index.html +++ b/gateway/web/index.html @@ -172,7 +172,7 @@