agentbundle 0.29.5__tar.gz → 0.29.6__tar.gz

{agentbundle-0.29.5 → agentbundle-0.29.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentbundle
-Version: 0.29.5
+Version: 0.29.6
 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
@@ -269,7 +269,10 @@ ignore them there; the separation is structural, not incidental.
 `keywords` once; the build projects the cleanly-mappable subset — plus the
 pack's `README.md` — into each distribution route's manifest (the `plugin.json`
 / `marketplace.json` entry), so the catalogue describes each pack richly rather
-than with a single sentence. Extra fields stay in `pack.toml`; the projection
+than with a single sentence. A marketplace entry's `source` is a `git-subdir`
+object (`url`, `path`, and one of `ref`/`sha`) pointing at the pack's directory
+on the published distribution branch, and every entry is schema-validated at
+build time against `marketplace-entry.schema.json`. Extra fields stay in `pack.toml`; the projection
 is deliberately lossy per tool.
 
 Point a catalogue URI (a git URL or a local path) at the repo that holds your packs. Then `validate` a pack against the adapter contract, `render` it to preview the projection, and `install` it into a target repo. `scaffold` drops a pack's seeds into a fresh directory to start from. The build pipeline (`agentbundle.build`) is the same engine `make build` runs.
@@ -285,8 +288,9 @@ The org hint fires after the user-config but before the on-disk IDE probe — so
 
 **Bundled contracts** — the wheel ships the machine contracts used for offline validation:
 `pack.schema.json`, `skill.schema.json`, `guide.schema.json`, `skill-manifest.schema.json`,
-`profile.schema.json`, `catalogue.schema.json`, `target-vocab.toml`, and the adapter
-contract files. All are available without network access via `importlib.resources`.
+`profile.schema.json`, `catalogue.schema.json`, `plugin-manifest.schema.json`,
+`plugin-manifest.derived.schema.json`, `marketplace-entry.schema.json`,
+`target-vocab.toml`, and the adapter contract files. All are available without network access via `importlib.resources`.
 
 **Lint your catalogue** — shallow structural checks run without extra dependencies:
 

{agentbundle-0.29.5 → agentbundle-0.29.6}/README-pypi.md

@@ -247,7 +247,10 @@ ignore them there; the separation is structural, not incidental.
 `keywords` once; the build projects the cleanly-mappable subset — plus the
 pack's `README.md` — into each distribution route's manifest (the `plugin.json`
 / `marketplace.json` entry), so the catalogue describes each pack richly rather
-than with a single sentence. Extra fields stay in `pack.toml`; the projection
+than with a single sentence. A marketplace entry's `source` is a `git-subdir`
+object (`url`, `path`, and one of `ref`/`sha`) pointing at the pack's directory
+on the published distribution branch, and every entry is schema-validated at
+build time against `marketplace-entry.schema.json`. Extra fields stay in `pack.toml`; the projection
 is deliberately lossy per tool.
 
 Point a catalogue URI (a git URL or a local path) at the repo that holds your packs. Then `validate` a pack against the adapter contract, `render` it to preview the projection, and `install` it into a target repo. `scaffold` drops a pack's seeds into a fresh directory to start from. The build pipeline (`agentbundle.build`) is the same engine `make build` runs.
@@ -263,8 +266,9 @@ The org hint fires after the user-config but before the on-disk IDE probe — so
 
 **Bundled contracts** — the wheel ships the machine contracts used for offline validation:
 `pack.schema.json`, `skill.schema.json`, `guide.schema.json`, `skill-manifest.schema.json`,
-`profile.schema.json`, `catalogue.schema.json`, `target-vocab.toml`, and the adapter
-contract files. All are available without network access via `importlib.resources`.
+`profile.schema.json`, `catalogue.schema.json`, `plugin-manifest.schema.json`,
+`plugin-manifest.derived.schema.json`, `marketplace-entry.schema.json`,
+`target-vocab.toml`, and the adapter contract files. All are available without network access via `importlib.resources`.
 
 **Lint your catalogue** — shallow structural checks run without extra dependencies:
 

{agentbundle-0.29.5 → agentbundle-0.29.6}/agentbundle/_data/adapter.toml

@@ -188,12 +188,14 @@ install-routes = ["cli", "claude-plugins", "apm"]
 primitive = "skill"
 mode = "direct-directory"
 target-path = ".claude/skills/"
+plugin-target-path = "skills/"
 on-conflict = "prompt-then-preserve"
 
 [[adapter."claude-code".projection]]
 primitive = "agent"
 mode = "direct-file"
 target-path = ".claude/agents/"
+plugin-target-path = "agents/"
 on-conflict = "prompt-then-preserve"
 
 [[adapter."claude-code".projection]]
@@ -213,6 +215,7 @@ on-conflict = "merge-managed-key-only"
 primitive = "command"
 mode = "direct-file"
 target-path = ".claude/commands/"
+plugin-target-path = "commands/"
 on-conflict = "prompt-then-preserve"
 
 # hook-body — scope-conditional target.

agentbundle-0.29.6/agentbundle/_data/marketplace-entry.schema.json

@@ -0,0 +1,110 @@
+{
+  "x-spec": "docs/specs/claude-plugins-manifest-correctness",
+  "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"
+    },
+    "category": {
+      "type": "string"
+    },
+    "source": {
+      "type": "object",
+      "required": [
+        "source",
+        "url",
+        "path"
+      ],
+      "additionalProperties": false,
+      "properties": {
+        "source": {
+          "type": "string",
+          "enum": [
+            "git-subdir"
+          ]
+        },
+        "url": {
+          "type": "string",
+          "pattern": "^https://github\\.com/[^/]+/[^/]+\\.git$"
+        },
+        "path": {
+          "type": "string",
+          "pattern": "^[a-z0-9][a-z0-9-]*$"
+        },
+        "ref": {
+          "type": "string"
+        },
+        "sha": {
+          "type": "string"
+        }
+      },
+      "if": {
+        "required": [
+          "ref"
+        ]
+      },
+      "then": {},
+      "else": {
+        "required": [
+          "sha"
+        ]
+      }
+    }
+  }
+}

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

@@ -0,0 +1,147 @@
+{
+  "x-spec": "docs/specs/claude-plugins-manifest-correctness",
+  "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",
+        "url",
+        "path"
+      ],
+      "additionalProperties": false,
+      "properties": {
+        "source": {
+          "type": "string",
+          "enum": [
+            "git-subdir"
+          ]
+        },
+        "url": {
+          "type": "string",
+          "pattern": "^https://github\\.com/[^/]+/[^/]+\\.git$"
+        },
+        "path": {
+          "type": "string",
+          "pattern": "^[a-z0-9][a-z0-9-]*$"
+        },
+        "ref": {
+          "type": "string"
+        },
+        "sha": {
+          "type": "string"
+        }
+      },
+      "if": {
+        "required": [
+          "ref"
+        ]
+      },
+      "then": {},
+      "else": {
+        "required": [
+          "sha"
+        ]
+      }
+    },
+    "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.29.6/agentbundle/_data/plugin-manifest.schema.json

@@ -0,0 +1,110 @@
+{
+  "x-spec": "docs/specs/claude-plugins-manifest-correctness",
+  "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"
+      }
+    },
+    "category": {
+      "type": "string"
+    },
+    "displayName": {
+      "type": "string"
+    },
+    "source": {
+      "type": "object",
+      "required": [
+        "source",
+        "url",
+        "path"
+      ],
+      "additionalProperties": false,
+      "properties": {
+        "source": {
+          "type": "string",
+          "enum": [
+            "git-subdir"
+          ]
+        },
+        "url": {
+          "type": "string",
+          "pattern": "^https://github\\.com/[^/]+/[^/]+\\.git$"
+        },
+        "path": {
+          "type": "string",
+          "pattern": "^[a-z0-9][a-z0-9-]*$"
+        },
+        "ref": {
+          "type": "string"
+        },
+        "sha": {
+          "type": "string"
+        }
+      },
+      "if": {
+        "required": [
+          "ref"
+        ]
+      },
+      "then": {},
+      "else": {
+        "required": [
+          "sha"
+        ]
+      }
+    }
+  }
+}

{agentbundle-0.29.5 → agentbundle-0.29.6}/agentbundle/build/adapters/claude_code.py

@@ -62,11 +62,33 @@ def project_packs(pack_paths: list[Path], contract: dict, output_root: Path) ->
 # Mirror of kiro.py:_skill_direct_directory_target — keep in sync.
 # A shared helper is barred by the spec's `Never do` boundary (no
 # expansion of projections/direct_directory.py beyond `sweep_orphans`).
+def _resolve_target(output_root: Path, target_path: str) -> Path:
+    """Join a contract ``target-path`` onto ``output_root``, confined.
+
+    ``target-path`` (and its route-scoped sibling ``plugin-target-path``) are
+    contract *data*. An absolute value discards the base entirely on join
+    (``Path("/a/b") / "/etc/x"`` is ``/etc/x``) and a ``..``-bearing one walks
+    out of it — and because the orphan sweep resolves the same value, an
+    escaped target becomes the root of a ``shutil.rmtree``. Confine after
+    resolution rather than trusting the string (CWE-73, not just CWE-22).
+    """
+    candidate = output_root / target_path.rstrip("/")
+    root_resolved = output_root.resolve()
+    try:
+        candidate.resolve().relative_to(root_resolved)
+    except ValueError:
+        raise ValueError(
+            f"claude-code: target-path {target_path!r} escapes the output root "
+            f"{output_root}"
+        ) from None
+    return candidate
+
+
 def _skill_direct_directory_target(contract: dict, output_root: Path) -> Path | None:
     adapter_block = contract["adapter"]["claude-code"]
     for entry in adapter_block.get("projection", []):
         if entry.get("primitive") == "skill" and entry.get("mode") == "direct-directory":
-            return output_root / entry["target-path"].rstrip("/")
+            return _resolve_target(output_root, entry["target-path"])
     return None
 
 
@@ -128,8 +150,11 @@ def _project_single(pack_path: Path, contract: dict, output_root: Path) -> None:
             continue
 
         if mode == "direct-directory":
-            _project_direct_directory(source_dir, output_root / rule["target-path"].rstrip("/"))
+            _project_direct_directory(
+                source_dir, _resolve_target(output_root, rule["target-path"])
+            )
         elif mode == "direct-file":
+            _resolve_target(output_root, rule["target-path"])  # confinement check
             _project_direct_file(source_dir, output_root, rule["target-path"])
         elif mode == "merge-json":
             project_merge_json(source_dir, output_root, rule)

{agentbundle-0.29.5 → agentbundle-0.29.6}/agentbundle/build/main.py

@@ -46,8 +46,15 @@ _MARKETPLACE_DESCRIPTION = (
 )
 
 # Match https://github.com/owner/repo (optional trailing .git and slash).
+# HTTPS only: an `http://` link is rejected outright rather than upgraded,
+# because `git-subdir` moves the fetch host from the schema into data.
 _GITHUB_URL_RE = re.compile(
-    r"^https?://github\.com/([^/]+/[^/]+?)(?:\.git)?/?$"
+    r"^https://github\.com/([^/]+/[^/]+?)(?:\.git)?/?$"
+)
+# Matched separately so an insecure link raises instead of silently falling
+# through the "not a GitHub URL" branch, which emits no `source` at all.
+_INSECURE_GITHUB_URL_RE = re.compile(
+    r"^http://github\.com/([^/]+/[^/]+?)(?:\.git)?/?$"
 )
 
 
@@ -206,9 +213,17 @@ def derive_projectable_subset(pack_toml: dict) -> dict:
 
       - ``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}``.
+      - ``source``      ← derived from ``[pack.links].repository`` when it is an
+        **https** GitHub URL: ``{"source": "git-subdir",
+        "url": "https://github.com/owner/name.git", "path": pack.name,
+        "ref": _DIST_BRANCH}``. Claude Code's ``github`` source accepts only
+        ``repo``/``ref``/``sha`` and has no subdirectory support, so the former
+        ``branch``/``directory`` keys were silently dropped and the installer
+        cloned the default branch at repo root — every adopter received an
+        empty plugin. An ``http://`` repository link **raises**: silently
+        upgrading it to ``https`` would fabricate a URL the author did not
+        write, and silently omitting ``source`` would reintroduce the same
+        class of quiet failure.
       - ``license``     ← ``[pack].license`` (verbatim).
       - ``homepage``    ← ``[pack.links].homepage`` (verbatim).
       - ``repository``  ← ``[pack.links].repository`` (verbatim).
@@ -255,13 +270,20 @@ def derive_projectable_subset(pack_toml: dict) -> dict:
             # from the canonical distribution branch.
             pack_name = pack.get("name", "")
             if isinstance(pack_name, str) and pack_name:
+                if _INSECURE_GITHUB_URL_RE.match(repository):
+                    raise ValueError(
+                        f"[pack.links].repository must be https, got "
+                        f"{repository!r}. Refusing to upgrade it silently: the "
+                        f"emitted url is what an adopter's client clones and "
+                        f"then executes."
+                    )
                 m = _GITHUB_URL_RE.match(repository)
                 if m:
                     out["source"] = {
-                        "source": "github",
-                        "repo": m.group(1),
-                        "branch": _DIST_BRANCH,
-                        "directory": pack_name,
+                        "source": "git-subdir",
+                        "url": f"https://github.com/{m.group(1)}.git",
+                        "path": pack_name,
+                        "ref": _DIST_BRANCH,
                     }
 
     keywords = pack.get("keywords")
@@ -485,6 +507,49 @@ def _run_per_pack(
     return {"recipe": recipe.name, "type": recipe.type, "produced": produced}
 
 
+def _resolve_contract_for_route(contract: dict, recipe: Recipe) -> dict:
+    """Return the contract with route-scoped projection targets applied.
+
+    Claude Code *plugins* load ``skills/``, ``agents/`` and ``commands/`` from
+    the plugin root; a repo or user install lands the same primitives under
+    ``.claude/``. Rather than widen every adapter's ``project`` signature with a
+    route argument, the dispatcher swaps ``target-path`` for the entry's
+    ``plugin-target-path`` on the claude-plugins recipe only. The adapter keeps
+    reading ``target-path``, so the orphan sweep
+    (``_skill_direct_directory_target``) resolves the same route-correct target
+    for free — had the route reached the projection but not the sweep, the sweep
+    would silently target a nonexistent directory.
+    """
+    if recipe.name != "per-pack-claude-plugin" or recipe.adapter != "claude-code":
+        return contract
+    entries = contract["adapter"]["claude-code"].get("projection", [])
+    missing = [
+        e["primitive"] for e in entries
+        if e.get("primitive") in ("skill", "agent", "command")
+        and "plugin-target-path" not in e
+    ]
+    if missing:
+        # Fail loud. Returning the un-rerouted contract here would silently
+        # restore the `.claude/` layout — the empty-plugin defect this exists
+        # to prevent — for a typo'd key or a stale bundled adapter.toml.
+        raise ValueError(
+            "claude-plugins recipe: claude-code contract is missing "
+            f"'plugin-target-path' for {missing}; components would be "
+            "published under .claude/ where the plugin loader cannot see them"
+        )
+    rerouted = [
+        {**entry, "target-path": entry["plugin-target-path"]}
+        if "plugin-target-path" in entry
+        else entry
+        for entry in entries
+    ]
+    adapters = dict(contract["adapter"])
+    adapters["claude-code"] = {
+        **contract["adapter"]["claude-code"], "projection": rerouted
+    }
+    return {**contract, "adapter": adapters}
+
+
 def _run_per_pack_single(
     pack: Pack,
     recipe: Recipe,
@@ -494,6 +559,7 @@ def _run_per_pack_single(
     produced: dict[str, str],
 ) -> None:
     """Execute the derivation pipeline for a single pack."""
+    contract = _resolve_contract_for_route(contract, recipe)
     per_pack_output = output_dir / recipe.output_subdir / pack.name
     _assert_under(per_pack_output, output_dir)
     # Transactional cleanup (Blocker-4): remove any prior partial or
@@ -700,19 +766,25 @@ def _run_aggregate(recipe: Recipe, output_dir: Path) -> dict:
     _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).
+    # Derive marketplace name and owner from the first entry's `source.url`
+    # (populated above from pack.toml via derive_projectable_subset). This
+    # reads `url` rather than the former `repo`: a `git-subdir` source carries
+    # no `repo`, so leaving the old split in place would silently drop the
+    # envelope's `name`, `owner` and `description` — the same defect the
+    # 2026-07 "marketplace missing top-level name" fix already corrected once.
     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
+            url = src.get("url", "")
+            if isinstance(url, str):
+                m = _GITHUB_URL_RE.match(url)
+                if m:
+                    owner_part, name_part = m.group(1).split("/", 1)
+                    marketplace_name = name_part
+                    marketplace_owner = {"name": owner_part}
+                    break
 
     payload: dict = {}
     if marketplace_name:

{agentbundle-0.29.5 → agentbundle-0.29.6}/agentbundle/build/tests/test_end_to_end_build.py

@@ -62,14 +62,22 @@ class EndToEndBuildTests(unittest.TestCase):
             # primitives lands at its declared output under the `core` pack
             # — the only fixture that exercises every primitive type.
             core_plugin = tmp_path / "claude-plugins" / "core"
-            self.assertTrue((core_plugin / ".claude" / "skills" / "example").exists())
-            self.assertTrue((core_plugin / ".claude" / "agents" / "bar.md").exists())
+            # Components land at the PLUGIN ROOT on this route: Claude Code
+            # plugins load skills/, agents/ and commands/ from there, not from
+            # `.claude/`. Hook wiring is the exception — it stays at
+            # `.claude/settings.local.json`, which is where the harness reads it.
+            self.assertTrue((core_plugin / "skills" / "example").exists())
+            self.assertTrue((core_plugin / "agents" / "bar.md").exists())
             self.assertTrue((core_plugin / "tools" / "hooks" / "baz.sh").exists())
             self.assertTrue((core_plugin / "tools" / "hooks" / "baz.py").exists())
             self.assertTrue(
                 (core_plugin / ".claude" / "settings.local.json").exists()
             )
-            self.assertTrue((core_plugin / ".claude" / "commands" / "qux.md").exists())
+            self.assertTrue((core_plugin / "commands" / "qux.md").exists())
+            # …and the old locations are gone, so a half-applied move fails.
+            self.assertFalse((core_plugin / ".claude" / "skills").exists())
+            self.assertFalse((core_plugin / ".claude" / "agents").exists())
+            self.assertFalse((core_plugin / ".claude" / "commands").exists())
 
     def test_plain_build_does_not_invoke_self_host_recipes(self) -> None:
         """AC: plain `make build` produces only dist/apm, dist/claude-plugins,