910b601a5e
BottleSpec.manifest is ManifestIndex | Manifest (pre/post _validate()). Downstream code always runs post-validate so it needs Manifest, but pyright flagged every .agent/.bottle access. The new loaded_manifest property asserts isinstance and returns Manifest, giving pyright a narrowed type without scattering type: ignore everywhere. Also remove unused Manifest imports from test files and annotate the _index() helper in test_manifest_agent_git_user.
267 lines
9.2 KiB
Python
267 lines
9.2 KiB
Python
"""Unit: agent-level git-gate.user overlay + provenance (PRD 0027, PRD 0047).
|
|
|
|
An agent file may declare `git-gate.user` (name/email). At
|
|
`ManifestIndex.load_for_agent()` it overlays the referenced bottle's
|
|
`git-gate.user` per-field, agent-wins-on-non-empty. `git-gate.repos` is
|
|
rejected on agents. `Manifest.git_identity_summary()` reports the
|
|
effective identity with per-field `(agent)`/`(bottle)` provenance.
|
|
|
|
The `from_json_obj` path drives `Agent.from_dict` + the overlay in
|
|
load_for_agent; a temp-dir case locks the md loader (the `_AGENT_KEYS`
|
|
allow + the `git-gate` threading into `agent_dict`)."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import os
|
|
import shutil
|
|
import tempfile
|
|
import textwrap
|
|
import unittest
|
|
from pathlib import Path
|
|
|
|
from bot_bottle.manifest import ManifestError, Manifest, ManifestIndex
|
|
|
|
|
|
def _error_message(callable_, *args, **kwargs) -> str: # type: ignore
|
|
"""Run `callable_` expecting a ManifestError; return its message."""
|
|
try:
|
|
callable_(*args, **kwargs)
|
|
except ManifestError as e:
|
|
return str(e)
|
|
raise AssertionError("expected ManifestError was not raised")
|
|
|
|
|
|
def _manifest(*, bottle_user=None, agent_git=None) -> Manifest: # type: ignore
|
|
"""Build an index with one agent 'impl' and load it, returning a Manifest."""
|
|
bottle: dict = {} # type: ignore
|
|
if bottle_user is not None:
|
|
bottle = {"git-gate": {"user": bottle_user}}
|
|
agent: dict = {"skills": [], "prompt": "", "bottle": "dev"} # type: ignore
|
|
if agent_git is not None:
|
|
agent["git-gate"] = agent_git
|
|
return ManifestIndex.from_json_obj({
|
|
"bottles": {"dev": bottle},
|
|
"agents": {"impl": agent},
|
|
}).load_for_agent("impl")
|
|
|
|
|
|
def _index(*, bottle_user: dict[str, object] | None = None, agent_git: dict[str, object] | None = None) -> ManifestIndex:
|
|
"""Build an index with one agent 'impl' without loading it."""
|
|
bottle: dict = {} # type: ignore
|
|
if bottle_user is not None:
|
|
bottle = {"git-gate": {"user": bottle_user}}
|
|
agent: dict = {"skills": [], "prompt": "", "bottle": "dev"} # type: ignore
|
|
if agent_git is not None:
|
|
agent["git-gate"] = agent_git
|
|
return ManifestIndex.from_json_obj({
|
|
"bottles": {"dev": bottle},
|
|
"agents": {"impl": agent},
|
|
})
|
|
|
|
|
|
class TestAgentGitUserOverlay(unittest.TestCase):
|
|
def test_agent_supplies_both_fields(self):
|
|
m = _manifest(agent_git={"user": {"name": "a", "email": "a@b"}})
|
|
u = m.bottle.git_user
|
|
self.assertEqual("a", u.name)
|
|
self.assertEqual("a@b", u.email)
|
|
|
|
def test_agent_name_only_email_falls_through_to_bottle(self):
|
|
m = _manifest(
|
|
bottle_user={"name": "B", "email": "b@c"},
|
|
agent_git={"user": {"name": "a"}},
|
|
)
|
|
u = m.bottle.git_user
|
|
self.assertEqual("a", u.name) # agent wins
|
|
self.assertEqual("b@c", u.email) # bottle falls through
|
|
|
|
def test_agent_email_only_name_falls_through_to_bottle(self):
|
|
m = _manifest(
|
|
bottle_user={"name": "B", "email": "b@c"},
|
|
agent_git={"user": {"email": "a@b"}},
|
|
)
|
|
u = m.bottle.git_user
|
|
self.assertEqual("B", u.name)
|
|
self.assertEqual("a@b", u.email)
|
|
|
|
def test_agent_identity_with_bottle_declaring_none(self):
|
|
idx = _index(agent_git={"user": {"name": "a", "email": "a@b"}})
|
|
# Raw bottle has no git_user; loaded manifest has merged git_user from agent
|
|
self.assertTrue(idx.bottles["dev"].git_user.is_empty())
|
|
m = idx.load_for_agent("impl")
|
|
self.assertFalse(m.bottle.git_user.is_empty())
|
|
|
|
def test_bottle_only_identity_preserved_when_agent_silent(self):
|
|
m = _manifest(bottle_user={"name": "B", "email": "b@c"})
|
|
u = m.bottle.git_user
|
|
self.assertEqual("B", u.name)
|
|
self.assertEqual("b@c", u.email)
|
|
|
|
def test_no_overlay_uses_bottle_instance_directly(self):
|
|
idx = _index(bottle_user={"name": "B"})
|
|
m = idx.load_for_agent("impl")
|
|
# Agent has no git_user — bottle instance should be the same object
|
|
self.assertIs(idx.bottles["dev"], m.bottle)
|
|
|
|
def test_noop_overlay_uses_bottle_instance_directly(self):
|
|
idx = _index(
|
|
bottle_user={"name": "B", "email": "b@c"},
|
|
agent_git={"user": {"name": "B", "email": "b@c"}},
|
|
)
|
|
m = idx.load_for_agent("impl")
|
|
# Agent git_user == bottle git_user — no replace needed
|
|
self.assertEqual(idx.bottles["dev"].git_user, m.bottle.git_user)
|
|
|
|
def test_other_bottle_fields_untouched_by_overlay(self):
|
|
idx = ManifestIndex.from_json_obj({
|
|
"bottles": {"dev": {
|
|
"env": {"FOO": "bar"},
|
|
"supervise": True,
|
|
"git-gate": {"user": {"name": "B"}},
|
|
}},
|
|
"agents": {"impl": {
|
|
"bottle": "dev", "skills": [], "prompt": "",
|
|
"git-gate": {"user": {"name": "a"}},
|
|
}},
|
|
})
|
|
b = idx.load_for_agent("impl").bottle
|
|
self.assertEqual("a", b.git_user.name)
|
|
self.assertEqual({"FOO": "bar"}, dict(b.env))
|
|
self.assertTrue(b.supervise)
|
|
|
|
|
|
class TestAgentGitUserRejections(unittest.TestCase):
|
|
def test_agent_repos_dies_bottle_only(self):
|
|
msg = _error_message(_manifest, agent_git={
|
|
"repos": {"r": {"url": "ssh://git@x/y.git", "key": {"provider": "static", "path": "/dev/null"}}},
|
|
})
|
|
self.assertIn("git-gate.repos", msg)
|
|
self.assertIn("bottle-only", msg)
|
|
|
|
def test_agent_unknown_git_subkey_dies(self):
|
|
msg = _error_message(_manifest, agent_git={"nope": {}})
|
|
self.assertIn("not allowed at the agent level", msg)
|
|
|
|
def test_agent_git_user_both_empty_dies(self):
|
|
msg = _error_message(_manifest, agent_git={"user": {"name": "", "email": ""}})
|
|
self.assertIn("neither name nor email", msg)
|
|
|
|
|
|
class TestGitIdentitySummary(unittest.TestCase):
|
|
def test_both_from_agent(self):
|
|
m = _manifest(agent_git={"user": {"name": "a", "email": "a@b"}})
|
|
self.assertEqual(
|
|
"name=a (agent), email=a@b (agent)",
|
|
m.git_identity_summary(),
|
|
)
|
|
|
|
def test_mixed_provenance(self):
|
|
m = _manifest(
|
|
bottle_user={"name": "B", "email": "b@c"},
|
|
agent_git={"user": {"name": "a"}},
|
|
)
|
|
self.assertEqual(
|
|
"name=a (agent), email=b@c (bottle)",
|
|
m.git_identity_summary(),
|
|
)
|
|
|
|
def test_bottle_only(self):
|
|
m = _manifest(bottle_user={"name": "B", "email": "b@c"})
|
|
self.assertEqual(
|
|
"name=B (bottle), email=b@c (bottle)",
|
|
m.git_identity_summary(),
|
|
)
|
|
|
|
def test_none_when_unset_anywhere(self):
|
|
m = _manifest()
|
|
self.assertIsNone(m.git_identity_summary())
|
|
|
|
|
|
_BOTTLE_DEV = """
|
|
---
|
|
git-gate:
|
|
user:
|
|
name: bottle-name
|
|
email: bottle@example.com
|
|
---
|
|
|
|
dev bottle.
|
|
"""
|
|
|
|
_AGENT_WITH_GIT = """
|
|
---
|
|
bottle: dev
|
|
git-gate:
|
|
user:
|
|
name: agent-name
|
|
---
|
|
|
|
impl agent.
|
|
"""
|
|
|
|
_AGENT_WITH_REPOS = """
|
|
---
|
|
bottle: dev
|
|
git-gate:
|
|
repos:
|
|
r:
|
|
url: ssh://git@x/y.git
|
|
identity: /dev/null
|
|
---
|
|
|
|
bad agent.
|
|
"""
|
|
|
|
|
|
class TestAgentGitUserMdLoader(unittest.TestCase):
|
|
"""Locks the md path: `git-gate` is an accepted agent key and threads
|
|
into the parsed Agent (not rejected as an unknown frontmatter key),
|
|
and agent `git-gate.repos` dies through the same loader."""
|
|
|
|
def setUp(self) -> None:
|
|
self.home = Path(tempfile.mkdtemp(prefix="cb-home-"))
|
|
self._orig_home = os.environ.get("HOME")
|
|
os.environ["HOME"] = str(self.home)
|
|
|
|
def tearDown(self) -> None:
|
|
if self._orig_home is None:
|
|
os.environ.pop("HOME", None)
|
|
else:
|
|
os.environ["HOME"] = self._orig_home
|
|
shutil.rmtree(self.home, ignore_errors=True)
|
|
|
|
def _write(self, rel: str, text: str) -> None:
|
|
p = self.home / ".bot-bottle" / rel
|
|
p.parent.mkdir(parents=True, exist_ok=True)
|
|
p.write_text(textwrap.dedent(text).lstrip("\n"))
|
|
|
|
def test_md_agent_git_user_overlays_bottle(self):
|
|
self._write("bottles/dev.md", _BOTTLE_DEV)
|
|
self._write("agents/impl.md", _AGENT_WITH_GIT)
|
|
m = ManifestIndex.resolve(str(self.home)).load_for_agent("impl")
|
|
u = m.bottle.git_user
|
|
self.assertEqual("agent-name", u.name)
|
|
self.assertEqual("bottle@example.com", u.email)
|
|
self.assertEqual(
|
|
"name=agent-name (agent), email=bottle@example.com (bottle)",
|
|
m.git_identity_summary(),
|
|
)
|
|
|
|
def test_md_agent_repos_fails_at_preflight(self):
|
|
"""git-gate.repos on an agent is an error; resolve() still succeeds
|
|
so other agents remain accessible, but load_for_agent raises."""
|
|
self._write("bottles/dev.md", _BOTTLE_DEV)
|
|
self._write("agents/impl.md", _AGENT_WITH_REPOS)
|
|
from bot_bottle.manifest import ManifestError
|
|
names = ManifestIndex.resolve(str(self.home))
|
|
self.assertIn("impl", names.all_agent_names)
|
|
with self.assertRaises(ManifestError) as ctx:
|
|
names.load_for_agent("impl")
|
|
msg = str(ctx.exception)
|
|
self.assertIn("git-gate.repos", msg)
|
|
self.assertIn("bottle-only", msg)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main()
|