Personal AI, On Personal Devices
Python
feat(core): consolidate all state under a single env-aware home directory (#462) (#549)
Jon Saad-Falcon3e2f4bcdb40b
diff --git a/docs/getting-started/configuration.md b/docs/getting-started/configuration.mdindex 82631d83..ea1b5d6b 100644--- a/docs/getting-started/configuration.md+++ b/docs/getting-started/configuration.md@@ -17,6 +17,46 @@ The configuration file lives at:OpenJarvis creates the `~/.openjarvis/` directory and populates it with a default config when you run `jarvis init`.+## Relocating the OpenJarvis directory++OpenJarvis keeps **all** of its state — config, databases, caches, logs,+credentials, skills, recipes, connectors — under a **single root** so it never+clutters your home directory beyond one folder. By default that root is+`~/.openjarvis`, but you can move it.++The root is resolved in priority order:++1. **`$OPENJARVIS_HOME`** — explicit override. Honored by both the installer+ and the Python runtime.+2. **`$XDG_DATA_HOME/openjarvis`** — used when `$XDG_DATA_HOME` is set (a single+ `openjarvis` directory nested under it, per the XDG Base Directory spec).+3. **`~/.openjarvis`** — the default. With no environment variables set, the+ resolved path is exactly this, so existing installs are untouched.++```bash+# Relocate the whole install + runtime tree at install time:+OPENJARVIS_HOME=~/apps/openjarvis curl -fsSL https://open-jarvis.github.io/OpenJarvis/install.sh | bash++# Or for a single run / your shell profile:+export OPENJARVIS_HOME=~/apps/openjarvis+```++Confirm where your data lives with:++```bash+jarvis config path+```++!!! note "Migration"+ Because the default is unchanged, **no data migration is required** for+ existing installs. If you set `OPENJARVIS_HOME` (or `XDG_DATA_HOME`) on a+ machine that already has data in `~/.openjarvis`, OpenJarvis will look in+ the new location and not see your old data — move it yourself if you want+ to keep it: `mv ~/.openjarvis "$OPENJARVIS_HOME"`.++`$OPENJARVIS_CONFIG` still points at an explicit `config.toml` file+independently of the root, if you need to override just the config file path.+## Generating Configuration### First-Time Setupdiff --git a/scripts/install/install.sh b/scripts/install/install.shindex bf9fc383..0738b748 100755--- a/scripts/install/install.sh+++ b/scripts/install/install.sh@@ -210,6 +210,14 @@ if ! command -v python3 >/dev/null 2>&1; thenfi# ---- env ----+# OpenJarvis keeps ALL of its state (install tree + runtime data, configs,+# databases, caches, logs) under a single root so it never clutters $HOME+# beyond one directory. Relocate it by exporting OPENJARVIS_HOME before+# running the installer, e.g.:+# OPENJARVIS_HOME=~/apps/openjarvis curl ... | bash+# The Python runtime honors the same override (and, when OPENJARVIS_HOME is+# unset, $XDG_DATA_HOME/openjarvis if XDG_DATA_HOME is set). With nothing set+# the root is ~/.openjarvis, so existing installs are untouched.OPENJARVIS_HOME="${OPENJARVIS_HOME:-$HOME/.openjarvis}"OPENJARVIS_REPO_URL="${OPENJARVIS_REPO_URL:-https://github.com/open-jarvis/OpenJarvis.git}"SRC_DIR="$OPENJARVIS_HOME/src"diff --git a/src/openjarvis/agents/claude_code.py b/src/openjarvis/agents/claude_code.pyindex 8fb3c470..fdece7f0 100644--- a/src/openjarvis/agents/claude_code.py+++ b/src/openjarvis/agents/claude_code.py@@ -19,6 +19,7 @@ from typing import Any, List, Optionalfrom openjarvis.agents._stubs import AgentContext, AgentResult, BaseAgentfrom openjarvis.core.events import EventBus+from openjarvis.core.paths import get_config_dirfrom openjarvis.core.registry import AgentRegistryfrom openjarvis.core.types import ToolResultfrom openjarvis.engine._stubs import InferenceEngine@@ -103,7 +104,7 @@ class ClaudeCodeAgent(BaseAgent):"Install it from https://nodejs.org/ or via your package manager.")- dest = Path.home() / ".openjarvis" / "claude_code_runner"+ dest = get_config_dir() / "claude_code_runner"dest.mkdir(parents=True, exist_ok=True)# Copy runner files if missing or outdateddiff --git a/src/openjarvis/agents/digest_store.py b/src/openjarvis/agents/digest_store.pyindex d44afde4..7856a74e 100644--- a/src/openjarvis/agents/digest_store.py+++ b/src/openjarvis/agents/digest_store.py@@ -9,6 +9,8 @@ from datetime import datetimefrom pathlib import Pathfrom typing import Dict, List, Optional+from openjarvis.core.paths import get_config_dir+@dataclassclass DigestArtifact:@@ -30,7 +32,7 @@ class DigestStore:def __init__(self, db_path: str = "") -> None:if not db_path:- db_path = str(Path.home() / ".openjarvis" / "digest.db")+ db_path = str(get_config_dir() / "digest.db")self._db_path = db_pathself._conn = sqlite3.connect(db_path, check_same_thread=False)self._conn.execute("PRAGMA journal_mode=WAL")diff --git a/src/openjarvis/agents/hybrid/runner.py b/src/openjarvis/agents/hybrid/runner.pyindex 52a2f12a..d671615f 100644--- a/src/openjarvis/agents/hybrid/runner.py+++ b/src/openjarvis/agents/hybrid/runner.py@@ -38,13 +38,14 @@ except ModuleNotFoundError:from openjarvis.agents._stubs import AgentContext, AgentResultfrom openjarvis.agents.hybrid._energy import EnergyCollectorfrom openjarvis.agents.hybrid._prompts import format_prompt as _format_prompt+from openjarvis.core.paths import get_config_dirPACKAGE_DIR = Path(__file__).parentDEFAULT_REGISTRY_DIR = PACKAGE_DIR / "registry"DEFAULT_EXPERIMENTS_DIR = Path(os.environ.get("OPENJARVIS_HYBRID_EXPERIMENTS_DIR",- Path.home() / ".openjarvis" / "experiments" / "hybrid",+ get_config_dir() / "experiments" / "hybrid",))DEFAULT_SUBSETS_DIR = DEFAULT_EXPERIMENTS_DIR / "subsets"@@ -122,6 +123,7 @@ def load_registry(registry_dir: Optional[Path] = None) -> Dict[str, Dict[str, An# ---------- Bench dispatch ----------+def _load_gaia_tasks(n: Optional[int]) -> List[Dict[str, Any]]:"""GAIA validation. Each task is a dict with `task_id` + `question`."""from openjarvis.evals.datasets.gaia import GAIADataset@@ -137,12 +139,14 @@ def _load_gaia_tasks(n: Optional[int]) -> List[Dict[str, Any]]:# id round-trip.md = rec.metadata or {}task_id = md.get("task_id") or rec.record_id- out.append({- "task_id": task_id,- "question": md.get("question", rec.problem),- "reference": rec.reference,- "metadata": dict(md),- })+ out.append(+ {+ "task_id": task_id,+ "question": md.get("question", rec.problem),+ "reference": rec.reference,+ "metadata": dict(md),+ }+ )return out@@ -155,19 +159,21 @@ def _load_swebench_tasks(n: Optional[int]) -> List[Dict[str, Any]]:out: List[Dict[str, Any]] = []for rec in ds.iter_records():md = rec.metadata or {}- out.append({- "task_id": md.get("instance_id", rec.record_id),- "repo": md.get("repo", ""),- "base_commit": md.get("base_commit", ""),- "problem_statement": md.get("problem_statement", rec.problem),- "hints_text": md.get("hints_text", ""),- "test_patch": md.get("test_patch", ""),- "FAIL_TO_PASS": md.get("FAIL_TO_PASS", []),- "PASS_TO_PASS": md.get("PASS_TO_PASS", []),- "version": md.get("version"),- "reference": rec.reference,- "metadata": dict(md),- })+ out.append(+ {+ "task_id": md.get("instance_id", rec.record_id),+ "repo": md.get("repo", ""),+ "base_commit": md.get("base_commit", ""),+ "problem_statement": md.get("problem_statement", rec.problem),+ "hints_text": md.get("hints_text", ""),+ "test_patch": md.get("test_patch", ""),+ "FAIL_TO_PASS": md.get("FAIL_TO_PASS", []),+ "PASS_TO_PASS": md.get("PASS_TO_PASS", []),+ "version": md.get("version"),+ "reference": rec.reference,+ "metadata": dict(md),+ }+ )return out@@ -206,7 +212,9 @@ def _load_subset_file(subset_path: str) -> Dict[str, Any]:f"subset {p.name} has no 'task_ids' field; got keys {list(data.keys())}")return data- raise ValueError(f"subset {p.name} must be a list or dict; got {type(data).__name__}")+ raise ValueError(+ f"subset {p.name} must be a list or dict; got {type(data).__name__}"+ )def _apply_subset(@@ -332,7 +340,11 @@ def _score_swebench(patch = extract_patch(answer)if patch is None:- return {"success": False, "score": 0.0, "details": {"reason": "no_patch_extracted"}}+ return {+ "success": False,+ "score": 0.0,+ "details": {"reason": "no_patch_extracted"},+ }record = EvalRecord(record_id=task["task_id"],@@ -368,6 +380,7 @@ def score(# ---------- Cell run ----------+def _cell_dir(cell_name: str, root: Path) -> Path:d = root / cell_named.mkdir(parents=True, exist_ok=True)@@ -440,8 +453,10 @@ def _error_row(task: Dict[str, Any], t0: float, error: str) -> Dict[str, Any]:return {"task_id": task["task_id"],"answer": "",- "tokens_local": 0, "tokens_cloud": 0,- "cost_usd": 0.0, "latency_s": time.time() - t0,+ "tokens_local": 0,+ "tokens_cloud": 0,+ "cost_usd": 0.0,+ "latency_s": time.time() - t0,"web_search_uses": 0,"tool_calls": 0,"n_cloud_calls": 0,@@ -456,11 +471,13 @@ def _run_one_inner() -> Dict[str, Any]:"""Run the agent on one task. Returns a hybrid-shape row."""prompt = _format_prompt(task)- ctx = AgentContext(metadata={- "task": task,- "task_id": task["task_id"],- "log_dir": log_dir,- })+ ctx = AgentContext(+ metadata={+ "task": task,+ "task_id": task["task_id"],+ "log_dir": log_dir,+ }+ )t0 = time.time()try:result: AgentResult = agent.run(prompt, ctx)@@ -534,11 +551,12 @@ def _run_one(if worker.is_alive():print(f"[timeout] task={task['task_id']} exceeded "- f"{task_timeout_s/60:.1f}m — abandoning worker, recording error row",+ f"{task_timeout_s / 60:.1f}m — abandoning worker, recording error row",flush=True,)return _error_row(- task, t0,+ task,+ t0,f"TaskTimeout: task exceeded the {task_timeout_s:.0f}s hybrid ""per-task wall-clock cap (likely a hung network or Modal-harness ""call); worker thread abandoned, task left for resume.",@@ -558,7 +576,7 @@ def _heartbeat(done: int, total: int, row: Dict[str, Any], t_start: float) -> Noprint(f"[{done}/{total}] {ok} task={row['task_id']} score={sc_str} "f"local={row['tokens_local']} cloud={row['tokens_cloud']} "- f"${row['cost_usd']:.3f} {row['latency_s']:.1f}s eta={eta/60:.1f}m",+ f"${row['cost_usd']:.3f} {row['latency_s']:.1f}s eta={eta / 60:.1f}m",flush=True,)@@ -644,9 +662,9 @@ def _write_summary(summary_path.write_text(json.dumps(summary, indent=2))print(f"[summary] {cell_name}: n={n_done}/{cell['n']} err={n_err} "- f"acc={acc:.3f} cost=${total_cost:.2f} time={wall/60:.1f}m "- f"energy={energy_j/1000:.1f}kJ "- f"(session +{elapsed/60:.1f}m +{energy_j_session/1000:.1f}kJ, "+ f"acc={acc:.3f} cost=${total_cost:.2f} time={wall / 60:.1f}m "+ f"energy={energy_j / 1000:.1f}kJ "+ f"(session +{elapsed / 60:.1f}m +{energy_j_session / 1000:.1f}kJ, "f"processed={n_processed})",flush=True,)@@ -664,8 +682,11 @@ def run_cell(out_dir = _cell_dir(cell_name, out_root)with _cell_lock(out_dir, cell_name):_run_cell_locked(- cell_name, cell, out_dir,- do_score=do_score, resume=resume,+ cell_name,+ cell,+ out_dir,+ do_score=do_score,+ resume=resume,)@@ -727,7 +748,7 @@ def _run_cell_locked(mcfg = cell.get("method_cfg") or {}task_timeout_s = float(mcfg.get("task_timeout_s", DEFAULT_TASK_TIMEOUT_S))if task_timeout_s > 0:- print(f"[task-timeout] {task_timeout_s/60:.1f}m per task", flush=True)+ print(f"[task-timeout] {task_timeout_s / 60:.1f}m per task", flush=True)agent = _build_agent(cell)@@ -739,18 +760,25 @@ def _run_cell_locked(def _process(task: Dict[str, Any]) -> None:row = _run_one(- agent, cell["bench"], task, log_dir,+ agent,+ cell["bench"],+ task,+ log_dir,task_timeout_s=task_timeout_s,)scored: Optional[Dict[str, Any]] = Noneif do_score and row.get("error") is None:try:scored = score(- cell["bench"], task, row["answer"], cell_name=cell_name,+ cell["bench"],+ task,+ row["answer"],+ cell_name=cell_name,)except Exception as e:scored = {- "success": False, "score": 0.0,+ "success": False,+ "score": 0.0,"details": {"score_error": str(e)},}full_row = {**row, "score": scored}@@ -789,9 +817,7 @@ def _run_cell_locked(while not watchdog_stop.wait(60.0):try:cur = (- results_path.stat().st_mtime- if results_path.exists()- else last_seen+ results_path.stat().st_mtime if results_path.exists() else last_seen)except Exception:cur = last_seen@@ -830,7 +856,11 @@ def _run_cell_locked(watchdog_stop.set()_write_summary(- out_dir, cell_name, cell, tasks, t_start,+ out_dir,+ cell_name,+ cell,+ tasks,+ t_start,n_processed=len(pending),energy_j_session=energy.energy_j_total,)@@ -838,6 +868,7 @@ def _run_cell_locked(# ---------- CLI ----------+def main(argv: Optional[List[str]] = None) -> int:p = argparse.ArgumentParser(prog="python -m openjarvis.agents.hybrid.runner",@@ -855,13 +886,18 @@ def main(argv: Optional[List[str]] = None) -> int:help="Override experiments output root.",)p.add_argument("--no-score", action="store_true", help="Skip scoring.")- p.add_argument("--no-resume", action="store_true", help="Don't resume from results.jsonl.")+ p.add_argument(+ "--no-resume", action="store_true", help="Don't resume from results.jsonl."+ )args = p.parse_args(argv)reg_dir = Path(args.registry_dir) if args.registry_dir else Nonecells = load_registry(reg_dir)if not cells:- print(f"[error] no cells found in {reg_dir or DEFAULT_REGISTRY_DIR}", file=sys.stderr)+ print(+ f"[error] no cells found in {reg_dir or DEFAULT_REGISTRY_DIR}",+ file=sys.stderr,+ )return 2if args.cell not in cells:print(@@ -871,7 +907,8 @@ def main(argv: Optional[List[str]] = None) -> int:return 2root = Path(args.root) if args.root else Nonerun_cell(- args.cell, cells[args.cell],+ args.cell,+ cells[args.cell],do_score=not args.no_score,resume=not args.no_resume,root=root,diff --git a/src/openjarvis/agents/manager.py b/src/openjarvis/agents/manager.pyindex dbc57178..38fa71aa 100644--- a/src/openjarvis/agents/manager.py+++ b/src/openjarvis/agents/manager.py@@ -11,10 +11,11 @@ import loggingimport sqlite3import timeimport uuid-from pathlib import Pathfrom typing import Any, Dict, List, Optionalfrom uuid import uuid4+from openjarvis.core.paths import get_config_dir+logger = logging.getLogger(__name__)_CREATE_AGENTS = """\@@ -537,7 +538,7 @@ class AgentManager:pass# User templates- user_dir = Path("~/.openjarvis/templates").expanduser()+ user_dir = get_config_dir() / "templates"if user_dir.is_dir():for f in user_dir.glob("*.toml"):try:diff --git a/src/openjarvis/agents/morning_digest.py b/src/openjarvis/agents/morning_digest.pyindex 9b69e3e1..e621ca26 100644--- a/src/openjarvis/agents/morning_digest.py+++ b/src/openjarvis/agents/morning_digest.py@@ -13,6 +13,7 @@ from typing import Any, List, Optionalfrom openjarvis.agents._stubs import AgentContext, AgentResult, ToolUsingAgentfrom openjarvis.agents.digest_store import DigestArtifact, DigestStore+from openjarvis.core.paths import get_config_dirfrom openjarvis.core.registry import AgentRegistryfrom openjarvis.core.types import Message, Role, ToolCall@@ -21,7 +22,7 @@ def _load_persona(persona_name: str) -> str:"""Load a persona prompt file by name."""search_paths = [Path("configs/openjarvis/prompts/personas") / f"{persona_name}.md",- Path.home() / ".openjarvis" / "prompts" / "personas" / f"{persona_name}.md",+ get_config_dir() / "prompts" / "personas" / f"{persona_name}.md",]for p in search_paths:if p.exists():@@ -202,7 +203,7 @@ class MorningDigestAgent(ToolUsingAgent):tts_text = re.sub(r"\*{1,2}([^*]+)\*{1,2}", r"\1", tts_text)tts_text = tts_text.strip()- output_dir = str(Path.home() / ".openjarvis" / "digests")+ output_dir = str(get_config_dir() / "digests")tts_call = ToolCall(id="digest-tts-1",name="text_to_speech",diff --git a/src/openjarvis/agents/proactive_agent.py b/src/openjarvis/agents/proactive_agent.pyindex 01b5ba6c..2aab5c38 100644--- a/src/openjarvis/agents/proactive_agent.py+++ b/src/openjarvis/agents/proactive_agent.py@@ -43,6 +43,7 @@ from typing import Any, Dict, List, Optional, Setfrom openjarvis.agents._stubs import AgentContext, AgentResult, ToolUsingAgentfrom openjarvis.core.config import load_config+from openjarvis.core.paths import get_config_dirfrom openjarvis.core.registry import AgentRegistryfrom openjarvis.core.types import Message, Role, ToolCallfrom openjarvis.tools.approval_store import (@@ -342,8 +343,8 @@ class ProactiveAgent(ToolUsingAgent):return self._approval_storedef _build_system_prompt(self) -> str:- user_md = _load_md_file(Path.home() / ".openjarvis" / "USER.md")- memory_md = _load_md_file(Path.home() / ".openjarvis" / "MEMORY.md")+ user_md = _load_md_file(get_config_dir() / "USER.md")+ memory_md = _load_md_file(get_config_dir() / "MEMORY.md")now = datetime.now()context_block = ""if user_md or memory_md:diff --git a/src/openjarvis/agents/prompt_loader.py b/src/openjarvis/agents/prompt_loader.pyindex 4a508e66..f92c88fc 100644--- a/src/openjarvis/agents/prompt_loader.py+++ b/src/openjarvis/agents/prompt_loader.py@@ -15,16 +15,17 @@ from __future__ import annotationsimport jsonimport logging-import osfrom pathlib import Pathfrom typing import Any+from openjarvis.core.paths import get_config_dir+logger = logging.getLogger(__name__)def _openjarvis_home() -> Path:- """Resolve $OPENJARVIS_HOME, defaulting to ~/.openjarvis."""- return Path(os.environ.get("OPENJARVIS_HOME", "~/.openjarvis")).expanduser()+ """Resolve the OpenJarvis root, honoring OPENJARVIS_HOME / XDG_DATA_HOME."""+ return get_config_dir()def load_system_prompt_override(agent_name: str) -> str | None:diff --git a/src/openjarvis/channels/imessage_daemon.py b/src/openjarvis/channels/imessage_daemon.pyindex a79961a0..c185f4da 100644--- a/src/openjarvis/channels/imessage_daemon.py+++ b/src/openjarvis/channels/imessage_daemon.py@@ -18,11 +18,13 @@ import timefrom pathlib import Pathfrom typing import Any, Dict, List+from openjarvis.core.paths import get_config_dir+logger = logging.getLogger(__name__)_DEFAULT_DB_PATH = str(Path.home() / "Library" / "Messages" / "chat.db")_POLL_INTERVAL = 5-_PID_FILE = str(Path.home() / ".openjarvis" / "imessage-agent.pid")+_PID_FILE = str(get_config_dir() / "imessage-agent.pid")def poll_new_messages(diff --git a/src/openjarvis/channels/slack_daemon.py b/src/openjarvis/channels/slack_daemon.pyindex c4def051..a2f028c3 100644--- a/src/openjarvis/channels/slack_daemon.py+++ b/src/openjarvis/channels/slack_daemon.py@@ -14,9 +14,11 @@ import sysfrom pathlib import Pathfrom typing import Any+from openjarvis.core.paths import get_config_dir+logger = logging.getLogger(__name__)-_PID_FILE = str(Path.home() / ".openjarvis" / "slack-daemon.pid")+_PID_FILE = str(get_config_dir() / "slack-daemon.pid")def _to_slack_fmt(text: str) -> str:diff --git a/src/openjarvis/channels/whatsapp_baileys.py b/src/openjarvis/channels/whatsapp_baileys.pyindex 42c48886..7cc5ae17 100644--- a/src/openjarvis/channels/whatsapp_baileys.py+++ b/src/openjarvis/channels/whatsapp_baileys.py@@ -22,6 +22,7 @@ from openjarvis.channels._stubs import (ChannelStatus,)from openjarvis.core.events import EventBus, EventType+from openjarvis.core.paths import get_config_dirfrom openjarvis.core.registry import ChannelRegistrylogger = logging.getLogger(__name__)@@ -38,7 +39,7 @@ if not _BRIDGE_SRC.exists():)# Default runtime directory (npm install + auth state).-_DEFAULT_RUNTIME_DIR = Path.home() / ".openjarvis" / "whatsapp_baileys_bridge"+_DEFAULT_RUNTIME_DIR = get_config_dir() / "whatsapp_baileys_bridge"@ChannelRegistry.register("whatsapp_baileys")diff --git a/src/openjarvis/cli/_version_check.py b/src/openjarvis/cli/_version_check.pyindex f49c34ab..dc01f6c5 100644--- a/src/openjarvis/cli/_version_check.py+++ b/src/openjarvis/cli/_version_check.py@@ -9,9 +9,11 @@ import sysimport timefrom pathlib import Path+from openjarvis.core.paths import get_config_dir+logger = logging.getLogger(__name__)-_CACHE_PATH = Path("~/.openjarvis/version-check.json").expanduser()+_CACHE_PATH = get_config_dir() / "version-check.json"_CACHE_TTL = 86400 # 24 hours_PYPI_API = "https://pypi.org/pypi/openjarvis/json"@@ -21,7 +23,7 @@ def _config_path() -> Path:override = os.environ.get("OPENJARVIS_CONFIG")if override:return Path(override).expanduser()- return Path("~/.openjarvis/config.toml").expanduser()+ return get_config_dir() / "config.toml"# Commands that surface the "new version available" nudge. We deliberatelydiff --git a/src/openjarvis/cli/agent_cmd.py b/src/openjarvis/cli/agent_cmd.pyindex 15de4510..6f4054f8 100644--- a/src/openjarvis/cli/agent_cmd.py+++ b/src/openjarvis/cli/agent_cmd.py@@ -12,15 +12,12 @@ from rich.table import Tabledef _get_manager():"""Get or create the AgentManager singleton."""- from pathlib import Path-from openjarvis.agents.manager import AgentManagerfrom openjarvis.core.config import load_config+ from openjarvis.core.paths import get_config_dirconfig = load_config()- db_path = config.agent_manager.db_path or str(- Path("~/.openjarvis/agents.db").expanduser()- )+ db_path = config.agent_manager.db_path or str(get_config_dir() / "agents.db")return AgentManager(db_path=db_path)@@ -273,6 +270,7 @@ def search(agent_id: str, query: str, limit: int) -> None:console = Console(stderr=True)try:from openjarvis.core.config import load_config+ from openjarvis.core.paths import get_config_dirfrom openjarvis.traces.store import TraceStoreconfig = load_config()@@ -281,7 +279,7 @@ def search(agent_id: str, query: str, limit: int) -> None:if not agent:console.print(f"[red]Agent not found: {agent_id}[/red]")return- store = TraceStore(config.traces.db_path or "~/.openjarvis/traces.db")+ store = TraceStore(config.traces.db_path or str(get_config_dir() / "traces.db"))results = store.search(query, agent=agent["name"], limit=limit)if not results:console.print("[dim]No results.[/dim]")@@ -545,8 +543,7 @@ def run_agent(agent_id):updated = manager.get_agent(agent_id)runs = updated.get("total_runs", 0)console.print(- f"[green]✓[/green] Tick complete. "- f"Status: {updated['status']}, runs: {runs}"+ f"[green]✓[/green] Tick complete. Status: {updated['status']}, runs: {runs}")# Print the agent's actual output. summary_memory holds the latest tick's@@ -662,6 +659,7 @@ def trace(agent_id, run_number, limit):import datetimefrom openjarvis.core.config import load_config+ from openjarvis.core.paths import get_config_dirfrom openjarvis.traces.store import TraceStoremanager = _get_manager()@@ -671,7 +669,7 @@ def trace(agent_id, run_number, limit):raise SystemExit(1)config = load_config()- store = TraceStore(config.traces.db_path or "~/.openjarvis/traces.db")+ store = TraceStore(config.traces.db_path or str(get_config_dir() / "traces.db"))traces = store.list_traces(agent=agent_id, limit=limit)if not traces:@@ -841,8 +839,8 @@ def ask(agent_id, message, auto_approve):if auto_approve:executor._confirm_callback = lambda _prompt: Trueelse:- executor._confirm_callback = (- lambda prompt: click.confirm(f"\n{prompt}", default=False)+ executor._confirm_callback = lambda prompt: click.confirm(+ f"\n{prompt}", default=False)# Run the tick with a live trace rather than blocking in silence — the# message we just queued is consumed as this tick's input, so the userdiff --git a/src/openjarvis/cli/config_cmd.py b/src/openjarvis/cli/config_cmd.pyindex 43e5be3f..4d9a9284 100644--- a/src/openjarvis/cli/config_cmd.py+++ b/src/openjarvis/cli/config_cmd.py@@ -276,6 +276,36 @@ def hardware() -> None:config.add_command(show_group, "show")[email protected]("path")+def show_path() -> None:+ """Print the resolved OpenJarvis directories (home, config, cache).++ All OpenJarvis state lives under a single root, resolved in priority+ order: ``$OPENJARVIS_HOME`` > ``$XDG_DATA_HOME/openjarvis`` >+ ``~/.openjarvis``. Use this to confirm where your data is stored after+ setting an override.+ """+ from openjarvis.core.paths import get_cache_dir, get_config_dir, get_config_path++ console = Console(stderr=True)+ home = get_config_dir()+ override = (+ "OPENJARVIS_HOME"+ if os.environ.get("OPENJARVIS_HOME")+ else "XDG_DATA_HOME"+ if os.environ.get("XDG_DATA_HOME")+ else "default (~/.openjarvis)"+ )+ table = Table(show_header=True, header_style="bold")+ table.add_column("Directory")+ table.add_column("Path", style="cyan")+ table.add_row("Home (root)", str(home))+ table.add_row("Config file", str(get_config_path()))+ table.add_row("Cache", str(get_cache_dir()))+ console.print(table)+ console.print(f"[dim]Resolved via: {override}[/dim]")++def _probe_engine_host(url: str, console: Console) -> None:"""Probe an engine host URL and print reachability status."""try:diff --git a/src/openjarvis/cli/doctor_cmd.py b/src/openjarvis/cli/doctor_cmd.pyindex f9db7232..395ad12f 100644--- a/src/openjarvis/cli/doctor_cmd.py+++ b/src/openjarvis/cli/doctor_cmd.py@@ -354,7 +354,9 @@ def doctor(as_json: bool) -> None:# Background tasks sectionfrom openjarvis.cli._bg_state import get_status+ from openjarvis.core.paths import get_config_dir+ scripts_dir = get_config_dir() / ".scripts"console.print("[bold]Background tasks[/bold]")bg = get_status()bg_failed = False@@ -364,8 +366,8 @@ def doctor(as_json: bool) -> None:elif bg.rust_extension == "failed":console.print(f" [red]✗[/red] Rust extension: failed — {bg.rust_error[:80]}")console.print(- " retry: ~/.openjarvis/.scripts/install-rust.sh && "- "~/.openjarvis/.scripts/build-extension.sh"+ f" retry: {scripts_dir}/install-rust.sh && "+ f"{scripts_dir}/build-extension.sh")bg_failed = Trueelse:@@ -380,7 +382,7 @@ def doctor(as_json: bool) -> None:console.print(f" [green]✓[/green] {model_id}: ready")elif state == "failed":console.print(f" [red]✗[/red] {model_id}: failed")- console.print(f" retry: ~/.openjarvis/.scripts/pull-model.sh {model_id}")+ console.print(f" retry: {scripts_dir}/pull-model.sh {model_id}")bg_failed = Trueelse:console.print(f" [yellow]…[/yellow] {model_id}: downloading")diff --git a/src/openjarvis/cli/log_config.py b/src/openjarvis/cli/log_config.pyindex 5c6f99bf..aa6a2b3e 100644--- a/src/openjarvis/cli/log_config.py+++ b/src/openjarvis/cli/log_config.py@@ -7,6 +7,7 @@ from logging.handlers import RotatingFileHandlerfrom pathlib import Pathfrom typing import Optional, Union+from openjarvis.core.paths import get_config_dirfrom openjarvis.security.credential_stripper import CredentialStripper_stripper = CredentialStripper()@@ -68,7 +69,7 @@ def setup_logging(if log_file is None:from openjarvis.security.file_utils import secure_mkdir- log_dir = Path.home() / ".openjarvis"+ log_dir = get_config_dir()secure_mkdir(log_dir)log_file = log_dir / "cli.log"file_handler = RotatingFileHandler(diff --git a/src/openjarvis/cli/scan_cmd.py b/src/openjarvis/cli/scan_cmd.pyindex a29571f7..1d7862e7 100644--- a/src/openjarvis/cli/scan_cmd.py+++ b/src/openjarvis/cli/scan_cmd.py@@ -11,6 +11,8 @@ from typing import Callable, Listimport click+from openjarvis.core.paths import get_config_dir+# Engine ports that should only be listening on localhost._ENGINE_PORTS = {11434, 8080, 8000, 30000, 1234, 52415, 18181}@@ -132,7 +134,7 @@ class PrivacyScanner:def check_icloud_sync(self) -> ScanResult:"""Check whether ~/.openjarvis is inside iCloud Drive sync scope."""try:- config_path = Path("~/.openjarvis").expanduser().resolve()+ config_path = get_config_dir().resolve()icloud_path = Path("~/Library/Mobile Documents/").expanduser().resolve()if str(config_path).startswith(str(icloud_path)):return ScanResult(diff --git a/src/openjarvis/cli/serve.py b/src/openjarvis/cli/serve.pyindex ae59c7db..75b3a943 100644--- a/src/openjarvis/cli/serve.py+++ b/src/openjarvis/cli/serve.py@@ -11,6 +11,7 @@ from rich.console import Consolefrom openjarvis.cli._banner import print_bannerfrom openjarvis.core.config import load_configfrom openjarvis.core.events import EventBus+from openjarvis.core.paths import get_config_dirfrom openjarvis.engine import (discover_engines,discover_models,@@ -496,13 +497,9 @@ def serve(agent_manager = Noneif config.agent_manager.enabled:try:- from pathlib import Path-from openjarvis.agents.manager import AgentManager- am_db = config.agent_manager.db_path or str(- Path("~/.openjarvis/agents.db").expanduser()- )+ am_db = config.agent_manager.db_path or str(get_config_dir() / "agents.db")# The server owns the scheduler and is the authoritative tick# runner — on boot it holds no locks, so it (and only it) sweeps# any zombie running→idle left by a previous crash.@@ -607,9 +604,7 @@ def serve(try:import tomllib- _cfg_path = str(- __import__("pathlib").Path.home() / ".openjarvis" / "config.toml"- )+ _cfg_path = str(get_config_dir() / "config.toml")with open(_cfg_path, "rb") as _f:_raw = tomllib.load(_f)api_key = _raw.get("server", {}).get("auth", {}).get("api_key", "")diff --git a/src/openjarvis/cli/skill_cmd.py b/src/openjarvis/cli/skill_cmd.pyindex 1e612a02..6c7be45a 100644--- a/src/openjarvis/cli/skill_cmd.py+++ b/src/openjarvis/cli/skill_cmd.py@@ -11,6 +11,7 @@ from rich.table import Tablefrom openjarvis.core.config import load_configfrom openjarvis.core.events import EventBus+from openjarvis.core.paths import get_config_dirfrom openjarvis.skills.manager import SkillManager@@ -28,12 +29,12 @@ def _get_trace_store():def _get_discovered_dir() -> Path:"""Return the directory where discovered skill manifests are written."""- return Path("~/.openjarvis/skills/discovered/").expanduser()+ return get_config_dir() / "skills" / "discovered"def _get_overlay_dir() -> Path:"""Return the directory where optimization overlays are stored."""- return Path("~/.openjarvis/learning/skills/").expanduser()+ return get_config_dir() / "learning" / "skills"def _get_skill_paths() -> List[Path]:@@ -41,7 +42,7 @@ def _get_skill_paths() -> List[Path]:workspace = Path("./skills")if workspace.exists():paths.append(workspace)- user_dir = Path("~/.openjarvis/skills/").expanduser()+ user_dir = get_config_dir() / "skills"paths.append(user_dir)return paths@@ -174,8 +175,10 @@ def _get_resolver(source: str, url: str = ""):from openjarvis.skills.sources.github import GitHubResolvercache = _Path(- "~/.openjarvis/skill-cache/github/" + url.rstrip("/").rsplit("/", 1)[-1]- ).expanduser()+ str(get_config_dir() / "skill-cache" / "github")+ + "/"+ + url.rstrip("/").rsplit("/", 1)[-1]+ )return GitHubResolver(cache_root=cache, repo_url=url)raise click.BadParameter(f"Unknown source: {source!r}")diff --git a/src/openjarvis/core/config.py b/src/openjarvis/core/config.pyindex 8fb1ae70..85eecc3c 100644--- a/src/openjarvis/core/config.py+++ b/src/openjarvis/core/config.py@@ -16,6 +16,14 @@ from dataclasses import dataclass, fieldfrom pathlib import Pathfrom typing import TYPE_CHECKING, Any, Dict, List, Optional+from openjarvis.core.paths import (+ ConfigurationError,+ get_cache_dir,+ get_config_dir,+ get_config_path,+ get_data_dir,+)+if TYPE_CHECKING:# Only used by type-checkers (mypy/pyright) for the ``JarvisConfig.mining``# field annotation. The runtime import is deferred inside@@ -33,15 +41,24 @@ except ModuleNotFoundError:# Hardware dataclasses# ----------------------------------------------------------------------------DEFAULT_CONFIG_DIR = Path.home() / ".openjarvis"-DEFAULT_CONFIG_PATH = DEFAULT_CONFIG_DIR / "config.toml"+# Legacy names, kept for the ~45 modules that import them. They are resolved+# once at import via the env-aware resolver in ``openjarvis.core.paths`` (the+# install-script model: ``OPENJARVIS_HOME`` / ``XDG_DATA_HOME`` are set before+# the process starts). They are real module attributes — not computed lazily —+# so existing tests can ``monkeypatch.setattr`` them and so dataclass-instance+# defaults stay consistent. Code that must react to a mid-process env change+# (or wants the override regardless of import order) should call+# ``get_config_dir()`` / ``get_config_path()`` directly; the dataclass field+# defaults below already do this via ``default_factory``.+DEFAULT_CONFIG_DIR = get_config_dir()+DEFAULT_CONFIG_PATH = get_config_path()def _ensure_config_dir() -> Path:"""Ensure the config directory exists with restrictive permissions."""from openjarvis.security.file_utils import secure_mkdir- return secure_mkdir(DEFAULT_CONFIG_DIR)+ return secure_mkdir(get_config_dir())@dataclass(slots=True)@@ -742,7 +759,9 @@ class SkillsLearningConfig:optimizer: str = "dspy" # "dspy" or "gepa"min_traces_per_skill: int = 20optimization_interval_seconds: int = 86400- overlay_dir: str = "~/.openjarvis/learning/skills/"+ overlay_dir: str = field(+ default_factory=lambda: str(get_config_dir() / "learning" / "skills")+ )@dataclass(slots=True)@@ -894,7 +913,7 @@ class StorageConfig:"""Storage (memory) backend settings."""default_backend: str = "sqlite"- db_path: str = str(DEFAULT_CONFIG_DIR / "memory.db")+ db_path: str = field(default_factory=lambda: str(get_config_dir() / "memory.db"))context_top_k: int = 5context_min_score: float = 0.0context_max_tokens: int = 2048@@ -998,7 +1017,7 @@ class TelemetryConfig:"""Telemetry persistence settings."""enabled: bool = True- db_path: str = str(DEFAULT_CONFIG_DIR / "telemetry.db")+ db_path: str = field(default_factory=lambda: str(get_config_dir() / "telemetry.db"))gpu_metrics: bool = Falsegpu_poll_interval_ms: int = 50energy_vendor: str = "" # auto-detect or force "nvidia"/"amd"/"apple"/"cpu_rapl"@@ -1023,7 +1042,7 @@ class AnalyticsConfig:enabled: bool = Truehost: str = "https://34.231.106.201.sslip.io"key: str = "phc_ysKu72QaxzYNmDpHFcesD2ZZAe68zkdWJEKoYYkc5e3n"- anon_id_path: str = str(DEFAULT_CONFIG_DIR / "anon_id")+ anon_id_path: str = field(default_factory=lambda: str(get_config_dir() / "anon_id"))flush_interval_seconds: int = 30flush_at_size: int = 100@@ -1033,7 +1052,7 @@ class TracesConfig:"""Trace system settings."""enabled: bool = True- db_path: str = str(DEFAULT_CONFIG_DIR / "traces.db")+ db_path: str = field(default_factory=lambda: str(get_config_dir() / "traces.db"))@dataclass(slots=True)@@ -1235,7 +1254,9 @@ class SecurityConfig:mode: str = "redact" # "redact" | "warn" | "block"secret_scanner: bool = Truepii_scanner: bool = True- audit_log_path: str = str(DEFAULT_CONFIG_DIR / "audit.db")+ audit_log_path: str = field(+ default_factory=lambda: str(get_config_dir() / "audit.db")+ )enforce_tool_confirmation: bool = Truemerkle_audit: bool = Truesigning_key_path: str = ""@@ -1246,7 +1267,9 @@ class SecurityConfig:local_engine_bypass: bool = Falselocal_tool_bypass: bool = Falseprofile: str = ""- vault_key_path: str = str(DEFAULT_CONFIG_DIR / ".vault_key")+ vault_key_path: str = field(+ default_factory=lambda: str(get_config_dir() / ".vault_key")+ )capabilities: CapabilitiesConfig = field(default_factory=CapabilitiesConfig)@@ -1367,7 +1390,7 @@ class SessionConfig:enabled: bool = Falsemax_age_hours: float = 24.0consolidation_threshold: int = 100- db_path: str = str(DEFAULT_CONFIG_DIR / "sessions.db")+ db_path: str = field(default_factory=lambda: str(get_config_dir() / "sessions.db"))@dataclass(slots=True)@@ -1385,7 +1408,9 @@ class OperatorsConfig:"""Operator lifecycle settings."""enabled: bool = False- manifests_dir: str = "~/.openjarvis/operators"+ manifests_dir: str = field(+ default_factory=lambda: str(get_config_dir() / "operators")+ )auto_activate: str = "" # Comma-separated operator IDs@@ -1411,7 +1436,7 @@ class OptimizeConfig:benchmark: str = ""max_samples: int = 50judge_model: str = "gpt-5-mini-2025-08-07"- db_path: str = str(DEFAULT_CONFIG_DIR / "optimize.db")+ db_path: str = field(default_factory=lambda: str(get_config_dir() / "optimize.db"))@dataclass(slots=True)@@ -1419,18 +1444,20 @@ class AgentManagerConfig:"""Persistent agent manager settings."""enabled: bool = True- db_path: str = str(DEFAULT_CONFIG_DIR / "agents.db")+ db_path: str = field(default_factory=lambda: str(get_config_dir() / "agents.db"))@dataclass(slots=True)class MemoryFilesConfig:"""Persistent memory-file paths and nudge settings."""- soul_path: str = "~/.openjarvis/SOUL.md"- memory_path: str = "~/.openjarvis/MEMORY.md"- user_path: str = "~/.openjarvis/USER.md"+ soul_path: str = field(default_factory=lambda: str(get_config_dir() / "SOUL.md"))+ memory_path: str = field(+ default_factory=lambda: str(get_config_dir() / "MEMORY.md")+ )+ user_path: str = field(default_factory=lambda: str(get_config_dir() / "USER.md"))nudge_interval: int = 10- persona_name: str = "" # named persona dir under ~/.openjarvis/personas/<name>/+ persona_name: str = "" # named persona dir under <config-dir>/personas/<name>/@dataclass(slots=True)@@ -1469,13 +1496,15 @@ class SkillsConfig:"""Configuration for agent-authored procedural skills."""enabled: bool = True- skills_dir: str = "~/.openjarvis/skills/"+ skills_dir: str = field(default_factory=lambda: str(get_config_dir() / "skills"))active: str = "*"auto_discover: bool = Trueauto_sync: bool = Falsenudge_interval: int = 15index_repo: str = "https://github.com/openjarvis/skill-index.git"- index_dir: str = "~/.openjarvis/skill-index/"+ index_dir: str = field(+ default_factory=lambda: str(get_config_dir() / "skill-index")+ )max_depth: int = 5sandbox_dangerous: bool = Truesources: List[SkillSourceConfig] = field(default_factory=list)@@ -1781,7 +1810,7 @@ def load_config(path: Optional[Path] = None) -> JarvisConfig:elif os.environ.get("OPENJARVIS_CONFIG"):config_path = Path(os.environ["OPENJARVIS_CONFIG"]).expanduser().resolve()else:- config_path = DEFAULT_CONFIG_PATH+ config_path = get_config_path()if config_path.exists():with open(config_path, "rb") as fh:data = tomllib.load(fh)@@ -2119,9 +2148,14 @@ __all__ = ["BrowserConfig","CapabilitiesConfig","ChannelConfig",+ "ConfigurationError","DEFAULT_CONFIG_DIR","DEFAULT_CONFIG_PATH","DiscordChannelConfig",+ "get_cache_dir",+ "get_config_dir",+ "get_config_path",+ "get_data_dir","EmailChannelConfig","EngineConfig","FeishuChannelConfig",diff --git a/src/openjarvis/core/credentials.py b/src/openjarvis/core/credentials.pyindex 6259de7f..7bb99495 100644--- a/src/openjarvis/core/credentials.py+++ b/src/openjarvis/core/credentials.py@@ -10,13 +10,20 @@ import osimport threadingfrom pathlib import Path+from openjarvis.core.paths import get_config_dir+try:import tomllibexcept ModuleNotFoundError:import tomli as tomllib # type: ignore[no-redef]_LOCK = threading.Lock()-_DEFAULT_PATH = Path.home() / ".openjarvis" / "credentials.toml"+++def _default_path() -> Path:+ """Resolve the credentials file under the OpenJarvis root (env-aware)."""+ return get_config_dir() / "credentials.toml"+TOOL_CREDENTIALS: dict[str, list[str]] = {"web_search": ["TAVILY_API_KEY"],@@ -53,7 +60,7 @@ TOOL_CREDENTIALS: dict[str, list[str]] = {def load_credentials(path: Path | None = None) -> dict[str, dict[str, str]]:"""Load credentials from TOML file."""- p = Path(path) if path else _DEFAULT_PATH+ p = Path(path) if path else _default_path()if not p.exists():return {}with open(p, "rb") as f:@@ -75,7 +82,7 @@ def save_credential(if not stripped:raise ValueError("Credential value must not be empty")- p = Path(path) if path else _DEFAULT_PATH+ p = Path(path) if path else _default_path()with _LOCK:creds = load_credentials(path=p)if tool_name not in creds:diff --git a/src/openjarvis/core/paths.py b/src/openjarvis/core/paths.pynew file mode 100644index 00000000..0aaff375--- /dev/null+++ b/src/openjarvis/core/paths.py@@ -0,0 +1,122 @@+"""Central, env-aware resolution of OpenJarvis' home directory.++OpenJarvis keeps all of its runtime state (config, databases, caches, logs,+credentials, skills, recipes, …) under a single root so it never clutters the+user's home directory beyond one directory. That root is resolved here, with+the following precedence (highest first):++1. ``$OPENJARVIS_HOME`` — explicit override (also honored by the shell+ installer, see ``scripts/install/install.sh``).+2. ``$XDG_DATA_HOME/openjarvis`` — when ``$XDG_DATA_HOME`` is set, follow the+ XDG Base Directory spec by nesting a single ``openjarvis`` directory under+ it. We deliberately use ONE directory rather than splitting across XDG+ config/data/cache so the install tree stays self-contained and relocatable.+3. ``~/.openjarvis`` — the historical default. With no env vars set, the+ resolved path is exactly this, so existing installs are untouched.++``config.py`` re-exports :func:`get_config_dir` results through the legacy+``DEFAULT_CONFIG_DIR``/``DEFAULT_CONFIG_PATH`` names (computed dynamically) so+the ~45 modules that import those names keep working while honoring the+override. Modules that previously hardcoded ``Path.home() / ".openjarvis"``+should call :func:`get_config_dir` (or :func:`get_data_dir` /+:func:`get_cache_dir`) instead.++Defense in depth: the resolved root must never live inside the OpenJarvis+source tree (a misconfigured ``$OPENJARVIS_HOME`` pointing at the repo would+otherwise scatter runtime artifacts into the working tree). This mirrors the+guard in ``learning/spec_search/storage/paths.py`` and fails loudly per+REVIEW.md's no-silent-failure discipline.+"""++from __future__ import annotations++import os+from pathlib import Path++_DEFAULT_DIR_NAME = ".openjarvis"+_XDG_SUBDIR_NAME = "openjarvis"+++class ConfigurationError(RuntimeError):+ """Raised when the resolved home directory would violate isolation guarantees."""+++def _find_source_root() -> Path | None:+ """Walk upward from this module to find the OpenJarvis source root.++ Returns the directory containing the OpenJarvis ``pyproject.toml`` (the one+ whose ``name = "openjarvis"``), or ``None`` when running from an installed+ wheel rather than a source checkout.+ """+ here = Path(__file__).resolve()+ for candidate in (here, *here.parents):+ py = candidate / "pyproject.toml"+ if py.exists():+ try:+ content = py.read_text(encoding="utf-8")+ except OSError:+ continue+ if 'name = "openjarvis"' in content.lower():+ return candidate+ return None+++def _reject_source_tree(path: Path) -> Path:+ """Raise if ``path`` resolves inside the OpenJarvis source tree."""+ source_root = _find_source_root()+ if source_root is not None:+ try:+ path.relative_to(source_root)+ except ValueError:+ pass # Good — not inside the source tree.+ else:+ raise ConfigurationError(+ f"OpenJarvis home ({path}) is inside the source tree "+ f"({source_root}). OpenJarvis refuses to write runtime state "+ "inside its own repo. Set OPENJARVIS_HOME (or XDG_DATA_HOME) "+ "to a directory outside the repo (default: ~/.openjarvis)."+ )+ return path+++def get_config_dir() -> Path:+ """Resolve OpenJarvis' single root directory, honoring env overrides.++ Precedence: ``$OPENJARVIS_HOME`` > ``$XDG_DATA_HOME/openjarvis`` >+ ``~/.openjarvis``. The result is always absolute and is rejected if it+ falls inside the OpenJarvis source tree.+ """+ env_home = os.environ.get("OPENJARVIS_HOME")+ if env_home:+ resolved = Path(env_home).expanduser().resolve()+ return _reject_source_tree(resolved)++ xdg_data = os.environ.get("XDG_DATA_HOME")+ if xdg_data:+ resolved = (Path(xdg_data).expanduser() / _XDG_SUBDIR_NAME).resolve()+ return _reject_source_tree(resolved)++ return (Path.home() / _DEFAULT_DIR_NAME).resolve()+++def get_config_path() -> Path:+ """Resolve the path to ``config.toml`` under the OpenJarvis root."""+ return get_config_dir() / "config.toml"+++def get_data_dir() -> Path:+ """Resolve the directory for persistent data (databases, blobs, …).++ Consolidated under the single root; identical to :func:`get_config_dir`.+ Provided as a distinct name so call sites read intentionally.+ """+ return get_config_dir()+++def get_cache_dir() -> Path:+ """Resolve the directory for regenerable caches (eval datasets, etc.).++ Lives at ``<root>/cache`` so caches stay inside the single OpenJarvis+ directory instead of scattering across ``~/.cache``.+ """+ return get_config_dir() / "cache"diff --git a/src/openjarvis/evals/datasets/gaia.py b/src/openjarvis/evals/datasets/gaia.pyindex 18a89b3b..1f2ec9e2 100644--- a/src/openjarvis/evals/datasets/gaia.py+++ b/src/openjarvis/evals/datasets/gaia.py@@ -11,11 +11,12 @@ import shutilfrom pathlib import Pathfrom typing import Iterable, List, MutableMapping, Optional, Sequence+from openjarvis.core.paths import get_cache_dirfrom openjarvis.evals.core.dataset import DatasetProviderfrom openjarvis.evals.core.splits import apply_splitfrom openjarvis.evals.core.types import EvalRecord-_DEFAULT_CACHE_DIR = Path.home() / ".cache" / "gaia_benchmark"+_DEFAULT_CACHE_DIR = get_cache_dir() / "gaia_benchmark"_DEFAULT_INPUT_PROMPT = """Please answer the question below. You should:diff --git a/src/openjarvis/evals/datasets/liveresearch.py b/src/openjarvis/evals/datasets/liveresearch.pyindex 665ef0d3..750d3e98 100644--- a/src/openjarvis/evals/datasets/liveresearch.py+++ b/src/openjarvis/evals/datasets/liveresearch.py@@ -17,6 +17,7 @@ import subprocessfrom pathlib import Pathfrom typing import Any, Dict, Iterable, List, Optional+from openjarvis.core.paths import get_cache_dirfrom openjarvis.evals.core.dataset import DatasetProviderfrom openjarvis.evals.core.splits import apply_splitfrom openjarvis.evals.core.types import EvalRecord@@ -24,7 +25,7 @@ from openjarvis.evals.core.types import EvalRecordLOGGER = logging.getLogger(__name__)LIVERESEARCH_REPO = "https://github.com/Ayanami0730/deep_research_bench.git"-CACHE_DIR = Path.home() / ".cache" / "liveresearch_bench"+CACHE_DIR = get_cache_dir() / "liveresearch_bench"def _load_jsonl(path: Path) -> List[Dict[str, Any]]:diff --git a/src/openjarvis/evals/datasets/loghub.py b/src/openjarvis/evals/datasets/loghub.pyindex 6ddbcf4b..33da2488 100644--- a/src/openjarvis/evals/datasets/loghub.py+++ b/src/openjarvis/evals/datasets/loghub.py@@ -13,6 +13,7 @@ import refrom pathlib import Pathfrom typing import Any, Dict, Iterable, List, Optional+from openjarvis.core.paths import get_cache_dirfrom openjarvis.evals.core.dataset import DatasetProviderfrom openjarvis.evals.core.types import EvalRecord@@ -64,9 +65,7 @@ class LogHubDataset(DatasetProvider):f"Choose from: {list(_DATASETS.keys())}")self._subset = subset- self._cache_dir = (- Path(cache_dir) if cache_dir else Path.home() / ".cache" / "loghub"- )+ self._cache_dir = Path(cache_dir) if cache_dir else get_cache_dir() / "loghub"self._records: List[EvalRecord] = []def load(diff --git a/src/openjarvis/evals/datasets/paperarena.py b/src/openjarvis/evals/datasets/paperarena.pyindex 9aa9bea4..79d86258 100644--- a/src/openjarvis/evals/datasets/paperarena.py+++ b/src/openjarvis/evals/datasets/paperarena.py@@ -15,6 +15,7 @@ import randomfrom pathlib import Pathfrom typing import Any, Dict, Iterable, List, Optional+from openjarvis.core.paths import get_cache_dirfrom openjarvis.evals.core.dataset import DatasetProviderfrom openjarvis.evals.core.types import EvalRecord@@ -41,7 +42,7 @@ class PaperArenaDataset(DatasetProvider):cache_dir: Optional[str] = None,) -> None:self._cache_dir = (- Path(cache_dir) if cache_dir else Path.home() / ".cache" / "paperarena"+ Path(cache_dir) if cache_dir else get_cache_dir() / "paperarena")self._records: List[EvalRecord] = []diff --git a/src/openjarvis/evals/datasets/pinchbench.py b/src/openjarvis/evals/datasets/pinchbench.pyindex 4696fcb1..d9bcb100 100644--- a/src/openjarvis/evals/datasets/pinchbench.py+++ b/src/openjarvis/evals/datasets/pinchbench.py@@ -18,6 +18,7 @@ from typing import Any, Dict, Iterable, List, Optionalimport yaml+from openjarvis.core.paths import get_cache_dirfrom openjarvis.evals.core.dataset import DatasetProviderfrom openjarvis.evals.core.splits import apply_splitfrom openjarvis.evals.core.types import EvalRecord@@ -25,7 +26,7 @@ from openjarvis.evals.core.types import EvalRecordLOGGER = logging.getLogger(__name__)PINCHBENCH_REPO = "https://github.com/pinchbench/skill.git"-CACHE_DIR = Path.home() / ".cache" / "pinchbench"+CACHE_DIR = get_cache_dir() / "pinchbench"def _parse_task_markdown(content: str, filename: str = "") -> Dict[str, Any]:diff --git a/src/openjarvis/evals/datasets/taubench.py b/src/openjarvis/evals/datasets/taubench.pyindex ca61c384..e0874ed9 100644--- a/src/openjarvis/evals/datasets/taubench.py+++ b/src/openjarvis/evals/datasets/taubench.py@@ -12,9 +12,9 @@ import loggingimport osimport subprocessimport sys-from pathlib import Pathfrom typing import Iterable, List, Optional+from openjarvis.core.paths import get_cache_dirfrom openjarvis.evals.core.dataset import DatasetProviderfrom openjarvis.evals.core.splits import apply_splitfrom openjarvis.evals.core.types import EvalRecord@@ -22,7 +22,7 @@ from openjarvis.evals.core.types import EvalRecordLOGGER = logging.getLogger(__name__)TAU2_REPO = "https://github.com/sierra-research/tau2-bench.git"-CACHE_DIR = Path.home() / ".cache" / "tau2-bench"+CACHE_DIR = get_cache_dir() / "tau2-bench"DOMAINS = ("airline", "retail", "telecom")diff --git a/src/openjarvis/evals/datasets/webchorearena.py b/src/openjarvis/evals/datasets/webchorearena.pyindex 2b72da3e..abca0bef 100644--- a/src/openjarvis/evals/datasets/webchorearena.py+++ b/src/openjarvis/evals/datasets/webchorearena.py@@ -21,6 +21,7 @@ import subprocessfrom pathlib import Pathfrom typing import Any, Dict, Iterable, List, Optional+from openjarvis.core.paths import get_cache_dirfrom openjarvis.evals.core.dataset import DatasetProviderfrom openjarvis.evals.core.types import EvalRecord@@ -56,7 +57,7 @@ class WebChoreArenaDataset(DatasetProvider):) -> None:self._subset = subset # "all", "small", or a site nameself._cache_dir = (- Path(cache_dir) if cache_dir else Path.home() / ".cache" / "webchorearena"+ Path(cache_dir) if cache_dir else get_cache_dir() / "webchorearena")self._headless = headlessself._records: List[EvalRecord] = []diff --git a/src/openjarvis/evals/scorers/swebench_harness.py b/src/openjarvis/evals/scorers/swebench_harness.pyindex 415d8ff2..43c69f1a 100644--- a/src/openjarvis/evals/scorers/swebench_harness.py+++ b/src/openjarvis/evals/scorers/swebench_harness.py@@ -49,6 +49,7 @@ import tempfilefrom pathlib import Pathfrom typing import Any, Dict, Optional, Tuple+from openjarvis.core.paths import get_cache_dirfrom openjarvis.evals.core.scorer import Scorerfrom openjarvis.evals.core.types import EvalRecord@@ -93,9 +94,7 @@ def _run_subprocess_hard_timeout()try:stdout, stderr = proc.communicate(timeout=timeout_s)- return subprocess.CompletedProcess(- cmd, proc.returncode, stdout, stderr- )+ return subprocess.CompletedProcess(cmd, proc.returncode, stdout, stderr)except subprocess.TimeoutExpired:# Kill the whole group, not just the direct child — Modal harness# subprocesses fork workers that would otherwise keep pipes open.@@ -115,9 +114,7 @@ def _run_subprocess_hard_timeout(stdout, stderr = proc.communicate(timeout=10)except subprocess.TimeoutExpired:stdout, stderr = "", ""- raise subprocess.TimeoutExpired(- cmd, timeout_s, output=stdout, stderr=stderr- )+ raise subprocess.TimeoutExpired(cmd, timeout_s, output=stdout, stderr=stderr)# ---------- Patch tracking ----------@@ -208,11 +205,11 @@ def _patch_modal_sandbox_source() -> None:# Upstream changed the line — bail rather than apply blindly.returnreplacement = (- ' # ' + _CGROUP_SOURCE_SENTINEL + '\n'- ' try:\n'+ " # " + _CGROUP_SOURCE_SENTINEL + "\n"+ " try:\n"' self.write_file("/sys/fs/cgroup/cpu/cpu.shares", "2048")\n'- ' except FileNotFoundError:\n'- ' pass # cgroup v2 Modal sandbox — path missing is fine\n'+ " except FileNotFoundError:\n"+ " pass # cgroup v2 Modal sandbox — path missing is fine\n")new_src = src.replace(needle + "\n", replacement, 1)try:@@ -324,22 +321,23 @@ def extract_patch(text: str) -> Optional[str]:# ---------- Harness invocation ----------+def _harness_cache_dir() -> Path:"""Where the swebench subprocess writes its report JSON + logs/ tree.- Defaults to ``$OPENJARVIS_HOME/.swebench-cache`` if set, otherwise to a- process-shared tempdir. Pin both so we don't pollute the project root.+ Consolidated under the env-aware OpenJarvis cache root+ (``<openjarvis-home>/cache/swebench``) so it never pollutes the project+ root or scatters across ``$HOME``. Honors ``OPENJARVIS_HOME`` /+ ``XDG_DATA_HOME`` via :func:`openjarvis.core.paths.get_cache_dir`."""- home = os.environ.get("OPENJARVIS_HOME")- if home:- cache = Path(home) / ".swebench-cache"- else:- cache = Path(tempfile.gettempdir()) / "openjarvis-swebench-cache"+ cache = get_cache_dir() / "swebench"cache.mkdir(parents=True, exist_ok=True)return cache-def _find_report(cache: Path, instance_id: str, run_id: str) -> Optional[Dict[str, Any]]:+def _find_report(+ cache: Path, instance_id: str, run_id: str+) -> Optional[Dict[str, Any]]:"""Find the harness's report JSON for one instance.swebench writes ``<model_name_or_path>.<run_id>.json`` inside the@@ -427,26 +425,40 @@ def _run_harness(with tempfile.TemporaryDirectory() as tmp:tmp_path = Path(tmp)preds_path = tmp_path / "predictions.jsonl"- preds_path.write_text(json.dumps({- "instance_id": instance_id,- "model_name_or_path": "openjarvis-harness",- "model_patch": patch,- }) + "\n")+ preds_path.write_text(+ json.dumps(+ {+ "instance_id": instance_id,+ "model_name_or_path": "openjarvis-harness",+ "model_patch": patch,+ }+ )+ + "\n"+ )cmd = [- sys.executable, "-m", "swebench.harness.run_evaluation",- "--predictions_path", str(preds_path),- "--max_workers", "1",- "--run_id", run_id,- "--dataset_name", "SWE-bench/SWE-bench_Verified",- "--instance_ids", instance_id,+ sys.executable,+ "-m",+ "swebench.harness.run_evaluation",+ "--predictions_path",+ str(preds_path),+ "--max_workers",+ "1",+ "--run_id",+ run_id,+ "--dataset_name",+ "SWE-bench/SWE-bench_Verified",+ "--instance_ids",+ instance_id,]if backend == "modal":cmd += ["--modal", "true"]try:proc = _run_subprocess_hard_timeout(- cmd, timeout_s=timeout_s, cwd=str(cache),+ cmd,+ timeout_s=timeout_s,+ cwd=str(cache),)except subprocess.TimeoutExpired as exc:# The harness subprocess (and its Modal grandchildren) exceeded@@ -497,6 +509,7 @@ def _run_harness(# ---------- Scorer ----------+class SWEBenchHarnessScorer(Scorer):"""SWE-bench Verified scorer that runs the official harness.@@ -516,7 +529,7 @@ class SWEBenchHarnessScorer(Scorer):timeout_s: int = 1800,cell_name: Optional[str] = None,judge_backend: object = None, # noqa: ARG002 — CLI factory compat- judge_model: str = "", # noqa: ARG002 — CLI factory compat+ judge_model: str = "", # noqa: ARG002 — CLI factory compat) -> None:self._timeout_s = int(timeout_s)# ``cell_name`` namespaces the ``run_id`` so concurrent cells scoring@@ -538,16 +551,15 @@ class SWEBenchHarnessScorer(Scorer):if patch is None:return False, {"reason": "no_patch_extracted"}- instance_id = (- record.metadata.get("instance_id")- or record.record_id- or ""- )+ instance_id = record.metadata.get("instance_id") or record.record_id or ""if not instance_id:return False, {"reason": "missing_instance_id"}result = _run_harness(- instance_id, patch, self._timeout_s, cell_name=self._cell_name,+ instance_id,+ patch,+ self._timeout_s,+ cell_name=self._cell_name,)details = dict(result.get("details", {}))details["patch"] = patchdiff --git a/src/openjarvis/evals/skill_benchmark.py b/src/openjarvis/evals/skill_benchmark.pyindex dbed8b0c..cc3ab2db 100644--- a/src/openjarvis/evals/skill_benchmark.py+++ b/src/openjarvis/evals/skill_benchmark.py@@ -16,6 +16,8 @@ from datetime import datetime, timezonefrom pathlib import Pathfrom typing import Any, Dict, List, Optional+from openjarvis.core.paths import get_config_dir+LOGGER = logging.getLogger(__name__)CONDITIONS = (@@ -52,14 +54,12 @@ class SkillBenchmarkConfig:seeds: List[int] = field(default_factory=lambda: [42, 43, 44])max_samples: Optional[int] = Noneoutput_dir: Path = field(default_factory=lambda: Path("docs/superpowers/results/"))- skills_dir: Path = field(- default_factory=lambda: Path("~/.openjarvis/skills/").expanduser()- )+ skills_dir: Path = field(default_factory=lambda: get_config_dir() / "skills")overlay_dir_dspy: Path = field(- default_factory=lambda: Path("~/.openjarvis/learning/skills-dspy/").expanduser()+ default_factory=lambda: get_config_dir() / "learning" / "skills-dspy")overlay_dir_gepa: Path = field(- default_factory=lambda: Path("~/.openjarvis/learning/skills-gepa/").expanduser()+ default_factory=lambda: get_config_dir() / "learning" / "skills-gepa")diff --git a/src/openjarvis/learning/agents/ace_optimizer.py b/src/openjarvis/learning/agents/ace_optimizer.pyindex 9f1cb4ce..df11441c 100644--- a/src/openjarvis/learning/agents/ace_optimizer.py+++ b/src/openjarvis/learning/agents/ace_optimizer.py@@ -30,6 +30,7 @@ from pathlib import Pathfrom typing import Any, Dict, Listfrom openjarvis.core.config import ACEOptimizerConfig+from openjarvis.core.paths import get_config_dirfrom openjarvis.core.registry import LearningRegistryfrom openjarvis.learning._stubs import AgentLearningPolicy@@ -48,7 +49,7 @@ except ImportError:def _default_save_dir(task_name: str) -> Path:- return Path.home() / ".openjarvis" / "learning" / "ace" / task_name+ return get_config_dir() / "learning" / "ace" / task_nameclass _TraceDataProcessor:@@ -87,9 +88,7 @@ class _TraceDataProcessor:if not predictions:return 0.0n_correct = sum(- 1- for p, g in zip(predictions, ground_truths)- if cls.answer_is_correct(p, g)+ 1 for p, g in zip(predictions, ground_truths) if cls.answer_is_correct(p, g))return n_correct / len(predictions)@@ -149,8 +148,7 @@ class ACEAgentOptimizer:return {"status": "skipped","reason": (- f"only {len(traces)} traces, "- f"min_traces={self.config.min_traces}"+ f"only {len(traces)} traces, min_traces={self.config.min_traces}"),}@@ -158,8 +156,7 @@ class ACEAgentOptimizer:return {"status": "error","reason": (- "ace not installed (pip install "- "'openjarvis[learning-ace]')"+ "ace not installed (pip install 'openjarvis[learning-ace]')"),}diff --git a/src/openjarvis/learning/agents/skill_optimizer.py b/src/openjarvis/learning/agents/skill_optimizer.pyindex e6a5151e..bb495034 100644--- a/src/openjarvis/learning/agents/skill_optimizer.py+++ b/src/openjarvis/learning/agents/skill_optimizer.py@@ -19,6 +19,7 @@ from datetime import datetime, timezonefrom pathlib import Pathfrom typing import Any, Dict, List, Optional+from openjarvis.core.paths import get_config_dirfrom openjarvis.core.types import Trace, TraceStepfrom openjarvis.skills.manager import SkillManagerfrom openjarvis.skills.overlay import SkillOverlay, write_overlay@@ -99,7 +100,7 @@ class SkillOptimizer:passif overlay_dir is None:overlay_dir = Path(- "~/.openjarvis/learning/skills/"+ str(get_config_dir() / "learning" / "skills")).expanduser()overlay_dir = Path(overlay_dir).expanduser()diff --git a/src/openjarvis/learning/spec_search/storage/paths.py b/src/openjarvis/learning/spec_search/storage/paths.pyindex 2227c828..3fa55827 100644--- a/src/openjarvis/learning/spec_search/storage/paths.py+++ b/src/openjarvis/learning/spec_search/storage/paths.py@@ -11,14 +11,21 @@ writing artifacts into the working tree.from __future__ import annotations-import osfrom pathlib import Path+from openjarvis.core.paths import ConfigurationError, get_config_dirfrom openjarvis.security.file_utils import secure_mkdir--class ConfigurationError(RuntimeError):- """Raised when path configuration would violate isolation guarantees."""+# ``ConfigurationError`` is re-exported from ``openjarvis.core.paths`` (it used+# to be defined here). Spec search now resolves the home dir through the unified+# core resolver, which raises the same exception type on a source-tree path, so+# we alias rather than redefine to keep ``except ConfigurationError`` callers and+# existing tests working.+__all__ = [+ "ConfigurationError",+ "ensure_spec_search_dirs",+ "resolve_spec_search_root",+]def _find_source_root() -> Path | None:@@ -42,11 +49,12 @@ def _find_source_root() -> Path | None:def _resolve_openjarvis_home() -> Path:- """Resolve the OPENJARVIS_HOME directory (env var or default)."""- env = os.environ.get("OPENJARVIS_HOME")- if env:- return Path(env).expanduser().resolve()- return (Path.home() / ".openjarvis").resolve()+ """Resolve the OpenJarvis home directory via the unified core resolver.++ Delegates to ``get_config_dir`` so spec-search honors the same env-aware+ resolution (OPENJARVIS_HOME and XDG) as the rest of the framework.+ """+ return get_config_dir()def resolve_spec_search_root() -> Path:diff --git a/src/openjarvis/mining/_constants.py b/src/openjarvis/mining/_constants.pyindex 4e6675d5..3ba86d6a 100644--- a/src/openjarvis/mining/_constants.py+++ b/src/openjarvis/mining/_constants.py@@ -9,7 +9,7 @@ section 7.3 for the rev-bump workflow.from __future__ import annotations-from pathlib import Path+from openjarvis.core.paths import get_config_dirPEARL_REPO = "https://github.com/pearl-research-labs/pearl.git"# TODO at implementation time: replace with the specific commit/tag verified@@ -47,9 +47,9 @@ DEFAULT_PEARLD_RPC_URL = "http://localhost:44107"MIN_FREE_DISK_GB = 200# Runtime sidecar location (single-session assumption — see spec §8.8).-RUNTIME_DIR = Path.home() / ".openjarvis" / "runtime"+RUNTIME_DIR = get_config_dir() / "runtime"SIDECAR_PATH = RUNTIME_DIR / "mining.json"SIDECAR_LOCK_PATH = RUNTIME_DIR / "mining.lock"# Pearl source cache for build-from-pin path (see spec §7.2).-PEARL_CACHE_DIR = Path.home() / ".openjarvis" / "cache" / "pearl"+PEARL_CACHE_DIR = get_config_dir() / "cache" / "pearl"diff --git a/src/openjarvis/mining/cpu_pearl.py b/src/openjarvis/mining/cpu_pearl.pyindex b2f95490..f892c04d 100644--- a/src/openjarvis/mining/cpu_pearl.py+++ b/src/openjarvis/mining/cpu_pearl.py@@ -17,6 +17,7 @@ import urllib.requestfrom pathlib import Pathfrom openjarvis.core.config import HardwareInfo+from openjarvis.core.paths import get_config_dirfrom openjarvis.core.registry import MinerRegistryfrom . import _install@@ -47,7 +48,7 @@ def _sidecar_path() -> Path:def _log_dir() -> Path:"""Return the logs directory. Override in tests."""- return Path.home() / ".openjarvis" / "logs" / "mining"+ return get_config_dir() / "logs" / "mining"def _parse_gateway_metrics(text: str, *, provider_id: str) -> MiningStats:diff --git a/src/openjarvis/prompt/builder.py b/src/openjarvis/prompt/builder.pyindex 69f51849..e654a56e 100644--- a/src/openjarvis/prompt/builder.py+++ b/src/openjarvis/prompt/builder.py@@ -5,6 +5,7 @@ from pathlib import Pathfrom typing import List, Literal, Optional, Tuplefrom openjarvis.core.config import MemoryFilesConfig, SystemPromptConfig+from openjarvis.core.paths import get_config_dirPromptCacheSegment = Literal["frozen_prefix", "dynamic_suffix"]@@ -279,7 +280,7 @@ class SystemPromptBuilder:f"Invalid persona name {name!r}: must be a simple ""identifier (no path separators or '..').")- base = Path.home() / ".openjarvis" / "personas" / name+ base = get_config_dir() / "personas" / namereturn MemoryFilesConfig(soul_path=str(base / "SOUL.md"),memory_path=str(base / "MEMORY.md"),diff --git a/src/openjarvis/recipes/loader.py b/src/openjarvis/recipes/loader.pyindex 9506b40a..ae324460 100644--- a/src/openjarvis/recipes/loader.py+++ b/src/openjarvis/recipes/loader.py@@ -19,13 +19,14 @@ try:except ModuleNotFoundError:import tomli as tomllib # type: ignore[no-redef]+from openjarvis.core.paths import get_config_dir# Built-in recipes directory (package data)_PROJECT_RECIPES_DIR = Path(__file__).resolve().parent / "data"_PROJECT_OPERATORS_DIR = _PROJECT_RECIPES_DIR / "operators"# User-level directories-_USER_RECIPES_DIR = Path.home() / ".openjarvis" / "recipes"-_USER_OPERATORS_DIR = Path.home() / ".openjarvis" / "operators"+_USER_RECIPES_DIR = get_config_dir() / "recipes"+_USER_OPERATORS_DIR = get_config_dir() / "operators"@dataclass(slots=True)diff --git a/src/openjarvis/server/agent_manager_routes.py b/src/openjarvis/server/agent_manager_routes.pyindex 21936445..d2825ec3 100644--- a/src/openjarvis/server/agent_manager_routes.py+++ b/src/openjarvis/server/agent_manager_routes.py@@ -2095,10 +2095,13 @@ def create_agent_manager_router(raise HTTPException(status_code=404, detail="Agent not found")try:from openjarvis.core.config import load_config+ from openjarvis.core.paths import get_config_dirfrom openjarvis.traces.store import TraceStoreconfig = load_config()- store = TraceStore(config.traces.db_path or "~/.openjarvis/traces.db")+ store = TraceStore(+ config.traces.db_path or str(get_config_dir() / "traces.db")+ )traces = store.list_traces(agent=agent_id, limit=limit)return {"traces": [@@ -2120,10 +2123,13 @@ def create_agent_manager_router(def get_trace(agent_id: str, trace_id: str):try:from openjarvis.core.config import load_config+ from openjarvis.core.paths import get_config_dirfrom openjarvis.traces.store import TraceStoreconfig = load_config()- store = TraceStore(config.traces.db_path or "~/.openjarvis/traces.db")+ store = TraceStore(+ config.traces.db_path or str(get_config_dir() / "traces.db")+ )trace = store.get(trace_id)if trace is None:raise HTTPException(status_code=404, detail="Trace not found")diff --git a/src/openjarvis/server/cloud_router.py b/src/openjarvis/server/cloud_router.pyindex b80d1f9b..a82770d8 100644--- a/src/openjarvis/server/cloud_router.py+++ b/src/openjarvis/server/cloud_router.py@@ -10,18 +10,18 @@ from __future__ import annotationsimport jsonimport osfrom collections.abc import AsyncIterator-from pathlib import Pathfrom typing import Any, Sequenceimport httpx+from openjarvis.core.paths import get_config_dirfrom openjarvis.core.types import Message# ---------------------------------------------------------------------------# Key / provider detection# ----------------------------------------------------------------------------_CLOUD_ENV_FILE = Path.home() / ".openjarvis" / "cloud-keys.env"+_CLOUD_ENV_FILE = get_config_dir() / "cloud-keys.env"_OPENAI_PREFIXES = ("gpt-", "o1-", "o3-", "o4-", "chatgpt-")_ANTHROPIC_PREFIXES = ("claude-",)diff --git a/src/openjarvis/server/routes.py b/src/openjarvis/server/routes.pyindex 14df26ca..320f2488 100644--- a/src/openjarvis/server/routes.py+++ b/src/openjarvis/server/routes.py@@ -9,6 +9,7 @@ from typing import Anyfrom fastapi import APIRouter, HTTPException, Requestfrom fastapi.responses import StreamingResponse+from openjarvis.core.paths import get_config_dirfrom openjarvis.core.types import Message, Rolefrom openjarvis.server.models import (ChatCompletionChunk,@@ -821,10 +822,9 @@ async def reload_cloud_engine(request: Request):key so that cloud models become available without a full app restart."""import os- from pathlib import Path# Re-read ~/.openjarvis/cloud-keys.env and update the running process env.- keys_path = Path.home() / ".openjarvis" / "cloud-keys.env"+ keys_path = get_config_dir() / "cloud-keys.env"if keys_path.exists():for raw_line in keys_path.read_text().splitlines():line = raw_line.strip()diff --git a/src/openjarvis/server/session_store.py b/src/openjarvis/server/session_store.pyindex 892b1692..107f0052 100644--- a/src/openjarvis/server/session_store.py+++ b/src/openjarvis/server/session_store.py@@ -8,6 +8,8 @@ import sqlite3from pathlib import Pathfrom typing import Any, Dict, List, Optional+from openjarvis.core.paths import get_config_dir+logger = logging.getLogger(__name__)_MAX_HISTORY_TURNS = 20@@ -22,7 +24,7 @@ class SessionStore:def __init__(self, db_path: str = "") -> None:if not db_path:- db_path = str(Path.home() / ".openjarvis" / "sessions.db")+ db_path = str(get_config_dir() / "sessions.db")from openjarvis.security.file_utils import secure_createsecure_create(Path(db_path))diff --git a/src/openjarvis/skills/importer.py b/src/openjarvis/skills/importer.pyindex 4137f4bb..7c33d3f8 100644--- a/src/openjarvis/skills/importer.py+++ b/src/openjarvis/skills/importer.py@@ -23,6 +23,7 @@ from typing import Listimport yaml+from openjarvis.core.paths import get_config_dirfrom openjarvis.skills.parser import SkillParserfrom openjarvis.skills.sources.base import ResolvedSkillfrom openjarvis.skills.tool_translator import ToolTranslator@@ -56,7 +57,7 @@ class SkillImporter:self._parser = parserself._translator = tool_translatorif target_root is None:- target_root = Path("~/.openjarvis/skills/").expanduser()+ target_root = get_config_dir() / "skills"self._target_root = Path(target_root)def import_skill(diff --git a/src/openjarvis/skills/manager.py b/src/openjarvis/skills/manager.pyindex 4549f6b8..6a39426e 100644--- a/src/openjarvis/skills/manager.py+++ b/src/openjarvis/skills/manager.py@@ -7,6 +7,7 @@ from pathlib import Pathfrom typing import Any, Dict, List, Optionalfrom openjarvis.core.events import EventBus+from openjarvis.core.paths import get_config_dirfrom openjarvis.skills.dependency import validate_dependenciesfrom openjarvis.skills.executor import SkillExecutor, SkillResultfrom openjarvis.skills.loader import discover_skills@@ -54,7 +55,7 @@ class SkillManager:except Exception:passif overlay_dir is None:- overlay_dir = Path("~/.openjarvis/learning/skills/").expanduser()+ overlay_dir = get_config_dir() / "learning" / "skills"self._overlay_dir = Path(overlay_dir).expanduser()# ------------------------------------------------------------------@@ -262,7 +263,7 @@ class SkillManager:discovered = discovery.analyze_traces(traces)if output_dir is None:- output_dir = Path("~/.openjarvis/skills/discovered/").expanduser()+ output_dir = get_config_dir() / "skills" / "discovered"output_dir = Path(output_dir).expanduser()output_dir.mkdir(parents=True, exist_ok=True)@@ -375,7 +376,7 @@ class SkillManager:manifest's ``name`` field equals ``name``."""if roots is None:- roots = [Path("~/.openjarvis/skills/").expanduser(), Path("./skills")]+ roots = [get_config_dir() / "skills", Path("./skills")]matches: List[Path] = []for root in roots:diff --git a/src/openjarvis/skills/sources/hermes.py b/src/openjarvis/skills/sources/hermes.pyindex 273e4867..e238b417 100644--- a/src/openjarvis/skills/sources/hermes.py+++ b/src/openjarvis/skills/sources/hermes.py@@ -14,6 +14,7 @@ from typing import Listimport yaml+from openjarvis.core.paths import get_config_dirfrom openjarvis.skills.sources.base import ResolvedSkill, SourceResolverLOGGER = logging.getLogger(__name__)@@ -28,7 +29,7 @@ class HermesResolver(SourceResolver):def __init__(self, cache_root: Path | None = None) -> None:if cache_root is None:- cache_root = Path("~/.openjarvis/skill-cache/hermes/").expanduser()+ cache_root = get_config_dir() / "skill-cache" / "hermes"self._cache_root = Path(cache_root)def cache_dir(self) -> Path:diff --git a/src/openjarvis/skills/sources/openclaw.py b/src/openjarvis/skills/sources/openclaw.pyindex 780f4401..496e4de3 100644--- a/src/openjarvis/skills/sources/openclaw.py+++ b/src/openjarvis/skills/sources/openclaw.py@@ -15,6 +15,7 @@ from typing import Listimport yaml+from openjarvis.core.paths import get_config_dirfrom openjarvis.skills.sources.base import ResolvedSkill, SourceResolverLOGGER = logging.getLogger(__name__)@@ -29,7 +30,7 @@ class OpenClawResolver(SourceResolver):def __init__(self, cache_root: Path | None = None) -> None:if cache_root is None:- cache_root = Path("~/.openjarvis/skill-cache/openclaw/").expanduser()+ cache_root = get_config_dir() / "skill-cache" / "openclaw"self._cache_root = Path(cache_root)def cache_dir(self) -> Path:diff --git a/src/openjarvis/system/builder.py b/src/openjarvis/system/builder.pyindex c686c504..743bb7b1 100644--- a/src/openjarvis/system/builder.py+++ b/src/openjarvis/system/builder.py@@ -7,6 +7,7 @@ from typing import Any, List, Optionalfrom openjarvis.core.config import JarvisConfig, load_configfrom openjarvis.core.events import EventBus, get_event_bus+from openjarvis.core.paths import get_config_dirfrom openjarvis.engine._stubs import InferenceEnginefrom openjarvis.system.core import JarvisSystemfrom openjarvis.tools._stubs import BaseTool, ToolExecutor@@ -232,12 +233,10 @@ class SystemBuilder:agent_manager = Noneif config.agent_manager.enabled:try:- from pathlib import Path-from openjarvis.agents.manager import AgentManageram_db = config.agent_manager.db_path or str(- Path("~/.openjarvis/agents.db").expanduser()+ get_config_dir() / "agents.db")agent_manager = AgentManager(db_path=am_db)except Exception as exc:diff --git a/src/openjarvis/templates/agent_templates.py b/src/openjarvis/templates/agent_templates.pyindex d3058b16..5595f7b1 100644--- a/src/openjarvis/templates/agent_templates.py+++ b/src/openjarvis/templates/agent_templates.py@@ -11,6 +11,8 @@ try:except ModuleNotFoundError:import tomli as tomllib # type: ignore[no-redef]+from openjarvis.core.paths import get_config_dir+@dataclass(slots=True)class AgentTemplate:@@ -72,7 +74,7 @@ def _builtin_templates_dir() -> Path:def _user_templates_dir() -> Path:"""Return the path to user-defined templates (~/.openjarvis/templates/agents/)."""- return Path.home() / ".openjarvis" / "templates" / "agents"+ return get_config_dir() / "templates" / "agents"def discover_templates(diff --git a/src/openjarvis/tools/approval_store.py b/src/openjarvis/tools/approval_store.pyindex 1fb68c05..edf7f21f 100644--- a/src/openjarvis/tools/approval_store.py+++ b/src/openjarvis/tools/approval_store.py@@ -19,6 +19,8 @@ from datetime import datetime, timedelta, timezonefrom pathlib import Pathfrom typing import Any, Dict, List, Optional+from openjarvis.core.paths import get_config_dir+# ---------------------------------------------------------------------------# Decision constants# ---------------------------------------------------------------------------@@ -147,7 +149,7 @@ class ApprovalStore:def __init__(self, db_path: str = "") -> None:if not db_path:- db_path = str(Path.home() / ".openjarvis" / "approvals.db")+ db_path = str(get_config_dir() / "approvals.db")self._db_path = db_pathPath(db_path).parent.mkdir(parents=True, exist_ok=True)self._conn = sqlite3.connect(db_path, check_same_thread=False)diff --git a/src/openjarvis/tools/description_loader.py b/src/openjarvis/tools/description_loader.pyindex de1e0a66..c34c3948 100644--- a/src/openjarvis/tools/description_loader.py+++ b/src/openjarvis/tools/description_loader.py@@ -16,10 +16,10 @@ The TOML file format (written by the applier) is::from __future__ import annotationsimport logging-import os-from pathlib import Pathfrom typing import Dict, Optional+from openjarvis.core.paths import get_config_dir+logger = logging.getLogger(__name__)_cache: Optional[Dict[str, str]] = None@@ -27,7 +27,7 @@ _cache: Optional[Dict[str, str]] = Nonedef _load_overrides() -> Dict[str, str]:"""Parse descriptions.toml and return {tool_name: description}."""- home = Path(os.environ.get("OPENJARVIS_HOME", "~/.openjarvis")).expanduser()+ home = get_config_dir()desc_path = home / "tools" / "descriptions.toml"if not desc_path.exists():return {}diff --git a/src/openjarvis/tools/memory_manage.py b/src/openjarvis/tools/memory_manage.pyindex 8088e50a..7c14a6c0 100644--- a/src/openjarvis/tools/memory_manage.py+++ b/src/openjarvis/tools/memory_manage.py@@ -5,6 +5,7 @@ from __future__ import annotationsfrom pathlib import Pathfrom typing import Any+from openjarvis.core.paths import get_config_dirfrom openjarvis.core.registry import ToolRegistryfrom openjarvis.core.types import ToolResultfrom openjarvis.tools._stubs import BaseTool, ToolSpec@@ -14,7 +15,9 @@ from openjarvis.tools._stubs import BaseTool, ToolSpecclass MemoryManageTool(BaseTool):"""Manage persistent agent memory (MEMORY.md)."""- def __init__(self, memory_path: Path | str = "~/.openjarvis/MEMORY.md") -> None:+ def __init__(self, memory_path: Path | str | None = None) -> None:+ if memory_path is None:+ memory_path = get_config_dir() / "MEMORY.md"self._memory_path = Path(memory_path).expanduser()@propertydiff --git a/src/openjarvis/tools/skill_manage.py b/src/openjarvis/tools/skill_manage.pyindex c9767315..5bf99c88 100644--- a/src/openjarvis/tools/skill_manage.py+++ b/src/openjarvis/tools/skill_manage.py@@ -5,6 +5,7 @@ from __future__ import annotationsfrom pathlib import Pathfrom typing import Any, List+from openjarvis.core.paths import get_config_dirfrom openjarvis.core.registry import ToolRegistryfrom openjarvis.core.types import ToolResultfrom openjarvis.tools._stubs import BaseTool, ToolSpec@@ -14,7 +15,9 @@ from openjarvis.tools._stubs import BaseTool, ToolSpecclass SkillManageTool(BaseTool):"""Manage agent-authored procedural skills."""- def __init__(self, skills_dir: Path | str = "~/.openjarvis/skills/") -> None:+ def __init__(self, skills_dir: Path | str | None = None) -> None:+ if skills_dir is None:+ skills_dir = get_config_dir() / "skills"self._skills_dir = Path(skills_dir).expanduser()@propertydiff --git a/src/openjarvis/tools/user_profile_manage.py b/src/openjarvis/tools/user_profile_manage.pyindex 2e718349..584eefaf 100644--- a/src/openjarvis/tools/user_profile_manage.py+++ b/src/openjarvis/tools/user_profile_manage.py@@ -5,6 +5,7 @@ from __future__ import annotationsfrom pathlib import Pathfrom typing import Any+from openjarvis.core.paths import get_config_dirfrom openjarvis.core.registry import ToolRegistryfrom openjarvis.core.types import ToolResultfrom openjarvis.tools._stubs import BaseTool, ToolSpec@@ -14,7 +15,9 @@ from openjarvis.tools._stubs import BaseTool, ToolSpecclass UserProfileManageTool(BaseTool):"""Manage persistent user profile (USER.md)."""- def __init__(self, user_path: Path | str = "~/.openjarvis/USER.md") -> None:+ def __init__(self, user_path: Path | str | None = None) -> None:+ if user_path is None:+ user_path = get_config_dir() / "USER.md"self._user_path = Path(user_path).expanduser()@propertydiff --git a/tests/core/test_config_paths.py b/tests/core/test_config_paths.pynew file mode 100644index 00000000..8660bb1c--- /dev/null+++ b/tests/core/test_config_paths.py@@ -0,0 +1,176 @@+"""Tests for the env-aware OpenJarvis home-directory resolver (issue #462).++Covers the single-root consolidation: ``$OPENJARVIS_HOME`` >+``$XDG_DATA_HOME/openjarvis`` > ``~/.openjarvis``, backward compatibility+(no env => exactly ``~/.openjarvis``), and the source-tree rejection guard.+"""++from __future__ import annotations++from pathlib import Path++import pytest++from openjarvis.core import paths+++def _clear_env(monkeypatch: pytest.MonkeyPatch) -> None:+ """Remove every env var that influences home resolution."""+ for var in (+ "OPENJARVIS_HOME",+ "XDG_DATA_HOME",+ "XDG_CONFIG_HOME",+ "XDG_CACHE_HOME",+ ):+ monkeypatch.delenv(var, raising=False)+++class TestGetConfigDir:+ """Precedence and backward compatibility of get_config_dir()."""++ def test_default_when_unset_is_legacy_dir(+ self, monkeypatch: pytest.MonkeyPatch+ ) -> None:+ # Backward-compat: with nothing set, the resolved dir is exactly the+ # historical ~/.openjarvis so existing installs are untouched.+ _clear_env(monkeypatch)+ assert paths.get_config_dir() == (Path.home() / ".openjarvis").resolve()++ def test_respects_openjarvis_home(+ self, tmp_path: Path, monkeypatch: pytest.MonkeyPatch+ ) -> None:+ _clear_env(monkeypatch)+ custom = tmp_path / "oj"+ monkeypatch.setenv("OPENJARVIS_HOME", str(custom))+ assert paths.get_config_dir() == custom.resolve()++ def test_respects_xdg_data_home(+ self, tmp_path: Path, monkeypatch: pytest.MonkeyPatch+ ) -> None:+ _clear_env(monkeypatch)+ monkeypatch.setenv("XDG_DATA_HOME", str(tmp_path))+ # Single nested 'openjarvis' dir under XDG_DATA_HOME.+ assert paths.get_config_dir() == (tmp_path / "openjarvis").resolve()++ def test_openjarvis_home_wins_over_xdg(+ self, tmp_path: Path, monkeypatch: pytest.MonkeyPatch+ ) -> None:+ _clear_env(monkeypatch)+ oj = tmp_path / "oj_wins"+ monkeypatch.setenv("OPENJARVIS_HOME", str(oj))+ monkeypatch.setenv("XDG_DATA_HOME", str(tmp_path / "xdg_loses"))+ assert paths.get_config_dir() == oj.resolve()++ def test_expands_user_in_openjarvis_home(+ self, monkeypatch: pytest.MonkeyPatch+ ) -> None:+ _clear_env(monkeypatch)+ monkeypatch.setenv("OPENJARVIS_HOME", "~/relocated-oj")+ assert paths.get_config_dir() == (Path.home() / "relocated-oj").resolve()++ def test_returns_absolute_path(+ self, tmp_path: Path, monkeypatch: pytest.MonkeyPatch+ ) -> None:+ _clear_env(monkeypatch)+ monkeypatch.setenv("OPENJARVIS_HOME", str(tmp_path / "rel"))+ assert paths.get_config_dir().is_absolute()+++class TestDerivedDirs:+ """config_path / data_dir / cache_dir all hang off the single root."""++ def test_config_path(self, tmp_path: Path, monkeypatch: pytest.MonkeyPatch) -> None:+ _clear_env(monkeypatch)+ monkeypatch.setenv("OPENJARVIS_HOME", str(tmp_path / "oj"))+ assert paths.get_config_path() == (tmp_path / "oj" / "config.toml").resolve()++ def test_data_dir_equals_config_dir(+ self, tmp_path: Path, monkeypatch: pytest.MonkeyPatch+ ) -> None:+ _clear_env(monkeypatch)+ monkeypatch.setenv("OPENJARVIS_HOME", str(tmp_path / "oj"))+ assert paths.get_data_dir() == paths.get_config_dir()++ def test_cache_dir_is_nested_cache(+ self, tmp_path: Path, monkeypatch: pytest.MonkeyPatch+ ) -> None:+ _clear_env(monkeypatch)+ monkeypatch.setenv("OPENJARVIS_HOME", str(tmp_path / "oj"))+ assert paths.get_cache_dir() == (tmp_path / "oj" / "cache").resolve()++ def test_cache_dir_under_xdg(+ self, tmp_path: Path, monkeypatch: pytest.MonkeyPatch+ ) -> None:+ _clear_env(monkeypatch)+ monkeypatch.setenv("XDG_DATA_HOME", str(tmp_path))+ assert paths.get_cache_dir() == (tmp_path / "openjarvis" / "cache").resolve()+++class TestSourceTreeRejection:+ """A home pointing inside the repo must fail loudly (REVIEW.md)."""++ def test_rejects_path_inside_source_tree(+ self, monkeypatch: pytest.MonkeyPatch+ ) -> None:+ _clear_env(monkeypatch)+ source_root = paths._find_source_root()+ assert source_root is not None # We must be running inside the repo.+ monkeypatch.setenv("OPENJARVIS_HOME", str(source_root / "junk_dir"))+ with pytest.raises(paths.ConfigurationError, match="inside the source tree"):+ paths.get_config_dir()+++class TestLegacyConstantsHonorEnv:+ """The legacy DEFAULT_CONFIG_* names route through the env-aware resolver.++ This is the exact split-brain bug from #462: the constant used to ignore+ OPENJARVIS_HOME entirely. The constant is resolved once at import (the+ install-script model, where the env is set before the process starts), and+ every instance-level default goes through ``get_config_dir()`` so it honors+ the override. ``DEFAULT_CONFIG_DIR`` stays a real attribute so existing+ tests can ``monkeypatch.setattr`` it.+ """++ def test_constant_matches_resolver_at_import(self) -> None:+ from openjarvis.core import config++ # The constant is the import-time resolution of the same function.+ assert config.DEFAULT_CONFIG_DIR == paths.get_config_dir()+ assert config.DEFAULT_CONFIG_PATH == paths.get_config_path()++ def test_constant_is_a_real_settable_attribute(+ self, tmp_path: Path, monkeypatch: pytest.MonkeyPatch+ ) -> None:+ # Install/CLI tests monkeypatch this attribute directly; it must be a+ # real module attribute (not __getattr__-only) for setattr/undo to work.+ from openjarvis.core import config++ monkeypatch.setattr(config, "DEFAULT_CONFIG_DIR", tmp_path / "patched")+ assert config.DEFAULT_CONFIG_DIR == tmp_path / "patched"++ def test_dataclass_defaults_reflect_env(+ self, tmp_path: Path, monkeypatch: pytest.MonkeyPatch+ ) -> None:+ # Config dataclass field defaults must resolve under the override at+ # instantiation time, not freeze ~/.openjarvis at import.+ _clear_env(monkeypatch)+ from openjarvis.core.config import SessionConfig, StorageConfig++ monkeypatch.setenv("OPENJARVIS_HOME", str(tmp_path / "oj"))+ root = (tmp_path / "oj").resolve()+ assert StorageConfig().db_path == str(root / "memory.db")+ assert SessionConfig().db_path == str(root / "sessions.db")++ def test_downstream_consumer_honors_env(+ self, tmp_path: Path, monkeypatch: pytest.MonkeyPatch+ ) -> None:+ # End-to-end: a non-config subsystem (credentials) resolves under the+ # custom root, proving the override is no longer split-brain.+ _clear_env(monkeypatch)+ from openjarvis.core import credentials++ monkeypatch.setenv("OPENJARVIS_HOME", str(tmp_path / "oj"))+ assert (+ credentials._default_path()+ == (tmp_path / "oj" / "credentials.toml").resolve()+ )diff --git a/tests/core/test_skills_learning_config.py b/tests/core/test_skills_learning_config.pyindex be849b8d..f9f368d8 100644--- a/tests/core/test_skills_learning_config.py+++ b/tests/core/test_skills_learning_config.py@@ -3,6 +3,7 @@from __future__ import annotationsfrom openjarvis.core.config import LearningConfig, SkillsLearningConfig+from openjarvis.core.paths import get_config_dirclass TestSkillsLearningConfig:@@ -12,7 +13,9 @@ class TestSkillsLearningConfig:assert cfg.optimizer == "dspy"assert cfg.min_traces_per_skill == 20assert cfg.optimization_interval_seconds == 86400- assert cfg.overlay_dir == "~/.openjarvis/learning/skills/"+ # overlay_dir now resolves under the env-aware OpenJarvis root (#462),+ # defaulting to <home>/learning/skills instead of the old literal.+ assert cfg.overlay_dir == str(get_config_dir() / "learning" / "skills")def test_can_be_constructed_with_all_fields(self):cfg = SkillsLearningConfig(