comate-cli 0.12.2__tar.gz → 0.12.3__tar.gz

{comate_cli-0.12.2 → comate_cli-0.12.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: comate-cli
-Version: 0.12.2
+Version: 0.12.3
 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.2 → comate_cli-0.12.3}/comate_cli/distribution.py

@@ -149,11 +149,19 @@ class DistributionProfile:
     session_hooks: SessionHooks | None = None
     agent_hooks: tuple["AgentHookRegistration", ...] = ()
     services: BackendServices | None = None
+    # 发行版策略文案：用户选 ultracode 时先弹确认框、切换后结果行再补一行。
+    # None（公版默认）= 不弹、不补。单语纯文本，由 overlay 决定语言。
+    ultracode_notice: str | None = None
 
     def __post_init__(self) -> None:
         for field_name in ("product_name", "command_name", "package_name"):
             if not str(getattr(self, field_name)).strip():
                 raise ValueError(f"DistributionProfile.{field_name} must be non-empty")
+        if self.ultracode_notice is not None:
+            normalized = str(self.ultracode_notice).strip()
+            if not normalized:
+                raise ValueError("DistributionProfile.ultracode_notice must be non-empty when provided")
+            object.__setattr__(self, "ultracode_notice", normalized)
 
         object.__setattr__(self, "startup_hooks", tuple(self.startup_hooks))
         object.__setattr__(self, "agent_hooks", tuple(self.agent_hooks))

{comate_cli-0.12.2 → comate_cli-0.12.3}/comate_cli/terminal_agent/effort_menu.py

@@ -192,12 +192,26 @@ def build_effort_ruler(
 
 
 def build_effort_confirm(
-    *, previous: str | None, new: str | None, turn_count: int
+    *,
+    previous: str | None,
+    new: str | None,
+    turn_count: int,
+    cache_warning: bool = True,
+    notice: str | None = None,
 ) -> tuple[str, list[str], list[dict[str, Any]]]:
-    """会话已跑过请求时的二次确认：讲清楚代价是 prompt cache 失效。"""
+    """二次确认框。两段说明各自独立开关，能合成一个框就不连弹两个：
+
+    - `cache_warning`：会话已跑过请求且档位真变了 → 讲清楚代价是 prompt cache 失效。
+    - `notice`：发行版塞进来的 ultracode 提示文案（`DistributionProfile.ultracode_notice`），
+      是数据不是 i18n 文案，原样展示。
+    """
     prev, nxt = _label(previous), _label(new)
     title = i18n(message.effort_confirm_title, previous=prev, new=nxt)
-    context = [i18n(message.effort_confirm_context, turns=turn_count)]
+    context: list[str] = []
+    if cache_warning:
+        context.append(i18n(message.effort_confirm_context, turns=turn_count))
+    if notice:
+        context.append(notice)
     options = [
         {"value": "yes", "label": i18n(message.effort_confirm_yes), "description": ""},
         {"value": "no", "label": i18n(message.effort_confirm_no, previous=prev), "description": ""},
@@ -212,11 +226,13 @@ def effort_result_line(
     ultracode_before: bool = False,
     ultracode_after: bool = False,
     workflow_available: bool = True,
+    notice: str | None = None,
 ) -> str:
     """切换结果行。
 
     ultracode 两个布尔只改**措辞**（前后档位名显示成 ultracode），判据仍是 effort 解析结果；
-    开着 ultracode 但会话没有 Workflow 工具时补一行提示（Q24）。
+    开着 ultracode 但会话没有 Workflow 工具时补一行提示（Q24）；
+    发行版给了 `notice` 且切换后 ultracode 开着，再补一行该文案（原样，不进 i18n）。
 
     **以切换后的解析结果为准，不照抄 event.new。**用户要的和实际生效的会分叉：
     - **请求落空**：`applied=None` 且 `downgraded=False`（downgraded 要求 applied 非空）。
@@ -238,6 +254,8 @@ def effort_result_line(
         lines.append(f"  {tail}")
     if ultracode_after and not workflow_available:
         lines.append(f"  {i18n(message.effort_ultracode_no_workflow_tool)}")
+    if ultracode_after and notice:
+        lines.append(f"  {notice}")
     if event.local_override is not None:
         lines.append(
             f"  {i18n(message.output_style_local_override_hint, name=event.local_override)}"

{comate_cli-0.12.2 → comate_cli-0.12.3}/comate_cli/terminal_agent/tui_parts/commands.py

@@ -2388,6 +2388,11 @@ class CommandsMixin:
     def _ultracode_enabled(self) -> bool:
         return bool(getattr(self._session, "ultracode_enabled", False))
 
+    def _ultracode_notice(self) -> str | None:
+        """发行版塞进 profile 的 ultracode 提示文案；公版 / 没接 profile 时为 None。"""
+        profile = getattr(self, "_profile", None)
+        return getattr(profile, "ultracode_notice", None) or None
+
     def _workflow_tool_available(self) -> bool:
         """会话工具集里有没有 Workflow（后台任务关闭时它被剔除）。读不到就当有，不误报。"""
         agent = getattr(self._session, "_agent", None)
@@ -2458,8 +2463,10 @@ class CommandsMixin:
 
         `scope` 是落点：菜单路径固定 local，直接命令路径由 `--global` 决定。
         `persist=False`（刻度尺 `s` 键）只切本会话，不碰 settings。
-        `ultracode` 是目标开关状态：只有档位变化才需要确认框（开关本身是 append-only
-        reminder，不炸 prompt cache）。
+        `ultracode` 是目标开关状态：开关本身是 append-only reminder，不炸 prompt cache，
+        所以只动开关默认不弹框——除非发行版配了 `ultracode_notice`：开启 ultracode
+        这一跳必须先让用户看到那段文案并确认。两段说明（cache 失效 / 发行版提示）
+        合进同一个确认框，不连弹两个。
 
         `from_menu=True` 表示这一跳是"菜单里选完 → 再开确认框"。这种菜单换菜单
         必须标 `_mark_local_ui_transition_pending()`，否则回到
@@ -2494,8 +2501,13 @@ class CommandsMixin:
                 )
             )
             return
-        if not level_changed or not bool(getattr(self._session, "_model_switch_locked", False)):
-            # 只动开关、或会话还没跑过请求：无需确认
+        cache_warning = level_changed and bool(
+            getattr(self._session, "_model_switch_locked", False)
+        )
+        # 只在"从关到开"这一跳提示；ultracode 已开着再选别的档不提示。
+        notice = self._ultracode_notice() if ultracode and not previous_ultracode else None
+        if not cache_warning and notice is None:
+            # 只动开关、或会话还没跑过请求，且发行版没配提示：无需确认
             self._apply_effort_switch(
                 target, scope=scope, persist=persist, ultracode=ultracode
             )
@@ -2508,6 +2520,8 @@ class CommandsMixin:
             previous=effort_level_label(previous, ultracode=previous_ultracode),
             new=effort_level_label(target, ultracode=ultracode),
             turn_count=turns,
+            cache_warning=cache_warning,
+            notice=notice,
         )
 
         def on_confirm(value: str) -> None:
@@ -2583,6 +2597,7 @@ class CommandsMixin:
                 ultracode_before=previous_ultracode,
                 ultracode_after=ultracode,
                 workflow_available=self._workflow_tool_available(),
+                notice=self._ultracode_notice(),
             )
         )
         logger.info(f"Effort switched: {event} (ultracode={ultracode})")

{comate_cli-0.12.2 → comate_cli-0.12.3}/pyproject.toml

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

{comate_cli-0.12.2 → comate_cli-0.12.3}/tests/test_distribution_contract.py

@@ -41,6 +41,7 @@ class TestDefaults:
         assert DEFAULT_PROFILE.update is None
         assert DEFAULT_PROFILE.render_logo is None
         assert DEFAULT_PROFILE.system_role is None
+        assert DEFAULT_PROFILE.ultracode_notice is None
 
     def test_profile_is_frozen(self):
         from comate_cli.distribution import DEFAULT_PROFILE
@@ -92,6 +93,13 @@ class TestValidation:
         with pytest.raises(ValueError, match="provider_presets"):
             DistributionProfile(provider_presets=())
 
+    def test_blank_ultracode_notice_rejected_and_nonblank_is_stripped(self):
+        from comate_cli.distribution import DistributionProfile
+
+        with pytest.raises(ValueError):
+            DistributionProfile(ultracode_notice="   ")
+        assert DistributionProfile(ultracode_notice="  night only  ").ultracode_notice == "night only"
+
     def test_update_source_requires_callable(self):
         from comate_cli.distribution import UpdateSource
 

{comate_cli-0.12.2 → comate_cli-0.12.3}/tests/test_effort_menu.py

@@ -75,6 +75,21 @@ class TestEffortMenu(unittest.TestCase):
         self.assertTrue(any("7" in line for line in context))
         self.assertEqual([o["value"] for o in options], ["yes", "no"])
 
+    def test_confirm_dialog_notice_and_cache_warning_are_independent(self) -> None:
+        """两段说明各自开关：没 cache 段时不能出现轮数，没 notice 时不能出现文案。"""
+        with override_locale("en"):
+            _t, only_notice, _o = build_effort_confirm(
+                previous="high", new="ultracode", turn_count=7,
+                cache_warning=False, notice="night only",
+            )
+            _t, both, _o = build_effort_confirm(
+                previous="high", new="ultracode", turn_count=7, notice="night only",
+            )
+        self.assertEqual(only_notice, ["night only"])
+        self.assertEqual(len(both), 2)
+        self.assertIn("7", both[0])
+        self.assertEqual(both[1], "night only")
+
 
 class TestEffortRulerSpec(unittest.TestCase):
     def test_seven_cells_auto_absent_ultracode_last(self) -> None:

{comate_cli-0.12.2 → comate_cli-0.12.3}/tests/test_effort_slash_command.py

@@ -678,6 +678,117 @@ class TestUltracode(unittest.TestCase):
         self.assertNotIn("Workflow tool", self._lines(h)[0])
 
 
+class TestUltracodeNotice(unittest.TestCase):
+    """发行版 `ultracode_notice`：开启 ultracode 这一跳先弹框、切完结果行再补一行。
+
+    公版（notice=None）一字不多、一框不弹——这条护栏和"有 notice 才出现"同等重要。
+    """
+
+    NOTICE = "白天网关繁忙，建议夜里用。"
+
+    def _lines(self, h: _Harness) -> list[str]:
+        return [c for k, c, _s in h._renderer.events if k != "user"]
+
+    def _harness(self, session: _Session, *, notice: str | None) -> _Harness:
+        from comate_cli.distribution import DistributionProfile
+
+        h = _Harness(session)
+        h._profile = DistributionProfile(ultracode_notice=notice)
+        return h
+
+    def test_public_profile_without_notice_changes_nothing(self) -> None:
+        session = _Session()
+        h = self._harness(session, notice=None)
+        with override_locale("en"):
+            h._slash_effort("ultracode")
+        self.assertEqual(h._selection_ui.calls, [], "没配 notice 就不弹框")
+        self.assertEqual(session.set_ultracode_calls, [True])
+        self.assertNotIn(self.NOTICE, self._lines(h)[0])
+
+    def test_direct_arg_on_fresh_session_confirms_with_notice_only(self) -> None:
+        """空会话本来不弹框；配了 notice 就要弹，且框里只有 notice、没有 cache 那段。"""
+        session = _Session(locked=False)
+        h = self._harness(session, notice=self.NOTICE)
+        with override_locale("en"):
+            h._slash_effort("ultracode")
+        self.assertEqual(session.set_ultracode_calls, [], "确认前不能就开了")
+        self.assertEqual(len(h._selection_ui.calls), 1)
+        confirm = h._selection_ui.calls[0]
+        self.assertEqual(confirm["context_lines"], [self.NOTICE])
+        self.assertEqual([o["value"] for o in confirm["options"]], ["yes", "no"])
+        h.press_enter()  # yes
+        self.assertEqual(session.set_effort_calls, ["xhigh"])
+        self.assertEqual(session.set_ultracode_calls, [True])
+        self.assertEqual(h._ui_mode, UIMode.NORMAL)
+        self.assertFalse(h._local_ui_transition_pending)
+        self.assertIn(self.NOTICE, self._lines(h)[0], "切完结果行再补一行")
+
+    def test_locked_session_merges_cache_warning_and_notice_into_one_dialog(self) -> None:
+        session = _Session(locked=True, turn_number=3)
+        session._effort = "high"
+        h = self._harness(session, notice=self.NOTICE)
+        with override_locale("en"):
+            h._slash_effort("")
+            h.press_digit(7)
+            h.press_enter()
+        self.assertEqual(len(h._selection_ui.calls), 1, "两段说明合成一个框，不连弹")
+        context = h._selection_ui.calls[0]["context_lines"]
+        self.assertEqual(len(context), 2)
+        self.assertIn("3", context[0])
+        self.assertEqual(context[1], self.NOTICE)
+        h.press_enter()  # yes
+        self.assertEqual(session.set_effort_calls, ["xhigh"])
+        self.assertEqual(session.set_ultracode_calls, [True])
+
+    def test_switch_only_on_locked_session_still_confirms_when_notice_set(self) -> None:
+        """已在 xhigh 只开开关：平时不弹，配了 notice 也要弹（只有 notice 段）。"""
+        session = _Session(locked=True, turn_number=3)
+        session._effort = "xhigh"
+        h = self._harness(session, notice=self.NOTICE)
+        h._slash_effort("ultracode")
+        self.assertEqual(len(h._selection_ui.calls), 1)
+        self.assertEqual(h._selection_ui.calls[0]["context_lines"], [self.NOTICE])
+        self.assertEqual(session.set_ultracode_calls, [], "确认前不能就开了")
+
+    def test_ruler_session_only_key_also_confirms(self) -> None:
+        session = _Session()
+        h = self._harness(session, notice=self.NOTICE)
+        with override_locale("en"):
+            h._slash_effort("")
+            h.press_digit(7)
+            h.press_s()
+        self.assertEqual(len(h._selection_ui.calls), 1)
+        self.assertEqual(session.set_ultracode_calls, [])
+        h.press_enter()  # yes
+        self.assertEqual(session.set_effort_calls, ["xhigh"])
+        self.assertEqual(session.set_effort_persists, [False], "`s` 仍是仅本会话")
+        self.assertEqual(session.set_ultracode_calls, [True])
+
+    def test_confirm_no_leaves_session_untouched(self) -> None:
+        session = _Session()
+        h = self._harness(session, notice=self.NOTICE)
+        with override_locale("en"):
+            h._slash_effort("ultracode")
+            h.press_digit(2)  # no
+            h.press_enter()
+        self.assertEqual(session.set_effort_calls, [])
+        self.assertEqual(session.set_ultracode_calls, [])
+        self.assertEqual(h._ui_mode, UIMode.NORMAL)
+        self.assertTrue(any("cancel" in line.lower() for line in self._lines(h)))
+
+    def test_leaving_ultracode_never_shows_notice(self) -> None:
+        """提示只在"从关到开"这一跳；已开着再切别的档既不弹框也不补行。"""
+        session = _Session()
+        session._effort = "xhigh"
+        session._ultracode = True
+        h = self._harness(session, notice=self.NOTICE)
+        with override_locale("en"):
+            h._slash_effort("high")
+        self.assertEqual(h._selection_ui.calls, [])
+        self.assertEqual(session.set_ultracode_calls, [False])
+        self.assertNotIn(self.NOTICE, "\n".join(self._lines(h)))
+
+
 class TestModelMenuEffortHintRow(unittest.TestCase):
     """`/model` 菜单底部那行只读 effort 提示必须随光标刷新。
 

{comate_cli-0.12.2 → comate_cli-0.12.3}/uv.lock

@@ -383,7 +383,7 @@ dev = [
 
 [[package]]
 name = "comate-cli"
-version = "0.12.2"
+version = "0.12.3"
 source = { editable = "." }
 dependencies = [
     { name = "charset-normalizer" },