project-auto-wizard 0.14.0 → 0.15.1

package/payload/scripts/version_manager.py

@@ -95,16 +95,33 @@ def read_file(path):
 
 def write_file(path, text):
     """Write text preserving the dominant line ending of the existing file
-    on disk (LF stays LF, CRLF stays CRLF — never platform-dependent)."""
+    on disk (LF stays LF, CRLF stays CRLF — never platform-dependent).
+    Returns False (and leaves the file untouched) when the content is already identical."""
     p = Path(path)
     eol = "\n"
+    previous = None
     if p.is_file():
         with open(p, "r", encoding="utf-8", newline="") as f:
-            eol = _detect_eol(f.read())
+            previous = f.read()
+        eol = _detect_eol(previous)
     if eol != "\n":
         text = text.replace("\n", eol)
+    if previous == text:
+        return False
     with open(p, "w", encoding="utf-8", newline="") as f:
         f.write(text)
+    return True
+
+
+# Files whose content actually changed in this process. Lets the sync check tell "reconciled" from "already in sync".
+_CHANGED_FILES = []
+
+
+def write_synced(path, text):
+    """write_file() for version files: logs `updated:` only when the content really changed."""
+    if write_file(path, text):
+        _CHANGED_FILES.append(str(path))
+        log(t("version_manager.updated", path=path))
 
 
 # ===================================================================
@@ -117,7 +134,7 @@ def _version_yml_path():
 
 def require_version_yml():
     if not _version_yml_path().is_file():
-        log("ERROR: version.yml not found")
+        log(t("version_manager.err_yml_missing"))
         sys.exit(1)
 
 
@@ -176,6 +193,21 @@ def get_current_version():
     return read_scalar_key("version", "0.0.0")
 
 
+# Names that used to be separate types. A version.yml written before the merge may still carry them,
+# and the release workflow can run before the wizard rewrites that file, so they are read as the new name.
+TYPE_ALIASES = {"next": "react"}
+
+
+def _canonical_types(types):
+    """Map aliased type names to their current name, dropping duplicates while keeping order."""
+    out = []
+    for t in types:
+        t = TYPE_ALIASES.get(t, t)
+        if t not in out:
+            out.append(t)
+    return out
+
+
 def get_project_types_csv():
     """Return project_types as a list. Supports both:
       project_types: ["a", "b"]
@@ -196,7 +228,7 @@ def get_project_types_csv():
         inner = m.group(1)
         items = re.findall(r'"([^"]*)"|\'([^\']*)\'', inner)
         types = [a or b for a, b in items]
-        return [t for t in types if t]
+        return _canonical_types([t for t in types if t])
 
     # Block list form:
     # project_types:
@@ -207,7 +239,7 @@ def get_project_types_csv():
         block = m.group(1)
         # trailing comments are allowed on list items too
         types = re.findall(r'-[ \t]*["\']?([^"\'#\n]+?)["\']?[ \t]*(?:#.*)?$', block, re.MULTILINE)
-        return [t.strip() for t in types if t.strip()]
+        return _canonical_types([t.strip() for t in types if t.strip()])
 
     return []
 
@@ -221,16 +253,19 @@ def get_type_path(project_type, project_types_list=None):
     if not m:
         return "."
     block = m.group(1)
-    km = re.search(
-        r'^[ \t]+["\']?' + re.escape(project_type)
-        + r'["\']?:[ \t]*["\']?([^"\'#\n]+?)["\']?[ \t]*(?:#.*)?$',
-        block,
-        re.MULTILINE,
-    )
-    if km:
-        val = km.group(1).strip()
-        if val and val != "null":
-            return val
+    # The current name first, then any older name that maps to it (e.g. next -> react).
+    names = [project_type] + [old for old, new in TYPE_ALIASES.items() if new == project_type]
+    for name in names:
+        km = re.search(
+            r'^[ \t]+["\']?' + re.escape(name)
+            + r'["\']?:[ \t]*["\']?([^"\'#\n]+?)["\']?[ \t]*(?:#.*)?$',
+            block,
+            re.MULTILINE,
+        )
+        if km:
+            val = km.group(1).strip()
+            if val and val != "null":
+                return val
     return "."
 
 
@@ -238,7 +273,7 @@ def get_version_code():
     require_version_yml()
     code = read_scalar_key("version_code", None)
     if code is None or code == "" or code == "null":
-        log("WARNING: version_code field missing, adding default value 1")
+        log(t("version_manager.warn_code_missing"))
         text = read_text()
         if re.search(r'^version:', text, re.MULTILINE):
             new_text = re.sub(
@@ -260,7 +295,7 @@ def set_version_code(new_code):
     if current not in (None, "", "null"):
         try:
             if int(new_code) < int(current):
-                log(f"WARNING: version_code {new_code} is lower than current {current} — writing anyway (regression?)")
+                log(t("version_manager.warn_code_regress", new_code=new_code, current=current))
         except ValueError:
             pass
     text = read_text()
@@ -318,7 +353,7 @@ def get_higher_version(v1, v2):
 def update_version_yml(new_version):
     if not write_scalar_key("version", new_version):
         # Without the key nothing was written yet the call looked successful, so the same version came out every time.
-        log("WARNING: version field missing in version.yml, adding it")
+        log(t("version_manager.warn_version_missing"))
         text = read_text()
         line = f'version: "{new_version}"\n'
         if re.search(r'^version_code:', text, re.MULTILINE):
@@ -327,7 +362,7 @@ def update_version_yml(new_version):
             new_text = text.rstrip("\n") + "\n" + line
         write_text(new_text)
     if read_scalar_key("version") != new_version:
-        raise VersionSyncError(f"failed to write version {new_version} to version.yml")
+        raise VersionSyncError(t("version_manager.err_write_failed", version=new_version))
     today = datetime.date.today().isoformat()
     user = os.environ.get("GITHUB_ACTOR", "")
     if not user:
@@ -411,16 +446,15 @@ def sync_maven(path_dir, new_version):
     text = read_file(root_pom)
     old_version = _pom_text(text, ["version"])
     if old_version is None:
-        log(f"WARNING: spring: {root_pom} has no project <version> (inherited from parent?) — skipping")
+        log(t("version_manager.warn_spring_no_version", pom=root_pom))
         return True
     if "${" in old_version:
         # CI-friendly versions such as ${revision} are managed in a property, so leave them alone.
-        log(f"WARNING: spring: {root_pom} <version> is a property ({old_version}) — skipping")
+        log(t("version_manager.warn_spring_property", pom=root_pom, version=old_version))
         return True
     new_full = _keep_snapshot(old_version, new_version)
     new_text, _ = _pom_replace(text, ["version"], new_full)
-    write_file(root_pom, new_text)
-    log(f"updated: {root_pom}")
+    write_synced(root_pom, new_text)
 
     root_artifact = _pom_text(text, ["artifactId"])
     for child in sorted(Path(path_dir).glob("*/pom.xml")):
@@ -432,8 +466,7 @@ def sync_maven(path_dir, new_version):
         ctext, _ = _pom_replace(ctext, ["parent", "version"], new_full)
         if _pom_text(ctext, ["version"]) == old_version:
             ctext, _ = _pom_replace(ctext, ["version"], new_full)
-        write_file(child, ctext)
-        log(f"updated: {child}")
+        write_synced(child, ctext)
     return True
 
 
@@ -509,7 +542,7 @@ def sync_spring(path_dir, new_version):
     has_pom = sync_maven(path_dir, new_version)
     if not candidates:
         if not has_pom:
-            log(f"WARNING: spring: no build.gradle(.kts) or pom.xml found under {path_dir} — skipping")
+            log(t("version_manager.warn_spring_no_files", dir=path_dir))
         return
     for gradle_file in candidates:
         text = read_file(gradle_file)
@@ -522,10 +555,9 @@ def sync_spring(path_dir, new_version):
             replaced = f"{m.group(1)}{m.group(2)}{_keep_snapshot(m.group(3), new_version)}{m.group(2)}"
             new_text = new_text[:m.start()] + replaced + new_text[m.end():]
         if not matches:
-            log(f"WARNING: spring: no `version = '...'` line in {gradle_file} — skipping")
+            log(t("version_manager.warn_spring_no_gradle_line", file=gradle_file))
             continue
-        write_file(gradle_file, new_text)
-        log(f"updated: {gradle_file}")
+        write_synced(gradle_file, new_text)
 
 
 def _pubspec_build_number(path_dir):
@@ -548,7 +580,7 @@ def get_reconciled_version_code():
         if n is not None
     ]
     if pubspec_codes and max(pubspec_codes) > code:
-        log(f"pubspec.yaml build number {max(pubspec_codes)} is ahead of version_code {code} — adopting it")
+        log(t("version_manager.pubspec_ahead", build=max(pubspec_codes), code=code))
         code = max(pubspec_codes)
         set_version_code(code)
     return code
@@ -557,7 +589,7 @@ def get_reconciled_version_code():
 def sync_flutter(path_dir, new_version, version_code):
     target = Path(path_dir) / "pubspec.yaml"
     if not target.is_file():
-        log(f"WARNING: flutter: {target} not found — skipping")
+        log(t("version_manager.warn_flutter_missing", target=target))
         return
     text = read_file(target)
     full_version = f"{new_version}+{version_code}"
@@ -566,8 +598,7 @@ def sync_flutter(path_dir, new_version, version_code):
         new_text = pattern.sub(r'\1 ' + full_version, text, count=1)
     else:
         new_text = text.rstrip("\n") + f"\nversion: {full_version}\n"
-    write_file(target, new_text)
-    log(f"updated: {target}")
+    write_synced(target, new_text)
 
 
 def _json_indent(text):
@@ -582,20 +613,19 @@ def _json_indent(text):
 
 def sync_json_version(target, new_version, key_path):
     if not target.is_file():
-        log(f"WARNING: {target} not found — skipping")
+        log(t("version_manager.warn_target_missing", target=target))
         return
     raw = read_file(target)
     try:
         data = json.loads(raw)
     except json.JSONDecodeError as e:
         # Skipping and reporting success would silently leave the tag/version.yml and the package version out of step.
-        raise VersionSyncError(f"{target} is not valid JSON ({e}) — cannot write version")
+        raise VersionSyncError(t("version_manager.err_not_json", target=target, error=e))
     node = data
     for k in key_path[:-1]:
         node = node.setdefault(k, {})
     node[key_path[-1]] = new_version
-    write_file(target, json.dumps(data, indent=_json_indent(raw), ensure_ascii=False) + "\n")
-    log(f"updated: {target}")
+    write_synced(target, json.dumps(data, indent=_json_indent(raw), ensure_ascii=False) + "\n")
 
 
 _TOML_HEADER_RE = re.compile(r'^[ \t]*\[+[ \t]*([^\]\n]+?)[ \t]*\]+[ \t]*(?:#.*)?$', re.MULTILINE)
@@ -641,12 +671,11 @@ def sync_python(path_dir, new_version):
     spans = _python_version_spans(path_dir)
     if not spans:
         # Setups that keep the version out of the file (e.g. dynamic = ["version"]) have nowhere to write it.
-        log(f"WARNING: python: no version in pyproject.toml [project]/[tool.poetry] or setup.py under {path_dir} — skipping")
+        log(t("version_manager.warn_python_no_version", dir=path_dir))
         return
     for target, (start, end) in spans:
         text = read_file(target)
-        write_file(target, text[:start] + new_version + text[end:])
-        log(f"updated: {target}")
+        write_synced(target, text[:start] + new_version + text[end:])
 
 
 _PLIST_VERSION_RE = re.compile(r'(<key>CFBundleShortVersionString</key>\s*<string>)([^<]*)(</string>)')
@@ -673,33 +702,31 @@ def sync_react_native(path_dir, new_version):
                 continue
             # A build-variable reference such as $(MARKETING_VERSION) is owned by the Xcode settings, so do not overwrite it.
             if m.group(2).strip().startswith("$("):
-                log(f"skipped: {plist_file} — CFBundleShortVersionString references a build variable")
+                log(t("version_manager.skipped_plist", file=plist_file))
                 continue
             new_text = _PLIST_VERSION_RE.sub(lambda mm: mm.group(1) + new_version + mm.group(3), text)
-            write_file(plist_file, new_text)
-            log(f"updated: {plist_file}")
+            write_synced(plist_file, new_text)
             found_plist = True
     else:
-        log(f"WARNING: react-native: {ios_dir} not found — skipping")
+        log(t("version_manager.warn_rn_ios_missing", dir=ios_dir))
 
     gradle_file = Path(path_dir) / "android" / "app" / "build.gradle"
     if gradle_file.is_file():
         text = read_file(gradle_file)
         new_text = re.sub(r'versionName\s+"[^"]*"', f'versionName "{new_version}"', text)
-        write_file(gradle_file, new_text)
-        log(f"updated: {gradle_file}")
+        write_synced(gradle_file, new_text)
     else:
-        log(f"WARNING: react-native: {gradle_file} not found — skipping")
+        log(t("version_manager.warn_rn_gradle_missing", file=gradle_file))
 
     if not found_plist and not gradle_file.is_file():
-        log(f"WARNING: react-native: no target files found under {path_dir}")
+        log(t("version_manager.warn_rn_no_targets", dir=path_dir))
 
 
 def sync_for_type(project_type, new_version, version_code_getter):
     path_dir = get_type_path(project_type)
     handler = TYPE_HANDLERS.get(project_type)
     if handler is None:
-        log(f"WARNING: unknown project type: {project_type} — skipping")
+        log(t("version_manager.warn_unknown_type", type=project_type))
         return
     handler.sync(path_dir, new_version, version_code_getter)
 
@@ -709,17 +736,17 @@ def sync_all_project_files(new_version):
     if not types:
         # No silent fallback: an unreadable project_types used to degrade to
         # "basic" and skip every sync without a word.
-        raise SystemExit("ERROR: version.yml has no readable project_types — cannot sync project files")
+        raise SystemExit(t("version_manager.err_no_types_sync"))
     errors = []
-    for t in types:
+    for ptype in types:
         # Keep syncing the other types when one fails; collect failures and report them via the exit code at the end.
         try:
-            sync_for_type(t, new_version, get_reconciled_version_code)
+            sync_for_type(ptype, new_version, get_reconciled_version_code)
         except VersionSyncError as e:
-            log(f"ERROR: {t}: {e}")
-            errors.append(t)
+            log(t("version_manager.err_type", type=ptype, error=e))
+            errors.append(ptype)
     if errors:
-        raise VersionSyncError(f"project file sync failed for: {', '.join(errors)}")
+        raise VersionSyncError(t("version_manager.err_sync_failed", types=", ".join(errors)))
 
 
 README_VERSION_LINE_RE = re.compile(
@@ -749,7 +776,7 @@ def update_readme_version(new_version, path="README.md"):
             return False
         lines[i + 1] = new_line
         write_file(p, "\n".join(lines))
-        log(f"README.md version line -> v{new_version}")
+        log(t("version_manager.readme_updated", version=new_version))
         return True
     return False
 
@@ -859,7 +886,6 @@ TYPE_HANDLERS = {
     # Only types that need a build number compute version_code (this has a pubspec-adjusting side effect).
     "flutter": TypeHandler(read=_read_flutter, sync=lambda d, v, code: sync_flutter(d, v, code())),
     "react": _PACKAGE_JSON,
-    "next": _PACKAGE_JSON,
     "node": _PACKAGE_JSON,
     "python": TypeHandler(read=_read_python, sync=lambda d, v, _code: sync_python(d, v)),
     "react-native": TypeHandler(read=_read_react_native, sync=lambda d, v, _code: sync_react_native(d, v)),
@@ -880,7 +906,7 @@ def get_project_file_version(project_type):
         if handler is not None:
             version = handler.read(path_dir)
     except Exception as e:
-        log(f"WARNING: failed reading project file for {project_type}: {e}")
+        log(t("version_manager.warn_read_failed", type=project_type, error=e))
         version = None
 
     if not version:
@@ -892,32 +918,35 @@ def sync_versions():
     yml_version = get_current_version()
     types = get_project_types_csv()
     if not types:
-        raise SystemExit("ERROR: version.yml has no readable project_types — cannot sync versions")
+        raise SystemExit(t("version_manager.err_no_types_check"))
     primary_type = types[0]
     project_version = get_project_file_version(primary_type)
 
-    log("Version sync check")
-    log(f"  version.yml: {yml_version}")
-    log(f"  project file: {project_version}")
-
     if yml_version != project_version:
+        # The detail lines are only useful when the two disagree; an in-sync check prints a single line
+        # (this check runs several times per job, so a multi-line block each time is just noise).
+        log(t("version_manager.sync_check"))
+        log(t("version_manager.sync_yml_version", version=yml_version))
+        log(t("version_manager.sync_project_version", version=project_version))
         if validate_version(yml_version) and validate_version(project_version):
             higher = get_higher_version(yml_version, project_version)
-            log(f"Version mismatch detected, syncing to higher version: {higher}")
+            log(t("version_manager.sync_mismatch", version=higher))
             if higher != yml_version:
                 update_version_yml(higher)
             if higher != project_version:
                 sync_all_project_files(higher)
             return higher
         else:
-            log("WARNING: version format invalid, cannot sync")
+            log(t("version_manager.warn_format_invalid"))
             return yml_version
     else:
-        types = get_project_types_csv()
-        if types:
-            log(f"Multi-type — reconciling all type files to version.yml version: {yml_version}")
-            sync_all_project_files(yml_version)
-        log(f"Version already in sync: {yml_version}")
+        # The primary type matches, but the other types' files may still lag behind; reconcile them quietly.
+        changed_before = len(_CHANGED_FILES)
+        sync_all_project_files(yml_version)
+        if len(_CHANGED_FILES) > changed_before:
+            log(t("version_manager.sync_reconciled", version=yml_version))
+        else:
+            log(t("version_manager.sync_ok", version=yml_version))
         return yml_version
 
 
@@ -952,7 +981,7 @@ def cmd_increment(args):
     require_version_yml()
     current_version = sync_versions()
     if not validate_version(current_version):
-        log(f"ERROR: invalid version format: {current_version}")
+        log(t("version_manager.err_invalid_version", version=current_version))
         return 1
     bump = getattr(args, "bump", None) or "patch"
     new_version = increment_version(current_version, bump)
@@ -968,7 +997,7 @@ def cmd_set(args):
     require_version_yml()
     new_version = args.version
     if not validate_version(new_version):
-        log(f"ERROR: invalid version format: {new_version} (must be x.y.z)")
+        log(t("version_manager.err_invalid_version_xyz", version=new_version))
         return 1
     update_all_versions(new_version)
     print(new_version)
@@ -1017,7 +1046,7 @@ def main(argv=None):
     try:
         return handler(args)
     except VersionSyncError as e:
-        log(f"ERROR: {e}")
+        log(t("version_manager.err_generic", error=e))
         return 1
 
 

package/payload/version.yml.template

@@ -10,7 +10,7 @@
 #   workflows call GitHub Copilot CLI, which consumes GitHub Copilot AI Credits.
 #   Falls back to rule-based summaries whenever Copilot is off or unavailable.
 # ===
-# Supported project types: spring, flutter, next, react, react-native,
+# Supported project types: spring, flutter, react, react-native,
 #                          react-native-expo, node, python, basic, go
 # Multi-type projects: list every type in the project_types array
 #   -> the first entry is the primary type (project_types is the single source of truth)
@@ -20,7 +20,7 @@
 # Synced files per type:
 # - spring: build.gradle / build.gradle.kts / pom.xml
 # - flutter: pubspec.yaml
-# - next/react/node: package.json
+# - react/node: package.json
 # - react-native: Info.plist + build.gradle
 # - react-native-expo: app.json
 # - python: pyproject.toml / setup.py

package/payload/workflows/common/PROJECT-COMMON-AI-PR-SUMMARY.yaml

@@ -53,11 +53,13 @@ jobs:
       - name: Read copilot_ai option from version.yml
         id: copilot_options
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
+          m() { python3 "$GITHUB_WORKSPACE/.github/scripts/messages.py" get "$@"; }
           # scoped to the metadata: -> template: -> options: chain so an
           # unrelated "copilot_ai:" key can never hijack the value
           COPILOT_AI=$(python3 -c 'import re; t=open("version.yml",encoding="utf-8").read(); m=re.search(r"metadata:.*?template:.*?options:.*?copilot_ai:\s*\"?(true|false)", t, re.S); print(m.group(1) if m else "false")' 2>/dev/null || echo "false")
           echo "copilot_ai=$COPILOT_AI" >> $GITHUB_OUTPUT
-          echo "copilot_ai option: $COPILOT_AI"
+          echo "$(m wf_common.copilot_ai_option copilot_ai="$COPILOT_AI")"
 
       - name: Install Copilot CLI
         if: steps.copilot_options.outputs.copilot_ai == 'true'
@@ -74,6 +76,8 @@ jobs:
           COPILOT_AI: ${{ steps.copilot_options.outputs.copilot_ai }}
           GH_TOKEN: ${{ github.token }}
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
+          m() { python3 "$GITHUB_WORKSPACE/.github/scripts/messages.py" get "$@"; }
           PR_NUMBER=${{ github.event.pull_request.number }}
 
           git fetch origin {{MAIN_BRANCH}}
@@ -105,7 +109,7 @@ jobs:
           fi
           VERSION=$(python3 -c 'import sys; sys.path.insert(0, ".github/scripts"); from version_manager import increment_version; print(increment_version(sys.argv[1], sys.argv[2]))' "$CURRENT_VERSION" "${BUMP:-patch}" 2>/dev/null || echo "")
           VERSION=${VERSION:-Unreleased}
-          echo "expected next version: $VERSION (current: ${CURRENT_VERSION:-none}, mode: $MODE, bump: ${BUMP:-patch})"
+          echo "$(m wf_aisum.expected_version version="$VERSION" current_version="${CURRENT_VERSION:-none}" mode="$MODE" bump="${BUMP:-patch}")"
 
           SUMMARY_RESULT=$(python3 .github/scripts/changelog_manager.py ai-summary \
             --commits-file commits.txt \
@@ -136,10 +140,10 @@ jobs:
             --jq ".[] | select(.user.login == \"github-actions[bot]\" and (.body | startswith(\"$MARKER\"))) | .id" 2>/dev/null | tail -n 1 || true)
           if [ -n "$COMMENT_ID" ]; then
             gh api -X PATCH "repos/${{ github.repository }}/issues/comments/${COMMENT_ID}" --input comment_payload.json > /dev/null \
-              || echo "comment update failed — continuing (this workflow never blocks the PR)"
+              || echo "$(m wf_aisum.comment_update_failed)"
           else
             gh api -X POST "repos/${{ github.repository }}/issues/${PR_NUMBER}/comments" --input comment_payload.json > /dev/null \
-              || echo "comment post failed — continuing (this workflow never blocks the PR)"
+              || echo "$(m wf_aisum.comment_post_failed)"
           fi
 
       - name: Link related issue via branch name
@@ -152,6 +156,7 @@ jobs:
           # AUTO-CHANGELOG-CONTROL).
           HEAD_REF: ${{ github.event.pull_request.head.ref }}
         run: |
+          [ -f "$GITHUB_WORKSPACE/.github/scripts/messages.py" ] || { echo "::error::messages.py is missing; rerun \`npx project-auto-wizard --mode full --force\`"; exit 1; }
           m() { python3 "$GITHUB_WORKSPACE/.github/scripts/messages.py" get "$@"; }
           ISSUE_NUM=$(python3 .github/scripts/issue_helper.py extract-branch-issue "$HEAD_REF")