Skip to content

CLI for SidePulse

Python

Recover agent state after status bar restarts

Peter Kuharf9f1d845153b
diff --git a/src/sidepulse/collector.py b/src/sidepulse/collector.py
index 267d42e..598a228 100644
--- a/src/sidepulse/collector.py
+++ b/src/sidepulse/collector.py
@@ -379,6 +379,7 @@ class LiveAgentMonitor:
self,
*,
sources: Iterable[SourceSpec] = (),
+ recovery_sources: Iterable[SourceSpec] = (),
stale_after_seconds: float = 3600.0,
tool_running_timeout_seconds: float = 0.0,
completed_visible_seconds: float = COMPLETED_VISIBLE_SECONDS,
@@ -387,6 +388,7 @@ class LiveAgentMonitor:
latest_state_path: Path | None = None,
) -> None:
self.sources = tuple(sources)
+ self.recovery_sources = tuple(recovery_sources)
self.stale_after_seconds = stale_after_seconds
self.tool_running_timeout_seconds = tool_running_timeout_seconds
self.completed_visible_seconds = completed_visible_seconds
@@ -399,6 +401,7 @@ class LiveAgentMonitor:
self.metadata_by_status: dict[str, StatusMetadata] = {}
self.pending_permissions_by_key: dict[str, set[str]] = {}
self.load_latest_state()
+ self.reconcile_recovery_sources()
def ingest_record(self, record: HookEvent) -> None:
with self.lock:
@@ -455,6 +458,32 @@ class LiveAgentMonitor:
loaded[status.agent_id] = status
self.statuses_by_key.update(loaded)
+ def reconcile_recovery_sources(self) -> None:
+ """Merge events missed while the live event socket was unavailable."""
+ if not self.recovery_sources:
+ return
+
+ recovery_monitor = AgentMonitor(
+ sources=self.recovery_sources,
+ stale_after_seconds=self.stale_after_seconds,
+ tool_running_timeout_seconds=self.tool_running_timeout_seconds,
+ completed_visible_seconds=self.completed_visible_seconds,
+ idle_visible_seconds=self.idle_visible_seconds,
+ post_tool_working_visible_seconds=self.post_tool_working_visible_seconds,
+ )
+ recovered_statuses = recovery_monitor._latest_statuses()
+ changed = False
+ for agent_id, recovered in recovered_statuses.items():
+ previous = self.statuses_by_key.get(agent_id)
+ if previous is not None and recovered.updated_at < previous.updated_at:
+ continue
+ if recovered != previous:
+ self.statuses_by_key[agent_id] = recovered
+ changed = True
+
+ if changed:
+ self.write_latest_state()
+
def write_latest_state(self) -> None:
if self.latest_state_path is None:
return
diff --git a/src/sidepulse/cursor_hook.py b/src/sidepulse/cursor_hook.py
index 7b4c19e..b9a17e9 100644
--- a/src/sidepulse/cursor_hook.py
+++ b/src/sidepulse/cursor_hook.py
@@ -90,9 +90,18 @@ def main(argv: list[str] | None = None) -> int:
args.log.expanduser(),
json.dumps(normalized, separators=(",", ":"), ensure_ascii=False),
)
- send_hook_event(provider, line)
- write_hook_line(log_path, line)
- write_hook_status_audit(provider, line)
+ try:
+ write_hook_line(log_path, line)
+ except Exception:
+ pass
+ try:
+ write_hook_status_audit(provider, line)
+ except Exception:
+ pass
+ try:
+ send_hook_event(provider, line)
+ except Exception:
+ pass
except Exception:
pass
diff --git a/src/sidepulse/hook.py b/src/sidepulse/hook.py
index 82a1a23..ce8a914 100644
--- a/src/sidepulse/hook.py
+++ b/src/sidepulse/hook.py
@@ -124,10 +124,19 @@ def hook_log_main(provider: str, log_path: Path, event: str | None = None) -> in
log_path,
payload_text,
)
- if not hook_event_socket_disabled():
- send_hook_event(actual_provider, line)
- write_hook_line(actual_log_path, line)
- write_hook_status_audit(actual_provider, line)
+ try:
+ write_hook_line(actual_log_path, line)
+ except Exception:
+ pass
+ try:
+ write_hook_status_audit(actual_provider, line)
+ except Exception:
+ pass
+ try:
+ if not hook_event_socket_disabled():
+ send_hook_event(actual_provider, line)
+ except Exception:
+ pass
except Exception:
return 0
return 0
diff --git a/src/sidepulse/status_bar.py b/src/sidepulse/status_bar.py
index c789b32..ac80c82 100644
--- a/src/sidepulse/status_bar.py
+++ b/src/sidepulse/status_bar.py
@@ -80,7 +80,7 @@ from .audit import (
read_status_history_records,
status_history_record,
)
-from .collector import LiveAgentMonitor, SourceSpec
+from .collector import LiveAgentMonitor, SourceSpec, default_sources
from .device_writer import (
DEFAULT_FILE_NAME,
MOUNT_ROOT,
@@ -1050,6 +1050,7 @@ class StatusBarController(NSObject):
socket_path = default_event_socket_path()
return LiveAgentMonitor(
sources=(SourceSpec("event-bus", socket_path),),
+ recovery_sources=default_sources(self.settings),
stale_after_seconds=self.settings.idle_timeout_seconds,
latest_state_path=default_latest_state_path(),
)
diff --git a/tests/test_hook_stability.py b/tests/test_hook_stability.py
index e8d9e11..93a57b6 100644
--- a/tests/test_hook_stability.py
+++ b/tests/test_hook_stability.py
@@ -164,6 +164,11 @@ class FailOpenTests(HookIsolationMixin, unittest.TestCase):
"claude", self.log_path, '{"hook_event_name": "Stop"}'
)
self.assertEqual(0, code)
+ self.assertTrue(self.log_path.exists())
+ self.assertEqual(
+ json.loads(self.log_path.read_text())["hook_event_name"],
+ "Stop",
+ )
class StdoutPurityTests(HookIsolationMixin, unittest.TestCase):
diff --git a/tests/test_sidepulse.py b/tests/test_sidepulse.py
index 5e2ef24..c442682 100644
--- a/tests/test_sidepulse.py
+++ b/tests/test_sidepulse.py
@@ -694,6 +694,114 @@ class AgentMonitorTests(unittest.TestCase):
self.assertEqual(reloaded.snapshot().aggregate.mode, AgentMode.TOOL_RUNNING)
self.assertEqual(reloaded.snapshot().statuses[0].origin, "Codex UI")
+ def test_live_sidepulse_recovers_stop_missed_during_restart(self) -> None:
+ with tempfile.TemporaryDirectory() as tmp:
+ base = Path(tmp)
+ latest = base / "latest.json"
+ codex_log = base / "codex.jsonl"
+ session_id = "codex-session"
+ prompt_at = datetime.now(timezone.utc) - timedelta(seconds=10)
+ stop_at = prompt_at + timedelta(seconds=5)
+ latest.write_text(
+ json.dumps(
+ {
+ "updated_at": prompt_at.isoformat(),
+ "statuses": [
+ {
+ "provider": "codex",
+ "agent_id": f"codex:session:{session_id}",
+ "display_name": "project: Restart recovery",
+ "mode": "working",
+ "updated_at": prompt_at.isoformat(),
+ "event_name": "UserPromptSubmit",
+ "session_id": session_id,
+ "cwd": "/tmp/project",
+ }
+ ],
+ }
+ )
+ + "\n"
+ )
+ codex_log.write_text(
+ json.dumps(
+ {
+ "logged_at": stop_at.isoformat(),
+ "event": {
+ "hook_event_name": "Stop",
+ "session_id": session_id,
+ "cwd": "/tmp/project",
+ "last_assistant_message": "Finished.",
+ },
+ }
+ )
+ + "\n"
+ )
+
+ monitor = LiveAgentMonitor(
+ sources=(SourceSpec("event-bus", base / "events.sock"),),
+ recovery_sources=(SourceSpec("codex", codex_log),),
+ stale_after_seconds=3600,
+ latest_state_path=latest,
+ )
+
+ status = monitor.snapshot().statuses[0]
+ self.assertEqual(status.mode, AgentMode.COMPLETED)
+ self.assertEqual(status.event_name, "Stop")
+ persisted = json.loads(latest.read_text())["statuses"][0]
+ self.assertEqual(persisted["mode"], AgentMode.COMPLETED.value)
+ self.assertEqual(persisted["event_name"], "Stop")
+
+ def test_live_sidepulse_recovery_does_not_replace_newer_cached_state(self) -> None:
+ with tempfile.TemporaryDirectory() as tmp:
+ base = Path(tmp)
+ latest = base / "latest.json"
+ codex_log = base / "codex.jsonl"
+ session_id = "codex-session"
+ prompt_at = datetime.now(timezone.utc) - timedelta(seconds=10)
+ stop_at = prompt_at + timedelta(seconds=5)
+ latest.write_text(
+ json.dumps(
+ {
+ "updated_at": stop_at.isoformat(),
+ "statuses": [
+ {
+ "provider": "codex",
+ "agent_id": f"codex:session:{session_id}",
+ "display_name": "project: Restart recovery",
+ "mode": "completed",
+ "updated_at": stop_at.isoformat(),
+ "event_name": "Stop",
+ "session_id": session_id,
+ "cwd": "/tmp/project",
+ }
+ ],
+ }
+ )
+ + "\n"
+ )
+ codex_log.write_text(
+ json.dumps(
+ {
+ "logged_at": prompt_at.isoformat(),
+ "event": {
+ "hook_event_name": "UserPromptSubmit",
+ "session_id": session_id,
+ "cwd": "/tmp/project",
+ },
+ }
+ )
+ + "\n"
+ )
+
+ monitor = LiveAgentMonitor(
+ recovery_sources=(SourceSpec("codex", codex_log),),
+ latest_state_path=latest,
+ )
+
+ status = monitor.snapshot().statuses[0]
+ self.assertEqual(status.mode, AgentMode.COMPLETED)
+ self.assertEqual(status.event_name, "Stop")
+
def test_status_bar_session_menu_title_is_task_and_project(self) -> None:
try:
from sidepulse import status_bar
@@ -2152,6 +2260,7 @@ class AgentMonitorTests(unittest.TestCase):
self.skipTest(str(exc))
with tempfile.TemporaryDirectory() as tmp:
+ recovery_source = SourceSpec("codex", Path(tmp) / "codex.jsonl")
fake = SimpleNamespace(
settings=AgentMonitorSettings(idle_timeout_seconds=1234)
)
@@ -2164,10 +2273,15 @@ class AgentMonitorTests(unittest.TestCase):
"sidepulse.status_bar.default_latest_state_path",
return_value=Path(tmp) / "latest.json",
),
+ patch(
+ "sidepulse.status_bar.default_sources",
+ return_value=(recovery_source,),
+ ),
):
monitor = status_bar.StatusBarController.build_monitor(fake)
self.assertEqual(monitor.stale_after_seconds, 1234)
+ self.assertEqual(monitor.recovery_sources, (recovery_source,))
def test_status_bar_setup_window_has_first_launch_controls(self) -> None:
try: