diff --git a/plugin/.claude-plugin/plugin.json b/plugin/.claude-plugin/plugin.json index 0958ee9f..f083d771 100644 --- a/plugin/.claude-plugin/plugin.json +++ b/plugin/.claude-plugin/plugin.json @@ -1,7 +1,7 @@ { "name": "scribe", "description": "Scribe for Claude Code: connects the scribe MCP server, adds the hooks that deliver live project state and relevant records at the right moment, ships the shared client-neutral Scribe skills (using-scribe, writing-plans, reporting-back, systematic-debugging, verification, brainstorming, reusing-code, shape-accounting), and syncs your saved Scribe Processes as skills (/scribe:sync).", - "version": "2026.10.05.1630", + "version": "2026.10.05.1823", "author": { "name": "Bryan Van Deusen" }, diff --git a/plugin/skills/brainstorming/SKILL.md b/plugin/skills/brainstorming/SKILL.md index f803082d..cef62349 100644 --- a/plugin/skills/brainstorming/SKILL.md +++ b/plugin/skills/brainstorming/SKILL.md @@ -1,6 +1,8 @@ --- name: brainstorming description: Use when exploring options or shaping a direction before committing — open up the solution space instead of jumping to the first idea. Triggers on "how should we approach X", "what are the options", weighing trade-offs, or any open-ended design question. Recall prior thinking first; capture the decision after. +metadata: + moments: work.plan --- # Brainstorming diff --git a/plugin/skills/reporting-back/SKILL.md b/plugin/skills/reporting-back/SKILL.md index 02537006..a8766c8e 100644 --- a/plugin/skills/reporting-back/SKILL.md +++ b/plugin/skills/reporting-back/SKILL.md @@ -1,6 +1,8 @@ --- name: reporting-back description: Use when you are about to write the reply the operator will read — work finished, a task marked done, stopping on a blocker, asking them to decide or to do something, answering "where are we" / "what's next", or proposing an approach. Shapes the reply around where the work stands (which task, what changed, what needs them, what comes next) instead of the order you did things in. Triggers on reporting completion, handing off, asking a question, or summarising progress. +metadata: + moments: reply.report --- # Reporting back diff --git a/plugin/skills/reusing-code/SKILL.md b/plugin/skills/reusing-code/SKILL.md index 0aeab713..079d2a21 100644 --- a/plugin/skills/reusing-code/SKILL.md +++ b/plugin/skills/reusing-code/SKILL.md @@ -1,6 +1,8 @@ --- name: reusing-code description: Use when you're about to build ANY shape — a component, control, route handler, service class, helper, test scaffold — search recorded snippets FIRST and start from the recorded shape instead of re-solving it. And before the turn that built it ends, say what it is — record the reusable as a snippet, classify the rest — so every later instance starts from it. Triggers on "write a util/helper", "I need a function that…", "let me add a component/button/field/route", having just built the first instance of anything, or the end-of-turn list of shapes to judge. +metadata: + moments: work.change --- # Reusing code — the pattern library diff --git a/plugin/skills/shape-accounting/SKILL.md b/plugin/skills/shape-accounting/SKILL.md index dff2eff5..435150a4 100644 --- a/plugin/skills/shape-accounting/SKILL.md +++ b/plugin/skills/shape-accounting/SKILL.md @@ -1,6 +1,8 @@ --- name: shape-accounting description: Use when a project's shape accounting needs attention — the pattern_coverage line from enter_project shows unclassified shapes or is missing on a forge-served project, the operator asks about coverage/accounting/canon, or you just proved a code-to-canon relationship (an audit enumerated call sites, a consolidation repointed consumers, a verify pass confirmed a helper's users). Triggers on "coverage", "accounted", "unclassified", "classify shapes", "what uses this", or finishing any consolidation. +metadata: + moments: work.record --- # Shape accounting — every shape classified against canon diff --git a/plugin/skills/systematic-debugging/SKILL.md b/plugin/skills/systematic-debugging/SKILL.md index 87cdcf4e..0cc21106 100644 --- a/plugin/skills/systematic-debugging/SKILL.md +++ b/plugin/skills/systematic-debugging/SKILL.md @@ -1,6 +1,8 @@ --- name: systematic-debugging description: Use when diagnosing a bug, failure, or unexpected behavior — investigate methodically instead of guessing. Triggers on "why is this failing/breaking", a stack trace, a flaky test, or any "it should work but doesn't". On resolution, capture the issue in Scribe so it isn't re-debugged from scratch. +metadata: + moments: work.debug --- # Systematic debugging diff --git a/plugin/skills/using-scribe/SKILL.md b/plugin/skills/using-scribe/SKILL.md index fc6e19de..850ffbf0 100644 --- a/plugin/skills/using-scribe/SKILL.md +++ b/plugin/skills/using-scribe/SKILL.md @@ -1,6 +1,8 @@ --- name: using-scribe description: Use at the START of every session, and before answering anything about the operator's work or starting any task — establishes the Scribe-first reflex. You hold none of the operator's rules: they arrive by retrieval when your work matches one, and what_might_apply is how you ask before a consequential act — it returns the wide net of candidates with no bar. Call enter_project when a repo/project is in scope. Then recall before acting, update over duplicate, plan in Scribe not in files. +metadata: + moments: session.start --- # Using Scribe diff --git a/plugin/skills/verification/SKILL.md b/plugin/skills/verification/SKILL.md index 444d1857..774a4ccf 100644 --- a/plugin/skills/verification/SKILL.md +++ b/plugin/skills/verification/SKILL.md @@ -1,6 +1,8 @@ --- name: verification description: Use before claiming a task is done or a change works — confirm it actually does, then record that you did. Triggers when you're about to report completion, mark a task done, or say "it works" / "fixed". Guards against declaring success on unverified work. +metadata: + moments: work.verify --- # Verification before completion diff --git a/plugin/skills/writing-plans/SKILL.md b/plugin/skills/writing-plans/SKILL.md index 98109993..91e942b4 100644 --- a/plugin/skills/writing-plans/SKILL.md +++ b/plugin/skills/writing-plans/SKILL.md @@ -1,6 +1,8 @@ --- name: writing-plans description: Use when a piece of work has an arc — several steps toward one goal, worth tracking as a unit — and you want the approach reviewable before you start. Triggers when the user asks you to plan, design an approach, or scope an effort, or when work is about to sprawl across several steps. Not for single-step work. The plan lives in a Scribe milestone (via start_planning), not a local file. +metadata: + moments: work.plan --- # Writing plans diff --git a/src/scribe/mcp/tools/processes.py b/src/scribe/mcp/tools/processes.py index 2c0833ea..03c9e42f 100644 --- a/src/scribe/mcp/tools/processes.py +++ b/src/scribe/mcp/tools/processes.py @@ -10,6 +10,8 @@ from scribe.mcp._context import current_user_id from scribe.services import access as access_svc from scribe.services import dedup as dedup_svc from scribe.services import knowledge as knowledge_svc +from scribe.services import moment_actions +from scribe.services import moments as moments_svc from scribe.services import notes as notes_svc from scribe.services import systems as systems_svc from scribe.services import trash as trash_svc @@ -53,7 +55,8 @@ async def list_processes( async def create_process( title: str, body: str, tags: list[str] | None = None, - system_ids: list[int] | None = None, force: bool = False, + system_ids: list[int] | None = None, moments: list[str] | None = None, + force: bool = False, ) -> dict: """Create a stored process (a reusable saved prompt). @@ -79,6 +82,12 @@ async def create_process( system_ids: Systems (subsystems/areas) to file this process under, so an area-scoped read finds it. A process is a note, so it has always been taggable in the data model; neither door offered it (#4249). + moments: The moments from list_moments this procedure is FOR — a + release procedure is a deliver, a review procedure a verify. + Loading the process then reaches each one, as well as its own + `skill.scribe-proc-`, so a rule mounted on work.deliver + arrives when the release procedure is loaded, before any of its + steps run. force: Bypass the near-duplicate gate. By default, if a title- or meaning-similar process already exists, creation is BLOCKED and the existing one's id is returned so you update it instead. Set true @@ -102,12 +111,33 @@ async def create_process( ) if dup is not None: return dedup_svc.duplicate_response(dup, "process") + declared = moments_svc.require_moments(moments) note = await notes_svc.create_note( uid, title=title.strip(), body=body, note_type="process", tags=tags, + data=_with_moments(None, declared), ) if system_ids: await systems_svc.set_record_systems(uid, note.id, system_ids) - return await moment_delivery.attach_moment_rules(uid, "create_process", {}, note.to_dict()) + return await moment_delivery.attach_moment_rules(uid, "create_process", {}, _process_dict(note)) + + +def _with_moments(data: dict | None, declared: list[str] | None) -> dict | None: + """`data` with its moments replaced by `declared` (None leaves them).""" + out = dict(data or {}) + if declared is None: + return out or None + if declared: + out[moment_actions.PROCESS_MOMENTS_FIELD] = declared + else: + out.pop(moment_actions.PROCESS_MOMENTS_FIELD, None) + return out or None + + +def _process_dict(note) -> dict: + """A process as the tools return it: the note, plus the moments it declares.""" + out = note.to_dict() + out["moments"] = moment_actions.declared_moments(note.data) + return out async def get_process(name_or_id: str, project_id: int = 0) -> dict: @@ -144,7 +174,7 @@ async def get_process(name_or_id: str, project_id: int = 0) -> dict: note, candidates = await notes_svc.resolve_process(uid, name_or_id) if note is None: raise ValueError(f"process {name_or_id!r} not found") - out = note.to_dict() + out = _process_dict(note) if candidates: out["other_matches"] = candidates out.update(await access_svc.describe_provenance(uid, note)) @@ -162,13 +192,18 @@ async def get_process(name_or_id: str, project_id: int = 0) -> dict: async def update_process(process_id: int, title: str = "", body: str = "", tags: list[str] | None = None, - system_ids: list[int] | None = None) -> dict: + system_ids: list[int] | None = None, + moments: list[str] | None = None) -> dict: """Update a stored process. Only provided fields change — empty title/body leave that field unchanged; pass tags to replace the tag set. `system_ids` replaces the Systems this process is filed under: None leaves them alone, a list (including `[]`) replaces them. + `moments` replaces the moments the procedure is for (see create_process) + the same way: None leaves them, [] clears them. The change reaches the + next load of its skill — the skill file itself does not carry them. + Editing another user's process requires an editor or admin share from them; a read-only share is not enough and says so rather than claiming not-found. """ @@ -189,6 +224,9 @@ async def update_process(process_id: int, title: str = "", body: str = "", fields["body"] = body if tags is not None: fields["tags"] = tags + declared = moments_svc.require_moments(moments) + if declared is not None: + fields["data"] = _with_moments(note.data, declared) # As the owner — update_note is owner-scoped and the write is authorised above. updated = await notes_svc.update_note(note.user_id, process_id, **fields) # The CALLER, not the owner. `update_note` above is owner-scoped because @@ -199,7 +237,7 @@ async def update_process(process_id: int, title: str = "", body: str = "", await systems_svc.set_record_systems(uid, process_id, system_ids) if updated is None: raise ValueError(f"process {process_id} not found") - out = updated.to_dict() + out = _process_dict(updated) out.update(await access_svc.describe_provenance(uid, updated)) return out diff --git a/src/scribe/services/moment_actions.py b/src/scribe/services/moment_actions.py index 6130866f..179a450c 100644 --- a/src/scribe/services/moment_actions.py +++ b/src/scribe/services/moment_actions.py @@ -63,6 +63,33 @@ COMMAND_TOOLS = frozenset({"bash"}) # procedures' own. SKILL_TOOL, SKILL_FIELD = "skill", "skill" +# A procedure also reaches the moment it is FOR (step 5): loading the +# reporting procedure is a report as surely as the reply that follows it. +# +# The product's own skills declare theirs in their SKILL.md frontmatter +# (`metadata: moments:`), and the declaration ships HERE as defaults, because +# the server never sees the plugin's files. `test_skill_moments` holds the two +# together. The plugin's name qualifies the skill, as the harness names it. +BUNDLED_SKILL_PLUGIN = "scribe" +BUNDLED_SKILL_MOMENTS: dict[str, tuple[str, ...]] = { + "using-scribe": ("session.start",), + "brainstorming": ("work.plan",), + "writing-plans": ("work.plan",), + "reusing-code": ("work.change",), + "systematic-debugging": ("work.debug",), + "verification": ("work.verify",), + "shape-accounting": ("work.record",), + "reporting-back": ("reply.report",), +} + +# A stored process arrives as the skill `scribe-proc-` +# (scribe_sync_processes.sh). Its moments are the process's own field, read +# when it loads — not copied into the stub, which is written once a session +# and would go on firing a moment its process no longer declares. +PROCESS_SKILL_PREFIX = "scribe-proc-" +PROCESS_MOMENTS_FIELD = "moments" +PROCESS = "process" + _SEGMENT_SPLIT = re.compile(r"&&|\|\||[;|\n]") _ENV_ASSIGN = re.compile(r"^[A-Za-z_][A-Za-z0-9_]*=\S*\s+") @@ -92,6 +119,9 @@ def _defaults() -> tuple[Action, ...]: on("work.plan", "EnterPlanMode") on("work.plan", "ExitPlanMode") on("reply.ask", "AskUserQuestion") + for skill, reached in BUNDLED_SKILL_MOMENTS.items(): + for moment in reached: + on(moment, "Skill", f"{SKILL_FIELD}={BUNDLED_SKILL_PLUGIN}:{skill}") # Scribe's own tools — every install has these, so their moments ship. on("work.start", "update_task", "status=in_progress") @@ -201,12 +231,38 @@ def effective_actions(mappings: Iterable) -> list[tuple[Action, str]]: return out -def resolve(tool: str, tool_input: dict | None, mappings: Iterable = ()) -> list[dict]: +def skill_name(tool: str, tool_input: dict | None) -> str: + """The procedure a skill-loader call loads, lowercased; "" for any other call.""" + if tool_key(tool) != SKILL_TOOL: + return "" + return str((tool_input or {}).get(SKILL_FIELD) or "").strip().lower() + + +def declared_moments(data: dict | None) -> list[str]: + """The moments a stored process declares — the valid ones, in its order. + + Read defensively: the field is written through require_moments, but a + moment the catalog later drops must stop firing, not break the load. + """ + raw = (data or {}).get(PROCESS_MOMENTS_FIELD) or [] + if isinstance(raw, str): + raw = [raw] + return [m for m in dict.fromkeys(str(n).strip().lower() for n in raw) + if catalog.is_moment(m)] + + +def resolve( + tool: str, tool_input: dict | None, mappings: Iterable = (), + declared: Iterable[str] = (), +) -> list[dict]: """Every moment this call reaches, each with the action that reached it. One entry per moment, in catalog order. When two actions reach the same moment the more specific one — the longer match — is the one named, since "reached by `git push`" says more than "reached by Bash". + + `declared` are the moments the procedure this call loads says it is for + (a stored process's own field); each is reached by the load itself. """ best: dict[str, dict] = {} for action, via in effective_actions(mappings): @@ -219,12 +275,15 @@ def resolve(tool: str, tool_input: dict | None, mappings: Iterable = ()) -> list "match": action.match, "via": via, } - if tool_key(tool) == SKILL_TOOL: - name = str((tool_input or {}).get(SKILL_FIELD) or "").strip().lower() + name = skill_name(tool, tool_input) + if name: moment = catalog.SKILL_PREFIX + name - if name and catalog.is_moment(moment): - best[moment] = {"moment": moment, "tool": tool, "match": f"skill={name}", - "via": DEFAULT} + if catalog.is_moment(moment): + best[moment] = {"moment": moment, "tool": tool, + "match": f"{SKILL_FIELD}={name}", "via": DEFAULT} + for moment in declared: + best.setdefault(moment, {"moment": moment, "tool": tool, + "match": f"{SKILL_FIELD}={name}", "via": PROCESS}) order = {name: i for i, name in enumerate(catalog.MOMENTS)} return sorted(best.values(), key=lambda h: (order.get(h["moment"], len(order)), h["moment"])) @@ -286,7 +345,35 @@ async def moments_for(user_id: int, tool: str, tool_input: dict | None) -> list[ except Exception: logger.warning("moment mappings unreadable; using the defaults", exc_info=True) mappings = [] - return resolve(tool, tool_input, mappings) + name = skill_name(tool, tool_input) + declared = (await process_moments(user_id, name) + if name.startswith(PROCESS_SKILL_PREFIX) else []) + return resolve(tool, tool_input, mappings, declared) + + +async def process_moments(user_id: int, skill: str) -> list[str]: + """The moments the stored process behind `scribe-proc-` declares. + + The slug is resolved through the same manifest the sync script wrote the + skill from, so the two agree on which process a slug names. Fails open to + none: a process that cannot be read still loads, it just reaches no more + than its own `skill.`. + """ + from scribe.services import notes as notes_svc + from scribe.services import plugin_context + + slug = skill[len(PROCESS_SKILL_PREFIX):] + try: + manifest = await plugin_context.build_process_manifest(user_id) + entry = next((p for p in manifest.get("processes", []) if p.get("slug") == slug), None) + if entry is None: + return [] + loaded = await notes_svc.get_note_for_user(user_id, int(entry["id"])) + note = loaded[0] if loaded else None + return declared_moments(note.data if note is not None else None) + except Exception: + logger.debug("process moments for %s unreadable", skill, exc_info=True) + return [] async def _find(session, user_id: int, tool: str, match: str, moment: str): diff --git a/src/scribe/services/moment_delivery.py b/src/scribe/services/moment_delivery.py index 6d18d65f..34c7148c 100644 --- a/src/scribe/services/moment_delivery.py +++ b/src/scribe/services/moment_delivery.py @@ -17,7 +17,6 @@ from __future__ import annotations import logging from scribe.services import moment_actions -from scribe.services import moments as catalog from scribe.services import retrieval_pipeline as rp logger = logging.getLogger(__name__) @@ -39,8 +38,10 @@ async def reachable_tools(user_id: int) -> list[str]: What the plugin's catch-all hook reads once per session window, so the calls that cannot reach a mounted rule — most of them, and every one on an install that has mounted nothing — never leave the machine. An action - counts only when its moment carries a mount; the skill loader counts when - any `skill.` moment does. + counts only when its moment carries a mount. The skill loader counts + whenever anything is mounted: a stored process declares its own moments, + which only the load itself can resolve, and a load is rare enough that + asking costs nothing. """ from scribe.services import rulebooks @@ -53,8 +54,7 @@ async def reachable_tools(user_id: int) -> list[str]: for action, _via in moment_actions.effective_actions(mappings) if action.moment in mounted } - if any(name.startswith(catalog.SKILL_PREFIX) for name in mounted): - keys.add(moment_actions.SKILL_TOOL) + keys.add(moment_actions.SKILL_TOOL) return sorted(keys) diff --git a/tests/test_mcp_tool_processes.py b/tests/test_mcp_tool_processes.py index 49e26ff8..5a8f421e 100644 --- a/tests/test_mcp_tool_processes.py +++ b/tests/test_mcp_tool_processes.py @@ -166,6 +166,88 @@ async def test_delete_process_refuses_a_plain_note(): mock_delete.assert_not_awaited() +# ── the moments a procedure is for (milestone 458 step 5) ──────────────── + +@pytest.mark.asyncio +async def test_create_process_stores_the_moments_it_is_for(): + created = fake_note(title="Release", note_type="process", + data={"moments": ["work.deliver"]}) + with patch("scribe.mcp.tools.processes.dedup_svc.find_duplicate_note", + AsyncMock(return_value=None)), \ + patch("scribe.services.notes.create_note", + AsyncMock(return_value=created)) as mock_create: + from scribe.mcp.tools.processes import create_process + out = await create_process(title="Release", body="steps", + moments=["Work.Deliver", "work.deliver"]) + assert mock_create.await_args.kwargs["data"] == {"moments": ["work.deliver"]} + assert out["moments"] == ["work.deliver"] + + +@pytest.mark.asyncio +async def test_create_process_refuses_an_unknown_moment_before_writing(): + """A typo'd moment would be stored and never fire — a procedure that looks + attached and is not.""" + with patch("scribe.mcp.tools.processes.dedup_svc.find_duplicate_note", + AsyncMock(return_value=None)), \ + patch("scribe.services.notes.create_note", AsyncMock()) as mock_create: + from scribe.mcp.tools.processes import create_process + with pytest.raises(ValueError, match="unknown moment"): + await create_process(title="Release", body="steps", moments=["work.shipped"]) + mock_create.assert_not_awaited() + + +@pytest.mark.asyncio +async def test_create_process_without_moments_stores_no_data(): + created = fake_note(title="Release", note_type="process") + with patch("scribe.mcp.tools.processes.dedup_svc.find_duplicate_note", + AsyncMock(return_value=None)), \ + patch("scribe.services.notes.create_note", + AsyncMock(return_value=created)) as mock_create: + from scribe.mcp.tools.processes import create_process + out = await create_process(title="Release", body="steps") + assert mock_create.await_args.kwargs["data"] is None + assert out["moments"] == [] + + +async def _update(moments, data): + proc = fake_note(id=5, title="Release", note_type="process", data=data) + with patch("scribe.services.notes.get_note_for_user", + AsyncMock(return_value=(proc, "owner"))), \ + patch("scribe.services.access.can_write_note", AsyncMock(return_value=True)), \ + patch("scribe.services.notes.update_note", + AsyncMock(return_value=proc)) as mock_update: + from scribe.mcp.tools.processes import update_process + await update_process(process_id=5, moments=moments) + return mock_update.await_args.kwargs + + +@pytest.mark.asyncio +async def test_update_process_replaces_moments_and_keeps_the_rest_of_data(): + sent = await _update(["work.verify"], {"moments": ["work.deliver"], "other": 1}) + assert sent["data"] == {"moments": ["work.verify"], "other": 1} + + +@pytest.mark.asyncio +async def test_update_process_empty_moments_clears_them(): + assert (await _update([], {"moments": ["work.deliver"]}))["data"] is None + assert (await _update([], {"moments": ["work.deliver"], "other": 1}))["data"] == {"other": 1} + + +@pytest.mark.asyncio +async def test_update_process_without_moments_leaves_data_alone(): + assert "data" not in await _update(None, {"moments": ["work.deliver"]}) + + +@pytest.mark.asyncio +async def test_get_process_says_which_moments_it_is_for(): + note = fake_note(id=7, title="Release", note_type="process", + data={"moments": ["work.deliver"]}) + with patch("scribe.services.notes.resolve_process", AsyncMock(return_value=(note, []))): + from scribe.mcp.tools.processes import get_process + out = await get_process("release") + assert out["moments"] == ["work.deliver"] + + def test_register_attaches_every_tool_in_the_module(): """Derived from the module rather than listed: a tool written but never registered is invisible to an agent, and nothing else would notice.""" diff --git a/tests/test_moment_actions.py b/tests/test_moment_actions.py index 985e25ec..60dd7db4 100644 --- a/tests/test_moment_actions.py +++ b/tests/test_moment_actions.py @@ -109,9 +109,22 @@ def test_a_whole_tool_mapping_ignores_its_arguments(): def test_loading_a_procedure_reaches_its_own_moment(): + assert _reached("Skill", {"skill": "release-notes"}) == ["skill.release-notes"] + + +def test_a_bundled_skill_also_reaches_the_moment_it_is_for(): + """Loading the planning procedure IS planning: a rule mounted on work.plan + arrives on the load, not only on the plan it goes on to open.""" assert _reached("Skill", {"skill": "scribe:writing-plans"}) == [ - "skill.scribe:writing-plans", + "work.plan", "skill.scribe:writing-plans", ] + assert _reached("Skill", {"skill": "scribe:reporting-back"})[0] == "reply.report" + + +def test_only_the_products_own_skill_reaches_a_bundled_default(): + """Another plugin's `verification` skill is not the product's procedure; + the plugin's name is what makes the declaration ours.""" + assert _reached("Skill", {"skill": "other:verification"}) == ["skill.other:verification"] def test_a_procedure_name_that_is_not_a_moment_reaches_nothing(): @@ -119,6 +132,79 @@ def test_a_procedure_name_that_is_not_a_moment_reaches_nothing(): assert _reached("Skill", {}) == [] +# ── a stored process's own moments ─────────────────────────────────────── + +def test_a_process_declares_moments_its_load_reaches(): + hits = ma.resolve("Skill", {"skill": "scribe-proc-release"}, [], ["work.deliver"]) + assert [(h["moment"], h["via"]) for h in hits] == [ + ("work.deliver", ma.PROCESS), ("skill.scribe-proc-release", ma.DEFAULT), + ] + assert hits[0]["match"] == "skill=scribe-proc-release" + + +def test_a_declared_moment_another_action_reaches_is_named_once(): + rows = [_row("Skill", "skill=scribe-proc-release", "work.deliver")] + hits = ma.resolve("Skill", {"skill": "scribe-proc-release"}, rows, ["work.deliver"]) + assert [h["moment"] for h in hits].count("work.deliver") == 1 + + +def test_declared_moments_only_reach_a_skill_load(): + hits = ma.resolve("Bash", {"command": "ls"}, [], ["work.deliver"]) + assert [h["moment"] for h in hits] == ["work.run"] + + +@pytest.mark.parametrize("data, expected", [ + (None, []), + ({}, []), + ({"moments": ["work.deliver", "Work.Deliver", "reply.report"]}, ["work.deliver", "reply.report"]), + ({"moments": "work.verify"}, ["work.verify"]), + ({"moments": ["work.finished", "skill.two words", "work.debug"]}, ["work.debug"]), +]) +def test_a_process_field_is_read_defensively(data, expected): + """A moment the catalog no longer has stops firing; it does not break the load.""" + assert ma.declared_moments(data) == expected + + +async def test_only_a_process_skill_asks_for_its_process(): + asked = AsyncMock(return_value=["work.deliver"]) + with patch.object(ma, "list_mappings", AsyncMock(return_value=[])), \ + patch.object(ma, "process_moments", asked): + reached = await ma.moments_for(1, "Skill", {"skill": "scribe-proc-release"}) + await ma.moments_for(1, "Skill", {"skill": "scribe:verification"}) + await ma.moments_for(1, "Bash", {"command": "git push"}) + assert "work.deliver" in [h["moment"] for h in reached] + asked.assert_awaited_once_with(1, "scribe-proc-release") + + +async def _process_moments(manifest, note=None, *, raises=False): + from scribe.services import notes as notes_svc + from scribe.services import plugin_context + + built = AsyncMock(side_effect=RuntimeError("down")) if raises else AsyncMock(return_value=manifest) + loader = AsyncMock(return_value=(note, None) if note is not None else None) + with patch.object(plugin_context, "build_process_manifest", built), \ + patch.object(notes_svc, "get_note_for_user", loader): + return await ma.process_moments(1, "scribe-proc-release"), loader + + +async def test_a_process_slug_resolves_through_the_sync_manifest(): + """The same manifest the sync script wrote the skill from, so the slug + names the same process here as it did on disk.""" + note = SimpleNamespace(data={"moments": ["work.deliver"]}) + found, loader = await _process_moments( + {"processes": [{"id": 7, "slug": "other"}, {"id": 9, "slug": "release"}]}, note) + assert found == ["work.deliver"] + loader.assert_awaited_once_with(1, 9) + + +async def test_an_unknown_or_unreadable_process_reaches_nothing_more(): + found, loader = await _process_moments({"processes": [{"id": 7, "slug": "other"}]}) + assert found == [] + loader.assert_not_awaited() + found, _ = await _process_moments({}, raises=True) + assert found == [] + + # ── an install's own ───────────────────────────────────────────────────── def test_an_install_mapping_adds_a_moment(): diff --git a/tests/test_moment_delivery.py b/tests/test_moment_delivery.py index 5bc5daf0..5b663882 100644 --- a/tests/test_moment_delivery.py +++ b/tests/test_moment_delivery.py @@ -194,11 +194,17 @@ async def test_an_install_with_nothing_mounted_keeps_the_hook_off_the_wire(): async def test_only_the_tools_whose_moments_carry_a_mount_are_listed(): - assert await _reachable({"work.deliver"}) == ["bash"] - assert await _reachable({"work.finish"}) == ["update_milestone", "update_task"] + assert await _reachable({"work.deliver"}) == ["bash", "skill"] + assert await _reachable({"work.finish"}) == ["skill", "update_milestone", "update_task"] assert await _reachable({"skill.release"}) == ["skill"] +async def test_the_skill_loader_counts_whenever_anything_is_mounted(): + """A stored process declares its own moments, resolved only when it loads + — so a mount on any moment may be reached by loading a procedure.""" + assert "skill" in await _reachable({"work.debug"}) + + async def test_an_installs_own_mapping_and_removal_both_count(): own = SimpleNamespace(tool="mcp__deploy__ship", match="", moment="work.deliver", effect="add") assert "ship" in await _reachable({"work.deliver"}, [own]) diff --git a/tests/test_skill_moments.py b/tests/test_skill_moments.py new file mode 100644 index 00000000..fb8576eb --- /dev/null +++ b/tests/test_skill_moments.py @@ -0,0 +1,84 @@ +"""The bundled skills declare the moments they are for (milestone 458 step 5). + +Loading the reporting procedure is a report; loading the planning procedure +is planning. Each SKILL.md says which moment it is for in its frontmatter +(`metadata: moments:`), where an author editing the skill sees it — but the +server that resolves a skill load to its moments never sees the plugin's +files, so the same declaration ships as defaults in +`moment_actions.BUNDLED_SKILL_MOMENTS`. Two copies drift unless something +holds them together; this does, in both directions, and every skill has to +make the choice rather than inherit silence. +""" +from __future__ import annotations + +import json +import re +from pathlib import Path + +from scribe.services import moment_actions as ma +from scribe.services import moments + +ROOT = Path(__file__).resolve().parents[1] +SKILLS = ROOT / "plugin" / "skills" +MANIFEST = ROOT / "plugin" / ".claude-plugin" / "plugin.json" + +_FRONT = re.compile(r"\A---\n(.*?)\n---\n", re.S) +_METADATA = re.compile(r"^metadata:[ \t]*\n((?:[ \t]+\S.*(?:\n|\Z))*)", re.M) +_MOMENTS = re.compile(r"^[ \t]+moments:[ \t]*(.*)$", re.M) + + +def declared(text: str) -> tuple[str, ...]: + """The moments a SKILL.md's frontmatter declares; () when it declares none. + + Agent Skills metadata maps strings to strings, so several moments are one + comma-separated value. + """ + front = _FRONT.match(text) + meta = _METADATA.search(front.group(1)) if front else None + line = _MOMENTS.search(meta.group(1)) if meta else None + if not line: + return () + return tuple(m.strip() for m in line.group(1).split(",") if m.strip()) + + +def _on_disk() -> dict[str, tuple[str, ...]]: + return {p.parent.name: declared(p.read_text()) for p in sorted(SKILLS.glob("*/SKILL.md"))} + + +def test_the_reader_finds_a_declaration_and_only_in_the_frontmatter(): + """The guard below is only as good as this reader, so it must be able to + say no: a declaration in the body, or none at all, reads as nothing.""" + assert declared( + "---\nname: x\ndescription: y\nmetadata:\n moments: work.plan, reply.report\n---\nbody\n" + ) == ("work.plan", "reply.report") + assert declared("---\nname: x\ndescription: y\n---\nmetadata:\n moments: work.plan\n") == () + assert declared("---\nname: x\nmetadata:\n author: someone\n---\n") == () + assert declared("no frontmatter\n") == () + + +def test_every_bundled_skill_declares_the_moments_it_is_for(): + silent = [name for name, found in _on_disk().items() if not found] + assert not silent, ( + f"{silent} declare no moment. Add `metadata:` / ` moments: ` to " + f"the frontmatter (list_moments has the catalog) and the same entry to " + f"moment_actions.BUNDLED_SKILL_MOMENTS" + ) + + +def test_the_frontmatter_and_the_shipped_defaults_agree(): + assert _on_disk() == ma.BUNDLED_SKILL_MOMENTS, ( + "a SKILL.md's `metadata: moments:` and moment_actions.BUNDLED_SKILL_MOMENTS " + "disagree — the server reads only the latter, so change both together" + ) + + +def test_every_declared_moment_is_in_the_catalog(): + bad = {name: found for name, found in _on_disk().items() + if any(m not in moments.MOMENTS for m in found)} + assert not bad, bad + + +def test_the_defaults_qualify_skills_by_the_plugins_own_name(): + """The harness names a plugin's skill `:`, so the defaults + match only while this agrees with the manifest.""" + assert json.loads(MANIFEST.read_text())["name"] == ma.BUNDLED_SKILL_PLUGIN