2026-04-17 12:50:12 +07:00
|
|
|
"""Concurrency + timeout tests for MemoryHandler._ensure_initialized (Unit 1).
|
|
|
|
|
|
|
|
|
|
Covers:
|
|
|
|
|
- 10 concurrent first-callers trigger exactly one backend init
|
|
|
|
|
(singleflight via asyncio.Lock + double-check).
|
|
|
|
|
- Initialization timeout is surfaced via log + leaves _initialized=False so
|
|
|
|
|
a subsequent call can retry (fail-open contract).
|
|
|
|
|
- End-to-end real-backend sanity test (no monkeypatching of internals)
|
|
|
|
|
that exercises LocalBackend so the system-wide check is satisfied.
|
|
|
|
|
"""
|
|
|
|
|
|
|
|
|
|
from __future__ import annotations
|
|
|
|
|
|
|
|
|
|
import asyncio
|
fix(ccr): skip Anthropic marker emission when tool injection is deferred (#1273)
## Description
Anthropic request-side CCR can still compress a turn into retrieval
markers after the frozen-prefix cache guard suppresses
`headroom_retrieve` registration. That leaves the model with marker-only
context it cannot redeem, so the proxy silently drops recoverable data
on exactly the turns where cache preservation deferred tool injection.
This change couples the Anthropic request-side CCR path to tool
availability so a turn never emits retrieve-only markers without the
retrieval tool, even when token mode or cache-mode prefix replay could
otherwise reuse already-compressed marker text. Closes #1006
After a collaborator merged current `main` into this branch, CI also
picked up unrelated offline-memory failures from the merged base. Those
follow-up changes are test-only: they keep the offline Hugging Face
cache lanes skipping cleanly instead of failing in memory tests that are
outside the CCR runtime path.
## Type of Change
- [x] Bug fix (non-breaking change that fixes an issue)
- [ ] New feature (non-breaking change that adds functionality)
- [ ] Breaking change (fix or feature that would cause existing
functionality to change)
- [ ] Documentation update
- [ ] Performance improvement
- [ ] Code refactoring (no functional changes)
## Changes Made
- Couple Anthropic request-side CCR compression to the same
frozen-prefix guard that already defers `headroom_retrieve`
registration.
- Keep the existing cache-preservation behavior: frozen-prefix turns
stop emitting CCR retrieval markers instead of forcing tool injection
into the cached prefix.
- Make the skip decision use the effective frozen prefix after
token-mode reclamping, so turns that genuinely reclamp to zero still
keep normal reversible CCR behavior.
- Bypass cached marker reuse in both token mode and cache-mode prefix
replay when tool injection is deferred.
- Add focused regressions for the Anthropic request-path seams under
this bug:
- frozen-prefix turns do not emit marker-only payloads
- unfrozen turns still keep normal reversible CCR behavior
- token-mode reclamp back to zero still compresses normally
- existing `headroom_retrieve` tools keep reversible CCR on frozen turns
- cache-mode delta reuse and exact-prefix replay both forward original
content when retrieval is unavailable
- Add a `CHANGELOG.md` entry because the proxy's user-visible Anthropic
CCR behavior changes.
- Add a shared test skip helper for offline Hugging Face cache misses
and apply it to the merged `main` memory tests that were failing only in
the offline CI shards after the branch picked up current `main`.
## Testing
- [x] Unit tests pass (`uv run pytest
tests/test_proxy/test_anthropic_ccr_deferred_injection.py`)
- [x] Linting passes (`uv run ruff check . && uv run ruff format .
--check`)
- [ ] Type checking passes (`uv run mypy headroom`)
- [x] New tests added for new functionality when applicable
- [ ] Manual testing performed
### Test Output
```text
uv run pytest tests/test_proxy/test_anthropic_ccr_deferred_injection.py
14 passed, 1 warning in 34.19s
uv run pytest tests/test_memory/test_skip_helpers.py tests/test_memory/test_embedder_mps_serialization.py::test_cpu_uses_shared_executor tests/test_memory/test_hierarchical.py::TestLocalEmbedder::test_embed_single tests/test_memory_bridge.py::TestMemoryBridgeImport::test_import_claude_code_memory tests/test_memory_handler_concurrent_init.py::test_real_localbackend_initializes_via_public_entrypoint tests/test_memory_system.py::TestLocalBackend::test_save_memory_basic -q
4 passed, 5 skipped, 11 warnings in 7.65s
uv run ruff check .
All checks passed!
uv run ruff format . --check
968 files already formatted
```
## Real Behavior Proof
- Environment: local FastAPI `TestClient` for the Anthropic request
path, plus Windows Python 3.12 offline-memory repros with
`TRANSFORMERS_OFFLINE=1`
- Exact command / steps: Run the focused CCR regression command and the
offline-memory repro subset below on the merged branch state.
- `uv run pytest
tests/test_proxy/test_anthropic_ccr_deferred_injection.py`
- `uv run pytest tests/test_memory/test_skip_helpers.py
tests/test_memory/test_embedder_mps_serialization.py::test_cpu_uses_shared_executor
tests/test_memory/test_hierarchical.py::TestLocalEmbedder::test_embed_single
tests/test_memory_bridge.py::TestMemoryBridgeImport::test_import_claude_code_memory
tests/test_memory_handler_concurrent_init.py::test_real_localbackend_initializes_via_public_entrypoint
tests/test_memory_system.py::TestLocalBackend::test_save_memory_basic
-q`
- Scenario coverage from the CCR pytest command:
- frozen prefix with deferred tool injection and cached marker text
available in token mode
- unfrozen turn with normal CCR marker emission
- token mode where the tracked frozen prefix reclamps back to zero
- frozen prefix where the client already supplied `headroom_retrieve`
- cache-mode append-only delta reuse with a previously forwarded
compressed prefix
- cache-mode exact-prefix replay where the previous forwarded prefix
already contained a marker
- Scenario coverage from the offline-memory repro command:
- direct local embedder startup on CPU with no cached HF model
- hierarchical memory embedder startup with offline model cache missing
- bridge import through `LocalBackend`
- `MemoryHandler` public init warmup path
- `LocalBackend` save path under the offline lane
- Observed result: The CCR regression keeps marker-free forwarding on
frozen turns without tool availability, and the merged-`main`
offline-memory lanes now skip cleanly instead of failing unrelated CI
shards.
- frozen-prefix Anthropic turns without tool availability forward the
original long transcript across both token-mode and cache-mode reuse
paths, while unfrozen turns, reclamped token-mode turns, and frozen
turns that already advertise `headroom_retrieve` keep the reversible CCR
marker path
- the merged-`main` offline-memory regressions now skip cleanly when the
Hugging Face cache is unavailable instead of failing unrelated CI shards
- Not tested: live Zed session cache-hit behavior, provider latency
under real Anthropic upstreams, and online Hugging Face download lanes
## Review Readiness
- [x] I have performed a self-review
- [x] This PR is ready for human review
## Checklist
- [x] My code follows the project's style guidelines
- [x] I have performed a self-review of my code
- [x] I have commented my code, particularly in hard-to-understand areas
- [x] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [x] I have added tests that prove my fix is effective or that my
feature works
- [x] New and existing unit tests pass locally with my changes
- [x] I have updated the CHANGELOG.md if applicable
## Additional Notes
- Runtime scope is still intentionally narrow to Anthropic request-side
CCR. OpenAI, Gemini, streaming, and response-side CCR behavior are
unchanged.
- The only non-CCR diff is the test-only offline-memory follow-up
required after current `main` was merged into the branch.
- The focused proxy pytest run still emits the Windows-local
`StarletteDeprecationWarning` from `fastapi.testclient`'s `httpx`
bridge. The offline-memory repro command also emits existing datetime
deprecation warnings and a pytest teardown warning around skipped
offline lanes; none of those warnings were introduced by the CCR runtime
change.
2026-06-23 13:48:05 -04:00
|
|
|
import functools
|
|
|
|
|
import os
|
2026-04-17 12:50:12 +07:00
|
|
|
from typing import Any
|
|
|
|
|
from unittest.mock import patch
|
|
|
|
|
|
|
|
|
|
import pytest
|
|
|
|
|
|
|
|
|
|
from headroom.proxy.memory_handler import (
|
|
|
|
|
STARTUP_INIT_TIMEOUT_SECONDS,
|
|
|
|
|
MemoryConfig,
|
|
|
|
|
MemoryHandler,
|
|
|
|
|
)
|
fix(ccr): skip Anthropic marker emission when tool injection is deferred (#1273)
## Description
Anthropic request-side CCR can still compress a turn into retrieval
markers after the frozen-prefix cache guard suppresses
`headroom_retrieve` registration. That leaves the model with marker-only
context it cannot redeem, so the proxy silently drops recoverable data
on exactly the turns where cache preservation deferred tool injection.
This change couples the Anthropic request-side CCR path to tool
availability so a turn never emits retrieve-only markers without the
retrieval tool, even when token mode or cache-mode prefix replay could
otherwise reuse already-compressed marker text. Closes #1006
After a collaborator merged current `main` into this branch, CI also
picked up unrelated offline-memory failures from the merged base. Those
follow-up changes are test-only: they keep the offline Hugging Face
cache lanes skipping cleanly instead of failing in memory tests that are
outside the CCR runtime path.
## Type of Change
- [x] Bug fix (non-breaking change that fixes an issue)
- [ ] New feature (non-breaking change that adds functionality)
- [ ] Breaking change (fix or feature that would cause existing
functionality to change)
- [ ] Documentation update
- [ ] Performance improvement
- [ ] Code refactoring (no functional changes)
## Changes Made
- Couple Anthropic request-side CCR compression to the same
frozen-prefix guard that already defers `headroom_retrieve`
registration.
- Keep the existing cache-preservation behavior: frozen-prefix turns
stop emitting CCR retrieval markers instead of forcing tool injection
into the cached prefix.
- Make the skip decision use the effective frozen prefix after
token-mode reclamping, so turns that genuinely reclamp to zero still
keep normal reversible CCR behavior.
- Bypass cached marker reuse in both token mode and cache-mode prefix
replay when tool injection is deferred.
- Add focused regressions for the Anthropic request-path seams under
this bug:
- frozen-prefix turns do not emit marker-only payloads
- unfrozen turns still keep normal reversible CCR behavior
- token-mode reclamp back to zero still compresses normally
- existing `headroom_retrieve` tools keep reversible CCR on frozen turns
- cache-mode delta reuse and exact-prefix replay both forward original
content when retrieval is unavailable
- Add a `CHANGELOG.md` entry because the proxy's user-visible Anthropic
CCR behavior changes.
- Add a shared test skip helper for offline Hugging Face cache misses
and apply it to the merged `main` memory tests that were failing only in
the offline CI shards after the branch picked up current `main`.
## Testing
- [x] Unit tests pass (`uv run pytest
tests/test_proxy/test_anthropic_ccr_deferred_injection.py`)
- [x] Linting passes (`uv run ruff check . && uv run ruff format .
--check`)
- [ ] Type checking passes (`uv run mypy headroom`)
- [x] New tests added for new functionality when applicable
- [ ] Manual testing performed
### Test Output
```text
uv run pytest tests/test_proxy/test_anthropic_ccr_deferred_injection.py
14 passed, 1 warning in 34.19s
uv run pytest tests/test_memory/test_skip_helpers.py tests/test_memory/test_embedder_mps_serialization.py::test_cpu_uses_shared_executor tests/test_memory/test_hierarchical.py::TestLocalEmbedder::test_embed_single tests/test_memory_bridge.py::TestMemoryBridgeImport::test_import_claude_code_memory tests/test_memory_handler_concurrent_init.py::test_real_localbackend_initializes_via_public_entrypoint tests/test_memory_system.py::TestLocalBackend::test_save_memory_basic -q
4 passed, 5 skipped, 11 warnings in 7.65s
uv run ruff check .
All checks passed!
uv run ruff format . --check
968 files already formatted
```
## Real Behavior Proof
- Environment: local FastAPI `TestClient` for the Anthropic request
path, plus Windows Python 3.12 offline-memory repros with
`TRANSFORMERS_OFFLINE=1`
- Exact command / steps: Run the focused CCR regression command and the
offline-memory repro subset below on the merged branch state.
- `uv run pytest
tests/test_proxy/test_anthropic_ccr_deferred_injection.py`
- `uv run pytest tests/test_memory/test_skip_helpers.py
tests/test_memory/test_embedder_mps_serialization.py::test_cpu_uses_shared_executor
tests/test_memory/test_hierarchical.py::TestLocalEmbedder::test_embed_single
tests/test_memory_bridge.py::TestMemoryBridgeImport::test_import_claude_code_memory
tests/test_memory_handler_concurrent_init.py::test_real_localbackend_initializes_via_public_entrypoint
tests/test_memory_system.py::TestLocalBackend::test_save_memory_basic
-q`
- Scenario coverage from the CCR pytest command:
- frozen prefix with deferred tool injection and cached marker text
available in token mode
- unfrozen turn with normal CCR marker emission
- token mode where the tracked frozen prefix reclamps back to zero
- frozen prefix where the client already supplied `headroom_retrieve`
- cache-mode append-only delta reuse with a previously forwarded
compressed prefix
- cache-mode exact-prefix replay where the previous forwarded prefix
already contained a marker
- Scenario coverage from the offline-memory repro command:
- direct local embedder startup on CPU with no cached HF model
- hierarchical memory embedder startup with offline model cache missing
- bridge import through `LocalBackend`
- `MemoryHandler` public init warmup path
- `LocalBackend` save path under the offline lane
- Observed result: The CCR regression keeps marker-free forwarding on
frozen turns without tool availability, and the merged-`main`
offline-memory lanes now skip cleanly instead of failing unrelated CI
shards.
- frozen-prefix Anthropic turns without tool availability forward the
original long transcript across both token-mode and cache-mode reuse
paths, while unfrozen turns, reclamped token-mode turns, and frozen
turns that already advertise `headroom_retrieve` keep the reversible CCR
marker path
- the merged-`main` offline-memory regressions now skip cleanly when the
Hugging Face cache is unavailable instead of failing unrelated CI shards
- Not tested: live Zed session cache-hit behavior, provider latency
under real Anthropic upstreams, and online Hugging Face download lanes
## Review Readiness
- [x] I have performed a self-review
- [x] This PR is ready for human review
## Checklist
- [x] My code follows the project's style guidelines
- [x] I have performed a self-review of my code
- [x] I have commented my code, particularly in hard-to-understand areas
- [x] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [x] I have added tests that prove my fix is effective or that my
feature works
- [x] New and existing unit tests pass locally with my changes
- [x] I have updated the CHANGELOG.md if applicable
## Additional Notes
- Runtime scope is still intentionally narrow to Anthropic request-side
CCR. OpenAI, Gemini, streaming, and response-side CCR behavior are
unchanged.
- The only non-CCR diff is the test-only offline-memory follow-up
required after current `main` was merged into the branch.
- The focused proxy pytest run still emits the Windows-local
`StarletteDeprecationWarning` from `fastapi.testclient`'s `httpx`
bridge. The offline-memory repro command also emits existing datetime
deprecation warnings and a pytest teardown warning around skipped
offline lanes; none of those warnings were introduced by the CCR runtime
change.
2026-06-23 13:48:05 -04:00
|
|
|
from tests._skip_helpers import external_model_skip_reason
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def skip_offline_model_failures(func):
|
|
|
|
|
"""Skip real-backend smoke tests when the local embedder cannot start offline."""
|
|
|
|
|
|
|
|
|
|
@functools.wraps(func)
|
|
|
|
|
async def wrapper(*args, **kwargs):
|
|
|
|
|
try:
|
|
|
|
|
return await func(*args, **kwargs)
|
|
|
|
|
except Exception as exc:
|
|
|
|
|
reason = external_model_skip_reason(exc)
|
|
|
|
|
if reason is not None:
|
|
|
|
|
pytest.skip(reason)
|
|
|
|
|
raise
|
|
|
|
|
|
|
|
|
|
return wrapper
|
|
|
|
|
|
2026-04-17 12:50:12 +07:00
|
|
|
|
|
|
|
|
# -------------------------------------------------------------------
|
|
|
|
|
# Singleflight under concurrent callers
|
|
|
|
|
# -------------------------------------------------------------------
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
|
|
|
async def test_concurrent_ensure_initialized_runs_init_once(tmp_path, monkeypatch):
|
|
|
|
|
hits = {"n": 0}
|
|
|
|
|
start_event = asyncio.Event()
|
|
|
|
|
release_event = asyncio.Event()
|
|
|
|
|
|
|
|
|
|
class FakeLocalBackend:
|
|
|
|
|
def __init__(self, config): # noqa: D401
|
|
|
|
|
self.config = config
|
|
|
|
|
|
|
|
|
|
async def _ensure_initialized(self) -> None:
|
|
|
|
|
hits["n"] += 1
|
|
|
|
|
start_event.set()
|
|
|
|
|
# Simulate a slow cold-start so concurrent callers pile up on
|
|
|
|
|
# the lock. Without singleflight, hits would exceed 1.
|
|
|
|
|
await release_event.wait()
|
|
|
|
|
|
|
|
|
|
async def close(self) -> None:
|
|
|
|
|
pass
|
|
|
|
|
|
|
|
|
|
import headroom.memory.backends.local as local_mod
|
|
|
|
|
|
|
|
|
|
monkeypatch.setattr(local_mod, "LocalBackend", FakeLocalBackend)
|
|
|
|
|
|
|
|
|
|
handler = MemoryHandler(
|
2026-04-18 08:22:04 +07:00
|
|
|
MemoryConfig(enabled=True, backend="local", db_path=str(tmp_path / "mem.db"))
|
2026-04-17 12:50:12 +07:00
|
|
|
)
|
|
|
|
|
|
|
|
|
|
async def caller() -> None:
|
|
|
|
|
await handler._ensure_initialized()
|
|
|
|
|
|
|
|
|
|
# Fire 10 concurrent first-callers.
|
|
|
|
|
tasks = [asyncio.create_task(caller()) for _ in range(10)]
|
|
|
|
|
# Let one task enter the critical section, then release it.
|
|
|
|
|
await start_event.wait()
|
|
|
|
|
release_event.set()
|
|
|
|
|
await asyncio.gather(*tasks)
|
|
|
|
|
|
|
|
|
|
assert hits["n"] == 1, f"expected 1 backend init under concurrency, got {hits['n']}"
|
|
|
|
|
assert handler._initialized is True
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
|
|
|
async def test_ensure_initialized_noop_when_disabled(tmp_path):
|
|
|
|
|
handler = MemoryHandler(
|
|
|
|
|
MemoryConfig(enabled=False, backend="local", db_path=str(tmp_path / "mem.db"))
|
|
|
|
|
)
|
|
|
|
|
await handler._ensure_initialized()
|
|
|
|
|
assert handler._initialized is False
|
|
|
|
|
assert handler._backend is None
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# -------------------------------------------------------------------
|
|
|
|
|
# Timeout fail-open
|
|
|
|
|
# -------------------------------------------------------------------
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@pytest.mark.asyncio
|
2026-04-18 08:22:04 +07:00
|
|
|
async def test_ensure_initialized_timeout_leaves_handler_unready(tmp_path, monkeypatch):
|
2026-04-17 12:50:12 +07:00
|
|
|
class HangingBackend:
|
|
|
|
|
def __init__(self, config):
|
|
|
|
|
self.config = config
|
|
|
|
|
|
|
|
|
|
async def _ensure_initialized(self) -> None:
|
|
|
|
|
# Hang forever — timeout must cancel this.
|
|
|
|
|
await asyncio.Event().wait()
|
|
|
|
|
|
|
|
|
|
async def close(self) -> None:
|
|
|
|
|
pass
|
|
|
|
|
|
|
|
|
|
import headroom.memory.backends.local as local_mod
|
|
|
|
|
|
|
|
|
|
monkeypatch.setattr(local_mod, "LocalBackend", HangingBackend)
|
|
|
|
|
|
|
|
|
|
handler = MemoryHandler(
|
2026-04-18 08:22:04 +07:00
|
|
|
MemoryConfig(enabled=True, backend="local", db_path=str(tmp_path / "mem.db"))
|
2026-04-17 12:50:12 +07:00
|
|
|
)
|
|
|
|
|
|
|
|
|
|
# Attach a handler directly to the module logger — caplog has trouble
|
|
|
|
|
# when third-party conftest monkeys with propagation settings.
|
|
|
|
|
import logging as _logging
|
|
|
|
|
|
|
|
|
|
mem_logger = _logging.getLogger("headroom.proxy.memory_handler")
|
|
|
|
|
captured: list[_logging.LogRecord] = []
|
|
|
|
|
|
|
|
|
|
class _ListHandler(_logging.Handler):
|
|
|
|
|
def emit(self, record: _logging.LogRecord) -> None:
|
|
|
|
|
captured.append(record)
|
|
|
|
|
|
|
|
|
|
handler_log = _ListHandler(level=_logging.ERROR)
|
|
|
|
|
mem_logger.addHandler(handler_log)
|
|
|
|
|
prev_level = mem_logger.level
|
|
|
|
|
mem_logger.setLevel(_logging.DEBUG)
|
|
|
|
|
try:
|
|
|
|
|
# Shrink the module-level timeout to keep the test fast.
|
2026-04-18 08:22:04 +07:00
|
|
|
with patch("headroom.proxy.memory_handler.STARTUP_INIT_TIMEOUT_SECONDS", 0.1):
|
2026-04-17 12:50:12 +07:00
|
|
|
await handler._ensure_initialized()
|
|
|
|
|
finally:
|
|
|
|
|
mem_logger.removeHandler(handler_log)
|
|
|
|
|
mem_logger.setLevel(prev_level)
|
|
|
|
|
|
|
|
|
|
# Fail-open: no exception, _initialized=False, error logged.
|
|
|
|
|
assert handler._initialized is False
|
|
|
|
|
found_timeout_log = any("timed out" in rec.getMessage().lower() for rec in captured)
|
|
|
|
|
assert found_timeout_log, (
|
2026-04-18 08:22:04 +07:00
|
|
|
f"expected 'timed out' log record; got: {[(r.levelname, r.getMessage()) for r in captured]}"
|
2026-04-17 12:50:12 +07:00
|
|
|
)
|
|
|
|
|
|
|
|
|
|
# Confirm the default constant is unchanged (sanity).
|
|
|
|
|
assert STARTUP_INIT_TIMEOUT_SECONDS == 30.0
|
|
|
|
|
|
|
|
|
|
|
2026-04-18 01:57:16 +07:00
|
|
|
@pytest.mark.asyncio
|
|
|
|
|
async def test_ensure_initialized_timeout_nulls_partially_initialized_backend(
|
|
|
|
|
tmp_path, monkeypatch
|
|
|
|
|
):
|
|
|
|
|
"""If wait_for fires while _init_backend_locked has already set
|
|
|
|
|
``self._backend`` but before ``self._initialized = True``, the timeout
|
|
|
|
|
handler must null ``_backend``. Otherwise callers doing
|
|
|
|
|
``if self.memory_handler._backend:`` see a truthy-but-broken backend.
|
|
|
|
|
"""
|
|
|
|
|
|
2026-04-20 22:38:26 +07:00
|
|
|
close_hits = {"n": 0}
|
|
|
|
|
|
2026-04-18 01:57:16 +07:00
|
|
|
class SlowBackend:
|
|
|
|
|
def __init__(self, config):
|
|
|
|
|
self.config = config
|
|
|
|
|
|
|
|
|
|
async def _ensure_initialized(self) -> None:
|
|
|
|
|
# Hang long enough to blow the 0.01s timeout below.
|
|
|
|
|
await asyncio.sleep(5.0)
|
|
|
|
|
|
|
|
|
|
async def close(self) -> None:
|
2026-04-20 22:38:26 +07:00
|
|
|
close_hits["n"] += 1
|
2026-04-18 01:57:16 +07:00
|
|
|
|
|
|
|
|
import headroom.memory.backends.local as local_mod
|
|
|
|
|
|
|
|
|
|
monkeypatch.setattr(local_mod, "LocalBackend", SlowBackend)
|
|
|
|
|
|
|
|
|
|
handler = MemoryHandler(
|
2026-04-18 08:22:04 +07:00
|
|
|
MemoryConfig(enabled=True, backend="local", db_path=str(tmp_path / "mem.db"))
|
2026-04-18 01:57:16 +07:00
|
|
|
)
|
|
|
|
|
|
2026-04-18 08:22:04 +07:00
|
|
|
with patch("headroom.proxy.memory_handler.STARTUP_INIT_TIMEOUT_SECONDS", 0.01):
|
2026-04-18 01:57:16 +07:00
|
|
|
await handler._ensure_initialized()
|
|
|
|
|
|
|
|
|
|
# Both must be consistent after timeout.
|
|
|
|
|
assert handler._initialized is False
|
|
|
|
|
assert handler._backend is None
|
2026-04-20 22:38:26 +07:00
|
|
|
assert close_hits["n"] == 1
|
2026-04-18 01:57:16 +07:00
|
|
|
|
|
|
|
|
|
2026-04-18 01:58:05 +07:00
|
|
|
@pytest.mark.asyncio
|
2026-04-18 08:22:04 +07:00
|
|
|
async def test_ensure_initialized_cancellation_propagates_and_resets_state(tmp_path, monkeypatch):
|
2026-04-18 01:58:05 +07:00
|
|
|
"""External cancellation of an in-flight ``_ensure_initialized`` must
|
|
|
|
|
propagate (CancelledError is BaseException — not a swallowable error)
|
|
|
|
|
and leave the handler in a clean state."""
|
|
|
|
|
|
2026-04-20 22:38:26 +07:00
|
|
|
close_hits = {"n": 0}
|
|
|
|
|
|
2026-04-18 01:58:05 +07:00
|
|
|
class HangingBackend:
|
|
|
|
|
def __init__(self, config):
|
|
|
|
|
self.config = config
|
|
|
|
|
|
|
|
|
|
async def _ensure_initialized(self) -> None:
|
|
|
|
|
await asyncio.Event().wait()
|
|
|
|
|
|
|
|
|
|
async def close(self) -> None:
|
2026-04-20 22:38:26 +07:00
|
|
|
close_hits["n"] += 1
|
2026-04-18 01:58:05 +07:00
|
|
|
|
|
|
|
|
import headroom.memory.backends.local as local_mod
|
|
|
|
|
|
|
|
|
|
monkeypatch.setattr(local_mod, "LocalBackend", HangingBackend)
|
|
|
|
|
|
|
|
|
|
handler = MemoryHandler(
|
2026-04-18 08:22:04 +07:00
|
|
|
MemoryConfig(enabled=True, backend="local", db_path=str(tmp_path / "mem.db"))
|
2026-04-18 01:58:05 +07:00
|
|
|
)
|
|
|
|
|
|
|
|
|
|
task = asyncio.create_task(handler._ensure_initialized())
|
|
|
|
|
# Give the task a tick to enter _init_backend_locked and assign _backend.
|
|
|
|
|
await asyncio.sleep(0.05)
|
|
|
|
|
task.cancel()
|
|
|
|
|
with pytest.raises(asyncio.CancelledError):
|
|
|
|
|
await task
|
|
|
|
|
|
|
|
|
|
assert handler._initialized is False
|
|
|
|
|
assert handler._backend is None
|
2026-04-20 22:38:26 +07:00
|
|
|
assert close_hits["n"] == 1
|
2026-04-18 01:58:05 +07:00
|
|
|
|
|
|
|
|
|
2026-04-17 12:50:12 +07:00
|
|
|
# -------------------------------------------------------------------
|
|
|
|
|
# Real backend init (no monkeypatching) — integration smoke test
|
|
|
|
|
# -------------------------------------------------------------------
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@pytest.mark.asyncio
|
fix(ccr): skip Anthropic marker emission when tool injection is deferred (#1273)
## Description
Anthropic request-side CCR can still compress a turn into retrieval
markers after the frozen-prefix cache guard suppresses
`headroom_retrieve` registration. That leaves the model with marker-only
context it cannot redeem, so the proxy silently drops recoverable data
on exactly the turns where cache preservation deferred tool injection.
This change couples the Anthropic request-side CCR path to tool
availability so a turn never emits retrieve-only markers without the
retrieval tool, even when token mode or cache-mode prefix replay could
otherwise reuse already-compressed marker text. Closes #1006
After a collaborator merged current `main` into this branch, CI also
picked up unrelated offline-memory failures from the merged base. Those
follow-up changes are test-only: they keep the offline Hugging Face
cache lanes skipping cleanly instead of failing in memory tests that are
outside the CCR runtime path.
## Type of Change
- [x] Bug fix (non-breaking change that fixes an issue)
- [ ] New feature (non-breaking change that adds functionality)
- [ ] Breaking change (fix or feature that would cause existing
functionality to change)
- [ ] Documentation update
- [ ] Performance improvement
- [ ] Code refactoring (no functional changes)
## Changes Made
- Couple Anthropic request-side CCR compression to the same
frozen-prefix guard that already defers `headroom_retrieve`
registration.
- Keep the existing cache-preservation behavior: frozen-prefix turns
stop emitting CCR retrieval markers instead of forcing tool injection
into the cached prefix.
- Make the skip decision use the effective frozen prefix after
token-mode reclamping, so turns that genuinely reclamp to zero still
keep normal reversible CCR behavior.
- Bypass cached marker reuse in both token mode and cache-mode prefix
replay when tool injection is deferred.
- Add focused regressions for the Anthropic request-path seams under
this bug:
- frozen-prefix turns do not emit marker-only payloads
- unfrozen turns still keep normal reversible CCR behavior
- token-mode reclamp back to zero still compresses normally
- existing `headroom_retrieve` tools keep reversible CCR on frozen turns
- cache-mode delta reuse and exact-prefix replay both forward original
content when retrieval is unavailable
- Add a `CHANGELOG.md` entry because the proxy's user-visible Anthropic
CCR behavior changes.
- Add a shared test skip helper for offline Hugging Face cache misses
and apply it to the merged `main` memory tests that were failing only in
the offline CI shards after the branch picked up current `main`.
## Testing
- [x] Unit tests pass (`uv run pytest
tests/test_proxy/test_anthropic_ccr_deferred_injection.py`)
- [x] Linting passes (`uv run ruff check . && uv run ruff format .
--check`)
- [ ] Type checking passes (`uv run mypy headroom`)
- [x] New tests added for new functionality when applicable
- [ ] Manual testing performed
### Test Output
```text
uv run pytest tests/test_proxy/test_anthropic_ccr_deferred_injection.py
14 passed, 1 warning in 34.19s
uv run pytest tests/test_memory/test_skip_helpers.py tests/test_memory/test_embedder_mps_serialization.py::test_cpu_uses_shared_executor tests/test_memory/test_hierarchical.py::TestLocalEmbedder::test_embed_single tests/test_memory_bridge.py::TestMemoryBridgeImport::test_import_claude_code_memory tests/test_memory_handler_concurrent_init.py::test_real_localbackend_initializes_via_public_entrypoint tests/test_memory_system.py::TestLocalBackend::test_save_memory_basic -q
4 passed, 5 skipped, 11 warnings in 7.65s
uv run ruff check .
All checks passed!
uv run ruff format . --check
968 files already formatted
```
## Real Behavior Proof
- Environment: local FastAPI `TestClient` for the Anthropic request
path, plus Windows Python 3.12 offline-memory repros with
`TRANSFORMERS_OFFLINE=1`
- Exact command / steps: Run the focused CCR regression command and the
offline-memory repro subset below on the merged branch state.
- `uv run pytest
tests/test_proxy/test_anthropic_ccr_deferred_injection.py`
- `uv run pytest tests/test_memory/test_skip_helpers.py
tests/test_memory/test_embedder_mps_serialization.py::test_cpu_uses_shared_executor
tests/test_memory/test_hierarchical.py::TestLocalEmbedder::test_embed_single
tests/test_memory_bridge.py::TestMemoryBridgeImport::test_import_claude_code_memory
tests/test_memory_handler_concurrent_init.py::test_real_localbackend_initializes_via_public_entrypoint
tests/test_memory_system.py::TestLocalBackend::test_save_memory_basic
-q`
- Scenario coverage from the CCR pytest command:
- frozen prefix with deferred tool injection and cached marker text
available in token mode
- unfrozen turn with normal CCR marker emission
- token mode where the tracked frozen prefix reclamps back to zero
- frozen prefix where the client already supplied `headroom_retrieve`
- cache-mode append-only delta reuse with a previously forwarded
compressed prefix
- cache-mode exact-prefix replay where the previous forwarded prefix
already contained a marker
- Scenario coverage from the offline-memory repro command:
- direct local embedder startup on CPU with no cached HF model
- hierarchical memory embedder startup with offline model cache missing
- bridge import through `LocalBackend`
- `MemoryHandler` public init warmup path
- `LocalBackend` save path under the offline lane
- Observed result: The CCR regression keeps marker-free forwarding on
frozen turns without tool availability, and the merged-`main`
offline-memory lanes now skip cleanly instead of failing unrelated CI
shards.
- frozen-prefix Anthropic turns without tool availability forward the
original long transcript across both token-mode and cache-mode reuse
paths, while unfrozen turns, reclamped token-mode turns, and frozen
turns that already advertise `headroom_retrieve` keep the reversible CCR
marker path
- the merged-`main` offline-memory regressions now skip cleanly when the
Hugging Face cache is unavailable instead of failing unrelated CI shards
- Not tested: live Zed session cache-hit behavior, provider latency
under real Anthropic upstreams, and online Hugging Face download lanes
## Review Readiness
- [x] I have performed a self-review
- [x] This PR is ready for human review
## Checklist
- [x] My code follows the project's style guidelines
- [x] I have performed a self-review of my code
- [x] I have commented my code, particularly in hard-to-understand areas
- [x] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [x] I have added tests that prove my fix is effective or that my
feature works
- [x] New and existing unit tests pass locally with my changes
- [x] I have updated the CHANGELOG.md if applicable
## Additional Notes
- Runtime scope is still intentionally narrow to Anthropic request-side
CCR. OpenAI, Gemini, streaming, and response-side CCR behavior are
unchanged.
- The only non-CCR diff is the test-only offline-memory follow-up
required after current `main` was merged into the branch.
- The focused proxy pytest run still emits the Windows-local
`StarletteDeprecationWarning` from `fastapi.testclient`'s `httpx`
bridge. The offline-memory repro command also emits existing datetime
deprecation warnings and a pytest teardown warning around skipped
offline lanes; none of those warnings were introduced by the CCR runtime
change.
2026-06-23 13:48:05 -04:00
|
|
|
@skip_offline_model_failures
|
2026-04-17 12:50:12 +07:00
|
|
|
async def test_real_localbackend_initializes_via_public_entrypoint(tmp_path):
|
|
|
|
|
"""End-to-end sanity check: the public ``ensure_initialized`` path works
|
|
|
|
|
against a real LocalBackend. This catches regressions where the new
|
|
|
|
|
asyncio.Lock layering (Unit 1) breaks the actual init chain."""
|
|
|
|
|
pytest.importorskip("sqlite3") # bundled with Python but be explicit
|
|
|
|
|
# Skip on environments without an embedder backend available.
|
|
|
|
|
try:
|
|
|
|
|
import onnxruntime # noqa: F401
|
|
|
|
|
except Exception:
|
|
|
|
|
try:
|
|
|
|
|
import sentence_transformers # noqa: F401
|
|
|
|
|
except Exception: # pragma: no cover - env-dependent
|
|
|
|
|
pytest.skip("No embedder backend available in this environment")
|
|
|
|
|
|
|
|
|
|
handler = MemoryHandler(
|
|
|
|
|
MemoryConfig(
|
|
|
|
|
enabled=True,
|
|
|
|
|
backend="local",
|
|
|
|
|
db_path=str(tmp_path / "mem.db"),
|
|
|
|
|
)
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
# Concurrent callers should still produce one initialized backend.
|
|
|
|
|
await asyncio.gather(*[handler.ensure_initialized() for _ in range(5)])
|
|
|
|
|
assert handler._initialized is True
|
|
|
|
|
assert handler._backend is not None
|
|
|
|
|
|
|
|
|
|
# warmup_embedder is best-effort; on a real backend it should succeed.
|
|
|
|
|
warmed = await handler.warmup_embedder()
|
fix(ccr): skip Anthropic marker emission when tool injection is deferred (#1273)
## Description
Anthropic request-side CCR can still compress a turn into retrieval
markers after the frozen-prefix cache guard suppresses
`headroom_retrieve` registration. That leaves the model with marker-only
context it cannot redeem, so the proxy silently drops recoverable data
on exactly the turns where cache preservation deferred tool injection.
This change couples the Anthropic request-side CCR path to tool
availability so a turn never emits retrieve-only markers without the
retrieval tool, even when token mode or cache-mode prefix replay could
otherwise reuse already-compressed marker text. Closes #1006
After a collaborator merged current `main` into this branch, CI also
picked up unrelated offline-memory failures from the merged base. Those
follow-up changes are test-only: they keep the offline Hugging Face
cache lanes skipping cleanly instead of failing in memory tests that are
outside the CCR runtime path.
## Type of Change
- [x] Bug fix (non-breaking change that fixes an issue)
- [ ] New feature (non-breaking change that adds functionality)
- [ ] Breaking change (fix or feature that would cause existing
functionality to change)
- [ ] Documentation update
- [ ] Performance improvement
- [ ] Code refactoring (no functional changes)
## Changes Made
- Couple Anthropic request-side CCR compression to the same
frozen-prefix guard that already defers `headroom_retrieve`
registration.
- Keep the existing cache-preservation behavior: frozen-prefix turns
stop emitting CCR retrieval markers instead of forcing tool injection
into the cached prefix.
- Make the skip decision use the effective frozen prefix after
token-mode reclamping, so turns that genuinely reclamp to zero still
keep normal reversible CCR behavior.
- Bypass cached marker reuse in both token mode and cache-mode prefix
replay when tool injection is deferred.
- Add focused regressions for the Anthropic request-path seams under
this bug:
- frozen-prefix turns do not emit marker-only payloads
- unfrozen turns still keep normal reversible CCR behavior
- token-mode reclamp back to zero still compresses normally
- existing `headroom_retrieve` tools keep reversible CCR on frozen turns
- cache-mode delta reuse and exact-prefix replay both forward original
content when retrieval is unavailable
- Add a `CHANGELOG.md` entry because the proxy's user-visible Anthropic
CCR behavior changes.
- Add a shared test skip helper for offline Hugging Face cache misses
and apply it to the merged `main` memory tests that were failing only in
the offline CI shards after the branch picked up current `main`.
## Testing
- [x] Unit tests pass (`uv run pytest
tests/test_proxy/test_anthropic_ccr_deferred_injection.py`)
- [x] Linting passes (`uv run ruff check . && uv run ruff format .
--check`)
- [ ] Type checking passes (`uv run mypy headroom`)
- [x] New tests added for new functionality when applicable
- [ ] Manual testing performed
### Test Output
```text
uv run pytest tests/test_proxy/test_anthropic_ccr_deferred_injection.py
14 passed, 1 warning in 34.19s
uv run pytest tests/test_memory/test_skip_helpers.py tests/test_memory/test_embedder_mps_serialization.py::test_cpu_uses_shared_executor tests/test_memory/test_hierarchical.py::TestLocalEmbedder::test_embed_single tests/test_memory_bridge.py::TestMemoryBridgeImport::test_import_claude_code_memory tests/test_memory_handler_concurrent_init.py::test_real_localbackend_initializes_via_public_entrypoint tests/test_memory_system.py::TestLocalBackend::test_save_memory_basic -q
4 passed, 5 skipped, 11 warnings in 7.65s
uv run ruff check .
All checks passed!
uv run ruff format . --check
968 files already formatted
```
## Real Behavior Proof
- Environment: local FastAPI `TestClient` for the Anthropic request
path, plus Windows Python 3.12 offline-memory repros with
`TRANSFORMERS_OFFLINE=1`
- Exact command / steps: Run the focused CCR regression command and the
offline-memory repro subset below on the merged branch state.
- `uv run pytest
tests/test_proxy/test_anthropic_ccr_deferred_injection.py`
- `uv run pytest tests/test_memory/test_skip_helpers.py
tests/test_memory/test_embedder_mps_serialization.py::test_cpu_uses_shared_executor
tests/test_memory/test_hierarchical.py::TestLocalEmbedder::test_embed_single
tests/test_memory_bridge.py::TestMemoryBridgeImport::test_import_claude_code_memory
tests/test_memory_handler_concurrent_init.py::test_real_localbackend_initializes_via_public_entrypoint
tests/test_memory_system.py::TestLocalBackend::test_save_memory_basic
-q`
- Scenario coverage from the CCR pytest command:
- frozen prefix with deferred tool injection and cached marker text
available in token mode
- unfrozen turn with normal CCR marker emission
- token mode where the tracked frozen prefix reclamps back to zero
- frozen prefix where the client already supplied `headroom_retrieve`
- cache-mode append-only delta reuse with a previously forwarded
compressed prefix
- cache-mode exact-prefix replay where the previous forwarded prefix
already contained a marker
- Scenario coverage from the offline-memory repro command:
- direct local embedder startup on CPU with no cached HF model
- hierarchical memory embedder startup with offline model cache missing
- bridge import through `LocalBackend`
- `MemoryHandler` public init warmup path
- `LocalBackend` save path under the offline lane
- Observed result: The CCR regression keeps marker-free forwarding on
frozen turns without tool availability, and the merged-`main`
offline-memory lanes now skip cleanly instead of failing unrelated CI
shards.
- frozen-prefix Anthropic turns without tool availability forward the
original long transcript across both token-mode and cache-mode reuse
paths, while unfrozen turns, reclamped token-mode turns, and frozen
turns that already advertise `headroom_retrieve` keep the reversible CCR
marker path
- the merged-`main` offline-memory regressions now skip cleanly when the
Hugging Face cache is unavailable instead of failing unrelated CI shards
- Not tested: live Zed session cache-hit behavior, provider latency
under real Anthropic upstreams, and online Hugging Face download lanes
## Review Readiness
- [x] I have performed a self-review
- [x] This PR is ready for human review
## Checklist
- [x] My code follows the project's style guidelines
- [x] I have performed a self-review of my code
- [x] I have commented my code, particularly in hard-to-understand areas
- [x] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [x] I have added tests that prove my fix is effective or that my
feature works
- [x] New and existing unit tests pass locally with my changes
- [x] I have updated the CHANGELOG.md if applicable
## Additional Notes
- Runtime scope is still intentionally narrow to Anthropic request-side
CCR. OpenAI, Gemini, streaming, and response-side CCR behavior are
unchanged.
- The only non-CCR diff is the test-only offline-memory follow-up
required after current `main` was merged into the branch.
- The focused proxy pytest run still emits the Windows-local
`StarletteDeprecationWarning` from `fastapi.testclient`'s `httpx`
bridge. The offline-memory repro command also emits existing datetime
deprecation warnings and a pytest teardown warning around skipped
offline lanes; none of those warnings were introduced by the CCR runtime
change.
2026-06-23 13:48:05 -04:00
|
|
|
if not warmed and os.environ.get("TRANSFORMERS_OFFLINE") == "1":
|
|
|
|
|
pytest.skip("Skipped because required Hugging Face model files are unavailable offline")
|
2026-04-17 12:50:12 +07:00
|
|
|
assert warmed is True
|
|
|
|
|
await handler.close()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
|
|
|
async def test_warmup_embedder_returns_false_without_backend():
|
|
|
|
|
handler = MemoryHandler(MemoryConfig(enabled=True, backend="local"))
|
|
|
|
|
# _initialized=False, _backend=None → no-op, no crash.
|
|
|
|
|
result = await handler.warmup_embedder()
|
|
|
|
|
assert result is False
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
|
|
|
async def test_warmup_embedder_swallows_exceptions():
|
|
|
|
|
handler = MemoryHandler(MemoryConfig(enabled=True, backend="local"))
|
|
|
|
|
handler._initialized = True
|
|
|
|
|
|
|
|
|
|
class HM:
|
|
|
|
|
class _E:
|
|
|
|
|
async def embed(self, _text: Any) -> Any:
|
|
|
|
|
raise RuntimeError("synthetic embedder failure")
|
|
|
|
|
|
|
|
|
|
_embedder = _E()
|
|
|
|
|
|
|
|
|
|
class Backend:
|
|
|
|
|
_hierarchical_memory = HM()
|
|
|
|
|
|
|
|
|
|
handler._backend = Backend()
|
|
|
|
|
# Must not raise; returns False.
|
|
|
|
|
result = await handler.warmup_embedder()
|
|
|
|
|
assert result is False
|