## Summary
Reported as "deliver_files is broken". It is not: **the tool never ran.**
Every `deliver_files` call on one install was refused before dispatch -- five in a row in a single session -- and nothing was ever delivered:
```
Error: Invalid parameters for tool 'deliver_files': files should be array
```
What the model sent was the array, spelled as a string:
```json
{"files": "[{\"path\": \"...poster.png\", \"title\": \"...\"}]", "message": "..."}
```
`cast_params` already forgives that spelling for every scalar type -- `"3"` for an integer, `"true"` for a boolean -- and did not for arrays or objects, which are exactly the types a model is most likely to stringify.
## Type
- [x] Fix
- [ ] Feature
## The edge of the forgiving is the design
When the value is a string, try `json.loads`, and take the result **only if it is the type the schema asked for**. A string that is not JSON, or is JSON of the wrong shape, is returned unchanged so the validator still names the real problem -- the point is to widen what is accepted, not to swallow a type error.
**Nothing here can raise.** Turning "your argument has the wrong type" into a traceback would be worse than the refusal it replaces, so the parse is wrapped and failure falls through.
**A `type: "string"` field is never parsed.** JSON is ordinary text in a message body or a file's content, and replacing it would hand the tool something it never asked for. Two independent things prevent it today (the string branch returns before the parse is reached, and the parse only wins on a type match), which is why the case pinning it is a tripwire rather than a load-bearing assertion -- said so in its own docstring rather than left to look like coverage.
## Not just deliver_files
Six built-in tools declare an array or object parameter and were all exposed:
| tool | parameter |
|---|---|
| `deliver_files` | `files` |
| `ask_user` | `questions` |
| `image_generate` | `images` |
| `message` | `media` |
| `create_playbook` | `skills` |
| `video_generate` | `params` |
The same failure was already seen from the other side: `acp_client/acp_agent.py` records `update_task_state` and `operations should be array` from a real dispatch.
## Verification
```
make lint-python ruff check + ruff format --check, 1850 files
make lint-imports 9 contracts kept, 0 broken
pytest tests/ 19,699 passed, 7 failed (all pre-existing, see below)
```
- [x] Relevant tests pass locally
- [x] Relevant lint / type checks pass locally
- [ ] User-facing docs or screenshots -- no user-facing string
**End to end, through the real tool**, with the exact payload that failed five times in production:
```
files sent as: str -> [{"path": ".../poster.png", "title": "..."}]
returned: Delivered 1 file(s): poster.png (72 B).
still "should be array": False
registered in the store: True
```
Twelve cases, five mutations, each killing at least one:
| mutation | red |
|---|---|
| drop the whole branch (the old behaviour) | 3 |
| raise instead of falling through on a parse failure | 5 |
| accept the parse whatever type it yielded | 1 |
| do not re-cast the parsed value, so items are not cast | 1 |
| widen the tuple to include `string` | **survived -- unreachable** |
The last is worth stating rather than hiding: that mutation cannot change behaviour, because the `type == "string"` branch returns earlier and the type check would refuse the result anyway. I also tried moving the new block above that branch, alone and combined with widening the tuple, and neither reddens anything either. The invariant holds by construction; the case that documents it says so.
**Pre-existing failures, checked against the base.** 7 failed in the full run, all in `tests/test_security_network.py` (`test_a_redirect_to_a_dangerous_address_is_refused` and siblings). Running that file alone on this same tree gives 4 -- the count is order-dependent -- and the change touches only `raven/agent/tools/params.py` plus a new test file, neither of which `raven/security/network.py` imports. The failures are the box's resolver: it returns poisoned answers roughly half the time, which I measured separately (`en.wikipedia.org` came back as `2001::1` on 3 of 6 lookups). Not introduced here, and worth someone's attention on its own.
## Risk
- [x] Security impact considered -- widens what reaches a tool's own validation, not what bypasses it. A parsed value is still validated against the same schema, and a parse that yields the wrong type is refused exactly as before
- [x] Backward compatibility considered -- a call that worked before takes the identical path; the new branch is reached only by a `str` where an array or object is declared, which previously always failed
- [x] Rollback path is clear -- single-commit revert
## Related Issues
N/A
## Swept
`mr-review-patterns` pre-submit sweep, over `git diff origin/main...HEAD`.
- **1 (a write location moved)** -- nothing moved; a branch was added to an existing dispatch on `target_type`. Grepped every caller of `cast_params`: the registry is the only one, and it runs `validate_params` right after, which is the reader this affects.
- **2 (a value with several entry points)** -- the cast is the single funnel every tool argument passes through, which is why the fix belongs here and not in `deliver_files`.
- **3 (a guard)** -- checked both directions: what it wrongly lets through (JSON of the wrong type, non-JSON text -- both refused, with cases) and what it wrongly refuses (a real list, unaffected, with a case).
- **4 (tests)** -- five mutations above, one honestly reported as unreachable. Failing-ID sets diffed against the base rather than counts.
- **6 (stale text)** -- the module docstring enumerated what is coerced ("a string that should be an integer"); it now names arrays and objects too. Grepped the tracked tree for other statements of the rule: none.
- **9 (error handling)** -- the new path adds one way to end and it is caught: `json.loads` raises `ValueError` on bad text and `TypeError` on a non-string, and both fall through to the untouched value.
- **11** -- `git ls-files | grep -c node_modules` is 0; the commit-message gate was run, not eyeballed.
Not applicable, with reasons: **3b, 3c, 3d, 3e** (no tool schema produced, no state moved, one lane, no assertion lost its symbol); **4b, 4c, 4d** (no platform branch, no shell, no rendered number); **5, 5b** (no dependency; `json` is stdlib and already imported across this package); **6b, 6c** (no backup, no generated artifact); **7, 7b** (nothing on disk); **8** (no asset, no secret); **10** (no prompt text).
## Deliberately not fixed
The error text still ends with `[Analyze the error above and try a different approach.]`, and the model plainly did not -- it sent the same shape five times. A message naming the expected spelling (`files must be a JSON array, not a string containing one`) would give it something to act on. That is a change to the registry's error surface, affects every tool, and deserves its own argument.
## Moved from !594
Opened on a compliant source branch. AGENTS.md 2.1 asks for a 3-5 word snake_case description and the previous branch had seven; GitLab cannot change an existing merge request's source branch, so the change moves rather than the name.
Same commits, rebased onto `c2a9768f`. Both code findings from the review on !594 are already in them -- `RecursionError` caught with its regression case, and the implementation comment reduced to the two non-obvious reasons. Nothing else changed, so that review carries.
194 lines
7.1 KiB
Python
194 lines
7.1 KiB
Python
"""Bundled-file reference resolution in ``load_skills_for_context``.
|
|
|
|
Covers three mechanisms and their false-positive guards:
|
|
- markdown-link rewrite to absolute paths (existence-checked),
|
|
- the ``{baseDir}`` per-ref substitution,
|
|
- the directory-resolution header hint.
|
|
"""
|
|
|
|
from pathlib import Path
|
|
|
|
import pytest
|
|
|
|
from raven.memory_engine.skill_forge import LocalSkillCatalog
|
|
from raven.memory_engine.skill_local.types import SkillMeta
|
|
|
|
|
|
@pytest.fixture
|
|
def svc(tmp_path: Path) -> LocalSkillCatalog:
|
|
workspace = tmp_path / "chanwork"
|
|
workspace.mkdir()
|
|
builtin = tmp_path / "builtin"
|
|
builtin.mkdir()
|
|
return LocalSkillCatalog(workspace, builtin_skills_dir=builtin, start_watcher=False)
|
|
|
|
|
|
@pytest.fixture
|
|
def skill_dir(tmp_path: Path) -> Path:
|
|
"""A skill directory with a few bundled files actually on disk."""
|
|
d = tmp_path / "skills" / "demo"
|
|
(d / "references").mkdir(parents=True)
|
|
(d / "scripts").mkdir()
|
|
(d / "assets").mkdir()
|
|
(d / "examples").mkdir()
|
|
(d / "references" / "EXISTS.md").write_text("x")
|
|
(d / "references" / "GUIDE.md").write_text("x")
|
|
(d / "references" / "sub").mkdir()
|
|
(d / "references" / "sub" / "deep.md").write_text("x")
|
|
(d / "scripts" / "run.sh").write_text("#!/bin/sh")
|
|
(d / "assets" / "logo.svg").write_text("x")
|
|
(d / "examples" / "demo.py").write_text("x")
|
|
return d
|
|
|
|
|
|
def _meta(skill_dir: Path, body: str, name: str = "demo") -> SkillMeta:
|
|
return SkillMeta(
|
|
id=0,
|
|
name=name,
|
|
description="",
|
|
path=skill_dir / "SKILL.md",
|
|
content=body,
|
|
source="t",
|
|
)
|
|
|
|
|
|
def render(svc: LocalSkillCatalog, skill_dir: Path, body: str) -> str:
|
|
return svc.load_skills_for_context([_meta(skill_dir, body)], max_inject=1)
|
|
|
|
|
|
# ── markdown-link rewrite (B) ────────────────────────────────────────
|
|
|
|
|
|
def test_md_link_existing_becomes_absolute(svc, skill_dir):
|
|
out = render(svc, skill_dir, "see [Guide](references/GUIDE.md)")
|
|
assert f"({skill_dir}/references/GUIDE.md)" in out
|
|
|
|
|
|
def test_md_link_missing_left_unchanged(svc, skill_dir):
|
|
out = render(svc, skill_dir, "see [X](references/MISSING.md)")
|
|
assert "(references/MISSING.md)" in out
|
|
assert str(skill_dir) + "/references/MISSING.md" not in out
|
|
|
|
|
|
def test_md_link_external_url_untouched(svc, skill_dir):
|
|
out = render(svc, skill_dir, "see [site](https://example.com/x)")
|
|
assert "(https://example.com/x)" in out
|
|
|
|
|
|
def test_md_link_non_whitelisted_dir_untouched(svc, skill_dir):
|
|
out = render(svc, skill_dir, "see [d](docs/intro.md)")
|
|
assert "(docs/intro.md)" in out
|
|
|
|
|
|
def test_md_link_dotslash_prefix(svc, skill_dir):
|
|
out = render(svc, skill_dir, "see [G](./references/EXISTS.md)")
|
|
assert f"({skill_dir}/references/EXISTS.md)" in out
|
|
|
|
|
|
def test_md_link_nested_path(svc, skill_dir):
|
|
out = render(svc, skill_dir, "see [D](references/sub/deep.md)")
|
|
assert f"({skill_dir}/references/sub/deep.md)" in out
|
|
|
|
|
|
def test_md_link_anchor_and_query_preserved(svc, skill_dir):
|
|
out = render(svc, skill_dir, "[a](references/GUIDE.md#sec) [b](references/GUIDE.md?v=1)")
|
|
assert f"({skill_dir}/references/GUIDE.md#sec)" in out
|
|
assert f"({skill_dir}/references/GUIDE.md?v=1)" in out
|
|
|
|
|
|
def test_md_link_all_bundled_dirs(svc, skill_dir):
|
|
out = render(
|
|
svc,
|
|
skill_dir,
|
|
"[s](scripts/run.sh) [a](assets/logo.svg) [e](examples/demo.py)",
|
|
)
|
|
assert f"({skill_dir}/scripts/run.sh)" in out
|
|
assert f"({skill_dir}/assets/logo.svg)" in out
|
|
assert f"({skill_dir}/examples/demo.py)" in out
|
|
|
|
|
|
def test_md_link_in_code_fence_not_rewritten(svc, skill_dir):
|
|
out = render(svc, skill_dir, "```md\n[Guide](references/GUIDE.md)\n```")
|
|
assert "(references/GUIDE.md)" in out
|
|
assert f"{skill_dir}/references/GUIDE.md" not in out
|
|
|
|
|
|
# ── bare / shell refs are NOT touched (rely on the header hint) ───────
|
|
|
|
|
|
def test_bare_ref_in_prose_untouched(svc, skill_dir):
|
|
out = render(svc, skill_dir, "see references/GUIDE.md for details")
|
|
assert "references/GUIDE.md for details" in out
|
|
assert f"{skill_dir}/references/GUIDE.md for details" not in out
|
|
|
|
|
|
def test_bash_dotslash_ref_untouched(svc, skill_dir):
|
|
out = render(svc, skill_dir, "run `./scripts/run.sh` now")
|
|
assert "./scripts/run.sh" in out
|
|
|
|
|
|
# ── directory header hint (C) ────────────────────────────────────────
|
|
|
|
|
|
def test_dir_header_present_for_pathset(svc, skill_dir):
|
|
out = render(svc, skill_dir, "see references/GUIDE.md")
|
|
assert f"**Skill directory**: `{skill_dir}`" in out
|
|
assert "resolve under this directory" in out
|
|
|
|
|
|
def test_dir_header_absent_when_dir_missing(svc, tmp_path):
|
|
gone = tmp_path / "gone" / "SKILL.md"
|
|
meta = SkillMeta(
|
|
id=0, name="g", description="", path=gone, content="[g](references/GUIDE.md)\nsee references/x.md", source="t"
|
|
)
|
|
out = svc.load_skills_for_context([meta], max_inject=1)
|
|
assert "Skill directory" not in out
|
|
assert f"{gone.parent}/references/GUIDE.md" not in out # no 404 abs path
|
|
|
|
|
|
# ── {baseDir} per-ref substitution ───────────────────────────────────
|
|
|
|
|
|
def test_basedir_existing_ref_resolves(svc, skill_dir):
|
|
out = render(svc, skill_dir, "cat {baseDir}/scripts/run.sh")
|
|
assert f"{skill_dir}/scripts/run.sh" in out
|
|
|
|
|
|
def test_basedir_missing_ref_left_literal_no_404(svc, skill_dir):
|
|
out = render(svc, skill_dir, "ok {baseDir}/scripts/run.sh missing {baseDir}/references/NOPE.md")
|
|
assert f"{skill_dir}/scripts/run.sh" in out # existing → abs
|
|
assert "{baseDir}/references/NOPE.md" in out # missing → literal
|
|
assert f"{skill_dir}/references/NOPE.md" not in out # never a 404 abs path
|
|
|
|
|
|
def test_basedir_bare_resolves_to_dir(svc, skill_dir):
|
|
out = render(svc, skill_dir, "files live under {baseDir} here")
|
|
assert f"under {skill_dir} here" in out
|
|
|
|
|
|
def test_basedir_all_broken_no_header(svc, skill_dir):
|
|
out = render(svc, skill_dir, "see {baseDir}/references/NOPE.md only")
|
|
assert "Skill directory" not in out
|
|
assert "{baseDir}/references/NOPE.md" in out
|
|
|
|
|
|
# ── misc ─────────────────────────────────────────────────────────────
|
|
|
|
|
|
def test_multi_skill_each_own_dir(svc, tmp_path):
|
|
d1 = tmp_path / "s1"
|
|
(d1 / "references").mkdir(parents=True)
|
|
(d1 / "references" / "A.md").write_text("a")
|
|
d2 = tmp_path / "s2"
|
|
(d2 / "references").mkdir(parents=True)
|
|
(d2 / "references" / "B.md").write_text("b")
|
|
m1 = SkillMeta(id=1, name="s1", description="", path=d1 / "SKILL.md", content="[a](references/A.md)", source="t")
|
|
m2 = SkillMeta(id=2, name="s2", description="", path=d2 / "SKILL.md", content="[b](references/B.md)", source="t")
|
|
out = svc.load_skills_for_context([m1, m2], max_inject=5)
|
|
assert f"{d1}/references/A.md" in out
|
|
assert f"{d2}/references/B.md" in out
|
|
|
|
|
|
def test_empty_body_skipped(svc, skill_dir):
|
|
assert render(svc, skill_dir, "") == ""
|