@revotools/cli 0.6.0 → 0.6.1

package/dist/revo

@@ -8,7 +8,7 @@ set -euo pipefail
 # Exit cleanly on SIGPIPE (e.g., revo clone | grep, revo status | head)
 trap 'exit 0' PIPE
 
-REVO_VERSION="0.6.0"
+REVO_VERSION="0.6.1"
 
 
 # === lib/ui.sh ===
@@ -481,6 +481,7 @@ YAML_REPO_URLS=()
 YAML_REPO_PATHS=()
 YAML_REPO_TAGS=()
 YAML_REPO_DEPS=()
+YAML_REPO_BRANCHES=()
 
 yaml_parse() {
     local file="$1"
@@ -497,6 +498,7 @@ yaml_parse() {
     YAML_REPO_PATHS=()
     YAML_REPO_TAGS=()
     YAML_REPO_DEPS=()
+    YAML_REPO_BRANCHES=()
 
     if [[ ! -f "$file" ]]; then
         return 1
@@ -550,6 +552,7 @@ yaml_parse() {
                 YAML_REPO_PATHS[$current_index]=$(yaml_path_from_url "$url")
                 YAML_REPO_TAGS[$current_index]=""
                 YAML_REPO_DEPS[$current_index]=""
+                YAML_REPO_BRANCHES[$current_index]=""
                 YAML_REPO_COUNT=$((YAML_REPO_COUNT + 1))
                 continue
             fi
@@ -573,6 +576,8 @@ yaml_parse() {
                     deps_str="${deps_str//\"/}"
                     deps_str="${deps_str//\'/}"
                     YAML_REPO_DEPS[$current_index]="$deps_str"
+                elif [[ "$trimmed" =~ ^branch:[[:space:]]*(.+)$ ]]; then
+                    YAML_REPO_BRANCHES[$current_index]="${BASH_REMATCH[1]}"
                 fi
             fi
         fi
@@ -648,6 +653,12 @@ yaml_get_deps() {
     printf '%s' "${YAML_REPO_DEPS[$idx]:-}"
 }
 
+# Get repo default branch by index (empty means use workspace default)
+yaml_get_branch() {
+    local idx="$1"
+    printf '%s' "${YAML_REPO_BRANCHES[$idx]:-}"
+}
+
 # Find repo index by name (path basename)
 # Usage: idx=$(yaml_find_by_name "backend")
 # Returns: index or -1 if not found
@@ -681,6 +692,7 @@ yaml_write() {
             local path="${YAML_REPO_PATHS[$i]}"
             local tags="${YAML_REPO_TAGS[$i]}"
             local deps="${YAML_REPO_DEPS[$i]:-}"
+            local branch="${YAML_REPO_BRANCHES[$i]:-}"
 
             printf '  - url: %s\n' "$url"
 
@@ -700,6 +712,11 @@ yaml_write() {
             if [[ -n "$deps" ]]; then
                 printf '    depends_on: [%s]\n' "$deps"
             fi
+
+            # Write branch if it differs from the workspace default
+            if [[ -n "$branch" ]] && [[ "$branch" != "$YAML_DEFAULTS_BRANCH" ]]; then
+                printf '    branch: %s\n' "$branch"
+            fi
         done
 
         printf '\ndefaults:\n'
@@ -708,12 +725,13 @@ yaml_write() {
 }
 
 # Add a repo to the config
-# Usage: yaml_add_repo "url" "path" "tags" "deps"
+# Usage: yaml_add_repo "url" "path" "tags" "deps" ["branch"]
 yaml_add_repo() {
     local url="$1"
     local path="${2:-}"
     local tags="${3:-}"
     local deps="${4:-}"
+    local branch="${5:-}"
 
     local idx=$YAML_REPO_COUNT
 
@@ -725,6 +743,7 @@ yaml_add_repo() {
     YAML_REPO_PATHS[$idx]="$path"
     YAML_REPO_TAGS[$idx]="$tags"
     YAML_REPO_DEPS[$idx]="$deps"
+    YAML_REPO_BRANCHES[$idx]="$branch"
 
     YAML_REPO_COUNT=$((YAML_REPO_COUNT + 1))
 }
@@ -826,6 +845,7 @@ config_init() {
     YAML_REPO_PATHS=()
     YAML_REPO_TAGS=()
     YAML_REPO_DEPS=()
+    YAML_REPO_BRANCHES=()
 
     # Create directory structure
     mkdir -p "$REVO_REPOS_DIR"
@@ -967,11 +987,25 @@ config_workspace_name() {
     printf '%s' "$YAML_WORKSPACE_NAME"
 }
 
-# Get default branch
+# Get workspace default branch
 config_default_branch() {
     printf '%s' "$YAML_DEFAULTS_BRANCH"
 }
 
+# Get effective default branch for a specific repo
+# Falls back to workspace default if no per-repo branch is set
+# Usage: branch=$(config_repo_default_branch "repo_index")
+config_repo_default_branch() {
+    local idx="$1"
+    local branch
+    branch=$(yaml_get_branch "$idx")
+    if [[ -n "$branch" ]]; then
+        printf '%s' "$branch"
+    else
+        printf '%s' "$YAML_DEFAULTS_BRANCH"
+    fi
+}
+
 # === lib/git.sh ===
 # Revo CLI - Git Operations
 # Wrapper functions for git commands with consistent error handling
@@ -1180,6 +1214,34 @@ git_remote_url() {
     git -C "$repo_dir" remote get-url origin 2>/dev/null
 }
 
+# Detect the default branch for a cloned repo
+# Tries symbolic-ref first, then falls back to checking main/master
+# Usage: branch=$(git_default_branch "repo_dir")
+git_default_branch() {
+    local repo_dir="$1"
+    local ref
+
+    # Best source: what the remote says HEAD points to
+    ref=$(git -C "$repo_dir" symbolic-ref refs/remotes/origin/HEAD 2>/dev/null)
+    if [[ -n "$ref" ]]; then
+        printf '%s' "${ref##*/}"
+        return 0
+    fi
+
+    # Fallback: check which of main/master exists
+    if git -C "$repo_dir" rev-parse --verify origin/main >/dev/null 2>&1; then
+        printf '%s' "main"
+        return 0
+    fi
+    if git -C "$repo_dir" rev-parse --verify origin/master >/dev/null 2>&1; then
+        printf '%s' "master"
+        return 0
+    fi
+
+    # Last resort: whatever branch we're on
+    git -C "$repo_dir" rev-parse --abbrev-ref HEAD 2>/dev/null
+}
+
 # Check if branch exists (local or remote)
 # Usage: if git_branch_exists "repo_dir" "branch_name"; then ...
 git_branch_exists() {
@@ -1733,8 +1795,10 @@ cmd_init() {
             fi
 
             tags=$(_init_auto_tags "$dir" "$name")
-            yaml_add_repo "$remote" "$path" "$tags" ""
-            ui_step_done "Detected:" "$name → $remote"
+            local branch
+            branch=$(git_default_branch "$dir")
+            yaml_add_repo "$remote" "$path" "$tags" "" "$branch"
+            ui_step_done "Detected:" "$name → $remote (branch: $branch)"
             detected_count=$((detected_count + 1))
         done <<< "$_INIT_FOUND_DIRS"
 
@@ -1839,8 +1903,10 @@ cmd_detect() {
             ln -s "../$name" "repos/$name"
         fi
 
-        yaml_add_repo "$remote" "$name" "$tags" ""
-        ui_step_done "Found:" "$name ($remote)"
+        local branch
+        branch=$(git_default_branch "$d")
+        yaml_add_repo "$remote" "$name" "$tags" "" "$branch"
+        ui_step_done "Found:" "$name ($remote, branch: $branch)"
         found=$((found + 1))
     done
 
@@ -1860,8 +1926,10 @@ cmd_detect() {
             done
             [[ $already -eq 1 ]] && continue
             remote=$(cd "$d" && git remote get-url origin 2>/dev/null || echo "local://$d")
-            yaml_add_repo "$remote" "$name" "$name" ""
-            ui_step_done "Found:" "$name ($remote)"
+            local branch
+            branch=$(git_default_branch "$d")
+            yaml_add_repo "$remote" "$name" "$name" "" "$branch"
+            ui_step_done "Found:" "$name ($remote, branch: $branch)"
             found=$((found + 1))
         done
     fi
@@ -1966,7 +2034,13 @@ cmd_clone() {
         local clone_err
         if clone_err=$(git clone --quiet "$url" "$full_path" 2>&1); then
             ui_spinner_stop
-            ui_step_done "Cloned:" "$path"
+            # Detect and store the repo's default branch
+            local detected_branch
+            detected_branch=$(git_default_branch "$full_path")
+            if [[ -n "$detected_branch" ]]; then
+                YAML_REPO_BRANCHES[$repo]="$detected_branch"
+            fi
+            ui_step_done "Cloned:" "$path (branch: ${detected_branch:-$YAML_DEFAULTS_BRANCH})"
             success_count=$((success_count + 1))
         else
             ui_spinner_error "Failed to clone: $path"
@@ -1977,9 +2051,12 @@ cmd_clone() {
         fi
     done <<< "$repos"
 
-    # Always regenerate the workspace CLAUDE.md after a clone batch so that
-    # newly cloned repos appear in the context immediately.
+    # Persist any newly detected per-repo branches and regenerate CLAUDE.md
+    # so newly cloned repos appear in the context immediately.
     if [[ $fail_count -eq 0 ]] && { [[ $success_count -gt 0 ]] || [[ $skip_count -gt 0 ]]; }; then
+        if [[ $success_count -gt 0 ]]; then
+            config_save
+        fi
         context_regenerate_silent
     fi
 
@@ -2268,6 +2345,12 @@ cmd_checkout() {
             continue
         fi
 
+        # Resolve "default" to each repo's own default branch
+        local target="$branch_name"
+        if [[ "$target" == "default" ]]; then
+            target=$(config_repo_default_branch "$repo")
+        fi
+
         # Check for uncommitted changes
         if git_is_dirty "$full_path" && [[ $force -eq 0 ]]; then
             ui_step_error "Uncommitted changes: $path"
@@ -2277,15 +2360,15 @@ cmd_checkout() {
         fi
 
         # Check if branch exists
-        if ! git_branch_exists "$full_path" "$branch_name"; then
-            ui_step_error "Branch not found: $path"
+        if ! git_branch_exists "$full_path" "$target"; then
+            ui_step_error "Branch not found: $path ($target)"
             fail_count=$((fail_count + 1))
             continue
         fi
 
         # Checkout
-        if git_checkout "$full_path" "$branch_name"; then
-            ui_step_done "Checked out:" "$path → $branch_name"
+        if git_checkout "$full_path" "$target"; then
+            ui_step_done "Checked out:" "$path → $target"
             success_count=$((success_count + 1))
         else
             ui_step_error "Failed: $path - $GIT_ERROR"
@@ -2899,6 +2982,17 @@ _context_write_file() {
         url=$(yaml_get_url "$i")
         full_path="$REVO_REPOS_DIR/$path"
 
+        local branch
+        branch=$(yaml_get_branch "$i")
+
+        # Backfill: detect default branch for cloned repos that don't have one stored
+        if [[ -z "$branch" ]] && [[ -d "$full_path" ]]; then
+            branch=$(git_default_branch "$full_path")
+            if [[ -n "$branch" ]]; then
+                YAML_REPO_BRANCHES[$i]="$branch"
+            fi
+        fi
+
         {
             printf '### %s\n' "$path"
 
@@ -2906,6 +3000,9 @@ _context_write_file() {
                 printf -- '- **Tags:** %s\n' "$tags"
             fi
             printf -- '- **Path:** repos/%s\n' "$path"
+            if [[ -n "$branch" ]] && [[ "$branch" != "$YAML_DEFAULTS_BRANCH" ]]; then
+                printf -- '- **Default branch:** %s\n' "$branch"
+            fi
             if [[ -n "$deps" ]]; then
                 printf -- '- **Depends on:** %s\n' "$deps"
             fi
@@ -3151,6 +3248,8 @@ cmd_context() {
 
     ui_spinner_start "Scanning $YAML_REPO_COUNT repositories..."
     _context_write_file "$output"
+    # Persist any newly detected per-repo branches back to revo.yaml
+    config_save
     ui_spinner_stop
     ui_step_done "Scanned:" "$YAML_REPO_COUNT repositories"
     ui_step_done "Wrote:" "CLAUDE.md"
@@ -3286,10 +3385,10 @@ cmd_feature() {
             printf '# Feature: %s\n' "$name"
             printf '\n'
             printf '## Status\n'
-            printf '- Created: %s\n' "$timestamp"
-            printf '- Branch: %s\n' "$branch"
+            printf -- '- Created: %s\n' "$timestamp"
+            printf -- '- Branch: %s\n' "$branch"
             if [[ -n "$tag" ]]; then
-                printf '- Tag filter: %s\n' "$tag"
+                printf -- '- Tag filter: %s\n' "$tag"
             fi
             printf '\n'
             printf '## Repos\n'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@revotools/cli",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "Claude-first multi-repo workspace manager (fork of Mars)",
   "bin": {
     "revo": "./dist/revo"