cpflow 5.2.0 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d334d4f24d777236b1d99232c0aeb14aaac17a3daed74837738773a5aa42b3c
-  data.tar.gz: ca7b66e6bd876a6a3f422a425aa86ce90e74af5f57e23eada8384c3f1e963f75
+  metadata.gz: cd92be5f61c4108f79f0d356ade6d46fc89b637179986563354b874ce50fdac5
+  data.tar.gz: 2086b7705d7dfb7f69864cce1a41a380637aa644190a1ed011e0c7d948101205
 SHA512:
-  metadata.gz: e72015fc6143701ee31e311030a71c91957556aba0cc762c01d63834cd71d01ba7bfe4e76e216700a8367e365fbb3da2459c70707e6364e7985326e00e6ccab5
-  data.tar.gz: 4b19772575225b90d96ebe788cc555699210df4aa9ae92677e6fbde395f4bcc92b2ef2206b062049c8192ca91228e45e7c7c9414b1948b896248758eb8c71370
+  metadata.gz: 35d38fcb4bd0fdaf2f8334daf3b36631a1ededcaf0b5e9fea3b4da15c968ba34db8c14415b2ff84f1bb5701b630d96fe531b1c4e0dac3ae88f171c62796ecb64
+  data.tar.gz: dd1ba11c088bd4190dea8995cc750499e83f2c3520cea1fdc88f01678187ce107e27f12425ebf378972c77f0f5aaf9f6f83eee9d257b2eabbdcd4aeb8f7f12f8

data/.agents/agent-workflow.yml

@@ -1,8 +1,10 @@
 # Non-command agent-workflow configuration for portable shared skills.
+# This file is the canonical source for the non-command policy values below.
+# AGENTS.md directs portable skills here; it does not duplicate or override them.
 # Commands live as scripts in .agents/bin/ (see .agents/bin/README.md).
-# Compatibility summary for older workflow copies; canonical values live in
-# AGENTS.md.
 base_branch: main
+merge_submission:
+  mode: direct
 changelog: "CHANGELOG.md — Keep-a-Changelog; user-visible changes only"
 follow_up_prefix: "Follow-up:"
 review_gate: "AI reviewers are advisory unless they confirm a blocker; merge gate is the full `gh pr checks` list green (not --required) + all threads resolved + mergeable clean"
@@ -11,5 +13,14 @@ coordination_backend: "private shakacode/agent-coordination (claims/heartbeats n
 benchmark_labels: n/a
 merge_ledger: n/a
 ci_parity_environment: "n/a — reproduce CI-only failures from the matching job in .github/workflows/**"
+release_qa_runbook: ".agents/workflows/ai-rollout-e2e-test.md — use after publishing a cpflow gem that changes GitHub Actions, AI rollout prompts, readiness checks, generator output, or React on Rails deployment behavior"
 hosted_ci_trigger: "n/a — CI runs on every PR"
 ci_change_detector: n/a
+
+# Consumed by the portable untrusted-contributor-intake skill. These values must
+# be read from the trusted base ref, never from contributor-controlled PR content.
+untrusted_contributor_intake:
+  trusted_github_host: github.com
+  trusted_github_scheme: https
+  trusted_github_repo: shakacode/control-plane-flow
+repo_prefix: CPF

data/.agents/bin/README.md

@@ -14,6 +14,7 @@ means that capability is n/a here.
 | `docs` | Check generated command docs | `bundle exec rake check_command_docs` |
 | `build` | Build / type-check | n/a (gem) |
 
-Canonical non-command policy lives in [`../../AGENTS.md`](../../AGENTS.md).
-[`../agent-workflow.yml`](../agent-workflow.yml) is retained only as a
-compatibility summary for older workflow copies.
+Canonical non-command policy, including the release-QA runbook reference, lives
+in [`../agent-workflow.yml`](../agent-workflow.yml). [`../../AGENTS.md`](../../AGENTS.md)
+is the thin discovery pointer for portable shared skills and does not duplicate
+or override that policy.

data/.github/actions/cpflow-setup-environment/action.yml

@@ -99,7 +99,7 @@ runs:
 
         # Bump this default when a new Control Plane CLI release should roll out by default.
         # Override per-repo by setting the `CPLN_CLI_VERSION` repo variable.
-        default_cpln_cli_version="3.10.2"
+        default_cpln_cli_version="3.11.0"
 
         CPLN_CLI_VERSION="${CPLN_CLI_VERSION:-${default_cpln_cli_version}}"
 

data/.github/actions/cpflow-wait-for-health/action.yml

@@ -1,9 +1,9 @@
 name: Wait for Control Plane workload health
 description: >-
   Polls Control Plane until the latest workload version is ready, then checks
-  the workload endpoint with curl. Exits success when the HTTP response status
-  is in the accepted list. Fails non-zero (and reports `healthy=false`) once
-  retries are exhausted.
+  the standard workload endpoint and ready location endpoints with curl. Exits
+  success when the HTTP response status is in the accepted list. Fails non-zero
+  (and reports `healthy=false`) once retries are exhausted.
 
 inputs:
   workload_name:
@@ -39,6 +39,9 @@ outputs:
   healthy:
     description: '"true" once a healthy response was observed; "false" otherwise.'
     value: ${{ steps.poll.outputs.healthy }}
+  endpoint:
+    description: The workload or location endpoint that returned an accepted status.
+    value: ${{ steps.poll.outputs.endpoint }}
 
 runs:
   using: composite
@@ -59,6 +62,40 @@ runs:
 
         read -r -a accepted_statuses <<< "${CPFLOW_ACCEPTED_STATUSES}"
 
+        check_endpoint() {
+          local endpoint="$1"
+          local endpoint_type="$2"
+          local http_status
+
+          http_status="$(curl -s -o /dev/null -w '%{http_code}' --max-time "${CPFLOW_CURL_MAX_TIME}" "${endpoint}" 2>/dev/null || true)"
+          http_status="${http_status:-000}"
+          echo "${endpoint_type}: ${endpoint}, HTTP status: ${http_status}"
+
+          for accepted in "${accepted_statuses[@]}"; do
+            if [[ "${http_status}" == "${accepted}" ]]; then
+              {
+                echo "healthy=true"
+                echo "endpoint=${endpoint}"
+              } >> "$GITHUB_OUTPUT"
+              return 0
+            fi
+          done
+
+          return 1
+        }
+
+        summarize_cpln_error() {
+          local error_text="$1"
+
+          case "${error_text}" in
+            *401*|*403*|*[Uu]nauthorized*|*[Ff]orbidden*) echo "authorization failure" ;;
+            *404*|*"not found"*|*"Not Found"*) echo "resource not found" ;;
+            *429*|*"rate limit"*|*"Rate Limit"*) echo "rate limited" ;;
+            *"timed out"*|*[Tt]imeout*) echo "request timeout" ;;
+            *) echo "CLI error (details suppressed; ${#error_text} stderr bytes captured)" ;;
+          esac
+        }
+
         for attempt in $(seq 1 "${CPFLOW_MAX_RETRIES}"); do
           echo "Health check attempt ${attempt}/${CPFLOW_MAX_RETRIES}"
 
@@ -72,22 +109,57 @@ runs:
           workload_ready="$(echo "${workload_json}" | jq -r '.status.ready // false')"
           latest_ready="$(echo "${workload_json}" | jq -r '.status.readyLatest // false')"
           readiness_status="$(echo "${workload_json}" | jq -r '.health.readiness // "unknown"')"
-          endpoint="$(echo "${workload_json}" | jq -r '.status.endpoint // empty')"
+          workload_endpoint="$(echo "${workload_json}" | jq -r '.status.endpoint // empty')"
 
           if [[ "${workload_ready}" != "true" || "${latest_ready}" != "true" ]]; then
             echo "Workload status: ready=${workload_ready}, readyLatest=${latest_ready}, readiness=${readiness_status}; waiting for latest deployment."
-          elif [[ -n "${endpoint}" ]]; then
-            http_status="$(curl -s -o /dev/null -w '%{http_code}' --max-time "${CPFLOW_CURL_MAX_TIME}" "${endpoint}" 2>/dev/null || echo 000)"
-            echo "Endpoint: ${endpoint}, HTTP status: ${http_status}"
-
-            for accepted in "${accepted_statuses[@]}"; do
-              if [[ "${http_status}" == "${accepted}" ]]; then
-                echo "healthy=true" >> "$GITHUB_OUTPUT"
-                exit 0
-              fi
-            done
           else
-            echo "Workload '${CPFLOW_WORKLOAD_NAME}' has no endpoint yet; waiting for one to be assigned."
+            if [[ -n "${workload_endpoint}" ]] && check_endpoint "${workload_endpoint}" "Workload endpoint"; then
+              exit 0
+            fi
+
+            location_endpoint_count=0
+            deployments_listed=false
+            deployments_settled=false
+            deployments_stderr="$(mktemp)"
+            if deployments_json="$(cpln workload get-deployments "${CPFLOW_WORKLOAD_NAME}" --gvc "${CPFLOW_APP_NAME}" --org "${CPFLOW_ORG}" -o json 2>"${deployments_stderr}")"; then
+              deployments_listed=true
+              unsettled_location_count="$(
+                printf '%s\n' "${deployments_json}" |
+                  jq '[.items[]? | select(.status.ready != true or (.status.deploying // false) == true)] | length'
+              )"
+
+              if [[ "${unsettled_location_count}" -gt 0 ]]; then
+                echo "Deployment locations are not all ready (${unsettled_location_count} unsettled); waiting before endpoint fallback."
+              else
+                deployments_settled=true
+                while IFS= read -r location_endpoint; do
+                  location_endpoint_count=$((location_endpoint_count + 1))
+                  if [[ -n "${location_endpoint}" &&
+                        "${location_endpoint}" != "${workload_endpoint}" ]] &&
+                    check_endpoint "${location_endpoint}" "Location endpoint"; then
+                    rm -f "${deployments_stderr}"
+                    exit 0
+                  fi
+                done < <(
+                  printf '%s\n' "${deployments_json}" |
+                    jq -r '.items[]? | .status.endpoint // empty' |
+                    awk '!seen[$0]++'
+                )
+              fi
+            else
+              deployments_error="$(<"${deployments_stderr}")"
+              deployments_error_summary="$(summarize_cpln_error "${deployments_error}")"
+              echo "::warning::Could not list location endpoints for workload '${CPFLOW_WORKLOAD_NAME}' (${deployments_error_summary}); retrying."
+            fi
+            rm -f "${deployments_stderr}"
+
+            if [[ -z "${workload_endpoint}" &&
+                  "${deployments_listed}" == "true" &&
+                  "${deployments_settled}" == "true" &&
+                  "${location_endpoint_count}" -eq 0 ]]; then
+              echo "Workload '${CPFLOW_WORKLOAD_NAME}' has no endpoint yet; waiting for one to be assigned."
+            fi
           fi
 
           if [[ "${attempt}" -lt "${CPFLOW_MAX_RETRIES}" ]]; then

data/.github/pull_request_template.md

@@ -0,0 +1,18 @@
+## Summary
+
+<!-- What changes, and why is it useful? -->
+
+## Related issue
+
+<!-- Use "Closes #123" for an accepted issue, or link the maintainer discussion. -->
+
+## Validation
+
+<!-- List the exact commands or manual checks you ran. -->
+
+## Checklist
+
+- [ ] This PR addresses an accepted issue or maintainer request, or is a small typo fix.
+- [ ] The change is focused and contains no unrelated cleanup or generated churn.
+- [ ] I added or updated tests, documentation, and `CHANGELOG.md` where applicable.
+- [ ] I reviewed and understand all submitted content, including AI-assisted changes.

data/.github/workflows/claude.yml

@@ -11,13 +11,104 @@ on:
     types: [submitted]
 
 jobs:
-  claude:
+  authorize_claude_actor:
     if: |
       (github.event_name == 'issue_comment' && contains(github.event.comment.body, '@claude')) ||
       (github.event_name == 'pull_request_review_comment' && contains(github.event.comment.body, '@claude')) ||
       (github.event_name == 'pull_request_review' && contains(github.event.review.body, '@claude')) ||
       (github.event_name == 'issues' && (contains(github.event.issue.body, '@claude') || contains(github.event.issue.title, '@claude')))
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    outputs:
+      authorized: ${{ steps.permission-gate.outputs.authorized }}
+    steps:
+      - name: Verify actor can run Claude
+        id: permission-gate
+        uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9
+        with:
+          script: |
+            const owner = context.repo.owner;
+            const repo = context.repo.repo;
+            const permissionByLogin = new Map();
+
+            function claudeRequester() {
+              if (
+                context.eventName === 'issue_comment' ||
+                context.eventName === 'pull_request_review_comment'
+              ) {
+                return context.payload.comment?.user?.login;
+              }
+
+              if (context.eventName === 'pull_request_review') {
+                return context.payload.review?.user?.login;
+              }
+
+              if (context.eventName === 'issues') {
+                return context.payload.issue?.user?.login;
+              }
+
+              return null;
+            }
+
+            async function hasWriteAccessFor(username) {
+              if (!username) {
+                return false;
+              }
+
+              if (permissionByLogin.has(username)) {
+                return permissionByLogin.get(username);
+              }
+
+              let hasWriteAccess = false;
+              try {
+                const { data: permission } = await github.rest.repos.getCollaboratorPermissionLevel({
+                  owner,
+                  repo,
+                  username
+                });
+                hasWriteAccess = ['admin', 'write'].includes(permission.permission);
+              } catch (error) {
+                core.warning(
+                  `Unable to verify ${username} write permission for Claude; ` +
+                    `treating the Claude request as untrusted: ${error.message || error}`
+                );
+              }
+
+              permissionByLogin.set(username, hasWriteAccess);
+              return hasWriteAccess;
+            }
+
+            const actor = context.actor;
+            const requester = claudeRequester();
+
+            if (!requester) {
+              core.setOutput('authorized', 'false');
+              core.setFailed('Unable to run Claude because the requester could not be determined.');
+              return;
+            }
+
+            if (!(await hasWriteAccessFor(actor))) {
+              core.setOutput('authorized', 'false');
+              core.setFailed(`Unable to run Claude because ${actor} does not have write/admin repository permission.`);
+              return;
+            }
+
+            if (!(await hasWriteAccessFor(requester))) {
+              core.setOutput('authorized', 'false');
+              core.setFailed(
+                `Unable to run Claude because requester ${requester} does not have write/admin repository permission.`
+              );
+              return;
+            }
+
+            core.setOutput('authorized', 'true');
+            core.info(`Authorized ${actor} and Claude requester ${requester} to run Claude.`);
+
+  claude:
+    needs: authorize_claude_actor
+    if: needs.authorize_claude_actor.outputs.authorized == 'true'
+    runs-on: ubuntu-latest
     permissions:
       contents: read
       pull-requests: read