wezard 1.4.2 → 2.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.claude-plugin/marketplace.json +1 -1
- package/.claude-plugin/plugin.json +1 -1
- package/CLAUDE.md +17 -13
- package/README.md +130 -77
- package/cli/wezard.sh +0 -62
- package/config.example.jsonc +3 -9
- package/dist/cli/init.js +12 -21
- package/dist/cli/init.js.map +1 -1
- package/dist/daemon/approval.js +11 -7
- package/dist/daemon/approval.js.map +1 -1
- package/dist/daemon/cc-session.js +136 -0
- package/dist/daemon/cc-session.js.map +1 -0
- package/dist/daemon/chat-name.js +8 -18
- package/dist/daemon/chat-name.js.map +1 -1
- package/dist/daemon/detail.js +54 -13
- package/dist/daemon/detail.js.map +1 -1
- package/dist/daemon/graph.js +5 -7
- package/dist/daemon/graph.js.map +1 -1
- package/dist/daemon/inbound.js +188 -254
- package/dist/daemon/inbound.js.map +1 -1
- package/dist/daemon/index.js +459 -258
- package/dist/daemon/index.js.map +1 -1
- package/dist/daemon/jobs.js +2 -2
- package/dist/daemon/memory-steward.js +82 -0
- package/dist/daemon/memory-steward.js.map +1 -0
- package/dist/daemon/mirror-bridge.js +370 -170
- package/dist/daemon/mirror-bridge.js.map +1 -1
- package/dist/daemon/mirror-store.js.map +1 -1
- package/dist/daemon/model-select.js +74 -0
- package/dist/daemon/model-select.js.map +1 -0
- package/dist/daemon/peers.js +10 -16
- package/dist/daemon/peers.js.map +1 -1
- package/dist/daemon/session-name.js +4 -27
- package/dist/daemon/session-name.js.map +1 -1
- package/dist/daemon/spawn-tmux.js +61 -16
- package/dist/daemon/spawn-tmux.js.map +1 -1
- package/dist/daemon/task-gate.js +97 -0
- package/dist/daemon/task-gate.js.map +1 -0
- package/dist/daemon/task-registry.js +132 -0
- package/dist/daemon/task-registry.js.map +1 -0
- package/dist/daemon/tasks.js +126 -54
- package/dist/daemon/tasks.js.map +1 -1
- package/dist/daemon/wizard-memory.js +52 -0
- package/dist/daemon/wizard-memory.js.map +1 -0
- package/dist/daemon/wizard.js +107 -41
- package/dist/daemon/wizard.js.map +1 -1
- package/dist/mcp/server.js +181 -209
- package/dist/mcp/server.js.map +1 -1
- package/dist/shared/chat-http.js +187 -108
- package/dist/shared/chat-http.js.map +1 -1
- package/dist/shared/chat-render.js +25 -34
- package/dist/shared/chat-render.js.map +1 -1
- package/dist/shared/chat-view.js +14 -2
- package/dist/shared/chat-view.js.map +1 -1
- package/dist/shared/cli-backends.js +2 -7
- package/dist/shared/cli-backends.js.map +1 -1
- package/dist/shared/config.js +26 -9
- package/dist/shared/config.js.map +1 -1
- package/dist/shared/detail-render.js +12 -6
- package/dist/shared/detail-render.js.map +1 -1
- package/dist/shared/detail-store.js +1 -1
- package/dist/shared/detail-store.js.map +1 -1
- package/dist/shared/role-render.js +55 -0
- package/dist/shared/role-render.js.map +1 -0
- package/dist/shared/role-view.js +228 -0
- package/dist/shared/role-view.js.map +1 -0
- package/dist/shared/schedule-spec.js +92 -116
- package/dist/shared/schedule-spec.js.map +1 -1
- package/dist/shared/session-label.js +103 -72
- package/dist/shared/session-label.js.map +1 -1
- package/dist/shared/std.js +3 -0
- package/dist/shared/std.js.map +1 -1
- package/dist/shared/task-file.js +120 -0
- package/dist/shared/task-file.js.map +1 -0
- package/dist/shared/trigger.js +232 -0
- package/dist/shared/trigger.js.map +1 -0
- package/dist/shared/world.js +17 -5
- package/dist/shared/world.js.map +1 -1
- package/dist/svr/index.js +67 -2
- package/dist/svr/index.js.map +1 -1
- package/hooks/pre-tool-use.sh +4 -4
- package/package.json +1 -2
- package/web/chat.css +424 -212
- package/web/chat.js +953 -323
- package/commands/wrc.md +0 -7
- package/dist/daemon/cc-bridge.js +0 -183
- package/dist/daemon/cc-bridge.js.map +0 -1
- package/dist/daemon/sessions.js +0 -4
- package/dist/daemon/sessions.js.map +0 -1
package/dist/shared/std.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"std.js","sourceRoot":"","sources":["../../shared/std.ts"],"names":[],"mappings":"AAAA,0EAA0E;AAC1E,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,EAAU,EAAiB,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;AAE1F,4DAA4D;AAC5D,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,CAAS,EAAE,GAAW,EAAU,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;AAE1G,kFAAkF;AAClF,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,CAAS,EAAE,GAAW,EAAU,EAAE,CAClE,CAAC,CAAC,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,GAAG,GAAG,CAAC;AAElE,8EAA8E;AAC9E,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,CAAS,EAAE,GAAW,EAAU,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,GAAG,CAAC,CAAC;AAEzG;;;;;;iBAMiB;AACjB,MAAM,CAAC,MAAM,QAAQ,GAAG,KAAK,EAC3B,EAAgB,EAChB,KAAa,EACb,CAAkC,EACpB,EAAE;IAChB,MAAM,GAAG,GAAG,IAAI,KAAK,CAAI,EAAE,CAAC,MAAM,CAAC,CAAC;IACpC,IAAI,IAAI,GAAG,CAAC,CAAC;IACb,MAAM,MAAM,GAAG,KAAK,IAAmB,EAAE;QACvC,KAAK,IAAI,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE;YAAE,GAAG,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAE,EAAE,CAAC,CAAC,CAAC;IAC9E,CAAC,CAAC;IACF,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC;IAC3F,OAAO,GAAG,CAAC;AACb,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"std.js","sourceRoot":"","sources":["../../shared/std.ts"],"names":[],"mappings":"AAAA,0EAA0E;AAC1E,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,EAAU,EAAiB,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;AAE1F,4DAA4D;AAC5D,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,CAAS,EAAE,GAAW,EAAU,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;AAE1G,kFAAkF;AAClF,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,CAAS,EAAE,GAAW,EAAU,EAAE,CAClE,CAAC,CAAC,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,GAAG,GAAG,CAAC;AAElE,8EAA8E;AAC9E,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,CAAS,EAAE,GAAW,EAAU,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,GAAG,CAAC,CAAC;AAEzG;;;;;;iBAMiB;AACjB,MAAM,CAAC,MAAM,QAAQ,GAAG,KAAK,EAC3B,EAAgB,EAChB,KAAa,EACb,CAAkC,EACpB,EAAE;IAChB,MAAM,GAAG,GAAG,IAAI,KAAK,CAAI,EAAE,CAAC,MAAM,CAAC,CAAC;IACpC,IAAI,IAAI,GAAG,CAAC,CAAC;IACb,MAAM,MAAM,GAAG,KAAK,IAAmB,EAAE;QACvC,KAAK,IAAI,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE;YAAE,GAAG,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAE,EAAE,CAAC,CAAC,CAAC;IAC9E,CAAC,CAAC;IACF,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC;IAC3F,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAEF;gFACgF;AAChF,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,QAAgB,EAChB,GAAqC,EAC7B,EAAE,CACV,QAAQ,CAAC,OAAO,CAAC,qCAAqC,EAAE,CAAC,KAAK,EAAE,GAAW,EAAE,EAAE,CAC7E,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC,CAAC,CAAC,KAAK,CAC/B,CAAC"}
|
|
@@ -0,0 +1,120 @@
|
|
|
1
|
+
// 一条定时任务 = 一份**可注入代码的配置**: `~/.wezard/tasks/<id>.task.mjs`。
|
|
2
|
+
//
|
|
3
|
+
// 为什么是文件而不是 config 里的一行记录: 定时任务天生是「到点跑一段逻辑」, 而
|
|
4
|
+
// 逻辑写不进 json。旧形状里 wizard 只能通过人话解析器间接碰到「什么时候」, 碰不到
|
|
5
|
+
// 的说法就做不到; 「放枪前先看一眼有没有活」更是完全无处安放, 只能到点先起一个
|
|
6
|
+
// wizard 再让它自己判断要不要干 —— 每一次空转都是一个 pane 加一份上下文。
|
|
7
|
+
//
|
|
8
|
+
// 现在这份文件就是配置本身: wizard 用 Read/Edit 直接改它, 存盘即生效。它导出四件
|
|
9
|
+
// 事, 每一件都可以被单独替换 (Strategy):
|
|
10
|
+
//
|
|
11
|
+
// when 何时放枪 —— 人话, 或 helpers 组合出的规约 (shared/trigger.ts)
|
|
12
|
+
// gate 放枪前的检查 (可选) —— 有副作用、可以跑命令; 返回 false 这一轮就不放
|
|
13
|
+
// prompt 到点说给 wizard 听的话, `{{var}}` 由 gate 填
|
|
14
|
+
// target/fresh 在谁的聊天/目录下办, 是否每次新起一个白板 wizard
|
|
15
|
+
// createdBy 排班的 wizard —— 日程归它 (owner), fresh 执行体挂在它的家谱下
|
|
16
|
+
//
|
|
17
|
+
// 本模块只做纯的那一半: 形状、校验、模板渲染、路径。加载与执行在 daemon/。
|
|
18
|
+
import { basename, join } from "node:path";
|
|
19
|
+
import { describeTrigger, toTrigger } from "./trigger.js";
|
|
20
|
+
export const TASKS_DIR = "~/.wezard/tasks";
|
|
21
|
+
export const TASK_EXT = ".task.mjs";
|
|
22
|
+
const DEFAULT_GATE_TIMEOUT = 120;
|
|
23
|
+
export const taskIdOfFile = (file) => basename(file).replace(/\.task\.mjs$/, "");
|
|
24
|
+
export const fileOfTaskId = (dir, id) => join(dir, `${id}${TASK_EXT}`);
|
|
25
|
+
/** 文件名即 id, 所以它必须既好认又能当路径。 */
|
|
26
|
+
export const slugify = (raw, fallback) => {
|
|
27
|
+
const s = raw.toLowerCase().replace(/[^\p{L}\p{N}]+/gu, "-").slice(0, 24).replace(/^-+|-+$/g, "");
|
|
28
|
+
return s || fallback;
|
|
29
|
+
};
|
|
30
|
+
export const uniqueId = (want, taken) => taken.has(want) ? [...Array(99).keys()].map((i) => `${want}-${i + 2}`).find((c) => !taken.has(c)) ?? `${want}-${Date.now() % 1000}` : want;
|
|
31
|
+
/** 模块 → 记录。认不出的 when / 空 prompt 在这里被挡住, 连带一句人话的理由。 */
|
|
32
|
+
export const normalizeTask = (mod, id, file, now = new Date()) => {
|
|
33
|
+
if (!mod || typeof mod !== "object")
|
|
34
|
+
return { ok: false, reason: "任务文件要 `export default { when, prompt }`" };
|
|
35
|
+
const m = mod;
|
|
36
|
+
const prompt = (m.prompt ?? "").toString().trim();
|
|
37
|
+
if (!prompt)
|
|
38
|
+
return { ok: false, reason: "prompt 不能为空" };
|
|
39
|
+
const tr = toTrigger(m.when, now);
|
|
40
|
+
if (!tr.ok)
|
|
41
|
+
return { ok: false, reason: tr.reason };
|
|
42
|
+
return {
|
|
43
|
+
ok: true,
|
|
44
|
+
task: {
|
|
45
|
+
id,
|
|
46
|
+
file,
|
|
47
|
+
trigger: tr.trigger,
|
|
48
|
+
when: describeTrigger(tr.trigger),
|
|
49
|
+
prompt,
|
|
50
|
+
note: (m.note ?? "").toString(),
|
|
51
|
+
target: (m.target ?? "").toString(),
|
|
52
|
+
fresh: m.fresh !== false,
|
|
53
|
+
enabled: m.enabled !== false,
|
|
54
|
+
hasGate: typeof m.gate === "function",
|
|
55
|
+
gateTimeoutSec: Math.max(5, Math.min(900, m.gateTimeoutSec ?? DEFAULT_GATE_TIMEOUT)),
|
|
56
|
+
createdBy: (m.createdBy ?? "").toString(),
|
|
57
|
+
owner: (m.createdBy ?? "").toString() || (m.target ?? "").toString(),
|
|
58
|
+
},
|
|
59
|
+
};
|
|
60
|
+
};
|
|
61
|
+
// ── 生成 ────────────────────────────────────────────────────────────
|
|
62
|
+
const js = (s) => JSON.stringify(s);
|
|
63
|
+
/** 人话 → 源码里那一行 `when`。认出来是什么就写什么, 别把原话塞进去 ——
|
|
64
|
+
* 「20 分钟后」在下一次 reload 时会重新往后数 20 分钟。 */
|
|
65
|
+
const renderWhen = (tr) => {
|
|
66
|
+
const guards = tr.guards.map((g) => g.kind === "between" ? `between("${String(g.from.hour).padStart(2, "0")}:${String(g.from.minute).padStart(2, "0")}", "${String(g.to.hour).padStart(2, "0")}:${String(g.to.minute).padStart(2, "0")}")`
|
|
67
|
+
: g.kind === "onDays" ? `onDays(${JSON.stringify(g.days)})`
|
|
68
|
+
: `not(/* ${g.kind} */)`);
|
|
69
|
+
const c = tr.clock;
|
|
70
|
+
const clock = c.kind === "every" ? `every(${c.minutes})`
|
|
71
|
+
: c.kind === "once" ? `at(${c.at})`
|
|
72
|
+
: `daily(${c.times.map((t) => `"${String(t.hour).padStart(2, "0")}:${String(t.minute).padStart(2, "0")}"`).join(", ")})`;
|
|
73
|
+
const helpers = [
|
|
74
|
+
...(guards.length ? ["and"] : []),
|
|
75
|
+
...(c.kind === "every" ? ["every"] : c.kind === "once" ? ["at"] : ["daily"]),
|
|
76
|
+
...new Set(tr.guards.map((g) => (g.kind === "between" ? "between" : g.kind === "onDays" ? "onDays" : "not"))),
|
|
77
|
+
];
|
|
78
|
+
const body = guards.length ? `and(${clock}, ${guards.join(", ")})` : clock;
|
|
79
|
+
return `({ ${helpers.join(", ")} }) => ${body}`;
|
|
80
|
+
};
|
|
81
|
+
/**
|
|
82
|
+
* 新任务的源码。头上那段注释是 wizard 唯一的说明书 —— 它 Read 这个文件时看到的
|
|
83
|
+
* 就是这些, 所以写全: 能改什么、gate 拿得到什么、改完要不要重启 (不要)。
|
|
84
|
+
*/
|
|
85
|
+
export const renderTaskFile = (d) => `// wezard 定时任务 · ${d.id}
|
|
86
|
+
// 这份文件**就是配置**: 直接改, 存盘即生效 (守护进程盯着这个目录, 不用 reload)。
|
|
87
|
+
//
|
|
88
|
+
// when 何时放枪。人话 ("每个工作日晚上9:30") 或组合:
|
|
89
|
+
// every("1h") | daily("09:00","18:00") | at(<epoch ms>) ← 产生时刻
|
|
90
|
+
// between("08:00","20:00") | onDays("工作日") | not(…) ← 只做筛选
|
|
91
|
+
// and(every("1h"), between("08:00","20:00")) ← 时钟 ∧ 筛子
|
|
92
|
+
// gate 放枪前的检查, 可选。**没拉到活就别惊动 wizard** 用它:
|
|
93
|
+
// 返回 false → 这一轮不放枪 (不起 wizard, 群里也不出声)
|
|
94
|
+
// 返回 { vars } → 放枪, vars 填进 prompt 里的 {{名字}}
|
|
95
|
+
// 返回 { state } → 存下来, 下一轮从 ctx.state 拿得到
|
|
96
|
+
// ctx = { now, task:{id,target,cwd}, sh(cmd), state, log }
|
|
97
|
+
// sh 的 cwd 默认是目标 wizard 的工作区; 抛错等同于返回 false。
|
|
98
|
+
// prompt 到点说给 wizard 听的话。写成零上下文也能执行的完整指令 —— 到点接活的
|
|
99
|
+
// 多半是个刚出生的白板 wizard, 它只看得见这一句。
|
|
100
|
+
//
|
|
101
|
+
// 停掉这条任务: enabled: false (留档), 或直接删掉本文件。
|
|
102
|
+
export default {
|
|
103
|
+
note: ${js(d.note)},
|
|
104
|
+
target: ${js(d.target)},
|
|
105
|
+
fresh: ${d.fresh},
|
|
106
|
+
enabled: true,
|
|
107
|
+
createdBy: ${js(d.createdBy)},
|
|
108
|
+
|
|
109
|
+
when: ${renderWhen(d.trigger)},
|
|
110
|
+
|
|
111
|
+
// gate: async ({ sh, state, log }) => {
|
|
112
|
+
// const out = await sh("git fetch -q && git log --oneline HEAD..@{u}");
|
|
113
|
+
// if (!out.trim()) return false; // 没新东西 → 这一轮不放枪
|
|
114
|
+
// return { vars: { commits: out.trim() } }; // 有 → prompt 里的 {{commits}}
|
|
115
|
+
// },
|
|
116
|
+
|
|
117
|
+
prompt: ${JSON.stringify(d.prompt)},
|
|
118
|
+
};
|
|
119
|
+
`;
|
|
120
|
+
//# sourceMappingURL=task-file.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"task-file.js","sourceRoot":"","sources":["../../shared/task-file.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,232 @@
|
|
|
1
|
+
// 触发规约 (Specification) —— 「什么时候放枪」从一个三选一的枚举, 改成一棵可组合、
|
|
2
|
+
// 可序列化、可回显的小 AST。
|
|
3
|
+
//
|
|
4
|
+
// 改这一刀的理由: 枚举是封闭的, 而人的说法是开放的。「白天每隔一个小时」在旧形状
|
|
5
|
+
// 里无处安放 —— 它是两件事的**交集**: 一个产生时刻的时钟 (每小时), 和一个只会
|
|
6
|
+
// 否决的筛子 (08:00–20:00)。把这两类分开, 组合就够用了, 不必为每种新说法再加一个
|
|
7
|
+
// kind:
|
|
8
|
+
//
|
|
9
|
+
// Clock 能自己产生候选时刻, 有「下次是什么时候」 every / daily / once
|
|
10
|
+
// Guard 产生不了任何一枪, 只否决落在外面的 between / onDays / not
|
|
11
|
+
// Trigger = 一个 Clock ∧ 若干 Guard
|
|
12
|
+
//
|
|
13
|
+
// AST 而不是闭包: 闭包没法回显给人看 (「每 1 小时 · 08:00-20:00」)、没法存进 json、
|
|
14
|
+
// 没法在详情页画出来。构造器 (every/daily/and/…) 只是这棵树的字面量工厂 —— LLM
|
|
15
|
+
// 写 `and(every("1h"), between("08:00","20:00"))` 与手写对象字面量等价。
|
|
16
|
+
import { daysLabel, daysOf, durationLabel, hhmm, parseDays, parseDuration, parseInterval, parseOnceAt, parseTimeOfDay, parseWindow, RANGE_RE, } from "./schedule-spec.js";
|
|
17
|
+
// 守护进程重启/维护会吃掉整分钟的 tick。错过的那一下在 5 分钟内补跑, 超出就放弃 ——
|
|
18
|
+
// 早上 9 点的任务在中午补跑比不跑更糟。
|
|
19
|
+
const CATCHUP_MS = 5 * 60_000;
|
|
20
|
+
const minutesOfDay = (t) => t.hour * 60 + t.minute;
|
|
21
|
+
const asHM = (v) => {
|
|
22
|
+
if (typeof v !== "string")
|
|
23
|
+
return v;
|
|
24
|
+
const t = parseTimeOfDay(v);
|
|
25
|
+
if (!t)
|
|
26
|
+
throw new Error(`认不出时刻「${v}」, 写成 "09:30" / "晚上9点半" 这样`);
|
|
27
|
+
return t;
|
|
28
|
+
};
|
|
29
|
+
// ── 构造器 (任务文件里的 helpers) ──────────────────────────────────
|
|
30
|
+
/** `every("1h")` / `every(90)` / `every("每隔两个小时")` —— 每隔多久一枪。 */
|
|
31
|
+
export const every = (spec) => {
|
|
32
|
+
const n = typeof spec === "string" ? (parseDuration(spec) ?? parseInterval(spec)) : parseDuration(spec);
|
|
33
|
+
if (!n)
|
|
34
|
+
throw new Error(`认不出间隔「${spec}」, 写成 "1h" / "30m" / "两小时"`);
|
|
35
|
+
return { clock: { kind: "every", minutes: Math.max(1, Math.round(n)) }, guards: [] };
|
|
36
|
+
};
|
|
37
|
+
/** `daily("09:30")` / `daily("09:00", "18:00")` —— 每天的这几个时刻。 */
|
|
38
|
+
export const daily = (...times) => ({
|
|
39
|
+
clock: { kind: "daily", times: times.length ? times.map(asHM) : [{ hour: 9, minute: 0 }] },
|
|
40
|
+
guards: [],
|
|
41
|
+
});
|
|
42
|
+
/** `at("2026-10-01 09:00")` / `at(Date)` —— 只响一次。 */
|
|
43
|
+
export const at = (when) => {
|
|
44
|
+
const ms = when instanceof Date ? when.getTime()
|
|
45
|
+
: typeof when === "number" ? when
|
|
46
|
+
: (parseOnceAt(when, new Date()) ?? Date.parse(when));
|
|
47
|
+
if (!Number.isFinite(ms))
|
|
48
|
+
throw new Error(`认不出时刻「${String(when)}」`);
|
|
49
|
+
return { clock: { kind: "once", at: ms }, guards: [] };
|
|
50
|
+
};
|
|
51
|
+
/** `between("08:00","20:00")` —— 只在这段时间内放行。from > to 视为跨午夜。 */
|
|
52
|
+
export const between = (from, to) => ({ kind: "between", from: asHM(from), to: asHM(to) });
|
|
53
|
+
/** `onDays("工作日")` / `onDays([1,3,5])` —— 只在这几天放行。 */
|
|
54
|
+
export const onDays = (spec) => ({ kind: "onDays", days: daysOf(spec) });
|
|
55
|
+
export const not = (of) => ({ kind: "not", of });
|
|
56
|
+
/** `and(every("1h"), between("08:00","20:00"))` —— 一个时钟配若干筛子。 */
|
|
57
|
+
export const and = (base, ...guards) => ({ clock: base.clock, guards: [...base.guards, ...guards] });
|
|
58
|
+
/** 任务文件的 `when` 拿到的就是这一组; 传进去而不是让它 import, 是因为任务文件
|
|
59
|
+
* 住在 ~/.wezard/tasks/ 下, 那里没有也不该有到 dist 的相对路径。 */
|
|
60
|
+
export const TRIGGER_HELPERS = { every, daily, at, between, onDays, not, and };
|
|
61
|
+
// ── 人话 → 规约 ────────────────────────────────────────────────────
|
|
62
|
+
/**
|
|
63
|
+
* 整句话进, 规约出。认不出返回 undefined —— 调用方要把原句回给用户让他重说,
|
|
64
|
+
* 绝不能猜一个时间安静地存下去。
|
|
65
|
+
*
|
|
66
|
+
* 顺序有意为之: 一次性 (带「今天/明天/N 分钟后」的措辞) 最具体, 其次是间隔,
|
|
67
|
+
* 最后才是周期日程 —— 「每天」这种词在前两者里都不会出现。窗口与星期是筛子,
|
|
68
|
+
* 无论走哪条时钟分支都往上挂。
|
|
69
|
+
*/
|
|
70
|
+
export const parseTrigger = (text, now = new Date()) => {
|
|
71
|
+
const t = text.trim();
|
|
72
|
+
if (!t)
|
|
73
|
+
return undefined;
|
|
74
|
+
const once = parseOnceAt(t, now);
|
|
75
|
+
if (once !== undefined)
|
|
76
|
+
return { clock: { kind: "once", at: once }, guards: [] };
|
|
77
|
+
const w = parseWindow(t);
|
|
78
|
+
// 「8点到20点每小时」: 区间已被窗口吃掉, 再去 parseTimeOfDay 会把 8 点当成日程
|
|
79
|
+
// 时刻。显式区间从句子里剔掉后再找时刻。
|
|
80
|
+
const tod = parseTimeOfDay(w?.explicit ? t.replace(RANGE_RE, " ") : t, t);
|
|
81
|
+
// 软窗口 (「晚上」) 碰上具体时刻就让位 —— 那个词说的是这一刻, 不是一段。
|
|
82
|
+
const win = w && (!w.soft || !tod) ? w : undefined;
|
|
83
|
+
const days = parseDays(t);
|
|
84
|
+
const iv = parseInterval(t);
|
|
85
|
+
const guards = [
|
|
86
|
+
...(win ? [between(win.from, win.to)] : []),
|
|
87
|
+
...(days && days.length ? [onDays(days)] : []),
|
|
88
|
+
];
|
|
89
|
+
// 「每 2 天早上 9 点」这种既给间隔又给时刻的说法, 按日程理解更接近本意;
|
|
90
|
+
// 纯间隔 (不带时刻) 才走 every。
|
|
91
|
+
if (iv !== undefined && !tod)
|
|
92
|
+
return { clock: { kind: "every", minutes: Math.max(1, Math.round(iv)) }, guards };
|
|
93
|
+
if (tod)
|
|
94
|
+
return { clock: { kind: "daily", times: [tod] }, guards };
|
|
95
|
+
if (days)
|
|
96
|
+
return { clock: { kind: "daily", times: [{ hour: 9, minute: 0 }] }, guards }; // 只说了「每个工作日」
|
|
97
|
+
if (iv !== undefined)
|
|
98
|
+
return { clock: { kind: "every", minutes: Math.max(1, Math.round(iv)) }, guards };
|
|
99
|
+
return undefined;
|
|
100
|
+
};
|
|
101
|
+
/** 1.5.x 之前的三选一 `when`。老 config 里的定时靠它升格, 否则静默消失。 */
|
|
102
|
+
export const triggerOfLegacyWhen = (w) => {
|
|
103
|
+
if (w.kind === "every")
|
|
104
|
+
return { clock: { kind: "every", minutes: w.minutes ?? 60 }, guards: [] };
|
|
105
|
+
if (w.kind === "once")
|
|
106
|
+
return { clock: { kind: "once", at: w.at ?? 0 }, guards: [] };
|
|
107
|
+
return {
|
|
108
|
+
clock: { kind: "daily", times: [{ hour: w.hour ?? 9, minute: w.minute ?? 0 }] },
|
|
109
|
+
guards: w.days?.length ? [onDays(w.days)] : [],
|
|
110
|
+
};
|
|
111
|
+
};
|
|
112
|
+
/** 任务文件的 `when` 可以写成人话、helpers 表达式或直接一棵树 —— 都收敛到这里。 */
|
|
113
|
+
export const toTrigger = (when, now = new Date()) => {
|
|
114
|
+
try {
|
|
115
|
+
if (typeof when === "function") {
|
|
116
|
+
const r = when(TRIGGER_HELPERS);
|
|
117
|
+
return toTrigger(r, now);
|
|
118
|
+
}
|
|
119
|
+
if (typeof when === "string") {
|
|
120
|
+
const t = parseTrigger(when, now);
|
|
121
|
+
return t ? { ok: true, trigger: t } : { ok: false, reason: WHEN_HELP(when) };
|
|
122
|
+
}
|
|
123
|
+
if (when && typeof when === "object" && "clock" in when) {
|
|
124
|
+
const tr = when;
|
|
125
|
+
return { ok: true, trigger: { clock: tr.clock, guards: tr.guards ?? [] } };
|
|
126
|
+
}
|
|
127
|
+
return { ok: false, reason: `when 认不出: ${JSON.stringify(when)?.slice(0, 120) ?? typeof when}` };
|
|
128
|
+
}
|
|
129
|
+
catch (e) {
|
|
130
|
+
return { ok: false, reason: e.message };
|
|
131
|
+
}
|
|
132
|
+
};
|
|
133
|
+
export const WHEN_HELP = (raw) => `无法理解「${raw}」。能认的说法: 每天/每个工作日/每周三 + 时刻 (晚上9:30 / 21:30 / 九点半), ` +
|
|
134
|
+
`每隔 N 分钟|小时 (每小时 / 每隔两个小时), N 分钟后, 明早 9 点; ` +
|
|
135
|
+
`再叠时间窗口 (白天 / 工作时间 / 8点到20点)。也可以在任务文件里直接写 ` +
|
|
136
|
+
`\`when: ({every, between, and}) => and(every("1h"), between("08:00","20:00"))\`。`;
|
|
137
|
+
// ── 判定 ────────────────────────────────────────────────────────────
|
|
138
|
+
/** 此刻落在这个筛子里吗。`between` 的 from > to 表示跨午夜 (「夜里」)。 */
|
|
139
|
+
export const holds = (g, now) => {
|
|
140
|
+
switch (g.kind) {
|
|
141
|
+
case "onDays":
|
|
142
|
+
return !g.days.length || g.days.includes(now.getDay());
|
|
143
|
+
case "not":
|
|
144
|
+
return !holds(g.of, now);
|
|
145
|
+
case "between": {
|
|
146
|
+
const m = now.getHours() * 60 + now.getMinutes();
|
|
147
|
+
const a = minutesOfDay(g.from);
|
|
148
|
+
const b = minutesOfDay(g.to);
|
|
149
|
+
return a <= b ? m >= a && m < b : m >= a || m < b;
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
};
|
|
153
|
+
const dailyInstantsToday = (times, now) => times.map((t) => {
|
|
154
|
+
const d = new Date(now);
|
|
155
|
+
d.setHours(t.hour, t.minute, 0, 0);
|
|
156
|
+
return d.getTime();
|
|
157
|
+
});
|
|
158
|
+
const clockDue = (c, now, since) => {
|
|
159
|
+
const t = now.getTime();
|
|
160
|
+
switch (c.kind) {
|
|
161
|
+
case "once":
|
|
162
|
+
return t >= c.at && since < c.at;
|
|
163
|
+
case "every":
|
|
164
|
+
return t - since >= c.minutes * 60_000;
|
|
165
|
+
case "daily":
|
|
166
|
+
return dailyInstantsToday(c.times, now).some((inst) => t >= inst && t - inst < CATCHUP_MS && since < inst);
|
|
167
|
+
}
|
|
168
|
+
};
|
|
169
|
+
/**
|
|
170
|
+
* 到点了吗。`since` = 上次触发时刻, 从没触发过就传创建时刻 —— 它同时承担三件事:
|
|
171
|
+
* 同一分钟内多次 tick 的去重、重启后不重复触发、以及「刚创建就到点」不立即打一枪。
|
|
172
|
+
*
|
|
173
|
+
* 筛子放在时钟之后判: 窗外的那一枪是**被吞掉**而不是被推迟 —— 「白天每小时」在
|
|
174
|
+
* 夜里不补跑, 早上 8 点重新开始。
|
|
175
|
+
*/
|
|
176
|
+
export const isDue = (tr, now, since) => clockDue(tr.clock, now, since) && tr.guards.every((g) => holds(g, now));
|
|
177
|
+
// 筛子恒假时 (「每周三」配「周末」) 枚举会走到天荒地老 —— 给个上限, 到顶返回
|
|
178
|
+
// 最后一个候选。回显里那个"下次"不准好过让详情页卡死。
|
|
179
|
+
const MAX_PROBE = 512;
|
|
180
|
+
function* candidates(c, since, now) {
|
|
181
|
+
const t = now.getTime();
|
|
182
|
+
if (c.kind === "once") {
|
|
183
|
+
yield c.at;
|
|
184
|
+
return;
|
|
185
|
+
}
|
|
186
|
+
if (c.kind === "every") {
|
|
187
|
+
const step = c.minutes * 60_000;
|
|
188
|
+
let next = Math.max(since + step, t);
|
|
189
|
+
for (let i = 0; i < MAX_PROBE; i++) {
|
|
190
|
+
yield next;
|
|
191
|
+
next += step;
|
|
192
|
+
}
|
|
193
|
+
return;
|
|
194
|
+
}
|
|
195
|
+
for (let d = 0; d < MAX_PROBE / 8; d++) {
|
|
196
|
+
const day = new Date(now.getFullYear(), now.getMonth(), now.getDate() + d);
|
|
197
|
+
for (const inst of dailyInstantsToday(c.times, day).sort((a, b) => a - b))
|
|
198
|
+
if (inst > t)
|
|
199
|
+
yield inst;
|
|
200
|
+
}
|
|
201
|
+
}
|
|
202
|
+
/** 下一次该在什么时候响 —— 时钟给候选, 筛子挑第一个过的。`since` 同 isDue。 */
|
|
203
|
+
export const nextFire = (tr, since, now = new Date()) => {
|
|
204
|
+
let last = now.getTime();
|
|
205
|
+
for (const c of candidates(tr.clock, since, now)) {
|
|
206
|
+
last = c;
|
|
207
|
+
if (tr.guards.every((g) => holds(g, new Date(c))))
|
|
208
|
+
return c;
|
|
209
|
+
}
|
|
210
|
+
return last;
|
|
211
|
+
};
|
|
212
|
+
// ── 回显 ────────────────────────────────────────────────────────────
|
|
213
|
+
const guardLabel = (g) => {
|
|
214
|
+
switch (g.kind) {
|
|
215
|
+
case "between": return `${hhmm(g.from)}-${hhmm(g.to)}`;
|
|
216
|
+
case "onDays": return daysLabel(g.days);
|
|
217
|
+
case "not": return `非(${guardLabel(g.of)})`;
|
|
218
|
+
}
|
|
219
|
+
};
|
|
220
|
+
const clockLabel = (c) => {
|
|
221
|
+
switch (c.kind) {
|
|
222
|
+
case "every": return `每 ${durationLabel(c.minutes)}`;
|
|
223
|
+
case "daily": return c.times.map(hhmm).join("、");
|
|
224
|
+
case "once": {
|
|
225
|
+
const d = new Date(c.at);
|
|
226
|
+
return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, "0")}-${String(d.getDate()).padStart(2, "0")} ${hhmm({ hour: d.getHours(), minute: d.getMinutes() })}(仅一次)`;
|
|
227
|
+
}
|
|
228
|
+
}
|
|
229
|
+
};
|
|
230
|
+
/** 人能一眼确认的回显 —— 存下去之前必须把它回给用户。 */
|
|
231
|
+
export const describeTrigger = (tr) => [clockLabel(tr.clock), ...tr.guards.map(guardLabel)].join(" · ");
|
|
232
|
+
//# sourceMappingURL=trigger.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"trigger.js","sourceRoot":"","sources":["../../shared/trigger.ts"],"names":[],"mappings":"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"}
|
package/dist/shared/world.js
CHANGED
|
@@ -93,13 +93,15 @@ export const buildWorld = (records, facts, scope, now) => {
|
|
|
93
93
|
const base = baseOfKey(target);
|
|
94
94
|
const chat = f?.chat ?? facts.chatNames[base] ?? "";
|
|
95
95
|
const until = rs.reduce((mx, r) => Math.max(mx, staleAt(r)), 0);
|
|
96
|
+
// 名字全局唯一, 与聊天无关 —— 名册里的就是它; 名册缺席 (svr) 才按 slot / 聊天名推。
|
|
97
|
+
const name = (f?.name ?? "").trim() || tag || chat || target;
|
|
96
98
|
return {
|
|
97
99
|
target,
|
|
98
100
|
base,
|
|
99
101
|
tag,
|
|
100
102
|
chat,
|
|
101
|
-
name
|
|
102
|
-
label:
|
|
103
|
+
name,
|
|
104
|
+
label: labelFor(name),
|
|
103
105
|
description: f?.description ?? "",
|
|
104
106
|
cwd: f?.cwd || [...rs].reverse().find((r) => r.cwd)?.cwd || "",
|
|
105
107
|
model: f?.model || [...rs].reverse().find((r) => r.model)?.model || "",
|
|
@@ -137,14 +139,24 @@ export const buildWorld = (records, facts, scope, now) => {
|
|
|
137
139
|
: m1;
|
|
138
140
|
}, new Map());
|
|
139
141
|
// 登记边 —— 家谱。观测不到 (分身可能一句话没说), 但它是最稳定的一种关系。
|
|
140
|
-
const
|
|
141
|
-
|
|
142
|
+
const withLineage = facts.wizards.reduce(
|
|
143
|
+
// 克隆边从上下文的来源画起 (克隆别人时是 forkOf, 否则是 parent); 克隆了别人的那位
|
|
144
|
+
// parent 另记一条 spawn 边 —— 它是生出这个分身、归它管的那一位。
|
|
145
|
+
(m, w) => {
|
|
146
|
+
if (!w.parent)
|
|
147
|
+
return m;
|
|
148
|
+
if (!w.clonedFrom)
|
|
149
|
+
return link(m, "spawn", w.parent, w.target, w.bornAt ?? 0);
|
|
150
|
+
const m1 = link(m, "clone", w.forkOf ?? w.parent, w.target, w.bornAt ?? 0);
|
|
151
|
+
return w.forkOf ? link(m1, "spawn", w.parent, w.target, w.bornAt ?? 0) : m1;
|
|
152
|
+
}, observed);
|
|
153
|
+
const edges = [...withLineage.values()].sort((a, b) => b.lastTs - a.lastTs);
|
|
142
154
|
// 有关系的一律留下 —— 边的端点被筛掉, 那条边就没地方落脚了。
|
|
143
155
|
const linked = new Set(edges.flatMap((e) => [e.from, e.to]));
|
|
144
156
|
const pinned = new Set([
|
|
145
157
|
...linked,
|
|
146
158
|
...facts.jobs.filter((j) => j.status === "open").flatMap((j) => [j.owner, ...j.members.map((mm) => mm.target)]),
|
|
147
|
-
...facts.schedules.
|
|
159
|
+
...facts.schedules.flatMap((x) => [x.target, x.owner].filter(Boolean)),
|
|
148
160
|
]);
|
|
149
161
|
const relevant = (n) => n.local || n.self || pinned.has(n.target) || n.busy || n.alive || now - n.lastTs < RECENT_MS;
|
|
150
162
|
const parentOf = (t) => factOf.get(t)?.parent;
|
package/dist/shared/world.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"world.js","sourceRoot":"","sources":["../../shared/world.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"world.js","sourceRoot":"","sources":["../../shared/world.ts"],"names":[],"mappings":"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"}
|
package/dist/svr/index.js
CHANGED
|
@@ -2,11 +2,18 @@
|
|
|
2
2
|
// wezard svr — 独立的 detail 中转服务。部署到 chat + cli 都可达的网络机器上,
|
|
3
3
|
// cli/daemon 端把 tool/approval 详情 POST 过来, chat 用户点卡片链接直连本机浏览。
|
|
4
4
|
//
|
|
5
|
-
//
|
|
5
|
+
// 只有三条业务路由:
|
|
6
6
|
// • POST /d bearer 鉴权, body = DetailRecord JSON → 存入 store
|
|
7
|
+
// • POST /w bearer 鉴权, body = 一台 daemon 的注册表快照 (WorldFacts)
|
|
7
8
|
// • GET /detail?id= 从 store 取, 用 shared/detail-render 渲染 HTML
|
|
8
9
|
// 加上 GET /healthz 便于反代/监控探活。
|
|
9
10
|
//
|
|
11
|
+
// 为什么要 POST /w: turn 记录里只有"谁跑了一轮", 身份 / 家谱 / 工单 / 日程全在
|
|
12
|
+
// daemon 那侧的注册表里。没有它, 远端浏览的关系图退化成「名册缺席」, 日程栏更是
|
|
13
|
+
// 永远空的 —— 而那恰恰是最该被远程看一眼的东西。快照按**来源机器**分开存: 一个
|
|
14
|
+
// svr 可能同时接着几台 daemon, 覆盖式写会让先推的那台凭空消失; 读的时候合并,
|
|
15
|
+
// 过了 FACTS_TTL_MS 没再推的来源自动淡出 (那台机器下线了)。
|
|
16
|
+
//
|
|
10
17
|
// 存储直接复用 daemon 的 createDetailStore (append-only JSONL + LRU + 24h TTL)。
|
|
11
18
|
// 信任模型: token 相同 = 可写; 读端不签名 (拿到 id 即可读)。id 是 uuid, 不可枚举。
|
|
12
19
|
import { createServer } from "node:http";
|
|
@@ -17,6 +24,7 @@ import { loadOrCreateSvrToken } from "../shared/svr-token.js";
|
|
|
17
24
|
import { createDetailStore } from "../shared/detail-store.js";
|
|
18
25
|
import { renderDetailPage, renderNotFound } from "../shared/detail-render.js";
|
|
19
26
|
import { createChatRoutes, chatRouteTable } from "../shared/chat-http.js";
|
|
27
|
+
import { EMPTY_FACTS } from "../shared/world.js";
|
|
20
28
|
import { resolvePublicHost } from "../shared/lan-ip.js";
|
|
21
29
|
import { loadConfig } from "../shared/config.js";
|
|
22
30
|
// Defaults: config.svr.* > 硬编码兜底。CLI 参数在 parseArgs 里再覆盖上去。
|
|
@@ -108,6 +116,29 @@ const json = (res, status, body) => {
|
|
|
108
116
|
res.setHeader("content-type", "application/json");
|
|
109
117
|
res.end(JSON.stringify(body));
|
|
110
118
|
};
|
|
119
|
+
/** 一份快照从推来到失效的窗口。daemon 每 30s 推一次, 给足三次重试的余量 —— 宁可
|
|
120
|
+
* 多显示两分钟略陈的忙闲, 也好过一次网络抖动就把整张名册抹成「缺席」。 */
|
|
121
|
+
const FACTS_TTL_MS = 150_000;
|
|
122
|
+
const isFactsPush = (v) => {
|
|
123
|
+
if (!v || typeof v !== "object")
|
|
124
|
+
return false;
|
|
125
|
+
const r = v;
|
|
126
|
+
const f = r.facts;
|
|
127
|
+
if (typeof r.source !== "string" || !r.source || !f)
|
|
128
|
+
return false;
|
|
129
|
+
return Array.isArray(f.wizards) && Array.isArray(f.jobs) && Array.isArray(f.schedules) && !!f.chatNames;
|
|
130
|
+
};
|
|
131
|
+
/** 几台 daemon 的快照合成一份世界。同一个 key 只可能由它所属的那台机器推出来,
|
|
132
|
+
* 所以合并就是拼接 + 去重 (后来的覆盖, 顺带把同一台机器的重推收敛掉)。 */
|
|
133
|
+
const mergeFacts = (fresh) => {
|
|
134
|
+
const uniq = (xs, key) => [...xs.reduce((m, x) => m.set(key(x), x), new Map()).values()];
|
|
135
|
+
return {
|
|
136
|
+
wizards: uniq(fresh.flatMap((p) => [...p.facts.wizards]), (w) => w.target),
|
|
137
|
+
jobs: uniq(fresh.flatMap((p) => [...p.facts.jobs]), (j) => j.id),
|
|
138
|
+
schedules: uniq(fresh.flatMap((p) => [...p.facts.schedules]), (x) => x.id),
|
|
139
|
+
chatNames: Object.assign({}, ...fresh.map((p) => p.facts.chatNames)),
|
|
140
|
+
};
|
|
141
|
+
};
|
|
111
142
|
const isDetailRecord = (v) => {
|
|
112
143
|
if (!v || typeof v !== "object")
|
|
113
144
|
return false;
|
|
@@ -127,9 +158,19 @@ const main = async () => {
|
|
|
127
158
|
mkdirSync(stateDir, { recursive: true });
|
|
128
159
|
const token = loadOrCreateSvrToken(args.tokenFile, args.token);
|
|
129
160
|
const store = createDetailStore({ stateDir, log });
|
|
161
|
+
// 注册表快照只放内存: 它是 daemon 那边的投影, 重启后下一次推送 (≤30s) 就补齐,
|
|
162
|
+
// 落盘只会换来一份过期名册在冷启动那几十秒里冒充现状。
|
|
163
|
+
const factsBySource = new Map();
|
|
164
|
+
const currentFacts = () => {
|
|
165
|
+
const cut = Date.now() - FACTS_TTL_MS;
|
|
166
|
+
const fresh = [...factsBySource].filter(([, v]) => v.at > cut);
|
|
167
|
+
for (const [k] of [...factsBySource].filter(([, v]) => v.at <= cut))
|
|
168
|
+
factsBySource.delete(k);
|
|
169
|
+
return fresh.length ? mergeFacts(fresh.map(([source, v]) => ({ source, facts: v.facts }))) : EMPTY_FACTS;
|
|
170
|
+
};
|
|
130
171
|
// Chat 视图 (SPA + JSON API + SSE) 与 daemon 完全同源 —— svr 侧的记录是 POST /d
|
|
131
172
|
// 推过来的, store.subscribe 一样会触发, 所以远端浏览也是实时的。
|
|
132
|
-
const chat = chatRouteTable(createChatRoutes(store));
|
|
173
|
+
const chat = chatRouteTable(createChatRoutes(store, currentFacts));
|
|
133
174
|
const server = createServer(async (req, res) => {
|
|
134
175
|
const url = new URL(req.url ?? "/", `http://${req.headers.host ?? "localhost"}`);
|
|
135
176
|
try {
|
|
@@ -163,6 +204,30 @@ const main = async () => {
|
|
|
163
204
|
res.end(renderDetailPage(rec));
|
|
164
205
|
return;
|
|
165
206
|
}
|
|
207
|
+
if (req.method === "POST" && url.pathname === "/w") {
|
|
208
|
+
const auth = req.headers.authorization ?? "";
|
|
209
|
+
if (!auth.startsWith("Bearer ") || auth.slice(7) !== token) {
|
|
210
|
+
json(res, 401, { ok: false, error: "unauthorized" });
|
|
211
|
+
return;
|
|
212
|
+
}
|
|
213
|
+
const body = await readBody(req);
|
|
214
|
+
let parsed;
|
|
215
|
+
try {
|
|
216
|
+
parsed = JSON.parse(body.toString("utf8"));
|
|
217
|
+
}
|
|
218
|
+
catch {
|
|
219
|
+
json(res, 400, { ok: false, error: "invalid json" });
|
|
220
|
+
return;
|
|
221
|
+
}
|
|
222
|
+
if (!isFactsPush(parsed)) {
|
|
223
|
+
json(res, 400, { ok: false, error: "invalid world facts" });
|
|
224
|
+
return;
|
|
225
|
+
}
|
|
226
|
+
factsBySource.set(parsed.source, { at: Date.now(), facts: parsed.facts });
|
|
227
|
+
log.debug({ source: parsed.source, wizards: parsed.facts.wizards.length }, "world facts stored");
|
|
228
|
+
json(res, 200, { ok: true });
|
|
229
|
+
return;
|
|
230
|
+
}
|
|
166
231
|
if (req.method === "POST" && url.pathname === "/d") {
|
|
167
232
|
const auth = req.headers.authorization ?? "";
|
|
168
233
|
if (!auth.startsWith("Bearer ") || auth.slice(7) !== token) {
|