Develop

.changeset/message-document-text-rename.md

@@ -10,8 +10,6 @@
 '@loopstack/dynamic-routing-example-workflow': patch
 '@loopstack/error-retry-example-workflow': patch
 '@loopstack/git-commit-flow-example-workflow': patch
-'@loopstack/hitl-ask-user-example-workflow': patch
-'@loopstack/hitl-confirm-example-workflow': patch
 '@loopstack/mcp-linear-example-workflow': patch
 '@loopstack/module-config-example': patch
 '@loopstack/remote-file-explorer-example-workflow': patch

.changeset/subworkflow-show-option.md

@@ -10,8 +10,6 @@
 '@loopstack/code-agent-example-workflow': patch
 '@loopstack/github-oauth-example': patch
 '@loopstack/google-oauth-example': patch
-'@loopstack/hitl-ask-user-example-workflow': patch
-'@loopstack/hitl-confirm-example-workflow': patch
 '@loopstack/mcp-linear-example-workflow': patch
 '@loopstack/run-sub-workflow-example': patch
 ---

.github/scripts/sync-develop.sh

@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Fast-forward `develop` to `main` after a release.
+# If `develop` is ahead of `main`, open (or reuse) a PR so devs notice.
+#
+# Required env: GH_TOKEN (with `pull-requests: write` on the calling job).
+
+AHEAD=$(git rev-list --count origin/main..origin/develop)
+
+if [ "$AHEAD" -eq 0 ]; then
+  echo "develop has no extra commits — resetting to main"
+  git push origin origin/main:refs/heads/develop --force
+  exit 0
+fi
+
+echo "::warning::develop is $AHEAD commit(s) ahead of main — auto fast-forward skipped. Opening sync PR."
+
+EXISTING=$(gh pr list --base develop --head main --state open --json number --jq '.[0].number')
+if [ -n "$EXISTING" ]; then
+  echo "Sync PR already open: #$EXISTING — skipping create."
+  exit 0
+fi
+
+gh pr create \
+  --base develop \
+  --head main \
+  --title "chore: sync main → develop (auto fast-forward failed)" \
+  --body "The post-release sync job could not fast-forward \`develop\` to \`main\` because \`develop\` is $AHEAD commit(s) ahead.
+
+Merge this PR to bring the latest release commits from \`main\` into \`develop\`."

.github/workflows/release.yml

@@ -129,19 +129,15 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       contents: write
+      pull-requests: write
     steps:
       - name: Checkout
         uses: actions/checkout@v4
         with:
           ref: develop
           fetch-depth: 0
 
-      - name: Reset develop to main
-        run: |
-          AHEAD=$(git rev-list --count origin/main..origin/develop)
-          if [ "$AHEAD" -eq 0 ]; then
-            echo "develop has no extra commits — resetting to main"
-            git push origin origin/main:refs/heads/develop --force
-          else
-            echo "::warning::develop is $AHEAD commit(s) ahead of main — skipping reset to avoid losing work. Merge main into develop manually."
-          fi
+      - name: Reset develop to main or open sync PR
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: .github/scripts/sync-develop.sh