wave-agent-sdk 0.13.5 → 0.14.0

package/dist/tools/webFetchTool.js

@@ -1,30 +1,80 @@
 import TurndownService from "turndown";
+import { LRUCache } from "lru-cache";
 import { WEB_FETCH_TOOL_NAME } from "../constants/tools.js";
 import { logger } from "../utils/globalLogger.js";
+// --- Security Limits ---
+const MAX_HTTP_CONTENT_LENGTH = 10 * 1024 * 1024; // 10MB
+const FETCH_TIMEOUT_MS = 60000; // 60s
+const MAX_REDIRECTS = 10;
+const MAX_MARKDOWN_LENGTH = 100000;
+const USER_AGENT = "Wave-User (+https://github.com/netease-lcap/wave-agent)";
+// --- Cache (LRU with 15min TTL, 50MB max) ---
 const CACHE_TTL = 15 * 60 * 1000; // 15 minutes
-const cache = new Map();
-function getFromCache(url) {
-    const cached = cache.get(url);
-    if (cached && Date.now() - cached.timestamp < CACHE_TTL) {
-        return cached.content;
+const CACHE_MAX_BYTES = 50 * 1024 * 1024; // 50MB
+const cache = new LRUCache({
+    ttl: CACHE_TTL,
+    maxSize: CACHE_MAX_BYTES,
+    sizeCalculation: (entry) => entry.bytes,
+});
+// --- Helpers ---
+function formatSize(bytes) {
+    if (bytes < 1024)
+        return `${bytes}B`;
+    if (bytes < 1024 * 1024)
+        return `${(bytes / 1024).toFixed(1)}KB`;
+    return `${(bytes / (1024 * 1024)).toFixed(1)}MB`;
+}
+function validateURL(url) {
+    if (url.length > 2000) {
+        return {
+            valid: false,
+            error: "URL exceeds maximum length of 2000 characters",
+        };
     }
-    if (cached) {
-        cache.delete(url);
+    let parsed;
+    try {
+        parsed = new URL(url);
     }
-    return null;
-}
-function setToCache(url, content) {
-    cache.set(url, { content, timestamp: Date.now() });
+    catch (error) {
+        return {
+            valid: false,
+            error: `Invalid URL: ${error instanceof Error ? error.message : String(error)}`,
+        };
+    }
+    if (parsed.username || parsed.password) {
+        return { valid: false, error: "URL must not contain username or password" };
+    }
+    const hostParts = parsed.hostname.split(".");
+    if (hostParts.length < 2) {
+        return {
+            valid: false,
+            error: "URL hostname must have at least two parts (e.g., example.com)",
+        };
+    }
+    return { valid: true };
 }
-// Clean up cache every 15 minutes
-setInterval(() => {
-    const now = Date.now();
-    for (const [url, cached] of cache.entries()) {
-        if (now - cached.timestamp >= CACHE_TTL) {
-            cache.delete(url);
-        }
+function isPermittedRedirect(originalUrl, redirectUrl) {
+    try {
+        const original = new URL(originalUrl);
+        const redirect = new URL(redirectUrl);
+        const origHost = original.host;
+        const redirHost = redirect.host;
+        // Same host
+        if (origHost === redirHost)
+            return true;
+        // www. variation (e.g., example.com <-> www.example.com)
+        const bareOrig = origHost.replace(/^www\./, "");
+        const bareRedir = redirHost.replace(/^www\./, "");
+        if (bareOrig === bareRedir)
+            return true;
+        return false;
+    }
+    catch {
+        return false;
     }
-}, CACHE_TTL).unref();
+}
+const GITHUB_URL_ERROR = "For GitHub URLs, please use the 'gh' CLI via the Bash tool instead (e.g., 'gh pr view', 'gh issue view', 'gh api').";
+// --- Tool ---
 export const webFetchTool = {
     name: WEB_FETCH_TOOL_NAME,
     config: {
@@ -44,10 +94,11 @@ Usage notes:
   - IMPORTANT: If an MCP-provided web fetch tool is available, prefer using that tool instead of this one, as it may have fewer restrictions.
   - The URL must be a fully-formed valid URL
   - HTTP URLs will be automatically upgraded to HTTPS
+  - Content exceeding ${formatSize(MAX_MARKDOWN_LENGTH)} will be truncated
   - The prompt should describe what information you want to extract from the page
   - This tool is read-only and does not modify any files
   - Results may be summarized if the content is very large
-  - Includes a self-cleaning 15-minute cache for faster responses when repeatedly accessing the same URL
+  - Includes an LRU cache with a 15-minute TTL for faster responses when repeatedly accessing the same URL
   - When a URL redirects to a different host, the tool will inform you and provide the redirect URL in a special format. You should then make a new WebFetch request with the redirect URL to fetch the content.
   - For GitHub URLs, prefer using the gh CLI via Bash instead (e.g., gh pr view, gh issue view, gh api).`,
             parameters: {
@@ -82,79 +133,82 @@ Usage notes:
         if (url.startsWith("http://")) {
             url = "https://" + url.substring(7);
         }
+        // Validate URL
+        const validation = validateURL(url);
+        if (!validation.valid) {
+            return {
+                success: false,
+                content: "",
+                error: validation.error,
+            };
+        }
         // Check for GitHub URLs
         if (url.includes("github.com")) {
             return {
                 success: false,
                 content: "",
-                error: "For GitHub URLs, please use the 'gh' CLI via the Bash tool instead (e.g., 'gh pr view', 'gh issue view', 'gh api').",
+                error: GITHUB_URL_ERROR,
             };
         }
         try {
-            let markdown = getFromCache(url);
-            if (!markdown) {
-                const response = await fetch(url, {
-                    redirect: "manual",
-                    headers: {
-                        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36",
-                    },
-                });
-                if (response.status >= 300 && response.status < 400) {
-                    const location = response.headers.get("location");
-                    if (location) {
-                        const redirectUrl = new URL(location, url).toString();
-                        const originalHost = new URL(url).host;
-                        const redirectHost = new URL(redirectUrl).host;
-                        if (originalHost !== redirectHost) {
-                            return {
-                                success: true,
-                                content: `REDIRECT_TO: ${redirectUrl}\nThe URL redirected to a different host. Please make a new WebFetch request with this redirect URL if you wish to continue.`,
-                            };
-                        }
-                        // If same host, we could follow it, but the requirement says "When a URL redirects to a different host, the tool will inform you".
-                        // For simplicity and following the requirement strictly, let's just return the redirect for different hosts.
-                        // If it's the same host, we can try to fetch again or just return it too.
-                        return {
-                            success: true,
-                            content: `REDIRECT_TO: ${redirectUrl}\nThe URL redirected. Please make a new WebFetch request with this redirect URL.`,
-                        };
-                    }
-                }
-                if (!response.ok) {
-                    return {
-                        success: false,
-                        content: "",
-                        error: `Failed to fetch URL: ${response.status} ${response.statusText}`,
-                    };
-                }
-                const html = await response.text();
-                const turndownService = new TurndownService();
-                markdown = turndownService.turndown(html);
-                setToCache(url, markdown);
+            const cached = cache.get(url);
+            if (cached) {
+                const markdown = cached.content;
+                return processWithAI(url, prompt, markdown, cached.code, cached.codeText, context);
+            }
+            // Fetch with redirect following
+            const result = await fetchWithRedirects(url, context.abortSignal);
+            if (result.kind === "redirect") {
+                return {
+                    success: true,
+                    content: `REDIRECT_TO: ${result.redirectUrl}\nThe URL redirected to a different host. Please make a new WebFetch request with this redirect URL if you wish to continue.`,
+                };
             }
-            // Process with AI
-            if (!context.aiManager || !context.aiService) {
+            if (result.kind === "error") {
                 return {
                     success: false,
-                    content: markdown,
-                    error: "AI Manager or AI Service not available for processing content",
+                    content: "",
+                    error: result.error,
                 };
             }
-            const modelConfig = context.aiManager.getModelConfig();
-            const fastModel = modelConfig.fastModel;
-            const aiResponse = await context.aiService.processWebContent({
-                gatewayConfig: context.aiManager.getGatewayConfig(),
-                modelConfig: modelConfig,
+            const { response, finalUrl } = result;
+            if (!response.ok) {
+                return {
+                    success: false,
+                    content: "",
+                    error: `Failed to fetch URL: ${response.status} ${response.statusText}`,
+                };
+            }
+            const contentLengthHeader = response.headers.get("content-length");
+            const contentLength = contentLengthHeader
+                ? parseInt(contentLengthHeader, 10)
+                : null;
+            if (contentLength !== null && contentLength > MAX_HTTP_CONTENT_LENGTH) {
+                return {
+                    success: false,
+                    content: "",
+                    error: `Content too large: ${formatSize(contentLength)} exceeds limit of ${formatSize(MAX_HTTP_CONTENT_LENGTH)}`,
+                };
+            }
+            const html = await response.text();
+            const turndownService = new TurndownService();
+            let markdown = turndownService.turndown(html);
+            const markdownBytes = new TextEncoder().encode(markdown).length;
+            // Truncate if too large
+            if (markdown.length > MAX_MARKDOWN_LENGTH) {
+                markdown =
+                    markdown.substring(0, MAX_MARKDOWN_LENGTH) +
+                        `[Content truncated at ${MAX_MARKDOWN_LENGTH} characters due to length limit.]`;
+            }
+            // Store in LRU cache
+            cache.set(finalUrl, {
+                bytes: markdownBytes,
+                code: response.status,
+                codeText: response.statusText,
                 content: markdown,
-                prompt: prompt,
-                model: fastModel,
-                abortSignal: context.abortSignal,
+                contentType: response.headers.get("content-type") || "",
             });
-            return {
-                success: true,
-                content: aiResponse.content || "",
-                shortResult: `Processed content from ${url}`,
-            };
+            return processWithAI(finalUrl, prompt, markdown, response.status, response.statusText, context, markdownBytes);
         }
         catch (error) {
             logger.error(`WebFetch failed for ${url}:`, error);
@@ -169,3 +223,73 @@ Usage notes:
         return `Fetch ${params.url}`;
     },
 };
+// --- Fetch with redirect following ---
+async function fetchWithRedirects(initialUrl, abortSignal, redirectCount = 0) {
+    if (redirectCount >= MAX_REDIRECTS) {
+        return {
+            kind: "error",
+            error: `Too many redirects (max ${MAX_REDIRECTS})`,
+        };
+    }
+    const controller = new AbortController();
+    const timeoutId = setTimeout(() => controller.abort(), FETCH_TIMEOUT_MS);
+    // Forward the context's abort signal if provided
+    if (abortSignal) {
+        abortSignal.addEventListener("abort", () => controller.abort(), {
+            once: true,
+        });
+    }
+    let response;
+    try {
+        response = await fetch(initialUrl, {
+            redirect: "manual",
+            signal: controller.signal,
+            headers: {
+                "User-Agent": USER_AGENT,
+                Accept: "text/markdown, text/html, */*",
+            },
+        });
+    }
+    finally {
+        clearTimeout(timeoutId);
+    }
+    if (response.status >= 300 && response.status < 400) {
+        const location = response.headers.get("location");
+        if (location) {
+            const redirectUrl = new URL(location, initialUrl).toString();
+            if (!isPermittedRedirect(initialUrl, redirectUrl)) {
+                return { kind: "redirect", redirectUrl };
+            }
+            // Follow permitted redirect recursively
+            return fetchWithRedirects(redirectUrl, abortSignal, redirectCount + 1);
+        }
+    }
+    return { kind: "response", response, finalUrl: initialUrl };
+}
+// --- AI Processing ---
+async function processWithAI(url, prompt, markdown, statusCode, statusText, context, contentSize) {
+    if (!context.aiManager || !context.aiService) {
+        return {
+            success: false,
+            content: markdown,
+            error: "AI Manager or AI Service not available for processing content",
+        };
+    }
+    const modelConfig = context.aiManager.getModelConfig();
+    const fastModel = modelConfig.fastModel;
+    const aiResponse = await context.aiService.processWebContent({
+        gatewayConfig: context.aiManager.getGatewayConfig(),
+        modelConfig: modelConfig,
+        content: markdown,
+        prompt: prompt,
+        model: fastModel,
+        abortSignal: context.abortSignal,
+    });
+    const sizeStr = contentSize !== undefined ? formatSize(contentSize) : "unknown size";
+    const statusStr = `${statusCode} ${statusText}`.trim();
+    return {
+        success: true,
+        content: aiResponse.content || "",
+        shortResult: `Received ${sizeStr} (${statusStr}) from ${url}`,
+    };
+}

package/dist/types/messaging.d.ts

@@ -52,6 +52,7 @@ export interface ToolBlock {
     compactParams?: string;
     parametersChunk?: string;
     isManuallyBackgrounded?: boolean;
+    timestamp?: number;
 }
 export interface ImageBlock {
     type: "image";

package/dist/types/messaging.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"messaging.d.ts","sourceRoot":"","sources":["../../src/types/messaging.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"messaging.d.ts","sourceRoot":"","sources":["../../src/types/messaging.ts"],"names":[],"mappings":"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"}

package/dist/utils/convertMessagesForAPI.js

@@ -42,7 +42,7 @@ export function convertMessagesForAPI(messages) {
             const compressBlock = message.blocks.find((block) => block.type === "compress");
             if (compressBlock && compressBlock.type === "compress") {
                 recentMessages.unshift({
-                    role: "assistant",
+                    role: "user",
                     content: compressBlock.content,
                 });
             }

package/dist/utils/groupMessagesByApiRound.d.ts

@@ -0,0 +1,24 @@
+import type { Message } from "../types/index.js";
+export interface ApiRound {
+    messages: Message[];
+    estimatedTokens: number;
+}
+/**
+ * Groups messages into "API rounds" — each round corresponds to one API
+ * call-response cycle. This is critical because in agentic sessions with a
+ * single user prompt, Wave creates a new Message per API round (each recursive
+ * sendAIMessage call creates a new assistant message).
+ *
+ * Boundaries:
+ *  - A new `role: "user"` message starts a new round.
+ *  - A new `role: "assistant"` message with a different `id` starts a new round.
+ *  - A message with a `compress` block is pushed as its own round and starts a
+ *    new round after it.
+ */
+export declare function groupMessagesByApiRound(messages: Message[]): ApiRound[];
+/**
+ * Returns the last `roundCount` complete API rounds as a flat message array.
+ * Never splits a tool_use/tool_result pair. If fewer rounds exist, returns all.
+ */
+export declare function getLastApiRounds(messages: Message[], roundCount: number): Message[];
+//# sourceMappingURL=groupMessagesByApiRound.d.ts.map

package/dist/utils/groupMessagesByApiRound.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"groupMessagesByApiRound.d.ts","sourceRoot":"","sources":["../../src/utils/groupMessagesByApiRound.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAEjD,MAAM,WAAW,QAAQ;IACvB,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;CACzB;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,QAAQ,EAAE,CA8DvE;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,OAAO,EAAE,EACnB,UAAU,EAAE,MAAM,GACjB,OAAO,EAAE,CAIX"}

package/dist/utils/groupMessagesByApiRound.js

@@ -0,0 +1,97 @@
+/**
+ * Groups messages into "API rounds" — each round corresponds to one API
+ * call-response cycle. This is critical because in agentic sessions with a
+ * single user prompt, Wave creates a new Message per API round (each recursive
+ * sendAIMessage call creates a new assistant message).
+ *
+ * Boundaries:
+ *  - A new `role: "user"` message starts a new round.
+ *  - A new `role: "assistant"` message with a different `id` starts a new round.
+ *  - A message with a `compress` block is pushed as its own round and starts a
+ *    new round after it.
+ */
+export function groupMessagesByApiRound(messages) {
+    const rounds = [];
+    let currentRound = [];
+    let lastAssistantId;
+    for (const msg of messages) {
+        let startNewRound = false;
+        if (msg.role === "user") {
+            startNewRound = true;
+        }
+        else if (msg.role === "assistant") {
+            // Compress block is always its own round
+            const hasCompress = msg.blocks.some((b) => b.type === "compress");
+            if (hasCompress) {
+                startNewRound = true;
+            }
+            else if (msg.id !== lastAssistantId) {
+                // New assistant id starts a new round.
+                // Exception: if the current round is [user] (first assistant after a
+                // user prompt in a normal conversation), keep them together as one
+                // round. But if we already have assistant(s) in this round (agentic
+                // tool loop), the new id starts a new round.
+                const roundHasOtherAssistant = currentRound.some((m) => m.role === "assistant" && m.id !== msg.id);
+                if (roundHasOtherAssistant) {
+                    startNewRound = true;
+                }
+            }
+            lastAssistantId = msg.id;
+        }
+        if (startNewRound && currentRound.length > 0) {
+            rounds.push({
+                messages: currentRound,
+                estimatedTokens: estimateTokens(currentRound),
+            });
+            currentRound = [];
+        }
+        currentRound.push(msg);
+        // After pushing a compress message as its own round, flush immediately
+        if (msg.role === "assistant" &&
+            msg.blocks.some((b) => b.type === "compress")) {
+            rounds.push({
+                messages: currentRound,
+                estimatedTokens: estimateTokens(currentRound),
+            });
+            currentRound = [];
+        }
+    }
+    if (currentRound.length > 0) {
+        rounds.push({
+            messages: currentRound,
+            estimatedTokens: estimateTokens(currentRound),
+        });
+    }
+    return rounds;
+}
+/**
+ * Returns the last `roundCount` complete API rounds as a flat message array.
+ * Never splits a tool_use/tool_result pair. If fewer rounds exist, returns all.
+ */
+export function getLastApiRounds(messages, roundCount) {
+    const rounds = groupMessagesByApiRound(messages);
+    const lastRounds = rounds.slice(-roundCount);
+    return lastRounds.flatMap((r) => r.messages);
+}
+/**
+ * Roughly estimate token count from character count (~4 chars per token).
+ */
+function estimateTokens(messages) {
+    let chars = 0;
+    for (const msg of messages) {
+        for (const block of msg.blocks) {
+            if ("content" in block && typeof block.content === "string") {
+                chars += block.content.length;
+            }
+            if (block.type === "tool" &&
+                block.parameters &&
+                typeof block.parameters === "string") {
+                chars += block.parameters.length;
+            }
+            if (block.type === "tool" && block.result) {
+                chars += block.result.length;
+            }
+        }
+    }
+    return Math.ceil(chars / 4);
+}

package/dist/utils/messageOperations.d.ts

@@ -41,6 +41,7 @@ export interface UpdateToolBlockParams {
     compactParams?: string;
     parametersChunk?: string;
     isManuallyBackgrounded?: boolean;
+    timestamp?: number;
 }
 export type AgentToolBlockUpdateParams = Omit<UpdateToolBlockParams, "messages">;
 export interface AddErrorBlockParams {

package/dist/utils/messageOperations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"messageOperations.d.ts","sourceRoot":"","sources":["../../src/utils/messageOperations.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"messageOperations.d.ts","sourceRoot":"","sources":["../../src/utils/messageOperations.ts"],"names":[],"mappings":"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"}

package/dist/utils/microcompact.d.ts

@@ -0,0 +1,7 @@
+import type { Message } from "../types/messaging.js";
+export interface MicrocompactOptions {
+    timeThresholdMS: number;
+    recentResultsToKeep: number;
+}
+export declare function microcompactMessages(messages: Message[], options: MicrocompactOptions): Message[];
+//# sourceMappingURL=microcompact.d.ts.map

package/dist/utils/microcompact.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"microcompact.d.ts","sourceRoot":"","sources":["../../src/utils/microcompact.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAa,MAAM,uBAAuB,CAAC;AAEhE,MAAM,WAAW,mBAAmB;IAClC,eAAe,EAAE,MAAM,CAAC;IACxB,mBAAmB,EAAE,MAAM,CAAC;CAC7B;AAID,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,OAAO,EAAE,EACnB,OAAO,EAAE,mBAAmB,GAC3B,OAAO,EAAE,CAwFX"}

package/dist/utils/microcompact.js

@@ -0,0 +1,78 @@
+const CLEARED_RESULT = "[Old tool result content cleared]";
+export function microcompactMessages(messages, options) {
+    const { timeThresholdMS, recentResultsToKeep } = options;
+    // 1. Find the latest tool block timestamp across all assistant messages
+    let lastAssistantTime = 0;
+    for (const msg of messages) {
+        if (msg.role === "assistant") {
+            for (const block of msg.blocks) {
+                if (block.type === "tool" && block.stage === "end" && block.timestamp) {
+                    if (block.timestamp > lastAssistantTime) {
+                        lastAssistantTime = block.timestamp;
+                    }
+                }
+            }
+        }
+    }
+    // 2. If no prior assistant messages with completed tools, return unchanged
+    if (lastAssistantTime === 0) {
+        return messages;
+    }
+    // 3. If within threshold, return unchanged
+    if (Date.now() - lastAssistantTime < timeThresholdMS) {
+        return messages;
+    }
+    const toolRefs = [];
+    for (let mi = 0; mi < messages.length; mi++) {
+        const msg = messages[mi];
+        if (msg.role === "assistant") {
+            for (let bi = 0; bi < msg.blocks.length; bi++) {
+                const block = msg.blocks[bi];
+                if (block.type === "tool" && block.stage === "end" && block.timestamp) {
+                    toolRefs.push({
+                        msgIndex: mi,
+                        blockIndex: bi,
+                        timestamp: block.timestamp,
+                    });
+                }
+            }
+        }
+    }
+    toolRefs.sort((a, b) => b.timestamp - a.timestamp);
+    // 5. Mark the top N as "keep"
+    const keepSet = new Set();
+    for (let i = 0; i < Math.min(recentResultsToKeep, toolRefs.length); i++) {
+        const ref = toolRefs[i];
+        keepSet.add(`${ref.msgIndex}:${ref.blockIndex}`);
+    }
+    // 6. Deep-copy messages and clear result + shortResult on non-kept blocks
+    const result = messages.map((msg) => ({
+        ...msg,
+        blocks: msg.blocks.map((block) => {
+            if (block.type === "tool" && block.stage === "end" && block.timestamp) {
+                return { ...block };
+            }
+            return block;
+        }),
+    }));
+    // Clear non-kept tool blocks
+    for (const ref of toolRefs) {
+        const key = `${ref.msgIndex}:${ref.blockIndex}`;
+        if (!keepSet.has(key)) {
+            result[ref.msgIndex] = {
+                ...result[ref.msgIndex],
+                blocks: result[ref.msgIndex].blocks.map((b, idx) => {
+                    if (idx === ref.blockIndex && b.type === "tool") {
+                        return {
+                            ...b,
+                            result: CLEARED_RESULT,
+                            shortResult: undefined,
+                        };
+                    }
+                    return b;
+                }),
+            };
+        }
+    }
+    return result;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wave-agent-sdk",
-  "version": "0.13.5",
+  "version": "0.14.0",
   "description": "SDK for building AI-powered development tools and agents",
   "keywords": [
     "ai",
@@ -33,6 +33,7 @@
     "cron-parser": "^5.5.0",
     "fuzzysort": "^3.1.0",
     "glob": "^13.0.0",
+    "lru-cache": "^11.3.5",
     "minimatch": "^10.0.3",
     "openai": "^5.12.2",
     "turndown": "^7.2.2"

package/src/agent.ts

@@ -332,6 +332,19 @@ export class Agent {
     return this.messageQueue.getQueue();
   }
 
+  /**
+   * Remove a queued message by index
+   * @param index - The index of the message to remove
+   * @returns true if the message was removed, false if the index was out of bounds
+   */
+  public removeQueuedMessage(index: number): boolean {
+    const removed = this.messageQueue.removeAt(index);
+    if (removed) {
+      this.options.callbacks?.onQueuedMessagesChange?.(this.queuedMessages);
+    }
+    return removed;
+  }
+
   /**
    * Process the next queued message when the agent becomes idle.
    * Dequeues the next message and handles it based on type.
@@ -566,11 +579,13 @@ export class Agent {
 
   /** Unified interrupt method, interrupts both AI messages and command execution */
   public abortMessage(): void {
+    // Clear queue first to prevent processQueuedMessage from dequeuing
+    // when abortAIMessage triggers onLoadingChange(false)
+    this.messageQueue.clear();
+    this.options.callbacks?.onQueuedMessagesChange?.(this.queuedMessages);
     this.abortAIMessage(); // This will abort tools including Agent tool (subagents)
     this.abortBashCommand();
     this.abortSlashCommand();
-    this.messageQueue.clear();
-    this.options.callbacks?.onQueuedMessagesChange?.(this.queuedMessages);
   }
 
   /** Interrupt bash command execution */