@visorcraft/idlehands 1.1.7 → 1.1.9

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

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

package/dist/bot/discord-streaming.js

@@ -0,0 +1,107 @@
+import { splitDiscord, safeContent } from './discord-routing.js';
+import { formatToolCallSummary } from '../progress/tool-summary.js';
+import { ProgressPresenter } from '../progress/progress-presenter.js';
+import { MessageEditScheduler, classifyDiscordEditError } from '../progress/message-edit-scheduler.js';
+export class DiscordStreamingMessage {
+    placeholder;
+    channel;
+    opts;
+    banner = null;
+    finalized = false;
+    presenter = new ProgressPresenter({
+        maxToolLines: 8,
+        maxTailLines: 4,
+        maxDiffLines: 32,
+        maxAssistantChars: 1200,
+        discordMaxLen: 1900,
+        toolCallSummary: (c) => formatToolCallSummary({ name: c.name, args: c.args }),
+    });
+    scheduler = null;
+    constructor(placeholder, channel, opts) {
+        this.placeholder = placeholder;
+        this.channel = channel;
+        this.opts = opts;
+    }
+    start() {
+        if (this.scheduler || this.finalized)
+            return;
+        this.presenter.start();
+        if (this.placeholder) {
+            const every = Math.max(500, Math.floor(this.opts?.editIntervalMs ?? 1500));
+            this.scheduler = new MessageEditScheduler({
+                intervalMs: every,
+                render: () => this.presenter.renderDiscordMarkdown(),
+                apply: async (text) => {
+                    if (!this.placeholder)
+                        return;
+                    await this.placeholder.edit(text);
+                },
+                isDirty: () => this.presenter.isDirty(),
+                clearDirty: () => this.presenter.clearDirty(),
+                classifyError: classifyDiscordEditError,
+            });
+            this.scheduler.start();
+        }
+    }
+    stop() {
+        if (this.scheduler) {
+            this.scheduler.stop();
+            this.scheduler = null;
+        }
+        this.presenter.stop();
+    }
+    setBanner(text) {
+        this.banner = text?.trim() ? text.trim() : null;
+        this.presenter.setBanner(this.banner);
+    }
+    hooks() {
+        return this.presenter.hooks();
+    }
+    async finalize(finalText) {
+        this.finalized = true;
+        this.stop();
+        const snap = this.presenter.snapshot('stop');
+        const toolLines = snap.toolLines.slice(-8);
+        // Build combined text with informative fallback
+        let combined = '';
+        if (toolLines.length)
+            combined += toolLines.join('\n') + '\n\n';
+        if (finalText && finalText.trim()) {
+            combined += finalText;
+        }
+        else if (finalText) {
+            combined += '*(response contained only protocol artifacts - no user-visible content)*';
+        }
+        else {
+            combined += '*(no response generated - task may be complete or awaiting further input)*';
+        }
+        const chunks = splitDiscord(safeContent(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.presenter.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":"AAEA,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,MAAM,uCAAuC,CAAC;AAEvG,MAAM,OAAO,uBAAuB;IAgBf;IACA;IACA;IAjBX,MAAM,GAAkB,IAAI,CAAC;IAC7B,SAAS,GAAG,KAAK,CAAC;IAElB,SAAS,GAAG,IAAI,iBAAiB,CAAC;QACxC,YAAY,EAAE,CAAC;QACf,YAAY,EAAE,CAAC;QACf,YAAY,EAAE,EAAE;QAChB,iBAAiB,EAAE,IAAI;QACvB,aAAa,EAAE,IAAI;QACnB,eAAe,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,qBAAqB,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,IAAW,EAAE,CAAC;KACrF,CAAC,CAAC;IAEK,SAAS,GAAgC,IAAI,CAAC;IAEtD,YACmB,WAAuB,EACvB,OAAyB,EACzB,IAAkC;QAFlC,gBAAW,GAAX,WAAW,CAAY;QACvB,YAAO,GAAP,OAAO,CAAkB;QACzB,SAAI,GAAJ,IAAI,CAA8B;IAClD,CAAC;IAEJ,KAAK;QACH,IAAI,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,SAAS;YAAE,OAAO;QAE7C,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;QAEvB,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACrB,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,IAAI,IAAI,CAAC,CAAC,CAAC;YAC3E,IAAI,CAAC,SAAS,GAAG,IAAI,oBAAoB,CAAC;gBACxC,UAAU,EAAE,KAAK;gBACjB,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,qBAAqB,EAAE;gBACpD,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;oBACpB,IAAI,CAAC,IAAI,CAAC,WAAW;wBAAE,OAAO;oBAC9B,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACpC,CAAC;gBACD,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE;gBACvC,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE;gBAC7C,aAAa,EAAE,wBAAwB;aACxC,CAAC,CAAC;YACH,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;QACzB,CAAC;IACH,CAAC;IAED,IAAI;QACF,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;YACtB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACxB,CAAC;QACD,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;IACxB,CAAC;IAED,SAAS,CAAC,IAAmB;QAC3B,IAAI,CAAC,MAAM,GAAG,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QAChD,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACxC,CAAC;IAED,KAAK;QACH,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;IAChC,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,SAAiB;QAC9B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACtB,IAAI,CAAC,IAAI,EAAE,CAAC;QAEZ,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC7C,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAE3C,gDAAgD;QAChD,IAAI,QAAQ,GAAG,EAAE,CAAC;QAClB,IAAI,SAAS,CAAC,MAAM;YAAE,QAAQ,IAAI,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC;QAEhE,IAAI,SAAS,IAAI,SAAS,CAAC,IAAI,EAAE,EAAE,CAAC;YAClC,QAAQ,IAAI,SAAS,CAAC;QACxB,CAAC;aAAM,IAAI,SAAS,EAAE,CAAC;YACrB,QAAQ,IAAI,0EAA0E,CAAC;QACzF,CAAC;aAAM,CAAC;YACN,QAAQ,IAAI,4EAA4E,CAAC;QAC3F,CAAC;QAED,MAAM,MAAM,GAAG,YAAY,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC;QAEnD,IAAI,IAAI,CAAC,WAAW,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC1C,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QACzD,CAAC;aAAM,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC7B,MAAO,IAAI,CAAC,OAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QAC9D,CAAC;QAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;YACjD,MAAO,IAAI,CAAC,OAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QAC9D,CAAC;QACD,IAAI,MAAM,CAAC,MAAM,GAAG,EAAE,EAAE,CAAC;YACvB,MAAO,IAAI,CAAC,OAAe,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QACtF,CAAC;IACH,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,MAAc;QAChC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACtB,IAAI,CAAC,IAAI,EAAE,CAAC;QAEZ,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC7C,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3C,MAAM,QAAQ,GAAG,WAAW,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,KAAK,MAAM,EAAE,CAAC,CAAC;QACtG,MAAM,MAAM,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAC;QAEtC,IAAI,IAAI,CAAC,WAAW,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC1C,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QACzD,CAAC;aAAM,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC7B,MAAO,IAAI,CAAC,OAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QAC9D,CAAC;IACH,CAAC;CACF"}

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) {
@@ -395,20 +221,31 @@ When you escalate, your request will be re-run on a more capable model.`;
         managed.lastActivity = Date.now();
     }
     function cancelActive(managed) {
-        if (!managed.inFlight)
-            return { ok: false, message: 'Nothing running.' };
-        managed.state = 'canceling';
-        managed.pendingQueue = [];
-        try {
-            managed.activeAbortController?.abort();
+        const wasRunning = managed.inFlight;
+        const queueSize = managed.pendingQueue.length;
+        if (!wasRunning && queueSize === 0) {
+            return { ok: false, message: 'Nothing to cancel.' };
         }
-        catch { }
-        try {
-            managed.session.cancel();
+        // Always clear queued work.
+        managed.pendingQueue = [];
+        if (wasRunning) {
+            managed.state = 'canceling';
+            try {
+                managed.activeAbortController?.abort();
+            }
+            catch { }
+            try {
+                managed.session.cancel();
+            }
+            catch { }
         }
-        catch { }
         managed.lastActivity = Date.now();
-        return { ok: true, message: '⏹ Cancel requested. Stopping current turn...' };
+        const parts = [];
+        if (wasRunning)
+            parts.push('stopping current task');
+        if (queueSize > 0)
+            parts.push(`cleared ${queueSize} queued task${queueSize > 1 ? 's' : ''}`);
+        return { ok: true, message: `⏹ Cancelled: ${parts.join(', ')}.` };
     }
     async function processMessage(managed, msg) {
         let turn = beginTurn(managed);
@@ -489,14 +326,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 +341,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 +373,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 +409,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 +433,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 +453,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 +480,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 +492,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) {
@@ -902,12 +717,9 @@ When you escalate, your request will be re-run on a more capable model.`;
                 if (!managed) {
                     await interaction.reply('No active session.');
                 }
-                else if (managed.state !== 'running') {
-                    await interaction.reply('Nothing to cancel.');
-                }
                 else {
-                    cancelActive(managed);
-                    await interaction.reply('🛑 Cancelling...');
+                    const res = cancelActive(managed);
+                    await interaction.reply(res.message);
                 }
                 break;
             }
@@ -1539,7 +1351,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(() => { });