fix(offline): address Copilot review round 4

- fix(offline): use handle_vscode_settings() merge for --here --offline
  to prevent data loss on existing .vscode/settings.json
- fix(release): glob wheel filename in create-github-release.sh instead
  of hardcoding version, preventing upload failures on version mismatch
- docs(release): add comment noting pyproject.toml version is synced by
  release-trigger.yml before the tag is pushed

Author: mnriem

.github/workflows/release.yml

@@ -38,6 +38,9 @@ jobs:
           chmod +x .github/workflows/scripts/create-release-packages.sh
           .github/workflows/scripts/create-release-packages.sh ${{ steps.version.outputs.tag }}
 
+      # Note: pyproject.toml version is already synced to the git tag by
+      # release-trigger.yml (which updates pyproject.toml, commits, then pushes
+      # the tag). No version sync step is needed here.
       - name: Build Python wheel
         if: steps.check_release.outputs.exists == 'false'
         run: |

.github/workflows/scripts/create-github-release.sh

@@ -15,8 +15,26 @@ VERSION="$1"
 # Remove 'v' prefix from version for release title
 VERSION_NO_V=${VERSION#v}
 
+# Find the built wheel dynamically to avoid version mismatch between
+# pyproject.toml and the git tag.
+shopt -s nullglob
+wheel_files=(.genreleases/specify_cli-*-py3-none-any.whl)
+
+if (( ${#wheel_files[@]} == 0 )); then
+  echo "Error: No specify_cli wheel found in .genreleases/" >&2
+  exit 1
+fi
+
+if (( ${#wheel_files[@]} > 1 )); then
+  echo "Error: Multiple specify_cli wheels found in .genreleases/; expected exactly one:" >&2
+  printf '  %s\n' "${wheel_files[@]}" >&2
+  exit 1
+fi
+
+WHEEL_FILE="${wheel_files[0]}"
+
 gh release create "$VERSION" \
-  .genreleases/specify_cli-"$VERSION_NO_V"-py3-none-any.whl \
+  "$WHEEL_FILE" \
   .genreleases/spec-kit-template-copilot-sh-"$VERSION".zip \
   .genreleases/spec-kit-template-copilot-ps-"$VERSION".zip \
   .genreleases/spec-kit-template-claude-sh-"$VERSION".zip \

src/specify_cli/__init__.py

@@ -1283,7 +1283,12 @@ def scaffold_from_core_pack(
                     rel = item.relative_to(build_dir)
                     dest = project_path / rel
                     dest.parent.mkdir(parents=True, exist_ok=True)
-                    shutil.copy2(item, dest)
+                    # When scaffolding into an existing directory (--here),
+                    # use the same merge semantics as the GitHub-download path.
+                    if is_current_dir and dest.name == "settings.json" and dest.parent.name == ".vscode":
+                        handle_vscode_settings(item, dest, rel, verbose=False, tracker=tracker)
+                    else:
+                        shutil.copy2(item, dest)
 
         if tracker:
             tracker.complete("scaffold", "bundled assets applied")