claude-notification-plugin 1.1.103 → 1.1.105

package/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-notification-plugin",
-  "version": "1.1.103",
+  "version": "1.1.105",
   "description": "Claude Code task-completion notifications: Telegram, desktop notifications (Windows/macOS/Linux), sound, and voice",
   "author": {
     "name": "Viacheslav Makarov",

package/commit-sha

@@ -1 +1 @@
-2e9c7bcf03f36a13b336e1cb5405bc9d362bec0c
+172c80dbeb3e3f935e6e96b28d23b7ee40ba8858

package/listener/listener.js

@@ -298,7 +298,7 @@ async function notifyTaskCompletion (workDir, task, kind, payload = {}) {
   runner.cleanActivitySignal(workDir);
   const entry = queue.queues[workDir];
   const label = formatLabel(entry?.project, entry?.branch);
-  const output = payload.text || '';
+  let output = payload.text || '';
 
   // Build header
   let header;
@@ -311,12 +311,19 @@ async function notifyTaskCompletion (workDir, task, kind, payload = {}) {
     header = `⏰ <code>${label}</code>\nTask forcefully stopped — ${reason}`;
     queueResult = 'TIMEOUT';
   } else if (task.raw) {
-    // /clear wipes Claude's context — reset our counters to match.
-    if ((task.text || '').trim().toLowerCase() === '/clear') {
+    const rawCmd = (task.text || '').trim().toLowerCase();
+    // /clear wipes Claude's context — reset our counters to match. The PTY
+    // buffer after /clear is just an empty prompt + status bar, so skip the
+    // body dump and report a clean confirmation instead.
+    if (rawCmd === '/clear') {
       sessions.delete(workDir);
+      header = `🧹 <code>${label}</code>  <code>/clear</code> — session reset`;
+      queueResult = '/clear';
+      output = '';
+    } else {
+      header = `📨 <code>${label}</code>  sent <code>${escapeHtml(task.text)}</code>`;
+      queueResult = output;
     }
-    header = `📨 <code>${label}</code>  sent <code>${escapeHtml(task.text)}</code>`;
-    queueResult = output;
   } else {
     // Update session tracking for non-raw completions
     const session = sessions.get(workDir) || { taskCount: 0 };

package/listener/pty-runner.js

@@ -4,7 +4,8 @@ import fs from 'fs';
 import path from 'path';
 import { EventEmitter } from 'events';
 import { PTY_SIGNAL_DIR } from '../bin/constants.js';
-import { cleanPtyOutput } from './telegram-poller.js';
+import { cleanRenderedScreen } from './telegram-poller.js';
+import { renderPtyScreen } from './screen-renderer.js';
 
 const DEFAULT_TIMEOUT = 600_000; // 10 minutes
 // Built-in slash-commands (forwarded via %cmd) rarely emit a Stop hook event,
@@ -253,31 +254,37 @@ export class PtyRunner extends EventEmitter {
       }
 
       const CHECK_INTERVAL = 5000;
-      const checker = setInterval(() => {
+      let idleCheckInFlight = false;
+      const checker = setInterval(async () => {
         const lastActivity = session?._lastActivityTime || 0;
         const idleMs = lastActivity > 0 ? Date.now() - lastActivity : 0;
 
         // Idle-prompt fallback: PTY went quiet AND its tail shows Claude's
         // idle status bar — treat as completed even if the Stop hook never
         // produced a signal (happens with resumed sessions on Windows ConPTY).
-        if (idleMs > IDLE_PROMPT_FALLBACK_MS && session) {
-          const tailRaw = (session._buffer || '').slice(-3000);
-          const tailClean = cleanPtyOutput(tailRaw);
-          if (IDLE_PROMPT_RE.test(tailClean)) {
-            clearInterval(checker);
-            this.pendingMarkers.delete(pendingId);
-            const fullClean = cleanPtyOutput(session._buffer || '').trim();
-            const text = fullClean.length > 2000 ? fullClean.slice(-2000) : fullClean;
-            this.logger.warn(`PTY idle-prompt fallback completion in ${session.workDir} (no Stop signal in ${Math.round(idleMs / 1000)}s)`);
-            resolve({
-              lastAssistantMessage: text,
-              sessionId: session.sessionId || null,
-              cost: 0,
-              numTurns: 0,
-              durationMs: idleMs,
-              isIdleFallback: true,
-            });
-            return;
+        // Rendering is async (xterm-headless), so guard against re-entry while
+        // an earlier tick is still rendering.
+        if (idleMs > IDLE_PROMPT_FALLBACK_MS && session && !idleCheckInFlight) {
+          idleCheckInFlight = true;
+          try {
+            const rendered = await renderPtyScreen(session._buffer || '');
+            if (IDLE_PROMPT_RE.test(rendered)) {
+              clearInterval(checker);
+              this.pendingMarkers.delete(pendingId);
+              const text = cleanRenderedScreen(rendered).trim().slice(-2000);
+              this.logger.warn(`PTY idle-prompt fallback completion in ${session.workDir} (no Stop signal in ${Math.round(idleMs / 1000)}s)`);
+              resolve({
+                lastAssistantMessage: text,
+                sessionId: session.sessionId || null,
+                cost: 0,
+                numTurns: 0,
+                durationMs: idleMs,
+                isIdleFallback: true,
+              });
+              return;
+            }
+          } finally {
+            idleCheckInFlight = false;
           }
         }
 
@@ -437,7 +444,7 @@ export class PtyRunner extends EventEmitter {
         this.taskLogger.logAnswer(task.project || 'unknown', task.branch || 'main', result.text, 0);
       }
       this.emit('complete', workDir, task, result);
-    }).catch((err) => {
+    }).catch(async (err) => {
       session.state = 'idle';
       session.currentTask = null;
 
@@ -445,7 +452,11 @@ export class PtyRunner extends EventEmitter {
         if (task.raw) {
           // Slash commands (e.g. /clear, /cost) usually don't emit a Stop hook.
           // Treat inactivity as successful completion and keep the PTY alive.
-          const cleaned = cleanPtyOutput(session._buffer || '').trim();
+          // Render through xterm-headless so the *final* screen is what we
+          // report — naive ANSI stripping leaves transient popup rows in the
+          // output even though the real terminal has redrawn over them.
+          const rendered = await renderPtyScreen(session._buffer || '');
+          const cleaned = cleanRenderedScreen(rendered).trim();
           const tail = cleaned.length > 2000 ? cleaned.slice(-2000) : cleaned;
           const result = {
             text: tail,

package/listener/screen-renderer.js

@@ -0,0 +1,41 @@
+import xtermPkg from '@xterm/headless';
+
+const { Terminal } = xtermPkg;
+
+// Must match the dimensions PTY sessions are spawned with (pty-runner.js).
+// Mismatch produces wrap artifacts in the rendered viewport.
+const COLS = 120;
+const ROWS = 40;
+
+// Run raw PTY bytes through a headless xterm.js so the *final* visible screen
+// is what we read out — cursor positioning, line erases, scroll-up, etc. are
+// all honored. Without this, transient UI (e.g. the slash-command popup that
+// briefly appears while typing `/clear`) leaks into the captured output even
+// though the real terminal has long since cleared those rows.
+//
+// Returns the viewport text (ROWS lines joined by \n) with trailing empty
+// lines trimmed. Scrollback is intentionally ignored — Telegram messages
+// reflect the on-screen state, not the entire session history.
+export async function renderPtyScreen (raw) {
+  if (!raw) {
+    return '';
+  }
+  const term = new Terminal({ cols: COLS, rows: ROWS, allowProposedApi: true });
+  await new Promise((resolve) => term.write(raw, resolve));
+  const buf = term.buffer.active;
+  const lines = [];
+  const startY = buf.viewportY;
+  for (let y = 0; y < ROWS; y++) {
+    const line = buf.getLine(startY + y);
+    lines.push(line ? line.translateToString(true) : '');
+  }
+  while (lines.length && !lines[lines.length - 1].trim()) {
+    lines.pop();
+  }
+  if (typeof term.dispose === 'function') {
+    term.dispose();
+  }
+  return lines.join('\n');
+}
+
+export { COLS as RENDER_COLS, ROWS as RENDER_ROWS };

package/listener/telegram-poller.js

@@ -416,4 +416,54 @@ function cleanPtyOutput (raw) {
   return cleaned.join('\n');
 }
 
-export { escapeHtml, stripAnsi, cleanPtyOutput };
+// Softer cleaner for *rendered* terminal screens (post xterm-headless emulation).
+// Unlike cleanPtyOutput, this preserves `❯ <command>` lines because the
+// rendered screen already reflects the final state — that prompt line is the
+// actual command echo + result, not a transient input being typed.
+function cleanRenderedScreen (rendered) {
+  if (!rendered) {
+    return '';
+  }
+  const lines = rendered.split('\n');
+  const cleaned = [];
+  for (const line of lines) {
+    const trimmed = line.trimEnd();
+    if (!trimmed.trim()) {
+      continue;
+    }
+    // Empty prompt arrow (no command on it) — drop
+    if (/^❯\s*$/.test(trimmed)) {
+      continue;
+    }
+    // Pure divider lines (≥50% box-drawing chars)
+    const specialChars = (trimmed.match(/[▐▝▘▛▜█▌▀▄░▒▓─━═╌┄│┃┌┐└┘├┤┬┴┼╔╗╚╝╠╣╦╩╬]/g) || []).length;
+    if (specialChars > trimmed.length * 0.5) {
+      continue;
+    }
+    // Status bar — bypass/auto/plan permissions
+    if (/[⏵⏴]\s*[⏵⏴]?\s*(bypass|auto|plan)\s+permissions?/i.test(trimmed)) {
+      continue;
+    }
+    if (/shift\+tab\s*to\s*cycle/i.test(trimmed)) {
+      continue;
+    }
+    if (/ctrl\+[a-z]\s+to\s/i.test(trimmed)) {
+      continue;
+    }
+    // Effort indicator: "◉ xhigh · /effort"
+    if (/^\s*◉\s+\S+\s*·\s*\/effort\s*$/.test(trimmed)) {
+      continue;
+    }
+    // Help hint: "/ide for WebStorm" etc. at far-right column
+    if (/^\s+\/(ide|model|help)\s+(for|to)\s+/i.test(trimmed)) {
+      continue;
+    }
+    if (/Pasting\s*text/i.test(trimmed)) {
+      continue;
+    }
+    cleaned.push(trimmed);
+  }
+  return cleaned.join('\n');
+}
+
+export { escapeHtml, stripAnsi, cleanPtyOutput, cleanRenderedScreen };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "claude-notification-plugin",
   "productName": "claude-notification-plugin",
-  "version": "1.1.103",
+  "version": "1.1.105",
   "description": "Claude Code task-completion notifications: Telegram, desktop notifications (Windows/macOS/Linux), sound, and voice",
   "type": "module",
   "engines": {
@@ -55,6 +55,7 @@
     "access": "public"
   },
   "dependencies": {
+    "@xterm/headless": "^6.0.0",
     "node-notifier": "^10.0.1",
     "node-pty": "^1.1.0"
   },