@modusensus/dsh-mneme 0.12.0 → 0.14.0-beta.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/README.md +51 -20
- package/bin/dsh-mneme-choro.mjs +9 -1
- package/docs/CONFIGURATION.md +47 -6
- package/docs/DIRECTORIES.md +114 -0
- package/docs/DISTILL.md +64 -0
- package/docs/DSH-GO.md +97 -0
- package/docs/ENTITIES.md +5 -3
- package/docs/FORGET.md +77 -0
- package/docs/KB.md +110 -0
- package/docs/SLEEP.md +28 -3
- package/docs/STORAGE.md +23 -0
- package/lib/api-standalone.js +4 -1
- package/lib/api.js +788 -30
- package/lib/attachment-text.js +122 -0
- package/lib/choro-command.js +9 -2
- package/lib/client.js +4627 -1409
- package/lib/config.js +166 -1
- package/lib/continuity.js +7 -6
- package/lib/diary/auto.js +190 -0
- package/lib/diary/compose.js +440 -0
- package/lib/diary/dir.js +59 -0
- package/lib/diary/export.js +97 -0
- package/lib/diary/index.js +26 -0
- package/lib/diary/library.js +189 -0
- package/lib/diary/qq-inbox.js +142 -0
- package/lib/diary/rollover.js +61 -0
- package/lib/diary/session-provider.js +122 -0
- package/lib/dream/decisions.js +95 -6
- package/lib/dream/sleep.js +760 -19
- package/lib/dream/triage.js +139 -0
- package/lib/dream.js +168 -21
- package/lib/dsh-go/host.js +162 -0
- package/lib/dsh-go/panel.js +2091 -0
- package/lib/dsh-go/text.js +342 -0
- package/lib/dsh-go/views/common.js +68 -0
- package/lib/dsh-go/views/entity.js +48 -0
- package/lib/dsh-go/views/memory.js +198 -0
- package/lib/dsh-go/views/root.js +30 -0
- package/lib/dsh-go/views/settings.js +398 -0
- package/lib/dsh-go/views/status.js +51 -0
- package/lib/embedding.js +42 -8
- package/lib/entities/extractor.js +36 -7
- package/lib/hot-memory.js +22 -11
- package/lib/index.js +123 -3
- package/lib/inject.js +203 -20
- package/lib/kb/index.js +309 -0
- package/lib/kb/routes.js +220 -0
- package/lib/kb/tools.js +148 -0
- package/lib/lang.js +98 -4
- package/lib/peak-hours.js +57 -2
- package/lib/semantic.js +347 -60
- package/lib/service.js +268 -69
- package/lib/settings.js +128 -15
- package/lib/store.js +585 -26
- package/lib/summarize.js +38 -11
- package/lib/tools.js +35 -4
- package/lib/user-settings.js +128 -32
- package/lib/vector-index.js +76 -6
- package/lib/wiki/claims.js +267 -0
- package/lib/wiki/cli-hint.js +90 -0
- package/lib/wiki/queries.js +282 -2
- package/lib/wiki/render.js +74 -0
- package/lib/wiki/t0.js +43 -6
- package/lib/wiki/t1-jobs.js +232 -0
- package/lib/wiki/t1.js +145 -32
- package/package.json +39 -1
- package/scripts/release-docs.mjs +7 -1
- package/scripts/release-notes.mjs +4 -1
- package/src/api-standalone.js +4 -1
- package/src/api.js +788 -30
- package/src/attachment-text.js +122 -0
- package/src/choro-command.js +9 -2
- package/src/config.js +166 -1
- package/src/continuity.js +7 -6
- package/src/diary/auto.js +190 -0
- package/src/diary/compose.js +440 -0
- package/src/diary/dir.js +59 -0
- package/src/diary/export.js +97 -0
- package/src/diary/index.js +26 -0
- package/src/diary/library.js +189 -0
- package/src/diary/qq-inbox.js +142 -0
- package/src/diary/rollover.js +61 -0
- package/src/diary/session-provider.js +122 -0
- package/src/dream/decisions.js +95 -6
- package/src/dream/sleep.js +760 -19
- package/src/dream/triage.js +139 -0
- package/src/dream.js +168 -21
- package/src/dsh-go/host.js +162 -0
- package/src/dsh-go/panel.js +2091 -0
- package/src/dsh-go/text.js +342 -0
- package/src/dsh-go/views/common.js +68 -0
- package/src/dsh-go/views/entity.js +48 -0
- package/src/dsh-go/views/memory.js +198 -0
- package/src/dsh-go/views/root.js +30 -0
- package/src/dsh-go/views/settings.js +398 -0
- package/src/dsh-go/views/status.js +51 -0
- package/src/embedding.js +42 -8
- package/src/entities/extractor.js +36 -7
- package/src/hot-memory.js +22 -11
- package/src/index.js +123 -3
- package/src/inject.js +203 -20
- package/src/kb/index.js +309 -0
- package/src/kb/routes.js +220 -0
- package/src/kb/tools.js +148 -0
- package/src/lang.js +98 -4
- package/src/peak-hours.js +57 -2
- package/src/semantic.js +347 -60
- package/src/service.js +268 -69
- package/src/settings.js +128 -15
- package/src/store.js +585 -26
- package/src/summarize.js +38 -11
- package/src/tools.js +35 -4
- package/src/user-settings.js +128 -32
- package/src/vector-index.js +76 -6
- package/src/wiki/claims.js +267 -0
- package/src/wiki/cli-hint.js +90 -0
- package/src/wiki/queries.js +282 -2
- package/src/wiki/render.js +74 -0
- package/src/wiki/t0.js +43 -6
- package/src/wiki/t1-jobs.js +232 -0
- package/src/wiki/t1.js +145 -32
- package/test/api-routes-gaps.test.js +63 -0
- package/test/api.test.js +385 -4
- package/test/attachment-text.test.js +140 -0
- package/test/bm25-corpus-cache.test.js +145 -0
- package/test/capacity-warning.test.js +262 -0
- package/test/client.test.js +1051 -185
- package/test/conflict-freeze.test.js +45 -1
- package/test/conflict-ledger-enforce.test.js +452 -0
- package/test/conflict-ledger.test.js +242 -0
- package/test/continuity.test.js +8 -1
- package/test/contrast.test.js +124 -12
- package/test/diary-library.test.js +187 -0
- package/test/diary.test.js +576 -0
- package/test/dream-baseline-clamp.test.js +174 -0
- package/test/dream-maxtokens-fallback.test.js +3 -3
- package/test/dream.test.js +62 -1
- package/test/dsh-go-host.test.js +134 -0
- package/test/dsh-go-panel-actions.test.js +854 -0
- package/test/dsh-go-panel.test.js +251 -0
- package/test/embedding-ready.test.js +33 -3
- package/test/entities.test.js +73 -0
- package/test/forget-corrections.test.js +70 -0
- package/test/graph-api.test.js +124 -0
- package/test/hot-memory.test.js +48 -0
- package/test/image-memory.test.js +171 -0
- package/test/inject-parent-gate.test.js +6 -3
- package/test/inject.test.js +59 -0
- package/test/issue-617-step1-query-and-fusion.test.js +361 -0
- package/test/kb-api-wiring.test.js +128 -0
- package/test/kb-collections.test.js +272 -0
- package/test/kb-routes.test.js +379 -0
- package/test/mint-source.test.js +26 -0
- package/test/panel-chart-scale.test.js +90 -0
- package/test/panel-tokens.test.js +245 -0
- package/test/peak-hours-observability.test.js +70 -0
- package/test/persona-api.test.js +3 -3
- package/test/persona-by-session.test.js +568 -0
- package/test/persona-settings.test.js +7 -7
- package/test/reflection-update-gate.test.js +129 -0
- package/test/reindex-backfill.test.js +334 -0
- package/test/reindex-scheduler.test.js +369 -0
- package/test/release-docs.test.js +20 -0
- package/test/release-notes.test.js +25 -0
- package/test/scope-candidates.test.js +249 -0
- package/test/security-doc.test.js +10 -0
- package/test/sleep-action-set.test.js +14 -0
- package/test/sleep-heat.test.js +49 -0
- package/test/sleep.test.js +635 -0
- package/test/standalone-api.test.js +24 -0
- package/test/store.test.js +20 -0
- package/test/summarize.test.js +26 -0
- package/test/user-settings-segments.test.js +528 -0
- package/test/vector-index.test.js +120 -6
- package/test/wiki-api.test.js +463 -1
- package/test/wiki-claims.test.js +194 -0
- package/test/wiki-cli-hint.test.js +118 -0
- package/test/wiki-provenance.test.js +202 -0
- package/test/wiki-queries.test.js +128 -0
- package/test/wiki-t0.test.js +77 -1
- package/test/wiki-t1-jobs.test.js +125 -0
- package/test/wiki-t1.test.js +226 -1
|
@@ -0,0 +1,232 @@
|
|
|
1
|
+
// dsh-mneme/src/wiki/t1-jobs.js
|
|
2
|
+
// T1 面板后台任务的进程账与状态机(契约 §3.2)。
|
|
3
|
+
//
|
|
4
|
+
// 为什么住在这里而不是 api.js:T1 要 spawn 子进程,而 api.js 刻意只依赖少数 node
|
|
5
|
+
// 内置(不 import child_process)——HTTP 面只做参数解析与闸门分叉,进程生命周期与
|
|
6
|
+
// 状态账归 wiki 层。副作用是单测可以在 API 侧注入假 job 对象,永不真跑一次 T1
|
|
7
|
+
// (真跑要花模型额度,测试里花钱是不可接受的)。
|
|
8
|
+
//
|
|
9
|
+
// 为什么 spawn CLI 而不是宿主进程内直接 createT1():单模块 30–240s,挂在宿主事件
|
|
10
|
+
// 循环上会拖住整个插件;而 bin/dsh-mneme-choro.mjs --t1 已经是那条唯一收费入口,
|
|
11
|
+
// 面板再走一遍编排逻辑等于造第二条路径,两边迟早不一致(收据形状、降级语义都会漂)。
|
|
12
|
+
//
|
|
13
|
+
// stdout 契约(防一类回归):CLI 的 --json 用 JSON.stringify(receipt, null, 2) 输出
|
|
14
|
+
// ——**多行 JSON,不是 NDJSON**。所以 ring buffer 按行收(面板要的是人能看的日志尾巴),
|
|
15
|
+
// 回执解析另留一份可截断的全文,别指望从 200 行里拼出完整 JSON。
|
|
16
|
+
import { spawn as nodeSpawn } from "node:child_process";
|
|
17
|
+
import { randomUUID } from "node:crypto";
|
|
18
|
+
import { dirname, join } from "node:path";
|
|
19
|
+
import { fileURLToPath } from "node:url";
|
|
20
|
+
|
|
21
|
+
// lib/wiki/t1-jobs.js 与 src/wiki/t1-jobs.js 到 bin/ 都是上两级:sync 只换目录名,
|
|
22
|
+
// 深度不变,所以这里可以硬编码相对位置。
|
|
23
|
+
const DEFAULT_SCRIPT = join(dirname(fileURLToPath(import.meta.url)), "..", "..", "bin", "dsh-mneme-choro.mjs");
|
|
24
|
+
|
|
25
|
+
// 日志尾巴的上限取 200 行:面板是个窄弹层,再多也没人往下翻;而上限存在的真理由
|
|
26
|
+
// 是长任务会往 stdout 泼几万行,不封顶就是内存泄漏。
|
|
27
|
+
const DEFAULT_RING = 200;
|
|
28
|
+
// 已完成任务保留条数:status 要能被反复轮询(面板 2s 一次),但也不能无限留。
|
|
29
|
+
const DEFAULT_FINISHED = 20;
|
|
30
|
+
|
|
31
|
+
/** 逐行切分:chunk 边界可能落在一行中间,所以每路各留一个未完成余量。 */
|
|
32
|
+
function makeLineSplitter(onLine) {
|
|
33
|
+
let rest = "";
|
|
34
|
+
return {
|
|
35
|
+
push(chunk) {
|
|
36
|
+
rest += chunk;
|
|
37
|
+
const parts = rest.split(/\r?\n/);
|
|
38
|
+
rest = parts.pop() ?? "";
|
|
39
|
+
for (const line of parts) onLine(line);
|
|
40
|
+
},
|
|
41
|
+
flush() {
|
|
42
|
+
if (rest !== "") { onLine(rest); rest = ""; }
|
|
43
|
+
}
|
|
44
|
+
};
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
/**
|
|
48
|
+
* @param {object} opts
|
|
49
|
+
* @param {object} opts.store createStore 产物(只需要它来定位 bin 之外的路径时用;目前不读库)
|
|
50
|
+
* @param {Function} [opts.spawn] 注入的 spawn(测试注假实现,绝不真起进程)
|
|
51
|
+
* @param {string} [opts.nodePath] 跑脚本的解释器,缺省 process.execPath
|
|
52
|
+
* @param {string} [opts.scriptPath] CLI 路径,缺省按 lib/src 同深度推导
|
|
53
|
+
* @param {string|null} [opts.dbPath] 透传 --db;不传则 CLI 用自己的缺省记忆库
|
|
54
|
+
* @param {() => string} [opts.now]
|
|
55
|
+
* @param {number} [opts.ringLimit]
|
|
56
|
+
* @param {number} [opts.maxFinished]
|
|
57
|
+
*/
|
|
58
|
+
export function createT1Jobs({
|
|
59
|
+
store = null,
|
|
60
|
+
spawn: spawnFn = nodeSpawn,
|
|
61
|
+
nodePath = process.execPath,
|
|
62
|
+
scriptPath = DEFAULT_SCRIPT,
|
|
63
|
+
dbPath = null,
|
|
64
|
+
now = () => new Date().toISOString(),
|
|
65
|
+
ringLimit = DEFAULT_RING,
|
|
66
|
+
maxFinished = DEFAULT_FINISHED,
|
|
67
|
+
env = process.env
|
|
68
|
+
} = {}) {
|
|
69
|
+
const jobs = new Map();
|
|
70
|
+
// 同一个仓库同时只许一个 T1:两个进程同时往同一批页面写,claims 与 status 会
|
|
71
|
+
// 交错成没人能解释的中间态(T1 的写路径没有跨进程锁,这是硬事实不是保守)。
|
|
72
|
+
const runningByRepo = new Map();
|
|
73
|
+
|
|
74
|
+
function pushLine(job, line) {
|
|
75
|
+
job.logTail.push(line);
|
|
76
|
+
if (job.logTail.length > ringLimit) job.logTail.splice(0, job.logTail.length - ringLimit);
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
/** 回执解析:只认 JSON.parsable 的完整 stdout;解析不出来就保持 0/0/0 不瞎猜。 */
|
|
80
|
+
function readCounts(job) {
|
|
81
|
+
const text = job.stdoutAll.trim();
|
|
82
|
+
if (text === "") return null;
|
|
83
|
+
let receipt;
|
|
84
|
+
try { receipt = JSON.parse(text); } catch { return null; }
|
|
85
|
+
if (!receipt || typeof receipt !== "object") return null;
|
|
86
|
+
if (Array.isArray(receipt.enriched) || Array.isArray(receipt.failed)) {
|
|
87
|
+
const done = Array.isArray(receipt.enriched) ? receipt.enriched.length : 0;
|
|
88
|
+
const failed = Array.isArray(receipt.failed) ? receipt.failed.length : 0;
|
|
89
|
+
return { total: done + failed, done, failed };
|
|
90
|
+
}
|
|
91
|
+
if (Array.isArray(receipt.candidates)) {
|
|
92
|
+
return { total: receipt.candidates.length, done: 0, failed: 0 };
|
|
93
|
+
}
|
|
94
|
+
return null;
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
function trimFinished() {
|
|
98
|
+
const finished = [...jobs.values()].filter((j) => j.state !== "running");
|
|
99
|
+
if (finished.length <= maxFinished) return;
|
|
100
|
+
finished.sort((a, b) => String(a.finishedAt).localeCompare(String(b.finishedAt)));
|
|
101
|
+
for (const job of finished.slice(0, finished.length - maxFinished)) jobs.delete(job.jobId);
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
function finish(job, state, error) {
|
|
105
|
+
if (job.state !== "running") return; // close 与 error 可能都到,只认第一次结算
|
|
106
|
+
job.state = state;
|
|
107
|
+
job.finishedAt = now();
|
|
108
|
+
if (error) job.error = error;
|
|
109
|
+
const counts = readCounts(job);
|
|
110
|
+
if (counts) job.modules = counts;
|
|
111
|
+
const key = String(job.repoKey);
|
|
112
|
+
if (runningByRepo.get(key) === job.jobId) runningByRepo.delete(key);
|
|
113
|
+
trimFinished();
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
/**
|
|
117
|
+
* 起一个后台 T1。返回 {started:true, jobId} 或 {started:false, code, jobId?}——
|
|
118
|
+
* 路由据此分叉 200 / 409,本层不碰 HTTP。
|
|
119
|
+
*/
|
|
120
|
+
function start({ repo = null, module = null, retryFailed = false } = {}) {
|
|
121
|
+
const rootPath = typeof repo?.root_path === "string" ? repo.root_path : "";
|
|
122
|
+
if (rootPath === "") return { started: false, code: "repo-invalid" };
|
|
123
|
+
const repoKey = String(repo.id ?? rootPath);
|
|
124
|
+
const existing = runningByRepo.get(repoKey);
|
|
125
|
+
if (existing) {
|
|
126
|
+
const job = jobs.get(existing);
|
|
127
|
+
// runningByRepo 里还留着但 job 已经结算(理论不可达)时不该把它当占用,
|
|
128
|
+
// 否则这个仓库会被一条幽灵记录永久锁死。
|
|
129
|
+
if (job && job.state === "running") return { started: false, code: "job-running", jobId: existing };
|
|
130
|
+
runningByRepo.delete(repoKey);
|
|
131
|
+
}
|
|
132
|
+
|
|
133
|
+
const jobId = randomUUID();
|
|
134
|
+
const job = {
|
|
135
|
+
jobId,
|
|
136
|
+
repoKey,
|
|
137
|
+
repo: { id: repo.id ?? null, name: repo.name ?? null, rootPath },
|
|
138
|
+
state: "running",
|
|
139
|
+
startedAt: now(),
|
|
140
|
+
finishedAt: null,
|
|
141
|
+
modules: { total: 0, done: 0, failed: 0 },
|
|
142
|
+
logTail: [],
|
|
143
|
+
error: null,
|
|
144
|
+
stdoutAll: "",
|
|
145
|
+
stderrTail: []
|
|
146
|
+
};
|
|
147
|
+
jobs.set(jobId, job);
|
|
148
|
+
runningByRepo.set(repoKey, jobId);
|
|
149
|
+
|
|
150
|
+
const args = [scriptPath, rootPath, "--t1", "--apply", "--json"];
|
|
151
|
+
if (module) args.push("--module", String(module));
|
|
152
|
+
if (retryFailed === true) args.push("--retry-failed");
|
|
153
|
+
if (dbPath) args.push("--db", String(dbPath));
|
|
154
|
+
|
|
155
|
+
let child;
|
|
156
|
+
try {
|
|
157
|
+
child = spawnFn(nodePath, args, {
|
|
158
|
+
// Electron 宿主里 process.execPath 是 electron 本体;不设这个变量它会去开
|
|
159
|
+
// 窗口而不是跑 Node 脚本(t1.js 的真实 runner 用的是同一招)。
|
|
160
|
+
env: { ...env, ELECTRON_RUN_AS_NODE: "1" },
|
|
161
|
+
stdio: ["ignore", "pipe", "pipe"],
|
|
162
|
+
windowsHide: true
|
|
163
|
+
});
|
|
164
|
+
} catch (err) {
|
|
165
|
+
finish(job, "failed", String((err && err.message) || err));
|
|
166
|
+
return { started: true, jobId };
|
|
167
|
+
}
|
|
168
|
+
job.child = child;
|
|
169
|
+
|
|
170
|
+
const outLines = makeLineSplitter((line) => pushLine(job, line));
|
|
171
|
+
const errLines = makeLineSplitter((line) => {
|
|
172
|
+
job.stderrTail.push(line);
|
|
173
|
+
if (job.stderrTail.length > 20) job.stderrTail.shift();
|
|
174
|
+
});
|
|
175
|
+
child.stdout?.setEncoding?.("utf8");
|
|
176
|
+
child.stderr?.setEncoding?.("utf8");
|
|
177
|
+
child.stdout?.on?.("data", (chunk) => {
|
|
178
|
+
// 回执解析要完整 JSON,而 ring buffer 只留尾巴——所以另攒一份,封顶 256 KiB
|
|
179
|
+
// 防止一个跑飞的任务把宿主内存吃光。
|
|
180
|
+
if (job.stdoutAll.length < 256 * 1024) job.stdoutAll += chunk;
|
|
181
|
+
outLines.push(chunk);
|
|
182
|
+
});
|
|
183
|
+
child.stderr?.on?.("data", (chunk) => errLines.push(chunk));
|
|
184
|
+
child.on?.("error", (err) => {
|
|
185
|
+
outLines.flush();
|
|
186
|
+
errLines.flush();
|
|
187
|
+
finish(job, "failed", String((err && err.message) || err));
|
|
188
|
+
});
|
|
189
|
+
child.on?.("close", (code) => {
|
|
190
|
+
outLines.flush();
|
|
191
|
+
errLines.flush();
|
|
192
|
+
if (code === 0) {
|
|
193
|
+
finish(job, "done", null);
|
|
194
|
+
} else {
|
|
195
|
+
// CLI 的拒绝与异常都走 stderr + exit 1(bin:161-171):只报 exit code 等于
|
|
196
|
+
// 让面板显示「失败了,不知道为啥」,所以把 stderr 尾巴当 error 带出去。
|
|
197
|
+
const tail = job.stderrTail.length > 0 ? job.stderrTail[job.stderrTail.length - 1] : "";
|
|
198
|
+
finish(job, "failed", tail || `exit code ${code}`);
|
|
199
|
+
}
|
|
200
|
+
});
|
|
201
|
+
return { started: true, jobId };
|
|
202
|
+
}
|
|
203
|
+
|
|
204
|
+
/** 状态快照(不含 child 等内部件)。未知 jobId → null。 */
|
|
205
|
+
function status(jobId) {
|
|
206
|
+
const job = jobs.get(String(jobId ?? ""));
|
|
207
|
+
if (!job) return null;
|
|
208
|
+
const view = {
|
|
209
|
+
jobId: job.jobId,
|
|
210
|
+
repo: job.repo,
|
|
211
|
+
state: job.state,
|
|
212
|
+
startedAt: job.startedAt,
|
|
213
|
+
modules: { ...job.modules },
|
|
214
|
+
logTail: job.logTail.slice()
|
|
215
|
+
};
|
|
216
|
+
if (job.finishedAt) view.finishedAt = job.finishedAt;
|
|
217
|
+
if (job.error) view.error = job.error;
|
|
218
|
+
return view;
|
|
219
|
+
}
|
|
220
|
+
|
|
221
|
+
function dispose() {
|
|
222
|
+
for (const job of jobs.values()) {
|
|
223
|
+
if (job.state === "running") {
|
|
224
|
+
try { job.child?.kill?.(); } catch { /* 进程可能已退出:dispose 不该抛 */ }
|
|
225
|
+
}
|
|
226
|
+
}
|
|
227
|
+
jobs.clear();
|
|
228
|
+
runningByRepo.clear();
|
|
229
|
+
}
|
|
230
|
+
|
|
231
|
+
return { start, status, dispose, scriptPath };
|
|
232
|
+
}
|
package/lib/wiki/t1.js
CHANGED
|
@@ -23,7 +23,14 @@ import { readFileSync, writeFileSync, existsSync, mkdtempSync, rmSync, mkdirSync
|
|
|
23
23
|
import { join, dirname, sep, resolve } from "node:path";
|
|
24
24
|
import { tmpdir } from "node:os";
|
|
25
25
|
import { realpathSync } from "node:fs";
|
|
26
|
-
import {
|
|
26
|
+
import {
|
|
27
|
+
extractHumanBlocks, injectHumanBlocks, T1_SECTION_START, T1_SECTION_END,
|
|
28
|
+
FM_VERIFIED_AT, FM_VERIFIED_BASELINE, setFrontmatterKeys,
|
|
29
|
+
} from "./render.js";
|
|
30
|
+
import { gitHead } from "./t0.js";
|
|
31
|
+
// issue #607:拒绝文案里的 CLI 命令要给绝对路径入口(profile 装的插件没有全局
|
|
32
|
+
// shim,光写 `dsh-mneme-choro` 用户照抄只会 command not found)。
|
|
33
|
+
import { choroCliCommandFrom } from "./cli-hint.js";
|
|
27
34
|
|
|
28
35
|
// 标记的单一来源在 render.js(页面格式的家);这里转出去,调用方与测试继续从
|
|
29
36
|
// t1.js 取,不必知道它住在哪。
|
|
@@ -31,6 +38,9 @@ export { T1_SECTION_START, T1_SECTION_END };
|
|
|
31
38
|
export const T1_FAIL_THRESHOLD = 2;
|
|
32
39
|
export const DEFAULT_T1_MODEL = "xdpool/deepseek-v4.1-flash";
|
|
33
40
|
|
|
41
|
+
// #607:拒绝文案里的命令串推导一次(本文件在 src/wiki/ 与 lib/wiki/ 同一层)。
|
|
42
|
+
const T1_CLI = choroCliCommandFrom(import.meta.url, "<repo>");
|
|
43
|
+
|
|
34
44
|
// 三重上限缺省(实现计划 P15):单模块预算——timeout 墙钟、工具调用次数、
|
|
35
45
|
// 累计输出字节。真实成本实测见 V1(10s/次任务),这里给的是上限不是预期。
|
|
36
46
|
export const DEFAULT_LIMITS = Object.freeze({
|
|
@@ -58,9 +68,18 @@ export function isEnvironmentFailure(result) {
|
|
|
58
68
|
// 模型路由走 --patch 临时 overlay 指池模型(bili-scroll 同款,零配置改动)。
|
|
59
69
|
// exe 定位:env DSH_EXE > process.execPath(本身是 Harness exe,即已在宿主 CLI 内)>
|
|
60
70
|
// 标准安装位。定位不到 → environment 失败(降级表第一行),不猜测。
|
|
61
|
-
|
|
71
|
+
//
|
|
72
|
+
// 三种定位(exe / cli.js / 失败诊断)都做成可注入的纯函数:issue #578 的病根全在
|
|
73
|
+
// 「按一种安装布局写死」,而布局差异只有真机上才看得见——不能测的东西迟早会错。
|
|
74
|
+
export function makeHeadlessRunner({
|
|
75
|
+
profile = "headless",
|
|
76
|
+
onOverlay = null,
|
|
77
|
+
spawn: spawnFn = spawn,
|
|
78
|
+
locateExe = locateDshExe,
|
|
79
|
+
resolveCli = resolveCliJs,
|
|
80
|
+
} = {}) {
|
|
62
81
|
return async function runSession({ cwd, task, model, timeoutMs, maxToolCalls, maxOutputBytes }) {
|
|
63
|
-
const exe =
|
|
82
|
+
const exe = locateExe();
|
|
64
83
|
if (!exe) {
|
|
65
84
|
return {
|
|
66
85
|
ok: false,
|
|
@@ -68,10 +87,16 @@ export function makeHeadlessRunner({ profile = "headless", onOverlay = null } =
|
|
|
68
87
|
reason: "找不到 DeepSeek Harness 主程序(设 DSH_EXE 环境变量,或用 --dsh-exe 显式指定)",
|
|
69
88
|
};
|
|
70
89
|
}
|
|
71
|
-
const
|
|
72
|
-
if (!
|
|
73
|
-
|
|
90
|
+
const cli = resolveCli(exe);
|
|
91
|
+
if (!cli.path) {
|
|
92
|
+
// 显式指定(DSH_CLI_JS / --dsh-cli)但路径不存在,与「哪种布局都找不到」是两件
|
|
93
|
+
// 事:前者是人写错了一个字符,后者是布局没覆盖。分开说,否则用户会去改布局。
|
|
94
|
+
const reason = cli.explicitMissing
|
|
95
|
+
? `DSH_CLI_JS 指定的 headless CLI 不存在:${cli.explicitMissing}(这是显式指定,不会回退到其它候选;改正它或取消指定)`
|
|
96
|
+
: `在 ${dirname(exe)} 下找不到 headless CLI。试过:${cli.candidates.join("、") || "(无候选)"}。DSH NEXT 布局可用环境变量 DSH_CLI_JS 直接指定 cli 路径`;
|
|
97
|
+
return { ok: false, kind: "environment", reason };
|
|
74
98
|
}
|
|
99
|
+
const cliJs = cli.path;
|
|
75
100
|
const [provider, modelName] = String(model).split("/");
|
|
76
101
|
const overlayPath = writeModelOverlay(provider ?? "xdpool", modelName ?? "deepseek-v4.1-flash", onOverlay);
|
|
77
102
|
let proc = null;
|
|
@@ -84,12 +109,21 @@ export function makeHeadlessRunner({ profile = "headless", onOverlay = null } =
|
|
|
84
109
|
"headless",
|
|
85
110
|
task,
|
|
86
111
|
];
|
|
87
|
-
proc =
|
|
112
|
+
proc = spawnFn(exe, args, {
|
|
88
113
|
cwd,
|
|
89
114
|
env: { ...process.env, ELECTRON_RUN_AS_NODE: "1" },
|
|
90
115
|
stdio: ["ignore", "pipe", "pipe"],
|
|
91
116
|
});
|
|
92
|
-
|
|
117
|
+
const result = await consumeHeadlessStream(proc, { timeoutMs, maxToolCalls, maxOutputBytes });
|
|
118
|
+
// 探测不可用时(普通 node 看不进 asar)走的是旧布局的老路径,这条提示只在真失败时
|
|
119
|
+
// 附上——成功时多说一句只会让人以为哪里没配好。
|
|
120
|
+
if (!result.ok && !cli.verified && result.kind === "environment") {
|
|
121
|
+
// 候选清单一起带上:只说「未经探测」等于让人重新猜一遍布局,而这轮已经把
|
|
122
|
+
// 探测过哪些路径算出来了(#578 那位用户当初只能靠读源码猜)。
|
|
123
|
+
result.reason += `(CLI 路径未经探测:当前进程看不进 asar,按旧布局 ${cliJs} 处理;`
|
|
124
|
+
+ `已探测:${(cli.candidates ?? []).join("、") || "(无候选)"}。若是 DSH NEXT 请设 DSH_CLI_JS)`;
|
|
125
|
+
}
|
|
126
|
+
return result;
|
|
93
127
|
} catch (err) {
|
|
94
128
|
return { ok: false, kind: "environment", reason: String(err?.message ?? err) };
|
|
95
129
|
} finally {
|
|
@@ -99,19 +133,60 @@ export function makeHeadlessRunner({ profile = "headless", onOverlay = null } =
|
|
|
99
133
|
};
|
|
100
134
|
}
|
|
101
135
|
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
136
|
+
// exe 名白名单:不认「同目录任意 exe」——那只会在装了两套宿主时挑中错的那个。
|
|
137
|
+
// 前两个是现行两种安装布局的名字(DSH NEXT 的 exe 就叫 DSH NEXT.exe),第三个是
|
|
138
|
+
// 历史名字,留着只为不打断已经在用旧版的人。
|
|
139
|
+
const DSH_EXE_NAMES = ["deepseek harness.exe", "dsh next.exe", "dsh.exe"];
|
|
140
|
+
|
|
141
|
+
export function locateDshExe(env = process.env, execPath = process.execPath) {
|
|
142
|
+
if (env.DSH_EXE && existsSync(env.DSH_EXE)) return env.DSH_EXE;
|
|
143
|
+
const exePath = execPath ?? "";
|
|
144
|
+
if (DSH_EXE_NAMES.includes(basename(exePath).toLowerCase())) return exePath;
|
|
145
|
+
// 标准安装位按「两种布局 × 两种名字」逐个试。issue #578:DSH NEXT 装在别处、
|
|
146
|
+
// exe 也不叫 DeepSeek Harness.exe,旧实现两个条件同时不满足 → 直接 environment 失败。
|
|
147
|
+
const roots = [env["ProgramFiles"] ?? "C:\\Program Files", env["ProgramFiles(x86)"] ?? "C:\\Program Files (x86)"].filter(Boolean);
|
|
148
|
+
for (const root of roots) {
|
|
149
|
+
for (const name of ["DeepSeek Harness", "DSH NEXT"]) {
|
|
150
|
+
const candidate = join(root, name, `${name}.exe`);
|
|
151
|
+
if (existsSync(candidate)) return candidate;
|
|
152
|
+
}
|
|
153
|
+
}
|
|
154
|
+
return null;
|
|
108
155
|
}
|
|
109
156
|
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
157
|
+
// cli.js 在 app.asar 内部,位置随安装布局变(issue #578 的核心):旧布局多一层
|
|
158
|
+
// `dsh/`,DSH NEXT 直接放在 `lib/desktop-cli.js`。所以这里是**按优先级探测**,
|
|
159
|
+
// 不再硬编码单一路径。
|
|
160
|
+
//
|
|
161
|
+
// 关于「不能 existsSync」那条旧注释:它对 CLI 子进程成立(普通 node 没有 asar
|
|
162
|
+
// 补丁),但**探测发生在插件进程里**(Electron 主进程 / ELECTRON_RUN_AS_NODE 子
|
|
163
|
+
// 进程,两者都给 fs 打了 asar 补丁)——本机实测 statSync/readFileSync 对 asar 内
|
|
164
|
+
// 路径都正常工作。探测不到时(比如被测进程是裸 node)退回旧布局那条老路径并标记
|
|
165
|
+
// verified:false,让失败信息自己说明「这次没探测」。
|
|
166
|
+
export function resolveCliJs(exe, env = process.env) {
|
|
167
|
+
const base = dirname(exe);
|
|
168
|
+
const asar = join(base, "resources", "app.asar");
|
|
169
|
+
// DSH_CLI_JS 是**人明确指定**的答案,不是一条待排序的候选:指定了就不许再猜。
|
|
170
|
+
// 回退到别的候选会让人以为自己的设置生效了——实际跑的却是另一份 CLI,症状是
|
|
171
|
+
// 「我明明指了 NEXT 的 cli,报错里还是旧布局路径」。指定了但不存在 → 直接失败,
|
|
172
|
+
// 让错误信息如实指向他写的那个路径。
|
|
173
|
+
const explicit = typeof env.DSH_CLI_JS === "string" && env.DSH_CLI_JS !== "" ? env.DSH_CLI_JS : null;
|
|
174
|
+
const candidates = [
|
|
175
|
+
explicit,
|
|
176
|
+
join(asar, "lib", "desktop-cli.js"),
|
|
177
|
+
join(asar, "dsh", "node_modules", "@deepseek-ai", "dsh-desktop-host", "lib", "cli.js"),
|
|
178
|
+
join(asar, "node_modules", "@deepseek-ai", "dsh-desktop-host", "lib", "cli.js"),
|
|
179
|
+
].filter((c) => typeof c === "string" && c !== "");
|
|
180
|
+
if (explicit !== null) {
|
|
181
|
+
if (existsSync(explicit)) return { path: explicit, candidates, verified: true };
|
|
182
|
+
return { path: null, candidates, verified: false, explicitMissing: explicit };
|
|
183
|
+
}
|
|
184
|
+
for (const candidate of candidates) {
|
|
185
|
+
if (existsSync(candidate)) return { path: candidate, candidates, verified: true };
|
|
186
|
+
}
|
|
187
|
+
// 全部探测失败:把**旧布局**那条老路径交出去(它曾是唯一答案,老真机上大概率还是
|
|
188
|
+
// 它),但如实带上 verified:false 与完整候选清单——猜错时失败信息里得看得见试过什么。
|
|
189
|
+
return { path: join(asar, "dsh", "node_modules", "@deepseek-ai", "dsh-desktop-host", "lib", "cli.js"), candidates, verified: false };
|
|
115
190
|
}
|
|
116
191
|
|
|
117
192
|
// overlay 只含 provider/model 名(红线 4:不落 key);一次性临时目录,finally 里删。
|
|
@@ -131,6 +206,9 @@ function writeModelOverlay(provider, model, onOverlay) {
|
|
|
131
206
|
return p;
|
|
132
207
|
}
|
|
133
208
|
|
|
209
|
+
// stderr 尾巴上限:够装下一条栈顶报错,又不至于把几万行 usage 全端上来。
|
|
210
|
+
const STDERR_TAIL_LIMIT = 4096;
|
|
211
|
+
|
|
134
212
|
// NDJSON 事件流消费:三重上限在读取循环里计数,超限 kill。headless --json 的事件
|
|
135
213
|
// 形状以宿主实现为准——工具调用按「事件名含 tool_call/tool_use」的宽匹配计数,
|
|
136
214
|
// 计不出就退化为只用 timeout/bytes 两道上限(如实降级,不假装第三道存在)。
|
|
@@ -141,6 +219,7 @@ function consumeHeadlessStream(proc, { timeoutMs, maxToolCalls, maxOutputBytes }
|
|
|
141
219
|
let toolCalls = 0;
|
|
142
220
|
let scannedLines = 0; // 已计过数的完整行数——每块只扫新增部分,否则事件被平方级重复计数(实测 11s 撞 40 上限的假象就是这么来的)
|
|
143
221
|
let timedOut = false;
|
|
222
|
+
let stderrTail = "";
|
|
144
223
|
const timer = setTimeout(() => {
|
|
145
224
|
timedOut = true;
|
|
146
225
|
proc.kill();
|
|
@@ -177,15 +256,22 @@ function consumeHeadlessStream(proc, { timeoutMs, maxToolCalls, maxOutputBytes }
|
|
|
177
256
|
}
|
|
178
257
|
scannedLines = complete;
|
|
179
258
|
});
|
|
180
|
-
|
|
259
|
+
// stderr 必须收:headless 起不来时真正的原因(缺 credential、NO_ADAPTER、模块解析
|
|
260
|
+
// 失败、CLI 路径不存在)全在这里,而 stdout 一个字都没有——issue #578 的「(无输出)」
|
|
261
|
+
// 就是这么来的。只留尾巴(4 KiB)且不参与成败判定,纯诊断。
|
|
262
|
+
proc.stderr.on("data", (chunk) => {
|
|
263
|
+
stderrTail = (stderrTail + chunk.toString("utf8")).slice(-STDERR_TAIL_LIMIT);
|
|
264
|
+
});
|
|
181
265
|
proc.on("error", (err) => finish({ ok: false, kind: "environment", reason: `spawn 失败:${String(err?.message ?? err)}` }));
|
|
182
266
|
proc.on("close", (code) => {
|
|
183
267
|
if (timedOut) { finish({ ok: false, kind: "module", reason: `超过 ${timeoutMs}ms 墙钟上限` }); return; }
|
|
184
268
|
// 最终答案:--json 流里最后一个非事件行;流解析失败就取 stdout 去掉事件行后的文本。
|
|
185
269
|
const text = extractFinalText(out);
|
|
186
270
|
if (code !== 0) {
|
|
187
|
-
const envHint = /MISSING_CREDENTIAL|NO_ADAPTER|UNKNOWN_MODEL|EADDR|cannot find/i.test(out) ? "environment" : "module";
|
|
188
|
-
|
|
271
|
+
const envHint = /MISSING_CREDENTIAL|NO_ADAPTER|UNKNOWN_MODEL|EADDR|cannot find/i.test(out + stderrTail) ? "environment" : "module";
|
|
272
|
+
// 诊断优先取 stderr 尾巴:失败时 stdout 常常是空的,而原因都在 stderr。
|
|
273
|
+
const detail = (text || "").slice(0, 200) || stderrTail.trim().slice(-400) || "(无输出)";
|
|
274
|
+
finish({ ok: false, kind: envHint, reason: `headless 退出码 ${code}:${detail}` });
|
|
189
275
|
return;
|
|
190
276
|
}
|
|
191
277
|
if (!text.trim()) { finish({ ok: false, kind: "module", reason: "headless 没有产出可解析的最终回答" }); return; }
|
|
@@ -239,7 +325,7 @@ export function createT1({ store, runSession = null, limits = DEFAULT_LIMITS, no
|
|
|
239
325
|
const rootPath = realpathSync(resolve(repoRoot));
|
|
240
326
|
const repo = store.db.prepare("SELECT * FROM choro_repos WHERE root_path = ?").get(rootPath);
|
|
241
327
|
if (!repo) {
|
|
242
|
-
throw new T1Refusal("not-registered", `${rootPath} 还没有登记:先跑一次 T0
|
|
328
|
+
throw new T1Refusal("not-registered", `${rootPath} 还没有登记:先跑一次 T0(${T1_CLI ?? "dsh-mneme-choro <repo> --apply"})`);
|
|
243
329
|
}
|
|
244
330
|
|
|
245
331
|
// 选模块:skeleton 必跑;failed 只在 retryFailed 时;enriched 跳过(重富化留待显式 --module)。
|
|
@@ -280,10 +366,18 @@ export function createT1({ store, runSession = null, limits = DEFAULT_LIMITS, no
|
|
|
280
366
|
skipped,
|
|
281
367
|
t1Unavailable: null,
|
|
282
368
|
};
|
|
369
|
+
// --dsh-exe 只影响这一轮:原来写进 process.env 就不还了,同一进程里后续任何一次
|
|
370
|
+
// 定位都会继承它(面板里切仓库、换个布局都还是旧值),属于会记很久的脏状态。
|
|
283
371
|
const runnerWithExe = dshExe
|
|
284
372
|
? async (call) => {
|
|
373
|
+
const saved = process.env.DSH_EXE;
|
|
285
374
|
process.env.DSH_EXE = dshExe;
|
|
286
|
-
|
|
375
|
+
try {
|
|
376
|
+
return await runner(call);
|
|
377
|
+
} finally {
|
|
378
|
+
if (saved === undefined) delete process.env.DSH_EXE;
|
|
379
|
+
else process.env.DSH_EXE = saved;
|
|
380
|
+
}
|
|
287
381
|
}
|
|
288
382
|
: runner;
|
|
289
383
|
|
|
@@ -339,12 +433,18 @@ export function createT1({ store, runSession = null, limits = DEFAULT_LIMITS, no
|
|
|
339
433
|
|
|
340
434
|
// 富化 + 双落(P19/P20)。写路径断言复用 t0 的机械面语义:只许动
|
|
341
435
|
// .chorography/** 下的页面与 evidence。
|
|
436
|
+
//
|
|
437
|
+
// verifiedBaseline 必须是**这一刻**的 HEAD:claims 的行号是从这棵代码树上读出来
|
|
438
|
+
// 的,之后判失效只能从它起算。拿不到 HEAD(不是 git 仓库 / git 不在)就记 null,
|
|
439
|
+
// 面板据此说「这一页哪次验证的,不知道」——不退回全仓 git_baseline,那会把
|
|
440
|
+
// 「T1 之前就发生、claim 早已算进去」的改动误报成 touched。
|
|
342
441
|
const generatedAt = now();
|
|
343
|
-
|
|
344
|
-
|
|
442
|
+
const verifiedBaseline = gitHead(rootPath);
|
|
443
|
+
enrichPageFile(pageFile, parsed.sections, { verifiedBaseline, verifiedAt: generatedAt });
|
|
444
|
+
writeEvidenceFile(rootPath, slug, parsed.claims, generatedAt, verifiedBaseline);
|
|
345
445
|
store.saveChoroPageClaims(pageRow.id, parsed.claims.map((c) => ({ ...c, createdAt: generatedAt })));
|
|
346
|
-
store.markChoroPageEnriched(pageRow.id, generatedAt);
|
|
347
|
-
receipt.enriched.push({ slug, sections: Object.keys(parsed.sections), claims: parsed.claims.length });
|
|
446
|
+
store.markChoroPageEnriched(pageRow.id, generatedAt, verifiedBaseline);
|
|
447
|
+
receipt.enriched.push({ slug, sections: Object.keys(parsed.sections), claims: parsed.claims.length, verifiedBaseline });
|
|
348
448
|
}
|
|
349
449
|
return receipt;
|
|
350
450
|
}
|
|
@@ -424,7 +524,11 @@ function parseT1Output(text) {
|
|
|
424
524
|
}
|
|
425
525
|
|
|
426
526
|
// 富化(P19):剥掉旧 T1 段 → 新段插在「## 生成说明」之前 → 保留区照旧页尾回填。
|
|
427
|
-
|
|
527
|
+
//
|
|
528
|
+
// 顺带把「对着哪个提交验证的」写进 frontmatter(① provenance):这两个键**只有 T1
|
|
529
|
+
// 写**,T0 渲染一个字节都不产出。因此 T0 重跑整页重建时它们随语义段一起消失,
|
|
530
|
+
// 与「T0 丢弃 T1 正文」是同一件事,不新增语义,也不碰 T0 的逐字节确定性。
|
|
531
|
+
function enrichPageFile(pageFile, sections, { verifiedBaseline = null, verifiedAt = null } = {}) {
|
|
428
532
|
let content = readFileSync(pageFile, "utf8");
|
|
429
533
|
// 剥旧 T1 段(含标记本身)
|
|
430
534
|
const wrap = new RegExp(`${escapeRe(T1_SECTION_START)}[\\s\\S]*?${escapeRe(T1_SECTION_END)}\\n?`, "g");
|
|
@@ -456,7 +560,13 @@ function enrichPageFile(pageFile, sections) {
|
|
|
456
560
|
? `${content.replace(/\n*$/, "\n")}\n${block}`
|
|
457
561
|
: content.slice(0, anchor) + block.replace(/^\n/, "") + content.slice(anchor);
|
|
458
562
|
const { blocks } = extractHumanBlocks(base);
|
|
459
|
-
const
|
|
563
|
+
const withHuman = blocks.length > 0 ? injectHumanBlocks(stripHumanBlocks(base), blocks) : base;
|
|
564
|
+
// HUMAN 块是页尾整块,frontmatter 在页首,两者互不干扰;顺序仍按「先回填保留区、
|
|
565
|
+
// 再收尾 frontmatter」,避免 fronts 里的键名与保留区正文同名时被误改。
|
|
566
|
+
const finalContent = setFrontmatterKeys(withHuman, [
|
|
567
|
+
[FM_VERIFIED_BASELINE, verifiedBaseline],
|
|
568
|
+
[FM_VERIFIED_AT, verifiedAt],
|
|
569
|
+
]);
|
|
460
570
|
writeFileSync(pageFile, finalContent, "utf8");
|
|
461
571
|
}
|
|
462
572
|
|
|
@@ -466,11 +576,14 @@ function stripHumanBlocks(text) {
|
|
|
466
576
|
return text.replace(re, "");
|
|
467
577
|
}
|
|
468
578
|
|
|
469
|
-
function writeEvidenceFile(repoRoot, slug, claims, generatedAt) {
|
|
579
|
+
function writeEvidenceFile(repoRoot, slug, claims, generatedAt, verifiedBaseline = null) {
|
|
470
580
|
const rel = `${".chorography"}/evidence/${slug}.json`;
|
|
471
581
|
const abs = insideChoro(repoRoot, rel);
|
|
472
582
|
mkdirp(dirname(abs));
|
|
473
|
-
|
|
583
|
+
// verifiedBaseline 与页面 frontmatter 同源同写:evidence 是给人核的旁证,光有 claims
|
|
584
|
+
// 没有「对着哪个提交」的,事后同样无从复核。
|
|
585
|
+
const body = { slug, generatedAt, verifiedBaseline, claims };
|
|
586
|
+
writeFileSync(abs, `${JSON.stringify(body, null, 2)}\n`, "utf8");
|
|
474
587
|
}
|
|
475
588
|
|
|
476
589
|
function insideChoro(rootPath, relPath) {
|
package/package.json
CHANGED
|
@@ -1,8 +1,22 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@modusensus/dsh-mneme",
|
|
3
3
|
"description": "Cross-session memory plugin for DeepSeek Harness with autoDream consolidation: SQLite store, Markdown mirrors, 10 model tools, automatic injection, session summarization, user profile/rules, custom slash commands, vector (semantic) search, and a Web GUI panel",
|
|
4
|
-
"version": "0.
|
|
4
|
+
"version": "0.14.0-beta.1",
|
|
5
5
|
"license": "MIT",
|
|
6
|
+
"keywords": [
|
|
7
|
+
"dsh",
|
|
8
|
+
"dsh-plugin",
|
|
9
|
+
"deepseek-harness",
|
|
10
|
+
"deepseek",
|
|
11
|
+
"memory",
|
|
12
|
+
"agent-memory",
|
|
13
|
+
"long-term-memory",
|
|
14
|
+
"cross-session",
|
|
15
|
+
"recall",
|
|
16
|
+
"consolidation",
|
|
17
|
+
"sqlite",
|
|
18
|
+
"markdown"
|
|
19
|
+
],
|
|
6
20
|
"repository": {
|
|
7
21
|
"type": "git",
|
|
8
22
|
"url": "git+https://github.com/slow-stack/mneme.git"
|
|
@@ -57,6 +71,30 @@
|
|
|
57
71
|
"patch": "./cordis.patch.yml"
|
|
58
72
|
}
|
|
59
73
|
},
|
|
74
|
+
"dshGo": {
|
|
75
|
+
"v": 1,
|
|
76
|
+
"title": {
|
|
77
|
+
"zh": "记忆库",
|
|
78
|
+
"en": "Memory"
|
|
79
|
+
},
|
|
80
|
+
"icon": "book",
|
|
81
|
+
"contributes": {
|
|
82
|
+
"panels": [
|
|
83
|
+
{
|
|
84
|
+
"id": "mneme",
|
|
85
|
+
"title": {
|
|
86
|
+
"zh": "记忆库",
|
|
87
|
+
"en": "Memory"
|
|
88
|
+
},
|
|
89
|
+
"icon": "book",
|
|
90
|
+
"placement": [
|
|
91
|
+
"session.tab",
|
|
92
|
+
"features"
|
|
93
|
+
]
|
|
94
|
+
}
|
|
95
|
+
]
|
|
96
|
+
}
|
|
97
|
+
},
|
|
60
98
|
"peerDependencies": {
|
|
61
99
|
"@deepseek-ai/cordis": "^4.0.1",
|
|
62
100
|
"@deepseek-ai/dsh-host-webserver": ">=0.1.0-rc.6 <0.2.0 || >=0.1.5-rc.0 <0.3.0 || >=0.2.0-rc.0 <0.3.0",
|
package/scripts/release-docs.mjs
CHANGED
|
@@ -182,6 +182,12 @@ export function sectionOf(text, heading) {
|
|
|
182
182
|
export function checkSupportTable(text, version) {
|
|
183
183
|
const [major, minor] = version.split(".");
|
|
184
184
|
const expected = `${major}.${minor}.x`;
|
|
185
|
+
// 预发布版(0.14.0-beta.1)不是「受支持的版本」,支持表不该跟着它挪格。
|
|
186
|
+
// 挪了等于对外宣称 0.14 已经在活跃维护——而 beta 随时可能推倒重来。
|
|
187
|
+
// 这里显式标 skipped,调用方据此换一句人话;**不静默通过**:skipped 是返回值的一部分。
|
|
188
|
+
if (version.includes("-")) {
|
|
189
|
+
return { ok: true, expected, problems: [], skipped: "prerelease" };
|
|
190
|
+
}
|
|
185
191
|
const problems = [];
|
|
186
192
|
for (const [heading, label] of [
|
|
187
193
|
["## Supported Versions", "英文"],
|
|
@@ -200,5 +206,5 @@ export function checkSupportTable(text, version) {
|
|
|
200
206
|
const found = rows[0].split("|")[1].trim();
|
|
201
207
|
if (found !== expected) problems.push(`${label}表首行写的是 ${found},应为 ${expected}`);
|
|
202
208
|
}
|
|
203
|
-
return { ok: problems.length === 0, expected, problems };
|
|
209
|
+
return { ok: problems.length === 0, expected, problems, skipped: null };
|
|
204
210
|
}
|
|
@@ -149,7 +149,10 @@ export function renderNotes(sectionText, opts = {}) {
|
|
|
149
149
|
/** release.yml 的调用方式:node dsh-mneme/scripts/release-notes.mjs <version>(cwd 为仓库根)。 */
|
|
150
150
|
function main() {
|
|
151
151
|
const v = (process.argv[2] || "").replace(/^v/, "");
|
|
152
|
-
|
|
152
|
+
// 允许预发布后缀:0.14.0-beta.1 是合法发布版本,此前这条守卫把它当非法用法直接 exit 1,
|
|
153
|
+
// 于是 release job 在抽正文这步就红了——预发布版根本发不出去。语义校验交给
|
|
154
|
+
// semver 的形状(x.y.z 后可跟 -标识),不做额外白名单。
|
|
155
|
+
if (!/^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?$/.test(v)) { console.error("usage: release-notes.mjs <version>"); process.exit(1); }
|
|
153
156
|
const md = readFileSync("dsh-mneme/CHANGELOG.md", "utf8");
|
|
154
157
|
const sec = findSection(md, v);
|
|
155
158
|
if (!sec) { console.error("changelog section not found: " + v); process.exit(1); }
|
package/src/api-standalone.js
CHANGED
|
@@ -478,7 +478,10 @@ export function createStandaloneApi({ service, store, config = {}, logger, setti
|
|
|
478
478
|
const listFilters = { includeArchived, ...(occurredFrom ? { occurredFrom } : {}), ...(occurredTo ? { occurredTo } : {}) };
|
|
479
479
|
const items = service.toApiList(service.list({ type, limit, offset, order, minImportance, source, ...listFilters }));
|
|
480
480
|
// Total honors the same filters so pager math stays correct.
|
|
481
|
-
|
|
481
|
+
// #597:typeCounts 与宿主内 /list 同口径(同一份筛选、不带 type 的全库分布),
|
|
482
|
+
// 两张面只许剩鉴权与路径不同。
|
|
483
|
+
const countFilters = { minImportance, source, ...listFilters };
|
|
484
|
+
sendJson(res, 200, { items, total: service.count(type, countFilters), typeCounts: service.countByType(countFilters) });
|
|
482
485
|
return;
|
|
483
486
|
}
|
|
484
487
|
|