travel-agent-cli 0.3.2 → 0.3.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "travel-agent-cli",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "AI 驱动的旅行目的地推荐 Agent - 命令行工具（集成 FlyAI 旅行搜索）",
   "bin": {
     "travel-agent": "bin/cli.js",

package/python/interactive.py

@@ -7,209 +7,103 @@
 import asyncio
 from textual.app import App, ComposeResult
 from textual.widgets import Header, Footer, Static, Input, RichLog
-from textual.containers import Container, Horizontal, Vertical
-from textual.screen import Screen
+from textual.containers import Container, Vertical
 from textual.binding import Binding
 from textual import work
-from rich.panel import Panel
+from textual.command import CommandPalette, Provider, Hit
+from textual.screen import Screen
 from rich.markdown import Markdown
 from rich.text import Text
+from rich.panel import Panel
 
 from main import run_command
 from config.settings import get_settings
 
 
-class ChatOutput(Static):
-    """聊天输出区域"""
-
-    def __init__(self):
-        super().__init__()
-        self.messages = []
-
-    def compose(self) -> ComposeResult:
-        yield Static(id="chat-content")
-
-    def add_message(self, role: str, content: str):
-        """添加消息到聊天记录"""
-        self.messages.append((role, content))
-        self._update_display()
-
-    def _update_display(self):
-        """更新显示内容"""
-        content_widget = self.query_one("#chat-content", Static)
-        lines = []
-
-        for role, content in self.messages:
-            if role == "user":
-                lines.append(f"[bold blue]> {content}[/bold blue]")
-            else:
-                lines.append(f"{content}")
-            lines.append("")
-
-        content_widget.update("\n".join(lines))
-
-
-class CommandPalette(Screen):
-    """命令选择面板（按 / 唤起）"""
+class CommandProvider(Provider):
+    """命令提供者 - 用于命令面板"""
+
+    @property
+    def commands(self) -> list[tuple[str, str, str]]:
+        return [
+            ("run", "运行完整工作流", "搜索关键词 -n 推荐数"),
+            ("flyai", "FlyAI 旅行搜索", "查询词如：5 天日本行程"),
+            ("analyze", "产品可行性分析", "分析话题如：北欧极光"),
+            ("model", "模型管理", "list/status/use"),
+            ("config", "配置管理", "--show/--init"),
+            ("status", "系统状态", "查看版本/API 配置"),
+            ("agents", "Agent 团队", "查看 Agent 信息"),
+            ("help", "帮助信息", "显示帮助"),
+        ]
+
+    async def search(self, query: str) -> list[Hit]:
+        results = []
+        query_lower = query.lower()
+        for cmd, desc, usage in self.commands:
+            if query_lower in cmd.lower() or query_lower in desc.lower():
+                results.append(
+                    Hit(
+                        score=1.0,
+                        match=Text(f"/{cmd} - {desc}"),
+                        text=Text(f"用法：{usage}", style="dim"),
+                    )
+                )
+        return results
+
+
+class ChatScreen(Screen):
+    """主聊天界面"""
+
+    AUTO_FOCUS = "#chat-input"  # 自动聚焦输入框
 
     BINDINGS = [
-        Binding("escape", "close", "关闭", show=True),
-        Binding("up", "navigate_up", "上", show=False),
-        Binding("down", "navigate_down", "下", show=False),
-        Binding("enter", "select", "选择", show=True),
-    ]
-
-    COMMANDS = [
-        ("run", "运行完整工作流", "/run"),
-        ("flyai", "FlyAI 旅行搜索", "/flyai <查询>"),
-        ("analyze", "产品可行性分析", "/analyze <话题>"),
-        ("model", "模型管理", "/model list|status|use"),
-        ("config", "配置管理", "/config --show|--init"),
-        ("status", "系统状态", "/status"),
-        ("agents", "Agent 团队", "/agents"),
-        ("help", "帮助信息", "/help"),
+        Binding("ctrl+q", "quit", "退出"),
+        Binding("ctrl+g", "submit", "提交"),
+        Binding("/", "command_palette", "命令"),
+        Binding("ctrl+l", "clear", "清屏"),
     ]
 
-    def __init__(self):
-        super().__init__()
-        self.selected_index = 0
-
-    def compose(self) -> ComposeResult:
-        yield Static(self._render_commands(), id="command-list")
-
-    def _render_commands(self) -> str:
-        """渲染命令列表"""
-        lines = ["[bold]可用命令[/bold]\n"]
-        for i, (cmd, desc, usage) in enumerate(self.COMMANDS):
-            marker = "→ " if i == self.selected_index else "  "
-            lines.append(f"{marker}[cyan]/{cmd}[/cyan] - {desc}")
-            lines.append(f"   [dim]{usage}[/dim]")
-            lines.append("")
-        return "\n".join(lines)
-
-    def on_key(self, event):
-        """处理键盘事件"""
-        if event.key == "up":
-            self.selected_index = (self.selected_index - 1) % len(self.COMMANDS)
-        elif event.key == "down":
-            self.selected_index = (self.selected_index + 1) % len(self.COMMANDS)
-        elif event.key == "enter":
-            self.dismiss(self.COMMANDS[self.selected_index][0])
-        elif event.key == "escape":
-            self.dismiss(None)
-
-        self.query_one("#command-list", Static).update(self._render_commands())
-
-
-class TravelAgentApp(App):
-    """travel-agent 交互式应用"""
-
-    TITLE = "travel-agent"
-    SUB_TITLE = "AI 驱动的旅行目的地推荐"
-
-    CSS = """
-    Screen {
-        background: $surface;
-    }
-
-    #main-container {
-        height: 100%;
-    }
-
-    #chat-output {
-        height: 1fr;
-        border: solid $primary;
-        margin: 1 1 0 1;
-        padding: 1;
-        background: $surface;
-    }
-
-    #input-area {
-        height: auto;
-        max-height: 3;
-        margin: 1;
-        padding: 1;
-        background: $primary-background;
-        border: solid $primary;
-    }
-
-    #command-palette {
-        width: 60;
-        height: 20;
-        align: center middle;
-        background: $surface;
-        border: solid $primary;
-        padding: 1 2;
-    }
-    """
-
-    BINDINGS = [
-        Binding("ctrl+q", "quit", "退出", show=True),
-        Binding("/", "command_palette", "命令", show=True),
-        Binding("ctrl+h", "toggle_help", "帮助", show=True),
-        Binding("ctrl+g", "submit_input", "提交", show=True),
-    ]
-
-    def __init__(self):
-        super().__init__()
-        self.messages = []
-        self.command_history = []
-        self.history_index = -1
-        self.chat_output = None
-        self.input_widget = None
-
     def compose(self) -> ComposeResult:
         yield Header(show_clock=True)
-        with Container(id="main-container"):
-            with Vertical():
-                yield Static("", id="chat-output")
-                yield Input(placeholder="输入消息或 / 命令...", id="input-area")
+        with Vertical():
+            # 聊天输出区域 - 使用 RichLog 支持 Markdown
+            yield RichLog(id="chat-output", highlight=True, markup=True)
+            # 输入区域
+            yield Input(
+                placeholder="输入消息或按 / 打开命令面板...",
+                id="chat-input"
+            )
         yield Footer()
 
     def on_mount(self) -> None:
-        """应用启动时"""
-        self.chat_output = self.query_one("#chat-output", Static)
-        self.input_widget = self.query_one("#input-area", Input)
-        self.input_widget.focus()
-
+        """屏幕挂载时"""
         # 显示欢迎信息
         self._add_welcome_message()
 
     def _add_welcome_message(self):
         """显示欢迎信息"""
+        log = self.query_one("#chat-output", RichLog)
         welcome = """
-欢迎使用 travel-agent 交互式 CLI！
-
-可用命令：
-  /run     - 运行完整工作流
-  /flyai   - FlyAI 旅行搜索
-  /analyze - 产品可行性分析
-  /model   - 模型管理
-  /config  - 配置管理
-  /status  - 系统状态
-  /agents  - 查看 Agent 团队
-
-按 / 打开命令面板，Ctrl+Q 退出
+# 欢迎使用 travel-agent 交互式 CLI
+
+## 可用命令
+- `/run` - 运行完整工作流
+- `/flyai` - FlyAI 旅行搜索
+- `/analyze` - 产品可行性分析
+- `/model` - 模型管理
+- `/config` - 配置管理
+- `/status` - 系统状态
+- `/agents` - 查看 Agent 团队
+
+## 快捷键
+- `Ctrl+G` - 提交输入
+- `/` - 打开命令面板
+- `Ctrl+L` - 清屏
+- `Ctrl+Q` - 退出
+
+直接输入自然语言查询（如"5 天日本行程规划"）将使用 FlyAI 搜索。
 """
-        self.messages.append(("system", welcome))
-        self._update_chat_output()
-
-    def _update_chat_output(self):
-        """更新聊天输出"""
-        if not self.chat_output:
-            return
-
-        lines = []
-        for role, content in self.messages:
-            if role == "user":
-                lines.append(f"[bold blue]> {content}[/bold blue]")
-            elif role == "system":
-                lines.append(f"[dim]{content}[/dim]")
-            else:
-                lines.append(f"{content}")
-            lines.append("")
-
-        self.chat_output.update("\n".join(lines))
+        log.write(Markdown(welcome))
 
     def on_input_submitted(self, event: Input.Submitted) -> None:
         """处理输入提交"""
@@ -217,27 +111,24 @@ class TravelAgentApp(App):
         if not user_input:
             return
 
-        # 添加到历史记录
-        self.command_history.append(user_input)
-        self.history_index = len(self.command_history)
-
-        # 显示用户消息
-        self.messages.append(("user", user_input))
-        self._update_chat_output()
-
         # 清空输入框
         event.input.value = ""
 
+        # 显示用户消息
+        log = self.query_one("#chat-output", RichLog)
+        log.write(Text(f"> {user_input}", style="bold blue"))
+
         # 处理命令
         self._handle_command(user_input)
 
     @work(exclusive=True)
     async def _handle_command(self, command: str):
         """处理命令（异步工作）"""
+        log = self.query_one("#chat-output", RichLog)
+
         try:
             # 显示处理中状态
-            self.messages.append(("system", "正在处理..."))
-            self._update_chat_output()
+            log.write(Text("正在处理...", style="dim"))
 
             if command.startswith("/"):
                 # 处理斜杠命令
@@ -246,17 +137,15 @@ class TravelAgentApp(App):
                 # 默认使用 flyai 处理自然语言
                 result = await self._handle_natural_language(command)
 
-            # 移除处理中状态
-            self.messages = [(r, c) for r, c in self.messages if c != "正在处理..."]
-
             # 显示结果
-            self.messages.append(("assistant", result))
-            self._update_chat_output()
+            if result:
+                log.write(Panel(result, title="结果", border_style="green"))
 
         except Exception as e:
-            self.messages = [(r, c) for r, c in self.messages if c != "正在处理..."]
-            self.messages.append(("system", f"[red]错误：{e}[/red]"))
-            self._update_chat_output()
+            log.write(Text(f"错误：{e}", style="red"))
+
+        # 重新聚焦输入框
+        self.query_one("#chat-input", Input).focus()
 
     async def _handle_slash_command(self, command: str) -> str:
         """处理斜杠命令"""
@@ -264,58 +153,82 @@ class TravelAgentApp(App):
         cmd_name = parts[0]
         args = parts[1] if len(parts) > 1 else ""
 
-        try:
-            result = await run_command(cmd_name, args)
-            return result
-        except Exception as e:
-            return f"命令执行失败：{e}"
+        result = await run_command(cmd_name, args)
+        return result
 
     async def _handle_natural_language(self, query: str) -> str:
         """处理自然语言查询（默认使用 flyai）"""
-        try:
-            result = await run_command("flyai", query)
-            return result
-        except Exception as e:
-            return f"查询失败：{e}"
+        result = await run_command("flyai", query)
+        return result
 
-    def action_quit(self):
+    def action_quit(self) -> None:
         """退出应用"""
         self.exit()
 
-    def action_command_palette(self):
+    def action_submit(self) -> None:
+        """提交输入"""
+        input_widget = self.query_one("#chat-input", Input)
+        input_widget._submit()
+
+    def action_clear(self) -> None:
+        """清屏"""
+        log = self.query_one("#chat-output", RichLog)
+        log.clear()
+        self._add_welcome_message()
+
+    def action_command_palette(self) -> None:
         """打开命令面板"""
-        def handle_result(selected):
-            if selected:
-                self.input_widget.value = f"/{selected}"
-                self.input_widget.focus()
+        def handle_result(command: str | None):
+            if command:
+                # 将选择的命令填入输入框
+                input_widget = self.query_one("#chat-input", Input)
+                input_widget.value = f"/{command}"
+                input_widget.focus()
 
-        self.push_screen(CommandPalette(), handle_result)
+        self.app.push_screen(CommandPalette(provider=CommandProvider), handle_result)
 
-    def action_submit_input(self):
-        """提交输入"""
-        if self.input_widget:
-            self.input_widget._submit()
-
-    def action_toggle_help(self):
-        """切换帮助显示"""
-        help_text = """
-快捷键：
-  Ctrl+G  - 提交输入
-  /       - 打开命令面板
-  Ctrl+Q  - 退出应用
-  ↑/↓     - 历史命令导航（在输入框中）
-
-命令：
-  /run     - 运行完整工作流
-  /flyai   - FlyAI 旅行搜索
-  /analyze - 产品可行性分析
-  /model   - 模型管理
-  /config  - 配置管理
-  /status  - 系统状态
-  /agents  - 查看 Agent 团队
-"""
-        self.messages.append(("system", help_text))
-        self._update_chat_output()
+
+class TravelAgentApp(App):
+    """travel-agent 交互式应用"""
+
+    TITLE = "travel-agent"
+    SUB_TITLE = "AI 驱动的旅行目的地推荐"
+
+    CSS = """
+    Screen {
+        background: $surface;
+    }
+
+    Vertical {
+        height: 100%;
+    }
+
+    #chat-output {
+        height: 1fr;
+        background: $surface;
+        padding: 1;
+    }
+
+    Input#chat-input {
+        height: 3;
+        margin: 1 1 0 1;
+        padding: 1;
+        dock: bottom;
+    }
+
+    Input#chat-input:focus {
+        background: $surface;
+        border: solid $primary;
+    }
+    """
+
+    BINDINGS = [
+        Binding("ctrl+q", "quit", "退出", show=True),
+    ]
+
+    def on_mount(self) -> None:
+        """应用启动时"""
+        self.push_screen(ChatScreen())
 
 
 def main():