agentbundle 0.46.1__tar.gz → 0.47.1__tar.gz

{agentbundle-0.46.1/agentbundle.egg-info → agentbundle-0.47.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentbundle
-Version: 0.46.1
+Version: 0.47.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-Expression: Apache-2.0 OR MIT
@@ -34,6 +34,23 @@ python -m pip install agentbundle
 
 Requires Python 3.11+. Runs on macOS, Linux, and Windows.
 
+## What's new in 0.47.1
+
+**Fixed:** `workspace_status` now reports the output path your
+`agentbundle-layout.toml` configures. It previously showed the built-in default
+for an item type while the git tools committed to your configured `output_dir`,
+so the status surface and everything else disagreed. If your configured
+directory resolves outside the repository, the status surface now reports no
+pattern and says why, because commits are confined to the repository.
+
+## What's new in 0.47.0
+
+**Removed:** the work-loop telemetry resolver. `jsonl-otlp-export` now reads
+`[telemetry]` from your repository and user `agentbundle-layout.toml` itself,
+through its own `--config` and `--user-config` flags, so invoking it no longer
+requires importing this package. Configuration files, their location and their
+repository-wins-per-setting precedence are unchanged; only what reads them moved.
+
 ## What's new in 0.46.1
 
 `catalogue init` no longer stages its writes under a name another local user
@@ -57,22 +74,9 @@ null. Values written into the generated `catalogue.toml` are escaped for TOML.
 
 ## What's new in 0.45.0
 
-`agentbundle` can now work out where to send your work-loop telemetry.
-`agentbundle.telemetry_layout.resolve()` reads the `[telemetry]` section of the
-`agentbundle-layout.toml` in your repository and the one in your user layout
-directory, and returns the arguments for the separately installed
-`jsonl-otlp-exporter` sender. Nothing is sent unless you configure an endpoint
-and install that sender: they are two separate consents.
-
-Repository settings win per setting, because sending data off the machine is a
-team decision rather than a personal one. Both files are read through the
-catalogue's confinement helper and bounded at 64 KiB, and a `[telemetry]`
-setting the sender has no route for is refused — naming the file it came from —
-rather than silently ignored.
-
-`catalogue lint` also reports `CAT-L032` when a pack declares an optional
-runtime dependency you do not have installed. It names the package and exits 0.
-It never invokes a package manager and never installs anything.
+Work-loop telemetry configuration. The resolver this release introduced was
+removed in 0.47.0 — the sender reads both `agentbundle-layout.toml` files
+itself, so nothing in this package stands between your configuration and it.
 
 ## What's new in 0.44.3
 

{agentbundle-0.46.1 → agentbundle-0.47.1}/README-pypi.md

@@ -14,6 +14,23 @@ python -m pip install agentbundle
 
 Requires Python 3.11+. Runs on macOS, Linux, and Windows.
 
+## What's new in 0.47.1
+
+**Fixed:** `workspace_status` now reports the output path your
+`agentbundle-layout.toml` configures. It previously showed the built-in default
+for an item type while the git tools committed to your configured `output_dir`,
+so the status surface and everything else disagreed. If your configured
+directory resolves outside the repository, the status surface now reports no
+pattern and says why, because commits are confined to the repository.
+
+## What's new in 0.47.0
+
+**Removed:** the work-loop telemetry resolver. `jsonl-otlp-export` now reads
+`[telemetry]` from your repository and user `agentbundle-layout.toml` itself,
+through its own `--config` and `--user-config` flags, so invoking it no longer
+requires importing this package. Configuration files, their location and their
+repository-wins-per-setting precedence are unchanged; only what reads them moved.
+
 ## What's new in 0.46.1
 
 `catalogue init` no longer stages its writes under a name another local user
@@ -37,22 +54,9 @@ null. Values written into the generated `catalogue.toml` are escaped for TOML.
 
 ## What's new in 0.45.0
 
-`agentbundle` can now work out where to send your work-loop telemetry.
-`agentbundle.telemetry_layout.resolve()` reads the `[telemetry]` section of the
-`agentbundle-layout.toml` in your repository and the one in your user layout
-directory, and returns the arguments for the separately installed
-`jsonl-otlp-exporter` sender. Nothing is sent unless you configure an endpoint
-and install that sender: they are two separate consents.
-
-Repository settings win per setting, because sending data off the machine is a
-team decision rather than a personal one. Both files are read through the
-catalogue's confinement helper and bounded at 64 KiB, and a `[telemetry]`
-setting the sender has no route for is refused — naming the file it came from —
-rather than silently ignored.
-
-`catalogue lint` also reports `CAT-L032` when a pack declares an optional
-runtime dependency you do not have installed. It names the package and exits 0.
-It never invokes a package manager and never installs anything.
+Work-loop telemetry configuration. The resolver this release introduced was
+removed in 0.47.0 — the sender reads both `agentbundle-layout.toml` files
+itself, so nothing in this package stands between your configuration and it.
 
 ## What's new in 0.44.3
 

{agentbundle-0.46.1 → agentbundle-0.47.1}/agentbundle/_data/knowledge-captured-observation.schema.json

@@ -5,11 +5,10 @@
   "description": "Strict producer request admitted by project-knowledge capture before core derives storage identity.",
   "x-spec": ["docs/specs/project-knowledge-foundation/"],
   "type": "object",
-  "contract_version": "knowledge-captured-observation.v1",
+  "contract_version": "knowledge-captured-observation.v2",
   "additionalProperties": false,
   "required": [
     "contract_version",
-    "lesson",
     "kind",
     "project_scope",
     "competency_facets",
@@ -23,13 +22,13 @@
   ],
   "properties": {
     "contract_version": {
-      "const": "knowledge-captured-observation.v1"
+      "const": "knowledge-captured-observation.v2"
     },
     "lesson": {
       "$ref": "#/$defs/safeText2000"
     },
     "kind": {
-      "enum": ["pattern", "gotcha", "antipattern"]
+      "enum": ["pattern", "gotcha", "antipattern", "work-item"]
     },
     "project_scope": {
       "type": "object",
@@ -205,14 +204,123 @@
       "required": ["command", "path"],
       "properties": {
         "command": {
-          "$ref": "#/$defs/safeText500"
+          "type": "array",
+          "minItems": 1,
+          "maxItems": 20,
+          "items": { "$ref": "#/$defs/safeText500" }
         },
         "path": {
           "$ref": "#/$defs/repositoryPath"
         }
       }
+    },
+    "work_item": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": ["statement", "shape", "blocker", "finished_state", "necessity_rationale"],
+      "properties": {
+        "statement": {
+          "$ref": "#/$defs/safeText2000"
+        },
+        "shape": {
+          "enum": ["defect", "question", "decision"]
+        },
+        "blocker": {
+          "enum": ["decision", "instrument", "elapsed-time", "dependency"]
+        },
+        "finished_state": {
+          "$ref": "#/$defs/safeText2000"
+        },
+        "necessity_rationale": {
+          "$ref": "#/$defs/safeText2000"
+        },
+        "observed": {
+          "$ref": "#/$defs/safeText2000"
+        },
+        "intended": {
+          "$ref": "#/$defs/safeText2000"
+        },
+        "answered_by": {
+          "$ref": "#/$defs/safeText2000"
+        },
+        "significance": {
+          "type": "array",
+          "minItems": 1,
+          "uniqueItems": true,
+          "items": {
+            "enum": [
+              "architecturally-significant",
+              "expensive-to-reverse",
+              "constrains-beyond"
+            ]
+          }
+        }
+      }
     }
   },
+  "allOf": [
+    {
+      "if": {"properties": {"kind": {"const": "work-item"}}},
+      "then": {"required": ["work_item"]}
+    },
+    {
+      "if": {"not": {"properties": {"kind": {"const": "work-item"}}}},
+      "then": {"required": ["lesson"]}
+    },
+    {
+      "if": {
+        "required": ["work_item"],
+        "properties": {
+          "work_item": {
+            "required": ["shape"],
+            "properties": {"shape": {"const": "defect"}}
+          }
+        }
+      },
+      "then": {
+        "anyOf": [
+          {"required": ["verification_route"]},
+          {
+            "properties": {
+              "work_item": {"required": ["observed", "intended"]}
+            }
+          }
+        ]
+      }
+    },
+    {
+      "if": {
+        "required": ["work_item"],
+        "properties": {
+          "work_item": {
+            "required": ["shape"],
+            "properties": {"shape": {"const": "question"}}
+          }
+        }
+      },
+      "then": {
+        "properties": {
+          "work_item": {"required": ["answered_by"]}
+        }
+      }
+    },
+    {
+      "if": {
+        "required": ["work_item"],
+        "properties": {
+          "work_item": {
+            "required": ["shape"],
+            "properties": {"shape": {"const": "decision"}}
+          }
+        }
+      },
+      "then": {
+        "properties": {
+          "work_item": {"required": ["significance"]}
+        }
+      }
+    }
+  ],
   "$defs": {
     "safeText2000": {
       "type": "string",

{agentbundle-0.46.1 → agentbundle-0.47.1}/agentbundle/build/self_host.py

@@ -130,6 +130,32 @@ def _runtime_projections(root: Path) -> tuple[tuple[Path, Path], ...]:
     )
 
 
+def _library_mirrors(root: Path) -> tuple[tuple[Path, Path], ...]:
+    """Return pack-source mirrors that land outside the flat `_data/` layout.
+
+    `catalogue_tooling.file_safety` is the blessed filesystem-confinement helper
+    and must stay byte-identical to the core pack script it mirrors. It is kept
+    separate from `_runtime_projections` because the sibling-closure derivation
+    below is a fact about `_data/`'s flat layout: this destination is an ordinary
+    package module reached by import, so it has no sibling closure to check.
+    """
+
+    return (
+        (
+            root / "packs" / "core" / ".apm" / "skills" / "close-work"
+            / "scripts" / "file_safety.py",
+            root / "packages" / "agentbundle" / "agentbundle" / "catalogue_tooling"
+            / "file_safety.py",
+        ),
+    )
+
+
+def _mirrored_pack_sources(root: Path) -> tuple[tuple[Path, Path], ...]:
+    """Every pack-source copy `make build-self` writes and build-check gates."""
+
+    return _runtime_projections(root) + _library_mirrors(root)
+
+
 # A bundled runtime loads its helpers as siblings of its own file, because the
 # `_data/` layout is flat. Every sibling it reaches must therefore be bundled
 # too, or the packaged CLI resolves a module that is not there. Pairs are
@@ -618,6 +644,11 @@ EXCLUDED_PATTERNS: tuple[str, ...] = (
     # Manual seed-projected root path (amendment 2026-05-25). The subtree
     # patterns above cover the other reclassified documentation paths.
     "docs/CHARTER.md",
+    # Seeded once, then repository-owned — same shape as CHARTER.md. The seed is
+    # a template whose map carries a placeholder row; a real repository's map
+    # names its own areas, including ones no pack seeds. Projecting the seed over
+    # it would overwrite that with the template on every build.
+    "docs/README.md",
     "README.md",  # root-level; nested README.md not excluded
     "CONTRIBUTING.md",
     "LICENSE-*",
@@ -698,14 +729,12 @@ _EXCLUDED_REGEXES: tuple[re.Pattern[str], ...] = tuple(
 # Hardcoded "Projected README" allow-list — paths classified as
 # *Projected* even when EXCLUDED_PATTERNS would otherwise catch them.
 #
-# The 2026-05-25 amendment reclassified 19 paths Projected
-# → Manual; this allow-list shrank to one entry (`docs/CONVENTIONS.md`)
-# accordingly. The reclassified paths now fall through to
-# EXCLUDED_PATTERNS coverage (the repository-owned documentation and package
-# subtrees plus their root-file entries above).
-PROJECTED_README_OVERRIDES: tuple[str, ...] = (
-    "docs/CONVENTIONS.md",
-)
+# The 2026-05-25 amendment reclassified 19 paths Projected → Manual, leaving
+# one entry. Retiring the conventions document removed it, so the allow-list is now
+# empty: every path's classification comes from EXCLUDED_PATTERNS alone, with no
+# exception. Keep the tuple rather than deleting it — a future Projected path
+# that an excluded pattern would otherwise catch belongs here.
+PROJECTED_README_OVERRIDES: tuple[str, ...] = ()
 
 
 def _is_excluded(relative: Path) -> bool:
@@ -763,7 +792,7 @@ def _project_seeds(
             # the Phase-2 composite-agents-md recipe consumes them
             # by reading `packs/core/seeds/_agents-footer.md`
             # directly. Skip standalone projection. Convention
-            # documented in docs/CONVENTIONS.md § Pack source-of-truth
+            # documented in ``docs/architecture/pack-layout.md`` § The source-of-truth split.
             # split.
             if src.name.startswith("_"):
                 continue
@@ -1589,7 +1618,7 @@ def run_self_host(
     if agents_path is not None:
         extra_marker_paths.append(Path("AGENTS.md"))
     resolve_markers(working_tree, discovery_flat, extra_paths=extra_marker_paths)
-    for source_path, bundled_path in _runtime_projections(working_tree):
+    for source_path, bundled_path in _mirrored_pack_sources(working_tree):
         if not source_path.is_file() or not bundled_path.parent.is_dir():
             continue
         bundled_path.write_bytes(source_path.read_bytes())
@@ -1864,14 +1893,15 @@ def run_build_check_drift_gates(
     # directory missing a declared copy is the worse failure, because the
     # packaged engine imports its siblings by path and would fail at import
     # while build-check reported clean.
-    for source_path, bundled_path in _runtime_projections(REPO_ROOT):
+    for source_path, bundled_path in _mirrored_pack_sources(REPO_ROOT):
         if not source_path.is_file() or not bundled_path.parent.is_dir():
             continue
         if not bundled_path.is_file():
+            _where = bundled_path.parent.relative_to(REPO_ROOT).as_posix()
             failures.append(
                 "build-check: packaged runtime missing — "
                 f"{bundled_path.name} is declared as a packaged runtime but is "
-                "absent from packages/agentbundle/agentbundle/_data/; run "
+                f"absent from {_where}/; run "
                 "`make build-self` to sync it"
             )
             continue

{agentbundle-0.46.1 → agentbundle-0.47.1}/agentbundle/catalogue_tooling/lint.py

@@ -518,6 +518,7 @@ _SEEDS_REQUIRED_PLACEHOLDERS: dict[str, tuple[str, ...]] = {
     "docs/rfc/README.md": ("<!-- no RFCs yet -->",),
     "docs/adr/README.md": ("<!-- no ADRs yet -->",),
     "governance/manifest.example.yaml": ("ADR-NNNN",),
+    "docs/README.md": ("<your area>",),
     "docs/architecture/README.md": (),
     "docs/knowledge/README.md": (),
     "docs/product/README.md": (),
@@ -525,7 +526,6 @@ _SEEDS_REQUIRED_PLACEHOLDERS: dict[str, tuple[str, ...]] = {
     "docs/product/changelog.md": ("pack-name][version",),
     "docs/product/briefs/_template.md": ("<slug>", "<one-line outcome>"),
     "workspace.toml": ("[backlog]",),
-    "docs/CONVENTIONS.md": (),
     "AGENTS.md": ("<project-name>",),
     "AGENT_RULES.md": (),
     "docs/AGENTS.md": (),

{agentbundle-0.46.1 → agentbundle-0.47.1}/agentbundle/catalogue_tooling/verify.py

@@ -1092,7 +1092,7 @@ def _step_agent_artifacts(
         model = fields.get("model")
         if model is None or model == "":
             _report(path, "frontmatter missing required key: model "
-                         "(see docs/CONVENTIONS.md#model-selection)")
+                         "(see the work-loop skill's references/model-selection.md)")
         elif not isinstance(model, str):
             _report(path, f"frontmatter key 'model' must be a string "
                          f"(got {type(model).__name__}) — "

{agentbundle-0.46.1 → agentbundle-0.47.1}/agentbundle/commands/_common.py

@@ -173,7 +173,8 @@ def deliver_seeds(seeds_dir: Path, output: Path) -> list[SeedDelivery]:
     For each file under ``seeds_dir`` (recursively):
       - **Composition fragments** (name starts with ``_``, e.g.
         ``_agents-footer.md``) are *not* delivered standalone — they are folded
-        into ``AGENTS.md`` instead (per ``CONVENTIONS.md`` §Pack source-of-truth split).
+        into ``AGENTS.md`` instead (per the pack-layout contract's
+        § The source-of-truth split).
       - **Absent on disk** → write the seed (Tier-1).
       - **Present, content matches** → no-op (already in sync).
       - **Present, content differs** → write a ``*.upstream.<ext>`` companion

{agentbundle-0.46.1 → agentbundle-0.47.1}/agentbundle/commands/adapt.py

@@ -246,7 +246,7 @@ def run(args: argparse.Namespace) -> int:
             for k, v in discovery.markers.items():
                 values[k] = v
 
-    if getattr(args, "values_from", None):
+    if args.values_from:
         try:
             explicit = load_values_from(Path(args.values_from))
         except ConfigError as exc:
@@ -265,7 +265,7 @@ def run(args: argparse.Namespace) -> int:
 
         # Substitute markers only when --values-from was given (preserve
         # the read-only-without-values-from contract).
-        if getattr(args, "values_from", None) and values and projected:
+        if args.values_from and values and projected:
             for relpath in sorted(projected):
                 target = s.root / relpath
                 if not target.exists() or not target.is_file():

{agentbundle-0.46.1 → agentbundle-0.47.1}/agentbundle/commands/catalogue_build.py

@@ -15,12 +15,12 @@ if TYPE_CHECKING:
 def run(args: argparse.Namespace) -> int:
     from agentbundle.catalogue_tooling.build import build_catalogue
 
-    root = Path(getattr(args, "root", ".")).resolve()
-    output_str = getattr(args, "output", None)
+    root = Path(args.root).resolve()
+    output_str = args.output
     output = Path(output_str).resolve() if output_str else None
-    pack = getattr(args, "pack", None)
-    recipe = getattr(args, "recipe", None)
-    fmt = getattr(args, "format", "table")
+    pack = args.pack
+    recipe = args.recipe
+    fmt = args.format
 
     try:
         result = build_catalogue(root, output=output, pack=pack, recipe=recipe)

{agentbundle-0.46.1 → agentbundle-0.47.1}/agentbundle/commands/catalogue_contracts.py

@@ -90,7 +90,7 @@ def _run_export(args: argparse.Namespace) -> int:
 
 def run(args: argparse.Namespace) -> int:
     """Dispatch a bundled-contract operation."""
-    subcommand = getattr(args, "contracts_sub", None)
+    subcommand = args.contracts_sub
     if subcommand == "list":
         return _run_list(args)
     if subcommand == "show":

{agentbundle-0.46.1 → agentbundle-0.47.1}/agentbundle/commands/catalogue_init.py

@@ -30,7 +30,7 @@ _SELF_HOSTED_ONLY_FLAGS: tuple[tuple[str, str], ...] = (
 
 
 def run(args: argparse.Namespace) -> int:
-    preset: str | None = getattr(args, "preset", None)
+    preset: str | None = args.preset
     if preset == "self-hosted":
         return _run_self_hosted(args)
     # Reject self-hosted-only flags when not in self-hosted mode.
@@ -47,7 +47,7 @@ def run(args: argparse.Namespace) -> int:
 def _run_plain(args: argparse.Namespace) -> int:
     from agentbundle.catalogue_tooling.initialise import init_catalogue
 
-    target_raw = getattr(args, "target", ".")
+    target_raw = args.target
     target_path = Path(target_raw)
     if target_path.is_symlink():
         print(
@@ -57,13 +57,13 @@ def _run_plain(args: argparse.Namespace) -> int:
         return 2
     target = target_path.resolve()
 
-    dry_run: bool = getattr(args, "dry_run", False)
-    name: str | None = getattr(args, "name", None) or None
-    display_name: str | None = getattr(args, "display_name", None) or None
-    description: str | None = getattr(args, "description", None) or None
-    owner_name: str | None = getattr(args, "owner_name", None) or None
-    preferred_adapter: str | None = getattr(args, "preferred_adapter", None) or None
-    fmt: str = getattr(args, "format", "table")
+    dry_run: bool = args.dry_run
+    name: str | None = args.name or None
+    display_name: str | None = args.display_name or None
+    description: str | None = args.description or None
+    owner_name: str | None = args.owner_name or None
+    preferred_adapter: str | None = args.preferred_adapter or None
+    fmt: str = args.format
 
     result = init_catalogue(
         target=target,
@@ -162,7 +162,7 @@ def _run_self_hosted(args: argparse.Namespace) -> int:
         init_self_hosted,
     )
 
-    target_raw = getattr(args, "target", ".")
+    target_raw = args.target
     target_path = Path(target_raw)
     if target_path.is_symlink():
         print(
@@ -171,7 +171,7 @@ def _run_self_hosted(args: argparse.Namespace) -> int:
         )
         return 2
 
-    source_raw = getattr(args, "source", None)
+    source_raw = args.source
     if not source_raw:
         print(
             "error: --source is required with --preset self-hosted",
@@ -179,12 +179,12 @@ def _run_self_hosted(args: argparse.Namespace) -> int:
         )
         return 2
 
-    tooling: str = getattr(args, "tooling", None) or "external"
+    tooling: str = args.tooling or "external"
     if tooling not in ("external", "vendored"):
         print("error: --tooling must be 'external' or 'vendored'", file=sys.stderr)
         return 2
 
-    attribution: str = getattr(args, "attribution", None) or "white-label"
+    attribution: str = args.attribution or "white-label"
     if attribution not in ("white-label", "attributed"):
         print(
             "error: --attribution must be 'white-label' or 'attributed'",
@@ -192,7 +192,7 @@ def _run_self_hosted(args: argparse.Namespace) -> int:
         )
         return 2
 
-    guides: str = getattr(args, "guides", None) or "selected"
+    guides: str = args.guides or "selected"
     if guides not in ("none", "selected"):
         print("error: --guides must be 'none' or 'selected'", file=sys.stderr)
         return 2
@@ -201,22 +201,22 @@ def _run_self_hosted(args: argparse.Namespace) -> int:
         target=target_path.resolve(),
         source=Path(source_raw).resolve(),
         tooling=tooling,
-        name=getattr(args, "name", None) or None,
-        display_name=getattr(args, "display_name", None) or None,
-        description=getattr(args, "description", None) or None,
-        owner_name=getattr(args, "owner_name", None) or None,
-        owner_email=getattr(args, "owner_email", None) or None,
-        preferred_adapter=getattr(args, "preferred_adapter", None) or None,
-        repository_url=getattr(args, "repository_url", None) or None,
-        packs=getattr(args, "packs", None) or None,
-        adapters=getattr(args, "adapters", None) or None,
-        profiles=getattr(args, "profiles", None) or None,
+        name=args.name or None,
+        display_name=args.display_name or None,
+        description=args.description or None,
+        owner_name=args.owner_name or None,
+        owner_email=args.owner_email or None,
+        preferred_adapter=args.preferred_adapter or None,
+        repository_url=args.repository_url or None,
+        packs=args.packs or None,
+        adapters=args.adapters or None,
+        profiles=args.profiles or None,
         guides=guides,
         attribution=attribution,
-        dry_run=bool(getattr(args, "dry_run", False)),
+        dry_run=bool(args.dry_run),
     )
 
-    fmt: str = getattr(args, "format", "table")
+    fmt: str = args.format
     result = init_self_hosted(cfg)
 
     if fmt == "json":

{agentbundle-0.46.1 → agentbundle-0.47.1}/agentbundle/commands/catalogue_lint.py

@@ -13,10 +13,10 @@ if TYPE_CHECKING:
 def run(args: argparse.Namespace) -> int:
     from agentbundle.catalogue_tooling.lint import lint_catalogue, render_json, render_table
 
-    root = Path(getattr(args, "root", ".")).resolve()
-    pack = getattr(args, "pack", None)
-    fmt = getattr(args, "format", "table")
-    deep = getattr(args, "deep", False)
+    root = Path(args.root).resolve()
+    pack = args.pack
+    fmt = args.format
+    deep = args.deep
 
     try:
         result = lint_catalogue(root, pack=pack, deep=deep)

{agentbundle-0.46.1 → agentbundle-0.47.1}/agentbundle/commands/catalogue_package.py

@@ -11,7 +11,7 @@ if TYPE_CHECKING:
 
 
 def run(args: argparse.Namespace) -> int:
-    flavor: str = getattr(args, "flavor", "runtime")
+    flavor: str = args.flavor
     if flavor == "source":
         return _run_source(args)
     return _run_runtime(args)
@@ -20,15 +20,15 @@ def run(args: argparse.Namespace) -> int:
 def _run_runtime(args: argparse.Namespace) -> int:
     from agentbundle.catalogue_tooling.package import package_catalogue
 
-    root = Path(getattr(args, "root", ".")).resolve()
-    output_str = getattr(args, "output", None)
+    root = Path(args.root).resolve()
+    output_str = args.output
     if not output_str:
         print("error: --output is required", file=sys.stderr)
         return 1
     output = Path(output_str).resolve()
-    bundle = getattr(args, "bundle", None)
-    release = getattr(args, "release", None)
-    channel = getattr(args, "channel", None)
+    bundle = args.bundle
+    release = args.release
+    channel = args.channel
 
     for flag, value in (("bundle", bundle), ("release", release), ("channel", channel)):
         if not value:
@@ -41,9 +41,9 @@ def _run_runtime(args: argparse.Namespace) -> int:
         release=release,
         channel=channel,
         output=output,
-        source_revision=getattr(args, "source_revision", None),
-        minimum_agentbundle_version=getattr(args, "minimum_agentbundle_version", None),
-        published_at=getattr(args, "published_at", None),
+        source_revision=args.source_revision,
+        minimum_agentbundle_version=args.minimum_agentbundle_version,
+        published_at=args.published_at,
     )
 
     if not result.ok:
@@ -57,7 +57,7 @@ def _run_runtime(args: argparse.Namespace) -> int:
 def _run_source(args: argparse.Namespace) -> int:
     from agentbundle.catalogue_tooling.package import package_source_flavour
 
-    channel = getattr(args, "channel", None)
+    channel = args.channel
     if channel:
         print(
             "error: --channel is not valid with --flavor source; "
@@ -66,14 +66,14 @@ def _run_source(args: argparse.Namespace) -> int:
         )
         return 2
 
-    root = Path(getattr(args, "root", ".")).resolve()
-    output_str = getattr(args, "output", None)
+    root = Path(args.root).resolve()
+    output_str = args.output
     if not output_str:
         print("error: --output is required", file=sys.stderr)
         return 1
     output = Path(output_str).resolve()
-    bundle = getattr(args, "bundle", None)
-    release = getattr(args, "release", None)
+    bundle = args.bundle
+    release = args.release
 
     for flag, value in (("bundle", bundle), ("release", release)):
         if not value:
@@ -85,7 +85,7 @@ def _run_source(args: argparse.Namespace) -> int:
         bundle=bundle,
         release=release,
         output=output,
-        source_revision=getattr(args, "source_revision", None),
+        source_revision=args.source_revision,
     )
 
     if not result.ok: