mirror of
https://github.com/leonvanzyl/autocoder.git
synced 2026-03-17 10:53:09 +00:00
71f17c73c2
Add interactive multiple-choice question support to the project assistant, allowing it to present clickable options when clarification is needed. Backend changes: - Add ask_user MCP tool to feature_mcp.py with input validation - Add mcp__features__ask_user to assistant allowed tools list - Intercept ask_user tool calls in _query_claude() to yield question messages - Add answer WebSocket message handler in assistant_chat router - Document ask_user tool in assistant system prompt Frontend changes: - Add AssistantChatQuestionMessage type and update server message union - Add currentQuestions state and sendAnswer() to useAssistantChat hook - Handle question WebSocket messages by attaching to last assistant message - Render QuestionOptions component between messages and input area - Disable text input while structured questions are active Flow: Claude calls ask_user → backend intercepts → WebSocket question message → frontend renders QuestionOptions → user clicks options → answer sent back → Claude receives formatted answer and continues conversation. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
364 lines
14 KiB
Python
364 lines
14 KiB
Python
"""
|
|
Assistant Chat Router
|
|
=====================
|
|
|
|
WebSocket and REST endpoints for the read-only project assistant.
|
|
"""
|
|
|
|
import json
|
|
import logging
|
|
from typing import Optional
|
|
|
|
from fastapi import APIRouter, HTTPException, WebSocket, WebSocketDisconnect
|
|
from pydantic import BaseModel
|
|
|
|
from ..services.assistant_chat_session import (
|
|
AssistantChatSession,
|
|
create_session,
|
|
get_session,
|
|
list_sessions,
|
|
remove_session,
|
|
)
|
|
from ..services.assistant_database import (
|
|
create_conversation,
|
|
delete_conversation,
|
|
get_conversation,
|
|
get_conversations,
|
|
)
|
|
from ..utils.project_helpers import get_project_path as _get_project_path
|
|
from ..utils.validation import validate_project_name
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
router = APIRouter(prefix="/api/assistant", tags=["assistant-chat"])
|
|
|
|
|
|
# ============================================================================
|
|
# Pydantic Models
|
|
# ============================================================================
|
|
|
|
class ConversationSummary(BaseModel):
|
|
"""Summary of a conversation."""
|
|
id: int
|
|
project_name: str
|
|
title: Optional[str]
|
|
created_at: Optional[str]
|
|
updated_at: Optional[str]
|
|
message_count: int
|
|
|
|
|
|
class ConversationMessageModel(BaseModel):
|
|
"""A message within a conversation."""
|
|
id: int
|
|
role: str
|
|
content: str
|
|
timestamp: Optional[str]
|
|
|
|
|
|
class ConversationDetail(BaseModel):
|
|
"""Full conversation with messages."""
|
|
id: int
|
|
project_name: str
|
|
title: Optional[str]
|
|
created_at: Optional[str]
|
|
updated_at: Optional[str]
|
|
messages: list[ConversationMessageModel]
|
|
|
|
|
|
class SessionInfo(BaseModel):
|
|
"""Active session information."""
|
|
project_name: str
|
|
conversation_id: Optional[int]
|
|
is_active: bool
|
|
|
|
|
|
# ============================================================================
|
|
# REST Endpoints - Conversation Management
|
|
# ============================================================================
|
|
|
|
@router.get("/conversations/{project_name}", response_model=list[ConversationSummary])
|
|
async def list_project_conversations(project_name: str):
|
|
"""List all conversations for a project."""
|
|
if not validate_project_name(project_name):
|
|
raise HTTPException(status_code=400, detail="Invalid project name")
|
|
|
|
project_dir = _get_project_path(project_name)
|
|
if not project_dir or not project_dir.exists():
|
|
raise HTTPException(status_code=404, detail="Project not found")
|
|
|
|
conversations = get_conversations(project_dir, project_name)
|
|
return [ConversationSummary(**c) for c in conversations]
|
|
|
|
|
|
@router.get("/conversations/{project_name}/{conversation_id}", response_model=ConversationDetail)
|
|
async def get_project_conversation(project_name: str, conversation_id: int):
|
|
"""Get a specific conversation with all messages."""
|
|
if not validate_project_name(project_name):
|
|
raise HTTPException(status_code=400, detail="Invalid project name")
|
|
|
|
project_dir = _get_project_path(project_name)
|
|
if not project_dir or not project_dir.exists():
|
|
raise HTTPException(status_code=404, detail="Project not found")
|
|
|
|
conversation = get_conversation(project_dir, conversation_id)
|
|
if not conversation:
|
|
raise HTTPException(status_code=404, detail="Conversation not found")
|
|
|
|
return ConversationDetail(
|
|
id=conversation["id"],
|
|
project_name=conversation["project_name"],
|
|
title=conversation["title"],
|
|
created_at=conversation["created_at"],
|
|
updated_at=conversation["updated_at"],
|
|
messages=[ConversationMessageModel(**m) for m in conversation["messages"]],
|
|
)
|
|
|
|
|
|
@router.post("/conversations/{project_name}", response_model=ConversationSummary)
|
|
async def create_project_conversation(project_name: str):
|
|
"""Create a new conversation for a project."""
|
|
if not validate_project_name(project_name):
|
|
raise HTTPException(status_code=400, detail="Invalid project name")
|
|
|
|
project_dir = _get_project_path(project_name)
|
|
if not project_dir or not project_dir.exists():
|
|
raise HTTPException(status_code=404, detail="Project not found")
|
|
|
|
conversation = create_conversation(project_dir, project_name)
|
|
return ConversationSummary(
|
|
id=int(conversation.id),
|
|
project_name=str(conversation.project_name),
|
|
title=str(conversation.title) if conversation.title else None,
|
|
created_at=conversation.created_at.isoformat() if conversation.created_at else None,
|
|
updated_at=conversation.updated_at.isoformat() if conversation.updated_at else None,
|
|
message_count=0,
|
|
)
|
|
|
|
|
|
@router.delete("/conversations/{project_name}/{conversation_id}")
|
|
async def delete_project_conversation(project_name: str, conversation_id: int):
|
|
"""Delete a conversation."""
|
|
if not validate_project_name(project_name):
|
|
raise HTTPException(status_code=400, detail="Invalid project name")
|
|
|
|
project_dir = _get_project_path(project_name)
|
|
if not project_dir or not project_dir.exists():
|
|
raise HTTPException(status_code=404, detail="Project not found")
|
|
|
|
success = delete_conversation(project_dir, conversation_id)
|
|
if not success:
|
|
raise HTTPException(status_code=404, detail="Conversation not found")
|
|
|
|
return {"success": True, "message": "Conversation deleted"}
|
|
|
|
|
|
# ============================================================================
|
|
# REST Endpoints - Session Management
|
|
# ============================================================================
|
|
|
|
@router.get("/sessions", response_model=list[str])
|
|
async def list_active_sessions():
|
|
"""List all active assistant sessions."""
|
|
return list_sessions()
|
|
|
|
|
|
@router.get("/sessions/{project_name}", response_model=SessionInfo)
|
|
async def get_session_info(project_name: str):
|
|
"""Get information about an active session."""
|
|
if not validate_project_name(project_name):
|
|
raise HTTPException(status_code=400, detail="Invalid project name")
|
|
|
|
session = get_session(project_name)
|
|
if not session:
|
|
raise HTTPException(status_code=404, detail="No active session for this project")
|
|
|
|
return SessionInfo(
|
|
project_name=project_name,
|
|
conversation_id=session.get_conversation_id(),
|
|
is_active=True,
|
|
)
|
|
|
|
|
|
@router.delete("/sessions/{project_name}")
|
|
async def close_session(project_name: str):
|
|
"""Close an active session."""
|
|
if not validate_project_name(project_name):
|
|
raise HTTPException(status_code=400, detail="Invalid project name")
|
|
|
|
session = get_session(project_name)
|
|
if not session:
|
|
raise HTTPException(status_code=404, detail="No active session for this project")
|
|
|
|
await remove_session(project_name)
|
|
return {"success": True, "message": "Session closed"}
|
|
|
|
|
|
# ============================================================================
|
|
# WebSocket Endpoint
|
|
# ============================================================================
|
|
|
|
@router.websocket("/ws/{project_name}")
|
|
async def assistant_chat_websocket(websocket: WebSocket, project_name: str):
|
|
"""
|
|
WebSocket endpoint for assistant chat.
|
|
|
|
Message protocol:
|
|
|
|
Client -> Server:
|
|
- {"type": "start", "conversation_id": int | null} - Start/resume session
|
|
- {"type": "message", "content": "..."} - Send user message
|
|
- {"type": "answer", "answers": {...}} - Answer to structured questions
|
|
- {"type": "ping"} - Keep-alive ping
|
|
|
|
Server -> Client:
|
|
- {"type": "conversation_created", "conversation_id": int} - New conversation created
|
|
- {"type": "text", "content": "..."} - Text chunk from Claude
|
|
- {"type": "tool_call", "tool": "...", "input": {...}} - Tool being called
|
|
- {"type": "question", "questions": [...]} - Structured questions for user
|
|
- {"type": "response_done"} - Response complete
|
|
- {"type": "error", "content": "..."} - Error message
|
|
- {"type": "pong"} - Keep-alive pong
|
|
"""
|
|
# Always accept WebSocket first to avoid opaque 403 errors
|
|
await websocket.accept()
|
|
|
|
try:
|
|
project_name = validate_project_name(project_name)
|
|
except HTTPException:
|
|
await websocket.send_json({"type": "error", "content": "Invalid project name"})
|
|
await websocket.close(code=4000, reason="Invalid project name")
|
|
return
|
|
|
|
project_dir = _get_project_path(project_name)
|
|
if not project_dir:
|
|
await websocket.send_json({"type": "error", "content": "Project not found in registry"})
|
|
await websocket.close(code=4004, reason="Project not found in registry")
|
|
return
|
|
|
|
if not project_dir.exists():
|
|
await websocket.send_json({"type": "error", "content": "Project directory not found"})
|
|
await websocket.close(code=4004, reason="Project directory not found")
|
|
return
|
|
logger.info(f"Assistant WebSocket connected for project: {project_name}")
|
|
|
|
session: Optional[AssistantChatSession] = None
|
|
|
|
try:
|
|
while True:
|
|
try:
|
|
data = await websocket.receive_text()
|
|
message = json.loads(data)
|
|
msg_type = message.get("type")
|
|
logger.debug(f"Assistant received message type: {msg_type}")
|
|
|
|
if msg_type == "ping":
|
|
await websocket.send_json({"type": "pong"})
|
|
continue
|
|
|
|
elif msg_type == "start":
|
|
# Get optional conversation_id to resume
|
|
conversation_id = message.get("conversation_id")
|
|
logger.debug(f"Processing start message with conversation_id={conversation_id}")
|
|
|
|
try:
|
|
# Create a new session
|
|
logger.debug(f"Creating session for {project_name}")
|
|
session = await create_session(
|
|
project_name,
|
|
project_dir,
|
|
conversation_id=conversation_id,
|
|
)
|
|
logger.debug("Session created, starting...")
|
|
|
|
# Stream the initial greeting
|
|
async for chunk in session.start():
|
|
if logger.isEnabledFor(logging.DEBUG):
|
|
logger.debug(f"Sending chunk: {chunk.get('type')}")
|
|
await websocket.send_json(chunk)
|
|
logger.debug("Session start complete")
|
|
except Exception as e:
|
|
logger.exception(f"Error starting assistant session for {project_name}")
|
|
await websocket.send_json({
|
|
"type": "error",
|
|
"content": f"Failed to start session: {str(e)}"
|
|
})
|
|
|
|
elif msg_type == "message":
|
|
if not session:
|
|
session = get_session(project_name)
|
|
if not session:
|
|
await websocket.send_json({
|
|
"type": "error",
|
|
"content": "No active session. Send 'start' first."
|
|
})
|
|
continue
|
|
|
|
user_content = message.get("content", "").strip()
|
|
if not user_content:
|
|
await websocket.send_json({
|
|
"type": "error",
|
|
"content": "Empty message"
|
|
})
|
|
continue
|
|
|
|
# Stream Claude's response
|
|
async for chunk in session.send_message(user_content):
|
|
await websocket.send_json(chunk)
|
|
|
|
elif msg_type == "answer":
|
|
# User answered a structured question
|
|
if not session:
|
|
session = get_session(project_name)
|
|
if not session:
|
|
await websocket.send_json({
|
|
"type": "error",
|
|
"content": "No active session. Send 'start' first."
|
|
})
|
|
continue
|
|
|
|
# Format the answers as a natural response
|
|
answers = message.get("answers", {})
|
|
if isinstance(answers, dict):
|
|
response_parts = []
|
|
for question_idx, answer_value in answers.items():
|
|
if isinstance(answer_value, list):
|
|
response_parts.append(", ".join(answer_value))
|
|
else:
|
|
response_parts.append(str(answer_value))
|
|
user_response = "; ".join(response_parts) if response_parts else "OK"
|
|
else:
|
|
user_response = str(answers)
|
|
|
|
# Stream Claude's response
|
|
async for chunk in session.send_message(user_response):
|
|
await websocket.send_json(chunk)
|
|
|
|
else:
|
|
await websocket.send_json({
|
|
"type": "error",
|
|
"content": f"Unknown message type: {msg_type}"
|
|
})
|
|
|
|
except json.JSONDecodeError:
|
|
await websocket.send_json({
|
|
"type": "error",
|
|
"content": "Invalid JSON"
|
|
})
|
|
|
|
except WebSocketDisconnect:
|
|
logger.info(f"Assistant chat WebSocket disconnected for {project_name}")
|
|
|
|
except Exception as e:
|
|
logger.exception(f"Assistant chat WebSocket error for {project_name}")
|
|
try:
|
|
await websocket.send_json({
|
|
"type": "error",
|
|
"content": f"Server error: {str(e)}"
|
|
})
|
|
except Exception:
|
|
pass
|
|
|
|
finally:
|
|
# Don't remove session on disconnect - allow resume
|
|
pass
|