Self-evolving Context Database for AI Agents. Unify Agent Memory, Knowledge RAG and Skills.
Python agent-contextagent-memoryagent-pluginsagentic-ragcontext-databasedsh-pluginknowledge-basememorymemory-managementself-evolvingvector-database
chore(agent-tools): converge MCP tool names (#1851)
Mingjian Quea5649a4d20fe
diff --git a/docs/en/agent-integrations/04-other-plugins.md b/docs/en/agent-integrations/04-other-plugins.mdindex 8b7bb4094..ae70c9203 100644--- a/docs/en/agent-integrations/04-other-plugins.md+++ b/docs/en/agent-integrations/04-other-plugins.md@@ -13,7 +13,7 @@ A minimal MCP-only server for [Codex](https://github.com/openai/codex). Intentio- no writes to `~/.codex`- no checked-in build output-Codex gets four explicit memory tools: `openviking_recall`, `openviking_store`, plus a couple more.+Codex gets four explicit memory tools: `find`, `remember`, plus a couple more.If you only need explicit memory operations from Codex (no auto-recall or auto-capture), this is the simplest option.diff --git a/docs/plans/agent-tool-name-convergence.md b/docs/plans/agent-tool-name-convergence.mdnew file mode 100644index 000000000..74d2b0a3e--- /dev/null+++ b/docs/plans/agent-tool-name-convergence.md@@ -0,0 +1,129 @@+# OpenViking Agent 工具名与通用接口收敛++这份文档从现有插件真实暴露的工具和 hook 出发,整理 OpenViking 面向不同 Agent 提供通用能力时的命名和下沉边界。++当前结论:OpenViking 自己提供的通用 Agent / MCP 工具名默认不带 `viking_` 前缀,例如 `find`、`search`、`remember`、`forget`、`health`。原因是工具执行入口已经是 OpenViking MCP server 或 OpenViking 插件,`viking://` URI 也已经表达了资源域;继续在工具名里重复 `viking_` 只会增加噪音。Hermes 是例外:它在 Hermes 官方仓里作为 memory provider 接入,宿主内可能同时存在其他 memory provider,因此可以保留 `viking_*` 作为 provider 级显式区分。++判断标准:只有不改变原功能、默认 scope、参数语义、返回语义和 lifecycle 行为时,才标记为“可以直接收敛”。如果多个插件重复实现同一能力,才考虑把能力下沉为 OpenViking 通用接口;单宿主专用能力继续留在插件内。++本次盘点覆盖:++- 本仓插件:OpenClaw、Claude Code、Codex MCP、opencode-memory-plugin、opencode skill plugin。+- 本仓外插件:Hermes 官方仓内置 OpenViking memory provider,本仓没有实现代码,本 PR 只记录命名原则。+- 通用 MCP 客户端:Cursor / Trae / Manus / Claude Desktop / ChatGPT 等直接消费 OV server `/mcp`。++## OpenViking 通用工具名++| 通用工具名 / 能力名 | 当前是否由 OV 提供 | 说明 |+|---|---|---|+| `find` | 是:REST `/api/v1/search/find`、MCP `find`、CLI `ov find` | 轻量语义检索。调用方决定 `target_uri`、limit、score threshold 和展示格式。 |+| `search` | 是:REST `/api/v1/search/search`、MCP `search`、CLI `ov search` | session-aware / deep search。可结合 `session_id` 做上下文检索。 |+| `remember` | 是:REST `/api/v1/sessions/*`、MCP `remember` | 写入消息并 commit,触发 memory extraction。 |+| `forget` | 是:REST `DELETE /api/v1/fs`、MCP `forget`、CLI `ov rm` | 按明确 `viking://` URI 删除。 |+| `health` | 是:REST `/health`、MCP `health`、CLI `ov health` | 检查 OpenViking server 可达性和基础健康状态。 |+| `read` | 是:REST `/api/v1/content/read`、MCP `read`、CLI `ov read` | 读取指定 URI 的内容。 |+| `list` | 是:REST `/api/v1/fs/ls`、MCP `list`、CLI `ov ls` | 列出目录或命名空间下的节点。 |+| `add_resource` | 是:REST `/api/v1/resources`、MCP `add_resource`、CLI `ov add-resource` | 添加外部资源。 |+| `grep` / `glob` | 是:REST `/api/v1/search/grep` 等、MCP `grep` / `glob`、CLI `ov grep` / `ov glob` | 精确文本检索和路径匹配。 |+| `import` | 否 | OpenClaw 的 `ov_import` 同时覆盖 resource / skill 导入,目前 OV 没有完全等价的单一通用工具。 |+| `archive_search` / `archive_read` | 否 | OpenClaw archive 工具绑定 session archive 语义,目前 OV 只有底层 grep/read 能力。 |++## 1. Search++Search 是显式搜索:用户或模型主动发起 query,目标是查找 memories、resources、skills 或 session context,并把结果作为可继续读取 / 引用的候选返回。OpenViking 已提供 `find` 和 `search` 两层:`find` 是轻量检索,`search` 是 session-aware deep search。++| 插件 / 接入 | 当前暴露工具名 / 入口 | 当前实际调用的 OV 接口 | 能否直接收敛到通用工具名 | 结论 / 原因 |+|---|---|---|---|---|+| OV server `/mcp` | `find` / `search` | 直接调用 `service.search.find()` / `service.search.search()` | 已收敛 | 本 PR 新增 `find`,并让 `search` 保持 deep/session-aware 语义。 |+| Codex MCP | `find` | REST `/api/v1/search/find`,默认 `target_uri=viking://user/memories` | 已收敛到工具名 | 工具名已统一为 `find`;默认 memory-only scope 是 Codex 插件自己的安全约束。 |+| OpenClaw | `memory_search` | REST `/api/v1/search/find`;默认查 resources + agent skills | 否 | `memory_search` 已同步到 `openclaw.plugin.json`;它不等价于通用 `find`。 |+| Claude Code hooks / MCP | 无显式 search 工具;MCP 可直接用 OV `/mcp` 的 `find` / `search` | hooks 底层用 REST;MCP 直连 OV `/mcp` | 不改 | Claude Code 的显式搜索由通用 MCP 承担;hook search 行为归入 Recall。 |+| opencode-memory-plugin | `memsearch` | REST `/api/v1/search/find` 或 `/api/v1/search/search` | 否 | 它有 `auto` / `fast` / `deep` 模式,并会按 OpenCode session 自动选择接口和注入 `session_id`。 |+| opencode skill plugin | `ov search` / `ov find` 等 CLI 命令 | OV CLI | 已下沉,不改名 | 这是 shell skill,不是 native tool;`ov` 是 CLI 命令名前缀。 |+| Hermes OpenViking provider | `viking_search` | Hermes provider 内部调用 OpenViking semantic search | 不在本 PR 改 | Hermes 是外部官方仓 provider,工具名保留 `viking_*` 用于和其他 memory provider 区分。 |++## 2. Recall++Recall 是上下文召回:宿主在 prompt lifecycle 中自动取回相关 memory / skill / resource,并决定排序、预算、注入格式和触发时机。它不是简单的用户显式搜索,因此当前不定义一个通用 `recall` 工具名;底层可以复用 `find`、`search`、`read`。++| 插件 / 接入 | 当前暴露工具名 / 入口 | 当前实际调用的 OV 接口 | 能否直接收敛到通用工具名 | 结论 / 原因 |+|---|---|---|---|---|+| OpenClaw | `memory_recall` | REST `/api/v1/search/find`;默认并行查 user/agent memories,配置开启时追加 resources | 否 | 它是 OpenClaw 的记忆召回工具,默认 scope、资源开关、去重和返回格式都属于宿主语义。 |+| Claude Code hooks | `UserPromptSubmit` 自动召回,无模型可见工具名 | REST `/api/v1/search/find` + `/api/v1/content/read` | 不改 | hook 负责多 scope、ranking、token budget 和注入格式,底层已复用 OV。 |+| opencode-memory-plugin | 自动上下文注入路径 | REST `/api/v1/search/find` 或 `/api/v1/search/search` | 不改 | 召回绑定 OpenCode session 和注入策略,不是一个独立通用工具名。 |+| Codex MCP | 无自动 recall;模型显式调用 `find` | REST `/api/v1/search/find` | 不涉及 | Codex MCP 插件是显式工具,不做 lifecycle recall。 |+| opencode skill plugin | 无自动 recall;模型按 skill 说明调用 CLI | OV CLI | 不涉及 | shell skill 不做宿主 lifecycle 注入。 |+| Hermes OpenViking provider | 自动 provider context / prefetch | provider turn 前 prefetch 相关 memories 并注入 system prompt | 不在本 PR 改 | Hermes memory provider lifecycle 自带 recall:turn 前预取、非阻塞注入;不是 OV 通用 `recall` 工具。 |++## 3. Remember++Remember 是写入长期记忆:把文本、消息或会话内容写入 OpenViking session,并触发 commit / memory extraction。OV 通用能力名就是 `remember`;`memory_store` 只是 OpenClaw 当前宿主工具名,不代表 OV 还要提供另一个通用写入工具。++| 插件 / 接入 | 当前暴露工具名 / 入口 | 当前实际调用的 OV 接口 | 能否直接收敛到通用工具名 | 结论 / 原因 |+|---|---|---|---|---|+| OV server `/mcp` | `remember` | session message + commit | 已收敛 | 通用 MCP 客户端直接使用 `remember`。 |+| Codex MCP | `remember` | REST `/api/v1/sessions/*` | 已收敛到工具名 | 工具名已统一为 `remember`;插件仍保留同步等待提取结果的返回语义。 |+| OpenClaw | `memory_store` | REST `/api/v1/sessions/*` | 否 | 它会写 session message、commit、等待提取,并绑定 OpenClaw 的 session/agent 映射。是否改名仍需单独评估。 |+| Claude Code hooks | `Stop` / `PreCompact` / `SessionEnd` / `SubagentStop` 自动捕获,无模型可见工具名 | REST `/api/v1/sessions/*` | 不改 | hook 负责 transcript 解析、增量状态、subagent 隔离和异步写,底层已复用 OV。 |+| opencode-memory-plugin | `memcommit` | REST `/api/v1/sessions/{id}/messages` + `/commit` | 否 | 它绑定当前 OpenCode session,会先 flush pending messages,并等待或跟踪记忆提取。 |+| opencode skill plugin | 无 native remember 工具;模型按 skill 说明调用 CLI 写入/导入 | OV CLI | 不涉及 | shell skill 不注册 native tool。 |+| Hermes OpenViking provider | `viking_remember`;turn 后 `sync_turn()`;session end commit | `POST /sessions/{id}/messages` + `POST /sessions/{id}/commit` | 不在本 PR 改 | Hermes provider 会在响应后同步 conversation turn,并在 session end 触发 extraction;`viking_remember` 是显式记忆标注工具。 |++## 4. Forget++接口功能:按明确 `viking://` URI 删除 OpenViking 中的记忆或资源。++| 插件 / 接入 | 当前暴露工具名 / 入口 | 当前实际调用的 OV 接口 | 能否直接收敛到通用工具名 | 结论 / 原因 |+|---|---|---|---|---|+| OV server `/mcp` | `forget` | `DELETE /api/v1/fs` | 已收敛 | 通用 MCP 工具名就是 `forget`。 |+| Codex MCP | `forget` | `DELETE /api/v1/fs` | 已收敛 | 本 PR 将 Codex MCP 的删除工具改为 `forget`。 |+| OpenClaw | `memory_forget` | `DELETE /api/v1/fs`,必要时先 search 候选 | 否 | 它还支持按 query 搜索候选并删除唯一高置信 memory,不等价于通用 URI 删除。 |+| Claude Code hooks / MCP | hooks 无 forget;MCP 可直接用 OV `/mcp` 的 `forget` | OV `/mcp` 或 REST `DELETE /api/v1/fs` | 已下沉,不改 | 删除是显式危险操作,Claude Code 通过 MCP 工具使用 OV 通用能力。 |+| opencode-memory-plugin | 无独立 forget native tool | 无 | 不涉及 | 当前插件主能力是 search/read/browse/commit。 |+| opencode skill plugin | `ov rm` | OV CLI | 已下沉,不改名 | 这是 CLI 能力,不是 Agent native tool 命名。 |+| Hermes OpenViking provider | 无公开 `viking_forget` 工具 | 无公开删除路径 | 不在本 PR 改 | 最新 Hermes OpenViking provider 公开工具列举不包含 forget。 |++## 5. Health++接口功能:检查 OpenViking server 是否可达、可用。++| 插件 / 接入 | 当前暴露工具名 / 入口 | 当前实际调用的 OV 接口 | 能否直接收敛到通用工具名 | 结论 / 原因 |+|---|---|---|---|---|+| OV server `/mcp` | `health` | `/health` | 已收敛 | 通用 MCP 工具名就是 `health`。 |+| Codex MCP | `health` | `/health` | 已收敛 | 本 PR 将 Codex MCP 的健康检查工具改为 `health`。 |+| OpenClaw | 无模型可见 health 工具 | 初始化时调用 `/health` | 不涉及 | OpenClaw 只在插件初始化时探活,不需要暴露工具。 |+| Claude Code hooks / MCP | 无专用 health hook;MCP 可直接用 OV `/mcp` 的 `health` | OV `/mcp` 或 REST `/health` | 已下沉,不改 | 健康检查属于通用 MCP 能力。 |+| opencode-memory-plugin | 无独立 health native tool | 插件初始化 / 客户端可探活 | 不涉及 | 不作为模型可见工具收敛。 |+| opencode skill plugin | `ov health` | OV CLI | 已下沉,不改名 | 这是 CLI 命令名前缀。 |+| Hermes OpenViking provider | 无公开 `viking_health` 工具 | 配置 / provider 初始化检查 endpoint | 不在本 PR 改 | 最新公开工具列举不包含 health。 |++## 6. Import / Archive / Read / Browse++这些能力当前不能简单改名到通用工具,因为宿主语义尚未完全下沉。++| 插件 / 接入 | 当前暴露工具名 / 入口 | 当前实际调用的 OV 接口 | 能否直接收敛到通用工具名 | 结论 / 原因 |+|---|---|---|---|---|+| OpenClaw | `ov_import` | resource 走 `/api/v1/resources` / `add_resource`;skill 走 `/api/v1/skills` | 否 | 同时覆盖 resource / skill 导入,OV 还没有完全等价的 `import` 通用工具。 |+| OpenClaw | `ov_archive_search` | REST `/api/v1/search/grep` 等底层能力 | 否 | 语义是搜索当前 session history archive,不是通用 grep。 |+| OpenClaw | `ov_archive_expand` | REST `/api/v1/sessions/{id}/archives/{archive_id}` | 否 | 语义是读取当前 session archive 片段,不是通用 read。 |+| Codex MCP | 无 import / archive / browse 工具;可通过 OV `/mcp` 使用 `read` 等通用能力 | REST / MCP | 不涉及 | Codex 示例插件只保留显式 memory 四件套。 |+| Claude Code hooks / MCP | MCP 可直接用 OV `/mcp` 的 `read` / `list` / `add_resource` / `grep` / `glob` | OV `/mcp` | 已下沉,不改 | Claude Code 插件 `.mcp.json` 指向 OV server,直接消费通用 MCP 工具。 |+| opencode-memory-plugin | `memread` | REST `/api/v1/content/{abstract,overview,read}` + `/api/v1/fs/stat` | 否 | 它支持 `auto` 层级,会先 stat 再选择 overview/read。 |+| opencode-memory-plugin | `membrowse` | REST `/api/v1/fs/ls` / `tree` / `stat` | 否 | 它把 `list` / `tree` / `stat` / `simple` 视图合成一个工具。 |+| opencode skill plugin | `ov search` / `ov read` / `ov ls` / `ov rm` 等 CLI 命令 | OV CLI | 已下沉,不改名 | 这是 shell skill,不是 native tool;`ov` 是 CLI 命令名前缀,不属于 Agent 工具名收敛问题。 |+| Hermes OpenViking provider | `viking_read` / `viking_browse` / `viking_add_resource` | provider 内部调用 OpenViking read / browse / resource ingest | 不在本 PR 改 | Hermes 最新公开工具包含 read、browse、add_resource;未公开 archive_search / archive_read。 |++## 本 PR 的实际收敛++- OV server `/mcp`:提供 `find` 和 `search` 两层显式搜索;`find` 是轻量检索,`search` 是 session-aware deep search。+- Codex MCP:当前暴露 `find`、`remember`、`forget`、`health`,全部不带 `viking_` 前缀。+- OpenClaw:当前暴露 `memory_search` 并同步 `openclaw.plugin.json`;`memory_recall` 继续作为召回语义保留,不和 search 混成一个通用工具。+- 不引入新的 ToolCatalog / agent tools 抽象,不迁移 Claude Code、opencode、Hermes 的既有工具名和执行语义。++## 后续下沉原则++1. OpenViking 直接提供的通用 Agent / MCP 工具名不带 `viking_` 前缀。+2. Hermes 这类外部 provider 场景可以保留 `viking_*`,用于和宿主内其他 provider 显式区分。+3. 先看插件是否能无语义变化调用 OV 已有接口;能就直接收敛。+4. OV 没有接口,但多个插件都重复实现同一能力,再补一个具体 OV 通用接口。+5. 只有单个宿主需要,或依赖宿主 lifecycle、默认 scope、返回格式的能力,继续留在插件里。diff --git a/docs/zh/agent-integrations/04-other-plugins.md b/docs/zh/agent-integrations/04-other-plugins.mdindex 18cb7b32a..5b67a42b6 100644--- a/docs/zh/agent-integrations/04-other-plugins.md+++ b/docs/zh/agent-integrations/04-other-plugins.md@@ -13,7 +13,7 @@- 不写 `~/.codex`- 不留 build 产物-Codex 拿到的只是几个显式记忆工具:`openviking_recall`、`openviking_store`,外加几个辅助。+Codex 拿到的只是几个显式记忆工具:`find`、`remember`,外加几个辅助。如果你只需要 Codex 显式调用记忆(不需要自动召回/捕获),这是最简方案。diff --git a/examples/codex-memory-plugin/README.md b/examples/codex-memory-plugin/README.mdindex 06536912c..1a0315be3 100644--- a/examples/codex-memory-plugin/README.md+++ b/examples/codex-memory-plugin/README.md@@ -11,10 +11,10 @@ This example intentionally stays MCP-only:Codex gets four tools:-- `openviking_recall`-- `openviking_store`-- `openviking_forget`-- `openviking_health`+- `find`+- `remember`+- `forget`+- `health`## Files@@ -72,18 +72,18 @@ Supported environment overrides:## Tools-### `openviking_recall`+### `find`-Search OpenViking memory.+Find OpenViking memory.Parameters:-- `query`: search query-- `target_uri`: optional search scope, default `viking://user/memories`+- `query`: find query+- `target_uri`: optional find scope, default `viking://user/memories`- `limit`: optional max results- `score_threshold`: optional minimum score-### `openviking_store`+### `remember`Store a memory by creating a short OpenViking session, adding the text, andcommitting the session. Memory creation is extraction-dependent; the tool@@ -94,16 +94,16 @@ Parameters:- `text`: information to store- `role`: optional message role, default `user`-### `openviking_forget`+### `forget`Delete an exact memory URI. This example intentionally does not auto-delete by-query; use `openviking_recall` first, then pass the exact URI.+query; use `find` first, then pass the exact URI.Parameters:- `uri`: exact `viking://user/.../memories/...` or `viking://agent/.../memories/...` URI-### `openviking_health`+### `health`Check server reachability.diff --git a/examples/codex-memory-plugin/src/memory-server.ts b/examples/codex-memory-plugin/src/memory-server.tsindex 61d2100ca..557287be3 100644--- a/examples/codex-memory-plugin/src/memory-server.ts+++ b/examples/codex-memory-plugin/src/memory-server.ts@@ -284,11 +284,11 @@ const client = new OpenVikingClient(const server = new McpServer({ name: "openviking-memory-codex", version: "0.1.0" })server.tool(- "openviking_recall",- "Search OpenViking long-term memory.",+ "find",+ "Find OpenViking long-term memory.",{- query: z.string().describe("Search query"),- target_uri: z.string().optional().describe("Search scope URI, default viking://user/memories"),+ query: z.string().describe("Find query"),+ target_uri: z.string().optional().describe("Find scope URI, default viking://user/memories"),limit: z.number().optional().describe("Max results, default 6"),score_threshold: z.number().optional().describe("Minimum relevance score 0-1, default 0.01"),},@@ -310,7 +310,7 @@ server.tool()server.tool(- "openviking_store",+ "remember","Store information in OpenViking long-term memory.",{text: z.string().describe("Information to store"),@@ -352,8 +352,8 @@ server.tool()server.tool(- "openviking_forget",- "Delete an exact OpenViking memory URI. Use openviking_recall first if you only have a query.",+ "forget",+ "Delete an exact OpenViking memory URI. Use find first if you only have a query.",{uri: z.string().describe("Exact memory URI to delete"),},@@ -368,7 +368,7 @@ server.tool()server.tool(- "openviking_health",+ "health","Check whether the OpenViking server is reachable.",{},async () => {diff --git a/examples/openclaw-plugin/DISCUSSION-ov-import.md b/examples/openclaw-plugin/DISCUSSION-ov-import.mdindex 1975b55fa..0ffcb5167 100644--- a/examples/openclaw-plugin/DISCUSSION-ov-import.md+++ b/examples/openclaw-plugin/DISCUSSION-ov-import.md@@ -291,16 +291,16 @@ raw SKILL.md or MCP dict- zip 使用纯 JavaScript 实现,避免依赖系统 `zip` 命令。- resource 的 `to` 与 `parent` 保持互斥,沿用服务端约束。-### 8. 导入后的检索入口:ov_search+### 8. 导入后的检索入口:memory_search只提供 `ov_import` 会让体验不闭环:用户可以把 resource 或 skill 导入 OpenViking,但在 OpenClaw 内不一定知道如何检索、读取或验证导入结果。因此建议同时讨论一个轻量检索入口:-- LLM tool:`ov_search`-- slash command:`/ov-search`+- LLM tool:`memory_search`+- slash command:`/memory-search`-`ov_search` 的目标不是替代 OpenViking CLI 的全部能力,而是提供最小闭环:+`memory_search` 的目标不是替代 OpenViking CLI 的全部能力,而是提供最小闭环:1. 导入 resource 或 skill。2. 返回 resource 的 `root_uri` 或 skill 的 `uri`。@@ -321,7 +321,7 @@ raw SKILL.md or MCP dict```textImported OpenViking resource: viking://resources/openviking-readmeProcessing: completed-Try: /ov-search "OpenViking install" --uri viking://resources/openviking-readme+Try: /memory-search "OpenViking install" --uri viking://resources/openviking-readme````ov_import` 导入 skill 后也应返回 skill URI,并给出 skill 检索建议:@@ -329,10 +329,10 @@ Try: /ov-search "OpenViking install" --uri viking://resources/openviking-readme```textImported OpenViking skill: viking://agent/skills/install-openviking-memoryProcessing: completed-Try: /ov-search "<query>" --uri viking://agent/skills+Try: /memory-search "<query>" --uri viking://agent/skills```-#### ov_search 参数设计+#### memory_search 参数设计v1 建议保持简洁:@@ -347,9 +347,9 @@ v1 建议保持简洁:示例命令:```text-/ov-search "OpenViking install" --uri viking://resources/openviking-readme-/ov-search "API usage" --uri viking://resources-/ov-search "<query>" --uri viking://agent/skills+/memory-search "OpenViking install" --uri viking://resources/openviking-readme+/memory-search "API usage" --uri viking://resources+/memory-search "<query>" --uri viking://agent/skills```对应 LLM tool 示例:@@ -362,9 +362,9 @@ v1 建议保持简洁:}```-#### ov_search 返回结果+#### memory_search 返回结果-`ov_search` 应尽量贴近 OpenViking 当前 `/api/v1/search/find` 的返回结构。OpenViking search 的 raw HTTP 返回外层是:+`memory_search` 应尽量贴近 OpenViking 当前 `/api/v1/search/find` 的返回结构。OpenViking find 的 raw HTTP 返回外层是:```ts{@@ -399,7 +399,7 @@ v1 建议保持简洁:}```-因此 `ov_search` 建议也返回两层结果:+因此 `memory_search` 建议也返回两层结果:1. 用户可读的 `content.text`2. 保留 OpenViking 分桶结构的 `details`@@ -496,11 +496,11 @@ v1 建议只返回检索结果摘要和 URI,不直接返回完整文件内容- 避免把大文档直接塞进上下文。- 用户或 LLM 可以基于 URI 再决定是否需要后续 `/ov-read` 或未来的 `ov_read`。-- 保持 `ov_search` 作为导入后的最小消费闭环,而不是完整文件浏览器。+- 保持 `memory_search` 作为导入后的最小消费闭环,而不是完整文件浏览器。#### 是否同时检索 memory/resource/skill-`memory_recall` 当前偏向长期记忆,不适合作为 resource/skill 导入后的默认消费入口。`ov_search` v1 应检索:+`memory_recall` 当前偏向长期记忆,不适合作为 resource/skill 导入后的默认消费入口。`memory_search` v1 应检索:```tsuris = ["viking://resources", "viking://agent/skills"]@@ -516,7 +516,7 @@ targetTypes?: Array<"memory" | "resource" | "skill">;#### 读取与树形查看-`ov_search` 只解决“查到相关上下文”的问题。若用户需要更明确的文件浏览能力,后续可以再讨论:+`memory_search` 只解决“查到相关上下文”的问题。若用户需要更明确的文件浏览能力,后续可以再讨论:- `/ov-read <uri>`- `/ov-tree <uri>`@@ -555,10 +555,10 @@ v1 暂不加入,避免把导入 RFC 扩展成完整 OpenViking CLI replica。- `--to` 与 `--parent` 冲突- `kind=skill` 时拒绝 `to`、`parent`、`reason`、`instruction`-覆盖 `ov_search`:+覆盖 `memory_search`:-- 注册单个 tool:`ov_search`-- 注册单个 command:`/ov-search`+- 注册单个 tool:`memory_search`+- 注册单个 command:`/memory-search`- 未指定 `uri` 时默认检索 `viking://resources` 和 `viking://agent/skills`- 指定 `--uri` 时只检索该范围- OpenViking error response 透传为可读错误@@ -568,9 +568,9 @@ v1 暂不加入,避免把导入 RFC 扩展成完整 OpenViking CLI replica。```text/ov-import ./README.md --to viking://resources/openviking-readme --wait-/ov-search "OpenViking install" --uri viking://resources/openviking-readme+/memory-search "OpenViking install" --uri viking://resources/openviking-readme/ov-import ./skills/install-openviking-memory --kind skill --wait-/ov-search "install OpenViking memory" --uri viking://agent/skills+/memory-search "install OpenViking memory" --uri viking://agent/skills```以及自然语言触发:@@ -594,7 +594,7 @@ v1 暂不加入,避免把导入 RFC 扩展成完整 OpenViking CLI replica。- 但当前建议先使用显式 `--kind skill`,默认 resource,行为更可解释。4. 导入本地大目录前是否需要确认机制?- 当前方案先不加确认;后续可基于文件数量/zip 大小增加保护。-5. `ov_search` v1 是否默认检索 `viking://resources` 和 `viking://agent/skills`?+5. `memory_search` v1 是否默认检索 `viking://resources` 和 `viking://agent/skills`?- 当前建议是。memory 仍交给既有 `memory_recall`,避免职责重叠。6. 是否需要在 v1 同时提供 `/ov-read` 或 `/ov-tree`?- - 当前建议不加,先用 `ov_search` 完成导入后的最小消费闭环。+ - 当前建议不加,先用 `memory_search` 完成导入后的最小消费闭环。diff --git a/examples/openclaw-plugin/README.md b/examples/openclaw-plugin/README.mdindex 11e88672a..729757ae8 100644--- a/examples/openclaw-plugin/README.md+++ b/examples/openclaw-plugin/README.md@@ -159,7 +159,7 @@ Beyond automatic behavior, the plugin exposes six tools directly:- `memory_forget`: delete by URI, or search first and remove a single strong match- `ov_archive_expand`: expand a concrete archive back into raw messages- `ov_import`: import a resource or skill; defaults to resource and uses `kind: "skill"` for skills-- `ov_search`: search OpenViking resources and skills, especially after importing them+- `memory_search`: search OpenViking resources and skills, especially after importing themThey serve different roles:@@ -168,7 +168,7 @@ They serve different roles:- `memory_store` is for immediately persisting clearly important information- `ov_archive_expand` is the "go back to archive detail" escape hatch when summaries are not enough- `ov_import` lets the agent complete explicit import requests without asking the user to remember slash commands-- `ov_search` closes the loop after import by letting the user or agent confirm and consume resources and skills+- `memory_search` closes the loop after import by letting the user or agent confirm and consume resources and skills`ov_archive_expand` is especially important because `assemble()` normally returns archive summaries and indexes, not the full raw transcript.@@ -184,8 +184,8 @@ The plugin also registers explicit slash commands for manual imports:```text/ov-import ./README.md --to viking://resources/openviking-readme --wait/ov-import ./skills/install-openviking-memory --kind skill --wait-/ov-search "OpenViking install" --uri viking://resources/openviking-readme-/ov-search "memory install skill" --uri viking://agent/skills+/memory-search "OpenViking install" --uri viking://resources/openviking-readme+/memory-search "memory install skill" --uri viking://agent/skills```Resource import supports remote URLs, Git URLs, local files, local directories, and uploaded zip files. OpenViking's built-in parsers cover common documents and media such as Markdown, text, PDF, HTML, Word, PowerPoint, Excel, EPUB, images, audio, and video. Directory imports also accept common code, documentation, and config file extensions such as `.py`, `.js`, `.ts`, `.go`, `.rs`, `.java`, `.cpp`, `.json`, `.yaml`, `.toml`, `.csv`, `.rst`, `.proto`, `.tf`, and `.vue`.@@ -200,7 +200,7 @@ The plugin operates exclusively in remote mode as a pure HTTP client:- `baseUrl` and optional `apiKey` come from plugin config- no local subprocess is started or managed-- session context, memory find/read, commit, and archive expansion behavior stays the same+- session context, memory search/read, commit, and archive expansion behavior stays the sameThe OpenViking service must be deployed and running independently before the plugin can connect to it.diff --git a/examples/openclaw-plugin/README_CN.md b/examples/openclaw-plugin/README_CN.mdindex 3a3deca18..b89d921f8 100644--- a/examples/openclaw-plugin/README_CN.md+++ b/examples/openclaw-plugin/README_CN.md@@ -159,7 +159,7 @@ preflight 阶段的 `assemble()` 并不是简单地把旧聊天记录塞回来- `memory_forget`:按 URI 删除,或先搜索再删除唯一高置信候选- `ov_archive_expand`:展开某个 archive 的原始消息- `ov_import`:导入 resource 或 skill;默认 resource,导入 skill 时使用 `kind: "skill"`-- `ov_search`:检索 OpenViking resources 和 skills,尤其用于导入后的确认和消费+- `memory_search`:检索 OpenViking resources 和 skills,尤其用于导入后的确认和消费它们各自的作用不同:@@ -168,7 +168,7 @@ preflight 阶段的 `assemble()` 并不是简单地把旧聊天记录塞回来- `memory_store` 适合把一段明确的重要信息立刻落入记忆管线。- `ov_archive_expand` 负责在 summary 不够细时回到 archive 级原文。- `ov_import` 让 agent 在用户明确提出导入需求时直接完成操作,不要求用户记住 slash command。-- `ov_search` 补齐导入后的使用闭环,让用户或 agent 可以确认并消费 resources 和 skills。+- `memory_search` 补齐导入后的使用闭环,让用户或 agent 可以确认并消费 resources 和 skills。其中 `ov_archive_expand` 是 `assemble()` 的重要补充,因为 `assemble()` 默认给的是压缩后的索引和摘要,而不是完整历史正文。@@ -184,8 +184,8 @@ Resource 和 skill 保持两个入口,因为它们落在不同 OpenViking 命```text/ov-import ./README.md --to viking://resources/openviking-readme --wait/ov-import ./skills/install-openviking-memory --kind skill --wait-/ov-search "OpenViking install" --uri viking://resources/openviking-readme-/ov-search "memory install skill" --uri viking://agent/skills+/memory-search "OpenViking install" --uri viking://resources/openviking-readme+/memory-search "memory install skill" --uri viking://agent/skills```Resource 导入支持远程 URL、Git URL、本地文件、本地目录和 zip。OpenViking 内置 parser 覆盖常见文档和媒体类型,例如 Markdown、纯文本、PDF、HTML、Word、PowerPoint、Excel、EPUB、图片、音频和视频。目录导入还支持常见代码、文档和配置扩展名,例如 `.py`、`.js`、`.ts`、`.go`、`.rs`、`.java`、`.cpp`、`.json`、`.yaml`、`.toml`、`.csv`、`.rst`、`.proto`、`.tf`、`.vue`。@@ -200,7 +200,7 @@ Resource 导入支持远程 URL、Git URL、本地文件、本地目录和 zip- `baseUrl` 和可选 `apiKey` 由插件配置提供- 不会启动或管理本地子进程-- session context、memory find/read、commit、archive expand 这些行为保持不变+- session context、memory search/read、commit、archive expand 这些行为保持不变OpenViking 服务需要独立部署并运行,插件才能连接到它。diff --git a/examples/openclaw-plugin/index.ts b/examples/openclaw-plugin/index.tsindex f4350f0f0..2aa43cc07 100644--- a/examples/openclaw-plugin/index.ts+++ b/examples/openclaw-plugin/index.ts@@ -141,7 +141,7 @@ type OvImportInput = {timeout?: number;};-type OvSearchInput = {+type MemorySearchInput = {query: string;uri?: string;limit?: number;@@ -362,13 +362,13 @@ export function parseOvImportCommandArgs(args: string): OvImportInput {};}-export function parseOvSearchCommandArgs(args: string): OvSearchInput {+export function parseMemorySearchCommandArgs(args: string): MemorySearchInput {const parsed = parseFlagArgs(args);- // `/ov-search` only accepts a single query string, so positional segments are+ // `/memory-search` only accepts a single query string, so positional segments are// always re-joined to preserve unquoted multi-word searches.const query = parsed.positionals.join(" ").trim();if (!query) {- throw new Error('Usage: /ov-search "<query>" [--uri URI] [--limit N]');+ throw new Error('Usage: /memory-search "<query>" [--uri URI] [--limit N]');}return {query,@@ -702,7 +702,7 @@ const mergeFindResults = (results: FindResult[]): FindResult => {};};- const formatSearchRows = (result: FindResult): string[] => {+ const formatMemorySearchRows = (result: FindResult): string[] => {const truncateSummary = (value: string, maxChars = 220): string => {const collapsed = value.replace(/\s+/g, " ").trim();if (collapsed.length <= maxChars) {@@ -743,7 +743,7 @@ const mergeFindResults = (results: FindResult[]): FindResult => {];};- const formatSearchText = (query: string, uri: string | undefined, result: FindResult): string => {+ const formatMemorySearchText = (query: string, uri: string | undefined, result: FindResult): string => {if ((result.total ?? 0) <= 0) {const scope = uri ? ` under ${uri}` : "";return `No OpenViking resource or skill results found for "${query}"${scope}.`;@@ -752,12 +752,12 @@ const mergeFindResults = (results: FindResult[]): FindResult => {const lines = [`Found ${result.total ?? 0} OpenViking results for "${query}"${scope}`,"",- ...formatSearchRows(result),+ ...formatMemorySearchRows(result),].filter((line, index, all) => line || (all[index - 1] && all[index + 1]));return lines.join("\n");};- const searchOpenViking = async (input: OvSearchInput, agentId?: string) => {+ const memorySearchOpenViking = async (input: MemorySearchInput, agentId?: string) => {const query = input.query.trim();if (!query) {throw new Error("query is required");@@ -797,7 +797,7 @@ const mergeFindResults = (results: FindResult[]): FindResult => {result = mergeFindResults(successful);}return {- content: [{ type: "text" as const, text: formatSearchText(query, input.uri, result) }],+ content: [{ type: "text" as const, text: formatMemorySearchText(query, input.uri, result) }],details: {action: "searched",query,@@ -851,8 +851,8 @@ const mergeFindResults = (results: FindResult[]): FindResult => {api.registerTool((ctx: ToolContext) => ({- name: "ov_search",- label: "Search (OpenViking)",+ name: "memory_search",+ label: "Memory Search (OpenViking)",description:"Search OpenViking resources and skills. Use after importing, or when the user asks to search OpenViking resources or skills.",parameters: Type.Object({@@ -862,17 +862,17 @@ const mergeFindResults = (results: FindResult[]): FindResult => {}),async execute(_toolCallId: string, params: Record<string, unknown>) {if (isBypassedSession(ctx)) {- return makeBypassedToolResult("ov_search");+ return makeBypassedToolResult("memory_search");}const session = resolvePluginSessionRouting(ctx);- return searchOpenViking({+ return memorySearchOpenViking({query: String((params as { query?: unknown }).query ?? ""),uri: typeof params.uri === "string" ? params.uri : undefined,limit: typeof params.limit === "number" ? params.limit : undefined,}, session.agentId);},}),- { name: "ov_search" },+ { name: "memory_search" },);api.registerCommand?.({@@ -896,21 +896,21 @@ const mergeFindResults = (results: FindResult[]): FindResult => {});api.registerCommand?.({- name: "ov-search",+ name: "memory-search",description: "Search OpenViking resources and skills.",acceptsArgs: true,handler: async (ctx: PluginCommandContext) => {try {if (isBypassedSession(ctx)) {- const bypassed = makeBypassedToolResult("ov_search");+ const bypassed = makeBypassedToolResult("memory_search");return { text: bypassed.content[0]!.text, details: bypassed.details };}const session = resolvePluginSessionRouting(ctx);- const input = parseOvSearchCommandArgs(ctx.args ?? "");- const result = await searchOpenViking(input, session.agentId);+ const input = parseMemorySearchCommandArgs(ctx.args ?? "");+ const result = await memorySearchOpenViking(input, session.agentId);return { text: result.content[0]!.text, details: result.details };} catch (err) {- return { text: `OpenViking search failed: ${err instanceof Error ? err.message : String(err)}` };+ return { text: `OpenViking memory search failed: ${err instanceof Error ? err.message : String(err)}` };}},});diff --git a/examples/openclaw-plugin/openclaw.plugin.json b/examples/openclaw-plugin/openclaw.plugin.jsonindex b9f6d8df7..dece4db23 100644--- a/examples/openclaw-plugin/openclaw.plugin.json+++ b/examples/openclaw-plugin/openclaw.plugin.json@@ -13,7 +13,7 @@"contracts": {"tools": ["ov_import",- "ov_search",+ "memory_search","memory_recall","memory_store","memory_forget",diff --git a/examples/openclaw-plugin/tests/ut/tools.test.ts b/examples/openclaw-plugin/tests/ut/tools.test.tsindex 6048fddad..e6b001ef1 100644--- a/examples/openclaw-plugin/tests/ut/tools.test.ts+++ b/examples/openclaw-plugin/tests/ut/tools.test.ts@@ -2,7 +2,7 @@ import { afterEach, describe, expect, it, vi } from "vitest";import contextEnginePlugin, {parseOvImportCommandArgs,- parseOvSearchCommandArgs,+ parseMemorySearchCommandArgs,tokenizeCommandArgs,} from "../../index.js";import type { FindResultItem } from "../../client.js";@@ -335,7 +335,7 @@ describe("Tool: ov_archive_expand (behavioral)", () => {});});-describe("Tool: ov_import and ov_search (registration)", () => {+describe("Tool: ov_import and memory_search (registration)", () => {it("registers unified import tool with expected parameters", () => {const { tools, api } = setupPlugin();contextEnginePlugin.register(api as any);@@ -351,10 +351,10 @@ describe("Tool: ov_import and ov_search (registration)", () => {expect(props).toHaveProperty("wait");});- it("registers search tool with natural-language trigger guidance", () => {+ it("registers memory_search tool with natural-language trigger guidance", () => {const { tools, api } = setupPlugin();contextEnginePlugin.register(api as any);- const tool = tools.get("ov_search");+ const tool = tools.get("memory_search");expect(tool).toBeDefined();expect(tool!.description).toContain("Search OpenViking resources and skills");expect(tool!.description).toContain("Use after importing");@@ -365,7 +365,7 @@ describe("Tool: ov_import and ov_search (registration)", () => {});});-describe("Tool: ov_search (behavioral)", () => {+describe("Tool: memory_search (behavioral)", () => {it("searches resources and skills by default when no uri is provided", async () => {const fetchMock = vi.fn(async (url: string, init?: RequestInit) => {if (url.endsWith("/api/v1/system/status")) {@@ -421,7 +421,7 @@ describe("Tool: ov_search (behavioral)", () => {const { tools, api } = setupPlugin();contextEnginePlugin.register(api as any);- const search = tools.get("ov_search")!;+ const search = tools.get("memory_search")!;const result = await search.execute("tc1", { query: "OpenViking install" }) as ToolResult;expect(result.content[0]!.text).toContain("no");@@ -476,7 +476,7 @@ describe("Tool: ov_search (behavioral)", () => {const { tools, api } = setupPlugin();contextEnginePlugin.register(api as any);- const search = tools.get("ov_search")!;+ const search = tools.get("memory_search")!;const result = await search.execute("tc1", { query: "OpenViking install" }) as ToolResult;expect(result.details.resources).toHaveLength(1);@@ -512,7 +512,7 @@ describe("Tool: ov_search (behavioral)", () => {const { tools, api } = setupPlugin();contextEnginePlugin.register(api as any);- const search = tools.get("ov_search")!;+ const search = tools.get("memory_search")!;const result = await search.execute("tc1", {query: "theme",uri: "viking://user/default/memories",@@ -593,9 +593,9 @@ describe("OpenViking import command parsing", () => {});});-describe("OpenViking search command parsing", () => {- it("parses ov-search query and flags", () => {- expect(parseOvSearchCommandArgs(`"OpenViking install" --uri viking://resources --limit=3`)).toMatchObject({+describe("OpenViking memory_search command parsing", () => {+ it("parses memory_search query and flags", () => {+ expect(parseMemorySearchCommandArgs(`"OpenViking install" --uri viking://resources --limit=3`)).toMatchObject({query: "OpenViking install",uri: "viking://resources",limit: 3,@@ -603,7 +603,7 @@ describe("OpenViking search command parsing", () => {});it("keeps multi-word unquoted slash-command queries intact", () => {- expect(parseOvSearchCommandArgs(`OpenViking install --uri viking://resources`)).toMatchObject({+ expect(parseMemorySearchCommandArgs(`OpenViking install --uri viking://resources`)).toMatchObject({query: "OpenViking install",uri: "viking://resources",});@@ -624,7 +624,7 @@ describe("Plugin registration", () => {acceptsArgs: true,description: "Import a resource or skill into OpenViking.",});- expect(commands.get("ov-search")).toMatchObject({+ expect(commands.get("memory-search")).toMatchObject({acceptsArgs: true,description: "Search OpenViking resources and skills.",});@@ -637,12 +637,12 @@ describe("Plugin registration", () => {args: "",commandBody: "/ov-import",});- const search = await commands.get("ov-search")!.handler({+ const search = await commands.get("memory-search")!.handler({args: "",- commandBody: "/ov-search",+ commandBody: "/memory-search",});expect(resource.text).toContain("Usage: /ov-import");- expect(search.text).toContain("Usage: /ov-search");+ expect(search.text).toContain("Usage: /memory-search");});it("search command propagates agent identity when command ctx includes it", async () => {@@ -657,9 +657,9 @@ describe("Plugin registration", () => {const { commands, api } = setupPlugin();contextEnginePlugin.register(api as any);- await commands.get("ov-search")!.handler({+ await commands.get("memory-search")!.handler({args: "test query --uri viking://resources",- commandBody: "/ov-search",+ commandBody: "/memory-search",agentId: "worker",sessionId: "session-1",sessionKey: "agent:worker:session-1",@@ -687,9 +687,9 @@ describe("Plugin registration", () => {};contextEnginePlugin.register(api as any);- await commands.get("ov-search")!.handler({+ await commands.get("memory-search")!.handler({args: "test query --uri viking://resources",- commandBody: "/ov-search",+ commandBody: "/memory-search",agentId: "worker",sessionId: "session-1",sessionKey: "agent:worker:session-1",@@ -741,9 +741,9 @@ describe("Plugin registration", () => {};contextEnginePlugin.register(api as any);- const search = await commands.get("ov-search")!.handler({+ const search = await commands.get("memory-search")!.handler({args: "test query --uri viking://resources",- commandBody: "/ov-search",+ commandBody: "/memory-search",sessionKey: "agent:bypass:session-1",});diff --git a/openviking/server/mcp_endpoint.py b/openviking/server/mcp_endpoint.pyindex 40b28cf58..cb3306655 100644--- a/openviking/server/mcp_endpoint.py+++ b/openviking/server/mcp_endpoint.py@@ -2,8 +2,8 @@# SPDX-License-Identifier: AGPL-3.0"""MCP (Model Context Protocol) endpoint for OpenViking server.-Exposes 7 tools to Claude Code (or any MCP client) via streamable HTTP:- search, read, list, store, add_resource, forget, health+Exposes tools to Claude Code (or any MCP client) via streamable HTTP:+ find, search, read, list, remember, add_resource, grep, glob, forget, healthMounted on the FastAPI app at /mcp. The MCP session manager lifecycle istied to the FastAPI app lifespan (not a sub-app lifespan) so the task group@@ -105,7 +105,7 @@ class _IdentityASGIMiddleware:# ----------------------------------------------------------------------------# MCP server + 7 tools (aligned with vikingbot/agent/tools/ov_file.py)+# MCP server tools (aligned with vikingbot/agent/tools/ov_file.py)# ---------------------------------------------------------------------------mcp = FastMCP(@@ -114,23 +114,50 @@ mcp = FastMCP()-# -- search ----------------------------------------------------------------+# -- find / search ---------------------------------------------------------@mcp.tool()-async def search(query: str, target_uri: str = "", limit: int = 10, min_score: float = 0.35) -> str:- """Search OpenViking context database (memories, resources, skills). Returns ranked results with URI, abstract, and score. Leave target_uri empty to search everything, or pass a viking:// URI to narrow scope."""+async def find(query: str, target_uri: str = "", limit: int = 10, min_score: float = 0.35) -> str:+ """Fast semantic retrieval without session context. Returns ranked memories, resources, and skills with URI, abstract, and score."""service = get_service()- ctx = _get_ctx()-result = await service.search.find(+ query=query,+ ctx=_get_ctx(),+ target_uri=target_uri,+ limit=limit,+ score_threshold=min_score,+ )+ return _format_search_result(result)+++async def search(+ query: str,+ target_uri: str = "",+ session_id: Optional[str] = None,+ limit: int = 10,+ min_score: float = 0.35,+) -> str:+ """Deep semantic retrieval with optional session context and intent analysis. Returns ranked memories, resources, and skills with URI, abstract, and score."""+ service = get_service()+ ctx = _get_ctx()+ session = None+ if session_id:+ session = service.sessions.session(ctx, session_id)+ await session.load()+ result = await service.search.search(query=query,ctx=ctx,target_uri=target_uri,+ session=session,limit=limit,score_threshold=min_score,)+ return _format_search_result(result)++def _format_search_result(result) -> str:items = []for ctx_type, contexts in [("memory", result.memories),@@ -145,8 +172,11 @@ async def search(query: str, target_uri: str = "", limit: int = 10, min_score: flines = []for ctx_type, m in items:- abstract = (m.abstract or m.overview or "(no abstract)").strip()- lines.append(f"- [{ctx_type} {m.score * 100:.0f}%] {m.uri}\n {abstract}")+ abstract = (+ getattr(m, "abstract", "") or getattr(m, "overview", "") or "(no abstract)"+ ).strip()+ score = getattr(m, "score", 0.0)+ lines.append(f"- [{ctx_type} {score * 100:.0f}%] {m.uri}\n {abstract}")return (f"Found {len(items)} item(s):\n\n"@@ -213,7 +243,7 @@ async def ls(uri: str, recursive: bool = False) -> str:return "\n".join(lines)-# -- store -----------------------------------------------------------------+# -- remember --------------------------------------------------------------class StoreMessage(BaseModel):@@ -222,7 +252,7 @@ class StoreMessage(BaseModel):@mcp.tool()-async def store(messages: list[StoreMessage]) -> str:+async def remember(messages: list[StoreMessage]) -> str:"""Store information into OpenViking long-term memory. Use when the user says 'remember this', shares preferences, important facts, or decisions worth persisting."""import uuid@@ -399,7 +429,7 @@ async def mcp_lifespan():"""Run the MCP session manager. Call this inside the FastAPI lifespan."""async with mcp.session_manager.run():logger.info(- "MCP endpoint ready (9 tools: search, read, list, store, add_resource, grep, glob, forget, health)"+ "MCP endpoint ready (10 tools: find, search, read, list, remember, add_resource, grep, glob, forget, health)")yielddiff --git a/tests/server/test_mcp_endpoint.py b/tests/server/test_mcp_endpoint.pyindex 984d09539..6cbbc0e9f 100644--- a/tests/server/test_mcp_endpoint.py+++ b/tests/server/test_mcp_endpoint.py@@ -7,8 +7,12 @@ Tests the tool functions directly by setting up the identity contextvarand service dependency, avoiding MCP protocol complexity."""+from types import SimpleNamespace+from unittest.mock import AsyncMock+import pytest+import openviking.server.mcp_endpoint as mcp_endpointfrom openviking.server.dependencies import set_servicefrom openviking.server.identity import RequestContext, Rolefrom openviking.server.mcp_endpoint import (@@ -21,8 +25,8 @@ from openviking.server.mcp_endpoint import (grep,health,read,+ remember,search,- store,)from openviking.server.mcp_endpoint import ls as list_toolfrom openviking_cli.exceptions import UnauthenticatedError@@ -108,6 +112,75 @@ async def test_search_respects_min_score(service):assert isinstance(result, str)+async def test_find_tool_calls_lightweight_find(service, monkeypatch):+ captured = {}++ async def fake_find(**kwargs):+ captured.update(kwargs)+ return SimpleNamespace(memories=[], resources=[], skills=[])++ monkeypatch.setattr(service.search, "find", fake_find)++ result = await mcp_endpoint.find(+ query="fast lookup",+ target_uri="viking://resources",+ limit=2,+ min_score=0.2,+ )++ assert result == "No matching context found."+ assert captured["query"] == "fast lookup"+ assert captured["ctx"] == DEFAULT_CTX+ assert captured["target_uri"] == "viking://resources"+ assert captured["limit"] == 2+ assert captured["score_threshold"] == 0.2+++async def test_search_tool_calls_context_aware_search_with_session(service, monkeypatch):+ captured = {}+ session = SimpleNamespace(load_called=False)++ async def load():+ session.load_called = True++ session.load = load++ def session_factory(ctx, session_id):+ captured["session_factory_ctx"] = ctx+ captured["session_id"] = session_id+ return session++ async def fake_search(**kwargs):+ captured.update(kwargs)+ return SimpleNamespace(memories=[], resources=[], skills=[])++ async def fail_find(**kwargs):+ raise AssertionError("MCP search should call service.search.search, not find")++ monkeypatch.setattr(service.sessions, "session", session_factory)+ monkeypatch.setattr(service.search, "search", fake_search)+ monkeypatch.setattr(service.search, "find", fail_find)++ result = await search(+ query="deep lookup",+ target_uri="viking://resources",+ session_id="session-1",+ limit=4,+ min_score=0.1,+ )++ assert result == "No matching context found."+ assert session.load_called is True+ assert captured["session_factory_ctx"] == DEFAULT_CTX+ assert captured["session_id"] == "session-1"+ assert captured["query"] == "deep lookup"+ assert captured["ctx"] == DEFAULT_CTX+ assert captured["target_uri"] == "viking://resources"+ assert captured["session"] == session+ assert captured["limit"] == 4+ assert captured["score_threshold"] == 0.1++# ---------------------------------------------------------------------------# read tool# ---------------------------------------------------------------------------@@ -154,13 +227,13 @@ async def test_list_empty_dir(service):async def test_store_single_message(service):- result = await store(messages=[StoreMessage(role="user", content="The sky is blue")])+ result = await remember(messages=[StoreMessage(role="user", content="The sky is blue")])assert "stored" in result.lower()assert "1 message" in resultasync def test_store_batch_messages(service):- result = await store(+ result = await remember(messages=[StoreMessage(role="user", content="Remember my favorite color is blue"),StoreMessage(role="assistant", content="Noted, your favorite color is blue."),@@ -190,7 +263,7 @@ async def test_store_populates_role_id_from_ctx(service, monkeypatch):monkeypatch.setattr(Session, "add_message", _spy)- await store(+ await remember(messages=[StoreMessage(role="user", content="user msg"),StoreMessage(role="assistant", content="assistant msg"),@@ -203,6 +276,35 @@ async def test_store_populates_role_id_from_ctx(service, monkeypatch):]+async def test_store_skips_empty_message_content(service, monkeypatch):+ class FakeSession:+ def __init__(self):+ self.messages = []++ def add_message(self, role, parts, role_id=None, created_at=None):+ self.messages.append((role, parts, role_id, created_at))++ fake_session = FakeSession()+ monkeypatch.setattr(service.sessions, "get", AsyncMock(return_value=fake_session))+ monkeypatch.setattr(service.sessions, "commit_async", AsyncMock())++ result = await remember(+ messages=[+ StoreMessage(role="user", content=""),+ StoreMessage(role="assistant", content="Noted."),+ ]+ )++ assert "2 message" in result+ assert len(fake_session.messages) == 1+ role, parts, role_id, created_at = fake_session.messages[0]+ assert role == "assistant"+ assert parts[0].text == "Noted."+ assert role_id == DEFAULT_CTX.user.agent_id+ assert created_at is None+ service.sessions.commit_async.assert_awaited_once()++# ---------------------------------------------------------------------------# add_resource tool# ---------------------------------------------------------------------------