xgem-cli 2.0.0-alpha.2 → 2.0.0-alpha.3

package/lib/git.sh

@@ -24,9 +24,13 @@ cmd_git_cmt() {
         die "Invalid choice. Operation aborted."
     fi
 
-    log_info "Committing changes..."
-    if ! git commit -m "$commit_msg"; then
-        die "Commit failed. Aborting before pull/push."
+    if git diff --cached --quiet; then
+        log_warn "Nothing staged to commit — checking whether there's anything already committed to sync."
+    else
+        log_info "Committing changes..."
+        if ! git commit -m "$commit_msg"; then
+            die "Commit failed. Aborting before pull/push."
+        fi
     fi
 
     local current_branch remote_name
@@ -38,14 +42,29 @@ cmd_git_cmt() {
     fi
 
     if [ -z "$remote_name" ]; then
-        log_warn "Local commit dropped cleanly, but no remote is configured — sync was skipped."
+        log_warn "No remote configured — sync was skipped."
+        return 0
+    fi
+
+    local ahead_count
+    ahead_count=$(git rev-list --count "$remote_name/$current_branch..$current_branch" 2>/dev/null)
+    if [ "$ahead_count" = "0" ]; then
+        log_success "Already up to date with '$remote_name/$current_branch' — nothing to push."
         return 0
     fi
 
     log_info "Pulling updates from remote '$remote_name' on '$current_branch' via rebase..."
     if ! git pull --rebase "$remote_name" "$current_branch"; then
-        log_error "MERGE CONFLICT DETECTED!"
-        log_warn "Execution paused. Resolve conflicts to proceed."
+        local git_dir
+        git_dir=$(git rev-parse --git-dir 2>/dev/null)
+        if [ -d "$git_dir/rebase-merge" ] || [ -d "$git_dir/rebase-apply" ]; then
+            log_error "MERGE CONFLICT DETECTED!"
+            log_warn "Execution paused. Resolve conflicts to proceed."
+        else
+            log_error "Could not sync with '$remote_name' — this looks like a connection problem, not a merge conflict (see the git error above)."
+            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 open_editor
         read -r -p "Do you want to open VS Code to resolve this now? (y/n): " open_editor
         [[ "$open_editor" == "y" || "$open_editor" == "Y" ]] && code .

package/lib-win/git.js

@@ -41,25 +41,45 @@ async function cmdCmt(commitMsg) {
         die('Invalid choice. Operation aborted.');
     }
 
-    logInfo('Committing changes...');
-    const commitResult = git(['commit', '-m', commitMsg]);
-    if (commitResult.status !== 0) {
-        die('Commit failed. Aborting before pull/push.');
+    const hasStaged = spawnSync('git', ['diff', '--cached', '--quiet']).status !== 0;
+    if (!hasStaged) {
+        logWarn("Nothing staged to commit — checking whether there's anything already committed to sync.");
+    } else {
+        logInfo('Committing changes...');
+        const commitResult = git(['commit', '-m', commitMsg]);
+        if (commitResult.status !== 0) {
+            die('Commit failed. Aborting before pull/push.');
+        }
     }
 
     const currentBranch = gitCapture(['branch', '--show-current']);
     const remoteName = remoteExists('origin') ? 'origin' : gitCapture(['remote']).split(/\r?\n/)[0];
 
     if (!remoteName) {
-        logWarn('Local commit dropped cleanly, but no remote is configured — sync was skipped.');
+        logWarn('No remote configured — sync was skipped.');
+        return;
+    }
+
+    const aheadCount = gitCapture(['rev-list', '--count', `${remoteName}/${currentBranch}..${currentBranch}`]);
+    if (aheadCount === '0') {
+        logSuccess(`Already up to date with '${remoteName}/${currentBranch}' — nothing to push.`);
         return;
     }
 
     logInfo(`Pulling updates from remote '${remoteName}' on '${currentBranch}' via rebase...`);
     const pullResult = git(['pull', '--rebase', remoteName, currentBranch]);
     if (pullResult.status !== 0) {
-        logError('MERGE CONFLICT DETECTED!');
-        logWarn('Execution paused. Resolve conflicts to proceed.');
+        const gitDir = gitCapture(['rev-parse', '--git-dir']);
+        const path = require('node:path');
+        const fs = require('node:fs');
+        const inConflict = fs.existsSync(path.join(gitDir, 'rebase-merge')) || fs.existsSync(path.join(gitDir, 'rebase-apply'));
+        if (inConflict) {
+            logError('MERGE CONFLICT DETECTED!');
+            logWarn('Execution paused. Resolve conflicts to proceed.');
+        } else {
+            logError(`Could not sync with '${remoteName}' — this looks like a connection problem, not a merge conflict (see the git error above).`);
+            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);
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xgem-cli",
-  "version": "2.0.0-alpha.2",
+  "version": "2.0.0-alpha.3",
   "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"