xgem-cli 2.0.0-alpha → 2.0.0-alpha.10

package/lib/doctor.sh

@@ -26,7 +26,10 @@ flutter_supports_flag() {
 flutter_config_spm_enabled() {
     has_cmd flutter || { echo "unknown (flutter not found)"; return; }
     local line
-    line=$(flutter config 2>/dev/null | grep -i "swift-package-manager")
+    # Anchored to "enable-swift-package-manager:" (the current-value line)
+    # so this doesn't instead match the "--[no-]enable-swift-package-manager"
+    # flag-syntax help line that `flutter config` also prints.
+    line=$(flutter config 2>/dev/null | grep -im1 -E '^[[:space:]]*enable-swift-package-manager:')
     if [ -z "$line" ]; then
         echo "unknown (not reported by this Flutter version)"
     else
@@ -86,7 +89,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 +97,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 )
@@ -100,7 +105,7 @@ _flutter_build_ios() {
     mkdir -p "$archive_dir"
     archive_path="$archive_dir/Runner $archive_time.xcarchive"
 
-    if ! xcodebuild -workspace ios/Runner.xcworkspace \
+    local -a archive_cmd=(xcodebuild -workspace ios/Runner.xcworkspace \
         -scheme Runner \
         -sdk iphoneos \
         -configuration Release \
@@ -108,10 +113,35 @@ _flutter_build_ios() {
         -archivePath "$archive_path" \
         "BUILD_NUMBER=$build_number" \
         "MARKETING_VERSION=$build_name" \
-        -allowProvisioningUpdates > "$log_file" 2>&1; then
-        log_error "Archive FAILED"
-        cat "$log_file"
-        die "xcodebuild archive failed" "$?"
+        -allowProvisioningUpdates)
+
+    if ! "${archive_cmd[@]}" > "$log_file" 2>&1; then
+        # Static pre-checks can miss cases the real SwiftPM resolution
+        # catches (different plugin manifest layouts, symlinked package
+        # dirs, etc.) — Xcode's own error is authoritative, so parse it
+        # directly and retry once before giving up.
+        local retry_required
+        retry_required=$(ios_parse_required_from_build_log "$log_file")
+        if [ -n "$retry_required" ]; then
+            log_warn "Archive failed on a SwiftPM platform-version mismatch Xcode reports directly (requires iOS $retry_required). Retrying with that applied..."
+            ios_pbxproj_patch_deployment_target "$retry_required" "."
+            ios_regenerate_generated_package "."
+            local regenerated
+            regenerated=$(ios_generated_package_target ".")
+            if [ -z "$regenerated" ] || _ios_ver_lt "$regenerated" "$retry_required"; then
+                ios_patch_generated_package_target "$retry_required" "."
+            fi
+
+            if ! "${archive_cmd[@]}" > "$log_file" 2>&1; then
+                log_error "Archive FAILED again after retry"
+                cat "$log_file"
+                die "xcodebuild archive failed" "$?"
+            fi
+        else
+            log_error "Archive FAILED"
+            cat "$log_file"
+            die "xcodebuild archive failed" "$?"
+        fi
     fi
     log_success "Archive created at: $archive_path"
 
@@ -159,20 +189,21 @@ cmd_flutter_build() {
     echo ""
     echo "Select Target Platform:"
     echo "1) APK (Android)"
-    echo "2) iOS"
-    echo "3) macOS"
-    echo "4) Windows"
-    echo "5) Linux"
+    echo "2) App Bundle (Android, .aab — required for Play Store uploads)"
+    echo "3) iOS"
+    echo "4) macOS"
+    echo "5) Windows"
+    echo "6) Linux"
     local platform_choice
-    read -r -p "Choose [1-5]: " platform_choice
-    if ! [[ "$platform_choice" =~ ^[1-5]$ ]]; then
+    read -r -p "Choose [1-6]: " platform_choice
+    if ! [[ "$platform_choice" =~ ^[1-6]$ ]]; then
         die "Invalid platform choice '$platform_choice'."
     fi
 
     local mode="--release"
     [[ "$is_release" == "n" || "$is_release" == "N" ]] && mode="--debug"
 
-    if [ "$platform_choice" -eq 2 ]; then
+    if [ "$platform_choice" -eq 3 ]; then
         _flutter_build_ios "$build_name" "$build_number" "$mode"
         return
     fi
@@ -180,9 +211,10 @@ cmd_flutter_build() {
     log_info "Initializing Flutter Build ($mode) for version $build_name+$build_number..."
     case $platform_choice in
         1) flutter build apk "$mode" "--build-name=$build_name" "--build-number=$build_number" ;;
-        3) flutter build macos "$mode" "--build-name=$build_name" "--build-number=$build_number" ;;
-        4) flutter build windows "$mode" "--build-name=$build_name" "--build-number=$build_number" ;;
-        5) flutter build linux "$mode" "--build-name=$build_name" "--build-number=$build_number" ;;
+        2) flutter build appbundle "$mode" "--build-name=$build_name" "--build-number=$build_number" ;;
+        4) flutter build macos "$mode" "--build-name=$build_name" "--build-number=$build_number" ;;
+        5) flutter build windows "$mode" "--build-name=$build_name" "--build-number=$build_number" ;;
+        6) flutter build linux "$mode" "--build-name=$build_name" "--build-number=$build_number" ;;
     esac
 }
 
@@ -205,3 +237,114 @@ flutter_run_native_command() {
         *) die "No native flutter command for '$script'." ;;
     esac
 }
+
+# create_flutter_project — used by lib/create.sh's create_project_wizard.
+# `flutter create` needs a target dir; "." scaffolds into the current one.
+create_flutter_project() {
+    require_cmd flutter "Install Flutter: https://docs.flutter.dev/get-started/install"
+    local project_dir
+    project_dir=$(_prompt_project_location "Flutter")
+    [ "$project_dir" != "." ] && XGEM_CREATED_NEW_FOLDER="$project_dir"
+    if [ "$project_dir" = "." ]; then
+        flutter create . || die "flutter create failed."
+    else
+        flutter create "$project_dir" || die "flutter create failed."
+        cd "$project_dir" || die "Could not enter $project_dir"
+    fi
+    _flutter_offer_run_on_device
+}
+
+# _flutter_select_device -> echoes the chosen device id, or nothing if
+# none available/selected. Uses `flutter devices --machine` (JSON) parsed
+# with python3 — already a soft dependency elsewhere in lib/ios.sh for the
+# same reason (no jq assumed present).
+_flutter_select_device() {
+    require_cmd python3 "Needed to parse 'flutter devices --machine' output."
+    local devices_json_file
+    devices_json_file=$(mktemp)
+    flutter devices --machine > "$devices_json_file" 2>/dev/null
+
+    local -a ids=() labels=()
+    while IFS='|' read -r id label; do
+        [ -n "$id" ] || continue
+        ids+=("$id")
+        labels+=("$label")
+    done < <(python3 - "$devices_json_file" <<'PYEOF'
+import json, sys
+
+try:
+    with open(sys.argv[1]) as f:
+        devices = json.load(f)
+except Exception:
+    devices = []
+
+for d in devices:
+    platform = d.get("platform") or d.get("targetPlatform") or ""
+    name = d.get("name", "unknown")
+    device_id = d.get("id", "")
+    print(f"{device_id}|{name} ({platform})")
+PYEOF
+)
+    rm -f "$devices_json_file"
+
+    if [ ${#ids[@]} -eq 0 ]; then
+        log_warn "No running devices/simulators found."
+        _flutter_offer_launch_emulator
+        return 1
+    fi
+
+    echo "Available devices:" >&2
+    local i
+    for i in "${!ids[@]}"; do
+        echo "$((i + 1))) ${labels[$i]}" >&2
+    done
+
+    local choice
+    read -r -p "Select a device [1-${#ids[@]}]: " choice
+    if ! [[ "$choice" =~ ^[0-9]+$ ]] || [ "$choice" -lt 1 ] || [ "$choice" -gt "${#ids[@]}" ]; then
+        log_warn "Invalid selection."
+        return 1
+    fi
+    echo "${ids[$((choice - 1))]}"
+}
+
+# No running devices — check for available-but-not-booted emulators and
+# offer to launch one, matching the "check available simulators... then
+# launch it" behavior the user asked for.
+_flutter_offer_launch_emulator() {
+    local emulators_output
+    emulators_output=$(flutter emulators 2>/dev/null)
+    [ -n "$emulators_output" ] || return 1
+
+    echo "$emulators_output"
+    local launch_choice
+    read -r -p "Launch one of these emulators? Enter its id, or leave blank to skip: " launch_choice
+    [ -n "$launch_choice" ] || return 1
+
+    log_info "Launching emulator '$launch_choice'..."
+    flutter emulators --launch "$launch_choice"
+    log_info "Waiting for it to boot..."
+    sleep 5
+}
+
+# Only picks the device and records the launch command in
+# XGEM_POST_INIT_LAUNCH_CMD — does NOT run `flutter run` itself. That's a
+# long-running blocking process; running it here (before xgem's own
+# template injection / .gitignore setup) means a Ctrl-C on it would kill
+# this whole xgem process before that setup ever runs, same class of bug
+# as create-vite's own --immediate flag caused for React. Device selection
+# itself is just a quick menu prompt, so it's safe to do now.
+_flutter_offer_run_on_device() {
+    local run_choice
+    read -r -p "Run the app now on a device/simulator? (Y/n): " run_choice
+    run_choice=${run_choice:-y}
+    [[ "$run_choice" == "y" || "$run_choice" == "Y" ]] || return 0
+
+    local device_id
+    device_id=$(_flutter_select_device)
+    if [ -n "$device_id" ]; then
+        XGEM_POST_INIT_LAUNCH_CMD=(flutter run -d "$device_id")
+    else
+        log_warn "No device selected — run 'flutter run' manually once one is available."
+    fi
+}

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,52 @@ 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
+
+    # 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
+        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 .
@@ -144,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/ios.sh

@@ -60,8 +60,13 @@ ios_deployment_target_for_config() {
 
     if has_cmd xcodebuild; then
         local value
+        # Anchored: newer Xcode also emits DEPLOYMENT_TARGET_SETTING_NAME =
+        # IPHONEOS_DEPLOYMENT_TARGET (a meta-setting whose *value* is that
+        # string), which an unanchored grep matches before the real
+        # "IPHONEOS_DEPLOYMENT_TARGET = 15.6" line — anchoring to the key
+        # position avoids grabbing that decoy.
         value=$(xcodebuild -showBuildSettings "${xcb_args[@]}" -configuration "$config" 2>/dev/null \
-            | grep -m1 'IPHONEOS_DEPLOYMENT_TARGET' | awk '{print $NF}')
+            | grep -m1 -E '^[[:space:]]*IPHONEOS_DEPLOYMENT_TARGET[[:space:]]*=' | awk '{print $NF}')
         [ -n "$value" ] && { echo "$value"; return 0; }
     fi
 
@@ -80,15 +85,36 @@ ios_pbxproj_current_max_target() {
 }
 
 # ios_required_spm_deployment_target [project_dir]
-# Reads .dart_tool/package_config.json (written by `flutter pub get`) to
-# find every resolved package's own ios/Package.swift, and returns the
-# highest .iOS(.vNN) platform floor declared across them. This replaces
-# hardcoding a guessed value (e.g. "15.0") with an actual measurement of
-# what the resolved dependency graph requires.
+# Returns the highest .iOS(.vNN) platform floor declared across every
+# resolved SwiftPM plugin, instead of hardcoding a guessed value.
+#
+# Primary source: ios/Flutter/ephemeral/Packages/.packages/<name>-<version>/,
+# which `flutter pub get` itself populates with each SPM-enabled plugin as
+# part of dependency resolution — this is the actual, already-resolved
+# location Xcode/SPM uses, not a path we have to reconstruct. Scanning it
+# directly sidesteps having to guess each plugin's on-disk manifest layout
+# (which varies — not every plugin puts Package.swift at <root>/ios/).
+#
+# Falls back to parsing .dart_tool/package_config.json's rootUri entries
+# (assuming the common <root>/ios/Package.swift convention) only if that
+# ephemeral directory doesn't exist yet — e.g. before any pub get has run.
 ios_required_spm_deployment_target() {
     local project_dir=${1:-.}
-    local pkg_config="$project_dir/.dart_tool/package_config.json"
+    local packages_dir="$project_dir/ios/Flutter/ephemeral/Packages/.packages"
+
+    if [ -d "$packages_dir" ]; then
+        # -L: per-plugin dirs here are frequently symlinks into pub-cache;
+        # without -L, find silently skips descending into them.
+        find -L "$packages_dir" -maxdepth 4 -name "Package.swift" -print0 2>/dev/null \
+            | xargs -0 grep -ohE '\.iOS\(\.v[0-9_]+\)|\.iOS\("[0-9.]+"\)' 2>/dev/null \
+            | grep -oE '[0-9]+(\.[0-9]+)?(_[0-9]+)?' | tr '_' '.' \
+            | sort -g | tail -1
+        return 0
+    fi
+
+    log_debug "No resolved SwiftPM packages directory at $packages_dir yet; falling back to package_config.json."
 
+    local pkg_config="$project_dir/.dart_tool/package_config.json"
     [ -f "$pkg_config" ] || { log_debug "No .dart_tool/package_config.json — run flutter pub get first."; return 1; }
     has_cmd python3 || { log_debug "python3 not found; cannot parse package_config.json."; return 1; }
 
@@ -118,9 +144,12 @@ for pkg in data.get("packages", []):
     except OSError:
         continue
 
-    for m in re.finditer(r"\.iOS\(\.v(\d+(?:_\d+)?)\)", content):
+    # Both SPM syntaxes: enum .iOS(.v15) and string .iOS("15.0") (the form
+    # Flutter's own generator uses).
+    for m in re.finditer(r'\.iOS\(\.v(\d+(?:_\d+)?)\)|\.iOS\("(\d+(?:\.\d+)?)"\)', content):
+        raw = m.group(1) or m.group(2)
         try:
-            fv = float(m.group(1).replace("_", "."))
+            fv = float(raw.replace("_", "."))
         except ValueError:
             continue
         max_target = max(max_target, fv)
@@ -164,21 +193,40 @@ ios_generated_package_swift_path() {
         echo "$guess"
         return 0
     fi
-    find "$project_dir/ios" -maxdepth 6 -type f -name "Package.swift" \
+    # -L: plugin package directories under ephemeral/Packages/.packages are
+    # frequently symlinks into the pub-cache; a plain find silently skips
+    # symlinked directories instead of descending into them.
+    find -L "$project_dir/ios" -maxdepth 6 -type f -name "Package.swift" \
         -path "*FlutterGeneratedPluginSwiftPackage*" 2>/dev/null | head -1
 }
 
+# SPM's SupportedPlatform.iOS accepts two syntaxes: the enum form .iOS(.v15)
+# for the fixed known-version cases, and a string form .iOS("15.0") for
+# arbitrary versions — Flutter's own code generator uses the *string* form
+# for FlutterGeneratedPluginSwiftPackage, not the enum form. Matching only
+# the enum form (as an earlier version of this function did) means the
+# patch step silently never matches anything on a real generated package:
+# sed finds no match, writes back an identical file, and "succeeds" while
+# doing nothing.
+_ios_extract_platform_version() {
+    grep -oE '\.iOS\(\.v[0-9_]+\)|\.iOS\("[0-9.]+"\)' | head -1 \
+        | grep -oE '[0-9]+(\.[0-9]+)?(_[0-9]+)?' | tr '_' '.'
+}
+
 ios_generated_package_target() {
     local project_dir=${1:-.}
     local pkg
     pkg=$(ios_generated_package_swift_path "$project_dir")
     [ -n "$pkg" ] && [ -f "$pkg" ] || return 1
-    grep -oE '\.iOS\(\.v[0-9_]+\)' "$pkg" | head -1 | grep -oE '[0-9_]+' | tr '_' '.'
+    _ios_extract_platform_version < "$pkg"
 }
 
 # Last-resort workaround for the still-open upstream desync bug: directly
 # patch the generated package's platform declaration. Always logged loudly
 # — this is a documented workaround for a known bug, never a silent hack.
+# Writes the string form (.iOS("15.0")) since that's what Flutter's own
+# generator uses in this file — matching its existing convention rather
+# than introducing a different syntax.
 ios_patch_generated_package_target() {
     local new_target=$1
     local project_dir=${2:-.}
@@ -190,10 +238,9 @@ ios_patch_generated_package_target() {
     fi
 
     log_warn "Working around known Flutter SPM bug (flutter/flutter#186804): the regenerated package still doesn't match your deployment target, so patching it directly."
-    local token=${new_target//./_}
     local tmp
     tmp=$(mktemp)
-    sed -E "s/\.iOS\(\.v[0-9_]+\)/.iOS(.v${token})/g" "$pkg" > "$tmp"
+    sed -E "s/\.iOS\(\.v[0-9_]+\)/.iOS(\"${new_target}\")/g; s/\.iOS\(\"[0-9.]+\"\)/.iOS(\"${new_target}\")/g" "$pkg" > "$tmp"
     mv "$tmp" "$pkg"
     log_success "Patched generated package platform to iOS $new_target."
 }
@@ -205,14 +252,39 @@ ios_regenerate_generated_package() {
     ( cd "$project_dir" && flutter pub get )
 }
 
+# ios_parse_required_from_build_log <log_file>
+# Statically scanning plugin manifests to predict the required deployment
+# target has proven unreliable in practice (plugin authors structure SPM
+# manifests differently, package dirs can be symlinks, etc.). Xcode itself
+# always computes this correctly and states it plainly in its own error:
+# "requires minimum platform version X for the iOS platform". Parsing that
+# directly is the authoritative fallback when the static pre-check misses
+# something.
+ios_parse_required_from_build_log() {
+    local log_file=$1
+    grep -oE "requires minimum platform version [0-9]+(\.[0-9]+)?" "$log_file" 2>/dev/null \
+        | grep -oE '[0-9]+(\.[0-9]+)?' \
+        | sort -g | tail -1
+}
+
 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 +292,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