systemlink-cli 1.9.3__tar.gz → 1.11.0__tar.gz

{systemlink_cli-1.9.3 → systemlink_cli-1.11.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: systemlink-cli
-Version: 1.9.3
+Version: 1.11.0
 Summary: SystemLink Integrator CLI - cross-platform CLI for SystemLink workflows and templates.
 License-File: LICENSE
 Author: Fred Visser

{systemlink_cli-1.9.3 → systemlink_cli-1.11.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "systemlink-cli"
-version = "1.9.3"
+version = "1.11.0"
 description = "SystemLink Integrator CLI - cross-platform CLI for SystemLink workflows and templates."
 authors = ["Fred Visser <fred.visser@emerson.com>"]
 packages = [{ include = "slcli" }]
@@ -16,6 +16,7 @@ slcli = "slcli.__main__:cli"
 slcli-mcp = "slcli.mcp_server:main"
 build-pyinstaller = "scripts.build_pyinstaller:main"
 update-version = "scripts.update_version:main"
+release-from-changes = "scripts.towncrier_release:main"
 lint = "scripts.lint:main"
 
 [tool.poetry.group.mcp]
@@ -59,8 +60,8 @@ pyinstaller = "^6.14.2"
 types-requests = "*"
 types-tabulate = "*"
 
-# Semantic Release
-python-semantic-release = "^10.0.0"
+# Changelog and release management
+towncrier = "^25.8.0"
 pytest-xdist = "^3.8.0"
 
 # Excel file generation
@@ -114,34 +115,40 @@ check_untyped_defs = true
 warn_redundant_casts = true
 warn_unreachable = true
 
-[tool.semantic_release]
-version_toml = ["pyproject.toml:tool.poetry.version"]
-version_variables = ["slcli/_version.py:__version__"]
-build_command = "python scripts/update_version.py"
-major_on_zero = false
-branch = "main"
-upload_to_pypi = true
-upload_to_release = true
-hvcs = "github"
-commit_message = "chore(release): {version}"
-tag_format = "v{version}"
-
-[tool.semantic_release.commit_parser_options]
-allowed_tags = ["build", "chore", "ci", "docs", "feat", "fix", "perf", "style", "refactor", "test"]
-minor_tags = ["feat"]
-patch_tags = ["fix", "perf"]
-
-[tool.semantic_release.changelog]
-template_dir = "templates"
-exclude_commit_patterns = []
-
-[tool.semantic_release.changelog.default_templates]
-changelog_file = "CHANGELOG.md"
-
-[tool.semantic_release.branches.main]
-match = "(main|master)"
-prerelease_token = "rc"
-prerelease = false
+[tool.towncrier]
+package = "slcli"
+package_dir = "."
+directory = "newsfragments"
+filename = "CHANGELOG.md"
+template = "towncrier:default.md"
+start_string = "<!-- towncrier release notes start -->\n"
+title_format = "## v{version} ({project_date})"
+ignore = ["README.md"]
+
+[[tool.towncrier.type]]
+directory = "major"
+name = "Breaking Changes"
+showcontent = true
+
+[[tool.towncrier.type]]
+directory = "minor"
+name = "Features"
+showcontent = true
+
+[[tool.towncrier.type]]
+directory = "patch"
+name = "Bug Fixes"
+showcontent = true
+
+[[tool.towncrier.type]]
+directory = "doc"
+name = "Documentation"
+showcontent = true
+
+[[tool.towncrier.type]]
+directory = "misc"
+name = "Other Changes"
+showcontent = true
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]

{systemlink_cli-1.9.3 → systemlink_cli-1.11.0}/slcli/_version.py

@@ -1,4 +1,4 @@
 """Version information for slcli."""
 
 # This file is auto-generated. Do not edit manually.
-__version__ = "1.9.3"
+__version__ = "1.11.0"

{systemlink_cli-1.9.3 → systemlink_cli-1.11.0}/slcli/main.py

@@ -30,6 +30,7 @@ from .rich_output import install_rich_output
 from .rich_output import render_table
 from .routine_click import register_routine_commands
 from .skill_click import register_skill_commands
+from .spec_click import register_spec_commands
 from .ssl_trust import OS_TRUST_INJECTED, OS_TRUST_REASON
 from .system_click import register_system_commands
 from .tag_click import register_tag_commands
@@ -365,6 +366,11 @@ def info(format: str, skip_health: bool) -> None:
         workspace_display = truncate(workspace)
         info_rows.append(["Workspace", workspace_display])
 
+    system_query_endpoint = platform_info.get("system_query_endpoint")
+    if system_query_endpoint:
+        system_query_display = truncate(str(system_query_endpoint))
+        info_rows.append(["System Query", system_query_display])
+
     file_query_endpoint = platform_info.get("file_query_endpoint")
     if file_query_endpoint:
         if (
@@ -427,6 +433,7 @@ register_notebook_commands(cli)
 register_policy_commands(cli)
 register_routine_commands(cli)
 register_system_commands(cli)
+register_spec_commands(cli)
 register_tag_commands(cli)
 register_testmonitor_commands(cli)
 register_webapp_commands(cli)

systemlink_cli-1.11.0/slcli/mcp_reachability.py

@@ -0,0 +1,64 @@
+"""Helpers for classifying local MCP client connectivity failures."""
+
+from typing import Iterator, List
+
+
+def iter_exceptions(exc: BaseException) -> Iterator[BaseException]:
+    """Yield an exception plus any nested causes, contexts, or exception-group members."""
+    stack: List[BaseException] = [exc]
+    seen: set[int] = set()
+
+    while stack:
+        current = stack.pop()
+        marker = id(current)
+        if marker in seen:
+            continue
+        seen.add(marker)
+        yield current
+
+        cause = getattr(current, "__cause__", None)
+        if isinstance(cause, BaseException):
+            stack.append(cause)
+
+        context = getattr(current, "__context__", None)
+        if isinstance(context, BaseException):
+            stack.append(context)
+
+        if isinstance(current, BaseExceptionGroup):
+            stack.extend(current.exceptions)
+
+
+def is_reachability_failure(exc: BaseException) -> bool:
+    """Return True when an exception indicates the local MCP server is unreachable."""
+    for candidate in iter_exceptions(exc):
+        if isinstance(candidate, (OSError, TimeoutError)):
+            return True
+
+        message = str(candidate).lower()
+        if "/mcp" in message and any(
+            token in message
+            for token in (
+                "server error",
+                "not found",
+                "method not allowed",
+                "bad request",
+            )
+        ):
+            return True
+
+        if any(
+            token in message
+            for token in (
+                "connection refused",
+                "connect error",
+                "all connection attempts failed",
+                "timed out",
+                "timeout",
+                "name or service not known",
+                "nodename nor servname provided",
+                "server disconnected",
+            )
+        ):
+            return True
+
+    return False

{systemlink_cli-1.9.3 → systemlink_cli-1.11.0}/slcli/mcp_server.py

@@ -271,7 +271,41 @@ def query_systems(
     take: int = 100,
 ) -> str:
     """Query systems by alias, connection state, workspace, or raw filter."""
-    from .utils import get_base_url
+    import requests as requests_lib
+
+    from .system_query_utils import (
+        MATERIALIZED_SYSTEM_MCP_PROJECTION,
+        build_materialized_system_search_filter,
+        get_system_query_url,
+        get_system_search_url,
+    )
+    from .utils import make_api_request
+
+    materialized_filter = None
+    if filter is None:
+        materialized_filter = build_materialized_system_search_filter(
+            alias=alias,
+            state=state,
+            workspace_id=workspace,
+        )
+
+    if filter is None:
+        search_payload: Dict[str, Any] = {
+            "take": take,
+            "projection": MATERIALIZED_SYSTEM_MCP_PROJECTION,
+        }
+        if materialized_filter:
+            search_payload["filter"] = materialized_filter
+        try:
+            data = make_api_request(
+                "POST",
+                get_system_search_url(),
+                payload=search_payload,
+                handle_errors=False,
+            ).json()
+            return _dump(_normalize_systems(data))
+        except requests_lib.RequestException:
+            pass
 
     filter_parts: List[str] = []
     if alias:
@@ -283,11 +317,16 @@ def query_systems(
     if filter:
         filter_parts.append(filter)
 
-    payload: Dict[str, Any] = {"take": take}
+    query_payload: Dict[str, Any] = {"take": take}
     if filter_parts:
-        payload["filter"] = " and ".join(filter_parts)
-
-    data = _post_json(f"{get_base_url()}/nisysmgmt/v1/query-systems", payload)
+        query_payload["filter"] = " and ".join(filter_parts)
+
+    data = make_api_request(
+        "POST",
+        get_system_query_url(),
+        payload=query_payload,
+        handle_errors=False,
+    ).json()
     return _dump(_normalize_systems(data))
 
 

{systemlink_cli-1.9.3 → systemlink_cli-1.11.0}/slcli/platform.py

@@ -59,6 +59,8 @@ FEATURE_DISPLAY_NAMES: Dict[str, str] = {
 FILE_SEARCH_PATH = "/nifile/v1/service-groups/Default/search-files"
 FILE_QUERY_PATH = "/nifile/v1/service-groups/Default/query-files"
 FILE_QUERY_LINQ_PATH = "/nifile/v1/service-groups/Default/query-files-linq"
+SYSTEM_SEARCH_PATH = "/nisysmgmt/v1/materialized/search-systems"
+SYSTEM_QUERY_PATH = "/nisysmgmt/v1/query-systems"
 
 
 def _get_keyring_config() -> Dict[str, Any]:
@@ -195,7 +197,7 @@ SERVICE_CHECKS: List[List[str]] = [
     ["Auth", "GET", "/niauth/v1/policies"],
     ["Test Monitor", "GET", "/nitestmonitor/v2/results?take=0"],
     ["Asset Management", "POST", "/niapm/v1/query-assets"],
-    ["Systems", "POST", "/nisysmgmt/v1/query-systems"],
+    ["Systems", "POST", SYSTEM_QUERY_PATH],
     ["Tag", "GET", "/nitag/v2/tags?take=0"],
     ["File", "POST", FILE_SEARCH_PATH],
     ["Notebook", "POST", "/ninotebook/v1/notebook/query"],
@@ -319,6 +321,87 @@ def get_file_query_capability(api_url: str, api_key: str) -> Dict[str, Any]:
         }
 
 
+def get_system_query_capability(api_url: str, api_key: str) -> Dict[str, Any]:
+    """Determine which systems query endpoint is available for this server."""
+    headers = {
+        "x-ni-api-key": api_key,
+        "Content-Type": "application/json",
+        "User-Agent": "SystemLink-CLI/1.0 (cross-platform)",
+    }
+    ssl_verify = get_ssl_verify()
+
+    try:
+        search_resp = requests.post(
+            f"{api_url}{SYSTEM_SEARCH_PATH}",
+            headers=headers,
+            json={"take": 1, "projection": ["id"]},
+            verify=ssl_verify,
+            timeout=10,
+        )
+        if search_resp.status_code in (200, 400):
+            return {
+                "status": "ok",
+                "system_query_endpoint": "search-systems",
+                "materialized_search_available": True,
+            }
+        if search_resp.status_code in (401, 403):
+            return {
+                "status": "unauthorized",
+                "system_query_endpoint": "search-systems",
+                "materialized_search_available": True,
+            }
+        if search_resp.status_code not in (404, 501):
+            return {
+                "status": "error" if search_resp.status_code >= 500 else "not_found",
+                "system_query_endpoint": None,
+                "materialized_search_available": True,
+            }
+    except requests.RequestException:
+        return {
+            "status": "unreachable",
+            "system_query_endpoint": None,
+            "materialized_search_available": None,
+        }
+
+    try:
+        query_resp = requests.post(
+            f"{api_url}{SYSTEM_QUERY_PATH}",
+            headers=headers,
+            json={"take": 1, "projection": "new(id)"},
+            verify=ssl_verify,
+            timeout=10,
+        )
+        if query_resp.status_code in (200, 400):
+            return {
+                "status": "ok",
+                "system_query_endpoint": "query-systems",
+                "materialized_search_available": False,
+            }
+        if query_resp.status_code in (401, 403):
+            return {
+                "status": "unauthorized",
+                "system_query_endpoint": "query-systems",
+                "materialized_search_available": False,
+            }
+        if query_resp.status_code in (404, 501):
+            return {
+                "status": "not_found",
+                "system_query_endpoint": None,
+                "materialized_search_available": False,
+            }
+        return {
+            "status": "error",
+            "system_query_endpoint": None,
+            "materialized_search_available": False,
+        }
+    except requests.RequestException:
+        return {
+            "status": "unreachable",
+            "system_query_endpoint": None,
+            "materialized_search_available": False,
+        }
+
+
 def check_service_status(api_url: str, api_key: str) -> Dict[str, Any]:
     """Probe key SystemLink services and report their status.
 
@@ -334,10 +417,12 @@ def check_service_status(api_url: str, api_key: str) -> Dict[str, Any]:
         - auth_valid: bool | None - whether the API key is authorized (None if unreachable)
         - services: dict mapping service name to status string
           ("ok", "unauthorized", "not_found", "error", "unreachable")
-                - file_query_endpoint: selected file query endpoint, if available
-                - elasticsearch_available: bool | None - whether search-files is available
-                - platform: detected platform string (PLATFORM_SLE, PLATFORM_SLS,
-                    PLATFORM_UNREACHABLE, PLATFORM_UNKNOWN)
+        - file_query_endpoint: selected file query endpoint, if available
+        - elasticsearch_available: bool | None - whether search-files is available
+        - system_query_endpoint: selected systems query endpoint, if available
+        - materialized_search_available: bool | None - whether search-systems is available
+        - platform: detected platform string (PLATFORM_SLE, PLATFORM_SLS,
+          PLATFORM_UNREACHABLE, PLATFORM_UNKNOWN)
     """
     headers = {
         "x-ni-api-key": api_key,
@@ -396,6 +481,8 @@ def check_service_status(api_url: str, api_key: str) -> Dict[str, Any]:
             "services": services,
             "file_query_endpoint": None,
             "elasticsearch_available": None,
+            "system_query_endpoint": None,
+            "materialized_search_available": None,
             "platform": PLATFORM_UNREACHABLE,
         }
 
@@ -416,6 +503,8 @@ def check_service_status(api_url: str, api_key: str) -> Dict[str, Any]:
 
     file_capability = get_file_query_capability(api_url, api_key)
     services["File"] = file_capability["status"]
+    system_capability = get_system_query_capability(api_url, api_key)
+    services["Systems"] = system_capability["status"]
 
     return {
         "server_reachable": True,
@@ -423,6 +512,8 @@ def check_service_status(api_url: str, api_key: str) -> Dict[str, Any]:
         "services": services,
         "file_query_endpoint": file_capability["file_query_endpoint"],
         "elasticsearch_available": file_capability["elasticsearch_available"],
+        "system_query_endpoint": system_capability["system_query_endpoint"],
+        "materialized_search_available": system_capability["materialized_search_available"],
         "platform": platform,
     }
 
@@ -473,6 +564,8 @@ def get_platform_info(skip_health: bool = False) -> Dict[str, Any]:
     platform = stored_platform
     file_query_endpoint: Optional[str] = None
     elasticsearch_available: Optional[bool] = None
+    system_query_endpoint: Optional[str] = None
+    materialized_search_available: Optional[bool] = None
 
     if not skip_health and logged_in and isinstance(api_url, str) and api_url != "Not configured":
         status = check_service_status(api_url, api_key)
@@ -482,6 +575,8 @@ def get_platform_info(skip_health: bool = False) -> Dict[str, Any]:
         platform = status["platform"]
         file_query_endpoint = status.get("file_query_endpoint")
         elasticsearch_available = status.get("elasticsearch_available")
+        system_query_endpoint = status.get("system_query_endpoint")
+        materialized_search_available = status.get("materialized_search_available")
 
     info: Dict[str, Any] = {
         "api_url": api_url,
@@ -497,6 +592,10 @@ def get_platform_info(skip_health: bool = False) -> Dict[str, Any]:
         info["file_query_endpoint"] = file_query_endpoint
     if elasticsearch_available is not None:
         info["elasticsearch_available"] = elasticsearch_available
+    if system_query_endpoint is not None:
+        info["system_query_endpoint"] = system_query_endpoint
+    if materialized_search_available is not None:
+        info["materialized_search_available"] = materialized_search_available
 
     if services is not None:
         info["services"] = services

{systemlink_cli-1.9.3 → systemlink_cli-1.11.0}/slcli/skill_click.py

@@ -11,7 +11,14 @@ import questionary
 from .utils import ExitCodes
 
 SKILL_NAME = "slcli"
-SKILL_CHOICES = ["slcli", "systemlink-webapp", "systemlink-notebook"]
+_FALLBACK_SKILL_CHOICES = [
+    "nipkg-file-package",
+    "slcli",
+    "systemlink-job-debugging",
+    "systemlink-notebook",
+    "systemlink-python-test",
+    "systemlink-webapp",
+]
 
 # Mapping of client name -> (personal skills dir, project subdir relative to repo root)
 # personal dir uses Path.home() so it's always resolved at call time via _personal_dir().
@@ -23,6 +30,45 @@ _CLIENT_TABLE: Dict[str, Tuple[str, str]] = {
 CLIENT_CHOICES = list(_CLIENT_TABLE.keys())
 
 
+def _skills_dir_candidates() -> List[Path]:
+    """Return candidate bundled skills directories for source and frozen layouts."""
+    candidates: List[Path] = []
+
+    meipass = getattr(sys, "_MEIPASS", None)
+    if meipass:
+        candidates.append(Path(meipass) / "skills")
+
+    if getattr(sys, "frozen", False):
+        candidates.append(Path(sys.executable).resolve().parent / "skills")
+
+    candidates.append(Path(__file__).resolve().parent / "skills")
+    return candidates
+
+
+def _skill_names_in_directory(directory: Path) -> List[str]:
+    """Return sorted bundled skill names for a skills directory."""
+    if not directory.exists():
+        return []
+
+    return sorted(
+        child.name
+        for child in directory.iterdir()
+        if child.is_dir() and (child / "SKILL.md").exists()
+    )
+
+
+def _discover_skill_choices() -> List[str]:
+    """Discover bundled skills from the current installation layout."""
+    for candidate in _skills_dir_candidates():
+        names = _skill_names_in_directory(candidate)
+        if names:
+            return names
+    return list(_FALLBACK_SKILL_CHOICES)
+
+
+SKILL_CHOICES = _discover_skill_choices()
+
+
 def _personal_dir(client: str) -> Path:
     """Return the resolved personal skills directory for a client."""
     return Path(_CLIENT_TABLE[client][0]).expanduser()
@@ -57,24 +103,8 @@ def _find_bundled_skills_dir() -> Path:
     Raises:
         FileNotFoundError: If the skills directory cannot be found.
     """
-    candidates: List[Path] = []
-
-    # PyInstaller onefile mode
-    meipass = getattr(sys, "_MEIPASS", None)
-    if meipass:
-        candidates.append(Path(meipass) / "skills")
-
-    # PyInstaller onedir / frozen executable
-    if getattr(sys, "frozen", False):
-        candidates.append(Path(sys.executable).resolve().parent / "skills")
-
-    # pip install / development: skills/ bundled inside the slcli package
-    candidates.append(Path(__file__).resolve().parent / "skills")
-
-    for candidate in candidates:
-        if candidate.exists() and any(
-            (candidate / name / "SKILL.md").exists() for name in SKILL_CHOICES
-        ):
+    for candidate in _skills_dir_candidates():
+        if _skill_names_in_directory(candidate):
             return candidate
 
     raise FileNotFoundError(
@@ -178,7 +208,7 @@ def register_skill_commands(cli: Any) -> None:
         "-k",
         type=click.Choice(SKILL_CHOICES + ["all"], case_sensitive=False),
         default=None,
-        help="Skill to install (slcli, systemlink-webapp, systemlink-notebook, or all).",
+        help=f"Skill to install ({', '.join(SKILL_CHOICES)}, or all).",
     )
     @click.option(
         "--client",
@@ -207,7 +237,7 @@ def register_skill_commands(cli: Any) -> None:
         """Install agent skills for AI coding assistants.
 
         Copies bundled skills into the skills directory of one or more AI clients.
-        Available skills: slcli, systemlink-webapp, systemlink-notebook.
+        Available skills are shown in `--help` and prompted interactively.
         Supported clients and their skill locations:
 
                     \b