fix(my-deepagent): v0.3 plan-conformance — 18-item gap fix across PR #2-#9
1차 v0.3 구현 후 plan-v0.3 와 대조해 발견된 18건 누락/명세 위반을 보강. 자기 리뷰 3 라운드 (누락·미완 / 오류·엣지케이스 / 과최적화) 모두 PASS. PR #5 plan-mode (3건): - BLOCKED_TOOLS_IN_PLAN_MODE 에 write_todos 추가 - /plan 시 system message inject (_PLAN_MODE_SYSTEM_PROMPT) - /approve 시 마지막 assistant 메시지를 "approved plan" system 으로 inject - InteractiveSession._pending_system_messages 인프라 신설 PR #2 compaction (1건): - CompactionResult.summary_text 추가, 다음 thread 첫 ainvoke 에 inject PR #3 auto-memory (6건): - global memory dir + bootstrap - frontmatter name/description/type 정식 도입 + MemoryEntry/MemoryType - _infer_memory_type (keyword heuristic, no LLM) - _scrub_secrets (OpenRouter/Anthropic/OpenAI/AWS/Bearer redaction) - /memory show <name> 서브명령 - /remember [--global] / /forget [--global] 스코프 토글 PR #4 skills (3건): - project_skills_dir + 두 스코프 (global / project) merge with last-wins - /skill <name> 본문 inject (queue_system_message) — 이전엔 REPL 출력만 - /skills show <name> 별도 서브명령 PR #6 sub-agent (4건): - budget.py `session:<uuid>` scope + CostMiddleware 자동 전달 - resolve_root_session_id walk-up (cycle guard) + sub-agent root 에 charge - run_subagent_to_completion 실제 ainvoke + 결과 push to parent - /agents 서브명령 구조 (list / spawn / show) + spawn 시 parent system msg PR #7 governance (1건): - bootstrap_user_dirs — instructions + global/memory + skills + projects 한 호출로 idempotent 부트스트랩 PR #8 Web GUI (1건): - index.html → 세션 목록, runs.html (신설) → workflow archive - conversation.html ?session=<id> deep-link PR #9 workflow integration (2건): - /workflow 백그라운드 WorkflowEngine.run + 진행 메시지 stream 누적 - /binding show <workflow-name[@version]> 인자 지원 테스트 (+17, 685 → 702 passed): - test_plan_mode: write_todos 차단 + blocklist sanity - test_memory: scrub + type 추론 + override - test_skills: project override + find_skill + resolve_skill_sources(pk) - test_subagents: resolve_root_session_id chain + missing fallback - test_budget: session: scope accumulation - test_instructions: governance bootstrap + idempotency - test_api_static: runs.html 신설 + index.html 재구성 게이트: - ruff check / format --check / mypy: PASS (141 source files) - pytest -q --ignore=tests/integration/test_e2e_workflow.py --ignore=tests/integration/test_openrouter_smoke.py: 702 passed Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -18,6 +18,7 @@ from pathlib import Path
|
||||
from typing import Any
|
||||
|
||||
import pytest
|
||||
from fastapi import FastAPI
|
||||
from httpx import ASGITransport, AsyncClient
|
||||
from sqlalchemy import select
|
||||
|
||||
@@ -28,7 +29,9 @@ from my_deepagent.persistence.models import InteractiveSessionRow, MessageRow
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
async def app_client(tmp_path: Path) -> AsyncIterator[tuple[AsyncClient, Database]]:
|
||||
async def app_client(
|
||||
tmp_path: Path,
|
||||
) -> AsyncIterator[tuple[AsyncClient, Database, FastAPI]]:
|
||||
db_url = f"sqlite+aiosqlite:///{tmp_path / 'conv.sqlite3'}"
|
||||
cfg = load_config(
|
||||
workspace_root=tmp_path,
|
||||
@@ -44,7 +47,7 @@ async def app_client(tmp_path: Path) -> AsyncIterator[tuple[AsyncClient, Databas
|
||||
# Tests get their own Database instance for direct row inspection.
|
||||
external_db = Database(db_url)
|
||||
async with AsyncClient(transport=transport, base_url="http://test", timeout=10.0) as client:
|
||||
yield (client, external_db)
|
||||
yield (client, external_db, app)
|
||||
await external_db.dispose()
|
||||
|
||||
|
||||
@@ -55,9 +58,9 @@ async def app_client(tmp_path: Path) -> AsyncIterator[tuple[AsyncClient, Databas
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_conversation_page_served(
|
||||
app_client: tuple[AsyncClient, Database],
|
||||
app_client: tuple[AsyncClient, Database, FastAPI],
|
||||
) -> None:
|
||||
client, _ = app_client
|
||||
client, _db, _app = app_client
|
||||
r = await client.get("/conversation.html")
|
||||
assert r.status_code == 200
|
||||
assert 'data-page="conversation"' in r.text
|
||||
@@ -71,9 +74,9 @@ async def test_conversation_page_served(
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_post_message_returns_ack_and_persists_user_row(
|
||||
app_client: tuple[AsyncClient, Database], monkeypatch: pytest.MonkeyPatch
|
||||
app_client: tuple[AsyncClient, Database, FastAPI], monkeypatch: pytest.MonkeyPatch
|
||||
) -> None:
|
||||
client, db = app_client
|
||||
client, db, _app = app_client
|
||||
|
||||
invocations: list[tuple[str, str]] = []
|
||||
|
||||
@@ -125,11 +128,11 @@ async def test_post_message_returns_ack_and_persists_user_row(
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_post_message_holds_task_ref_on_app_state(
|
||||
app_client: tuple[AsyncClient, Database], monkeypatch: pytest.MonkeyPatch
|
||||
app_client: tuple[AsyncClient, Database, FastAPI], monkeypatch: pytest.MonkeyPatch
|
||||
) -> None:
|
||||
"""Background task must be held on app.state.pending_invocations so the
|
||||
GC + RUF006 don't drop it before completion."""
|
||||
client, _ = app_client
|
||||
client, _db, app = app_client
|
||||
|
||||
started = asyncio.Event()
|
||||
can_finish = asyncio.Event()
|
||||
@@ -150,12 +153,12 @@ async def test_post_message_holds_task_ref_on_app_state(
|
||||
# Wait for the task to start.
|
||||
await asyncio.wait_for(started.wait(), timeout=2.0)
|
||||
# The pending_invocations set on the app should hold a reference.
|
||||
pending = client._transport.app.state.pending_invocations
|
||||
pending = app.state.pending_invocations
|
||||
assert len(pending) == 1
|
||||
# Release the task and let the discard callback fire.
|
||||
can_finish.set()
|
||||
await asyncio.sleep(0.05)
|
||||
assert len(client._transport.app.state.pending_invocations) == 0
|
||||
assert len(app.state.pending_invocations) == 0
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
@@ -165,10 +168,10 @@ async def test_post_message_holds_task_ref_on_app_state(
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_background_invocation_persists_assistant_row(
|
||||
app_client: tuple[AsyncClient, Database], monkeypatch: pytest.MonkeyPatch
|
||||
app_client: tuple[AsyncClient, Database, FastAPI], monkeypatch: pytest.MonkeyPatch
|
||||
) -> None:
|
||||
"""When the runner finishes, an assistant MessageRow should be visible."""
|
||||
client, db = app_client
|
||||
client, db, _app = app_client
|
||||
|
||||
async def fake_invoke(
|
||||
passed_db: Any,
|
||||
@@ -184,19 +187,17 @@ async def test_background_invocation_persists_assistant_row(
|
||||
|
||||
from sqlalchemy import desc
|
||||
|
||||
from my_deepagent.persistence.models import MessageRow as MR
|
||||
|
||||
async with passed_db.session() as s:
|
||||
last = (
|
||||
await s.execute(
|
||||
select(MR.seq)
|
||||
.where(MR.session_id == str(session_id))
|
||||
.order_by(desc(MR.seq))
|
||||
select(MessageRow.seq)
|
||||
.where(MessageRow.session_id == str(session_id))
|
||||
.order_by(desc(MessageRow.seq))
|
||||
.limit(1)
|
||||
)
|
||||
).scalar_one_or_none() or 0
|
||||
s.add(
|
||||
MR(
|
||||
MessageRow(
|
||||
session_id=str(session_id),
|
||||
seq=last + 1,
|
||||
role="assistant",
|
||||
|
||||
Reference in New Issue
Block a user