@@ -1165,13 +1230,17 @@ def _handle_continue_session(self, raw_name: str) -> None:
self._send_json({"error": "Session not found"}, status=404)
return
+ if TERMINALS.any_active(session_name):
+ self._send_json({"error": "Session already active"}, status=409)
+ return
+
parts_dir = sess_dir / PARTS_DIR_NAME
parts_dir.mkdir(exist_ok=True)
- existing = [p for p in parts_dir.iterdir() if p.is_dir() and p.name.isdigit()]
- next_part = max((int(p.name) for p in existing), default=1) + 1 # part 1 is logs/, so next is 2+
+ next_part = next_part_number(parts_dir)
- part_logs_dir = parts_dir / str(next_part) / "logs"
- part_assets_dir = parts_dir / str(next_part) / "assets"
+ part_root = parts_dir / str(next_part)
+ part_logs_dir = part_root / "logs"
+ part_assets_dir = part_root / "assets"
for directory in (part_logs_dir, part_assets_dir):
directory.mkdir(parents=True, exist_ok=True)
@@ -1180,10 +1249,36 @@ def _handle_continue_session(self, raw_name: str) -> None:
session_id=generate_session_id(),
start_time=iso_timestamp(),
hostname=socket.gethostname(),
+ operator=_detect_operator(),
+ parts_count=next_part,
)
- _write_jsonl_record(part_logs_dir / SESSION_LOG_NAME, part_meta.to_dict())
+ hmac_key = load_session_key(sess_dir)
+ writer = JSONLWriter(part_logs_dir / SESSION_LOG_NAME, hmac_key=hmac_key)
+ writer.write(part_meta.to_dict())
+ writer.close()
+
+ try:
+ proc = TERMINALS.start(session_name, part=next_part)
+ except TerminalAlreadyRunning:
+ shutil.rmtree(str(part_root), ignore_errors=True)
+ self._send_json({"error": "Session already active"}, status=409)
+ return
+ except TerminalNotSupported as exc:
+ shutil.rmtree(str(part_root), ignore_errors=True)
+ self._send_json({"error": str(exc)}, status=501)
+ return
+ except ShellNotFound as exc:
+ shutil.rmtree(str(part_root), ignore_errors=True)
+ self._send_json({"error": str(exc)}, status=500)
+ return
+ except FileNotFoundError:
+ shutil.rmtree(str(part_root), ignore_errors=True)
+ self._send_json({"error": "Session not found"}, status=404)
+ return
+
+ update_parts_count(sess_dir, next_part)
- self._send_json({"session_name": session_name, "part": next_part}, status=200)
+ self._send_json({"session": session_name, "part": next_part, "status": "active", "pid": proc.pid}, status=200)
def _handle_validate_session(self, raw_name: str, params: dict[str, list[str]]) -> None:
session_name = unquote(raw_name)
diff --git a/src/guild_scroll/web/terminal.py b/src/guild_scroll/web/terminal.py
index d6f58fe..1d04994 100644
--- a/src/guild_scroll/web/terminal.py
+++ b/src/guild_scroll/web/terminal.py
@@ -12,6 +12,7 @@
from typing import Dict, Optional, Tuple
from guild_scroll.config import PARTS_DIR_NAME, SESSION_LOG_NAME, get_sessions_dir
+from guild_scroll.hooks import detect_shell
from guild_scroll.integrity import load_session_key
from guild_scroll.log_schema import CommandEvent
from guild_scroll.log_writer import JSONLWriter
@@ -59,9 +60,16 @@ def __init__(self, session_name: str, part: int = 1, shell: str = "zsh"):
except ImportError as exc: # pragma: no cover - platform specific
raise TerminalNotSupported("Terminal not supported on this platform") from exc
- shell_path = shutil.which(shell)
+ shell_candidate = detect_shell() or shell
+ shell_path = shutil.which(shell_candidate)
if not shell_path:
- raise ShellNotFound(f"{shell} not found on this system")
+ for fallback in ("bash", "sh"):
+ shell_path = shutil.which(fallback)
+ if shell_path:
+ shell_candidate = fallback
+ break
+ if not shell_path:
+ raise ShellNotFound(f"{shell_candidate} not found on this system")
self.session_name = session_name
self.part = part
@@ -92,6 +100,7 @@ def __init__(self, session_name: str, part: int = 1, shell: str = "zsh"):
env = os.environ.copy()
env.setdefault("TERM", "xterm-256color")
+ env.setdefault("SHELL", shell_candidate)
work_dir = tempfile.gettempdir()
self._proc = subprocess.Popen(
[shell_path],
@@ -269,6 +278,13 @@ def start(self, session_name: str, part: int = 1) -> TerminalProcess:
self._sessions[key] = process
return process
+ def any_active(self, session_name: str) -> bool:
+ with self._lock:
+ for (name, _), proc in self._sessions.items():
+ if name == session_name and proc.is_alive():
+ return True
+ return False
+
def get(self, session_name: str, part: int = 1) -> Optional[TerminalProcess]:
with self._lock:
proc = self._sessions.get((session_name, part))
diff --git a/tests/test_server.py b/tests/test_server.py
index 9110bd3..92b9945 100644
--- a/tests/test_server.py
+++ b/tests/test_server.py
@@ -334,8 +334,36 @@ def test_continue_session_returns_200_with_part_number(self, isolated_sessions_d
status, data = _request(server, "POST", "/api/session/cont-sess/continue")
assert status == 200
payload = json.loads(data)
+ assert payload["session"] == "cont-sess"
+ assert payload["status"] == "active"
assert payload["part"] >= 2
+
+ status_get, data_get = _request(server, "GET", "/api/session/cont-sess")
+ assert status_get == 200
+ meta = json.loads(data_get)["session"]
+ assert meta.get("parts_count") >= payload["part"]
+ finally:
+ server.shutdown()
+ server.server_close()
+ thread.join(timeout=2)
+
+ def test_continue_session_conflict_when_active(self, isolated_sessions_dir):
+ sessions_dir = isolated_sessions_dir / "sessions"
+ _make_session(sessions_dir, "cont-live")
+ server, thread = _start_test_server()
+ part = None
+ try:
+ status_first, data_first = _request(server, "POST", "/api/session/cont-live/continue")
+ assert status_first == 200
+ part = json.loads(data_first)["part"]
+
+ status_second, data_second = _request(server, "POST", "/api/session/cont-live/continue")
+ assert status_second == 409
+ payload_second = json.loads(data_second)
+ assert "active" in payload_second.get("error", "").lower()
finally:
+ if part:
+ _request(server, "POST", f"/api/session/cont-live/terminal/stop?part={part}")
server.shutdown()
server.server_close()
thread.join(timeout=2)