synapse-cli-agent 0.1.28__tar.gz → 0.1.29__tar.gz

{synapse_cli_agent-0.1.28 → synapse_cli_agent-0.1.29}/CHANGELOG.md

@@ -7,6 +7,26 @@ The release workflow automatically extracts the matching section as release note
 
 ---
 
+## v0.1.29
+
+### 新增功能
+
+- TUI 图片查看器：点击 transcript 中的图片可在模态窗口中放大查看，修复点击事件在模态栈切换时的误关闭问题。
+- TUI Mermaid 渲染优化：Mermaid 图片在后台线程渲染，渲染期间显示占位提示，避免原生渲染阻塞事件循环。
+- 后台会话结束时通知前台会话；跨事件边界携带取消原因。
+
+### 修复
+
+- 修复图片查看器点击关闭时可能移除默认 screen 并抛出 ScreenStackError 的问题。
+- 修复会话切换时 Mermaid 占位渲染的竞态，渲染结果仅在仍处于当前世代且已挂载时替换。
+
+### 工程改进
+
+- synapse-core-tool 原生扩展发布 0.1.2（修复 pyproject.toml 版本未同步导致的 PyPI 上传失败）。
+- 新增 `make_mermaid_widget_from_png`，将 PNG 渲染与 widget 构建解耦，明确 UI 线程边界。
+
+---
+
 ## v0.1.28
 
 ### 新增功能

{synapse_cli_agent-0.1.28 → synapse_cli_agent-0.1.29}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: synapse-cli-agent
-Version: 0.1.28
+Version: 0.1.29
 Summary: Local coding agent built on LangChain Deep Agents (LocalShell, no sandbox)
 Project-URL: Homepage, https://github.com/alex8224/synapse-agent
 Project-URL: Repository, https://github.com/alex8224/synapse-agent
@@ -208,6 +208,7 @@ Requires-Dist: langchain==1.3.14
 Requires-Dist: langgraph-checkpoint-sqlite==3.1.0
 Requires-Dist: langgraph==1.2.9
 Requires-Dist: mcp==1.28.1
+Requires-Dist: mmdr==0.3.0
 Requires-Dist: pydantic-settings==2.14.2
 Requires-Dist: python-dotenv==1.2.2
 Requires-Dist: rich==15.0.0

{synapse_cli_agent-0.1.28 → synapse_cli_agent-0.1.29}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "synapse-cli-agent"
-version = "0.1.28"
+version = "0.1.29"
 description = "Local coding agent built on LangChain Deep Agents (LocalShell, no sandbox)"
 readme = "README.md"
 license = { file = "LICENSE" }
@@ -20,6 +20,7 @@ dependencies = [
     "langgraph==1.2.9",
     "langgraph-checkpoint-sqlite==3.1.0",
     "mcp==1.28.1",
+    "mmdr==0.3.0",
     "pydantic-settings==2.14.2",
     "python-dotenv==1.2.2",
     "rich==15.0.0",

synapse_cli_agent-0.1.29/release_body.md

@@ -0,0 +1,19 @@
+## v0.1.29
+
+### 新增功能
+
+- TUI 图片查看器：点击 transcript 中的图片可在模态窗口中放大查看，修复点击事件在模态栈切换时的误关闭问题。
+- TUI Mermaid 渲染优化：Mermaid 图片在后台线程渲染，渲染期间显示占位提示，避免原生渲染阻塞事件循环。
+- 后台会话结束时通知前台会话；跨事件边界携带取消原因。
+
+### 修复
+
+- 修复图片查看器点击关闭时可能移除默认 screen 并抛出 ScreenStackError 的问题。
+- 修复会话切换时 Mermaid 占位渲染的竞态，渲染结果仅在仍处于当前世代且已挂载时替换。
+
+### 工程改进
+
+- synapse-core-tool 原生扩展发布 0.1.2（修复 pyproject.toml 版本未同步导致的 PyPI 上传失败）。
+- 新增 `make_mermaid_widget_from_png`，将 PNG 渲染与 widget 构建解耦，明确 UI 线程边界。
+
+---

{synapse_cli_agent-0.1.28 → synapse_cli_agent-0.1.29}/rust/synapse-core-tool/Cargo.lock

@@ -962,7 +962,7 @@ dependencies = [
 
 [[package]]
 name = "synapse-core-tool"
-version = "0.1.1"
+version = "0.1.2"
 dependencies = [
  "chardetng",
  "encoding_rs",

{synapse_cli_agent-0.1.28 → synapse_cli_agent-0.1.29}/rust/synapse-core-tool/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "synapse-core-tool"
-version = "0.1.1"
+version = "0.1.2"
 edition = "2021"
 rust-version = "1.80"
 license = "Apache-2.0"

{synapse_cli_agent-0.1.28 → synapse_cli_agent-0.1.29}/rust/synapse-core-tool/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "synapse-core-tool"
-version = "0.1.0"
+version = "0.1.2"
 description = "Native filesystem tools for Synapse"
 requires-python = ">=3.12"
 license = { text = "Apache-2.0" }

{synapse_cli_agent-0.1.28 → synapse_cli_agent-0.1.29}/src/synapse/observability/exit_trace.py

@@ -2,16 +2,13 @@
 
 Collects stage timings across the exit chain (Ctrl+C / ``/exit`` → Textual
 ``on_unmount`` → session/project teardown → ``asyncio.run`` executor join →
-atexit MCP/async-runtime close) and prints a report to **stderr** once the
-terminal has been restored, so the user can see exactly which stage is slow.
-
-Timing only starts when :func:`begin` is called (i.e. a real exit was
-requested); modules imported during tests never emit lines on their own.
+atexit MCP/async-runtime close).  The instrumentation (``begin``/``mark``/
+``span``) is kept, but the collected report is **no longer printed to stderr**:
+``duration`` and ``dump`` are no-ops kept only for call-site compatibility.
 """
 
 from __future__ import annotations
 
-import sys
 import threading
 import time
 from collections.abc import Iterator
@@ -75,38 +72,19 @@ class ExitTrace:
                 self.marks.append((name, since, step))
 
     def duration(self, name: str, started: float, **fields: Any) -> None:
-        """Emit one independent line for a late (atexit-phase) stage.
+        """No-op: exit stages are no longer reported to stderr.
 
-        Only prints after :meth:`begin` so plain test processes stay quiet.
-        ``started`` must be a ``time.perf_counter()`` value captured when the
-        stage began.
+        Kept so existing call sites (atexit MCP / async-runtime close) stay
+        untouched while the shutdown trace stays silent.
         """
-        with self._lock:
-            if not self._started:
-                return
-        elapsed = (time.perf_counter() - started) * 1000
-        suffix = " ".join(f"{key}={value}" for key, value in fields.items())
-        detail = f" {suffix}" if suffix else ""
-        print(
-            f"[exit-trace] thread={threading.current_thread().name} "
-            f"stage={name} elapsed_ms={elapsed:.1f}{detail}",
-            file=sys.stderr,
-        )
+        del name, started, fields
 
     def dump(self, *, header: str = "exit-trace") -> None:
-        """Print the accumulated stage report (call after the terminal is up)."""
-        with self._lock:
-            if not self._started or not self.marks or self.t0 is None:
-                return
-            marks = list(self.marks)
-            total = (time.perf_counter() - self.t0) * 1000
-        print(f"[{header}] total={total:.1f}ms stages={len(marks)}", file=sys.stderr)
-        for name, since, step in sorted(marks, key=lambda x: x[1]):
-            print(f"  +{step:8.1f}ms  @{since:8.1f}ms  {name}", file=sys.stderr)
-        top = sorted(marks, key=lambda x: x[2], reverse=True)[:10]
-        print(f"[{header}] top stages:", file=sys.stderr)
-        for name, _since, step in top:
-            print(f"  {step:8.1f}ms  {name}", file=sys.stderr)
+        """No-op: the accumulated stage report is no longer printed.
+
+        Kept for call-site compatibility (``tui_launch`` teardown).
+        """
+        del header
 
 
 EXIT_TRACE = ExitTrace()

{synapse_cli_agent-0.1.28 → synapse_cli_agent-0.1.29}/src/synapse/runtime/agent_loop/model.py

@@ -9,6 +9,8 @@ from dataclasses import dataclass, field
 from enum import StrEnum
 from typing import TYPE_CHECKING, Any
 
+from synapse.runtime.cancellation import mark_cancel_event
+
 if TYPE_CHECKING:
     from synapse.runtime.agent_loop.request import TurnRequest
 
@@ -50,6 +52,10 @@ class CancelToken:
             if self._event.is_set():
                 return False
             self._reason = str(reason or "user")
+            # ``stream_agent`` accepts a plain threading.Event for compatibility.
+            # Attach the origin before setting it so the parser can distinguish
+            # user ESC from lifecycle/goal cancellation without changing that API.
+            mark_cancel_event(self._event, self._reason)
             self._event.set()
             return True
 

{synapse_cli_agent-0.1.28 → synapse_cli_agent-0.1.29}/src/synapse/runtime/agent_loop/turn.py

@@ -244,7 +244,11 @@ class AgentTurnRuntime:
             last_ttft_s=result.last_ttft_s,
             last_rate_basis=result.last_rate_basis,
             compact_events=result.compact_events,
-            cancel_reason=token.reason if status is TurnStatus.CANCELLED else None,
+            cancel_reason=(
+                token.reason or result.cancel_reason
+                if status is TurnStatus.CANCELLED
+                else None
+            ),
         )
 
 

synapse_cli_agent-0.1.29/src/synapse/runtime/cancellation.py

@@ -0,0 +1,24 @@
+"""Cancellation metadata shared across runtime compatibility boundaries."""
+
+from __future__ import annotations
+
+import threading
+
+_CANCEL_REASON_ATTR = "_synapse_cancel_reason"
+
+
+def mark_cancel_event(event: threading.Event, reason: str) -> None:
+    """Attach a cancellation origin before setting a compatibility event."""
+    try:
+        setattr(event, _CANCEL_REASON_ATTR, reason)
+    except (AttributeError, TypeError):
+        # Some Event-compatible implementations may reject custom attributes.
+        pass
+
+
+def cancel_reason_from_event(event: threading.Event | None) -> str | None:
+    """Return Synapse cancellation metadata attached to a thread event."""
+    if event is None:
+        return None
+    reason = getattr(event, _CANCEL_REASON_ATTR, None)
+    return str(reason) if reason else None

{synapse_cli_agent-0.1.28 → synapse_cli_agent-0.1.29}/src/synapse/runtime/streaming/parser.py

@@ -17,6 +17,7 @@ import time
 from collections.abc import Callable
 from typing import Any
 
+from synapse.runtime.cancellation import cancel_reason_from_event
 from synapse.runtime.context_compact import (
     is_context_compact_text,
     is_lc_summarization_message,
@@ -808,6 +809,7 @@ def stream_agent(
         except Exception:  # noqa: BLE001
             interrupted = False
 
+    cancel_reason = cancel_reason_from_event(cancel_event) if cancelled else None
     result = StreamResult(
         state=final,
         final_text=final_text if not interrupted else (final_text or ""),
@@ -826,6 +828,7 @@ def stream_agent(
         last_ttft_s=last_ttft_s,
         last_rate_basis=last_rate_basis,
         cancelled=cancelled,
+        cancel_reason=cancel_reason,
         interrupted=interrupted,
         compact_events=compact_events,
     )
@@ -834,7 +837,7 @@ def stream_agent(
         try:
             from synapse.sessions.cancel_repair import repair_thread_after_cancel
 
-            repair_thread_after_cancel(agent, run_config)
+            repair_thread_after_cancel(agent, run_config, reason=cancel_reason)
         except Exception:  # noqa: BLE001
             pass
     elif interrupted:

{synapse_cli_agent-0.1.28 → synapse_cli_agent-0.1.29}/src/synapse/runtime/streaming/stream_events.py

@@ -215,7 +215,8 @@ class StreamResult:
     last_output_tokens_per_second: float | None = None
     last_ttft_s: float | None = None
     last_rate_basis: str = "end_to_end"
-    cancelled: bool = False  # user abort (ESC / cancel_event)
+    cancelled: bool = False  # turn aborted through cancel_event
+    cancel_reason: str | None = None  # user / goal_pause / shutdown / unknown
     interrupted: bool = False  # graph paused for HITL approval
     compact_events: int = 0  # context-compaction summaries hidden from UI
 def _chunk_text(msg_chunk: Any) -> str:

{synapse_cli_agent-0.1.28 → synapse_cli_agent-0.1.29}/src/synapse/sessions/cancel_repair.py

@@ -1,4 +1,4 @@
-"""Keep multi-turn context continuous after user cancel (ESC).
+"""Keep multi-turn context continuous after a turn is cancelled.
 
 Hard-stopping astream can leave the LangGraph checkpoint with:
 - AIMessage.tool_calls without matching ToolMessage
@@ -93,7 +93,16 @@ def _answered_tool_ids(messages: list[Any]) -> set[str]:
     return done
 
 
-def _pending_tool_seals(messages: list[Any]) -> list[Any]:
+def _is_user_cancel(reason: str | None) -> bool:
+    """Treat unannotated legacy cancel events as user cancellation."""
+    return reason in {None, "user"}
+
+
+def _cancelled_tool_content(reason: str | None) -> str:
+    return "[cancelled by user]" if _is_user_cancel(reason) else "[cancelled]"
+
+
+def _pending_tool_seals(messages: list[Any], *, reason: str | None) -> list[Any]:
     from langchain_core.messages import ToolMessage
 
     answered = _answered_tool_ids(messages)
@@ -105,7 +114,7 @@ def _pending_tool_seals(messages: list[Any]) -> list[Any]:
                 continue
             seals.append(
                 ToolMessage(
-                    content="[cancelled by user]",
+                    content=_cancelled_tool_content(reason),
                     tool_call_id=cid,
                     name=_tool_call_name(call),
                     status="error",
@@ -120,6 +129,9 @@ def _needs_cancel_note(messages: list[Any]) -> bool:
         return False
     last = messages[-1]
     content = str(getattr(last, "content", "") or "")
+    additional_kwargs = getattr(last, "additional_kwargs", None) or {}
+    if additional_kwargs.get("synapse_cancel_boundary"):
+        return False
     low = content.casefold()
     if _is_ai_msg(last) and not (getattr(last, "tool_calls", None) or []):
         if "cancelled" in low or "终止" in content:
@@ -133,7 +145,12 @@ def _needs_cancel_note(messages: list[Any]) -> bool:
     return True
 
 
-def repair_thread_after_cancel(agent: Any, config: dict[str, Any]) -> list[str]:
+def repair_thread_after_cancel(
+    agent: Any,
+    config: dict[str, Any],
+    *,
+    reason: str | None = None,
+) -> list[str]:
     """Seal a cancelled turn so the same thread_id remains continuous.
 
     Returns short status notes for logs/UI (never raises).
@@ -158,7 +175,7 @@ def repair_thread_after_cancel(agent: Any, config: dict[str, Any]) -> list[str]:
     next_nodes = tuple(str(x) for x in (getattr(snap, "next", None) or ()))
 
     try:
-        seals = _pending_tool_seals(messages)
+        seals = _pending_tool_seals(messages, reason=reason)
         if seals:
             tools_node = _pick_tools_node(nodes, next_nodes)
             if tools_node:
@@ -175,7 +192,17 @@ def repair_thread_after_cancel(agent: Any, config: dict[str, Any]) -> list[str]:
         if _needs_cancel_note(messages):
             from langchain_core.messages import AIMessage
 
-            note = AIMessage(content="[本轮已由用户终止，上下文已保留]")
+            # Lifecycle cancellation still needs a graph boundary, but must not
+            # surface as a fabricated user action in the transcript.
+            note = AIMessage(
+                content=(
+                    "[本轮已由用户终止，上下文已保留]" if _is_user_cancel(reason) else ""
+                ),
+                additional_kwargs={
+                    "synapse_cancel_boundary": True,
+                    "synapse_cancel_reason": reason or "legacy_user",
+                },
+            )
             model_node = _pick_model_node(nodes, next_nodes)
             if model_node and next_nodes:
                 try:
@@ -205,4 +232,4 @@ def repair_thread_after_cancel(agent: Any, config: dict[str, Any]) -> list[str]:
             notes.append("checkpoint ready for next turn")
     except Exception as exc:  # noqa: BLE001
         notes.append(f"cancel seal error: {exc}")
-    return notes
+    return notes

{synapse_cli_agent-0.1.28 → synapse_cli_agent-0.1.29}/src/synapse/ui/image_viewer.py

@@ -90,7 +90,12 @@ class ImageViewerScreen(ModalScreen[None]):
 
     def on_click(self, event: Click) -> None:
         del event
-        self.dismiss()
+        # The click that opened this modal can continue propagating after the
+        # app pushes us onto the stack. Only dismiss a viewer that is still
+        # the active screen; otherwise pop_screen() could remove the default
+        # screen and raise ScreenStackError.
+        if self.is_active:
+            self.dismiss()
 
 
 __all__ = [

synapse_cli_agent-0.1.29/src/synapse/ui/mermaid_image.py

@@ -0,0 +1,148 @@
+"""Mermaid fences -> mmdr PNG -> textual-image widgets for sealed answers.
+
+Mirrors ``synapse.ui.math_image``: the optional native ``mmdr`` extension
+renders mermaid source to PNG, and a protocol-aware widget displays it when the
+terminal supports a true pixel protocol (sixel / kitty TGP).
+
+Half-cell and unicode renderers are deliberately excluded: a mermaid graph
+drawn as half-block characters is illegible, so those terminals fall back to
+the termaid ASCII renderer (``_MermaidCodeBlock``) instead.
+"""
+
+from __future__ import annotations
+
+import io
+import re
+from dataclasses import dataclass
+from typing import Any, Literal
+
+from synapse.ui.image_render import active_renderer_name, make_pil_image_widget
+from synapse.ui.rendering import render_mermaid_png
+
+_MERMAID_MAX_COLS = 100
+_MERMAID_MAX_ROWS = 40
+_MAX_MERMAID_FENCES_PER_ANSWER = 24
+
+# True pixel protocols only; halfcell/unicode intentionally excluded.
+_PIXEL_RENDERERS = frozenset({"tgp", "tgpimage", "sixel", "sixelimage"})
+
+# Fenced block whose info string names mermaid / mmd (case-insensitive).
+_FENCE_RE = re.compile(
+    r"(?ms)^ {0,3}(`{3,}|~{3,})(?i:\s*(mermaid|mmd)\b)[^\n]*\n(.*?)^ {0,3}\1[ \t]*(?:\n|$)"
+)
+
+
+@dataclass(frozen=True)
+class MermaidSegment:
+    kind: Literal["markdown", "mermaid"]
+    source: str
+
+
+@dataclass(frozen=True, slots=True)
+class MermaidImageAttachment:
+    """Synthetic image attachment consumed by the shared image viewer."""
+
+    data: bytes
+    mime: str = "image/png"
+    name: str = "mermaid-diagram.png"
+    source: str = "mermaid"
+
+
+def split_mermaid_fences(
+    text: str, *, max_fences: int = _MAX_MERMAID_FENCES_PER_ANSWER
+) -> list[MermaidSegment]:
+    """Split mermaid fenced blocks from Markdown, preserving everything else."""
+    source = text or ""
+    segments: list[MermaidSegment] = []
+    cursor = 0
+    fences = 0
+    for match in _FENCE_RE.finditer(source):
+        if fences >= max(0, int(max_fences)):
+            break
+        if match.start() > cursor:
+            segments.append(MermaidSegment("markdown", source[cursor : match.start()]))
+        segments.append(MermaidSegment("mermaid", match.group(3).strip("\n")))
+        fences += 1
+        cursor = match.end()
+    if cursor < len(source):
+        segments.append(MermaidSegment("markdown", source[cursor:]))
+    return segments or [MermaidSegment("markdown", source)]
+
+
+def mermaid_pixel_renderer_active() -> bool:
+    """True when the terminal can display true pixel graphics for diagrams."""
+    return active_renderer_name().casefold() in _PIXEL_RENDERERS
+
+
+def make_mermaid_widget(source: str) -> Any | None:
+    """Build a protocol-aware image widget for one mermaid fence.
+
+    Returns ``None`` when mmdr is absent, the terminal has no pixel protocol
+    (half-cell / unicode -> callers fall back to termaid ASCII), or the render
+    fails. Mirrors ``math_image.make_math_widget``.
+    """
+    if not mermaid_pixel_renderer_active():
+        return None
+    png = render_mermaid_png(source)
+    if not png:
+        return None
+    return make_mermaid_widget_from_png(png)
+
+
+def make_mermaid_widget_from_png(png: bytes) -> Any | None:
+    """Build an image widget from already-rendered Mermaid PNG bytes.
+
+    Rendering may happen in a background worker, but Textual widgets must be
+    created on the UI thread. Keeping that boundary explicit prevents native
+    mmdr work from blocking the event loop.
+    """
+    try:
+        from PIL import Image as PILImage
+
+        image = PILImage.open(io.BytesIO(png))
+        image.load()
+        widget = make_pil_image_widget(
+            image,
+            max_cols=_MERMAID_MAX_COLS,
+            max_rows=_MERMAID_MAX_ROWS,
+        )
+        if widget is not None:
+            widget.add_class("mermaid-image")
+            # Reuse the transcript image click contract: CodingAgentApp walks
+            # ancestors for this class/metadata and opens ImageViewerScreen.
+            widget.add_class("transcript-image")
+            widget.image_attachment = MermaidImageAttachment(data=png)
+            # Keep consecutive diagrams visually distinct without doubling the
+            # gap above and below every image.
+            widget.styles.margin = (0, 0, 1, 0)
+        return widget
+    except Exception:  # noqa: BLE001 - malformed image/backend failure falls back
+        return None
+
+
+def mermaid_diagnostic() -> str:
+    """Single-line diagnostic: which backend renders mermaid right now."""
+    native = False
+    render_ok = False
+    try:
+        from synapse.ui.rendering import mmdr_available
+
+        native = mmdr_available()
+        render_ok = bool(render_mermaid_png("flowchart LR\n  A --> B"))
+    except Exception:  # noqa: BLE001 - optional native dependency
+        native = False
+    renderer = active_renderer_name()
+    uses_image = render_ok and mermaid_pixel_renderer_active()
+    mode = "mmdr-image" if uses_image else "termaid-ascii"
+    return f"mermaid={mode} | native={native} | render_ok={render_ok} | widget_renderer={renderer}"
+
+
+__all__ = [
+    "MermaidImageAttachment",
+    "MermaidSegment",
+    "make_mermaid_widget",
+    "make_mermaid_widget_from_png",
+    "mermaid_diagnostic",
+    "mermaid_pixel_renderer_active",
+    "split_mermaid_fences",
+]