guild-cli 0.6.4__tar.gz → 0.7.0__tar.gz

{guild_cli-0.6.4 → guild_cli-0.7.0}/.claude/skills/guild/SKILL.md

@@ -116,6 +116,13 @@ Provision a new sibling by instantiating the GitHub template and customising it:
     --template myorg/my-template \
     --apply
 
+# Custom PyPI dist name (command + import package stay the repo name)
+.claude/skills/guild/scripts/create.sh \
+    --agent agentculture/jetson \
+    --desc "Edge-AI ops agent." \
+    --dist jetson-cli \
+    --apply
+
 # JSON output (works in both dry-run and apply)
 .claude/skills/guild/scripts/create.sh \
     --agent agentculture/new-agent \
@@ -135,6 +142,9 @@ Provision a new sibling by instantiating the GitHub template and customising it:
    - rewrites `README.md` first heading + intro
    - overwrites `CLAUDE.md` with a self-init seed (names the agent, embeds the
      description, carries a `/init` re-init instruction)
+   - if `--dist` differs from the repo name, retargets the PyPI dist
+     (`[project].name`, the `importlib.metadata` lookup, the TestPyPI install
+     pin) — the command + import package stay the repo name
 4. Runs `configure-repo.sh` to apply GitHub settings (branch protection,
    environments, `SONAR_TOKEN` placeholder).
 5. Stages, commits (`scaffold <bare> from culture-agent-template`), and pushes.

{guild_cli-0.6.4 → guild_cli-0.7.0}/.claude/skills/guild/scripts/create.sh

@@ -12,7 +12,12 @@ set -euo pipefail
 # Usage:
 #   create.sh --agent OWNER/REPO --desc TEXT [--backend claude|acp]
 #             [--workspace-root DIR] [--template OWNER/REPO]
-#             [--org agentculture] [--apply] [--json]
+#             [--org agentculture] [--dist NAME] [--apply] [--json]
+#
+# --dist NAME sets the PyPI distribution name (default: the repo name); pass
+#   e.g. --dist jetson-cli to ship the dist as jetson-cli while keeping the
+#   command + import package as the repo name. Retargets [project].name, the
+#   importlib.metadata lookup, and the TestPyPI install pin.
 #
 # Exit codes:
 #   0   success (delegates to `guild create`; its exit code propagates)

{guild_cli-0.6.4 → guild_cli-0.7.0}/CHANGELOG.md

@@ -5,6 +5,25 @@ All notable changes to this project will be documented in this file.
 Format follows [Keep a Changelog](https://keepachangelog.com/). This project
 adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.7.0] - 2026-05-28
+
+### Added
+
+- **`guild create --dist NAME`** — set the PyPI **distribution** name at
+  provision time. Defaults to the repo token (unchanged behaviour); pass e.g.
+  `--dist jetson-cli` to ship the dist as `jetson-cli` while the console command
+  and import package stay the repo token (`jetson`), matching the
+  `guild-cli`/`guild` convention. The transform's new step 6 retargets only the
+  three dist-name surfaces — `[project].name`, the `importlib.metadata` version
+  lookup, and the TestPyPI install pin — and is a strict no-op when `--dist`
+  equals (or is omitted and defaults to) the repo token, so the bare-name case
+  (e.g. `dominion-breaker`) is preserved. The name is validated as a PEP 503
+  distribution name before any external act. This removes the manual
+  post-`create` dist rename that `agenda`, `convertible`, and `jetson` each
+  needed. Note: renaming the dist still requires a Trusted Publisher registered
+  for that project name on PyPI/TestPyPI — `guild create` configures the GitHub
+  side only.
+
 ## [0.6.4] - 2026-05-28
 
 ### Added

{guild_cli-0.6.4 → guild_cli-0.7.0}/CLAUDE.md

@@ -108,7 +108,7 @@ two live broadcasters.
 
 **Provisioning verb — `guild create` (template-instantiate a new sibling).**
 
-- `guild create --agent OWNER/REPO --desc TEXT [--backend claude|acp] [--workspace-root DIR] [--template agentculture/culture-agent-template] [--apply] [--json]` — provision a brand-new AgentCulture sibling by instantiating the GitHub template, renaming identifiers throughout the clone, writing a self-init CLAUDE.md seed, configuring the GitHub repo (branch protection, environments, SONAR_TOKEN placeholder), pushing the genesis commit, and registering the agent in `docs/skill-sources.md`. Dry-run by default; `--apply` executes. The transform is **pure** (unit-testable against a fixture dir; no network): `culture_agent_template` → pkg (underscore form, e.g. `my_agent`), `culture-agent-template` → repo token (hyphen form, e.g. `my-agent`). The CLAUDE.md seed is a `/init`-style bootstrap placeholder — run `/init` in the new repo after provisioning to expand it into a full runtime prompt. Implementation: `guild/scaffold/instantiate.py` (pure transform), `guild/cli/_commands/create.py` (CLI), `guild/cli/_commands/_provision_template.py` (injectable-runner executor), `.claude/skills/guild/scripts/create.sh` (thin wrapper).
+- `guild create --agent OWNER/REPO --desc TEXT [--backend claude|acp] [--workspace-root DIR] [--template agentculture/culture-agent-template] [--dist NAME] [--apply] [--json]` — provision a brand-new AgentCulture sibling by instantiating the GitHub template, renaming identifiers throughout the clone, writing a self-init CLAUDE.md seed, configuring the GitHub repo (branch protection, environments, SONAR_TOKEN placeholder), pushing the genesis commit, and registering the agent in `docs/skill-sources.md`. Dry-run by default; `--apply` executes. The transform is **pure** (unit-testable against a fixture dir; no network): `culture_agent_template` → pkg (underscore form, e.g. `my_agent`), `culture-agent-template` → repo token (hyphen form, e.g. `my-agent`). `--dist NAME` sets the **PyPI distribution name** (default: the repo token); pass e.g. `--dist jetson-cli` to publish as `jetson-cli` while keeping the command and import package as the repo token (`jetson`) — this retargets only `[project].name`, the `importlib.metadata` lookup, and the TestPyPI install pin, matching the `guild-cli`/`guild` convention without a manual post-create edit. (Renaming the dist needs a matching Trusted Publisher registered for that project name on PyPI/TestPyPI — `guild create` configures the GitHub side only.) The CLAUDE.md seed is a `/init`-style bootstrap placeholder — run `/init` in the new repo after provisioning to expand it into a full runtime prompt. Implementation: `guild/scaffold/instantiate.py` (pure transform), `guild/cli/_commands/create.py` (CLI), `guild/cli/_commands/_provision_template.py` (injectable-runner executor), `.claude/skills/guild/scripts/create.sh` (thin wrapper).
 
 **Inventory verbs — `overview` & `show` (the read-only surfaces).** guildmaster
 owns the mesh's *inventory* surfaces per

{guild_cli-0.6.4 → guild_cli-0.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: guild-cli
-Version: 0.6.4
+Version: 0.7.0
 Summary: guildmaster — an agent and CLI that manages skills for the AgentCulture mesh.
 Project-URL: Homepage, https://github.com/agentculture/guildmaster
 Project-URL: Issues, https://github.com/agentculture/guildmaster/issues

{guild_cli-0.6.4 → guild_cli-0.7.0}/guild/cli/_commands/_provision_template.py

@@ -241,6 +241,7 @@ def apply(
     guildmaster_root: Path,
     runner: Runner | None = None,
     template: str = DEFAULT_TEMPLATE,
+    dist: str | None = None,
     poll_attempts: int = 30,
     poll_delay: float = 2.0,
 ) -> dict:
@@ -265,6 +266,9 @@ def apply(
         Callable ``(cmd, cwd=None) -> RunResult``.  Defaults to real subprocess.
     template:
         The GitHub template repo to instantiate (default: ``DEFAULT_TEMPLATE``).
+    dist:
+        PyPI distribution name to set in the clone. ``None`` leaves it as the
+        repo name; a different value retargets the dist (see ``transform_clone``).
     poll_attempts / poll_delay:
         ``gh repo create --template`` copies the template content
         **asynchronously**; cloning immediately yields an empty repo. After
@@ -315,7 +319,7 @@ def apply(
     _check(clone, f"git clone {agent} failed", EXIT_ENV_ERROR)
 
     # Step 4 — pure transform (no runner needed).
-    transform_clone(clone_dest, bare, desc, backend)
+    transform_clone(clone_dest, bare, desc, backend, dist=dist)
 
     # Step 5 — stage everything.
     add = runner(["git", "-C", str(clone_dest), "add", "-A"])

{guild_cli-0.6.4 → guild_cli-0.7.0}/guild/cli/_commands/create.py

@@ -15,7 +15,7 @@ Usage
     guild create --agent OWNER/REPO --desc TEXT [--org agentculture]
                  [--backend claude|acp] [--workspace-root DIR]
                  [--template agentculture/culture-agent-template]
-                 [--apply] [--json]
+                 [--dist NAME] [--apply] [--json]
 """
 
 from __future__ import annotations
@@ -24,6 +24,7 @@ import argparse
 import difflib
 import json
 import keyword
+import re
 from pathlib import Path
 
 from guild.cli._commands import _broadcast
@@ -86,6 +87,17 @@ def register(sub: argparse._SubParsersAction) -> None:
         default=_provision.DEFAULT_TEMPLATE,
         help=f"GitHub template repo to instantiate (default: {_provision.DEFAULT_TEMPLATE}).",
     )
+    parser.add_argument(
+        "--dist",
+        metavar="NAME",
+        default=None,
+        help=(
+            "PyPI distribution name. Defaults to the repo name; pass e.g. "
+            "'jetson-cli' to ship the dist as 'jetson-cli' while keeping the "
+            "command and import package as the repo name ('jetson'). Retargets "
+            "[project].name, the importlib.metadata lookup, and the TestPyPI pin."
+        ),
+    )
     parser.add_argument(
         "--apply",
         action="store_true",
@@ -127,12 +139,26 @@ def _handle(args: argparse.Namespace) -> None:
             ),
         )
 
+    # Validate the optional PyPI dist name (fail fast, before any external act).
+    # PyPI normalises [-_.] runs, but the raw name must still be a non-empty run
+    # of letters/digits/.-_ that starts and ends alphanumerically (PEP 503).
+    if args.dist is not None and not re.match(
+        r"^[A-Za-z0-9]([A-Za-z0-9._-]*[A-Za-z0-9])?$", args.dist
+    ):
+        raise GuildError(
+            code=EXIT_USER_ERROR,
+            message=f"--dist {args.dist!r} is not a valid PyPI distribution name",
+            remediation=(
+                "use letters/digits/.-_ starting and ending alphanumerically (e.g. 'jetson-cli')"
+            ),
+        )
+
     # Resolve workspace root (parent of guildmaster if not supplied).
     workspace_root = args.workspace_root if args.workspace_root is not None else root.parent
     clone_dest = workspace_root / bare
 
     # Build the dry-run plan (pure — no writes, no subprocess).
-    plan = _transform_plan(bare, args.desc)
+    plan = _transform_plan(bare, args.desc, dist=args.dist)
 
     # Ledger diff (pure — reads only).
     skills = _broadcast.canonical_skills(root)
@@ -171,6 +197,7 @@ def _handle(args: argparse.Namespace) -> None:
         clone_dest=clone_dest,
         guildmaster_root=root,
         template=args.template,
+        dist=args.dist,
     )
 
     # Register in the ledger idempotently.
@@ -186,6 +213,7 @@ def _handle(args: argparse.Namespace) -> None:
         "repo": apply_result["repo"],
         "clone_dest": apply_result["clone_dest"],
         "pushed": apply_result["pushed"],
+        "dist": plan["dist"],
         "ledger_written": ledger_written,
     }
     emit_result(json.dumps(result, indent=2) if args.json else _render_apply(result))
@@ -207,6 +235,8 @@ def _render_dry_run(result: dict) -> str:
         f"  clone dest : {result['clone_dest']}",
         f"  pkg        : {plan['pkg']}",
         f"  repo token : {plan['repo_token']}",
+        f"  dist (PyPI): {plan['dist']}"
+        + ("" if plan["dist"] == plan["repo_token"] else "  (command + import stay repo token)"),
         "",
         "── rename map ──",
     ]

{guild_cli-0.6.4 → guild_cli-0.7.0}/guild/scaffold/instantiate.py

@@ -10,12 +10,13 @@ rename_map(bare) -> dict[str, str]
     The two identifier substitutions: ``culture_agent_template`` → ``pkg`` and
     ``culture-agent-template`` → ``repo_token``.  Pure function; no I/O.
 
-transform_plan(bare, desc) -> dict
+transform_plan(bare, desc, dist=None) -> dict
     A human/JSON-renderable description of what ``transform_clone`` WOULD do
     (the rename map, package directory rename, pyproject description, README
-    headline change, and CLAUDE.md seed replacement).  No I/O.
+    headline change, CLAUDE.md seed replacement, and — when *dist* differs from
+    the repo token — the dist-name retarget).  No I/O.
 
-transform_clone(dest, bare, desc, backend) -> None
+transform_clone(dest, bare, desc, backend, dist=None) -> None
     The actual, irreversible in-place transform.  Walks *dest*, skipping
     ``.git/``:
     1. Global text replace across every file: ``culture_agent_template`` → pkg,
@@ -29,6 +30,14 @@ transform_clone(dest, bare, desc, backend) -> None
     5. Overwrite ``CLAUDE.md`` with a self-init seed (prompt-file-present +
        backend-consistency compliant; carries an explicit ``/init`` re-init
        instruction; names the agent, embeds *desc*, uses *backend*).
+    6. **Only when** *dist* is given and differs from the repo token: retarget
+       the PyPI distribution name in the three places that name the *dist* (not
+       the import package or the console command) — ``[project].name``, the
+       ``importlib.metadata`` lookup, and the TestPyPI install pin.
+
+    *dist* ``None`` means "leave the dist as the repo token" (the default). An
+    explicitly empty/whitespace *dist* is rejected (``ValueError``) so a stray
+    programmatic ``""`` is not silently treated as "unset".
 
 This module is PURE w.r.t. the filesystem: it only writes within *dest*, and
 only after the caller hands it a real directory.  No subprocess, no network.
@@ -39,6 +48,7 @@ from __future__ import annotations
 
 import re
 from pathlib import Path
+from typing import Callable
 
 # ---------------------------------------------------------------------------
 # Identifier derivation
@@ -70,6 +80,21 @@ def _derive(bare: str) -> tuple[str, str]:
     return pkg, repo_token
 
 
+def _effective_dist(dist: str | None, repo_token: str) -> str:
+    """Resolve the distribution name, distinguishing ``None`` from ``""``.
+
+    ``None`` means "not provided" → default to *repo_token*. An explicitly
+    empty or whitespace-only *dist* is a programming error (the CLI rejects it
+    before this point) and raises ``ValueError`` rather than silently defaulting,
+    so plan and transform reason identically about their inputs.
+    """
+    if dist is None:
+        return repo_token
+    if not dist.strip():
+        raise ValueError("dist must be a non-empty string or None")
+    return dist
+
+
 # ---------------------------------------------------------------------------
 # Public helpers — no I/O
 # ---------------------------------------------------------------------------
@@ -95,7 +120,7 @@ def rename_map(bare: str) -> dict[str, str]:
     return {_TEMPLATE_PKG: pkg, _TEMPLATE_REPO: repo_token}
 
 
-def transform_plan(bare: str, desc: str) -> dict:
+def transform_plan(bare: str, desc: str, dist: str | None = None) -> dict:
     """Return a human/JSON-renderable description of what ``transform_clone`` would do.
 
     Parameters
@@ -104,6 +129,13 @@ def transform_plan(bare: str, desc: str) -> dict:
         The bare repo/agent name.
     desc:
         The short description for the new agent.
+    dist:
+        The PyPI distribution name to set. ``None`` (the default) means leave it
+        as the global-replace result (``repo_token``) — the pure default. When it
+        differs from ``repo_token``, an extra retarget step renames just the dist
+        (``[project].name``, the ``importlib.metadata`` lookup, and the TestPyPI
+        install pin); the importable package and the console command stay
+        ``repo_token``.
 
     Returns
     -------
@@ -111,10 +143,12 @@ def transform_plan(bare: str, desc: str) -> dict:
         ``rename_map``           — ``{old: new}`` substitution pairs
         ``package_dir_rename``   — ``{old_dir: new_dir}``
         ``pyproject_desc``       — the value that would be written to ``description``
+        ``dist``                 — the effective distribution name
         ``claude_md_seed``       — the first ~3 lines of the seed (synopsis only)
         ``steps``                — ordered list of step descriptions
     """
     pkg, repo_token = _derive(bare)
+    effective_dist = _effective_dist(dist, repo_token)
     m = rename_map(bare)
     steps = [
         f"global text replace in every file (skip .git/): "
@@ -124,6 +158,12 @@ def transform_plan(bare: str, desc: str) -> dict:
         "replace README.md first heading + intro with new agent name and description",
         "overwrite CLAUDE.md with a self-init seed (names agent, embeds desc, /init instruction)",
     ]
+    if effective_dist != repo_token:
+        steps.append(
+            f"retarget PyPI distribution name {repo_token!r} → {effective_dist!r} "
+            "([project].name, importlib.metadata lookup, TestPyPI install pin); "
+            f"command + import package stay {repo_token!r}"
+        )
     return {
         "bare": bare,
         "pkg": pkg,
@@ -131,6 +171,7 @@ def transform_plan(bare: str, desc: str) -> dict:
         "rename_map": m,
         "package_dir_rename": {_TEMPLATE_PKG: pkg},
         "pyproject_desc": desc,
+        "dist": effective_dist,
         "claude_md_seed_synopsis": f"# CLAUDE.md seed for {bare} — run /init to expand",
         "steps": steps,
     }
@@ -258,6 +299,61 @@ def _set_pyproject_description(pyproject: Path, desc: str) -> None:
         pyproject.write_text(new_text, encoding="utf-8")
 
 
+def _rewrite_text_file(path: Path, transform: Callable[[str], str]) -> None:
+    """Read *path*, apply *transform* to its text, and write back if it changed.
+
+    Degrades gracefully: a missing or non-UTF-8 file is left untouched. Centralises
+    the read/guard/write boilerplate so callers describe only the substitution.
+    """
+    if not path.is_file():
+        return
+    try:
+        text = path.read_text(encoding="utf-8")
+    except (UnicodeDecodeError, OSError):
+        return
+    new_text = transform(text)
+    if new_text != text:
+        path.write_text(new_text, encoding="utf-8")
+
+
+def _retarget_dist(dest: Path, pkg: str, repo_token: str, dist: str) -> None:
+    """Rename only the PyPI **distribution** from *repo_token* to *dist*.
+
+    Called after the global token replace has set every ``culture-agent-template``
+    occurrence to *repo_token*. This narrowly rewrites the three places that name
+    the *distribution* (as opposed to the importable package or the console
+    command, which stay *repo_token*):
+
+    1. ``pyproject.toml`` — the ``[project].name = "<repo_token>"`` line (matched
+       by value, so ``authors = [{name = "..."}]`` and other ``name =`` lines are
+       never touched).
+    2. ``<pkg>/__init__.py`` — the ``importlib.metadata`` version lookup argument
+       (the ``"<repo_token>"`` string literal).
+    3. ``.github/workflows/publish.yml`` — the TestPyPI install hint's version
+       pin (``<repo_token>==`` → ``<dist>==``; the ``==`` anchors it so other
+       ``repo_token`` mentions are untouched).
+
+    Each step degrades gracefully if the file or pattern is absent. No-op is the
+    caller's responsibility (skip when ``dist`` equals ``repo_token``).
+    """
+    name_line = re.compile(r'(?m)^(\s*name\s*=\s*)["\']' + re.escape(repo_token) + r'["\']')
+
+    _rewrite_text_file(
+        dest / "pyproject.toml",
+        lambda text: name_line.sub(lambda m: m.group(1) + '"' + dist + '"', text),
+    )
+    _rewrite_text_file(
+        dest / pkg / "__init__.py",
+        lambda text: text.replace(f'"{repo_token}"', f'"{dist}"').replace(
+            f"'{repo_token}'", f"'{dist}'"
+        ),
+    )
+    _rewrite_text_file(
+        dest / ".github" / "workflows" / "publish.yml",
+        lambda text: text.replace(f"{repo_token}==", f"{dist}=="),
+    )
+
+
 def _is_desc_stub(line: str) -> bool:
     """Return True if *line* looks like a short plain-text description placeholder.
 
@@ -380,6 +476,7 @@ def transform_clone(
     bare: str,
     desc: str,
     backend: str = "claude",
+    dist: str | None = None,
 ) -> None:
     """Customise the cloned template tree at *dest* into the new agent *bare*.
 
@@ -392,6 +489,10 @@ def transform_clone(
     3. **Set description** in ``pyproject.toml``.
     4. **Rewrite README.md** first heading + intro.
     5. **Overwrite CLAUDE.md** (or ``AGENTS.md`` for acp) with a self-init seed.
+    6. **Retarget the PyPI dist name** to *dist* (only when it differs from
+       ``repo_token``) — ``[project].name``, the ``importlib.metadata`` lookup,
+       and the TestPyPI install pin. The importable package and the console
+       command stay ``repo_token``.
 
     Parameters
     ----------
@@ -403,6 +504,9 @@ def transform_clone(
         Short description for the new agent.
     backend:
         ``"claude"`` (default) or ``"acp"``.
+    dist:
+        PyPI distribution name. ``None`` leaves it as ``repo_token`` (the pure
+        default); a different value retargets only the dist (step 6).
 
     Raises
     ------
@@ -418,7 +522,10 @@ def transform_clone(
     if not dest.is_dir():
         raise FileNotFoundError(f"dest is not a directory: {dest}")
 
-    pkg, _ = _derive(bare)
+    pkg, repo_token = _derive(bare)
+    # Resolve the dist up front so an explicitly-empty value is rejected before
+    # any file is touched (None → repo_token; "" / whitespace → ValueError).
+    effective_dist = _effective_dist(dist, repo_token)
     replacements = rename_map(bare)  # underscore first, then hyphen
 
     # Step 1 — global text replace (visit all files before the directory rename
@@ -442,3 +549,8 @@ def transform_clone(
     prompt_file = _BACKEND_PROMPT_FILE[backend]
     seed_content = _seed_prompt(bare, desc, backend)
     (dest / prompt_file).write_text(seed_content, encoding="utf-8")
+
+    # Step 6 — retarget the PyPI dist name (only when it differs from repo_token,
+    # so the default is a true no-op and the bare-name case is unchanged).
+    if effective_dist != repo_token:
+        _retarget_dist(dest, pkg, repo_token, effective_dist)

{guild_cli-0.6.4 → guild_cli-0.7.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "guild-cli"
-version = "0.6.4"
+version = "0.7.0"
 description = "guildmaster — an agent and CLI that manages skills for the AgentCulture mesh."
 readme = "README.md"
 license = "MIT"

{guild_cli-0.6.4 → guild_cli-0.7.0}/tests/test_cli_create.py

@@ -159,6 +159,36 @@ def test_create_dry_run_custom_template(tmp_path, monkeypatch, capsys):
     assert out["template"] == "myorg/my-template"
 
 
+def test_create_dry_run_dist_flag(tmp_path, monkeypatch, capsys):
+    monkeypatch.chdir(_seed(tmp_path))
+    monkeypatch.setattr(subprocess, "run", _never_called)
+
+    rc = main(["create", "--agent", "newsib", "--desc", "D.", "--dist", "newsib-cli", "--json"])
+    assert rc == 0
+    out = json.loads(capsys.readouterr().out)
+    assert out["plan"]["dist"] == "newsib-cli"
+    assert any("retarget" in s.lower() for s in out["plan"]["steps"])
+
+
+def test_create_dry_run_dist_defaults_to_repo_token(tmp_path, monkeypatch, capsys):
+    monkeypatch.chdir(_seed(tmp_path))
+    monkeypatch.setattr(subprocess, "run", _never_called)
+
+    rc = main(["create", "--agent", "newsib", "--desc", "D.", "--json"])
+    assert rc == 0
+    out = json.loads(capsys.readouterr().out)
+    assert out["plan"]["dist"] == "newsib"
+
+
+def test_create_rejects_invalid_dist_name(tmp_path, monkeypatch, capsys):
+    monkeypatch.chdir(_seed(tmp_path))
+    monkeypatch.setattr(subprocess, "run", _never_called)
+
+    rc = main(["create", "--agent", "newsib", "--desc", "D.", "--dist", "bad name!"])
+    assert rc != 0
+    assert "not a valid PyPI distribution name" in capsys.readouterr().err
+
+
 def test_create_dry_run_bare_agent_gets_org(tmp_path, monkeypatch, capsys):
     monkeypatch.chdir(_seed(tmp_path))
 
@@ -223,9 +253,18 @@ class _FakeRunner:
             (clone_dest / "culture_agent_template").mkdir()
             (clone_dest / "culture_agent_template" / "__init__.py").write_text(
                 "# culture_agent_template\n"
+                "from importlib.metadata import version as _pkg_version\n"
+                '__version__ = _pkg_version("culture-agent-template")\n'
             )
             (clone_dest / "pyproject.toml").write_text(
                 '[project]\nname = "culture-agent-template"\ndescription = "Template desc."\n'
+                "\n[project.scripts]\n"
+                'culture-agent-template = "culture_agent_template.cli:main"\n'
+            )
+            wf = clone_dest / ".github" / "workflows"
+            wf.mkdir(parents=True)
+            (wf / "publish.yml").write_text(
+                'run: echo "install culture-agent-template==${DEV_VERSION}"\n'
             )
             (clone_dest / "culture.yaml").write_text(
                 "agents:\n- suffix: culture-agent-template\n  backend: claude\n"
@@ -640,3 +679,41 @@ def test_create_apply_transform_renames_in_clone(tmp_path, monkeypatch):
     claude_md = (clone_dest / "CLAUDE.md").read_text()
     assert "newsib" in claude_md
     assert "/init" in claude_md
+
+
+def test_create_apply_dist_retargets_clone(tmp_path, monkeypatch):
+    """--apply with --dist renames the dist in the clone, not the command/pkg."""
+    root = _seed(tmp_path)
+    workspace = tmp_path / "ws"
+    workspace.mkdir()
+    monkeypatch.chdir(root)
+
+    runner = _FakeRunner()
+    import guild.cli._commands._provision_template as _prov
+
+    monkeypatch.setattr(_prov, "default_runner", runner)
+
+    main(
+        [
+            "create",
+            "--agent",
+            "newsib",
+            "--desc",
+            "Dist test.",
+            "--workspace-root",
+            str(workspace),
+            "--dist",
+            "newsib-cli",
+            "--apply",
+        ]
+    )
+
+    clone_dest = workspace / "newsib"
+    pyproject = (clone_dest / "pyproject.toml").read_text()
+    assert 'name = "newsib-cli"' in pyproject
+    # Command stays the bare repo name.
+    assert 'newsib = "newsib.cli:main"' in pyproject
+    init = (clone_dest / "newsib" / "__init__.py").read_text()
+    assert '_pkg_version("newsib-cli")' in init
+    wf = (clone_dest / ".github" / "workflows" / "publish.yml").read_text()
+    assert "newsib-cli==${DEV_VERSION}" in wf

{guild_cli-0.6.4 → guild_cli-0.7.0}/tests/test_scaffold_instantiate.py

@@ -30,12 +30,27 @@ def _build_fixture(tmp_path: Path) -> Path:
     (tmp_path / ".git").mkdir()
     (tmp_path / ".git" / "config").write_text("[core]\n\trepositoryformatversion = 0\n")
 
-    # Package directory with __init__.py that imports from the package
+    # Package directory with __init__.py that imports from the package and reads
+    # its version from the *distribution* metadata (hyphen form, like the real
+    # template's `importlib.metadata` lookup).
     pkg_dir = tmp_path / _TEMPLATE_PKG
     pkg_dir.mkdir()
     (pkg_dir / "__init__.py").write_text(
         '"""culture_agent_template package."""\n'
+        "from importlib.metadata import version as _pkg_version\n"
         "from culture_agent_template import cli  # noqa: F401\n"
+        '\n__version__ = _pkg_version("culture-agent-template")\n'
+    )
+
+    # .github/workflows/publish.yml — the TestPyPI install hint pins the dist.
+    wf_dir = tmp_path / ".github" / "workflows"
+    wf_dir.mkdir(parents=True)
+    (wf_dir / "publish.yml").write_text(
+        "name: publish\n"
+        "jobs:\n"
+        "  test-publish:\n"
+        "    steps:\n"
+        '      - run: echo "install culture-agent-template==${DEV_VERSION}"\n'
     )
 
     # pyproject.toml
@@ -375,6 +390,101 @@ def test_transform_readme_consumes_wrapped_inline_code_prose(tmp_path):
     assert "## More" in readme
 
 
+# ---------------------------------------------------------------------------
+# --dist retarget tests
+# ---------------------------------------------------------------------------
+
+
+def test_transform_default_dist_leaves_repo_token(tmp_path):
+    """No dist → the dist name stays the global-replace result (repo_token)."""
+    dest = _build_fixture(tmp_path)
+    transform_clone(dest, "appsec", "AppSec agent.", "claude")
+    pyproject = (dest / "pyproject.toml").read_text()
+    assert 'name = "appsec"' in pyproject
+    init = (dest / "appsec" / "__init__.py").read_text()
+    assert '_pkg_version("appsec")' in init
+
+
+def test_transform_dist_equal_repo_token_is_noop(tmp_path):
+    """Explicitly passing dist == repo_token changes nothing (no-op guard)."""
+    dest = _build_fixture(tmp_path)
+    transform_clone(dest, "appsec", "AppSec agent.", "claude", dist="appsec")
+    pyproject = (dest / "pyproject.toml").read_text()
+    assert 'name = "appsec"' in pyproject
+    assert "appsec-cli" not in pyproject
+
+
+def test_transform_custom_dist_retargets_pyproject_name(tmp_path):
+    dest = _build_fixture(tmp_path)
+    transform_clone(dest, "appsec", "AppSec agent.", "claude", dist="appsec-cli")
+    pyproject = (dest / "pyproject.toml").read_text()
+    assert 'name = "appsec-cli"' in pyproject
+
+
+def test_transform_custom_dist_retargets_init_metadata(tmp_path):
+    dest = _build_fixture(tmp_path)
+    transform_clone(dest, "appsec", "AppSec agent.", "claude", dist="appsec-cli")
+    init = (dest / "appsec" / "__init__.py").read_text()
+    assert '_pkg_version("appsec-cli")' in init
+
+
+def test_transform_custom_dist_retargets_publish_pin(tmp_path):
+    dest = _build_fixture(tmp_path)
+    transform_clone(dest, "appsec", "AppSec agent.", "claude", dist="appsec-cli")
+    wf = (dest / ".github" / "workflows" / "publish.yml").read_text()
+    assert "appsec-cli==${DEV_VERSION}" in wf
+    assert "appsec==${DEV_VERSION}" not in wf
+
+
+def test_transform_custom_dist_keeps_command_and_package(tmp_path):
+    """The dist rename must NOT touch the console command or the package dir."""
+    dest = _build_fixture(tmp_path)
+    transform_clone(dest, "appsec", "AppSec agent.", "claude", dist="appsec-cli")
+    # Package dir stays the import name.
+    assert (dest / "appsec").is_dir()
+    pyproject = (dest / "pyproject.toml").read_text()
+    # The console script (under [project.scripts]) stays the bare command.
+    assert 'appsec = "appsec.cli:main"' in pyproject
+    # packages list stays the import name.
+    assert 'packages = ["appsec"]' in pyproject
+
+
+def test_transform_custom_dist_hyphenated_repo(tmp_path):
+    """A hyphenated repo (my-agent) with a custom dist still retargets correctly."""
+    dest = _build_fixture(tmp_path)
+    transform_clone(dest, "my-agent", "Hyphenated.", "claude", dist="my-agent-cli")
+    pyproject = (dest / "pyproject.toml").read_text()
+    assert 'name = "my-agent-cli"' in pyproject
+    # command + package (underscore) untouched.
+    assert (dest / "my_agent").is_dir()
+    assert 'my-agent = "my_agent.cli:main"' in pyproject
+
+
+def test_transform_plan_includes_dist_default(tmp_path):
+    plan = transform_plan("appsec", "AppSec agent.")
+    assert plan["dist"] == "appsec"
+    # No retarget step when dist == repo_token.
+    assert not any("retarget" in s.lower() for s in plan["steps"])
+
+
+def test_transform_plan_includes_dist_custom(tmp_path):
+    plan = transform_plan("appsec", "AppSec agent.", dist="appsec-cli")
+    assert plan["dist"] == "appsec-cli"
+    assert any("retarget" in s.lower() and "appsec-cli" in s for s in plan["steps"])
+
+
+def test_transform_clone_empty_dist_raises(tmp_path):
+    """An explicitly-empty dist is a programming error, not "use the default"."""
+    dest = _build_fixture(tmp_path)
+    with pytest.raises(ValueError, match="dist"):
+        transform_clone(dest, "appsec", "AppSec agent.", "claude", dist="")
+
+
+def test_transform_plan_whitespace_dist_raises():
+    with pytest.raises(ValueError, match="dist"):
+        transform_plan("appsec", "AppSec agent.", dist="   ")
+
+
 def test_transform_seed_avoids_md036_standalone_emphasis(tmp_path):
     """The CLAUDE.md seed must not place the agent name on a standalone
     emphasized line (markdownlint MD036 no-emphasis-as-heading — this broke

{guild_cli-0.6.4 → guild_cli-0.7.0}/uv.lock

@@ -179,7 +179,7 @@ wheels = [
 
 [[package]]
 name = "guild-cli"
-version = "0.6.4"
+version = "0.7.0"
 source = { editable = "." }
 dependencies = [
     { name = "pyyaml" },