xgem-cli 2.0.0-alpha.7 → 2.0.0-alpha.8

package/README.md

@@ -49,6 +49,7 @@ xgem doctor ios [path]        Report on iOS build readiness: CocoaPods vs SPM, d
                                targets per config, and whether they're reconciled
 xgem git cmt "message"        Auto-stage, commit, rebase-pull, and push
 xgem git init                 Setup local repo, attach remote tracker shortcuts
+xgem git branch               Pick, create, or switch branches; remembers your choice
 xgem git rm-remote            Drop a configured remote
 xgem git rm-branch            Safely drop local and/or remote branch
 xgem --version                Print xgem's version
@@ -70,7 +71,7 @@ lib/
   doctor.sh    environment + feature detection ("xgem doctor")
   ios.sh       the SwiftPM-aware iOS build engine
   flutter.sh   flutter command group (build/hard-clean/build-runner), delegates iOS builds to ios.sh
-  git.sh       git cmt/init/rm-remote/rm-branch
+  git.sh       git cmt/init/branch/rm-remote/rm-branch
   scaffold.sh  generic clean/build/dev handling for the other, simpler frameworks
 templates/     the actual clean/build/dev script content xgem scaffolds into your project's .xgem-automate/
 ```

package/bin/xgem

@@ -70,6 +70,7 @@ print_usage() {
     echo "  xgem doctor [ios]             - Report on your environment / iOS SwiftPM build readiness"
     echo "  xgem git cmt \"message\"        - Auto-stage, commit, rebase-pull, and push"
     echo "  xgem git init                 - Setup local repo, attach remote tracker shortcuts"
+    echo "  xgem git branch               - Pick, create, or switch branches; remembers your choice"
     echo "  xgem git rm-remote            - Drop specified target remote tracing rules"
     echo "  xgem git rm-branch            - Safely drop local and remote workspace branch states"
     echo "  xgem --version                - Print xgem's version"
@@ -182,7 +183,7 @@ case "${1:-}" in
         ;;
 
     git)
-        [ -n "${2:-}" ] || die "Usage: xgem git <cmt|init|rm-remote|rm-branch>"
+        [ -n "${2:-}" ] || die "Usage: xgem git <cmt|init|branch|rm-remote|rm-branch>"
         cmd_git "$2" "${3:-}"
         exit 0
         ;;

package/bin/xgem.js

@@ -45,6 +45,7 @@ function printUsage() {
     console.log('  xgem doctor [ios]             - Report on your environment / iOS build availability');
     console.log('  xgem git cmt "message"        - Auto-stage, commit, rebase-pull, and push');
     console.log('  xgem git init                 - Setup local repo, attach remote tracker shortcuts');
+    console.log('  xgem git branch               - Pick, create, or switch branches; remembers your choice');
     console.log('  xgem git rm-remote            - Drop specified target remote tracing rules');
     console.log('  xgem git rm-branch            - Safely drop local and remote workspace branch states');
     console.log('  xgem --version                - Print xgem\'s version');
@@ -187,7 +188,7 @@ async function main() {
         case 'run': return cmdRun(a2, a3);
         case 'terminate': return cmdTerminate();
         case 'git':
-            if (!a2) die('Usage: xgem git <cmt|init|rm-remote|rm-branch>');
+            if (!a2) die('Usage: xgem git <cmt|init|branch|rm-remote|rm-branch>');
             return cmdGit(a2, a3);
         case 'doctor': return cmdDoctor(a2);
         case '--version':

package/lib/git.sh

@@ -46,6 +46,29 @@ cmd_git_cmt() {
         return 0
     fi
 
+    # A pull needs something to pull FROM. If this branch has never been
+    # pushed before, there's no remote ref to pull, and `git pull --rebase`
+    # fails with "couldn't find remote ref <branch>" — which is not a
+    # connection problem or a conflict, just a brand-new branch. Check for
+    # that specific case first so it gets its own accurate message instead
+    # of being lumped in with real connectivity failures.
+    git ls-remote --exit-code --heads "$remote_name" "$current_branch" >/dev/null 2>&1
+    local ls_remote_status=$?
+
+    if [ "$ls_remote_status" -eq 2 ]; then
+        log_info "'$current_branch' doesn't exist on '$remote_name' yet — pushing to create it..."
+        if git push -u "$remote_name" "$current_branch"; then
+            log_success "Git workflow complete! Branch created and pushed."
+        else
+            die "Push operation failed."
+        fi
+        return 0
+    elif [ "$ls_remote_status" -ne 0 ]; then
+        log_error "Could not reach '$remote_name' to check for '$current_branch' — this looks like a real connection problem."
+        log_warn "Your commit is safe locally. Re-run 'xgem git cmt' once connectivity is restored, or push manually: git push $remote_name $current_branch"
+        exit 1
+    fi
+
     local ahead_count
     ahead_count=$(git rev-list --count "$remote_name/$current_branch..$current_branch" 2>/dev/null)
     if [ "$ahead_count" = "0" ]; then
@@ -163,13 +186,69 @@ cmd_git_rm_branch() {
     fi
 }
 
-# xgem git <cmt|init|rm-remote|rm-branch> ...
+# cmd_git_branch: lists local branches, lets the user pick one (or create a
+# new one), checks it out, and remembers it as this repo's default so
+# there's a quick way back to it later. `xgem git cmt` always operates on
+# whatever's actually checked out (that's the only thing that's correct for
+# a commit), so this command's job is the checkout + remembering, not
+# changing how cmt picks its branch.
+cmd_git_branch() {
+    local -a branches=()
+    while IFS= read -r line; do
+        [ -n "$line" ] && branches+=("$line")
+    done < <(git branch --format='%(refname:short)' 2>/dev/null)
+
+    [ ${#branches[@]} -gt 0 ] || die "No local branches found."
+
+    local current_branch
+    current_branch=$(git branch --show-current 2>/dev/null)
+
+    echo "Available branches:"
+    local i=1 b
+    for b in "${branches[@]}"; do
+        if [ "$b" = "$current_branch" ]; then
+            echo "$i) $b (current)"
+        else
+            echo "$i) $b"
+        fi
+        i=$((i + 1))
+    done
+    local create_option=$i
+    echo "$create_option) Create new branch"
+
+    local choice
+    read -r -p "Select [1-$create_option]: " choice
+
+    if [ "$choice" = "$create_option" ]; then
+        local new_branch
+        read -r -p "Enter new branch name: " new_branch
+        [ -n "$new_branch" ] || die "Branch name cannot be empty."
+        git checkout -b "$new_branch" || die "Could not create branch '$new_branch'."
+        git config --local xgem.default-branch "$new_branch"
+        log_success "Created and switched to '$new_branch', set as default for this repo."
+        return 0
+    fi
+
+    if ! [[ "$choice" =~ ^[0-9]+$ ]] || [ "$choice" -lt 1 ] || [ "$choice" -gt ${#branches[@]} ]; then
+        die "Invalid selection."
+    fi
+
+    local selected="${branches[$((choice - 1))]}"
+    if [ "$selected" != "$current_branch" ]; then
+        git checkout "$selected" || die "Could not switch to branch '$selected'."
+    fi
+    git config --local xgem.default-branch "$selected"
+    log_success "Switched to '$selected' and set as default for this repo."
+}
+
+# xgem git <cmt|init|rm-remote|rm-branch|branch> ...
 cmd_git() {
     case "$1" in
         cmt)       cmd_git_cmt "$2" ;;
         init)      cmd_git_init ;;
         rm-remote) cmd_git_rm_remote ;;
         rm-branch) cmd_git_rm_branch ;;
-        *) die "Unknown git subcommand '$1'. Usage: xgem git <cmt|init|rm-remote|rm-branch>" ;;
+        branch)    cmd_git_branch ;;
+        *) die "Unknown git subcommand '$1'. Usage: xgem git <cmt|init|rm-remote|rm-branch|branch>" ;;
     esac
 }

package/lib/version.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 # xgem version info.
 
-XGEM_VERSION="2.0.0-alpha.7"
+XGEM_VERSION="2.0.0-alpha.8"
 
 print_version() {
     echo "xgem $XGEM_VERSION"

package/lib-win/git.js

@@ -60,6 +60,26 @@ async function cmdCmt(commitMsg) {
         return;
     }
 
+    // A pull needs something to pull FROM. If this branch has never been
+    // pushed before, there's no remote ref, and `git pull --rebase` fails
+    // with "couldn't find remote ref <branch>" — not a connection problem
+    // or a conflict, just a brand-new branch. Check for that case first.
+    const lsRemoteStatus = spawnSync('git', ['ls-remote', '--exit-code', '--heads', remoteName, currentBranch]).status;
+
+    if (lsRemoteStatus === 2) {
+        logInfo(`'${currentBranch}' doesn't exist on '${remoteName}' yet — pushing to create it...`);
+        if (git(['push', '-u', remoteName, currentBranch]).status === 0) {
+            logSuccess('Git workflow complete! Branch created and pushed.');
+        } else {
+            die('Push operation failed.');
+        }
+        return;
+    } else if (lsRemoteStatus !== 0) {
+        logError(`Could not reach '${remoteName}' to check for '${currentBranch}' — this looks like a real connection problem.`);
+        logWarn(`Your commit is safe locally. Re-run 'xgem git cmt' once connectivity is restored, or push manually: git push ${remoteName} ${currentBranch}`);
+        process.exit(1);
+    }
+
     const aheadCount = gitCapture(['rev-list', '--count', `${remoteName}/${currentBranch}..${currentBranch}`]);
     if (aheadCount === '0') {
         logSuccess(`Already up to date with '${remoteName}/${currentBranch}' — nothing to push.`);
@@ -168,13 +188,53 @@ async function cmdRmBranch() {
     }
 }
 
+// Lists local branches, lets the user pick one (or create a new one),
+// checks it out, and remembers it as this repo's default. cmt always
+// operates on whatever's actually checked out — this command's job is the
+// checkout + remembering, not changing how cmt picks its branch.
+async function cmdBranch() {
+    const branches = gitCapture(['branch', '--format=%(refname:short)']).split(/\r?\n/).filter(Boolean);
+    if (branches.length === 0) die('No local branches found.');
+
+    const currentBranch = gitCapture(['branch', '--show-current']);
+
+    console.log('Available branches:');
+    branches.forEach((b, i) => {
+        console.log(`${i + 1}) ${b}${b === currentBranch ? ' (current)' : ''}`);
+    });
+    const createOption = branches.length + 1;
+    console.log(`${createOption}) Create new branch`);
+
+    const choice = await prompt(`Select [1-${createOption}]`);
+
+    if (choice === String(createOption)) {
+        const newBranch = await prompt('Enter new branch name');
+        if (!newBranch) die('Branch name cannot be empty.');
+        if (git(['checkout', '-b', newBranch]).status !== 0) die(`Could not create branch '${newBranch}'.`);
+        git(['config', '--local', 'xgem.default-branch', newBranch]);
+        logSuccess(`Created and switched to '${newBranch}', set as default for this repo.`);
+        return;
+    }
+
+    const idx = parseInt(choice, 10) - 1;
+    if (Number.isNaN(idx) || idx < 0 || idx >= branches.length) die('Invalid selection.');
+
+    const selected = branches[idx];
+    if (selected !== currentBranch) {
+        if (git(['checkout', selected]).status !== 0) die(`Could not switch to branch '${selected}'.`);
+    }
+    git(['config', '--local', 'xgem.default-branch', selected]);
+    logSuccess(`Switched to '${selected}' and set as default for this repo.`);
+}
+
 async function cmdGit(sub, arg) {
     switch (sub) {
         case 'cmt': return cmdCmt(arg);
         case 'init': return cmdInit();
+        case 'branch': return cmdBranch();
         case 'rm-remote': return cmdRmRemote();
         case 'rm-branch': return cmdRmBranch();
-        default: die(`Unknown git subcommand '${sub}'. Usage: xgem git <cmt|init|rm-remote|rm-branch>`);
+        default: die(`Unknown git subcommand '${sub}'. Usage: xgem git <cmt|init|branch|rm-remote|rm-branch>`);
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xgem-cli",
-  "version": "2.0.0-alpha.7",
+  "version": "2.0.0-alpha.8",
   "description": "Framework-aware automation CLI: scaffolds and runs clean/build/dev scripts per project type, an environment doctor, a SwiftPM-aware iOS build engine, and a git workflow helper. Runs natively on macOS, Linux, and Windows.",
   "bin": {
     "xgem": "bin/xgem.js"