claude-notification-plugin 1.1.52 → 1.1.56

package/listener/listener.js

@@ -127,8 +127,8 @@ const runner = new PtyRunner(logger, taskTimeout, taskLogger, taskLogDir);
 const worktreeManager = new WorktreeManager(config, logger);
 
 const liveConsoleEnabled = listenerConfig.liveConsole !== false; // default: true
-const liveConsoleInterval = (listenerConfig.liveConsoleInterval || 5) * 1000;
-const LIVE_CONSOLE_MAX_OUTPUT = 3000;
+const liveConsoleIntervalMillis = (listenerConfig.liveConsoleIntervalMillis || 1) * 1000;
+const liveConsoleMaxOutputChars = listenerConfig.liveConsoleMaxOutputChars || 300;
 
 const startTime = Date.now();
 
@@ -142,7 +142,7 @@ const liveConsoleTimers = new Map();
 logger.info('Listener started');
 logger.info(`Projects: ${JSON.stringify(Object.keys(listenerConfig.projects))}`);
 logger.info(`Session continuity: ${continueSessionEnabled ? 'enabled' : 'disabled'}`);
-logger.info(`Live console: ${liveConsoleEnabled ? `enabled (${liveConsoleInterval / 1000}s interval)` : 'disabled'}`);
+logger.info(`Live console: ${liveConsoleEnabled ? `enabled (${liveConsoleIntervalMillis / 1000}s interval, max ${liveConsoleMaxOutputChars} chars)` : 'disabled'}`);
 
 // ----------------------
 // DISCOVER WORKTREES ON START
@@ -178,6 +178,7 @@ for (const [workDir, entry] of Object.entries(queue.queues)) {
 
 runner.on('complete', async (workDir, task, result) => {
   stopLiveConsole(workDir);
+  runner.cleanActivitySignal(workDir);
   const entry = queue.queues[workDir];
   const label = formatLabel(entry);
 
@@ -249,6 +250,7 @@ runner.on('complete', async (workDir, task, result) => {
 
 runner.on('error', async (workDir, task, errorMsg) => {
   stopLiveConsole(workDir);
+  runner.cleanActivitySignal(workDir);
   const entry = queue.queues[workDir];
   const label = formatLabel(entry);
 
@@ -268,6 +270,7 @@ runner.on('error', async (workDir, task, errorMsg) => {
 
 runner.on('timeout', async (workDir, task) => {
   stopLiveConsole(workDir);
+  runner.cleanActivitySignal(workDir);
   const entry = queue.queues[workDir];
   const label = formatLabel(entry);
   const timeoutMin = Math.round(taskTimeout / 60000);
@@ -296,9 +299,9 @@ function formatLabel (entry) {
     return 'unknown';
   }
   if (entry.branch && entry.branch !== 'main' && entry.branch !== 'master') {
-    return `/${entry.project}/${entry.branch}`;
+    return `&${entry.project}/${entry.branch}`;
   }
-  return `/${entry.project}`;
+  return `&${entry.project}`;
 }
 
 function getClaudeArgs (projectAlias) {
@@ -336,11 +339,11 @@ function startLiveConsole (workDir, messageId, header) {
         return;
       }
       // Take the tail that fits
-      const tail = cleaned.length > LIVE_CONSOLE_MAX_OUTPUT
-        ? cleaned.slice(-LIVE_CONSOLE_MAX_OUTPUT)
+      const tail = cleaned.length > liveConsoleMaxOutputChars
+        ? cleaned.slice(-liveConsoleMaxOutputChars)
         : cleaned;
       // Trim to last complete line if we sliced mid-line
-      const output = cleaned.length > LIVE_CONSOLE_MAX_OUTPUT
+      const output = cleaned.length > liveConsoleMaxOutputChars
         ? tail.slice(tail.indexOf('\n') + 1)
         : tail;
       if (!output || output === lastSentText) {
@@ -348,12 +351,16 @@ function startLiveConsole (workDir, messageId, header) {
       }
       lastSentText = output;
       const elapsed = formatDuration(Date.now() - new Date(runner.getActive(workDir)?.startedAt || Date.now()).getTime());
-      const text = `${header}\n<i>${elapsed}</i>\n\n<pre>${escapeHtml(output)}</pre>`;
+      const activity = runner.getActivity(workDir);
+      const activityLine = activity && (Date.now() - activity.timestamp < 30000)
+        ? `\n<b>${escapeHtml(formatActivity(activity))}</b>`
+        : '';
+      const text = `${header}\n<i>${elapsed}</i>${activityLine}\n\n<pre>${escapeHtml(output)}</pre>`;
       await poller.editMessage(messageId, text);
     } catch (err) {
       logger.warn(`Live console edit error: ${err.message}`);
     }
-  }, liveConsoleInterval);
+  }, liveConsoleIntervalMillis);
   liveConsoleTimers.set(workDir, timer);
 }
 
@@ -407,6 +414,37 @@ async function startTask (workDir, task) {
   }
 }
 
+function formatActivity (activity) {
+  if (!activity) {
+    return '';
+  }
+  const { toolName, toolInput } = activity;
+  switch (toolName) {
+    case 'Edit':
+    case 'Write':
+    case 'Read':
+      return toolInput?.file_path ? `${toolName}: ${path.basename(toolInput.file_path)}` : toolName;
+    case 'Bash':
+      return toolInput?.command ? `$ ${toolInput.command.slice(0, 80)}` : 'Bash';
+    case 'Grep':
+      return toolInput?.pattern ? `Grep: ${toolInput.pattern}` : 'Grep';
+    case 'Glob':
+      return toolInput?.pattern ? `Glob: ${toolInput.pattern}` : 'Glob';
+    case 'Agent':
+      return toolInput?.description ? `Agent: ${toolInput.description}` : 'Agent';
+    case 'WebFetch':
+      return toolInput?.url ? `Fetch: ${toolInput.url.slice(0, 60)}` : 'WebFetch';
+    case 'WebSearch':
+      return toolInput?.query ? `Search: ${toolInput.query}` : 'WebSearch';
+    default:
+      if (toolName?.startsWith('mcp__')) {
+        const parts = toolName.split('__');
+        return parts.length >= 3 ? `MCP ${parts[1]}: ${parts[2]}` : toolName;
+      }
+      return toolName || '';
+  }
+}
+
 function formatDuration (ms) {
   const sec = Math.floor(ms / 1000);
   if (sec < 60) {
@@ -448,9 +486,9 @@ async function handleCommand (cmd, args) {
     case '/stop':
       return handleStop();
     case '/help':
-      return handleHelp();
     case '/menu':
-      return handleMenu();
+    case '/start':
+      return handleHelp();
     default:
       return `Unknown command: ${cmd}`;
   }
@@ -469,8 +507,8 @@ function handleStatus (args) {
     for (const s of statuses) {
       const branchLabel = s.branch || 'main';
       const label = s.branch && s.branch !== 'main' && s.branch !== 'master'
-        ? `/${target.project}/${s.branch}`
-        : `/${target.project}`;
+        ? `&${target.project}/${s.branch}`
+        : `&${target.project}`;
       if (s.active) {
         const elapsed = s.active.startedAt
           ? formatDuration(Date.now() - new Date(s.active.startedAt).getTime())
@@ -512,8 +550,8 @@ function handleStatus (args) {
     for (const s of statuses) {
       const branchLabel = s.branch || 'main';
       const label = s.branch && s.branch !== 'main' && s.branch !== 'master'
-        ? `/${project}/${s.branch}`
-        : `/${project}`;
+        ? `&${project}/${s.branch}`
+        : `&${project}`;
       if (s.active) {
         const elapsed = s.active.startedAt
           ? formatDuration(Date.now() - new Date(s.active.startedAt).getTime())
@@ -550,8 +588,8 @@ function handleQueue () {
   for (const [project, statuses] of Object.entries(all)) {
     for (const s of statuses) {
       const label = s.branch && s.branch !== 'main' && s.branch !== 'master'
-        ? `/${project}/${s.branch}`
-        : `/${project}`;
+        ? `&${project}/${s.branch}`
+        : `&${project}`;
       if (s.active || s.queueLength > 0) {
         text += `\n<b>${escapeHtml(label)}</b>:`;
         if (s.active) {
@@ -584,12 +622,12 @@ async function handleCancel (args) {
   }
 
   if (!runner.isRunning(workDir)) {
-    return `❌ No active task in /${escapeHtml(projectAlias)}${branch ? '/' + escapeHtml(branch) : ''}`;
+    return `❌ No active task in &${escapeHtml(projectAlias)}${branch ? '/' + escapeHtml(branch) : ''}`;
   }
 
   runner.cancel(workDir);
   const next = queue.cancelActive(workDir);
-  const label = branch ? `/${projectAlias}/${branch}` : `/${projectAlias}`;
+  const label = branch ? `&${projectAlias}/${branch}` : `&${projectAlias}`;
 
   if (next) {
     startTask(workDir, next);
@@ -601,7 +639,7 @@ async function handleCancel (args) {
 function handleDrop (args) {
   const target = parseTarget(args);
   if (!target) {
-    return '❌ Usage: /drop /project N';
+    return '❌ Usage: /drop &project N';
   }
   const index = parseInt(target.rest, 10);
   if (!index || index < 1) {
@@ -635,7 +673,7 @@ function handleClear (args) {
   }
 
   const count = queue.clearQueue(workDir);
-  const label = branch ? `/${projectAlias}/${branch}` : `/${projectAlias}`;
+  const label = branch ? `&${projectAlias}/${branch}` : `&${projectAlias}`;
 
   // Also reset session
   sessions.delete(workDir);
@@ -657,7 +695,7 @@ function handleNewSession (args) {
     return `❌ ${escapeHtml(err.message)}`;
   }
 
-  const label = branch ? `/${projectAlias}/${branch}` : `/${projectAlias}`;
+  const label = branch ? `&${projectAlias}/${branch}` : `&${projectAlias}`;
   const session = sessions.get(workDir);
 
   sessions.delete(workDir);
@@ -675,7 +713,7 @@ function handleProjects () {
   let text = '📂 <b>Projects:</b>\n';
   for (const [alias, proj] of Object.entries(projects)) {
     const projPath = typeof proj === 'string' ? proj : proj.path;
-    text += `\n<b>/${escapeHtml(alias)}</b> → <code>${escapeHtml(projPath)}</code>`;
+    text += `\n<b>&${escapeHtml(alias)}</b> → <code>${escapeHtml(projPath)}</code>`;
     const worktrees = typeof proj === 'object' ? proj.worktrees : null;
     if (worktrees && Object.keys(worktrees).length > 0) {
       for (const [branch, wtPath] of Object.entries(worktrees)) {
@@ -689,7 +727,7 @@ function handleProjects () {
 function handleWorktrees (args) {
   const target = parseTarget(args);
   if (!target) {
-    return '❌ Usage: /worktrees /project';
+    return '❌ Usage: /worktrees &project';
   }
 
   const result = worktreeManager.listWorktrees(target.project);
@@ -708,7 +746,7 @@ function handleWorktrees (args) {
 function handleCreateWorktree (args) {
   const target = parseTarget(args);
   if (!target || !target.branch) {
-    return '❌ Usage: /worktree /project/branch';
+    return '❌ Usage: /worktree &project/branch';
   }
 
   const branch = target.branch;
@@ -725,7 +763,7 @@ function handleCreateWorktree (args) {
 function handleRemoveWorktree (args) {
   const target = parseTarget(args);
   if (!target || !target.branch) {
-    return '❌ Usage: /rmworktree /project/branch';
+    return '❌ Usage: /rmworktree &project/branch';
   }
 
   const branch = target.branch;
@@ -740,7 +778,7 @@ function handleRemoveWorktree (args) {
   }
 
   if (workDir && runner.isRunning(workDir)) {
-    return `❌ Cannot remove worktree: task is running. First /cancel /${escapeHtml(target.project)}/${escapeHtml(branch)}`;
+    return `❌ Cannot remove worktree: task is running. First /cancel &${escapeHtml(target.project)}/${escapeHtml(branch)}`;
   }
 
   try {
@@ -763,7 +801,7 @@ function handlePty (args) {
     }
     const info = runner.getSessionInfo(workDir);
     if (!info) {
-      return `🖥 No PTY session for /${escapeHtml(target.project)}${target.branch ? '/' + escapeHtml(target.branch) : ''}`;
+      return `🖥 No PTY session for &${escapeHtml(target.project)}${target.branch ? '/' + escapeHtml(target.branch) : ''}`;
     }
     return formatPtyInfo(target.project, target.branch, workDir, info);
   }
@@ -786,8 +824,8 @@ function handlePty (args) {
 
 function formatPtyInfo (project, branch, workDir, info) {
   const label = branch && branch !== 'main' && branch !== 'master'
-    ? `/${project}/${branch}`
-    : `/${project}`;
+    ? `&${project}/${branch}`
+    : `&${project}`;
   const elapsed = info.startedAt
     ? formatDuration(Date.now() - new Date(info.startedAt).getTime())
     : '-';
@@ -816,8 +854,8 @@ function handleHistory () {
   let text = '📜 <b>Recent tasks:</b>\n';
   for (const h of history.reverse()) {
     const label = h.branch && h.branch !== 'main' && h.branch !== 'master'
-      ? `/${h.project}/${h.branch}`
-      : `/${h.project}`;
+      ? `&${h.project}/${h.branch}`
+      : `&${h.project}`;
     const status = h.result === 'CANCELLED' ? '🛑' : h.result?.startsWith('ERROR') ? '❌' : '✅';
     text += `\n${status} [${escapeHtml(label)}] ${escapeHtml(h.text)}`;
   }
@@ -847,34 +885,30 @@ const MENU_KEYBOARD = {
   ],
 };
 
-function handleMenu () {
-  return { text: '📖 <b>Menu:</b>', replyMarkup: MENU_KEYBOARD };
-}
-
 function handleHelp () {
   return {
     text: `<b>📖 Commands:</b>
 
 /status — status of all projects
-/status /project — project status
+/status &project — project status
 /queue — all queues
-/cancel [/project[/branch]] — cancel task
-/drop /project N — remove task from queue
-/clear /project[/branch] — clear queue + reset session
-/newsession [/project[/branch]] — reset session (keep queue)
+/cancel [&project[/branch]] — cancel task
+/drop &project N — remove task from queue
+/clear &project[/branch] — clear queue + reset session
+/newsession [&project[/branch]] — reset session (keep queue)
 /projects — list projects
-/worktrees /project — project worktrees
-/worktree /project/branch — create worktree
-/rmworktree /project/branch — remove worktree
-/pty [/project[/branch]] — PTY session diagnostics
+/worktrees &project — project worktrees
+/worktree &project/branch — create worktree
+/rmworktree &project/branch — remove worktree
+/pty [&project[/branch]] — PTY session diagnostics
 /history — task history
 /stop — stop listener
 /menu — command buttons
 /help — this help
 
 <b>Tasks:</b>
-<code>/project task</code> — main worktree
-<code>/project/branch task</code> — worktree
+<code>&amp;project task</code> — main worktree
+<code>&amp;project/branch task</code> — worktree
 <code>task</code> — default project
 
 <b>Session:</b>
@@ -915,7 +949,7 @@ async function handleTask (parsed, telegramMessageId) {
 
   if (autoCreated) {
     await poller.sendMessage(`🌿 Created worktree <b>${escapeHtml(parsed.branch)}</b> for "<b>${escapeHtml(parsed.project)}</b>"`);
-    logger.info(`Auto-created worktree for task: /${parsed.project}/${parsed.branch} → ${workDir}`);
+    logger.info(`Auto-created worktree for task: &${parsed.project}/${parsed.branch} → ${workDir}`);
   }
 
   const result = queue.enqueue(
@@ -996,7 +1030,7 @@ async function mainLoop () {
             }
           }
         } else if (parsed.type === 'task') {
-          logger.info(`Task for /${parsed.project}${parsed.branch ? '/' + parsed.branch : ''}: ${parsed.text}`);
+          logger.info(`Task for &${parsed.project}${parsed.branch ? '/' + parsed.branch : ''}: ${parsed.text}`);
           await handleTask(parsed, msg.messageId);
         }
       }

package/listener/message-parser.js

@@ -1,111 +1,96 @@
-#!/usr/bin/env node
-
-const COMMANDS = [
-  '/status', '/queue', '/cancel', '/drop', '/clear', '/newsession',
-  '/projects', '/worktrees', '/worktree', '/rmworktree',
-  '/history', '/stop', '/help',
-];
-
-// Telegram bot commands to silently ignore (not tasks, not our commands)
-const IGNORED_COMMANDS = ['/start'];
-
-/**
- * Parse a Telegram message into a command or task.
- *
- * Formats:
- *   /command args           → { type: 'command', cmd, args }
- *   /project/branch text    → { type: 'task', project, branch, text }
- *   /project text           → { type: 'task', project, branch: null, text }
- *   text                    → { type: 'task', project: 'default', branch: null, text }
- *
- * If /word is a known command, it's treated as a command.
- * Otherwise /word is treated as a project alias.
- */
-export function parseMessage (text) {
-  if (!text || typeof text !== 'string') {
-    return null;
-  }
-
-  const trimmed = text.trim();
-  if (!trimmed) {
-    return null;
-  }
-
-  if (trimmed.startsWith('/')) {
-    const parts = trimmed.split(/\s+/);
-    const cmd = parts[0].toLowerCase().replace(/@\w+$/, ''); // strip @botname
-
-    // Telegram built-in commands — silently ignore
-    if (IGNORED_COMMANDS.includes(cmd)) {
-      return null;
-    }
-
-    // Known command
-    if (COMMANDS.includes(cmd)) {
-      return {
-        type: 'command',
-        cmd,
-        args: parts.slice(1).join(' '),
-      };
-    }
-
-    // Not a known command → treat as /project[/branch] task
-    const projectMatch = trimmed.match(/^\/(\S+)\s+([\s\S]+)$/);
-    if (projectMatch) {
-      const target = projectMatch[1];
-      const taskText = projectMatch[2].trim();
-
-      const slashIndex = target.indexOf('/');
-      if (slashIndex > 0) {
-        return {
-          type: 'task',
-          project: target.substring(0, slashIndex),
-          branch: target.substring(slashIndex + 1),
-          text: taskText,
-        };
-      }
-      return {
-        type: 'task',
-        project: target,
-        branch: null,
-        text: taskText,
-      };
-    }
-  }
-
-  // Plain text → default project
-  return {
-    type: 'task',
-    project: 'default',
-    branch: null,
-    text: trimmed,
-  };
-}
-
-/**
- * Parse /project or /project/branch from command args.
- * Returns { project, branch, rest } or null.
- */
-export function parseTarget (args) {
-  if (!args) {
-    return null;
-  }
-  const match = args.trim().match(/^\/(\S+)/);
-  if (!match) {
-    return null;
-  }
-  const target = match[1];
-  const slashIndex = target.indexOf('/');
-  if (slashIndex > 0) {
-    return {
-      project: target.substring(0, slashIndex),
-      branch: target.substring(slashIndex + 1),
-      rest: args.trim().substring(match[0].length).trim(),
-    };
-  }
-  return {
-    project: target,
-    branch: null,
-    rest: args.trim().substring(match[0].length).trim(),
-  };
-}
+#!/usr/bin/env node
+
+/**
+ * Parse a Telegram message into a command or task.
+ *
+ * Formats:
+ *   /command args           → { type: 'command', cmd, args }
+ *   &project/branch text    → { type: 'task', project, branch, text }
+ *   &project text           → { type: 'task', project, branch: null, text }
+ *   text                    → { type: 'task', project: 'default', branch: null, text }
+ *
+ * Any /word is treated as a command (known or unknown).
+ * Project designation uses & prefix: &project or &project/branch.
+ */
+export function parseMessage (text) {
+  if (!text || typeof text !== 'string') {
+    return null;
+  }
+
+  const trimmed = text.trim();
+  if (!trimmed) {
+    return null;
+  }
+
+  // Commands: anything starting with /
+  if (trimmed.startsWith('/')) {
+    const parts = trimmed.split(/\s+/);
+    const cmd = parts[0].toLowerCase().replace(/@\w+$/, ''); // strip @botname
+    return {
+      type: 'command',
+      cmd,
+      args: parts.slice(1).join(' '),
+    };
+  }
+
+  // Project-targeted task: &project[/branch] text
+  if (trimmed.startsWith('&')) {
+    const projectMatch = trimmed.match(/^&(\S+)\s+([\s\S]+)$/);
+    if (projectMatch) {
+      const target = projectMatch[1];
+      const taskText = projectMatch[2].trim();
+
+      const slashIndex = target.indexOf('/');
+      if (slashIndex > 0) {
+        return {
+          type: 'task',
+          project: target.substring(0, slashIndex),
+          branch: target.substring(slashIndex + 1),
+          text: taskText,
+        };
+      }
+      return {
+        type: 'task',
+        project: target,
+        branch: null,
+        text: taskText,
+      };
+    }
+  }
+
+  // Plain text → default project
+  return {
+    type: 'task',
+    project: 'default',
+    branch: null,
+    text: trimmed,
+  };
+}
+
+/**
+ * Parse &project or &project/branch from command args.
+ * Returns { project, branch, rest } or null.
+ */
+export function parseTarget (args) {
+  if (!args) {
+    return null;
+  }
+  const match = args.trim().match(/^&(\S+)/);
+  if (!match) {
+    return null;
+  }
+  const target = match[1];
+  const slashIndex = target.indexOf('/');
+  if (slashIndex > 0) {
+    return {
+      project: target.substring(0, slashIndex),
+      branch: target.substring(slashIndex + 1),
+      rest: args.trim().substring(match[0].length).trim(),
+    };
+  }
+  return {
+    project: target,
+    branch: null,
+    rest: args.trim().substring(match[0].length).trim(),
+  };
+}