@kenz1117/dsh-engram 0.7.15 → 0.8.12
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.en.md +6 -1
- package/README.md +7 -2
- package/lib/client.js +2 -2
- package/lib/client.js.map +1 -1
- package/lib/index.js +105 -38
- package/package.json +3 -9
- package/scripts/ensure-build.mjs +25 -0
- package/scripts/link-peers.mjs +4 -1
package/lib/index.js
CHANGED
|
@@ -716,8 +716,9 @@ const MODE_LIMITS = {
|
|
|
716
716
|
includeAssistant: true
|
|
717
717
|
}
|
|
718
718
|
};
|
|
719
|
-
/** 摄取输出 token
|
|
720
|
-
|
|
719
|
+
/** 摄取输出 token 上限。completion 预算含 reasoning_tokens:推理模型可能把预算耗在思考上、
|
|
720
|
+
答案为空(实测 600/2000 都会出现,4000 未复现),上限给足余量而非按答案长度估。 */
|
|
721
|
+
const INGEST_MAX_TOKENS = 4e3;
|
|
721
722
|
/** op_log 幂等键 op:该 (sessionId, turn) 已完成摄取。 */
|
|
722
723
|
const INGEST_DONE_OP = "ingest-done";
|
|
723
724
|
/** op_log pending 键 op:disposed 末轮摄取失败/超时,待下次会话重放补做。 */
|
|
@@ -745,6 +746,7 @@ const INGEST_SYSTEM = [
|
|
|
745
746
|
"entities 是这条记忆里提到的具体对象(人名/项目名/工具名/概念名),没有就省略该字段;实体名要短(专名本身,不超过 20 字),aliases 列出该实体的其他叫法,没有就省略。",
|
|
746
747
|
"facts 列出这条记忆中关于具体实体的客观事实(状态/归属/关系/数据),entity 必须取该条 entities 里出现过的实体名,一条一个知识点,没有就省略该字段。",
|
|
747
748
|
"scope 决定这条记忆进哪座宫殿:只跟当前项目/仓库有关的(技术选型、项目约定、架构决策、该项目自身的事实)用 project;与具体项目无关、跨项目通用的(个人偏好、习惯、用户本人的经历、通用事实)用 user。拿不准用 project。",
|
|
749
|
+
"忠实转述:原文中被否定、拒绝或纠正的内容,记录时必须保持其被否定的语义,不得写成正面断言;不要添加原文没有的关联、判断或结论。",
|
|
748
750
|
"只提取明确、可复用的信息;寒暄、临时上下文、你自己的回答不要提取。没有值得记的就输出 []。",
|
|
749
751
|
"不要输出 JSON 以外的任何内容。"
|
|
750
752
|
].join("\n");
|
|
@@ -1032,14 +1034,26 @@ async function ingestPreviousTurn(deps) {
|
|
|
1032
1034
|
maxTokens: INGEST_MAX_TOKENS,
|
|
1033
1035
|
mode: deps.mode
|
|
1034
1036
|
});
|
|
1035
|
-
|
|
1037
|
+
let raw = await deps.call({
|
|
1036
1038
|
route,
|
|
1037
1039
|
system: INGEST_SYSTEM,
|
|
1038
1040
|
userText,
|
|
1039
1041
|
maxTokens: INGEST_MAX_TOKENS,
|
|
1040
1042
|
purpose: "engram-ingest",
|
|
1041
1043
|
signal: deps.signal
|
|
1042
|
-
})
|
|
1044
|
+
});
|
|
1045
|
+
let parsed = parseJsonArray(raw);
|
|
1046
|
+
if (parsed === void 0 && raw.trim() === "") {
|
|
1047
|
+
raw = await deps.call({
|
|
1048
|
+
route,
|
|
1049
|
+
system: INGEST_SYSTEM,
|
|
1050
|
+
userText,
|
|
1051
|
+
maxTokens: INGEST_MAX_TOKENS,
|
|
1052
|
+
purpose: "engram-ingest",
|
|
1053
|
+
signal: deps.signal
|
|
1054
|
+
});
|
|
1055
|
+
parsed = parseJsonArray(raw);
|
|
1056
|
+
}
|
|
1043
1057
|
if (parsed === void 0) return {
|
|
1044
1058
|
scannedEvents: slice.length,
|
|
1045
1059
|
candidates: 0,
|
|
@@ -1047,7 +1061,7 @@ async function ingestPreviousTurn(deps) {
|
|
|
1047
1061
|
merged: 0,
|
|
1048
1062
|
deferred: 0,
|
|
1049
1063
|
dropped: 0,
|
|
1050
|
-
skipped: "unparseable-output"
|
|
1064
|
+
skipped: raw.trim() === "" ? "empty-answer" : "unparseable-output"
|
|
1051
1065
|
};
|
|
1052
1066
|
const embedder = await deps.embedder;
|
|
1053
1067
|
const writtenContents = [];
|
|
@@ -1548,6 +1562,10 @@ async function runHistoryBackfill(deps, defaults, overrides, onProgress, signal)
|
|
|
1548
1562
|
});
|
|
1549
1563
|
}
|
|
1550
1564
|
progress.turnsDone += 1;
|
|
1565
|
+
onProgress({
|
|
1566
|
+
...progress,
|
|
1567
|
+
currentSession: candidate.header.id
|
|
1568
|
+
});
|
|
1551
1569
|
}
|
|
1552
1570
|
await ensureSessionSummary({
|
|
1553
1571
|
events: candidate.events,
|
|
@@ -1578,6 +1596,40 @@ async function runHistoryBackfill(deps, defaults, overrides, onProgress, signal)
|
|
|
1578
1596
|
};
|
|
1579
1597
|
}
|
|
1580
1598
|
//#endregion
|
|
1599
|
+
//#region src/vec.ts
|
|
1600
|
+
/**
|
|
1601
|
+
* 向量相似度共享实现:store 检索与巩固聚类共用一份,替代历史上的两处复制。
|
|
1602
|
+
* @module @kenz1117/dsh-engram/vec
|
|
1603
|
+
*/
|
|
1604
|
+
/** 维度不匹配告警只发一次(模块级标记);上游单一嵌入模型下维度恒等,永不触发。 */
|
|
1605
|
+
let warnedDimensionMismatch = false;
|
|
1606
|
+
/**
|
|
1607
|
+
* 余弦相似度;任一向量零范数时返回 0。
|
|
1608
|
+
* 嵌入器当前为单一硬编码模型,维度恒等;一旦嵌入器可配置且两向量维度不同,
|
|
1609
|
+
* 逐维截断比较会产出「看起来像相似度的数」——这里响亮告警一次(不抛错,
|
|
1610
|
+
* 检索照常降级),供换模型时第一时间发现存量向量与新模型维度不一致。
|
|
1611
|
+
* @param a - 向量 A。
|
|
1612
|
+
* @param b - 向量 B。
|
|
1613
|
+
* @returns 余弦相似度,范围约 [-1, 1];零范数输入返回 0。
|
|
1614
|
+
*/
|
|
1615
|
+
function cosine(a, b) {
|
|
1616
|
+
if (a.length !== b.length && !warnedDimensionMismatch) {
|
|
1617
|
+
warnedDimensionMismatch = true;
|
|
1618
|
+
console.warn(`[dsh-engram] cosine dimension mismatch (${String(a.length)} vs ${String(b.length)}): mixed embedder models? retrieval quality is degraded`);
|
|
1619
|
+
}
|
|
1620
|
+
let dot = 0;
|
|
1621
|
+
let na = 0;
|
|
1622
|
+
let nb = 0;
|
|
1623
|
+
const len = Math.min(a.length, b.length);
|
|
1624
|
+
for (let i = 0; i < len; i++) {
|
|
1625
|
+
dot += a[i] * b[i];
|
|
1626
|
+
na += a[i] * a[i];
|
|
1627
|
+
nb += b[i] * b[i];
|
|
1628
|
+
}
|
|
1629
|
+
if (na === 0 || nb === 0) return 0;
|
|
1630
|
+
return dot / (Math.sqrt(na) * Math.sqrt(nb));
|
|
1631
|
+
}
|
|
1632
|
+
//#endregion
|
|
1581
1633
|
//#region src/consolidation/run.ts
|
|
1582
1634
|
/** 单条整理动作(写入 op_log 的统一标记)。 */
|
|
1583
1635
|
const CONSOLIDATION_OP = "consolidation";
|
|
@@ -1670,7 +1722,7 @@ async function runConsolidation(store, embedder, opts = {}) {
|
|
|
1670
1722
|
if (visited.has(b.id)) continue;
|
|
1671
1723
|
const bVec = vectors.get(b.id);
|
|
1672
1724
|
if (bVec === void 0) continue;
|
|
1673
|
-
if (cosine
|
|
1725
|
+
if (cosine(vectors.get(a.id), bVec) >= options.mergeThreshold) dupes.push(b);
|
|
1674
1726
|
}
|
|
1675
1727
|
if (dupes.length === 0) continue;
|
|
1676
1728
|
const ids = dupes.map((record) => record.id);
|
|
@@ -1707,20 +1759,6 @@ async function runConsolidation(store, embedder, opts = {}) {
|
|
|
1707
1759
|
} catch {}
|
|
1708
1760
|
return report;
|
|
1709
1761
|
}
|
|
1710
|
-
/** cosine 相似度(两个等长非零向量)。 */
|
|
1711
|
-
function cosine$1(a, b) {
|
|
1712
|
-
let dot = 0;
|
|
1713
|
-
let na = 0;
|
|
1714
|
-
let nb = 0;
|
|
1715
|
-
const n = Math.min(a.length, b.length);
|
|
1716
|
-
for (let i = 0; i < n; i += 1) {
|
|
1717
|
-
dot += a[i] * b[i];
|
|
1718
|
-
na += a[i] * a[i];
|
|
1719
|
-
nb += b[i] * b[i];
|
|
1720
|
-
}
|
|
1721
|
-
const denom = Math.sqrt(na) * Math.sqrt(nb);
|
|
1722
|
-
return denom === 0 ? 0 : dot / denom;
|
|
1723
|
-
}
|
|
1724
1762
|
//#endregion
|
|
1725
1763
|
//#region src/consolidation/reflect.ts
|
|
1726
1764
|
/**
|
|
@@ -2575,6 +2613,37 @@ async function countByOp(store, sinceMs) {
|
|
|
2575
2613
|
}
|
|
2576
2614
|
return counts;
|
|
2577
2615
|
}
|
|
2616
|
+
/** 按天汇总 op_log 中的所有写侧活动(用于活动热力日历)。返回的 dayMs 是该日 0 点的本地时间戳。
|
|
2617
|
+
* 包含 write/update/ingest-done/ingest-request/distill-request/consolidation/restore/forget,排除纯读侧(search/outcome-report)。 */
|
|
2618
|
+
async function countByDay(store, sinceMs, untilMs) {
|
|
2619
|
+
const ops = await store.recentOps(1e5);
|
|
2620
|
+
const counts = /* @__PURE__ */ new Map();
|
|
2621
|
+
const dayMs = (ms) => {
|
|
2622
|
+
const d = new Date(ms);
|
|
2623
|
+
d.setHours(0, 0, 0, 0);
|
|
2624
|
+
return d.getTime();
|
|
2625
|
+
};
|
|
2626
|
+
const startDay = dayMs(sinceMs);
|
|
2627
|
+
const endDay = dayMs(untilMs);
|
|
2628
|
+
for (let t = startDay; t <= endDay; t += 864e5) counts.set(t, 0);
|
|
2629
|
+
const writeOps = /* @__PURE__ */ new Set([
|
|
2630
|
+
"write",
|
|
2631
|
+
"update",
|
|
2632
|
+
"ingest-done",
|
|
2633
|
+
"ingest-request",
|
|
2634
|
+
"distill-request",
|
|
2635
|
+
"consolidation",
|
|
2636
|
+
"restore",
|
|
2637
|
+
"forget"
|
|
2638
|
+
]);
|
|
2639
|
+
for (const op of ops) {
|
|
2640
|
+
if (op.at < sinceMs || op.at > untilMs) continue;
|
|
2641
|
+
if (!writeOps.has(op.op)) continue;
|
|
2642
|
+
const d = dayMs(op.at);
|
|
2643
|
+
counts.set(d, (counts.get(d) ?? 0) + 1);
|
|
2644
|
+
}
|
|
2645
|
+
return counts;
|
|
2646
|
+
}
|
|
2578
2647
|
/** 聚合两库的指标 + 各 scope 状态。
|
|
2579
2648
|
* @param scopeFilter - 限定只聚合指定 scope;undefined = 三库全聚合(向后兼容)。 */
|
|
2580
2649
|
async function aggregateTelemetry(openStore, windowDays = DEFAULT_WINDOW_DAYS, scopeFilter) {
|
|
@@ -2597,12 +2666,18 @@ async function aggregateTelemetry(openStore, windowDays = DEFAULT_WINDOW_DAYS, s
|
|
|
2597
2666
|
compressRequests: 0,
|
|
2598
2667
|
searchRewrites: 0,
|
|
2599
2668
|
consumptions: 0,
|
|
2600
|
-
consolidations: 0
|
|
2669
|
+
consolidations: 0,
|
|
2670
|
+
reviewAnswers: 0
|
|
2601
2671
|
};
|
|
2602
2672
|
const scopeViews = [];
|
|
2673
|
+
const dailyTotals = /* @__PURE__ */ new Map();
|
|
2603
2674
|
for (const scope of scopes) try {
|
|
2604
2675
|
const store = await openStore(scope);
|
|
2605
|
-
const [counts, stats] = await Promise.all([
|
|
2676
|
+
const [counts, stats, daily] = await Promise.all([
|
|
2677
|
+
countByOp(store, sinceMs),
|
|
2678
|
+
store.stats(),
|
|
2679
|
+
countByDay(store, sinceMs, untilMs)
|
|
2680
|
+
]);
|
|
2606
2681
|
countsAgg.ingestRequests += counts["ingest-request"] ?? 0;
|
|
2607
2682
|
countsAgg.ingestDones += counts["ingest-done"] ?? 0;
|
|
2608
2683
|
countsAgg.searches += counts["search-rewrite-request"] ?? 0;
|
|
@@ -2615,19 +2690,25 @@ async function aggregateTelemetry(openStore, windowDays = DEFAULT_WINDOW_DAYS, s
|
|
|
2615
2690
|
countsAgg.searchRewrites += counts["search-rewrite-request"] ?? 0;
|
|
2616
2691
|
countsAgg.consumptions += counts["outcome-report"] ?? 0;
|
|
2617
2692
|
countsAgg.consolidations += counts["consolidation"] ?? 0;
|
|
2693
|
+
countsAgg.reviewAnswers += counts["review-answer"] ?? 0;
|
|
2618
2694
|
scopeViews.push({
|
|
2619
2695
|
scope,
|
|
2620
2696
|
active: stats.active,
|
|
2621
2697
|
total: stats.total,
|
|
2622
2698
|
signalRatio: stats.signalRatio
|
|
2623
2699
|
});
|
|
2700
|
+
for (const [day, n] of daily) dailyTotals.set(day, (dailyTotals.get(day) ?? 0) + n);
|
|
2624
2701
|
} catch {}
|
|
2625
2702
|
return {
|
|
2626
2703
|
windowDays,
|
|
2627
2704
|
sinceMs,
|
|
2628
2705
|
untilMs,
|
|
2629
2706
|
counts: countsAgg,
|
|
2630
|
-
scopes: scopeViews
|
|
2707
|
+
scopes: scopeViews,
|
|
2708
|
+
dailyWrites: Array.from(dailyTotals.entries()).sort(([a], [b]) => a - b).map(([dayMs, count]) => ({
|
|
2709
|
+
dayMs,
|
|
2710
|
+
count
|
|
2711
|
+
}))
|
|
2631
2712
|
};
|
|
2632
2713
|
}
|
|
2633
2714
|
//#endregion
|
|
@@ -3315,7 +3396,7 @@ function registerEngramRoutes(ctx, deps) {
|
|
|
3315
3396
|
return;
|
|
3316
3397
|
}
|
|
3317
3398
|
if (req.method === "GET" && route === "telemetry") {
|
|
3318
|
-
const windowDays = Math.min(
|
|
3399
|
+
const windowDays = Math.min(366, Math.max(1, Number(url.searchParams.get("days") ?? 7) || 7));
|
|
3319
3400
|
const rawScope = url.searchParams.get("scope");
|
|
3320
3401
|
json(res, 200, await aggregateTelemetry((scope) => storeFor(scope), windowDays, rawScope === "user" ? "user" : rawScope === "project" ? "project" : rawScope === "shared" ? "shared" : void 0));
|
|
3321
3402
|
return;
|
|
@@ -4118,20 +4199,6 @@ function observationRowToRecord(row) {
|
|
|
4118
4199
|
lastValidatedAt: row.last_validated_at
|
|
4119
4200
|
};
|
|
4120
4201
|
}
|
|
4121
|
-
/** 余弦相似度;任一向量零范数时返回 0。 */
|
|
4122
|
-
function cosine(a, b) {
|
|
4123
|
-
let dot = 0;
|
|
4124
|
-
let na = 0;
|
|
4125
|
-
let nb = 0;
|
|
4126
|
-
const len = Math.min(a.length, b.length);
|
|
4127
|
-
for (let i = 0; i < len; i++) {
|
|
4128
|
-
dot += a[i] * b[i];
|
|
4129
|
-
na += a[i] * a[i];
|
|
4130
|
-
nb += b[i] * b[i];
|
|
4131
|
-
}
|
|
4132
|
-
if (na === 0 || nb === 0) return 0;
|
|
4133
|
-
return dot / (Math.sqrt(na) * Math.sqrt(nb));
|
|
4134
|
-
}
|
|
4135
4202
|
/**
|
|
4136
4203
|
* 中文 2-gram + 西文词元切词:unicode61 把连续汉字当作单个 token,无法支撑短语检索,
|
|
4137
4204
|
* 因此入库与查询前都把中文按两字窗口切开、西文按词保留,用空格分隔交给 FTS5。
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kenz1117/dsh-engram",
|
|
3
3
|
"description": "Cross-session long-term memory for DeepSeek Harness (memory palace · AGI Architecture Exploration on dsh-market): dual-scope SQLite memory graph, hybrid retrieval, provenance audit, and a knowledge flywheel.",
|
|
4
|
-
"version": "0.
|
|
4
|
+
"version": "0.8.12",
|
|
5
5
|
"icon": "icon.svg",
|
|
6
6
|
"logo": "icon-256.svg",
|
|
7
7
|
"publishConfig": {
|
|
@@ -45,7 +45,7 @@
|
|
|
45
45
|
}
|
|
46
46
|
},
|
|
47
47
|
"scripts": {
|
|
48
|
-
"prepare": "node scripts/link-peers.mjs",
|
|
48
|
+
"prepare": "node scripts/link-peers.mjs && node scripts/ensure-build.mjs",
|
|
49
49
|
"bundle": "tsdown",
|
|
50
50
|
"watch": "tsdown --watch",
|
|
51
51
|
"test": "vitest run",
|
|
@@ -76,6 +76,7 @@
|
|
|
76
76
|
"peerDependencies": {
|
|
77
77
|
"@deepseek-ai/cordis": "*",
|
|
78
78
|
"@deepseek-ai/dsh-agent": "*",
|
|
79
|
+
"@deepseek-ai/dsh-client-ui-layout": "*",
|
|
79
80
|
"@deepseek-ai/dsh-llm": "*",
|
|
80
81
|
"@deepseek-ai/dsh-tools": "*",
|
|
81
82
|
"@deepseek-ai/schemastery": "*"
|
|
@@ -91,12 +92,5 @@
|
|
|
91
92
|
"tsdown": "^0.22.14",
|
|
92
93
|
"typescript": "^5.9.3",
|
|
93
94
|
"vitest": "^4.1.11"
|
|
94
|
-
},
|
|
95
|
-
"pnpm": {
|
|
96
|
-
"onlyBuiltDependencies": [
|
|
97
|
-
"onnxruntime-node",
|
|
98
|
-
"sharp",
|
|
99
|
-
"protobufjs"
|
|
100
|
-
]
|
|
101
95
|
}
|
|
102
96
|
}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
#!/usr/bin/env node
|
|
2
|
+
/**
|
|
3
|
+
* prepare 的构建兜底:lib/ 缺失时现场构建。
|
|
4
|
+
*
|
|
5
|
+
* 场景:从 GitHub 源码快捷安装(dsh plugin add github:...)会以源码形态执行 prepare,
|
|
6
|
+
* 此时没有构建产物,宿主以 "no entry point" 失败而非提示构建——这里补上自动构建。
|
|
7
|
+
* 开发仓(clone + pnpm install)通常已有 lib/ 或随后手动构建,仅在缺失时才付构建成本。
|
|
8
|
+
* 跨平台:经 node 执行 pnpm(Windows 下 pnpm 是 .cmd,shell 默认解析)。
|
|
9
|
+
*/
|
|
10
|
+
|
|
11
|
+
import { existsSync } from 'node:fs'
|
|
12
|
+
import { execSync } from 'node:child_process'
|
|
13
|
+
import { fileURLToPath } from 'node:url'
|
|
14
|
+
|
|
15
|
+
const entry = fileURLToPath(new URL('../lib/index.js', import.meta.url))
|
|
16
|
+
if (existsSync(entry)) {
|
|
17
|
+
console.log('[prepare] lib/index.js present, skipping build')
|
|
18
|
+
} else {
|
|
19
|
+
console.log('[prepare] lib/index.js missing — building (pnpm run bundle)...')
|
|
20
|
+
execSync('pnpm run bundle', { stdio: 'inherit', cwd: fileURLToPath(new URL('..', import.meta.url)) })
|
|
21
|
+
if (!existsSync(entry)) {
|
|
22
|
+
console.error('[prepare] build finished but lib/index.js is still missing — check the bundle output above')
|
|
23
|
+
process.exitCode = 1
|
|
24
|
+
}
|
|
25
|
+
}
|
package/scripts/link-peers.mjs
CHANGED
|
@@ -33,6 +33,8 @@ const LINKED_PACKAGES = [
|
|
|
33
33
|
['@deepseek-ai/dsh-client-ui-settings', 'packages/client/ui-settings'],
|
|
34
34
|
['@deepseek-ai/dsh-client-ui-renderer', 'packages/client/ui-renderer'],
|
|
35
35
|
['@deepseek-ai/dsh-client-ui-slots', 'packages/client/ui-slots'],
|
|
36
|
+
['@deepseek-ai/dsh-client-ui-layout', 'packages/client/ui-layout'],
|
|
37
|
+
['@deepseek-ai/dsh-client-ui-sidebar', 'packages/client/ui-sidebar'],
|
|
36
38
|
['@deepseek-ai/dsh-llm', 'packages/llm/llm'],
|
|
37
39
|
['@deepseek-ai/dsh-agent', 'packages/core/agent'],
|
|
38
40
|
['@deepseek-ai/dsh-scope', 'packages/core/scope'],
|
|
@@ -59,4 +61,5 @@ for (const [name, rel] of LINKED_PACKAGES) {
|
|
|
59
61
|
symlinkSync(target, link, 'dir')
|
|
60
62
|
created += 1
|
|
61
63
|
}
|
|
62
|
-
|
|
64
|
+
// 英文输出:这份摘要最常被贴进 issue/安装日志(贡献者含英文用户),中文注释留在源码内。
|
|
65
|
+
console.log(`[link-peers] ok: created ${created}, skipped ${skipped} of ${LINKED_PACKAGES.length} peers${skipped === LINKED_PACKAGES.length ? ' (all already provided by the host profile — nothing to link, this is expected)' : ''}`)
|