Personal AI, On Personal Devices
Python
feat: add full telemetry footer to agent Interact responses
Jon Saad-Falcone9fe9be03558
diff --git a/frontend/src/lib/api.ts b/frontend/src/lib/api.tsindex f6a16f45..d30e4498 100644--- a/frontend/src/lib/api.ts+++ b/frontend/src/lib/api.ts@@ -509,7 +509,7 @@ export async function sendAgentMessage(callbacks?: {onProgress?: (label: string) => void;onContentDelta?: (delta: string, fullContent: string) => void;- onDone?: (fullContent: string) => void;+ onDone?: (fullContent: string, usage?: Record<string, number>, telemetry?: Record<string, unknown>) => void;},): Promise<AgentMessage> {const res = await fetch(`${getBase()}/v1/managed-agents/${agentId}/messages`, {@@ -526,6 +526,8 @@ export async function sendAgentMessage(const decoder = new TextDecoder();let fullContent = '';let buffer = '';+ let lastUsage: Record<string, number> | undefined;+ let lastTelemetry: Record<string, unknown> | undefined;try {while (true) {const { done, value } = await reader.read();@@ -547,12 +549,15 @@ export async function sendAgentMessage(fullContent += delta;callbacks?.onContentDelta?.(delta, fullContent);}+ // Capture usage + telemetry from final chunk+ if (chunk.usage) lastUsage = chunk.usage;+ if (chunk.telemetry) lastTelemetry = chunk.telemetry;} catch { /* skip malformed chunks */ }}}} catch { /* stream ended */ }- callbacks?.onDone?.(fullContent);+ callbacks?.onDone?.(fullContent, lastUsage, lastTelemetry);return {id: '',diff --git a/frontend/src/pages/AgentsPage.tsx b/frontend/src/pages/AgentsPage.tsxindex 6428008f..dcf12474 100644--- a/frontend/src/pages/AgentsPage.tsx+++ b/frontend/src/pages/AgentsPage.tsx@@ -973,7 +973,110 @@ function AgentConfigGrid({ agent, onAgentUpdated }: { agent: ManagedAgent; onAge// ---------------------------------------------------------------------------/** AgentMessage extended with optional response metadata for the footer. */-type InteractMessage = AgentMessage & { _elapsed?: string; _toolCalls?: number };+type InteractMessage = AgentMessage & {+ _elapsed?: string;+ _toolCalls?: number;+ _usage?: Record<string, number>;+ _telemetry?: Record<string, unknown>;+};++function AgentResponseFooter({+ msg, copiedId, onCopy,+}: {+ msg: InteractMessage;+ copiedId: string | null;+ onCopy: (id: string) => void;+}) {+ const [expanded, setExpanded] = useState(false);+ const u = msg._usage;+ const t = msg._telemetry as Record<string, unknown> | undefined;+ const elapsed = msg._elapsed;+ const toolCalls = msg._toolCalls || 0;++ // Build summary line like Chat: "ollama - qwen3.5:9b - 18.3s - 50 tokens"+ const parts: string[] = [];+ if (t?.engine) parts.push(String(t.engine));+ if (t?.model_id) parts.push(String(t.model_id));+ if (elapsed) parts.push(`${elapsed}s`);+ if (u?.prompt_tokens) parts.push(`${u.prompt_tokens} input tokens`);+ if (u?.completion_tokens) parts.push(`${u.completion_tokens} output tokens`);+ if (toolCalls > 0) parts.push(`${toolCalls} tool ${toolCalls === 1 ? 'call' : 'calls'}`);++ const summary = parts.length > 0 ? parts.join(' - ') : elapsed ? `${elapsed}s` : '';++ // Build expanded rows+ const rows: Array<{ label: string; value: string }> = [];+ if (t?.engine) rows.push({ label: 'Engine', value: `${t.engine}${t.model_id ? ` (${t.model_id})` : ''}` });+ if (u) {+ const tokenParts = [];+ if (u.completion_tokens) tokenParts.push(`${u.completion_tokens} generated`);+ if (u.prompt_tokens) tokenParts.push(`${u.prompt_tokens} prompt`);+ if (tokenParts.length) rows.push({ label: 'Tokens', value: tokenParts.join(' · ') });+ }+ if (toolCalls > 0) rows.push({ label: 'Tool calls', value: `${toolCalls}` });+ if (t?.tokens_per_sec) rows.push({ label: 'Speed', value: `${Math.round(Number(t.tokens_per_sec))} tok/s` });+ if (t?.total_ms) rows.push({ label: 'Latency', value: `${(Number(t.total_ms) / 1000).toFixed(1)}s total` });++ if (!summary) return null;++ return (+ <div style={{ borderTop: '1px solid var(--color-border-subtle)', marginTop: 6 }}>+ <div style={{ display: 'flex', alignItems: 'center', paddingTop: 4 }}>+ <button+ onClick={() => rows.length > 0 && setExpanded(!expanded)}+ style={{+ flex: 1, display: 'flex', alignItems: 'center', gap: 6,+ background: 'none', border: 'none', cursor: rows.length > 0 ? 'pointer' : 'default',+ padding: 0, textAlign: 'left',+ }}+ >+ <span style={{ width: 4, height: 4, borderRadius: '50%', background: 'var(--color-accent)', flexShrink: 0 }} />+ <span style={{ fontSize: 11, color: 'var(--color-text-tertiary)', fontFamily: 'system-ui' }}>+ {summary}+ </span>+ {rows.length > 0 && (+ <span style={{ fontSize: 10, color: 'var(--color-text-tertiary)' }}>+ {expanded ? '▲' : '▼'}+ </span>+ )}+ </button>+ <button+ onClick={() => onCopy(msg.id)}+ style={{+ background: 'none', border: 'none', cursor: 'pointer',+ color: 'var(--color-text-tertiary)', padding: 2,+ display: 'flex', alignItems: 'center',+ }}+ title="Copy response"+ >+ {copiedId === msg.id ? <Check size={12} /> : <Copy size={12} />}+ </button>+ </div>+ {expanded && rows.length > 0 && (+ <div style={{+ borderRadius: 6, marginTop: 4, padding: '6px 10px',+ background: 'rgba(0, 0, 0, 0.15)',+ }}>+ <div style={{+ display: 'grid', gridTemplateColumns: 'auto 1fr',+ columnGap: 12, rowGap: 2,+ }}>+ {rows.map((row) => (+ <div key={row.label} style={{ display: 'contents' }}>+ <span style={{ fontSize: 11, color: 'var(--color-text-tertiary)', fontFamily: 'monospace' }}>+ {row.label}+ </span>+ <span style={{ fontSize: 11, color: 'var(--color-text-secondary)', fontFamily: 'monospace' }}>+ {row.value}+ </span>+ </div>+ ))}+ </div>+ </div>+ )}+ </div>+ );+}function InteractTab({ agentId, agentStatus }: { agentId: string; agentStatus: string }) {const [messages, setMessages] = useState<InteractMessage[]>([]);@@ -1067,6 +1170,8 @@ function InteractTab({ agentId, agentStatus }: { agentId: string; agentStatus: s}, 100);let toolCount = 0;+ let responseUsage: Record<string, number> | undefined;+ let responseTelemetry: Record<string, unknown> | undefined;try {const response = await sendAgentMessage(agentId, text, mode, {onProgress: (label) => {@@ -1074,9 +1179,10 @@ function InteractTab({ agentId, agentStatus }: { agentId: string; agentStatus: stoolCount++;},onContentDelta: (_delta, full) => setStreamingContent(full),- onDone: () => {- // Clear streaming state — final content comes from the response object+ onDone: (_content, usage, telemetry) => {setStreamingContent('');+ responseUsage = usage;+ responseTelemetry = telemetry;},});const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);@@ -1089,6 +1195,8 @@ function InteractTab({ agentId, agentStatus }: { agentId: string; agentStatus: sdirection: 'agent_to_user' as const,_elapsed: elapsed,_toolCalls: toolCount,+ _usage: responseUsage,+ _telemetry: responseTelemetry,},...prev,]);@@ -1144,44 +1252,12 @@ function InteractTab({ agentId, agentStatus }: { agentId: string; agentStatus: s<p className="text-xs mt-1 opacity-70">{msg.status === 'pending' ? 'sending...' : new Date(msg.created_at * 1000).toLocaleTimeString()}</p>- {msg.direction === 'agent_to_user' && (msg._elapsed || (msg._toolCalls && msg._toolCalls > 0)) && (- <div- style={{- borderTop: '1px solid var(--color-border-subtle)',- marginTop: 6,- paddingTop: 4,- display: 'flex',- alignItems: 'center',- gap: 8,- fontSize: 11,- color: 'var(--color-text-tertiary)',- }}- >- {msg._elapsed && <span>{msg._elapsed}s</span>}- {msg._toolCalls != null && msg._toolCalls > 0 && (- <span>{msg._toolCalls} tool {msg._toolCalls === 1 ? 'call' : 'calls'}</span>- )}- <button- onClick={() => {- navigator.clipboard.writeText(msg.content);- setCopiedId(msg.id);- setTimeout(() => setCopiedId(null), 2000);- }}- style={{- marginLeft: 'auto',- background: 'none',- border: 'none',- cursor: 'pointer',- color: 'var(--color-text-tertiary)',- padding: 2,- display: 'flex',- alignItems: 'center',- }}- title="Copy response"- >- {copiedId === msg.id ? <Check size={12} /> : <Copy size={12} />}- </button>- </div>+ {msg.direction === 'agent_to_user' && (+ <AgentResponseFooter msg={msg} copiedId={copiedId} onCopy={(id) => {+ navigator.clipboard.writeText(msg.content);+ setCopiedId(id);+ setTimeout(() => setCopiedId(null), 2000);+ }} />)}</div></div>diff --git a/src/openjarvis/server/agent_manager_routes.py b/src/openjarvis/server/agent_manager_routes.pyindex 8fffc9bb..26421608 100644--- a/src/openjarvis/server/agent_manager_routes.py+++ b/src/openjarvis/server/agent_manager_routes.py@@ -676,48 +676,42 @@ async def _stream_managed_agent(dr_agent._executor.execute = _tracked_executedef _run_agent():+ agent_metadata = {}try:result = dr_agent.run(user_content)content = (result.content or "No results found.")- # Log query completion- try:- elapsed = _dr_time.time() - _dr_start- manager.add_learning_log(- agent_id,- "query_complete",- f"Response: {len(content)} chars in {elapsed:.1f}s",- {- "response_length": len(content),- "elapsed_seconds": round(elapsed, 2),- },- )- except Exception as _qc_exc:- logger.warning("Log query_complete failed: %s", _qc_exc)- progress_q.put({- "type": "done",- "content": content,- })+ agent_metadata = result.metadata or {}except Exception as exc:- # Log query error- try:- elapsed = _dr_time.time() - _dr_start- manager.add_learning_log(- agent_id,- "query_error",- f"Error after {elapsed:.1f}s: {exc}",- {- "error": str(exc),- "elapsed_seconds": round(elapsed, 2),- },- )- except Exception:- pass- progress_q.put({- "type": "error",- "content": f"Error: {exc}",- })+ content = f"Error: {exc}"++ elapsed = _dr_time.time() - _dr_start++ # Log BEFORE queue put (put triggers SSE end)+ try:+ is_err = content.startswith("Error:")+ manager.add_learning_log(+ agent_id,+ "query_error" if is_err else "query_complete",+ f"{'Error' if is_err else 'Response'}: "+ f"{len(content)} chars in {elapsed:.1f}s",+ {+ "response_length": len(content),+ "elapsed_seconds": round(elapsed, 2),+ },+ )+ except Exception as _qc_exc:+ logger.warning(+ "Log failed: %s", _qc_exc,+ )++ progress_q.put({+ "type": "error" if content.startswith("Error:") else "done",+ "content": content,+ "metadata": agent_metadata,+ "elapsed": elapsed,+ })thread = threading.Thread(target=_run_agent, daemon=True)thread.start()@@ -755,13 +749,23 @@ async def _stream_managed_agent(elif event["type"] in ("done", "error"):content = event["content"]+ meta = event.get("metadata", {})+ elapsed_s = event.get("elapsed", 0)+# Stream content word-by-wordwords = content.split(" ")for i, word in enumerate(words):token = word if i == 0 else " " + wordyield _sse_chunk(chunk_id, model, token)- # Final chunk+ # Build usage + telemetry+ prompt_tok = meta.get("prompt_tokens", 0)+ comp_tok = meta.get("completion_tokens", 0)+ total_tok = meta.get("total_tokens", 0)+ word_count = len(words)+ speed = round(word_count / elapsed_s) if elapsed_s > 0 else 0++ # Final chunk with usage + telemetryfinish_data = {"id": chunk_id,"object": "chat.completion.chunk",@@ -773,6 +777,18 @@ async def _stream_managed_agent("finish_reason": "stop",}],+ "usage": {+ "prompt_tokens": prompt_tok,+ "completion_tokens": comp_tok,+ "total_tokens": total_tok or (prompt_tok + comp_tok),+ },+ "telemetry": {+ "engine": "ollama",+ "model_id": model,+ "total_ms": round(elapsed_s * 1000),+ "tokens_per_sec": speed,+ "tool_calls": len(meta.get("sources", [])),+ },}yield f"data: {json.dumps(finish_data)}\n\n"yield "data: [DONE]\n\n"