@@ -654,6 +736,7 @@ function turnEl(t){
+'#'+t.id+' · '+esc(t.source||'voice')+''
+''+fmtTime(t.wall)+'
'
+'
들음'+(t.heard?esc(t.heard):'(수신 대기)')+'
'
+ +'
생각'+(t.thought?esc(t.thought):'…')+'
'
+'
답변'+(t.reply?esc(t.reply):'…생각 중')+'
'
+(t.error?'
오류'+esc(t.error)+'
':'')
+'
'+steps+'
'
@@ -671,13 +754,34 @@ function upsertTurn(t){
else { cont.prepend(fresh); }
}
+// --- Bottom terminal log panel: store all events, render filtered ---------- #
+let logEvents = []; // {id, level, message, wall}
+function logMatches(e){
+ const lv = $('logLevel').value;
+ if(lv && e.level!==lv) return false;
+ const q = $('logSearch').value.trim().toLowerCase();
+ if(q && !((e.message||'').toLowerCase().includes(q) || fmtTime(e.wall).includes(q))) return false;
+ return true;
+}
+function renderLogs(){
+ const body = $('logbody');
+ const shown = logEvents.filter(logMatches);
+ body.innerHTML = shown.map(e =>
+ '
'
+ + ''+fmtTime(e.wall)+''
+ + ''+esc(e.level||'info')+''
+ + ''+esc(e.message)+''
+ + ''
+ + ''
+ + '
'
+ ).join('');
+ $('logCount').textContent = shown.length + (shown.length!==logEvents.length ? ' / '+logEvents.length : '') + '줄';
+}
function addEvent(e){
- const box = $('events');
- const row = document.createElement('div');
- row.className = 'ev ' + (e.level==='error'?'error':'');
- row.innerHTML = '
'+fmtTime(e.wall)+''+esc(e.message)+'';
- box.prepend(row);
- while(box.childElementCount>60) box.removeChild(box.lastChild);
+ if(e.id==null){ e.id = 'c'+Date.now()+Math.random(); }
+ logEvents.push(e);
+ if(logEvents.length>2000) logEvents = logEvents.slice(-2000);
+ renderLogs();
}
function applySnapshot(snap){
@@ -686,8 +790,8 @@ function applySnapshot(snap){
const list = (snap.turns||[]);
for(const t of list) upsertTurn(t);
if(list.length===0){ $('empty').style.display='block'; }
- $('events').innerHTML='';
- for(const e of (snap.events||[])) addEvent(e);
+ logEvents = (snap.events||[]).slice();
+ renderLogs();
}
function connect(){
@@ -700,6 +804,9 @@ function connect(){
else if(ev.type==='status') renderStatus(ev.status);
else if(ev.type==='turn') upsertTurn(ev.turn);
else if(ev.type==='log') { addEvent(ev); if(statusData){ statusData.errors_total=(statusData.errors_total||0)+(ev.level==='error'?1:0); $('s-errors').textContent=statusData.errors_total; } }
+ else if(ev.type==='logs_cleared') { logEvents=[]; renderLogs(); }
+ else if(ev.type==='log_deleted') { logEvents=logEvents.filter(e=>e.id!==ev.id); renderLogs(); }
+ else if(ev.type==='log_edited') { const e=logEvents.find(e=>e.id===ev.id); if(e){e.message=ev.message; renderLogs();} }
};
}
// --- STT recognition test (upload / mic record -> GPU whisper) ----------- #
@@ -788,6 +895,35 @@ async function openPrompt(){
}
$('promptBtn').onclick = openPrompt;
+// --- 로그 패널: 열고닫기 / 검색 / 삭제(전체·개별) / 수정 -------------------- #
+$('logToggle').onclick = ()=>{
+ const d=$('logdock'); d.classList.toggle('collapsed');
+ $('logToggle').textContent = (d.classList.contains('collapsed')?'▸':'▾') + ' 이벤트 / 오류 로그';
+};
+$('logSearch').oninput = renderLogs;
+$('logLevel').onchange = renderLogs;
+$('logClear').onclick = async ()=>{
+ if(!confirm('로그를 모두 삭제할까요?')) return;
+ try{ await fetch('/api/logs/clear',{method:'POST'}); toast('로그를 삭제했습니다'); }
+ catch(e){ toast('삭제 실패: '+e); }
+};
+$('logbody').addEventListener('click', async (ev)=>{
+ const btn = ev.target.closest('.lact'); if(!btn) return;
+ const line = btn.closest('.logline'); const id = line && line.getAttribute('data-id');
+ if(id==null) return;
+ const act = btn.getAttribute('data-act');
+ const isServer = !String(id).startsWith('c'); // server events have numeric ids
+ if(act==='del'){
+ if(isServer){ try{ await fetch('/api/logs/delete',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({id:Number(id)})}); }catch(e){} }
+ logEvents = logEvents.filter(e=>String(e.id)!==String(id)); renderLogs();
+ } else if(act==='edit'){
+ const cur = logEvents.find(e=>String(e.id)===String(id)); if(!cur) return;
+ const nv = prompt('로그 수정', cur.message); if(nv==null) return;
+ cur.message = nv; renderLogs();
+ if(isServer){ try{ await fetch('/api/logs/edit',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({id:Number(id),message:nv})}); }catch(e){} }
+ }
+});
+
connect();
// Refresh uptime label every second from the last known status.
setInterval(()=>{ if(statusData){ statusData.uptime_s=(statusData.uptime_s||0)+1; $('s-up').textContent=fmtUptime(statusData.uptime_s);} }, 1000);
diff --git a/wsai/monitor.py b/wsai/monitor.py
index 8b89e5e..e532230 100644
--- a/wsai/monitor.py
+++ b/wsai/monitor.py
@@ -83,6 +83,7 @@ class Turn:
self.wall = _now_wall()
self._t0 = _now_mono()
self.heard_text = ""
+ self.thought_text = ""
self.reply_text = ""
self.status = "active" # active | ok | error
self.error = ""
@@ -95,6 +96,10 @@ class Turn:
self.heard_text = text
self._touch()
+ def thought(self, text: str) -> None:
+ self.thought_text = text
+ self._touch()
+
def replied(self, text: str) -> None:
self.reply_text = text
self._touch()
@@ -134,6 +139,7 @@ class Turn:
"source": self.source,
"wall": self.wall,
"heard": self.heard_text,
+ "thought": self.thought_text,
"reply": self.reply_text,
"status": self.status,
"error": self.error,
@@ -147,7 +153,9 @@ class Monitor:
def __init__(self, keep: int = 60) -> None:
self._turns: deque[Turn] = deque(maxlen=keep)
- self._events: deque[dict[str, Any]] = deque(maxlen=200)
+ # Keep a long event tail so the terminal panel can show the log from
+ # (voice-server) start, not just the last few lines.
+ self._events: deque[dict[str, Any]] = deque(maxlen=2000)
self._status: dict[str, Any] = {
"running": False,
"listening": False,
@@ -159,6 +167,7 @@ class Monitor:
self._lock = threading.Lock()
self._subs: list["queue.Queue[str]"] = []
self._id = 0
+ self._event_id = 0
# -- status ----------------------------------------------------------- #
def set_status(self, **kw: Any) -> None:
@@ -179,13 +188,48 @@ class Monitor:
def log(self, level: str, message: str) -> None:
"""A free-form lifecycle/error line (startup, disconnect, crash…)."""
- evt = {"type": "log", "level": level, "message": message, "wall": _now_wall()}
with self._lock:
+ self._event_id += 1
+ evt = {"type": "log", "id": self._event_id, "level": level,
+ "message": message, "wall": _now_wall()}
self._events.append(evt)
if level == "error":
self._status["errors_total"] += 1
self._broadcast(evt)
+ def delete_event(self, event_id: int) -> bool:
+ """Remove one log line by id (dashboard per-line '삭제')."""
+ found = False
+ with self._lock: # _broadcast re-locks, so must run outside this block
+ for e in list(self._events):
+ if e.get("id") == event_id:
+ self._events.remove(e)
+ found = True
+ break
+ if found:
+ self._broadcast({"type": "log_deleted", "id": event_id})
+ return found
+
+ def edit_event(self, event_id: int, message: str) -> bool:
+ """Edit one log line's text by id (dashboard per-line '수정')."""
+ found = False
+ with self._lock: # _broadcast re-locks, so must run outside this block
+ for e in self._events:
+ if e.get("id") == event_id:
+ e["message"] = message
+ found = True
+ break
+ if found:
+ self._broadcast({"type": "log_edited", "id": event_id, "message": message})
+ return found
+
+ def clear_events(self) -> None:
+ """Wipe the event/error log (dashboard '로그 삭제'). Broadcasts a reset so
+ every connected page clears its terminal panel too."""
+ with self._lock:
+ self._events.clear()
+ self._broadcast({"type": "logs_cleared"})
+
# -- turns ------------------------------------------------------------ #
def turn(self, source: str = "voice") -> Turn:
with self._lock: