@ context reference expansion and bug corrections

Fixes on record

Merged to main. A stamp counts the issues a fix is linked to.

• #2343 feat: @ context references + Honcho config fixes

  merged to main

  files: agent/context_references.py, cli.py, gateway/run.py, hermes_cli/doctor.py, honcho_integration/cli.py, honcho_integration/client.py, run_agent.py, tests/honcho_integration/test_client.py, tests/test_context_references.py

  Show the diff

  • agent/context_references.py

    @@ -0,0 +1,440 @@
    +from __future__ import annotations
    +
    +import asyncio
    +import inspect
    +import json
    +import mimetypes
    +import os
    +import re
    +import subprocess
    +from dataclasses import dataclass, field
    +from pathlib import Path
    +from typing import Awaitable, Callable
    +
    +from agent.model_metadata import estimate_tokens_rough
    +
    +REFERENCE_PATTERN = re.compile(
    +    r"(?<![\w/])@(?:(?P<simple>diff|staged)\b|(?P<kind>file|folder|git|url):(?P<value>\S+))"
    +)
    +TRAILING_PUNCTUATION = ",.;!?"
    +
    +
    +@dataclass(frozen=True)
    +class ContextReference:
    +    raw: str
    +    kind: str
    +    target: str
    +    start: int
    +    end: int
    +    line_start: int | None = None
    +    line_end: int | None = None
    +
    +
    +@dataclass
    +class ContextReferenceResult:
    +    message: str
    +    original_message: str
    +    references: list[ContextReference] = field(default_factory=list)
    +    warnings: list[str] = field(default_factory=list)
    +    injected_tokens: int = 0
    +    expanded: bool = False
    +    blocked: bool = False
    +
    +
    +def parse_context_references(message: str) -> list[ContextReference]:
    +    refs: list[ContextReference] = []
    +    if not message:
    +        return refs
    +
    +    for match in REFERENCE_PATTERN.finditer(message):
    +        simple = match.group("simple")
    +        if simple:
    +            refs.append(
    +                ContextReference(
    +                    raw=match.group(0),
    +                    kind=simple,
    +                    target="",
    +                    start=match.start(),
    +                    end=match.end(),
    +                )
    +            )
    +            continue
    +
    +        kind = match.group("kind")
    +        value = _strip_trailing_punctuation(match.group("value") or "")
    +        line_start = None
    +        line_end = None
    +        target = value
    +
    +        if kind == "file":
    +            range_match = re.match(r"^(?P<path>.+?):(?P<start>\d+)(?:-(?P<end>\d+))?$", value)
    +            if range_match:
    +                target = range_match.group("path")
    +                line_start = int(range_match.group("start"))
    +                line_end = int(range_match.group("end") or range_match.group("start"))
    +
    +        refs.append(
    +            ContextReference(
    +                raw=match.group(0),
    +                kind=kind,
    +                target=target,
    +                start=match.start(),
    +                end=match.end(),
    +                line_start=line_start,
    +                line_end=line_end,
    +            )
    +        )
    +
    +    return refs
    +
    +
    +def preprocess_context_references(
    +    message: str,
    +    *,
    +    cwd: str | Path,
    +    context_length: int,
    +    url_fetcher: Callable[[str], str | Awaitable[str]] | None = None,
    +    allowed_root: str | Path | None = None,
    +) -> ContextReferenceResult:
    +    coro = preprocess_context_references_async(
    +        message,
    +        cwd=cwd,
    +        context_length=context_length,
    +        url_fetcher=url_fetcher,
    +        allowed_root=allowed_root,
    +    )
    +    # Safe for both CLI (no loop) and gateway (loop already running).
    +    try:
    +        loop = asyncio.get_running_loop()
    +    except RuntimeError:
    +        loop = None
    +    if loop and loop.is_running():
    +        import concurrent.futures
    +        with concurrent.futures.ThreadPoolExecutor(max_workers=1) as pool:
    +            return pool.submit(asyncio.run, coro).result()
    +    return asyncio.run(coro)
    +
    +
    +async def preprocess_context_references_async(
    +    message: str,
    +    *,
    +    cwd: str | Path,
    +    context_length: int,
    +    url_fetcher: Callable[[str], str | Awaitable[str]] | None = None,
    +    allowed_root: str | Path | None = None,
    +) -> ContextReferenceResult:
    +    refs = parse_context_references(message)
    +    if not refs:
    +        return ContextReferenceResult(message=message, original_message=message)
    +
    +    cwd_path = Path(cwd).expanduser().resolve()
    +    allowed_root_path = Path(allowed_root).expanduser().resolve() if allowed_root is not None else None
    +    warnings: list[str] = []
    +    blocks: list[str] = []
    +    injected_tokens = 0
    +
    +    for ref in refs:
    +        warning, block = await _expand_reference(
    +            ref,
    +            cwd_path,
    +            url_fetcher=url_fetcher,
    +            allowed_root=allowed_root_path,
    +        )
    +        if warning:
    +            warnings.append(warning)
    +        if block:
    +            blocks.append(block)
    +            injected_tokens += estimate_tokens_rough(block)
    +
    +    hard_limit = max(1, int(context_length * 0.50))
    +    soft_limit = max(1, int(context_length * 0.25))
    +    if injected_tokens > hard_limit:
    +        warnings.append(
    +            f"@ context injection refused: {injected_tokens} tokens exceeds the 50% hard limit ({hard_limit})."
    +        )
    +        return ContextReferenceResult(
    +            message=message,
    +            original_message=message,
    +            references=refs,
    +            warnings=warnings,
    +            injected_tokens=[redacted:secret-assignment]
    +            expanded=False,
    +            blocked=True,
    +        )
    +
    +    if injected_tokens > soft_limit:
    +        warnings.append(
    +            f"@ context injection warning: {injected_tokens} tokens exceeds the 25% soft limit ({soft_limit})."
    +        )
    +
    +    stripped = _remove_reference_tokens(message, refs)
    +    final = stripped
    +    if warnings:
    +        final = f"{final}\n\n--- Context Warnings ---\n" + "\n".join(f"- {warning}" for warning in warnings)
    +    if blocks:
    +        final = f"{final}\n\n--- Attached Context ---\n\n" + "\n\n".join(blocks)
    +
    +    return ContextReferenceResult(
    +        message=final.strip(),
    +        original_message=message,
    +        references=refs,
    +        warnings=warnings,
    +        injected_tokens=[redacted:secret-assignment]
    +        expanded=bool(blocks or warnings),
    +        blocked=False,
    +    )
    +
    +
    +async def _expand_reference(
    +    ref: ContextReference,
    +    cwd: Path,
    +    *,
    +    url_fetcher: Callable[[str], str | Awaitable[str]] | None = None,
    +    allowed_root: Path | None = None,
    +) -> tuple[str | None, str | None]:
    +    try:
    +        if ref.kind == "file":
    +            return _expand_file_reference(ref, cwd, allowed_root=allowed_root)
    +        if ref.kind == "folder":
    +            return _expand_folder_reference(ref, cwd, allowed_root=allowed_root)
    +        if ref.kind == "diff":
    +            return _expand_git_reference(ref, cwd, ["diff"], "git diff")
    +        if ref.kind == "staged":
    +            return _expand_git_reference(ref, cwd, ["diff", "--staged"], "git diff --staged")
    +        if ref.kind == "git":
    +            count = max(1, min(int(ref.target or "1"), 10))
    +            return _expand_git_reference(ref, cwd, ["log", f"-{count}", "-p"], f"git log -{count} -p")
    +        if ref.kind == "url":
    +            content = await _fetch_url_content(ref.target, url_fetcher=url_fetcher)
    +            if not content:
    +                return f"{ref.raw}: no content extracted", None
    +            return None, f"🌐 {ref.raw} ({estimate_tokens_rough(content)} tokens)\n{content}"
    +    except Exception as exc:
    +        return f"{ref.raw}: {exc}", None
    +
    +    return f"{ref.raw}: unsupported reference type", None
    +
    +
    +def _expand_file_reference(
    +    ref: ContextReference,
    +    cwd: Path,
    +    *,
    +    allowed_root: Path | None = None,
    +) -> tuple[str | None, str | None]:
    +    path = _resolve_path(cwd, ref.target, allowed_root=allowed_root)
    +    if not path.exists():
    +        return f"{ref.raw}: file not found", None
    +    if not path.is_file():
    +        return f"{ref.raw}: path is not a file", None
    +    if _is_binary_file(path):
    +        return f"{ref.raw}: binary files are not supported", None
    +
    +    text = path.read_text(encoding="utf-8")
    +    if ref.line_start is not None:
    +        lines = text.splitlines()
    +        start_idx = max(ref.line_start - 1, 0)
    +        end_idx = min(ref.line_end or ref.line_start, len(lines))
    +        text = "\n".join(lines[start_idx:end_idx])
    +
    +    lang = _code_fence_language(path)
    +    label = ref.raw
    +    return None, f"📄 {label} ({estimate_tokens_rough(text)} tokens)\n```{lang}\n{text}\n```"
    +
    +
    +def _expand_folder_reference(
    +    ref: ContextReference,
    +    cwd: Path,
    +    *,
    +    allowed_root: Path | None = None,
    +) -> tuple[str | None, str | None]:
    +    path = _resolve_path(cwd, ref.target, allowed_root=allowed_root)
    +    if not path.exists():
    +        return f"{ref.raw}: folder not found", None
    +    if not path.is_dir():
    +        return f"{ref.raw}: path is not a folder", None
    +
    +    listing = _build_folder_listing(path, cwd)
    +    return None, f"📁 {ref.raw} ({estimate_tokens_rough(listing)} tokens)\n{listing}"
    +
    +
    +def _expand_git_reference(
    +    ref: ContextReference,
    +    cwd: Path,
    +    args: list[str],
    +    label: str,
    +) -> tuple[str | None, str | None]:
    +    result = subprocess.run(
    +        ["git", *args],
    +        cwd=cwd,
    +        capture_output=True,
    +        text=True,
    +    )
    +    if result.returncode != 0:
    +        stderr = (result.stderr or "").strip() or "git command failed"
    +        return f"{ref.raw}: {stderr}", None
    +    content = result.stdout.strip()
    +    if not content:
    +        content = "(no output)"
    +    return None, f"🧾 {label} ({estimate_tokens_rough(content)} tokens)\n```diff\n{content}\n```"
    +
    +
    +async def _fetch_url_content(
    +    url: str,
    +    *,
    +    url_fetcher: Callable[[str], str | Awaitable[str]] | None = None,
    +) -> str:
    +    fetcher = url_fetcher or _default_url_fetcher
    +    content = fetcher(url)
    +    if inspect.isawaitable(content):
    +        content = await content
    +    return str(content or "").strip()
    +
    +
    +async def _default_url_fetcher(url: str) -> str:
    +    from tools.web_tools import web_extract_tool
    +
    +    raw = await web_extract_tool([url], format="markdown", use_llm_processing=True)
    +    payload = json.loads(raw)
    +    docs = payload.get("data", {}).get("documents", [])
    +    if not docs:
    +        return ""
    +    doc = docs[0]
    +    return str(doc.get("content") or doc.get("raw_content") or "").strip()
    +
    +
    +def _resolve_path(cwd: Path, target: str, *, allowed_root: Path | None = None) -> Path:
    +    path = Path(os.path.expanduser(target))
    +    if not path.is_absolute():
    +        path = cwd / path
    +    resolved = path.resolve()
    +    if allowed_root is not None:
    +        try:
    +            resolved.relative_to(allowed_root)
    +        except ValueError as exc:
    +            raise ValueError("path is outside the allowed workspace") from exc
    +    return resolved
    +
    +
    +def _strip_trailing_punctuation(value: str) -> str:
    +    stripped = value.rstrip(TRAILING_PUNCTUATION)
    +    while stripped.endswith((")", "]", "}")):
    +        closer = stripped[-1]
    +        opener = {")": "(", "]": "[", "}": "{"}[closer]
    +        if stripped.count(closer) > stripped.count(opener):
    +            stripped = stripped[:-1]
    +            continue
    +        break
    +    return stripped
    +
    +
    +def _remove_reference_tokens(message: str, refs: list[ContextReference]) -> str:
    +    pieces: list[str] = []
    +    cursor = 0
    +    for ref in refs:
    +        pieces.append(message[cursor:ref.start])
    +        cursor = ref.end
    +    pieces.append(message[cursor:])
    +    text = "".join(pieces)
    +    text = re.sub(r"\s{2,}", " ", text)
    +    text = re.sub(r"\s+([,.;:!?])", r"\1", text)
    +    return text.strip()
    +
    +
    +def _is_binary_file(path: Path) -> bool:
    +    mime, _ = mimetypes.guess_type(path.name)
    +    if mime and not mime.startswith("text/") and not any(
    +        path.name.endswith(ext) for ext in (".py", ".md", ".txt", ".json", ".yaml", ".yml", ".toml", ".js", ".ts")
    +    ):
    +        return True
    +    chunk = path.read_bytes()[:4096]
    +    return b"\x00" in chunk
    +
    +
    +def _build_folder_listing(path: Path, cwd: Path, limit: int = 200) -> str:
    +    lines = [f"{path.relative_to(cwd)}/"]
    +    entries = _iter_visible_entries(path, cwd, limit=limit)
    +    for entry in entries:
    +        rel = entry.relative_to(cwd)
    +        indent = "  " * max(len(rel.parts) - len(path.relative_to(cwd).parts) - 1, 0)
    +        if entry.is_dir():
    +            lines.append(f"{indent}- {entry.name}/")
    +        else:
    +            meta = _file_metadata(entry)
    +            lines.append(f"{indent}- {entry.name} ({meta})")
    +    if len(entries) >= limit:
    +        lines.append("- ...")
    +    return "\n".join(lines)
    +
    +
    +def _iter_visible_entries(path: Path, cwd: Path, limit: int) -> list[Path]:
    +    rg_entries = _rg_files(path, cwd, limit=limit)
    +    if rg_entries is not None:
    +        output: list[Path] = []
    +        seen_dirs: set[Path] = set()
    +        for rel in rg_entries:
    +            full = cwd / rel
    +            for parent in full.parents:
    +                if parent == cwd or parent in seen_dirs or path not in {parent, *parent.parents}:
    +                    continue
    +                seen_dirs.add(parent)
    +                output.append(parent)
    +            output.append(full)
    +        return sorted({p for p in output if p.exists()}, key=lambda p: (not p.is_dir(), str(p)))
    +
    +    output = []
    +    for root, dirs, files in os.walk(path):
    +        dirs[:] = sorted(d for d in dirs if not d.startswith(".") and d != "__pycache__")
    +        files = sorted(f for f in files if not f.startswith("."))
    +        root_path = Path(root)
    +        for d in dirs:
    +            output.append(root_path / d)
    +            if len(output) >= limit:
    +                return output
    +        for f in files:
    +            output.append(root_path / f)
    +            if len(output) >= limit:
    +                return output
    +    return output
    +
    +
    +def _rg_files(path: Path, cwd: Path, limit: int) -> list[Path] | None:
    +    try:
    +        result = subprocess.run(
    +            ["rg", "--files", str(path.relative_to(cwd))],
    +            cwd=cwd,
    +            capture_output=True,
    +            text=True,
    +        )
    +    except FileNotFoundError:
    +        return None
    +    if result.returncode != 0:
    +        return None
    +    files = [Path(line.strip()) for line in result.stdout.splitlines() if line.strip()]
    +    return files[:limit]
    +
    +
    +def _file_metadata(path: Path) -> str:
    +    if _is_binary_file(path):
    +        return f"{path.stat().st_size} bytes"
    +    try:
    +        line_count = path.read_text(encoding="utf-8").count("\n") + 1
    +    except Exception:
    +        return f"{path.stat().st_size} bytes"
    +    return f"{line_count} lines"
    +
    +
    +def _code_fence_language(path: Path) -> str:
    +    mapping = {
    +        ".py": "python",
    +        ".js": "javascript",
    +        ".ts": "typescript",
    +        ".tsx": "tsx",
    +        ".jsx": "jsx",
    +        ".json": "json",
    +        ".md": "markdown",
    +        ".sh": "bash",
    +        ".yml": "yaml",
    +        ".yaml": "yaml",
    +        ".toml": "toml",
    +    }
    +    return mapping.get(path.suffix.lower(), "")

  • cli.py

    @@ -165,10 +165,10 @@ def load_cli_config() -> Dict[str, Any]:
                 "cwd": ".",  # "." is resolved to os.getcwd() at runtime
                 "timeout": 60,
                 "lifetime_seconds": 300,
    -            "docker_image": "python:3.11",
    +            "docker_image": "nikolaik/python-nodejs:python3.11-nodejs20",
                 "docker_forward_env": [],
    -            "singularity_image": "docker://python:3.11",
    -            "modal_image": "python:3.11",
    +            "singularity_image": "docker://nikolaik/python-nodejs:python3.11-nodejs20",
    +            "modal_image": "nikolaik/python-nodejs:python3.11-nodejs20",
                 "daytona_image": "nikolaik/python-nodejs:python3.11-nodejs20",
                 "docker_volumes": [],  # host:container volume mounts for Docker backend
                 "docker_mount_cwd_to_workspace": False,  # explicit opt-in only; default off for sandbox isolation
    @@ -5320,6 +5320,28 @@ def chat(self, message, images: list = None) -> Optional[str]:
                     message if isinstance(message, str) else "", images
                 )
     
    +        # Expand @ context references (e.g. @file:main.py, @diff, @folder:src/)
    +        if isinstance(message, str) and "@" in message:
    +            try:
    +                from agent.context_references import preprocess_context_references
    +                from agent.model_metadata import get_model_context_length
    +                _ctx_len = get_model_context_length(
    +                    self.model, base_url=self.base_url or "", api_key=[redacted:secret-assignment] or "")
    +                _ctx_result = preprocess_context_references(
    +                    message, cwd=os.getcwd(), context_length=_ctx_len)
    +                if _ctx_result.expanded or _ctx_result.blocked:
    +                    if _ctx_result.references:
    +                        _cprint(
    +                            f"  {_DIM}[@ context: {len(_ctx_result.references)} ref(s), "
    +                            f"{_ctx_result.injected_tokens} tokens]{_RST}")
    +                    for w in _ctx_result.warnings:
    +                        _cprint(f"  {_DIM}⚠ {w}{_RST}")
    +                    if _ctx_result.blocked:
    +                        return "\n".join(_ctx_result.warnings) or "Context injection refused."
    +                    message = _ctx_result.message
    +            except Exception as e:
    +                logging.debug("@ context reference expansion failed: %s", e)
    +
             # Add user message to history
             self.conversation_history.append({"role": "user", "content": message})
     
    @@ -5751,12 +5773,14 @@ def run(self):
             """Run the interactive CLI loop with persistent input at bottom."""
             self.show_banner()
     
    -        # One-line Honcho session indicator (TTY-only, not captured by agent)
    +        # One-line Honcho session indicator (TTY-only, not captured by agent).
    +        # Only show when the user explicitly configured Honcho for Hermes
    +        # (not auto-enabled from a stray HONCHO_API_KEY env var).
             try:
                 from honcho_integration.client import HonchoClientConfig
                 from agent.display import honcho_session_line, write_tty
                 hcfg = HonchoClientConfig.from_global_config()
    -            if hcfg.enabled and hcfg.api_key:
    +            if hcfg.enabled and hcfg.api_key and hcfg.explicitly_configured:
                     sname = hcfg.resolve_session_name(session_id=self.session_id)
                     if sname:
                         write_tty(honcho_session_line(hcfg.workspace_id, sname) + "\n")

  • gateway/run.py

    @@ -2058,7 +2058,31 @@ async def _handle_message_with_agent(self, event, source, _quick_key: str):
                     "message": message_text[:500],
                 }
                 await self.hooks.emit("agent:start", hook_ctx)
    -            
    +
    +            # Expand @ context references (@file:, @folder:, @diff, etc.)
    +            if "@" in message_text:
    +                try:
    +                    from agent.context_references import preprocess_context_references_async
    +                    from agent.model_metadata import get_model_context_length
    +                    _msg_cwd = os.environ.get("MESSAGING_CWD", os.path.expanduser("~"))
    +                    _msg_ctx_len = get_model_context_length(
    +                        self._model, base_url=self._base_url or "")
    +                    _ctx_result = await preprocess_context_references_async(
    +                        message_text, cwd=_msg_cwd,
    +                        context_length=_msg_ctx_len, allowed_root=_msg_cwd)
    +                    if _ctx_result.blocked:
    +                        _adapter = self.adapters.get(source.platform)
    +                        if _adapter:
    +                            await _adapter.send(
    +                                source.chat_id,
    +                                "\n".join(_ctx_result.warnings) or "Context injection refused.",
    +                            )
    +                        return
    +                    if _ctx_result.expanded:
    +                        message_text = _ctx_result.message
    +                except Exception as exc:
    +                    logger.debug("@ context reference expansion failed: %s", exc)
    +
                 # Run the agent
                 agent_result = await self._run_agent(
                     message=message_text,

  • hermes_cli/doctor.py

    @@ -717,13 +717,14 @@ def run_doctor(args):
         print(color("◆ Honcho Memory", Colors.CYAN, Colors.BOLD))
     
         try:
    -        from honcho_integration.client import HonchoClientConfig, GLOBAL_CONFIG_PATH
    +        from honcho_integration.client import HonchoClientConfig, resolve_config_path
             hcfg = HonchoClientConfig.from_global_config()
    +        _honcho_cfg_path = resolve_config_path()
     
    -        if not GLOBAL_CONFIG_PATH.exists():
    +        if not _honcho_cfg_path.exists():
                 check_warn("Honcho config not found", f"run: hermes honcho setup")
             elif not hcfg.enabled:
    -            check_info("Honcho disabled (set enabled: true in ~/.honcho/config.json to activate)")
    +            check_info(f"Honcho disabled (set enabled: true in {_honcho_cfg_path} to activate)")
             elif not hcfg.api_key:
                 [redacted:secret-assignment]"Honcho API key not set", "run: hermes honcho setup")
                 issues.append("No Honcho API key — run 'hermes honcho setup'")

  • honcho_integration/cli.py

    @@ -10,22 +10,30 @@
     import sys
     from pathlib import Path
     
    -GLOBAL_CONFIG_PATH = Path.home() / ".honcho" / "config.json"
    +from honcho_integration.client import resolve_config_path, GLOBAL_CONFIG_PATH
    +
     HOST = "hermes"
     
     
    +def _config_path() -> Path:
    +    """Return the active Honcho config path (instance-local or global)."""
    +    return resolve_config_path()
    +
    +
     def _read_config() -> dict:
    -    if GLOBAL_CONFIG_PATH.exists():
    +    path = _config_path()
    +    if path.exists():
             try:
    -            return json.loads(GLOBAL_CONFIG_PATH.read_text(encoding="utf-8"))
    +            return json.loads(path.read_text(encoding="utf-8"))
             except Exception:
                 pass
         return {}
     
     
    -def _write_config(cfg: dict) -> None:
    -    GLOBAL_CONFIG_PATH.parent.mkdir(parents=True, exist_ok=True)
    -    GLOBAL_CONFIG_PATH.write_text(
    +def _write_config(cfg: dict, path: Path | None = None) -> None:
    +    path = path or _config_path()
    +    path.parent.mkdir(parents=True, exist_ok=True)
    +    path.write_text(
             json.dumps(cfg, indent=2, ensure_ascii=False) + "\n",
             encoding="utf-8",
         )
    @@ -87,9 +95,14 @@ def cmd_setup(args) -> None:
         """Interactive Honcho setup wizard."""
         cfg = _read_config()
     
    +    active_path = _config_path()
         print("\nHoncho memory setup\n" + "─" * 40)
         print("  Honcho gives Hermes persistent cross-session memory.")
    -    print("  Config is shared with other hosts at ~/.honcho/config.json\n")
    +    if active_path != GLOBAL_CONFIG_PATH:
    +        print(f"  Instance config: {active_path}")
    +    else:
    +        print("  Config is shared with other hosts at ~/.honcho/config.json")
    +    print()
     
         if not _ensure_sdk_installed():
             return
    @@ -162,10 +175,10 @@ def cmd_setup(args) -> None:
             hermes_host["recallMode"] = new_recall
     
         # Session strategy
    -    current_strat = hermes_host.get("sessionStrategy") or cfg.get("sessionStrategy", "per-session")
    +    current_strat = hermes_host.get("sessionStrategy") or cfg.get("sessionStrategy", "per-directory")
         print(f"\n  Session strategy options:")
    -    print("    per-session   — new Honcho session each run, named by Hermes session ID (default)")
    -    print("    per-directory — one session per working directory")
    +    print("    per-directory — one session per working directory (default)")
    +    print("    per-session   — new Honcho session each run, named by Hermes session ID")
         print("    per-repo      — one session per git repository (uses repo root name)")
         print("    global        — single session across all directories")
         new_strat = _prompt("Session strategy", default=current_strat)
    @@ -176,7 +189,7 @@ def cmd_setup(args) -> None:
         hermes_host.setdefault("saveMessages", True)
     
         _write_config(cfg)
    -    print(f"\n  Config written to {GLOBAL_CONFIG_PATH}")
    +    print(f"\n  Config written to {active_path}")
     
         # Test connection
         print("  Testing connection... ", end="", flush=True)
    @@ -223,8 +236,10 @@ def cmd_status(args) -> None:
     
         cfg = _read_config()
     
    +    active_path = _config_path()
    +
         if not cfg:
    -        print("  No Honcho config found at ~/.honcho/config.json")
    +        print(f"  No Honcho config found at {active_path}")
             print("  Run 'hermes honcho setup' to configure.\n")
             return
     
    @@ -243,7 +258,7 @@ def cmd_status(args) -> None:
         print(f"  API key:        {masked}")
         print(f"  Workspace:      {hcfg.workspace_id}")
         print(f"  Host:           {hcfg.host}")
    -    print(f"  Config path:    {GLOBAL_CONFIG_PATH}")
    +    print(f"  Config path:    {active_path}")
         print(f"  AI peer:        {hcfg.ai_peer}")
         print(f"  User peer:      {hcfg.peer_name or 'not set'}")
         print(f"  Session key:    {hcfg.resolve_session_name()}")
    @@ -275,7 +290,7 @@ def cmd_sessions(args) -> None:
         if not sessions:
             print("  No session mappings configured.\n")
             print("  Add one with: hermes honcho map <session-name>")
    -        print("  Or edit ~/.honcho/config.json directly.\n")
    +        print(f"  Or edit {_config_path()} directly.\n")
             return
     
         cwd = os.getcwd()
    @@ -361,7 +376,7 @@ def cmd_peer(args) -> None:
     
         if changed:
             _write_config(cfg)
    -        print(f"  Saved to {GLOBAL_CONFIG_PATH}\n")
    +        print(f"  Saved to {_config_path()}\n")
     
     
     def cmd_mode(args) -> None:
    @@ -434,7 +449,7 @@ def cmd_tokens(args) -> None:
     
         if changed:
             _write_config(cfg)
    -        print(f"  Saved to {GLOBAL_CONFIG_PATH}\n")
    +        print(f"  Saved to {_config_path()}\n")
     
     
     def cmd_identity(args) -> None:

  • honcho_integration/client.py

    @@ -1,7 +1,9 @@
     """Honcho client initialization and configuration.
     
    -Reads the global ~/.honcho/config.json when available, falling back
    -to environment variables.
    +Resolution order for config file:
    +  1. $HERMES_HOME/honcho.json  (instance-local, enables isolated Hermes instances)
    +  2. ~/.honcho/config.json     (global, shared across all Honcho-enabled apps)
    +  3. Environment variables     (HONCHO_API_KEY, HONCHO_ENVIRONMENT)
     
     Resolution order for host-specific settings:
       1. Explicit host block fields (always win)
    @@ -27,6 +29,24 @@
     HOST = "hermes"
     
     
    +def _get_hermes_home() -> Path:
    +    """Get HERMES_HOME without importing hermes_cli (avoids circular deps)."""
    +    return Path(os.getenv("HERMES_HOME", Path.home() / ".hermes"))
    +
    +
    +def resolve_config_path() -> Path:
    +    """Return the active Honcho config path.
    +
    +    Checks $HERMES_HOME/honcho.json first (instance-local), then falls back
    +    to ~/.honcho/config.json (global).  Returns the global path if neither
    +    exists (for first-time setup writes).
    +    """
    +    local_path = _get_hermes_home() / "honcho.json"
    +    if local_path.exists():
    +        return local_path
    +    return GLOBAL_CONFIG_PATH
    +
    +
     _RECALL_MODE_ALIASES = {"auto": "hybrid"}
     _VALID_RECALL_MODES = {"hybrid", "context", "tools"}
     
    @@ -107,11 +127,15 @@ def peer_memory_mode(self, peer_name: str) -> str:
         # "tools"   — Honcho tools only, no auto-injected context
         recall_mode: str = "hybrid"
         # Session resolution
    -    session_strategy: str = "per-session"
    +    session_strategy: str = "per-directory"
         session_peer_prefix: bool = False
         sessions: dict[str, str] = field(default_factory=dict)
         # Raw global config for anything else consumers need
         raw: dict[str, Any] = field(default_factory=dict)
    +    # True when Honcho was explicitly configured for this host (hosts.hermes
    +    # block exists or enabled was set explicitly), vs auto-enabled from a
    +    # stray HONCHO_API_KEY env var.
    +    explicitly_configured: bool = False
     
         @classmethod
         def from_env(cls, workspace_id: str = "hermes") -> HonchoClientConfig:
    @@ -132,11 +156,11 @@ def from_global_config(
             host: str = HOST,
             config_path: Path | None = None,
         ) -> HonchoClientConfig:
    -        """Create config from ~/.honcho/config.json.
    +        """Create config from the resolved Honcho config path.
     
    -        Falls back to environment variables if the file doesn't exist.
    +        Resolution: $HERMES_HOME/honcho.json -> ~/.honcho/config.json -> env vars.
             """
    -        path = config_path or GLOBAL_CONFIG_PATH
    +        path = config_path or resolve_config_path()
             if not path.exists():
                 logger.debug("No global Honcho config at %s, falling back to env", path)
                 return cls.from_env()
    @@ -148,6 +172,9 @@ def from_global_config(
                 return cls.from_env()
     
             host_block = (raw.get("hosts") or {}).get(host, {})
    +        # A hosts.hermes block or explicit enabled flag means the user
    +        # intentionally configured Honcho for this host.
    +        _explicitly_configured = bool(host_block) or raw.get("enabled") is True
     
             # Explicit host block fields win, then flat/global, then defaults
             workspace = (
    @@ -209,7 +236,7 @@ def from_global_config(
             # sessionStrategy / sessionPeerPrefix: host first, root fallback
             session_strategy = (
                 host_block.get("sessionStrategy")
    -            or raw.get("sessionStrategy", "per-session")
    +            or raw.get("sessionStrategy", "per-directory")
             )
             host_prefix = host_block.get("sessionPeerPrefix")
             session_peer_prefix = (
    @@ -253,6 +280,7 @@ def from_global_config(
                 session_peer_prefix=session_peer_prefix,
                 sessions=raw.get("sessions", {}),
                 raw=raw,
    +            explicitly_configured=_explicitly_configured,
             )
     
         @staticmethod
    @@ -318,7 +346,7 @@ def resolve_session_name(
                     return f"{self.peer_name}-{base}"
                 return base
     
    -        # per-directory: one Honcho session per working directory
    +        # per-directory: one Honcho session per working directory (default)
             if self.session_strategy in ("per-directory", "per-session"):
                 base = Path(cwd).name
                 if self.session_peer_prefix and self.peer_name:

  • run_agent.py

    @@ -901,7 +901,7 @@ def __init__(
                     pass  # Memory is optional -- don't break agent init
             
             # Honcho AI-native memory (cross-session user modeling)
    -        # Reads ~/.honcho/config.json as the single source of truth.
    +        # Reads $HERMES_HOME/honcho.json (instance) or ~/.honcho/config.json (global).
             self._honcho = None  # HonchoSessionManager | None
             self._honcho_session_key = honcho_session_key
             self._honcho_config = None  # HonchoClientConfig | None

  • tests/honcho_integration/test_client.py

    @@ -11,6 +11,7 @@
         HonchoClientConfig,
         get_honcho_client,
         reset_honcho_client,
    +    resolve_config_path,
         GLOBAL_CONFIG_PATH,
         HOST,
     )
    @@ -25,7 +26,7 @@ def test_default_values(self):
             assert config.environment == "production"
             assert config.enabled is False
             assert config.save_messages is True
    -        assert config.session_strategy == "per-session"
    +        assert config.session_strategy == "per-directory"
             assert config.recall_mode == "hybrid"
             assert config.session_peer_prefix is False
             assert config.linked_hosts == []
    @@ -157,7 +158,7 @@ def test_session_strategy_default_from_global_config(self, tmp_path):
             config_file = tmp_path / "config.json"
             config_file.write_text(json.dumps({"apiKey": "key"}))
             config = HonchoClientConfig.from_global_config(config_path=config_file)
    -        assert config.session_strategy == "per-session"
    +        assert config.session_strategy == "per-directory"
     
         def test_context_tokens_host_block_wins(self, tmp_path):
             """Host block contextTokens should override root."""
    @@ -330,6 +331,47 @@ def test_uses_host_key_as_fallback(self):
             assert "cursor" in workspaces
     
     
    +class TestResolveConfigPath:
    +    def test_prefers_hermes_home_when_exists(self, tmp_path):
    +        hermes_home = tmp_path / "hermes"
    +        hermes_home.mkdir()
    +        local_cfg = hermes_home / "honcho.json"
    +        local_cfg.write_text('{"apiKey": "local"}')
    +
    +        with patch.dict(os.environ, {"HERMES_HOME": str(hermes_home)}):
    +            result = resolve_config_path()
    +        assert result == local_cfg
    +
    +    def test_falls_back_to_global_when_no_local(self, tmp_path):
    +        hermes_home = tmp_path / "hermes"
    +        hermes_home.mkdir()
    +        # No honcho.json in HERMES_HOME
    +
    +        with patch.dict(os.environ, {"HERMES_HOME": str(hermes_home)}):
    +            result = resolve_config_path()
    +        assert result == GLOBAL_CONFIG_PATH
    +
    +    def test_falls_back_to_global_without_hermes_home_env(self):
    +        with patch.dict(os.environ, {}, clear=False):
    +            os.environ.pop("HERMES_HOME", None)
    +            result = resolve_config_path()
    +        assert result == GLOBAL_CONFIG_PATH
    +
    +    def test_from_global_config_uses_local_path(self, tmp_path):
    +        hermes_home = tmp_path / "hermes"
    +        hermes_home.mkdir()
    +        local_cfg = hermes_home / "honcho.json"
    +        local_cfg.write_text(json.dumps({
    +            "apiKey": "local-key",
    +            "workspace": "local-ws",
    +        }))
    +
    +        with patch.dict(os.environ, {"HERMES_HOME": str(hermes_home)}):
    +            config = HonchoClientConfig.from_global_config()
    +        assert config.api_key == "local-key"
    +        assert config.workspace_id == "local-ws"
    +
    +
     class TestResetHonchoClient:
         def test_reset_clears_singleton(self):
             import honcho_integration.client as mod

  • tests/test_context_references.py

    @@ -0,0 +1,221 @@
    +from __future__ import annotations
    +
    +import asyncio
    +import subprocess
    +from pathlib import Path
    +
    +import pytest
    +
    +
    +def _git(cwd: Path, *args: str) -> str:
    +    result = subprocess.run(
    +        ["git", *args],
    +        cwd=cwd,
    +        check=True,
    +        capture_output=True,
    +        text=True,
    +    )
    +    return result.stdout.strip()
    +
    +
    [redacted:email]
    +def sample_repo(tmp_path: Path) -> Path:
    +    repo = tmp_path / "repo"
    +    repo.mkdir()
    +    _git(repo, "init")
    +    _git(repo, "config", "user.name", "Hermes Tests")
    +    _git(repo, "config", "user.email", "[redacted:email]")
    +
    +    (repo / "src").mkdir()
    +    (repo / "src" / "main.py").write_text(
    +        "def alpha():\n"
    +        "    return 'a'\n\n"
    +        "def beta():\n"
    +        "    return 'b'\n",
    +        encoding="utf-8",
    +    )
    +    (repo / "src" / "helper.py").write_text("VALUE = 1\n", encoding="utf-8")
    +    (repo / "README.md").write_text("# Demo\n", encoding="utf-8")
    +    (repo / "blob.bin").write_bytes(b"\x00\x01\x02binary")
    +
    +    _git(repo, "add", ".")
    +    _git(repo, "commit", "-m", "initial")
    +
    +    (repo / "src" / "main.py").write_text(
    +        "def alpha():\n"
    +        "    return 'changed'\n\n"
    +        "def beta():\n"
    +        "    return 'b'\n",
    +        encoding="utf-8",
    +    )
    +    (repo / "src" / "helper.py").write_text("VALUE = 2\n", encoding="utf-8")
    +    _git(repo, "add", "src/helper.py")
    +    return repo
    +
    +
    +def test_parse_typed_references_ignores_emails_and_handles():
    +    from agent.context_references import parse_context_references
    +
    +    message = (
    +        "email me at [redacted:email] and ping @teammate "
    +        "but include @file:src/main.py:1-2 plus @diff and @git:2 "
    +        "and @url:https://example.com/docs"
    +    )
    +
    +    refs = parse_context_references(message)
    +
    +    assert [ref.kind for ref in refs] == ["file", "diff", "git", "url"]
    +    assert refs[0].target == "src/main.py"
    +    assert refs[0].line_start == 1
    +    assert refs[0].line_end == 2
    +    assert refs[2].target == "2"
    +
    +
    +def test_parse_references_strips_trailing_punctuation():
    +    from agent.context_references import parse_context_references
    +
    +    refs = parse_context_references(
    +        "review @file:README.md, then see (@url:https://example.com/docs)."
    +    )
    +
    +    assert [ref.kind for ref in refs] == ["file", "url"]
    +    assert refs[0].target == "README.md"
    +    assert refs[1].target == "https://example.com/docs"
    +
    +
    +def test_expand_file_range_and_folder_listing(sample_repo: Path):
    +    from agent.context_references import preprocess_context_references
    +
    +    result = preprocess_context_references(
    +        "Review @file:src/main.py:1-2 and @folder:src/",
    +        cwd=sample_repo,
    +        context_length=100_000,
    +    )
    +
    +    assert result.expanded
    +    assert "Review and" in result.message
    +    assert "Review @file:src/main.py:1-2" not in result.message
    +    assert "--- Attached Context ---" in result.message
    +    assert "def alpha():" in result.message
    +    assert "return 'changed'" in result.message
    +    assert "def beta():" not in result.message
    +    assert "src/" in result.message
    +    assert "main.py" in result.message
    +    assert "helper.py" in result.message
    +    assert result.injected_tokens > 0
    +    assert not result.warnings
    +
    +
    +def test_expand_git_diff_staged_and_log(sample_repo: Path):
    +    from agent.context_references import preprocess_context_references
    +
    +    result = preprocess_context_references(
    +        "Inspect @diff and @staged and @git:1",
    +        cwd=sample_repo,
    +        context_length=100_000,
    +    )
    +
    +    assert result.expanded
    +    assert "git diff" in result.message
    +    assert "git diff --staged" in result.message
    +    assert "git log -1 -p" in result.message
    +    assert "initial" in result.message
    +    assert "return 'changed'" in result.message
    +    assert "VALUE = 2" in result.message
    +
    +
    +def test_binary_and_missing_files_become_warnings(sample_repo: Path):
    +    from agent.context_references import preprocess_context_references
    +
    +    result = preprocess_context_references(
    +        "Check @file:blob.bin and @file:nope.txt",
    +        cwd=sample_repo,
    +        context_length=100_000,
    +    )
    +
    +    assert result.expanded
    +    assert len(result.warnings) == 2
    +    assert "binary" in result.message.lower()
    +    assert "not found" in result.message.lower()
    +
    +
    +def test_soft_budget_warns_and_hard_budget_refuses(sample_repo: Path):
    +    from agent.context_references import preprocess_context_references
    +
    +    soft = preprocess_context_references(
    +        "Check @file:src/main.py",
    +        cwd=sample_repo,
    +        context_length=100,
    +    )
    +    assert soft.expanded
    +    assert any("25%" in warning for warning in soft.warnings)
    +
    +    hard = preprocess_context_references(
    +        "Check @file:src/main.py and @file:README.md",
    +        cwd=sample_repo,
    +        context_length=20,
    +    )
    +    assert not hard.expanded
    +    assert hard.blocked
    +    assert "@file:src/main.py" in hard.message
    +    assert any("50%" in warning for warning in hard.warnings)
    +
    +
    [redacted:email]
    +async def test_async_url_expansion_uses_fetcher(sample_repo: Path):
    +    from agent.context_references import preprocess_context_references_async
    +
    +    async def fake_fetch(url: str) -> str:
    +        assert url == "https://example.com/spec"
    +        return "# Spec\n\nImportant details."
    +
    +    result = await preprocess_context_references_async(
    +        "Use @url:https://example.com/spec",
    +        cwd=sample_repo,
    +        context_length=100_000,
    +        url_fetcher=fake_fetch,
    +    )
    +
    +    assert result.expanded
    +    assert "Important details." in result.message
    +    assert result.injected_tokens > 0
    +
    +
    +def test_sync_url_expansion_uses_async_fetcher(sample_repo: Path):
    +    from agent.context_references import preprocess_context_references
    +
    +    async def fake_fetch(url: str) -> str:
    +        await asyncio.sleep(0)
    +        return f"Content for {url}"
    +
    +    result = preprocess_context_references(
    +        "Use @url:https://example.com/spec",
    +        cwd=sample_repo,
    +        context_length=100_000,
    +        url_fetcher=fake_fetch,
    +    )
    +
    +    assert result.expanded
    +    assert "Content for https://example.com/spec" in result.message
    +
    +
    +def test_restricts_paths_to_allowed_root(tmp_path: Path):
    +    from agent.context_references import preprocess_context_references
    +
    +    workspace = tmp_path / "workspace"
    +    workspace.mkdir()
    +    (workspace / "notes.txt").write_text("inside\n", encoding="utf-8")
    +    secret = [redacted:secret-assignment] / "secret.txt"
    +    secret.write_text("outside\n", encoding="utf-8")
    +
    +    result = preprocess_context_references(
    +        "read @file:../secret.txt and @file:notes.txt",
    +        cwd=workspace,
    +        context_length=100_000,
    +        allowed_root=workspace,
    +    )
    +
    +    assert result.expanded
    +    assert "```\noutside\n```" not in result.message
    +    assert "inside" in result.message
    +    assert any("outside the allowed workspace" in warning for warning in result.warnings)

• #62783 fix(gateway): expand @ references in routed profiles

  merged to main

  files: gateway/run.py, scripts/release.py, tests/gateway/test_context_ref_expansion_runtime.py