## Summary Six defects a review pass over the served page turned up, plus the registry read underneath one of them. **The delivery card was measured rather than stated.** A width-derived capacity hook decided how many tiles fit and whether a description was drawn, so one card was four different cards across six widths. The cap is a stated count now, the description always shows, and a tile keeps one preview ratio with a max-height instead of a growing box. Measured after: a single card is 142px at every width with a description and 134px without, and a grid preview is a constant 198x124. The preview itself lost its inset white sheet -- content fills the tile. **A desk pane re-opened itself.** Clicking a row whose pane was already up replaced the pane object, re-tiled the grid and re-revealed the workspace to arrive at exactly the screen that was already there, and `revealWorkspace` ran a full workspace draw even when the split was already open. Both are no-ops now; workspace draws on a re-click went from one to zero, and none of it ever repainted the pane's content -- that was measured before changing anything. **A dag node header ran past its panel.** The node id is unbounded -- a playbook names one `daily-ai-digest-36e275-scan-news` -- and with nothing able to shrink, the flex row pushed the "open run" link off the right edge, where it read as the card having been cut in half. Measured before: a 320px panel overflowed by 18px and a 280px one by 58px. The name gives way now, and only the name. **The file view's action row was `.acts`**, which the transcript already uses for an answer's icon strip -- 27x27 square buttons. Two text buttons were squeezed into those squares and their labels overlapped, which reads as mojibake, not as a layout bug. Renamed to `.binacts`: the buttons measure 186x30 and 107x30 with no overlap. Second class collision found in this stylesheet, after `.mini`. **The floating desk covered the settings dialog.** It sits in its own band below the takeover layer now, verified with `elementFromPoint` at the palette centre returning the dialog's own panel. **The instance registry was read once per process.** `_load` cached its records for the life of the gateway, while sub-agents register from their own `cli` processes into the same shared file -- so every instance created after startup was invisible to the panel until a restart. The decisive test was appending a row from outside a running server and getting zero back. It reloads on a change in `(mtime_ns, size)`, stamped from the stat taken *before* the read so a writer landing between the two is seen on the next call rather than stamped as already-loaded and skipped forever; `_flush` restamps after its own write, so writing does not cost a reparse. This also closes a silent data loss: `_flush` writes the whole cached map back, so flushing from a stale cache dropped every record another process had added in the meantime. ## Type - [x] Fix - [ ] Feature - [ ] Docs - [ ] CI / tooling - [ ] Refactor - [ ] Other ## Verification Run at this head, on `da0f0124`: - `uv run --frozen --all-extras pytest -q` -> `11214 passed, 33 skipped, 13 deselected, 2 warnings in 715.40s`, exit 0 - `npm test --prefix ui` -> `58 passed (58) / 686 passed (686)` - `make lint-ui` -> `generated.ts matches the contract (132 methods)`, then `tsc --noEmit` with no output - `uv run --frozen --extra dev ruff check` + `ruff format --check` on the two python files -> `All checks passed!`, `2 files already formatted` - `PYTHONPATH=. python3 scripts/check_commit_messages.py origin/main..HEAD` -> no output, exit 0 The five registry tests were mutation-checked: disabling the reload reds three of them, and removing the restamp in `_flush` reds the one that pins "our own write is not a reason to reparse". The two desk-store tests were checked the same way. `make lint-python` over the whole repo is not clean at this head, and was not before this branch: the errors are in `raven/agent/tools/deliver.py`, `raven/cli/tui_commands.py`, `tests/test_channels_outlet.py` and `tests/test_mcp_client.py`, none of which appears in this diff. - [x] Relevant tests pass locally - [x] Relevant lint / type checks pass locally - [x] User-facing docs or screenshots are updated when needed ## Risk User-visible behaviour changes, all of them on the served page: - a delivery card is one height per state instead of one per width, and always carries its description; - clicking a desk row whose pane is open no longer redraws anything; - a dag node's name truncates instead of pushing its run link out of view; - the desk no longer paints over the settings dialog; - an instance registered by another process appears without a restart. Rollback: revert the two commits. Nothing is persisted that a rollback would strand -- the registry change is read-side only, and the css and tsx changes hold no state. - [x] Security impact considered - [x] Backward compatibility considered - [x] Rollback path is clear for risky changes Known gap, deliberately not fixed here: a spawn's answer is missing from three instance logs on my own machine (the spawn's prompt is logged as a `user` row with no `assistant` row beside it), so opening those instances shows a question that was never answered. Reproduced on disk, not yet diagnosed, and unrelated to anything in this diff. ## Related Issues N/A
245 lines
8.8 KiB
Python
245 lines
8.8 KiB
Python
"""HubSkillSource + SkillHubClient.search — discovery layer (P1).
|
|
|
|
Hermetic: a httpx MockTransport stands in for the Skill Hub, so no
|
|
network. Covers envelope unwrapping, RouterHit mapping, safety-score
|
|
filtering, and graceful empties. Body-hydrate moved to
|
|
SkillsSegmentBuilder (see test_skill_segment_builder.py); this layer
|
|
returns metadata-only RouterHits.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from typing import Any
|
|
|
|
import httpx
|
|
import pytest
|
|
|
|
from raven.memory_engine.skill_forge import HubSkillSource
|
|
from raven.memory_engine.skill_forge.types import RouterHit
|
|
from raven.skill_hub import SkillHubClient
|
|
from raven.skill_hub.client import SkillHubError
|
|
|
|
|
|
def _envelope(result: dict[str, Any], *, error: str = "ok", status: int = 0) -> dict:
|
|
return {"error": error, "requestId": "req-1", "status": status, "result": result}
|
|
|
|
|
|
def _item(id_: str, name: str, *, score=0.9, safety=None) -> dict:
|
|
"""A Hub catalog item in the dev/aws schema. ``score_safety`` is absent
|
|
by default (the real catalog payload omits it — it's detail-only); pass
|
|
``safety=`` to exercise the optional safety guard."""
|
|
it = {
|
|
"id": id_,
|
|
"skill_id": f"acme/{name.lower().replace(' ', '-')}",
|
|
"name": name,
|
|
"description": f"{name} does things.",
|
|
"source": "acme",
|
|
"category": "ops",
|
|
"tags": ["x"],
|
|
"quality_score": score,
|
|
"body_tokens": 1000,
|
|
"install_count": 10,
|
|
"download_url": f"https://hub.test/openapi/v1/skills/{id_}/download",
|
|
}
|
|
if safety is not None:
|
|
it["score_safety"] = safety
|
|
return it
|
|
|
|
|
|
def _client(handler) -> SkillHubClient:
|
|
transport = httpx.MockTransport(handler)
|
|
return SkillHubClient(
|
|
"https://hub.test",
|
|
api_key="k",
|
|
client=httpx.AsyncClient(transport=transport),
|
|
)
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# SkillHubClient.search
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
class TestClientSearch:
|
|
async def test_search_unwraps_envelope_and_sends_headers(self) -> None:
|
|
seen: dict[str, Any] = {}
|
|
|
|
def handler(req: httpx.Request) -> httpx.Response:
|
|
seen["path"] = req.url.path
|
|
seen["q"] = req.url.params.get("q")
|
|
seen["auth"] = req.headers.get("authorization")
|
|
seen["reqid"] = req.headers.get("x-request-id")
|
|
return httpx.Response(200, json=_envelope({"items": [_item("a", "Alpha")]}))
|
|
|
|
c = _client(handler)
|
|
items = await c.search("calendar", limit=5)
|
|
assert seen["path"] == "/openapi/v1/skills"
|
|
assert seen["q"] == "calendar"
|
|
assert seen["auth"] == "Bearer k"
|
|
assert seen["reqid"] # X-Request-ID present
|
|
assert [it["name"] for it in items] == ["Alpha"]
|
|
await c.aclose()
|
|
|
|
async def test_long_query_is_trimmed_to_the_edge_limit(self) -> None:
|
|
"""A prompt-sized query must not blow the hub edge's query-string cap.
|
|
|
|
The deployed hub sits behind a load balancer that answers 403 to a
|
|
query string over 2048 bytes, so an untrimmed query loses discovery
|
|
outright instead of searching on a prefix.
|
|
"""
|
|
seen: dict[str, Any] = {}
|
|
|
|
def handler(req: httpx.Request) -> httpx.Response:
|
|
seen["query"] = req.url.query
|
|
seen["q"] = req.url.params.get("q")
|
|
return httpx.Response(200, json=_envelope({"items": []}))
|
|
|
|
long_q = "分析这个项目的源码并输出报告。" * 200
|
|
c = _client(handler)
|
|
await c.search(long_q, limit=20)
|
|
assert len(seen["query"]) <= 2048
|
|
assert long_q.startswith(seen["q"])
|
|
await c.aclose()
|
|
|
|
async def test_trim_measures_encoded_width_not_characters(self) -> None:
|
|
"""Trimming counts encoded bytes: one CJK char costs 9, an ASCII one 1.
|
|
|
|
A character-count cap is off by up to 9x, which either still 403s or
|
|
throws away most of a query that would have fit.
|
|
"""
|
|
seen: dict[str, Any] = {}
|
|
|
|
def handler(req: httpx.Request) -> httpx.Response:
|
|
seen["query"] = req.url.query
|
|
seen["q"] = req.url.params.get("q")
|
|
return httpx.Response(200, json=_envelope({"items": []}))
|
|
|
|
c = _client(handler)
|
|
await c.search("中" * 500, limit=20)
|
|
cjk_kept = len(seen["q"])
|
|
cjk_bytes = len(seen["query"])
|
|
await c.search("a" * 500, limit=20)
|
|
ascii_kept = len(seen["q"])
|
|
await c.aclose()
|
|
|
|
assert cjk_bytes <= 2048
|
|
assert cjk_bytes > 1900, "trimmed far below the budget -- counting chars, not bytes"
|
|
assert cjk_kept < 250, f"kept {cjk_kept} CJK chars, which cannot fit 2048 bytes"
|
|
assert ascii_kept == 500, "an ASCII query well inside the budget must pass whole"
|
|
|
|
async def test_trim_budget_leaves_room_for_the_other_params(self) -> None:
|
|
seen: dict[str, Any] = {}
|
|
|
|
def handler(req: httpx.Request) -> httpx.Response:
|
|
seen["query"] = req.url.query
|
|
return httpx.Response(200, json=_envelope({"items": []}))
|
|
|
|
c = _client(handler)
|
|
await c.search("中" * 500, limit=100, category="operations", sort="quality")
|
|
assert len(seen["query"]) <= 2048
|
|
await c.aclose()
|
|
|
|
async def test_non_ok_envelope_raises(self) -> None:
|
|
def handler(req):
|
|
return httpx.Response(200, json=_envelope({}, error="bad", status=7))
|
|
|
|
c = _client(handler)
|
|
with pytest.raises(SkillHubError):
|
|
await c.search("q")
|
|
await c.aclose()
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# HubSkillSource.search → RouterHit
|
|
# ---------------------------------------------------------------------------
|
|
|
|
|
|
class TestHubSource:
|
|
async def test_maps_items_to_router_hits(self) -> None:
|
|
def handler(req):
|
|
return httpx.Response(
|
|
200,
|
|
json=_envelope(
|
|
{
|
|
"items": [
|
|
_item("id1", "Calendar Scheduling", score=0.91),
|
|
_item("id2", "Email Triage", score=0.80),
|
|
]
|
|
}
|
|
),
|
|
)
|
|
|
|
src = HubSkillSource(_client(handler), weight=0.85)
|
|
hits = await src.search("schedule", [], k=10)
|
|
assert len(hits) == 2
|
|
h = hits[0]
|
|
assert isinstance(h, RouterHit)
|
|
assert h.qualified_id == "hub/id1" # UUID is the native id
|
|
assert h.name == "Calendar Scheduling"
|
|
assert h.content == "" # Tier 0: metadata only
|
|
assert h.score == pytest.approx(0.91) # from quality_score
|
|
assert h.meta["source"] == "hub"
|
|
assert h.meta["id"] == "id1"
|
|
assert h.meta["skill_id"] == "acme/calendar-scheduling"
|
|
assert h.meta["tags"] == ["x"]
|
|
assert src.weight == 0.85
|
|
|
|
async def test_filters_below_min_safety(self) -> None:
|
|
def handler(req):
|
|
return httpx.Response(
|
|
200,
|
|
json=_envelope(
|
|
{
|
|
"items": [
|
|
_item("ok", "Safe", safety=0.9),
|
|
_item("no", "Risky", safety=0.4),
|
|
]
|
|
}
|
|
),
|
|
)
|
|
|
|
src = HubSkillSource(_client(handler), min_safety=0.7)
|
|
hits = await src.search("q", [], k=10)
|
|
assert [h.name for h in hits] == ["Safe"]
|
|
|
|
async def test_missing_id_or_name_skipped(self) -> None:
|
|
def handler(req):
|
|
return httpx.Response(
|
|
200,
|
|
json=_envelope(
|
|
{
|
|
"items": [
|
|
{"id": "x"}, # no name
|
|
_item("good", "Good"),
|
|
]
|
|
}
|
|
),
|
|
)
|
|
|
|
src = HubSkillSource(_client(handler))
|
|
hits = await src.search("q", [], k=10)
|
|
assert [h.name for h in hits] == ["Good"]
|
|
|
|
async def test_all_hits_metadata_only(self) -> None:
|
|
"""HubSkillSource is Tier 0 / discovery — body hydrate now happens
|
|
in SkillsSegmentBuilder's pre-gate stage instead. Verifies the
|
|
retired ``prefetch_bodies`` knob isn't silently re-introducing body
|
|
fetches at the source layer."""
|
|
|
|
def handler(req: httpx.Request) -> httpx.Response:
|
|
return httpx.Response(
|
|
200,
|
|
json=_envelope(
|
|
{
|
|
"items": [
|
|
_item("id1", "Top", score=0.95),
|
|
_item("id2", "Low", score=0.3),
|
|
]
|
|
}
|
|
),
|
|
)
|
|
|
|
src = HubSkillSource(_client(handler))
|
|
hits = await src.search("q", [], k=10)
|
|
assert all(h.content == "" for h in hits)
|