fix: address final copilot review feedback

Author: PascalThuet

src/specify_cli/shared_infra.py

@@ -23,7 +23,7 @@ def load_speckit_manifest(
             manifest = IntegrationManifest.load("speckit", project_path)
             manifest.version = version
             return manifest
-        except (ValueError, FileNotFoundError) as exc:
+        except (ValueError, FileNotFoundError, OSError, UnicodeDecodeError) as exc:
             if console is not None:
                 console.print(
                     f"[yellow]Warning:[/yellow] Could not read shared infrastructure "

tests/integrations/test_cli.py

@@ -271,6 +271,23 @@ def test_shared_infra_warns_when_manifest_cannot_be_loaded(self, tmp_path, capsy
         assert "Could not read shared infrastructure manifest" in captured.out
         assert "A new shared manifest will be created" in captured.out
 
+    def test_shared_infra_warns_when_manifest_cannot_be_decoded(self, tmp_path, capsys):
+        """Non-UTF-8 shared manifests warn before falling back to a new manifest."""
+        from specify_cli import _install_shared_infra
+
+        project = tmp_path / "bad-shared-manifest-encoding-test"
+        project.mkdir()
+        integrations_dir = project / ".specify" / "integrations"
+        integrations_dir.mkdir(parents=True)
+        manifest_path = integrations_dir / "speckit.manifest.json"
+        manifest_path.write_bytes(b"\xff\xfe\x00")
+
+        _install_shared_infra(project, "sh")
+
+        captured = capsys.readouterr()
+        assert "Could not read shared infrastructure manifest" in captured.out
+        assert "A new shared manifest will be created" in captured.out
+
     def test_shared_infra_no_warning_when_forced(self, tmp_path, capsys):
         """No skip warning when force=True (all files overwritten)."""
         from specify_cli import _install_shared_infra

tests/integrations/test_integration_subcommand.py

@@ -81,15 +81,10 @@ def test_list_shows_multi_install_safe_status(self, tmp_path):
         assert result.exit_code == 0
         assert "Multi-install" in result.output
         assert "Safe" in result.output
-        rows = {
-            cells[0]: cells
-            for line in result.output.splitlines()
-            if line.startswith("│")
-            for cells in ([cell.strip() for cell in line.split("│")[1:-1]],)
-            if cells and cells[0]
-        }
-        assert rows["claude"][4] == "yes"
-        assert rows["copilot"][4] == "no"
+        claude_row = next(line for line in result.output.splitlines() if line.startswith("│ claude"))
+        copilot_row = next(line for line in result.output.splitlines() if line.startswith("│ copilot"))
+        assert claude_row.rstrip().endswith("│ yes           │")
+        assert copilot_row.rstrip().endswith("│ no            │")
 
 
 # ── install ──────────────────────────────────────────────────────────

tests/integrations/test_registry.py

@@ -31,16 +31,6 @@
 ]
 
 
-def _multi_install_safe_install_orders() -> list[tuple[str, str]]:
-    safe_keys = _multi_install_safe_keys()
-    return [
-        (first, second)
-        for first in safe_keys
-        for second in safe_keys
-        if first != second
-    ]
-
-
 def _multi_install_safe_keys() -> list[str]:
     return sorted(
         key
@@ -240,7 +230,7 @@ def test_safe_context_files_do_not_overlap_other_command_dirs(self, first, secon
             f"commands directory {_integration_commands_dir(first)!r}"
         )
 
-    @pytest.mark.parametrize(("first", "second"), _multi_install_safe_install_orders())
+    @pytest.mark.parametrize(("first", "second"), _multi_install_safe_pairs())
     def test_safe_integrations_have_disjoint_manifests(
         self,
         tmp_path,