wave-agent-sdk 0.19.6 → 0.19.7

package/src/agent.ts

@@ -10,7 +10,6 @@ import { BangManager } from "./managers/bangManager.js";
 import { CronManager } from "./managers/cronManager.js";
 import { GoalManager } from "./managers/goalManager.js";
 import { BackgroundTaskManager } from "./managers/backgroundTaskManager.js";
-import { NotificationQueue } from "./managers/notificationQueue.js";
 import { MessageQueue, type QueuedMessage } from "./managers/messageQueue.js";
 import { SlashCommandManager } from "./managers/slashCommandManager.js";
 import { PluginManager } from "./managers/pluginManager.js";
@@ -77,9 +76,8 @@ export class Agent {
   private goalManager: GoalManager; // Add goal manager instance
   private hookManager: HookManager; // Add hooks manager instance
   private reversionManager: ReversionManager;
-  private notificationQueue: NotificationQueue; // Add notification queue instance
-  private messageQueue: MessageQueue; // Add message queue instance
-  private pendingNotificationPromises: Promise<void>[] = []; // Track pending notification processing
+  private messageQueue: MessageQueue; // Unified queue for messages, bang commands, and notifications
+  private dispatchPromise: Promise<void> | null = null; // Track current dispatch for teardown
   private memoryRuleManager: MemoryRuleManager; // Add memory rule manager instance
   private liveConfigManager: LiveConfigManager; // Add live configuration manager
   private taskManager: TaskManager;
@@ -207,25 +205,8 @@ export class Agent {
     this.bangManager = this.container.get("BangManager")!;
     this.cronManager = this.container.get("CronManager")!;
     this.goalManager = this.container.get("GoalManager")!;
-    this.notificationQueue = this.container.get("NotificationQueue")!;
     this.messageQueue = this.container.get("MessageQueue")!;
 
-    // Wire up notification queue to trigger AI when notifications arrive while idle
-    this.notificationQueue.onNotificationsEnqueued = () => {
-      // If the AI is NOT loading (idle), trigger a new AI cycle to process notifications
-      if (!this.aiManager.isLoading) {
-        const pendingPromise = this.processPendingNotifications().catch(
-          (error) => {
-            this.logger?.error(
-              "Failed to process pending notifications:",
-              error,
-            );
-          },
-        );
-        this.pendingNotificationPromises.push(pendingPromise);
-      }
-    };
-
     // Wire up CWD change callback from AIManager to sync Agent's workdir
     this.aiManager.setOnCwdChange((newCwd) => {
       this.workdir = newCwd;
@@ -233,18 +214,20 @@ export class Agent {
       this.options.callbacks?.onWorkdirChange?.(newCwd);
     });
 
-    // Wire up message queue to process when agent becomes idle
-    this.messageQueue.onMessageEnqueued = () => this.tryDequeue();
+    // Wire up message queue to process when agent becomes idle.
+    // Both user messages and background task notifications enqueue here,
+    // unified through a single dispatch path (tryDispatch).
+    this.messageQueue.onMessageEnqueued = () => this.tryDispatch();
 
     // Wire up AI loading changes to process queue when AI becomes idle
     this.aiManager.onLoadingChange = (loading: boolean) => {
-      if (!loading) this.tryDequeue();
+      if (!loading) this.tryDispatch();
     };
 
     // Wire up bang manager callback for command running changes
     this.bangManager.onCommandRunningChange = (running: boolean) => {
       this.options.callbacks?.onCommandRunningChange?.(running);
-      if (!running) this.tryDequeue();
+      if (!running) this.tryDispatch();
     };
 
     // Set initial permission mode if provided
@@ -346,9 +329,11 @@ export class Agent {
     return this.bangManager?.isCommandRunning ?? false;
   }
 
-  /** Get queued messages */
+  /** Get queued user-facing messages (excludes background notifications) */
   public get queuedMessages(): QueuedMessage[] {
-    return this.messageQueue.getQueue();
+    return this.messageQueue
+      .getQueue()
+      .filter((m) => m.type !== "notification");
   }
 
   /** Get goal status string */
@@ -421,28 +406,31 @@ export class Agent {
   }
 
   /**
-   * Unified dequeue trigger — checks state machine before processing.
-   * Called from onMessageEnqueued, onLoadingChange(false), and
-   * onCommandRunningChange(false).
+   * Unified dispatch trigger — checks state machine before processing.
+   * Handles user messages, bang commands, and background task notifications
+   * through a single serialized path. Called from onMessageEnqueued,
+   * onLoadingChange(false), and onCommandRunningChange(false).
    */
-  private tryDequeue(): void {
+  private tryDispatch(): void {
     if (this.messageQueue.state !== "idle") return;
     if (!this.messageQueue.hasPending()) return;
     if (this.aiManager.isLoading || this.isCommandRunning) return;
 
     this.messageQueue.transitionTo("dispatching");
-    this.processQueuedMessage()
+    this.dispatchPromise = this.processQueuedMessage()
       .catch((error) => {
         this.logger?.error("Failed to process queued message:", error);
       })
       .finally(() => {
         this.messageQueue.transitionTo("idle");
-        this.tryDequeue(); // Re-check after processing
+        this.dispatchPromise = null;
+        this.tryDispatch(); // Re-check after processing
       });
   }
 
   /**
-   * Process the next queued message when the agent becomes idle.
+   * Process the next queued item when the agent becomes idle.
+   * Handles three item types: user messages, bang commands, and notifications.
    */
   private async processQueuedMessage(): Promise<void> {
     const next = this.messageQueue.dequeue();
@@ -454,6 +442,25 @@ export class Agent {
     if (next.type === "bang") {
       await this.bangManager?.executeCommand(next.content);
       await this.messageManager.saveSession();
+    } else if (next.type === "notification") {
+      // Drain all pending notifications and batch them into a single AI turn
+      const allNotifications = [
+        next.content,
+        ...this.messageQueue.drainNotifications(),
+      ];
+      for (const xml of allNotifications) {
+        const block = parseTaskNotificationXml(xml);
+        if (block) {
+          this.messageManager.addNotificationMessage({
+            taskId: block.taskId,
+            taskType: block.taskType,
+            status: block.status,
+            summary: block.summary,
+            outputFile: block.outputFile,
+          });
+        }
+      }
+      await this.aiManager.sendAIMessage({ recursionDepth: 0 });
     } else {
       await this.sendMessage(next.content, next.images);
     }
@@ -681,31 +688,6 @@ export class Agent {
     this.aiManager.abortAIMessage();
   }
 
-  /**
-   * Process pending background task notifications by injecting them as user messages
-   * and triggering a new AI response cycle.
-   */
-  private async processPendingNotifications(): Promise<void> {
-    const notifications = this.notificationQueue.dequeueAll();
-    if (notifications.length === 0) return;
-
-    for (const notification of notifications) {
-      const block = parseTaskNotificationXml(notification);
-      if (block) {
-        this.messageManager.addNotificationMessage({
-          taskId: block.taskId,
-          taskType: block.taskType,
-          status: block.status,
-          summary: block.summary,
-          outputFile: block.outputFile,
-        });
-      }
-    }
-
-    // Trigger AI to process the notifications
-    await this.aiManager.sendAIMessage({ recursionDepth: 0 });
-  }
-
   /** Execute bash command (bang command) */
   public async bang(command: string): Promise<void> {
     // If the agent is busy, enqueue the bang command
@@ -866,8 +848,9 @@ export class Agent {
   /** Unified interrupt method, interrupts both AI messages and command execution */
   public abortMessage(): void {
     if (this.aiManager.isLoading || this.isCommandRunning) {
-      // Clear queue first to prevent processQueuedMessage from dequeuing
-      // when abortAIMessage triggers onLoadingChange(false)
+      // Clear user-facing queue items first to prevent processQueuedMessage
+      // from dequeuing when abortAIMessage triggers onLoadingChange(false).
+      // Notifications are preserved so background task results aren't lost.
       this.messageQueue.clear();
       this.options.callbacks?.onQueuedMessagesChange?.(this.queuedMessages);
     }
@@ -957,15 +940,14 @@ export class Agent {
     }).catch(() => {});
     await shutdownTelemetry();
 
-    // Clear notification callback first to prevent any late triggers from
+    // Clear message queue callback first to prevent any late triggers from
     // starting async work during teardown
-    this.notificationQueue.onNotificationsEnqueued = undefined;
+    this.messageQueue.onMessageEnqueued = undefined;
 
-    // Await any pending notification processing to prevent race conditions
+    // Await any pending dispatch to prevent race conditions
     // with test teardown (e.g., V8 coverage stream cleanup)
-    if (this.pendingNotificationPromises.length > 0) {
-      await Promise.allSettled(this.pendingNotificationPromises);
-      this.pendingNotificationPromises = [];
+    if (this.dispatchPromise) {
+      await this.dispatchPromise.catch(() => {});
     }
 
     // Fire SessionEnd hooks (fire-and-forget, don't block shutdown)

package/src/managers/aiManager.ts

@@ -41,7 +41,7 @@ import { Container } from "../utils/container.js";
 import type { WorktreeSession } from "../utils/worktreeSession.js";
 import { recoverTruncatedJson } from "../utils/stringUtils.js";
 import { ConfigurationService } from "../services/configurationService.js";
-import type { NotificationQueue } from "./notificationQueue.js";
+import type { MessageQueue } from "./messageQueue.js";
 
 import { logger } from "../utils/globalLogger.js";
 import {
@@ -115,6 +115,7 @@ export interface AIManagerOptions {
 
 export class AIManager {
   public isLoading: boolean = false;
+  private turnGeneration = 0; // Guards against concurrent sendAIMessage turns
   private abortController: AbortController | null = null;
   onLoadingChange?: (loading: boolean) => void;
   private toolAbortController: AbortController | null = null;
@@ -397,6 +398,10 @@ export class AIManager {
   }
 
   public abortAIMessage(): void {
+    // Bump generation so the in-flight turn's end-of-turn setIsLoading(false)
+    // is skipped (generation mismatch), preventing it from racing with this abort.
+    this.turnGeneration++;
+
     // Interrupt AI service
     if (this.abortController) {
       try {
@@ -818,6 +823,15 @@ export class AIManager {
     const { recursionDepth = 0, model, allowedRules, maxTokens } = options;
     let turnOffset = recursionDepth;
 
+    // Reserve this turn synchronously before any async work. Bumping the
+    // generation invalidates any in-flight turn's end-of-turn cleanup, and
+    // recording myGeneration lets us skip cleanup if a newer turn (or abort)
+    // has superseded us. setIsLoading(true) here also closes the "idle but
+    // previous turn not finished" race window by marking us busy immediately.
+    this.turnGeneration++;
+    const myGeneration = this.turnGeneration;
+    this.setIsLoading(true);
+
     outer: while (true) {
       let shouldRestart = false;
 
@@ -839,9 +853,8 @@ export class AIManager {
         }).catch(() => {}); // Non-blocking
       }
 
-      // Set loading state early for the initial call, before any async work
+      // Apply allowed rules for the initial call
       if (turnOffset === 0) {
-        this.setIsLoading(true);
         if (allowedRules && allowedRules.length > 0) {
           this.permissionManager?.addTemporaryRules(allowedRules);
         }
@@ -1375,8 +1388,6 @@ export class AIManager {
 
         // Save session in each iteration to ensure message persistence
         await this.messageManager.saveSession();
-        // Set loading to false first
-        this.setIsLoading(false);
 
         // Clear temporary rules
         this.permissionManager?.clearTemporaryRules();
@@ -1475,11 +1486,11 @@ export class AIManager {
 
         // Inject pending notifications from background tasks (after Stop hooks,
         // aligned with Claude Code which fires Stop hooks unconditionally)
-        const notificationQueue = this.container.has("NotificationQueue")
-          ? this.container.get<NotificationQueue>("NotificationQueue")
+        const messageQueue = this.container.has("MessageQueue")
+          ? this.container.get<MessageQueue>("MessageQueue")
           : undefined;
-        if (notificationQueue && notificationQueue.hasPending()) {
-          const notifications = notificationQueue.dequeueAll();
+        if (messageQueue && messageQueue.hasNotifications()) {
+          const notifications = messageQueue.drainNotifications();
           for (const notification of notifications) {
             const block = parseTaskNotificationXml(notification);
             if (block) {
@@ -1498,7 +1509,16 @@ export class AIManager {
         }
       }
 
-      if (!shouldRestart) break outer;
+      if (!shouldRestart) {
+        // Release loading state only after ALL cleanup is done (session save,
+        // Stop hooks, notification injection). Generation check ensures a
+        // superseded (aborted or newer) turn doesn't clobber the current
+        // loading state.
+        if (myGeneration === this.turnGeneration) {
+          this.setIsLoading(false);
+        }
+        break outer;
+      }
     }
   }
 

package/src/managers/backgroundTaskManager.ts

@@ -6,7 +6,7 @@ import { BackgroundTask, BackgroundShell } from "../types/processes.js";
 import { stripAnsiColors } from "../utils/stringUtils.js";
 import { logger } from "../utils/globalLogger.js";
 import { Container } from "../utils/container.js";
-import { NotificationQueue } from "./notificationQueue.js";
+import { MessageQueue } from "./messageQueue.js";
 import { resolveShellPath } from "../utils/shellResolver.js";
 
 export interface BackgroundTaskManagerCallbacks {
@@ -32,10 +32,6 @@ export class BackgroundTaskManager {
     this.workdir = options.workdir;
   }
 
-  private get notificationQueue(): NotificationQueue {
-    return this.container.get<NotificationQueue>("NotificationQueue")!;
-  }
-
   /**
    * Fire the onBackgroundTasksChange callback so UI consumers refresh.
    * Public so other managers (e.g. WorkflowManager) can trigger a refresh
@@ -178,13 +174,13 @@ export class BackgroundTaskManager {
 
       // Skip notification if task was manually killed (user/agent-initiated stop)
       if (!wasKilled) {
-        const notificationQueue = this.container.has("NotificationQueue")
-          ? this.container.get<NotificationQueue>("NotificationQueue")
+        const messageQueue = this.container.has("MessageQueue")
+          ? this.container.get<MessageQueue>("MessageQueue")
           : undefined;
-        if (notificationQueue) {
+        if (messageQueue) {
           const statusStr = shell.status;
           const summary = `Command "${command}" ${statusStr} with exit code ${code ?? 0}`;
-          notificationQueue.enqueue(
+          messageQueue.enqueueNotification(
             `<task-notification>\n<task-id>${id}</task-id>\n<task-type>shell</task-type>\n<output-file>${logPath}</output-file>\n<status>${statusStr}</status>\n<summary>${summary}</summary>\n</task-notification>`,
           );
         }
@@ -208,12 +204,12 @@ export class BackgroundTaskManager {
       this.notifyTasksChange();
 
       // Enqueue error notification
-      const notificationQueue = this.container.has("NotificationQueue")
-        ? this.container.get<NotificationQueue>("NotificationQueue")
+      const messageQueue = this.container.has("MessageQueue")
+        ? this.container.get<MessageQueue>("MessageQueue")
         : undefined;
-      if (notificationQueue) {
+      if (messageQueue) {
         const summary = `Command "${command}" failed with error: ${stripAnsiColors(error.message)}`;
-        notificationQueue.enqueue(
+        messageQueue.enqueueNotification(
           `<task-notification>\n<task-id>${id}</task-id>\n<task-type>shell</task-type>\n<output-file>${logPath}</output-file>\n<status>failed</status>\n<summary>${summary}</summary>\n</task-notification>`,
         );
       }
@@ -337,13 +333,13 @@ export class BackgroundTaskManager {
 
       // Skip notification if task was manually killed (user/agent-initiated stop)
       if (!wasKilled) {
-        const notificationQueue = this.container.has("NotificationQueue")
-          ? this.container.get<NotificationQueue>("NotificationQueue")
+        const messageQueue = this.container.has("MessageQueue")
+          ? this.container.get<MessageQueue>("MessageQueue")
           : undefined;
-        if (notificationQueue) {
+        if (messageQueue) {
           const statusStr = shell.status;
           const summary = `Command "${command}" ${statusStr} with exit code ${code ?? 0}`;
-          notificationQueue.enqueue(
+          messageQueue.enqueueNotification(
             `<task-notification>\n<task-id>${id}</task-id>\n<task-type>shell</task-type>\n<output-file>${logPath}</output-file>\n<status>${statusStr}</status>\n<summary>${summary}</summary>\n</task-notification>`,
           );
         }
@@ -364,12 +360,12 @@ export class BackgroundTaskManager {
       this.notifyTasksChange();
 
       // Enqueue error notification
-      const notificationQueue = this.container.has("NotificationQueue")
-        ? this.container.get<NotificationQueue>("NotificationQueue")
+      const messageQueue = this.container.has("MessageQueue")
+        ? this.container.get<MessageQueue>("MessageQueue")
         : undefined;
-      if (notificationQueue) {
+      if (messageQueue) {
         const summary = `Command "${command}" failed with error: ${stripAnsiColors(error.message)}`;
-        notificationQueue.enqueue(
+        messageQueue.enqueueNotification(
           `<task-notification>\n<task-id>${id}</task-id>\n<task-type>shell</task-type>\n<output-file>${logPath}</output-file>\n<status>failed</status>\n<summary>${summary}</summary>\n</task-notification>`,
         );
       }

package/src/managers/messageQueue.ts

@@ -2,7 +2,7 @@ export type QueueState = "idle" | "dispatching" | "running";
 
 export interface QueuedMessage {
   id?: string;
-  type?: "message" | "bang";
+  type?: "message" | "bang" | "notification";
   content: string;
   images?: Array<{ path: string; mimeType: string }>;
   longTextMap?: Record<string, string>;
@@ -44,8 +44,12 @@ export class MessageQueue {
     return this.queue.shift() ?? null;
   }
 
+  /**
+   * Clear user-facing items (messages, bang commands) but preserve pending
+   * notifications so background task results are not lost on abort.
+   */
   clear(): void {
-    this.queue = [];
+    this.queue = this.queue.filter((m) => m.type === "notification");
     this._state = "idle";
   }
 
@@ -113,4 +117,41 @@ export class MessageQueue {
     this.queue = remaining;
     return editable;
   }
+
+  /**
+   * Enqueue a background task notification (XML string). Notifications are
+   * not user-editable and not surfaced in the queued-messages UI.
+   */
+  enqueueNotification(xml: string): void {
+    this.queue.push({
+      id: `mq-${this.nextId++}`,
+      type: "notification",
+      content: xml,
+      editable: false,
+    });
+    this.onMessageEnqueued?.();
+  }
+
+  /** Whether any notification items are pending. */
+  hasNotifications(): boolean {
+    return this.queue.some((m) => m.type === "notification");
+  }
+
+  /**
+   * Drain all notification items, returning their XML content. Non-notification
+   * items (messages, bang commands) are preserved in the queue.
+   */
+  drainNotifications(): string[] {
+    const notifications: string[] = [];
+    const remaining: QueuedMessage[] = [];
+    for (const msg of this.queue) {
+      if (msg.type === "notification") {
+        notifications.push(msg.content);
+      } else {
+        remaining.push(msg);
+      }
+    }
+    this.queue = remaining;
+    return notifications;
+  }
 }

package/src/managers/subagentManager.ts

@@ -19,7 +19,7 @@ import {
   createAbortPromise,
 } from "../utils/abortUtils.js";
 import { BackgroundTaskManager } from "./backgroundTaskManager.js";
-import { NotificationQueue } from "./notificationQueue.js";
+import { MessageQueue } from "./messageQueue.js";
 import { logger } from "../utils/globalLogger.js";
 import {
   UserMessageParams,
@@ -81,7 +81,6 @@ export interface SubagentInstance {
   toolManager: ToolManager;
   permissionManager: PermissionManager;
   backgroundTaskManager: BackgroundTaskManager;
-  notificationQueue: NotificationQueue;
   status: "initializing" | "active" | "completed" | "error" | "aborted";
   messages: Message[];
   usedTools: {
@@ -393,10 +392,6 @@ export class SubagentManager {
     });
     subagentContainer.register("AIManager", aiManager);
 
-    // Create isolated NotificationQueue for the subagent/forked agent
-    const subagentNotificationQueue = new NotificationQueue();
-    subagentContainer.register("NotificationQueue", subagentNotificationQueue);
-
     // Create isolated BackgroundTaskManager for the subagent/forked agent
     const subagentBackgroundTaskManager = new BackgroundTaskManager(
       subagentContainer,
@@ -417,7 +412,6 @@ export class SubagentManager {
       toolManager,
       permissionManager: subagentPermissionManager,
       backgroundTaskManager: subagentBackgroundTaskManager,
-      notificationQueue: subagentNotificationQueue,
       status: "initializing",
       messages: [],
       usedTools: [], // Initialize usedTools
@@ -657,12 +651,12 @@ export class SubagentManager {
           }
           // Skip notification if task was already stopped (e.g. by main agent shutdown)
           if (!wasAlreadyKilled) {
-            const notificationQueue = this.container.has("NotificationQueue")
-              ? this.container.get<NotificationQueue>("NotificationQueue")
+            const messageQueue = this.container.has("MessageQueue")
+              ? this.container.get<MessageQueue>("MessageQueue")
               : undefined;
-            if (notificationQueue) {
+            if (messageQueue) {
               const summary = `Agent task "${instance.description}" completed`;
-              notificationQueue.enqueue(
+              messageQueue.enqueueNotification(
                 `<task-notification>\n<task-id>${instance.backgroundTaskId}</task-id>\n<task-type>agent</task-type>\n<status>completed</status>\n<summary>${summary}</summary>\n</task-notification>`,
               );
             }
@@ -694,14 +688,14 @@ export class SubagentManager {
           }
           // Skip notification if task was already stopped (e.g. by main agent shutdown)
           if (!wasAlreadyKilled) {
-            const notificationQueue = this.container.has("NotificationQueue")
-              ? this.container.get<NotificationQueue>("NotificationQueue")
+            const messageQueue = this.container.has("MessageQueue")
+              ? this.container.get<MessageQueue>("MessageQueue")
               : undefined;
-            if (notificationQueue) {
+            if (messageQueue) {
               const errorMsg =
                 error instanceof Error ? error.message : String(error);
               const summary = `Agent task "${instance.description}" failed: ${errorMsg}`;
-              notificationQueue.enqueue(
+              messageQueue.enqueueNotification(
                 `<task-notification>\n<task-id>${instance.backgroundTaskId}</task-id>\n<task-type>agent</task-type>\n<status>failed</status>\n<summary>${summary}</summary>\n</task-notification>`,
               );
             }

package/src/managers/workflowManager.ts

@@ -4,7 +4,7 @@ import * as fs from "fs";
 import * as path from "path";
 import { Container } from "../utils/container.js";
 import { BackgroundTaskManager } from "./backgroundTaskManager.js";
-import { NotificationQueue } from "./notificationQueue.js";
+import { MessageQueue } from "./messageQueue.js";
 import { SubagentManager } from "./subagentManager.js";
 import { taskNotificationToXml } from "../utils/notificationXml.js";
 import { ConcurrencyLimiter } from "../workflow/concurrencyLimiter.js";
@@ -49,8 +49,8 @@ export class WorkflowManager {
     return this.container.get<BackgroundTaskManager>("BackgroundTaskManager")!;
   }
 
-  private get notificationQueue(): NotificationQueue {
-    return this.container.get<NotificationQueue>("NotificationQueue")!;
+  private get messageQueue(): MessageQueue {
+    return this.container.get<MessageQueue>("MessageQueue")!;
   }
 
   private get subagentManager(): SubagentManager {
@@ -295,7 +295,7 @@ export class WorkflowManager {
 
         // Enqueue completion notification
         const journalPath = journal.filePath;
-        this.notificationQueue.enqueue(
+        this.messageQueue.enqueueNotification(
           taskNotificationToXml({
             type: "task_notification",
             taskId: runId,
@@ -337,7 +337,7 @@ export class WorkflowManager {
           task.endTime = Date.now();
         }
 
-        this.notificationQueue.enqueue(
+        this.messageQueue.enqueueNotification(
           taskNotificationToXml({
             type: "task_notification",
             taskId: runId,

package/src/services/interactionService.ts

@@ -71,6 +71,13 @@ export class InteractionService {
         })),
       });
 
+      // Reserve loading state synchronously before any async work (hooks).
+      // This closes the race window where a concurrent notification/message
+      // could see isLoading=false during the await below and start a second
+      // sendAIMessage. sendAIMessage's generation guard is the backstop, but
+      // reserving here prevents the race at its source.
+      aiManager.setIsLoading(true);
+
       // Execute UserPromptSubmit hooks after adding the user message
       if (hookManager) {
         try {
@@ -104,6 +111,8 @@ export class InteractionService {
               "UserPromptSubmit hook blocked prompt processing with error:",
               processResult.errorMessage,
             );
+            // Release the loading state we reserved above
+            aiManager.setIsLoading(false);
             return; // Don't send to AI
           }
         } catch (error) {
@@ -116,6 +125,8 @@ export class InteractionService {
       await aiManager.sendAIMessage();
     } catch (error) {
       console.error("Failed to add user message:", error);
+      // Ensure loading state is released on error
+      aiManager.setIsLoading(false);
       // Loading state will be automatically updated by the useEffect that watches messages
     }
   }

package/src/services/taskManager.ts

@@ -7,6 +7,13 @@ import { logger } from "../utils/globalLogger.js";
 import { Container } from "../utils/container.js";
 import type { MessageManager } from "../managers/messageManager.js";
 
+function byIdAsc(a: Task, b: Task) {
+  const aNum = parseInt(a.id, 10);
+  const bNum = parseInt(b.id, 10);
+  if (!isNaN(aNum) && !isNaN(bNum)) return aNum - bNum;
+  return a.id.localeCompare(b.id);
+}
+
 export class TaskManager extends EventEmitter {
   private readonly baseDir: string;
   private taskListId: string;
@@ -234,7 +241,7 @@ export class TaskManager extends EventEmitter {
         }),
       );
 
-      return tasks.filter((t): t is Task => t !== null);
+      return tasks.filter((t): t is Task => t !== null).sort(byIdAsc);
     } catch (error) {
       if ((error as NodeJS.ErrnoException).code === "ENOENT") {
         return [];

package/src/utils/containerSetup.ts

@@ -1,7 +1,6 @@
 import { Container } from "./container.js";
 import { ForegroundTaskManager } from "../managers/foregroundTaskManager.js";
 import { BackgroundTaskManager } from "../managers/backgroundTaskManager.js";
-import { NotificationQueue } from "../managers/notificationQueue.js";
 import { MessageQueue } from "../managers/messageQueue.js";
 import { TaskManager } from "../services/taskManager.js";
 import { MessageManager } from "../managers/messageManager.js";
@@ -92,9 +91,6 @@ export function setupAgentContainer(
   // container so it is isolated per session, not shared process-wide.
   container.register("WorktreeSession", null);
 
-  const notificationQueue = new NotificationQueue();
-  container.register("NotificationQueue", notificationQueue);
-
   const messageQueue = new MessageQueue();
   container.register("MessageQueue", messageQueue);
 

package/dist/agent.d.ts.map

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