clideck 1.25.4 → 1.25.6

package/handlers.js

@@ -130,6 +130,7 @@ function onConnection(ws) {
       case 'input':                sessions.input(msg); break;
       case 'session.statusReport':
         if (sessions.getSessions().has(msg.id)) {
+          sessions.broadcast({ type: 'session.status', id: msg.id, working: !!msg.working });
           plugins.notifyStatus(msg.id, !!msg.working);
         }
         break;
@@ -306,8 +307,7 @@ function onConnection(ws) {
       }
 
       case 'remote.getHistory': {
-        const turns = transcript.getScreenTurns(msg.id, sessions.getSessions().get(msg.id)?.presetId)
-          || transcript.getLastTurns(msg.id, msg.limit || 50);
+        const turns = transcript.getScreenTurns(msg.id, sessions.getSessions().get(msg.id)?.presetId);
         ws.send(JSON.stringify({ type: 'remote.history', id: msg.id, turns: turns || [] }));
         break;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clideck",
-  "version": "1.25.4",
+  "version": "1.25.6",
   "description": "One screen for all your AI coding agents — run, monitor, and manage multiple CLI agents from a single browser tab",
   "main": "server.js",
   "bin": {

package/public/js/terminals.js

@@ -318,7 +318,7 @@ export function addTerminal(id, name, themeId, commandId, projectId, muted, last
   const statusEl = item.querySelector('.session-status');
   const cmd = state.cfg.commands.find(c => c.id === commandId);
   const hasBridge = !!cmd?.bridge;
-  const stopBounce = hasBridge ? null : startBounce(statusEl);
+  const stopBounce = null;
 
   const el = document.createElement('div');
   el.className = 'term-wrap';
@@ -338,20 +338,31 @@ export function addTerminal(id, name, themeId, commandId, projectId, muted, last
   term.loadAddon(fit);
   term.onData(data => send({ type: 'input', id, data }));
 
-  // [RENDER-STATUS] agent working/idle detection via onRender + onWriteParsed
-  let _lastTyping = 0, _renderWorking = false, _renderTimer = null, _hasRender = false, _hasParsed = false;
-  term.onData(() => { _lastTyping = Date.now(); });
-  function _statusTick() {
-    if (Date.now() - _lastTyping < 500) return;
-    const cmd = state.cfg.commands.find(c => c.id === commandId);
-    if (cmd?.bridge) return;
-    if (_hasRender && _hasParsed && !_renderWorking) {
-      _renderWorking = true;
-      send({ type: 'session.statusReport', id, working: true }); setStatus(id, true);
-    }
+  // [SCREEN-CAPTURE] extract terminal buffer when BOTH idle AND render-silent (2s)
+  // Decoupled from status: telemetry knows when agent is done, onRender knows when terminal is done
+  const _telemetryOnly = cmd?.presetId === 'claude-code' || cmd?.presetId === 'codex' || cmd?.presetId === 'gemini-cli';
+  let _screenTimer = null, _renderSilent = false;
+  function _tryScreenCapture() {
+    const entry = state.terms.get(id);
+    if (!entry?.pendingScreenCapture || (!_renderSilent && !_telemetryOnly) || !entry.term) return;
+    entry.pendingScreenCapture = false;
+    const buf = entry.term.buffer.active;
+    const lines = [];
+    for (let i = 0; i < buf.length; i++) { const line = buf.getLine(i); if (line) lines.push(line.translateToString(true)); }
+    send({ type: 'terminal.buffer', id, lines });
   }
-  term.onWriteParsed(() => { _hasParsed = true; _statusTick(); });
-  term.onRender(() => { _hasRender = true; _statusTick(); clearTimeout(_renderTimer); _renderTimer = setTimeout(() => { _renderWorking = false; _hasRender = false; _hasParsed = false; send({ type: 'session.statusReport', id, working: false }); setStatus(id, false); }, 2000); });
+  let _idleTimer = null, _workTimer = null, _lastTyping = 0, _lastRender = 0;
+  term.onData(() => { _lastTyping = Date.now(); });
+  term.onRender(() => {
+    _lastRender = Date.now();
+    _renderSilent = false;
+    clearTimeout(_screenTimer);
+    _screenTimer = setTimeout(() => { _renderSilent = true; _tryScreenCapture(); }, 2000);
+  });
+  term.onWriteParsed(() => { if (Date.now() - _lastTyping < 500) return; const entry = state.terms.get(id); if (entry) entry.lastRenderAt = Date.now(); if (_telemetryOnly) return; if (!_workTimer) _workTimer = setTimeout(() => { _workTimer = null; if (Date.now() - _lastRender < 500) setStatus(id, true); }, 1500); clearTimeout(_idleTimer); _idleTimer = setTimeout(() => { clearTimeout(_workTimer); _workTimer = null; setStatus(id, false); send({ type: 'session.statusReport', id, working: false }); }, 1500); });
+
+  // Expose capture function so setStatus can trigger it when idle arrives after render silence
+  setTimeout(() => { const e = state.terms.get(id); if (e) e.tryScreenCapture = _tryScreenCapture; }, 0);
 
   term.open(el);
   attachToTerminal(term);
@@ -383,7 +394,7 @@ export function addTerminal(id, name, themeId, commandId, projectId, muted, last
   // Safety: if RO hasn't fired within 500ms, flush anyway to avoid unbounded queue
   setTimeout(() => { if (!fitted) { fitted = true; for (const chunk of pending) term.write(chunk); pending = null; updatePreview(id); } }, 500);
   const cancelFitRaf = () => { if (fitRaf) { cancelAnimationFrame(fitRaf); fitRaf = 0; } };
-  state.terms.set(id, { term, fit, el, ro, cancelFitRaf, themeId, commandId, projectId: projectId || null, muted: !!muted, working: !hasBridge, workStartedAt: hasBridge ? null : Date.now(), stopBounce, queue: (data) => { if (!fitted) { pending.push(data); return true; } return false; }, lastActivityAt: Date.now(), unread: false, lastPreviewText: lastPreview || '', searchText: '' });
+  state.terms.set(id, { term, fit, el, ro, cancelFitRaf, themeId, commandId, projectId: projectId || null, muted: !!muted, working: false, workStartedAt: null, stopBounce, queue: (data) => { if (!fitted) { pending.push(data); return true; } return false; }, lastActivityAt: Date.now(), unread: false, lastPreviewText: lastPreview || '', searchText: '' });
   document.getElementById('empty').style.display = 'none';
   document.getElementById('terminals').style.pointerEvents = '';
   if (muted) requestAnimationFrame(() => updateMuteIndicator(id));
@@ -529,16 +540,9 @@ function setStatus(id, working) {
     }
   }
 
-  // Extract terminal buffer on working→idle for clean transcript
-  if (wasWorking && !working && entry.term) {
-    const buf = entry.term.buffer.active;
-    const lines = [];
-    for (let i = 0; i < buf.length; i++) {
-      const line = buf.getLine(i);
-      if (line) lines.push(line.translateToString(true));
-    }
-    send({ type: 'terminal.buffer', id, lines });
-  }
+  // Mark idle so the onRender silence watcher can capture .screen
+  // Also try immediately — renders may already be silent
+  if (wasWorking && !working) { entry.pendingScreenCapture = true; entry.tryScreenCapture?.(); }
 
   if (working) entry.workStartedAt = Date.now();
 

package/telemetry-receiver.js

@@ -32,7 +32,7 @@ function handleLogs(req, res) {
     const resAttrs = parseAttrs(rl.resource?.attributes);
     const sessionId = resAttrs['clideck.session_id'];
 
-    // DEBUG: log all incoming telemetry with resource attributes
+    // service.name values: claude-code, codex_cli_rs, gemini-cli
     const serviceName = resAttrs['service.name'] || 'unknown';
     let resolvedId = sessionId;
 
@@ -68,6 +68,41 @@ function handleLogs(req, res) {
       for (const lr of sl.logRecords || []) {
         const attrs = parseAttrs(lr.attributes);
 
+        const eventName = attrs['event.name'];
+        // if (serviceName === 'codex_cli_rs' && eventName) console.log(`[telemetry:codex] ${eventName}`);
+        // if (serviceName === 'gemini-cli' && eventName) console.log(`[telemetry:gemini] ${eventName}`);
+
+        // Telemetry-based status
+        const startEvents = new Set(['user_prompt', 'gemini_cli.user_prompt', 'codex.user_prompt']);
+        if (startEvents.has(eventName)) {
+          broadcastFn?.({ type: 'session.status', id: resolvedId, working: true, source: 'telemetry' });
+        }
+        // Claude: telemetry-only status. user_prompt/any event → working, api_request → idle.
+        if (serviceName === 'claude-code' && eventName) {
+          if (eventName === 'api_request') {
+            broadcastFn?.({ type: 'session.status', id: resolvedId, working: false, source: 'telemetry' });
+          } else if (eventName !== 'user_prompt') {
+            broadcastFn?.({ type: 'session.status', id: resolvedId, working: true, source: 'telemetry' });
+          }
+        }
+        // Codex: telemetry-only status. codex.user_prompt/any event → working, codex.sse_event → idle.
+        if (serviceName === 'codex_cli_rs' && eventName) {
+          if (eventName === 'codex.sse_event') {
+            broadcastFn?.({ type: 'session.status', id: resolvedId, working: false, source: 'telemetry' });
+          } else if (eventName !== 'codex.user_prompt') {
+            broadcastFn?.({ type: 'session.status', id: resolvedId, working: true, source: 'telemetry' });
+          }
+        }
+        // Gemini: telemetry-only status. Whitelisted events → working, api_response (role=main) → idle.
+        if (serviceName === 'gemini-cli' && eventName) {
+          if (eventName === 'gemini_cli.api_response' && attrs['role'] === 'main') {
+            broadcastFn?.({ type: 'session.status', id: resolvedId, working: false, source: 'telemetry' });
+          } else if (eventName === 'gemini_cli.api_request' || eventName === 'gemini_cli.model_routing'
+            || (eventName === 'gemini_cli.api_response' && attrs['role'] !== 'main')) {
+            broadcastFn?.({ type: 'session.status', id: resolvedId, working: true, source: 'telemetry' });
+          }
+        }
+
         const agentSessionId = attrs['session.id'] || attrs['conversation.id'];
         if (agentSessionId && sess) {
           // Prefer interactive session ID (Gemini sends non-interactive init events first)

package/transcript.js

@@ -10,6 +10,7 @@ const inputBuf = {};
 const outputBuf = {};
 const cache = {};
 const prefixes = {};
+const userTexts = {}; // sessionId → [text, ...] — user prompts for parser matching
 let broadcast = null;
 let notifyPlugin = null;
 
@@ -47,17 +48,31 @@ function store(id, role, text) {
 }
 
 function trackInput(id, data) {
-  if (!inputBuf[id]) inputBuf[id] = { text: '', esc: false };
+  if (!inputBuf[id]) inputBuf[id] = { text: '', esc: false, osc: false };
   const buf = inputBuf[id];
   for (const ch of data) {
+    // OSC sequence: ESC ] ... (terminated by BEL or ESC \)
+    if (buf.osc) {
+      if (ch === '\x07') { buf.osc = false; continue; }                    // BEL terminator
+      if (ch === '\\' && buf.escPending) { buf.osc = false; buf.escPending = false; continue; } // ESC \ terminator
+      buf.escPending = (ch === '\x1b');
+      continue;
+    }
     if (ch === '\x1b') { buf.esc = true; continue; }
     if (buf.esc) {
-      if ((ch >= 'A' && ch <= 'Z') || (ch >= 'a' && ch <= 'z') || ch === '~') buf.esc = false;
+      buf.esc = false;
+      if (ch === ']') { buf.osc = true; continue; }                        // Start OSC
+      if (ch === '[') { buf.csi = true; continue; }                        // Start CSI
+      continue;                                                            // Simple ESC + char
+    }
+    // CSI sequence: ESC [ ... (terminated by letter or ~)
+    if (buf.csi) {
+      if ((ch >= 'A' && ch <= 'Z') || (ch >= 'a' && ch <= 'z') || ch === '~') buf.csi = false;
       continue;
     }
     if (ch === '\r' || ch === '\n') {
       const line = buf.text.trim();
-      if (line) store(id, 'user', line);
+      if (line) { store(id, 'user', line); if (!userTexts[id]) userTexts[id] = []; userTexts[id].push(line); }
       buf.text = '';
     } else if (ch === '\x7f' || ch === '\x08') {
       const chars = Array.from(buf.text);
@@ -113,14 +128,21 @@ function getScreen(id) {
 
 // Per-agent screen parsers. Each returns [{role, text}] from .screen content.
 const agentParsers = {
-  'claude-code': (lines) => {
+  'claude-code': (lines, id) => {
+    const known = userTexts[id]?.length ? new Set(userTexts[id]) : null;
     const turns = [];
     let current = null;
     for (const line of lines) {
-      const m = line.match(/^(?:[│ ]\s*)?([❯›]|[⏺•●])\s(.*)$/);
-      if (m) {
+      const agent = line.match(/^(?:[│ ]\s*)?[⏺•●]\s(.*)$/);
+      if (agent) {
         if (current) { current.text = current.text.replace(/\n+$/, ''); turns.push(current); }
-        current = { role: m[1] === '❯' || m[1] === '›' ? 'user' : 'agent', text: m[2] };
+        current = { role: 'agent', text: agent[1] };
+        continue;
+      }
+      const userM = line.match(/^(?:[│ ]\s*)?[❯›]\s(.*)$/);
+      if (userM && (known ? known.has(userM[1].trim()) : true)) {
+        if (current) { current.text = current.text.replace(/\n+$/, ''); turns.push(current); }
+        current = { role: 'user', text: userM[1] };
         continue;
       }
       if (!current) continue;
@@ -132,14 +154,21 @@ const agentParsers = {
     if (current) { current.text = current.text.replace(/\n+$/, ''); turns.push(current); }
     return turns.length >= 2 ? turns : null;
   },
-  'codex': (lines) => {
+  'codex': (lines, id) => {
+    const known = userTexts[id]?.length ? new Set(userTexts[id]) : null;
     const turns = [];
     let current = null;
     for (const line of lines) {
-      const m = line.match(/^(?:│\s*)?([›•])\s(.*)$/);
-      if (m) {
+      const agent = line.match(/^(?:│\s*)?•\s(.*)$/);
+      if (agent) {
+        if (current) { current.text = current.text.replace(/\n+$/, ''); turns.push(current); }
+        current = { role: 'agent', text: agent[1] };
+        continue;
+      }
+      const userM = line.match(/^(?:│\s*)?›\s(.*)$/);
+      if (userM && (known ? known.has(userM[1].trim()) : true)) {
         if (current) { current.text = current.text.replace(/\n+$/, ''); turns.push(current); }
-        current = { role: m[1] === '›' ? 'user' : 'agent', text: m[2] };
+        current = { role: 'user', text: userM[1] };
         continue;
       }
       if (!current) continue;
@@ -151,7 +180,8 @@ const agentParsers = {
     if (current) { current.text = current.text.replace(/\n+$/, ''); turns.push(current); }
     return turns.length >= 2 ? turns : null;
   },
-  'gemini-cli': (lines) => {
+  'gemini-cli': (lines, id) => {
+    const known = userTexts[id]?.length ? new Set(userTexts[id]) : null;
     const geminiChrome = t => {
       const s = t.trim();
       return /^shift\+tab to accept/i.test(s)
@@ -166,11 +196,12 @@ const agentParsers = {
     let current = null;
     for (const line of lines) {
       if (geminiChrome(line)) continue;
-      const isUser = line.startsWith(' > ');
       const isAgent = line.startsWith('✦ ');
+      const userM = line.startsWith(' > ') ? line.slice(3) : null;
+      const isUser = userM && (known ? known.has(userM.trim()) : true);
       if (isUser || isAgent) {
         if (current) { current.text = current.text.replace(/\n+$/, ''); turns.push(current); }
-        current = { role: isUser ? 'user' : 'agent', text: isUser ? line.slice(3) : line.slice(2) };
+        current = { role: isUser ? 'user' : 'agent', text: isUser ? userM : line.slice(2) };
         continue;
       }
       if (!current) continue;
@@ -229,7 +260,7 @@ function getScreenTurns(id, agent) {
   if (!screen) return null;
   const lines = screen.split('\n');
   const parser = agentParsers[agent];
-  const turns = parser ? parser(lines) : anchorParse(id, lines);
+  const turns = parser ? parser(lines, id) : anchorParse(id, lines);
   // Drop trailing user turn — it's the empty prompt or unanswered input
   if (turns?.length && turns[turns.length - 1].role === 'user') turns.pop();
   return turns?.length >= 2 ? turns : null;
@@ -267,6 +298,7 @@ function clear(id) {
   }
   delete cache[id];
   delete prefixes[id];
+  delete userTexts[id];
   try { unlinkSync(join(DIR, `${id}.screen`)); } catch {}
 }