comate-cli 0.12.4b11__tar.gz → 0.12.4b13__tar.gz

{comate_cli-0.12.4b11 → comate_cli-0.12.4b13}/CHANGELOG.md

@@ -91,6 +91,13 @@
 
 ### Fixed
 
+- `comate update` 在依赖包刚发布时解析失败：更新命令只刷新 CLI 自身的索引缓存，
+  依赖（如 `comate-agent-sdk`）仍用旧缓存，uv 报 `No solution found`。macOS/Linux
+  进程内更新与 Windows 分阶段安装现在都改用 `uv tool install --refresh`，刷新全部
+  缓存后再解析。Windows 手动修复命令本来带 `--reinstall`（隐含 `--refresh`），
+  不受影响。旧版本用户可先运行 `uv cache clean comate-agent-sdk`，或手动执行
+  `uv tool install comate-cli==<版本> --force --refresh-package comate-cli
+  --refresh-package comate-agent-sdk`。
 - macOS 11/12 上 `uv tool install comate-cli` 失败（`pypdfium2-5.13.0-py3-none-macosx_13_0_arm64.whl is not compatible`）：
   SDK 依赖的 pypdfium2 从 5.12 起只出 macOS 13+ 的安装包，老系统上 uv 退回源码编译，编出来仍是
   macOS 13 的包，装不上；和 Python 版本无关。comate-agent-sdk 0.12.10 把它限制在 `<5.10`（5.9.0 支持

{comate_cli-0.12.4b11 → comate_cli-0.12.4b13}/CONTEXT.md

@@ -5,9 +5,13 @@ Canonical language for Comate CLI command discovery, slash input completion, men
 ## Menu Panel Language
 
 **Menu Panel（菜单面板）**:
-由 slash 命令打开的暂态操作界面。多个菜单使用一致的视觉与导航规则，关闭后返回对话输入。
+由 slash 命令打开的暂态操作界面。多个菜单使用一致的视觉与导航规则，关闭后返回对话输入。Menu Panel 打开期间，Status Bar 不显示。
 _Avoid_: menu output（菜单输出）, history block（历史块）
 
+**Status Bar（状态栏）**:
+底部交互带最下方的一行。左列显示 Transient Status Message，没有消息时显示权限模式提示；右列显示会话信息（模型、分支、上下文余量等）。Menu Panel 打开期间隐藏；工具审批、向用户提问、退出确认不属于 Menu Panel，不隐藏它。
+_Avoid_: footer（Menu Panel 自己有页脚）, bottom toolbar（prompt_toolkit 的术语，本项目不使用）, 补全状态行（与 Status Bar 共用同一个位置，但是另一个东西）
+
 **Settings Edit Session（设置编辑会话）**:
 从打开设置面板到保留或取消更改的一次编辑过程。更改即时保存；保留操作接受这些更改，取消操作撤销本次仍未被外部再次修改的更改。
 _Avoid_: settings draft（设置草稿）, save-on-close（关闭时才保存）
@@ -341,10 +345,13 @@ _Avoid_: lag log, profiler output (the profiler records phase durations, not a s
 - **Suggestion Acceptance** follows the inline-completion PRD rule that `Enter` submits only the user's real input; this deliberately differs from Claude Code, where an empty-box `Enter` submits the suggestion.
 - A **Safe Clear** after **Suggestion Acceptance** returns an empty box without the suggestion: the suggestion is one-shot.
 
+- A **Transient Status Message** raised while a **Menu Panel** hides the **Status Bar** is not shown and is not deferred; it expires unseen. Menu Panels report their own feedback in their own footer or in scrollback, never through the Status Bar.
 - The bottom interaction band shows at most one "working" signal at a time. During a **Stall Status** the loading line carries it and the **Task List Panel** is hidden entirely; when the Stall Status ends, the Task List Panel returns unchanged.
 - Running tools are not a **Stall Status**: the running-tool list and the **Task List Panel** may share the screen.
 
 ## Flagged ambiguities
 
+- 代码里的 `_menu_panel_active()` 实际含义是“使用共享 `MenuPanel` 外壳”，不含 `/statusline`、marketplace 安装、`/goal edit`，因此与本术语表的 **Menu Panel**（slash 命令打开的暂态操作界面）并不等价。判断 **Status Bar** 是否隐藏另用独立集合，不复用它。
+
 - OpenWorker still shows `HIGH` as **Max** (ADR-0017/0019); the agreed family-wide name is **Elite** (ADR-0023). Until OpenWorker is updated, the same Provider-Pool Level has two display names across products.
 - The original "builtin" collision between Execution Axis and Source Axis has been resolved by reserving "builtin" for Core Slash Commands and introducing "default" for the new shipped markdown resources.

{comate_cli-0.12.4b11 → comate_cli-0.12.4b13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: comate-cli
-Version: 0.12.4b11
+Version: 0.12.4b13
 Summary: Comate terminal CLI built on comate-agent-sdk
 Project-URL: Homepage, https://github.com/AndyLee1024/agent-sdk
 Project-URL: Repository, https://github.com/AndyLee1024/agent-sdk

{comate_cli-0.12.4b11 → comate_cli-0.12.4b13}/comate_cli/terminal_agent/side_install.py

@@ -395,16 +395,15 @@ async def stage_update(
 
         _notify(progress, StagePhase.STAGING)
         # 精确 pin 检查阶段拿到的版本号，不用 @latest：消除检查与安装之间的 TOCTOU，
-        # 也让预发布（beta）版本能被显式安装。--refresh-package 与 macOS/Linux 路径
-        # 一致：Version Check 刚在 JSON API 看到的版本，uv 缓存的 simple 索引可能还没有
-        # （实机 b3→b4：No solution found），必须绕过缓存重拉。
+        # 也让预发布（beta）版本能被显式安装。用 --refresh 刷新全部缓存：依赖包
+        # （如 comate-agent-sdk）可能刚与 CLI 一起发布，只刷新自身索引会让依赖
+        # 解析撞上旧缓存（实机 b10→b11：No solution found）。
         cmd = (
             layout.uv_path,
             "tool",
             "install",
             f"{target.package}=={version}",
-            "--refresh-package",
-            target.package,
+            "--refresh",
             *target.install_args,
         )
         code, output = await run(

{comate_cli-0.12.4b11 → comate_cli-0.12.4b13}/comate_cli/terminal_agent/tui.py

@@ -168,7 +168,10 @@ from comate_cli.terminal_agent.backend.session_title import (
     _USER_TURN_SOURCES,
     current_session_title,
 )
-from comate_cli.terminal_agent.tui_parts.ui_mode import MODAL_UI_MODES
+from comate_cli.terminal_agent.tui_parts.ui_mode import (
+    MODAL_UI_MODES,
+    STATUS_BAR_HIDDEN_UI_MODES,
+)
 from comate_cli.terminal_title import (
     AttentionState,
     format_tab_title,
@@ -994,9 +997,7 @@ class TerminalAgentTUI(
                         char=LIGHT_HORIZONTAL,
                         style=self._input_separator_style,
                     ),
-                    filter=Condition(lambda: self._ui_mode not in {
-                        UIMode.CONFIG, UIMode.SELECTION, UIMode.PLUGIN, UIMode.MCP_CONNECTING,
-                    }),
+                    filter=Condition(lambda: not self._menu_panel_hides_status_bar()),
                 ),
                 self._bottom_container,
             ],
@@ -1042,12 +1043,18 @@ class TerminalAgentTUI(
             self._render_dirty = True
 
     def _bottom_status_visible(self) -> bool:
-        """底部 status / completion 行显隐：BTW 模式与 effort 刻度尺打开期间隐藏。"""
-        if self._ui_mode == UIMode.BTW:
+        """底部 status / completion 行显隐：Menu Panel、BTW 模式与 effort 刻度尺打开期间隐藏。"""
+        if self._ui_mode == UIMode.BTW or self._menu_panel_hides_status_bar():
             return False
         ruler = getattr(self, "_effort_ruler", None)
         return not (ruler is not None and ruler.active)
 
+    def _menu_panel_hides_status_bar(self) -> bool:
+        """Menu Panel 可见时隐藏 Status Bar；退出确认盖住面板后面板已压隐，Status Bar 随之恢复。"""
+        if getattr(self, "_exit_guard_active", False):
+            return False
+        return self._ui_mode in STATUS_BAR_HIDDEN_UI_MODES
+
     def _menu_panel_active(self) -> bool:
         """共享菜单自带顶线；宿主只在其他交互层显示输入分隔线。"""
         if getattr(self, "_exit_guard_active", False):

{comate_cli-0.12.4b11 → comate_cli-0.12.4b13}/comate_cli/terminal_agent/tui_parts/commands.py

@@ -1105,7 +1105,6 @@ class CommandsMixin:
         ok = self._selection_ui.set_options(
             title="MCP Servers",
             page_id="mcp:servers",
-            searchable=True,
             options=options,
             on_confirm=on_confirm,
             on_cancel=on_cancel,
@@ -1581,7 +1580,6 @@ class CommandsMixin:
         ok = self._selection_ui.set_options(
             title=f"Tools for {alias}",
             page_id=f"mcp:tools:{alias}",
-            searchable=True,
             options=self._mcp_tools_menu_options(row),
             on_confirm=on_confirm,
             on_cancel=on_cancel,

{comate_cli-0.12.4b11 → comate_cli-0.12.4b13}/comate_cli/terminal_agent/tui_parts/ui_mode.py

@@ -30,3 +30,16 @@ MODAL_UI_MODES = frozenset({UIMode.TOOL_APPROVAL, UIMode.QUESTION})
 
 # loading 区与 fold 容器整体隐藏集合 = 弹框态 + BTW（dual-loading 先例）。
 LOADING_SUPPRESSED_UI_MODES = MODAL_UI_MODES | {UIMode.BTW}
+
+# Menu Panel（slash 命令打开的暂态面板）打开期间 Status Bar 及其上方分隔线整体隐藏。
+# 审批 / 提问不在内（Status Bar 要显示待审批工具名），GOAL_RESUME 由启动自动弹出，
+# BTW 与 /effort 刻度尺各有独立的隐藏规则。
+STATUS_BAR_HIDDEN_UI_MODES = frozenset({
+    UIMode.CONFIG,
+    UIMode.SELECTION,
+    UIMode.PLUGIN,
+    UIMode.MCP_CONNECTING,
+    UIMode.STATUSLINE,
+    UIMode.MARKETPLACE_INSTALL,
+    UIMode.GOAL_EDIT,
+})

{comate_cli-0.12.4b11 → comate_cli-0.12.4b13}/comate_cli/terminal_agent/update_check.py

@@ -199,8 +199,7 @@ class UpdateTarget:
             "install",
             spec,
             "--force",
-            "--refresh-package",
-            self.package,
+            "--refresh",
             *self.install_args,
         )
 

{comate_cli-0.12.4b11 → comate_cli-0.12.4b13}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "comate-cli"
-version = "0.12.4b11"
+version = "0.12.4b13"
 description = "Comate terminal CLI built on comate-agent-sdk"
 readme = "README.md"
 requires-python = ">=3.11,<3.14"

{comate_cli-0.12.4b11 → comate_cli-0.12.4b13}/tests/test_mcp_slash_command.py

@@ -282,6 +282,8 @@ class TestMcpSlashCommand(unittest.IsolatedAsyncioTestCase):
         self.assertIsNotNone(selection_ui.last_kwargs)
         assert selection_ui.last_kwargs is not None
         self.assertEqual(selection_ui.last_kwargs["title"], "MCP Servers")
+        # 服务器列表条目少，搜索框只会白占一行；工具列表数量无上限，才需要搜索。
+        self.assertFalse(selection_ui.last_kwargs.get("searchable", False))
         self.assertEqual(selection_ui.last_kwargs["options"][0]["label"], "context7")
         self.assertIn("✓ Connected", selection_ui.last_kwargs["options"][0]["description"])
         self.assertNotIn(
@@ -1256,6 +1258,8 @@ class TestMcpToolToggle(unittest.IsolatedAsyncioTestCase):
 
         assert selection_ui.last_kwargs is not None
         self.assertEqual(selection_ui.last_kwargs["title"], f"Tools for {self.ALIAS}")
+        # 搜索开着时 k/j 让位给输入，页脚提示的「或 k/j：移动」会失效；/mcp 全部菜单都不带搜索。
+        self.assertFalse(selection_ui.last_kwargs.get("searchable", False))
         self.assertEqual(
             self._labels(selection_ui.last_kwargs["options"]),
             ["[ ] 1. query-docs", "[x] 2. resolve-library-id", "Back"],

{comate_cli-0.12.4b11 → comate_cli-0.12.4b13}/tests/test_modal_panel_visibility.py

@@ -586,3 +586,81 @@ def test_real_tui_bottom_status_hidden_while_effort_ruler_is_open() -> None:
 
     tui._effort_ruler.clear()
     assert tui._bottom_container.filter() is True
+
+
+# Menu Panel 打开期间不显示 Status Bar（及其上方分隔线）；其余交互层保持原样。
+_STATUS_BAR_HIDDEN_MODES = [
+    UIMode.CONFIG,
+    UIMode.SELECTION,
+    UIMode.PLUGIN,
+    UIMode.MCP_CONNECTING,
+    UIMode.STATUSLINE,
+    UIMode.MARKETPLACE_INSTALL,
+    UIMode.GOAL_EDIT,
+]
+# 非 Menu Panel：审批要在 Status Bar 显示待审批工具名；GOAL_RESUME 是启动时自动弹出、
+# 不由 slash 命令打开；BTW 由独立规则只隐藏 Status Bar，分隔线保持原样。
+_STATUS_BAR_SHOWN_MODES = [
+    UIMode.NORMAL,
+    UIMode.QUESTION,
+    UIMode.TOOL_APPROVAL,
+    UIMode.GOAL_RESUME,
+]
+
+
+def _status_separator(tui: TerminalAgentTUI) -> Any:
+    """Status Bar 上方分隔线：主 HSplit 中紧邻 _bottom_container 之前的容器。"""
+    children = tui._main_container.children
+    assert children[-1] is tui._bottom_container
+    return children[-2]
+
+
+@pytest.mark.parametrize("mode", _STATUS_BAR_HIDDEN_MODES)
+def test_status_bar_and_separator_hidden_while_menu_panel_is_open(mode: UIMode) -> None:
+    tui, _renderer = _make_layout_tui()
+    tui._manual_mode = mode
+    assert tui._ui_mode is mode
+    assert tui._bottom_container.filter() is False
+    assert _status_separator(tui).filter() is False
+
+
+@pytest.mark.parametrize("mode", _STATUS_BAR_SHOWN_MODES)
+def test_status_bar_stays_visible_outside_menu_panels(mode: UIMode) -> None:
+    tui, _renderer = _make_layout_tui()
+    if mode is UIMode.TOOL_APPROVAL:
+        tui._approval_queue.extend(_approval_entries(1))  # type: ignore[arg-type]
+    elif mode is UIMode.QUESTION:
+        tui._question_active = True
+    else:
+        tui._manual_mode = mode
+    assert tui._ui_mode is mode
+    assert tui._bottom_container.filter() is True
+    assert _status_separator(tui).filter() is True
+
+
+def test_btw_hides_status_bar_but_keeps_its_separator() -> None:
+    tui, _renderer = _make_layout_tui()
+    tui._manual_mode = UIMode.BTW
+    assert tui._bottom_container.filter() is False
+    assert _status_separator(tui).filter() is True
+
+
+@pytest.mark.parametrize("mode", _STATUS_BAR_HIDDEN_MODES)
+def test_status_bar_returns_when_exit_guard_covers_menu_panel(mode: UIMode) -> None:
+    """退出确认盖住面板时面板已不可见（_mode_layer_visible 压隐），Status Bar 随之恢复。"""
+    tui, _renderer = _make_layout_tui()
+    tui._manual_mode = mode
+    tui._exit_guard_active = True
+    assert tui._bottom_container.filter() is True
+    assert _status_separator(tui).filter() is True
+
+
+def test_status_bar_returns_when_approval_interrupts_menu_panel() -> None:
+    """面板打开时来了审批：_ui_mode 派生为 TOOL_APPROVAL，Status Bar 重新显示；审批结束回到面板。"""
+    tui, _renderer = _make_layout_tui()
+    tui._manual_mode = UIMode.CONFIG
+    assert tui._bottom_container.filter() is False
+    tui._approval_queue.extend(_approval_entries(1))  # type: ignore[arg-type]
+    assert tui._bottom_container.filter() is True
+    tui._approval_queue.clear()
+    assert tui._bottom_container.filter() is False

{comate_cli-0.12.4b11 → comate_cli-0.12.4b13}/tests/test_side_install.py

@@ -271,10 +271,12 @@ class TestStageUpdate(unittest.IsolatedAsyncioTestCase):
                 install_cmd,
                 (
                     "uv", "tool", "install", "acme-cli==1.1.0",
-                    "--refresh-package", "acme-cli",
+                    "--refresh",
                     "--default-index", "https://pypi.example.com/simple",
                 ),
             )
+            self.assertIn("--refresh", install_cmd)
+            self.assertNotIn("--refresh-package", install_cmd)
             vdir = vi.version_dir(layout, "1.1.0")
             self.assertEqual(install_env["UV_TOOL_DIR"], str(vdir / "tools"))
             self.assertEqual(install_env["UV_TOOL_BIN_DIR"], str(vdir / "bin"))

{comate_cli-0.12.4b11 → comate_cli-0.12.4b13}/tests/test_update_check.py

@@ -618,8 +618,7 @@ class TestCheckUpdate(unittest.IsolatedAsyncioTestCase):
                 "install",
                 "acme-cli@latest",
                 "--force",
-                "--refresh-package",
-                "acme-cli",
+                "--refresh",
                 "--default-index",
                 "https://pypi.example.com/local/simple",
                 "--index",
@@ -629,6 +628,16 @@ class TestCheckUpdate(unittest.IsolatedAsyncioTestCase):
             ),
         )
 
+    def test_update_command_refreshes_all_cached_data(self) -> None:
+        target = UpdateTarget(
+            package="comate-cli",
+            product_label="Comate",
+            release_notes_url="https://example.com",
+        )
+        command = target.update_command()
+        self.assertIn("--refresh", command)
+        self.assertNotIn("--refresh-package", command)
+
     async def test_check_update_uses_injected_fetcher(self) -> None:
         from comate_cli.distribution import LatestRelease
 
@@ -1025,7 +1034,7 @@ class TestCheckUpdate(unittest.IsolatedAsyncioTestCase):
         self.assertTrue(ok)
         mock_exec.assert_awaited_once()
         console.print.assert_any_call(
-            "Updating Comate via `uv tool install comate-cli@latest --force --refresh-package comate-cli`..."
+            "Updating Comate via `uv tool install comate-cli@latest --force --refresh`..."
         )
         console.out.assert_called_once_with("installed comate-cli@0.3.6\n", end="")
         console.print.assert_any_call("🎉 Update ran successfully! Please restart Comate.")
@@ -1068,8 +1077,7 @@ class TestCheckUpdate(unittest.IsolatedAsyncioTestCase):
                     "install",
                     "acme-cli@latest",
                     "--force",
-                    "--refresh-package",
-                    "acme-cli",
+                    "--refresh",
                     "--default-index",
                     "https://pypi.example.com/local/simple",
                 ),
@@ -1395,8 +1403,7 @@ class TestCheckUpdate(unittest.IsolatedAsyncioTestCase):
                     "install",
                     "comate-cli@latest",
                     "--force",
-                    "--refresh-package",
-                    "comate-cli",
+                    "--refresh",
                 )
             ],
         )
@@ -1448,8 +1455,7 @@ class TestCheckUpdate(unittest.IsolatedAsyncioTestCase):
                     "install",
                     "acme-cli@latest",
                     "--force",
-                    "--refresh-package",
-                    "acme-cli",
+                    "--refresh",
                     "--default-index",
                     "https://pypi.example.com/local/simple",
                     "--index",
@@ -2355,7 +2361,7 @@ class TestUpdateCommandPinning(unittest.IsolatedAsyncioTestCase):
             target.update_command(pin_version="0.12.0b2"),
             (
                 "uv", "tool", "install", "comate-cli==0.12.0b2",
-                "--force", "--refresh-package", "comate-cli",
+                "--force", "--refresh",
                 "--default-index", "https://pypi.example.com/simple",
             ),
         )

{comate_cli-0.12.4b11 → comate_cli-0.12.4b13}/uv.lock

@@ -301,7 +301,7 @@ wheels = [
 
 [[package]]
 name = "comate-agent-sdk"
-version = "0.12.18"
+version = "0.12.19"
 source = { editable = "../../" }
 dependencies = [
     { name = "aiohttp" },
@@ -384,7 +384,7 @@ dev = [
 
 [[package]]
 name = "comate-cli"
-version = "0.12.4b11"
+version = "0.12.4b13"
 source = { editable = "." }
 dependencies = [
     { name = "charset-normalizer" },