@plainconceptsplatform/workflows 1.6.23 → 1.6.41

package/loops/workflows/work-router.yml

@@ -134,7 +134,7 @@ env:
   # times it tries before leaving the issue to a person. Only machine failures are retried; a
   # verdict the agent reached on purpose is reported and never re-run, because re-running a
   # decision reproduces it.
-  HOUSEKEEPING_RETRY_AFTER_HOURS: "6"
+  HOUSEKEEPING_RETRY_AFTER_HOURS: "1"
   HOUSEKEEPING_MAX_RETRIES: "3"
   # A bot pull request older than this with no merge-gate verdict at all is reported, never
   # closed: the janitor deletes branches and labels, never someone's work.
@@ -157,6 +157,10 @@ env:
   # How many times a `blocked` verdict, or a merge that did not happen, is retried once the base
   # branch has moved. After that the pull request waits for a person or a new commit.
   MERGE_TRAIN_MAX_RETRIES: "3"
+  # "true" lets a stack root merge itself once every child has landed and CI is green, through the
+  # same gate as any pull request: a change over the blast radius limit, a protected path or an
+  # unresolved finding still goes to a person. "false" keeps every root for a human.
+  MERGE_TRAIN_STACK_ROOT_AUTOMERGE: "true"
   # "true" logs the move the train would make and makes none. For trying the train on a
   # repository before letting it act.
   MERGE_TRAIN_DRY_RUN: "false"
@@ -752,10 +756,17 @@ jobs:
           GH_TOKEN: ${{ steps.app-token.outputs.token }}
           REPO: ${{ github.repository }}
           STACK_BRANCH: ${{ needs.check-stack-branch.outputs.stack-branch }}
+          DEFAULT_BRANCH: ${{ github.event.repository.default_branch || 'main' }}
           ISSUE_NUMBER: ${{ needs.classify.outputs.issue-number }}
           ATTEMPTS: ${{ needs.classify.outputs.attempts }}
         run: |
           set -euo pipefail
+          # A dispatch on the feature ref runs the feature branch's own copy of the workflows, so a
+          # branch cut before a workflow fix keeps running the old one: Pliny-Bot #774 ran every
+          # tier on glm-5-2 from feat/767 after main had dropped the pin. Bring the default branch
+          # in first. A conflict (409) leaves the branch as it is; the run still goes ahead.
+          code=$(gh api -X POST "repos/$REPO/merges" -f base="$STACK_BRANCH" -f head="$DEFAULT_BRANCH"             -f commit_message="chore: bring $DEFAULT_BRANCH into $STACK_BRANCH before a child runs"             --silent -i 2>/dev/null | head -1 | awk '{print $2}' || true)
+          echo "Merged $DEFAULT_BRANCH into $STACK_BRANCH: HTTP ${code:-unknown} (201 merged, 204 up to date, 409 conflict)"
           gh workflow run agent-implement.lock.yml --repo "$REPO" --ref "$STACK_BRANCH" \
             -f issue-number="$ISSUE_NUMBER" \
             -f attempts_so_far="$ATTEMPTS"
@@ -922,6 +933,7 @@ jobs:
           hold-label: ${{ env.MERGE_TRAIN_HOLD_LABEL }}
           max-gate-attempts: ${{ env.MAX_GATE_ATTEMPTS }}
           max-retries: ${{ env.MERGE_TRAIN_MAX_RETRIES }}
+          stack-root-automerge: ${{ env.MERGE_TRAIN_STACK_ROOT_AUTOMERGE }}
           max-repairs: ${{ env.MERGE_TRAIN_REPAIRS }}
           dry-run: ${{ env.MERGE_TRAIN_DRY_RUN }}
           ci-run-id: ${{ needs.classify.outputs.ci-run-id }}
@@ -1265,7 +1277,7 @@ jobs:
                       if [ "${already:-0}" -gt 0 ]; then
                         echo "Stack #$parent already has a completion announcement; staying silent."
                       else
-                        gh pr comment "$root_pr" --repo "$REPO" --body "Stack complete: all children have merged into the feature branch and CI is green. This root pull request is ready for a human to review and merge into $DEFAULT_BRANCH. $completion_marker"
+                        gh pr comment "$root_pr" --repo "$REPO" --body "Stack complete: all children have merged into the feature branch and CI is green. This root pull request is ready to merge into $DEFAULT_BRANCH: the merge gate decides it next, and a person is asked only when its blast radius or a finding says so. $completion_marker"
                         echo "Stack #$parent complete: announced root PR #$root_pr."
                       fi
                     fi

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plainconceptsplatform/workflows",
-  "version": "1.6.23",
+  "version": "1.6.41",
   "description": "Install and update Platform GitHub agentic workflows.",
   "keywords": [
     "github-actions",