@@ -500,6 +508,12 @@
+
+
+
@@ -514,6 +528,8 @@
let autoTimer = null
let allTools = []
let allPrompts = []
+let allMcpServers = []
+let currentMcpServer = null
// ═══════════════════════════════════════════════════════════
// DOM refs
@@ -533,6 +549,9 @@
const promptsContent = document.getElementById('prompts-content')
const promptsPh = document.getElementById('prompts-placeholder')
const toolsContent = document.getElementById('tools-content')
+const mcpServerListEl = document.getElementById('mcp-server-list')
+const mcpContent = document.getElementById('mcp-content')
+const mcpPh = document.getElementById('mcp-placeholder')
// ═══════════════════════════════════════════════════════════
// Tab switching
@@ -545,16 +564,19 @@
setHidden('planning-aside', tab !== 'planning')
setHidden('prompts-aside', tab !== 'prompts')
setHidden('tools-aside', tab !== 'tools')
+ setHidden('mcp-aside', tab !== 'mcp')
setHidden('view-context', tab !== 'context')
setHidden('view-planning', tab !== 'planning')
setHidden('view-prompts', tab !== 'prompts')
setHidden('view-tools', tab !== 'tools')
+ setHidden('view-mcp', tab !== 'mcp')
setHidden('ctx-controls', tab !== 'context' && tab !== 'planning')
setHidden('pt-controls', tab === 'context' || tab === 'planning')
if (tab === 'planning') loadPlanningSessions()
+ if (tab === 'mcp') loadMcpServers()
}
document.querySelectorAll('.tab').forEach(t =>
@@ -573,6 +595,7 @@
loadSessions()
loadPrompts()
loadTools()
+loadMcpServers()
if (idInput.value) loadContext(idInput.value)
@@ -972,7 +995,7 @@
⚙ ${p.enabled_tools.length} tools`
card.appendChild(hdr)
- // Tools pills (togglable)
+ // Tools pills (togglable) — built-in + resolved MCP
const toolsWrap = document.createElement('div')
toolsWrap.className = 'tools-inline hidden'
for (const t of p.enabled_tools) {
@@ -981,11 +1004,37 @@
pill.textContent = t
toolsWrap.appendChild(pill)
}
+ for (const t of (p.resolved_mcp_tools || [])) {
+ const pill = document.createElement('span')
+ pill.className = 'tool-pill'
+ pill.style.cssText = 'background:#1e3a3a;color:var(--c-system);border-color:#2a5a5a;'
+ pill.textContent = t
+ toolsWrap.appendChild(pill)
+ }
card.appendChild(toolsWrap)
hdr.querySelector('.ph-tools-badge').addEventListener('click', () =>
toolsWrap.classList.toggle('hidden'))
+ // MCP servers
+ if (p.mcp_servers && Object.keys(p.mcp_servers).length) {
+ const mcpWrap = document.createElement('div')
+ mcpWrap.className = 'tools-inline'
+ const label = document.createElement('span')
+ label.className = 'tool-pill'
+ label.style.cssText = 'background:transparent;border:none;color:var(--text3);padding-left:0;cursor:default;'
+ label.textContent = 'MCP servers:'
+ mcpWrap.appendChild(label)
+ for (const [server, groups] of Object.entries(p.mcp_servers)) {
+ const pill = document.createElement('span')
+ pill.className = 'tool-pill'
+ pill.style.cssText = 'background:#1e3a3a;color:var(--c-system);border-color:#2a5a5a;'
+ pill.textContent = `${esc(server)} [${groups.join(', ')}]`
+ mcpWrap.appendChild(pill)
+ }
+ card.appendChild(mcpWrap)
+ }
+
// Sections
const labelClasses = { persona: 'lbl-persona', profile: 'lbl-profile', 'profiles block': 'lbl-profiles' }
@@ -1045,13 +1094,13 @@
const card = document.createElement('div')
card.className = 'tool-card'
+ const isMcp = tool.name.startsWith('mcp_')
const hdr = document.createElement('div')
hdr.className = 'tool-card-header'
- // Heuristic: tools with underscores that aren't snake-case-class are user tools.
- // For now just show the name; no reliable builtin flag from API yet.
hdr.innerHTML = `
▶
- ${esc(tool.name)}`
+ ${esc(tool.name)}
+ ${isMcp ? 'mcp' : ''}`
const body = document.createElement('div')
body.className = 'tool-card-body hidden'
@@ -1104,6 +1153,166 @@
}
// ═══════════════════════════════════════════════════════════
+// MCP tab
+// ═══════════════════════════════════════════════════════════
+async function loadMcpServers() {
+ try {
+ allMcpServers = await apiFetch('/agents/mcp_servers')
+ renderMcpServerList(allMcpServers)
+ if (currentMcpServer) {
+ const s = allMcpServers.find(s => s.name === currentMcpServer)
+ if (s) renderMcpServer(s)
+ }
+ } catch (e) {
+ mcpServerListEl.innerHTML = `
+
Select an MCP server.
+
+ ${e.message}
`
+ }
+}
+
+function renderMcpServerList(servers) {
+ mcpServerListEl.innerHTML = ''
+ if (!servers.length) {
+ mcpServerListEl.innerHTML = 'no MCP servers
'
+ return
+ }
+ for (const s of servers) {
+ const el = document.createElement('div')
+ el.className = 'list-item' + (s.name === currentMcpServer ? ' selected' : '')
+ el.dataset.name = s.name
+ const statusColor = s.connected ? 'var(--accent)' : '#f48771'
+ const statusText = s.connected ? '●' : '○'
+ el.innerHTML = `
+ ${esc(s.name)}
+ `
+ el.addEventListener('click', () => {
+ currentMcpServer = s.name
+ document.querySelectorAll('#mcp-server-list .list-item').forEach(e =>
+ e.classList.toggle('selected', e.dataset.name === s.name))
+ renderMcpServer(s)
+ })
+ mcpServerListEl.appendChild(el)
+ }
+}
+
+function renderMcpServer(s) {
+ mcpPh.classList.add('hidden')
+ mcpContent.innerHTML = ''
+
+ const card = document.createElement('div')
+ card.className = 'prompt-card'
+
+ // Header
+ const hdr = document.createElement('div')
+ hdr.className = 'profile-header'
+ const statusColor = s.connected ? 'var(--accent)' : '#f48771'
+ hdr.innerHTML = `
+ ${esc(s.name)}
+ ${s.connected ? '● connected' : '○ offline'} + ${esc(s.transport)}${s.url ? ' · ' + esc(s.url) : s.command ? ' · ' + esc(s.command) : ''}` + card.appendChild(hdr) + + // Groups + if (s.groups && Object.keys(s.groups).length) { + const groupsWrap = document.createElement('div') + groupsWrap.className = 'tools-inline' + const label = document.createElement('span') + label.className = 'tool-pill' + label.style.cssText = 'background:transparent;border:none;color:var(--text3);padding-left:0;cursor:default;' + label.textContent = 'Groups:' + groupsWrap.appendChild(label) + for (const [group, tools] of Object.entries(s.groups)) { + const pill = document.createElement('span') + pill.className = 'tool-pill' + pill.title = tools.join('\n') + pill.textContent = `${esc(group)} (${tools.length})` + groupsWrap.appendChild(pill) + } + card.appendChild(groupsWrap) + } + + // Profile mappings + if (s.profiles && s.profiles.length) { + const profWrap = document.createElement('div') + profWrap.className = 'tools-inline' + const label = document.createElement('span') + label.className = 'tool-pill' + label.style.cssText = 'background:transparent;border:none;color:var(--text3);padding-left:0;cursor:default;' + label.textContent = 'Used by:' + profWrap.appendChild(label) + for (const pr of s.profiles) { + const pill = document.createElement('span') + pill.className = 'tool-pill' + pill.style.cssText = 'background:#2d1e3a;color:var(--c-assistant);border-color:#3d2e4a;' + pill.textContent = `${esc(pr.profile_id)} [${pr.groups.join(', ')}]` + profWrap.appendChild(pill) + } + card.appendChild(profWrap) + } + + // Instructions + if (s.instructions) { + const sec = document.createElement('div') + sec.className = 'prompt-section' + const secHdr = document.createElement('div') + secHdr.className = 'prompt-section-header' + secHdr.innerHTML = ` + ▶ + Instructions + ${s.instructions.length.toLocaleString()} chars` + const body = document.createElement('div') + body.className = 'prompt-section-body' + const pre = document.createElement('pre') + pre.textContent = s.instructions + body.appendChild(pre) + + const chevron = secHdr.querySelector('.ps-chevron') + secHdr.addEventListener('click', () => { + const collapsed = body.classList.toggle('hidden') + chevron.classList.toggle('open', !collapsed) + }) + + sec.appendChild(secHdr) + sec.appendChild(body) + card.appendChild(sec) + } + + // Tools exposed by server + if (s.tools && s.tools.length) { + const sec = document.createElement('div') + sec.className = 'prompt-section' + const secHdr = document.createElement('div') + secHdr.className = 'prompt-section-header' + secHdr.innerHTML = ` + ▶ + Tools (${s.tools.length})` + const body = document.createElement('div') + body.className = 'prompt-section-body' + for (const t of s.tools) { + const row = document.createElement('div') + row.style.cssText = 'padding:4px 0;border-top:1px solid var(--border);font-size:11px;' + row.innerHTML = ` + ${esc(t.name)} + ${esc(t.description)}` + body.appendChild(row) + } + + const chevron = secHdr.querySelector('.ps-chevron') + secHdr.addEventListener('click', () => { + const collapsed = body.classList.toggle('hidden') + chevron.classList.toggle('open', !collapsed) + }) + + sec.appendChild(secHdr) + sec.appendChild(body) + card.appendChild(sec) + } + + mcpContent.appendChild(card) +} + +// ═══════════════════════════════════════════════════════════ // Helpers // ═══════════════════════════════════════════════════════════ async function apiFetch(path) { diff --git a/mcp_servers.json b/mcp_servers.json index 3b6d892..be15b36 100644 --- a/mcp_servers.json +++ b/mcp_servers.json @@ -26,6 +26,6 @@ "list_pending_changes" ] }, - "instructions": "Use this server whenever the user asks about infrastructure, servers, services, networks, documentation, or system inventory. Always validate the repository before making changes. Do not store raw secrets in documentation." + "instructions": "MANDATORY: Before answering ANY question about infrastructure, servers, services, networks, documentation, or system inventory — you MUST call gnexus-book tools first.\n\nQuery mapping:\n- 'server X not working / status' → search_docs, get_inventory_item\n- 'what services run where' → list_inventory, get_relationships\n- 'update docs / fix documentation' → read_doc, propose_doc_change, commit_changes\n- 'is X up to date / freshness' → check_freshness\n- 'validate repository / repo state' → validate_repository, git_status\n\nDo NOT rely on memory or NAVI.md for infrastructure facts — they may be stale. Always pull current state from gnexus-book.\n\nAlways validate the repository before making changes. Do not store raw secrets in documentation." } } diff --git a/navi/api/routes/agents.py b/navi/api/routes/agents.py index dc099f4..1846e25 100644 --- a/navi/api/routes/agents.py +++ b/navi/api/routes/agents.py @@ -4,10 +4,11 @@ from fastapi import APIRouter, Depends, HTTPException -from navi.api.deps import get_current_user, get_profile_registry, get_tool_registry +from navi.api.deps import get_current_user, get_mcp_manager, get_profile_registry, get_tool_registry from navi.auth import User from navi.config import settings from navi.core import ProfileRegistry, ToolRegistry +from navi.mcp import McpManager, load_mcp_servers router = APIRouter(prefix="/agents", tags=["agents"]) @@ -41,9 +42,35 @@ return result +def _resolve_mcp_tools( + profile, + mcp_manager: McpManager | None, + tool_registry: ToolRegistry, +) -> list[str]: + """Expand profile.mcp_servers into concrete tool names (mcp_server_tool).""" + if not profile.mcp_servers or not mcp_manager: + return [] + names: list[str] = [] + for server_name, groups in profile.mcp_servers.items(): + if "*" in groups: + prefix = f"mcp_{server_name}_" + for tool in tool_registry.all(): + if tool.name.startswith(prefix) and tool.name not in names: + names.append(tool.name) + else: + for group_name in groups: + for tool_name in mcp_manager.resolve_group(server_name, group_name): + full_name = f"mcp_{server_name}_{tool_name}" + if full_name not in names: + names.append(full_name) + return names + + @router.get("/prompts") async def list_system_prompts( profiles: Annotated[ProfileRegistry, Depends(get_profile_registry)], + mcp_manager: Annotated[McpManager, Depends(get_mcp_manager)], + tool_registry: Annotated[ToolRegistry, Depends(get_tool_registry)], ) -> list[dict]: """Return the full built system prompt for every profile, broken into sections. @@ -85,6 +112,8 @@ "profile_name": profile.name, "model": profile.model, "enabled_tools": profile.enabled_tools, + "mcp_servers": profile.mcp_servers, + "resolved_mcp_tools": _resolve_mcp_tools(profile, mcp_manager, tool_registry), "sections": sections, "full": full, "total_chars": len(full), @@ -105,3 +134,61 @@ } for t in tools.all() ] + + +@router.get("/mcp_servers") +async def list_mcp_servers( + mcp_manager: Annotated[McpManager, Depends(get_mcp_manager)], + profiles: Annotated[ProfileRegistry, Depends(get_profile_registry)], +) -> list[dict]: + """Return all configured MCP servers with groups, tools, instructions and profile mappings.""" + configs = load_mcp_servers(mcp_manager.config_path) + connected = mcp_manager.clients + all_profiles = profiles.all() + + result = [] + for name, cfg in configs.items(): + client = connected.get(name) + server_tools = [] + if client and client.connected: + try: + tools = await client.list_tools() + server_tools = [ + {"name": t.name, "description": t.description or ""} + for t in tools + ] + except Exception: + pass + + # Build profile mappings + profile_refs = [] + for p in all_profiles: + if name in (p.mcp_servers or {}): + profile_refs.append({ + "profile_id": p.id, + "profile_name": p.name, + "groups": p.mcp_servers[name], + }) + + # Merge instructions: server-provided + config overlay + parts: list[str] = [] + if client and client.instructions: + parts.append(client.instructions) + if cfg.instructions: + if parts: + parts.append("") + parts.append(cfg.instructions) + + result.append({ + "name": name, + "connected": client is not None and client.connected, + "transport": cfg.transport, + "url": cfg.url, + "command": cfg.command, + "groups": cfg.groups, + "instructions": "\n".join(parts) if parts else None, + "tools": server_tools, + "profiles": profile_refs, + }) + + return result diff --git a/navi/core/agent.py b/navi/core/agent.py index e95d87a..9112ae2 100644 --- a/navi/core/agent.py +++ b/navi/core/agent.py @@ -349,7 +349,7 @@ # Use dedicated subagent_tools if configured, else fall back to enabled_tools. tool_source = profile.subagent_tools if profile.subagent_tools else profile.enabled_tools - tools = [t for t in self._tool_list(tool_source) if t.name not in exclude] + tools = [t for t in self._tool_list(tool_source, profile.mcp_servers) if t.name not in exclude] tool_schemas = [t.schema() for t in tools] llm = self._get_backend(profile.llm_backend) @@ -464,6 +464,9 @@ built_ctx: list[Message] = [subagent_sys_msg] if mem: built_ctx.append(mem) + mcp_msg = self._ctx_builder._mcp_context_msg() + if mcp_msg: + built_ctx.append(mcp_msg) built_ctx.extend(m for m in context if m.role != "system") self._check_context_size(built_ctx) diff --git a/navi/core/events.py b/navi/core/events.py index 53cc43c..4eda7d0 100644 --- a/navi/core/events.py +++ b/navi/core/events.py @@ -81,6 +81,7 @@ elapsed_seconds: float | None = None tool_call_count: int = 0 token_count: int | None = None # same as context_tokens; kept separate for clarity + message_index: int | None = None # raw index of the first assistant msg in this turn group def to_wire(self) -> dict: return { @@ -91,6 +92,7 @@ "elapsed_seconds": self.elapsed_seconds, "tool_call_count": self.tool_call_count, "token_count": self.token_count, + "message_index": self.message_index, } diff --git a/navi/core/planning.py b/navi/core/planning.py index cdda1ff..fd000f5 100644 --- a/navi/core/planning.py +++ b/navi/core/planning.py @@ -110,6 +110,10 @@ "RESOURCES:\n" "- [tool_name]: [what it does] — [limitation if any] — [alternative if limitation blocks the goal]\n" "- context sources: [which of memory / NAVI.md / web you will check and why]\n" + "KNOWLEDGE SOURCE ASSESSMENT:\n" + "- Domain: [user personal facts / infrastructure / own capabilities / external web]\n" + "- Primary source: [memory / connected knowledge servers / NAVI.md / docs / web]\n" + "- Fallback: [alternative source if primary is unavailable]\n" "COMPLEXITY: simple | medium | complex — choose based on ambiguity, number of files/systems, risk, and autonomy needed.\n" "SUBTASKS:\n" "1. [discrete unit of work]\n" diff --git a/navi/profiles/server_admin/config.json b/navi/profiles/server_admin/config.json index 43f36c2..8fa09cb 100644 --- a/navi/profiles/server_admin/config.json +++ b/navi/profiles/server_admin/config.json @@ -63,7 +63,7 @@ "gmail" ], "mcp_servers": { - "gnexus-book": ["read", "write", "admin"] + "gnexus-book": ["read", "write"] }, "planning_mandatory": false, "planning_phase1_enabled": true, diff --git a/navi/tools/filesystem.py b/navi/tools/filesystem.py index 27d79f9..e2a422c 100644 --- a/navi/tools/filesystem.py +++ b/navi/tools/filesystem.py @@ -239,15 +239,18 @@ "Examples: 'what arguments does function X take?', 'on which line is class Y defined?', " "'does this config contain key Z?', 'list all TODO comments'. " "Pass the question in 'question'.\n" - " • edit — use for deterministic exact text replacement when you know the old text. " - "Pass 'old' and 'new'. The old text must match exactly and occur once.\n" - " • smart_edit — use for semantic changes when you know the instruction but not the exact replacement. " + "Four editing modes — choose the cheapest one that fits your situation:\n" + " • write — overwrite the ENTIRE file with new content. Use only for new files or total rewrites.\n" + " • edit — deterministic exact-text replacement. You must know the precise old text (must occur exactly once). " + "Pass 'old' and 'new'. Fastest and safest for small tweaks.\n" + " • edit_lines — deterministic line-based edit. You must know exact line numbers. " + "Pass 'operations' array with replace/delete/insert ops. Fastest for bulk structural changes.\n" + " • smart_edit — AI-powered semantic edit. Use when you know the intent but not the exact replacement. " "Examples: 'rename function foo to bar', 'add a docstring to method X', " "'remove all commented-out code', 'change timeout from 30 to 60'. " - "Pass the instruction in 'instruction'. Returns a diff of what changed.\n" + "Pass the instruction in 'instruction'. Consumes extra tokens.\n" "Standard actions (use only when AI actions are not applicable): " - "read — raw file text (offset+limit for large files); " - "write — create or overwrite a file; " + "read — raw file text (offset+limit for large files, numbered=true for line numbers); " "append — add text to end; " "list — directory contents with sizes; " "find — search files by glob pattern downward; " @@ -264,7 +267,7 @@ "action": { "type": "string", "enum": [ - "read", "write", "append", "edit", "list", "find", "find_up", + "read", "write", "append", "edit", "edit_lines", "list", "find", "find_up", "info", "move", "delete", "exists", "mkdir", "query", "smart_edit", ], @@ -286,6 +289,30 @@ "type": "string", "description": "Replacement text for edit.", }, + "operations": { + "type": "array", + "description": ( + "JSON array of line-based edit operations (required for edit_lines). " + "Each op is {\"op\": \"replace\"|\"delete\"|\"insert\", \"start\": int, \"end\": int, \"content\": str}. " + "Line numbers are 1-based and inclusive. Use edit_lines for fast deterministic edits " + "when you know the exact lines (e.g. 'change line 15 from X to Y')." + ), + "items": { + "type": "object", + "properties": { + "op": {"type": "string", "enum": ["replace", "delete", "insert"]}, + "start": {"type": "integer"}, + "end": {"type": "integer"}, + "after": {"type": "integer"}, + "content": {"type": "string"}, + }, + "required": ["op"], + }, + }, + "numbered": { + "type": "boolean", + "description": "Include 1-based line numbers in read output (default false).", + }, "destination": { "type": "string", "description": "Target path for move action.", @@ -357,6 +384,7 @@ case "write": return await asyncio.to_thread(self._write, path, params) case "append": return await asyncio.to_thread(self._append, path, params) case "edit": return await asyncio.to_thread(self._edit, path, params) + case "edit_lines": return await asyncio.to_thread(self._edit_lines, path, params) case "list": return await asyncio.to_thread(self._list, path, params) case "find": return await asyncio.to_thread(self._find, path, params) case "find_up": return await asyncio.to_thread(self._find_up, path, params) @@ -417,7 +445,10 @@ f"⚠ Large file ({_fmt_size(file_size)}) — consider offset/limit next time.\n" if file_size > _READ_WARN_BYTES else "" ) + numbered = params.get("numbered", False) header = f"[{path} | {total_lines} lines | {_fmt_size(file_size)}]\n" + if numbered: + return ToolResult(success=True, output=header + warn + _number_lines(text.splitlines(keepends=False), 1)) return ToolResult(success=True, output=header + warn + text) def _write(self, path: Path, params: dict) -> ToolResult: @@ -482,6 +513,42 @@ ), ) + def _edit_lines(self, path: Path, params: dict) -> ToolResult: + ops = params.get("operations") + if not ops: + return ToolResult(success=False, output="'operations' is required for edit_lines", error="missing_operations") + if not path.exists(): + return ToolResult(success=False, output=f"File not found: {path}", error="not_found") + if path.is_dir(): + return ToolResult(success=False, output="edit_lines works on files, not directories.", error="is_directory") + + text = path.read_text(encoding="utf-8", errors="replace") + lines = text.splitlines() + errors = _validate_ops(ops, len(lines)) + if errors: + return ToolResult( + success=False, + output="Invalid operations:\n" + "\n".join(f" • {e}" for e in errors), + error="invalid_ops", + ) + new_lines = _apply_ops(lines, ops) + diff = _unified_diff(lines, new_lines, path) + + new_text = "\n".join(new_lines) + ("\n" if text.endswith("\n") else "") + tmp = path.with_suffix(path.suffix + ".tmp") + try: + tmp.write_text(new_text, encoding="utf-8") + tmp.replace(path) + finally: + if tmp.exists(): + tmp.unlink(missing_ok=True) + + summary = ( + f"Applied {len(ops)} operation(s) to {path.name} " + f"({len(lines)} → {len(new_lines)} lines)." + ) + return ToolResult(success=True, output=f"{summary}\n\n{diff}" if diff else summary) + def _list(self, path: Path, params: dict) -> ToolResult: if not path.exists(): return ToolResult(success=False, output=f"Path not found: {path}", error="not_found") diff --git a/webclient/dist/assets/index-BPPoD3Ep.js b/webclient/dist/assets/index-BPPoD3Ep.js deleted file mode 100644 index eff3cc8..0000000 --- a/webclient/dist/assets/index-BPPoD3Ep.js +++ /dev/null @@ -1,93 +0,0 @@ -var tS=Object.defineProperty;var nS=(t,e,n)=>e in t?tS(t,e,{enumerable:!0,configurable:!0,writable:!0,value:n}):t[e]=n;var dt=(t,e,n)=>nS(t,typeof e!="symbol"?e+"":e,n);(function(){const e=document.createElement("link").relList;if(e&&e.supports&&e.supports("modulepreload"))return;for(const i of document.querySelectorAll('link[rel="modulepreload"]'))r(i);new MutationObserver(i=>{for(const a of i)if(a.type==="childList")for(const s of a.addedNodes)s.tagName==="LINK"&&s.rel==="modulepreload"&&r(s)}).observe(document,{childList:!0,subtree:!0});function n(i){const a={};return i.integrity&&(a.integrity=i.integrity),i.referrerPolicy&&(a.referrerPolicy=i.referrerPolicy),i.crossOrigin==="use-credentials"?a.credentials="include":i.crossOrigin==="anonymous"?a.credentials="omit":a.credentials="same-origin",a}function r(i){if(i.ep)return;i.ep=!0;const a=n(i);fetch(i.href,a)}})();/** -* @vue/shared v3.5.32 -* (c) 2018-present Yuxi (Evan) You and Vue contributors -* @license MIT -**/function yc(t){const e=Object.create(null);for(const n of t.split(","))e[n]=1;return n=>n in e}const ut={},Sr=[],En=()=>{},ig=()=>!1,Ui=t=>t.charCodeAt(0)===111&&t.charCodeAt(1)===110&&(t.charCodeAt(2)>122||t.charCodeAt(2)<97),Fi=t=>t.startsWith("onUpdate:"),yt=Object.assign,Ic=(t,e)=>{const n=t.indexOf(e);n>-1&&t.splice(n,1)},rS=Object.prototype.hasOwnProperty,it=(t,e)=>rS.call(t,e),Ae=Array.isArray,fr=t=>jr(t)==="[object Map]",ag=t=>jr(t)==="[object Set]",S_=t=>jr(t)==="[object Date]",Ue=t=>typeof t=="function",gt=t=>typeof t=="string",Vt=t=>typeof t=="symbol",at=t=>t!==null&&typeof t=="object",og=t=>(at(t)||Ue(t))&&Ue(t.then)&&Ue(t.catch),sg=Object.prototype.toString,jr=t=>sg.call(t),iS=t=>jr(t).slice(8,-1),lg=t=>jr(t)==="[object Object]",Bi=t=>gt(t)&&t!=="NaN"&&t[0]!=="-"&&""+parseInt(t,10)===t,kr=yc(",key,ref,ref_for,ref_key,onVnodeBeforeMount,onVnodeMounted,onVnodeBeforeUpdate,onVnodeUpdated,onVnodeBeforeUnmount,onVnodeUnmounted"),Gi=t=>{const e=Object.create(null);return(n=>e[n]||(e[n]=t(n)))},aS=/-\w/g,Gt=Gi(t=>t.replace(aS,e=>e.slice(1).toUpperCase())),oS=/\B([A-Z])/g,Gn=Gi(t=>t.replace(oS,"-$1").toLowerCase()),Yi=Gi(t=>t.charAt(0).toUpperCase()+t.slice(1)),Ei=Gi(t=>t?`on${Yi(t)}`:""),mn=(t,e)=>!Object.is(t,e),Si=(t,...e)=>{for(let n=0;n${d.join("`:"",p=u.join(" ");return m+p}return(_,l)=>{var d,u;return w(),U("div",mO,[h("div",gO,[h("div",EO,[h("div",{class:"msg-user-text",innerHTML:c(t.msg.text)},null,8,SO),(d=t.msg.images)!=null&&d.length||(u=t.msg.files)!=null&&u.length?(w(),U("div",fO,[(w(!0),U(ct,null,an(t.msg.images,(m,p)=>(w(),U("img",{key:`img-${p}`,src:m,class:"msg-user-image",onClick:E=>X(i)(m)},null,8,TO))),128)),(w(!0),U(ct,null,an(t.msg.files,(m,p)=>(w(),U("span",{key:`file-${p}`,class:"msg-user-file-pill"},[l[1]||(l[1]=h("i",{class:"ph ph-file"},null,-1)),Ot(" "+Le(m.name),1)]))),128))])):Ie("",!0)]),h("div",bO,[X(r)?(w(),U("span",RO,Le(X(r)),1)):Ie("",!0),h("button",{class:"btn-icon msg-copy-btn",title:X(a)?"Copied!":"Copy",onClick:l[0]||(l[0]=m=>X(s)(t.msg.text))},[h("i",{class:Ze(X(a)?"ph ph-check":"ph ph-copy")},null,2)],8,hO)])])])}}},vO={key:0,class:"spinner"},NO={class:"thinking-body"},Cc={__name:"ThinkingCard",props:{msg:{type:Object,required:!0}},setup(t){const e=t,n=le(null),r=fe(()=>{var a;return(((a=e.msg.thinking)==null?void 0:a.text)??"").replace(/^
")}
'+(n?i:cn(i,!0))+`"+(n?i:cn(i,!0))+`-${this.parser.parse(t)}-`}html({text:t}){return t}heading({tokens:t,depth:e}){return`
-`}list(t){const e=t.ordered,n=t.start;let r="";for(let s=0;s
${this.parser.parseInline(t)}
-`}table(t){let e="",n="";for(let i=0;i${cn(t,!0)}`}br(t){return""}del({tokens:t}){return`
An error occurred:
"+cn(n.message+"",!0)+"";return e?Promise.resolve(r):r}if(e)return Promise.reject(n);throw n}}},ir=new Ty;function tt(t,e){return ir.parse(t,e)}tt.options=tt.setOptions=function(t){return ir.setOptions(t),tt.defaults=ir.defaults,YE(tt.defaults),tt};tt.getDefaults=Jc;tt.defaults=lr;tt.use=function(...t){return ir.use(...t),tt.defaults=ir.defaults,YE(tt.defaults),tt};tt.walkTokens=function(t,e){return ir.walkTokens(t,e)};tt.parseInline=ir.parseInline;tt.Parser=In;tt.parser=In.parse;tt.Renderer=ki;tt.TextRenderer=o_;tt.Lexer=yn;tt.lexer=yn.lex;tt.Tokenizer=Pi;tt.Hooks=Ri;tt.parse=tt;tt.options;tt.setOptions;tt.use;tt.walkTokens;tt.parseInline;In.parse;yn.lex;tt.setOptions({breaks:!0,gfm:!0});const JE=new tt.Renderer;JE.code=function({text:t,lang:e}){const n=e&&xi.getLanguage(e)?e:"plaintext",r=xi.highlight(t,{language:n}).value;return`
${n}
${r}${d.join("`:"",p=u.join(" ");return m+p}return(_,l)=>{var d,u;return w(),U("div",SO,[h("div",fO,[h("div",TO,[h("div",{class:"msg-user-text",innerHTML:c(t.msg.text)},null,8,bO),(d=t.msg.images)!=null&&d.length||(u=t.msg.files)!=null&&u.length?(w(),U("div",RO,[(w(!0),U(ct,null,an(t.msg.images,(m,p)=>(w(),U("img",{key:`img-${p}`,src:m,class:"msg-user-image",onClick:E=>K(i)(m)},null,8,hO))),128)),(w(!0),U(ct,null,an(t.msg.files,(m,p)=>(w(),U("span",{key:`file-${p}`,class:"msg-user-file-pill"},[l[1]||(l[1]=h("i",{class:"ph ph-file"},null,-1)),Ot(" "+Me(m.name),1)]))),128))])):Ie("",!0)]),h("div",CO,[K(r)?(w(),U("span",vO,Me(K(r)),1)):Ie("",!0),h("button",{class:"btn-icon msg-copy-btn",title:K(a)?"Copied!":"Copy",onClick:l[0]||(l[0]=m=>K(s)(t.msg.text))},[h("i",{class:Ve(K(a)?"ph ph-check":"ph ph-copy")},null,2)],8,NO)])])])}}},yO={key:0,class:"spinner"},IO={class:"thinking-body"},Cc={__name:"ThinkingCard",props:{msg:{type:Object,required:!0}},setup(t){const e=t,n=ie(null),r=Ee(()=>{var a;return(((a=e.msg.thinking)==null?void 0:a.text)??"").replace(/^
")}
'+(n?i:cn(i,!0))+`"+(n?i:cn(i,!0))+`+${this.parser.parse(t)}+`}html({text:t}){return t}heading({tokens:t,depth:e}){return`
+`}list(t){const e=t.ordered,n=t.start;let r="";for(let s=0;s
${this.parser.parseInline(t)}
+`}table(t){let e="",n="";for(let i=0;i${cn(t,!0)}`}br(t){return""}del({tokens:t}){return`
An error occurred:
"+cn(n.message+"",!0)+"";return e?Promise.resolve(r):r}if(e)return Promise.reject(n);throw n}}},ar=new hy;function tt(t,e){return ar.parse(t,e)}tt.options=tt.setOptions=function(t){return ar.setOptions(t),tt.defaults=ar.defaults,qE(tt.defaults),tt};tt.getDefaults=Jc;tt.defaults=lr;tt.use=function(...t){return ar.use(...t),tt.defaults=ar.defaults,qE(tt.defaults),tt};tt.walkTokens=function(t,e){return ar.walkTokens(t,e)};tt.parseInline=ar.parseInline;tt.Parser=In;tt.parser=In.parse;tt.Renderer=ki;tt.TextRenderer=o_;tt.Lexer=yn;tt.lexer=yn.lex;tt.Tokenizer=Pi;tt.Hooks=Ri;tt.parse=tt;tt.options;tt.setOptions;tt.use;tt.walkTokens;tt.parseInline;In.parse;yn.lex;tt.setOptions({breaks:!0,gfm:!0});const jE=new tt.Renderer;jE.code=function({text:t,lang:e}){const n=e&&xi.getLanguage(e)?e:"plaintext",r=xi.highlight(t,{language:n}).value;return`
${n}
${r}
+
+
+
+
+ {{ ptrLabel }}
+
+
diff --git a/webclient/src/stores/chat.js b/webclient/src/stores/chat.js
index 4f07a4c..bfdd16e 100644
--- a/webclient/src/stores/chat.js
+++ b/webclient/src/stores/chat.js
@@ -346,6 +346,9 @@
msg.elapsed_seconds = data?.elapsed_seconds ?? null
msg.tool_call_count = data?.tool_call_count ?? null
msg.token_count = data?.token_count ?? null
+ // Assign stable h_ id so the rating UI appears and feedback can be mapped
+ const assistantIndex = messages.value.filter(m => m.role === 'assistant').length - 1
+ msg.id = `h_${assistantIndex}`
streamingMsg.value = null
// Purge if nothing was ever written (avoids empty msg-assistant divs)
if (!msg.thinking && !msg.tools.length && !msg.text) {
@@ -372,6 +375,8 @@
const msg = streamingMsg.value
if (msg) {
msg.done = true
+ const assistantIndex = messages.value.filter(m => m.role === 'assistant').length - 1
+ msg.id = `h_${assistantIndex}`
streamingMsg.value = null
if (!msg.thinking && !msg.tools.length && !msg.text) {
messages.value = messages.value.filter(m => m !== msg)
@@ -431,6 +436,7 @@
function buildMessageList(raw) {
const result = []
let i = 0
+ let assistantCounter = 0
while (i < raw.length) {
const m = raw[i]
@@ -459,7 +465,7 @@
if (m.role === 'assistant') {
// Collect all tool-call rounds + final content into one message
- const msgId = `h_${i}`
+ const firstIdx = i
const tools = []
let thinking = null
let text = ''
@@ -529,10 +535,10 @@
// Only add the message if there's something to show
if (thinking || tools.length || text) {
+ const msgId = `h_${assistantCounter++}`
// Scan the group for metrics (saved on the final assistant turn)
let elapsed_seconds = null, tool_call_count = null, token_count = null
- const startIdx = Number(msgId.slice(2))
- for (let j = startIdx; j < i; j++) {
+ for (let j = firstIdx; j < i; j++) {
const am = raw[j]
if (!am || am.role !== 'assistant') continue
if (am.elapsed_seconds != null) elapsed_seconds = am.elapsed_seconds
diff --git a/webclient/src/styles/app.scss b/webclient/src/styles/app.scss
index a447267..37831ab 100644
--- a/webclient/src/styles/app.scss
+++ b/webclient/src/styles/app.scss
@@ -158,14 +158,34 @@
flex-direction: column;
}
-.sessions-label {
+.sessions-header {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
padding: $space-sm $space-md;
+ gap: $space-sm;
+}
+
+.sessions-label {
font-size: 11px;
text-transform: uppercase;
letter-spacing: 0.08em;
color: $color-text-dark;
}
+.sessions-refresh-btn {
+ font-size: 14px;
+ color: $color-text-dark;
+ transition: color 0.15s, transform 0.15s;
+
+ &:hover { color: $color-text-light; }
+ &.is-spinning i { animation: spin 0.8s linear infinite; }
+}
+
+@keyframes spin {
+ to { transform: rotate(360deg); }
+}
+
// ─── Sidebar profile selector ──────────────────────────────────────────────
// Standalone .input-style select (outside .form-group context)
.sidebar-profile-select {