Skip to content

feat: multi-turn session continuity + model flag for claude -p bypass #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nextsaver-source merged 1 commit into from
Jun 9, 2026
Merged

feat: multi-turn session continuity + model flag for claude -p bypass #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions cron/scheduler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1244,10 +1244,11 @@ def _run_via_claude_subprocess(
"TZ": os.environ.get("TZ", "Asia/Seoul"),
}

logger.info("Job '%s': running via claude -p subprocess (subscription)", job_id)
_model = os.environ.get("HERMES_CLAUDE_SUB_MODEL", "claude-opus-4-8").strip() or "claude-opus-4-8"
logger.info("Job '%s': running via claude -p subprocess (subscription) model=%s", job_id, _model)
try:
result = subprocess.run(
[claude_bin, "-p", prompt],
[claude_bin, "-p", "--model", _model, prompt],
capture_output=True,
text=True,
env=env,
Expand Down
43 changes: 26 additions & 17 deletions gateway/run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17829,23 +17829,29 @@ def _interim_assistant_cb(text: str, *, already_streamed: bool = False) -> None:
):
import subprocess as _subprocess
import shutil as _shutil
import uuid as _uuid
_claude_bin = _shutil.which("claude")
if _claude_bin:
_hist_lines = []
for _h in (history or []):
_role = str(_h.get("role") or "")
_content = _h.get("content") or ""
if isinstance(_content, list):
_content = " ".join(
c.get("text", "") if isinstance(c, dict) else str(c)
for c in _content
).strip()
if _role and _content:
_hist_lines.append(f"{_role.capitalize()}: {_content}")
_full_prompt = (
"[Previous conversation:\n" + "\n".join(_hist_lines) + "\n]\n\nUser: " + message
if _hist_lines else message
)
# --- session-id mapping: gateway session_key → claude session uuid ---
_session_map_path = Path.home() / ".claude-hermes" / "gateway_session_map.json"
_session_map: dict = {}
try:
if _session_map_path.exists():
_session_map = json.loads(_session_map_path.read_text())
except Exception:
_session_map = {}
_existing_session_id = _session_map.get(session_key or "")
_is_new_session = not _existing_session_id
if _is_new_session:
_claude_session_id = str(_uuid.uuid4())
_session_map[session_key or ""] = _claude_session_id
try:
_session_map_path.write_text(json.dumps(_session_map, ensure_ascii=False))
except Exception:
pass
else:
_claude_session_id = _existing_session_id
# --- build subprocess command ---
_sub_env = {
"PATH": os.environ.get("PATH", ""),
"HOME": os.environ.get("HOME", ""),
Expand All @@ -17858,9 +17864,12 @@ def _interim_assistant_cb(text: str, *, already_streamed: bool = False) -> None:
}
_sub_timeout = float(os.getenv("HERMES_CRON_TIMEOUT", "600") or "600")
_sub_model = str(turn_route.get("model") or "").strip()
_sub_cmd = [_claude_bin, "-p", _full_prompt]
# new session → --session-id to create; existing → --resume to continue
_session_flag = "--session-id" if _is_new_session else "--resume"
_sub_cmd = [_claude_bin, "-p", _session_flag, _claude_session_id]
if _sub_model and _sub_model.startswith("claude"):
_sub_cmd = [_claude_bin, "-p", "--model", _sub_model, _full_prompt]
_sub_cmd += ["--model", _sub_model]
_sub_cmd.append(message)
try:
_sub_result = _subprocess.run(
_sub_cmd,
Expand Down
Loading