agentbundle 0.11.1__tar.gz → 0.12.1__tar.gz

{agentbundle-0.11.1 → agentbundle-0.12.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentbundle
-Version: 0.11.1
+Version: 0.12.1
 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
@@ -41,7 +41,7 @@ No catalogue argument needed: it defaults to the agent-ready-repo catalogue. It
 **Install for yourself, everywhere** — so a pack follows you across every project, with no per-repo setup:
 
 ```bash
-agentbundle install --pack research --scope user
+agentbundle install --pack desk-research --scope user
 ```
 
 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.

{agentbundle-0.11.1 → agentbundle-0.12.1}/README.md

@@ -23,7 +23,7 @@ No catalogue argument needed: it defaults to the agent-ready-repo catalogue. It
 **Install for yourself, everywhere** — so a pack follows you across every project, with no per-repo setup:
 
 ```bash
-agentbundle install --pack research --scope user
+agentbundle install --pack desk-research --scope user
 ```
 
 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.

{agentbundle-0.11.1 → agentbundle-0.12.1}/agentbundle/_data/pack.schema.json

@@ -150,6 +150,26 @@
               }
             }
           }
+        },
+        "first-value": {
+          "type": "object",
+          "description": "Pack first-value contract (RFC-0064 Amendment #4). Level A required for all packs; Level B required when level-b = true.",
+          "properties": {
+            "audience-posture": {"type": "string", "enum": ["non-technical", "mixed", "technical"]},
+            "surfaces": {"type": "array", "items": {"type": "string"}},
+            "prerequisites": {"type": "array", "items": {"type": "string"}},
+            "verification": {"type": "string"},
+            "recovery": {"type": "string"},
+            "level-b": {"type": "boolean"},
+            "starter-task": {"type": "string"},
+            "starter-prompt": {"type": "string"},
+            "expected-result": {"type": "string"},
+            "next-action": {"type": "string"},
+            "tutorial": {"type": "string"},
+            "writes-to-repo": {"type": "boolean"},
+            "safety-gate": {"type": "string"}
+          },
+          "additionalProperties": false
         }
       },
       "if": {

agentbundle-0.12.1/agentbundle/_data/plugin-manifest.derived.schema.json

@@ -0,0 +1,73 @@
+{
+  "type": "object",
+  "required": ["name", "version", "description"],
+  "additionalProperties": false,
+  "properties": {
+    "name": {"type": "string"},
+    "version": {"type": "string"},
+    "description": {"type": "string"},
+    "skills": {
+      "type": "array",
+      "items": {"type": "string"}
+    },
+    "agents": {
+      "type": "array",
+      "items": {"type": "string"}
+    },
+    "author": {
+      "type": "object",
+      "required": ["name"],
+      "properties": {
+        "name": {"type": "string"},
+        "email": {"type": "string"}
+      }
+    },
+    "license": {"type": "string"},
+    "homepage": {"type": "string"},
+    "repository": {"type": "string"},
+    "keywords": {
+      "type": "array",
+      "items": {"type": "string"}
+    },
+    "displayName": {"type": "string"},
+    "source": {
+      "type": "object",
+      "required": ["source", "repo", "branch", "directory"],
+      "additionalProperties": false,
+      "properties": {
+        "source": {"type": "string", "enum": ["github"]},
+        "repo": {"type": "string"},
+        "branch": {"type": "string"},
+        "directory": {"type": "string"}
+      }
+    },
+    "hooks": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "SessionStart": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "additionalProperties": false,
+            "properties": {
+              "hooks": {
+                "type": "array",
+                "items": {
+                  "type": "object",
+                  "required": ["type", "command"],
+                  "additionalProperties": false,
+                  "properties": {
+                    "type": {"type": "string", "enum": ["command"]},
+                    "command": {"type": "string"},
+                    "timeout": {"type": "integer"}
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}

agentbundle-0.11.1/agentbundle/_data/plugin-manifest.derived.schema.json → agentbundle-0.12.1/agentbundle/_data/plugin-manifest.schema.json

@@ -14,7 +14,14 @@
       "type": "array",
       "items": {"type": "string"}
     },
-    "author": {"type": "string"},
+    "author": {
+      "type": "object",
+      "required": ["name"],
+      "properties": {
+        "name": {"type": "string"},
+        "email": {"type": "string"}
+      }
+    },
     "license": {"type": "string"},
     "homepage": {"type": "string"},
     "repository": {"type": "string"},
@@ -24,19 +31,14 @@
     },
     "category": {"type": "string"},
     "displayName": {"type": "string"},
-    "hooks": {
+    "source": {
       "type": "object",
+      "additionalProperties": false,
       "properties": {
-        "SessionStart": {
-          "type": "array",
-          "items": {
-            "type": "object",
-            "required": ["command"],
-            "properties": {
-              "command": {"type": "string"}
-            }
-          }
-        }
+        "source": {"type": "string"},
+        "repo": {"type": "string"},
+        "branch": {"type": "string"},
+        "directory": {"type": "string"}
       }
     }
   }

{agentbundle-0.11.1 → agentbundle-0.12.1}/agentbundle/build/adapters/claude_code.py

@@ -107,6 +107,17 @@ def _project_single(pack_path: Path, contract: dict, output_root: Path) -> None:
             raise ValueError(f"claude-code: unhandled mode {mode!r} for {primitive_name}")
 
 
+def _ignore_symlinks(directory: str, names: list[str]) -> set[str]:
+    """`shutil.copytree` ignore callback: skip every symlink member.
+
+    Drops nested symlinks so they are never reproduced in the output
+    tree. The top-level `is_symlink()` skip in `_project_direct_directory`
+    covers the skill root; this covers the subtree.
+    """
+    base = Path(directory)
+    return {name for name in names if (base / name).is_symlink()}
+
+
 def _project_direct_directory(source_dir: Path, target_dir: Path) -> None:
     for entry in sorted(source_dir.iterdir()):
         # Defense-in-depth — `lint-packs` rejects packs that ship
@@ -125,10 +136,10 @@ def _project_direct_directory(source_dir: Path, target_dir: Path) -> None:
                 destination.unlink()
             elif destination.exists():
                 shutil.rmtree(destination)
-            # symlinks=True preserves symlinks rather than dereferencing
-            # them — a malicious pack with a symlink to /etc/passwd
-            # cannot exfiltrate the target into the projection.
-            shutil.copytree(entry, destination, symlinks=True)
+            # `ignore=_ignore_symlinks` drops nested symlinks so they are
+            # never reproduced in the output tree. A malicious pack with a
+            # symlink to /etc/passwd cannot exfiltrate the target.
+            shutil.copytree(entry, destination, ignore=_ignore_symlinks)
 
 
 def _project_direct_file(source_dir: Path, output_root: Path, target_prefix: str) -> None:

{agentbundle-0.11.1 → agentbundle-0.12.1}/agentbundle/build/adapters/codex.py

@@ -29,6 +29,17 @@ from agentbundle.build.projections.codex_agent_toml import (
 )
 
 
+def _ignore_symlinks(directory: str, names: list[str]) -> set[str]:
+    """`shutil.copytree` ignore callback: skip every symlink member.
+
+    Drops nested symlinks so they are never reproduced in the output
+    tree. The top-level `is_symlink()` skip in `project_packs` covers
+    the skill root; this covers the subtree.
+    """
+    base = Path(directory)
+    return {name for name in names if (base / name).is_symlink()}
+
+
 def _iter_primitives(contract: dict) -> Iterator[str]:
     """Yield Codex's projected primitive names in phase order."""
     adapter_block = contract["adapter"]["codex"]
@@ -131,11 +142,11 @@ def project_packs(pack_paths: list[Path], contract: dict, output_root: Path) ->
                             destination.unlink()
                         elif destination.exists():
                             shutil.rmtree(destination)
-                        # symlinks=True keeps source symlinks as
-                        # symlinks — never dereferences. A malicious
-                        # pack with a symlink to /etc/passwd cannot
-                        # exfiltrate.
-                        shutil.copytree(entry, destination, symlinks=True)
+                        # `ignore=_ignore_symlinks` drops nested symlinks
+                        # entirely — never reproduced in the output tree.
+                        # A malicious pack with a symlink to /etc/passwd
+                        # cannot exfiltrate.
+                        shutil.copytree(entry, destination, ignore=_ignore_symlinks)
             # Bound to `skill` only per spec § Never do. Other
             # direct-directory primitives opt in explicitly.
             if primitive_name == "skill":

{agentbundle-0.11.1 → agentbundle-0.12.1}/agentbundle/build/adapters/copilot.py

@@ -34,6 +34,17 @@ from agentbundle.build.projections.copilot_hooks_json import (
 )
 
 
+def _ignore_symlinks(directory: str, names: list[str]) -> set[str]:
+    """`shutil.copytree` ignore callback: skip every symlink member.
+
+    Drops nested symlinks so they are never reproduced in the output
+    tree. The top-level `is_symlink()` skip in `_project_direct_directory`
+    covers the skill root; this covers the subtree.
+    """
+    base = Path(directory)
+    return {name for name in names if (base / name).is_symlink()}
+
+
 def _iter_primitives(contract: dict) -> Iterator[str]:
     """Yield Copilot's projected primitive names in phase order."""
     adapter_block = contract["adapter"]["copilot"]
@@ -86,13 +97,13 @@ def _project_direct_directory(
     """Copy each `<name>/` source tree to the target directory verbatim, then
     sweep orphaned target dirs no longer backed by a source.
 
-    Mirrors codex's `direct-directory` branch: `symlinks=True` keeps source
-    symlinks as symlinks (never dereferenced), a symlink at the entry root is
-    skipped (defense-in-depth — `lint-packs` already refuses symlinked packs,
-    but a direct `project()` caller bypasses that gate), and a destination
-    symlink is `unlink`ed (never `rmtree`d) before the copy. The orphan sweep is
-    **bounded to the `skill` primitive's** expected source names, so it can
-    never delete sibling `.github/agents/` or `.github/hooks/` content.
+    A symlink at the entry root is skipped (defense-in-depth — `lint-packs`
+    already refuses symlinked packs, but a direct `project()` caller bypasses
+    that gate). `ignore=_ignore_symlinks` drops nested symlinks so they are
+    never reproduced in the output tree. A destination symlink is `unlink`ed
+    (never `rmtree`d) before the copy. The orphan sweep is **bounded to the
+    `skill` primitive's** expected source names, so it can never delete sibling
+    `.github/agents/` or `.github/hooks/` content.
     """
     target_dir = output_root / rule["target-path"].rstrip("/")
     target_dir.mkdir(parents=True, exist_ok=True)
@@ -107,6 +118,6 @@ def _project_direct_directory(
                 destination.unlink()
             elif destination.exists():
                 shutil.rmtree(destination)
-            shutil.copytree(entry, destination, symlinks=True)
+            shutil.copytree(entry, destination, ignore=_ignore_symlinks)
     if primitive_name == "skill":
         sweep_orphans(target_dir, expected_names)

{agentbundle-0.11.1 → agentbundle-0.12.1}/agentbundle/build/adapters/cursor.py

@@ -143,8 +143,8 @@ def _ignore_symlinks(directory: str, names: list[str]) -> set[str]:
     secret the symlink points at) into the projection. The top-level
     `is_symlink()` skip in `_project_direct_directory` only covers the skill
     root; this covers the subtree. (Build runs on trusted `packs/`; this is
-    the install-from-untrusted-catalogue defense — see docs/backlog.md for the
-    cross-adapter shared-helper follow-on.)
+    the install-from-untrusted-catalogue defense — mirrored in all five
+    direct-directory adapters.)
     """
     base = Path(directory)
     return {name for name in names if (base / name).is_symlink()}

{agentbundle-0.11.1 → agentbundle-0.12.1}/agentbundle/build/adapters/kiro.py

@@ -369,6 +369,17 @@ def _project_hook_wiring_to_agent_json(
 # ---------------------------------------------------------------------------
 
 
+def _ignore_symlinks(directory: str, names: list[str]) -> set[str]:
+    """`shutil.copytree` ignore callback: skip every symlink member.
+
+    Drops nested symlinks so they are never reproduced in the output
+    tree. The top-level `is_symlink()` skip in `_project_direct_directory`
+    covers the skill root; this covers the subtree.
+    """
+    base = Path(directory)
+    return {name for name in names if (base / name).is_symlink()}
+
+
 def _project_direct_directory(source_dir: Path, target_dir: Path) -> None:
     for entry in sorted(source_dir.iterdir()):
         # Defense-in-depth — `lint-packs` rejects packs that ship
@@ -386,7 +397,9 @@ def _project_direct_directory(source_dir: Path, target_dir: Path) -> None:
                 destination.unlink()
             elif destination.exists():
                 shutil.rmtree(destination)
-            shutil.copytree(entry, destination, symlinks=True)
+            # `ignore=_ignore_symlinks` drops nested symlinks so they are
+            # never reproduced in the output tree.
+            shutil.copytree(entry, destination, ignore=_ignore_symlinks)
 
 
 def _project_direct_file(source_dir: Path, output_root: Path, target_prefix: str) -> None:

{agentbundle-0.11.1 → agentbundle-0.12.1}/agentbundle/build/main.py

@@ -18,6 +18,7 @@ paths.
 from __future__ import annotations
 
 import json
+import re
 import shutil
 import sys
 import tomllib
@@ -33,6 +34,22 @@ PACKAGE_ROOT = Path(__file__).resolve().parent
 RECIPES_DIR = PACKAGE_ROOT / "recipes"
 REPO_ROOT = PACKAGE_ROOT.parent.parent.parent.parent
 
+# Canonical branch name for the published Claude-plugins distribution.
+# All marketplace entries' source.branch must match this value so `claude plugin
+# install` fetches from the right branch.
+_DIST_BRANCH = "claude-plugins-dist"
+
+# Marketplace description included in both the dist and self-hosted marketplace.json.
+# The description field is required for `claude plugin validate --strict` to pass.
+_MARKETPLACE_DESCRIPTION = (
+    "Agent skills, subagents, and hooks for Claude Code and other coding agents."
+)
+
+# Match https://github.com/owner/repo (optional trailing .git and slash).
+_GITHUB_URL_RE = re.compile(
+    r"^https?://github\.com/([^/]+/[^/]+?)(?:\.git)?/?$"
+)
+
 
 def _bundled_or_repo(name: str) -> Path:
     """Locate a data file shipped under both `agentbundle/_data/` and
@@ -187,8 +204,11 @@ def derive_projectable_subset(pack_toml: dict) -> dict:
     subset into the claude-plugins + apm routes (the ``plugin.json`` /
     ``marketplace.json`` entry). Fixed mapping:
 
-      - ``author``      ← first ``[[pack.maintainers]]``, rendered
-        ``"Name <email>"`` (name alone when no email).
+      - ``author``      ← first ``[[pack.maintainers]]``, as object
+        ``{"name": ..., "email": ...}`` (email omitted when absent).
+      - ``source``      ← derived from ``[pack.links].repository`` when it is a
+        GitHub URL: ``{"source": "github", "repo": "owner/name",
+        "branch": _DIST_BRANCH, "directory": pack.name}``.
       - ``license``     ← ``[pack].license`` (verbatim).
       - ``homepage``    ← ``[pack.links].homepage`` (verbatim).
       - ``repository``  ← ``[pack.links].repository`` (verbatim).
@@ -214,10 +234,10 @@ def derive_projectable_subset(pack_toml: dict) -> dict:
             name = first.get("name")
             email = first.get("email")
             if isinstance(name, str) and name:
+                author_obj: dict = {"name": name}
                 if isinstance(email, str) and email:
-                    out["author"] = f"{name} <{email}>"
-                else:
-                    out["author"] = name
+                    author_obj["email"] = email
+                out["author"] = author_obj
 
     license_ = pack.get("license")
     if isinstance(license_, str) and license_:
@@ -231,6 +251,18 @@ def derive_projectable_subset(pack_toml: dict) -> dict:
         repository = links.get("repository")
         if isinstance(repository, str) and repository:
             out["repository"] = repository
+            # Derive source field: tells Claude Code where to fetch the plugin
+            # from the canonical distribution branch.
+            pack_name = pack.get("name", "")
+            if isinstance(pack_name, str) and pack_name:
+                m = _GITHUB_URL_RE.match(repository)
+                if m:
+                    out["source"] = {
+                        "source": "github",
+                        "repo": m.group(1),
+                        "branch": _DIST_BRANCH,
+                        "directory": pack_name,
+                    }
 
     keywords = pack.get("keywords")
     if isinstance(keywords, list):
@@ -478,8 +510,22 @@ def _run_per_pack_single(
         destination.parent.mkdir(parents=True, exist_ok=True)
         # Load, splice in synthesised SessionStart hook, re-serialise.
         derived = json.loads(plugin_manifest.read_text(encoding="utf-8"))
+        # Claude Code 2.1.209+ hook contract: each event entry is an object
+        # with a nested "hooks" array of typed hook objects, not a flat
+        # {command} object. The old flat shape ({command}) is rejected with
+        # "hooks: Invalid input" by the plugin validator.
         derived["hooks"] = {
-            "SessionStart": [{"command": _SESSION_START_COMMAND}]
+            "SessionStart": [
+                {
+                    "hooks": [
+                        {
+                            "type": "command",
+                            "command": _SESSION_START_COMMAND,
+                            "timeout": 10,
+                        }
+                    ]
+                }
+            ]
         }
         # enriched-pack-manifest: merge the projectable metadata subset derived
         # from this pack's pack.toml (emit-only-when-present, so a legacy pack
@@ -490,6 +536,12 @@ def _run_per_pack_single(
                 pack_toml_for_subset.read_text(encoding="utf-8")
             )
             derived.update(derive_projectable_subset(pack_meta))
+        # Strip marketplace-only fields from the per-pack plugin.json.
+        # "source" and "category" belong only in marketplace.json entries;
+        # the Claude plugin validator warns they are ignored in plugin.json.
+        # _run_aggregate re-adds them from pack.toml when building marketplace.json.
+        for _marketplace_key in ("source", "category"):
+            derived.pop(_marketplace_key, None)
         # Validate the derived manifest IN MEMORY before writing to disk
         # (Blocker-3: pre-write validation so a synthesis bug never lands
         # a malformed plugin.json in dist/).
@@ -624,12 +676,52 @@ def _run_aggregate(recipe: Recipe, output_dir: Path) -> dict:
         for plugin_dir in sorted(input_dir.iterdir()):
             manifest = plugin_dir / ".claude-plugin" / "plugin.json"
             if manifest.exists():
-                entries.append(json.loads(manifest.read_text(encoding="utf-8")))
+                entry = json.loads(manifest.read_text(encoding="utf-8"))
+                # hooks are per-plugin installation artifacts, not marketplace
+                # metadata; strip them from marketplace entries.
+                entry.pop("hooks", None)
+                # Re-add marketplace-only fields (source, category) from the
+                # projected pack.toml (also present in the dist directory).
+                # These were stripped from plugin.json to keep it clean of
+                # fields the Claude plugin loader ignores at runtime.
+                pack_toml_path = plugin_dir / "pack.toml"
+                if pack_toml_path.exists():
+                    pack_meta = tomllib.loads(
+                        pack_toml_path.read_text(encoding="utf-8")
+                    )
+                    subset = derive_projectable_subset(pack_meta)
+                    for _mk in ("source", "category"):
+                        if _mk in subset:
+                            entry[_mk] = subset[_mk]
+                entries.append(entry)
     output_path = output_dir / recipe.output_file
     _assert_under(output_path, output_dir)
     output_path.parent.mkdir(parents=True, exist_ok=True)
+
+    # Derive marketplace name and owner from the first entry that carries a
+    # source.repo field (populated above from pack.toml via derive_projectable_subset).
+    marketplace_name: str | None = None
+    marketplace_owner: dict | None = None
+    for entry in entries:
+        src = entry.get("source")
+        if isinstance(src, dict):
+            repo = src.get("repo", "")
+            if isinstance(repo, str) and "/" in repo:
+                owner_part, name_part = repo.split("/", 1)
+                marketplace_name = name_part
+                marketplace_owner = {"name": owner_part}
+                break
+
+    payload: dict = {}
+    if marketplace_name:
+        payload["name"] = marketplace_name
+        payload["description"] = _MARKETPLACE_DESCRIPTION
+    if marketplace_owner:
+        payload["owner"] = marketplace_owner
+    payload["plugins"] = entries
+
     output_path.write_text(
-        json.dumps({"plugins": entries}, indent=2, sort_keys=True) + "\n",
+        json.dumps(payload, indent=2, sort_keys=True) + "\n",
         encoding="utf-8", newline="\n",
     )
     return {"recipe": recipe.name, "type": recipe.type, "entries": len(entries)}

{agentbundle-0.11.1 → agentbundle-0.12.1}/agentbundle/build/projections/gemini_command_toml.py

@@ -28,8 +28,8 @@ dollar-amount in prose or a fenced shell example (``$10/month``, or a ``$1``
 inside a fenced code block) trips it too. This is **fail-closed** (a loud build
 error an author can act on, never a silent bad emit), and no shipped command
 contains a ``$<digit>``. An injection-context-aware parser (skip fenced/inline code, require
-an injection-shaped token) is a documented follow-on — see ``docs/backlog.md``
-§ ``gemini-full-parity``. Until then: keep literal ``$<digit>`` out of command
+an injection-shaped token) is a documented follow-on — see ``workspace.toml [backlog]``
+slug ``gemini-full-parity``. Until then: keep literal ``$<digit>`` out of command
 bodies, or the build will refuse the command.
 
 The one-source-file → one-output-file shape and the frontmatter helpers mirror

{agentbundle-0.11.1 → agentbundle-0.12.1}/agentbundle/build/self_host.py

@@ -362,14 +362,13 @@ EXCLUDED_PATTERNS: tuple[str, ...] = (
     "docs/product/*.md",
     "docs/knowledge/*.md",
     "docs/guides/**/*.md",
+    # Seeded-once / adopter-curated files (RFC-0002 Manual semantics).
+    "workspace.toml",  # RFC-0069: seeded once; adopter-curated thereafter
     # Manual seed-projected paths (RFC-0002 amendment 2026-05-25). The
     # `docs/<area>/*.md` patterns above cover 11 of the 19 reclassified
-    # paths; the following 8 are not matched by any pattern and need
+    # paths; the following 7 are not matched by any pattern and need
     # explicit listing. See `docs/specs/self-hosting/spec.md` AC20.
     "docs/CHARTER.md",
-    "docs/backlog.md",  # per-instance work/deferral register; seed is
-                        # placeholder, on-disk file is the curated instance
-                        # (RFC-0016 mechanism 5). Preserved like docs/product/*.
     "docs/knowledge/patterns.jsonl",
     "docs/rfc/README.md",
     "docs/adr/README.md",
@@ -557,12 +556,14 @@ def _aggregate_marketplace(
     packs_dir: Path,
     output_root: Path,
     owner: str = "eugenelim",
+    name: str = "agent-ready-repo",
+    description: str = "Agent skills, subagents, and hooks for Claude Code and other coding agents.",
 ) -> Path:
     """Aggregate `packs/*/.claude-plugin/plugin.json` into
     `output_root/.claude-plugin/marketplace.json` so this repo is itself
-    a usable marketplace at HEAD. `owner` defaults to this repo's
-    concrete value but `run_self_host` overrides it from
-    `.adapt-discovery.toml[adapt].owner` so adopters get their own."""
+    a usable marketplace at HEAD. `owner` and `name` default to this repo's
+    concrete values but `run_self_host` overrides them from
+    `.adapt-discovery.toml` so adopters get their own."""
     entries: list[dict] = []
     for pack_path in sorted(packs_dir.iterdir()):
         if not pack_path.is_dir() or not (pack_path / "pack.toml").exists():
@@ -570,10 +571,12 @@ def _aggregate_marketplace(
         manifest = pack_path / ".claude-plugin" / "plugin.json"
         if manifest.exists():
             entry = json.loads(manifest.read_text(encoding="utf-8"))
+            # hooks are per-plugin artifacts; strip them from marketplace entries.
+            entry.pop("hooks", None)
             # enriched-pack-manifest: surface the projectable metadata subset
-            # (author / license / links / keywords / category / displayName)
-            # derived from pack.toml, so the catalogue entry is described
-            # richly. Emit-only-when-present keeps legacy entries byte-identical.
+            # (author / license / links / keywords / category / displayName /
+            # source) derived from pack.toml. Emit-only-when-present keeps
+            # legacy entries byte-identical.
             pack_meta = tomllib.loads(
                 (pack_path / "pack.toml").read_text(encoding="utf-8")
             )
@@ -582,6 +585,8 @@ def _aggregate_marketplace(
     target = output_root / ".claude-plugin" / "marketplace.json"
     target.parent.mkdir(parents=True, exist_ok=True)
     payload = {
+        "name": name,
+        "description": description,
         "owner": {"name": owner},
         "plugins": entries,
     }
@@ -1079,6 +1084,7 @@ def run_self_host(
         return 3
     discovery_flat = dict(discovery.markers)
     owner = discovery_flat.get("owner", "eugenelim")
+    marketplace_name = discovery_flat.get("project-name", "agent-ready-repo")
 
     if dry_run:
         with tempfile.TemporaryDirectory(prefix="agentbundle-shadow-") as shadow_str:
@@ -1096,7 +1102,7 @@ def run_self_host(
             except ValueError as exc:
                 print(f"self-host: {exc}", file=sys.stderr)
                 return 4
-            _aggregate_marketplace(packs_dir, shadow, owner=owner)
+            _aggregate_marketplace(packs_dir, shadow, owner=owner, name=marketplace_name)
             _recreate_claude_symlink(shadow, force_copy=no_symlink)
             extra_marker_paths = list(seed_map.keys()) + [
                 Path(".claude-plugin") / "marketplace.json",
@@ -1152,7 +1158,7 @@ def run_self_host(
     except ValueError as exc:
         print(f"self-host: {exc}", file=sys.stderr)
         return 4
-    _aggregate_marketplace(packs_dir, working_tree, owner=owner)
+    _aggregate_marketplace(packs_dir, working_tree, owner=owner, name=marketplace_name)
     _recreate_claude_symlink(working_tree, force_copy=no_symlink)
     extra_marker_paths = list(seed_map.keys()) + [
         Path(".claude-plugin") / "marketplace.json",