pull

pull

Pull latest commits from origin, committing local changes first, merging conflicts, and running setup scripts.

SUBMODULE MODE: If a submodule name is provided (e.g., /pull foundation), scope operations to that submodule only, not the main repository.

Configuration is read from foundation-config.yaml.

If submodule name provided:

1. Check if submodule exists: git submodule status <submodule-name>
2. Change to submodule directory: cd <submodule-name>
3. Run pull workflow in submodule context
4. Exit after submodule pull (do NOT pull main repository)

If no submodule name provided, proceed with main repository pull workflow below.

Workflow Overview

1. Commit local changes using foundation commit command (if any uncommitted changes)
2. Fetch latest from origin
3. Pull latest commits (merge or rebase based on configuration)
4. Resolve merge conflicts if they occur
5. Run setup scripts as needed

Tasks

Step 1: Determine Scope

If submodule name provided:

1. Verify submodule exists:

   if ! git submodule status <submodule-name> >/dev/null 2>&1; then
     echo "❌ Submodule not found: <submodule-name>"
     exit 1
   fi
   

2. Save parent directory and change to submodule directory:

   ORIGINAL_DIR=$(pwd)  # Save parent directory before cd
   cd <submodule-name> || exit 1
   

3. Update scope context (all subsequent operations in submodule)

If no submodule name provided, proceed with main repository context.

Step 2: Check for Uncommitted Changes

# Check if there are uncommitted changes
if git status --porcelain | grep -q .; then
  echo "📝 Found uncommitted changes, committing first..."
  
  # Use foundation commit command to commit changes
  # Agent should invoke the commit command workflow:
  # - Run security audit
  # - Stage changes
  # - Generate commit message
  # - Commit changes
  # - Push to origin if configured
  
  # For agent: Use the foundation commit command workflow
  # Invoke: `/commit <submodule-name>` (if submodule) or `/commit` (if main repo)
  
  echo "✅ Local changes committed"
else
  echo "✅ No uncommitted changes"
fi