stackops 8.102__tar.gz → 8.103__tar.gz

{stackops-8.102 → stackops-8.103}/MANIFEST.in

@@ -3,3 +3,4 @@ graft src/stackops/settings
 graft src/stackops/jobs
 graft src/stackops/profile
 graft src/stackops/scripts
+graft src/stackops/utils/schemas

{stackops-8.102/src/stackops.egg-info → stackops-8.103}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: stackops
-Version: 8.102
+Version: 8.103
 Summary: Developer Stack Manager
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0

{stackops-8.102 → stackops-8.103}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "stackops"
-version = "8.102"
+version = "8.103"
 description = "Developer Stack Manager"
 readme = "README.md"
 license = {text = "Apache 2.0"}
@@ -51,7 +51,7 @@ cloud = "stackops.scripts.python.cloud:main"
 fire = "stackops.scripts.python.fire_jobs:main"
 agents = "stackops.scripts.python.agents:main"
 terminal = "stackops.scripts.python.terminal:main"
-croshell = "stackops.scripts.python.croshell:main"
+preview = "stackops.scripts.python.preview:main"
 utils = "stackops.scripts.python.utils:main"
 stackops = "stackops.scripts.python.stackops_entry:main"
 seek = "stackops.scripts.python.seek:main"
@@ -65,7 +65,7 @@ license-files = []
 where = ["src"]
 
 [tool.setuptools.package-data]
-stackops = ["**/*.toml", "**/*.md", "**/*.sh", "**/*.ps1", "**/*.txt", "utils/schemas/**/*.json"]
+stackops = ["**/*.toml", "**/*.md", "**/*.sh", "**/*.ps1", "**/*.txt", "utils/schemas/**/*.json", "utils/schemas/**/*.yaml"]
 
 [dependency-groups]
 dev = [

stackops-8.103/src/manual/test_path_references.py

@@ -0,0 +1,18 @@
+
+
+from pathlib import Path
+
+import pytest
+
+from stackops.scripts.python.helpers.helpers_utils.path_reference_validation import audit_repository_path_references, format_path_reference_audit
+
+
+REPO_ROOT = Path(__file__).resolve().parents[2]
+
+
+def test_all_path_reference_targets_exist(capsys: pytest.CaptureFixture[str]) -> None:
+    audit = audit_repository_path_references(repo_path=REPO_ROOT, search_root=None)
+    with capsys.disabled():
+        print(f"Picked up {audit.reference_count} _PATH_REFERENCE variables.")
+    if audit.has_failures():
+        pytest.fail(format_path_reference_audit(audit=audit))

stackops-8.103/src/manual/test_secrets_schema.py

@@ -0,0 +1,47 @@
+import json
+from pathlib import Path
+
+import pytest
+
+from stackops.utils.schemas.secrets.secrets_loader import SecretsSchemaError, load_secrets_file
+from stackops.utils.schemas.secrets.secrets_types import SecretRecord
+
+
+REPO_ROOT = Path(__file__).resolve().parents[2]
+SECRETS_SCHEMA_PATH = REPO_ROOT / "src" / "stackops" / "utils" / "schemas" / "secrets" / "secrets.schema.json"
+SECRETS_EXAMPLE_PATH = REPO_ROOT / "src" / "stackops" / "utils" / "schemas" / "secrets" / "secrets.example.json"
+
+
+def test_loader_requires_secret_name(tmp_path: Path) -> None:
+    secrets_path = tmp_path / "secrets.json"
+    secrets_path.write_text(
+        json.dumps({"version": "0.5", "entries": [{"name": "service", "secrets": [{"keyValues": {"TOKEN": "redacted"}}]}]}), encoding="utf-8"
+    )
+
+    with pytest.raises(SecretsSchemaError, match=r"entries\[0\]\.secrets\[0\]\.name must be a non-empty string"):
+        load_secrets_file(secrets_path)
+
+
+def test_loaded_secret_name_is_required_type(tmp_path: Path) -> None:
+    secrets_path = tmp_path / "secrets.json"
+    secrets_path.write_text(
+        json.dumps({"version": "0.5", "entries": [{"name": "service", "secrets": [{"name": "api-token", "keyValues": {"TOKEN": "redacted"}}]}]}),
+        encoding="utf-8",
+    )
+
+    loaded = load_secrets_file(secrets_path)
+    secret: SecretRecord = loaded["entries"][0]["secrets"][0]
+
+    assert secret["name"] == "api-token"
+
+
+def test_schema_requires_secret_name() -> None:
+    schema = json.loads(SECRETS_SCHEMA_PATH.read_text(encoding="utf-8"))
+
+    assert schema["definitions"]["secret"]["required"] == ["name", "keyValues"]
+
+
+def test_packaged_example_secret_entries_have_names() -> None:
+    example = json.loads(SECRETS_EXAMPLE_PATH.read_text(encoding="utf-8"))
+
+    assert all("name" in secret for entry in example["entries"] for secret in entry["secrets"])

{stackops-8.102 → stackops-8.103}/src/stackops/cluster/remote/cloud_manager.py

@@ -13,8 +13,8 @@ from rich.console import Console
 from stackops.cluster.remote.models import JOB_STATUS, LogEntry
 from stackops.utils import rclone as rclone_utils
 from stackops.utils.files.read import read_json
-from stackops.utils.io import read_ini, save_json
-from stackops.utils.source_of_truth import DEFAULTS_PATH
+from stackops.utils.io import save_json
+from stackops.utils.source_of_truth import read_stackops_config_string
 
 
 LOCK_EXPIRY_SECONDS = 3600
@@ -59,7 +59,7 @@ class CloudManager:
         self.status_root = status_root
         self.max_jobs = max_jobs
         if cloud is None:
-            self.cloud = str(read_ini(DEFAULTS_PATH)["general"]["rclone_config_name"])
+            self.cloud = read_stackops_config_string("default_rclone_config")
         else:
             self.cloud = cloud
         self.lock_claimed = False

{stackops-8.102 → stackops-8.103}/src/stackops/cluster/remote/models.py

@@ -3,8 +3,8 @@ from dataclasses import dataclass, field, asdict
 from datetime import datetime, timedelta
 
 from stackops.utils.accessories import randstr
-from stackops.utils.io import read_ini
-from stackops.utils.source_of_truth import DEFAULTS_PATH
+from stackops.utils.source_of_truth import DOTFILES_STACKOPS_CONFIG_PATH, read_stackops_config_string
+from stackops.utils.schemas.config.config_types import StackOpsConfigStringKey
 
 
 JOB_STATUS: TypeAlias = Literal["queued", "running", "completed", "failed"]
@@ -158,12 +158,11 @@ class LogEntry:
         )
 
 
-def _read_default_config_value(key: str) -> str:
+def _read_default_config_value(key: StackOpsConfigStringKey) -> str:
     try:
-        section = read_ini(DEFAULTS_PATH)["general"]
-        return str(section[key])
-    except (FileNotFoundError, KeyError, IndexError) as err:
-        raise ValueError(f"Default config value '{key}' could not be read from `{DEFAULTS_PATH}`") from err
+        return read_stackops_config_string(key)
+    except (FileNotFoundError, KeyError, ValueError) as err:
+        raise ValueError(f"Config value '{key}' could not be read from `{DOTFILES_STACKOPS_CONFIG_PATH}`") from err
 
 
 @dataclass
@@ -222,9 +221,9 @@ class RemoteStackOpsConfig:
             raise ValueError("cloud_name must be provided when transfer_method is 'cloud'")
         if self.notify_upon_completion:
             if self.to_email is None:
-                self.to_email = _read_default_config_value("to_email")
+                self.to_email = _read_default_config_value("default_email_address")
             if self.email_config_name is None:
-                self.email_config_name = _read_default_config_value("email_config_name")
+                self.email_config_name = _read_default_config_value("default_email_config")
 
 
 @dataclass

stackops-8.103/src/stackops/jobs/installer/__init__.py

@@ -0,0 +1 @@
+TODO_PATH_REFERENCE = "todo.md"

{stackops-8.102 → stackops-8.103}/src/stackops/jobs/installer/checks/vt_utils.py

@@ -13,6 +13,8 @@ from typing import TYPE_CHECKING, TypedDict
 
 from rich.progress import Progress, TaskID
 
+from stackops.utils.source_of_truth import read_virus_total_api_key
+
 if TYPE_CHECKING:
     import vt
 
@@ -43,11 +45,7 @@ VERDICT_CATEGORIES: tuple[str, ...] = ("malicious", "suspicious", "harmless", "u
 
 
 def get_vt_client() -> "vt.Client":
-    VT_TOKEN_PATH = Path.home().joinpath("dotfiles/creds/tokens/virustotal")
-    if not VT_TOKEN_PATH.exists():
-        raise FileNotFoundError(f"VirusTotal token not found at {VT_TOKEN_PATH}")
-
-    token = VT_TOKEN_PATH.read_text(encoding="utf-8").split("\n")[0].strip()
+    token = read_virus_total_api_key()
     import vt
 
     return vt.Client(token)

{stackops-8.102 → stackops-8.103}/src/stackops/jobs/installer/package_groups.py

@@ -19,13 +19,16 @@ AGENTS = [
     "opencode-ai",
     "chatgpt",
     "forge",
+    "hermes",
     "mods",
     "oz",
     "q",
+    "qodercli",
     "qwen-code",
     "cursor-cli",
     "droid",
     "pi",
+    "omp",
     "orca",
     "kilocode",
     "cline",

stackops-8.103/src/stackops/profile/__init__.py

@@ -0,0 +1,6 @@
+# Compatibility path references for callers that still resolve mapper assets
+# relative to stackops.profile. New code should import stackops.utils.schemas.mapper.
+MAPPER_DATA_SCHEMA_PATH_REFERENCE = "../utils/schemas/mapper/data.schema.json"
+MAPPER_DATA_PATH_REFERENCE = "../utils/schemas/mapper/data.yaml"
+MAPPER_DOTFILES_SCHEMA_PATH_REFERENCE = "../utils/schemas/mapper/dotfiles.schema.json"
+MAPPER_DOTFILES_PATH_REFERENCE = "../utils/schemas/mapper/dotfiles.yaml"

{stackops-8.102 → stackops-8.103}/src/stackops/profile/create_links.py

@@ -24,7 +24,7 @@ from stackops.profile.dotfiles_mapper import (
     VALID_OS_VALUES,
     load_dotfiles_mapper,
 )
-from stackops.utils.source_of_truth import CONFIG_ROOT
+from stackops.utils.source_of_truth import CONFIG_ROOT, DOTFILES_SSH_CREDS_ROOT, resolve_source_of_truth_path
 
 import platform
 import subprocess
@@ -75,7 +75,7 @@ def _parse_os_field(os_field: OsField) -> set[OsName]:
 
 
 def _resolve_self_managed_path(path_value: str) -> Path:
-    return Path(path_value.replace("CONFIG_ROOT", CONFIG_ROOT.as_posix())).expanduser().absolute()
+    return resolve_source_of_truth_path(path_value)
 
 
 def _is_public_self_managed_path(path_value: str) -> bool:
@@ -390,12 +390,12 @@ def apply_mapper(
                         status=f"error: {str(ex)}",
                     )
 
-            if program_name == "ssh" and system == "Linux":  # permissions of ~/dotfiles/.ssh should be adjusted
+            if program_name == "ssh" and system == "Linux":  # permissions of the private SSH dotfiles should be adjusted
                 try:
                     console.print("\n[bold]🔒 Setting secure permissions for SSH files...[/bold]")
                     subprocess.run("chmod 700 $HOME/.ssh/", shell=True, check=True)
-                    subprocess.run("chmod 700 $HOME/dotfiles/creds/.ssh/", shell=True, check=True)
-                    subprocess.run("chmod 600 $HOME/dotfiles/creds/.ssh/*", shell=True, check=True)
+                    subprocess.run(f"chmod 700 {DOTFILES_SSH_CREDS_ROOT}", shell=True, check=True)
+                    subprocess.run(f"chmod 600 {DOTFILES_SSH_CREDS_ROOT}/*", shell=True, check=True)
                     subprocess.run("chmod 600 $HOME/.ssh/*", shell=True, check=True)
                     console.print("[green]✅ SSH permissions set successfully[/green]")
                 except Exception as e:

{stackops-8.102 → stackops-8.103}/src/stackops/profile/dotfiles_mapper.py

@@ -2,17 +2,18 @@ from collections.abc import Mapping
 from pathlib import Path
 from typing import Literal, NotRequired, TypedDict
 
-import stackops.profile as profile_assets
 import yaml
 
+import stackops.utils.schemas.mapper as mapper_assets
 from stackops.utils.path_reference import get_path_reference_path
+from stackops.utils.source_of_truth import DOTFILES_USER_MAPPER_PATH
 
 
 LIBRARY_MAPPER_PATH = get_path_reference_path(
-    module=profile_assets,
-    path_reference=profile_assets.MAPPER_DOTFILES_PATH_REFERENCE,
+    module=mapper_assets,
+    path_reference=mapper_assets.MAPPER_DOTFILES_PATH_REFERENCE,
 )
-USER_MAPPER_PATH = Path.home().joinpath("dotfiles/stackops/mapper_dotfiles.yaml")
+USER_MAPPER_PATH = DOTFILES_USER_MAPPER_PATH
 DEFAULT_DOTFILE_MAPPER_HEADER = (
     "# User-defined config file mappings\n"
     "# Created by `d c` CLI tool\n"

{stackops-8.102 → stackops-8.103}/src/stackops/scripts/python/cloud.py

@@ -2,6 +2,7 @@
 
 import typer
 from typing import Annotated, Literal
+from stackops.profile.dotfiles_mapper import DEFAULT_OS_FILTER
 from stackops.utils.ve import read_default_cloud_config
 
 
@@ -32,6 +33,10 @@ def copy(
     target: Annotated[str, typer.Argument(help="🎯 file/folder path to be be sent to here.")],
     overwrite: Annotated[bool, typer.Option("--overwrite", "-o", help="📝 Overwrite existing file.")] = defaults["overwrite"],
     share: Annotated[bool, typer.Option("--share", "-s", help="🔗 Share file / directory")] = defaults["share"],
+    record: Annotated[bool, typer.Option("--record", "-m", help="📝 Record an upload in user mapper/data.yaml. Requires --record-name.")] = False,
+    record_group: Annotated[str, typer.Option("--record-group", "-g", help="🗂 Group name for --record in mapper/data.yaml.")] = "default",
+    record_name: Annotated[str | None, typer.Option("--record-name", "-n", help="🏷 Entry name for --record in mapper/data.yaml. Required when using --record.")] = None,
+    record_os: Annotated[str, typer.Option("--record-os", help="💻 OS filter for --record. Comma-separated: linux,darwin,windows. Defaults to all.")] = DEFAULT_OS_FILTER,
     rel2home: Annotated[bool, typer.Option("--relative2home", "-r", help="🏠 Relative to `myhome` folder")] = defaults["rel2home"],
     root: Annotated[str, typer.Option("--root", "-R", help="🌳 Remote root.")] = defaults["root"],
     key: Annotated[str | None, typer.Option("--key", "-k", help="🔑 Key for encryption")] = defaults["key"],
@@ -43,7 +48,24 @@ def copy(
 ) -> None:
     """📤 Upload or 📥 Download files/folders to/from cloud storage services."""
     from stackops.scripts.python.helpers.helpers_cloud.cloud_copy import main as copy_main
-    copy_main(source=source, target=target, overwrite=overwrite, share=share, rel2home=rel2home, root=root, key=key, pwd=pwd, encrypt=encrypt, zip_=zip_, os_specific=os_specific, config=config)
+    copy_main(
+        source=source,
+        target=target,
+        overwrite=overwrite,
+        share=share,
+        record=record,
+        record_group=record_group,
+        record_name=record_name,
+        record_os=record_os,
+        rel2home=rel2home,
+        root=root,
+        key=key,
+        pwd=pwd,
+        encrypt=encrypt,
+        zip_=zip_,
+        os_specific=os_specific,
+        config=config,
+    )
 
 
 def mount(

{stackops-8.102 → stackops-8.103}/src/stackops/scripts/python/devops.py

@@ -46,6 +46,15 @@ def inspect_devops_help_emojis() -> list[EmojiDisplayDiagnostic]:
     return emoji_display_diagnostics(emojis=["🔧", "📁", "🔩", "💾", "🔧", "🌐", "🚀"])
 
 
+def _run_nested_app(ctx: typer.Context, app_factory: Callable[[], typer.Typer], *, prog_name: str | None = None) -> None:
+    if prog_name is None:
+        nested_result: object = app_factory()(ctx.args, standalone_mode=False)
+    else:
+        nested_result = app_factory()(ctx.args, prog_name=prog_name, standalone_mode=False)
+    if isinstance(nested_result, int):
+        raise typer.Exit(code=nested_result)
+
+
 def install(
     ctx: typer.Context,
     which: Annotated[
@@ -71,35 +80,35 @@ def repos(ctx: typer.Context) -> None:
     """📁 <r> Manage development repositories"""
     from stackops.scripts.python.helpers.helpers_devops import cli_repos
 
-    cli_repos.get_app()(ctx.args, standalone_mode=False)
+    _run_nested_app(ctx, cli_repos.get_app)
 
 
 def config(ctx: typer.Context) -> None:
     """⚙️ <c> Configuration management"""
     from stackops.scripts.python.helpers.helpers_devops import cli_config
 
-    cli_config.get_app()(ctx.args, prog_name=ctx.command_path, standalone_mode=False)
+    _run_nested_app(ctx, cli_config.get_app, prog_name=ctx.command_path)
 
 
 def data(ctx: typer.Context) -> None:
     """💾 <d> Data management"""
     from stackops.scripts.python.helpers.helpers_devops import cli_data
 
-    cli_data.get_app()(ctx.args, standalone_mode=False)
+    _run_nested_app(ctx, cli_data.get_app)
 
 
 def self_cmd(ctx: typer.Context) -> None:
     """🔧 <s> Self management"""
     from stackops.scripts.python.helpers.helpers_devops import cli_self
 
-    cli_self.get_app()(ctx.args, standalone_mode=False)
+    _run_nested_app(ctx, cli_self.get_app)
 
 
 def network(ctx: typer.Context) -> None:
     """🌐 <n> Network management"""
     import stackops.scripts.python.helpers.helpers_devops.cli_nw as cli_network
 
-    cli_network.get_app()(ctx.args, standalone_mode=False)
+    _run_nested_app(ctx, cli_network.get_app)
 
 
 def execute(
@@ -119,6 +128,13 @@ def execute(
     run_py_script_module.run_py_script(ctx=ctx, name=name, where=where, interactive=interactive, command=command, list_scripts=list_scripts)
 
 
+def vault(ctx: typer.Context) -> None:
+    """🔐 <v> Search Bitwarden credentials and manage vault sessions."""
+    from stackops.scripts.python.helpers.helpers_devops import cli_vault
+
+    _run_nested_app(ctx, cli_vault.get_app, prog_name=ctx.command_path)
+
+
 def get_app() -> typer.Typer:
     cli_app = typer.Typer(help="🔧 DevOps operations", no_args_is_help=True, add_help_option=True, add_completion=False)
     ctx_settings: dict[str, object] = {
@@ -147,6 +163,9 @@ def get_app() -> typer.Typer:
     )
     cli_app.command("e", no_args_is_help=True, hidden=True)(execute)
 
+    cli_app.command("vault", help="🔐 <v> Search Bitwarden credentials and manage vault sessions", context_settings=ctx_settings)(vault)
+    cli_app.command("v", hidden=True, context_settings=ctx_settings)(vault)
+
     return cli_app
 
 

{stackops-8.102 → stackops-8.103}/src/stackops/scripts/python/fire_jobs.py

@@ -23,7 +23,6 @@ def fire(
     root_repo: Annotated[bool, typer.Option("--root-repo", "-r", help="Resolve and search from the repository root")] = False,
     remote: Annotated[bool, typer.Option("--remote", "-R", help="Launch on a remote machine")] = False,
     streamlit: Annotated[bool, typer.Option("--streamlit", "-S", help="Run as streamlit app")] = False,
-    environment: Annotated[str, typer.Option("--environment", "-E", help="Choose ip, localhost, hostname or arbitrary url")] = "",
     holdDirectory: Annotated[bool, typer.Option("--holdDirectory", "-D", help="Hold current directory and avoid cd'ing to the script directory")] = False,
     PathExport: Annotated[bool, typer.Option("--PathExport", "-P", help="Augment the PYTHONPATH with repo root")] = False,
     git_pull: Annotated[bool, typer.Option("--git-pull", "-g", help="Start by pulling the git repo")] = False,
@@ -52,7 +51,6 @@ def fire(
         module=module,
         script=script,
         streamlit=streamlit,
-        environment=environment,
         holdDirectory=holdDirectory,
         PathExport=PathExport,
         git_pull=git_pull,