Teknium
99433742dc
- server.py 7663 -> 5319: _run_prompt_submit and its goal/loop/voice/scope phases move to tui_gateway/prompt_turn.py (bound via method_ctx.bind_module); _start_agent_build split into _bind/_release_build_profile_scopes, _deferred_build_agent_kwargs, _wire_session_agent, _start_session_services; _load_enabled_toolsets split (_enabled_mcp_server_names, _resolve_explicit_toolsets). - methods_slash: _LIVE_SLASH_OUTPUT dispatch table; methods_tools: _SLASH_BUILTINS, _guarded; tool_progress: _PROGRESS_HANDLERS; methods_config_set: _REASONING_DISPLAY_WORDS; methods_voice: _VOICE_TOGGLE_ACTIONS. - Unified: _denied_source (methods_session) replaces _WORKER_SOURCES in methods_profiles; _compress_live_with_feedback / _compute_host_slash shared by the slash mirror and /compress; _end_voice_chat shared by stop-phrase paths; _watcher_mtime_ns; _reaper_session_is_detached_idle; _notif_* helpers. - Dead: _profile_dir_or_err, _resume_info, _slash_builtin_table (refs.py: 0 hits). - acp_adapter/server.py: docstring compaction only (AST-identical). - Every file semantically reviewed hunk-by-hunk for wire/log/lock/order parity.
285 lines
10 KiB
Python
285 lines
10 KiB
Python
"""Desktop/TUI sessions must adopt live compression config on the next turn.
|
|
|
|
Regression for #95151: ``_sync_agent_model_with_config`` only compared the
|
|
model/provider. After ``hermes config set compression.threshold_tokens 100000``
|
|
the already-open session kept the computed threshold from agent creation.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from types import SimpleNamespace
|
|
|
|
from agent.context_compressor import ContextCompressor
|
|
from tui_gateway import server
|
|
|
|
|
|
def _session_with_compressor(**compression_ctor):
|
|
compressor = ContextCompressor(
|
|
model="gpt-5.6-sol",
|
|
threshold_percent=0.85,
|
|
config_context_length=272_000,
|
|
quiet_mode=True,
|
|
**compression_ctor,
|
|
)
|
|
agent = SimpleNamespace(
|
|
model="gpt-5.6-sol",
|
|
provider="openai-codex",
|
|
context_compressor=compressor,
|
|
compression_enabled=True,
|
|
compression_idle_compact_after_seconds=0,
|
|
codex_responses_native_compaction=False,
|
|
codex_responses_compact_threshold=200_000,
|
|
)
|
|
return {
|
|
"agent": agent,
|
|
"session_key": "session-95151",
|
|
}, compressor
|
|
|
|
|
|
def test_live_threshold_tokens_applies_on_next_turn_without_rebuild(monkeypatch):
|
|
session, compressor = _session_with_compressor()
|
|
stale = compressor.threshold_tokens
|
|
assert stale > 100_000
|
|
|
|
monkeypatch.setattr(
|
|
server,
|
|
"_load_cfg",
|
|
lambda: {
|
|
"model": {
|
|
"default": "gpt-5.6-sol",
|
|
"provider": "openai-codex",
|
|
"context_length": 272_000,
|
|
},
|
|
"compression": {
|
|
"threshold_tokens": 100_000,
|
|
"proactive_prune_tokens": 48_000,
|
|
"idle_compact_after_seconds": 1800,
|
|
"tail_mode": "lean",
|
|
},
|
|
},
|
|
)
|
|
|
|
live_agent = session["agent"]
|
|
server._sync_agent_compression_with_config("sid-95151", session)
|
|
|
|
assert session["agent"] is live_agent
|
|
assert compressor.threshold_tokens == 100_000
|
|
assert compressor.proactive_prune_tokens == 48_000
|
|
assert compressor.tail_mode == "lean"
|
|
assert live_agent.compression_idle_compact_after_seconds == 1800
|
|
|
|
|
|
def test_live_codex_native_compaction_applies_on_next_turn(monkeypatch):
|
|
session, _ = _session_with_compressor()
|
|
|
|
monkeypatch.setattr(
|
|
server,
|
|
"_load_cfg",
|
|
lambda: {"compression": {"codex_responses_native": True}},
|
|
)
|
|
|
|
server._sync_agent_compression_with_config("sid-95151", session)
|
|
|
|
assert session["agent"].codex_responses_native_compaction is True
|
|
|
|
|
|
def test_live_codex_native_threshold_applies_on_next_turn(monkeypatch):
|
|
session, _ = _session_with_compressor()
|
|
|
|
monkeypatch.setattr(
|
|
server,
|
|
"_load_cfg",
|
|
lambda: {
|
|
"compression": {"codex_responses_compact_threshold": 120_000}
|
|
},
|
|
)
|
|
|
|
server._sync_agent_compression_with_config("sid-95151", session)
|
|
|
|
assert session["agent"].codex_responses_compact_threshold == 120_000
|
|
|
|
|
|
def test_unchanged_compression_config_is_noop(monkeypatch):
|
|
session, compressor = _session_with_compressor(threshold_tokens_cap=100_000)
|
|
cfg = {
|
|
"model": {"context_length": 272_000},
|
|
"compression": {"threshold_tokens": 100_000},
|
|
}
|
|
monkeypatch.setattr(server, "_load_cfg", lambda: cfg)
|
|
session["config_compression_seen"] = server._tui_compression_config_signature(cfg)
|
|
|
|
compressor.threshold_tokens = 99_999
|
|
server._sync_agent_compression_with_config("sid-95151", session)
|
|
|
|
assert compressor.threshold_tokens == 99_999
|
|
|
|
|
|
def test_clearing_threshold_tokens_restores_ratio_trigger(monkeypatch):
|
|
session, compressor = _session_with_compressor(threshold_tokens_cap=100_000)
|
|
assert compressor.threshold_tokens == 100_000
|
|
|
|
monkeypatch.setattr(
|
|
server,
|
|
"_load_cfg",
|
|
lambda: {
|
|
"model": {"context_length": 272_000},
|
|
"compression": {},
|
|
},
|
|
)
|
|
server._sync_agent_compression_with_config("sid-95151", session)
|
|
|
|
assert compressor.threshold_tokens > 100_000
|
|
assert compressor.threshold_tokens_cap is None
|
|
|
|
|
|
def test_prompt_submit_calls_compression_sync_after_model_sync():
|
|
# Read the module that actually defines the turn (it moved out of server.py).
|
|
source = open(server._run_prompt_submit.__code__.co_filename, encoding="utf-8").read()
|
|
model_idx = source.find("_sync_agent_model_with_config(sid, session)")
|
|
compression_idx = source.find("_sync_agent_compression_with_config(sid, session)")
|
|
assert model_idx != -1
|
|
assert compression_idx != -1
|
|
assert model_idx < compression_idx
|
|
|
|
|
|
# ── Unset semantics (#94724 review finding on #95980) ────────────────────
|
|
# ``_apply_live_compression_config`` used to act only on PRESENT keys, so
|
|
# removing tail_mode / context_length / target_ratio / model_thresholds /
|
|
# proactive_prune_* / protect_last_n / min_tail_user_messages / threshold /
|
|
# idle_compact_after_seconds from config.yaml left stale values active in
|
|
# live sessions forever. Absence must restore the normalized default (or the
|
|
# model-derived value) through the same derivation the agent-construction
|
|
# path uses.
|
|
|
|
|
|
def _neutral_session(**compression_ctor):
|
|
"""Session on a model with no per-model threshold override in play."""
|
|
compressor = ContextCompressor(
|
|
model="unset-test-model",
|
|
config_context_length=600_000, # >=512K: no small-context floor
|
|
quiet_mode=True,
|
|
**compression_ctor,
|
|
)
|
|
agent = SimpleNamespace(
|
|
model="unset-test-model",
|
|
provider="",
|
|
context_compressor=compressor,
|
|
compression_enabled=True,
|
|
compression_idle_compact_after_seconds=0,
|
|
codex_responses_native_compaction=False,
|
|
codex_responses_compact_threshold=200_000,
|
|
)
|
|
return {"agent": agent, "session_key": "session-unset"}, compressor
|
|
|
|
|
|
def _sync_with_cfg(monkeypatch, session, cfg):
|
|
monkeypatch.setattr(server, "_load_cfg", lambda: cfg)
|
|
server._sync_agent_compression_with_config("sid-unset", session)
|
|
|
|
|
|
def test_removing_tail_mode_restores_lean_default(monkeypatch):
|
|
session, compressor = _neutral_session(tail_mode="legacy")
|
|
assert compressor.tail_mode == "legacy"
|
|
_sync_with_cfg(monkeypatch, session, {"compression": {}})
|
|
assert compressor.tail_mode == "lean"
|
|
|
|
|
|
def test_removing_target_ratio_restores_default(monkeypatch):
|
|
session, compressor = _neutral_session(summary_target_ratio=0.60)
|
|
assert compressor.summary_target_ratio == 0.60
|
|
_sync_with_cfg(monkeypatch, session, {"compression": {}})
|
|
assert compressor.summary_target_ratio == 0.20
|
|
|
|
|
|
def test_removing_protect_last_n_restores_default(monkeypatch):
|
|
session, compressor = _neutral_session(protect_last_n=5)
|
|
_sync_with_cfg(monkeypatch, session, {"compression": {}})
|
|
assert compressor.protect_last_n == 20
|
|
|
|
|
|
def test_removing_proactive_prune_keys_restores_defaults(monkeypatch):
|
|
session, compressor = _neutral_session(
|
|
proactive_prune_tokens=48_000,
|
|
proactive_prune_min_result_chars=30_000,
|
|
proactive_prune_min_reclaim_tokens=1,
|
|
)
|
|
_sync_with_cfg(monkeypatch, session, {"compression": {}})
|
|
assert compressor.proactive_prune_tokens == 0
|
|
assert compressor.proactive_prune_min_result_chars == 8000
|
|
assert compressor.proactive_prune_min_reclaim_tokens == 4096
|
|
|
|
|
|
def test_removing_min_tail_user_messages_restores_default(monkeypatch):
|
|
session, compressor = _neutral_session(min_tail_user_messages=4)
|
|
_sync_with_cfg(monkeypatch, session, {"compression": {}})
|
|
assert compressor.min_tail_user_messages == 1
|
|
|
|
|
|
def test_removing_model_thresholds_restores_empty_map(monkeypatch):
|
|
session, compressor = _neutral_session(
|
|
model_thresholds={"unset-test-model": 0.95}
|
|
)
|
|
assert compressor.threshold_percent == 0.95
|
|
_sync_with_cfg(monkeypatch, session, {"compression": {}})
|
|
assert compressor.model_thresholds == {}
|
|
# The stale per-model override must stop steering the live threshold too.
|
|
assert compressor.threshold_percent == 0.50
|
|
|
|
|
|
def test_removing_threshold_restores_derived_default(monkeypatch):
|
|
session, compressor = _neutral_session(threshold_percent=0.85)
|
|
assert compressor.threshold_percent == 0.85
|
|
_sync_with_cfg(
|
|
monkeypatch,
|
|
session,
|
|
{"model": {"context_length": 600_000}, "compression": {}},
|
|
)
|
|
assert compressor._config_threshold_percent == 0.50
|
|
assert compressor.threshold_percent == 0.50
|
|
assert compressor.threshold_tokens == int(600_000 * 0.50)
|
|
|
|
|
|
def test_removing_context_length_reinfers_from_model_metadata(monkeypatch):
|
|
import agent.context_compressor as cc_mod
|
|
|
|
session, compressor = _neutral_session()
|
|
assert compressor.context_length == 600_000
|
|
|
|
monkeypatch.setattr(
|
|
cc_mod,
|
|
"get_model_context_length",
|
|
lambda *a, **k: 1_000_000,
|
|
)
|
|
_sync_with_cfg(monkeypatch, session, {"model": {}, "compression": {}})
|
|
assert compressor._config_context_length is None
|
|
assert compressor.context_length == 1_000_000
|
|
assert compressor.threshold_tokens == int(1_000_000 * 0.50)
|
|
|
|
|
|
def test_removing_idle_compact_after_seconds_restores_zero(monkeypatch):
|
|
session, _ = _neutral_session()
|
|
session["agent"].compression_idle_compact_after_seconds = 1800
|
|
_sync_with_cfg(monkeypatch, session, {"compression": {}})
|
|
assert session["agent"].compression_idle_compact_after_seconds == 0
|
|
|
|
|
|
def test_removing_enabled_restores_true(monkeypatch):
|
|
session, _ = _neutral_session()
|
|
session["agent"].compression_enabled = False
|
|
_sync_with_cfg(monkeypatch, session, {"compression": {}})
|
|
assert session["agent"].compression_enabled is True
|
|
|
|
|
|
def test_removing_codex_native_compaction_restores_false(monkeypatch):
|
|
session, _ = _neutral_session()
|
|
session["agent"].codex_responses_native_compaction = True
|
|
_sync_with_cfg(monkeypatch, session, {"compression": {}})
|
|
assert session["agent"].codex_responses_native_compaction is False
|
|
|
|
|
|
def test_removing_codex_native_threshold_restores_default(monkeypatch):
|
|
session, _ = _neutral_session()
|
|
session["agent"].codex_responses_compact_threshold = 120_000
|
|
_sync_with_cfg(monkeypatch, session, {"compression": {}})
|
|
assert session["agent"].codex_responses_compact_threshold == 200_000
|