Personal AI, On Personal Devices
Python
feat: show model in agent overview, split tokens, editable model
Jon Saad-Falconc1e02a236af7
diff --git a/frontend/src/lib/api.ts b/frontend/src/lib/api.tsindex e1678213..ceb3614e 100644--- a/frontend/src/lib/api.ts+++ b/frontend/src/lib/api.ts@@ -296,6 +296,8 @@ export interface ManagedAgent {total_runs?: number;total_cost?: number;total_tokens?: number;+ input_tokens?: number;+ output_tokens?: number;last_run_at?: number | null;// Scheduleschedule_type?: string;diff --git a/frontend/src/pages/AgentsPage.tsx b/frontend/src/pages/AgentsPage.tsxindex 5e31e1c7..47700a41 100644--- a/frontend/src/pages/AgentsPage.tsx+++ b/frontend/src/pages/AgentsPage.tsx@@ -20,6 +20,8 @@ import {fetchManagedAgent,fetchAvailableTools,saveToolCredentials,+ fetchModels,+ updateManagedAgent,} from '../lib/api';import type { AgentTask, ChannelBinding, AgentTemplate, AgentMessage, ManagedAgent, LearningLogEntry, AgentTrace, ToolInfo } from '../lib/api';import {@@ -1162,6 +1164,79 @@ function AgentCard({);}+// ---------------------------------------------------------------------------+// Detail view — Configuration grid with editable model+// ---------------------------------------------------------------------------++function AgentConfigGrid({ agent, onAgentUpdated }: { agent: ManagedAgent; onAgentUpdated: () => void }) {+ const [editingModel, setEditingModel] = useState(false);+ const [models, setModels] = useState<string[]>([]);+ const currentModel = (agent.config?.model as string) || '(default)';++ async function startEditing() {+ try {+ const fetched = await fetchModels();+ setModels(fetched.map((m) => m.id));+ } catch {+ // ignore+ }+ setEditingModel(true);+ }++ async function changeModel(newModel: string) {+ try {+ const newConfig = { ...(agent.config || {}), model: newModel };+ await updateManagedAgent(agent.id, { config: newConfig });+ onAgentUpdated();+ } catch {+ // ignore+ }+ setEditingModel(false);+ }++ const rows: [string, React.ReactNode][] = [+ ['Intelligence', editingModel ? (+ <select+ autoFocus+ defaultValue={currentModel}+ onChange={(e) => changeModel(e.target.value)}+ onBlur={() => setEditingModel(false)}+ className="text-sm rounded px-1 py-0.5"+ style={{ background: 'var(--color-bg)', border: '1px solid var(--color-border)', color: 'var(--color-text)' }}+ >+ {models.map((m) => <option key={m} value={m}>{m}</option>)}+ </select>+ ) : (+ <span+ onClick={startEditing}+ className="cursor-pointer underline decoration-dotted"+ style={{ color: 'var(--color-accent)' }}+ title="Click to change model"+ >+ {currentModel}+ </span>+ )],+ ['Agent Type', <span key="at">{agent.agent_type}</span>],+ ['Schedule', <span key="sc">{formatSchedule(agent.schedule_type, agent.schedule_value)}</span>],+ ['Last Run', <span key="lr">{formatRelativeTime(agent.last_run_at)}</span>],+ ['Budget', <span key="bg">{agent.budget ? formatCost(agent.budget) : 'Unlimited'}</span>],+ ['Learning', <span key="le">{agent.learning_enabled ? 'Enabled' : 'Disabled'}</span>],+ ['Input Tokens', <span key="it">{String(agent.input_tokens ?? 0)}</span>],+ ['Output Tokens', <span key="ot">{String(agent.output_tokens ?? 0)}</span>],+ ];++ return (+ <div className="grid grid-cols-2 gap-x-6 gap-y-2 text-sm">+ {rows.map(([label, value]) => (+ <div key={label as string} className="flex gap-2 items-center">+ <span style={{ color: 'var(--color-text-tertiary)', minWidth: 100 }}>{label}</span>+ <span style={{ color: 'var(--color-text)' }}>{value}</span>+ </div>+ ))}+ </div>+ );+}+// ---------------------------------------------------------------------------// Detail view — Interact tab// ---------------------------------------------------------------------------@@ -1776,21 +1851,7 @@ export function AgentsPage() {<h3 className="text-sm font-medium mb-3" style={{ color: 'var(--color-text-secondary)' }}>Configuration</h3>- <div className="grid grid-cols-2 gap-x-6 gap-y-2 text-sm">- {[- ['Agent Type', selectedAgent.agent_type],- ['Schedule', formatSchedule(selectedAgent.schedule_type, selectedAgent.schedule_value)],- ['Last Run', formatRelativeTime(selectedAgent.last_run_at)],- ['Budget', selectedAgent.budget ? formatCost(selectedAgent.budget) : 'Unlimited'],- ['Learning', selectedAgent.learning_enabled ? 'Enabled' : 'Disabled'],- ['Total Tokens', String(selectedAgent.total_tokens ?? 0)],- ].map(([k, v]) => (- <div key={k} className="flex gap-2">- <span style={{ color: 'var(--color-text-tertiary)', minWidth: 90 }}>{k}</span>- <span style={{ color: 'var(--color-text)' }}>{v}</span>- </div>- ))}- </div>+ <AgentConfigGrid agent={selectedAgent} onAgentUpdated={refresh} /><div className="mt-3 pt-3" style={{ borderTop: '1px solid var(--color-border)' }}><span className="text-xs font-mono" style={{ color: 'var(--color-text-tertiary)' }}>ID: {selectedAgent.id}diff --git a/src/openjarvis/agents/executor.py b/src/openjarvis/agents/executor.pyindex 4ad52e2a..c7e34342 100644--- a/src/openjarvis/agents/executor.py+++ b/src/openjarvis/agents/executor.py@@ -411,10 +411,18 @@ class AgentExecutor:or result.metadata.get("tokens_used")or 0)+ in_tokens = result.metadata.get("prompt_tokens", 0)+ out_tokens = result.metadata.get(+ "completion_tokens", 0,+ )cost = result.metadata.get("cost", 0.0)budget_kwargs: dict[str, Any] = {"stall_retries": 0}if tokens > 0:budget_kwargs["total_tokens_increment"] = tokens+ if in_tokens > 0:+ budget_kwargs["input_tokens_increment"] = in_tokens+ if out_tokens > 0:+ budget_kwargs["output_tokens_increment"] = out_tokensif cost > 0:budget_kwargs["total_cost_increment"] = costself._manager.update_agent(agent_id, **budget_kwargs)diff --git a/src/openjarvis/agents/manager.py b/src/openjarvis/agents/manager.pyindex 5d5b331e..ba11f1ff 100644--- a/src/openjarvis/agents/manager.py+++ b/src/openjarvis/agents/manager.py@@ -112,6 +112,8 @@ class AgentManager:"ALTER TABLE managed_agents ADD COLUMN last_activity_at REAL","ALTER TABLE managed_agents ADD COLUMN stall_retries INTEGER DEFAULT 0","ALTER TABLE managed_agents ADD COLUMN current_activity TEXT DEFAULT ''",+ "ALTER TABLE managed_agents ADD COLUMN input_tokens INTEGER DEFAULT 0",+ "ALTER TABLE managed_agents ADD COLUMN output_tokens INTEGER DEFAULT 0",]for migration in _MIGRATIONS:try:@@ -182,6 +184,14 @@ class AgentManager:if total_tokens_increment:sets.append("total_tokens = total_tokens + ?")vals.append(total_tokens_increment)+ input_tokens_increment = kwargs.get("input_tokens_increment", 0)+ if input_tokens_increment:+ sets.append("input_tokens = input_tokens + ?")+ vals.append(input_tokens_increment)+ output_tokens_increment = kwargs.get("output_tokens_increment", 0)+ if output_tokens_increment:+ sets.append("output_tokens = output_tokens + ?")+ vals.append(output_tokens_increment)if "last_activity_at" in kwargs:sets.append("last_activity_at = ?")vals.append(kwargs["last_activity_at"])@@ -645,6 +655,8 @@ class AgentManager:"last_activity_at": row["last_activity_at"],"stall_retries": row["stall_retries"] or 0,"current_activity": row["current_activity"] or "",+ "input_tokens": row["input_tokens"] or 0,+ "output_tokens": row["output_tokens"] or 0,}@staticmethod