stackops 26.6.4__tar.gz → 26.6.6__tar.gz

{stackops-26.6.4/src/stackops.egg-info → stackops-26.6.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: stackops
-Version: 26.6.4
+Version: 26.6.6
 Summary: Developer Stack Manager
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0
@@ -91,6 +91,15 @@ stackops --help
 </details>
 
 
+## Codex Skill
+
+Install the StackOps skill for Codex with:
+
+```bash
+bunx skills add thisismygitrepo/stackops --skill stackops --global --agent codex --yes
+```
+
+
 ## Quick Init
 
 Run these once StackOps is installed.

{stackops-26.6.4 → stackops-26.6.6}/README.md

@@ -64,6 +64,15 @@ stackops --help
 </details>
 
 
+## Codex Skill
+
+Install the StackOps skill for Codex with:
+
+```bash
+bunx skills add thisismygitrepo/stackops --skill stackops --global --agent codex --yes
+```
+
+
 ## Quick Init
 
 Run these once StackOps is installed.

{stackops-26.6.4 → stackops-26.6.6}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "stackops"
-version = "26.6.4"
+version = "26.6.6"
 description = "Developer Stack Manager"
 readme = "README.md"
 license = {text = "Apache 2.0"}

stackops-26.6.6/src/manual/test_dotfile_mapper_assets.py

@@ -0,0 +1,29 @@
+from pathlib import Path
+
+import yaml
+
+
+REPO_ROOT = Path(__file__).resolve().parents[2]
+MAPPER_PATH = REPO_ROOT / "src" / "stackops" / "utils" / "schemas" / "mapper" / "dotfiles.yaml"
+SETTINGS_ROOT = REPO_ROOT / "src" / "stackops" / "settings"
+CONFIG_SETTINGS_PREFIX = "CONFIG_ROOT/settings/"
+
+
+def test_library_mapper_config_settings_targets_are_packaged() -> None:
+    mapper = yaml.safe_load(MAPPER_PATH.read_text(encoding="utf-8")) or {}
+    missing_assets: list[str] = []
+
+    for program_name, entries in mapper.items():
+        for entry_name, entry in entries.items():
+            self_managed = entry["self_managed"]
+            if not self_managed.startswith(CONFIG_SETTINGS_PREFIX):
+                continue
+
+            relative_asset_path = self_managed.removeprefix(CONFIG_SETTINGS_PREFIX)
+            packaged_asset_path = SETTINGS_ROOT / relative_asset_path
+            if not packaged_asset_path.exists():
+                missing_assets.append(
+                    f"{program_name}.{entry_name}: {self_managed} -> {packaged_asset_path.relative_to(REPO_ROOT)}"
+                )
+
+    assert missing_assets == [], "Missing packaged settings assets:\n" + "\n".join(missing_assets)

stackops-26.6.6/src/manual/test_stackops_skill_refs.py

@@ -0,0 +1,129 @@
+from datetime import date
+
+from typer.testing import CliRunner
+
+from stackops.scripts.python.graph.cli_graph_apps import load_app_model
+from stackops.scripts.python.graph.cli_graph_nodes import build_children
+from stackops.scripts.python.graph.cli_graph_shared import AppRef
+from stackops.scripts.python.helpers.helpers_devops import cli_self_assets, stackops_skill_refs
+
+
+SAMPLE_GRAPH = {
+    "root": {
+        "kind": "root",
+        "name": "stackops",
+        "source": {"file": "src/stackops/scripts/python/stackops_entry.py"},
+        "children": [
+            {
+                "kind": "group",
+                "name": "devops",
+                "fullPath": "devops",
+                "source": {
+                    "file": "src/stackops/scripts/python/stackops_entry.py",
+                    "dispatches_to": "stackops.scripts.python.devops.get_app",
+                },
+                "aliases": [{"name": "d", "hidden": True}],
+                "children": [
+                    {
+                        "kind": "command",
+                        "name": "install",
+                        "fullPath": "devops install",
+                        "source": {"file": "src/stackops/scripts/python/devops.py", "callable": "install"},
+                    },
+                    {
+                        "kind": "group",
+                        "name": "data",
+                        "fullPath": "devops data",
+                        "source": {
+                            "file": "src/stackops/scripts/python/devops.py",
+                            "dispatches_to": "stackops.scripts.python.helpers.helpers_devops.cli_data.get_app",
+                        },
+                        "children": [
+                            {
+                                "kind": "command",
+                                "name": "sync",
+                                "fullPath": "devops data sync",
+                                "source": {
+                                    "file": "src/stackops/scripts/python/helpers/helpers_devops/cli_data.py",
+                                    "callable": "sync",
+                                },
+                            }
+                        ],
+                    },
+                ],
+            },
+            {
+                "kind": "group",
+                "name": "type-fix",
+                "fullPath": "utils pyproject type-fix",
+                "source": {
+                    "file": "src/stackops/scripts/python/helpers/helpers_utils/pyproject_utils_app.py",
+                    "dispatches_to": "stackops.scripts.python.helpers.helpers_utils.type_fix.get_app",
+                },
+                "children": [],
+            },
+        ],
+    }
+}
+
+
+def test_cli_map_uses_high_level_references_without_alias_nodes() -> None:
+    rendered = stackops_skill_refs.render_cli_map(
+        cli_graph_payload=SAMPLE_GRAPH,
+        project_scripts={"devops": "stackops.scripts.python.devops:main"},
+        generated_on=date(2026, 6, 9),
+    )
+
+    assert "Regenerated from `src/stackops/scripts/python/graph/cli_graph.json` on 2026-06-09." in rendered
+    assert "- `devops` -> `stackops.scripts.python.devops:main`" in rendered
+    assert "- `UV_CACHE_DIR=/tmp/uv-cache uv run stackops --help`" in rendered
+    assert "- `UV_CACHE_DIR=/tmp/uv-cache uv run devops --help`" in rendered
+    assert "devops install" not in rendered
+    assert "devops data sync" not in rendered
+    assert "commands/command--" not in rendered
+    assert "\n- [`d`" not in rendered
+
+
+def test_source_map_links_root_entrypoints_only() -> None:
+    rendered = stackops_skill_refs.render_source_map(cli_graph_payload=SAMPLE_GRAPH, generated_on=date(2026, 6, 9))
+
+    assert (
+        "- `devops` -> `src/stackops/scripts/python/stackops_entry.py` -> "
+        "`stackops.scripts.python.devops.get_app` via `devops`"
+    ) in rendered
+    assert "devops install" not in rendered
+    assert "devops data sync" not in rendered
+    assert "commands/command--" not in rendered
+    assert "commands/command--" not in rendered
+
+
+def test_update_skill_refs_command_is_registered() -> None:
+    result = CliRunner().invoke(cli_self_assets.get_app(), ["--help"])
+
+    assert result.exit_code == 0
+    assert "update-skill-refs" in result.stdout
+
+
+def test_cli_graph_expands_static_loop_command_registrations() -> None:
+    app_model = load_app_model(
+        AppRef(
+            module="stackops.scripts.python.helpers.helpers_devops.cli_config_tmux",
+            factory="get_app",
+        )
+    )
+
+    children = build_children(
+        app_model=app_model,
+        parent_full_tokens=("devops", "config", "terminal", "tmux-style"),
+        parent_short_tokens=("d", "c", "t", "s"),
+    )
+    child_names = {child["name"] for child in children}
+
+    assert {
+        "install-oh-my-tmux",
+        "apply-stackops-local",
+        "preset",
+        "set-option",
+        "reload",
+        "status",
+    } <= child_names

{stackops-26.6.4 → stackops-26.6.6}/src/stackops/cluster/sessions_managers/session_conflict.py

@@ -5,7 +5,7 @@ import subprocess
 from typing import Literal, NotRequired, TypedDict
 
 
-SessionBackend = Literal["tmux", "windows-terminal"]
+SessionBackend = Literal["tmux", "herdr"]
 SessionConflictActionLoose = Literal[
     "restart", "r",
     "rename", "n",
@@ -48,13 +48,13 @@ SUPPORTED_SESSION_CONFLICT_ACTIONS = frozenset(
         "mergeSkip",
     }
 )
-MERGE_NEW_WINDOWS_SESSION_CONFLICT_ACTIONS = frozenset(
+MERGE_SESSION_CONFLICT_ACTIONS = frozenset(
     {
         "mergeOverwrite",
         "mergeSkip",
     }
 )
-MERGE_NEW_WINDOWS_SUPPORTED_BACKENDS = frozenset({"tmux", "windows-terminal"})
+MERGE_SUPPORTED_BACKENDS = frozenset({"tmux"})
 
 
 class SessionLaunchPlan(TypedDict):
@@ -102,7 +102,7 @@ def _build_launch_plan(
 
 
 def _existing_conflict_hint(backend: SessionBackend) -> str:
-    if backend in MERGE_NEW_WINDOWS_SUPPORTED_BACKENDS:
+    if backend in MERGE_SUPPORTED_BACKENDS:
         return (
             "Use --on-conflict restart, --on-conflict rename, --on-conflict skip, "
             "--on-conflict mergeOverwrite, or "
@@ -112,7 +112,7 @@ def _existing_conflict_hint(backend: SessionBackend) -> str:
 
 
 def _duplicate_conflict_hint(backend: SessionBackend) -> str:
-    if backend in MERGE_NEW_WINDOWS_SUPPORTED_BACKENDS:
+    if backend in MERGE_SUPPORTED_BACKENDS:
         return (
             "Use unique layout names, --on-conflict rename, --on-conflict skip, "
             "--on-conflict mergeOverwrite, or "
@@ -138,16 +138,9 @@ def list_existing_sessions(backend: SessionBackend) -> set[str]:
                 return set()
             return {line.strip() for line in result.stdout.splitlines() if line.strip()}
 
-        if backend == "windows-terminal":
-            from stackops.cluster.sessions_managers.windows_terminal.wt_utils.wt_helpers import POWERSHELL_CMD
-
-            ps_script = """
-Get-Process -Name 'WindowsTerminal' -ErrorAction SilentlyContinue |
-Select-Object MainWindowTitle |
-ConvertTo-Json -Depth 2
-"""
+        if backend == "herdr":
             result = subprocess.run(
-                [POWERSHELL_CMD, "-Command", ps_script],
+                ["herdr", "workspace", "list"],
                 capture_output=True,
                 text=True,
                 timeout=10,
@@ -159,14 +152,17 @@ ConvertTo-Json -Depth 2
             if not output:
                 return set()
             payload = json.loads(output)
-            if not isinstance(payload, list):
-                payload = [payload]
-            titles = {
-                str(item.get("MainWindowTitle", "")).strip()
-                for item in payload
-                if isinstance(item, dict) and str(item.get("MainWindowTitle", "")).strip()
+            result_payload = payload.get("result") if isinstance(payload, dict) else None
+            if not isinstance(result_payload, dict):
+                return set()
+            workspaces = result_payload.get("workspaces")
+            if not isinstance(workspaces, list):
+                return set()
+            return {
+                str(item.get("label", "")).strip()
+                for item in workspaces
+                if isinstance(item, dict) and str(item.get("label", "")).strip()
             }
-            return titles
     except Exception:
         return set()
 
@@ -174,13 +170,7 @@ ConvertTo-Json -Depth 2
 
 
 def session_exists(session_name: str, existing_sessions: set[str], backend: SessionBackend) -> bool:
-    if backend != "windows-terminal":
-        return session_name in existing_sessions
-    session_name_lc = session_name.casefold()
-    return any(
-        candidate.casefold() == session_name_lc or session_name_lc in candidate.casefold()
-        for candidate in existing_sessions
-    )
+    return session_name in existing_sessions
 
 
 def build_session_launch_plan(
@@ -189,16 +179,15 @@ def build_session_launch_plan(
     on_conflict: SessionConflictAction,
 ) -> list[SessionLaunchPlan]:
     if (
-        on_conflict in MERGE_NEW_WINDOWS_SESSION_CONFLICT_ACTIONS
-        and backend not in MERGE_NEW_WINDOWS_SUPPORTED_BACKENDS
+        on_conflict in MERGE_SESSION_CONFLICT_ACTIONS
+        and backend not in MERGE_SUPPORTED_BACKENDS
     ):
-        supported_backends_text = ", ".join(sorted(MERGE_NEW_WINDOWS_SUPPORTED_BACKENDS))
+        supported_backends_text = ", ".join(sorted(MERGE_SUPPORTED_BACKENDS))
         raise SessionConflictError(
             f"{on_conflict} is only supported for {supported_backends_text} backends."
         )
     existing_sessions = list_existing_sessions(backend)
     planned_sessions: set[str] = set()
-    restarted_sessions: set[str] = set()
     plans: list[SessionLaunchPlan] = []
 
     for requested_name in requested_session_names:
@@ -211,18 +200,11 @@ def build_session_launch_plan(
 
         match on_conflict:
             case "mergeOverwrite":
-                should_restart_existing = (
-                    backend == "windows-terminal"
-                    and conflict_with_existing
-                    and requested_name not in restarted_sessions
-                )
-                if should_restart_existing:
-                    restarted_sessions.add(requested_name)
                 plans.append(
                     _build_launch_plan(
                         requested_name=requested_name,
                         session_name=requested_name,
-                        restart_required=should_restart_existing,
+                        restart_required=False,
                         conflict_source=conflict_source,
                         skip_launch=False,
                     )
@@ -230,17 +212,6 @@ def build_session_launch_plan(
                 planned_sessions.add(requested_name)
                 continue
             case "mergeSkip":
-                if backend == "windows-terminal" and conflict_with_existing:
-                    plans.append(
-                        _build_launch_plan(
-                            requested_name=requested_name,
-                            session_name=requested_name,
-                            restart_required=False,
-                            conflict_source="existing",
-                            skip_launch=True,
-                        )
-                    )
-                    continue
                 plans.append(
                     _build_launch_plan(
                         requested_name=requested_name,
@@ -342,22 +313,40 @@ def kill_existing_session(backend: SessionBackend, session_name: str) -> None:
             )
             return
 
-        if backend == "windows-terminal":
-            from stackops.cluster.sessions_managers.windows_terminal.wt_utils.wt_helpers import POWERSHELL_CMD
-
-            safe_name = session_name.replace("'", "''")
-            ps_script = f"""
-$name = '{safe_name}'
-Get-Process -Name 'WindowsTerminal' -ErrorAction SilentlyContinue |
-Where-Object {{ $_.MainWindowTitle -like "*$name*" }} |
-Stop-Process -Force -ErrorAction SilentlyContinue
-"""
-            subprocess.run(
-                [POWERSHELL_CMD, "-Command", ps_script],
+        if backend == "herdr":
+            result = subprocess.run(
+                ["herdr", "workspace", "list"],
                 capture_output=True,
                 text=True,
                 timeout=10,
                 check=False,
             )
+            if result.returncode != 0:
+                return
+            output = result.stdout.strip()
+            if not output:
+                return
+            payload = json.loads(output)
+            result_payload = payload.get("result") if isinstance(payload, dict) else None
+            if not isinstance(result_payload, dict):
+                return
+            workspaces = result_payload.get("workspaces")
+            if not isinstance(workspaces, list):
+                return
+            for item in workspaces:
+                if not isinstance(item, dict):
+                    continue
+                if str(item.get("label", "")).strip() != session_name:
+                    continue
+                workspace_id = str(item.get("workspace_id", "")).strip()
+                if workspace_id == "":
+                    continue
+                subprocess.run(
+                    ["herdr", "workspace", "close", workspace_id],
+                    capture_output=True,
+                    text=True,
+                    timeout=10,
+                    check=False,
+                )
     except Exception:
         return

stackops-26.6.6/src/stackops/cluster/sessions_managers/status_reporting.py

@@ -0,0 +1,43 @@
+from typing import Any
+
+
+def calculate_global_summary_from_status(
+    all_status: dict[str, dict[str, Any]],
+    include_remote_machines: bool = False,
+) -> dict[str, Any]:
+    total_sessions = len(all_status)
+    healthy_sessions = sum(
+        1
+        for status in all_status.values()
+        if status.get("summary", {}).get("session_healthy", False)
+    )
+    total_commands = sum(
+        status.get("summary", {}).get("total_commands", 0)
+        for status in all_status.values()
+    )
+    total_running = sum(
+        status.get("summary", {}).get("running_commands", 0)
+        for status in all_status.values()
+    )
+
+    result: dict[str, Any] = {
+        "total_sessions": total_sessions,
+        "healthy_sessions": healthy_sessions,
+        "unhealthy_sessions": total_sessions - healthy_sessions,
+        "total_commands": total_commands,
+        "running_commands": total_running,
+        "stopped_commands": total_commands - total_running,
+        "all_sessions_healthy": healthy_sessions == total_sessions,
+        "all_commands_running": total_running == total_commands,
+    }
+
+    if include_remote_machines:
+        result["remote_machines"] = list(
+            {
+                status.get("remote_name", "")
+                for status in all_status.values()
+                if "remote_name" in status
+            }
+        )
+
+    return result

{stackops-26.6.4 → stackops-26.6.6}/src/stackops/cluster/sessions_managers/tmux/tmux_local_manager.py

@@ -22,7 +22,7 @@ from stackops.cluster.sessions_managers.tmux.tmux_utils.tmux_status import (
     check_tmux_session_status,
 )
 from stackops.cluster.sessions_managers.monitoring_types import CommandStatus, StartResult
-from stackops.cluster.sessions_managers.windows_terminal.wt_utils.status_reporting import calculate_global_summary_from_status
+from stackops.cluster.sessions_managers.status_reporting import calculate_global_summary_from_status
 
 
 logger = get_logger("cluster.sessions_managers.tmux_local_manager")