Address seventeenth review: project checks, catalog robustness

- Add .specify/ project check to workflow run/resume/status/search/info
- remove_catalog validates config shape (dict + list) before indexing
- _fetch_single_catalog validates response is a dict
- _get_merged_workflows raises when all catalogs fail to fetch
- add_catalog guards against non-dict catalog entries in config

Author: mnriem

src/specify_cli/__init__.py

@@ -4221,6 +4221,9 @@ def workflow_run(
     from .workflows.engine import WorkflowEngine
 
     project_root = Path.cwd()
+    if not (project_root / ".specify").exists():
+        console.print("[red]Error:[/red] Not a spec-kit project (no .specify/ directory)")
+        raise typer.Exit(1)
     engine = WorkflowEngine(project_root)
     engine.on_step_start = lambda sid, label: console.print(f"  \u25b8 [{sid}] {label} \u2026")
 
@@ -4285,6 +4288,9 @@ def workflow_resume(
     from .workflows.engine import WorkflowEngine
 
     project_root = Path.cwd()
+    if not (project_root / ".specify").exists():
+        console.print("[red]Error:[/red] Not a spec-kit project (no .specify/ directory)")
+        raise typer.Exit(1)
     engine = WorkflowEngine(project_root)
     engine.on_step_start = lambda sid, label: console.print(f"  \u25b8 [{sid}] {label} \u2026")
 
@@ -4318,6 +4324,9 @@ def workflow_status(
     from .workflows.engine import WorkflowEngine
 
     project_root = Path.cwd()
+    if not (project_root / ".specify").exists():
+        console.print("[red]Error:[/red] Not a spec-kit project (no .specify/ directory)")
+        raise typer.Exit(1)
     engine = WorkflowEngine(project_root)
 
     if run_id:
@@ -4669,6 +4678,9 @@ def workflow_search(
     from .workflows.catalog import WorkflowCatalog, WorkflowCatalogError
 
     project_root = Path.cwd()
+    if not (project_root / ".specify").exists():
+        console.print("[red]Error:[/red] Not a spec-kit project (no .specify/ directory)")
+        raise typer.Exit(1)
     catalog = WorkflowCatalog(project_root)
 
     try:
@@ -4702,6 +4714,9 @@ def workflow_info(
     from .workflows.engine import WorkflowEngine
 
     project_root = Path.cwd()
+    if not (project_root / ".specify").exists():
+        console.print("[red]Error:[/red] Not a spec-kit project (no .specify/ directory)")
+        raise typer.Exit(1)
 
     # Check installed first
     registry = WorkflowRegistry(project_root)

src/specify_cli/workflows/catalog.py

@@ -350,6 +350,11 @@ def _validate_catalog_url(url: str) -> None:
                 f"Failed to fetch catalog from {entry.url}: {exc}"
             ) from exc
 
+        if not isinstance(data, dict):
+            raise WorkflowCatalogError(
+                f"Catalog from {entry.url} is not a valid JSON object."
+            )
+
         # Write cache
         self.cache_dir.mkdir(parents=True, exist_ok=True)
         with open(cache_file, "w", encoding="utf-8") as f:
@@ -365,13 +370,15 @@ def _get_merged_workflows(
         """Merge workflows from all active catalogs (lower priority number wins)."""
         catalogs = self.get_active_catalogs()
         merged: dict[str, dict[str, Any]] = {}
+        fetch_errors = 0
 
         # Process later/higher-numbered entries first so earlier/lower-numbered
         # entries overwrite them on workflow ID conflicts.
         for entry in reversed(catalogs):
             try:
                 data = self._fetch_single_catalog(entry, force_refresh)
             except WorkflowCatalogError:
+                fetch_errors += 1
                 continue
             workflows = data.get("workflows", {})
             # Handle both dict and list formats
@@ -391,6 +398,10 @@ def _get_merged_workflows(
                         wf_data["_catalog_name"] = entry.name
                         wf_data["_install_allowed"] = entry.install_allowed
                         merged[wf_id] = wf_data
+        if fetch_errors == len(catalogs) and catalogs:
+            raise WorkflowCatalogError(
+                "All configured catalogs failed to fetch."
+            )
         return merged
 
     # -- Public API -------------------------------------------------------
@@ -467,15 +478,18 @@ def add_catalog(self, url: str, name: str | None = None) -> None:
             raise WorkflowValidationError(
                 "Catalog config 'catalogs' must be a list."
             )
-        # Check for duplicate URL
+        # Check for duplicate URL (guard against non-dict entries)
         for cat in catalogs:
-            if cat.get("url") == url:
+            if isinstance(cat, dict) and cat.get("url") == url:
                 raise WorkflowValidationError(
                     f"Catalog URL already configured: {url}"
                 )
 
         # Derive priority from the highest existing priority + 1
-        max_priority = max((cat.get("priority", 0) for cat in catalogs), default=0)
+        max_priority = max(
+            (cat.get("priority", 0) for cat in catalogs if isinstance(cat, dict)),
+            default=0,
+        )
         catalogs.append(
             {
                 "name": name or f"catalog-{len(catalogs) + 1}",
@@ -498,7 +512,15 @@ def remove_catalog(self, index: int) -> str:
             raise WorkflowValidationError("No catalog config file found.")
 
         data = yaml.safe_load(config_path.read_text(encoding="utf-8")) or {}
+        if not isinstance(data, dict):
+            raise WorkflowValidationError(
+                "Catalog config file is corrupted (expected a mapping)."
+            )
         catalogs = data.get("catalogs", [])
+        if not isinstance(catalogs, list):
+            raise WorkflowValidationError(
+                "Catalog config 'catalogs' must be a list."
+            )
 
         if index < 0 or index >= len(catalogs):
             raise WorkflowValidationError(
@@ -511,4 +533,6 @@ def remove_catalog(self, index: int) -> str:
         with open(config_path, "w", encoding="utf-8") as f:
             yaml.dump(data, f, default_flow_style=False, sort_keys=False, allow_unicode=True)
 
-        return removed.get("name", f"catalog-{index + 1}")
+        if isinstance(removed, dict):
+            return removed.get("name", f"catalog-{index + 1}")
+        return f"catalog-{index + 1}"

workflows/speckit/workflow.yml

@@ -18,7 +18,7 @@ inputs:
     prompt: "Feature name"
   integration:
     type: string
-    default: "claude"
+    default: "copilot"
     prompt: "Integration to use (e.g. claude, copilot, gemini)"
   scope:
     type: string