Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
57 changes: 50 additions & 7 deletions hermes_state.py
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,9 @@ def parse_session_metadata(raw: Any) -> Dict[str, Any]:
return {}


SESSION_WORK_RESULT_STATUSES = frozenset({"completed", "failed"})


def session_owned_work_ids(metadata: Dict[str, Any]) -> List[str]:
"""Return work ids Hermes stored. Empty means none — never invent."""
raw = metadata.get("work_ids")
Expand All @@ -145,19 +148,37 @@ def session_owned_work_ids(metadata: Dict[str, Any]) -> List[str]:
return owned


def apply_session_live_work(session: Dict[str, Any]) -> Dict[str, Any]:
"""Project Hermes-owned ``live`` and ``metadata.work_ids`` onto a session row.
def session_owned_work_results(
metadata: Dict[str, Any], work_ids: Optional[List[str]] = None
) -> Dict[str, Dict[str, str]]:
raw = metadata.get("work_results")
if not isinstance(raw, dict):
raw = {}
if work_ids is None:
work_ids = session_owned_work_ids(metadata)
results: Dict[str, Dict[str, str]] = {}
for work_id in work_ids:
entry = raw.get(work_id)
if not isinstance(entry, dict):
continue
status = str(entry.get("status") or "").strip()
if status not in SESSION_WORK_RESULT_STATUSES:
continue
results[work_id] = {"status": status}
return results

``is_active`` is a dashboard activity heuristic and is not live. A
session is live only when Hermes stored that fact (Work Start wake).
Work ids are only those Hermes persisted — omit/empty stays honest.
"""

def apply_session_live_work(session: Dict[str, Any]) -> Dict[str, Any]:
"""Project Hermes-owned ``live``, ``work_ids``, and ``work_results``."""
meta = parse_session_metadata(session.get("metadata"))
work_ids = session_owned_work_ids(meta)
archived = bool(session.get("archived"))
live = bool(meta.get("live")) and not archived
session["live"] = live
session["metadata"] = {"work_ids": work_ids}
session["metadata"] = {
"work_ids": work_ids,
"work_results": session_owned_work_results(meta, work_ids),
}
owner = str(meta.get("owner") or session.get("owner") or "").strip()
profile = str(meta.get("profile") or session.get("profile") or "").strip()
if owner:
Expand Down Expand Up @@ -1553,6 +1574,28 @@ def attach_session_work(
meta["profile"] = profile_id
return self.set_session_metadata(session_id, meta)

def mark_session_work(
self,
session_id: str,
work_ref: str,
status: str,
) -> bool:
"""Persist a terminal result for a work id this session already owns."""
work_id = str(work_ref or "").strip()
status_id = str(status or "").strip()
if (
not work_id
or status_id not in SESSION_WORK_RESULT_STATUSES
or not self.get_session(session_id)
):
return False
meta = self.get_session_metadata(session_id)
if work_id not in session_owned_work_ids(meta):
return False
meta["work_results"] = session_owned_work_results(meta)
meta["work_results"][work_id] = {"status": status_id}
return self.set_session_metadata(session_id, meta)

def get_session_by_title(self, title: str) -> Optional[Dict[str, Any]]:
"""Look up a session by exact title. Returns session dict or None."""
with self._lock:
Expand Down
58 changes: 58 additions & 0 deletions tests/gateway/test_api_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -3533,23 +3533,27 @@ async def test_wake_then_list_get_show_live_work(self, adapter, tmp_path, monkey
body = await wake.json()
assert body["session"]["live"] is True
assert body["session"]["metadata"]["work_ids"] == ["card-1"]
assert body["session"]["metadata"]["work_results"] == {}

listed = await cli.get("/api/sessions")
rows = (await listed.json())["data"]
row = next(s for s in rows if s["id"] == "api-wake")
assert row["live"] is True
assert row["metadata"]["work_ids"] == ["card-1"]
assert row["metadata"]["work_results"] == {}
assert "is_active" not in row

got = await cli.get("/api/sessions/api-wake")
session = (await got.json())["session"]
assert session["live"] is True
assert session["metadata"]["work_ids"] == ["card-1"]
assert session["metadata"]["work_results"] == {}

profile_list = await cli.get("/api/profiles/sessions")
prow = next(s for s in (await profile_list.json())["data"] if s["id"] == "api-wake")
assert prow["live"] is True
assert prow["metadata"]["work_ids"] == ["card-1"]
assert prow["metadata"]["work_results"] == {}
finally:
db.close()

Expand All @@ -3568,5 +3572,59 @@ async def test_list_without_wake_does_not_invent_work(self, adapter, tmp_path, m
row = next(s for s in (await listed.json())["data"] if s["id"] == "api-idle")
assert row["live"] is False
assert row["metadata"]["work_ids"] == []
assert row["metadata"]["work_results"] == {}
finally:
db.close()

@pytest.mark.asyncio
async def test_mark_terminal_emits_that_work_ref_only(self, adapter, tmp_path, monkeypatch):
from hermes_state import SessionDB

db_path = tmp_path / "sessions.db"
db = SessionDB(db_path=db_path)
db.create_session(session_id="api-two", source="api_server")
monkeypatch.setattr(adapter, "_ensure_session_db", lambda: db)
try:
app = _session_app(adapter)
async with TestClient(TestServer(app)) as cli:
first = await cli.post(
"/api/sessions/api-two/prompt",
json={"work_ref": "card-1"},
)
second = await cli.post(
"/api/sessions/api-two/prompt",
json={"work_ref": "card-2"},
)
assert first.status == 200
assert second.status == 200
assert db.mark_session_work("api-two", "card-1", "failed") is True

expected_ids = ["card-1", "card-2"]
expected_results = {"card-1": {"status": "failed"}}

listed = await cli.get("/api/sessions")
row = next(s for s in (await listed.json())["data"] if s["id"] == "api-two")
assert row["live"] is True
assert row["metadata"]["work_ids"] == expected_ids
assert row["metadata"]["work_results"] == expected_results
assert "card-2" not in row["metadata"]["work_results"]

got = await cli.get("/api/sessions/api-two")
session = (await got.json())["session"]
assert session["live"] is True
assert session["metadata"]["work_ids"] == expected_ids
assert session["metadata"]["work_results"] == expected_results

profile_list = await cli.get("/api/profiles/sessions")
prow = next(s for s in (await profile_list.json())["data"] if s["id"] == "api-two")
assert prow["live"] is True
assert prow["metadata"]["work_ids"] == expected_ids
assert prow["metadata"]["work_results"] == expected_results

profile_got = await cli.get("/api/profiles/sessions/api-two")
psession = (await profile_got.json())["session"]
assert psession["live"] is True
assert psession["metadata"]["work_ids"] == expected_ids
assert psession["metadata"]["work_results"] == expected_results
finally:
db.close()
70 changes: 67 additions & 3 deletions tests/hermes_cli/test_web_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,6 @@ def test_get_sessions_archived_is_boolean(self):
assert row["archived"] is False

def test_wake_with_work_ref_lists_and_gets_live_work(self):
"""After POST /prompt with work_ref, list/get emit Hermes-owned live+work."""
from hermes_state import SessionDB

db = SessionDB()
Expand All @@ -459,6 +458,7 @@ def test_wake_with_work_ref_lists_and_gets_live_work(self):
woken = wake.json()["session"]
assert woken["live"] is True
assert woken["metadata"]["work_ids"] == ["card-1"]
assert woken["metadata"]["work_results"] == {}
assert woken["owner"] == "alpha"
assert woken["profile"] == "default"

Expand All @@ -468,19 +468,24 @@ def test_wake_with_work_ref_lists_and_gets_live_work(self):
)
assert listed["live"] is True
assert listed["metadata"]["work_ids"] == ["card-1"]
assert listed["metadata"]["work_results"] == {}
assert listed["is_active"] is True

detail = self.client.get("/api/sessions/wake-owner").json()
assert detail["live"] is True
assert detail["metadata"]["work_ids"] == ["card-1"]
assert detail["metadata"]["work_results"] == {}

profile_listed = next(
s for s in self.client.get("/api/profiles/sessions").json()["sessions"]
if s["id"] == "wake-owner"
)
assert profile_listed["live"] is True
assert profile_listed["metadata"]["work_ids"] == ["card-1"]
assert self.client.get("/api/profiles/sessions/wake-owner").json()["live"] is True
assert profile_listed["metadata"]["work_results"] == {}
profile_detail = self.client.get("/api/profiles/sessions/wake-owner").json()
assert profile_detail["live"] is True
assert profile_detail["metadata"]["work_results"] == {}

def test_prompt_without_work_ref_does_not_invent_work_or_live(self):
from hermes_state import SessionDB
Expand All @@ -496,6 +501,7 @@ def test_prompt_without_work_ref_does_not_invent_work_or_live(self):
session = resp.json()["session"]
assert session["live"] is False
assert session["metadata"]["work_ids"] == []
assert session["metadata"]["work_results"] == {}

listed = next(
s for s in self.client.get("/api/sessions").json()["sessions"]
Expand All @@ -504,9 +510,9 @@ def test_prompt_without_work_ref_does_not_invent_work_or_live(self):
assert listed["is_active"] is True
assert listed["live"] is False
assert listed["metadata"]["work_ids"] == []
assert listed["metadata"]["work_results"] == {}

def test_is_active_alone_is_not_live(self):
"""Dashboard recency (is_active) is not live."""
from hermes_state import SessionDB

db = SessionDB()
Expand All @@ -522,9 +528,67 @@ def test_is_active_alone_is_not_live(self):
assert listed["is_active"] is True
assert listed["live"] is False
assert listed["metadata"]["work_ids"] == []
assert listed["metadata"]["work_results"] == {}
detail = self.client.get("/api/sessions/active-only").json()
assert detail["live"] is False
assert detail["metadata"]["work_ids"] == []
assert detail["metadata"]["work_results"] == {}

def test_mark_terminal_appears_on_get_for_that_work_ref_only(self):
from hermes_state import SessionDB

db = SessionDB()
try:
db.create_session(session_id="wake-two", source="cli")
finally:
db.close()

first = self.client.post(
"/api/sessions/wake-two/prompt",
json={"work_ref": "card-1"},
)
second = self.client.post(
"/api/sessions/wake-two/prompt",
json={"work_ref": "card-2"},
)
assert first.status_code == 200
assert second.status_code == 200

db = SessionDB()
try:
assert db.mark_session_work("wake-two", "card-1", "completed") is True
finally:
db.close()

expected_ids = ["card-1", "card-2"]
expected_results = {"card-1": {"status": "completed"}}

listed = next(
s for s in self.client.get("/api/sessions").json()["sessions"]
if s["id"] == "wake-two"
)
assert listed["live"] is True
assert listed["metadata"]["work_ids"] == expected_ids
assert listed["metadata"]["work_results"] == expected_results
assert "card-2" not in listed["metadata"]["work_results"]

detail = self.client.get("/api/sessions/wake-two").json()
assert detail["live"] is True
assert detail["metadata"]["work_ids"] == expected_ids
assert detail["metadata"]["work_results"] == expected_results

profile_listed = next(
s for s in self.client.get("/api/profiles/sessions").json()["sessions"]
if s["id"] == "wake-two"
)
assert profile_listed["live"] is True
assert profile_listed["metadata"]["work_ids"] == expected_ids
assert profile_listed["metadata"]["work_results"] == expected_results

profile_detail = self.client.get("/api/profiles/sessions/wake-two").json()
assert profile_detail["live"] is True
assert profile_detail["metadata"]["work_ids"] == expected_ids
assert profile_detail["metadata"]["work_results"] == expected_results

def test_rename_response_omits_archived_when_not_set(self):
"""Title-only PATCH keeps its legacy {ok, title} response shape."""
Expand Down
Loading
Loading