fix: improve test match specificity and rollback error message per code review

Co-authored-by: mnriem <15701806+mnriem@users.noreply.github.com>
Agent-Logs-Url: https://github.com/github/spec-kit/sessions/40d5aec5-d8e9-4e3f-ae60-6cf67ff491f3

Author: Copilot

src/specify_cli/__init__.py

@@ -2731,7 +2731,8 @@ def agent_switch(
                 )
                 options["agent_switch_error"] = (
                     f"Switch to '{agent_id}' failed after teardown of "
-                    f"'{current_agent}'. Restore manually."
+                    f"'{current_agent}'. Run 'specify init --here --agent "
+                    f"{current_agent}' to restore."
                 )
                 init_options_file.write_text(
                     json.dumps(options, indent=2), encoding="utf-8"

tests/test_agent_pack.py

@@ -344,7 +344,7 @@ def test_agent_dir_raises_on_empty_commands_dir(self, tmp_path):
         data["command_registration"]["commands_dir"] = ""
         m = AgentManifest.from_dict(data)
         b = DefaultBootstrap(m)
-        with pytest.raises(AgentPackError, match="empty commands_dir"):
+        with pytest.raises(AgentPackError, match=f"Agent '{m.id}' has an empty commands_dir"):
             b.agent_dir(tmp_path)