Apply review feedback: drop dead try/except, guard ext-config creation, explicit ConvertFrom-Yaml check

Author: Copilot

extensions/agent-context/scripts/powershell/update-agent-context.ps1

@@ -59,15 +59,21 @@ $ProjectRoot  = (Get-Location).Path
 $ExtConfig    = Join-Path $ProjectRoot '.specify/extensions/agent-context/agent-context-config.yml'
 
 if (-not (Test-Path -LiteralPath $ExtConfig)) {
-    Write-Host "agent-context: $ExtConfig not found; nothing to do."
+    Write-Warning "agent-context: $ExtConfig not found; nothing to do."
     exit 0
 }
 
-try {
-    $Options = Get-Content -LiteralPath $ExtConfig -Raw | ConvertFrom-Yaml -ErrorAction Stop
-} catch {
-    # ConvertFrom-Yaml may not be available on all systems.
-    # Fall back to Python+PyYAML for consistent parsing semantics.
+$Options = $null
+if (Get-Command ConvertFrom-Yaml -ErrorAction SilentlyContinue) {
+    try {
+        $Options = Get-Content -LiteralPath $ExtConfig -Raw | ConvertFrom-Yaml -ErrorAction Stop
+    } catch {
+        $Options = $null  # fall through to Python fallback
+    }
+}
+
+if ($null -eq $Options) {
+    # ConvertFrom-Yaml unavailable or failed; fall back to Python+PyYAML.
     $pythonCmd = $null
     foreach ($candidate in @('python3', 'python')) {
         if (Get-Command $candidate -ErrorAction SilentlyContinue) {
@@ -126,7 +132,7 @@ if (-not (Test-ConfigObject -Object $Options)) {
 
 $ContextFile = Get-ConfigValue -Object $Options -Key 'context_file'
 if (-not $ContextFile) {
-    Write-Host 'agent-context: context_file not set in extension config; nothing to do.'
+    Write-Warning 'agent-context: context_file not set in extension config; nothing to do.'
     exit 0
 }
 

src/specify_cli/__init__.py

@@ -1592,11 +1592,14 @@ def _clear_init_options_for_integration(project_root: Path, integration_key: str
         opts.pop("ai", None)
         opts.pop("ai_skills", None)
         save_init_options(project_root, opts)
-        # Clear context_file in the extension config too. If the config file
-        # does not exist yet, create it so no stale target can persist.
-        _update_agent_context_config_file(
-            project_root, "", preserve_markers=True
-        )
+        # Clear context_file in the extension config if it already exists.
+        # Avoid creating the config (and parent dirs) in projects where the
+        # agent-context extension was never installed.
+        ext_cfg_path = project_root / _AGENT_CTX_EXT_CONFIG
+        if ext_cfg_path.exists():
+            _update_agent_context_config_file(
+                project_root, "", preserve_markers=True
+            )
     elif has_legacy_context_keys:
         save_init_options(project_root, opts)
 

src/specify_cli/agents.py

@@ -376,17 +376,11 @@ def resolve_skill_placeholders(
 
         # Resolve __CONTEXT_FILE__ from the agent-context extension config.
         # Fall back to init-options.json for projects that haven't migrated.
-        context_file = ""
-        try:
-            # Local import: _load_agent_context_config lives in __init__.py
-            # which imports agents.py, so a top-level import would be circular.
-            from . import _load_agent_context_config
-            ac_cfg = _load_agent_context_config(project_root)
-            context_file = ac_cfg.get("context_file") or ""
-        except ImportError:
-            # Best-effort read: if the helper cannot be imported (e.g. during
-            # circular import setup), fall back to init-options.json below.
-            context_file = ""
+        # Local import: _load_agent_context_config lives in __init__.py which
+        # imports agents.py, so a top-level import would be circular.
+        from . import _load_agent_context_config
+        ac_cfg = _load_agent_context_config(project_root)
+        context_file = ac_cfg.get("context_file") or ""
         if not context_file:
             context_file = init_opts.get("context_file") or ""
         body = body.replace("__CONTEXT_FILE__", context_file)