feat(scripts): Add hybrid workflow automation scripts by DrunkOnJava · Pull Request #246 · DrunkOnJava/ModularHomeInventory

DrunkOnJava · 2025-07-31T22:21:32Z

🛠️ Workflow Automation Scripts

This PR adds essential scripts to support the hybrid workflow model with automation tools.

Scripts added:

1. claude-branch.sh - Smart branch creation

Automatic prefix detection: Detects branch type from name (feat/, fix/, docs/, etc.)
Configurable base branch: Defaults to dev but can target main when needed
Draft PR creation: Optional --pr flag creates draft PR with template
Developer guidance: Shows next steps and commit size limits
GitHub CLI integration: Works with gh for seamless PR creation

2. apply-branch-protection.sh - Branch protection setup

Differentiated rules: Strict for main, relaxed for dev
Main branch protection:
- Requires 1 review approval
- Dismisses stale reviews
- Requires up-to-date branches
- Blocks force pushes
- Requires conversation resolution
Dev branch protection:
- No review requirements
- Allows force pushes (for rebasing)
- Status checks still required
Safety features: Dry-run mode, auto-detection of repo info

Usage examples:

# Create a feature branch
./scripts/claude-branch.sh add-search-feature

# Create a fix branch with draft PR
./scripts/claude-branch.sh fix-navigation --pr

# Create branch from main instead of dev
./scripts/claude-branch.sh critical-hotfix --base main --pr

# Apply branch protection (dry run)
./scripts/apply-branch-protection.sh --dry-run

# Apply branch protection
./scripts/apply-branch-protection.sh

Why these scripts matter:

Reduces friction in following the hybrid workflow
Ensures consistency in branch naming and PR creation
Automates protection setup for new repositories
Guides developers through best practices

This is Part 3 of 5 of the hybrid workflow implementation.

These scripts make it easier for both Claude and human developers to follow the hybrid workflow conventions.

github-actions · 2025-07-31T22:22:13Z

🔍 PR Validation Results

Build Status: ❌ Failed
SwiftLint: ⚠️ Issues found
Project Structure: ❌ Issues found
Compilation: ❌ Failed

This comment was automatically generated by the PR validation workflow.

Copilot

Pull Request Overview

This PR adds two essential bash scripts to support hybrid workflow automation for seamless branch creation and repository protection setup.

Introduces claude-branch.sh for intelligent branch creation with automatic prefix detection and optional draft PR generation
Adds apply-branch-protection.sh for configuring differentiated GitHub branch protection rules between main and dev branches

Reviewed Changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 7 comments.

File	Description
scripts/claude-branch.sh	Smart branch creation script with prefix detection, configurable base branches, and GitHub CLI integration for draft PRs
scripts/apply-branch-protection.sh	Branch protection automation script with differentiated rules for main (strict) and dev (relaxed) branches

Copilot · 2025-07-31T22:22:51Z

scripts/claude-branch.sh

+        BRANCH_NAME="fix/${BRANCH_INPUT#fix-}"
+    elif [[ $BRANCH_INPUT == docs-* ]] || [[ $BRANCH_INPUT == *-docs ]]; then
+        BRANCH_NAME="docs/${BRANCH_INPUT#docs-}"
+    elif [[ $BRANCH_INPUT == test-* ]] || [[ $BRANCH_INPUT == *-test ]]; then
+        BRANCH_NAME="test/${BRANCH_INPUT#test-}"
+    elif [[ $BRANCH_INPUT == chore-* ]] || [[ $BRANCH_INPUT == *-chore ]]; then
+        BRANCH_NAME="chore/${BRANCH_INPUT#chore-}"


The branch name stripping logic is incorrect. For input 'fix-navigation-bug', this produces 'fix/navigation-bug' but for input 'navigation-fix', it produces 'fix/navigation-fix' (not stripping the suffix). The logic should handle both prefix and suffix cases consistently.

Suggested change

BRANCH_NAME="fix/${BRANCH_INPUT#fix-}"

elif [[ $BRANCH_INPUT == docs-* ]] || [[ $BRANCH_INPUT == *-docs ]]; then

BRANCH_NAME="docs/${BRANCH_INPUT#docs-}"

elif [[ $BRANCH_INPUT == test-* ]] || [[ $BRANCH_INPUT == *-test ]]; then

BRANCH_NAME="test/${BRANCH_INPUT#test-}"

elif [[ $BRANCH_INPUT == chore-* ]] || [[ $BRANCH_INPUT == *-chore ]]; then

BRANCH_NAME="chore/${BRANCH_INPUT#chore-}"

BRANCH_NAME="fix/${BRANCH_INPUT#fix-}"

BRANCH_NAME="${BRANCH_NAME%-fix}"

elif [[ $BRANCH_INPUT == docs-* ]] || [[ $BRANCH_INPUT == *-docs ]]; then

BRANCH_NAME="docs/${BRANCH_INPUT#docs-}"

BRANCH_NAME="${BRANCH_NAME%-docs}"

elif [[ $BRANCH_INPUT == test-* ]] || [[ $BRANCH_INPUT == *-test ]]; then

BRANCH_NAME="test/${BRANCH_INPUT#test-}"

BRANCH_NAME="${BRANCH_NAME%-test}"

elif [[ $BRANCH_INPUT == chore-* ]] || [[ $BRANCH_INPUT == *-chore ]]; then

BRANCH_NAME="chore/${BRANCH_INPUT#chore-}"

BRANCH_NAME="${BRANCH_NAME%-chore}"

Copilot · 2025-07-31T22:22:51Z

scripts/claude-branch.sh

+    if [[ $BRANCH_INPUT == fix-* ]] || [[ $BRANCH_INPUT == *-fix ]]; then
+        BRANCH_NAME="fix/${BRANCH_INPUT#fix-}"
+    elif [[ $BRANCH_INPUT == docs-* ]] || [[ $BRANCH_INPUT == *-docs ]]; then
+        BRANCH_NAME="docs/${BRANCH_INPUT#docs-}"


Same issue as with fix branches - the suffix stripping logic is inconsistent. For 'navigation-docs', this produces 'docs/navigation-docs' instead of 'docs/navigation'.

Suggested change

BRANCH_NAME="docs/${BRANCH_INPUT#docs-}"

BRANCH_NAME="docs/${BRANCH_INPUT#docs-}"

BRANCH_NAME="${BRANCH_NAME%-docs}"

Copilot · 2025-07-31T22:22:51Z

scripts/claude-branch.sh

+    elif [[ $BRANCH_INPUT == docs-* ]] || [[ $BRANCH_INPUT == *-docs ]]; then
+        BRANCH_NAME="docs/${BRANCH_INPUT#docs-}"
+    elif [[ $BRANCH_INPUT == test-* ]] || [[ $BRANCH_INPUT == *-test ]]; then
+        BRANCH_NAME="test/${BRANCH_INPUT#test-}"


Same suffix stripping issue affects test branches. The logic should properly handle both 'test-feature' and 'feature-test' patterns.

Suggested change

BRANCH_NAME="test/${BRANCH_INPUT#test-}"

BRANCH_NAME="test/${BRANCH_INPUT#test-}"

BRANCH_NAME="${BRANCH_NAME%-test}"

Copilot · 2025-07-31T22:22:52Z

scripts/claude-branch.sh

+    elif [[ $BRANCH_INPUT == test-* ]] || [[ $BRANCH_INPUT == *-test ]]; then
+        BRANCH_NAME="test/${BRANCH_INPUT#test-}"
+    elif [[ $BRANCH_INPUT == chore-* ]] || [[ $BRANCH_INPUT == *-chore ]]; then
+        BRANCH_NAME="chore/${BRANCH_INPUT#chore-}"


Same suffix stripping issue affects chore branches. The logic should properly handle both 'chore-task' and 'task-chore' patterns.

Suggested change

BRANCH_NAME="chore/${BRANCH_INPUT#chore-}"

BRANCH_NAME="chore/${BRANCH_INPUT#chore-}"

BRANCH_NAME="${BRANCH_NAME%-chore}"

Copilot · 2025-07-31T22:22:52Z

scripts/apply-branch-protection.sh

+# Check for required tools
+if ! command -v jq &> /dev/null; then
+    echo -e "${RED}❌ Error: jq is required but not installed${NC}"
+    echo "Install with: brew install jq"
+    exit 1
+fi
+
+if ! command -v curl &> /dev/null; then
+    echo -e "${RED}❌ Error: curl is required but not installed${NC}"
+    exit 1
+fi
+
+# Run main function
+main "$@"


The dependency checks should be moved to the beginning of the main() function or before it's called. Currently, if users run with --help, they'll see the error about missing jq even though they just want to see usage information.

Suggested change

# Check for required tools

if ! command -v jq &> /dev/null; then

echo -e "${RED}❌ Error: jq is required but not installed${NC}"

echo "Install with: brew install jq"

exit 1

fi

if ! command -v curl &> /dev/null; then

echo -e "${RED}❌ Error: curl is required but not installed${NC}"

exit 1

fi

# Run main function

main "$@"

# Run main function

main "$@"

# Check for required tools (moved into main function)

Copilot · 2025-07-31T22:22:52Z

scripts/apply-branch-protection.sh

+    local response=$(curl -s -X PUT \
+        -H "Authorization: token $TOKEN" \
+        -H "Accept: application/vnd.github.v3+json" \
+        -H "Content-Type: application/json" \
+        -d "$settings" \
+        "$GITHUB_API/repos/$OWNER/$REPO/branches/$branch/protection")
+
+    # Check if successful
+    if [[ $(echo "$response" | jq -r '.url // empty') ]]; then


This condition checks if the URL field exists, but GitHub API errors also return JSON with different fields. This could incorrectly report success when the API returns an error. Should check for specific success indicators or HTTP status codes.

Suggested change

local response=$(curl -s -X PUT \

-H "Authorization: token $TOKEN" \

-H "Accept: application/vnd.github.v3+json" \

-H "Content-Type: application/json" \

-d "$settings" \

"$GITHUB_API/repos/$OWNER/$REPO/branches/$branch/protection")

# Check if successful

if [[ $(echo "$response" | jq -r '.url // empty') ]]; then

local response

local http_status

response=$(curl -s -w "%{http_code}" -o /tmp/response_body -X PUT \

-H "Authorization: token $TOKEN" \

-H "Accept: application/vnd.github.v3+json" \

-H "Content-Type: application/json" \

-d "$settings" \

"$GITHUB_API/repos/$OWNER/$REPO/branches/$branch/protection")

http_status=$(tail -n1 <<< "$response")

response=$(cat /tmp/response_body)

# Check if successful

if [[ "$http_status" -eq 200 || "$http_status" -eq 204 ]]; then

Copilot · 2025-07-31T22:22:53Z

scripts/claude-branch.sh

+    else
+        echo -e "${YELLOW}⚠️  GitHub CLI (gh) not found. Install it to auto-create PRs.${NC}"
+        echo -e "${BLUE}Push complete. Create PR manually at:${NC}"
+        echo "https://github.com/$(git remote get-url origin | sed 's/.*github.com[:/]\(.*\)\.git/\1/')/pull/new/$branch_name"


This sed command duplicates the regex logic from get_repo_info() in the other script. Consider extracting a shared function or using a more robust URL parsing approach that's consistent between scripts.

Suggested change

echo "https://github.com/$(git remote get-url origin | sed 's/.*github.com[:/]$.*$\.git/\1/')/pull/new/$branch_name"

repo_name=$(get_repo_name)

echo "https://github.com/$repo_name/pull/new/$branch_name"

Add two essential scripts for the hybrid workflow: 1. claude-branch.sh - Streamlined branch creation - Automatic branch prefix detection (feat/, fix/, docs/, etc.) - Base branch configuration (defaults to dev) - Optional draft PR creation with template - Clear next-steps guidance - Integration with commit size limits 2. apply-branch-protection.sh - GitHub branch protection setup - Different rules for main (strict) vs dev (relaxed) - Main: requires reviews, up-to-date branches, no force push - Dev: no reviews required, allows force push for rebasing - Dry-run mode for testing - Auto-detects repository from git remote These scripts reduce manual setup and ensure consistent workflow adoption. Part 3 of the hybrid workflow implementation. Co-authored-by: Claude <claude@anthropic.com>

github-actions · 2025-07-31T23:11:16Z

🔍 PR Validation Results

Build Status: ✅ Passed
SwiftLint: ⚠️ Issues found
Project Structure: ❌ Issues found
Compilation: ❌ Failed

This comment was automatically generated by the PR validation workflow.

Copilot AI review requested due to automatic review settings July 31, 2025 22:21

Copilot AI reviewed Jul 31, 2025

View reviewed changes

This was referenced Jul 31, 2025

feat(hooks): Add Git hooks installation system #248

Merged

fix(ci): Only run Swift checks on PRs with Swift changes #250

Merged

DrunkOnJava force-pushed the feat/hybrid-workflow-scripts branch from 8315cb8 to 5deb615 Compare July 31, 2025 23:10

DrunkOnJava merged commit e7d5c85 into main Jul 31, 2025
2 of 4 checks passed

DrunkOnJava deleted the feat/hybrid-workflow-scripts branch July 31, 2025 23:12

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(scripts): Add hybrid workflow automation scripts#246

feat(scripts): Add hybrid workflow automation scripts#246
DrunkOnJava merged 1 commit intomainfrom
feat/hybrid-workflow-scripts

DrunkOnJava commented Jul 31, 2025

Uh oh!

github-actions bot commented Jul 31, 2025

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Jul 31, 2025

Uh oh!

Copilot AI Jul 31, 2025

Uh oh!

Copilot AI Jul 31, 2025

Uh oh!

Copilot AI Jul 31, 2025

Uh oh!

Copilot AI Jul 31, 2025

Uh oh!

Copilot AI Jul 31, 2025

Uh oh!

Copilot AI Jul 31, 2025

Uh oh!

github-actions bot commented Jul 31, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

	BRANCH_NAME="docs/${BRANCH_INPUT#docs-}"
	BRANCH_NAME="docs/${BRANCH_INPUT#docs-}"
	BRANCH_NAME="${BRANCH_NAME%-docs}"

	BRANCH_NAME="test/${BRANCH_INPUT#test-}"
	BRANCH_NAME="test/${BRANCH_INPUT#test-}"
	BRANCH_NAME="${BRANCH_NAME%-test}"

	BRANCH_NAME="chore/${BRANCH_INPUT#chore-}"
	BRANCH_NAME="chore/${BRANCH_INPUT#chore-}"
	BRANCH_NAME="${BRANCH_NAME%-chore}"

	echo "https://github.com/$(git remote get-url origin \| sed 's/.github.com[:/]\(.\)\.git/\1/')/pull/new/$branch_name"
	repo_name=$(get_repo_name)
	echo "https://github.com/$repo_name/pull/new/$branch_name"

Conversation

DrunkOnJava commented Jul 31, 2025

🛠️ Workflow Automation Scripts

Scripts added:

1. claude-branch.sh - Smart branch creation

2. apply-branch-protection.sh - Branch protection setup

Usage examples:

Why these scripts matter:

Uh oh!

github-actions bot commented Jul 31, 2025

🔍 PR Validation Results

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Copilot AI Jul 31, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jul 31, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jul 31, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jul 31, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jul 31, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jul 31, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jul 31, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Jul 31, 2025

🔍 PR Validation Results

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants