declapract-typescript-ehmpathy 0.47.27 → 0.47.29

package/dist/practices/cicd-common/best-practice/.agent/repo=.this/role=any/skills/use.apikeys.sh

@@ -1,31 +1,36 @@
-#!/usr/bin/env bash
+#!/bin/sh
 ######################################################################
 # .what = export api keys for integration tests
-# .why = enables running integration tests that require api keys
+# .why = enables tests that require api keys to run
 #
 # usage:
-#   source .agent/repo=.this/role=any/skills/use.apikeys.sh
+#   . .agent/repo=.this/role=any/skills/use.apikeys.sh
 #
 # note:
-#   - must be called with `source` to export vars to current shell
+#   - must be called with `.` or `source` to export vars to current shell
 #   - loads from ~/.config/rhachet/apikeys.env if available
 #   - falls back to .env.local (gitignored) in repo root
 ######################################################################
 
-# fail if not sourced
-if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
-  echo "error: this script must be sourced, not executed"
-  echo "usage: source ${BASH_SOURCE[0]}"
-  exit 1
-fi
+# fail if not sourced (check if $0 matches this file)
+case "$0" in
+  *use.apikeys.sh)
+    echo "error: this file must be sourced, not executed"
+    echo "usage: source $0"
+    exit 1
+    ;;
+esac
+
+# alias source to `.` for posix compat
+source() { . "$@"; }
 
-# try loading from user config first
-if [[ -f ~/.config/rhachet/apikeys.env ]]; then
+# try to load from user config first
+if [ -f ~/.config/rhachet/apikeys.env ]; then
   source ~/.config/rhachet/apikeys.env
   echo "✓ loaded api keys from ~/.config/rhachet/apikeys.env"
 
 # fallback to local gitignored file
-elif [[ -f .env.local ]]; then
+elif [ -f .env.local ]; then
   source .env.local
   echo "✓ loaded api keys from .env.local"
 
@@ -39,20 +44,21 @@ else
   echo "with contents like:"
   echo "  export OPENAI_API_KEY=sk-..."
   echo "  export ANTHROPIC_API_KEY=sk-..."
-  return 1
+  return 1 2>/dev/null || exit 1
 fi
 
 # read required keys from json config if present
 APIKEYS_CONFIG=".agent/repo=.this/role=any/skills/use.apikeys.json"
-if [[ -f "$APIKEYS_CONFIG" ]]; then
-  # extract required keys using jq
+if [ -f "$APIKEYS_CONFIG" ]; then
+  # extract required keys via jq
   REQUIRED_KEYS=$(jq -r '.apikeys.required[]?' "$APIKEYS_CONFIG" 2>/dev/null)
 
   # verify each required key is set
   for KEY in $REQUIRED_KEYS; do
-    if [[ -z "${!KEY}" ]]; then
+    VALUE=$(eval "echo \"\$$KEY\"")
+    if [ -z "$VALUE" ]; then
       echo "⚠ $KEY not set (required by $APIKEYS_CONFIG)"
-      return 1
+      return 1 2>/dev/null || exit 1
     fi
     echo "✓ $KEY set"
   done

package/dist/practices/cicd-common/best-practice/.github/actions/please-release/action.yml

@@ -362,37 +362,80 @@ runs:
         MAIN_SHA=$(gh api "repos/${REPO}/git/ref/heads/main" --jq '.object.sha')
 
         if [ -n "$FOUND_PR" ] && [ "$FOUND_PR" != "null" ]; then
-          PR_NUMBER=$(echo "$FOUND_PR" | jq -r '.number')
-          BRANCH=$(echo "$FOUND_PR" | jq -r '.headRefName')
-          echo "   ├── found-pr: #$PR_NUMBER ($BRANCH)"
-
-          # upsert rebased commit
-          echo "   ├── upserting rebased commit..."
-          COMMIT_SHA=$(upsert_rebased_commit "$BRANCH" "$MAIN_SHA" "chore(release): ${NEXT_VERSION} 🎉")
-          echo "   ├── commit: ${COMMIT_SHA:0:7}"
-
-          # update pr metadata
-          echo "   ├── updating pr metadata..."
-          gh pr edit "$PR_NUMBER" \
-            --title "chore(release): ${NEXT_VERSION} 🎉" \
-            --body "$PR_BODY"
-
-          echo "   ├── ✨ pr updated: #$PR_NUMBER"
-          echo "   └── 🌊 action: updated"
-          echo "action=updated" >> $GITHUB_OUTPUT
-          echo "pr-number=$PR_NUMBER" >> $GITHUB_OUTPUT
+          FOUND_PR_NUMBER=$(echo "$FOUND_PR" | jq -r '.number')
+          FOUND_PR_BRANCH=$(echo "$FOUND_PR" | jq -r '.headRefName')
+          IDEAL_PR_BRANCH="release/${NEXT_VERSION}"
+          echo "   ├── found-pr: #$FOUND_PR_NUMBER ($FOUND_PR_BRANCH)"
+
+          # check if branch name matches expected version
+          if [ "$FOUND_PR_BRANCH" != "$IDEAL_PR_BRANCH" ]; then
+            echo "   ├── branch mismatch: $FOUND_PR_BRANCH != $IDEAL_PR_BRANCH"
+            echo "   ├── recreate pr with correct branch..."
+
+            # close found pr (with comment explaining why)
+            gh pr comment "$FOUND_PR_NUMBER" --body "🫧 closed: version bumped to ${NEXT_VERSION}, recreated pr with branch \`${IDEAL_PR_BRANCH}\`"
+            gh pr close "$FOUND_PR_NUMBER"
+            echo "   ├── closed: #$FOUND_PR_NUMBER"
+
+            # delete found branch (fail fast unless already gone)
+            DELETE_OUTPUT=$(gh api "repos/${REPO}/git/refs/heads/${FOUND_PR_BRANCH}" -X DELETE 2>&1) || {
+              if echo "$DELETE_OUTPUT" | grep -q "Reference does not exist"; then
+                echo "   ├── branch already deleted: $FOUND_PR_BRANCH"
+              else
+                echo "   ├── ⛈️ failed to delete branch: $FOUND_PR_BRANCH"
+                echo "$DELETE_OUTPUT"
+                exit 1
+              fi
+            }
+            echo "   ├── deleted branch: $FOUND_PR_BRANCH"
+
+            # create new branch with correct name
+            echo "   ├── create branch: $IDEAL_PR_BRANCH"
+            COMMIT_SHA=$(upsert_rebased_commit "$IDEAL_PR_BRANCH" "$MAIN_SHA" "chore(release): ${NEXT_VERSION} 🎉")
+            echo "   ├── commit: ${COMMIT_SHA:0:7}"
+
+            # create new pr
+            echo "   ├── create pr..."
+            PR_URL=$(gh pr create \
+              --title "chore(release): ${NEXT_VERSION} 🎉" \
+              --body "$PR_BODY" \
+              --base main \
+              --head "$IDEAL_PR_BRANCH")
+
+            PR_NUMBER=$(echo "$PR_URL" | grep -oE '[0-9]+$')
+            echo "   ├── ✨ pr recreated: #$PR_NUMBER (was #$FOUND_PR_NUMBER)"
+            echo "   └── 🌊 action: recreated"
+            echo "action=recreated" >> $GITHUB_OUTPUT
+            echo "pr-number=$PR_NUMBER" >> $GITHUB_OUTPUT
+          else
+            # branch name matches, update in place
+            echo "   ├── upsert rebased commit..."
+            COMMIT_SHA=$(upsert_rebased_commit "$FOUND_PR_BRANCH" "$MAIN_SHA" "chore(release): ${NEXT_VERSION} 🎉")
+            echo "   ├── commit: ${COMMIT_SHA:0:7}"
+
+            # update pr metadata
+            echo "   ├── update pr metadata..."
+            gh pr edit "$FOUND_PR_NUMBER" \
+              --title "chore(release): ${NEXT_VERSION} 🎉" \
+              --body "$PR_BODY"
+
+            echo "   ├── ✨ pr updated: #$FOUND_PR_NUMBER"
+            echo "   └── 🌊 action: updated"
+            echo "action=updated" >> $GITHUB_OUTPUT
+            echo "pr-number=$FOUND_PR_NUMBER" >> $GITHUB_OUTPUT
+          fi
         else
           BRANCH="release/${NEXT_VERSION}"
           echo "   ├── found-pr: (none)"
           echo "   ├── branch: $BRANCH"
 
           # upsert rebased commit (creates branch if missing)
-          echo "   ├── upserting rebased commit..."
+          echo "   ├── upsert rebased commit..."
           COMMIT_SHA=$(upsert_rebased_commit "$BRANCH" "$MAIN_SHA" "chore(release): ${NEXT_VERSION} 🎉")
           echo "   ├── commit: ${COMMIT_SHA:0:7}"
 
           # create pr
-          echo "   ├── creating pr..."
+          echo "   ├── create pr..."
           PR_URL=$(gh pr create \
             --title "chore(release): ${NEXT_VERSION} 🎉" \
             --body "$PR_BODY" \

package/dist/practices/tests/best-practice/package.json

@@ -9,7 +9,7 @@
     "@swc/jest": "@declapract{check.minVersion('0.2.39')}"
   },
   "scripts": {
-    "test:auth": "[ \"$ECHO\" = 'true' ] && echo 'source .agent/repo=.this/role=any/skills/use.apikeys.sh' || bash -c 'source .agent/repo=.this/role=any/skills/use.apikeys.sh'",
+    "test:auth": "[ \"$ECHO\" = 'true' ] && echo '. .agent/repo=.this/role=any/skills/use.apikeys.sh' || . .agent/repo=.this/role=any/skills/use.apikeys.sh",
     "test:unit": "jest -c ./jest.unit.config.ts --forceExit --verbose --passWithNoTests $([ -z $THOROUGH ] && echo '--changedSince=main') $([ -n $RESNAP ] && echo '--updateSnapshot')",
     "test:integration": "jest -c ./jest.integration.config.ts --forceExit --verbose --passWithNoTests $([ -z $THOROUGH ] && echo '--changedSince=main') $([ -n $RESNAP ] && echo '--updateSnapshot')",
     "test:acceptance:locally": "npm run build && LOCALLY=true jest -c ./jest.acceptance.config.ts --forceExit --verbose --runInBand --passWithNoTests $([ -n $RESNAP ] && echo '--updateSnapshot')",

package/package.json

@@ -2,7 +2,7 @@
   "name": "declapract-typescript-ehmpathy",
   "author": "ehmpathy",
   "description": "declapract best practices declarations for typescript",
-  "version": "0.47.27",
+  "version": "0.47.29",
   "license": "MIT",
   "main": "src/index.js",
   "repository": "ehmpathy/declapract-typescript-ehmpathy",