comate-cli 0.8.0__tar.gz → 0.8.2__tar.gz

comate_cli-0.8.2/CONTEXT.md

@@ -0,0 +1,39 @@
+# Comate CLI Slash Command Model
+
+The comate_cli slash command system separates how a command is *executed* from *where its definition comes from*. Two orthogonal axes describe every registered command. The same word "builtin" previously appeared on both axes with different, conflicting override semantics — this glossary resolves that ambiguity.
+
+## Language
+
+**Core Slash Command**:
+A slash command backed by a hardcoded Python handler registered in `SLASH_COMMAND_SPECS` (e.g. `/help`, `/model`, `/exit`). Registered with `SlashCommandSource = "builtin"` on the *execution* axis.
+_Avoid_: builtin command (ambiguous), native command
+
+**Default Custom Command**:
+A markdown-resource slash command shipped inside the `comate_cli` package under `terminal_agent/builtin_commands/`. Loaded via the custom-command pipeline (frontmatter + template), with `source_scope = "default"` on the *source* axis. User-authored custom commands of the same name override it.
+_Avoid_: builtin command (ambiguous), bundled command
+
+**Execution Axis** (`SlashCommandSource`):
+Describes how a registered command is dispatched. Values: `"builtin"` (hardcoded handler), `"custom"` (markdown template render), `"skill"` (skill slash). Orthogonal to the Source Axis.
+
+**Source Axis** (`CustomSlashCommand.source_scope`):
+Describes where a markdown-template command's definition lives. Values: `"project"`, `"user"`, `"plugin"`, `"default"`. Determines override priority only.
+
+**Reserved Name Set** (`builtin_names`):
+The set of names derived from `SLASH_COMMAND_SPECS` (Core Slash Commands) that user-authored custom commands may not shadow. A custom command whose name collides with this set is silently skipped with a warning during discovery. **Default Custom Command names do NOT belong to this set** — they are overrideable by design.
+
+**Override Priority Chain**:
+`project > user > default` (plus `plugin` registered independently at runtime). When a Default Custom Command and a user/project custom command share a name, the higher-priority scope wins silently (no warning); only the winning entry reaches the registry.
+
+## Relationships
+
+- A **Core Slash Command** is always registered with `source="builtin"` on the Execution Axis. Its name belongs to the **Reserved Name Set** and cannot be overridden by any markdown-template command.
+- A **Default Custom Command** is registered with `source="custom"` on the Execution Axis (same dispatch path as project/user/plugin custom commands) and `source_scope="default"` on the Source Axis.
+- The **Execution Axis** and **Source Axis** are independent. A single registered command carries a value on each.
+- The word "builtin" appears only on the Execution Axis (`source="builtin"`) and refers exclusively to **Core Slash Commands**. The Source Axis value `"default"` refers exclusively to **Default Custom Commands**.
+- **Default Custom Commands** are loaded from package resources via `importlib.resources`, parsed by the same frontmatter pipeline as project/user commands, and subject to the **Override Priority Chain** at registration time.
+- A **Default Custom Command** parse failure is a developer-visible error (raised at discovery), not a user-visible warning, because package resources are trusted input maintained by the comate_cli maintainers.
+- The **Reserved Name Set** gates discovery only; it prevents user-authored markdown commands from shadowing **Core Slash Commands**, and only Core Slash Commands.
+
+## Flagged ambiguities
+
+- None currently. 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.8.0 → comate_cli-0.8.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: comate-cli
-Version: 0.8.0
+Version: 0.8.2
 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.8.0 → comate_cli-0.8.2}/comate_cli/terminal_agent/app.py

@@ -54,7 +54,7 @@ async def _check_update(*, profiler: StartupProfiler | None = None) -> UpdateInf
     if profiler is not None:
         profiler.mark("impl.start")
     try:
-        check_update, _, _, _ = _import_update_check_core()
+        check_update, _ = _import_update_check_core()
         return await check_update(log=logger, profiler=profiler)
     finally:
         if profiler is not None:
@@ -308,15 +308,11 @@ def _import_update_check_core():
     from comate_cli.terminal_agent.update_check import (
         check_update,
         get_pending_update_prompt_info,
-        record_update_check_attempt,
-        should_check_for_update,
     )
 
     return (
         check_update,
         get_pending_update_prompt_info,
-        record_update_check_attempt,
-        should_check_for_update,
     )
 
 
@@ -387,7 +383,7 @@ def _build_agent(
     profiler: StartupProfiler | None = None,
     extra_disallowed_tools: tuple[str, ...] | None = None,
 ) -> Agent:
-    Agent, AgentConfig, CompactionConfig, EnvOptions = _import_sdk_agent_components(profiler)
+    Agent, AgentConfig, _, EnvOptions = _import_sdk_agent_components(profiler)
     from comate_cli.terminal_agent.config import store
 
     resolved_project_root = project_root or _resolve_cli_project_root()
@@ -407,9 +403,6 @@ def _build_agent(
         strict_hook_settings=False,
         memory_background_enabled=snapshot.memory_background_enabled,
         memory_dreaming_enabled=snapshot.memory_dreaming_enabled,
-        compaction=CompactionConfig(
-            threshold_ratio=snapshot.compaction_threshold_ratio,
-        ),
         disallowed_tools=disallowed_tools,
     )
     if profiler is not None:
@@ -546,6 +539,69 @@ async def _run_print_mode(
     )
 
 
+def _iter_exception_chain(exc: BaseException) -> Iterator[BaseException]:
+    seen: set[int] = set()
+    current: BaseException | None = exc
+    while current is not None and id(current) not in seen:
+        seen.add(id(current))
+        yield current
+        current = current.__cause__ or current.__context__
+
+
+def _exception_traceback_mentions_memory_prefetch(exc: BaseException) -> bool:
+    for chained in _iter_exception_chain(exc):
+        tb = chained.__traceback__
+        while tb is not None:
+            code = tb.tb_frame.f_code
+            filename = code.co_filename
+            function_name = code.co_name
+            if function_name == "_prefetch_relevant_memories":
+                return True
+            if (
+                filename.endswith("memory_runtime.py")
+                and function_name == "_prefetch_relevant_memories"
+            ):
+                return True
+            tb = tb.tb_next
+    return False
+
+
+def _loop_context_repr_mentions_memory_prefetch(context: dict) -> bool:
+    for key in ("future", "task", "handle"):
+        value = context.get(key)
+        if value is None:
+            continue
+        representation = repr(value)
+        if "_prefetch_relevant_memories" in representation:
+            return True
+        if "side_query:memory_select" in representation:
+            return True
+    return False
+
+
+def _is_memory_prefetch_unretrieved_task_exception(context: dict) -> bool:
+    message = str(context.get("message") or "")
+    if "Task exception was never retrieved" not in message:
+        return False
+
+    exc = context.get("exception")
+    if not isinstance(exc, BaseException):
+        return False
+
+    try:
+        from comate_agent_sdk.llm.exceptions import ModelProviderError
+    except Exception:
+        return False
+
+    if not isinstance(exc, ModelProviderError):
+        return False
+
+    return (
+        _loop_context_repr_mentions_memory_prefetch(context)
+        or _exception_traceback_mentions_memory_prefetch(exc)
+    )
+
+
 def _install_event_loop_exception_handler() -> None:
     """Install a custom exception handler to suppress known MCP transport race conditions.
 
@@ -563,6 +619,17 @@ def _install_event_loop_exception_handler() -> None:
         if isinstance(exc, RuntimeError) and "cancel scope" in str(exc):
             logger.warning("MCP transport cleanup race detected (suppressed): %s", exc)
             return
+        if _is_memory_prefetch_unretrieved_task_exception(context):
+            logger.debug(
+                "Relevant memory prefetch task failure suppressed during shutdown: %s",
+                exc,
+                exc_info=(
+                    (type(exc), exc, exc.__traceback__)
+                    if isinstance(exc, BaseException)
+                    else None
+                ),
+            )
+            return
         if _default is not None:
             _default(loop, context)
         else:
@@ -623,12 +690,7 @@ async def run(
         print_logo(console, project_root=project_root)
         profiler.mark("logo.printed")
 
-        (
-            _check_update_func,
-            get_pending_update_prompt_info,
-            _record_update_check_attempt,
-            _should_check_for_update,
-        ) = _import_update_check_core()
+        _check_update_func, get_pending_update_prompt_info = _import_update_check_core()
         pending_info = get_pending_update_prompt_info()
         if pending_info is not None:
             should_stop = await _handle_update_on_launch(pending_info)
@@ -719,21 +781,11 @@ async def run(
     profiler.mark("tui.init.done")
     tui.add_resume_history(mode)
     update_check_task: asyncio.Task[None] | None = None
-    (
-        _check_update_func,
-        _get_pending_update_prompt_info,
-        record_update_check_attempt,
-        should_check_for_update,
-    ) = _import_update_check_core()
-    if should_check_for_update():
-        # attempt 语义：先记录尝试时间，确保 interval 内最多发起一次网络检查
-        record_update_check_attempt()
-        update_check_task = _schedule_update_check_on_launch(
-            renderer=renderer,
-            profiler=profiler,
-        )
-    else:
-        profiler.mark("update_check.throttled")
+    _check_update_func, _get_pending_update_prompt_info = _import_update_check_core()
+    update_check_task = _schedule_update_check_on_launch(
+        renderer=renderer,
+        profiler=profiler,
+    )
 
     async def _mcp_loader() -> None:
         await _preload_mcp_in_tui(session, profiler=profiler.child("mcp"))

{comate_cli-0.8.0 → comate_cli-0.8.2}/comate_cli/terminal_agent/config/model.py

@@ -1,6 +1,6 @@
 """ConfigSnapshot：/config UI、store、startup 三处共享的偏好快照。
 
-Revision 3: 6 项偏好（display_thinking, model_level, compaction, memory_background, memory_dreaming, token_cost）。
+Revision 5: 6 项偏好（display_thinking, model_level, memory_background, memory_dreaming, token_cost, recap）。
 """
 from __future__ import annotations
 
@@ -8,13 +8,6 @@ from dataclasses import dataclass, replace
 from typing import Literal
 
 ModelLevelPreset = Literal["LOW", "MID", "HIGH"]
-ThresholdPreset = Literal["conservative", "balanced", "aggressive"]
-
-COMPACT_PRESETS: dict[str, float] = {
-    "conservative": 0.65,
-    "balanced": 0.80,
-    "aggressive": 0.92,
-}
 
 
 @dataclass(frozen=True, slots=True)
@@ -23,11 +16,10 @@ class ConfigSnapshot:
 
     display_thinking: bool = False
     model_level: ModelLevelPreset = "MID"
-    compaction_threshold_ratio: float = 0.80
-    compaction_threshold_preset: ThresholdPreset = "balanced"
     memory_background_enabled: bool = True
     memory_dreaming_enabled: bool = True
     token_cost_enabled: bool = False
+    recap_enabled: bool = True
 
     @classmethod
     def default(cls) -> "ConfigSnapshot":
@@ -39,13 +31,6 @@ class ConfigSnapshot:
     def with_model_level(self, level: ModelLevelPreset) -> "ConfigSnapshot":
         return replace(self, model_level=level)
 
-    def with_threshold_preset(self, preset: ThresholdPreset) -> "ConfigSnapshot":
-        return replace(
-            self,
-            compaction_threshold_preset=preset,
-            compaction_threshold_ratio=COMPACT_PRESETS[preset],
-        )
-
     def with_memory_background(self, enabled: bool) -> "ConfigSnapshot":
         return replace(self, memory_background_enabled=enabled)
 
@@ -54,3 +39,6 @@ class ConfigSnapshot:
 
     def with_token_cost(self, enabled: bool) -> "ConfigSnapshot":
         return replace(self, token_cost_enabled=enabled)
+
+    def with_recap(self, enabled: bool) -> "ConfigSnapshot":
+        return replace(self, recap_enabled=enabled)

{comate_cli-0.8.0 → comate_cli-0.8.2}/comate_cli/terminal_agent/config/picker.py

@@ -3,7 +3,7 @@
 仿 plugins/plugin_picker.py:PluginPickerUI 的模式：
 enter() → container → focus_target() → handle_*。
 
-Revision 3: 6 行 ConfigField。
+Revision 5: 6 行 ConfigField。
 """
 from __future__ import annotations
 
@@ -34,27 +34,28 @@ logger = logging.getLogger(__name__)
 _FIELD_LABELS: dict[ConfigField, str] = {
     ConfigField.DISPLAY_THINKING: "Thinking display",
     ConfigField.MODEL_LEVEL: "Default model level",
-    ConfigField.AUTO_COMPACT_THRESHOLD: "Auto compact threshold",
     ConfigField.MEMORY_BACKGROUND: "Memory background",
     ConfigField.MEMORY_DREAMING: "Memory dreaming",
     ConfigField.TOKEN_COST: "Token cost",
+    ConfigField.RECAP: "Recap",
 }
 
 _FIELD_ORDER = (
     ConfigField.DISPLAY_THINKING,
     ConfigField.MODEL_LEVEL,
-    ConfigField.AUTO_COMPACT_THRESHOLD,
     ConfigField.MEMORY_BACKGROUND,
     ConfigField.MEMORY_DREAMING,
     ConfigField.TOKEN_COST,
+    ConfigField.RECAP,
 )
 
-_ENUM_FIELDS = {ConfigField.MODEL_LEVEL, ConfigField.AUTO_COMPACT_THRESHOLD}
+_ENUM_FIELDS = {ConfigField.MODEL_LEVEL}
 _BOOL_FIELDS = {
     ConfigField.DISPLAY_THINKING,
     ConfigField.MEMORY_BACKGROUND,
     ConfigField.MEMORY_DREAMING,
     ConfigField.TOKEN_COST,
+    ConfigField.RECAP,
 }
 
 
@@ -160,14 +161,14 @@ class ConfigPickerUI:
             return f"[ {'on ' if snap.display_thinking else 'off'} ]"
         if f == ConfigField.MODEL_LEVEL:
             return f"[ {snap.model_level} ]"
-        if f == ConfigField.AUTO_COMPACT_THRESHOLD:
-            return f"[ {snap.compaction_threshold_preset} ({snap.compaction_threshold_ratio:.2f}) ]"
         if f == ConfigField.MEMORY_BACKGROUND:
             return f"[ {'on ' if snap.memory_background_enabled else 'off'} ]"
         if f == ConfigField.MEMORY_DREAMING:
             return f"[ {'on ' if snap.memory_dreaming_enabled else 'off'} ]"
         if f == ConfigField.TOKEN_COST:
             return f"[ {'on ' if snap.token_cost_enabled else 'off'} ]"
+        if f == ConfigField.RECAP:
+            return f"[ {'on ' if snap.recap_enabled else 'off'} ]"
         return ""
 
     def _subview_fragments(self) -> list[tuple[str, str]]:

{comate_cli-0.8.0 → comate_cli-0.8.2}/comate_cli/terminal_agent/config/picker_state.py

@@ -1,6 +1,6 @@
 """ConfigPicker 的纯逻辑状态机——不依赖 prompt_toolkit。
 
-Revision 3: 6 行 ConfigField。
+Revision 5: 6 行 ConfigField。
 """
 from __future__ import annotations
 
@@ -9,20 +9,18 @@ from enum import Enum
 from typing import Callable
 
 from .model import (
-    COMPACT_PRESETS,
     ConfigSnapshot,
     ModelLevelPreset,
-    ThresholdPreset,
 )
 
 
 class ConfigField(Enum):
     DISPLAY_THINKING = "display_thinking"
     MODEL_LEVEL = "model_level"
-    AUTO_COMPACT_THRESHOLD = "auto_compact_threshold"
     MEMORY_BACKGROUND = "memory_background"
     MEMORY_DREAMING = "memory_dreaming"
     TOKEN_COST = "token_cost"
+    RECAP = "recap"
 
 
 class ViewMode(Enum):
@@ -51,19 +49,12 @@ class PickerExit:
 _FIELD_ORDER = (
     ConfigField.DISPLAY_THINKING,
     ConfigField.MODEL_LEVEL,
-    ConfigField.AUTO_COMPACT_THRESHOLD,
     ConfigField.MEMORY_BACKGROUND,
     ConfigField.MEMORY_DREAMING,
     ConfigField.TOKEN_COST,
+    ConfigField.RECAP,
 )
 
-_THRESHOLD_VALUES: tuple[ThresholdPreset, ...] = ("conservative", "balanced", "aggressive")
-_THRESHOLD_DESCRIPTIONS: dict[str, str] = {
-    "conservative": "0.65 — compact more often; smaller per-call ctx.",
-    "balanced": "0.80 — default. Compact when ctx >= 80% utilized.",
-    "aggressive": "0.92 — compact late; larger ctx per call.",
-}
-
 _MODEL_LEVEL_VALUES: tuple[ModelLevelPreset, ...] = ("LOW", "MID", "HIGH")
 _MODEL_LEVEL_DESCRIPTIONS: dict[str, str] = {
     "LOW": "Fastest, cheapest. Good for simple tasks.",
@@ -98,11 +89,6 @@ class ConfigPickerState:
     def subview_options(self) -> list[SubviewOption]:
         if self.view_mode != ViewMode.SUBVIEW or self.subview_field is None:
             return []
-        if self.subview_field == ConfigField.AUTO_COMPACT_THRESHOLD:
-            return [
-                SubviewOption(v, v.capitalize(), _THRESHOLD_DESCRIPTIONS[v])
-                for v in _THRESHOLD_VALUES
-            ]
         if self.subview_field == ConfigField.MODEL_LEVEL:
             return [
                 SubviewOption(v, v, _MODEL_LEVEL_DESCRIPTIONS[v])
@@ -140,10 +126,8 @@ class ConfigPickerState:
             self.draft = self.draft.with_memory_dreaming(not self.draft.memory_dreaming_enabled)
         elif f == ConfigField.TOKEN_COST:
             self.draft = self.draft.with_token_cost(not self.draft.token_cost_enabled)
-        elif f == ConfigField.AUTO_COMPACT_THRESHOLD:
-            cur = _THRESHOLD_VALUES.index(self.draft.compaction_threshold_preset)
-            next_v = _THRESHOLD_VALUES[(cur + 1) % len(_THRESHOLD_VALUES)]
-            self.draft = self.draft.with_threshold_preset(next_v)
+        elif f == ConfigField.RECAP:
+            self.draft = self.draft.with_recap(not self.draft.recap_enabled)
         elif f == ConfigField.MODEL_LEVEL:
             cur = _MODEL_LEVEL_VALUES.index(self.draft.model_level)
             next_v = _MODEL_LEVEL_VALUES[(cur + 1) % len(_MODEL_LEVEL_VALUES)]
@@ -152,7 +136,7 @@ class ConfigPickerState:
     def handle_enter(self) -> PickerExit | None:
         if self.view_mode == ViewMode.MAIN:
             f = self.focused_field
-            if f in (ConfigField.AUTO_COMPACT_THRESHOLD, ConfigField.MODEL_LEVEL):
+            if f == ConfigField.MODEL_LEVEL:
                 self.view_mode = ViewMode.SUBVIEW
                 self.subview_field = f
                 self.subview_cursor = self._initial_subview_cursor(f)
@@ -166,9 +150,7 @@ class ConfigPickerState:
                 self._return_to_main()
                 return None
             chosen = opts[self.subview_cursor].value
-            if self.subview_field == ConfigField.AUTO_COMPACT_THRESHOLD:
-                self.draft = self.draft.with_threshold_preset(chosen)  # type: ignore[arg-type]
-            elif self.subview_field == ConfigField.MODEL_LEVEL:
+            if self.subview_field == ConfigField.MODEL_LEVEL:
                 self.draft = self.draft.with_model_level(chosen)  # type: ignore[arg-type]
             self._return_to_main()
         return None
@@ -202,8 +184,6 @@ class ConfigPickerState:
 
     # ---- helpers --------------------------------------------------------
     def _initial_subview_cursor(self, f: ConfigField) -> int:
-        if f == ConfigField.AUTO_COMPACT_THRESHOLD:
-            return _THRESHOLD_VALUES.index(self.draft.compaction_threshold_preset)
         if f == ConfigField.MODEL_LEVEL:
             return _MODEL_LEVEL_VALUES.index(self.draft.model_level)
         return 0

{comate_cli-0.8.0 → comate_cli-0.8.2}/comate_cli/terminal_agent/config/store.py

@@ -16,15 +16,12 @@ from typing import Any, get_args
 from comate_agent_sdk.agent.settings import USER_SETTINGS_PATH, _write_text_atomic
 
 from .model import (
-    COMPACT_PRESETS,
     ConfigSnapshot,
     ModelLevelPreset,
-    ThresholdPreset,
 )
 
 logger = logging.getLogger(__name__)
 
-_VALID_PRESETS = set(get_args(ThresholdPreset))
 _VALID_MODEL_LEVELS = {v.lower() for v in get_args(ModelLevelPreset)}
 _TRUTHY = {"true", "1", "on", "yes"}
 _FALSY = {"false", "0", "off", "no"}
@@ -32,9 +29,9 @@ _CLI_SECTION = "comate_cli"
 _CLI_CONFIG_SECTION = "config"
 _CLI_CONFIG_DISPLAY_SECTION = "display"
 _CLI_CONFIG_MODEL_SECTION = "model"
-_CLI_CONFIG_COMPACTION_SECTION = "compaction"
 _CLI_CONFIG_MEMORY_SECTION = "memory"
 _CLI_CONFIG_TOKEN_COST_SECTION = "token_cost"
+_CLI_CONFIG_RECAP_SECTION = "recap"
 
 
 def _settings_path() -> Path:
@@ -143,19 +140,6 @@ def _apply_legacy_settings(snapshot: ConfigSnapshot, data: Mapping[str, Any]) ->
                 model,
             )
 
-    # compaction.auto_threshold_preset
-    compaction = data.get("compaction") or {}
-    if isinstance(compaction, dict):
-        preset = compaction.get("auto_threshold_preset")
-        if isinstance(preset, str):
-            if preset in _VALID_PRESETS:
-                snapshot = snapshot.with_threshold_preset(preset)  # type: ignore[arg-type]
-            else:
-                logger.warning(
-                    "settings.json compaction.auto_threshold_preset 非法 (%r)，回退 balanced",
-                    preset,
-                )
-
     # memory_state.enabled
     memory_state = data.get("memory_state") or {}
     if isinstance(memory_state, dict) and isinstance(memory_state.get("enabled"), bool):
@@ -211,40 +195,6 @@ def _apply_cli_config(snapshot: ConfigSnapshot, section: dict[str, Any]) -> Conf
                 raw_model,
             )
 
-    compaction = _named_object(
-        section,
-        _CLI_CONFIG_COMPACTION_SECTION,
-        "comate_cli.config.compaction",
-    )
-    raw_preset = _named_string(
-        compaction,
-        "threshold_preset",
-        "comate_cli.config.compaction.threshold_preset",
-    )
-    if raw_preset is not None:
-        if raw_preset in _VALID_PRESETS:
-            snapshot = snapshot.with_threshold_preset(raw_preset)  # type: ignore[arg-type]
-            raw_ratio = compaction.get("threshold_ratio")
-            if isinstance(raw_ratio, (int, float)) and not isinstance(raw_ratio, bool):
-                expected = COMPACT_PRESETS[raw_preset]
-                if float(raw_ratio) != expected:
-                    logger.warning(
-                        "settings.json comate_cli.config.compaction.threshold_ratio "
-                        "与 threshold_preset 不一致 (%r != %r)，以 preset 为准",
-                        raw_ratio,
-                        expected,
-                    )
-        else:
-            logger.warning(
-                "settings.json comate_cli.config.compaction.threshold_preset 非法 (%r)，保留已有值",
-                raw_preset,
-            )
-    elif "threshold_ratio" in compaction:
-        logger.warning(
-            "settings.json comate_cli.config.compaction.threshold_ratio 缺少 "
-            "threshold_preset，保留已有 preset 派生值"
-        )
-
     memory = _named_object(
         section,
         _CLI_CONFIG_MEMORY_SECTION,
@@ -279,6 +229,19 @@ def _apply_cli_config(snapshot: ConfigSnapshot, section: dict[str, Any]) -> Conf
     if parsed_bool is not None:
         snapshot = snapshot.with_token_cost(parsed_bool)
 
+    recap = _named_object(
+        section,
+        _CLI_CONFIG_RECAP_SECTION,
+        "comate_cli.config.recap",
+    )
+    parsed_bool = _named_bool(
+        recap,
+        "enabled",
+        "comate_cli.config.recap.enabled",
+    )
+    if parsed_bool is not None:
+        snapshot = snapshot.with_recap(parsed_bool)
+
     return snapshot
 
 
@@ -310,10 +273,6 @@ def save(snapshot: ConfigSnapshot) -> SaveResult:
 def build_cli_config_settings(snapshot: ConfigSnapshot) -> dict[str, Any]:
     """Build the canonical comate_cli.config settings subtree."""
     return {
-        "compaction": {
-            "threshold_preset": snapshot.compaction_threshold_preset,
-            "threshold_ratio": snapshot.compaction_threshold_ratio,
-        },
         "display": {"thinking": snapshot.display_thinking},
         "memory": {
             "background_enabled": snapshot.memory_background_enabled,
@@ -321,6 +280,7 @@ def build_cli_config_settings(snapshot: ConfigSnapshot) -> dict[str, Any]:
         },
         "model": {"level": snapshot.model_level.lower()},
         "token_cost": {"enabled": snapshot.token_cost_enabled},
+        "recap": {"enabled": snapshot.recap_enabled},
     }
 
 
@@ -345,7 +305,10 @@ def apply_cli_config_snapshot_to_settings(
     """Apply canonical comate_cli.config plus SDK mirrors to a settings object."""
     data = deepcopy(dict(existing))
     cli = _ensure_object(data, _CLI_SECTION)
-    cli[_CLI_CONFIG_SECTION] = build_cli_config_settings(snapshot)
+    existing_cli_config = cli.get(_CLI_CONFIG_SECTION)
+    cli_config = deepcopy(existing_cli_config) if isinstance(existing_cli_config, dict) else {}
+    cli_config.update(build_cli_config_settings(snapshot))
+    cli[_CLI_CONFIG_SECTION] = cli_config
 
     data["model"] = snapshot.model_level.lower()
 
@@ -362,11 +325,6 @@ def apply_cli_config_snapshot_to_settings(
         display.pop("thinking", None)
     _cleanup_empty_object(data, "display")
 
-    compaction = data.get("compaction")
-    if isinstance(compaction, dict):
-        compaction.pop("auto_threshold_preset", None)
-    _cleanup_empty_object(data, "compaction")
-
     return data
 
 

{comate_cli-0.8.0 → comate_cli-0.8.2}/comate_cli/terminal_agent/custom_slash_commands.py

@@ -5,6 +5,7 @@ import logging
 import re
 import shlex
 from dataclasses import dataclass
+from importlib.resources import as_file, files
 from pathlib import Path
 from typing import Literal
 
@@ -25,6 +26,9 @@ FILE_REF_PATTERN = re.compile(r"(?<!\S)@([^\s]+)")
 _MARKER_PREFIX = "<<__COMATE_CUSTOM_BLOCK_"
 _MARKER_SUFFIX = "__>>"
 
+_BUILTIN_COMMANDS_PACKAGE = "comate_cli.terminal_agent"
+_BUILTIN_COMMANDS_RESOURCE = "builtin_commands"
+
 
 class CustomSlashExpandError(RuntimeError):
     pass
@@ -35,7 +39,7 @@ class CustomSlashCommand:
     name: str
     description: str
     template: str
-    source_scope: Literal["project", "user", "plugin"]
+    source_scope: Literal["project", "user", "plugin", "default"]
     namespace: str
     source_path: Path
     argument_hint: str | None = None
@@ -114,10 +118,44 @@ def discover_custom_slash_commands(
     return CustomSlashLoadResult(commands=tuple(commands), warnings=tuple(warnings))
 
 
+def discover_default_slash_commands() -> CustomSlashLoadResult:
+    """加载随包分发的 default scope custom commands。
+
+    default scope 的 md 资源由 comate_cli 维护者维护，是可信输入。解析失败
+    直接 raise CustomSlashExpandError（developer-visible error），不返回
+    warnings；这与 project/user scope 把 warnings 塞给终端用户的语义不同。
+
+    扁平布局：扫描 ``comate_cli.terminal_agent.builtin_commands`` 下的所有
+    ``*.md`` 资源，namespace 强制为空字符串。非 .md 文件被忽略。
+    """
+    root = files(_BUILTIN_COMMANDS_PACKAGE).joinpath(_BUILTIN_COMMANDS_RESOURCE)
+    if not root.is_dir():
+        return CustomSlashLoadResult(commands=(), warnings=())
+
+    commands: list[CustomSlashCommand] = []
+    for entry in sorted(root.iterdir(), key=lambda item: item.name):
+        if not entry.name.endswith(".md"):
+            continue
+        with as_file(entry) as path:
+            parsed = _parse_custom_command_file(
+                file_path=path,
+                scope="default",
+                root_dir=path.parent,
+            )
+        if isinstance(parsed, str):
+            raise CustomSlashExpandError(
+                f"Built-in command resource {entry.name} is malformed: {parsed}"
+            )
+        commands.append(parsed)
+
+    commands.sort(key=lambda item: item.name.lower())
+    return CustomSlashLoadResult(commands=tuple(commands), warnings=())
+
+
 def _parse_custom_command_file(
     *,
     file_path: Path,
-    scope: Literal["project", "user"],
+    scope: Literal["project", "user", "default"],
     root_dir: Path,
 ) -> CustomSlashCommand | str:
     command_name = file_path.stem.strip()