Skip to content

feat: add bidirectional sync workflow #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mearman merged 3 commits into from
Feb 17, 2026
Merged

feat: add bidirectional sync workflow #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
743ff7c
feat: add bidirectional sync workflow
Mearman Feb 17, 2026
c1c7430
feat: add bidirectional sync workflow
Mearman Feb 17, 2026
c8654ed
fix(hooks): add post-rewrite hook to catch lint issues on amends
Mearman Feb 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/prompts/review/03-self-improvement.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ Both types of prompts can be improved through issue creation.

Use the appropriate channel for different types of feedback:

| Channel | When to Use | Example |
|---------|-------------|---------|
| **PR Review** | Code/issues in the current PR's changes | "Line 42 has a bug" |
| **PR Issue Comment** | Meta-feedback about the PR or process | "This PR needs tests" |
| **Separate Issue** | Prompt improvements beyond current PR | "Add security guidelines" |
| Channel | When to Use | Example |
| -------------------- | --------------------------------------- | ------------------------- |
| **PR Review** | Code/issues in the current PR's changes | "Line 42 has a bug" |
| **PR Issue Comment** | Meta-feedback about the PR or process | "This PR needs tests" |
| **Separate Issue** | Prompt improvements beyond current PR | "Add security guidelines" |

**Key distinction:** Feedback about the PR's code goes in the review. Feedback about prompts goes in a separate issue. Do not mix these.

Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/bidirectional-sync.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,20 @@ jobs:
fi

- name: Verify required configuration
env:
SYNC_PRIVATE_KEY: ${{ secrets.SYNC_PRIVATE_KEY }}

@claude claude Bot Feb 17, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good security fix. Moving secrets into environment variables prevents them from appearing in logs if the script encounters errors that echo the command.

APP_ID: ${{ steps.repo.outputs.app_id }}
run: |
if [[ -z "${{ secrets.SYNC_PRIVATE_KEY }}" ]]; then
if [[ -z "$SYNC_PRIVATE_KEY" ]]; then
echo "::error::SYNC_PRIVATE_KEY secret is not set. Please configure it in repo settings."
exit 1
fi
if [[ -z "${{ steps.repo.outputs.app_id }}" ]]; then
if [[ -z "$APP_ID" ]]; then
echo "::error::GitHub App ID variable not set. Configure EXADEV_APP_ID or ADPEAK_APP_ID."
exit 1
fi

- name: Generate GitHub App token for other repo
if: steps.check.outputs.skip != 'true'
uses: tibdex/github-app-token@v2
id: token
with:
Expand All @@ -51,7 +53,6 @@ jobs:

- name: Sync to other repo
id: sync
if: steps.check.outputs.skip != 'true'
env:
TARGET_REPO: ${{ steps.repo.outputs.target }}
TARGET_TOKEN: ${{ steps.token.outputs.token }}
Expand Down Expand Up @@ -84,8 +85,8 @@ jobs:
git config user.email "github-actions[bot]@users.noreply.github.com"

if git rebase target/main 2>/dev/null; then
# Rebase successful - push directly to main
git push target HEAD:main
# Rebase successful - push with ci.skip to prevent triggering workflow loop
git push target HEAD:main -o ci.skip

@claude claude Bot Feb 17, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The -o ci.skip push option doesn't exist in GitHub. To skip workflow triggers, include [skip ci], [ci skip], [no ci], [skip actions], or [actions skip] in commit messages instead.

However, you can't modify commit messages during git rebase of others' commits. This workflow will create an infinite loop: ExaDev pushes → triggers adpeak workflow → adpeak pushes → triggers ExaDev workflow.

You need loop prevention. Options:

  1. Check commit messages for a sync marker (e.g., skip if any commit contains [sync from)
  2. Check if commits were authored by github-actions[bot]
  3. Use a repository variable or separate sync token to detect sync commits
Suggested change
git push target HEAD:main -o ci.skip
# Rebase successful - push directly to main
git push target HEAD:main

echo "skip_pr=true" >> "$GITHUB_OUTPUT"
echo "::notice::Successfully rebased and synced ${COMMITS_BEHIND} commit(s) to ${TARGET_REPO}"
else
Expand Down
4 changes: 4 additions & 0 deletions .husky/post-rewrite
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/sh
# Run lint-staged after git commit --amend or rebase
# This catches formatting issues that pre-commit missed
npx lint-staged

@claude claude Bot Feb 17, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct solution. The pre-commit hook does not run on git commit --amend, so formatting issues can slip through. The post-rewrite hook runs after amends and rebases, catching these issues.

One consideration: this will run lint-staged after every rewritten commit during an interactive rebase, which could slow down multi-commit rebases. This is standard behavior and acceptable.