comate-cli 0.10.2__tar.gz → 0.10.4__tar.gz

{comate_cli-0.10.2 → comate_cli-0.10.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: comate-cli
-Version: 0.10.2
+Version: 0.10.4
 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.10.2 → comate_cli-0.10.4}/comate_cli/terminal_agent/markdown_render.py

@@ -6,31 +6,35 @@ from rich.segment import Segment
 from rich.style import Style
 from rich.text import Text
 from rich.theme import Theme
+from rich.color import Color, ColorType
+
+from prompt_toolkit.styles.base import ANSI_COLOR_NAMES
 
 from comate_cli.terminal_agent import theme
 
 Fragment = tuple[str, str]
 
 _MIN_WIDTH = 40
-_CODE_THEME = "nord"  # 冷灰蓝系，与 Nico Dark 同族（spec 第 5 节）
+_CODE_THEME = "ansi_dark"  # Rich 内置 ANSI 主题：无背景，token 映射终端 16 色（对齐 CC cli-highlight）
 
 MARKDOWN_RICH_STYLES: dict[str, str] = {
-    "markdown.paragraph": theme.TEXT,
-    "markdown.h1": f"bold underline {theme.TEXT_BRIGHT}",
-    "markdown.h2": f"bold {theme.TEXT_BRIGHT}",
-    "markdown.h3": f"bold {theme.TEXT_BRIGHT}",
-    "markdown.h4": f"bold {theme.TEXT_BRIGHT}",
-    "markdown.h5": f"bold {theme.TEXT_BRIGHT}",
-    "markdown.h6": f"bold {theme.TEXT_BRIGHT}",
-    "markdown.strong": f"bold {theme.TEXT_BRIGHT}",
-    "markdown.em": f"italic {theme.TEXT}",
+    # CC 模型：正文零前景色，只用属性；颜色仅出现在行内代码与代码块语法高亮。
+    "markdown.paragraph": "",
+    "markdown.h1": "bold italic underline",
+    "markdown.h2": "bold",
+    "markdown.h3": "bold",
+    "markdown.h4": "bold",
+    "markdown.h5": "bold",
+    "markdown.h6": "bold",
+    "markdown.strong": "bold",
+    "markdown.em": "italic",
     "markdown.code": theme.INLINE_CODE,
-    "markdown.block_quote": f"italic {theme.TEXT_MUTED}",
-    "markdown.item": theme.TEXT,
-    "markdown.item.bullet": f"bold {theme.TEXT_BRIGHT}",
-    "markdown.item.number": f"bold {theme.TEXT_BRIGHT}",
-    "markdown.link": f"underline {theme.ACCENT}",
-    "markdown.link_url": f"underline {theme.ACCENT}",
+    "markdown.block_quote": "italic",
+    "markdown.item": "",
+    "markdown.item.bullet": "",
+    "markdown.item.number": "",
+    "markdown.link": "underline",
+    "markdown.link_url": "underline",
 }
 
 _MARKDOWN_THEME = Theme(MARKDOWN_RICH_STYLES)
@@ -132,6 +136,29 @@ def render_markdown_to_rich(content: str, *, width: int) -> Text:
         return Text(str(content).strip("\n"))
 
 
+def _rich_color_to_pt(color: Color | None) -> str | None:
+    """把 Rich Color 映射成 prompt_toolkit 颜色 token。
+
+    ANSI 标准/8-bit 色（number 0-15）没有 RGB triplet；缺这个分支时
+    rich_style_to_prompt_toolkit_style 会把 ansi_dark 的每个语法高亮色
+    静默丢弃（transcript viewer 的 pt-fragment 路径）。
+    prompt_toolkit 的 ANSI_COLOR_NAMES 首位是 'ansidefault'，整体偏移 1，
+    故 Rich color number N 对应 ANSI_COLOR_NAMES[N + 1]。
+    """
+    if color is None:
+        return None
+    number = color.number
+    if (
+        color.type in (ColorType.STANDARD, ColorType.EIGHT_BIT)
+        and number is not None
+        and number < 16
+    ):
+        return ANSI_COLOR_NAMES[number + 1]
+    if color.triplet is not None:
+        return color.triplet.hex
+    return None
+
+
 def rich_style_to_prompt_toolkit_style(rich_style: Style) -> str:
     parts: list[str] = []
     if getattr(rich_style, "bold", False):
@@ -144,10 +171,12 @@ def rich_style_to_prompt_toolkit_style(rich_style: Style) -> str:
         parts.append("dim")
     if getattr(rich_style, "reverse", False):
         parts.append("reverse")
-    if rich_style.color and rich_style.color.triplet:
-        parts.append(f"fg:{rich_style.color.triplet.hex}")
-    if rich_style.bgcolor and rich_style.bgcolor.triplet:
-        parts.append(f"bg:{rich_style.bgcolor.triplet.hex}")
+    fg = _rich_color_to_pt(rich_style.color)
+    if fg is not None:
+        parts.append(f"fg:{fg}")
+    bg = _rich_color_to_pt(rich_style.bgcolor)
+    if bg is not None:
+        parts.append(f"bg:{bg}")
     return " ".join(parts)
 
 

{comate_cli-0.10.2 → comate_cli-0.10.4}/comate_cli/terminal_agent/theme.py

@@ -35,7 +35,7 @@ PALETTE: dict[str, str] = {
 }
 
 # ── 派生色（仅限指定用途，spec 第 3 节）───────────────────────────────
-INLINE_CODE = "#A5DFF7"             # markdown 行内代码（比 accent 安静的浅青）
+INLINE_CODE = "cyan"                # markdown 行内代码：终端原生 ANSI 青，继承 shell 主题
 SWEEP_BASE_RGB = (78, 134, 166)     # #4E86A6 流光基色
 SWEEP_MID_RGB = (103, 213, 255)     # #67D5FF 流光峰值＝品牌青
 SWEEP_HIGH_RGB = (224, 246, 255)    # #E0F6FF 流光高光

{comate_cli-0.10.2 → comate_cli-0.10.4}/comate_cli/terminal_agent/update_check.py

@@ -408,11 +408,17 @@ def format_update_hint(info: UpdateInfo, target: UpdateTarget | None = None) ->
 
     update_target = _target_for_info(info, target)
     messages = get_update_messages()
-    hint_template = messages.windows_hint if sys.platform == "win32" else messages.hint
+    is_windows = sys.platform == "win32"
+    command = _format_update_command(update_target)
+    if is_windows:
+        from comate_cli.terminal_agent.windows_updater import windows_update_command_text
+
+        command = windows_update_command_text(update_target)
+    hint_template = messages.windows_hint if is_windows else messages.hint
     return hint_template.format(
         product=update_target.product_label,
         package=update_target.package,
-        command=_format_update_command(update_target),
+        command=command,
         current=info.current_version,
         latest=info.latest_version,
     )
@@ -589,7 +595,12 @@ async def run_update_command(
     command_text = " ".join(command)
     messages = get_update_messages()
     if sys.platform == "win32":
-        from comate_cli.terminal_agent.windows_updater import spawn_detached_updater
+        from comate_cli.terminal_agent.windows_updater import (
+            spawn_detached_updater,
+            windows_update_command_text,
+        )
+
+        windows_command_text = windows_update_command_text(update_target)
 
         if spawn_detached_updater(info, target=update_target):
             console.out(
@@ -605,7 +616,7 @@ async def run_update_command(
             messages.windows_manual_update.format(
                 product=update_target.product_label,
                 package=update_target.package,
-                command=command_text,
+                command=windows_command_text,
                 current=info.current_version,
                 latest=info.latest_version,
             ),

{comate_cli-0.10.2 → comate_cli-0.10.4}/comate_cli/terminal_agent/update_messages.py

@@ -61,8 +61,9 @@ _MESSAGES: dict[str, UpdateMessages] = {
             "windows and run `{command}` in a new PowerShell to update manually."
         ),
         windows_update_result_timeout=(
-            "Background update to {latest} did not run: {product} windows stayed open "
-            'past the wait limit. Choose "Update now" again, or run `{command}` manually.'
+            "Background update to {latest} did not run: {product} did not finish "
+            'shutting down before the wait limit. Choose "Update now" again, or run '
+            "`{command}` manually."
         ),
         success="🎉 Update ran successfully! Please restart {product}.",
         failure=(
@@ -105,7 +106,7 @@ _MESSAGES: dict[str, UpdateMessages] = {
             "在新的 PowerShell 中运行 `{command}` 手动更新。"
         ),
         windows_update_result_timeout=(
-            "后台更新到 {latest} 未执行：等待 {product} 窗口关闭超时。"
+            "后台更新到 {latest} 未执行：{product} 退出未完成，等待超时。"
             "可再次选择“立即更新”，或手动运行 `{command}`。"
         ),
         success="🎉 更新命令已成功执行！请重启 {product}。",
@@ -149,7 +150,7 @@ _MESSAGES: dict[str, UpdateMessages] = {
             "在新的 PowerShell 中執行 `{command}` 手動更新。"
         ),
         windows_update_result_timeout=(
-            "背景更新到 {latest} 未執行：等待 {product} 視窗關閉逾時。"
+            "背景更新到 {latest} 未執行：{product} 結束未完成，等待逾時。"
             "可再次選擇「立即更新」，或手動執行 `{command}`。"
         ),
         success="🎉 更新命令已成功執行！請重新啟動 {product}。",
@@ -194,8 +195,8 @@ _MESSAGES: dict[str, UpdateMessages] = {
             "を実行して手動で更新してください。"
         ),
         windows_update_result_timeout=(
-            "{latest} へのバックグラウンド更新は実行されませんでした：{product} ウィンドウが"
-            "閉じられるのを待機中にタイムアウトしました。もう一度「今すぐ更新」を選ぶか、"
+            "{latest} へのバックグラウンド更新は実行されませんでした：{product} が"
+            "待機時間内に終了しませんでした。もう一度「今すぐ更新」を選ぶか、"
             "`{command}` を手動で実行してください。"
         ),
         success="🎉 更新コマンドが正常に完了しました。{product} を再起動してください。",

{comate_cli-0.10.2 → comate_cli-0.10.4}/comate_cli/terminal_agent/windows_updater.py

@@ -10,6 +10,7 @@ from __future__ import annotations
 
 import json
 import logging
+import os
 import shutil
 import subprocess
 from contextlib import suppress
@@ -31,14 +32,23 @@ UPDATER_CREATIONFLAGS = (
     _DETACHED_PROCESS | _CREATE_NEW_PROCESS_GROUP | _CREATE_NO_WINDOW
 )
 
-_WAIT_TIMEOUT_MINUTES = 10
-_POLL_INTERVAL_SECONDS = 2
+_PARENT_WAIT_TIMEOUT_SECONDS = 60
+_POST_PARENT_EXIT_GRACE_MS = 800
 _VALID_STATUSES = frozenset({"success", "failed", "timeout"})
 
 _SCRIPT_TEMPLATE = """\
 $ErrorActionPreference = 'Stop'
 $resultPath = __RESULT_PATH__
 $logPath = __LOG_PATH__
+$parentPid = __PARENT_PID__
+$commandName = __COMMAND_NAME__
+$processFilter = __PROCESS_FILTER__
+$mutexName = __MUTEX_NAME__
+
+function Write-Log {
+    param([string]$Message)
+    Add-Content -LiteralPath $logPath -Value $Message -Encoding UTF8
+}
 
 function Write-UpdateResult {
     param($Status, $ExitCode)
@@ -53,16 +63,62 @@ function Write-UpdateResult {
     $payload | ConvertTo-Json | Set-Content -LiteralPath $resultPath -Encoding UTF8
 }
 
-try {
-    Set-Content -LiteralPath $logPath -Value ('updater started ' + (Get-Date)) -Encoding UTF8
-    $deadline = (Get-Date).AddMinutes(__WAIT_MINUTES__)
-    while (Get-Process -Name __COMMAND_NAME__ -ErrorAction SilentlyContinue) {
-        if ((Get-Date) -gt $deadline) {
-            Write-UpdateResult -Status 'timeout' -ExitCode $null
-            exit 0
+function Write-CommandProcessSnapshot {
+    param([string]$Label)
+    Write-Log ('[' + $Label + '] remaining processes named ' + $commandName + '.exe')
+    try {
+        $processes = Get-CimInstance Win32_Process -Filter $processFilter -ErrorAction SilentlyContinue
+        if (-not $processes) {
+            Write-Log '  none'
+            return
+        }
+        foreach ($proc in $processes) {
+            Write-Log (
+                '  PID=' + $proc.ProcessId +
+                ' ParentPID=' + $proc.ParentProcessId +
+                ' Created=' + $proc.CreationDate +
+                ' Path=' + $proc.ExecutablePath +
+                ' CommandLine=' + $proc.CommandLine
+            )
         }
-        Start-Sleep -Seconds __POLL_SECONDS__
+    } catch {
+        Write-Log ('  snapshot failed: ' + ($_ | Out-String))
+    }
+}
+
+$createdNew = $false
+$mutex = $null
+try {
+    Set-Content -LiteralPath $logPath -Value ('updater started ' + (Get-Date) + ' parent_pid=' + $parentPid) -Encoding UTF8
+    $mutex = [System.Threading.Mutex]::new($true, $mutexName, [ref]$createdNew)
+    if (-not $createdNew) {
+        Write-Log ('another updater already owns mutex ' + $mutexName)
+        exit 0
+    }
+
+    try {
+        Wait-Process -Id $parentPid -Timeout __WAIT_SECONDS__ -ErrorAction SilentlyContinue
+    } catch {
+        Write-Log ('parent wait raised: ' + ($_ | Out-String))
     }
+
+    $parent = Get-Process -Id $parentPid -ErrorAction SilentlyContinue
+    if ($parent) {
+        Write-Log ('parent process still running after timeout: PID=' + $parentPid)
+        Write-CommandProcessSnapshot -Label 'timeout'
+        Write-UpdateResult -Status 'timeout' -ExitCode $null
+        exit 0
+    }
+
+    Start-Sleep -Milliseconds __POST_PARENT_EXIT_GRACE_MS__
+    Write-CommandProcessSnapshot -Label 'before-uv'
+
+    $env:UV_HTTP_TIMEOUT = '30'
+    $env:PIP_NO_INPUT = '1'
+    $env:GIT_TERMINAL_PROMPT = '0'
+    $env:UV_NO_PROGRESS = '1'
+
+    Write-Log ('running uv: ' + __UV_COMMAND_TEXT__)
     $ErrorActionPreference = 'Continue'
     & __UV_PATH__ __UV_ARGS__ *>> $logPath
     $code = $LASTEXITCODE
@@ -75,6 +131,13 @@ try {
 } catch {
     ($_ | Out-String) | Add-Content -LiteralPath $logPath -Encoding UTF8
     Write-UpdateResult -Status 'failed' -ExitCode -1
+} finally {
+    if ($createdNew -and $null -ne $mutex) {
+        try { $mutex.ReleaseMutex() } catch {}
+    }
+    if ($null -ne $mutex) {
+        $mutex.Dispose()
+    }
 }
 """
 
@@ -114,19 +177,51 @@ def _ps_quote(value: str) -> str:
     return "'" + value.replace("'", "''") + "'"
 
 
+def _ps_double_quote(value: str) -> str:
+    return '"' + value.replace("`", "``").replace('"', '`"') + '"'
+
+
+def windows_update_command(target: "UpdateTarget") -> tuple[str, ...]:
+    """Windows repair-style uv command.
+
+    Keep this separate from UpdateTarget.update_command(): Linux/Mac preserve the
+    existing command, while Windows uses --reinstall to recover from partial tool
+    environment updates after file-lock failures.
+    """
+    return (
+        "uv",
+        "tool",
+        "install",
+        f"{target.package}@latest",
+        "--force",
+        "--reinstall",
+        "--refresh-package",
+        target.package,
+        *target.install_args,
+    )
+
+
+def windows_update_command_text(target: "UpdateTarget") -> str:
+    return " ".join(windows_update_command(target))
+
+
 def build_updater_script(
     *,
     info: "UpdateInfo",
     target: "UpdateTarget",
     uv_path: str,
     updates_dir: Path,
+    parent_pid: int,
 ) -> str:
+    command = windows_update_command(target)
     uv_args = (
-        f"tool install {_ps_quote(target.package + '@latest')} --force "
+        f"tool install {_ps_quote(target.package + '@latest')} --force --reinstall "
         f"--refresh-package {_ps_quote(target.package)}"
     )
     if target.install_args:
         uv_args += " " + " ".join(_ps_quote(arg) for arg in target.install_args)
+    uv_command_text = " ".join(command)
+    package_key = _package_key(target.package)
     replacements = {
         "__RESULT_PATH__": _ps_quote(
             str(result_path(target.package, updates_dir=updates_dir))
@@ -136,10 +231,14 @@ def build_updater_script(
         "__FROM_VERSION__": _ps_quote(info.current_version),
         "__TO_VERSION__": _ps_quote(info.latest_version),
         "__COMMAND_NAME__": _ps_quote(target.command_name),
+        "__PROCESS_FILTER__": _ps_double_quote(f"Name='{target.command_name}.exe'"),
+        "__MUTEX_NAME__": _ps_quote(f"Local\\comate-cli-updater-{package_key}"),
+        "__PARENT_PID__": str(int(parent_pid)),
         "__UV_PATH__": _ps_quote(uv_path),
         "__UV_ARGS__": uv_args,
-        "__WAIT_MINUTES__": str(_WAIT_TIMEOUT_MINUTES),
-        "__POLL_SECONDS__": str(_POLL_INTERVAL_SECONDS),
+        "__UV_COMMAND_TEXT__": _ps_quote(uv_command_text),
+        "__WAIT_SECONDS__": str(_PARENT_WAIT_TIMEOUT_SECONDS),
+        "__POST_PARENT_EXIT_GRACE_MS__": str(_POST_PARENT_EXIT_GRACE_MS),
     }
     script = _SCRIPT_TEMPLATE
     for token, value in replacements.items():
@@ -168,6 +267,7 @@ def spawn_detached_updater(
                 target=target,
                 uv_path=uv_path,
                 updates_dir=resolved_dir,
+                parent_pid=os.getpid(),
             ),
             encoding="utf-8-sig",
         )
@@ -244,7 +344,7 @@ def format_update_result_message(
         "package": target.package,
         "current": result.from_version,
         "latest": result.to_version,
-        "command": " ".join(target.update_command()),
+        "command": windows_update_command_text(target),
         "code": result.exit_code if result.exit_code is not None else "?",
     }
     if result.status == "success":

{comate_cli-0.10.2 → comate_cli-0.10.4}/pyproject.toml

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

{comate_cli-0.10.2 → comate_cli-0.10.4}/tests/test_history_printer.py

@@ -639,18 +639,15 @@ class TestAssistantMarkdownStyling(unittest.TestCase):
         ])
         plain = _strip_ansi(output)
         self.assertIn(f"{BULLET} Use foo now", plain)
-        # INLINE_CODE = #A5DFF7 → rgb(165,223,247)
-        self.assertIn("\x1b[38;2;165;223;247mfoo", output)
+        # 行内代码 = ANSI cyan（标准色 36），继承终端主题、不再是固定 hex
+        self.assertIn("\x1b[36mfoo", output)
 
-    def test_assistant_fenced_code_keeps_final_line_padding_in_scrollhistory(self) -> None:
+    def test_assistant_fenced_code_has_no_background_in_scrollhistory(self) -> None:
         output = self._render_to_str([
             HistoryEntry(entry_type="assistant", text="```json\n{\n   }\n```\n")
         ])
-        plain = _strip_ansi(output)
-        brace_line = next(line for line in plain.splitlines() if line.strip() == "}")
-        visible = brace_line.rstrip()
-
-        self.assertGreater(len(brace_line), len(visible), msg=repr(brace_line))
+        # ansi_dark 无背景：scrollhistory 里不应出现任何背景填充 SGR(48;...)
+        self.assertNotIn("\x1b[48", output)
 
     def test_markdown_styling_preserves_assistant_run_collapse(self) -> None:
         output = _strip_ansi(self._render_to_str([
@@ -668,3 +665,27 @@ class TestAssistantMarkdownStyling(unittest.TestCase):
         ))
         self.assertNotIn(BULLET, output)
         self.assertRegex(output, r"^ {2}Use foo now")
+
+    def test_staging_ansi_path_no_background_and_keeps_color(self) -> None:
+        # 复刻 render_panels 的 staging 捕获：render_history_group -> Console(force_terminal)
+        # -> ANSI() 解析。断言无背景且 ANSI 语法色被保留。
+        import io
+        from prompt_toolkit.formatted_text import ANSI, to_formatted_text
+        from comate_cli.terminal_agent.markdown_render import render_markdown_to_rich
+
+        buf = io.StringIO()
+        console = Console(file=buf, force_terminal=True, width=44)
+        group = render_history_group(
+            console,
+            [HistoryEntry(entry_type="assistant", text="```python\ndef f():\n    return 1\n```\n")],
+            terminal_width=44,
+            render_markdown_to_plain=render_markdown_to_rich,
+            assume_run_continues_at_tail=True,
+        )
+        assert group is not None
+        print_history_group_sync(console, group)
+        ansi_text = buf.getvalue()
+
+        self.assertNotIn("\x1b[48", ansi_text)  # 无背景填充
+        styles = {s for s, _ in to_formatted_text(ANSI(ansi_text)) if s}
+        self.assertTrue(any("ansi" in s for s in styles), styles)

{comate_cli-0.10.2 → comate_cli-0.10.4}/tests/test_markdown_render.py

@@ -5,7 +5,6 @@ import unittest
 from rich.console import Console
 from rich.style import Style
 
-from comate_cli.terminal_agent import theme
 from comate_cli.terminal_agent.markdown_render import (
     MARKDOWN_RICH_STYLES,
     render_markdown_to_plain,
@@ -65,33 +64,32 @@ class TestSingleLineNoLeadingBlank(unittest.TestCase):
 
 
 class TestClaudeDarkMarkdownTheme(unittest.TestCase):
-    def test_heading_rich_output_is_bold_underlined_no_italic(self) -> None:
-        """spec 第 5 节：h1 = text.bright 粗体 + 下划线（去斜体）。"""
+    def test_h1_is_bold_italic_underline(self) -> None:
+        """CC 模型：h1 = bold + italic + underline，零前景色。"""
         text = render_markdown_to_rich("# heading\n", width=80)
         spans = list(getattr(text, "spans", []))
         self.assertEqual(text.plain.splitlines(), ["heading"])
         styles = [str(span.style) for span in spans]
-        self.assertTrue(any("bold" in style for style in styles), styles)
-        self.assertTrue(any("underline" in style for style in styles), styles)
-        self.assertFalse(any("italic" in style for style in styles), styles)
+        self.assertTrue(any("bold" in s for s in styles), styles)
+        self.assertTrue(any("italic" in s for s in styles), styles)
+        self.assertTrue(any("underline" in s for s in styles), styles)
 
-    def test_inline_code_uses_permission_color(self) -> None:
+    def test_inline_code_uses_ansi_cyan(self) -> None:
         fragments = render_markdown_to_pt_fragments("use `foo` now", width=80)
         code_styles = [style for style, text in fragments if text == "foo"]
         self.assertTrue(code_styles, fragments)
         self.assertTrue(
-            any(f"fg:{theme.INLINE_CODE.lower()}" in style.lower() for style in code_styles),
+            any("fg:ansicyan" in style for style in code_styles),
             code_styles,
         )
 
-    def test_markdown_body_not_forced_white(self):
-        """spec 第 5 节：正文告别强制纯白。"""
-        self.assertNotIn("#ffffff", MARKDOWN_RICH_STYLES["markdown.paragraph"])
-        self.assertEqual(MARKDOWN_RICH_STYLES["markdown.paragraph"], theme.TEXT)
+    def test_markdown_body_has_no_forced_color(self):
+        """CC 模型：正文零前景色（空样式，继承终端默认色）。"""
+        self.assertEqual(MARKDOWN_RICH_STYLES["markdown.paragraph"], "")
 
-    def test_code_theme_is_nord(self):
+    def test_code_theme_is_ansi_dark(self):
         from comate_cli.terminal_agent.markdown_render import _CODE_THEME
-        self.assertEqual(_CODE_THEME, "nord")
+        self.assertEqual(_CODE_THEME, "ansi_dark")
 
     def test_blockquote_keeps_bar_and_italic_style(self) -> None:
         fragments = render_markdown_to_pt_fragments("> quoted text\n", width=80)
@@ -104,21 +102,13 @@ class TestClaudeDarkMarkdownTheme(unittest.TestCase):
         text = render_markdown_to_rich("```python\nprint(1)\n```\n", width=80)
         self.assertIn("print(1)", text.plain)
 
-    def test_fenced_code_preserves_padding_on_final_code_line(self) -> None:
-        text = render_markdown_to_rich("```json\n{\n   }\n```\n", width=40)
-        code_lines = [line for line in text.split("\n") if line.plain.strip()]
-        closing_line = next(line for line in code_lines if line.plain.strip() == "}")
-        visible = closing_line.plain.rstrip()
-
-        self.assertGreater(len(closing_line.plain), len(visible))
-        self.assertTrue(closing_line.plain.endswith(" "))
-
+    def test_fenced_code_has_no_background(self) -> None:
+        """CC 模型：代码块无背景盒——每个字符位的 bgcolor 都为 None。"""
+        text = render_markdown_to_rich("```python\nprint(1)\n```\n", width=40)
         console = Console(color_system="truecolor")
-        trailing_style = closing_line.get_style_at_offset(
-            console,
-            len(closing_line.plain) - 1,
-        )
-        self.assertIsNotNone(trailing_style.bgcolor)
+        for offset in range(len(text.plain)):
+            style = text.get_style_at_offset(console, offset)
+            self.assertIsNone(style.bgcolor, msg=(offset, text.plain[offset]))
 
     def test_prompt_toolkit_fragments_do_not_repeat_hash_for_truecolor(self) -> None:
         style = rich_style_to_prompt_toolkit_style(Style.parse("#b1b9f9 bold"))
@@ -126,6 +116,36 @@ class TestClaudeDarkMarkdownTheme(unittest.TestCase):
         self.assertIn("bold", style)
         self.assertNotIn("##", style)
 
+    def test_prompt_toolkit_fragments_map_ansi_standard_colors(self) -> None:
+        # ANSI 命名色无 RGB triplet；转换器必须映射到 pt 的 ansi* 名，
+        # 否则 ansi_dark 语法高亮在 pt-fragment 路径（transcript viewer）丢色。
+        self.assertIn(
+            "fg:ansicyan",
+            rich_style_to_prompt_toolkit_style(Style.parse("cyan")),
+        )
+        self.assertIn(
+            "fg:ansibrightblue",
+            rich_style_to_prompt_toolkit_style(Style.parse("bright_blue")),
+        )
+        # 属性 + ANSI 前景色共存
+        combined = rich_style_to_prompt_toolkit_style(Style.parse("bold cyan"))
+        self.assertIn("bold", combined)
+        self.assertIn("fg:ansicyan", combined)
+
+    def test_code_block_pt_fragments_carry_ansi_color(self) -> None:
+        # transcript viewer 路径：代码块须保留 ANSI 语法色（依赖 pt 转换器 ANSI 分支）。
+        fragments = render_markdown_to_pt_fragments(
+            "```python\ndef f():\n    return 1\n```\n", width=40
+        )
+        styles = [style for style, _ in fragments]
+        self.assertTrue(any("fg:ansi" in s for s in styles), styles)
+
+    def test_prose_pt_fragments_have_no_foreground_color(self) -> None:
+        # 正文零上色：段落/加粗/斜体不得带 fg:
+        fragments = render_markdown_to_pt_fragments("A **bold** and *em* line.\n", width=40)
+        for style, text in fragments:
+            self.assertNotIn("fg:", style, (style, text))
+
 
 if __name__ == "__main__":
     unittest.main()

{comate_cli-0.10.2 → comate_cli-0.10.4}/tests/test_theme.py

@@ -32,7 +32,7 @@ class TestPaletteTokens(unittest.TestCase):
         )
 
     def test_derived_colors(self):
-        self.assertEqual(theme.INLINE_CODE, "#A5DFF7")
+        self.assertEqual(theme.INLINE_CODE, "cyan")
         self.assertEqual(theme.SWEEP_BASE_RGB, (78, 134, 166))     # 流光基色
         self.assertEqual(theme.SWEEP_MID_RGB, (103, 213, 255))     # 流光峰值＝品牌青
         self.assertEqual(theme.SWEEP_HIGH_RGB, (224, 246, 255))    # 流光高光