@mysten-incubation/oc-memwal 0.0.5 → 0.0.6-dev.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/dist/capture.d.ts +4 -18
- package/dist/capture.d.ts.map +1 -1
- package/dist/capture.js +78 -40
- package/dist/capture.js.map +1 -1
- package/dist/cli/search.d.ts.map +1 -1
- package/dist/cli/search.js +2 -1
- package/dist/cli/search.js.map +1 -1
- package/dist/config.d.ts +4 -28
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +37 -39
- package/dist/config.js.map +1 -1
- package/dist/constants.d.ts +9 -0
- package/dist/constants.d.ts.map +1 -1
- package/dist/constants.js +12 -0
- package/dist/constants.js.map +1 -1
- package/dist/format.d.ts +27 -0
- package/dist/format.d.ts.map +1 -1
- package/dist/format.js +50 -0
- package/dist/format.js.map +1 -1
- package/dist/hooks/capture.d.ts.map +1 -1
- package/dist/hooks/capture.js +4 -2
- package/dist/hooks/capture.js.map +1 -1
- package/dist/hooks/recall.d.ts +0 -4
- package/dist/hooks/recall.d.ts.map +1 -1
- package/dist/hooks/recall.js +37 -18
- package/dist/hooks/recall.js.map +1 -1
- package/dist/tools/search.d.ts.map +1 -1
- package/dist/tools/search.js +6 -5
- package/dist/tools/search.js.map +1 -1
- package/dist/tools/store.d.ts.map +1 -1
- package/dist/tools/store.js +2 -5
- package/dist/tools/store.js.map +1 -1
- package/dist/types.d.ts +2 -0
- package/dist/types.d.ts.map +1 -1
- package/openclaw.plugin.json +14 -3
- package/package.json +3 -2
package/dist/capture.d.ts
CHANGED
|
@@ -1,25 +1,11 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Capture filtering — determines whether a conversation turn
|
|
3
3
|
* is worth sending to analyze() for fact extraction.
|
|
4
|
-
*
|
|
5
|
-
* Prevents wasted server calls on trivial turns like "ok", "thanks", emoji.
|
|
6
|
-
* Based on patterns from LanceDB's shouldCapture() implementation.
|
|
7
|
-
*/
|
|
8
|
-
/**
|
|
9
|
-
* Check if text looks like a prompt injection attempt.
|
|
10
|
-
* Used by both capture (reject on store) and recall (reject on inject).
|
|
11
4
|
*/
|
|
5
|
+
/** Normalize text by stripping invisible/format characters, decomposing Unicode, and mapping confusable scripts. */
|
|
6
|
+
export declare function normalizeForInjectionCheck(text: string): string;
|
|
7
|
+
/** Check if text matches known prompt injection patterns. */
|
|
12
8
|
export declare function looksLikeInjection(text: string): boolean;
|
|
13
|
-
/**
|
|
14
|
-
* Determine whether a conversation text is worth capturing.
|
|
15
|
-
*
|
|
16
|
-
* Applies a multi-step filter chain: rejects short text, filler responses,
|
|
17
|
-
* XML/system content, emoji-heavy messages, and injection attempts.
|
|
18
|
-
* Accepts immediately if a trigger pattern matches (e.g. "remember", "prefer").
|
|
19
|
-
* Falls through to accept if text is long enough for the server LLM to evaluate.
|
|
20
|
-
*
|
|
21
|
-
* @param text - Raw message text (user or assistant)
|
|
22
|
-
* @returns `true` if the text likely contains memorable facts
|
|
23
|
-
*/
|
|
9
|
+
/** Determine whether a conversation turn is worth capturing. */
|
|
24
10
|
export declare function shouldCapture(text: string): boolean;
|
|
25
11
|
//# sourceMappingURL=capture.d.ts.map
|
package/dist/capture.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"capture.d.ts","sourceRoot":"","sources":["../src/capture.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"capture.d.ts","sourceRoot":"","sources":["../src/capture.ts"],"names":[],"mappings":"AAAA;;;GAGG;AA2EH,oHAAoH;AACpH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAW/D;AAED,6DAA6D;AAC7D,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAWxD;AAED,gEAAgE;AAChE,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAYnD"}
|
package/dist/capture.js
CHANGED
|
@@ -1,76 +1,114 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Capture filtering — determines whether a conversation turn
|
|
3
3
|
* is worth sending to analyze() for fact extraction.
|
|
4
|
-
*
|
|
5
|
-
* Prevents wasted server calls on trivial turns like "ok", "thanks", emoji.
|
|
6
|
-
* Based on patterns from LanceDB's shouldCapture() implementation.
|
|
7
4
|
*/
|
|
8
5
|
import { MIN_CAPTURE_LENGTH, MAX_EMOJI_COUNT } from "./constants.js";
|
|
9
6
|
/** Filler patterns — exact-match trivial responses. */
|
|
10
7
|
const FILLER_PATTERN = /^(ok|okay|sure|thanks|thank you|thx|yes|yep|yeah|no|nope|nah|got it|hmm|hm|ah|oh|lol|haha|nice|cool|great|right|alright|fine|k|kk)\s*[.!?]*$/i;
|
|
11
|
-
/**
|
|
8
|
+
/** Visual lookalike character map (Cyrillic, Greek, Latin symbols). */
|
|
9
|
+
const VISUAL_CONFUSABLES = {
|
|
10
|
+
"а": "a", "А": "a", "б": "b", "Б": "b", "в": "b", "В": "b", "ь": "b", "Ь": "b",
|
|
11
|
+
"с": "c", "С": "c", "д": "d", "Д": "d", "е": "e", "Е": "e", "ѐ": "e", "Ѐ": "e",
|
|
12
|
+
"ё": "e", "Ё": "e", "є": "e", "Є": "e", "і": "i", "І": "i", "ї": "i", "Ї": "i",
|
|
13
|
+
"ј": "j", "Ј": "j", "к": "k", "К": "k", "л": "l", "Л": "l", "м": "m", "М": "m",
|
|
14
|
+
"н": "h", "Н": "h", "п": "n", "П": "n", "о": "o", "О": "o", "ѻ": "o", "Ѻ": "o",
|
|
15
|
+
"р": "p", "Р": "p", "ҏ": "p", "Ҏ": "p", "ѕ": "s", "Ѕ": "s", "т": "t", "Т": "t",
|
|
16
|
+
"и": "u", "И": "u", "й": "u", "Й": "u", "у": "y", "У": "y", "х": "x", "Х": "x",
|
|
17
|
+
"α": "a", "Α": "a", "β": "b", "Β": "b", "γ": "y", "Γ": "r", "δ": "d", "Δ": "d",
|
|
18
|
+
"ε": "e", "Ε": "e", "ζ": "z", "Ζ": "z", "η": "n", "Η": "h", "θ": "o", "Θ": "o",
|
|
19
|
+
"ι": "i", "Ι": "i", "κ": "k", "Κ": "k", "λ": "l", "Λ": "l", "μ": "u", "Μ": "m",
|
|
20
|
+
"ν": "v", "Ν": "n", "ξ": "x", "Ξ": "x", "ο": "o", "Ο": "o", "π": "n", "Π": "n",
|
|
21
|
+
"ρ": "p", "Ρ": "p", "σ": "o", "Σ": "e", "ς": "s", "τ": "t", "Τ": "t", "υ": "u",
|
|
22
|
+
"Υ": "y", "φ": "o", "Φ": "o", "χ": "x", "Χ": "x", "ψ": "y", "Ψ": "y", "ω": "w",
|
|
23
|
+
"Ω": "o", "ℓ": "l", "ø": "o", "Ø": "o", "đ": "d", "Đ": "d", "ħ": "h", "Ħ": "h",
|
|
24
|
+
"ł": "l", "Ł": "l", "ŋ": "n", "Ŋ": "n", "ŧ": "t", "Ŧ": "t",
|
|
25
|
+
};
|
|
26
|
+
/** Prompt injection patterns — never capture or recall these. */
|
|
12
27
|
const INJECTION_PATTERNS = [
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
/\
|
|
28
|
+
/\b(ign[o0a]re|disregard|override|f[o0]rget|bypass)\b[\s\S]{0,140}?\b(instruct\w*|instr\w{1,8}tions?|pr[o0]mpt|rules|c[o0]nstraints|guidelines|safety)\b/i,
|
|
29
|
+
/\b(?:do\s+not|don\x27?t|st[o0]p)\s+f[o0]ll[o0]w(?:ing)?\b[\s\S]{0,80}?\b(?:system|devel[o0]per|safety|rules|instructions?|instr\w{1,8}tions?)\b/i,
|
|
30
|
+
/\b(?:new\s+instructions|system\s+override)\s*:\s*/i,
|
|
31
|
+
/\byou\s+are\s+now\s+(?:dan|unrestricted|jailbroken|unfiltered)\b/i,
|
|
32
|
+
/\bsystem\s+pr[o0]mpt\b/i,
|
|
33
|
+
/\breveal\s+(?:all\s+)?(?:your\s+)?(?:system\s+)?instructions?\b/i,
|
|
34
|
+
/<\s*\/?\s*(system|assistant|developer|tool|function|prompt)\b/i,
|
|
35
|
+
];
|
|
36
|
+
/**
|
|
37
|
+
* Patterns broad enough to match ordinary speech, so they only count when the
|
|
38
|
+
* text is actually aimed at the model.
|
|
39
|
+
*
|
|
40
|
+
* "I run the deploy command every Friday" is a fact worth remembering;
|
|
41
|
+
* "run the shell command" is an instruction aimed at the agent. Both match the
|
|
42
|
+
* same regex, so the regex alone cannot separate them. Without this split these
|
|
43
|
+
* two patterns silently discard normal developer speech — measured at 7 of 12
|
|
44
|
+
* realistic statements dropped, with no error surfaced to the user.
|
|
45
|
+
*/
|
|
46
|
+
const CONTEXTUAL_INJECTION_PATTERNS = [
|
|
47
|
+
/\b(ign[o0a]re|disregard|f[o0]rget|override)\b[\s\S]{0,80}?\b(everything|anything)\b[\s\S]{0,80}?\b(bef[o0]re|pri[o0]r|t[o0]ld|pr[o0]mpt)\b/i,
|
|
48
|
+
/\b(run|execute|call|invoke)\b.{0,40}\b(tool|command|shell|bash)\b/i,
|
|
49
|
+
];
|
|
50
|
+
/**
|
|
51
|
+
* Is the text addressing the model rather than describing the speaker?
|
|
52
|
+
*
|
|
53
|
+
* Injection has to reach the model to work, so it either names it ("you",
|
|
54
|
+
* "your") or leads with a bare imperative built from an injection verb. A
|
|
55
|
+
* sentence that does neither is someone talking about their own workflow.
|
|
56
|
+
*/
|
|
57
|
+
const ADDRESSES_MODEL = [
|
|
58
|
+
/\b(you|your|yourself)\b/i,
|
|
59
|
+
/^(ign[o0a]re|disregard|f[o0]rget|override|bypass|run|execute|call|invoke|reveal|print|output)\b/i,
|
|
18
60
|
];
|
|
19
|
-
/** Memory trigger patterns — always capture if matched
|
|
61
|
+
/** Memory trigger patterns — always capture if matched. */
|
|
20
62
|
const TRIGGER_PATTERNS = [
|
|
21
63
|
/remember|prefer|radši|zapamatuj/i,
|
|
22
64
|
/i (like|prefer|hate|love|want|need|use|am|work)/i,
|
|
23
65
|
/my\s+\w+\s+is|is\s+my/i,
|
|
24
66
|
/always|never|important/i,
|
|
25
67
|
/decided|will use|switched to/i,
|
|
26
|
-
/\+\d{10,}/,
|
|
27
|
-
/[\w.-]+@[\w.-]+\.\w+/,
|
|
68
|
+
/\+\d{10,}/,
|
|
69
|
+
/[\w.-]+@[\w.-]+\.\w+/,
|
|
28
70
|
];
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
71
|
+
/** Normalize text by stripping invisible/format characters, decomposing Unicode, and mapping confusable scripts. */
|
|
72
|
+
export function normalizeForInjectionCheck(text) {
|
|
73
|
+
const noInvisible = text.replace(/[\p{Cf}\p{Cc}\p{Co}\p{Cs}]/gu, "");
|
|
74
|
+
const decomposed = noInvisible
|
|
75
|
+
.normalize("NFKD")
|
|
76
|
+
.replace(/[\p{Diacritic}\p{M}]/gu, "");
|
|
77
|
+
let mapped = "";
|
|
78
|
+
for (const char of decomposed) {
|
|
79
|
+
mapped += VISUAL_CONFUSABLES[char] ?? char;
|
|
80
|
+
}
|
|
81
|
+
return mapped.replace(/\s+/g, " ").trim();
|
|
82
|
+
}
|
|
83
|
+
/** Check if text matches known prompt injection patterns. */
|
|
36
84
|
export function looksLikeInjection(text) {
|
|
37
|
-
|
|
85
|
+
if (!text)
|
|
86
|
+
return false;
|
|
87
|
+
const normalized = normalizeForInjectionCheck(text);
|
|
38
88
|
if (!normalized)
|
|
39
89
|
return false;
|
|
40
|
-
|
|
90
|
+
if (INJECTION_PATTERNS.some((p) => p.test(normalized)))
|
|
91
|
+
return true;
|
|
92
|
+
// Broad patterns only count when the text is aimed at the model, otherwise
|
|
93
|
+
// they swallow ordinary statements about shells, commands and tools.
|
|
94
|
+
return (CONTEXTUAL_INJECTION_PATTERNS.some((p) => p.test(normalized)) &&
|
|
95
|
+
ADDRESSES_MODEL.some((p) => p.test(normalized)));
|
|
41
96
|
}
|
|
42
|
-
/**
|
|
43
|
-
* Determine whether a conversation text is worth capturing.
|
|
44
|
-
*
|
|
45
|
-
* Applies a multi-step filter chain: rejects short text, filler responses,
|
|
46
|
-
* XML/system content, emoji-heavy messages, and injection attempts.
|
|
47
|
-
* Accepts immediately if a trigger pattern matches (e.g. "remember", "prefer").
|
|
48
|
-
* Falls through to accept if text is long enough for the server LLM to evaluate.
|
|
49
|
-
*
|
|
50
|
-
* @param text - Raw message text (user or assistant)
|
|
51
|
-
* @returns `true` if the text likely contains memorable facts
|
|
52
|
-
*/
|
|
97
|
+
/** Determine whether a conversation turn is worth capturing. */
|
|
53
98
|
export function shouldCapture(text) {
|
|
54
|
-
// Too short to contain useful facts
|
|
55
99
|
if (text.length < MIN_CAPTURE_LENGTH)
|
|
56
100
|
return false;
|
|
57
|
-
// Pure filler response
|
|
58
101
|
if (FILLER_PATTERN.test(text.trim()))
|
|
59
102
|
return false;
|
|
60
|
-
// System/XML content (likely injected context, not user speech)
|
|
61
103
|
if (text.trim().startsWith("<") && text.includes("</"))
|
|
62
104
|
return false;
|
|
63
|
-
// Emoji-heavy (likely reactions, not factual content)
|
|
64
105
|
const emojiCount = (text.match(/[\u{1F300}-\u{1F9FF}]/gu) || []).length;
|
|
65
106
|
if (emojiCount > MAX_EMOJI_COUNT)
|
|
66
107
|
return false;
|
|
67
|
-
|
|
68
|
-
if (INJECTION_PATTERNS.some((p) => p.test(text)))
|
|
108
|
+
if (looksLikeInjection(text))
|
|
69
109
|
return false;
|
|
70
|
-
// If it matches a trigger pattern, definitely capture
|
|
71
110
|
if (TRIGGER_PATTERNS.some((p) => p.test(text)))
|
|
72
111
|
return true;
|
|
73
|
-
// Default: capture if it's long enough (the server LLM will decide what's worth keeping)
|
|
74
112
|
return true;
|
|
75
113
|
}
|
|
76
114
|
//# sourceMappingURL=capture.js.map
|
package/dist/capture.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"capture.js","sourceRoot":"","sources":["../src/capture.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"capture.js","sourceRoot":"","sources":["../src/capture.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAErE,uDAAuD;AACvD,MAAM,cAAc,GAAG,+IAA+I,CAAC;AAEvK,uEAAuE;AACvE,MAAM,kBAAkB,GAA2B;IACjD,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;IAC9E,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;IAC9E,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;IAC9E,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;IAC9E,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;IAC9E,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;IAC9E,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;IAC9E,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;IAC9E,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;IAC9E,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;IAC9E,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;IAC9E,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;IAC9E,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;IAC9E,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;IAC9E,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;CAC3D,CAAC;AAEF,iEAAiE;AACjE,MAAM,kBAAkB,GAAG;IACzB,0JAA0J;IAC1J,kJAAkJ;IAClJ,oDAAoD;IACpD,mEAAmE;IACnE,yBAAyB;IACzB,kEAAkE;IAClE,gEAAgE;CACjE,CAAC;AAEF;;;;;;;;;GASG;AACH,MAAM,6BAA6B,GAAG;IACpC,6IAA6I;IAC7I,oEAAoE;CACrE,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,eAAe,GAAG;IACtB,0BAA0B;IAC1B,kGAAkG;CACnG,CAAC;AAEF,2DAA2D;AAC3D,MAAM,gBAAgB,GAAG;IACvB,kCAAkC;IAClC,kDAAkD;IAClD,wBAAwB;IACxB,yBAAyB;IACzB,+BAA+B;IAC/B,WAAW;IACX,sBAAsB;CACvB,CAAC;AAEF,oHAAoH;AACpH,MAAM,UAAU,0BAA0B,CAAC,IAAY;IACrD,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,8BAA8B,EAAE,EAAE,CAAC,CAAC;IACrE,MAAM,UAAU,GAAG,WAAW;SAC3B,SAAS,CAAC,MAAM,CAAC;SACjB,OAAO,CAAC,wBAAwB,EAAE,EAAE,CAAC,CAAC;IAEzC,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,KAAK,MAAM,IAAI,IAAI,UAAU,EAAE,CAAC;QAC9B,MAAM,IAAI,kBAAkB,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC;IAC7C,CAAC;IACD,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;AAC5C,CAAC;AAED,6DAA6D;AAC7D,MAAM,UAAU,kBAAkB,CAAC,IAAY;IAC7C,IAAI,CAAC,IAAI;QAAE,OAAO,KAAK,CAAC;IACxB,MAAM,UAAU,GAAG,0BAA0B,CAAC,IAAI,CAAC,CAAC;IACpD,IAAI,CAAC,UAAU;QAAE,OAAO,KAAK,CAAC;IAC9B,IAAI,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC;IACpE,2EAA2E;IAC3E,qEAAqE;IACrE,OAAO,CACL,6BAA6B,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC7D,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAChD,CAAC;AACJ,CAAC;AAED,gEAAgE;AAChE,MAAM,UAAU,aAAa,CAAC,IAAY;IACxC,IAAI,IAAI,CAAC,MAAM,GAAG,kBAAkB;QAAE,OAAO,KAAK,CAAC;IACnD,IAAI,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QAAE,OAAO,KAAK,CAAC;IACnD,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,OAAO,KAAK,CAAC;IAErE,MAAM,UAAU,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,yBAAyB,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;IACxE,IAAI,UAAU,GAAG,eAAe;QAAE,OAAO,KAAK,CAAC;IAE/C,IAAI,kBAAkB,CAAC,IAAI,CAAC;QAAE,OAAO,KAAK,CAAC;IAC3C,IAAI,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC;IAE5D,OAAO,IAAI,CAAC;AACd,CAAC"}
|
package/dist/cli/search.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search.d.ts","sourceRoot":"","sources":["../../src/cli/search.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"search.d.ts","sourceRoot":"","sources":["../../src/cli/search.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AAGxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,qDAAqD;AACrD,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,GAAG,IAAI,CAuB1F"}
|
package/dist/cli/search.js
CHANGED
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
* Semantic search with JSON output, scoped by --agent flag.
|
|
5
5
|
*/
|
|
6
6
|
import { resolveAgent } from "../config.js";
|
|
7
|
+
import { relevanceRatio } from "../format.js";
|
|
7
8
|
/** Register the `openclaw memwal search` command. */
|
|
8
9
|
export function registerSearchCommand(cmd, client, config) {
|
|
9
10
|
cmd
|
|
@@ -20,7 +21,7 @@ export function registerSearchCommand(cmd, client, config) {
|
|
|
20
21
|
const output = result.results.map((r) => ({
|
|
21
22
|
text: r.text,
|
|
22
23
|
blob_id: r.blob_id,
|
|
23
|
-
relevance:
|
|
24
|
+
relevance: relevanceRatio(r.distance),
|
|
24
25
|
}));
|
|
25
26
|
console.log(JSON.stringify(output, null, 2));
|
|
26
27
|
}
|
package/dist/cli/search.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search.js","sourceRoot":"","sources":["../../src/cli/search.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"search.js","sourceRoot":"","sources":["../../src/cli/search.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAG9C,qDAAqD;AACrD,MAAM,UAAU,qBAAqB,CAAC,GAAQ,EAAE,MAAc,EAAE,MAAoB;IAClF,GAAG;SACA,OAAO,CAAC,QAAQ,CAAC;SACjB,WAAW,CAAC,iBAAiB,CAAC;SAC9B,QAAQ,CAAC,SAAS,EAAE,cAAc,CAAC;SACnC,MAAM,CAAC,aAAa,EAAE,aAAa,EAAE,GAAG,CAAC;SACzC,MAAM,CAAC,gBAAgB,EAAE,8CAA8C,CAAC;SACxE,MAAM,CAAC,KAAK,EAAE,KAAa,EAAE,IAAS,EAAE,EAAE;QACzC,MAAM,EAAE,SAAS,EAAE,GAAG,YAAY,CAAC,MAAM,CAAC,gBAAgB,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,IAAI,CAAC,KAAK,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QAChH,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAEvC,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,SAAS,CAAC,CAAC;YAC5D,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC;gBAC7C,IAAI,EAAE,CAAC,CAAC,IAAI;gBACZ,OAAO,EAAE,CAAC,CAAC,OAAO;gBAClB,SAAS,EAAE,cAAc,CAAC,CAAC,CAAC,QAAQ,CAAC;aACtC,CAAC,CAAC,CAAC;YACJ,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAC/C,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,KAAK,CAAC,kBAAkB,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACjD,CAAC;IACH,CAAC,CAAC,CAAC;AACP,CAAC"}
|
package/dist/config.d.ts
CHANGED
|
@@ -1,40 +1,16 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Config parsing, validation, and namespace resolution.
|
|
3
|
-
*
|
|
4
|
-
* Uses Zod for schema validation — all config errors surface at startup
|
|
5
|
-
* with clear messages instead of failing at runtime.
|
|
6
3
|
*/
|
|
7
4
|
import type { PluginConfig } from "./types.js";
|
|
8
|
-
/**
|
|
9
|
-
* Parse and validate raw plugin config from openclaw.json.
|
|
10
|
-
*
|
|
11
|
-
* Resolves ${ENV_VAR} placeholders in string fields, then validates
|
|
12
|
-
* the full config against the Zod schema. Throws with clear field-level
|
|
13
|
-
* error messages on invalid config.
|
|
14
|
-
*
|
|
15
|
-
* @param raw - Raw config object from `api.pluginConfig`
|
|
16
|
-
* @returns Validated config with all defaults applied
|
|
17
|
-
* @throws {Error} If config is missing, or any field fails validation
|
|
18
|
-
*/
|
|
19
5
|
export declare function parseConfig(raw: unknown): PluginConfig;
|
|
20
6
|
export interface ResolvedAgent {
|
|
21
7
|
namespace: string;
|
|
8
|
+
legacyNamespace?: string;
|
|
22
9
|
agentName: string;
|
|
23
10
|
}
|
|
24
|
-
/**
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
* Parses agent name from format "agent:\<name\>:\<uuid\>".
|
|
28
|
-
* Each agent gets its own namespace for memory isolation.
|
|
29
|
-
* Falls back to defaultNamespace for main agent or unknown sessions.
|
|
30
|
-
*
|
|
31
|
-
* @param defaultNamespace - Fallback namespace (used for main agent)
|
|
32
|
-
* @param sessionKey - OpenClaw session key, e.g. "agent:researcher:uuid-456"
|
|
33
|
-
* @returns Resolved namespace and human-readable agent name
|
|
34
|
-
*/
|
|
11
|
+
/** Derive a collision-resistant namespace for an agent name. */
|
|
12
|
+
export declare function deriveAgentNamespace(rawName: string): string;
|
|
13
|
+
/** Resolve agent namespace and human-readable name from sessionKey. */
|
|
35
14
|
export declare function resolveAgent(defaultNamespace: string, sessionKey?: string): ResolvedAgent;
|
|
36
|
-
/**
|
|
37
|
-
* Format key for safe logging (first 4 + last 4 chars).
|
|
38
|
-
*/
|
|
39
15
|
export declare function keyPreview(key: string): string;
|
|
40
16
|
//# sourceMappingURL=config.d.ts.map
|
package/dist/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAuD/C,wBAAgB,WAAW,CAAC,GAAG,EAAE,OAAO,GAAG,YAAY,CAetD;AAMD,MAAM,WAAW,aAAa;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,gEAAgE;AAChE,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAgB5D;AAED,uEAAuE;AACvE,wBAAgB,YAAY,CAAC,gBAAgB,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,aAAa,CAmBzF;AAED,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE9C"}
|
package/dist/config.js
CHANGED
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Config parsing, validation, and namespace resolution.
|
|
3
|
-
*
|
|
4
|
-
* Uses Zod for schema validation — all config errors surface at startup
|
|
5
|
-
* with clear messages instead of failing at runtime.
|
|
6
3
|
*/
|
|
4
|
+
import { createHash } from "node:crypto";
|
|
7
5
|
import { z } from "zod";
|
|
6
|
+
import { DEFAULT_REQUEST_TIMEOUT_MS } from "./constants.js";
|
|
8
7
|
// ============================================================================
|
|
9
8
|
// Schema
|
|
10
9
|
// ============================================================================
|
|
@@ -18,17 +17,22 @@ const ConfigSchema = z.object({
|
|
|
18
17
|
serverUrl: z.string()
|
|
19
18
|
.min(1, "required")
|
|
20
19
|
.url("must be a valid URL"),
|
|
21
|
-
defaultNamespace: z.string()
|
|
20
|
+
defaultNamespace: z.string()
|
|
21
|
+
.min(1, "must not be empty")
|
|
22
|
+
.refine((ns) => !/[\r\n"]/.test(ns), {
|
|
23
|
+
message: 'defaultNamespace must not contain quotes (") or newline characters',
|
|
24
|
+
})
|
|
25
|
+
.default("default"),
|
|
22
26
|
autoRecall: z.boolean().default(true),
|
|
23
27
|
autoCapture: z.boolean().default(true),
|
|
24
28
|
maxRecallResults: z.number().min(1).max(20).default(5),
|
|
25
29
|
minRelevance: z.number().min(0).max(1).default(0.3),
|
|
26
30
|
captureMaxMessages: z.number().min(1).max(50).default(10),
|
|
31
|
+
requestTimeoutMs: z.number().min(1000).max(60000).default(DEFAULT_REQUEST_TIMEOUT_MS),
|
|
27
32
|
});
|
|
28
33
|
// ============================================================================
|
|
29
34
|
// Env Var Resolution
|
|
30
35
|
// ============================================================================
|
|
31
|
-
/** Replace ${ENV_VAR} placeholders with process.env values. */
|
|
32
36
|
function resolveEnvVar(value) {
|
|
33
37
|
return value.replace(/\$\{([^}]+)\}/g, (_, name) => {
|
|
34
38
|
const v = process.env[name];
|
|
@@ -37,10 +41,6 @@ function resolveEnvVar(value) {
|
|
|
37
41
|
return v;
|
|
38
42
|
});
|
|
39
43
|
}
|
|
40
|
-
/**
|
|
41
|
-
* Resolve ${ENV_VAR} placeholders in all string fields of a config object.
|
|
42
|
-
* Non-string fields are passed through unchanged.
|
|
43
|
-
*/
|
|
44
44
|
function resolveEnvVars(raw) {
|
|
45
45
|
const resolved = {};
|
|
46
46
|
for (const [key, value] of Object.entries(raw)) {
|
|
@@ -51,24 +51,11 @@ function resolveEnvVars(raw) {
|
|
|
51
51
|
// ============================================================================
|
|
52
52
|
// Config Parser
|
|
53
53
|
// ============================================================================
|
|
54
|
-
/**
|
|
55
|
-
* Parse and validate raw plugin config from openclaw.json.
|
|
56
|
-
*
|
|
57
|
-
* Resolves ${ENV_VAR} placeholders in string fields, then validates
|
|
58
|
-
* the full config against the Zod schema. Throws with clear field-level
|
|
59
|
-
* error messages on invalid config.
|
|
60
|
-
*
|
|
61
|
-
* @param raw - Raw config object from `api.pluginConfig`
|
|
62
|
-
* @returns Validated config with all defaults applied
|
|
63
|
-
* @throws {Error} If config is missing, or any field fails validation
|
|
64
|
-
*/
|
|
65
54
|
export function parseConfig(raw) {
|
|
66
55
|
if (!raw || typeof raw !== "object") {
|
|
67
56
|
throw new Error("memory-memwal: config is required");
|
|
68
57
|
}
|
|
69
|
-
// Resolve env vars before validation
|
|
70
58
|
const resolved = resolveEnvVars(raw);
|
|
71
|
-
// Validate with Zod — clear error messages per field
|
|
72
59
|
const result = ConfigSchema.safeParse(resolved);
|
|
73
60
|
if (!result.success) {
|
|
74
61
|
const issues = result.error.issues
|
|
@@ -78,29 +65,40 @@ export function parseConfig(raw) {
|
|
|
78
65
|
}
|
|
79
66
|
return result.data;
|
|
80
67
|
}
|
|
81
|
-
/**
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
68
|
+
/** Derive a collision-resistant namespace for an agent name. */
|
|
69
|
+
export function deriveAgentNamespace(rawName) {
|
|
70
|
+
const normalized = rawName.normalize("NFKC").trim();
|
|
71
|
+
const lower = normalized.toLowerCase();
|
|
72
|
+
// Domain 1: Safe standard names (1-64 ASCII alphanumeric/hyphen/underscore)
|
|
73
|
+
if (/^[a-zA-Z0-9_-]{1,64}$/.test(normalized)) {
|
|
74
|
+
return lower;
|
|
75
|
+
}
|
|
76
|
+
// Domain 2: Unsafe names (hash length >= 68 chars prevents domain collision)
|
|
77
|
+
const slug = lower
|
|
78
|
+
.replace(/[^a-z0-9_-]+/g, "-")
|
|
79
|
+
.replace(/^-+|-+$/g, "")
|
|
80
|
+
.slice(0, 32);
|
|
81
|
+
const hash = createHash("sha256").update(lower).digest("hex");
|
|
82
|
+
return slug && slug !== "main" ? `_h_${slug}_${hash}` : `_h_agent_${hash}`;
|
|
83
|
+
}
|
|
84
|
+
/** Resolve agent namespace and human-readable name from sessionKey. */
|
|
92
85
|
export function resolveAgent(defaultNamespace, sessionKey) {
|
|
93
86
|
if (!sessionKey)
|
|
94
87
|
return { namespace: defaultNamespace, agentName: "main" };
|
|
95
88
|
const match = sessionKey.match(/^agent:([^:]+):/);
|
|
96
|
-
const
|
|
97
|
-
if (!
|
|
89
|
+
const rawName = match?.[1];
|
|
90
|
+
if (!rawName || rawName === "main") {
|
|
91
|
+
return { namespace: defaultNamespace, agentName: "main" };
|
|
92
|
+
}
|
|
93
|
+
const trimmed = rawName.trim();
|
|
94
|
+
if (trimmed === "main" || trimmed.toLowerCase() === "main") {
|
|
98
95
|
return { namespace: defaultNamespace, agentName: "main" };
|
|
99
|
-
|
|
96
|
+
}
|
|
97
|
+
const namespace = deriveAgentNamespace(rawName);
|
|
98
|
+
const legacyNamespace = rawName !== namespace && /^[a-zA-Z0-9_-]{1,64}$/.test(trimmed) ? rawName : undefined;
|
|
99
|
+
const agentName = trimmed.normalize("NFKC").slice(0, 64) || namespace;
|
|
100
|
+
return { namespace, legacyNamespace, agentName };
|
|
100
101
|
}
|
|
101
|
-
/**
|
|
102
|
-
* Format key for safe logging (first 4 + last 4 chars).
|
|
103
|
-
*/
|
|
104
102
|
export function keyPreview(key) {
|
|
105
103
|
return key.length > 8 ? `${key.slice(0, 4)}...${key.slice(-4)}` : "****";
|
|
106
104
|
}
|
package/dist/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
|
package/dist/constants.d.ts
CHANGED
|
@@ -22,6 +22,15 @@ export declare const MAX_TEXT_PREVIEW_LENGTH = 100;
|
|
|
22
22
|
export declare const DEFAULT_SEARCH_LIMIT = 5;
|
|
23
23
|
/** Default number of retry attempts (1 = 2 total tries). */
|
|
24
24
|
export declare const DEFAULT_RETRY_COUNT = 1;
|
|
25
|
+
/**
|
|
26
|
+
* Default per-request deadline in ms.
|
|
27
|
+
*
|
|
28
|
+
* A relayer that accepts the connection but never responds would otherwise
|
|
29
|
+
* block the agent turn forever — an unreachable host fails fast at DNS, but a
|
|
30
|
+
* slow or overloaded one holds the socket open. Every client call is raced
|
|
31
|
+
* against this deadline.
|
|
32
|
+
*/
|
|
33
|
+
export declare const DEFAULT_REQUEST_TIMEOUT_MS = 10000;
|
|
25
34
|
/** Default delay in ms between retry attempts. */
|
|
26
35
|
export declare const DEFAULT_RETRY_DELAY_MS = 2000;
|
|
27
36
|
//# sourceMappingURL=constants.d.ts.map
|
package/dist/constants.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAMH,0EAA0E;AAC1E,eAAO,MAAM,kBAAkB,KAAK,CAAC;AAErC,8EAA8E;AAC9E,eAAO,MAAM,eAAe,IAAI,CAAC;AAMjC,+EAA+E;AAC/E,eAAO,MAAM,yBAAyB,KAAK,CAAC;AAM5C,qEAAqE;AACrE,eAAO,MAAM,iBAAiB,KAAK,CAAC;AAMpC,iEAAiE;AACjE,eAAO,MAAM,qBAAqB,IAAI,CAAC;AAEvC,mEAAmE;AACnE,eAAO,MAAM,sBAAsB,IAAI,CAAC;AAExC,4DAA4D;AAC5D,eAAO,MAAM,uBAAuB,MAAM,CAAC;AAM3C,wEAAwE;AACxE,eAAO,MAAM,oBAAoB,IAAI,CAAC;AAMtC,4DAA4D;AAC5D,eAAO,MAAM,mBAAmB,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAMH,0EAA0E;AAC1E,eAAO,MAAM,kBAAkB,KAAK,CAAC;AAErC,8EAA8E;AAC9E,eAAO,MAAM,eAAe,IAAI,CAAC;AAMjC,+EAA+E;AAC/E,eAAO,MAAM,yBAAyB,KAAK,CAAC;AAM5C,qEAAqE;AACrE,eAAO,MAAM,iBAAiB,KAAK,CAAC;AAMpC,iEAAiE;AACjE,eAAO,MAAM,qBAAqB,IAAI,CAAC;AAEvC,mEAAmE;AACnE,eAAO,MAAM,sBAAsB,IAAI,CAAC;AAExC,4DAA4D;AAC5D,eAAO,MAAM,uBAAuB,MAAM,CAAC;AAM3C,wEAAwE;AACxE,eAAO,MAAM,oBAAoB,IAAI,CAAC;AAMtC,4DAA4D;AAC5D,eAAO,MAAM,mBAAmB,IAAI,CAAC;AAMrC;;;;;;;GAOG;AACH,eAAO,MAAM,0BAA0B,QAAS,CAAC;AAEjD,kDAAkD;AAClD,eAAO,MAAM,sBAAsB,OAAO,CAAC"}
|
package/dist/constants.js
CHANGED
|
@@ -40,6 +40,18 @@ export const DEFAULT_SEARCH_LIMIT = 5;
|
|
|
40
40
|
// ============================================================================
|
|
41
41
|
/** Default number of retry attempts (1 = 2 total tries). */
|
|
42
42
|
export const DEFAULT_RETRY_COUNT = 1;
|
|
43
|
+
// ============================================================================
|
|
44
|
+
// Request timeout (format.ts → withTimeout)
|
|
45
|
+
// ============================================================================
|
|
46
|
+
/**
|
|
47
|
+
* Default per-request deadline in ms.
|
|
48
|
+
*
|
|
49
|
+
* A relayer that accepts the connection but never responds would otherwise
|
|
50
|
+
* block the agent turn forever — an unreachable host fails fast at DNS, but a
|
|
51
|
+
* slow or overloaded one holds the socket open. Every client call is raced
|
|
52
|
+
* against this deadline.
|
|
53
|
+
*/
|
|
54
|
+
export const DEFAULT_REQUEST_TIMEOUT_MS = 10_000;
|
|
43
55
|
/** Default delay in ms between retry attempts. */
|
|
44
56
|
export const DEFAULT_RETRY_DELAY_MS = 2000;
|
|
45
57
|
//# sourceMappingURL=constants.js.map
|
package/dist/constants.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,+EAA+E;AAC/E,iCAAiC;AACjC,+EAA+E;AAE/E,0EAA0E;AAC1E,MAAM,CAAC,MAAM,kBAAkB,GAAG,EAAE,CAAC;AAErC,8EAA8E;AAC9E,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,CAAC;AAEjC,+EAA+E;AAC/E,8BAA8B;AAC9B,+EAA+E;AAE/E,+EAA+E;AAC/E,MAAM,CAAC,MAAM,yBAAyB,GAAG,EAAE,CAAC;AAE5C,+EAA+E;AAC/E,gCAAgC;AAChC,+EAA+E;AAE/E,qEAAqE;AACrE,MAAM,CAAC,MAAM,iBAAiB,GAAG,EAAE,CAAC;AAEpC,+EAA+E;AAC/E,8BAA8B;AAC9B,+EAA+E;AAE/E,iEAAiE;AACjE,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,CAAC;AAEvC,mEAAmE;AACnE,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,CAAC;AAExC,4DAA4D;AAC5D,MAAM,CAAC,MAAM,uBAAuB,GAAG,GAAG,CAAC;AAE3C,+EAA+E;AAC/E,gCAAgC;AAChC,+EAA+E;AAE/E,wEAAwE;AACxE,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,CAAC;AAEtC,+EAA+E;AAC/E,gCAAgC;AAChC,+EAA+E;AAE/E,4DAA4D;AAC5D,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,CAAC;AAErC,kDAAkD;AAClD,MAAM,CAAC,MAAM,sBAAsB,GAAG,IAAI,CAAC"}
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,+EAA+E;AAC/E,iCAAiC;AACjC,+EAA+E;AAE/E,0EAA0E;AAC1E,MAAM,CAAC,MAAM,kBAAkB,GAAG,EAAE,CAAC;AAErC,8EAA8E;AAC9E,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,CAAC;AAEjC,+EAA+E;AAC/E,8BAA8B;AAC9B,+EAA+E;AAE/E,+EAA+E;AAC/E,MAAM,CAAC,MAAM,yBAAyB,GAAG,EAAE,CAAC;AAE5C,+EAA+E;AAC/E,gCAAgC;AAChC,+EAA+E;AAE/E,qEAAqE;AACrE,MAAM,CAAC,MAAM,iBAAiB,GAAG,EAAE,CAAC;AAEpC,+EAA+E;AAC/E,8BAA8B;AAC9B,+EAA+E;AAE/E,iEAAiE;AACjE,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,CAAC;AAEvC,mEAAmE;AACnE,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,CAAC;AAExC,4DAA4D;AAC5D,MAAM,CAAC,MAAM,uBAAuB,GAAG,GAAG,CAAC;AAE3C,+EAA+E;AAC/E,gCAAgC;AAChC,+EAA+E;AAE/E,wEAAwE;AACxE,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,CAAC;AAEtC,+EAA+E;AAC/E,gCAAgC;AAChC,+EAA+E;AAE/E,4DAA4D;AAC5D,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,CAAC;AAErC,+EAA+E;AAC/E,4CAA4C;AAC5C,+EAA+E;AAE/E;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,0BAA0B,GAAG,MAAM,CAAC;AAEjD,kDAAkD;AAClD,MAAM,CAAC,MAAM,sBAAsB,GAAG,IAAI,CAAC"}
|
package/dist/format.d.ts
CHANGED
|
@@ -4,6 +4,15 @@
|
|
|
4
4
|
*/
|
|
5
5
|
/** HTML-escape text to prevent prompt injection via stored memories. */
|
|
6
6
|
export declare function escapeForPrompt(text: string): string;
|
|
7
|
+
/**
|
|
8
|
+
* Map pgvector cosine distance `[0, 2]` to similarity in `[0, 1]`.
|
|
9
|
+
* Non-finite values clamp to 0 so a bad hit cannot print negative %.
|
|
10
|
+
*/
|
|
11
|
+
export declare function cosineSimilarity(distance: number): number;
|
|
12
|
+
/** Integer 0–100 relevance for prompt display. */
|
|
13
|
+
export declare function relevancePercent(distance: number): number;
|
|
14
|
+
/** Two-decimal 0–1 relevance for tool/CLI details. */
|
|
15
|
+
export declare function relevanceRatio(distance: number): number;
|
|
7
16
|
/**
|
|
8
17
|
* Format recalled memories for prompt injection with security warning.
|
|
9
18
|
*
|
|
@@ -51,5 +60,23 @@ export declare function toolError(message: string, err: unknown): {
|
|
|
51
60
|
* @returns Result of `fn` on first success
|
|
52
61
|
* @throws Last error if all attempts fail
|
|
53
62
|
*/
|
|
63
|
+
/**
|
|
64
|
+
* Race an async operation against a deadline.
|
|
65
|
+
*
|
|
66
|
+
* SDK coverage is uneven: `recall()` aborts itself after 15s, but `analyze()`
|
|
67
|
+
* goes through `signedRequest` with no signal, and the compatibility preflight
|
|
68
|
+
* (`GET /version`, falling back to `/health`) that runs ahead of every
|
|
69
|
+
* protected request is unguarded. So a relayer that accepts the socket and then
|
|
70
|
+
* goes silent stalls in the preflight before `recall()`'s own abort can apply,
|
|
71
|
+
* and blocks the agent turn. An unreachable host fails fast at DNS; a hung one
|
|
72
|
+
* does not. This bounds the whole call regardless of which leg stalls.
|
|
73
|
+
*
|
|
74
|
+
* @param fn - Async function to execute
|
|
75
|
+
* @param ms - Deadline in milliseconds
|
|
76
|
+
* @param label - Operation name, used in the timeout error message
|
|
77
|
+
* @returns Result of `fn` if it settles before the deadline
|
|
78
|
+
* @throws {Error} `<label> timed out after <ms>ms` if the deadline passes first
|
|
79
|
+
*/
|
|
80
|
+
export declare function withTimeout<T>(fn: () => Promise<T>, ms: number, label: string): Promise<T>;
|
|
54
81
|
export declare function withRetry<T>(fn: () => Promise<T>, retries?: number, delayMs?: number): Promise<T>;
|
|
55
82
|
//# sourceMappingURL=format.d.ts.map
|
package/dist/format.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../src/format.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAmCH,wEAAwE;AACxE,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEpD;AAED;;;;;;;;;GASG;AACH,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,GAChC,MAAM,CAWR;AAED,uEAAuE;AACvE,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEpD;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,GAAG,EAAE,EACf,QAAQ,EAAE,MAAM,EAChB,KAAK,GAAE,MAAM,EAA0B,GACtC,MAAM,EAAE,CA4BV;AAED,iDAAiD;AACjD,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO;;;;;;;;EAKtD;AAED;;;;;;;;GAQG;AACH,wBAAsB,SAAS,CAAC,CAAC,EAC/B,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACpB,OAAO,GAAE,MAA4B,EACrC,OAAO,GAAE,MAA+B,GACvC,OAAO,CAAC,CAAC,CAAC,CAQZ"}
|
|
1
|
+
{"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../src/format.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAmCH,wEAAwE;AACxE,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEpD;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAGzD;AAED,kDAAkD;AAClD,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAEzD;AAED,sDAAsD;AACtD,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAEvD;AAED;;;;;;;;;GASG;AACH,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,GAChC,MAAM,CAWR;AAED,uEAAuE;AACvE,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEpD;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,GAAG,EAAE,EACf,QAAQ,EAAE,MAAM,EAChB,KAAK,GAAE,MAAM,EAA0B,GACtC,MAAM,EAAE,CA4BV;AAED,iDAAiD;AACjD,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO;;;;;;;;EAKtD;AAED;;;;;;;;GAQG;AACH;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,WAAW,CAAC,CAAC,EACjC,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACpB,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,CAAC,CAAC,CAgBZ;AAED,wBAAsB,SAAS,CAAC,CAAC,EAC/B,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACpB,OAAO,GAAE,MAA4B,EACrC,OAAO,GAAE,MAA+B,GACvC,OAAO,CAAC,CAAC,CAAC,CAQZ"}
|
package/dist/format.js
CHANGED
|
@@ -27,6 +27,23 @@ const ESCAPE_MAP = {
|
|
|
27
27
|
export function escapeForPrompt(text) {
|
|
28
28
|
return text.replace(/[&<>"']/g, (c) => ESCAPE_MAP[c] ?? c);
|
|
29
29
|
}
|
|
30
|
+
/**
|
|
31
|
+
* Map pgvector cosine distance `[0, 2]` to similarity in `[0, 1]`.
|
|
32
|
+
* Non-finite values clamp to 0 so a bad hit cannot print negative %.
|
|
33
|
+
*/
|
|
34
|
+
export function cosineSimilarity(distance) {
|
|
35
|
+
if (!Number.isFinite(distance))
|
|
36
|
+
return 0;
|
|
37
|
+
return Math.min(1, Math.max(0, 1 - distance));
|
|
38
|
+
}
|
|
39
|
+
/** Integer 0–100 relevance for prompt display. */
|
|
40
|
+
export function relevancePercent(distance) {
|
|
41
|
+
return Math.round(cosineSimilarity(distance) * 100);
|
|
42
|
+
}
|
|
43
|
+
/** Two-decimal 0–1 relevance for tool/CLI details. */
|
|
44
|
+
export function relevanceRatio(distance) {
|
|
45
|
+
return Math.round(cosineSimilarity(distance) * 100) / 100;
|
|
46
|
+
}
|
|
30
47
|
/**
|
|
31
48
|
* Format recalled memories for prompt injection with security warning.
|
|
32
49
|
*
|
|
@@ -109,6 +126,39 @@ export function toolError(message, err) {
|
|
|
109
126
|
* @returns Result of `fn` on first success
|
|
110
127
|
* @throws Last error if all attempts fail
|
|
111
128
|
*/
|
|
129
|
+
/**
|
|
130
|
+
* Race an async operation against a deadline.
|
|
131
|
+
*
|
|
132
|
+
* SDK coverage is uneven: `recall()` aborts itself after 15s, but `analyze()`
|
|
133
|
+
* goes through `signedRequest` with no signal, and the compatibility preflight
|
|
134
|
+
* (`GET /version`, falling back to `/health`) that runs ahead of every
|
|
135
|
+
* protected request is unguarded. So a relayer that accepts the socket and then
|
|
136
|
+
* goes silent stalls in the preflight before `recall()`'s own abort can apply,
|
|
137
|
+
* and blocks the agent turn. An unreachable host fails fast at DNS; a hung one
|
|
138
|
+
* does not. This bounds the whole call regardless of which leg stalls.
|
|
139
|
+
*
|
|
140
|
+
* @param fn - Async function to execute
|
|
141
|
+
* @param ms - Deadline in milliseconds
|
|
142
|
+
* @param label - Operation name, used in the timeout error message
|
|
143
|
+
* @returns Result of `fn` if it settles before the deadline
|
|
144
|
+
* @throws {Error} `<label> timed out after <ms>ms` if the deadline passes first
|
|
145
|
+
*/
|
|
146
|
+
export async function withTimeout(fn, ms, label) {
|
|
147
|
+
let timer;
|
|
148
|
+
try {
|
|
149
|
+
return await Promise.race([
|
|
150
|
+
fn(),
|
|
151
|
+
new Promise((_, reject) => {
|
|
152
|
+
timer = setTimeout(() => reject(new Error(`${label} timed out after ${ms}ms`)), ms);
|
|
153
|
+
}),
|
|
154
|
+
]);
|
|
155
|
+
}
|
|
156
|
+
finally {
|
|
157
|
+
// Always clear, or a pending timer keeps the process alive after success
|
|
158
|
+
if (timer !== undefined)
|
|
159
|
+
clearTimeout(timer);
|
|
160
|
+
}
|
|
161
|
+
}
|
|
112
162
|
export async function withRetry(fn, retries = DEFAULT_RETRY_COUNT, delayMs = DEFAULT_RETRY_DELAY_MS) {
|
|
113
163
|
try {
|
|
114
164
|
return await fn();
|
package/dist/format.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"format.js","sourceRoot":"","sources":["../src/format.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"format.js","sourceRoot":"","sources":["../src/format.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"capture.d.ts","sourceRoot":"","sources":["../../src/hooks/capture.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AAIxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,oDAAoD;AACpD,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"capture.d.ts","sourceRoot":"","sources":["../../src/hooks/capture.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AAIxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,oDAAoD;AACpD,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,GAAG,IAAI,CA2ExF"}
|
package/dist/hooks/capture.js
CHANGED
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
*/
|
|
8
8
|
import { resolveAgent } from "../config.js";
|
|
9
9
|
import { shouldCapture } from "../capture.js";
|
|
10
|
-
import { extractMessageTexts, withRetry } from "../format.js";
|
|
10
|
+
import { extractMessageTexts, withRetry, withTimeout } from "../format.js";
|
|
11
11
|
/** Register the agent_end hook for auto-capture. */
|
|
12
12
|
export function registerCaptureHook(api, client, config) {
|
|
13
13
|
api.on("agent_end", async (event, ctx) => {
|
|
@@ -53,7 +53,9 @@ export function registerCaptureHook(api, client, config) {
|
|
|
53
53
|
// (The "no silent now() fallback" rule is about the server
|
|
54
54
|
// defaulting for callers that passed nothing; here the caller
|
|
55
55
|
// IS passing, with real-ish knowledge of when the event happened.)
|
|
56
|
-
|
|
56
|
+
// Timeout sits inside the retry so each attempt gets its own deadline,
|
|
57
|
+
// rather than one deadline spanning the whole retry budget.
|
|
58
|
+
const result = await withRetry(() => withTimeout(() => client.analyze(conversation, { namespace, occurredAt: new Date() }), config.requestTimeoutMs, "auto-capture"));
|
|
57
59
|
if (result.facts?.length) {
|
|
58
60
|
api.logger.info(`memory-memwal: auto-captured ${result.facts.length} facts ` +
|
|
59
61
|
`(agent: ${agentName}, namespace: ${namespace})`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"capture.js","sourceRoot":"","sources":["../../src/hooks/capture.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,mBAAmB,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"capture.js","sourceRoot":"","sources":["../../src/hooks/capture.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,mBAAmB,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAG3E,oDAAoD;AACpD,MAAM,UAAU,mBAAmB,CAAC,GAAQ,EAAE,MAAc,EAAE,MAAoB;IAChF,GAAG,CAAC,EAAE,CAAC,WAAW,EAAE,KAAK,EAAE,KAAU,EAAE,GAAQ,EAAE,EAAE;QACjD,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,MAAM;YAAE,OAAO;QAEtD,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,YAAY,CAAC,MAAM,CAAC,gBAAgB,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC;QAExF,IAAI,CAAC;YACH,yEAAyE;YACzE,oEAAoE;YACpE,uEAAuE;YACvE,MAAM,KAAK,GAAG,mBAAmB,CAC/B,KAAK,CAAC,QAAQ,EACd,MAAM,CAAC,kBAAkB,CAC1B,CAAC;YAEF,IAAI,CAAC,KAAK,CAAC,MAAM;gBAAE,OAAO;YAE1B,gEAAgE;YAChE,MAAM,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;YACzD,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;gBACvB,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,CAChB,8DAA8D;oBAC9D,WAAW,SAAS,KAAK,KAAK,CAAC,MAAM,oBAAoB,CAC1D,CAAC;gBACF,OAAO;YACT,CAAC;YAED,mEAAmE;YACnE,mDAAmD;YACnD,MAAM,YAAY,GAAG,UAAU;iBAC5B,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;iBAC/B,IAAI,CAAC,MAAM,CAAC,CAAC;YAEhB,kEAAkE;YAClE,6DAA6D;YAC7D,EAAE;YACF,4DAA4D;YAC5D,0DAA0D;YAC1D,2DAA2D;YAC3D,cAAc;YACd,EAAE;YACF,2DAA2D;YAC3D,+DAA+D;YAC/D,+DAA+D;YAC/D,+DAA+D;YAC/D,8DAA8D;YAC9D,4DAA4D;YAC5D,+DAA+D;YAC/D,2DAA2D;YAC3D,+DAA+D;YAC/D,2DAA2D;YAC3D,8DAA8D;YAC9D,mEAAmE;YACnE,uEAAuE;YACvE,4DAA4D;YAC5D,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,GAAG,EAAE,CAClC,WAAW,CACT,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,IAAI,EAAE,EAAE,CAAC,EACzE,MAAM,CAAC,gBAAgB,EACvB,cAAc,CACf,CACF,CAAC;YAEF,IAAI,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC;gBACzB,GAAG,CAAC,MAAM,CAAC,IAAI,CACb,gCAAgC,MAAM,CAAC,KAAK,CAAC,MAAM,SAAS;oBAC5D,WAAW,SAAS,gBAAgB,SAAS,GAAG,CACjD,CAAC;YACJ,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,GAAG,CAAC,MAAM,CAAC,IAAI,CACb,uCAAuC,MAAM,CAAC,GAAG,CAAC,EAAE,CACrD,CAAC;QACJ,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC"}
|
package/dist/hooks/recall.d.ts
CHANGED
|
@@ -1,9 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Auto-recall hook — before_prompt_build.
|
|
3
|
-
*
|
|
4
|
-
* Searches Walrus Memory for memories relevant to the user's prompt and injects
|
|
5
|
-
* them into the LLM context. Also injects a namespace instruction so
|
|
6
|
-
* tools scope to the correct agent's memory.
|
|
7
3
|
*/
|
|
8
4
|
import type { MemWal } from "@mysten-incubation/memwal";
|
|
9
5
|
import type { PluginConfig } from "../types.js";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recall.d.ts","sourceRoot":"","sources":["../../src/hooks/recall.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"recall.d.ts","sourceRoot":"","sources":["../../src/hooks/recall.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AAIxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAGhD,6DAA6D;AAC7D,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,GAAG,IAAI,CA2FvF"}
|
package/dist/hooks/recall.js
CHANGED
|
@@ -1,39 +1,58 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Auto-recall hook — before_prompt_build.
|
|
3
|
-
*
|
|
4
|
-
* Searches Walrus Memory for memories relevant to the user's prompt and injects
|
|
5
|
-
* them into the LLM context. Also injects a namespace instruction so
|
|
6
|
-
* tools scope to the correct agent's memory.
|
|
7
3
|
*/
|
|
8
4
|
import { resolveAgent } from "../config.js";
|
|
9
5
|
import { looksLikeInjection } from "../capture.js";
|
|
10
|
-
import { formatMemoriesForPrompt } from "../format.js";
|
|
6
|
+
import { formatMemoriesForPrompt, withTimeout } from "../format.js";
|
|
11
7
|
import { MIN_PROMPT_LENGTH } from "../constants.js";
|
|
12
8
|
/** Register the before_prompt_build hook for auto-recall. */
|
|
13
9
|
export function registerRecallHook(api, client, config) {
|
|
14
10
|
api.on("before_prompt_build", async (event, ctx) => {
|
|
15
|
-
// Skip trivial prompts ("ok", "y") — not worth a server round-trip
|
|
16
11
|
if (!event.prompt || event.prompt.length < MIN_PROMPT_LENGTH)
|
|
17
12
|
return;
|
|
18
|
-
const { namespace, agentName } = resolveAgent(config.defaultNamespace, ctx?.sessionKey);
|
|
19
|
-
// The LLM doesn't know which agent it is. This instruction guides
|
|
20
|
-
// memory_search/memory_store tool calls to the correct namespace.
|
|
21
|
-
// Returned via appendSystemContext in ALL code paths (including errors)
|
|
22
|
-
// so tools still scope correctly even when recall itself fails.
|
|
13
|
+
const { namespace, legacyNamespace, agentName } = resolveAgent(config.defaultNamespace, ctx?.sessionKey);
|
|
23
14
|
const namespaceInstruction = `When using memory_search or memory_store tools, ` +
|
|
24
|
-
`pass namespace
|
|
15
|
+
`pass namespace=${JSON.stringify(namespace)} to scope operations to the current agent's memory.`;
|
|
25
16
|
try {
|
|
26
|
-
|
|
27
|
-
|
|
17
|
+
// Each read carries its own deadline. `recall()` self-aborts after 15s,
|
|
18
|
+
// but the compatibility preflight ahead of it does not, and
|
|
19
|
+
// Promise.allSettled below waits for every promise — so one namespace
|
|
20
|
+
// holding its socket open would stall the whole turn if the deadline
|
|
21
|
+
// wrapped the pair instead of each read.
|
|
22
|
+
const recallPromises = [
|
|
23
|
+
withTimeout(() => client.recall(event.prompt, config.maxRecallResults, namespace), config.requestTimeoutMs, "auto-recall"),
|
|
24
|
+
];
|
|
25
|
+
if (legacyNamespace && legacyNamespace !== namespace) {
|
|
26
|
+
recallPromises.push(withTimeout(() => client.recall(event.prompt, config.maxRecallResults, legacyNamespace), config.requestTimeoutMs, "auto-recall (legacy namespace)"));
|
|
27
|
+
}
|
|
28
|
+
const resultsList = await Promise.allSettled(recallPromises);
|
|
29
|
+
const primaryResult = resultsList[0];
|
|
30
|
+
if (primaryResult?.status === "rejected") {
|
|
31
|
+
api.logger.warn(`memory-memwal: canonical recall failed: ${String(primaryResult.reason)}`);
|
|
32
|
+
}
|
|
33
|
+
const candidates = [];
|
|
34
|
+
const seen = new Set();
|
|
35
|
+
for (const res of resultsList) {
|
|
36
|
+
if (res.status === "fulfilled" && res.value?.results?.length) {
|
|
37
|
+
for (const item of res.value.results) {
|
|
38
|
+
const key = item.blob_id || item.text;
|
|
39
|
+
if (!seen.has(key)) {
|
|
40
|
+
seen.add(key);
|
|
41
|
+
candidates.push(item);
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
if (!candidates.length) {
|
|
28
47
|
return { appendSystemContext: namespaceInstruction };
|
|
29
48
|
}
|
|
30
|
-
|
|
31
|
-
// detection (drop memories containing prompt manipulation attempts)
|
|
32
|
-
const relevant = result.results.filter((r) => (1 - r.distance) >= config.minRelevance &&
|
|
49
|
+
const filtered = candidates.filter((r) => (1 - r.distance) >= config.minRelevance &&
|
|
33
50
|
!looksLikeInjection(r.text));
|
|
34
|
-
if (!
|
|
51
|
+
if (!filtered.length) {
|
|
35
52
|
return { appendSystemContext: namespaceInstruction };
|
|
36
53
|
}
|
|
54
|
+
filtered.sort((a, b) => a.distance - b.distance);
|
|
55
|
+
const relevant = filtered.slice(0, config.maxRecallResults);
|
|
37
56
|
api.logger.info(`memory-memwal: auto-recall injected ${relevant.length} memories ` +
|
|
38
57
|
`(agent: ${agentName}, namespace: ${namespace})`);
|
|
39
58
|
return {
|
package/dist/hooks/recall.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recall.js","sourceRoot":"","sources":["../../src/hooks/recall.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"recall.js","sourceRoot":"","sources":["../../src/hooks/recall.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search.d.ts","sourceRoot":"","sources":["../../src/tools/search.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AAIxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAGhD,6CAA6C;AAC7C,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"search.d.ts","sourceRoot":"","sources":["../../src/tools/search.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AAIxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAGhD,6CAA6C;AAC7C,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,GAAG,IAAI,CAyFvF"}
|
package/dist/tools/search.js
CHANGED
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
*/
|
|
9
9
|
import { Type } from "@sinclair/typebox";
|
|
10
10
|
import { looksLikeInjection } from "../capture.js";
|
|
11
|
-
import { escapeForPrompt, toolError } from "../format.js";
|
|
11
|
+
import { escapeForPrompt, relevancePercent, relevanceRatio, toolError, withTimeout } from "../format.js";
|
|
12
12
|
import { DEFAULT_SEARCH_LIMIT } from "../constants.js";
|
|
13
13
|
/** Register the memory_search agent tool. */
|
|
14
14
|
export function registerSearchTool(api, client, config) {
|
|
@@ -30,7 +30,7 @@ export function registerSearchTool(api, client, config) {
|
|
|
30
30
|
// LLM may omit namespace (e.g. tools.allow set but hooks disabled) — fall back safely
|
|
31
31
|
const ns = namespace || config.defaultNamespace;
|
|
32
32
|
try {
|
|
33
|
-
const result = await client.recall(query, limit, ns);
|
|
33
|
+
const result = await withTimeout(() => client.recall(query, limit, ns), config.requestTimeoutMs, "memory_search");
|
|
34
34
|
if (!result.results?.length) {
|
|
35
35
|
return {
|
|
36
36
|
content: [
|
|
@@ -50,10 +50,11 @@ export function registerSearchTool(api, client, config) {
|
|
|
50
50
|
details: { count: 0, namespace: ns },
|
|
51
51
|
};
|
|
52
52
|
}
|
|
53
|
-
//
|
|
53
|
+
// Cosine distance is [0, 2]; clamp so orthogonal/opposite hits
|
|
54
|
+
// cannot print a negative relevance % (WALM-441 / GH #798).
|
|
54
55
|
const formatted = safe
|
|
55
56
|
.map((r, i) => {
|
|
56
|
-
const relevance =
|
|
57
|
+
const relevance = relevancePercent(r.distance);
|
|
57
58
|
return `${i + 1}. ${escapeForPrompt(r.text)} (${relevance}% relevance)`;
|
|
58
59
|
})
|
|
59
60
|
.join("\n");
|
|
@@ -70,7 +71,7 @@ export function registerSearchTool(api, client, config) {
|
|
|
70
71
|
memories: safe.map((r) => ({
|
|
71
72
|
text: r.text,
|
|
72
73
|
blob_id: r.blob_id,
|
|
73
|
-
relevance:
|
|
74
|
+
relevance: relevanceRatio(r.distance),
|
|
74
75
|
})),
|
|
75
76
|
},
|
|
76
77
|
};
|
package/dist/tools/search.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search.js","sourceRoot":"","sources":["../../src/tools/search.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"search.js","sourceRoot":"","sources":["../../src/tools/search.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../../src/tools/store.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AAIxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAGhD,4CAA4C;AAC5C,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../../src/tools/store.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AAIxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAGhD,4CAA4C;AAC5C,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,GAAG,IAAI,CAwGtF"}
|
package/dist/tools/store.js
CHANGED
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
*/
|
|
8
8
|
import { Type } from "@sinclair/typebox";
|
|
9
9
|
import { looksLikeInjection } from "../capture.js";
|
|
10
|
-
import { toolError } from "../format.js";
|
|
10
|
+
import { toolError, withTimeout } from "../format.js";
|
|
11
11
|
import { MIN_STORE_TEXT_LENGTH, MAX_FACT_PREVIEW_COUNT, MAX_TEXT_PREVIEW_LENGTH } from "../constants.js";
|
|
12
12
|
/** Register the memory_store agent tool. */
|
|
13
13
|
export function registerStoreTool(api, client, config) {
|
|
@@ -68,10 +68,7 @@ export function registerStoreTool(api, client, config) {
|
|
|
68
68
|
};
|
|
69
69
|
}
|
|
70
70
|
try {
|
|
71
|
-
const result = await client.analyze(text.trim(), {
|
|
72
|
-
namespace: ns,
|
|
73
|
-
occurredAt,
|
|
74
|
-
});
|
|
71
|
+
const result = await withTimeout(() => client.analyze(text.trim(), { namespace: ns, occurredAt }), config.requestTimeoutMs, "memory_store");
|
|
75
72
|
const factCount = result.facts?.length ?? 0;
|
|
76
73
|
// Show first 3 extracted facts as confirmation, or raw text truncation as fallback
|
|
77
74
|
const preview = result.facts
|
package/dist/tools/store.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"store.js","sourceRoot":"","sources":["../../src/tools/store.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"store.js","sourceRoot":"","sources":["../../src/tools/store.ts"],"names":[],"mappings":"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"}
|
package/dist/types.d.ts
CHANGED
|
@@ -20,5 +20,7 @@ export interface PluginConfig {
|
|
|
20
20
|
minRelevance: number;
|
|
21
21
|
/** Number of recent messages to send for auto-capture. */
|
|
22
22
|
captureMaxMessages: number;
|
|
23
|
+
/** Per-request deadline in ms for every relayer call. */
|
|
24
|
+
requestTimeoutMs: number;
|
|
23
25
|
}
|
|
24
26
|
//# sourceMappingURL=types.d.ts.map
|
package/dist/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,MAAM,WAAW,YAAY;IAC3B,iCAAiC;IACjC,UAAU,EAAE,MAAM,CAAC;IACnB,8CAA8C;IAC9C,SAAS,EAAE,MAAM,CAAC;IAClB,gCAAgC;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,iEAAiE;IACjE,gBAAgB,EAAE,MAAM,CAAC;IACzB,4DAA4D;IAC5D,UAAU,EAAE,OAAO,CAAC;IACpB,0DAA0D;IAC1D,WAAW,EAAE,OAAO,CAAC;IACrB,8CAA8C;IAC9C,gBAAgB,EAAE,MAAM,CAAC;IACzB,+DAA+D;IAC/D,YAAY,EAAE,MAAM,CAAC;IACrB,0DAA0D;IAC1D,kBAAkB,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,MAAM,WAAW,YAAY;IAC3B,iCAAiC;IACjC,UAAU,EAAE,MAAM,CAAC;IACnB,8CAA8C;IAC9C,SAAS,EAAE,MAAM,CAAC;IAClB,gCAAgC;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,iEAAiE;IACjE,gBAAgB,EAAE,MAAM,CAAC;IACzB,4DAA4D;IAC5D,UAAU,EAAE,OAAO,CAAC;IACpB,0DAA0D;IAC1D,WAAW,EAAE,OAAO,CAAC;IACrB,8CAA8C;IAC9C,gBAAgB,EAAE,MAAM,CAAC;IACzB,+DAA+D;IAC/D,YAAY,EAAE,MAAM,CAAC;IACrB,0DAA0D;IAC1D,kBAAkB,EAAE,MAAM,CAAC;IAC3B,yDAAyD;IACzD,gBAAgB,EAAE,MAAM,CAAC;CAC1B"}
|
package/openclaw.plugin.json
CHANGED
|
@@ -3,6 +3,12 @@
|
|
|
3
3
|
"kind": "memory",
|
|
4
4
|
"name": "Walrus Memory",
|
|
5
5
|
"description": "Encrypted, decentralized long-term memory via Walrus Memory",
|
|
6
|
+
"contracts": {
|
|
7
|
+
"tools": [
|
|
8
|
+
"memory_search",
|
|
9
|
+
"memory_store"
|
|
10
|
+
]
|
|
11
|
+
},
|
|
6
12
|
"configSchema": {
|
|
7
13
|
"type": "object",
|
|
8
14
|
"additionalProperties": false,
|
|
@@ -48,9 +54,14 @@
|
|
|
48
54
|
"minimum": 1,
|
|
49
55
|
"maximum": 50,
|
|
50
56
|
"description": "Recent messages window for auto-capture"
|
|
57
|
+
},
|
|
58
|
+
"requestTimeoutMs": {
|
|
59
|
+
"type": "number",
|
|
60
|
+
"minimum": 1000,
|
|
61
|
+
"maximum": 60000,
|
|
62
|
+
"description": "Per-request deadline for relayer calls (default: 10000)"
|
|
51
63
|
}
|
|
52
|
-
}
|
|
53
|
-
"required": ["privateKey", "accountId", "serverUrl"]
|
|
64
|
+
}
|
|
54
65
|
},
|
|
55
66
|
"uiHints": {
|
|
56
67
|
"privateKey": {
|
|
@@ -66,7 +77,7 @@
|
|
|
66
77
|
},
|
|
67
78
|
"serverUrl": {
|
|
68
79
|
"label": "Walrus Memory Server URL",
|
|
69
|
-
"placeholder": "https://relayer.
|
|
80
|
+
"placeholder": "https://relayer-staging.memory.walrus.xyz"
|
|
70
81
|
},
|
|
71
82
|
"defaultNamespace": {
|
|
72
83
|
"label": "Default Namespace",
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@mysten-incubation/oc-memwal",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.6-dev.1",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"description": "NemoClaw/OpenClaw memory plugin — encrypted, decentralized long-term memory via Walrus Memory",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -36,7 +36,7 @@
|
|
|
36
36
|
"dependencies": {
|
|
37
37
|
"@sinclair/typebox": "0.34.48",
|
|
38
38
|
"zod": "^3.23.0",
|
|
39
|
-
"@mysten-incubation/memwal": "0.
|
|
39
|
+
"@mysten-incubation/memwal": "0.1.6"
|
|
40
40
|
},
|
|
41
41
|
"devDependencies": {
|
|
42
42
|
"@types/node": "^22.0.0",
|
|
@@ -50,6 +50,7 @@
|
|
|
50
50
|
"scripts": {
|
|
51
51
|
"build": "tsc",
|
|
52
52
|
"typecheck": "tsc --noEmit",
|
|
53
|
+
"test": "tsc && node --test \"test/**/*.test.mjs\"",
|
|
53
54
|
"clean": "node -e \"require('fs').rmSync('dist',{recursive:true,force:true})\""
|
|
54
55
|
}
|
|
55
56
|
}
|