nexforge-cli 0.2.2__tar.gz → 0.2.3__tar.gz

{nexforge_cli-0.2.2 → nexforge_cli-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nexforge-cli
-Version: 0.2.2
+Version: 0.2.3
 Summary: NexForgeCLI — 一个面向 DeepSeek V4 的终端智能体(TUI + CLI 双模式)
 Project-URL: Homepage, https://gitee.com/Lighthorn/nexforgecli
 Author: NexForge

{nexforge_cli-0.2.2 → nexforge_cli-0.2.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "nexforge-cli"
-version = "0.2.2"
+version = "0.2.3"
 description = "NexForgeCLI — 一个面向 DeepSeek V4 的终端智能体(TUI + CLI 双模式)"
 readme = "README.md"
 requires-python = ">=3.11"

{nexforge_cli-0.2.2 → nexforge_cli-0.2.3}/src/nexforge/ui/screens/chat.py

@@ -100,6 +100,7 @@ class ChatScreen(Screen):
         self._session_name: str = ""
         self._follow: bool = True  # 流式时自动跟底,用户上滚后暂停
         self._scroll_pending: bool = False  # 滚动节流:同一刷新周期只排一次
+        self._scroll_safety_active: bool = False  # 安全定时器防重
         self._agent_running: bool = False
 
     @property
@@ -320,9 +321,6 @@ class ChatScreen(Screen):
         else:
             self._note(f"未知命令:{text}(/help 查看)", error=True)
         self._refresh_status()
-        # 延迟滚动:等 SystemNote 被 call_later 挂载完成后再滚底
-        log = self._log
-        self.set_timer(0.15, lambda: log.scroll_end(animate=False))
 
     # ---- Agent 事件流 -----------------------------------------------------
 
@@ -402,9 +400,19 @@ class ChatScreen(Screen):
 
             def _do() -> None:
                 self._scroll_pending = False
+                self._scroll_safety_active = False
                 log.scroll_end(animate=False)
 
             self.call_after_refresh(_do)
+            # 安全超时:如果回调500ms后仍未执行(可能因widget移除被丢弃),强制复位
+            if not self._scroll_safety_active:
+                self._scroll_safety_active = True
+                self.set_timer(0.5, self._reset_scroll_safety)
+
+    def _reset_scroll_safety(self) -> None:
+        """安全定时器回调:强制复位 flags。"""
+        self._scroll_pending = False
+        self._scroll_safety_active = False
 
     def _set_follow(self, on: bool) -> None:
         """on=True 时强制滚到底(新回合/回底键);on=False 不做事。
@@ -416,6 +424,15 @@ class ChatScreen(Screen):
                 self.call_after_refresh(lambda: log.scroll_end(animate=False))
             except Exception:
                 pass
+        """on=True 时强制滚到底(新回合/回底键);on=False 不做事。
+        不再用 anchor(),避免与鼠标拖动拉锄导致卡死。"""
+        self._follow = on
+        if on:
+            try:
+                log = self._log
+                self.call_after_refresh(lambda: log.scroll_end(animate=False))
+            except Exception:
+                pass
 
     def _note(self, text: str, *, error: bool = False, scroll: bool = False) -> None:
         if scroll:

{nexforge_cli-0.2.2 → nexforge_cli-0.2.3}/src/nexforge/ui/widgets/messages.py

@@ -1,134 +1,139 @@
-"""消息组件:用户消息、助手回合(思考面板 + Markdown 正文)、工具卡片、系统提示。"""
-
-from __future__ import annotations
-
-from rich.markup import escape
-from textual.app import ComposeResult
-from textual.containers import Vertical
-from textual.widgets import Collapsible, Static
-from rich.markdown import Markdown as RichMarkdown
-
-
-class SystemNote(Static):
-    """系统 / 错误提示行。"""
-
-    def __init__(self, text: str, *, error: bool = False) -> None:
-        from nexforge.icons import icon
-
-        sym = icon("err") if error else icon("running")
-        color = "red" if error else "#22D3EE"
-        super().__init__(f"[{color}]{sym}[/] {escape(text).replace("]", r"]")}")
-
-
-class UserMessage(Static):
-    def __init__(self, text: str) -> None:
-        from nexforge.icons import icon
-
-        super().__init__(f"[b #6D5EF5]{icon('user')}[/] {escape(text).replace("]", r"]")}")
-
-
-class ToolCard(Static):
-    """一次工具调用:执行中 → 完成(✔/✖)。"""
-
-    def __init__(self, preview: str, icon_name: str = "running") -> None:
-        super().__init__()
-        self._preview = preview
-        self._icon = icon_name
-
-    def on_mount(self) -> None:
-        from nexforge.icons import icon
-
-        ic = icon(self._icon)
-        self.update(f"[#22D3EE]{ic}[/] {escape(self._preview).replace("]", r"]")}  [dim]执行中…[/]")
-
-    def set_result(self, ok: bool, summary: str) -> None:
-        from nexforge.icons import icon
-
-        mark = icon("ok") if ok else icon("err")
-        color = "green" if ok else "red"
-        self.update(
-            f"[{color}]{mark}[/] [#22D3EE]{escape(self._preview).replace("]", r"]")}[/] "
-            f"[dim]{escape(summary).replace("]", r"]")}[/]"
-        )
-
-
-class AssistantTurn(Vertical):
-    """一轮助手输出:可折叠思考面板 + Markdown 正文。"""
-
-    def __init__(self, initial_content: str = "") -> None:
-        super().__init__()
-        self._reasoning = ""
-        self._content = initial_content
-        self._collapsed_once = False
-        self._body: Static | None = None  # 思考面板引用缓存
-        self._txt: Static | None = None   # 正文引用缓存
-
-    def compose(self) -> ComposeResult:
-        import re
-        from nexforge.icons import icon
-        from rich.markup import escape as rich_escape
-
-        with Collapsible(title=f"{icon('thinking')} 思考", collapsed=False, id="think"):
-            yield Static("", id="reasoning-body")
-        # 流式时用 Static 快速渲染(避免每 token 全量 Markdown 解析变慢)
-        init = re.sub(r"\n{3,}", "\n\n", self._content).lstrip("\n")
-        yield Static(rich_escape(init), id="content-txt")
-
-    def on_mount(self) -> None:
-        # 未产生思考内容前隐藏思考面板
-        self.query_one("#think", Collapsible).display = False
-
-    def add_reasoning(self, text: str) -> None:
-        self._reasoning += text
-        panel = self.query_one("#think", Collapsible)
-        if not panel.display:
-            panel.display = True
-        if self._body is None:
-            self._body = self.query_one("#reasoning-body", Static)
-        self._body.update(self._reasoning)
-        # 思考面板的 Contents 有 overflow-y:auto,每次更新后滚到底
-        try:
-            contents = panel.query_one("Contents")
-            contents.scroll_end(animate=False)
-        except Exception:
-            pass
-
-    def add_content(self, text: str) -> None:
-        # 正文开始 → 折叠思考面板
-        if not self._collapsed_once and self._reasoning:
-            self.query_one("#think", Collapsible).collapsed = True
-            self._collapsed_once = True
-        self._content += text
-        from rich.markup import escape as rich_escape
-        if self._txt is None:
-            self._txt = self.query_one("#content-txt", Static)
-        self._txt.update(rich_escape(self._content))
-
-    def finalize_content(self) -> None:
-        """回合结束:用 Rich Markdown 渲染到 Static(无 Textual Markdown bug)。"""
-        import re
-        try:
-            self.query_one("#content-txt", Static).remove()
-        except Exception:
-            pass
-        try:
-            self.query_one("#think", Collapsible).remove()
-        except Exception:
-            pass
-        normalized = re.sub(r"\n{3,}", "\n\n", self._content).strip("\n")
-        rich_md = RichMarkdown(normalized)
-        self.mount(Static(rich_md, id="content-rt"))
-        self._scroll_to_end()
-
-    def _scroll_to_end(self) -> None:
-        """精确找到 #chat-log 并滚到底。"""
-        try:
-            from textual.containers import VerticalScroll
-            log = self.app.query_one("#chat-log", VerticalScroll)
-            log.scroll_end(animate=False)
-        except Exception:
-            pass
-
-    @property
-    def is_empty(self) -> bool:
-        return not self._reasoning and not self._content
+"""消息组件:用户消息、助手回合(思考面板 + Markdown 正文)、工具卡片、系统提示。"""
+
+from __future__ import annotations
+
+from rich.markup import escape
+from textual.app import ComposeResult
+from textual.containers import Vertical
+from textual.widgets import Collapsible, Static
+from rich.markdown import Markdown as RichMarkdown
+
+
+def _esc(text: str) -> str:
+    """Rich markup safe escape: [ -> \\[  , ] -> \\]."""
+    return escape(text).replace("]", r"\]")
+
+
+class SystemNote(Static):
+    """系统 / 错误提示行。"""
+
+    def __init__(self, text: str, *, error: bool = False) -> None:
+        from nexforge.icons import icon
+
+        sym = icon("err") if error else icon("running")
+        color = "red" if error else "#22D3EE"
+        super().__init__(f"[{color}]{sym}[/] {_esc(text)}")
+
+
+class UserMessage(Static):
+    def __init__(self, text: str) -> None:
+        from nexforge.icons import icon
+
+        super().__init__(f"[b #6D5EF5]{icon('user')}[/] {_esc(text)}")
+
+
+class ToolCard(Static):
+    """一次工具调用:执行中 → 完成(✔/✖)。"""
+
+    def __init__(self, preview: str, icon_name: str = "running") -> None:
+        super().__init__()
+        self._preview = preview
+        self._icon = icon_name
+
+    def on_mount(self) -> None:
+        from nexforge.icons import icon
+
+        ic = icon(self._icon)
+        self.update(f"[#22D3EE]{ic}[/] {_esc(self._preview)}  [dim]执行中…[/]")
+
+    def set_result(self, ok: bool, summary: str) -> None:
+        from nexforge.icons import icon
+
+        mark = icon("ok") if ok else icon("err")
+        color = "green" if ok else "red"
+        self.update(
+            f"[{color}]{mark}[/] [#22D3EE]{_esc(self._preview)}[/] "
+            f"[dim]{_esc(summary)}[/]"
+        )
+
+
+class AssistantTurn(Vertical):
+    """一轮助手输出:可折叠思考面板 + Markdown 正文。"""
+
+    def __init__(self, initial_content: str = "") -> None:
+        super().__init__()
+        self._reasoning = ""
+        self._content = initial_content
+        self._collapsed_once = False
+        self._body: Static | None = None  # 思考面板引用缓存
+        self._txt: Static | None = None   # 正文引用缓存
+
+    def compose(self) -> ComposeResult:
+        import re
+        from nexforge.icons import icon
+        from rich.markup import escape as rich_escape
+
+        with Collapsible(title=f"{icon('thinking')} 思考", collapsed=False, id="think"):
+            yield Static("", id="reasoning-body")
+        # 流式时用 Static 快速渲染(避免每 token 全量 Markdown 解析变慢)
+        init = re.sub(r"\n{3,}", "\n\n", self._content).lstrip("\n")
+        yield Static(rich_escape(init), id="content-txt")
+
+    def on_mount(self) -> None:
+        # 未产生思考内容前隐藏思考面板
+        self.query_one("#think", Collapsible).display = False
+
+    def add_reasoning(self, text: str) -> None:
+        self._reasoning += text
+        panel = self.query_one("#think", Collapsible)
+        if not panel.display:
+            panel.display = True
+        if self._body is None:
+            self._body = self.query_one("#reasoning-body", Static)
+        self._body.update(self._reasoning)
+        # 思考面板的 Contents 有 overflow-y:auto,每次更新后滚到底
+        try:
+            contents = panel.query_one("Contents")
+            contents.scroll_end(animate=False)
+        except Exception:
+            pass
+
+    def add_content(self, text: str) -> None:
+        # 正文开始 → 折叠思考面板
+        if not self._collapsed_once and self._reasoning:
+            self.query_one("#think", Collapsible).collapsed = True
+            self._collapsed_once = True
+        self._content += text
+        from rich.markup import escape as rich_escape
+        if self._txt is None:
+            self._txt = self.query_one("#content-txt", Static)
+        self._txt.update(rich_escape(self._content))
+
+    def finalize_content(self) -> None:
+        """回合结束:用 Rich Markdown 渲染到 Static(无 Textual Markdown bug)。"""
+        import re
+        try:
+            self.query_one("#content-txt", Static).remove()
+        except Exception:
+            pass
+        try:
+            self.query_one("#think", Collapsible).remove()
+        except Exception:
+            pass
+        normalized = re.sub(r"\n{3,}", "\n\n", self._content).strip("\n")
+        rich_md = RichMarkdown(normalized)
+        self.mount(Static(rich_md, id="content-rt"))
+        self._scroll_to_end()
+
+    def _scroll_to_end(self) -> None:
+        """精确找到 #chat-log 并滚到底。"""
+        try:
+            from textual.containers import VerticalScroll
+            log = self.app.query_one("#chat-log", VerticalScroll)
+            log.scroll_end(animate=False)
+        except Exception:
+            pass
+
+    @property
+    def is_empty(self) -> bool:
+        return not self._reasoning and not self._content