guild-cli 0.6.0__tar.gz → 0.6.1__tar.gz

{guild_cli-0.6.0 → guild_cli-0.6.1}/CHANGELOG.md

@@ -5,6 +5,29 @@ 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.6.1] - 2026-05-26
+
+### Added
+
+- **Registered `agenda`** (`agentculture/agenda`) in `docs/skill-sources.md` as a
+  downstream consumer of the canonical kit — the first sibling provisioned via
+  `guild create --apply`.
+
+### Fixed
+
+- **`guild create` seed generator (`instantiate.py`)**: the CLAUDE.md/AGENTS.md
+  seed emitted the agent name as a standalone emphasized line (`**<name>**`),
+  tripping markdownlint **MD036** and failing the new repo's first CI run; the
+  name is now inlined in a sentence.
+- **`guild create` README rewrite**: `_set_readme_intro` only replaced the first
+  line of the template's intro, leaving a dangling fragment when the intro spans
+  multiple lines (as the real `culture-agent-template` intro does). It now
+  replaces the whole first paragraph, stopping at a blank line **or** the start
+  of a new markdown block (heading / list / blockquote / badge / code fence) so
+  a block that immediately follows the intro is never silently dropped, while
+  wrapped inline-code prose (a single leading backtick) is still consumed. Both
+  bugs surfaced provisioning `agenda`; regression tests added.
+
 ## [0.6.0] - 2026-05-26
 
 ### Added

{guild_cli-0.6.0 → guild_cli-0.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: guild-cli
-Version: 0.6.0
+Version: 0.6.1
 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.0 → guild_cli-0.6.1}/docs/skill-sources.md

@@ -32,14 +32,14 @@ current by `guild overview --scope mesh`.
 
 | Skill | Upstream | Downstream copies (known) | Notes |
 |-------|----------|---------------------------|-------|
-| `agent-config` | `guildmaster` (`.claude/skills/agent-config/`) | — | Inventory variant backing `guild show` ([#12](https://github.com/agentculture/guildmaster/issues/12)); `show.sh` + `data/backend-fingerprints.yaml` vendored verbatim from steward, SKILL.md reframed from alignment-judgment to inventory + `type: command` added. **Forked from steward:** steward retains its own alignment-focused `agent-config` variant; the inventory variant is guildmaster's to supply. |
-| `cicd` | `guildmaster` (`.claude/skills/cicd/`) — layered on `agex pr` (in `agentculture/agex-cli`) | `afi-cli`, `agex-cli` (adapted-thin delegate — owns `agex pr`; see [agex-cli#53](https://github.com/agentculture/agex-cli/pull/53)), `agtag`, `antoine`, `appsec`, `auntiepypi`, `cfafi` (still named `pr-review`), `code-lens-cli`, `culture` (still named `pr-review`), `devague`, `katvan`, `lecodeur`, `lepenseur`, `seer-cli`, `telek` | Thin delegate to `agex pr` for lint / open / read / reply / delta, plus guildmaster's `status` (SonarCloud quality gate + hotspots + unresolved-thread tally) and `await` (composes `agex pr read --wait` with `status`, non-zero exit on Sonar ERROR / unresolved threads) extensions. **Inverted case:** agex-cli, as the `agex pr` upstream, vendors the skill adapted-thin — a `workflow.sh`-only pure delegate ([agex-cli#53](https://github.com/agentculture/agex-cli/pull/53)). Renamed from `pr-review` in steward 0.7.0; downstream copies may keep the old name on their own cadence. |
-| `communicate` | `guildmaster` (`.claude/skills/communicate/`) | `afi-cli`, `agex-cli` (identifier-only — vendored steward 0.11.0; scripts current as of 0.18.0), `agtag`, `antoine`, `appsec`, `auntiepypi`, `code-lens-cli`, `culture` (still named `coordinate`), `devague`, `katvan`, `lecodeur`, `lepenseur`, `seer-cli`, `telek` | Cross-repo + mesh communication: file issues / hand off briefs to sibling-repo agents (auto-signed), comment on existing issues, fetch issues to inline state into briefs, and send live messages to Culture mesh channels (unsigned — nick is the speaker). Renamed from `coordinate` in steward 0.8.0; absorbed `gh-issues` (as `fetch-issues.sh`) in 0.9.1. Issue I/O backed by `agtag` (>=0.1) since steward 0.11.0 — signature resolves from local `culture.yaml` (override via `--as`). |
-| `doc-test-alignment` | `guildmaster` (`.claude/skills/doc-test-alignment/`) | `devague`, `lecodeur`, `lepenseur` | Stub; real implementation TBD. `scripts/check.sh` exits not-yet-implemented today. |
-| `pypi-maintainer` | `guildmaster` (`.claude/skills/pypi-maintainer/`) | `agtag` | Switches a PyPI package install between pypi / test-pypi / local. Generalised from the original culture-specific `change-package`. |
-| `run-tests` | `guildmaster` (`.claude/skills/run-tests/`) | `agtag`, `antoine`, `appsec`, `code-lens-cli`, `culture`, `culture-sonar-cli`, `devague`, `lecodeur`, `lepenseur`, `seer-cli`, `shushu`, `telek` | Coverage source resolves from `[tool.coverage.run]` in `pyproject.toml`, so the script is portable across siblings without modification. |
-| `sonarclaude` | `guildmaster` (`.claude/skills/sonarclaude/`) | `antoine`, `appsec`, `code-lens-cli`, `devague`, `lecodeur`, `lepenseur`, `seer-cli`, `telek` | SonarCloud API client. Project key resolves from `$SONAR_PROJECT` or `--project KEY`. |
-| `version-bump` | `guildmaster` (`.claude/skills/version-bump/`) | `afi-cli`, `agtag`, `antoine`, `appsec`, `auntiepypi`, `cfafi`, `code-lens-cli`, `culture`, `devague`, `lecodeur`, `lepenseur`, `seer-cli`, `shushu`, `telek` | Pure Python, prepends a Keep-a-Changelog entry; no per-repo customization needed. |
+| `agent-config` | `guildmaster` (`.claude/skills/agent-config/`) | `agenda` | Inventory variant backing `guild show` ([#12](https://github.com/agentculture/guildmaster/issues/12)); `show.sh` + `data/backend-fingerprints.yaml` vendored verbatim from steward, SKILL.md reframed from alignment-judgment to inventory + `type: command` added. **Forked from steward:** steward retains its own alignment-focused `agent-config` variant; the inventory variant is guildmaster's to supply. |
+| `cicd` | `guildmaster` (`.claude/skills/cicd/`) — layered on `agex pr` (in `agentculture/agex-cli`) | `afi-cli`, `agex-cli` (adapted-thin delegate — owns `agex pr`; see [agex-cli#53](https://github.com/agentculture/agex-cli/pull/53)), `agtag`, `antoine`, `appsec`, `auntiepypi`, `cfafi` (still named `pr-review`), `code-lens-cli`, `culture` (still named `pr-review`), `devague`, `katvan`, `lecodeur`, `lepenseur`, `seer-cli`, `telek`, `agenda` | Thin delegate to `agex pr` for lint / open / read / reply / delta, plus guildmaster's `status` (SonarCloud quality gate + hotspots + unresolved-thread tally) and `await` (composes `agex pr read --wait` with `status`, non-zero exit on Sonar ERROR / unresolved threads) extensions. **Inverted case:** agex-cli, as the `agex pr` upstream, vendors the skill adapted-thin — a `workflow.sh`-only pure delegate ([agex-cli#53](https://github.com/agentculture/agex-cli/pull/53)). Renamed from `pr-review` in steward 0.7.0; downstream copies may keep the old name on their own cadence. |
+| `communicate` | `guildmaster` (`.claude/skills/communicate/`) | `afi-cli`, `agex-cli` (identifier-only — vendored steward 0.11.0; scripts current as of 0.18.0), `agtag`, `antoine`, `appsec`, `auntiepypi`, `code-lens-cli`, `culture` (still named `coordinate`), `devague`, `katvan`, `lecodeur`, `lepenseur`, `seer-cli`, `telek`, `agenda` | Cross-repo + mesh communication: file issues / hand off briefs to sibling-repo agents (auto-signed), comment on existing issues, fetch issues to inline state into briefs, and send live messages to Culture mesh channels (unsigned — nick is the speaker). Renamed from `coordinate` in steward 0.8.0; absorbed `gh-issues` (as `fetch-issues.sh`) in 0.9.1. Issue I/O backed by `agtag` (>=0.1) since steward 0.11.0 — signature resolves from local `culture.yaml` (override via `--as`). |
+| `doc-test-alignment` | `guildmaster` (`.claude/skills/doc-test-alignment/`) | `devague`, `lecodeur`, `lepenseur`, `agenda` | Stub; real implementation TBD. `scripts/check.sh` exits not-yet-implemented today. |
+| `pypi-maintainer` | `guildmaster` (`.claude/skills/pypi-maintainer/`) | `agtag`, `agenda` | Switches a PyPI package install between pypi / test-pypi / local. Generalised from the original culture-specific `change-package`. |
+| `run-tests` | `guildmaster` (`.claude/skills/run-tests/`) | `agtag`, `antoine`, `appsec`, `code-lens-cli`, `culture`, `culture-sonar-cli`, `devague`, `lecodeur`, `lepenseur`, `seer-cli`, `shushu`, `telek`, `agenda` | Coverage source resolves from `[tool.coverage.run]` in `pyproject.toml`, so the script is portable across siblings without modification. |
+| `sonarclaude` | `guildmaster` (`.claude/skills/sonarclaude/`) | `antoine`, `appsec`, `code-lens-cli`, `devague`, `lecodeur`, `lepenseur`, `seer-cli`, `telek`, `agenda` | SonarCloud API client. Project key resolves from `$SONAR_PROJECT` or `--project KEY`. |
+| `version-bump` | `guildmaster` (`.claude/skills/version-bump/`) | `afi-cli`, `agtag`, `antoine`, `appsec`, `auntiepypi`, `cfafi`, `code-lens-cli`, `culture`, `devague`, `lecodeur`, `lepenseur`, `seer-cli`, `shushu`, `telek`, `agenda` | Pure Python, prepends a Keep-a-Changelog entry; no per-repo customization needed. |
 
 > **How the downstream column is maintained.** The "Downstream copies (known)"
 > entries are kept in sync with guildmaster's own drift detector:
@@ -80,9 +80,9 @@ harmless on `claude-code`. This is the only divergence from upstream.
 
 | Skill | Origin | Downstream copies (known) | Notes |
 |-------|--------|---------------------------|-------|
-| `think` | `devague` (`agentculture/devague`, `../devague/.claude/skills/think/`) | — (broadcast pending) | Operator for the **idea→spec** leg (announcement frame → capture/classify claims → interrogate with honesty conditions → park open vagueness → `export` once the frame converges). Renamed from `devague` in devague 0.4.0. **Divergence:** `type: command` added. Runtime dep: `uv tool install devague`. |
-| `spec-to-plan` | `devague` (`agentculture/devague`, `../devague/.claude/skills/spec-to-plan/`) | — (broadcast pending) | Operator for the **spec→plan** leg (`devague plan ...`): seed from a converged frame, cover every coverage target with acceptance-gated, acyclically-ordered tasks, park unknowns as risks, `export` once the plan converges. New in devague 0.4.0. **Divergence:** `type: command` added. Runtime dep: `uv tool install devague`. |
-| `assign-to-workforce` | `devague` (`agentculture/devague`, `../devague/.claude/skills/assign-to-workforce/`) | — (broadcast pending) | Operator for the **implementation** leg: reads `devague plan waves` (read-only) and fans out independent tasks to one agent per task per wave in isolated git worktrees, with main-agent TDD-gated merges. Three human gates: spec / split plan / final PR. The CLI stays non-orchestrating ([devague#20](https://github.com/agentculture/devague/issues/20)). New in devague 0.10.0. **Divergence:** `type: command` added. Runtime deps: `uv tool install devague`, `git worktree`, the vendored `cicd` skill (for gate-3 `agex pr open`). |
+| `think` | `devague` (`agentculture/devague`, `../devague/.claude/skills/think/`) | — (broadcast pending), `agenda` | Operator for the **idea→spec** leg (announcement frame → capture/classify claims → interrogate with honesty conditions → park open vagueness → `export` once the frame converges). Renamed from `devague` in devague 0.4.0. **Divergence:** `type: command` added. Runtime dep: `uv tool install devague`. |
+| `spec-to-plan` | `devague` (`agentculture/devague`, `../devague/.claude/skills/spec-to-plan/`) | — (broadcast pending), `agenda` | Operator for the **spec→plan** leg (`devague plan ...`): seed from a converged frame, cover every coverage target with acceptance-gated, acyclically-ordered tasks, park unknowns as risks, `export` once the plan converges. New in devague 0.4.0. **Divergence:** `type: command` added. Runtime dep: `uv tool install devague`. |
+| `assign-to-workforce` | `devague` (`agentculture/devague`, `../devague/.claude/skills/assign-to-workforce/`) | — (broadcast pending), `agenda` | Operator for the **implementation** leg: reads `devague plan waves` (read-only) and fans out independent tasks to one agent per task per wave in isolated git worktrees, with main-agent TDD-gated merges. Three human gates: spec / split plan / final PR. The CLI stays non-orchestrating ([devague#20](https://github.com/agentculture/devague/issues/20)). New in devague 0.10.0. **Divergence:** `type: command` added. Runtime deps: `uv tool install devague`, `git worktree`, the vendored `cicd` skill (for gate-3 `agex pr open`). |
 
 Downstream is empty by design: these are still being introduced to the mesh.
 `guild teach --new --skill <name> --to <repos>` frames them as *new* skills to

{guild_cli-0.6.0 → guild_cli-0.6.1}/guild/scaffold/instantiate.py

@@ -162,7 +162,7 @@ def _seed_prompt(bare: str, desc: str, backend: str) -> str:
 
 ## Agent
 
-**{bare}**
+This repository hosts the **{bare}** agent.
 
 ## Description
 
@@ -272,6 +272,34 @@ def _is_desc_stub(line: str) -> bool:
     return not re.match(r"^[#>`\-\*!\[]", stripped)
 
 
+def _is_block_start(line: str) -> bool:
+    """Return True if *line* begins a new markdown block.
+
+    Used to bound intro-paragraph consumption in ``_replace_heading_block`` so a
+    block that immediately follows the intro *without* a blank line (e.g. ``##
+    Section``, a list, or a badge row) is not swallowed.  Recognised starts:
+    ATX headings (``#``), blockquotes (``>``), unordered list items
+    (``- ``/``* ``/``+ ``), links/badges (``[`` / ``![``), and fenced code
+    (```` ``` ```` / ``~~~``).
+
+    A *single* leading backtick is **not** a block start — it is inline code in
+    wrapped prose (e.g. ``` `culture.yaml`, and you have… ```), which is part of
+    the intro paragraph and must be consumed with it.
+    """
+    stripped = line.lstrip()
+    if not stripped:
+        return False
+    if stripped.startswith(("```", "~~~")):
+        return True
+    if stripped[0] in "#>":
+        return True
+    if stripped.startswith(("![", "[")):
+        return True
+    if stripped[:2] in ("- ", "* ", "+ "):
+        return True
+    return False
+
+
 def _replace_heading_block(lines: list[str], i: int, bare: str, desc: str) -> tuple[list[str], int]:
     """Replace the heading at *lines[i]* and its following description stub.
 
@@ -290,6 +318,14 @@ def _replace_heading_block(lines: list[str], i: int, bare: str, desc: str) -> tu
     if i < len(lines) and _is_desc_stub(lines[i]):
         out.append(desc + "\n")
         i += 1
+        # Consume the rest of the intro paragraph so a *multi-line* template
+        # intro is replaced wholesale rather than leaving a dangling fragment.
+        # Stop at a blank line (paragraph end) OR the start of a new markdown
+        # block (heading/list/blockquote/badge/fence) — even when no blank line
+        # separates it — so a following block is never silently dropped.  A
+        # single leading backtick stays consumable (wrapped inline-code prose).
+        while i < len(lines) and lines[i].strip() != "" and not _is_block_start(lines[i]):
+            i += 1
     elif i < len(lines):
         out.append(desc + "\n\n")
     else:

{guild_cli-0.6.0 → guild_cli-0.6.1}/pyproject.toml

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

{guild_cli-0.6.0 → guild_cli-0.6.1}/tests/test_scaffold_instantiate.py

@@ -312,3 +312,76 @@ def test_transform_invalid_backend_raises(tmp_path):
 def test_transform_missing_dest_raises(tmp_path):
     with pytest.raises(FileNotFoundError):
         transform_clone(tmp_path / "nonexistent", "appsec", "desc", "claude")
+
+
+def test_transform_readme_replaces_multiline_intro_paragraph(tmp_path):
+    """A *multi-line* template intro must be replaced wholesale — the real
+    culture-agent-template intro spans several lines, and replacing only the
+    first leaves a dangling fragment (regression: agenda genesis README)."""
+    dest = _build_fixture(tmp_path)
+    (dest / "README.md").write_text(
+        "# culture-agent-template\n\n"
+        "A clonable AgentCulture agent template with a consistent structure,\n"
+        "lifecycle, and skills. Clone it, rename the package, and edit\n"
+        "`culture.yaml` to make it your own.\n\n"
+        "## More\n\nMore docs.\n"
+    )
+    transform_clone(dest, "appsec", "AppSec security scanner.", "claude")
+    readme = (dest / "README.md").read_text()
+    # New description present; the entire old intro paragraph is gone.
+    assert "AppSec security scanner." in readme
+    assert "lifecycle, and skills" not in readme
+    assert "Clone it, rename the package" not in readme
+    assert "make it your own" not in readme
+    # Body after the intro paragraph is preserved.
+    assert "## More" in readme
+    assert "More docs." in readme
+
+
+def test_transform_readme_stops_intro_at_block_without_blank_line(tmp_path):
+    """Intro-paragraph consumption must stop at the start of a new markdown
+    block even when no blank line separates it from the intro stub — otherwise
+    a following heading/list/badge is silently dropped (Qodo, PR #29)."""
+    dest = _build_fixture(tmp_path)
+    (dest / "README.md").write_text(
+        "# culture-agent-template\n\n"
+        "A clonable template.\n"  # stub immediately followed by a heading
+        "## Features\n\n- one\n- two\n"
+    )
+    transform_clone(dest, "appsec", "AppSec scanner.", "claude")
+    readme = (dest / "README.md").read_text()
+    assert "AppSec scanner." in readme
+    assert "A clonable template." not in readme  # stub replaced
+    # The block that immediately follows the stub must survive.
+    assert "## Features" in readme
+    assert "- one" in readme
+    assert "- two" in readme
+
+
+def test_transform_readme_consumes_wrapped_inline_code_prose(tmp_path):
+    """A continuation line beginning with a *single* backtick (inline code) is
+    wrapped prose, not a block start, so it is consumed with the intro."""
+    dest = _build_fixture(tmp_path)
+    (dest / "README.md").write_text(
+        "# culture-agent-template\n\n"
+        "A clonable template you configure by editing\n"
+        "`culture.yaml` to taste.\n\n"
+        "## More\n"
+    )
+    transform_clone(dest, "appsec", "AppSec scanner.", "claude")
+    readme = (dest / "README.md").read_text()
+    assert "AppSec scanner." in readme
+    assert "culture.yaml` to taste" not in readme  # backtick prose consumed
+    assert "## More" in readme
+
+
+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
+    the agenda genesis CI lint job)."""
+    dest = _build_fixture(tmp_path)
+    transform_clone(dest, "appsec", "AppSec scanner.", "claude")
+    seed_lines = [ln.strip() for ln in (dest / "CLAUDE.md").read_text().splitlines()]
+    assert "**appsec**" not in seed_lines
+    # The name still appears, inlined in prose.
+    assert any("appsec" in ln for ln in seed_lines)

{guild_cli-0.6.0 → guild_cli-0.6.1}/uv.lock

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