agentbundle 0.6.0__tar.gz → 0.8.0__tar.gz

{agentbundle-0.6.0 → agentbundle-0.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentbundle
-Version: 0.6.0
+Version: 0.8.0
 Summary: npm for your coding agent. Install packs of skills, subagents, and hooks into any repo, for every major agent.
 Author-email: eugenelim <eugenelim@users.noreply.github.com>
 License: Apache-2.0 OR MIT
@@ -22,43 +22,57 @@ Description-Content-Type: text/markdown
 [![Python](https://img.shields.io/pypi/pyversions/agentbundle)](https://pypi.org/project/agentbundle/)
 [![License](https://img.shields.io/badge/license-MIT%2FApache--2.0-blue)](https://github.com/eugenelim/agent-ready-repo#license)
 
-**The installer for [agent-ready-repo](https://github.com/eugenelim/agent-ready-repo).** Think npm, but for the skills, subagents, and hooks your coding agent runs on.
+**The installer for [agent-ready-repo](https://github.com/eugenelim/agent-ready-repo).** Think npm, but for the skills, subagents, and hooks your coding agent runs on. One pack, one command, every major agent — Claude Code, Codex, Cursor, Copilot, Gemini, and Kiro (both the CLI and the IDE).
 
-`agentbundle` installs packs of agent primitives into your repo or your home directory. It projects each primitive into the layout every agent expects. One pack. One command. Every major agent.
+## Quick start
 
 ```bash
 pip install agentbundle
-agentbundle install --pack core git+https://github.com/eugenelim/agent-ready-repo
 ```
 
-That lands `core`, the flagship pack and the loop itself, in your repo. Claude Code, Codex, Cursor, Copilot, Gemini, and Kiro — both the CLI and the IDE — all read it, subagents and skills included.
+**Install into a repo** — so everyone who clones it gets the pack. `core` is the flagship pack, the loop itself:
 
-## Common commands
+```bash
+agentbundle install --pack core
+```
+
+No catalogue argument needed: it defaults to the agent-ready-repo catalogue. It lands in the repo's agent config — subagents and skills included — and you commit it like any other project file. This is the default scope: the pack belongs to the project and the whole team.
+
+**Install for yourself, everywhere** — so a pack follows you across every project, with no per-repo setup:
 
 ```bash
-# See what's in a catalogue
-agentbundle list-packs git+https://github.com/eugenelim/agent-ready-repo
+agentbundle install --pack research --scope user
+```
 
-# See the catalogue's curated install profiles
-agentbundle list-profiles git+https://github.com/eugenelim/agent-ready-repo
+User-scope packs land in your home directory, not the repo — they're yours, not the team's, and they're there in every project you open.
 
-# Install a whole curated profile — a single-scope set of packs — in one command
-agentbundle install --profile inception git+https://github.com/eugenelim/agent-ready-repo
+The install auto-detects your agent (`--adapter` overrides). To install from a **different** catalogue, pass it as a trailing argument — a git URL or a local path (`agentbundle install --pack core <catalogue>`); a `config set source <catalogue>` makes that the default, and an editable clone (`pip install -e`) defaults to itself.
 
-# Install the flagship loop into this repo
-agentbundle install --pack core git+https://github.com/eugenelim/agent-ready-repo
+## More commands
 
-# Install a pack at user scope, so it follows you across every project
-agentbundle install --pack research git+https://github.com/eugenelim/agent-ready-repo --scope user
+```bash
+# See what the catalogue offers (bare uses the default; or name one explicitly)
+agentbundle list-packs
+agentbundle list-profiles
+
+# Install a whole curated profile — a single-scope set of packs — in one command
+agentbundle install --profile inception
 
-# Preview an install without writing a file
-agentbundle install --pack core git+https://github.com/eugenelim/agent-ready-repo --dry-run
+# Preview any install without writing a file
+agentbundle install --pack core --dry-run
 
-# Upgrade a pack; it reports the .upstream files you need to reconcile
-agentbundle upgrade --pack core --to 0.4.0 git+https://github.com/eugenelim/agent-ready-repo
+# Upgrade to the version the catalogue ships — shows installed → target, asks first
+agentbundle upgrade --pack core
+agentbundle upgrade --pack core --yes  # skip the prompt (CI)
+
+# Uninstall — previews remove (Tier-1) vs keep (your edits), asks first
+agentbundle uninstall --pack core --dry-run
+agentbundle uninstall --pack core --yes
 ```
 
-A catalogue is a git URL or a local path. Installs auto-detect your agent; pass `--adapter` to override. A **profile** is a catalogue-curated, single-scope set of packs you install in one command — it declares its own scope, so `--scope` doesn't apply.
+A **profile** is a catalogue-curated, single-scope set of packs you install in one command — it declares its own scope, so `--scope` doesn't apply. **Upgrade takes no version** — the target is whatever the catalogue you point at declares; to pin a past version, point the catalogue at that git ref. Install a pack that's **already there** and `agentbundle` offers to `upgrade` it instead (`--yes` runs it straight away).
+
+**Mutating commands ask first.** `uninstall`, the `--force` cleanup, and the upgrade offer all preview what they'll do and confirm before touching anything; `--dry-run` previews without writing, and `--yes` skips the prompt for non-interactive / CI use (where, without it, they refuse rather than hang).
 
 ## Build your own catalogue
 

{agentbundle-0.6.0 → agentbundle-0.8.0}/README.md

@@ -4,43 +4,57 @@
 [![Python](https://img.shields.io/pypi/pyversions/agentbundle)](https://pypi.org/project/agentbundle/)
 [![License](https://img.shields.io/badge/license-MIT%2FApache--2.0-blue)](https://github.com/eugenelim/agent-ready-repo#license)
 
-**The installer for [agent-ready-repo](https://github.com/eugenelim/agent-ready-repo).** Think npm, but for the skills, subagents, and hooks your coding agent runs on.
+**The installer for [agent-ready-repo](https://github.com/eugenelim/agent-ready-repo).** Think npm, but for the skills, subagents, and hooks your coding agent runs on. One pack, one command, every major agent — Claude Code, Codex, Cursor, Copilot, Gemini, and Kiro (both the CLI and the IDE).
 
-`agentbundle` installs packs of agent primitives into your repo or your home directory. It projects each primitive into the layout every agent expects. One pack. One command. Every major agent.
+## Quick start
 
 ```bash
 pip install agentbundle
-agentbundle install --pack core git+https://github.com/eugenelim/agent-ready-repo
 ```
 
-That lands `core`, the flagship pack and the loop itself, in your repo. Claude Code, Codex, Cursor, Copilot, Gemini, and Kiro — both the CLI and the IDE — all read it, subagents and skills included.
+**Install into a repo** — so everyone who clones it gets the pack. `core` is the flagship pack, the loop itself:
 
-## Common commands
+```bash
+agentbundle install --pack core
+```
+
+No catalogue argument needed: it defaults to the agent-ready-repo catalogue. It lands in the repo's agent config — subagents and skills included — and you commit it like any other project file. This is the default scope: the pack belongs to the project and the whole team.
+
+**Install for yourself, everywhere** — so a pack follows you across every project, with no per-repo setup:
 
 ```bash
-# See what's in a catalogue
-agentbundle list-packs git+https://github.com/eugenelim/agent-ready-repo
+agentbundle install --pack research --scope user
+```
 
-# See the catalogue's curated install profiles
-agentbundle list-profiles git+https://github.com/eugenelim/agent-ready-repo
+User-scope packs land in your home directory, not the repo — they're yours, not the team's, and they're there in every project you open.
 
-# Install a whole curated profile — a single-scope set of packs — in one command
-agentbundle install --profile inception git+https://github.com/eugenelim/agent-ready-repo
+The install auto-detects your agent (`--adapter` overrides). To install from a **different** catalogue, pass it as a trailing argument — a git URL or a local path (`agentbundle install --pack core <catalogue>`); a `config set source <catalogue>` makes that the default, and an editable clone (`pip install -e`) defaults to itself.
 
-# Install the flagship loop into this repo
-agentbundle install --pack core git+https://github.com/eugenelim/agent-ready-repo
+## More commands
 
-# Install a pack at user scope, so it follows you across every project
-agentbundle install --pack research git+https://github.com/eugenelim/agent-ready-repo --scope user
+```bash
+# See what the catalogue offers (bare uses the default; or name one explicitly)
+agentbundle list-packs
+agentbundle list-profiles
+
+# Install a whole curated profile — a single-scope set of packs — in one command
+agentbundle install --profile inception
 
-# Preview an install without writing a file
-agentbundle install --pack core git+https://github.com/eugenelim/agent-ready-repo --dry-run
+# Preview any install without writing a file
+agentbundle install --pack core --dry-run
 
-# Upgrade a pack; it reports the .upstream files you need to reconcile
-agentbundle upgrade --pack core --to 0.4.0 git+https://github.com/eugenelim/agent-ready-repo
+# Upgrade to the version the catalogue ships — shows installed → target, asks first
+agentbundle upgrade --pack core
+agentbundle upgrade --pack core --yes  # skip the prompt (CI)
+
+# Uninstall — previews remove (Tier-1) vs keep (your edits), asks first
+agentbundle uninstall --pack core --dry-run
+agentbundle uninstall --pack core --yes
 ```
 
-A catalogue is a git URL or a local path. Installs auto-detect your agent; pass `--adapter` to override. A **profile** is a catalogue-curated, single-scope set of packs you install in one command — it declares its own scope, so `--scope` doesn't apply.
+A **profile** is a catalogue-curated, single-scope set of packs you install in one command — it declares its own scope, so `--scope` doesn't apply. **Upgrade takes no version** — the target is whatever the catalogue you point at declares; to pin a past version, point the catalogue at that git ref. Install a pack that's **already there** and `agentbundle` offers to `upgrade` it instead (`--yes` runs it straight away).
+
+**Mutating commands ask first.** `uninstall`, the `--force` cleanup, and the upgrade offer all preview what they'll do and confirm before touching anything; `--dry-run` previews without writing, and `--yes` skips the prompt for non-interactive / CI use (where, without it, they refuse rather than hang).
 
 ## Build your own catalogue
 

{agentbundle-0.6.0 → agentbundle-0.8.0}/agentbundle/_data/adapter.toml

@@ -77,7 +77,14 @@
 # the default agent's `.kiro/skills` auto-discovery (RFC-0022 E4; kiro
 # #6887/#6888/#4993). Additive `inject-resources` on BOTH the kiro-cli and
 # kiro-ide agent projections (CLI → agent JSON, IDE → quoted .md frontmatter).
-version = "0.15"
+# RFC-0040 / ADR-0030 / docs/specs/consolidated-pack-layout (v0.16): pack.toml
+# gains an optional scope-keyed [pack.layout] table (optional .repo / .user
+# sub-tables, each a `parent` base and/or a within-pack template-path) naming
+# where a consuming pack's durable output lands. Consumed by the new installer
+# `_append_layout_section` step (append-if-exists / never-create / never-
+# overwrite) into an adopter-owned `agentbundle-layout.toml`. Additive +
+# optional — packs pinned below v0.16 build and validate unchanged.
+version = "0.16"
 
 # Sibling schemas this contract references — pack metadata and the
 # per-pack Claude-plugin manifest. Defined by spec AC #3 + #4.

agentbundle-0.8.0/agentbundle/_data/install-defaults.toml

@@ -0,0 +1,10 @@
+# Packaged install default — layer 4 of the catalogue-source resolution chain
+# (RFC-0046 / ADR-0036). When `agentbundle install`/`upgrade` is run with no
+# `catalogue` positional and layers 1–3 (explicit arg, user config, editable
+# detection) yield nothing, this source is used.
+#
+# Private-fork pattern: blank the `source` value below (or delete this file
+# entirely) to disable the packaged GitHub default — layers 1–3 still apply, so
+# an editable clone or a `config set source` still resolves.
+[defaults]
+source = "git+https://github.com/eugenelim/agent-ready-repo"

{agentbundle-0.6.0 → agentbundle-0.8.0}/agentbundle/_data/pack.schema.json

@@ -131,6 +131,25 @@
             "type": "string",
             "pattern": "^[^/].*"
           }
+        },
+        "layout": {
+          "type": "object",
+          "properties": {
+            "repo": {
+              "type": "object",
+              "properties": {
+                "parent": {"type": "string"},
+                "template": {"type": "string"}
+              }
+            },
+            "user": {
+              "type": "object",
+              "properties": {
+                "parent": {"type": "string"},
+                "template": {"type": "string"}
+              }
+            }
+          }
         }
       },
       "if": {

{agentbundle-0.6.0 → agentbundle-0.8.0}/agentbundle/build/adapters/codex.py

@@ -72,7 +72,7 @@ def project_packs(pack_paths: list[Path], contract: dict, output_root: Path) ->
                 dir=str(agents_md.parent),
             )
             try:
-                with os.fdopen(fd, "w", encoding="utf-8") as handle:
+                with os.fdopen(fd, "w", encoding="utf-8", newline="\n") as handle:
                     handle.write(stripped)
                 os.replace(tmp_path, agents_md)
             except BaseException:

{agentbundle-0.6.0 → agentbundle-0.8.0}/agentbundle/build/adapters/cursor.py

@@ -251,7 +251,7 @@ def _project_agent_as_md(
             out_fm["readonly"] = readonly
 
         output_text = _serialize_frontmatter_md(out_fm) + body
-        (target_dir / entry.name).write_text(output_text, encoding="utf-8")
+        (target_dir / entry.name).write_text(output_text, encoding="utf-8", newline="\n")
 
 
 def _derive_readonly(frontmatter: dict[str, Any]) -> bool | None:
@@ -357,7 +357,7 @@ def _project_hooks_json(source_dir: Path, output_root: Path, rule: dict) -> None
     target_path.parent.mkdir(parents=True, exist_ok=True)
     target_path.write_text(
         json.dumps(existing, indent=2, sort_keys=True) + "\n",
-        encoding="utf-8",
+        encoding="utf-8", newline="\n",
     )
 
 

{agentbundle-0.6.0 → agentbundle-0.8.0}/agentbundle/build/adapters/gemini.py

@@ -220,7 +220,7 @@ def _project_agent_as_md(
         frontmatter, body = _split_frontmatter(entry.read_text(encoding="utf-8"))
         out_fm = _apply_mapping(frontmatter, mapping, entry.stem)
         output_text = _serialize_frontmatter_md(out_fm) + body
-        (target_dir / entry.name).write_text(output_text, encoding="utf-8")
+        (target_dir / entry.name).write_text(output_text, encoding="utf-8", newline="\n")
 
 
 def _apply_mapping(
@@ -386,7 +386,7 @@ def _project_settings_json(
     target_path.parent.mkdir(parents=True, exist_ok=True)
     target_path.write_text(
         json.dumps(existing, indent=2, sort_keys=True) + "\n",
-        encoding="utf-8",
+        encoding="utf-8", newline="\n",
     )
 
 

{agentbundle-0.6.0 → agentbundle-0.8.0}/agentbundle/build/adapters/kiro.py

@@ -297,7 +297,7 @@ def _project_agent_as_json(
         destination = target_dir / (entry.stem + ".json")
         destination.write_text(
             json.dumps(agent_json, indent=2, sort_keys=False) + "\n",
-            encoding="utf-8",
+            encoding="utf-8", newline="\n",
         )
 
 

{agentbundle-0.6.0 → agentbundle-0.8.0}/agentbundle/build/adapters/kiro_ide.py

@@ -255,7 +255,7 @@ def _project_agent_as_md(
 
         output_text = _serialize_frontmatter_md(rewritten) + body
         destination = target_dir / entry.name  # preserves .md extension
-        destination.write_text(output_text, encoding="utf-8")
+        destination.write_text(output_text, encoding="utf-8", newline="\n")
 
 
 def _serialize_frontmatter_md(fields: dict[str, Any]) -> str:

{agentbundle-0.6.0 → agentbundle-0.8.0}/agentbundle/build/main.py

@@ -498,7 +498,7 @@ def _run_per_pack_single(
         )
         destination.write_text(
             json.dumps(derived, indent=2, sort_keys=False) + "\n",
-            encoding="utf-8",
+            encoding="utf-8", newline="\n",
         )
         # Defence-in-depth: re-validate the written file against the schema
         # to catch any serialise/parse divergence introduced by json.dumps.
@@ -547,7 +547,7 @@ def _run_per_pack_apm(recipe: Recipe, packs: list[Pack], output_dir: Path) -> di
         pack_metadata = tomllib.loads((pack.path / "pack.toml").read_text(encoding="utf-8"))
         (per_pack_output / "apm.yml").write_text(
             _render_apm_yml(pack_metadata.get("pack", {})),
-            encoding="utf-8",
+            encoding="utf-8", newline="\n",
         )
         apm_source = pack.path / ".apm"
         if apm_source.exists():
@@ -568,7 +568,7 @@ def _run_per_pack_apm(recipe: Recipe, packs: list[Pack], output_dir: Path) -> di
         (hooks_dir / "install-marker.py").write_bytes(writer_bytes)
         (hooks_dir / "install-marker.json").write_text(
             json.dumps(_APM_INSTALL_MARKER_HOOK_JSON, indent=2) + "\n",
-            encoding="utf-8",
+            encoding="utf-8", newline="\n",
         )
 
         # Project pack.toml verbatim. The writer reads it for
@@ -630,7 +630,7 @@ def _run_aggregate(recipe: Recipe, output_dir: Path) -> dict:
     output_path.parent.mkdir(parents=True, exist_ok=True)
     output_path.write_text(
         json.dumps({"plugins": entries}, indent=2, sort_keys=True) + "\n",
-        encoding="utf-8",
+        encoding="utf-8", newline="\n",
     )
     return {"recipe": recipe.name, "type": recipe.type, "entries": len(entries)}
 

{agentbundle-0.6.0 → agentbundle-0.8.0}/agentbundle/build/projections/codex_agent_toml.py

@@ -331,4 +331,4 @@ def project_codex_agent_toml(
         )
         toml_lines = _emit_fields(rewritten, body)
         destination = target_dir / (entry.stem + ".toml")
-        destination.write_text("\n".join(toml_lines) + "\n", encoding="utf-8")
+        destination.write_text("\n".join(toml_lines) + "\n", encoding="utf-8", newline="\n")

{agentbundle-0.6.0 → agentbundle-0.8.0}/agentbundle/build/projections/copilot_agent_md.py

@@ -208,4 +208,4 @@ def project_copilot_agent_md(
             _validate_tools(frontmatter["tools"])
             emitted["tools"] = frontmatter["tools"]
         destination = target_dir / (entry.stem + ".agent.md")
-        destination.write_text(_emit(emitted, body), encoding="utf-8")
+        destination.write_text(_emit(emitted, body), encoding="utf-8", newline="\n")

{agentbundle-0.6.0 → agentbundle-0.8.0}/agentbundle/build/projections/copilot_hooks_json.py

@@ -138,5 +138,5 @@ def project_copilot_hooks_json(
         destination = target_dir / (entry.stem + ".json")
         destination.write_text(
             json.dumps(document, indent=2, sort_keys=False) + "\n",
-            encoding="utf-8",
+            encoding="utf-8", newline="\n",
         )

{agentbundle-0.6.0 → agentbundle-0.8.0}/agentbundle/build/projections/gemini_command_toml.py

@@ -227,4 +227,4 @@ def project_gemini_command_toml(
 
         destination = target_root / relative.with_suffix(".toml")
         destination.parent.mkdir(parents=True, exist_ok=True)
-        destination.write_text("\n".join(lines) + "\n", encoding="utf-8")
+        destination.write_text("\n".join(lines) + "\n", encoding="utf-8", newline="\n")

{agentbundle-0.6.0 → agentbundle-0.8.0}/agentbundle/build/projections/kiro_ide_hook.py

@@ -191,7 +191,7 @@ def project(
         # POSIX-friendliness.
         target_path.write_text(
             json.dumps(body, indent=2, sort_keys=False) + "\n",
-            encoding="utf-8",
+            encoding="utf-8", newline="\n",
         )
 
 

{agentbundle-0.6.0 → agentbundle-0.8.0}/agentbundle/build/projections/merge_into_agent_json.py

@@ -243,7 +243,7 @@ def _atomic_write(target_path: Path, data: dict) -> None:
     serialised = json.dumps(data, indent=2, sort_keys=False) + "\n"
     with tempfile.NamedTemporaryFile(
         mode="w",
-        encoding="utf-8",
+        encoding="utf-8", newline="\n",
         dir=str(target_path.parent),
         prefix=target_path.name + ".",
         suffix=".tmp",

{agentbundle-0.6.0 → agentbundle-0.8.0}/agentbundle/build/projections/merge_json.py

@@ -54,5 +54,5 @@ def project_merge_json(source_dir: Path, output_root: Path, rule: dict) -> None:
     target_path.parent.mkdir(parents=True, exist_ok=True)
     target_path.write_text(
         json.dumps(existing, indent=2, sort_keys=True) + "\n",
-        encoding="utf-8",
+        encoding="utf-8", newline="\n",
     )

{agentbundle-0.6.0 → agentbundle-0.8.0}/agentbundle/build/projections/user_merge_json.py

@@ -296,7 +296,7 @@ def _atomic_write(target_path: Path, data: dict) -> None:
     serialised = json.dumps(data, indent=2, sort_keys=False) + "\n"
     with tempfile.NamedTemporaryFile(
         mode="w",
-        encoding="utf-8",
+        encoding="utf-8", newline="\n",
         dir=str(target_path.parent),
         prefix=target_path.name + ".",
         suffix=".tmp",

{agentbundle-0.6.0 → agentbundle-0.8.0}/agentbundle/build/self_host.py

@@ -24,7 +24,9 @@ consumer.
 Self-host scope (see docs/specs/self-hosting/spec.md § Phased rollout):
 the `SELF_HOST_ADAPTERS` allow-list runs `claude-code` and `codex`.
 Kiro and Copilot stay distribution-only so self-host does not project
-`.kiro/` or `.github/instructions/`.
+`.kiro/` or `.github/instructions/`. Both `SELF_HOST_ADAPTERS` and
+`SELF_HOST_PACKS` are sourced from `recipes/self-host.toml` (see the
+`_DEFAULT_*` block below); the values named here are the current defaults.
 """
 
 from __future__ import annotations
@@ -79,27 +81,76 @@ TARGET_PATHS = (
     Path("AGENTS.md"),
 )
 
-# Self-host allow-list (see self-hosting spec § Phased rollout).
-# Kiro and Copilot remain in the contract for distribution builds but
-# are excluded from the self-host runner.
-SELF_HOST_ADAPTERS: tuple[str, ...] = ("claude-code", "codex")
-
-# Self-host *pack* allow-list. This repo is the catalogue's home, not
-# an adopter — `make build-self` should only project the in-house
-# packs into the working tree. User-scope-default packs (architect,
-# atlassian, contracts, converters, credential-brokers, figma) are
-# advertised via `marketplace.json` but their primitives don't belong
-# in this repo's `.claude/skills/` (or future `.kiro/skills/`) tree.
-# `monorepo-extras` is repo-only by metadata but the bundle is not a
-# canonical monorepo consumer of `new-package`, so it's left out too.
-# `_aggregate_marketplace` intentionally ignores this filter — the
-# catalogue advertises every pack.
-SELF_HOST_PACKS: tuple[str, ...] = (
+# Built-in fallbacks for the self-host pack / adapter allow-lists. The
+# authoritative values live in `recipes/self-host.toml` (read at import below);
+# these are used only when that recipe is missing a key or can't be read, so
+# module import stays total. Kiro and Copilot remain in the contract for
+# distribution builds but are excluded from the self-host runner. This repo is
+# the catalogue's home, not an adopter, so `make build-self` only projects the
+# in-house packs; `_aggregate_marketplace` intentionally ignores the pack
+# filter — the catalogue advertises every pack. See the recipe for the full
+# rationale behind the pack selection.
+_DEFAULT_SELF_HOST_ADAPTERS: tuple[str, ...] = ("claude-code", "codex")
+_DEFAULT_SELF_HOST_PACKS: tuple[str, ...] = (
     "core",
     "governance-extras",
     "user-guide-diataxis",
 )
 
+_SELF_HOST_RECIPE = "self-host"
+
+
+def _read_recipe_text(name: str) -> str | None:
+    """Return the text of `recipes/<name>.toml`, or None if unreadable.
+
+    Mirrors `build.main`'s recipe resolution: filesystem first (dev / editable
+    install), then `importlib.resources` (zipapp, where the package lives inside
+    a `.pyz` archive that `Path.exists()` cannot traverse).
+    """
+    recipe_path = Path(__file__).resolve().parent / "recipes" / f"{name}.toml"
+    if recipe_path.exists():
+        return recipe_path.read_text(encoding="utf-8")
+    try:
+        from importlib.resources import files
+
+        resource = files("agentbundle.build").joinpath(f"recipes/{name}.toml")
+        if resource.is_file():
+            return resource.read_text(encoding="utf-8")
+    except (FileNotFoundError, ModuleNotFoundError):
+        pass
+    return None
+
+
+def _extract_self_host_lists(
+    recipe: dict,
+) -> tuple[tuple[str, ...], tuple[str, ...]]:
+    """Pull `(packs, adapters)` from a parsed self-host recipe, substituting the
+    built-in defaults for any list that is absent or empty."""
+    body = recipe.get("recipe", {})
+    packs = tuple(body.get("packs", {}).get("include", ())) or _DEFAULT_SELF_HOST_PACKS
+    adapters = (
+        tuple(body.get("adapters", {}).get("targets", ()))
+        or _DEFAULT_SELF_HOST_ADAPTERS
+    )
+    return packs, adapters
+
+
+def _load_self_host_lists() -> tuple[tuple[str, ...], tuple[str, ...]]:
+    """Read the self-host allow-lists from the recipe. Total: any read or parse
+    failure falls back to the built-in defaults so module import never raises."""
+    try:
+        text = _read_recipe_text(_SELF_HOST_RECIPE)
+        if text is None:
+            return _DEFAULT_SELF_HOST_PACKS, _DEFAULT_SELF_HOST_ADAPTERS
+        return _extract_self_host_lists(tomllib.loads(text))
+    except Exception:
+        # Unreadable (non-UTF-8 / permission / IO) or malformed recipe — fall
+        # back so module import is total (AC3).
+        return _DEFAULT_SELF_HOST_PACKS, _DEFAULT_SELF_HOST_ADAPTERS
+
+
+SELF_HOST_PACKS, SELF_HOST_ADAPTERS = _load_self_host_lists()
+
 
 def _filter_self_host_packs(pack_paths: list[Path]) -> list[Path]:
     """Return the subset of *pack_paths* whose directory name is in
@@ -195,7 +246,7 @@ def resolve_markers(
             text,
         )
         if replaced != text:
-            path.write_text(replaced, encoding="utf-8")
+            path.write_text(replaced, encoding="utf-8", newline="\n")
             modified += 1
     return modified
 
@@ -270,7 +321,7 @@ def _compose_agents_md(
     body = body_path.read_text(encoding="utf-8").replace("\r\n", "\n")
     if body and not body.endswith("\n"):
         body += "\n"
-    target_path.write_text(body, encoding="utf-8")
+    target_path.write_text(body, encoding="utf-8", newline="\n")
 
     if footer_path.exists():
         text = target_path.read_text(encoding="utf-8")
@@ -279,7 +330,7 @@ def _compose_agents_md(
             text += "\n"
         if footer and not footer.endswith("\n"):
             footer += "\n"
-        target_path.write_text(text + footer, encoding="utf-8")
+        target_path.write_text(text + footer, encoding="utf-8", newline="\n")
     return target_path
 
 
@@ -329,6 +380,7 @@ EXCLUDED_PATTERNS: tuple[str, ...] = (
     "README.md",  # root-level; nested README.md not excluded
     "LICENSE-*",
     ".gitignore",
+    ".gitattributes",
     ".github/**",
     "AGENTS.local.md",
     "AGENTS.md",  # root-level; nested AGENTS.md not excluded
@@ -535,7 +587,7 @@ def _aggregate_marketplace(
     }
     target.write_text(
         json.dumps(payload, indent=2, sort_keys=True) + "\n",
-        encoding="utf-8",
+        encoding="utf-8", newline="\n",
     )
     return target
 
@@ -1463,10 +1515,42 @@ def run_build_check_drift_gates(
     return 0
 
 
+def _refuse_fixture_packs_dir(packs_dir: Path, *, dry_run: bool) -> int | None:
+    """Refuse a real-write self-host whose `packs_dir` points into
+    `tests/fixtures/` (which would overwrite the working tree with fixture
+    data), unless `ALLOW_FIXTURE_PACKS` is set.
+
+    This is the cross-platform home of the guard that used to live only in the
+    Makefile `build-self` recipe — so the make-free entry
+    `python -m agentbundle.build self` (the only way to run build-self on
+    Windows) is protected too. Returns a non-zero exit code to refuse, or
+    `None` to proceed. Dry-run writes to a shadow temp dir, so it is never
+    guarded (matching the `run_self_host` dirty-tree check). `as_posix()`
+    normalises separators so the match is Windows-safe.
+    """
+    if dry_run or os.environ.get("ALLOW_FIXTURE_PACKS"):
+        return None
+    # Trailing slash mirrors the historical Makefile glob `*tests/fixtures/*`
+    # exactly — so a sibling like `my-tests/fixtures-backup/` doesn't over-match.
+    if "tests/fixtures/" in packs_dir.as_posix():
+        print(
+            "self-host: refusing — --packs-dir points into tests/fixtures/; "
+            "this would overwrite your working tree with fixture data. Set "
+            "ALLOW_FIXTURE_PACKS=1 to override, or use --packs-dir packs.",
+            file=sys.stderr,
+        )
+        return 2
+    return None
+
+
 def cmd_self(args) -> int:
+    packs_dir = Path(args.packs_dir).resolve()
+    refusal = _refuse_fixture_packs_dir(packs_dir, dry_run=args.dry_run)
+    if refusal is not None:
+        return refusal
     return run_self_host(
         working_tree=Path(args.output_dir).resolve(),
-        packs_dir=Path(args.packs_dir).resolve(),
+        packs_dir=packs_dir,
         dry_run=args.dry_run,
         force=args.force,
         no_symlink=getattr(args, "no_symlink", False),

{agentbundle-0.6.0 → agentbundle-0.8.0}/agentbundle/build/tests/test_adapter_cursor.py

@@ -53,10 +53,11 @@ class CursorContractTests(unittest.TestCase):
     def test_contract_version_is_0_11(self) -> None:
         """AC1 — contract bumped to 0.11 by cursor-full-parity; subsequently
         0.12 (copilot-skills-and-web), 0.13 (docs/specs/gemini-full-parity),
-        0.14 (docs/specs/enriched-pack-manifest), then 0.15
-        (docs/specs/kiro-cli-agent-skill-resources).
+        0.14 (docs/specs/enriched-pack-manifest), 0.15
+        (docs/specs/kiro-cli-agent-skill-resources), then 0.16
+        (docs/specs/consolidated-pack-layout).
         Name preserved to keep the diff small."""
-        self.assertEqual(self.contract["contract"]["version"], "0.15")
+        self.assertEqual(self.contract["contract"]["version"], "0.16")
 
     def test_cursor_block_projects_five_primitives(self) -> None:
         """AC2 — the five standard primitives are in the projection array."""

{agentbundle-0.6.0 → agentbundle-0.8.0}/agentbundle/build/tests/test_adapter_gemini.py

@@ -151,9 +151,9 @@ class GeminiContractTests(unittest.TestCase):
         cls.contract = load_contract(CONTRACT_PATH)
 
     def test_contract_version_is_0_14(self) -> None:
-        """Contract version is 0.15 (docs/specs/kiro-cli-agent-skill-resources
-        bumped it from enriched-pack-manifest's 0.14). Name preserved."""
-        self.assertEqual(self.contract["contract"]["version"], "0.15")
+        """Contract version is 0.16 (docs/specs/consolidated-pack-layout
+        bumped it from kiro-cli-agent-skill-resources' 0.15). Name preserved."""
+        self.assertEqual(self.contract["contract"]["version"], "0.16")
 
     def test_gemini_block_projects_five_primitives(self) -> None:
         """AC2 — five standard primitives with their gemini targets."""