@coralai/sps-cli 0.58.20 → 0.58.22
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/dist/console-assets/assets/index-Bvm7gLHu.css +10 -0
- package/dist/console-assets/assets/{index-B956mP1c.js → index-D86y9Tcf.js} +105 -105
- package/dist/console-assets/index.html +2 -2
- package/dist/core/memory2/capture.d.ts +4 -2
- package/dist/core/memory2/capture.d.ts.map +1 -1
- package/dist/core/memory2/capture.js +62 -28
- package/dist/core/memory2/capture.js.map +1 -1
- package/dist/core/memory2/config.d.ts +6 -0
- package/dist/core/memory2/config.d.ts.map +1 -1
- package/dist/core/memory2/config.js +13 -0
- package/dist/core/memory2/config.js.map +1 -1
- package/dist/core/memory2/distill.d.ts +13 -0
- package/dist/core/memory2/distill.d.ts.map +1 -0
- package/dist/core/memory2/distill.js +88 -0
- package/dist/core/memory2/distill.js.map +1 -0
- package/dist/services/MemoryService.d.ts +2 -0
- package/dist/services/MemoryService.d.ts.map +1 -1
- package/dist/services/MemoryService.js +8 -7
- package/dist/services/MemoryService.js.map +1 -1
- package/package.json +1 -1
- package/dist/console-assets/assets/index-DENsMsFy.css +0 -10
|
@@ -7,8 +7,8 @@
|
|
|
7
7
|
<link rel="preconnect" href="https://fonts.googleapis.com">
|
|
8
8
|
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
|
|
9
9
|
<link href="https://fonts.googleapis.com/css2?family=Fredoka:wght@400;500;600;700&family=DM+Sans:wght@400;500;600;700&family=JetBrains+Mono:wght@400;500&display=swap" rel="stylesheet">
|
|
10
|
-
<script type="module" crossorigin src="/assets/index-
|
|
11
|
-
<link rel="stylesheet" crossorigin href="/assets/index-
|
|
10
|
+
<script type="module" crossorigin src="/assets/index-D86y9Tcf.js"></script>
|
|
11
|
+
<link rel="stylesheet" crossorigin href="/assets/index-Bvm7gLHu.css">
|
|
12
12
|
</head>
|
|
13
13
|
<body>
|
|
14
14
|
<div id="root"></div>
|
|
@@ -22,12 +22,14 @@ export declare function captureNote(project: string, cardId: string, ev: WorkerO
|
|
|
22
22
|
export declare function captureDiscard(project: string, cardId: string): void;
|
|
23
23
|
export type CaptureOutcome = {
|
|
24
24
|
saved: MemoryEntry;
|
|
25
|
+
} | {
|
|
26
|
+
distilling: true;
|
|
25
27
|
} | {
|
|
26
28
|
skipped: 'off' | 'empty' | 'too-short' | 'duplicate' | 'redacted';
|
|
27
29
|
};
|
|
28
30
|
/**
|
|
29
|
-
*
|
|
30
|
-
* 无论结果都清 buffer
|
|
31
|
+
* 卡片完成时调用。distill=on → 异步 LLM 蒸馏整段叙述成多条实质记忆(设计 §5);否则规则版取末尾结论段。
|
|
32
|
+
* 无论结果都清 buffer。捕获层异常不阻断卡片完成(调用方仍 try/catch 兜底)。
|
|
31
33
|
*/
|
|
32
34
|
export declare function captureFlush(project: string, cardId: string): CaptureOutcome;
|
|
33
35
|
//# sourceMappingURL=capture.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"capture.d.ts","sourceRoot":"","sources":["../../../src/core/memory2/capture.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"capture.d.ts","sourceRoot":"","sources":["../../../src/core/memory2/capture.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAOnE,OAAO,KAAK,EAAE,WAAW,EAAY,MAAM,YAAY,CAAC;AAiBxD,sCAAsC;AACtC,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAEnD;AAED,qDAAqD;AACrD,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAGlE;AAED,iEAAiE;AACjE,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,IAAI,GAAG,IAAI,CAIzF;AAED,6DAA6D;AAC7D,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,iBAAiB,GAAG,IAAI,CAKxF;AAED,mCAAmC;AACnC,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAIpE;AA6BD,MAAM,MAAM,cAAc,GACtB;IAAE,KAAK,EAAE,WAAW,CAAA;CAAE,GACtB;IAAE,UAAU,EAAE,IAAI,CAAA;CAAE,GACpB;IAAE,OAAO,EAAE,KAAK,GAAG,OAAO,GAAG,WAAW,GAAG,WAAW,GAAG,UAAU,CAAA;CAAE,CAAC;AAgC1E;;;GAGG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,cAAc,CAwB5E"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { isMemoryOff } from './config.js';
|
|
1
|
+
import { distillEnabled, isMemoryOff } from './config.js';
|
|
2
|
+
import { distillNarrative } from './distill.js';
|
|
2
3
|
import { externalRemember } from './external/agentMemory.js';
|
|
3
4
|
import { writeMemoryIndex } from './digest.js';
|
|
4
5
|
import { RedactedEntryDropped } from './redact.js';
|
|
@@ -45,15 +46,14 @@ export function captureDiscard(project, cardId) {
|
|
|
45
46
|
}
|
|
46
47
|
const MIN_LEN = 30;
|
|
47
48
|
const MAX_BODY = 1500;
|
|
48
|
-
/**
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
49
|
+
/** buffer → 完整归一化叙述(ACP 文本是流式小分片,join 回全文)。优先 result(某些后端 complete 带全文)。 */
|
|
50
|
+
function fullNarrative(buf) {
|
|
51
|
+
return ((buf.result && buf.result.trim().length >= MIN_LEN) ? buf.result : buf.texts.join('')).trim();
|
|
52
|
+
}
|
|
53
|
+
/** 规则版:从完整叙述取**末尾结论段**(agent 通常把总结放最后)。无段落结构则退回全文尾部。 */
|
|
54
|
+
function conclusionOf(full) {
|
|
54
55
|
if (full.length < MIN_LEN)
|
|
55
56
|
return null;
|
|
56
|
-
// 从末尾按空行累积段落到 >= MIN_LEN —— 得到完整的结论段(而非碎片)。无段落结构则退回全文。
|
|
57
57
|
const paras = full.split(/\n{2,}/).map((p) => p.trim()).filter(Boolean);
|
|
58
58
|
let concl = '';
|
|
59
59
|
for (let i = paras.length - 1; i >= 0 && concl.length < MIN_LEN; i--) {
|
|
@@ -69,9 +69,45 @@ function titleOf(body) {
|
|
|
69
69
|
const t = first.replace(/^#+\s*/, '').trim();
|
|
70
70
|
return t.length > 80 ? `${t.slice(0, 80)}…` : t;
|
|
71
71
|
}
|
|
72
|
+
/** 一条(去重后)落库 + 镜像 agentmemory。返回落盘的 entry 或 null(重复/脱敏丢弃)。 */
|
|
73
|
+
function persist(ref, m, seen) {
|
|
74
|
+
if (seen.has(normalizeForDedup(m.body)))
|
|
75
|
+
return null;
|
|
76
|
+
try {
|
|
77
|
+
const saved = saveEntry(ref, { title: m.title, body: m.body, category: m.category, tags: m.tags, source: 'capture', salience: m.salience ?? 2 });
|
|
78
|
+
seen.add(normalizeForDedup(saved.body));
|
|
79
|
+
void externalRemember(saved.body, { title: saved.title, project: ref.project }).catch(() => { }); // 镜像 agentmemory
|
|
80
|
+
return saved;
|
|
81
|
+
}
|
|
82
|
+
catch (err) {
|
|
83
|
+
if (err instanceof RedactedEntryDropped)
|
|
84
|
+
return null;
|
|
85
|
+
throw err;
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
/** LLM 蒸馏(异步 fire-and-forget):整段叙述 → N 条实质记忆;LLM 不可用则回退规则版单条结论。 */
|
|
89
|
+
async function distillAndSave(project, narrative) {
|
|
90
|
+
const ref = { scope: 'project', project };
|
|
91
|
+
const seen = new Set(listEntries(ref).map((e) => normalizeForDedup(e.body)));
|
|
92
|
+
const memories = await distillNarrative(narrative);
|
|
93
|
+
let n = 0;
|
|
94
|
+
if (memories && memories.length) {
|
|
95
|
+
for (const m of memories)
|
|
96
|
+
if (persist(ref, m, seen))
|
|
97
|
+
n++;
|
|
98
|
+
}
|
|
99
|
+
else {
|
|
100
|
+
// LLM 挂/返空 → 回退规则版单条(不丢这次捕获)
|
|
101
|
+
const concl = conclusionOf(narrative);
|
|
102
|
+
if (concl && persist(ref, { title: titleOf(concl), body: concl, category: 'note' }, seen))
|
|
103
|
+
n++;
|
|
104
|
+
}
|
|
105
|
+
if (n)
|
|
106
|
+
writeMemoryIndex(ref);
|
|
107
|
+
}
|
|
72
108
|
/**
|
|
73
|
-
*
|
|
74
|
-
* 无论结果都清 buffer
|
|
109
|
+
* 卡片完成时调用。distill=on → 异步 LLM 蒸馏整段叙述成多条实质记忆(设计 §5);否则规则版取末尾结论段。
|
|
110
|
+
* 无论结果都清 buffer。捕获层异常不阻断卡片完成(调用方仍 try/catch 兜底)。
|
|
75
111
|
*/
|
|
76
112
|
export function captureFlush(project, cardId) {
|
|
77
113
|
const k = key(project, cardId);
|
|
@@ -80,25 +116,23 @@ export function captureFlush(project, cardId) {
|
|
|
80
116
|
if (!buf)
|
|
81
117
|
return { skipped: 'off' };
|
|
82
118
|
buf.unsub?.();
|
|
83
|
-
const
|
|
84
|
-
if (
|
|
119
|
+
const narrative = fullNarrative(buf);
|
|
120
|
+
if (narrative.length < MIN_LEN)
|
|
85
121
|
return { skipped: buf.texts.length || buf.result ? 'too-short' : 'empty' };
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
if (normalizeForDedup(e.body) === norm)
|
|
90
|
-
return { skipped: 'duplicate' };
|
|
91
|
-
}
|
|
92
|
-
try {
|
|
93
|
-
const saved = saveEntry(ref, { title: titleOf(body), body, category: 'note', source: 'capture', salience: 2 });
|
|
94
|
-
writeMemoryIndex(ref);
|
|
95
|
-
void externalRemember(saved.body, { title: saved.title, project }).catch(() => { }); // 镜像到 agentmemory(带 project)
|
|
96
|
-
return { saved };
|
|
97
|
-
}
|
|
98
|
-
catch (err) {
|
|
99
|
-
if (err instanceof RedactedEntryDropped)
|
|
100
|
-
return { skipped: 'redacted' };
|
|
101
|
-
throw err;
|
|
122
|
+
if (distillEnabled()) {
|
|
123
|
+
void distillAndSave(project, narrative).catch(() => { }); // 异步,不阻塞卡片收尾
|
|
124
|
+
return { distilling: true };
|
|
102
125
|
}
|
|
126
|
+
// 规则版:单条结论
|
|
127
|
+
const ref = { scope: 'project', project };
|
|
128
|
+
const concl = conclusionOf(narrative);
|
|
129
|
+
if (!concl)
|
|
130
|
+
return { skipped: 'too-short' };
|
|
131
|
+
const seen = new Set(listEntries(ref).map((e) => normalizeForDedup(e.body)));
|
|
132
|
+
const saved = persist(ref, { title: titleOf(concl), body: concl, category: 'note' }, seen);
|
|
133
|
+
if (!saved)
|
|
134
|
+
return { skipped: 'duplicate' };
|
|
135
|
+
writeMemoryIndex(ref);
|
|
136
|
+
return { saved };
|
|
103
137
|
}
|
|
104
138
|
//# sourceMappingURL=capture.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"capture.js","sourceRoot":"","sources":["../../../src/core/memory2/capture.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"capture.js","sourceRoot":"","sources":["../../../src/core/memory2/capture.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,4 +21,10 @@ export declare function memoryEnv(key: string): string | undefined;
|
|
|
21
21
|
export declare function memoryMode(): MemoryMode;
|
|
22
22
|
/** 记忆整体是否关闭(mode=none):关则本地注入与捕获都不做。 */
|
|
23
23
|
export declare function isMemoryOff(): boolean;
|
|
24
|
+
/** 是否启用 LLM 蒸馏捕获(SPS_MEMORY_DISTILL=on)。关则走规则版(取末尾结论段)。 */
|
|
25
|
+
export declare function distillEnabled(): boolean;
|
|
26
|
+
/** 蒸馏用的 LLM 端点(Anthropic 兼容)。默认 claude-code-proxy(ChatGPT 订阅)。 */
|
|
27
|
+
export declare function distillUrl(): string;
|
|
28
|
+
/** 蒸馏模型名。默认便宜快的 claude-haiku-4-5。 */
|
|
29
|
+
export declare function distillModel(): string;
|
|
24
30
|
//# sourceMappingURL=config.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/core/memory2/config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAIH,MAAM,MAAM,UAAU,GAAG,OAAO,GAAG,gBAAgB,GAAG,UAAU,GAAG,MAAM,CAAC;AAW1E,wDAAwD;AACxD,wBAAgB,mBAAmB,IAAI,IAAI,CAAqB;AAEhE,4DAA4D;AAC5D,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAEzD;AAED,+BAA+B;AAC/B,wBAAgB,UAAU,IAAI,UAAU,CAIvC;AAED,wCAAwC;AACxC,wBAAgB,WAAW,IAAI,OAAO,CAErC"}
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/core/memory2/config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAIH,MAAM,MAAM,UAAU,GAAG,OAAO,GAAG,gBAAgB,GAAG,UAAU,GAAG,MAAM,CAAC;AAW1E,wDAAwD;AACxD,wBAAgB,mBAAmB,IAAI,IAAI,CAAqB;AAEhE,4DAA4D;AAC5D,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAEzD;AAED,+BAA+B;AAC/B,wBAAgB,UAAU,IAAI,UAAU,CAIvC;AAED,wCAAwC;AACxC,wBAAgB,WAAW,IAAI,OAAO,CAErC;AAID,2DAA2D;AAC3D,wBAAgB,cAAc,IAAI,OAAO,CAExC;AACD,kEAAkE;AAClE,wBAAgB,UAAU,IAAI,MAAM,CAEnC;AACD,qCAAqC;AACrC,wBAAgB,YAAY,IAAI,MAAM,CAErC"}
|
|
@@ -46,4 +46,17 @@ export function memoryMode() {
|
|
|
46
46
|
export function isMemoryOff() {
|
|
47
47
|
return memoryMode() === 'none';
|
|
48
48
|
}
|
|
49
|
+
// ─── LLM 蒸馏(设计 §5,默认关)——完成时把整段会话叙述提炼成多条实质记忆 ───
|
|
50
|
+
/** 是否启用 LLM 蒸馏捕获(SPS_MEMORY_DISTILL=on)。关则走规则版(取末尾结论段)。 */
|
|
51
|
+
export function distillEnabled() {
|
|
52
|
+
return (memoryEnv('SPS_MEMORY_DISTILL') ?? '').toLowerCase() === 'on';
|
|
53
|
+
}
|
|
54
|
+
/** 蒸馏用的 LLM 端点(Anthropic 兼容)。默认 claude-code-proxy(ChatGPT 订阅)。 */
|
|
55
|
+
export function distillUrl() {
|
|
56
|
+
return (memoryEnv('SPS_MEMORY_DISTILL_URL') ?? 'http://127.0.0.1:18765').replace(/\/+$/, '');
|
|
57
|
+
}
|
|
58
|
+
/** 蒸馏模型名。默认便宜快的 claude-haiku-4-5。 */
|
|
59
|
+
export function distillModel() {
|
|
60
|
+
return memoryEnv('SPS_MEMORY_DISTILL_MODEL') ?? 'claude-haiku-4-5';
|
|
61
|
+
}
|
|
49
62
|
//# sourceMappingURL=config.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/core/memory2/config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAI7C,+EAA+E;AAC/E,2DAA2D;AAC3D,IAAI,QAAQ,GAAkC,IAAI,CAAC;AACnD,SAAS,OAAO;IACd,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe;QAAE,OAAO,EAAE,CAAC;IAC3C,IAAI,QAAQ;QAAE,OAAO,QAAQ,CAAC;IAC9B,IAAI,CAAC;QAAC,QAAQ,GAAG,aAAa,EAA4B,CAAC;IAAC,CAAC;IAAC,MAAM,CAAC;QAAC,QAAQ,GAAG,EAAE,CAAC;IAAC,CAAC;IACtF,OAAO,QAAQ,CAAC;AAClB,CAAC;AACD,wDAAwD;AACxD,MAAM,UAAU,mBAAmB,KAAW,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC;AAEhE,4DAA4D;AAC5D,MAAM,UAAU,SAAS,CAAC,GAAW;IACnC,OAAO,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC;AAC5C,CAAC;AAED,+BAA+B;AAC/B,MAAM,UAAU,UAAU;IACxB,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;IAC/D,IAAI,GAAG,KAAK,MAAM,IAAI,GAAG,KAAK,UAAU,IAAI,GAAG,KAAK,gBAAgB;QAAE,OAAO,GAAG,CAAC;IACjF,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,wCAAwC;AACxC,MAAM,UAAU,WAAW;IACzB,OAAO,UAAU,EAAE,KAAK,MAAM,CAAC;AACjC,CAAC"}
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/core/memory2/config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAI7C,+EAA+E;AAC/E,2DAA2D;AAC3D,IAAI,QAAQ,GAAkC,IAAI,CAAC;AACnD,SAAS,OAAO;IACd,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe;QAAE,OAAO,EAAE,CAAC;IAC3C,IAAI,QAAQ;QAAE,OAAO,QAAQ,CAAC;IAC9B,IAAI,CAAC;QAAC,QAAQ,GAAG,aAAa,EAA4B,CAAC;IAAC,CAAC;IAAC,MAAM,CAAC;QAAC,QAAQ,GAAG,EAAE,CAAC;IAAC,CAAC;IACtF,OAAO,QAAQ,CAAC;AAClB,CAAC;AACD,wDAAwD;AACxD,MAAM,UAAU,mBAAmB,KAAW,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC;AAEhE,4DAA4D;AAC5D,MAAM,UAAU,SAAS,CAAC,GAAW;IACnC,OAAO,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC;AAC5C,CAAC;AAED,+BAA+B;AAC/B,MAAM,UAAU,UAAU;IACxB,MAAM,GAAG,GAAG,CAAC,SAAS,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC;IAC/D,IAAI,GAAG,KAAK,MAAM,IAAI,GAAG,KAAK,UAAU,IAAI,GAAG,KAAK,gBAAgB;QAAE,OAAO,GAAG,CAAC;IACjF,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,wCAAwC;AACxC,MAAM,UAAU,WAAW;IACzB,OAAO,UAAU,EAAE,KAAK,MAAM,CAAC;AACjC,CAAC;AAED,iDAAiD;AAEjD,2DAA2D;AAC3D,MAAM,UAAU,cAAc;IAC5B,OAAO,CAAC,SAAS,CAAC,oBAAoB,CAAC,IAAI,EAAE,CAAC,CAAC,WAAW,EAAE,KAAK,IAAI,CAAC;AACxE,CAAC;AACD,kEAAkE;AAClE,MAAM,UAAU,UAAU;IACxB,OAAO,CAAC,SAAS,CAAC,wBAAwB,CAAC,IAAI,wBAAwB,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;AAC/F,CAAC;AACD,qCAAqC;AACrC,MAAM,UAAU,YAAY;IAC1B,OAAO,SAAS,CAAC,0BAA0B,CAAC,IAAI,kBAAkB,CAAC;AACrE,CAAC"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { type MemoryCategory } from './types.js';
|
|
2
|
+
export interface DistilledMemory {
|
|
3
|
+
title: string;
|
|
4
|
+
body: string;
|
|
5
|
+
category: MemoryCategory;
|
|
6
|
+
tags: string[];
|
|
7
|
+
salience: number;
|
|
8
|
+
}
|
|
9
|
+
/**
|
|
10
|
+
* 蒸馏完整叙述 → 记忆数组。成功返数组(可能空);LLM 不可用/超时/解析失败 → 返 null(调用方回退规则版)。
|
|
11
|
+
*/
|
|
12
|
+
export declare function distillNarrative(narrative: string): Promise<DistilledMemory[] | null>;
|
|
13
|
+
//# sourceMappingURL=distill.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"distill.d.ts","sourceRoot":"","sources":["../../../src/core/memory2/distill.ts"],"names":[],"mappings":"AAUA,OAAO,EAAqB,KAAK,cAAc,EAAE,MAAM,YAAY,CAAC;AAEpE,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,cAAc,CAAC;IACzB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB;AAyCD;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,EAAE,GAAG,IAAI,CAAC,CAuB3F"}
|
|
@@ -0,0 +1,88 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @module core/memory2/distill
|
|
3
|
+
* @description LLM 蒸馏(设计 §5,SPS_MEMORY_DISTILL=on):把一张卡/会话的**完整归一化叙述**交给便宜 LLM,
|
|
4
|
+
* 提炼成 0–N 条**可复用、耐用**的原子记忆(决策/约定/坑/模式/架构),而非规则版只取末尾一段。
|
|
5
|
+
* 走 Anthropic 兼容端点(默认 claude-code-proxy :18765 / claude-haiku-4-5,即用户 ChatGPT 订阅)。
|
|
6
|
+
* 红线:输入来自 subscribe 的归一化文本,不碰 jsonl。任何失败 → 返 null,调用方回退规则版。
|
|
7
|
+
* @layer core
|
|
8
|
+
* @boundedContext memory
|
|
9
|
+
*/
|
|
10
|
+
import { distillModel, distillUrl } from './config.js';
|
|
11
|
+
import { MEMORY_CATEGORIES } from './types.js';
|
|
12
|
+
const MAX_INPUT_CHARS = 20000; // 太长取末尾(结论/近期决策在后)
|
|
13
|
+
const REQUEST_TIMEOUT_MS = 30000;
|
|
14
|
+
const PROMPT = (narrative) => `你是记忆蒸馏器。下面是一个编码 agent 完成一张开发卡的完整叙述。请提取**可复用、耐用**的项目记忆——只留将来做这个项目其它卡时有用的:关键决策、架构/技术选型、约定、踩过的坑、重要模式。忽略一次性操作、寒暄、过程碎念。
|
|
15
|
+
|
|
16
|
+
只输出一个 JSON 数组(不要 markdown 代码块、不要多余解释),每条:
|
|
17
|
+
{"title":"≤80字简短标题","body":"1-3句具体内容","category":"convention|decision|gotcha|pattern|reference|note","tags":["标签"],"salience":1-5}
|
|
18
|
+
|
|
19
|
+
规则:没有可复用的就返回 [];不要密钥/凭据/私有路径/客户数据;body 要具体可执行、别空泛;最多 5 条。
|
|
20
|
+
|
|
21
|
+
叙述:
|
|
22
|
+
${narrative}`;
|
|
23
|
+
/** 把 model 返回的文本解析成记忆数组(容忍 ```json 包裹、前后噪声)。 */
|
|
24
|
+
function parseMemories(text) {
|
|
25
|
+
let t = text.trim();
|
|
26
|
+
const fence = t.match(/```(?:json)?\s*([\s\S]*?)```/);
|
|
27
|
+
if (fence)
|
|
28
|
+
t = fence[1].trim();
|
|
29
|
+
const start = t.indexOf('[');
|
|
30
|
+
const end = t.lastIndexOf(']');
|
|
31
|
+
if (start < 0 || end < start)
|
|
32
|
+
return [];
|
|
33
|
+
let arr;
|
|
34
|
+
try {
|
|
35
|
+
arr = JSON.parse(t.slice(start, end + 1));
|
|
36
|
+
}
|
|
37
|
+
catch {
|
|
38
|
+
return [];
|
|
39
|
+
}
|
|
40
|
+
if (!Array.isArray(arr))
|
|
41
|
+
return [];
|
|
42
|
+
const out = [];
|
|
43
|
+
for (const raw of arr) {
|
|
44
|
+
if (!raw || typeof raw !== 'object')
|
|
45
|
+
continue;
|
|
46
|
+
const r = raw;
|
|
47
|
+
const title = typeof r.title === 'string' ? r.title.trim() : '';
|
|
48
|
+
const body = typeof r.body === 'string' ? r.body.trim() : '';
|
|
49
|
+
if (!title || !body)
|
|
50
|
+
continue;
|
|
51
|
+
const category = MEMORY_CATEGORIES.includes(r.category) ? r.category : 'note';
|
|
52
|
+
const tags = Array.isArray(r.tags) ? r.tags.map((x) => String(x)).filter(Boolean).slice(0, 8) : [];
|
|
53
|
+
const salience = Math.min(5, Math.max(1, Math.round(Number(r.salience) || 2)));
|
|
54
|
+
out.push({ title: title.slice(0, 120), body, category, tags, salience });
|
|
55
|
+
}
|
|
56
|
+
return out.slice(0, 5);
|
|
57
|
+
}
|
|
58
|
+
/**
|
|
59
|
+
* 蒸馏完整叙述 → 记忆数组。成功返数组(可能空);LLM 不可用/超时/解析失败 → 返 null(调用方回退规则版)。
|
|
60
|
+
*/
|
|
61
|
+
export async function distillNarrative(narrative) {
|
|
62
|
+
const url = distillUrl();
|
|
63
|
+
if (!url || !narrative.trim())
|
|
64
|
+
return null;
|
|
65
|
+
const input = narrative.length > MAX_INPUT_CHARS ? narrative.slice(-MAX_INPUT_CHARS) : narrative;
|
|
66
|
+
const ac = new AbortController();
|
|
67
|
+
const timer = setTimeout(() => ac.abort(), REQUEST_TIMEOUT_MS);
|
|
68
|
+
try {
|
|
69
|
+
const r = await fetch(`${url}/v1/messages`, {
|
|
70
|
+
method: 'POST',
|
|
71
|
+
headers: { 'content-type': 'application/json', 'x-api-key': 'sps-memory-distill', 'anthropic-version': '2023-06-01' },
|
|
72
|
+
body: JSON.stringify({ model: distillModel(), max_tokens: 1500, messages: [{ role: 'user', content: PROMPT(input) }] }),
|
|
73
|
+
signal: ac.signal,
|
|
74
|
+
});
|
|
75
|
+
if (!r.ok)
|
|
76
|
+
return null;
|
|
77
|
+
const data = await r.json();
|
|
78
|
+
const text = data.content?.map((b) => b.text ?? '').join('') ?? '';
|
|
79
|
+
return parseMemories(text);
|
|
80
|
+
}
|
|
81
|
+
catch {
|
|
82
|
+
return null;
|
|
83
|
+
}
|
|
84
|
+
finally {
|
|
85
|
+
clearTimeout(timer);
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
//# sourceMappingURL=distill.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"distill.js","sourceRoot":"","sources":["../../../src/core/memory2/distill.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MemoryService.d.ts","sourceRoot":"","sources":["../../src/services/MemoryService.ts"],"names":[],"mappings":"AASA,OAAO,EAAW,KAAK,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAE9D,OAAO,EAAmB,KAAK,YAAY,EAAE,MAAM,sCAAsC,CAAC;AAK1F,OAAO,EACmC,KAAK,WAAW,EAAE,KAAK,QAAQ,EACxE,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,KAAK,WAAW,EAAe,MAAM,qBAAqB,CAAC;AACpE,OAAO,EAAW,KAAK,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAE3D,MAAM,WAAW,WAAW;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,cAAe,SAAQ,WAAW;IACjD,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"MemoryService.d.ts","sourceRoot":"","sources":["../../src/services/MemoryService.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,12 +36,13 @@ const redactedErr = (e) => domainError('validation', 'MEMORY_REDACTED', `命中
|
|
|
36
36
|
export class MemoryService {
|
|
37
37
|
/** 枚举所有作用域 + 条目数。 */
|
|
38
38
|
async listScopes() {
|
|
39
|
-
const scopes = listAllScopes().map((ref) =>
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
agentId: ref.agentId,
|
|
43
|
-
|
|
44
|
-
|
|
39
|
+
const scopes = listAllScopes().map((ref) => {
|
|
40
|
+
const entries = listEntries(ref);
|
|
41
|
+
const updated = entries.reduce((mx, e) => (e.updated > mx ? e.updated : mx), '');
|
|
42
|
+
return { scope: ref.scope, project: ref.project, agentId: ref.agentId, count: entries.length, updated };
|
|
43
|
+
});
|
|
44
|
+
// 后端预排:新鲜度降序(空的排后),前端可直接用。
|
|
45
|
+
scopes.sort((a, b) => b.updated.localeCompare(a.updated));
|
|
45
46
|
return ok({ scopes });
|
|
46
47
|
}
|
|
47
48
|
/** 列一个作用域的全部条目(salience↓、updated↓)。 */
|
|
@@ -164,7 +165,7 @@ export class MemoryService {
|
|
|
164
165
|
}
|
|
165
166
|
const results = refs.map((ref) => {
|
|
166
167
|
const stats = gcScope(ref);
|
|
167
|
-
return { scope: { scope: ref.scope, project: ref.project, agentId: ref.agentId, count: stats.kept }, ...stats };
|
|
168
|
+
return { scope: { scope: ref.scope, project: ref.project, agentId: ref.agentId, count: stats.kept, updated: '' }, ...stats };
|
|
168
169
|
});
|
|
169
170
|
return ok({ results });
|
|
170
171
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MemoryService.js","sourceRoot":"","sources":["../../src/services/MemoryService.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AACnF,OAAO,EAAE,OAAO,EAAgB,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,eAAe,EAAqB,MAAM,sCAAsC,CAAC;AAC1F,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAC;AAC3G,OAAO,EACL,WAAW,EAAE,aAAa,EAAE,WAAW,EAAE,YAAY,EAAE,SAAS,EAAE,SAAS,GAC5E,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,iBAAiB,GAClB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAoB,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACpE,OAAO,EAAE,GAAG,EAAE,EAAE,EAAe,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"MemoryService.js","sourceRoot":"","sources":["../../src/services/MemoryService.ts"],"names":[],"mappings":"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"}
|