project-init 0.3.0__tar.gz → 0.4.0__tar.gz

{project_init-0.3.0/plugins/project-init-workflow → project_init-0.4.0/.claude}/hooks/dag_workflow.py

@@ -244,7 +244,11 @@ COMMAND_RULES: list[tuple[re.Pattern[str], str | None, str]] = [
         "Direct pushes to main/master are blocked. Open a feature branch and PR.",
     ),
     (
-        re.compile(r"\bgh\s+api\s+repos/[^/\s]+/[^/\s]+/pulls/\d+/merge\b"),
+        # `[^&;]*?` allows flags between `gh api` and the endpoint (a real merge
+        # needs `--method PUT`/`-X PUT`, often written before the path). `|` is NOT
+        # excluded: a pipe inside a quoted flag (e.g. `--jq '.a|.b'`) must not let a
+        # merge slip past the guard — only `;`/`&` end the command segment (PI-198).
+        re.compile(r"\bgh\s+api\b[^&;]*?repos/[^/\s]+/[^/\s]+/pulls/\d+/merge\b"),
         "pr.merged",
         "Use .claude/scripts/monitor_pr.sh <pr> --merge instead of `gh api .../merge` so CI and review gates are honored.",
     ),
@@ -380,8 +384,12 @@ def cmd_push(branch: str | None, max_retries: int, *, force: bool = False) -> in
     if not branch:
         sys.stderr.write("push: no current branch\n")
         return 1
-    if force and branch in ("main", "master"):
-        sys.stderr.write("push: refusing to force-push main/master\n")
+    if branch in ("main", "master"):
+        # Refuse main/master for ANY push, not only force-pushes — otherwise
+        # running push_branch.sh while on main bypasses the direct-push guard,
+        # since the internal `git push` subprocess is invisible to the
+        # PreToolUse hook (PI-202).
+        sys.stderr.write("push: refusing to push main/master directly — open a feature branch + PR\n")
         return 1
 
     code, sha_out = _git(["rev-parse", branch])

{project_init-0.3.0 → project_init-0.4.0}/.claude/scripts/monitor_pr.sh

@@ -16,10 +16,10 @@
 #
 # Full lifecycle for agents:
 #   1. .claude/scripts/monitor_pr.sh <n> --merge
-#   2. Exit 2 → review comments printed → read and address them, push
+#   2. Exit 2 -> review comments printed -> read and address them, push
 #   3. Re-run with --review-cycle 1
-#   4. Exit 2 again → address remaining comments, push
-#   5. Re-run with --review-cycle 2 → admin-merge fires if still blocked
+#   4. Exit 2 again -> address remaining comments, push
+#   5. Re-run with --review-cycle 2 -> admin-merge fires if still blocked
 #
 # Review cycle policy:
 #   Two fix cycles are required before admin-merge is allowed. This ensures
@@ -61,8 +61,8 @@ _count_pending() {
   echo "$1" | python3 -c "
 import json, sys
 data = json.load(sys.stdin)
-# Exclude review/decision — it is a derived commit status that only appears after a review
-# is submitted. We detect review state directly via reviewDecision below.
+# Exclude review/decision; it is a derived commit status that only appears
+# after a review event. We detect review state directly via reviewDecision.
 print(sum(1 for c in data if c.get('name') != 'review/decision' and c.get('state') in ('PENDING', 'IN_PROGRESS', 'EXPECTED')))
 "
 }
@@ -101,15 +101,35 @@ _print_review_comments() {
   echo "  Full PR: $(gh pr view "$PR_NUMBER" --json url -q '.url' 2>/dev/null || true)"
 }
 
+_run_gh() {
+  local output
+  local status
+
+  set +e
+  output=$(GH_PROMPT_DISABLED=1 gh "$@" 2>&1)
+  status=$?
+  set -e
+
+  if [ -n "$output" ]; then
+    printf '%s\n' "$output" | grep -v "^$" || true
+  fi
+
+  return "$status"
+}
+
 _admin_merge() {
-  GH_PROMPT_DISABLED=1 gh pr merge "$PR_NUMBER" --squash --delete-branch --admin 2>&1 | grep -v "^$" || true
-  echo "Merged PR #$PR_NUMBER (admin)"
+  if _run_gh pr merge "$PR_NUMBER" --squash --delete-branch --admin; then
+    echo "Merged PR #$PR_NUMBER (admin)"
+  else
+    echo "ERROR: admin merge failed for PR #$PR_NUMBER" >&2
+    return 1
+  fi
 }
 
-# Query the PR's aggregate review decision directly — source of truth regardless of
-# whether the review/decision commit status has been posted yet.
+# Query the PR's aggregate review decision directly — source of truth regardless
+# of whether the review/decision commit status has been posted yet.
 # Returns: APPROVED | CHANGES_REQUESTED | REVIEW_REQUIRED | (empty = no review policy)
-# Returns UNKNOWN on API failure — callers must treat this as fail-closed (do not merge).
+# Returns UNKNOWN on API failure — callers must treat this as fail-closed.
 _get_review_decision() {
   gh pr view "$PR_NUMBER" --json reviewDecision -q '.reviewDecision // ""' 2>/dev/null || echo "UNKNOWN"
 }
@@ -126,14 +146,28 @@ _has_review_activity() {
 # --- Wait for all CI checks (excludes review/decision commit status) ---
 # Guard: if checks haven't registered yet (empty list), keep polling.
 # An empty list is indistinguishable from "all done" without this guard,
-# which caused #104 to merge before CI even started.
+# which caused premature merges before CI even started. Bounded by CI_TIMEOUT
+# so a required check that never registers can't hang the script — and any
+# autonomous caller — forever; fail closed on timeout (PI-186/PI-203).
+CI_TIMEOUT=900
+CI_ELAPSED=0
 while true; do
   CHECKS=$(gh pr checks "$PR_NUMBER" --json name,state,bucket 2>/dev/null) || CHECKS="[]"
   CHECK_COUNT=$(echo "$CHECKS" | python3 -c "import json,sys; print(len(json.load(sys.stdin)))")
-  [ "$CHECK_COUNT" -eq 0 ] && { sleep 10; continue; }
-  PENDING=$(_count_pending "$CHECKS")
-  [ "$PENDING" -eq 0 ] && break
+  if [ "$CHECK_COUNT" -gt 0 ] && [ "$(_count_pending "$CHECKS")" -eq 0 ]; then
+    break
+  fi
+  if [ "$CI_ELAPSED" -ge "$CI_TIMEOUT" ]; then
+    echo "PR #$PR_NUMBER: CI did not settle within ${CI_TIMEOUT}s. Still pending:"
+    echo "$CHECKS" | python3 -c "import json,sys
+for c in json.load(sys.stdin):
+    if c.get('name') != 'review/decision' and c.get('state') in ('PENDING','IN_PROGRESS','EXPECTED'):
+        print('  -', c.get('name'))" 2>/dev/null || true
+    echo "Re-run once the check registers, or investigate why it never started."
+    exit 1
+  fi
   sleep 10
+  CI_ELAPSED=$((CI_ELAPSED + 10))
 done
 
 FAIL_CODE=0
@@ -151,14 +185,14 @@ if [ "$NO_REVIEW" -eq 1 ] && [ "$MODE" = "--merge" ]; then
   _admin_merge; exit 0
 fi
 
-# --- Wait up to 6 min for a reviewer to act (bounded replacement for the original infinite wait) ---
-# We query reviewDecision directly so this works even before the review/decision commit
-# status is created (which only happens after the first review event fires review-status.yml).
+# --- Wait up to 6 min for a reviewer to act ---
+# Query reviewDecision directly so this works before review-status.yml creates
+# the derived review/decision commit status.
 REVIEW_TIMEOUT=360
 REVIEW_ELAPSED=0
 REVIEW_DECISION=$(_get_review_decision)
 if [ "$MODE" = "--merge" ] && [ "$REVIEW_CYCLE" -ge "$MAX_REVIEW_CYCLES" ] && [ "$REVIEW_DECISION" = "REVIEW_REQUIRED" ]; then
-  echo "Max review cycles ($MAX_REVIEW_CYCLES) reached — force-merging with admin override."
+  echo "Max review cycles ($MAX_REVIEW_CYCLES) reached — skipping reviewer wait and force-merging with admin override."
   _admin_merge; exit 0
 fi
 
@@ -176,17 +210,14 @@ while { [ "$REVIEW_DECISION" = "REVIEW_REQUIRED" ] || [ "$REVIEW_DECISION" = "UN
     echo "  Review comments detected — proceeding without waiting for formal approval."
     break
   fi
-  # Refresh CHECKS too so late-arriving CI failures are caught
   CHECKS=$(gh pr checks "$PR_NUMBER" --json name,state,bucket 2>/dev/null) || CHECKS="[]"
 done
 
-# Fail closed: if reviewDecision could not be fetched, do not merge
 if [ "$REVIEW_DECISION" = "UNKNOWN" ]; then
   echo "ERROR: could not fetch reviewDecision for PR #$PR_NUMBER — cannot verify review state." >&2
   exit 2
 fi
 
-# Handle review outcome
 if [ "$REVIEW_DECISION" = "CHANGES_REQUESTED" ]; then
   echo "Review/decision failed on PR #$PR_NUMBER (cycle $REVIEW_CYCLE/$MAX_REVIEW_CYCLES):"
   _print_review_comments
@@ -227,20 +258,24 @@ PR_URL=$(gh pr view "$PR_NUMBER" --json url -q '.url')
 echo "PR #$PR_NUMBER passed: $PR_URL"
 
 if [ "$MODE" = "--merge" ]; then
-  # Check merge state: CLEAN = mergeable now, BLOCKED = review/branch protection gating
   MERGE_STATE=$(gh pr view "$PR_NUMBER" --json mergeStateStatus -q '.mergeStateStatus' 2>/dev/null || echo "UNKNOWN")
 
   if [ "$MERGE_STATE" = "CLEAN" ] || [ "$MERGE_STATE" = "UNSTABLE" ]; then
-    GH_PROMPT_DISABLED=1 gh pr merge "$PR_NUMBER" --squash --delete-branch 2>&1 | grep -v "^$" || true
-    echo "Merged PR #$PR_NUMBER"
+    if _run_gh pr merge "$PR_NUMBER" --squash --delete-branch; then
+      echo "Merged PR #$PR_NUMBER"
+    else
+      echo "ERROR: merge failed for PR #$PR_NUMBER" >&2
+      exit 1
+    fi
   elif [ "$MERGE_STATE" = "BLOCKED" ]; then
-    # CI passed but review protection is the only gate — admin merge (owner bypass)
     echo "PR is blocked by review protection — merging with admin override."
     _admin_merge
   else
-    # Unknown state — try direct first, fall back to --auto
-    if ! GH_PROMPT_DISABLED=1 gh pr merge "$PR_NUMBER" --squash --delete-branch 2>/dev/null; then
-      GH_PROMPT_DISABLED=1 gh pr merge "$PR_NUMBER" --squash --delete-branch --auto 2>&1 | grep -v "^$" || true
+    if ! _run_gh pr merge "$PR_NUMBER" --squash --delete-branch; then
+      if ! _run_gh pr merge "$PR_NUMBER" --squash --delete-branch --auto; then
+        echo "ERROR: could not merge or enable auto-merge for PR #$PR_NUMBER" >&2
+        exit 1
+      fi
       echo "Auto-merge enabled for PR #$PR_NUMBER — will merge once all requirements are met."
     else
       echo "Merged PR #$PR_NUMBER"

{project_init-0.3.0 → project_init-0.4.0}/.github/workflows/release.yml

@@ -50,7 +50,12 @@ jobs:
       - name: Create GitHub Release
         uses: softprops/action-gh-release@v3
         with:
-          files: dist/*
+          # Only the build artifacts — an unscoped glob also picks up the
+          # tracked dist/.gitignore and uploads it as a stray
+          # `default.gitignore` asset (PI-183).
+          files: |
+            dist/*.whl
+            dist/*.tar.gz
           body_path: RELEASE_NOTES.md
 
   # PyPI via trusted publishing (ADR-011): OIDC, no tokens to custody.

{project_init-0.3.0 → project_init-0.4.0}/.github/workflows/validate-pr.yml

@@ -62,3 +62,32 @@ jobs:
             echo "ERROR: PR body must include 'Closes #<number>' to auto-close the linked issue"
             exit 1
           fi
+
+          # Extract the issue key from the title scope, e.g. fix(PI-7): ... -> PI-7.
+          TITLE_KEY=$(echo "$PR_TITLE" | sed -nE 's/.*\(([A-Z][A-Z0-9]*-[0-9]+)\).*/\1/p')
+          TITLE_KEY_NUM=$(echo "$TITLE_KEY" | grep -oE '[0-9]+$' || true)
+
+          # Defense in depth: when the branch is *also* issue-linked, its key must
+          # match the title scope key. Otherwise a PR on branch fix/PI-99-* with
+          # title fix(PI-1): ... + body "Closes #1" passes every other check while
+          # closing the wrong issue off the wrong branch (PI-200 review).
+          BRANCH_KEY_NUM=$(echo "$PR_BRANCH" | sed -nE 's#^(feat|fix|chore|docs|test)/[A-Z][A-Z0-9]*-([0-9]+)-.*#\2#p')
+          if [ -n "$TITLE_KEY_NUM" ] && [ -n "$BRANCH_KEY_NUM" ] && [ "$TITLE_KEY_NUM" != "$BRANCH_KEY_NUM" ]; then
+            echo "ERROR: branch issue key (#$BRANCH_KEY_NUM) and title scope key ($TITLE_KEY -> #$TITLE_KEY_NUM) reference different issues."
+            echo "Rename the branch or fix the title so both point at the same issue."
+            exit 1
+          fi
+
+          # Verify the title scope key number is among the Closes numbers — a
+          # type(PI-N): ... PR must Closes #N (PI-N maps to issue #N), so it
+          # can't auto-close an unrelated issue (PI-200).
+          if [ -n "$TITLE_KEY_NUM" ]; then
+            CLOSES_NUMS=$(echo "$PR_BODY" | grep -oiE 'closes\s+#[0-9]+' | grep -oE '[0-9]+' || true)
+            if echo "$CLOSES_NUMS" | grep -qx "$TITLE_KEY_NUM"; then
+              echo "Closes #$TITLE_KEY_NUM matches the title scope key $TITLE_KEY"
+            else
+              echo "ERROR: title scope key $TITLE_KEY (#$TITLE_KEY_NUM) is not among the Closes numbers: $(echo $CLOSES_NUMS | tr '\n' ' ')"
+              echo "A '$TITLE_KEY' PR must 'Closes #$TITLE_KEY_NUM' — PI-N maps to issue #N."
+              exit 1
+            fi
+          fi

{project_init-0.3.0 → project_init-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: project-init
-Version: 0.3.0
+Version: 0.4.0
 Summary: Scaffolder for agentic-development infrastructure inside any project
 Project-URL: Repository, https://github.com/VytCepas/project-init
 Project-URL: Documentation, https://vytcepas.github.io/project-init/
@@ -329,7 +329,6 @@ project-init/
 │   ├── obsidian/             # Obsidian vault overlay (both presets)
 │   ├── graphify/             # Graphify memory overlay
 │   └── presets/              # toml preset definitions
-├── examples/                 # sample scaffolded outputs
 └── tests/                    # focused pytest modules by behavior area
 ```
 

{project_init-0.3.0 → project_init-0.4.0}/README.md

@@ -298,7 +298,6 @@ project-init/
 │   ├── obsidian/             # Obsidian vault overlay (both presets)
 │   ├── graphify/             # Graphify memory overlay
 │   └── presets/              # toml preset definitions
-├── examples/                 # sample scaffolded outputs
 └── tests/                    # focused pytest modules by behavior area
 ```
 

{project_init-0.3.0 → project_init-0.4.0}/docs/adr/adr-003-github-native-workflow.md

@@ -1,7 +1,7 @@
 # ADR-003: GitHub-native project management — GitHub Projects + Issues over Linear
 
 **Date:** 2026-04-27
-**Status:** Accepted
+**Status:** Accepted — superseded in part by [ADR-006](adr-006-conventional-commit-titles.md) (the PR/commit title format)
 
 ## Context
 

{project_init-0.3.0 → project_init-0.4.0}/docs/adr/adr-005-github-pr-board-workflow.md

@@ -1,7 +1,7 @@
 # ADR-005: GitHub PR and board lifecycle workflow
 
 **Date:** 2026-04-27
-**Status:** Accepted
+**Status:** Accepted — superseded in part by [ADR-006](adr-006-conventional-commit-titles.md) (the PR/commit title format)
 
 ## Context
 

{project_init-0.3.0 → project_init-0.4.0}/docs/adr/adr-011-pypi-trusted-publishing.md

@@ -28,7 +28,9 @@ Publish every tagged release to PyPI from the existing `release.yml` via a
 
 - Runs only after the GitHub Release job succeeds (`needs: release`).
 - Authenticates via OIDC (`id-token: write`) against the `pypi`
-  environment — protection rules can be added on the environment later.
+  environment, which is restricted to `v*` tags so only a tagged release
+  can deploy to it (PI-184); a required reviewer can be added later if a
+  manual approval gate before each publish is wanted.
 - Uses `pypa/gh-action-pypi-publish` (the canonical action; `release/v1`
   per its own guidance — Renovate's `pinGitHubActionDigests` preset will
   pin it to a digest on its next run, like every other action here).
@@ -46,6 +48,9 @@ Before the first publish, register the *pending publisher* on pypi.org
 repository `project-init`, workflow `release.yml`, environment `pypi`.
 The first tagged release after that claims the name.
 
+Done for v0.3.0 (#171): the publisher is registered, the `pypi`
+environment exists and is tag-restricted, and v0.3.0 is live on PyPI.
+
 ## Consequences
 
 - Anyone can install without trusting a curl-pipe-bash script.

{project_init-0.3.0 → project_init-0.4.0}/mkdocs.yml

@@ -20,11 +20,21 @@ theme:
 
 nav:
   - Home: README.md
+  - Guide:
+    - Using project-init: guides/using-project-init.md
   - Architecture Decisions:
     - Overview: adr/adr-001-scaffolder-design.md
     - dot_ prefix convention: adr/adr-002-dotglob-template-convention.md
     - GitHub-native workflow: adr/adr-003-github-native-workflow.md
     - Obsidian + docs integration: adr/adr-004-obsidian-docs-integration.md
+    - PR & board lifecycle: adr/adr-005-github-pr-board-workflow.md
+    - Conventional commit titles: adr/adr-006-conventional-commit-titles.md
+    - Security enforcement layers: adr/adr-007-security-enforcement-layers.md
+    - Distribution channel: adr/adr-008-distribution-channel.md
+    - Graphify memory preset: adr/adr-009-graphify-memory-preset.md
+    - Plugin marketplace dual-ship: adr/adr-010-plugin-marketplace-dual-ship.md
+    - PyPI trusted publishing: adr/adr-011-pypi-trusted-publishing.md
+    - Prod-safety guard: adr/adr-012-prod-safety-guard.md
   - Development:
     - Template system: development/template-system.md
     - Testing: development/testing.md

{project_init-0.3.0/.claude → project_init-0.4.0/plugins/project-init-workflow}/hooks/dag_workflow.py

@@ -244,7 +244,11 @@ COMMAND_RULES: list[tuple[re.Pattern[str], str | None, str]] = [
         "Direct pushes to main/master are blocked. Open a feature branch and PR.",
     ),
     (
-        re.compile(r"\bgh\s+api\s+repos/[^/\s]+/[^/\s]+/pulls/\d+/merge\b"),
+        # `[^&;]*?` allows flags between `gh api` and the endpoint (a real merge
+        # needs `--method PUT`/`-X PUT`, often written before the path). `|` is NOT
+        # excluded: a pipe inside a quoted flag (e.g. `--jq '.a|.b'`) must not let a
+        # merge slip past the guard — only `;`/`&` end the command segment (PI-198).
+        re.compile(r"\bgh\s+api\b[^&;]*?repos/[^/\s]+/[^/\s]+/pulls/\d+/merge\b"),
         "pr.merged",
         "Use .claude/scripts/monitor_pr.sh <pr> --merge instead of `gh api .../merge` so CI and review gates are honored.",
     ),
@@ -380,8 +384,12 @@ def cmd_push(branch: str | None, max_retries: int, *, force: bool = False) -> in
     if not branch:
         sys.stderr.write("push: no current branch\n")
         return 1
-    if force and branch in ("main", "master"):
-        sys.stderr.write("push: refusing to force-push main/master\n")
+    if branch in ("main", "master"):
+        # Refuse main/master for ANY push, not only force-pushes — otherwise
+        # running push_branch.sh while on main bypasses the direct-push guard,
+        # since the internal `git push` subprocess is invisible to the
+        # PreToolUse hook (PI-202).
+        sys.stderr.write("push: refusing to push main/master directly — open a feature branch + PR\n")
         return 1
 
     code, sha_out = _git(["rev-parse", branch])

{project_init-0.3.0 → project_init-0.4.0}/plugins/project-init-workflow/hooks/prod_guard.py

@@ -64,8 +64,21 @@ def _find_config(start: Path) -> Path | None:
     return None
 
 
+def _unquote(value: str) -> str:
+    """Strip one pair of matching surrounding quotes, leaving mismatched or
+    single quotes intact so ``'foo"`` is not silently corrupted (PI-187 review).
+    """
+    if len(value) >= 2 and value[0] == value[-1] and value[0] in "\"'":
+        return value[1:-1]
+    return value
+
+
 def _allow_patterns(root: Path) -> list[re.Pattern[str]]:
-    """Read the safety.allow JSON list from .claude/config.yaml (fail-open).
+    """Read the safety.allow list from .claude/config.yaml (fail-open).
+
+    Accepts both an inline JSON list (``allow: ["a", "b"]``) and a multi-line
+    YAML list (``allow:`` on its own line followed by ``- "a"`` items). The
+    inline-only parser silently dropped the natural YAML form to ``[]`` (PI-187).
 
     *root* is the Bash tool's cwd, which may be a subdirectory after `cd` —
     the config is located by walking up the tree.
@@ -73,22 +86,40 @@ def _allow_patterns(root: Path) -> list[re.Pattern[str]]:
     config = _find_config(root)
     if config is None:
         return []
+    patterns: list[str] = []
     try:
         in_safety = False
+        in_allow = False
         for line in config.read_text(encoding="utf-8").splitlines():
             if line.startswith("safety:"):
                 in_safety = True
                 continue
-            if in_safety:
-                if line.strip() and not line.startswith(" "):
-                    break
-                stripped = line.strip()
-                if stripped.startswith("allow:"):
-                    raw = stripped.split(":", 1)[1].strip()
-                    return [re.compile(p) for p in json.loads(raw)]
+            if not in_safety:
+                continue
+            if line.strip() and not line.startswith((" ", "\t")):
+                break  # a column-0 key ends the safety block
+            stripped = line.strip()
+            if not stripped or stripped.startswith("#"):
+                continue
+            if in_allow and stripped.startswith("- "):
+                patterns.append(_unquote(stripped[2:].strip()))
+                continue
+            in_allow = False
+            if stripped.startswith("allow:"):
+                raw = stripped.split(":", 1)[1].strip()
+                if raw:
+                    parsed = json.loads(raw)  # inline JSON list
+                    # A non-list allow (JSON string/object/number) must not be
+                    # iterated character-by-character into an over-permissive
+                    # allowlist or crash the guard — ignore it and keep
+                    # guarding (PI-187 review).
+                    if isinstance(parsed, list):
+                        patterns.extend(p for p in parsed if isinstance(p, str))
+                else:
+                    in_allow = True  # multi-line YAML list follows
+        return [re.compile(p) for p in patterns if p]
     except (OSError, json.JSONDecodeError, re.error):
-        pass
-    return []
+        return []
 
 
 def evaluate(command: str, permission_mode: str, allow: list[re.Pattern[str]]) -> dict | None:

{project_init-0.3.0 → project_init-0.4.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "project-init"
-version = "0.3.0"
+version = "0.4.0"
 description = "Scaffolder for agentic-development infrastructure inside any project"
 readme = "README.md"
 requires-python = ">=3.11"

{project_init-0.3.0 → project_init-0.4.0}/src/project_init/__init__.py

@@ -1,4 +1,4 @@
 """project-init — scaffolder for agentic-development infrastructure."""
 
-__version__ = "0.3.0"
+__version__ = "0.4.0"
 __repo_url__ = "https://github.com/VytCepas/project-init"