@visorcraft/idlehands 1.1.6 → 1.1.8

package/dist/bot/discord-streaming.js

@@ -0,0 +1,171 @@
+import { splitDiscord, safeContent } from './discord-routing.js';
+import { formatToolCallSummary } from '../progress/tool-summary.js';
+import { TurnProgressController } from '../progress/turn-progress.js';
+import { ToolTailBuffer } from '../progress/tool-tail.js';
+import { ProgressMessageRenderer } from '../progress/progress-message-renderer.js';
+import { renderDiscordMarkdown } from '../progress/serialize-discord.js';
+export class DiscordStreamingMessage {
+    placeholder;
+    channel;
+    opts;
+    buffer = '';
+    toolLines = [];
+    lastToolLine = '';
+    lastToolRepeat = 0;
+    statusLine = '⏳ Thinking...';
+    banner = null;
+    tails = new ToolTailBuffer({ maxChars: 4096, maxLines: 4 });
+    activeToolId = null;
+    timer = null;
+    dirty = true;
+    finalized = false;
+    progress = new TurnProgressController((snap) => {
+        this.statusLine = snap.statusLine;
+        this.dirty = true;
+    }, {
+        heartbeatMs: 1000,
+        bucketMs: 5000,
+        maxToolLines: 8,
+        toolCallSummary: (c) => formatToolCallSummary({ name: c.name, args: c.args }),
+    });
+    renderer = new ProgressMessageRenderer({
+        maxToolLines: 6,
+        maxTailLines: 4,
+        maxAssistantChars: 1200,
+    });
+    constructor(placeholder, channel, opts) {
+        this.placeholder = placeholder;
+        this.channel = channel;
+        this.opts = opts;
+    }
+    start() {
+        if (this.timer)
+            return;
+        this.progress.start();
+        const every = Math.max(500, Math.floor(this.opts?.editIntervalMs ?? 1500));
+        this.timer = setInterval(() => void this.flush(), every);
+    }
+    stop() {
+        if (this.timer) {
+            clearInterval(this.timer);
+            this.timer = null;
+        }
+        this.progress.stop();
+    }
+    setBanner(text) {
+        this.banner = text?.trim() ? text.trim() : null;
+        this.dirty = true;
+    }
+    hooks() {
+        return {
+            onToken: (t) => {
+                this.buffer += t;
+                this.progress.hooks.onToken?.(t);
+                this.dirty = true;
+            },
+            onToolCall: (call) => {
+                this.progress.hooks.onToolCall?.(call);
+                this.activeToolId = call.id;
+                this.tails.reset(call.id, call.name);
+                const line = `◆ ${formatToolCallSummary({ name: call.name, args: call.args })}...`;
+                if (this.lastToolLine === line && this.toolLines.length > 0) {
+                    this.lastToolRepeat += 1;
+                    this.toolLines[this.toolLines.length - 1] = `${line} (x${this.lastToolRepeat + 1})`;
+                }
+                else {
+                    this.lastToolLine = line;
+                    this.lastToolRepeat = 0;
+                    this.toolLines.push(line);
+                    if (this.toolLines.length > 8)
+                        this.toolLines.splice(0, this.toolLines.length - 8);
+                }
+                this.dirty = true;
+            },
+            onToolStream: (ev) => {
+                if (!this.activeToolId || ev.id !== this.activeToolId)
+                    return;
+                this.tails.push(ev);
+                this.dirty = true;
+            },
+            onToolResult: (result) => {
+                this.progress.hooks.onToolResult?.(result);
+                this.lastToolLine = '';
+                this.lastToolRepeat = 0;
+                if (this.toolLines.length > 0) {
+                    const icon = result.success ? '✓' : '✗';
+                    this.toolLines[this.toolLines.length - 1] = `${icon} ${result.name}: ${result.summary}`;
+                }
+                if (this.activeToolId === result.id) {
+                    this.tails.clear(result.id);
+                    this.activeToolId = null;
+                }
+                this.dirty = true;
+            },
+            onTurnEnd: (stats) => {
+                this.progress.hooks.onTurnEnd?.(stats);
+            },
+        };
+    }
+    renderProgressText() {
+        const tail = this.activeToolId ? this.tails.get(this.activeToolId) : null;
+        const doc = this.renderer.render({
+            banner: this.banner,
+            statusLine: this.statusLine || '⏳ Thinking...',
+            toolLines: this.toolLines,
+            toolTail: tail ? { name: tail.name, stream: tail.stream, lines: tail.lines } : null,
+            assistantMarkdown: this.buffer.trim() ? safeContent(this.buffer) : null,
+        });
+        return renderDiscordMarkdown(doc, { maxLen: 1900 });
+    }
+    async flush() {
+        if (this.finalized)
+            return;
+        if (!this.dirty)
+            return;
+        this.dirty = false;
+        const text = this.renderProgressText();
+        try {
+            if (this.placeholder) {
+                await this.placeholder.edit(text);
+            }
+        }
+        catch {
+            // ignore edit failures
+        }
+    }
+    async finalize(finalText) {
+        this.finalized = true;
+        this.stop();
+        const snap = this.progress.snapshot('stop');
+        const toolLines = snap.toolLines.slice(-8);
+        const combined = safeContent((toolLines.length ? toolLines.join('\n') + '\n\n' : '') + (finalText ?? ''));
+        const chunks = splitDiscord(combined);
+        if (this.placeholder && chunks.length > 0) {
+            await this.placeholder.edit(chunks[0]).catch(() => { });
+        }
+        else if (chunks.length > 0) {
+            await this.channel.send(chunks[0]).catch(() => { });
+        }
+        for (let i = 1; i < chunks.length && i < 10; i++) {
+            await this.channel.send(chunks[i]).catch(() => { });
+        }
+        if (chunks.length > 10) {
+            await this.channel.send('[truncated — response too long]').catch(() => { });
+        }
+    }
+    async finalizeError(errMsg) {
+        this.finalized = true;
+        this.stop();
+        const snap = this.progress.snapshot('stop');
+        const toolLines = snap.toolLines.slice(-8);
+        const combined = safeContent((toolLines.length ? toolLines.join('\n') + '\n\n' : '') + `❌ ${errMsg}`);
+        const chunks = splitDiscord(combined);
+        if (this.placeholder && chunks.length > 0) {
+            await this.placeholder.edit(chunks[0]).catch(() => { });
+        }
+        else if (chunks.length > 0) {
+            await this.channel.send(chunks[0]).catch(() => { });
+        }
+    }
+}
+//# sourceMappingURL=discord-streaming.js.map

package/dist/bot/discord-streaming.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"discord-streaming.js","sourceRoot":"","sources":["../../src/bot/discord-streaming.ts"],"names":[],"mappings":"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"}

package/dist/bot/discord.js

@@ -1,7 +1,8 @@
 import { Client, Events, GatewayIntentBits, Partials, REST, Routes, SlashCommandBuilder, } from 'discord.js';
 import { createSession } from '../agent.js';
 import { DiscordConfirmProvider } from './confirm-discord.js';
-import { sanitizeBotOutputText } from './format.js';
+import { parseAllowedUsers, normalizeApprovalMode, splitDiscord, safeContent, detectEscalation, checkKeywordEscalation, resolveAgentForMessage, sessionKeyForMessage, } from './discord-routing.js';
+import { firstToken } from '../cli/command-utils.js';
 import { projectDir } from '../utils.js';
 import { WATCHDOG_RECOMMENDED_TUNING_TEXT, formatWatchdogCancelMessage, resolveWatchdogSettings, shouldRecommendWatchdogTuning } from '../watchdog.js';
 import path from 'node:path';
@@ -9,183 +10,8 @@ import fs from 'node:fs/promises';
 import { runAnton } from '../anton/controller.js';
 import { parseTaskFile } from '../anton/parser.js';
 import { formatRunSummary, formatProgressBar, formatTaskStart, formatTaskEnd, formatTaskSkip } from '../anton/reporter.js';
-function parseAllowedUsers(cfg) {
-    const fromEnv = process.env.IDLEHANDS_DISCORD_ALLOWED_USERS;
-    if (fromEnv && fromEnv.trim()) {
-        return new Set(fromEnv
-            .split(',')
-            .map((s) => s.trim())
-            .filter(Boolean));
-    }
-    const values = Array.isArray(cfg.allowed_users) ? cfg.allowed_users : [];
-    return new Set(values.map((v) => String(v).trim()).filter(Boolean));
-}
-function normalizeApprovalMode(mode, fallback) {
-    const m = String(mode ?? '').trim().toLowerCase();
-    if (m === 'plan' || m === 'default' || m === 'auto-edit' || m === 'yolo')
-        return m;
-    return fallback;
-}
-function splitDiscord(text, limit = 1900) {
-    if (text.length <= limit)
-        return [text];
-    const chunks = [];
-    let i = 0;
-    while (i < text.length) {
-        chunks.push(text.slice(i, i + limit));
-        i += limit;
-    }
-    return chunks;
-}
-function safeContent(text) {
-    const t = sanitizeBotOutputText(text).trim();
-    return t.length ? t : '(empty response)';
-}
-/**
- * Check if the model response contains an escalation request.
- * Returns { escalate: true, reason: string } if escalation marker found at start of response.
- */
-function detectEscalation(text) {
-    const trimmed = text.trim();
-    const match = trimmed.match(/^\[ESCALATE:\s*([^\]]+)\]/i);
-    if (match) {
-        return { escalate: true, reason: match[1].trim() };
-    }
-    return { escalate: false };
-}
-/** Keyword presets for common escalation triggers */
-const KEYWORD_PRESETS = {
-    coding: ['build', 'implement', 'create', 'develop', 'architect', 'refactor', 'debug', 'fix', 'code', 'program', 'write'],
-    planning: ['plan', 'design', 'roadmap', 'strategy', 'analyze', 'research', 'evaluate', 'compare'],
-    complex: ['full', 'complete', 'comprehensive', 'multi-step', 'integrate', 'migration', 'overhaul', 'entire', 'whole'],
-};
-/**
- * Check if text matches a set of keywords.
- * Returns matched keywords or empty array if none match.
- */
-function matchKeywords(text, keywords, presets) {
-    const allKeywords = [...keywords];
-    // Add preset keywords
-    if (presets) {
-        for (const preset of presets) {
-            const presetWords = KEYWORD_PRESETS[preset];
-            if (presetWords)
-                allKeywords.push(...presetWords);
-        }
-    }
-    if (allKeywords.length === 0)
-        return [];
-    const lowerText = text.toLowerCase();
-    const matched = [];
-    for (const kw of allKeywords) {
-        if (kw.startsWith('re:')) {
-            // Regex pattern
-            try {
-                const regex = new RegExp(kw.slice(3), 'i');
-                if (regex.test(text))
-                    matched.push(kw);
-            }
-            catch {
-                // Invalid regex, skip
-            }
-        }
-        else {
-            // Word boundary match (case-insensitive)
-            const wordRegex = new RegExp(`\\b${kw.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}\\b`, 'i');
-            if (wordRegex.test(lowerText))
-                matched.push(kw);
-        }
-    }
-    return matched;
-}
-/**
- * Check if user message matches keyword escalation triggers.
- * Returns { escalate: true, tier: number, reason: string } if keywords match.
- * Tier indicates which model index to escalate to (highest matching tier wins).
- */
-function checkKeywordEscalation(text, escalation) {
-    if (!escalation)
-        return { escalate: false };
-    // Tiered keyword escalation
-    if (escalation.tiers && escalation.tiers.length > 0) {
-        let highestTier = -1;
-        let highestReason = '';
-        // Check each tier, highest matching tier wins
-        for (let i = 0; i < escalation.tiers.length; i++) {
-            const tier = escalation.tiers[i];
-            const matched = matchKeywords(text, tier.keywords || [], tier.keyword_presets);
-            if (matched.length > 0 && i > highestTier) {
-                highestTier = i;
-                highestReason = `tier ${i} keyword match: ${matched.slice(0, 3).join(', ')}${matched.length > 3 ? '...' : ''}`;
-            }
-        }
-        if (highestTier >= 0) {
-            return { escalate: true, tier: highestTier, reason: highestReason };
-        }
-        return { escalate: false };
-    }
-    // Legacy flat keywords (treated as tier 0)
-    const matched = matchKeywords(text, escalation.keywords || [], escalation.keyword_presets);
-    if (matched.length > 0) {
-        return {
-            escalate: true,
-            tier: 0,
-            reason: `keyword match: ${matched.slice(0, 3).join(', ')}${matched.length > 3 ? '...' : ''}`
-        };
-    }
-    return { escalate: false };
-}
-/**
- * Resolve which agent persona should handle a message.
- * Priority: user > channel > guild > default > first agent > null
- */
-function resolveAgentForMessage(msg, agents, routing) {
-    const agentMap = agents ?? {};
-    const agentIds = Object.keys(agentMap);
-    // No agents configured — return null persona (use global config)
-    if (agentIds.length === 0) {
-        return { agentId: '_default', persona: null };
-    }
-    const route = routing ?? {};
-    let resolvedId;
-    // Priority 1: User-specific routing
-    if (route.users && route.users[msg.author.id]) {
-        resolvedId = route.users[msg.author.id];
-    }
-    // Priority 2: Channel-specific routing
-    else if (route.channels && route.channels[msg.channelId]) {
-        resolvedId = route.channels[msg.channelId];
-    }
-    // Priority 3: Guild-specific routing
-    else if (msg.guildId && route.guilds && route.guilds[msg.guildId]) {
-        resolvedId = route.guilds[msg.guildId];
-    }
-    // Priority 4: Default agent
-    else if (route.default) {
-        resolvedId = route.default;
-    }
-    // Priority 5: First defined agent
-    else {
-        resolvedId = agentIds[0];
-    }
-    // Validate the resolved agent exists
-    const persona = agentMap[resolvedId];
-    if (!persona) {
-        // Fallback to first agent if routing points to non-existent agent
-        const fallbackId = agentIds[0];
-        return { agentId: fallbackId, persona: agentMap[fallbackId] ?? null };
-    }
-    return { agentId: resolvedId, persona };
-}
-function sessionKeyForMessage(msg, allowGuilds, agentId) {
-    // Include agentId in session key so switching agents creates a new session
-    if (allowGuilds) {
-        // Per-agent+channel+user session in guilds
-        return `${agentId}:${msg.channelId}:${msg.author.id}`;
-    }
-    // DM-only mode: per-agent+user session
-    return `${agentId}:${msg.author.id}`;
-}
+import { DiscordStreamingMessage } from './discord-streaming.js';
+import { chainAgentHooks } from '../progress/agent-hooks.js';
 export async function startDiscordBot(config, botConfig) {
     const token = process.env.IDLEHANDS_DISCORD_TOKEN || botConfig.token;
     if (!token) {
@@ -489,14 +315,14 @@ When you escalate, your request will be re-run on a more capable model.`;
             }
         }
         const placeholder = await sendUserVisible(msg, '⏳ Thinking...').catch(() => null);
-        let streamed = '';
-        const hooks = {
-            onToken: (t) => {
+        const streamer = new DiscordStreamingMessage(placeholder, msg.channel, { editIntervalMs: 1500 });
+        streamer.start();
+        const baseHooks = {
+            onToken: () => {
                 if (!isTurnActive(managed, turnId))
                     return;
                 markProgress(managed, turnId);
                 watchdogGraceUsed = 0;
-                streamed += t;
             },
             onToolCall: () => {
                 if (!isTurnActive(managed, turnId))
@@ -504,6 +330,12 @@ When you escalate, your request will be re-run on a more capable model.`;
                 markProgress(managed, turnId);
                 watchdogGraceUsed = 0;
             },
+            onToolStream: () => {
+                if (!isTurnActive(managed, turnId))
+                    return;
+                markProgress(managed, turnId);
+                watchdogGraceUsed = 0;
+            },
             onToolResult: () => {
                 if (!isTurnActive(managed, turnId))
                     return;
@@ -530,9 +362,7 @@ When you escalate, your request will be re-run on a more capable model.`;
                     watchdogGraceUsed += 1;
                     managed.lastProgressAt = Date.now();
                     console.error(`[bot:discord] ${managed.userId} watchdog inactivity on turn ${turnId} — applying grace period (${watchdogGraceUsed}/${watchdogIdleGraceTimeouts})`);
-                    if (placeholder) {
-                        void placeholder.edit('⏳ Still working... model is taking longer than usual.').catch(() => { });
-                    }
+                    streamer.setBanner('⏳ Still working... model is taking longer than usual.');
                     return;
                 }
                 if (managed.watchdogCompactAttempts < maxWatchdogCompacts) {
@@ -568,17 +398,17 @@ When you escalate, your request will be re-run on a more capable model.`;
                 const attemptController = new AbortController();
                 managed.activeAbortController = attemptController;
                 turn.controller = attemptController;
-                streamed = '';
                 const askText = isRetryAfterCompaction
                     ? 'Continue working on the task from where you left off. Context was compacted to free memory — do NOT restart from the beginning.'
                     : msg.content;
+                const hooks = chainAgentHooks({ signal: attemptController.signal }, baseHooks, streamer.hooks());
                 try {
-                    const result = await managed.session.ask(askText, { ...hooks, signal: attemptController.signal });
+                    const result = await managed.session.ask(askText, hooks);
                     askComplete = true;
                     if (!isTurnActive(managed, turnId))
                         return;
                     markProgress(managed, turnId);
-                    const finalText = safeContent(streamed || result.text);
+                    const finalText = safeContent(result.text);
                     // Check for auto-escalation request in response
                     const escalation = managed.agentPersona?.escalation;
                     const autoEscalate = escalation?.auto !== false && escalation?.models?.length;
@@ -592,10 +422,7 @@ When you escalate, your request will be re-run on a more capable model.`;
                             // Get endpoint from tier if defined
                             const tierEndpoint = escalation.tiers?.[nextIndex]?.endpoint;
                             console.error(`[bot:discord] ${managed.userId} auto-escalation requested: ${escResult.reason}${tierEndpoint ? ` @ ${tierEndpoint}` : ''}`);
-                            // Update placeholder with escalation notice
-                            if (placeholder) {
-                                await placeholder.edit(`⚡ Escalating to \`${targetModel}\` (${escResult.reason})...`).catch(() => { });
-                            }
+                            await streamer.finalizeError(`⚡ Escalating to \`${targetModel}\` (${escResult.reason})...`);
                             // Set up escalation for re-run
                             managed.pendingEscalation = targetModel;
                             managed.currentModelIndex = nextIndex + 1;
@@ -615,30 +442,14 @@ When you escalate, your request will be re-run on a more capable model.`;
                             return;
                         }
                     }
-                    const chunks = splitDiscord(finalText);
-                    if (placeholder) {
-                        await placeholder.edit(chunks[0]).catch(() => { });
-                    }
-                    else {
-                        await sendUserVisible(msg, chunks[0]).catch(() => { });
-                    }
-                    for (let i = 1; i < chunks.length && i < 10; i++) {
-                        if (!isTurnActive(managed, turnId))
-                            break;
-                        await msg.channel.send(chunks[i]).catch(() => { });
-                    }
-                    if (chunks.length > 10 && isTurnActive(managed, turnId)) {
-                        await msg.channel.send('[truncated — response too long]').catch(() => { });
-                    }
+                    await streamer.finalize(finalText);
                 }
                 catch (e) {
                     const raw = String(e?.message ?? e ?? 'unknown error');
                     const isAbort = raw.includes('AbortError') || raw.toLowerCase().includes('aborted');
                     // If aborted by watchdog compaction, wait for compaction to finish then retry
                     if (isAbort && watchdogCompactPending) {
-                        if (placeholder) {
-                            await placeholder.edit(`🔄 Context too large — compacting and retrying (attempt ${managed.watchdogCompactAttempts}/${maxWatchdogCompacts})...`).catch(() => { });
-                        }
+                        streamer.setBanner(`🔄 Context too large — compacting and retrying (attempt ${managed.watchdogCompactAttempts}/${maxWatchdogCompacts})...`);
                         // Wait for the async compaction to complete
                         while (watchdogCompactPending) {
                             await new Promise((r) => setTimeout(r, 500));
@@ -658,19 +469,11 @@ When you escalate, your request will be re-run on a more capable model.`;
                             abortReason: raw,
                             prefix: '⏹ ',
                         });
-                        if (placeholder)
-                            await placeholder.edit(cancelMsg).catch(() => { });
-                        else
-                            await sendUserVisible(msg, cancelMsg).catch(() => { });
+                        await streamer.finalizeError(cancelMsg);
                     }
                     else {
                         const errMsg = raw.slice(0, 400);
-                        if (placeholder) {
-                            await placeholder.edit(`❌ ${errMsg}`).catch(() => { });
-                        }
-                        else {
-                            await sendUserVisible(msg, `❌ ${errMsg}`).catch(() => { });
-                        }
+                        await streamer.finalizeError(errMsg);
                     }
                     askComplete = true;
                 }
@@ -678,6 +481,7 @@ When you escalate, your request will be re-run on a more capable model.`;
         }
         finally {
             clearInterval(watchdog);
+            streamer.stop();
             finishTurn(managed, turnId);
             // Auto-deescalate back to base model after each request
             if (managed.currentModelIndex > 0 && managed.agentPersona?.escalation) {
@@ -1539,7 +1343,7 @@ When you escalate, your request will be re-run on a more capable model.`;
     const DISCORD_RATE_LIMIT_MS = 15_000;
     async function handleDiscordAnton(managed, msg, content) {
         const args = content.replace(/^\/anton\s*/, '').trim();
-        const sub = args.split(/\s+/)[0]?.toLowerCase() || '';
+        const sub = firstToken(args);
         if (!sub || sub === 'status') {
             if (!managed.antonActive) {
                 await sendUserVisible(msg, 'No Anton run in progress.').catch(() => { });