comate-cli 0.10.18b2__tar.gz → 0.10.19b2__tar.gz

{comate_cli-0.10.18b2 → comate_cli-0.10.19b2}/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+### Fixed
+
+- frontmatter 解析统一剥离 UTF-8 BOM：Windows 上 PowerShell / 记事本以
+  UTF-8 with BOM 保存的 SKILL.md、subagent、plugin command、conditional rule 与
+  自定义 slash command 不再因围栏检测落空而加载失败或静默降级。
+
 ### Added
 
 - 输入框贴图：Ctrl+V（Windows Alt+V）读取系统剪贴板图片并挂为

{comate_cli-0.10.18b2 → comate_cli-0.10.19b2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: comate-cli
-Version: 0.10.18b2
+Version: 0.10.19b2
 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.11.14b1
+Requires-Dist: comate-agent-sdk==0.11.15b1
 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.10.18b2 → comate_cli-0.10.19b2}/comate_cli/terminal_agent/custom_slash_commands.py

@@ -12,6 +12,7 @@ from typing import Literal
 import yaml
 
 from comate_agent_sdk.utils.paths import PathInput, normalize_path_input
+from comate_agent_sdk.utils.yaml_utils import normalize_frontmatter_source
 
 logger = logging.getLogger(__name__)
 
@@ -166,7 +167,7 @@ def _parse_custom_command_file(
         )
 
     try:
-        content = file_path.read_text(encoding="utf-8")
+        content = normalize_frontmatter_source(file_path.read_text(encoding="utf-8"))
     except OSError as exc:
         return f"Skipped custom command '/{command_name}' from {file_path}: read failed ({exc})."
 

comate_cli-0.10.19b2/comate_cli/terminal_agent/i18n/__init__.py

@@ -0,0 +1,73 @@
+"""CLI 通用 i18n 设施：按当前界面语言把 message key 渲染成终端文案。
+
+调用形态：``i18n(message.queue_full)``、``i18n(message.image_unusable, error=exc)``。
+界面语言在模块 import 时检测一次并缓存——``detect_update_locale()`` 是纯
+env / stdlib 读取，无 IO、无网络、不碰 event loop，import 副作用可接受。
+"""
+
+from __future__ import annotations
+
+from collections.abc import Iterator
+from contextlib import contextmanager
+
+from comate_cli.terminal_agent.i18n._en import EN
+from comate_cli.terminal_agent.i18n._ja import JA
+from comate_cli.terminal_agent.i18n._zh import ZH
+from comate_cli.terminal_agent.i18n.message import message
+from comate_cli.terminal_agent.locale import (
+    detect_update_locale,
+    ui_language_for_locale,
+)
+
+_TABLES: dict[str, dict[str, str]] = {"zh": ZH, "en": EN, "ja": JA}
+
+_current_language: str = ui_language_for_locale(detect_update_locale())
+
+
+def get_current_locale() -> str:
+    """返回当前界面语言（``"zh"`` / ``"ja"`` / ``"en"``）。"""
+    return _current_language
+
+
+def set_locale(language: str) -> None:
+    """覆盖当前界面语言。未知语言等价于英文兜底（查表时落到 ``EN``）。"""
+    global _current_language
+    _current_language = language
+
+
+@contextmanager
+def override_locale(language: str) -> Iterator[None]:
+    """块内切换界面语言，退出时恢复原值（块内抛异常也恢复）。"""
+    previous = get_current_locale()
+    set_locale(language)
+    try:
+        yield
+    finally:
+        set_locale(previous)
+
+
+def i18n(key: message, **fmt: object) -> str:
+    """查表并渲染文案。
+
+    fallback 链：当前语言表 → ``EN`` 表 → key 字面量。漏翻不该让 CLI 崩，
+    所以任何情况都返回字符串、不抛 ``KeyError``；但模板占位符与传入
+    kwargs 不匹配是调用方的 bug，``str.format`` 的异常不吞。
+    """
+    name = str(key)
+    template = _TABLES.get(_current_language, EN).get(name)
+    if template is None:
+        template = EN.get(name)
+    if template is None:
+        return name
+    if not fmt:
+        return template
+    return template.format(**fmt)
+
+
+__all__ = [
+    "get_current_locale",
+    "i18n",
+    "message",
+    "override_locale",
+    "set_locale",
+]

comate_cli-0.10.19b2/comate_cli/terminal_agent/i18n/_en.py

@@ -0,0 +1,77 @@
+"""English message table. Keys mirror `message` one to one."""
+
+from __future__ import annotations
+
+EN: dict[str, str] = {
+    "exit_requested": "Exit requested. Closing session.",
+    "feedback_description_prompt": (
+        "Type a one-line description then Enter to submit; "
+        "press Enter with no text to skip the description."
+    ),
+    "feedback_thanks": "Thanks for your feedback!",
+    "feedback_transcript_not_found": "not found",
+    "feedback_upload_failed": "Feedback upload failed: {error}. Please retry later.",
+    "feedback_upload_internal_error": (
+        "Feedback upload failed: internal error. Please retry later."
+    ),
+    "feedback_upload_notice": (
+        "Will upload this session's transcript {transcript_name} "
+        "({transcript_size}) and the last {log_tail_size} of agent.log "
+        "to the server for analysis."
+    ),
+    "feedback_upload_ok": "Feedback uploaded, id {feedback_id}. Thank you!",
+    "feedback_value_unknown": "unknown",
+    "image_clipboard_empty": (
+        "No image in the clipboard (or this platform has no clipboard reader command)."
+    ),
+    "image_dropped_feedback_draft": (
+        "A feedback draft cannot carry images; dropped {count} image(s)."
+    ),
+    "image_dropped_slash_command": (
+        "A slash command cannot carry images; dropped {count} image(s)."
+    ),
+    "image_file_unusable": "Cannot use this image: {name}: {error}",
+    "image_model_unsupported": (
+        "The current model {display} does not support image input; "
+        "the paste was cancelled."
+    ),
+    "image_paste_input_stale": (
+        "The input was submitted or cleared, so the image paste was cancelled."
+    ),
+    "image_placeholder_orphaned": (
+        "{count} image placeholder(s) are no longer in the input box; "
+        "those images were dropped."
+    ),
+    "image_unusable": "Cannot use this image: {error}",
+    "mode_switch_failed": "Failed to switch permission mode: {error}",
+    "ps_unavailable_local_ui": (
+        "/ps is not available while another local UI is open."
+    ),
+    "question_cancelled": "Question cancelled; sent a refusal message.",
+    "queue_enqueue_failed": "Failed to queue the message: {error}",
+    "queue_full": "Message queue is full; wait for the current task to finish.",
+    "queue_session_unavailable": (
+        "The session cannot accept queued messages right now: {error}"
+    ),
+    "queue_withdrew_images_lost": (
+        "Withdrew {count} queued message(s); their images cannot be restored from "
+        "the input history, so paste them again. "
+        "The text can be recalled with Up."
+    ),
+    "queue_withdrew_recall_hint": (
+        "Withdrew {count} queued message(s); press Up to recall from input history."
+    ),
+    "queue_withdrew_restored": (
+        "Withdrew {count} queued message(s); restored to the input box."
+    ),
+    "slash_custom_busy": (
+        "A task is running, so a custom slash command cannot be queued. "
+        "Wait for the current task to finish."
+    ),
+    "thinking_display_disabled": "Thinking display disabled.",
+    "thinking_display_enabled": "Thinking display enabled.",
+    "transcript_empty": "No transcript entries yet. Send a message first.",
+    "transcript_viewer_failed": "Transcript viewer failed: {error}",
+}
+
+__all__ = ["EN"]

comate_cli-0.10.19b2/comate_cli/terminal_agent/i18n/_ja.py

@@ -0,0 +1,90 @@
+"""日本語メッセージ表。key は `message` と一対一で対応する。"""
+
+from __future__ import annotations
+
+JA: dict[str, str] = {
+    "exit_requested": "終了を要求しました。セッションを閉じています。",
+    "feedback_description_prompt": (
+        "説明を 1 行入力して Enter で送信します。"
+        "何も入力せずに Enter を押すと説明をスキップします。"
+    ),
+    "feedback_thanks": "フィードバックをありがとうございます！",
+    "feedback_transcript_not_found": "見つかりません",
+    "feedback_upload_failed": (
+        "フィードバックのアップロードに失敗しました：{error}。"
+        "しばらくしてから再試行してください。"
+    ),
+    "feedback_upload_internal_error": (
+        "フィードバックのアップロードに失敗しました：内部エラーです。"
+        "しばらくしてから再試行してください。"
+    ),
+    "feedback_upload_notice": (
+        "現在のセッションのトランスクリプト {transcript_name}"
+        "（{transcript_size}）と agent.log の末尾 {log_tail_size} を"
+        "サーバーにアップロードして分析します。"
+    ),
+    "feedback_upload_ok": (
+        "フィードバックをアップロードしました。id は {feedback_id} です。"
+        "ありがとうございます！"
+    ),
+    "feedback_value_unknown": "不明",
+    "image_clipboard_empty": (
+        "クリップボードに画像がありません"
+        "（またはこのプラットフォームにクリップボード読み取りコマンドがありません）。"
+    ),
+    "image_dropped_feedback_draft": (
+        "フィードバックの下書きには画像を添付できないため、"
+        "{count} 枚の画像を破棄しました。"
+    ),
+    "image_dropped_slash_command": (
+        "スラッシュコマンドには画像を添付できないため、{count} 枚の画像を破棄しました。"
+    ),
+    "image_file_unusable": "この画像は使用できません：{name}：{error}",
+    "image_model_unsupported": (
+        "現在のモデル {display} は画像入力に対応していないため、"
+        "貼り付けをキャンセルしました。"
+    ),
+    "image_paste_input_stale": (
+        "入力が送信または消去されたため、画像の貼り付けをキャンセルしました。"
+    ),
+    "image_placeholder_orphaned": (
+        "{count} 件の画像プレースホルダーが入力欄に残っていないため、画像を破棄しました。"
+    ),
+    "image_unusable": "この画像は使用できません：{error}",
+    "mode_switch_failed": "権限モードの切り替えに失敗しました：{error}",
+    "ps_unavailable_local_ui": (
+        "他のローカル UI が開いているため、/ps は利用できません。"
+    ),
+    "question_cancelled": "質問をキャンセルし、拒否の返信を送信しました。",
+    "queue_enqueue_failed": "メッセージのキュー追加に失敗しました：{error}",
+    "queue_full": "メッセージキューが満杯です。現在のタスクの完了をお待ちください。",
+    "queue_session_unavailable": (
+        "セッションは現在キューへのメッセージを受け付けられません：{error}"
+    ),
+    "queue_withdrew_images_lost": (
+        "キュー内のメッセージ {count} 件を取り消しました。"
+        "画像は入力履歴から復元できないため、貼り付け直してください。"
+        "テキストは Up キーで履歴から呼び出せます。"
+    ),
+    "queue_withdrew_recall_hint": (
+        "キュー内のメッセージ {count} 件を取り消しました。"
+        "Up キーで入力履歴から呼び出せます。"
+    ),
+    "queue_withdrew_restored": (
+        "キュー内のメッセージ {count} 件を取り消し、入力欄に復元しました。"
+    ),
+    "slash_custom_busy": (
+        "タスクの実行中は、カスタムスラッシュコマンドをキューに入れて実行できません。"
+        "現在のタスクの完了をお待ちください。"
+    ),
+    "thinking_display_disabled": "思考プロセスの表示をオフにしました。",
+    "thinking_display_enabled": "思考プロセスの表示をオンにしました。",
+    "transcript_empty": (
+        "トランスクリプトの記録がまだありません。まずメッセージを送信してください。"
+    ),
+    "transcript_viewer_failed": (
+        "トランスクリプトビューアを開けませんでした：{error}"
+    ),
+}
+
+__all__ = ["JA"]

comate_cli-0.10.19b2/comate_cli/terminal_agent/i18n/_zh.py

@@ -0,0 +1,50 @@
+"""简体中文文案表。key 与 `message` 一一对应。"""
+
+from __future__ import annotations
+
+ZH: dict[str, str] = {
+    "exit_requested": "已请求退出，正在关闭会话。",
+    "feedback_description_prompt": (
+        "输入一行描述后按 Enter 提交；不输入内容直接按 Enter 可跳过描述。"
+    ),
+    "feedback_thanks": "感谢你的反馈！",
+    "feedback_transcript_not_found": "未找到",
+    "feedback_upload_failed": "反馈上传失败：{error}，请稍后重试。",
+    "feedback_upload_internal_error": "反馈上传失败：内部错误，请稍后重试。",
+    "feedback_upload_notice": (
+        "将把当前会话的 transcript {transcript_name}（{transcript_size}）"
+        "与 agent.log 的最后 {log_tail_size} 上传到服务端用于分析。"
+    ),
+    "feedback_upload_ok": "反馈已上传，id 为 {feedback_id}，感谢！",
+    "feedback_value_unknown": "未知",
+    "image_clipboard_empty": "剪贴板中没有图片（或当前平台缺少剪贴板读取命令）。",
+    "image_dropped_feedback_draft": "反馈草稿不支持携带图片，已丢弃 {count} 张图。",
+    "image_dropped_slash_command": "slash 命令不支持携带图片，已丢弃 {count} 张图。",
+    "image_file_unusable": "图片无法使用：{name}：{error}",
+    "image_model_unsupported": "当前模型 {display} 不支持图片输入，已取消贴图。",
+    "image_paste_input_stale": "输入内容已经提交或清空，贴图请求已取消。",
+    "image_placeholder_orphaned": "{count} 张图片的字面量已不在输入框中，图片已被丢弃。",
+    "image_unusable": "图片无法使用：{error}",
+    "mode_switch_failed": "切换权限模式失败：{error}",
+    "ps_unavailable_local_ui": "另一个本地界面正在打开，/ps 暂不可用。",
+    "question_cancelled": "已取消提问，并已发送拒绝答复。",
+    "queue_enqueue_failed": "消息排队失败：{error}",
+    "queue_full": "消息队列已满，请等待当前任务完成。",
+    "queue_session_unavailable": "会话暂时无法接收排队消息：{error}",
+    "queue_withdrew_images_lost": (
+        "已撤回 {count} 条排队消息；其中的图片无法从输入历史恢复，请重新粘贴。"
+        "文本可按 Up 从历史召回。"
+    ),
+    "queue_withdrew_recall_hint": "已撤回 {count} 条排队消息，按 Up 可从输入历史召回。",
+    "queue_withdrew_restored": "已撤回 {count} 条排队消息，内容已还原到输入框。",
+    "slash_custom_busy": (
+        "当前任务运行中，custom slash command 不能排队执行，"
+        "请等待当前任务结束后再运行。"
+    ),
+    "thinking_display_disabled": "已关闭思考过程显示。",
+    "thinking_display_enabled": "已开启思考过程显示。",
+    "transcript_empty": "还没有 transcript 条目，请先发送一条消息。",
+    "transcript_viewer_failed": "无法打开 transcript 查看器：{error}",
+}
+
+__all__ = ["ZH"]

comate_cli-0.10.19b2/comate_cli/terminal_agent/i18n/message.py

@@ -0,0 +1,50 @@
+"""所有 i18n 消息 key。
+
+成员值即 key 字符串，扁平命名 + 领域前缀。`set(message)` 可枚举，
+翻译表覆盖测试靠它一条断言就能发现漏翻。
+"""
+
+from __future__ import annotations
+
+from enum import StrEnum
+
+
+class message(StrEnum):  # noqa: N801 - 调用形态是 i18n(message.key)，小写更贴近命名空间
+    exit_requested = "exit_requested"
+    feedback_description_prompt = "feedback_description_prompt"
+    feedback_thanks = "feedback_thanks"
+    feedback_transcript_not_found = "feedback_transcript_not_found"
+    feedback_upload_failed = "feedback_upload_failed"
+    feedback_upload_internal_error = "feedback_upload_internal_error"
+    feedback_upload_notice = "feedback_upload_notice"
+    feedback_upload_ok = "feedback_upload_ok"
+    # feedback id / 服务端错误两个数据槽位取不到值时的填充词，避免往中日文
+    # 句子里塞英文 unknown。transcript 读不到是「文件不在」而非「值未知」，
+    # 语义不同，用 feedback_transcript_not_found，不并到这里。
+    feedback_value_unknown = "feedback_value_unknown"
+    image_clipboard_empty = "image_clipboard_empty"
+    image_dropped_feedback_draft = "image_dropped_feedback_draft"
+    image_dropped_slash_command = "image_dropped_slash_command"
+    image_file_unusable = "image_file_unusable"
+    image_model_unsupported = "image_model_unsupported"
+    image_paste_input_stale = "image_paste_input_stale"
+    image_placeholder_orphaned = "image_placeholder_orphaned"
+    image_unusable = "image_unusable"
+    mode_switch_failed = "mode_switch_failed"
+    ps_unavailable_local_ui = "ps_unavailable_local_ui"
+    question_cancelled = "question_cancelled"
+    queue_enqueue_failed = "queue_enqueue_failed"
+    queue_full = "queue_full"
+    queue_session_unavailable = "queue_session_unavailable"
+    # 三条撤回提示语义不同（能否恢复、恢复到哪里），各自成句，不做条件分支模板。
+    queue_withdrew_images_lost = "queue_withdrew_images_lost"
+    queue_withdrew_recall_hint = "queue_withdrew_recall_hint"
+    queue_withdrew_restored = "queue_withdrew_restored"
+    slash_custom_busy = "slash_custom_busy"
+    thinking_display_disabled = "thinking_display_disabled"
+    thinking_display_enabled = "thinking_display_enabled"
+    transcript_empty = "transcript_empty"
+    transcript_viewer_failed = "transcript_viewer_failed"
+
+
+__all__ = ["message"]

{comate_cli-0.10.18b2 → comate_cli-0.10.19b2}/comate_cli/terminal_agent/image_chips.py

@@ -1,8 +1,12 @@
-"""输入框图片 chip 的纯函数工具。
+"""输入框折叠字面量的纯函数工具。
 
-chip 字面量固定为 ``[Pasted image #k: label]``。本地编号只负责输入框
+图片 chip 字面量固定为 ``[Pasted image #k: label]``。本地编号只负责输入框
 字面量与图片 payload 对齐；SDK canonical ``[Image #N]`` 编号仍由 runtime
 会话级计数器负责。
+
+长文本粘贴折叠占位符 ``[Pasted Content N chars]`` 的构造与识别也收在本模块：
+生成方（input_behavior）与消费方（输入框 lexer 高亮）必须共用同一份格式，
+否则改一处就会静默失配。
 """
 
 from __future__ import annotations
@@ -13,6 +17,12 @@ from typing import Sequence
 from comate_agent_sdk.llm.messages import ContentPartImageParam
 
 IMAGE_CHIP_RE = re.compile(r"\[Pasted image #([0-9]+): ([^\]\r\n]+)\]")
+PASTE_PLACEHOLDER_RE = re.compile(r"\[Pasted Content ([0-9]+) chars\]")
+
+
+def format_paste_placeholder(char_count: int) -> str:
+    """长文本粘贴的折叠占位符；与 ``PASTE_PLACEHOLDER_RE`` 互为逆。"""
+    return f"[Pasted Content {char_count} chars]"
 
 
 def format_image_chip(number: int, label: str) -> str:
@@ -20,14 +30,22 @@ def format_image_chip(number: int, label: str) -> str:
     return f"[Pasted image #{number}: {safe_label}]"
 
 
-def chip_numbers_in_text(text: str) -> list[int]:
-    """按出现顺序返回 chip 编号；重复编号只保留首个。"""
-    seen: set[int] = set()
-    ordered: list[int] = []
+def _valid_chip_matches(text: str) -> list[re.Match[str]]:
+    """格式合法的 chip 匹配；label 带首尾空白或换行的不算 chip 字面量。"""
+    matches: list[re.Match[str]] = []
     for match in IMAGE_CHIP_RE.finditer(text):
         label = match.group(2)
         if label != label.strip() or len(label.splitlines()) != 1:
             continue
+        matches.append(match)
+    return matches
+
+
+def chip_numbers_in_text(text: str) -> list[int]:
+    """按出现顺序返回 chip 编号；重复编号只保留首个。"""
+    seen: set[int] = set()
+    ordered: list[int] = []
+    for match in _valid_chip_matches(text):
         number = int(match.group(1))
         if number in seen:
             continue
@@ -36,6 +54,20 @@ def chip_numbers_in_text(text: str) -> list[int]:
     return ordered
 
 
+def image_chip_spans(text: str) -> list[tuple[int, int]]:
+    """按出现顺序返回格式合法的 chip 字面量区间，供输入框高亮使用。
+
+    只做格式判定，不做编号去重：高亮标注的是「这段是 chip 字面量」，
+    重复编号只在提交时决定谁带出图片。
+    """
+    return [match.span() for match in _valid_chip_matches(text)]
+
+
+def paste_placeholder_spans(text: str) -> list[tuple[int, int]]:
+    """按出现顺序返回长文本折叠占位符区间，供输入框高亮使用。"""
+    return [match.span() for match in PASTE_PLACEHOLDER_RE.finditer(text)]
+
+
 def collect_parts_for_submit(
     text: str,
     chips: dict[int, ContentPartImageParam],

comate_cli-0.10.19b2/comate_cli/terminal_agent/locale.py

@@ -0,0 +1,103 @@
+"""Locale detection shared by every user-facing language decision in the CLI.
+
+这里只放通用的 locale 基础设施：从系统读候选、归一化成受支持的 locale key、
+再压平成界面语言。update_messages（更新提示）、tips（loading tip）等业务模块
+都从这里取同一份实现，避免各自维护一份探测逻辑。
+"""
+
+from __future__ import annotations
+
+import locale
+import logging
+import os
+import sys
+
+logger = logging.getLogger(__name__)
+
+
+def _windows_ui_locale() -> str | None:
+    """Return the Windows user UI locale string, or None when unavailable."""
+    if sys.platform != "win32":
+        return None
+    try:
+        import ctypes
+
+        lang_id = ctypes.windll.kernel32.GetUserDefaultUILanguage()
+        return locale.windows_locale.get(lang_id)
+    except Exception:
+        logger.debug("windows UI locale detection failed", exc_info=True)
+        return None
+
+
+def system_locale_candidates() -> list[str]:
+    """Return non-empty locale candidates in user-intent priority order."""
+    candidates: list[str] = []
+    for env_var in ("LC_ALL", "LC_MESSAGES", "LANG", "LANGUAGE"):
+        value = os.environ.get(env_var)
+        if value:
+            candidates.append(value)
+    windows_locale = _windows_ui_locale()
+    if windows_locale:
+        candidates.append(windows_locale)
+    try:
+        lang, _encoding = locale.getlocale()
+    except Exception:
+        lang = None
+    if lang:
+        candidates.append(lang)
+    return candidates
+
+
+def detect_update_locale() -> str:
+    for candidate in system_locale_candidates():
+        normalized = _normalize_locale(candidate)
+        if normalized:
+            return normalized
+    return "en"
+
+
+def _normalize_locale(raw_locale: object) -> str | None:
+    if not raw_locale:
+        return None
+    text = str(raw_locale).strip().lower().replace("-", "_")
+    if not text:
+        return None
+    text = text.split(":", 1)[0]
+    text = text.split(".", 1)[0]
+    if text.startswith(("zh_cn", "zh_hans", "zh_sg")):
+        return "zh_cn"
+    if text.startswith(("zh_tw", "zh_hant", "zh_hk")):
+        return "zh_tw"
+    if text.startswith("ja"):
+        return "ja"
+    return "en"
+
+
+def ui_language_for_locale(locale_key: str | None) -> str:
+    """Map a normalized locale key to the CLI interface language.
+
+    入参是 :func:`detect_update_locale` 的归一化结果
+    （``"zh_cn"`` / ``"zh_tw"`` / ``"ja"`` / ``"en"``），出参是界面语言三档
+    ``"zh"`` / ``"ja"`` / ``"en"``。
+
+    界面语言只有这三档：简体中文、日语，其余（含繁体中文）一律英文兜底——
+    这与既有 i18n 设计文档「繁体中文不在范围」的边界保持一致。这是 locale
+    到界面语言的唯一映射，需要按界面语言取文案的消费者都从这里取，不要另造
+    一份。（``update_messages`` 的消息表按 locale_key 直接索引、区分繁简，
+    不经过这个函数。）
+
+    注意：不要改用 ``update_check._is_chinese_locale()``。那个函数服务于
+    PyPI 镜像源选择，对某些地区代码的归类与界面语言归一化**故意不一致**。
+    """
+    if locale_key == "zh_cn":
+        return "zh"
+    if locale_key == "ja":
+        return "ja"
+    return "en"
+
+
+__all__ = [
+    "detect_update_locale",
+    "system_locale_candidates",
+    "ui_language_for_locale",
+]

{comate_cli-0.10.18b2 → comate_cli-0.10.19b2}/comate_cli/terminal_agent/skill_slash_input.py

@@ -16,6 +16,11 @@ from comate_agent_sdk.skill.mentions import (
     model_visible_skill_slash_commands,
 )
 
+from comate_cli.terminal_agent.image_chips import (
+    image_chip_spans,
+    paste_placeholder_spans,
+)
+
 
 class SkillSlashMentionLexer(Lexer):
     def __init__(self, *, get_skills: Callable[[], Iterable[Any] | None]) -> None:
@@ -96,17 +101,47 @@ class CompositeAutoSuggest(AutoSuggest):
         return None
 
 
+def _highlight_spans(line: str, skills: Iterable[Any]) -> list[tuple[int, int, str]]:
+    """收集本行三类可高亮字面量的区间，返回按出现顺序排列且互不重叠的结果。
+
+    起点相同时长者优先，重叠时先到者赢。当前三类字面量的首字符互斥
+    （``/`` 与 ``[``），这条规则是为了不让后续改动依赖那个巧合。
+    """
+    spans: list[tuple[int, int, str]] = [
+        (mention.start, mention.end, "class:input.skill-slash")
+        for mention in iter_model_visible_skill_slash_mentions(line, skills)
+    ]
+    spans.extend(
+        (start, end, "class:input.image-chip")
+        for start, end in image_chip_spans(line)
+    )
+    spans.extend(
+        (start, end, "class:input.paste-placeholder")
+        for start, end in paste_placeholder_spans(line)
+    )
+    spans.sort(key=lambda span: (span[0], -span[1]))
+
+    accepted: list[tuple[int, int, str]] = []
+    cursor = 0
+    for start, end, style in spans:
+        if start < cursor:
+            continue
+        accepted.append((start, end, style))
+        cursor = end
+    return accepted
+
+
 def _highlight_line(line: str, skills: Iterable[Any]) -> list[tuple[str, str]]:
-    mentions = iter_model_visible_skill_slash_mentions(line, skills)
-    if not mentions:
+    spans = _highlight_spans(line, skills)
+    if not spans:
         return [("", line)]
     fragments: list[tuple[str, str]] = []
     cursor = 0
-    for mention in mentions:
-        if mention.start > cursor:
-            fragments.append(("", line[cursor : mention.start]))
-        fragments.append(("class:input.skill-slash", line[mention.start : mention.end]))
-        cursor = mention.end
+    for start, end, style in spans:
+        if start > cursor:
+            fragments.append(("", line[cursor:start]))
+        fragments.append((style, line[start:end]))
+        cursor = end
     if cursor < len(line):
         fragments.append(("", line[cursor:]))
     return fragments

{comate_cli-0.10.18b2 → comate_cli-0.10.19b2}/comate_cli/terminal_agent/theme.py

@@ -60,6 +60,7 @@ DIFF_REMOVED_BG = "#3D0100"         # CC native dark deleteLine rgb(61,1,0)
 DIFF_ADDED_FG = "#50C850"           # diff marker 装饰前景（CC native dark addDecoration rgb(80,200,80)）
 DIFF_REMOVED_FG = "#DC5A5A"         # CC native dark deleteDecoration rgb(220,90,90)
 SKILL_SLASH_STYLE = ACCENT_SOFT     # CLI 侧 skill slash 高亮（不再消费 SDK 常量）
+IMAGE_CHIP_STYLE = "#C792EA"        # 输入框图片 chip：真实挂载的多模态 payload，与青色系的 skill slash 区分
 IN_PROGRESS_MARKER = "#D77757"      # 进行中任务实心方块 ◼（对齐 Claude Code claude 橙 rgb(215,119,87)）
 ANNOUNCEMENT_ACCENT = "#d77757"     # 发行版公告 标题/引用/链接（同 Claude 橙，语义独立于 in-progress）
 
@@ -98,6 +99,8 @@ def main_tui_style_dict() -> dict[str, str]:
         "input.prompt": f"bg:default {ACCENT} bold",
         "input.line": f"bg:default {TEXT_BRIGHT}",
         "input.skill-slash": f"bg:default {SKILL_SLASH_STYLE}",
+        "input.image-chip": f"bg:default {IMAGE_CHIP_STYLE}",
+        "input.paste-placeholder": f"bg:default {TEXT_FAINT}",
         "input-line": f"bg:default {TEXT_BRIGHT}",
         "status": f"bg:default {TEXT_MUTED}",
         "status.mode.act": f"bg:default {MODE_ACT} bold",