project-kit-cli 1.0.1__tar.gz → 1.1.0__tar.gz

{project_kit_cli-1.0.1 → project_kit_cli-1.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: project-kit-cli
-Version: 1.0.1
+Version: 1.1.0
 Summary: Project definition and dev-workflow kit that hands off to Spec Kit
 Keywords: project-management,spec-kit,claude-code,workflow,github
 Author: Miguel Tomás

{project_kit_cli-1.0.1 → project_kit_cli-1.1.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "project-kit-cli"
-version = "1.0.1"
+version = "1.1.0"
 description = "Project definition and dev-workflow kit that hands off to Spec Kit"
 readme = "README.md"
 requires-python = ">=3.12"

{project_kit_cli-1.0.1 → project_kit_cli-1.1.0}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "project-kit-cli"
-version = "1.0.1"
+version = "1.1.0"
 description = "Project definition and dev-workflow kit that hands off to Spec Kit"
 readme = "README.md"
 requires-python = ">=3.12"

{project_kit_cli-1.0.1 → project_kit_cli-1.1.0}/src/project_kit/assets/docs/provisioning.md

@@ -65,7 +65,17 @@ Las épicas se crean antes que sus hijas, para poder enlazarlas.
 
 Se informan con `BLOCKING` y no se aplica nada:
 
-- `branches.main` de `config.yml` no es la rama por defecto del repositorio.
+- La rama por defecto del repositorio no es una de las que acepta `config.yml`. Por defecto solo
+  vale `branches.main`; `workflow.default_branches` admite una o varias de las ramas de
+  `branches`:
+
+  ```yaml
+  workflow:
+    default_branches: [develop]   # o [main, develop]
+  ```
+
+  Con git flow suele ser `develop`, para que `Closes #N` cierre el issue al fusionar en
+  `develop`: GitHub solo aplica las palabras de cierre en la rama por defecto.
 - El repositorio no tiene commits: las ramas nuevas se crean a partir de `main`, así que hace
   falta un commit inicial.
 

{project_kit_cli-1.0.1 → project_kit_cli-1.1.0}/src/project_kit/assets/skills/pk-workflow/SKILL.md

@@ -53,10 +53,14 @@ Read `.project-kit/templates/interview.md` first and follow it.
        develop: squash            # squash | merge | rebase
        release: merge
        main: merge
+     default_branches: [develop]  # only if the provider's default branch is not branches.main
    ```
 
-   If the user changes branch names or drops `release`/`develop`, edit `branches:` too. Tell
-   the user what you wrote.
+   If the user changes branch names or drops `release`/`develop`, edit `branches:` too. If the
+   team makes another branch the provider's default (with git flow, often `develop`, so that
+   `Closes #N` closes the issue on merging into it), list it in `default_branches`, one or
+   several of the `branches:` names; without it, `pjkit provision` only accepts `branches.main`.
+   Tell the user what you wrote.
 4. **Present** the document and the open markers; offer a clarification pass.
 5. **Approval gate.** On an explicit choice of "Approve it", set `**Status**: Approved` and
    run `pjkit approve workflow`.

{project_kit_cli-1.0.1 → project_kit_cli-1.1.0}/src/project_kit/config.py

@@ -57,6 +57,14 @@ class Config:
     # the name pattern of a spec's branch, and how pull requests are merged into each branch.
     spec_branch: str = DEFAULT_SPEC_BRANCH
     merge: dict[str, str] = field(default_factory=_default_merge)
+    # Branches the repository may have as its default branch (provision checks it). Empty: only
+    # branches.main. With git flow it is often develop, so that "Closes #N" closes the issue on
+    # merging into develop: GitHub only applies closing keywords on the default branch.
+    default_branches: list[str] = field(default_factory=list)
+
+    @property
+    def accepted_default_branches(self) -> list[str]:
+        return list(self.default_branches) or [self.branches["main"]]
 
     def validate(self) -> None:
         problems = []
@@ -87,6 +95,13 @@ class Config:
             names = list(self.branches.values())
             if len(set(names)) != len(names):
                 problems.append("branches must use three different names")
+        unknown_defaults = [b for b in self.default_branches if b not in self.branches.values()]
+        if unknown_defaults:
+            problems.append(
+                "workflow.default_branches must name branches from branches ("
+                + ", ".join(self.branches.values())
+                + f"), got {', '.join(map(repr, unknown_defaults))}"
+            )
         if not self.spec_branch.strip() or any(ch.isspace() for ch in self.spec_branch):
             problems.append("workflow.spec_branch must be a pattern without spaces, e.g. NNN-name")
         if set(self.merge) != set(BRANCH_KEYS):
@@ -113,6 +128,8 @@ class Config:
             "agents": list(self.agents),
             "workflow": {"spec_branch": self.spec_branch, "merge": dict(self.merge)},
         }
+        if self.default_branches:
+            data["workflow"]["default_branches"] = list(self.default_branches)
         if self.agent:
             data["agent"] = self.agent
         if not self.update_check:
@@ -166,8 +183,8 @@ def parse_config(text: str) -> Config:
 
     workflow = data.get("workflow") or {}
     if not isinstance(workflow, dict):
-        raise ConfigError("workflow must be a mapping (spec_branch, merge)")
-    extra = set(workflow) - {"spec_branch", "merge"}
+        raise ConfigError("workflow must be a mapping (spec_branch, merge, default_branches)")
+    extra = set(workflow) - {"spec_branch", "merge", "default_branches"}
     if extra:
         raise ConfigError(f"Unknown setting(s) in workflow: {', '.join(sorted(map(str, extra)))}")
     raw_merge = workflow.get("merge") or {}
@@ -177,6 +194,14 @@ def parse_config(text: str) -> Config:
     if not isinstance(spec_branch, str):
         raise ConfigError("workflow.spec_branch must be a string")
 
+    default_branches = workflow.get("default_branches", [])
+    if not isinstance(default_branches, list) or not all(
+        isinstance(b, str) for b in default_branches
+    ):
+        raise ConfigError("workflow.default_branches must be a list of branch names")
+    if "default_branches" in workflow and not default_branches:
+        raise ConfigError("workflow.default_branches must list at least one branch")
+
     mode = data.get("mode", "full")
     if not isinstance(mode, str):
         raise ConfigError("mode must be a string")
@@ -205,6 +230,7 @@ def parse_config(text: str) -> Config:
         agents=list(dict.fromkeys(agents)),
         spec_branch=spec_branch,
         merge={**_default_merge(), **raw_merge},
+        default_branches=list(dict.fromkeys(default_branches)),
     )
     config.validate()
     return config

{project_kit_cli-1.0.1 → project_kit_cli-1.1.0}/src/project_kit/provision.py

@@ -85,10 +85,14 @@ def build_plan(backlog: Backlog, config: Config, snap: Snapshot) -> Plan:
             plan.actions.append(Action("label", name, description, color))
 
     main = config.branches["main"]
-    if snap.repo.default_branch and snap.repo.default_branch != main:
+    accepted = config.accepted_default_branches
+    default = snap.repo.default_branch
+    if default and default not in accepted:
         plan.problems.append(
-            f"config.yml says the main branch is {main!r} but the repository's default "
-            f"branch is {snap.repo.default_branch!r}. Fix branches.main in config.yml."
+            f"The repository's default branch is {default!r}, but config.yml accepts "
+            f"{', '.join(map(repr, accepted))}. Fix branches.main, or add it to "
+            'workflow.default_branches (e.g. develop with git flow, so that "Closes #N" closes '
+            "the issue on merging into develop)."
         )
     main_sha = snap.branches.get(main)
     if main_sha is None: