hunter-harness 0.1.2 → 0.2.0

package/resources/harness/{java → bundles/general/codebuddy}/scripts/harness_deploy.py

@@ -40,9 +40,12 @@ SKIP_DIR_NAMES = {
     "redesign",
     "shared",
     "overlays",
+    "adapters",
     ".git",
 }
 SKIP_TOP_NAMES = {"harness-merge", "harness-report"}
+HARNESS_AGENTS = ("claude-code", "codex", "cursor", "codebuddy")
+AGENTS_WITH_CUSTOM_AGENTS = frozenset({"claude-code", "codebuddy"})
 
 
 def now_iso() -> str:
@@ -69,12 +72,14 @@ def sha256_file(path: Path) -> str:
     return h.hexdigest()
 
 
-def iter_copy_entries(skills_root: Path) -> Iterable[Path]:
+def iter_copy_entries(skills_root: Path, agent: str = "claude-code") -> Iterable[Path]:
     for entry in sorted(skills_root.iterdir()):
         if entry.name in SKIP_TOP_NAMES:
             continue
         if entry.is_dir() and entry.name in SKIP_DIR_NAMES:
             continue
+        if entry.is_dir() and entry.name == "agents" and agent not in AGENTS_WITH_CUSTOM_AGENTS:
+            continue
         if entry.is_file() and entry.name.startswith("."):
             continue
         yield entry
@@ -86,10 +91,10 @@ RUNTIME_IGNORE = shutil.ignore_patterns(
 RUNTIME_SKIP_FILES = {"_last_run.txt", "_same_proc_pid.txt", "_same_proc_tmp.txt"}
 
 
-def copy_tree(skills_root: Path, out_dir: Path) -> list[str]:
+def copy_tree(skills_root: Path, out_dir: Path, agent: str = "claude-code") -> list[str]:
     copied: list[str] = []
     out_dir.mkdir(parents=True, exist_ok=True)
-    for entry in iter_copy_entries(skills_root):
+    for entry in iter_copy_entries(skills_root, agent):
         dest = out_dir / entry.name
         if entry.is_dir():
             if entry.name == "scripts":
@@ -265,7 +270,11 @@ def validate_build_paths(skills_root: Path, out_dir: Path) -> tuple[Path, Path]:
     return skills_root, out_dir
 
 
-def core_content_hash(skills_root: Path, overlay_dir: Path | None) -> str:
+def core_content_hash(
+    skills_root: Path,
+    overlay_dir: Path | None,
+    agent_overlay_dir: Path | None = None,
+) -> str:
     """SHA-256 over the actual core/shared/protocol/script/overlay files that
     participate in the build (path-relative + content). Deterministic across
     time and machine paths (§7.3)."""
@@ -287,6 +296,8 @@ def core_content_hash(skills_root: Path, overlay_dir: Path | None) -> str:
             )
     if overlay_dir and overlay_dir.is_dir():
         files.extend(p for p in overlay_dir.rglob("*") if p.is_file())
+    if agent_overlay_dir and agent_overlay_dir.is_dir():
+        files.extend(p for p in agent_overlay_dir.rglob("*") if p.is_file())
     for f in sorted(set(files)):
         rel = f.resolve().relative_to(skills_root.resolve()).as_posix()
         h.update(rel.encode("utf-8"))
@@ -296,13 +307,18 @@ def core_content_hash(skills_root: Path, overlay_dir: Path | None) -> str:
     return h.hexdigest()[:16]
 
 
-def synthesis_header(skills_root: Path, overlay_dir: Path | None) -> str:
+def synthesis_header(
+    skills_root: Path,
+    overlay_dir: Path | None,
+    agent: str = "claude-code",
+    agent_overlay_dir: Path | None = None,
+) -> str:
     """Deterministic synth header: no absolute path, no timestamp (§7.3)."""
-    core_hash = core_content_hash(skills_root, overlay_dir)
+    core_hash = core_content_hash(skills_root, overlay_dir, agent_overlay_dir)
     overlay_name = overlay_dir.name if overlay_dir else "none"
     return (
         f"<!-- generated by harness_deploy.py; core={core_hash}; "
-        f"overlay={overlay_name}; do not edit -->\n"
+        f"overlay={overlay_name}; agent={agent}; do not edit -->\n"
     )
 
 
@@ -320,6 +336,7 @@ def process_skill_md(
     shared_dir: Path,
     overlay_path: Path | None,
     header: str,
+    agent_overlay_path: Path | None = None,
 ) -> None:
     text = path.read_text(encoding="utf-8")
     text = expand_includes(text, shared_dir)
@@ -327,6 +344,10 @@ def process_skill_md(
     if overlay_path and overlay_path.is_file():
         overlay = overlay_path.read_text(encoding="utf-8")
         text = apply_overlay_blocks(text, overlay, section_ids)
+        section_ids = parse_section_ids(text)
+    if agent_overlay_path and agent_overlay_path.is_file():
+        agent_overlay = agent_overlay_path.read_text(encoding="utf-8")
+        text = apply_overlay_blocks(text, agent_overlay, section_ids)
     text = inject_header(text, header)
     if INCLUDE_RE.search(text):
         raise RuntimeError(f"unexpanded include placeholder remains in {path}")
@@ -338,6 +359,19 @@ def overlay_for_skill(overlay_dir: Path, skill_name: str) -> Path | None:
     return candidate if candidate.is_file() else None
 
 
+def copy_adapter_agents(adapter_agents_dir: Path, staging: Path) -> list[str]:
+    """Copy adapters/<agent>/agents/*.md over staging/agents/."""
+    if not adapter_agents_dir.is_dir():
+        return []
+    dest = staging / "agents"
+    dest.mkdir(parents=True, exist_ok=True)
+    copied: list[str] = []
+    for agent_file in sorted(adapter_agents_dir.glob("*.md")):
+        shutil.copy2(agent_file, dest / agent_file.name)
+        copied.append(f"agents/{agent_file.name}")
+    return copied
+
+
 def copy_overlay_unique_skills(overlay_dir: Path, out_dir: Path) -> list[str]:
     added: list[str] = []
     for entry in sorted(overlay_dir.iterdir()):
@@ -402,14 +436,27 @@ def cmd_build(
     skills_root: Path,
     out_dir: Path,
     overlay: str | None,
+    agent: str | None = None,
 ) -> dict[str, Any]:
     skills_root, out_dir = validate_build_paths(skills_root, out_dir)
     shared_dir = skills_root / "shared"
     if not shared_dir.is_dir():
         raise FileNotFoundError(f"shared/ missing under {skills_root}")
+    if agent is None:
+        print(
+            "WARNING: --agent missing, defaulting to claude-code (deprecated)",
+            file=sys.stderr,
+        )
+        agent = "claude-code"
+    if agent not in HARNESS_AGENTS:
+        raise ValueError(f"unknown agent: {agent}")
     overlay_dir = skills_root / "overlays" / overlay if overlay else None
     if overlay and (not overlay_dir or not overlay_dir.is_dir()):
         raise FileNotFoundError(f"overlay not found: overlays/{overlay}")
+    agent_overlay_dir = skills_root / "adapters" / agent / "skill-overlays"
+    if not agent_overlay_dir.is_dir():
+        agent_overlay_dir = None
+    adapter_agents_dir = skills_root / "adapters" / agent / "agents"
 
     # §7.2: build entirely in a staging dir; out_dir is untouched until the
     # atomic swap. Never `shutil.rmtree(out_dir)` at build start.
@@ -417,18 +464,25 @@ def cmd_build(
     if staging.exists():
         shutil.rmtree(staging)
     try:
-        copied = copy_tree(skills_root, staging)
+        copied = copy_tree(skills_root, staging, agent)
         if overlay:
             copied.extend(copy_overlay_unique_skills(overlay_dir, staging))
             copied.extend(copy_overlay_extras(overlay_dir, staging))
             copied.extend(merge_overlay_skill_extras(overlay_dir, staging))
+        if agent in AGENTS_WITH_CUSTOM_AGENTS:
+            copied.extend(copy_adapter_agents(adapter_agents_dir, staging))
 
-        header = synthesis_header(skills_root, overlay_dir)
+        header = synthesis_header(skills_root, overlay_dir, agent, agent_overlay_dir)
         processed: list[str] = []
         for skill_md in sorted(staging.glob("harness-*/SKILL.md")):
             ov = overlay_for_skill(overlay_dir, skill_md.parent.name) if overlay_dir else None
+            agent_ov = (
+                overlay_for_skill(agent_overlay_dir, skill_md.parent.name)
+                if agent_overlay_dir
+                else None
+            )
             try:
-                process_skill_md(skill_md, shared_dir, ov, header)
+                process_skill_md(skill_md, shared_dir, ov, header, agent_ov)
             except KeyError as exc:
                 raise KeyError(
                     f"overlay anchor not found: {exc.args[0]} ({skill_md})"
@@ -440,10 +494,15 @@ def cmd_build(
                 raise RuntimeError(f"include placeholder remains: {skill_md}")
 
         # deterministic build marker (no timestamp -> byte-identical builds)
-        core_hash = core_content_hash(skills_root, overlay_dir)
+        core_hash = core_content_hash(skills_root, overlay_dir, agent_overlay_dir)
         (staging / BUILD_MARKER).write_text(
             json.dumps(
-                {"schemaVersion": 1, "overlay": overlay or "none", "coreHash": core_hash},
+                {
+                    "schemaVersion": 1,
+                    "overlay": overlay or "none",
+                    "agent": agent,
+                    "coreHash": core_hash,
+                },
                 ensure_ascii=False,
                 indent=2,
             )
@@ -480,6 +539,7 @@ def cmd_build(
         "skillsRoot": str(skills_root),
         "outDir": str(out_dir),
         "overlay": overlay,
+        "agent": agent,
         "copied": copied,
         "processedSkills": processed,
     }
@@ -573,6 +633,7 @@ def build_parser() -> argparse.ArgumentParser:
     b.add_argument("--skills-root", type=Path, required=True)
     b.add_argument("--out", type=Path, required=True)
     b.add_argument("--overlay")
+    b.add_argument("--agent", choices=HARNESS_AGENTS)
     b.add_argument("--json", action="store_true")
 
     i = sub.add_parser("install", help="Install build output to project .claude/skills")
@@ -593,7 +654,7 @@ def main(argv: list[str] | None = None) -> int:
     args = build_parser().parse_args(argv)
     try:
         if args.command == "build":
-            result = cmd_build(args.skills_root, args.out, args.overlay)
+            result = cmd_build(args.skills_root, args.out, args.overlay, args.agent)
             return emit_json(result) if args.json else 0
         if args.command == "install":
             result = cmd_install(args.from_dir, args.project, args.target)