Clean up.

core/src/castle_core/config.py

@@ -28,12 +28,37 @@ from castle_core.manifest import (
 )
 
 
-CASTLE_HOME = Path.home() / ".castle"
+def _resolve_castle_home() -> Path:
+    """Resolve the castle home directory (config, code, artifacts, secrets).
+
+    Defaults to ~/.castle. Override with the CASTLE_HOME environment variable
+    (supports ~ and relative paths, which are expanded and made absolute).
+    """
+    override = os.environ.get("CASTLE_HOME")
+    if override:
+        return Path(override).expanduser().resolve()
+    return Path.home() / ".castle"
+
+
+def _resolve_data_dir() -> Path:
+    """Resolve the program data directory (service/program data I/O).
+
+    Decoupled from CASTLE_HOME so bulk data can live on a dedicated volume.
+    Defaults to /data/castle. Override with the CASTLE_DATA_DIR environment
+    variable (supports ~ and relative paths, which are expanded and made absolute).
+    """
+    override = os.environ.get("CASTLE_DATA_DIR")
+    if override:
+        return Path(override).expanduser().resolve()
+    return Path("/data/castle")
+
+
+CASTLE_HOME = _resolve_castle_home()
 CODE_DIR = CASTLE_HOME / "code"
 ARTIFACTS_DIR = CASTLE_HOME / "artifacts"
 SPECS_DIR = ARTIFACTS_DIR / "specs"
 CONTENT_DIR = ARTIFACTS_DIR / "content"
-DATA_DIR = CASTLE_HOME / "data"
+DATA_DIR = _resolve_data_dir()
 SECRETS_DIR = CASTLE_HOME / "secrets"
 
 # Backwards-compat aliases (used by existing imports)

core/src/castle_core/deploy.py

@@ -146,7 +146,12 @@ def _build_deployed_service(
 ) -> DeployedComponent:
     """Build a DeployedComponent from a ServiceSpec."""
     run = svc.run
-    prefix = _env_prefix(name)
+    # Env prefix and data dir are keyed by the program (component) the service
+    # runs, not the service name — that's the prefix the program's settings read
+    # (e.g. job `protonmail-sync` runs program `protonmail` → PROTONMAIL_DATA_DIR).
+    # Falls back to the service name when no component is referenced.
+    config_key = svc.component or name
+    prefix = _env_prefix(config_key)
     env: dict[str, str] = {}
 
     # Data dir convention (for managed services)
@@ -154,7 +159,7 @@ def _build_deployed_service(
     if svc.manage and svc.manage.systemd and not svc.manage.systemd.enable:
         managed = False
     if managed:
-        env[f"{prefix}_DATA_DIR"] = str(DATA_DIR / name)
+        env[f"{prefix}_DATA_DIR"] = str(DATA_DIR / config_key)
 
     # Port convention (if exposed)
     port = None
@@ -210,10 +215,13 @@ def _build_deployed_job(
 ) -> DeployedComponent:
     """Build a DeployedComponent from a JobSpec."""
     run = job.run
-    prefix = _env_prefix(name)
+    # Keyed by the program (component) the job runs, not the job name — see
+    # _build_deployed_service for rationale. Falls back to the job name.
+    config_key = job.component or name
+    prefix = _env_prefix(config_key)
     env: dict[str, str] = {}
 
-    env[f"{prefix}_DATA_DIR"] = str(DATA_DIR / name)
+    env[f"{prefix}_DATA_DIR"] = str(DATA_DIR / config_key)
 
     if job.defaults and job.defaults.env:
         env.update(job.defaults.env)