Branch Puller

Branch Puller Skill

Your responsibility is to pull Git branches from remote repositories with intelligent conflict handling. You handle automatic conflict resolution using configurable strategies, rebase operations, and safe merge modes.

You are invoked by:

• The repo-manager agent for programmatic pull operations
• The /repo:pull command for user-initiated pulls
• FABER workflow managers when they need to sync with remote changes

You delegate to the active source control handler to perform platform-specific Git pull operations.

1. Conflict Resolution

   • ALWAYS use configured strategy for conflict resolution
   • ALWAYS warn before auto-resolving conflicts
   • ALWAYS provide clear feedback on what was done
   • NEVER silently resolve conflicts without reporting

2. Safe Defaults

   • ALWAYS default to auto-merge-prefer-remote (remote wins)
   • ALWAYS check for uncommitted changes before pulling
   • ALWAYS verify branch exists on remote
   • NEVER lose local uncommitted work

3. Rebase Safety

   • ALWAYS warn before rebasing
   • ALWAYS check if branch is shared/published
   • ALWAYS verify rebase completed successfully
   • NEVER leave repository in broken rebase state

4. Handler Invocation

   • ALWAYS load configuration to determine active handler
   • ALWAYS invoke the correct handler-source-control-{platform} skill
   • ALWAYS pass validated parameters to handler
   • ALWAYS return structured responses

5. Network & Auth

   • ALWAYS verify authentication before pulling
   • ALWAYS handle network errors gracefully
   • ALWAYS provide clear error messages for auth failures
   • NEVER proceed without valid credentials

{
  "operation": "pull-branch",
  "parameters": {
    "branch_name": "feat/123-add-export",
    "remote": "origin",
    "rebase": false,
    "strategy": "auto-merge-prefer-remote"
  }
}

Optional Parameters:

• branch_name (string) - Name of branch to pull (default: current branch)
• remote (string) - Remote name (default: "origin")
• rebase (boolean) - Use rebase instead of merge (default: false). PRECEDENCE: If true, overrides strategy to "rebase"
• strategy (string) - Conflict resolution strategy (default: "auto-merge-prefer-remote")
  • auto-merge-prefer-remote - Merge preferring remote changes (DEFAULT)
  • auto-merge-prefer-local - Merge preferring local changes
  • rebase - Rebase local commits onto remote
  • manual - Fetch and merge without auto-resolution
  • fail - Fail if conflicts would occur
• allow_switch (boolean) - Allow switching branches with uncommitted changes (default: false). SECURITY: Defaults to false to prevent accidental commits on wrong branch

1. OUTPUT START MESSAGE:

🎯 STARTING: Branch Puller
Branch: {branch_name}
Remote: {remote}
Strategy: {strategy}
Rebase: {rebase}
───────────────────────────────────────

2. LOAD CONFIGURATION:

Load repo configuration to determine:

• Active handler platform (github|gitlab|bitbucket)
• Default remote name
• Pull sync strategy
• Protected branches list
• Rebase policies

Use repo-common skill to load configuration.

Note: If config doesn't exist, defaults will be used (including pull_sync_strategy: "auto-merge-prefer-remote")

3. VALIDATE INPUTS:

Branch Validation:

• If branch_name not provided, use current branch (git rev-parse --abbrev-ref HEAD)
• Check branch_name exists locally
• SECURITY: If switching branches with uncommitted changes:
  • FAIL by default (exit code 2) unless allow_switch=true
  • Show clear error message with 3 options: commit, stash, or use --allow-switch
  • If allow_switch=true, warn that uncommitted changes will be carried over
• Check for uncommitted changes on same branch (warn if present)

Remote Validation:

• Verify remote exists in Git config
• Check remote is accessible
• Validate remote URL format
• Verify branch exists on remote

Strategy Validation:

• Validate strategy is one of the allowed values
• PRECEDENCE: If rebase=true, override strategy to "rebase" (--rebase flag takes precedence over --strategy)
• Check if strategy is compatible with current state

4. CHECK FOR UNCOMMITTED CHANGES:

if git status --porcelain | grep -q '^'; then
    WARN: "Warning: You have uncommitted changes. They will be preserved during pull."
    # Optionally stash if requested
fi

5. CHECK REMOTE BRANCH:

Verify the remote branch exists and is reachable:

git fetch {remote}
if ! git rev-parse {remote}/{branch_name} >/dev/null 2>&1; then
    ERROR: "Remote branch does not exist: {remote}/{branch_name}"
    EXIT CODE 1
fi

6. VALIDATE STRATEGY:

Check if selected strategy is appropriate:

• If no conflicts expected, any strategy works
• If conflicts exist, apply selected strategy
• Warn for potentially destructive strategies (auto-merge with conflicts)

7. CHECK AUTHENTICATION:

Verify credentials before attempting pull:

• Check Git credentials cached or available
• Verify platform API token (if needed)
• Test remote connectivity

8. INVOKE HANDLER:

Invoke the active source control handler skill.

IMPORTANT: You MUST use the Skill tool to invoke the handler. The handler skill name is constructed as follows:

1. Read the platform from config: config.handlers.source_control.active (e.g., "github")
2. Construct the full skill name: fractary-repo:handler-source-control-<platform>
3. For example, if platform is "github", invoke: fractary-repo:handler-source-control-github

DO NOT use any other handler name pattern. The correct pattern is always fractary-repo:handler-source-control-<platform>.

Use the Skill tool with:

• command: fractary-repo:handler-source-control-<platform> (where is from config)
• Pass parameters: {branch_name, remote, rebase, strategy}

The handler will:

• Fetch latest changes from remote
• Apply configured strategy for conflict resolution:
  • auto-merge-prefer-remote: Pull with -X theirs (remote wins)
  • auto-merge-prefer-local: Pull with -X ours (local wins)
  • rebase: Pull with --rebase
  • manual: Pull without auto-resolution
  • fail: Check for conflicts first, abort if found
• Handle merge conflicts according to strategy
• Report actions taken
• Return pull status and details

9. VALIDATE RESPONSE:

• Check handler returned success status
• Verify branch was updated successfully
• Check for any conflicts that need attention
• Verify working tree is clean (unless manual strategy)

10. CHECK CONFIG AND OUTPUT COMPLETION MESSAGE:

Check if configuration file exists using repo-common:check-config-exists utility.

If config_exists is false, include the recommendation in completion message:

✅ COMPLETED: Branch Puller
Branch Updated: {branch_name} ← {remote}/{branch_name}
Strategy Used: {strategy}
Commits Pulled: {commit_count}
───────────────────────────────────────
Next: Continue working on your changes

💡 Tip: Run /repo:init to create a configuration file for this repository.
   This allows you to customize pull strategies, branch naming, and other plugin settings.

If config exists, omit the recommendation:

✅ COMPLETED: Branch Puller
Branch Updated: {branch_name} ← {remote}/{branch_name}
Strategy Used: {strategy}
Commits Pulled: {commit_count}
───────────────────────────────────────
Next: Continue working on your changes

If conflicts require manual resolution:

⚠️  COMPLETED WITH CONFLICTS: Branch Puller
Branch Updated: {branch_name} ← {remote}/{branch_name}
Strategy Used: manual
Commits Pulled: {commit_count}
───────────────────────────────────────
Files with conflicts:
  - {file1}
  - {file2}

Next: Resolve conflicts manually
  1. Edit conflicted files
  2. git add <resolved-files>
  3. git commit

Success Response:

{
  "status": "success",
  "operation": "pull-branch",
  "branch_name": "feat/123-add-export",
  "remote": "origin",
  "strategy": "auto-merge-prefer-remote",
  "commits_pulled": 3,
  "platform": "github"
}

Success with Manual Conflicts:

{
  "status": "success",
  "operation": "pull-branch",
  "branch_name": "feat/123-add-export",
  "remote": "origin",
  "strategy": "manual",
  "commits_pulled": 3,
  "conflicted_files": ["src/app.js", "src/utils.js"],
  "platform": "github"
}

Error Response:

{
  "status": "failure",
  "operation": "pull-branch",
  "error": "Remote branch does not exist: origin/feat/123-add-export",
  "error_code": 1
}

• handler-source-control-github: GitHub pull operations via Git CLI
• handler-source-control-gitlab: GitLab pull operations (stub)
• handler-source-control-bitbucket: Bitbucket pull operations (stub)

The active handler is determined by configuration: config.handlers.source_control.active

Invalid Inputs (Exit Code 2):

• Not on a branch: "Error: Not on a branch and no branch name provided"
• Branch doesn't exist: "Error: Branch does not exist: {branch_name}"
• Invalid remote: "Error: Remote does not exist: {remote}"
• Invalid strategy: "Error: Invalid strategy: {strategy}"

Remote Branch Not Found (Exit Code 1):

• No remote branch: "Error: Remote branch does not exist: {remote}/{branch_name}"
• Branch not tracked: "Error: Branch has no upstream tracking. Use /repo:push --set-upstream first"

Authentication Error (Exit Code 11):

• No credentials: "Error: Git credentials not found. Run 'git config credential.helper' to configure."
• Invalid token: "Error: Platform API token invalid or expired"
• Permission denied: "Error: Permission denied. Check your access rights to {remote}"

Network Error (Exit Code 12):

• Connection failed: "Error: Failed to connect to remote: {remote}"
• Timeout: "Error: Pull operation timed out"
• DNS resolution: "Error: Could not resolve hostname: {remote_host}"

Merge Conflict Error (Exit Code 13):

• Unresolved conflicts (strategy=fail): "Error: Merge conflicts detected. Use different strategy or resolve manually."
• Rebase conflicts: "Error: Rebase conflicts detected. Resolve manually: git rebase --continue"

Configuration Error (Exit Code 3):

• Failed to load config: "Error: Failed to load configuration"
• Invalid platform: "Error: Invalid source control platform: {platform}"
• Handler not found: "Error: Handler not found for platform: {platform}"

Handler Error (Exit Code 1):

• Pass through handler error: "Error: Handler failed - {handler_error}"

Example 1: Pull Current Branch (Default Strategy)

INPUT:
{
  "operation": "pull-branch",
  "parameters": {
    "remote": "origin"
  }
}

# Assuming current branch is feat/123-user-export
OUTPUT:
{
  "status": "success",
  "operation": "pull-branch",
  "branch_name": "feat/123-user-export",
  "remote": "origin",
  "strategy": "auto-merge-prefer-remote",
  "commits_pulled": 2
}

Example 2: Pull Specific Branch with Rebase

INPUT:
{
  "operation": "pull-branch",
  "parameters": {
    "branch_name": "feat/456-dashboard",
    "remote": "origin",
    "rebase": true
  }
}

OUTPUT:
{
  "status": "success",
  "operation": "pull-branch",
  "branch_name": "feat/456-dashboard",
  "remote": "origin",
  "strategy": "rebase",
  "commits_pulled": 3
}

Example 3: Pull with Auto-Merge Prefer Remote

INPUT:
{
  "operation": "pull-branch",
  "parameters": {
    "branch_name": "fix/789-auth-bug",
    "remote": "origin",
    "strategy": "auto-merge-prefer-remote"
  }
}

OUTPUT:
{
  "status": "success",
  "operation": "pull-branch",
  "branch_name": "fix/789-auth-bug",
  "remote": "origin",
  "strategy": "auto-merge-prefer-remote",
  "commits_pulled": 5
}

Example 4: Pull with Manual Conflict Resolution

INPUT:
{
  "operation": "pull-branch",
  "parameters": {
    "branch_name": "feat/999-new-feature",
    "remote": "origin",
    "strategy": "manual"
  }
}

OUTPUT:
{
  "status": "success",
  "operation": "pull-branch",
  "branch_name": "feat/999-new-feature",
  "remote": "origin",
  "strategy": "manual",
  "commits_pulled": 2,
  "conflicted_files": ["src/app.js"]
}

Example 5: Pull with Fail Strategy (Conflicts Exist)

INPUT:
{
  "operation": "pull-branch",
  "parameters": {
    "branch_name": "feat/888-risky-change",
    "remote": "origin",
    "strategy": "fail"
  }
}

OUTPUT:
{
  "status": "failure",
  "operation": "pull-branch",
  "error": "Merge conflicts detected. Use different strategy or resolve manually.",
  "error_code": 13,
  "conflicted_files": ["src/core.js", "src/utils.js"]
}

Strategy: auto-merge-prefer-remote (DEFAULT)

• Uses git pull -X theirs
• Remote changes win in conflicts
• Recommended for staying in sync with main/shared branches
• Safe default that respects committed work

Strategy: auto-merge-prefer-local

• Uses git pull -X ours
• Local changes win in conflicts
• Use when you're confident your changes are correct
• Good for merging feature branches into your branch

Strategy: rebase

• Uses git pull --rebase
• Replays local commits on top of remote
• Creates cleaner, linear history
• Preferred for feature branches before PR

Strategy: manual

• Fetches and merges without auto-resolution
• User must resolve conflicts manually
• Most control, but requires manual work
• Best for complex conflicts needing careful review

Strategy: fail

• Checks for conflicts first
• Aborts if any conflicts detected
• Safest option, no automatic changes
• Good for CI/CD or automated workflows

Called By:

• repo-manager agent - For programmatic pull operations
• /repo:pull command - For user-initiated pulls
• FABER workflow managers - When syncing with remote changes

Calls:

• repo-common skill - For configuration loading
• handler-source-control-{platform} skill - For platform-specific pull operations

Does NOT Call:

• branch-manager (branch operations are separate)
• commit-creator (commits are separate from pulling)
• branch-pusher (push operations are separate)

Context Efficiency

This skill is focused on pull operations:

• Skill prompt: ~500 lines
• No script execution in context (delegated to handler)
• Clear conflict resolution strategies
• Structured error handling

By separating pull operations:

• Independent pull testing
• Clear strategy boundaries
• Better conflict handling
• Safe default behavior