micro-models-agent 2.14.0 → 2.16.0

package/dist/assets/js/sidebar.js

@@ -25,6 +25,8 @@ let trace = [];          // { id, kind, ts, name, args, output, success, duratio
 let selected = null;     // trace id
 let turn = 0;
 let seq = 0;
+let logCursor = null;    // max session-log ts already pulled (supplement fetch)
+let logPulling = false;
 const nodeById = new Map();   // entry id → row node
 const callIndex = new Map();  // toolCallId → entry
 const headerByTurn = new Map(); // turn → header node
@@ -48,6 +50,7 @@ export function setSidebarTab(id, persist = true) {
   if (!TABS.includes(id)) id = "session";
   if (persist) storeTab(id);
   const effective = id === "trace" && mqMobile() ? "session" : id;
+  if (effective !== active) collapseDetail();
   active = effective;
   TABS.forEach((name) => {
     const pane = paneEl(name);
@@ -90,6 +93,18 @@ function rowLabel(entry) {
     case "plan": return t("web.sidebar.trace_plan");
     case "question": return t("web.sidebar.trace_question");
     case "text": return t("web.sidebar.trace_text", { count: entry.chars || 0 });
+    case "status": return t("web.sidebar.trace_status");
+    case "log": return t("web.sidebar.trace_log", { level: entry.level || "" });
+    case "retract": return t("web.sidebar.trace_retract");
+    case "index": return t("web.sidebar.trace_index", { phase: entry.phase || "" });
+    case "critic": return t("web.sidebar.trace_critic", { status: entry.status || "" });
+    case "moe": return t("web.sidebar.trace_moe");
+    case "compaction": return t("web.sidebar.trace_compaction");
+    case "probe": return t("web.sidebar.trace_probe");
+    case "usage": return t("web.sidebar.trace_usage");
+    case "audit": return t("web.sidebar.trace_audit");
+    case "claim": return t("web.sidebar.trace_claim", { kind: entry.subkind || "" });
+    case "output": return t("web.sidebar.trace_output");
     default: return labelOf(entry.name);
   }
 }
@@ -103,11 +118,19 @@ function rowArgs(entry) {
     return t("web.rail.step_of", { cur: Math.min(idx + 1, total), total });
   }
   if (entry.kind === "question") return entry.text || "";
+  // Диагностические строки несут смысл в одной строке (статус/лог/ретракт/
+  // индекс/критик/MoE/компакция/проба/usage/аудит/claim/вывод).
+  if (entry.text && typeof entry.text === "string" && entry.kind !== "tool" && entry.kind !== "tool_fail") {
+    const line = entry.text.split("\n").map((l) => l.trim()).find((l) => l.length > 0) || "";
+    return line.slice(0, 160);
+  }
   return argText(entry.args);
 }
 
 function isWarn(entry) {
-  return entry.kind === "tool_fail" || entry.kind === "error";
+  return entry.kind === "tool_fail" || entry.kind === "error" || entry.kind === "claim" ||
+    (entry.kind === "critic" && entry.status === "critical") ||
+    (entry.kind === "log" && (entry.level === "warn" || entry.level === "error"));
 }
 
 function renderRow(entry) {
@@ -221,12 +244,16 @@ export function sidebarSessionChanged(sid) {
   textEntry = null;
   turn = 0;
   seq = 0;
+  // Trace живой: старые ходы чужой сессии не докачиваем, только новые события.
+  logCursor = new Date().toISOString();
+  logPulling = false;
   collapseDetail();
   renderList();
 }
 
-export function sidebarTurnEnd() {
-  turn += 1;
+export function sidebarTurnEnd(turnSeq) {
+  // Серверный номер хода (реконнекты локальный счётчик не сбивают).
+  turn = typeof turnSeq === "number" && turnSeq > turn ? turnSeq : turn + 1;
   textEntry = null;
 }
 
@@ -276,13 +303,118 @@ export function sidebarTraceEvent(kind, data) {
       const chunk = data.chunk || "";
       textEntry.chars += chunk.length;
       textEntry.text += chunk;
-      if (textEntry.text.length > 4000) textEntry.text = textEntry.text.slice(-4000);
+      // Полный текст хода — в память (деталь покажет целиком); обрезка честная,
+      // тем же капом и маркером, что у выводов тулов.
+      if (textEntry.text.length > MAX_OUTPUT_CHARS) {
+        textEntry.text = textEntry.text.slice(0, MAX_OUTPUT_CHARS) +
+          "\n… [truncated from " + textEntry.chars + " chars]";
+      }
       updateTextRow(textEntry);
       break;
     }
     case "error":
       pushRow(append({ kind: "error", message: data.message || data.error || "" }));
       break;
+    case "meta": {
+      // Тела тулов (`kind: "tool"`) уже идут строками tool_start/tool_end —
+      // в Trace несём только статусы (stuck/escalation/honest-stop и т.п.).
+      if (data.kind !== undefined && data.kind !== "status") break;
+      const text = data.chunk || "";
+      if (!text.trim()) break;
+      pushRow(append({ kind: "status", text }));
+      break;
+    }
+    case "log": {
+      // Внутренний шёпот петли (`diagnostic` + info) в Trace не несём —
+      // только варнинги/ошибки и пользовательские info (probe/overflow).
+      if (data.diagnostic && data.level === "info") break;
+      const text = data.text || "";
+      if (!text.trim()) break;
+      pushRow(append({ kind: "log", text, level: data.level || "", source: data.source || "" }));
+      break;
+    }
+    case "retract":
+      pushRow(append({ kind: "retract", text: data.reason || "" }));
+      break;
+    case "index": {
+      const stats = data.stats && typeof data.stats === "object"
+        ? Object.entries(data.stats).map(([k, v]) => k + ": " + v).join(", ")
+        : "";
+      pushRow(append({ kind: "index", phase: data.phase || "", text: stats }));
+      break;
+    }
+    default:
+      break;
+  }
+}
+
+/**
+ * Докачка диагностических событий из session-лога (критик, MoE, компакция,
+ * проба контекста, usage, аудит, claim-retry, вывод). Отдельных SSE-продюсеров
+ * нет — данные уже лежат в логе с `iteration`; тянем инкремент по курсору на
+ * каждый `turn_end`. Живые tool/text-строки не дублируются (другие kinds).
+ */
+export async function sidebarPullLog() {
+  const sid = sbEl && sbEl.dataset.sid;
+  if (!sid || logPulling) return;
+  logPulling = true;
+  try {
+    let url = "/api/sessions/" + encodeURIComponent(sid) + "/log?limit=100";
+    if (logCursor) url += "&since=" + encodeURIComponent(logCursor);
+    const r = await api(url);
+    if (!r.ok || !r.data || !Array.isArray(r.data.log)) return;
+    for (const e of r.data.log) {
+      if (typeof e.ts === "string" && (logCursor === null || e.ts > logCursor)) logCursor = e.ts;
+      appendLogEntry(e);
+    }
+  } catch {
+    /* best-effort supplement: Trace живёт и без докачки */
+  } finally {
+    logPulling = false;
+  }
+}
+
+function appendLogEntry(e) {
+  if (!e || typeof e.type !== "string") return;
+  switch (e.type) {
+    case "critic_check":
+      pushRow(append({ kind: "critic", status: "check", text: "", iteration: e.iteration }));
+      break;
+    case "critic_verdict":
+      pushRow(append({ kind: "critic", status: e.status || "", text: e.content || "", iteration: e.iteration }));
+      break;
+    case "critic_escalation":
+      pushRow(append({ kind: "critic", status: "escalation", text: e.content || "", iteration: e.iteration }));
+      break;
+    case "moe_plan":
+    case "moe_subtask":
+    case "moe_replan":
+    case "moe_verify": {
+      const bits = [e.title, e.subtaskId, e.expertTag, e.status].filter((x) => typeof x === "string" && x).join(" · ");
+      pushRow(append({ kind: "moe", subtype: e.type, text: bits, iteration: e.iteration }));
+      break;
+    }
+    case "compaction":
+      pushRow(append({ kind: "compaction", text: e.content || "", iteration: e.iteration }));
+      break;
+    case "context_probe":
+      pushRow(append({ kind: "probe", text: e.content || "" }));
+      break;
+    case "llm_usage": {
+      const toks = typeof e.totalTokens === "number" ? e.totalTokens : (e.promptTokens || 0) + (e.completionTokens || 0);
+      const who = [e.model || e.provider, toks ? toks + " tok" : ""].filter(Boolean).join(" · ");
+      pushRow(append({ kind: "usage", text: who, iteration: e.iteration }));
+      break;
+    }
+    case "audit":
+      pushRow(append({ kind: "audit", text: e.content || "", iteration: e.iteration }));
+      break;
+    case "claim_retry":
+      pushRow(append({ kind: "claim", subkind: e.kind || "", text: e.content || "", iteration: e.iteration }));
+      break;
+    case "output":
+      pushRow(append({ kind: "output", text: e.content || "", iteration: e.iteration }));
+      break;
     default:
       break;
   }
@@ -331,6 +463,8 @@ function renderDetail(entry) {
   if (d) meta.appendChild(kv(t("web.sidebar.detail_time"), d.toLocaleTimeString()));
   if (entry.toolCallId) meta.appendChild(kv(t("web.sidebar.detail_tool_call"), String(entry.toolCallId)));
   if (sbEl && sbEl.dataset.sid) meta.appendChild(kv(t("web.sidebar.detail_session"), sbEl.dataset.sid));
+  meta.appendChild(kv(t("web.sidebar.detail_turn"), String(entry.turn)));
+  if (typeof entry.iteration === "number") meta.appendChild(kv(t("web.sidebar.detail_iteration"), String(entry.iteration)));
   detailBody.appendChild(meta);
 
   if (entry.kind === "tool" || entry.kind === "tool_fail") {
@@ -338,6 +472,7 @@ function renderDetail(entry) {
     detailBody.appendChild(detailGroup(t("web.sidebar.detail_output"), codeBlock(capOutput(entry.output))));
   } else if (entry.kind === "text") {
     detailBody.appendChild(detailGroup(t("web.sidebar.detail_text"), codeBlock(entry.text || "")));
+    loadTextProvenance(entry);
   } else if (entry.kind === "plan") {
     const list = el("div");
     (entry.steps || []).forEach((s) => {
@@ -350,6 +485,52 @@ function renderDetail(entry) {
     detailBody.appendChild(detailGroup(t("web.sidebar.trace_question"), codeBlock(entry.text || "")));
   } else if (entry.kind === "error") {
     detailBody.appendChild(detailGroup(t("web.sidebar.detail_error"), codeBlock(entry.message || "")));
+  } else if (
+    entry.kind === "status" || entry.kind === "log" || entry.kind === "retract" ||
+    entry.kind === "index" || entry.kind === "critic" || entry.kind === "moe" ||
+    entry.kind === "compaction" || entry.kind === "probe" || entry.kind === "usage" ||
+    entry.kind === "audit" || entry.kind === "claim" || entry.kind === "output"
+  ) {
+    const title =
+      entry.kind === "moe" && entry.subtype ? entry.subtype
+      : entry.kind === "log" && entry.level ? "log · " + entry.level
+      : entry.kind === "index" && entry.phase ? "index · " + entry.phase
+      : entry.kind === "critic" && entry.status ? "critic · " + entry.status
+      : entry.kind === "claim" && entry.subkind ? "claim_retry · " + entry.subkind
+      : rowLabel(entry);
+    detailBody.appendChild(detailGroup(title, codeBlock(entry.text || "")));
+  }
+}
+
+/**
+ * Привязка текста хода к session-логу: сколько assistant-сообщений в сессии,
+ * их итерации и провенанс последнего LLM-вызова (модель/провайдер/токены).
+ * Живой текст хода уже показан выше целиком; это — сверка с логом.
+ */
+async function loadTextProvenance(entry) {
+  const sid = sbEl && sbEl.dataset.sid;
+  if (!sid || !detailBody || selected !== entry.id) return;
+  try {
+    const r = await api(
+      "/api/sessions/" + encodeURIComponent(sid) + "/log?types=assistant,llm_usage&limit=20",
+    );
+    if (!r.ok || !r.data || !Array.isArray(r.data.log) || selected !== entry.id) return;
+    const assistants = r.data.log.filter((e) => e.type === "assistant");
+    const usages = r.data.log.filter((e) => e.type === "llm_usage");
+    const iters = assistants.map((e) => e.iteration).filter((n) => typeof n === "number");
+    const last = usages.length > 0 ? usages[usages.length - 1] : null;
+    const bits = [
+      t("web.sidebar.detail_provenance_count", { n: assistants.length }) +
+        (iters.length > 0 ? " · iter " + Math.min(...iters) + "–" + Math.max(...iters) : ""),
+      last
+        ? [last.model || last.provider, last.totalTokens ?? (last.promptTokens || 0) + (last.completionTokens || 0)]
+            .filter(Boolean)
+            .join(" · ")
+        : "",
+    ].filter(Boolean).join("\n");
+    if (bits) detailBody.appendChild(detailGroup(t("web.sidebar.detail_provenance"), codeBlock(bits)));
+  } catch {
+    /* best-effort: живой текст уже на месте */
   }
 }
 
@@ -374,6 +555,18 @@ function mapKv(label, value, cls) {
   return row;
 }
 
+// Корень — всегда длинный путь: подпись сверху, путь снизу на всю ширину.
+// В одну flex-строку с подписью он не влезает и склеивается с ней.
+function mapPathRow(label, value) {
+  const wrap = el("div", "map-path");
+  wrap.appendChild(el("span", "dim", label));
+  const b = el("b");
+  b.textContent = value;
+  b.title = value;
+  wrap.appendChild(b);
+  return wrap;
+}
+
 let reindexing = false;   // клиентский спиннер до свежего снапшота
 let postResolved = false; // POST вернулся; следующий снапшот снимет спиннер
 let reindexError = false; // последний POST не удался
@@ -395,7 +588,7 @@ export function sidebarMapState(host) {
   mapEl.appendChild(mapKv(t("web.sidebar.map_files"), num(map.files)));
   mapEl.appendChild(mapKv(t("web.sidebar.map_symbols"), num(map.symbols)));
   mapEl.appendChild(mapKv(t("web.sidebar.map_tokens"), map.indexed ? fmtTokens(map.tokens || 0) : "—"));
-  if (host && host.workspace) mapEl.appendChild(mapKv(t("web.sidebar.map_root"), host.workspace));
+  if (host && host.workspace) mapEl.appendChild(mapPathRow(t("web.sidebar.map_root"), host.workspace));
 
   if (Array.isArray(map.languages) && map.languages.length > 0) {
     const head = el("div", "kv");

package/dist/assets/js/tabs.js

@@ -8,7 +8,7 @@ el, icon,
 import { api } from "./api.js";
 import { t } from "./i18n.js";
 import { S, MAX_IMAGES, MAX_IMAGE_BYTES } from "./store.js";
-import { relTime, contextLabel } from "./format.js";
+import { relTime, contextLabel, matchesQuery } from "./format.js";
 import {
 makeFeed, showEmptyFeed, activeFeed, liveFeed, appendTo,
 clearEmpty, showBusy, clearFeed, finishMd, resetTurnText,
@@ -204,18 +204,70 @@ document.getElementById("sessRefresh").addEventListener("click", () => {
   loadSessions();
 });
 
+// Live filter text of the sessions dropdown. Module-level so the 2s
+// `renderState` poll and the 15s `loadSessions` poll (both re-render the lists)
+// never wipe an in-progress query: the `<input id="sessSearch">` itself lives
+// statically in `index.html` and only the row lists are redrawn.
+let sessQuery = "";
+let sessSearchWired = false;
+
+// One-time wiring for the static `#sessSearch` input: placeholder follows the
+// locale on every render, listeners attach once. Returns the input or null.
+function ensureSessSearch() {
+  const search = document.getElementById("sessSearch");
+  if (!search) return null;
+  search.placeholder = t("web.sessions.search");
+  search.setAttribute("aria-label", t("web.sessions.search"));
+  if (!sessSearchWired) {
+    sessSearchWired = true;
+    search.addEventListener("click", (e) => e.stopPropagation());
+    search.addEventListener("input", () => {
+      sessQuery = search.value;
+      renderSessionsDropdown();
+      // Re-render must not steal the caret: the input node itself survives
+      // (only the lists redraw), but re-query it to be safe.
+      const again = document.getElementById("sessSearch");
+      if (again && document.activeElement !== again) again.focus();
+    });
+    search.addEventListener("keydown", (e) => {
+      e.stopPropagation();
+      if (e.key === "Escape") {
+        if (search.value) {
+          e.preventDefault();
+          search.value = "";
+          sessQuery = "";
+          renderSessionsDropdown();
+          search.focus();
+        } else {
+          setSessOpen(false);
+        }
+      } else if (e.key === "ArrowDown") {
+        e.preventDefault();
+        const first = document.querySelector("#sessActiveList .si-row .dd-row-main, #sessRecentList .si-row .dd-row-main");
+        if (first) first.focus();
+      }
+    });
+  }
+  return search;
+}
+
 export function renderSessionsDropdown() {
+  ensureSessSearch();
   const activeList = document.getElementById("sessActiveList");
   const recentList = document.getElementById("sessRecentList");
+  const activeHeader = document.getElementById("sessActiveHeader");
+  const recentHeader = document.getElementById("sessRecentHeader");
   activeList.textContent = "";
   recentList.textContent = "";
+  const q = sessQuery.trim();
   const activeId = S.state.activeSessionId;
   const sorted = S.state.sessions.slice().sort((a, b) => {
     const at = a.updatedAt ? new Date(a.updatedAt).getTime() : 0;
     const bt = b.updatedAt ? new Date(b.updatedAt).getTime() : 0;
     return bt - at;
-  });
+  }).filter((s) => matchesQuery((s.name || "") + " " + String(s.id || ""), q));
   let activePlaced = false;
+  let recentPlaced = false;
   sorted.forEach((s) => {
     const isActive = s.id === activeId;
     const row = sessionRow(s, isActive);
@@ -224,13 +276,27 @@ export function renderSessionsDropdown() {
       activePlaced = true;
     } else {
       recentList.appendChild(row);
+      recentPlaced = true;
     }
   });
-  if (!activePlaced) {
-    activeList.appendChild(el("div", "si", t("web.sessions.none_active")));
-  }
-  if (!recentList.childNodes.length) {
-    recentList.appendChild(el("div", "si", t("web.sessions.none")));
+  if (q) {
+    // Filtered view: empty sections hide with their headers; zero hits total
+    // show a single no-matches row instead of the unfiltered placeholders.
+    if (activeHeader) activeHeader.hidden = !activePlaced;
+    if (recentHeader) recentHeader.hidden = !recentPlaced;
+    if (!activePlaced && !recentPlaced) {
+      if (recentHeader) recentHeader.hidden = true;
+      recentList.appendChild(el("div", "si dim", t("web.settings.no_matches")));
+    }
+  } else {
+    if (activeHeader) activeHeader.hidden = false;
+    if (recentHeader) recentHeader.hidden = false;
+    if (!activePlaced) {
+      activeList.appendChild(el("div", "si", t("web.sessions.none_active")));
+    }
+    if (!recentPlaced) {
+      recentList.appendChild(el("div", "si", t("web.sessions.none")));
+    }
   }
   if (S.state.sessionsError) {
     recentList.appendChild(el("div", "dd-err", S.state.sessionsError));
@@ -304,11 +370,28 @@ const sessBtn = document.getElementById("sessBtn");
 export function setSessOpen(open) {
   sessDD.classList.toggle("open", !!open);
   sessBtn.setAttribute("aria-expanded", open ? "true" : "false");
+  if (!open && sessQuery) {
+    // Closing wipes the filter so the next opening starts from the full list.
+    sessQuery = "";
+    const search = document.getElementById("sessSearch");
+    if (search && search.value) {
+      search.value = "";
+      renderSessionsDropdown();
+    }
+  }
+}
+function focusSessSearch() {
+  setTimeout(() => {
+    const search = document.getElementById("sessSearch");
+    if (search) search.focus();
+  }, 0);
 }
 sessBtn.addEventListener("click", (e) => {
   e.stopPropagation();
   document.querySelectorAll("[data-sel]").forEach((s) => s.classList.remove("open"));
-  setSessOpen(!sessDD.classList.contains("open"));
+  const willOpen = !sessDD.classList.contains("open");
+  setSessOpen(willOpen);
+  if (willOpen) focusSessSearch();
 });
 
 // --- mobile session sub-header -------------------------------------------
@@ -370,7 +453,9 @@ if (sessCloseBtn) sessCloseBtn.addEventListener("click", () => {
 if (sessNameBtn) sessNameBtn.addEventListener("click", (e) => {
   e.stopPropagation();
   document.querySelectorAll("[data-sel]").forEach((s) => s.classList.remove("open"));
-  setSessOpen(!sessDD.classList.contains("open"));
+  const willOpen = !sessDD.classList.contains("open");
+  setSessOpen(willOpen);
+  if (willOpen) focusSessSearch();
 });
 if (typeof window.matchMedia === "function") {
   const narrowMq = window.matchMedia("(max-width: 760px)");
@@ -627,11 +712,8 @@ async function send() {
   const images = S.attachments.slice();
   if (!text && !images.length) return;
   const feed = liveFeed() || activeFeed();
-  if (S.state.busy) {
-    // Don't drop the input silently: tell the user a turn is still running.
-    if (feed) appendTo(feed, el("div", "warnline", "⚠ " + t("web.input.busy")));
-    return;
-  }
+  // No client-side busy gate: a message sent mid-turn is queued server-side
+  // (`202 {queued: n}`) and runs after the current turn, in order.
   clearEmpty(feed);
   finishMd();
   resetTurnText();
@@ -672,13 +754,18 @@ async function send() {
   if (images.length) body.images = images;
   const r = await api("/api/message", { method: "POST", body });
   if (!r.ok) {
-    const msg = (r.data && r.data.error) || r.status;
+    const err = (r.data && r.data.error) || r.status;
+    const msg = err === "queue_full" ? t("web.input.queue_full") : err;
     appendTo(feed, el("div", "warnline", "⚠ " + msg));
   } else {
     if (images.length) clearAttachments();
-    // Delay the spinner so fast first tokens never flash it: `showBusy`
-    // itself skips when a stream/think block already started.
-    window.setTimeout(() => showBusy(feed), 180);
+    if (r.data && r.data.queued) {
+      appendTo(feed, el("div", "detail", "↳ " + t("web.input.queued", { n: r.data.queued })));
+    } else {
+      // Delay the spinner so fast first tokens never flash it: `showBusy`
+      // itself skips when a stream/think block already started.
+      window.setTimeout(() => showBusy(feed), 180);
+    }
   }
 }