Skip to content

fix(operator): count guidance paths by filesystem type in adopt plan #509

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
solomonneas merged 1 commit into from
Jul 24, 2026
Merged

fix(operator): count guidance paths by filesystem type in adopt plan #509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 23 additions & 8 deletions src/brigade/operator_cmd/adoption.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,11 +176,22 @@ def _workspace_inventory(target: Path) -> dict[str, Any]:
".learnings",
"memory/cards",
]
guidance_dirs = {"rules", ".learnings", "memory/cards"}
guidance = [
{"path": rel, "exists": (target / rel).exists(), "kind": "dir" if rel in guidance_dirs else "file"}
for rel in guidance_paths
]
expected_guidance_dirs = {"rules", ".learnings", "memory/cards"}
guidance = []
for rel in guidance_paths:
path = target / rel
if path.is_file():
guidance.append({"path": rel, "exists": True, "kind": "file"})
elif path.is_dir():
guidance.append({"path": rel, "exists": True, "kind": "dir"})
else:
guidance.append(
{
"path": rel,
"exists": False,
"kind": "dir" if rel in expected_guidance_dirs else "file",
}
)
harness_rows = []
for harness in KNOWN_HARNESSES:
root = target / f".{harness}"
Expand All @@ -202,7 +213,7 @@ def _workspace_inventory(target: Path) -> dict[str, Any]:
"pipeline",
"memory-handoffs",
]
local_state = [{"path": rel, "exists": (target / rel).exists()} for rel in local_state_paths]
local_state = [{"path": rel, "exists": (target / rel).is_dir()} for rel in local_state_paths]
brigade_root = target / ".brigade"
return {
"brigade": {
Expand All @@ -214,8 +225,12 @@ def _workspace_inventory(target: Path) -> dict[str, Any]:
},
"guidance": {
"items": guidance,
"present_count": sum(1 for item in guidance if item["exists"] and item["kind"] == "file"),
"present_dir_count": sum(1 for item in guidance if item["exists"] and item["kind"] == "dir"),
"present_count": sum(
1 for item in guidance if item["kind"] == "file" and (target / item["path"]).is_file()
),
"present_dir_count": sum(
1 for item in guidance if item["kind"] == "dir" and (target / item["path"]).is_dir()
),
},
"harnesses": {
"items": harness_rows,
Expand Down
12 changes: 11 additions & 1 deletion tests/test_operator_cmd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1658,10 +1658,20 @@ def fake_hook_status(target, policy="public-repo"):

def test_adopt_plan_counts_guidance_files_and_dirs_separately(tmp_path, capsys):
(tmp_path / "CLAUDE.md").write_text("# rules\n")
(tmp_path / "memory" / "cards").mkdir(parents=True)
cards_dir = tmp_path / "memory" / "cards"
cards_dir.mkdir(parents=True)
for index in range(3):
(cards_dir / f"card-{index}.md").write_text(f"# card {index}\n")

assert cli.main(["operator", "adopt", "plan", "--target", str(tmp_path), "--json"]) == 0
payload = json.loads(capsys.readouterr().out)
guidance = payload["workspace"]["guidance"]
assert guidance["present_count"] == 1
assert guidance["present_dir_count"] == 1
present = {item["path"]: item for item in guidance["items"] if item["exists"]}
assert present["CLAUDE.md"]["kind"] == "file"
assert present["memory/cards"]["kind"] == "dir"

assert cli.main(["operator", "adopt", "plan", "--target", str(tmp_path)]) == 0
out = capsys.readouterr().out
assert "guidance_files: 1 (+1 dirs)" in out
Loading