31c40c72c0
* fix(desktop): stabilize project folder sessions Keep desktop folder selection aligned with new sessions and scope TUI gateway cwd through session context so prompts and tools resolve against the selected workspace. * fix(desktop): address review feedback on folder sessions Snapshot sessions before iterating to avoid concurrent-mutation crashes, optional-chain the revealLogs catch, and read console-message args from the correct Electron event/messageDetails positions. * fix(desktop): address second review pass on folder sessions Sync the remembered workspace key with the cwd atom (clear on empty), only load tree children for real directory nodes, and throttle renderer auto-reloads so a deterministic startup crash can't loop forever. * fix(desktop): inherit parent workspace for ephemeral agent tasks Background and preview tasks use ephemeral ids absent from the session map, so pass the parent session cwd into the session context explicitly instead of clearing it back to the gateway launch dir. Also correct the set_session_vars docstring about clear_session_vars semantics. * fix(desktop): validate preview cwd before pinning session context A non-empty but non-existent client cwd would pin an unusable override and silently fall back to the launch dir. Validate once, reuse for both the session context and the terminal override, and fall back to the parent session workspace when invalid. * fix(desktop): harden preview cwd normalization and adopt normalized cwd Guard preview cwd normalization against malformed client paths so a bad input can't fail the whole restart, and adopt the backend's normalized config.get cwd in the no-active-session path so the persisted workspace stays consistent with what the agent uses.
63 lines
2.0 KiB
Python
63 lines
2.0 KiB
Python
"""Single source of truth for the agent working directory.
|
|
|
|
`TERMINAL_CWD` is the runtime carrier for the configured working directory
|
|
(design #19214/#19242: `terminal.cwd` is bridged once to `TERMINAL_CWD` at
|
|
gateway/cron startup). The local-CLI backend deliberately leaves it unset and
|
|
relies on the launch dir. Reading it in one place keeps the system prompt, the
|
|
tool surfaces, and context-file discovery agreeing on where the agent lives.
|
|
|
|
Multi-session gateways can pin a logical cwd via the `_SESSION_CWD`
|
|
contextvar; CLI/cron fall through to `TERMINAL_CWD`/launch cwd.
|
|
"""
|
|
|
|
import os
|
|
from contextvars import ContextVar, Token
|
|
from pathlib import Path
|
|
from typing import Any
|
|
|
|
_UNSET: Any = object()
|
|
|
|
_SESSION_CWD: ContextVar = ContextVar("HERMES_SESSION_CWD", default=_UNSET)
|
|
|
|
|
|
def set_session_cwd(cwd: str | None) -> Token:
|
|
"""Pin the logical cwd for the current context."""
|
|
return _SESSION_CWD.set((cwd or "").strip())
|
|
|
|
|
|
def clear_session_cwd() -> None:
|
|
_SESSION_CWD.set("")
|
|
|
|
|
|
def _session_cwd_override() -> str:
|
|
value = _SESSION_CWD.get()
|
|
if value is _UNSET:
|
|
return ""
|
|
return str(value).strip()
|
|
|
|
|
|
def resolve_agent_cwd() -> Path:
|
|
override = _session_cwd_override()
|
|
if override:
|
|
p = Path(override).expanduser()
|
|
if p.is_dir():
|
|
return p
|
|
raw = os.environ.get("TERMINAL_CWD", "").strip()
|
|
if raw:
|
|
p = Path(raw).expanduser()
|
|
if p.is_dir():
|
|
return p
|
|
return Path(os.getcwd())
|
|
|
|
|
|
def resolve_context_cwd() -> Path | None:
|
|
# None means "no configured cwd": build_context_files_prompt then falls back
|
|
# to the launch dir (os.getcwd()) — correct for the local CLI. The gateway
|
|
# avoids slurping its install dir by setting TERMINAL_CWD (see system_prompt.py)
|
|
# or, per session, the _SESSION_CWD contextvar above.
|
|
override = _session_cwd_override()
|
|
if override:
|
|
return Path(override).expanduser()
|
|
raw = os.environ.get("TERMINAL_CWD", "").strip()
|
|
return Path(raw).expanduser() if raw else None
|