fix(scripts): harden cross-platform parity

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: marcelsafin

scripts/powershell/create-new-feature.ps1

@@ -147,7 +147,7 @@ $hasNumber = $PSBoundParameters.ContainsKey('Number') -and $Number -ne ''
 
 # Warn if -Number and -Timestamp are both specified.
 if ($Timestamp -and $hasNumber) {
-    Write-Warning "[specify] Warning: -Number is ignored when -Timestamp is used"
+    [Console]::Error.WriteLine("[specify] Warning: -Number is ignored when -Timestamp is used")
     $Number = ''
 }
 
@@ -239,8 +239,12 @@ if (-not $DryRun) {
     $env:SPECIFY_FEATURE = $branchName
     $env:SPECIFY_FEATURE_DIRECTORY = $featureDir
 
-    [Console]::Error.WriteLine("# To persist: export SPECIFY_FEATURE=$branchName")
-    [Console]::Error.WriteLine("#              export SPECIFY_FEATURE_DIRECTORY=$featureDir")
+    $quotedBranchName = "'" + $branchName.Replace("'", "''") + "'"
+    $quotedFeatureDir = "'" + $featureDir.Replace("'", "''") + "'"
+    $featureAssignment = '$env:SPECIFY_FEATURE = ' + $quotedBranchName
+    $directoryAssignment = '$env:SPECIFY_FEATURE_DIRECTORY = ' + $quotedFeatureDir
+    [Console]::Error.WriteLine("# To persist: $featureAssignment")
+    [Console]::Error.WriteLine("#              $directoryAssignment")
 }
 
 if ($Json) {
@@ -258,7 +262,7 @@ if ($Json) {
     Write-Output "SPEC_FILE: $specFile"
     Write-Output "FEATURE_NUM: $featureNum"
     if (-not $DryRun) {
-        Write-Output "# To persist in your shell: export SPECIFY_FEATURE=$branchName"
-        Write-Output "#                           export SPECIFY_FEATURE_DIRECTORY=$featureDir"
+        Write-Output "# To persist in your shell: $featureAssignment"
+        Write-Output "#                           $directoryAssignment"
     }
 }

scripts/python/create_new_feature.py

@@ -35,6 +35,32 @@ def _json_line(payload: object) -> str:
 _MAX_FEATURE_NUMBER = 2**63 - 1
 
 
+def _int64_from_digits(value: str) -> int | None:
+    normalized = value.lstrip("0") or "0"
+    maximum = str(_MAX_FEATURE_NUMBER)
+    if len(normalized) > len(maximum) or (
+        len(normalized) == len(maximum) and normalized > maximum
+    ):
+        return None
+    return int(normalized, 10)
+
+
+def _persistence_assignments(
+    branch_name: str, feature_dir: str, *, powershell: bool
+) -> tuple[str, str]:
+    if powershell:
+        quoted_branch = "'" + branch_name.replace("'", "''") + "'"
+        quoted_dir = "'" + feature_dir.replace("'", "''") + "'"
+        return (
+            f"$env:SPECIFY_FEATURE = {quoted_branch}",
+            f"$env:SPECIFY_FEATURE_DIRECTORY = {quoted_dir}",
+        )
+    return (
+        f"export SPECIFY_FEATURE={shlex.quote(branch_name)}",
+        f"export SPECIFY_FEATURE_DIRECTORY={shlex.quote(feature_dir)}",
+    )
+
+
 def _usage(argv0: str) -> str:
     return (
         f"Usage: {argv0} [--json] [--dry-run] [--allow-existing-branch] "
@@ -172,8 +198,8 @@ def _get_highest_from_specs(specs_dir: Path) -> int:
         if re.match(r"^[0-9]{3,}-", name) and not re.match(
             r"^[0-9]{8}-[0-9]{6}-", name
         ):
-            number = int(re.match(r"^[0-9]+", name).group(), 10)
-            if number <= _MAX_FEATURE_NUMBER:
+            number = _int64_from_digits(re.match(r"^[0-9]+", name).group())
+            if number is not None:
                 highest = max(highest, number)
     return highest
 
@@ -214,19 +240,14 @@ def main(argv: list[str] | None = None) -> int:
                     file=sys.stderr,
                 )
                 return 1
-            normalized_number = branch_number.lstrip("0") or "0"
-            max_feature_number = str(_MAX_FEATURE_NUMBER)
-            if len(normalized_number) > len(max_feature_number) or (
-                len(normalized_number) == len(max_feature_number)
-                and normalized_number > max_feature_number
-            ):
+            number = _int64_from_digits(branch_number)
+            if number is None:
                 print(
                     "Error: --number must be between 0 and "
                     f"{_MAX_FEATURE_NUMBER}, got '{branch_number}'",
                     file=sys.stderr,
                 )
                 return 1
-            number = int(normalized_number, 10)
         else:
             number = _get_highest_from_specs(specs_dir) + 1
         if number > _MAX_FEATURE_NUMBER:
@@ -303,15 +324,13 @@ def main(argv: list[str] | None = None) -> int:
         persist_feature_json(repo_root, str(feature_dir))
 
         # Inform the user how to set feature state in their own shell.
-        print(
-            f"# To persist: export SPECIFY_FEATURE={shlex.quote(branch_name)}",
-            file=sys.stderr,
-        )
-        print(
-            "#              export "
-            f"SPECIFY_FEATURE_DIRECTORY={shlex.quote(str(feature_dir))}",
-            file=sys.stderr,
+        feature_assignment, directory_assignment = _persistence_assignments(
+            branch_name,
+            str(feature_dir),
+            powershell=sys.platform == "win32",
         )
+        print(f"# To persist: {feature_assignment}", file=sys.stderr)
+        print(f"#              {directory_assignment}", file=sys.stderr)
 
     if args.json_mode:
         payload: dict[str, object] = {
@@ -327,14 +346,8 @@ def main(argv: list[str] | None = None) -> int:
         print(f"SPEC_FILE: {spec_file}")
         print(f"FEATURE_NUM: {feature_num}")
         if not args.dry_run:
-            print(
-                "# To persist in your shell: export "
-                f"SPECIFY_FEATURE={shlex.quote(branch_name)}"
-            )
-            print(
-                "#                           export "
-                f"SPECIFY_FEATURE_DIRECTORY={shlex.quote(str(feature_dir))}"
-            )
+            print(f"# To persist in your shell: {feature_assignment}")
+            print(f"#                           {directory_assignment}")
     return 0
 
 

src/specify_cli/integrations/base.py

@@ -679,13 +679,21 @@ def process_template(
         script_commands: dict[str, str] = {}
         script_pattern = re.compile(r"^\s*([A-Za-z0-9_-]+):\s*(.+)$")
         # Find the scripts: block
+        in_frontmatter = False
         in_scripts = False
         for line in content.splitlines():
-            if line.strip() == "scripts:":
+            if line == "---":
+                if in_frontmatter:
+                    break
+                in_frontmatter = True
+                continue
+            if not in_frontmatter:
+                continue
+            if line == "scripts:":
                 in_scripts = True
                 continue
             if in_scripts and line and not line[0].isspace():
-                in_scripts = False
+                break
             if in_scripts:
                 m = script_pattern.match(line)
                 if m:

tests/integrations/test_base.py

@@ -479,6 +479,24 @@ def test_sh_does_not_prefix_interpreter(self):
         assert ".specify/scripts/bash/check-prerequisites.sh --json" in result
         assert "python" not in result
 
+    def test_body_scripts_example_does_not_override_frontmatter(self):
+        content = (
+            "---\n"
+            "scripts:\n"
+            "  sh: scripts/bash/real.sh --json\n"
+            "---\n"
+            "Run {SCRIPT} now.\n"
+            "```yaml\n"
+            "scripts:\n"
+            "  sh: examples/not-the-command.sh\n"
+            "```\n"
+        )
+
+        result = IntegrationBase.process_template(content, "agent", "sh")
+
+        assert ".specify/scripts/bash/real.sh --json" in result
+        assert "examples/not-the-command.sh" in result
+
     def test_py_quotes_interpreter_with_spaces(self, monkeypatch):
         # An interpreter path containing whitespace (e.g. Windows
         # ``Program Files``) must be quoted so it isn't split into args.

tests/test_create_new_feature_python_parity.py

@@ -7,6 +7,7 @@
 
 import pytest
 
+from scripts.python import create_new_feature
 from scripts.python.common import persist_feature_json
 from tests.conftest import requires_bash
 from tests.parity_helpers import (
@@ -136,7 +137,8 @@ def test_all_variants_timestamp_mode_match_shape(repo: Path) -> None:
 
 
 @requires_bash
-def test_python_timestamp_number_warning_matches_bash(repo: Path) -> None:
+@pytest.mark.skipif(not HAS_POWERSHELL, reason="no PowerShell available")
+def test_all_variants_timestamp_number_warning_matches(repo: Path) -> None:
     args = (
         "--json",
         "--dry-run",
@@ -148,12 +150,31 @@ def test_python_timestamp_number_warning_matches_bash(repo: Path) -> None:
         "x",
     )
     bash = run(bash_cmd(repo, SCRIPT, *args), repo)
+    ps = run(
+        ps_cmd(
+            repo,
+            SCRIPT,
+            "-Json",
+            "-DryRun",
+            "-Timestamp",
+            "-Number",
+            "5",
+            "-ShortName",
+            "ua",
+            "x",
+        ),
+        repo,
+    )
     py = run(py_cmd(repo, SCRIPT, *args), repo)
 
-    assert py.returncode == bash.returncode == 0
+    assert bash.returncode == ps.returncode == py.returncode == 0
+    assert json_stdout(ps)
     assert (
         py.stderr
         == bash.stderr
+        == ps.stderr.replace("-Number", "--number").replace(
+            "-Timestamp", "--timestamp"
+        )
         == "[specify] Warning: --number is ignored when --timestamp is used\n"
     )
 
@@ -569,6 +590,26 @@ def test_all_variants_ignore_out_of_range_existing_prefix(repo: Path) -> None:
     assert json_stdout(py)["FEATURE_NUM"] == "001"
 
 
+def test_python_ignores_unconvertibly_large_existing_prefix() -> None:
+    class Entry:
+        name = f"{'9' * 5000}-existing"
+
+        @staticmethod
+        def is_dir() -> bool:
+            return True
+
+    class SpecsDir:
+        @staticmethod
+        def is_dir() -> bool:
+            return True
+
+        @staticmethod
+        def iterdir() -> list[Entry]:
+            return [Entry()]
+
+    assert create_new_feature._get_highest_from_specs(SpecsDir()) == 0
+
+
 @requires_bash
 @pytest.mark.skipif(not HAS_POWERSHELL, reason="no PowerShell available")
 def test_all_variants_text_mode_match(repo: Path) -> None:
@@ -603,14 +644,31 @@ def test_all_variants_non_dry_text_mode_match(tmp_path: Path) -> None:
     assert bash.returncode == ps.returncode == py.returncode == 0
     assert (
         normalize_repo_paths(bash.stdout, bash_repo)
-        == normalize_repo_paths(ps.stdout, ps_repo)
         == normalize_repo_paths(py.stdout, py_repo)
     )
     assert (
         normalize_repo_paths(bash.stderr, bash_repo)
-        == normalize_repo_paths(ps.stderr, ps_repo)
         == normalize_repo_paths(py.stderr, py_repo)
     )
+    ps_stdout = normalize_repo_paths(ps.stdout, ps_repo)
+    ps_stderr = normalize_repo_paths(ps.stderr, ps_repo)
+    assert "$env:SPECIFY_FEATURE = '007-x'" in ps_stdout
+    assert (
+        "$env:SPECIFY_FEATURE_DIRECTORY = '<REPO>/specs/007-x'" in ps_stdout
+    )
+    assert "$env:SPECIFY_FEATURE = '007-x'" in ps_stderr
+    assert (
+        "$env:SPECIFY_FEATURE_DIRECTORY = '<REPO>/specs/007-x'" in ps_stderr
+    )
+
+
+def test_python_powershell_persistence_assignments_escape_quotes() -> None:
+    assert create_new_feature._persistence_assignments(
+        "007-x", r"C:\repo\O'Brien", powershell=True
+    ) == (
+        "$env:SPECIFY_FEATURE = '007-x'",
+        "$env:SPECIFY_FEATURE_DIRECTORY = 'C:\\repo\\O''Brien'",
+    )
 
 
 @requires_bash