cctally 1.35.0 → 1.36.0

package/CHANGELOG.md

@@ -5,6 +5,11 @@ based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 
 ## [Unreleased]
 
+## [1.36.0] - 2026-06-11
+
+### Added
+- Conversation viewer: AskUserQuestion, TodoWrite, and ExitPlanMode now render as dedicated cards — the question-and-chosen-answer, a live checklist with progress, and the rendered plan with its approve/reject outcome — instead of raw JSON tool chips (#177 S2).
+
 ## [1.35.0] - 2026-06-11
 
 ### Added

package/bin/_lib_conversation.py

@@ -104,6 +104,7 @@ def _normalize(obj, t, offset):
     elif any(b["kind"] == "tool_result" for b in blocks):
         entry_type = TOOL_RESULT
         _attach_subagent_result(blocks, obj)   # #166: record-level toolUseResult
+        _attach_ask_answers(blocks, obj)       # #177 S2: AskUserQuestion answers
         # tool_result rows are stored but NOT indexed as prose (spec §2). A
         # user line that mixes a text block with a tool_result block must not
         # leak that text into the FTS index; the full content stays in
@@ -249,6 +250,43 @@ def _attach_subagent_result(blocks, obj):
         block["subagent_meta"] = meta
 
 
+def _attach_ask_answers(blocks, obj):
+    """Stash an AskUserQuestion's structured answers (+ annotations) onto its
+    single tool_result block (#177 S2), so the chosen option(s) have a robust
+    source the client can highlight without parsing the harness result string.
+    Self-identifying: fires only when toolUseResult carries an ``answers`` dict
+    (a key distinctive to AskUserQuestion), so no cross-record tool-name lookup
+    is needed. Same exactly-one-result-block guard as _attach_subagent_result.
+
+    answers/annotations are BOUNDED through _bound_input before storage — a
+    free-form "Other" answer or a long annotation note is attacker-controlled
+    free text, and every other free-text payload in this parser is capped
+    before it reaches blocks_json. Reusing _bound_input applies the same
+    five-axis cap (leaf/key/node/depth/total). The bound's truncation flag is
+    intentionally NOT surfaced (no answer-level "truncated" affordance — a
+    >8000-char option answer is not a realistic shape; the cap is a backstop).
+
+    An EMPTY answers dict is treated as no-capture (symmetric with the empty-
+    annotations drop below): emitting ``ask_answers={}`` would set a falsy
+    ``answers`` on the tool_call and suppress the client's result-text
+    fallback, so a degenerate empty payload must no-op here instead."""
+    tur = obj.get("toolUseResult")
+    if not isinstance(tur, dict):
+        return
+    answers = tur.get("answers")
+    if not isinstance(answers, dict) or not answers:   # require a non-empty dict
+        return
+    results = [b for b in blocks if b.get("kind") == "tool_result"]
+    if len(results) != 1:
+        return
+    bounded_ans, _ = _bound_input(answers)
+    results[0]["ask_answers"] = bounded_ans
+    anno = tur.get("annotations")
+    if isinstance(anno, dict) and anno:
+        bounded_anno, _ = _bound_input(anno)
+        results[0]["ask_annotations"] = bounded_anno
+
+
 def _stringify(c):
     if isinstance(c, str):
         return c

package/bin/_lib_conversation_query.py

@@ -483,6 +483,7 @@ def get_conversation(conn, session_id, *, after=None, limit=500):
     # spawn tool_use id <-> tool_result tool_use_id; agent_id == subagent_key.
     spawn_kind = {}     # tool_use id -> subagent_type
     agent_link = {}     # tool_use id -> (agent_id, raw_meta)
+    ask_link = {}       # tool_use id -> (answers, annotations)  (#177 S2)
     for it in items:
         for b in it["blocks"]:
             k = b.get("kind")
@@ -495,6 +496,10 @@ def get_conversation(conn, session_id, *, after=None, limit=500):
                 meta = b.pop("subagent_meta", None)
                 if aid and b.get("tool_use_id") is not None:
                     agent_link[b["tool_use_id"]] = (aid, meta or {})
+                ans = b.pop("ask_answers", None)            # #177 S2
+                anno = b.pop("ask_annotations", None)
+                if ans is not None and b.get("tool_use_id") is not None:
+                    ask_link[b["tool_use_id"]] = (ans, anno)
     subagent_meta = {}
     for _tuid, _kind in spawn_kind.items():
         _link = agent_link.get(_tuid)
@@ -553,6 +558,11 @@ def get_conversation(conn, session_id, *, after=None, limit=500):
                     b["kind"] = "tool_call"
                     b["tool_use_id"] = b.pop("id", None)
                     b.setdefault("result", None)
+                    link = ask_link.get(b["tool_use_id"])   # #177 S2
+                    if link is not None:
+                        b["answers"] = link[0]
+                        if link[1]:
+                            b["annotations"] = link[1]
 
     # ---- Phase 4: classify injected meta items (skill / command / context) ----
     # `meta` rows (the parser's isMeta classification) AND — only while the 005