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

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

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

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

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

{nexforge_cli-0.2.3 → nexforge_cli-0.2.5}/src/nexforge/core/session.py

@@ -31,6 +31,15 @@ class Session:
             self.messages.append({"role": "system", "content": self.system_prompt})
 
     def add_user(self, text: str) -> None:
+        # 中断恢复:若上一条 assistant 有未完成 tool_calls,补 tool 错误
+        if self.messages and self.messages[-1].get("role") == "assistant":
+            pending = self.messages[-1].get("tool_calls", [])
+            for tc in pending:
+                self.messages.append({
+                    "role": "tool",
+                    "tool_call_id": tc.get("id", ""),
+                    "content": "已取消(用户中断)。",
+                })
         self.messages.append({"role": "user", "content": text})
 
     def add_assistant(self, msg: AssistantMessage) -> None:

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

@@ -2,16 +2,11 @@
 
 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"\]")
+from rich.text import Text
 
 
 class SystemNote(Static):
@@ -22,14 +17,20 @@ class SystemNote(Static):
 
         sym = icon("err") if error else icon("running")
         color = "red" if error else "#22D3EE"
-        super().__init__(f"[{color}]{sym}[/] {_esc(text)}")
+        t = Text()
+        t.append(f"{sym} ", style=color)
+        t.append(text)
+        super().__init__(t)
 
 
 class UserMessage(Static):
     def __init__(self, text: str) -> None:
         from nexforge.icons import icon
 
-        super().__init__(f"[b #6D5EF5]{icon('user')}[/] {_esc(text)}")
+        t = Text()
+        t.append(f"{icon('user')} ", style="bold #6D5EF5")
+        t.append(text)
+        super().__init__(t)
 
 
 class ToolCard(Static):
@@ -44,17 +45,22 @@ class ToolCard(Static):
         from nexforge.icons import icon
 
         ic = icon(self._icon)
-        self.update(f"[#22D3EE]{ic}[/] {_esc(self._preview)}  [dim]执行中…[/]")
+        t = Text()
+        t.append(f"{ic} ", style="#22D3EE")
+        t.append(self._preview)
+        t.append("  执行…", style="dim")
+        self.update(t)
 
     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)}[/]"
-        )
+        t = Text()
+        t.append(f"{mark} ", style=color)
+        t.append(f"{self._preview} ", style="#22D3EE")
+        t.append(summary, style="dim")
+        self.update(t)
 
 
 class AssistantTurn(Vertical):