@alanzhao/dsh-memory-lite 0.2.1 → 0.2.4
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 +2 -1
- package/lib/catalog.d.ts +33 -11
- package/lib/catalog.js +67 -41
- package/lib/catalog.js.map +1 -1
- package/lib/client.js +56 -2
- package/lib/extract/index.js +55 -17
- package/lib/extract/index.js.map +1 -1
- package/lib/extract/window.d.ts +8 -0
- package/lib/extract/window.js +11 -4
- package/lib/extract/window.js.map +1 -1
- package/lib/inject.d.ts +2 -2
- package/lib/inject.js +6 -4
- package/lib/inject.js.map +1 -1
- package/lib/types.d.ts +4 -16
- package/lib/types.js +6 -0
- package/lib/types.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -58,6 +58,7 @@ The plugin row in `cordis.patch.yml` carries **no configuration** (mount only);
|
|
|
58
58
|
Effect timing:
|
|
59
59
|
|
|
60
60
|
- **Live** (apply on save): `extraction.*`, `index.maxTokens`, `defaultPeer`, `workspacePeers.*`, `ui.headerOrder` (after a refresh for the slot order).
|
|
61
|
+
- **Stale model values**: if `extraction.llm.route` (or `reasoningEffort`) points at a model the provider has renamed or removed, the panel shows it as a flagged *已失效* option with a warning instead of silently displaying *跟随全局默认*. The plugin never rewrites it for you — extraction keeps failing until you pick a new value.
|
|
61
62
|
- **Restart** (persisted, apply on next boot): `root`, `sharing.*` — `MemoryStore` pins them at construction; the panel labels them accordingly.
|
|
62
63
|
|
|
63
64
|
## Tools
|
|
@@ -87,7 +88,7 @@ Each memory file uses `## Current` / `## History` / `## Related` sections; updat
|
|
|
87
88
|
|
|
88
89
|
## How it works
|
|
89
90
|
|
|
90
|
-
- **L0 catalog injection** (`agent/pre-step` waterfall, copied from `@deepseek-ai/dsh-tool-skill`): the peer's `_index.md` is rendered into one durable `user/message` with
|
|
91
|
+
- **L0 catalog injection** (`agent/pre-step` waterfall, copied from `@deepseek-ai/dsh-tool-skill`): the peer's `_index.md` is rendered into one durable `user/message` carrying the **official** `plugin` source kind with the `catalog` form (`{kind:'plugin', plugin:'dsh-memory-lite', form:'catalog'}`) — the private `memory-catalog` kind used before 0.2.3 is still read back so old sessions never publish a duplicate. Re-published when the index changes or compaction moves it off the visible surface. A fresh empty index publishes nothing (unless sharing mounts are enabled — then only the `## shared` hint is published). Subagent sessions get no catalog.
|
|
91
92
|
- **Peer isolation**: each session's cwd derives its peer name (sanitized basename + short hash); cwd-less sessions fall back to `defaultPeer`.
|
|
92
93
|
- **Peer display names**: Chinese and other non-ASCII workspace directories collapse to hash-suffixed ASCII names (e.g. `workspace-aad65ea5`). The plugin records a human-readable `.peer-meta.json` (`displayName`, e.g. 健康分析) per peer the first time a session with that cwd is seen; the sharing settings list shows `健康分析 (workspace-aad65ea5)`.
|
|
93
94
|
- **Path safety**: every file access goes through a containment boundary — relative paths only, `..` / absolute / symlink escapes rejected at the executor.
|
package/lib/catalog.d.ts
CHANGED
|
@@ -1,35 +1,57 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* L0 catalog rendering
|
|
3
|
-
*
|
|
2
|
+
* L0 catalog rendering and session-history tracking.
|
|
3
|
+
*
|
|
4
|
+
* The injected message uses the OFFICIAL `plugin` source kind with the
|
|
5
|
+
* `catalog` form, so a released session-format migration can classify and
|
|
6
|
+
* carry it (the private `memory-catalog` kind written before 0.2.3 is still read
|
|
7
|
+
* back for old sessions). The official source form carries no payload, so the
|
|
8
|
+
* published state is recovered by comparing the message text itself.
|
|
4
9
|
* @module dsh-memory-lite/src/catalog
|
|
5
10
|
*/
|
|
6
11
|
import type { Agent } from '@deepseek-ai/dsh-agent';
|
|
7
12
|
import type { UserMessage } from '@deepseek-ai/dsh-session';
|
|
8
13
|
import type { IndexEntry } from './types.js';
|
|
9
|
-
/**
|
|
10
|
-
|
|
14
|
+
/**
|
|
15
|
+
* The `plugin` name stamped on the catalog source: the official `plugin` kind
|
|
16
|
+
* plus the official `catalog` form mark one plugin-published catalog without
|
|
17
|
+
* inventing a source kind outside the released vocabulary.
|
|
18
|
+
*/
|
|
19
|
+
export declare const MEMORY_CATALOG_PLUGIN = "dsh-memory-lite";
|
|
11
20
|
/** One shared-mount notice rendered into the catalog; not an index entry. */
|
|
12
21
|
export interface SharedMountNotice {
|
|
13
22
|
readonly name: string;
|
|
14
23
|
readonly peer: string;
|
|
15
24
|
readonly readonly: boolean;
|
|
16
25
|
}
|
|
26
|
+
/**
|
|
27
|
+
* Whether one message source is a memory catalog this plugin published. New
|
|
28
|
+
* messages carry the official `plugin` kind with the `catalog` form; sessions
|
|
29
|
+
* written before that change carry the private `memory-catalog` kind and stay
|
|
30
|
+
* readable, so an already-published catalog is never published twice.
|
|
31
|
+
*/
|
|
32
|
+
export declare function isMemoryCatalogSource(source: unknown): boolean;
|
|
17
33
|
/** The catalog message for this session's first publication. */
|
|
18
34
|
export declare function renderCatalogMessage(entries: readonly IndexEntry[], peer: string, sharedMounts?: readonly SharedMountNotice[]): UserMessage;
|
|
19
35
|
/** The catalog message when the index changed and an older catalog is still visible. */
|
|
20
36
|
export declare function renderCatalogUpdate(entries: readonly IndexEntry[], peer: string, sharedMounts?: readonly SharedMountNotice[]): UserMessage;
|
|
21
|
-
/** Entries of one durable catalog message, or undefined when the record is unusable. */
|
|
22
|
-
export declare function readCatalogEntries(source: unknown): readonly IndexEntry[] | undefined;
|
|
23
37
|
/**
|
|
24
|
-
*
|
|
25
|
-
*
|
|
38
|
+
* Whether a published catalog text is still this plugin's current rendering.
|
|
39
|
+
* An unchanged catalog matches whichever framing it was published with, so a
|
|
40
|
+
* first publication and an update that carry the same entries and mounts both
|
|
41
|
+
* count as current.
|
|
42
|
+
*/
|
|
43
|
+
export declare function isCurrentCatalogText(text: string, entries: readonly IndexEntry[], peer: string, sharedMounts?: readonly SharedMountNotice[]): boolean;
|
|
44
|
+
/**
|
|
45
|
+
* The latest catalog message this session published, plus the text it
|
|
46
|
+
* published while that message is still on the visible surface (compaction may
|
|
47
|
+
* have moved it off).
|
|
26
48
|
*/
|
|
27
49
|
export declare function catalogHistory(agent: Agent): {
|
|
28
|
-
visibleDigest?: string;
|
|
29
50
|
published: boolean;
|
|
51
|
+
visibleText?: string;
|
|
30
52
|
};
|
|
31
|
-
/** The
|
|
53
|
+
/** The catalog message already in the entering batch, if any. */
|
|
32
54
|
export declare function catalogMessage(messages: readonly UserMessage[]): {
|
|
33
55
|
message: UserMessage;
|
|
34
|
-
|
|
56
|
+
text: string;
|
|
35
57
|
} | undefined;
|
package/lib/catalog.js
CHANGED
|
@@ -1,18 +1,20 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* L0 catalog rendering
|
|
3
|
-
*
|
|
2
|
+
* L0 catalog rendering and session-history tracking.
|
|
3
|
+
*
|
|
4
|
+
* The injected message uses the OFFICIAL `plugin` source kind with the
|
|
5
|
+
* `catalog` form, so a released session-format migration can classify and
|
|
6
|
+
* carry it (the private `memory-catalog` kind written before 0.2.3 is still read
|
|
7
|
+
* back for old sessions). The official source form carries no payload, so the
|
|
8
|
+
* published state is recovered by comparing the message text itself.
|
|
4
9
|
* @module dsh-memory-lite/src/catalog
|
|
5
10
|
*/
|
|
6
|
-
import { createHash } from 'node:crypto';
|
|
7
11
|
import { createUserMessage } from '@deepseek-ai/dsh-llm';
|
|
8
|
-
/**
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
return createHash('sha256').update(canonical).digest('hex');
|
|
15
|
-
}
|
|
12
|
+
/**
|
|
13
|
+
* The `plugin` name stamped on the catalog source: the official `plugin` kind
|
|
14
|
+
* plus the official `catalog` form mark one plugin-published catalog without
|
|
15
|
+
* inventing a source kind outside the released vocabulary.
|
|
16
|
+
*/
|
|
17
|
+
export const MEMORY_CATALOG_PLUGIN = 'dsh-memory-lite';
|
|
16
18
|
const GUIDANCE = 'You have long-term memory tools (read_memory / search_memory / remember / update_memory / forget_memory). ' +
|
|
17
19
|
'Call remember only when the user explicitly asks to remember something; do not decide on your own. ' +
|
|
18
20
|
'To load the full text of a memory, call read_memory with the exact path from this index.';
|
|
@@ -26,6 +28,37 @@ function renderSharedMounts(mounts) {
|
|
|
26
28
|
...mounts.map(mount => `- shared/${mount.name}/: read-only mirror of peer '${mount.peer}'. The full index is not preloaded — find content with search_memory, then read_memory for the full text.`),
|
|
27
29
|
];
|
|
28
30
|
}
|
|
31
|
+
/** The single model-facing text block of one message content array. */
|
|
32
|
+
function textOfContent(content) {
|
|
33
|
+
if (!Array.isArray(content))
|
|
34
|
+
return undefined;
|
|
35
|
+
for (const block of content) {
|
|
36
|
+
if (typeof block !== 'object' || block === null)
|
|
37
|
+
continue;
|
|
38
|
+
const record = block;
|
|
39
|
+
if (record.type === 'text' && typeof record.text === 'string')
|
|
40
|
+
return record.text;
|
|
41
|
+
}
|
|
42
|
+
return undefined;
|
|
43
|
+
}
|
|
44
|
+
/**
|
|
45
|
+
* Whether one message source is a memory catalog this plugin published. New
|
|
46
|
+
* messages carry the official `plugin` kind with the `catalog` form; sessions
|
|
47
|
+
* written before that change carry the private `memory-catalog` kind and stay
|
|
48
|
+
* readable, so an already-published catalog is never published twice.
|
|
49
|
+
*/
|
|
50
|
+
export function isMemoryCatalogSource(source) {
|
|
51
|
+
if (typeof source !== 'object' || source === null)
|
|
52
|
+
return false;
|
|
53
|
+
const record = source;
|
|
54
|
+
if (record.kind === 'memory-catalog')
|
|
55
|
+
return true;
|
|
56
|
+
return record.kind === 'plugin' && record.plugin === MEMORY_CATALOG_PLUGIN && record.form === 'catalog';
|
|
57
|
+
}
|
|
58
|
+
/** The text one rendered catalog message publishes. */
|
|
59
|
+
function catalogText(message) {
|
|
60
|
+
return textOfContent(message.content);
|
|
61
|
+
}
|
|
29
62
|
/** The catalog message for this session's first publication. */
|
|
30
63
|
export function renderCatalogMessage(entries, peer, sharedMounts = []) {
|
|
31
64
|
return createUserMessage({
|
|
@@ -42,7 +75,7 @@ export function renderCatalogMessage(entries, peer, sharedMounts = []) {
|
|
|
42
75
|
'</system-reminder>',
|
|
43
76
|
].join('\n'),
|
|
44
77
|
}],
|
|
45
|
-
source: { kind: '
|
|
78
|
+
source: { kind: 'plugin', plugin: MEMORY_CATALOG_PLUGIN, form: 'catalog' },
|
|
46
79
|
});
|
|
47
80
|
}
|
|
48
81
|
/** The catalog message when the index changed and an older catalog is still visible. */
|
|
@@ -60,29 +93,23 @@ export function renderCatalogUpdate(entries, peer, sharedMounts = []) {
|
|
|
60
93
|
'</system-reminder>',
|
|
61
94
|
].join('\n'),
|
|
62
95
|
}],
|
|
63
|
-
source: { kind: '
|
|
96
|
+
source: { kind: 'plugin', plugin: MEMORY_CATALOG_PLUGIN, form: 'catalog' },
|
|
64
97
|
});
|
|
65
98
|
}
|
|
66
|
-
/**
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
const { category, path, summary } = entry;
|
|
76
|
-
if (typeof category !== 'string' || category === '' || typeof path !== 'string' || path === '' || typeof summary !== 'string') {
|
|
77
|
-
return undefined;
|
|
78
|
-
}
|
|
79
|
-
readable.push({ category, path, summary });
|
|
80
|
-
}
|
|
81
|
-
return readable;
|
|
99
|
+
/**
|
|
100
|
+
* Whether a published catalog text is still this plugin's current rendering.
|
|
101
|
+
* An unchanged catalog matches whichever framing it was published with, so a
|
|
102
|
+
* first publication and an update that carry the same entries and mounts both
|
|
103
|
+
* count as current.
|
|
104
|
+
*/
|
|
105
|
+
export function isCurrentCatalogText(text, entries, peer, sharedMounts = []) {
|
|
106
|
+
return text === catalogText(renderCatalogMessage(entries, peer, sharedMounts))
|
|
107
|
+
|| text === catalogText(renderCatalogUpdate(entries, peer, sharedMounts));
|
|
82
108
|
}
|
|
83
109
|
/**
|
|
84
|
-
* The latest
|
|
85
|
-
*
|
|
110
|
+
* The latest catalog message this session published, plus the text it
|
|
111
|
+
* published while that message is still on the visible surface (compaction may
|
|
112
|
+
* have moved it off).
|
|
86
113
|
*/
|
|
87
114
|
export function catalogHistory(agent) {
|
|
88
115
|
const visible = new Set(agent.session.surface.nodes);
|
|
@@ -93,29 +120,28 @@ export function catalogHistory(agent) {
|
|
|
93
120
|
const event = events[index];
|
|
94
121
|
if (event.type !== 'user/message')
|
|
95
122
|
continue;
|
|
96
|
-
|
|
97
|
-
if (typeof source !== 'object' || source === null || source.kind !== 'memory-catalog')
|
|
123
|
+
if (!isMemoryCatalogSource(event.data.source))
|
|
98
124
|
continue;
|
|
99
|
-
const
|
|
100
|
-
if (
|
|
125
|
+
const text = textOfContent(event.data.content);
|
|
126
|
+
if (text === undefined)
|
|
101
127
|
continue;
|
|
102
128
|
if (visible.has(event.seq))
|
|
103
|
-
return {
|
|
129
|
+
return { published: true, visibleText: text };
|
|
104
130
|
return { published: true };
|
|
105
131
|
}
|
|
106
132
|
return { published: false };
|
|
107
133
|
}
|
|
108
|
-
/** The
|
|
134
|
+
/** The catalog message already in the entering batch, if any. */
|
|
109
135
|
export function catalogMessage(messages) {
|
|
110
136
|
for (const message of messages) {
|
|
111
137
|
// A message without a stamped source (created before the loop or by hand)
|
|
112
138
|
// is not this plugin's catalog; treat it like any other message.
|
|
113
139
|
const source = message.source;
|
|
114
|
-
if (
|
|
140
|
+
if (!isMemoryCatalogSource(source))
|
|
115
141
|
continue;
|
|
116
|
-
const
|
|
117
|
-
if (
|
|
118
|
-
return { message,
|
|
142
|
+
const text = textOfContent(message.content);
|
|
143
|
+
if (text !== undefined)
|
|
144
|
+
return { message, text };
|
|
119
145
|
}
|
|
120
146
|
return undefined;
|
|
121
147
|
}
|
package/lib/catalog.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"catalog.js","sourceRoot":"","sources":["../src/catalog.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"catalog.js","sourceRoot":"","sources":["../src/catalog.ts"],"names":[],"mappings":"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"}
|
package/lib/client.js
CHANGED
|
@@ -199,9 +199,30 @@ window.__ModuleLoader__.load({
|
|
|
199
199
|
return cur;
|
|
200
200
|
};
|
|
201
201
|
|
|
202
|
+
// Keep a stored value visible when its option disappears. A provider model
|
|
203
|
+
// can be renamed or deleted while the route (or a reasoning effort) stays
|
|
204
|
+
// pinned in settings; without this the select silently falls back to its
|
|
205
|
+
// first entry, so the page looks healthy while extraction keeps calling a
|
|
206
|
+
// dead model (2026-09-16: route huoshan/deepseek-v4-flash rendered as
|
|
207
|
+
// follow-global-default).
|
|
208
|
+
// list - current options, the '' default first.
|
|
209
|
+
// current - stored (or drafted) value.
|
|
210
|
+
// listReady - whether list is authoritative: the catalog/effort fetch
|
|
211
|
+
// already answered. While it has not, the stored value is
|
|
212
|
+
// shown as-is and never flagged.
|
|
213
|
+
const withStoredValue = (list, current, listReady, label) => {
|
|
214
|
+
const options = list || [];
|
|
215
|
+
const value = current === undefined || current === null ? '' : String(current);
|
|
216
|
+
if (value === '') return { options, stale: false };
|
|
217
|
+
if (options.some((opt) => String(opt[0]) === value)) return { options, stale: false };
|
|
218
|
+
const head = listReady ? [value, label(value)] : [value, value];
|
|
219
|
+
return { options: [head, ...options], stale: listReady };
|
|
220
|
+
};
|
|
221
|
+
|
|
202
222
|
const rowStyle = { marginBottom: 12, maxWidth: 420 };
|
|
203
223
|
const labelStyle = { display: 'block', fontSize: 13, lineHeight: '20px', color: 'var(--dsw-alias-label-primary)', marginBottom: 4 };
|
|
204
224
|
const hintStyle = { fontSize: 11, lineHeight: '16px', color: 'var(--dsw-alias-label-tertiary)', marginTop: 3 };
|
|
225
|
+
const warningStyle = { fontSize: 11, lineHeight: '16px', color: 'var(--dsw-alias-state-error-primary)', marginTop: 3 };
|
|
205
226
|
const inputStyle = {
|
|
206
227
|
width: '100%', boxSizing: 'border-box', height: 28, padding: '0 8px',
|
|
207
228
|
borderRadius: 6, border: '1px solid var(--dsw-alias-border-l2)',
|
|
@@ -321,7 +342,11 @@ window.__ModuleLoader__.load({
|
|
|
321
342
|
return opts;
|
|
322
343
|
};
|
|
323
344
|
|
|
324
|
-
|
|
345
|
+
// A list is authoritative only once its fetch answered; until then a
|
|
346
|
+
// stored value missing from the options is not yet known to be stale.
|
|
347
|
+
const catalogReady = catalog !== null && !failed;
|
|
348
|
+
const effortsReadyFor = (route) => route !== '' && route === effortRoute && efforts !== null;
|
|
349
|
+
return { routeOptions, effortOptionsFor, selectRoute, failed, catalogReady, effortsReadyFor };
|
|
325
350
|
}
|
|
326
351
|
|
|
327
352
|
/* ---- 共享挂载 peer 列表 (16.9 补: 勾选式编辑) ---- */
|
|
@@ -370,6 +395,9 @@ window.__ModuleLoader__.load({
|
|
|
370
395
|
const shown = staged !== undefined ? staged : value;
|
|
371
396
|
|
|
372
397
|
let control;
|
|
398
|
+
// Set by the dynamic select below when the stored value is missing from
|
|
399
|
+
// its option list (the value is then also shown, flagged, as an option).
|
|
400
|
+
let staleWarning = null;
|
|
373
401
|
if (spec.type === 'toggle') {
|
|
374
402
|
control = jsx('input', {
|
|
375
403
|
type: 'checkbox',
|
|
@@ -389,16 +417,31 @@ window.__ModuleLoader__.load({
|
|
|
389
417
|
// Route dropdown: 跟随全局默认 + all registered provider/model pairs.
|
|
390
418
|
// Effort dropdown: options for the currently-selected route (draft or
|
|
391
419
|
// stored), falling back to the global default's effort when route unset.
|
|
420
|
+
// Either list can stop containing the stored value (a provider model is
|
|
421
|
+
// renamed or deleted): withStoredValue keeps that value on screen and
|
|
422
|
+
// flags it instead of letting the control fall back to its first entry.
|
|
392
423
|
let options;
|
|
424
|
+
let listReady;
|
|
425
|
+
let staleLabel;
|
|
393
426
|
let isRoute = false;
|
|
394
427
|
if (spec.dynamic === 'route') {
|
|
395
428
|
options = modelOptions ? modelOptions.routeOptions : [];
|
|
429
|
+
listReady = modelOptions ? modelOptions.catalogReady : false;
|
|
430
|
+
staleLabel = (v) => v + '(已失效:provider 中已无此模型)';
|
|
396
431
|
isRoute = true;
|
|
397
432
|
} else {
|
|
398
433
|
const routeKey = 'extraction.llm.route';
|
|
399
434
|
const routeVal = draft[routeKey] !== undefined ? draft[routeKey] : value;
|
|
400
435
|
options = modelOptions && modelOptions.effortOptionsFor ? modelOptions.effortOptionsFor(routeVal) : [];
|
|
436
|
+
listReady = modelOptions && modelOptions.effortsReadyFor ? modelOptions.effortsReadyFor(routeVal) : false;
|
|
437
|
+
staleLabel = (v) => v + '(已失效:所选模型未声明该推理强度)';
|
|
401
438
|
}
|
|
439
|
+
const resolved = withStoredValue(options, shown, listReady, staleLabel);
|
|
440
|
+
staleWarning = resolved.stale
|
|
441
|
+
? (isRoute
|
|
442
|
+
? '当前保存的模型已不在 provider 的模型列表中(多半是被改名或删除了);提取仍会用它并持续失败,请重新选择。'
|
|
443
|
+
: '当前保存的推理强度不在所选模型的可用列表中;提取仍会用它。')
|
|
444
|
+
: null;
|
|
402
445
|
control = jsx('select', {
|
|
403
446
|
value: String(shown ?? ''),
|
|
404
447
|
onChange: (e) => {
|
|
@@ -408,7 +451,7 @@ window.__ModuleLoader__.load({
|
|
|
408
451
|
onChange(key, next);
|
|
409
452
|
},
|
|
410
453
|
style: inputStyle,
|
|
411
|
-
children: (options || []).map(([optValue, optLabel]) =>
|
|
454
|
+
children: (resolved.options || []).map(([optValue, optLabel]) =>
|
|
412
455
|
jsx('option', { value: optValue, children: optLabel, key: optValue })),
|
|
413
456
|
});
|
|
414
457
|
} else if (spec.type === 'multicheck') {
|
|
@@ -447,6 +490,7 @@ window.__ModuleLoader__.load({
|
|
|
447
490
|
return jsx('div', { style: rowStyle, children: [
|
|
448
491
|
jsx('label', { style: labelStyle, children: spec.label }),
|
|
449
492
|
control,
|
|
493
|
+
staleWarning === null ? null : jsx('div', { style: warningStyle, children: staleWarning }),
|
|
450
494
|
jsx('div', { style: hintStyle, children: spec.hint || '' }),
|
|
451
495
|
]});
|
|
452
496
|
}
|
|
@@ -472,6 +516,16 @@ window.__ModuleLoader__.load({
|
|
|
472
516
|
const value = snapshot && snapshot.status === 'ready' ? snapshot.value : undefined;
|
|
473
517
|
const writable = snapshot ? snapshot.writable : false;
|
|
474
518
|
|
|
519
|
+
// Fetch the stored route's reasoning efforts on mount. Without this the
|
|
520
|
+
// effort dropdown only offers 跟随全局默认 until the user re-picks the
|
|
521
|
+
// route, which hides both the model's real efforts and a stale one.
|
|
522
|
+
const storedRoute = readPath(value, ['extraction', 'llm', 'route']);
|
|
523
|
+
const storedRouteKey = typeof storedRoute === 'string' ? storedRoute : '';
|
|
524
|
+
useEffect(() => {
|
|
525
|
+
if (storedRouteKey === '' || !modelOptions || !modelOptions.selectRoute) return;
|
|
526
|
+
modelOptions.selectRoute(storedRouteKey);
|
|
527
|
+
}, [storedRouteKey]);
|
|
528
|
+
|
|
475
529
|
const setField = (key, val) => {
|
|
476
530
|
setDraft((d) => ({ ...d, [key]: val }));
|
|
477
531
|
setSaved(false);
|
package/lib/extract/index.js
CHANGED
|
@@ -12,7 +12,7 @@ import { BlockAssembler, createUserMessage, ReasoningEffortId } from '@deepseek-
|
|
|
12
12
|
import { peerForHeader } from '../peer.js';
|
|
13
13
|
import { MEMORY_CATEGORIES } from '../types.js';
|
|
14
14
|
import { slugify, summaryOf } from '../memory-store.js';
|
|
15
|
-
import {
|
|
15
|
+
import { countsTowardExtraction, selectWindow, renderEventText } from './window.js';
|
|
16
16
|
import { shouldExtractIdle, shouldExtractTurn, shouldExtractWindow } from './triggers.js';
|
|
17
17
|
import { parseDecision } from './decision.js';
|
|
18
18
|
import { digestApproxTokens, rollDigest } from './digest.js';
|
|
@@ -75,9 +75,10 @@ export function applyExtraction(ctx, deps, tracker) {
|
|
|
75
75
|
ctx.on('session/event', (session, event) => {
|
|
76
76
|
if (session.header.origin === 'subagent')
|
|
77
77
|
return;
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
78
|
+
// One predicate for both the counter and the window: injections (memory
|
|
79
|
+
// catalog, runtime context, …) must neither count toward windowTurns nor
|
|
80
|
+
// keep re-arming the idle timer.
|
|
81
|
+
if (!countsTowardExtraction(event, ext().messageScope))
|
|
81
82
|
return;
|
|
82
83
|
const state = stateOf(session);
|
|
83
84
|
state.pending += 1;
|
|
@@ -153,11 +154,26 @@ export async function extractOnce(session, state, ctx, deps, signal, tracker) {
|
|
|
153
154
|
if (raw !== undefined)
|
|
154
155
|
state.checkpoint = parseCheckpoint(raw);
|
|
155
156
|
}
|
|
156
|
-
const fromSeq = state.checkpoint.checkpoint.seq;
|
|
157
157
|
const events = sessionEvents(session);
|
|
158
|
+
// The checkpoint records a session-log seq. A released session-format
|
|
159
|
+
// migration (v0 -> v1 -> v2 -> v3) renumbers every event, so a bookmark
|
|
160
|
+
// written under the previous numbering sits beyond the log's end and the
|
|
161
|
+
// window would silently select nothing forever. Detect that rebase and
|
|
162
|
+
// resume from the recent window instead of staying dead.
|
|
163
|
+
let maxSeq = 0;
|
|
164
|
+
for (const event of events) {
|
|
165
|
+
if (event.seq > maxSeq)
|
|
166
|
+
maxSeq = event.seq;
|
|
167
|
+
}
|
|
168
|
+
const storedSeq = state.checkpoint.checkpoint.seq;
|
|
169
|
+
const fromSeq = storedSeq > maxSeq ? 0 : storedSeq;
|
|
158
170
|
const windowEvents = selectWindow(events, fromSeq, ext.maxMessages, ext.messageScope);
|
|
159
|
-
if (windowEvents.length === 0)
|
|
171
|
+
if (windowEvents.length === 0) {
|
|
172
|
+
// Nothing new to read: clear the pending count so an oversized counter
|
|
173
|
+
// cannot re-schedule an empty scan on every subsequent event.
|
|
174
|
+
state.pending = 0;
|
|
160
175
|
return;
|
|
176
|
+
}
|
|
161
177
|
const windowStart = windowEvents[0].seq;
|
|
162
178
|
const windowEnd = windowEvents[windowEvents.length - 1].seq;
|
|
163
179
|
const windowText = windowEvents.map(event => renderEventText(event, ext.toolResultMaxBytes)).join('\n');
|
|
@@ -178,7 +194,7 @@ export async function extractOnce(session, state, ctx, deps, signal, tracker) {
|
|
|
178
194
|
auditLog: ext.auditLog, tracker,
|
|
179
195
|
};
|
|
180
196
|
if (route === undefined) {
|
|
181
|
-
await recordRun(rc, 'no-route', undefined, undefined, undefined);
|
|
197
|
+
await recordRun(rc, 'no-route', undefined, undefined, undefined, false);
|
|
182
198
|
return;
|
|
183
199
|
}
|
|
184
200
|
const system = extractionSystem();
|
|
@@ -192,7 +208,7 @@ export async function extractOnce(session, state, ctx, deps, signal, tracker) {
|
|
|
192
208
|
}
|
|
193
209
|
catch (error) {
|
|
194
210
|
metrics.inputTokens += digestApproxTokens(system) + digestApproxTokens(user);
|
|
195
|
-
await recordRun(rc, 'llm-error: ' + String(error).slice(0, 200), undefined, undefined, undefined);
|
|
211
|
+
await recordRun(rc, 'llm-error: ' + String(error).slice(0, 200), undefined, undefined, undefined, false);
|
|
196
212
|
return;
|
|
197
213
|
}
|
|
198
214
|
let decision;
|
|
@@ -229,18 +245,18 @@ export async function extractOnce(session, state, ctx, deps, signal, tracker) {
|
|
|
229
245
|
text = repaired.text;
|
|
230
246
|
}
|
|
231
247
|
catch {
|
|
232
|
-
await recordRun(rc, note, undefined, undefined, undefined);
|
|
248
|
+
await recordRun(rc, note, undefined, undefined, undefined, false);
|
|
233
249
|
return;
|
|
234
250
|
}
|
|
235
251
|
}
|
|
236
252
|
else {
|
|
237
253
|
metrics.inputTokens += digestApproxTokens(repairSystem) + digestApproxTokens(repairUser);
|
|
238
|
-
await recordRun(rc, note, undefined, undefined, undefined);
|
|
254
|
+
await recordRun(rc, note, undefined, undefined, undefined, false);
|
|
239
255
|
return;
|
|
240
256
|
}
|
|
241
257
|
}
|
|
242
258
|
else {
|
|
243
|
-
await recordRun(rc, note, undefined, undefined, undefined);
|
|
259
|
+
await recordRun(rc, note, undefined, undefined, undefined, false);
|
|
244
260
|
return;
|
|
245
261
|
}
|
|
246
262
|
}
|
|
@@ -249,11 +265,11 @@ export async function extractOnce(session, state, ctx, deps, signal, tracker) {
|
|
|
249
265
|
path = await applyDecision(store, peer, decision);
|
|
250
266
|
}
|
|
251
267
|
catch (error) {
|
|
252
|
-
await recordRun(rc, 'apply-error: ' + String(error).slice(0, 200), decision.kind, undefined, undefined);
|
|
268
|
+
await recordRun(rc, 'apply-error: ' + String(error).slice(0, 200), decision.kind, undefined, undefined, false);
|
|
253
269
|
return;
|
|
254
270
|
}
|
|
255
271
|
const digest = rollDigest(state.checkpoint.digest, windowText, DIGEST_MAX_TOKENS);
|
|
256
|
-
await recordRun(rc, recovered ? 'parse-error-recovered' : undefined, decision.kind, path, digest);
|
|
272
|
+
await recordRun(rc, recovered ? 'parse-error-recovered' : undefined, decision.kind, path, digest, true);
|
|
257
273
|
}
|
|
258
274
|
/** The repair turn: convert a failed non-JSON answer into a valid JSON decision. */
|
|
259
275
|
function buildRepairUser(failedAnswer) {
|
|
@@ -271,7 +287,7 @@ function buildRepairUser(failedAnswer) {
|
|
|
271
287
|
* one-line summary. When auditLog is off the audit entry and summary log are
|
|
272
288
|
* skipped but the checkpoint seq still advances (functional requirement).
|
|
273
289
|
*/
|
|
274
|
-
async function recordRun(rc, note, decision, path, digest) {
|
|
290
|
+
async function recordRun(rc, note, decision, path, digest, advance) {
|
|
275
291
|
const { ctx, state, store, peer, sessionId, windowStart, windowEnd, hits, route, metrics, startedAt, auditLog, tracker } = rc;
|
|
276
292
|
const durationMs = Date.now() - startedAt;
|
|
277
293
|
const outcome = note !== undefined ? note.split(':')[0].trim() : (decision ?? 'error');
|
|
@@ -292,9 +308,13 @@ async function recordRun(rc, note, decision, path, digest) {
|
|
|
292
308
|
...(metrics.cacheWriteTokens > 0 ? { cacheWriteTokens: metrics.cacheWriteTokens } : {}),
|
|
293
309
|
durationMs,
|
|
294
310
|
};
|
|
311
|
+
// A failed run keeps the previous checkpoint so the same window is retried
|
|
312
|
+
// on the next trigger; only a completed decision advances past it. The audit
|
|
313
|
+
// entry is appended either way (the failure is the evidence).
|
|
314
|
+
const nextSeq = advance ? windowEnd : state.checkpoint.checkpoint.seq;
|
|
295
315
|
state.checkpoint = auditLog
|
|
296
|
-
? withRun(state.checkpoint,
|
|
297
|
-
: { ...state.checkpoint, checkpoint: { seq:
|
|
316
|
+
? withRun(state.checkpoint, nextSeq, entry)
|
|
317
|
+
: { ...state.checkpoint, checkpoint: { seq: nextSeq } };
|
|
298
318
|
if (digest !== undefined) {
|
|
299
319
|
state.checkpoint = { ...state.checkpoint, digest };
|
|
300
320
|
}
|
|
@@ -399,6 +419,23 @@ function resolveRoute(configuredRoute, configuredEffort, defaultModel, session)
|
|
|
399
419
|
}
|
|
400
420
|
return undefined;
|
|
401
421
|
}
|
|
422
|
+
/**
|
|
423
|
+
* Provider-facing detail of a failed finish. The harness carries the real
|
|
424
|
+
* reason on `finish.failure` (unknown model, context overflow, transport
|
|
425
|
+
* error, …); without it the audit log only says "llm-error" and the cause has
|
|
426
|
+
* to be re-derived from scratch (the 2026-09-16 `UNKNOWN_MODEL` incident).
|
|
427
|
+
*/
|
|
428
|
+
function finishFailureDetail(finish) {
|
|
429
|
+
const failure = finish.failure;
|
|
430
|
+
if (failure === undefined)
|
|
431
|
+
return '';
|
|
432
|
+
const message = typeof failure.message === 'string' ? failure.message : '';
|
|
433
|
+
const code = typeof failure.code === 'string' && failure.code !== '' ? failure.code : '';
|
|
434
|
+
const status = typeof failure.status === 'number' ? String(failure.status) : '';
|
|
435
|
+
if (message === '')
|
|
436
|
+
return code === '' ? '' : code + (status === '' ? '' : ' ' + status);
|
|
437
|
+
return message + (code === '' ? '' : ' [' + code + (status === '' ? '' : ' ' + status) + ']');
|
|
438
|
+
}
|
|
402
439
|
/** Assemble the streamed text and real token usage; a non-success finish throws. */
|
|
403
440
|
async function collectStream(stream) {
|
|
404
441
|
const assembler = new BlockAssembler();
|
|
@@ -406,7 +443,8 @@ async function collectStream(stream) {
|
|
|
406
443
|
assembler.push(chunk);
|
|
407
444
|
const finish = assembler.finish;
|
|
408
445
|
if (finish.kind === 'aborted' || finish.kind === 'error') {
|
|
409
|
-
|
|
446
|
+
const detail = finishFailureDetail(finish);
|
|
447
|
+
throw new Error('llm stream finished with ' + finish.kind + (detail === '' ? '' : ': ' + detail));
|
|
410
448
|
}
|
|
411
449
|
return {
|
|
412
450
|
text: assembler
|
package/lib/extract/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/extract/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/extract/index.ts"],"names":[],"mappings":"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"}
|
package/lib/extract/window.d.ts
CHANGED
|
@@ -37,6 +37,14 @@ export declare function takeTail<T>(items: readonly T[], max: number): T[];
|
|
|
37
37
|
* and tool results are always conversation content.
|
|
38
38
|
*/
|
|
39
39
|
export declare function isConversationEvent(event: SurfaceEventLike): boolean;
|
|
40
|
+
/**
|
|
41
|
+
* Whether one event belongs to extraction at all: a surface type admitted by
|
|
42
|
+
* scope and, for user messages, real conversation input rather than a system
|
|
43
|
+
* injection. This is the single predicate shared by the pending trigger
|
|
44
|
+
* counter and the window selector, so an injection can never inflate the
|
|
45
|
+
* trigger count while being excluded from the window it would schedule.
|
|
46
|
+
*/
|
|
47
|
+
export declare function countsTowardExtraction(event: SurfaceEventLike, scope: readonly MessageScope[]): boolean;
|
|
40
48
|
/**
|
|
41
49
|
* Select the extraction window: conversation events admitted by scope with
|
|
42
50
|
* seq strictly after `fromSeqExclusive`, capped to the trailing
|
package/lib/extract/window.js
CHANGED
|
@@ -49,6 +49,16 @@ export function isConversationEvent(event) {
|
|
|
49
49
|
const source = event.data?.source;
|
|
50
50
|
return source?.kind === 'user';
|
|
51
51
|
}
|
|
52
|
+
/**
|
|
53
|
+
* Whether one event belongs to extraction at all: a surface type admitted by
|
|
54
|
+
* scope and, for user messages, real conversation input rather than a system
|
|
55
|
+
* injection. This is the single predicate shared by the pending trigger
|
|
56
|
+
* counter and the window selector, so an injection can never inflate the
|
|
57
|
+
* trigger count while being excluded from the window it would schedule.
|
|
58
|
+
*/
|
|
59
|
+
export function countsTowardExtraction(event, scope) {
|
|
60
|
+
return isSurfaceType(event.type) && inScope(event.type, scope) && isConversationEvent(event);
|
|
61
|
+
}
|
|
52
62
|
/**
|
|
53
63
|
* Select the extraction window: conversation events admitted by scope with
|
|
54
64
|
* seq strictly after `fromSeqExclusive`, capped to the trailing
|
|
@@ -58,10 +68,7 @@ export function isConversationEvent(event) {
|
|
|
58
68
|
* regardless of scope.
|
|
59
69
|
*/
|
|
60
70
|
export function selectWindow(events, fromSeqExclusive, maxMessages, scope = DEFAULT_MESSAGE_SCOPE) {
|
|
61
|
-
const selected = events.filter(event =>
|
|
62
|
-
&& inScope(event.type, scope)
|
|
63
|
-
&& isConversationEvent(event)
|
|
64
|
-
&& event.seq > fromSeqExclusive);
|
|
71
|
+
const selected = events.filter(event => countsTowardExtraction(event, scope) && event.seq > fromSeqExclusive);
|
|
65
72
|
return takeTail(selected, maxMessages);
|
|
66
73
|
}
|
|
67
74
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"window.js","sourceRoot":"","sources":["../../src/extract/window.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,8EAA8E;AAC9E,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,cAAc,EAAE,mBAAmB,EAAE,aAAa,CAAU,CAAA;AAM1F;;8CAE8C;AAC9C,MAAM,CAAC,MAAM,qBAAqB,GAA4B,CAAC,MAAM,EAAE,WAAW,CAAC,CAAA;AAEnF,mFAAmF;AACnF,MAAM,UAAU,WAAW,CAAC,IAAY;IACtC,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,cAAc,CAAC,CAAC,OAAO,MAAM,CAAA;QAClC,KAAK,mBAAmB,CAAC,CAAC,OAAO,WAAW,CAAA;QAC5C,KAAK,aAAa,CAAC,CAAC,OAAO,aAAa,CAAA;QACxC,OAAO,CAAC,CAAC,OAAO,SAAS,CAAA;IAC3B,CAAC;AACH,CAAC;AAED,+DAA+D;AAC/D,MAAM,UAAU,OAAO,CAAC,IAAY,EAAE,KAA8B;IAClE,MAAM,GAAG,GAAG,WAAW,CAAC,IAAI,CAAC,CAAA;IAC7B,OAAO,GAAG,KAAK,SAAS,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;AACjD,CAAC;AASD,0EAA0E;AAC1E,MAAM,UAAU,aAAa,CAAC,IAAY;IACxC,OAAO,aAAa,CAAC,QAAQ,CAAC,IAAwB,CAAC,CAAA;AACzD,CAAC;AAED,6EAA6E;AAC7E,MAAM,UAAU,QAAQ,CAAI,KAAmB,EAAE,GAAW;IAC1D,IAAI,GAAG,IAAI,CAAC;QAAE,OAAO,EAAE,CAAA;IACvB,OAAO,KAAK,CAAC,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,GAAG,CAAC,CAAA;AAC3E,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,mBAAmB,CAAC,KAAuB;IACzD,IAAI,KAAK,CAAC,IAAI,KAAK,cAAc;QAAE,OAAO,IAAI,CAAA;IAC9C,MAAM,MAAM,GAAI,KAAK,CAAC,IAA+C,EAAE,MAAM,CAAA;IAC7E,OAAO,MAAM,EAAE,IAAI,KAAK,MAAM,CAAA;AAChC,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,YAAY,CAC1B,MAAmC,EACnC,gBAAwB,EACxB,WAAmB,EACnB,QAAiC,qBAAqB;IAEtD,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CACrC,
|
|
1
|
+
{"version":3,"file":"window.js","sourceRoot":"","sources":["../../src/extract/window.ts"],"names":[],"mappings":"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"}
|
package/lib/inject.d.ts
CHANGED
|
@@ -15,12 +15,12 @@ import { type SharedMountNotice } from './catalog.js';
|
|
|
15
15
|
export interface CatalogDecisionParams {
|
|
16
16
|
readonly decision: PreStepDecision;
|
|
17
17
|
readonly history: {
|
|
18
|
-
readonly visibleDigest?: string;
|
|
19
18
|
readonly published: boolean;
|
|
19
|
+
readonly visibleText?: string;
|
|
20
20
|
};
|
|
21
21
|
readonly existing: {
|
|
22
22
|
readonly message: UserMessage;
|
|
23
|
-
readonly
|
|
23
|
+
readonly text: string;
|
|
24
24
|
} | undefined;
|
|
25
25
|
readonly entries: readonly IndexEntry[];
|
|
26
26
|
/** Shared mounts to advertise (Phase 3); drives the empty-index exception. */
|
package/lib/inject.js
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
*/
|
|
7
7
|
import { peerForHeader } from './peer.js';
|
|
8
8
|
import { digestApproxTokens } from './extract/digest.js';
|
|
9
|
-
import { catalogHistory, catalogMessage,
|
|
9
|
+
import { catalogHistory, catalogMessage, isCurrentCatalogText, renderCatalogMessage, renderCatalogUpdate } from './catalog.js';
|
|
10
10
|
/** Fixed catalog overhead (framing + guidance + section headers), approximate tokens. */
|
|
11
11
|
const CATALOG_FIXED_TOKENS = 200;
|
|
12
12
|
/**
|
|
@@ -42,13 +42,15 @@ export function applyCatalogDecision(params) {
|
|
|
42
42
|
const { decision, history, existing, entries, sharedMounts = [], peer } = params;
|
|
43
43
|
if (decision.kind === 'reject')
|
|
44
44
|
return decision;
|
|
45
|
-
|
|
46
|
-
|
|
45
|
+
// The official `plugin` + `catalog` source carries no payload, so "already
|
|
46
|
+
// published and still current" is decided by the published message text.
|
|
47
|
+
const current = (text) => text !== undefined && isCurrentCatalogText(text, entries, peer, sharedMounts);
|
|
48
|
+
if (current(history.visibleText)) {
|
|
47
49
|
return existing === undefined
|
|
48
50
|
? decision
|
|
49
51
|
: { kind: 'enter', messages: decision.messages.filter(message => message.id !== existing.message.id) };
|
|
50
52
|
}
|
|
51
|
-
if (existing !== undefined &&
|
|
53
|
+
if (existing !== undefined && current(existing.text))
|
|
52
54
|
return decision;
|
|
53
55
|
// Phase 3: an empty local index still publishes a catalog when there are
|
|
54
56
|
// shared mounts to advertise (otherwise the shared region is undiscoverable).
|
package/lib/inject.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inject.js","sourceRoot":"","sources":["../src/inject.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAQH,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AACxD,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,
|
|
1
|
+
{"version":3,"file":"inject.js","sourceRoot":"","sources":["../src/inject.ts"],"names":[],"mappings":"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"}
|
package/lib/types.d.ts
CHANGED
|
@@ -16,20 +16,8 @@ export interface IndexEntry {
|
|
|
16
16
|
readonly summary: string;
|
|
17
17
|
}
|
|
18
18
|
/**
|
|
19
|
-
*
|
|
20
|
-
*
|
|
21
|
-
*
|
|
19
|
+
* The injected catalog message uses the OFFICIAL `plugin` source kind with the
|
|
20
|
+
* `catalog` form (see catalog.ts), so released session-format migrations can
|
|
21
|
+
* always classify and carry it. The private `memory-catalog` kind written
|
|
22
|
+
* before 0.2.3 is read back for old sessions but never written again.
|
|
22
23
|
*/
|
|
23
|
-
export interface MemoryCatalogSource {
|
|
24
|
-
readonly kind: 'memory-catalog';
|
|
25
|
-
readonly form: 'catalog';
|
|
26
|
-
/** Marks a replacement catalog rather than this session's first publication. */
|
|
27
|
-
readonly update?: true;
|
|
28
|
-
/** Exactly the entries this message published, in catalog order. */
|
|
29
|
-
readonly entries: readonly IndexEntry[];
|
|
30
|
-
}
|
|
31
|
-
declare module '@deepseek-ai/dsh-llm' {
|
|
32
|
-
interface MessageSourceMap {
|
|
33
|
-
'memory-catalog': MemoryCatalogSource;
|
|
34
|
-
}
|
|
35
|
-
}
|
package/lib/types.js
CHANGED
|
@@ -4,4 +4,10 @@
|
|
|
4
4
|
*/
|
|
5
5
|
/** The four memory categories the plugin generates. */
|
|
6
6
|
export const MEMORY_CATEGORIES = ['preferences', 'entities', 'events', 'experiences'];
|
|
7
|
+
/**
|
|
8
|
+
* The injected catalog message uses the OFFICIAL `plugin` source kind with the
|
|
9
|
+
* `catalog` form (see catalog.ts), so released session-format migrations can
|
|
10
|
+
* always classify and carry it. The private `memory-catalog` kind written
|
|
11
|
+
* before 0.2.3 is read back for old sessions but never written again.
|
|
12
|
+
*/
|
|
7
13
|
//# sourceMappingURL=types.js.map
|
package/lib/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,uDAAuD;AACvD,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,aAAa,EAAE,UAAU,EAAE,QAAQ,EAAE,aAAa,CAAU,CAAA"}
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,uDAAuD;AACvD,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,aAAa,EAAE,UAAU,EAAE,QAAQ,EAAE,aAAa,CAAU,CAAA;AAe9F;;;;;GAKG"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@alanzhao/dsh-memory-lite",
|
|
3
|
-
"version": "0.2.
|
|
3
|
+
"version": "0.2.4",
|
|
4
4
|
"description": "Lightweight zero-dependency memory plugin for DeepSeek Harness: Markdown-file memory store, L0 catalog injection, and 5 model-facing tools.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"dsh",
|