Skip to content

Self-evolving Context Database for AI Agents. Unify Agent Memory, Knowledge RAG and Skills.

fix(skills): update session-derived skills through the skill installer (#5249)

t0saki03f596b72212
diff --git a/openviking/session/skill/skill_operation_updater.py b/openviking/session/skill/skill_operation_updater.py
index eb5f939c0..f1a871faf 100644
--- a/openviking/session/skill/skill_operation_updater.py
+++ b/openviking/session/skill/skill_operation_updater.py
@@ -15,7 +15,6 @@ from openviking.session.memory.dataclass import ResolvedOperation, ResolvedOpera
from openviking.session.memory.memory_type_registry import MemoryTypeRegistry
from openviking.session.memory.merge_op import MergeOpFactory
from openviking.storage.abstract_overview import body_for_preview
-from openviking.storage.content_write import ContentWriteCoordinator
from openviking.storage.viking_fs import VikingFS, get_viking_fs
from openviking.utils.skill_processor import SkillProcessor
from openviking_cli.exceptions import NotFoundError
@@ -105,41 +104,24 @@ class SkillOperationUpdater:
existing_skill = await self._load_existing_skill(skill_md_uri, ctx)
merged_skill = await self._merge_skill(operation, existing_skill)
- if existing_skill is None:
- processor_result = await self._skill_processor.process_skill(
- data=merged_skill,
- viking_fs=self._viking_fs,
- ctx=ctx,
- allow_local_path_resolution=False,
- lease_ref=transaction_handle,
- )
- created_root_uri = (
- processor_result.get("root_uri") or processor_result.get("uri") or root_uri
- )
- return {
- "status": "success",
- "action": "create",
- "root_uri": created_root_uri,
- "uri": created_root_uri,
- "skill_md_uri": f"{created_root_uri.rstrip('/')}/SKILL.md",
- "name": merged_skill["name"],
- }
-
- merged_skill = await self._skill_processor.sanitize_skill_privacy(merged_skill, ctx)
- serialized = SkillLoader.to_skill_md(merged_skill)
- write_result = await ContentWriteCoordinator(self._viking_fs).write(
- uri=skill_md_uri,
- content=serialized,
+ processor_result = await self._skill_processor.process_skill(
+ data=merged_skill,
+ viking_fs=self._viking_fs,
ctx=ctx,
- mode="replace",
+ allow_local_path_resolution=False,
+ # The skills root the package sits in, so the skill stays in its own scope.
+ target_uri=root_uri.rsplit("/", 1)[0],
+ lease_ref=transaction_handle,
)
- updated_root_uri = write_result.get("root_uri") or root_uri
+ new_root_uri = processor_result.get("root_uri") or root_uri
return {
"status": "success",
- "action": "update",
- "root_uri": updated_root_uri,
- "uri": updated_root_uri,
- "skill_md_uri": skill_md_uri,
+ "action": "create" if existing_skill is None else "update",
+ "root_uri": new_root_uri,
+ "uri": new_root_uri,
+ # The installer names the package after the skill, so report where
+ # it actually wrote rather than the URI the operation named.
+ "skill_md_uri": f"{new_root_uri}/SKILL.md",
"name": merged_skill["name"],
}
diff --git a/openviking/session/train/components/skill_policy_updater.py b/openviking/session/train/components/skill_policy_updater.py
index 83f08befb..0a5cdeacb 100644
--- a/openviking/session/train/components/skill_policy_updater.py
+++ b/openviking/session/train/components/skill_policy_updater.py
@@ -38,10 +38,8 @@ logger = get_logger(__name__)
class SkillPolicyUpdater:
"""PolicyUpdater that writes skill files to a skills directory.
- For new skills (no existing file) the full ``SkillProcessor.process_skill``
- pipeline is used (validation, privacy, overview, index). For existing
- skills, the merged content is serialized to SKILL.md and written via
- ``ContentWriteCoordinator``.
+ New and existing skills both go through the full ``SkillProcessor.process_skill``
+ pipeline (validation, privacy, overview, index).
``delete`` operations remove the entire skill subdirectory.
"""
diff --git a/tests/session/test_commit_skill_inference.py b/tests/session/test_commit_skill_inference.py
index 37b8aaa5f..1e48b348a 100644
--- a/tests/session/test_commit_skill_inference.py
+++ b/tests/session/test_commit_skill_inference.py
@@ -247,10 +247,55 @@ async def test_skill_operation_updater_creates_skill_with_session_defaults():
assert result.written_uris == [uri]
assert result.edited_uris == []
assert result.operation_results[0]["action"] == "create"
+ assert call["target_uri"] == "viking://user/default/skills"
@pytest.mark.asyncio
-async def test_skill_operation_updater_updates_existing_skill(monkeypatch):
+async def test_skill_operation_updater_keeps_a_shared_skill_in_the_shared_root():
+ processor = MagicMock()
+ processor.process_skill = AsyncMock(
+ return_value={
+ "status": "success",
+ "uri": "viking://agent/skills/code-review",
+ "root_uri": "viking://agent/skills/code-review",
+ }
+ )
+ viking_fs = MagicMock()
+ viking_fs.read_file = AsyncMock(side_effect=FileNotFoundError())
+ updater = SkillOperationUpdater(
+ registry=_build_skill_registry(),
+ skill_processor=processor,
+ viking_fs=viking_fs,
+ )
+ uri = "viking://agent/skills/code-review/SKILL.md"
+ operations = ResolvedOperations(
+ upsert_operations=[
+ ResolvedOperation(
+ old_memory_file_content=None,
+ memory_fields={
+ "skill_name": "code-review",
+ "description": "Review code from evidence",
+ "content": {"blocks": [{"search": "", "replace": "## 核心规范\n- 先读文件"}]},
+ },
+ memory_type="session_skills",
+ uris=[uri],
+ )
+ ],
+ delete_file_contents=[],
+ errors=[],
+ )
+
+ result = await updater.apply_operations(
+ operations,
+ RequestContext(user=UserIdentifier.the_default_user(), role=Role.ROOT),
+ )
+
+ assert processor.process_skill.await_args.kwargs["target_uri"] == "viking://agent/skills"
+ assert result.written_uris == [uri]
+
+
+async def test_skill_operation_updater_updates_existing_skill():
existing_skill_md = """---
name: code-review
description: Review code carefully
@@ -265,26 +310,11 @@ tags:
"""
viking_fs = MagicMock()
viking_fs.read_file = AsyncMock(return_value=existing_skill_md)
- write_calls = {}
-
- class _FakeContentWriter:
- def __init__(self, _viking_fs):
- self._viking_fs = _viking_fs
-
- async def write(self, **kwargs):
- write_calls.update(kwargs)
- return {
- "uri": kwargs["uri"],
- "root_uri": kwargs["uri"].rsplit("/SKILL.md", 1)[0],
- }
-
- monkeypatch.setattr(
- "openviking.session.skill.skill_operation_updater.ContentWriteCoordinator",
- _FakeContentWriter,
- )
processor = MagicMock()
- processor.sanitize_skill_privacy = AsyncMock(side_effect=lambda skill_dict, _ctx: skill_dict)
+ processor.process_skill = AsyncMock(
+ return_value={"root_uri": "viking://user/default/skills/code-review"}
+ )
updater = SkillOperationUpdater(
registry=_build_skill_registry(),
skill_processor=processor,
@@ -323,12 +353,12 @@ tags:
assert result.written_uris == []
assert result.edited_uris == [uri]
assert result.operation_results[0]["action"] == "update"
- assert write_calls["uri"] == uri
- assert write_calls["mode"] == "replace"
- assert "allowed-tools:" in write_calls["content"]
- assert "tags:" in write_calls["content"]
- assert "Review code from evidence" in write_calls["content"]
- assert "- 基于证据总结问题" in write_calls["content"]
+ call = processor.process_skill.await_args.kwargs
+ assert call["target_uri"] == "viking://user/default/skills"
+ assert call["data"]["allowed_tools"] == ["Read"]
+ assert call["data"]["tags"] == ["session-derived"]
+ assert call["data"]["description"] == "Review code from evidence"
+ assert "- 基于证据总结问题" in call["data"]["content"]
@pytest.mark.asyncio
@@ -347,23 +377,8 @@ tags:
"""
viking_fs = MagicMock()
viking_fs.read_file = AsyncMock(return_value=existing_skill_md)
- write_calls = {}
-
- class _FakeContentWriter:
- def __init__(self, _viking_fs):
- self._viking_fs = _viking_fs
-
- async def write(self, **kwargs):
- write_calls.update(kwargs)
- return {
- "uri": kwargs["uri"],
- "root_uri": kwargs["uri"].rsplit("/SKILL.md", 1)[0],
- }
-
- monkeypatch.setattr(
- "openviking.session.skill.skill_operation_updater.ContentWriteCoordinator",
- _FakeContentWriter,
- )
+ viking_fs._async_agfs.pathlock_acquire_tree = AsyncMock(return_value={"lease_ref": "test"})
+ viking_fs._async_agfs.pathlock_release = AsyncMock()
async def _fake_extract_skill_privacy_values(*, skill_name, skill_description, content):
assert skill_name == "code-review"
@@ -384,10 +399,14 @@ tags:
privacy_config_service = MagicMock()
privacy_config_service.upsert = AsyncMock()
+ vikingdb = MagicMock()
+ vikingdb.enqueue_embedding_msg = AsyncMock(return_value=True)
processor = SkillProcessor(
- vikingdb=MagicMock(),
+ vikingdb=vikingdb,
privacy_config_service=privacy_config_service,
)
+ processor._write_skill_content = AsyncMock()
+ processor._enqueue_skill_package = AsyncMock()
updater = SkillOperationUpdater(
registry=_build_skill_registry(),
skill_processor=processor,
@@ -424,8 +443,10 @@ tags:
assert result.written_uris == []
assert result.edited_uris == [uri]
assert result.operation_results[0]["action"] == "update"
- assert "secret-xyz" not in write_calls["content"]
- assert "{{ov_privacy:skill:code-review:api_key}}" in write_calls["content"]
+ written = processor._write_skill_content.await_args.kwargs
+ assert written["skill_dir_uri"] == "viking://user/default/skills/code-review"
+ assert "secret-xyz" not in written["skill_dict"]["content"]
+ assert "{{ov_privacy:skill:code-review:api_key}}" in written["skill_dict"]["content"]
privacy_config_service.upsert.assert_awaited_once_with(
ctx=ctx,
category="skill",
diff --git a/tests/session/train/test_train_components.py b/tests/session/train/test_train_components.py
index 3c2c35cc6..831983cd5 100644
--- a/tests/session/train/test_train_components.py
+++ b/tests/session/train/test_train_components.py
@@ -1121,17 +1121,6 @@ async def test_patch_merge_policy_optimizer_uses_session_skill_registry(monkeypa
async def sanitize_skill_privacy(self, skill, ctx):
return skill
- class FakeWriter:
- def __init__(self, viking_fs):
- assert viking_fs is fs
-
- async def write(self, *, uri, content, **kwargs):
- await fs.write_file(uri, content)
- return {}
-
- monkeypatch.setattr(
- "openviking.session.skill.skill_operation_updater.ContentWriteCoordinator", FakeWriter
- )
policy_set = ExperienceSet(
root_uri="viking://user/u/skills",
policies=[