Commit 0313068
merge: sync upstream main (59 commits) into dev
Upstream catch-up from volcengine/OpenViking main at a18d4b9.
Auto-merged (24 files): README, bot/config, crates/ov_cli, session/session.py,
session/compressor{,_v2}.py, session/memory_deduplicator.py, memory_extractor.py,
schema_model_generator.py, utils/uri.py, storage/viking_fs.py,
storage/transaction/lock_manager.py, storage/queuefs/semantic_processor.py,
retrieve/hierarchical_retriever.py, server/routers/content.py, server/routers/search.py,
core/directories.py, prompts/templates/memory/preferences.yaml,
examples/openclaw-plugin/{index,text-utils}.ts, examples/ov.conf.example,
openviking_cli/utils/config/{memory_config,open_viking_config}.py,
docs/en/concepts/08-session.md.
Hand-resolved conflicts (14 files):
Memory subsystem:
- entities.yaml: adopt upstream category field + event linking, keep our
brain-hardening rules (canonical names, Aliases section, one-card-per-entity).
Removed upstream's Caroline LoCoMo leak.
- events.yaml: adopt upstream year/month/day folder template.
- memory_updater.py: keep dev's two-function _apply_write/_apply_edit structure
with collision-safe entity writes, port get_year/get_month/get_day helpers
to ExtractContext for events.yaml template to work.
- session_extract_context_provider.py: keep dev's [Keywords] bug fix
(_derive_search_keywords) — upstream volcengine#1159 did not address this.
- extract_loop.py: keep dev's small-model extraction path. Dev's hard_cap
iteration extension is more sophisticated than upstream's version.
Storage:
- collection_schemas.py: combine dev's BGE-M3 truncation (30k chars) with
upstream volcengine#1301 embed_compat async wrapper.
- queuefs/semantic_dag.py: combine dev's old_summary hash comparison with
upstream's defensive null check on cached summary.
- queuefs/semantic_queue.py: keep dev's 300-second dedup window with
_TrackedSemanticRequest dataclass.
- utils/summarizer.py: take upstream — convergent fix, upstream is superset
of our context_type centralization plus resource cover handling.
Models:
- openai_vlm.py: merge timeout signature (float | None = 60.0).
Plugin (TypeScript):
- config.ts: keep dev's profileInjection/recallFormat/alignment fields,
add upstream's bypassSessionPatterns deprecation alias.
- client.ts: merge addSessionMessage signature
(sessionId, role, content, parts?, agentId?, createdAt?), keep dev's
createSession(), combine body building with optional created_at.
- context-engine.ts: keep dev's driftDetector + alignment, add upstream's
isBypassedSession helper + bypass early-return in doCommit/afterTurn.
Drop upstream's inline afterTurn commit block — dev routes through
doCommitOVSession. Update addSessionMessage call to 6-arg form.
- memory-ranking.ts: keep dev's multi-slot recall + tool-experience
separation architecture.
Deferred upstream changes:
- volcengine#1221 agfs→ragfs Rust rewrite: new Rust crates land but Python code
unchanged; pyagfs handles auto-fallback via RAGFS_IMPL env var.
- volcengine#1159 memory_updater unified operations refactor: kept dev's separate
write/edit function structure to avoid cascading schema changes through
extract_loop and related files.
Critical security + bug fixes preserved from upstream:
- volcengine#1319 leaked token removed from settings.py
- volcengine#1133 SSRF hardening on HTTP resource ingestion
- volcengine#1297 sanitize and cap recall queries (wraps our plugin recall)
- volcengine#1277 configurable embedding circuit breaker
- volcengine#1279 trusted mode without API key restricted to localhost
- volcengine#1211 PID lock recycle + ownership checks + compressor refs
- volcengine#1182 task API ownership leakage fix in content.py
- volcengine#1301 embedder async contention reduction
- volcengine#1226 prevent VLM blocking startup hang in redo recovery
- volcengine#769/volcengine#792 queuefs dedupe memory semantic parent enqueues
Critical dev fixes preserved:
- [Keywords] placeholder root-cause fix (brain-hardening plan phase 1)
- Episodic memory v2 (retrieval scope, category boosts, archive filter)
- Qwen-9B small-model extraction compatibility
- Plugin recall refactor (tool-experience separation, multi-tier recall)
- Context-type centralized inference (convergent with upstream fix)
- BGE-M3 embedding input truncation
- URI normalization + collision-safe entity writes
Merged on dev-local2 safety branch. Next steps: build + test before
fast-forwarding dev.
Co-Authored-By: claude-flow <ruv@ruv.net>File tree
455 files changed
+58940
-4883
lines changed- .github/workflows
- benchmark
- RAG
- config
- scripts
- src
- adapters
- core
- custom
- locomo
- mem0
- openclaw
- vikingbot
- skillsbench
- bot
- demo/werewolf
- eval/locomo
- scripts
- tests
- vikingbot
- agent
- bus
- channels
- cli
- config
- hooks/builtins
- openviking_mount
- providers
- sandbox/backends
- crates
- ov_cli/src
- commands
- ragfs-python
- src
- ragfs
- src
- core
- plugins
- kvfs
- localfs
- memfs
- queuefs
- s3fs
- serverinfofs
- sqlfs
- server
- shell
- docs
- en
- api
- concepts
- guides
- images
- zh
- api
- concepts
- faq
- guides
- examples
- claude-code-memory-plugin
- scripts
- openclaw-plugin
- __tests__
- health_check_tools
- images
- setup-helper
- tests
- e2e
- ut
- opencode-memory-plugin
- openviking_cli
- client
- utils/config
- openviking
- client
- console
- static
- core
- crypto
- models
- embedder
- rerank
- vlm
- backends
- parse
- ovpack
- parsers
- code
- ast
- languages
- prompts/templates/memory
- pyagfs
- retrieve
- server
- routers
- service
- session
- memory
- merge_op
- utils
- storage
- observers
- queuefs
- transaction
- vectordb_adapters
- vectordb
- collection
- utils
- telemetry
- utils
- tests
- api_test
- api
- resources
- scenarios
- resources_retrieval
- sessions
- stability_error
- sessions
- tools/checkers
- client
- integration
- misc
- oc2ov_test
- config
- tests
- advanced
- long_term
- p0
- session
- skill
- utils
- parse
- server
- session
- memory
- storage
- telemetry
- transaction
- unit
- crypto
- utils
- third_party/agfs/agfs-server/pkg/plugins/s3fs
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
455 files changed
+58940
-4883
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
237 | 237 | | |
238 | 238 | | |
239 | 239 | | |
| 240 | + | |
240 | 241 | | |
241 | 242 | | |
242 | 243 | | |
| 244 | + | |
| 245 | + | |
243 | 246 | | |
244 | 247 | | |
245 | 248 | | |
| 249 | + | |
| 250 | + | |
246 | 251 | | |
247 | 252 | | |
248 | 253 | | |
| |||
257 | 262 | | |
258 | 263 | | |
259 | 264 | | |
| 265 | + | |
| 266 | + | |
260 | 267 | | |
261 | 268 | | |
262 | 269 | | |
| |||
276 | 283 | | |
277 | 284 | | |
278 | 285 | | |
279 | | - | |
280 | 286 | | |
281 | | - | |
282 | 287 | | |
283 | | - | |
284 | 288 | | |
285 | 289 | | |
286 | 290 | | |
| |||
405 | 409 | | |
406 | 410 | | |
407 | 411 | | |
| 412 | + | |
408 | 413 | | |
409 | 414 | | |
410 | 415 | | |
| 416 | + | |
| 417 | + | |
411 | 418 | | |
412 | 419 | | |
413 | 420 | | |
| 421 | + | |
| 422 | + | |
414 | 423 | | |
415 | 424 | | |
416 | 425 | | |
| |||
425 | 434 | | |
426 | 435 | | |
427 | 436 | | |
| 437 | + | |
| 438 | + | |
428 | 439 | | |
429 | 440 | | |
430 | 441 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
| 1 | + | |
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
| |||
42 | 42 | | |
43 | 43 | | |
44 | 44 | | |
| 45 | + | |
45 | 46 | | |
46 | 47 | | |
| 48 | + | |
47 | 49 | | |
48 | | - | |
| 50 | + | |
49 | 51 | | |
50 | 52 | | |
51 | 53 | | |
| |||
58 | 60 | | |
59 | 61 | | |
60 | 62 | | |
61 | | - | |
| 63 | + | |
| 64 | + | |
62 | 65 | | |
63 | 66 | | |
64 | | - | |
| 67 | + | |
65 | 68 | | |
66 | 69 | | |
67 | 70 | | |
68 | | - | |
69 | | - | |
70 | | - | |
71 | | - | |
72 | | - | |
73 | | - | |
74 | | - | |
75 | | - | |
76 | 71 | | |
77 | 72 | | |
78 | | - | |
| 73 | + | |
79 | 74 | | |
80 | 75 | | |
81 | 76 | | |
| |||
84 | 79 | | |
85 | 80 | | |
86 | 81 | | |
87 | | - | |
| 82 | + | |
88 | 83 | | |
89 | 84 | | |
90 | 85 | | |
| |||
94 | 89 | | |
95 | 90 | | |
96 | 91 | | |
97 | | - | |
| 92 | + | |
98 | 93 | | |
99 | 94 | | |
100 | 95 | | |
| |||
109 | 104 | | |
110 | 105 | | |
111 | 106 | | |
112 | | - | |
| 107 | + | |
113 | 108 | | |
114 | 109 | | |
115 | 110 | | |
| |||
415 | 410 | | |
416 | 411 | | |
417 | 412 | | |
418 | | - | |
| 413 | + | |
| 414 | + | |
419 | 415 | | |
420 | 416 | | |
421 | 417 | | |
| |||
433 | 429 | | |
434 | 430 | | |
435 | 431 | | |
436 | | - | |
| 432 | + | |
437 | 433 | | |
438 | 434 | | |
439 | 435 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
8 | 8 | | |
9 | 9 | | |
10 | 10 | | |
| 11 | + | |
11 | 12 | | |
12 | 13 | | |
13 | 14 | | |
| |||
52 | 53 | | |
53 | 54 | | |
54 | 55 | | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
55 | 62 | | |
56 | 63 | | |
57 | 64 | | |
58 | 65 | | |
59 | | - | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
60 | 69 | | |
61 | 70 | | |
62 | 71 | | |
| 72 | + | |
| 73 | + | |
63 | 74 | | |
64 | 75 | | |
65 | 76 | | |
66 | 77 | | |
67 | | - | |
68 | | - | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
69 | 93 | | |
70 | 94 | | |
71 | 95 | | |
72 | 96 | | |
73 | | - | |
| 97 | + | |
| 98 | + | |
74 | 99 | | |
75 | 100 | | |
76 | 101 | | |
77 | 102 | | |
78 | 103 | | |
79 | | - | |
| 104 | + | |
80 | 105 | | |
81 | | - | |
82 | | - | |
83 | | - | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
84 | 109 | | |
85 | | - | |
| 110 | + | |
86 | 111 | | |
87 | 112 | | |
88 | | - | |
89 | | - | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
90 | 129 | | |
91 | 130 | | |
92 | 131 | | |
| |||
117 | 156 | | |
118 | 157 | | |
119 | 158 | | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
120 | 165 | | |
121 | 166 | | |
122 | 167 | | |
123 | 168 | | |
124 | | - | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
125 | 172 | | |
126 | 173 | | |
127 | 174 | | |
| 175 | + | |
| 176 | + | |
128 | 177 | | |
129 | 178 | | |
130 | 179 | | |
131 | 180 | | |
132 | | - | |
| 181 | + | |
133 | 182 | | |
134 | 183 | | |
135 | | - | |
136 | | - | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
137 | 193 | | |
138 | 194 | | |
139 | 195 | | |
140 | 196 | | |
141 | 197 | | |
142 | 198 | | |
143 | | - | |
144 | | - | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
145 | 208 | | |
146 | | - | |
| 209 | + | |
| 210 | + | |
147 | 211 | | |
148 | 212 | | |
149 | | - | |
150 | | - | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
151 | 219 | | |
152 | 220 | | |
153 | 221 | | |
| 222 | + | |
154 | 223 | | |
155 | 224 | | |
156 | | - | |
157 | | - | |
158 | | - | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
159 | 236 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
26 | | - | |
27 | | - | |
28 | | - | |
29 | 26 | | |
30 | 27 | | |
0 commit comments