Two related fixes for remote terminal backends (Modal/Docker): 1. NEW: Credential file mounting system Skills declare required_credential_files in frontmatter. Files are mounted into Docker (read-only bind mounts) and Modal (mounts at creation + sync via exec on each command for mid-session changes). Google Workspace skill updated with the new field. 2. FIX: Docker backend now includes env_passthrough vars Skills that declare required_environment_variables (e.g. Notion with NOTION_API_KEY) register vars in the env_passthrough system. The local backend checked this, but Docker's forward_env was a separate disconnected list. Now Docker exec merges both sources, so skill-declared env vars are forwarded into containers automatically. This fixes the reported issue where NOTION_API_KEY in ~/.hermes/.env wasn't reaching the Docker container despite being registered via the Notion skill's prerequisites. Closes #3665
164 lines
5.5 KiB
Python
164 lines
5.5 KiB
Python
"""Credential file passthrough registry for remote terminal backends.
|
|
|
|
Skills that declare ``required_credential_files`` in their frontmatter need
|
|
those files available inside sandboxed execution environments (Modal, Docker).
|
|
By default remote backends create bare containers with no host files.
|
|
|
|
This module provides a session-scoped registry so skill-declared credential
|
|
files (and user-configured overrides) are mounted into remote sandboxes.
|
|
|
|
Two sources feed the registry:
|
|
|
|
1. **Skill declarations** — when a skill is loaded via ``skill_view``, its
|
|
``required_credential_files`` entries are registered here if the files
|
|
exist on the host.
|
|
2. **User config** — ``terminal.credential_files`` in config.yaml lets users
|
|
explicitly list additional files to mount.
|
|
|
|
Remote backends (``tools/environments/modal.py``, ``docker.py``) call
|
|
:func:`get_credential_file_mounts` at sandbox creation time.
|
|
|
|
Each registered entry is a dict::
|
|
|
|
{
|
|
"host_path": "/home/user/.hermes/google_token.json",
|
|
"container_path": "/root/.hermes/google_token.json",
|
|
}
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import logging
|
|
import os
|
|
from pathlib import Path
|
|
from typing import Dict, List
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
# Session-scoped list of credential files to mount.
|
|
# Key: container_path (deduplicated), Value: host_path
|
|
_registered_files: Dict[str, str] = {}
|
|
|
|
# Cache for config-based file list (loaded once per process).
|
|
_config_files: List[Dict[str, str]] | None = None
|
|
|
|
|
|
def _resolve_hermes_home() -> Path:
|
|
return Path(os.environ.get("HERMES_HOME", Path.home() / ".hermes"))
|
|
|
|
|
|
def register_credential_file(
|
|
relative_path: str,
|
|
container_base: str = "/root/.hermes",
|
|
) -> bool:
|
|
"""Register a credential file for mounting into remote sandboxes.
|
|
|
|
*relative_path* is relative to ``HERMES_HOME`` (e.g. ``google_token.json``).
|
|
Returns True if the file exists on the host and was registered.
|
|
"""
|
|
hermes_home = _resolve_hermes_home()
|
|
host_path = hermes_home / relative_path
|
|
if not host_path.is_file():
|
|
logger.debug("credential_files: skipping %s (not found)", host_path)
|
|
return False
|
|
|
|
container_path = f"{container_base.rstrip('/')}/{relative_path}"
|
|
_registered_files[container_path] = str(host_path)
|
|
logger.debug("credential_files: registered %s -> %s", host_path, container_path)
|
|
return True
|
|
|
|
|
|
def register_credential_files(
|
|
entries: list,
|
|
container_base: str = "/root/.hermes",
|
|
) -> List[str]:
|
|
"""Register multiple credential files from skill frontmatter entries.
|
|
|
|
Each entry is either a string (relative path) or a dict with a ``path``
|
|
key. Returns the list of relative paths that were NOT found on the host
|
|
(i.e. missing files).
|
|
"""
|
|
missing = []
|
|
for entry in entries:
|
|
if isinstance(entry, str):
|
|
rel_path = entry.strip()
|
|
elif isinstance(entry, dict):
|
|
rel_path = (entry.get("path") or "").strip()
|
|
else:
|
|
continue
|
|
if not rel_path:
|
|
continue
|
|
if not register_credential_file(rel_path, container_base):
|
|
missing.append(rel_path)
|
|
return missing
|
|
|
|
|
|
def _load_config_files() -> List[Dict[str, str]]:
|
|
"""Load ``terminal.credential_files`` from config.yaml (cached)."""
|
|
global _config_files
|
|
if _config_files is not None:
|
|
return _config_files
|
|
|
|
result: List[Dict[str, str]] = []
|
|
try:
|
|
hermes_home = _resolve_hermes_home()
|
|
config_path = hermes_home / "config.yaml"
|
|
if config_path.exists():
|
|
import yaml
|
|
|
|
with open(config_path) as f:
|
|
cfg = yaml.safe_load(f) or {}
|
|
cred_files = cfg.get("terminal", {}).get("credential_files")
|
|
if isinstance(cred_files, list):
|
|
for item in cred_files:
|
|
if isinstance(item, str) and item.strip():
|
|
host_path = hermes_home / item.strip()
|
|
if host_path.is_file():
|
|
container_path = f"/root/.hermes/{item.strip()}"
|
|
result.append({
|
|
"host_path": str(host_path),
|
|
"container_path": container_path,
|
|
})
|
|
except Exception as e:
|
|
logger.debug("Could not read terminal.credential_files from config: %s", e)
|
|
|
|
_config_files = result
|
|
return _config_files
|
|
|
|
|
|
def get_credential_file_mounts() -> List[Dict[str, str]]:
|
|
"""Return all credential files that should be mounted into remote sandboxes.
|
|
|
|
Each item has ``host_path`` and ``container_path`` keys.
|
|
Combines skill-registered files and user config.
|
|
"""
|
|
mounts: Dict[str, str] = {}
|
|
|
|
# Skill-registered files
|
|
for container_path, host_path in _registered_files.items():
|
|
# Re-check existence (file may have been deleted since registration)
|
|
if Path(host_path).is_file():
|
|
mounts[container_path] = host_path
|
|
|
|
# Config-based files
|
|
for entry in _load_config_files():
|
|
cp = entry["container_path"]
|
|
if cp not in mounts and Path(entry["host_path"]).is_file():
|
|
mounts[cp] = entry["host_path"]
|
|
|
|
return [
|
|
{"host_path": hp, "container_path": cp}
|
|
for cp, hp in mounts.items()
|
|
]
|
|
|
|
|
|
def clear_credential_files() -> None:
|
|
"""Reset the skill-scoped registry (e.g. on session reset)."""
|
|
_registered_files.clear()
|
|
|
|
|
|
def reset_config_cache() -> None:
|
|
"""Force re-read of config on next access (for testing)."""
|
|
global _config_files
|
|
_config_files = None
|