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

package/lib/doctor.sh

@@ -86,7 +86,7 @@ doctor_print_ios() {
         echo "Deployment target [$cfg]: ${t:-unknown}"
     done
 
-    local required
+    local required generated
     required=$(ios_required_spm_deployment_target "$project_dir" 2>/dev/null)
     if [ -n "$required" ]; then
         echo "Required by resolved SwiftPM plugins: $required"
@@ -94,6 +94,14 @@ doctor_print_ios() {
         echo "Required by resolved SwiftPM plugins: unable to determine (run 'flutter pub get' first, or no SPM plugins declare an explicit floor)"
     fi
 
+    if [ "$uses_spm" = "yes" ]; then
+        generated=$(ios_generated_package_target "$project_dir" 2>/dev/null)
+        echo "FlutterGeneratedPluginSwiftPackage declares: ${generated:-unknown}"
+        if [ -n "$required" ] && [ -n "$generated" ] && _ios_ver_lt "$generated" "$required"; then
+            log_warn "This is stale — it declares iOS $generated but plugins need $required. This can happen even when your app's own deployment target is already high enough; 'xgem run flutter build' will detect and fix this."
+        fi
+    fi
+
     if [ "$uses_spm" = "yes" ]; then
         ios_known_issue_check
     fi

package/lib/flutter.sh

@@ -66,14 +66,19 @@ _flutter_build_ios() {
 
     require_cmd xcodebuild "iOS builds require Xcode's command-line tools."
 
+    # Must run pub get BEFORE reconciling: the required-deployment-target
+    # check reads .dart_tool/package_config.json, and that file only
+    # reflects the plugin versions actually in use after a fresh pub get.
+    # Reconciling against a stale package_config.json can silently pass a
+    # check that the real, just-resolved dependency graph would fail.
+    log_info "Regenerating dependencies..."
+    flutter pub get
+
     log_info "Reconciling iOS deployment target against resolved SwiftPM plugins..."
     if ! ios_reconcile_deployment_target "."; then
         die "iOS deployment target could not be reconciled; aborting before build."
     fi
 
-    log_info "Regenerating dependencies..."
-    flutter pub get
-
     if ios_project_uses_pods "."; then
         log_info "CocoaPods detected - installing pods..."
         ( cd ios || exit 1; pod install )

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/ios.sh

@@ -206,13 +206,23 @@ ios_regenerate_generated_package() {
 }
 
 ios_known_issue_check() {
-    log_warn "Known upstream issue (flutter/flutter#186804, #189422, #162072): FlutterGeneratedPluginSwiftPackage's deployment target can desync from your app's IPHONEOS_DEPLOYMENT_TARGET. Currently open — xgem detects and works around it automatically below."
+    log_warn "Known upstream issue (flutter/flutter#186804, #189422, #162072): FlutterGeneratedPluginSwiftPackage's deployment target can desync from your app's IPHONEOS_DEPLOYMENT_TARGET — independently, even when the app's own target is already high enough. Currently open — xgem detects and works around it automatically below."
+}
+
+# _ios_ver_lt a b -> true if a < b, numeric comparison (not string equality,
+# since "15" and "15.0" are the same version but different strings).
+_ios_ver_lt() {
+    awk -v a="$1" -v b="$2" 'BEGIN{exit !(a<b)}'
 }
 
 # ios_reconcile_deployment_target [project_dir]
-# The core "self-healing" step: detect a required-vs-current mismatch, plan
-# the fix, confirm (unless --yes/--dry-run), apply, regenerate, verify, and
-# fall back to the documented workaround if the upstream bug is still biting.
+# The core "self-healing" step. Checks TWO independent things against the
+# required version — the app's own pbxproj target, AND
+# FlutterGeneratedPluginSwiftPackage's own declared platform — because the
+# upstream bug is exactly that these two can desync from each other. A
+# project whose pbxproj is already at (say) 15.6 can still have a generated
+# package stuck at 13.0; checking only the pbxproj target (as an earlier
+# version of this function did) misses that case entirely.
 # Returns 0 if no action was needed or the fix succeeded; 1 if it couldn't
 # reconcile and the caller should stop before attempting a build.
 ios_reconcile_deployment_target() {
@@ -220,46 +230,53 @@ ios_reconcile_deployment_target() {
 
     ios_project_uses_spm "$project_dir" || { log_debug "Project does not use SwiftPM; skipping deployment-target reconciliation."; return 0; }
 
-    local required current
+    local required
     required=$(ios_required_spm_deployment_target "$project_dir")
-    current=$(ios_deployment_target_for_config "Release" "$project_dir")
-
     if [ -z "$required" ]; then
         log_debug "Could not determine a required deployment target from resolved SPM plugins; skipping reconciliation."
         return 0
     fi
-    if [ -z "$current" ]; then
-        log_warn "Could not determine the project's current deployment target; proceeding without reconciliation."
+
+    ios_known_issue_check
+
+    local current generated
+    current=$(ios_deployment_target_for_config "Release" "$project_dir")
+    generated=$(ios_generated_package_target "$project_dir")
+
+    local pbxproj_needs_bump=0 generated_needs_fix=0
+    [ -n "$current" ] && _ios_ver_lt "$current" "$required" && pbxproj_needs_bump=1
+    if [ -z "$generated" ] || _ios_ver_lt "$generated" "$required"; then
+        generated_needs_fix=1
+    fi
+
+    if [ "$pbxproj_needs_bump" = 0 ] && [ "$generated_needs_fix" = 0 ]; then
+        log_debug "Deployment target ($current) and generated package ($generated) already satisfy SwiftPM requirement ($required)."
         return 0
     fi
 
-    ios_known_issue_check
+    log_warn "Resolved SwiftPM plugins require iOS $required."
+    [ "$pbxproj_needs_bump" = 1 ] && echo "  - project.pbxproj currently targets iOS $current"
+    [ "$generated_needs_fix" = 1 ] && echo "  - FlutterGeneratedPluginSwiftPackage currently declares iOS ${generated:-unknown}"
+    echo "Plan:"
+    [ "$pbxproj_needs_bump" = 1 ] && echo "  1. Set IPHONEOS_DEPLOYMENT_TARGET = $required across every build configuration in project.pbxproj"
+    echo "  2. Clear ios/Flutter/ephemeral and re-run 'flutter pub get' to regenerate FlutterGeneratedPluginSwiftPackage"
+    echo "  3. Verify the regenerated package declares iOS $required; if it still doesn't (known upstream bug), patch it directly"
+
+    if ! confirm "Apply this fix?"; then
+        log_warn "Skipped. The build will likely fail SwiftPM resolution until this is reconciled manually."
+        return 1
+    fi
+
+    [ "$pbxproj_needs_bump" = 1 ] && ios_pbxproj_patch_deployment_target "$required" "$project_dir"
+    ios_regenerate_generated_package "$project_dir"
 
-    if awk -v a="$required" -v b="$current" 'BEGIN{exit !(a>b)}'; then
-        log_warn "Resolved SwiftPM plugins require iOS $required, but the project targets iOS $current."
-        echo "Plan:"
-        echo "  1. Set IPHONEOS_DEPLOYMENT_TARGET = $required across every build configuration in project.pbxproj"
-        echo "  2. Clear ios/Flutter/ephemeral and re-run 'flutter pub get' to regenerate FlutterGeneratedPluginSwiftPackage"
-        echo "  3. Verify the regenerated package declares iOS $required; if it still doesn't (known upstream bug), patch it directly"
-
-        if ! confirm "Apply this fix?"; then
-            log_warn "Skipped. The build will likely fail SwiftPM resolution until the deployment target is reconciled manually."
-            return 1
-        fi
-
-        ios_pbxproj_patch_deployment_target "$required" "$project_dir"
-        ios_regenerate_generated_package "$project_dir"
-
-        local regenerated
-        regenerated=$(ios_generated_package_target "$project_dir")
-        if [ "$regenerated" = "$required" ]; then
-            log_success "Generated package now correctly declares iOS $regenerated."
-        else
-            log_warn "Generated package declares '${regenerated:-unknown}' after regeneration, not $required."
-            ios_patch_generated_package_target "$required" "$project_dir"
-        fi
+    local regenerated
+    regenerated=$(ios_generated_package_target "$project_dir")
+    if [ -n "$regenerated" ] && ! _ios_ver_lt "$regenerated" "$required"; then
+        log_success "Generated package now correctly declares iOS $regenerated."
     else
-        log_debug "Deployment target ($current) already satisfies SwiftPM requirement ($required)."
+        log_warn "Generated package declares '${regenerated:-unknown}' after regeneration, still below $required."
+        ios_patch_generated_package_target "$required" "$project_dir"
     fi
 
     return 0

package/lib/version.sh

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

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.4",
   "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"