wave-agent-sdk 0.14.0 → 0.14.2

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":"AACA,OAAO,KAAK,EACV,OAAO,EACP,KAAK,EAGN,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAGlD,OAAO,EAAE,qCAAqC,EAAE,MAAM,qBAAqB,CAAC;AAI5E,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAC;IAChB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,MAAM,CAAC,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACnD,MAAM,CAAC,EAAE,aAAa,CAAC;IACvB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAGD,MAAM,WAAW,oBAAqB,SAAQ,iBAAiB;IAC7D,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,EAAE,CAAC,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,qBAAqB;IACpC,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,OAAO,GAAG,WAAW,GAAG,SAAS,GAAG,KAAK,CAAC;IAClD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,MAAM,CAAC,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACrD,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,sBAAsB,CAAC,EAAE,OAAO,CAAC;IACjC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAGD,MAAM,MAAM,0BAA0B,GAAG,IAAI,CAC3C,qBAAqB,EACrB,UAAU,CACX,CAAC;AAEF,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,GAAI,WAAW,MAAM,KAAG,MAmCxD,CAAC;AAEF,eAAO,MAAM,iBAAiB,QAAO,MAA+B,CAAC;AAGrE,eAAO,MAAM,wBAAwB,GAAI,0EAQtC,oBAAoB,KAAG,OAAO,EA6BhC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,2BAA2B,GACtC,UAAU,OAAO,EAAE,EACnB,IAAI,MAAM,EACV,QAAQ,OAAO,CAAC,iBAAiB,CAAC,KACjC,OAAO,EAwBT,CAAC;AAGF,eAAO,MAAM,6BAA6B,GACxC,UAAU,OAAO,EAAE,EACnB,UAAU,MAAM,EAChB,YAAY,qCAAqC,EAAE,EACnD,QAAQ,KAAK,EACb,mBAAmB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KACzC,OAAO,EA+BT,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,+BAA+B,GAC1C,UAAU,OAAO,EAAE,EACnB,WAAW,MAAM,EACjB,QAAQ,IAAI,CAAC,0BAA0B,EAAE,IAAI,CAAC,KAC7C;IAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAuB5C,CAAC;AAGF,eAAO,MAAM,wBAAwB,GAAI,6KAgBtC,qBAAqB,KAAG,OAAO,EAsFjC,CAAC;AAGF,eAAO,MAAM,sBAAsB,GAAI,sBAGpC,mBAAmB,KAAG,OAAO,EAgC/B,CAAC;AAGF,eAAO,MAAM,cAAc,GAAI,wBAG5B,aAAa,KAAG,OAAO,EAgBzB,CAAC;AAGF,eAAO,MAAM,mBAAmB,GAAI,gCAIjC,gBAAgB,KAAG,OAAO,EAmB5B,CAAC;AAGF,eAAO,MAAM,qBAAqB,GAAI,0CAKnC,kBAAkB,KAAG,OAAO,EAuB9B,CAAC;AAEF;;GAEG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,MAAM,CAU3D;AAED;;;GAGG;AACH,eAAO,MAAM,qBAAqB,GAAI,UAAU,OAAO,EAAE,KAAG,OAAO,EASlE,CAAC;AAEF;;;GAGG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAoBtD;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,GACb,MAAM,CAUR;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CAkB1D;AAED,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,OAAO,GAAG,OAAO,CAAC;IAC5B,MAAM,EAAE,WAAW,GAAG,QAAQ,GAAG,QAAQ,CAAC;IAC1C,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,eAAO,MAAM,gCAAgC,GAAI,8DAO9C,4BAA4B,KAAG,OAAO,EAiBxC,CAAC"}

package/dist/utils/messageOperations.js

@@ -423,9 +423,9 @@ export function getMessageContent(message) {
     if (bangBlock && "command" in bangBlock) {
         return `!${bangBlock.command}`;
     }
-    const compressBlock = message.blocks.find((block) => block.type === "compress");
-    if (compressBlock && "content" in compressBlock) {
-        return compressBlock.content;
+    const compactBlock = message.blocks.find((block) => block.type === "compact");
+    if (compactBlock && "content" in compactBlock) {
+        return compactBlock.content;
     }
     return "";
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wave-agent-sdk",
-  "version": "0.14.0",
+  "version": "0.14.2",
   "description": "SDK for building AI-powered development tools and agents",
   "keywords": [
     "ai",

package/src/agent.ts

@@ -317,9 +317,9 @@ export class Agent {
     return this.aiManager.isLoading;
   }
 
-  /** Get message compression status */
-  public get isCompressing(): boolean {
-    return this.aiManager.getIsCompressing();
+  /** Get message compaction status */
+  public get isCompacting(): boolean {
+    return this.aiManager.getIsCompacting();
   }
 
   /** Get bash command execution status */
@@ -633,6 +633,19 @@ export class Agent {
       this.pendingNotificationPromises = [];
     }
 
+    // Fire SessionEnd hooks (fire-and-forget, don't block shutdown)
+    try {
+      const sessionId = this.messageManager.getSessionId();
+      const transcriptPath = this.messageManager.getTranscriptPath();
+      await this.hookManager.executeSessionEndHooks(
+        "stop",
+        sessionId,
+        transcriptPath,
+      );
+    } catch (error) {
+      this.logger?.warn(`SessionEnd hooks failed: ${(error as Error).message}`);
+    }
+
     await this.messageManager.saveSession();
     this.abortAIMessage(); // This will abort tools including Agent tool (subagents)
     this.abortBashCommand();

package/src/core/plugin.ts

@@ -30,7 +30,10 @@ export class PluginCore {
     this.workdir = workdir;
     this.container = new Container();
     this.configurationService = new ConfigurationService();
-    this.marketplaceService = new MarketplaceService();
+    this.marketplaceService = new MarketplaceService(
+      this.workdir,
+      this.configurationService,
+    );
 
     // Wire up ConfigurationService in the container for PluginManager to use
     this.container.register("ConfigurationService", this.configurationService);
@@ -122,7 +125,7 @@ export class PluginCore {
     for (const m of marketplaces) {
       try {
         const manifest = await this.marketplaceService.loadMarketplaceManifest(
-          this.marketplaceService.getMarketplacePath(m),
+          this.marketplaceService.getMarketplacePath(m.source),
         );
         manifest.plugins.forEach((p) => {
           const pluginId = `${p.name}@${m.name}`;
@@ -154,15 +157,18 @@ export class PluginCore {
   /**
    * Adds a new marketplace
    */
-  async addMarketplace(input: string): Promise<KnownMarketplace> {
-    return await this.marketplaceService.addMarketplace(input);
+  async addMarketplace(
+    input: string,
+    scope: Scope = "user",
+  ): Promise<KnownMarketplace> {
+    return await this.marketplaceService.addMarketplace(input, scope);
   }
 
   /**
    * Removes a marketplace by name
    */
-  async removeMarketplace(name: string): Promise<void> {
-    await this.marketplaceService.removeMarketplace(name);
+  async removeMarketplace(name: string, scope?: Scope): Promise<void> {
+    await this.marketplaceService.removeMarketplace(name, scope);
   }
 
   /**
@@ -208,7 +214,7 @@ export class PluginCore {
    * Resolves the local path for a marketplace
    */
   getMarketplacePath(marketplace: KnownMarketplace): string {
-    return this.marketplaceService.getMarketplacePath(marketplace);
+    return this.marketplaceService.getMarketplacePath(marketplace.source);
   }
 
   /**

package/src/managers/aiManager.ts

@@ -30,7 +30,7 @@ import type { NotificationQueue } from "./notificationQueue.js";
 import { logger } from "../utils/globalLogger.js";
 
 export interface AIManagerCallbacks {
-  onCompressionStateChange?: (isCompressing: boolean) => void;
+  onCompactionStateChange?: (isCompacting: boolean) => void;
   onUsageAdded?: (usage: Usage) => void;
   onCwdChange?: (newCwd: string) => void;
 }
@@ -58,7 +58,7 @@ export class AIManager {
   private stream: boolean; // Streaming mode flag
   private modelOverride?: string;
   private _onCwdChange?: (newCwd: string) => void; // Store callback for CWD changes
-  private consecutiveCompressionFailures: number = 0;
+  private consecutiveCompactionFailures: number = 0;
 
   // Service overrides
   constructor(
@@ -177,7 +177,7 @@ export class AIManager {
     this._onCwdChange = callback;
   }
 
-  private isCompressing: boolean = false;
+  private isCompacting: boolean = false;
   private callbacks: AIManagerCallbacks;
 
   /**
@@ -253,8 +253,8 @@ export class AIManager {
     return "";
   }
 
-  // Private method to handle token statistics and message compression
-  private async handleTokenUsageAndCompression(
+  // Private method to handle token statistics and message compaction
+  private async handleTokenUsageAndCompaction(
     usage: Usage | undefined,
     abortController: AbortController,
   ): Promise<void> {
@@ -272,30 +272,30 @@ export class AIManager {
       this.getMaxInputTokens()
     ) {
       logger?.debug(
-        `Token usage exceeded ${this.getMaxInputTokens()}, compressing messages...`,
+        `Token usage exceeded ${this.getMaxInputTokens()}, compacting messages...`,
       );
 
-      // Check if messages need compression
-      const messagesToCompress = this.messageManager.getMessages();
+      // Check if messages need compaction
+      const messagesToCompact = this.messageManager.getMessages();
 
-      // If there are messages to compress, perform compression
-      if (messagesToCompress.length > 0) {
-        // Circuit breaker: skip compression after 3 consecutive failures
-        if (this.consecutiveCompressionFailures >= 3) {
+      // If there are messages to compact, perform compaction
+      if (messagesToCompact.length > 0) {
+        // Circuit breaker: skip compaction after 3 consecutive failures
+        if (this.consecutiveCompactionFailures >= 3) {
           logger?.warn(
-            `Skipping compression: ${this.consecutiveCompressionFailures} consecutive failures`,
+            `Skipping compaction: ${this.consecutiveCompactionFailures} consecutive failures`,
           );
           return;
         }
 
-        const recentChatMessages = convertMessagesForAPI(messagesToCompress);
+        const recentChatMessages = convertMessagesForAPI(messagesToCompact);
 
-        // Save session before compression to preserve original messages
+        // Save session before compaction to preserve original messages
         await this.messageManager.saveSession();
 
-        this.setIsCompressing(true);
+        this.setIsCompacting(true);
         try {
-          const compressionResult = await aiService.compressMessages({
+          const compactResult = await aiService.compactMessages({
             gatewayConfig: this.getGatewayConfig(),
             modelConfig: this.getModelConfig(),
             messages: recentChatMessages,
@@ -303,15 +303,15 @@ export class AIManager {
             model: this.getModelConfig().fastModel,
           });
 
-          // Handle usage tracking for compression operations
-          let compressionUsage: Usage | undefined;
-          if (compressionResult.usage) {
-            compressionUsage = {
-              prompt_tokens: compressionResult.usage.prompt_tokens,
-              completion_tokens: compressionResult.usage.completion_tokens,
-              total_tokens: compressionResult.usage.total_tokens,
+          // Handle usage tracking for compaction operations
+          let compactUsage: Usage | undefined;
+          if (compactResult.usage) {
+            compactUsage = {
+              prompt_tokens: compactResult.usage.prompt_tokens,
+              completion_tokens: compactResult.usage.completion_tokens,
+              total_tokens: compactResult.usage.total_tokens,
               model: this.getModelConfig().fastModel,
-              operation_type: "compress",
+              operation_type: "compact",
             };
           }
 
@@ -364,73 +364,152 @@ export class AIManager {
             }
           }
 
-          // 4. Skills context
-          const skills =
-            this.skillManager
-              ?.getAvailableSkills()
-              .filter((s) => !s.disableModelInvocation) || [];
-          if (skills.length > 0) {
-            const skillList = skills
-              .map((s) => `- ${s.name}: ${s.description || ""}`)
-              .join("\n");
-            contextParts.push(`\n\n[Available Skills]\n${skillList}`);
+          // 4. Invoked skills context (with token budget, matching Claude Code)
+          const POST_COMPACT_SKILLS_TOKEN_BUDGET = 25_000;
+          const POST_COMPACT_MAX_TOKENS_PER_SKILL = 5_000;
+          const invokedSkillNames =
+            this.messageManager.getInvokedSkillNames(10);
+          if (invokedSkillNames.length > 0 && this.skillManager) {
+            const invokedSkillParts: string[] = [];
+            let skillsUsedTokens = 0;
+            for (const skillName of invokedSkillNames) {
+              try {
+                const skill = await this.skillManager.loadSkill(skillName);
+                if (!skill) continue;
+
+                // Extract content after frontmatter (matching prepareSkillContent pattern)
+                const contentMatch = skill.content.match(
+                  /^---\n[\s\S]*?\n---\n([\s\S]*)$/,
+                );
+                let skillContent = contentMatch
+                  ? contentMatch[1].trim()
+                  : skill.content;
+
+                // Per-skill token budget enforcement (~4 chars per token)
+                const maxSkillChars = POST_COMPACT_MAX_TOKENS_PER_SKILL * 4;
+                if (skillContent.length > maxSkillChars) {
+                  skillContent =
+                    skillContent.slice(0, maxSkillChars) +
+                    "\n\n...[truncated]...";
+                }
+
+                const skillTokens = Math.ceil(skillContent.length / 4);
+                if (
+                  skillsUsedTokens + skillTokens >
+                  POST_COMPACT_SKILLS_TOKEN_BUDGET
+                )
+                  break;
+                skillsUsedTokens += skillTokens;
+
+                invokedSkillParts.push(
+                  `\n\n## ${skill.name}\n${skill.description ? `*${skill.description}*\n\n` : ""}\`\`\`\n${skillContent}\n\`\`\``,
+                );
+              } catch {
+                // Skip skills that can't be loaded
+              }
+            }
+            if (invokedSkillParts.length > 0) {
+              contextParts.push(
+                `\n\n[Invoked Skills]\n${invokedSkillParts.join("")}`,
+              );
+            }
           }
 
-          // 5. Background agents status
-          const agents = this.backgroundTaskManager?.getAllTasks() || [];
+          // 5. Background subagent status (shell tasks excluded, matching Claude Code's createAsyncAgentAttachmentsIfNeeded)
+          const agents =
+            this.backgroundTaskManager
+              ?.getAllTasks()
+              .filter((a) => a.type === "subagent") || [];
           if (agents.length > 0) {
-            const agentList = agents
-              .map((a) => `- Agent "${a.description}": ${a.status}`)
-              .join("\n");
-            contextParts.push(`\n\n[Background Tasks]\n${agentList}`);
+            const agentParts: string[] = [];
+            for (const a of agents) {
+              if (a.status === "killed") {
+                agentParts.push(
+                  `Task "${a.description}" (${a.id}) was stopped by the user.`,
+                );
+              } else if (a.status === "running") {
+                const parts = [
+                  `Background agent "${a.description}" (${a.id}) is still running.`,
+                  `Do NOT spawn a duplicate. You will be notified when it completes.`,
+                ];
+                if (a.outputPath) {
+                  parts.push(`You can read partial output at ${a.outputPath}.`);
+                }
+                agentParts.push(parts.join(" "));
+              } else {
+                // completed or failed
+                const parts = [
+                  `Task ${a.id} (status: ${a.status}) (description: ${a.description}).`,
+                ];
+                const deltaText = a.status === "failed" ? a.stderr : a.stdout;
+                if (deltaText && deltaText.length > 0) {
+                  const summary =
+                    deltaText.length > 500
+                      ? deltaText.slice(0, 500) + "..."
+                      : deltaText;
+                  parts.push(`Delta: ${summary}`);
+                }
+                if (a.outputPath) {
+                  parts.push(
+                    `Read the output file to retrieve the result: ${a.outputPath}.`,
+                  );
+                }
+                agentParts.push(parts.join(" "));
+              }
+            }
+            if (agentParts.length > 0) {
+              contextParts.push(
+                `\n\n[Background Tasks]\n${agentParts.join("\n")}`,
+              );
+            }
           }
 
           // Merge context restoration into summary
           const enhancedSummary =
-            compressionResult.content +
+            compactResult.content +
             (contextParts.length > 0
               ? `\n\n[Context Restoration]` + contextParts.join("")
               : "");
 
-          // Execute message reconstruction and sessionId update after compression
-          this.messageManager.compressMessagesAndUpdateSession(
+          // Execute message reconstruction and sessionId update after compaction
+          this.messageManager.compactMessagesAndUpdateSession(
             enhancedSummary,
-            compressionUsage,
+            compactUsage,
           );
 
           // Notify Agent to add to usage tracking
-          if (compressionUsage && this.callbacks?.onUsageAdded) {
-            this.callbacks.onUsageAdded(compressionUsage);
+          if (compactUsage && this.callbacks?.onUsageAdded) {
+            this.callbacks.onUsageAdded(compactUsage);
           }
 
           logger?.debug(
-            `Successfully compressed ${messagesToCompress.length} messages and updated session`,
+            `Successfully compacted ${messagesToCompact.length} messages and updated session`,
           );
-          this.consecutiveCompressionFailures = 0;
-        } catch (compressError) {
-          this.consecutiveCompressionFailures++;
+          this.consecutiveCompactionFailures = 0;
+        } catch (compactError) {
+          this.consecutiveCompactionFailures++;
           logger?.error(
-            `Failed to compress messages (${this.consecutiveCompressionFailures} consecutive):`,
-            compressError,
+            `Failed to compact messages (${this.consecutiveCompactionFailures} consecutive):`,
+            compactError,
           );
           this.messageManager.addErrorBlock(
-            `Failed to compress conversation history: ${compressError instanceof Error ? compressError.message : String(compressError)}. You may encounter context limit issues.`,
+            `Failed to compact conversation history: ${compactError instanceof Error ? compactError.message : String(compactError)}. You may encounter context limit issues.`,
           );
         } finally {
-          this.setIsCompressing(false);
+          this.setIsCompacting(false);
         }
       }
     }
   }
 
-  public getIsCompressing(): boolean {
-    return this.isCompressing;
+  public getIsCompacting(): boolean {
+    return this.isCompacting;
   }
 
-  public setIsCompressing(isCompressing: boolean): void {
-    if (this.isCompressing !== isCompressing) {
-      this.isCompressing = isCompressing;
-      this.callbacks.onCompressionStateChange?.(isCompressing);
+  public setIsCompacting(isCompacting: boolean): void {
+    if (this.isCompacting !== isCompacting) {
+      this.isCompacting = isCompacting;
+      this.callbacks.onCompactionStateChange?.(isCompacting);
     }
   }
 
@@ -914,8 +993,8 @@ export class AIManager {
         await Promise.all(toolExecutionPromises);
       }
 
-      // Handle token statistics and message compression
-      await this.handleTokenUsageAndCompression(result.usage, abortController);
+      // Handle token statistics and message compaction
+      await this.handleTokenUsageAndCompaction(result.usage, abortController);
 
       // Finalize text/reasoning blocks for the final response (no tools)
       this.messageManager.finalizeStreamingBlocks();

package/src/managers/backgroundTaskManager.ts

@@ -2,11 +2,7 @@ import { spawn, type ChildProcess } from "child_process";
 import * as os from "os";
 import * as fs from "fs";
 import * as path from "path";
-import {
-  BackgroundTask,
-  BackgroundShell,
-  BackgroundSubagent,
-} from "../types/processes.js";
+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";
@@ -157,22 +153,27 @@ export class BackgroundTaskManager {
       if (logStream.writable) {
         logStream.end();
       }
-      shell.status = code === 0 ? "completed" : "failed";
+      const wasKilled = shell.status === "killed";
+      if (!wasKilled) {
+        shell.status = code === 0 ? "completed" : "failed";
+      }
       shell.exitCode = code ?? 0;
       shell.endTime = Date.now();
       shell.runtime = shell.endTime - startTime;
       this.notifyTasksChange();
 
-      // Enqueue completion notification
-      const notificationQueue = this.container.has("NotificationQueue")
-        ? this.container.get<NotificationQueue>("NotificationQueue")
-        : undefined;
-      if (notificationQueue) {
-        const statusStr = shell.status;
-        const summary = `Command "${command}" ${statusStr} with exit code ${code ?? 0}`;
-        notificationQueue.enqueue(
-          `<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>`,
-        );
+      // Skip notification if task was manually killed (user/agent-initiated stop)
+      if (!wasKilled) {
+        const notificationQueue = this.container.has("NotificationQueue")
+          ? this.container.get<NotificationQueue>("NotificationQueue")
+          : undefined;
+        if (notificationQueue) {
+          const statusStr = shell.status;
+          const summary = `Command "${command}" ${statusStr} with exit code ${code ?? 0}`;
+          notificationQueue.enqueue(
+            `<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>`,
+          );
+        }
       }
     };
 
@@ -305,22 +306,27 @@ export class BackgroundTaskManager {
       if (logStream.writable) {
         logStream.end();
       }
-      shell.status = code === 0 ? "completed" : "failed";
+      const wasKilled = shell.status === "killed";
+      if (!wasKilled) {
+        shell.status = code === 0 ? "completed" : "failed";
+      }
       shell.exitCode = code ?? 0;
       shell.endTime = Date.now();
       shell.runtime = shell.endTime - startTime;
       this.notifyTasksChange();
 
-      // Enqueue completion notification
-      const notificationQueue = this.container.has("NotificationQueue")
-        ? this.container.get<NotificationQueue>("NotificationQueue")
-        : undefined;
-      if (notificationQueue) {
-        const statusStr = shell.status;
-        const summary = `Command "${command}" ${statusStr} with exit code ${code ?? 0}`;
-        notificationQueue.enqueue(
-          `<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>`,
-        );
+      // Skip notification if task was manually killed (user/agent-initiated stop)
+      if (!wasKilled) {
+        const notificationQueue = this.container.has("NotificationQueue")
+          ? this.container.get<NotificationQueue>("NotificationQueue")
+          : undefined;
+        if (notificationQueue) {
+          const statusStr = shell.status;
+          const summary = `Command "${command}" ${statusStr} with exit code ${code ?? 0}`;
+          notificationQueue.enqueue(
+            `<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>`,
+          );
+        }
       }
     });
 
@@ -427,21 +433,6 @@ export class BackgroundTaskManager {
     task.runtime = task.endTime - task.startTime;
     this.notifyTasksChange();
 
-    // Enqueue killed notification
-    const notificationQueue = this.container.has("NotificationQueue")
-      ? this.container.get<NotificationQueue>("NotificationQueue")
-      : undefined;
-    if (notificationQueue) {
-      const description = (task as BackgroundSubagent).description || "";
-      const command = (task as BackgroundShell).command || "";
-      const summary =
-        task.type === "subagent"
-          ? `Agent task "${description}" was stopped`
-          : `Command "${command}" was stopped`;
-      notificationQueue.enqueue(
-        `<task-notification>\n<task-id>${id}</task-id>\n<task-type>${task.type}</task-type>\n<status>killed</status>\n<summary>${summary}</summary>\n</task-notification>`,
-      );
-    }
     return true;
   }