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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: comate-cli
-Version: 0.12.1
+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
@@ -15,7 +15,7 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Python: <3.14,>=3.11
 Requires-Dist: charset-normalizer==3.4.7
-Requires-Dist: comate-agent-sdk<0.13,>=0.12.7
+Requires-Dist: comate-agent-sdk<0.13,>=0.12.8
 Requires-Dist: concurrent-log-handler>=0.9.25
 Requires-Dist: curl-cffi==0.13.0
 Requires-Dist: httpx<0.29.0,>=0.28.1

{comate_cli-0.12.1 → 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.1 → comate_cli-0.12.3}/comate_cli/terminal_agent/config/picker.py

@@ -15,7 +15,6 @@ from prompt_toolkit.layout.controls import FormattedTextControl
 from comate_cli.terminal_agent.figures import (
     EFFORT_HIGH,
     EFFORT_LOW,
-    HEAVY_HORIZONTAL,
     PLAY_ICON,
 )
 
@@ -217,11 +216,6 @@ class ConfigPickerUI:
             dont_extend_height=True,
             style="class:selection.title",
         )
-        divider = Window(
-            height=1,
-            char=HEAVY_HORIZONTAL,
-            style="class:selection.divider",
-        )
         self._content_window = Window(
             content=FormattedTextControl(self._content_fragments, focusable=True),
             wrap_lines=True,
@@ -234,4 +228,4 @@ class ConfigPickerUI:
             dont_extend_height=True,
             style="class:selection.body",
         )
-        return HSplit([header, divider, self._content_window, footer])
+        return HSplit([header, self._content_window, footer])

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

@@ -10,7 +10,7 @@ from typing import Any, Callable
 
 from comate_agent_sdk.agent.events import EffortSwitchedEvent
 from comate_agent_sdk.llm.effort import EFFORT_LADDER, EffortResolution, fold_down
-from comate_cli.terminal_agent.effort_style import effort_glyph, effort_style_str
+from comate_cli.terminal_agent.effort_style import ULTRACODE, effort_glyph, effort_style_str
 from comate_cli.terminal_agent.i18n import i18n, message
 from comate_cli.terminal_agent.output_style_menu import SCOPE_TAGS
 
@@ -21,8 +21,13 @@ _OPTION_TEXT = {
     "high": message.effort_option_high,
     "xhigh": message.effort_option_xhigh,
     "max": message.effort_option_max,
+    ULTRACODE: message.effort_option_ultracode,
 }
 
+# 刻度尺上的 7 格（左→右）；auto 不占格，用 `a` 键。ultracode 不是档位（rules/effort.md），
+# 在 CLI 层拆成 xhigh + 会话开关，只在这里当作第 7 格展示。
+RULER_VALUES: tuple[str, ...] = ("off", *EFFORT_LADDER, ULTRACODE)
+
 
 @dataclass(frozen=True, slots=True)
 class EffortMenuSpec:
@@ -31,8 +36,10 @@ class EffortMenuSpec:
     options: list[dict[str, Any]] = field(default_factory=list)
 
 
-def effort_level_label(level: str | None) -> str:
-    """档位名（None = auto）；auto 这个词整句跟随界面语言。"""
+def effort_level_label(level: str | None, *, ultracode: bool = False) -> str:
+    """档位名（None = auto）；auto 这个词整句跟随界面语言。开关开着时显示 ultracode。"""
+    if ultracode:
+        return i18n(message.effort_value_ultracode)
     return i18n(message.effort_value_auto) if level is None else level
 
 
@@ -109,13 +116,102 @@ def build_effort_menu(
     )
 
 
+@dataclass(frozen=True, slots=True)
+class EffortRulerSpec:
+    """横排刻度尺的纯数据：7 格 + 光标初始格 + 文案。渲染归 EffortRulerUI。"""
+
+    title: str
+    levels: list[dict[str, Any]] = field(default_factory=list)
+    current_value: str = "auto"
+    """光标初始格：档位名 / "ultracode"；auto 时落在模型默认档（没有就落 medium）。"""
+    faster_label: str = ""
+    smarter_label: str = ""
+    hint: str = ""
+
+
+def _level_note(level: str, resolution: EffortResolution) -> str:
+    """某一格的附注：不可关 / 会降级 / 不支持；正常时空串。ultracode 按 xhigh 判。"""
+    if level == "off":
+        return "" if resolution.can_disable_thinking else i18n(message.effort_option_cannot_disable)
+    probe = "xhigh" if level == ULTRACODE else level
+    if probe in resolution.available_levels:
+        return ""
+    target = fold_down(probe, resolution.available_levels)  # type: ignore[arg-type]
+    return (
+        i18n(message.effort_option_downgrade, applied=target)
+        if target
+        else i18n(message.effort_option_unsupported)
+    )
+
+
+def build_effort_ruler(
+    resolution: EffortResolution,
+    *,
+    model_name: str,
+    ultracode_enabled: bool,
+) -> EffortRulerSpec:
+    """`/effort` 刻度尺：off · low · medium · high · xhigh · max ┆ ultracode。
+
+    与竖排菜单同一套附注规则：不可用的格不隐藏不禁用，居中的备注行说清楚会降级成什么。
+    """
+    levels: list[dict[str, Any]] = []
+    for level in RULER_VALUES:
+        description = i18n(_OPTION_TEXT[level])
+        note = _level_note(level, resolution)
+        if note:
+            description = f"{description}  ({note})"
+        is_current = (
+            ultracode_enabled if level == ULTRACODE
+            else (not ultracode_enabled and resolution.requested == level)
+        )
+        levels.append(
+            {
+                "value": level,
+                "label": level,
+                "description": description,
+                "current": is_current,
+            }
+        )
+    if ultracode_enabled:
+        current_value = ULTRACODE
+    elif resolution.requested is not None:
+        current_value = resolution.requested
+    else:
+        # auto 没有格：光标落在模型默认档上，让"直接回车"等于"把 auto 固化成默认档"之前
+        # 用户能看见自己选了什么；没有默认档的开关型模型落 medium。
+        current_value = resolution.model_default or "medium"
+    del model_name  # 刻度尺不显示模型 / 默认档行（克制）；参数保留与竖排菜单签名对齐
+    return EffortRulerSpec(
+        title=i18n(message.effort_menu_title),
+        levels=levels,
+        current_value=current_value,
+        faster_label=i18n(message.effort_ruler_faster),
+        smarter_label=i18n(message.effort_ruler_smarter),
+        hint=i18n(message.effort_ruler_hint),
+    )
+
+
 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": ""},
@@ -123,9 +219,21 @@ def build_effort_confirm(
     return title, context, options
 
 
-def effort_result_line(event: EffortSwitchedEvent, resolution: EffortResolution) -> str:
+def effort_result_line(
+    event: EffortSwitchedEvent,
+    resolution: EffortResolution,
+    *,
+    ultracode_before: bool = False,
+    ultracode_after: bool = False,
+    workflow_available: bool = True,
+    notice: str | None = None,
+) -> str:
     """切换结果行。
 
+    ultracode 两个布尔只改**措辞**（前后档位名显示成 ultracode），判据仍是 effort 解析结果；
+    开着 ultracode 但会话没有 Workflow 工具时补一行提示（Q24）；
+    发行版给了 `notice` 且切换后 ultracode 开着，再补一行该文案（原样，不进 i18n）。
+
     **以切换后的解析结果为准，不照抄 event.new。**用户要的和实际生效的会分叉：
     - **请求落空**：`applied=None` 且 `downgraded=False`（downgraded 要求 applied 非空）。
       判据是 `applied is None`，不是"用户选了 off"——`off` 只是其中一种措辞。
@@ -135,13 +243,19 @@ def effort_result_line(event: EffortSwitchedEvent, resolution: EffortResolution)
     - 环境变量设了 effort 时切 auto：会话层清了，env 层仍然赢，
       照抄 event.new 会说 "high → auto"，而菜单和 statusline 还显示 high。
     """
-    head, tail = _result_head_and_tail(event, resolution)
+    head, tail = _result_head_and_tail(
+        event, resolution, ultracode_before=ultracode_before, ultracode_after=ultracode_after
+    )
     tag = SCOPE_TAGS.get(event.persisted_scope or "")
     if tag:
         head = f"{head} {tag}"
     lines = [head]
     if tail is not None:
         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)}"
@@ -150,12 +264,18 @@ def effort_result_line(event: EffortSwitchedEvent, resolution: EffortResolution)
 
 
 def _result_head_and_tail(
-    event: EffortSwitchedEvent, resolution: EffortResolution
+    event: EffortSwitchedEvent,
+    resolution: EffortResolution,
+    *,
+    ultracode_before: bool = False,
+    ultracode_after: bool = False,
 ) -> tuple[str, str | None]:
     """结果主行 + 可选的第二行提示。落点标签由调用方挂在主行末尾。"""
-    prev = _label(event.previous)
-    asked = _label(event.new)
-    actual_requested = _label(resolution.requested)
+    prev = _label(event.previous, ultracode=ultracode_before)
+    asked = _label(event.new, ultracode=ultracode_after)
+    # "谁压着"这一判据比较的是**档位**：ultracode 开着时请求档就是 xhigh，
+    # 显示成 ultracode 只是措辞，不能让 "xhigh" != "ultracode" 触发 kept 分支。
+    actual_requested = _label(resolution.requested, ultracode=ultracode_after)
 
     if not resolution.supported:
         return (