wave-agent-sdk 0.6.5 → 0.7.1

package/dist/core/plugin.js

@@ -0,0 +1,164 @@
+import { Container } from "../utils/container.js";
+import { PluginManager } from "../managers/pluginManager.js";
+import { PluginScopeManager } from "../managers/pluginScopeManager.js";
+import { MarketplaceService } from "../services/MarketplaceService.js";
+import { ConfigurationService } from "../services/configurationService.js";
+/**
+ * PluginCore
+ *
+ * Encapsulates plugin management logic, providing a high-level API for
+ * installing, uninstalling, enabling, and disabling plugins.
+ */
+export class PluginCore {
+    constructor(workdir = process.cwd()) {
+        this.workdir = workdir;
+        this.container = new Container();
+        this.configurationService = new ConfigurationService();
+        this.marketplaceService = new MarketplaceService();
+        // Wire up ConfigurationService in the container for PluginManager to use
+        this.container.register("ConfigurationService", this.configurationService);
+        this.pluginManager = new PluginManager(this.container, {
+            workdir: this.workdir,
+        });
+        this.pluginScopeManager = new PluginScopeManager({
+            workdir: this.workdir,
+            configurationService: this.configurationService,
+            pluginManager: this.pluginManager,
+        });
+    }
+    /**
+     * Installs a plugin from a marketplace
+     */
+    async installPlugin(pluginId, scope) {
+        const installedPlugin = await this.marketplaceService.installPlugin(pluginId);
+        if (scope) {
+            await this.enablePlugin(pluginId, scope);
+        }
+        return installedPlugin;
+    }
+    /**
+     * Uninstalls a plugin and removes it from all configuration scopes
+     */
+    async uninstallPlugin(pluginId) {
+        await this.marketplaceService.uninstallPlugin(pluginId);
+        await this.pluginScopeManager.removePluginFromAllScopes(pluginId);
+    }
+    /**
+     * Enables a plugin in the specified scope. If no scope is provided, it tries to find
+     * the scope where the plugin is already configured, or defaults to "user".
+     */
+    async enablePlugin(pluginId, scope) {
+        const targetScope = scope || this.findPluginScope(pluginId) || "user";
+        await this.pluginScopeManager.enablePlugin(targetScope, pluginId);
+        return targetScope;
+    }
+    /**
+     * Disables a plugin in the specified scope. If no scope is provided, it tries to find
+     * the scope where the plugin is already configured, or defaults to "user".
+     */
+    async disablePlugin(pluginId, scope) {
+        const targetScope = scope || this.findPluginScope(pluginId) || "user";
+        await this.pluginScopeManager.disablePlugin(targetScope, pluginId);
+        return targetScope;
+    }
+    /**
+     * Updates an installed plugin to the latest version from its marketplace
+     */
+    async updatePlugin(pluginId) {
+        return await this.marketplaceService.updatePlugin(pluginId);
+    }
+    /**
+     * Lists all plugins from all registered marketplaces with their installation and enabled status
+     */
+    async listPlugins() {
+        const installedPlugins = await this.marketplaceService.getInstalledPlugins();
+        const marketplaces = await this.marketplaceService.listMarketplaces();
+        const mergedEnabled = this.configurationService.getMergedEnabledPlugins(this.workdir);
+        const allMarketplacePlugins = [];
+        for (const m of marketplaces) {
+            try {
+                const manifest = await this.marketplaceService.loadMarketplaceManifest(this.marketplaceService.getMarketplacePath(m));
+                manifest.plugins.forEach((p) => {
+                    const pluginId = `${p.name}@${m.name}`;
+                    const installed = installedPlugins.plugins.find((ip) => ip.name === p.name && ip.marketplace === m.name);
+                    allMarketplacePlugins.push({
+                        ...p,
+                        marketplace: m.name,
+                        installed: !!installed,
+                        version: installed?.version,
+                        cachePath: installed?.cachePath,
+                        projectPath: installed?.projectPath,
+                        scope: this.pluginScopeManager.findPluginScope(pluginId) || undefined,
+                    });
+                });
+            }
+            catch {
+                // Skip marketplaces that fail to load
+            }
+        }
+        return {
+            plugins: allMarketplacePlugins,
+            mergedEnabled,
+        };
+    }
+    /**
+     * Adds a new marketplace
+     */
+    async addMarketplace(input) {
+        return await this.marketplaceService.addMarketplace(input);
+    }
+    /**
+     * Removes a marketplace by name
+     */
+    async removeMarketplace(name) {
+        await this.marketplaceService.removeMarketplace(name);
+    }
+    /**
+     * Updates a specific marketplace or all marketplaces
+     */
+    async updateMarketplace(name) {
+        await this.marketplaceService.updateMarketplace(name);
+    }
+    /**
+     * Lists all registered marketplaces
+     */
+    async listMarketplaces() {
+        return await this.marketplaceService.listMarketplaces();
+    }
+    /**
+     * Gets the registry of all installed plugins
+     */
+    async getInstalledPlugins() {
+        return await this.marketplaceService.getInstalledPlugins();
+    }
+    /**
+     * Gets the merged enabled state of all plugins across all scopes
+     */
+    getMergedEnabledPlugins() {
+        return this.configurationService.getMergedEnabledPlugins(this.workdir);
+    }
+    /**
+     * Loads a marketplace manifest from a local path
+     */
+    async loadMarketplaceManifest(marketplacePath) {
+        return await this.marketplaceService.loadMarketplaceManifest(marketplacePath);
+    }
+    /**
+     * Resolves the local path for a marketplace
+     */
+    getMarketplacePath(marketplace) {
+        return this.marketplaceService.getMarketplacePath(marketplace);
+    }
+    /**
+     * Finds the scope where a plugin is currently enabled/disabled
+     */
+    findPluginScope(pluginId) {
+        return this.pluginScopeManager.findPluginScope(pluginId);
+    }
+    /**
+     * Removes a plugin from the enabled plugins in the specified scope
+     */
+    async removeEnabledPlugin(scope, pluginId) {
+        await this.configurationService.removeEnabledPlugin(this.workdir, scope, pluginId);
+    }
+}

package/dist/core/session.d.ts

@@ -0,0 +1,3 @@
+export { listSessions, truncateContent, loadSessionFromJsonl, } from "../services/session.js";
+export type { SessionMetadata, SessionData } from "../services/session.js";
+//# sourceMappingURL=session.d.ts.map

package/dist/core/session.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/core/session.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,eAAe,EACf,oBAAoB,GACrB,MAAM,wBAAwB,CAAC;AAChC,YAAY,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC"}

package/dist/core/session.js

@@ -0,0 +1 @@
+export { listSessions, truncateContent, loadSessionFromJsonl, } from "../services/session.js";

package/dist/index.d.ts

@@ -1,14 +1,7 @@
-export * from "./services/aiService.js";
-export * from "./services/memory.js";
-export * from "./services/session.js";
-export * from "./services/hook.js";
-export * from "./services/jsonlHandler.js";
-export * from "./services/configurationService.js";
-export * from "./services/MarketplaceService.js";
+export * from "./core/session.js";
 export * from "./constants/tools.js";
-export * from "./managers/pluginManager.js";
-export * from "./managers/pluginScopeManager.js";
 export * from "./agent.js";
+export * from "./core/plugin.js";
 export * from "./utils/bashParser.js";
 export * from "./utils/convertMessagesForAPI.js";
 export * from "./utils/fileFilter.js";

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,cAAc,yBAAyB,CAAC;AACxC,cAAc,sBAAsB,CAAC;AACrC,cAAc,uBAAuB,CAAC;AACtC,cAAc,oBAAoB,CAAC;AACnC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,oCAAoC,CAAC;AACnD,cAAc,kCAAkC,CAAC;AAGjD,cAAc,sBAAsB,CAAC;AAGrC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,kCAAkC,CAAC;AAGjD,cAAc,YAAY,CAAC;AAG3B,cAAc,uBAAuB,CAAC;AACtC,cAAc,kCAAkC,CAAC;AACjD,cAAc,uBAAuB,CAAC;AACtC,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,qBAAqB,CAAC;AACpC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,iBAAiB,CAAC;AAChC,cAAc,0BAA0B,CAAC;AACzC,cAAc,wBAAwB,CAAC;AACvC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC;AACvC,cAAc,6BAA6B,CAAC;AAG5C,cAAc,kBAAkB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,cAAc,mBAAmB,CAAC;AAGlC,cAAc,sBAAsB,CAAC;AAGrC,cAAc,YAAY,CAAC;AAC3B,cAAc,kBAAkB,CAAC;AAGjC,cAAc,uBAAuB,CAAC;AACtC,cAAc,kCAAkC,CAAC;AACjD,cAAc,uBAAuB,CAAC;AACtC,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,qBAAqB,CAAC;AACpC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,iBAAiB,CAAC;AAChC,cAAc,0BAA0B,CAAC;AACzC,cAAc,wBAAwB,CAAC;AACvC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,wBAAwB,CAAC;AACvC,cAAc,6BAA6B,CAAC;AAG5C,cAAc,kBAAkB,CAAC"}

package/dist/index.js

@@ -1,18 +1,10 @@
 // Export all services
-export * from "./services/aiService.js";
-export * from "./services/memory.js";
-export * from "./services/session.js";
-export * from "./services/hook.js";
-export * from "./services/jsonlHandler.js";
-export * from "./services/configurationService.js"; // New configuration management service
-export * from "./services/MarketplaceService.js";
+export * from "./core/session.js";
 // Export constants
 export * from "./constants/tools.js";
-// Export managers
-export * from "./managers/pluginManager.js";
-export * from "./managers/pluginScopeManager.js";
 // Export main agent
 export * from "./agent.js";
+export * from "./core/plugin.js";
 // Export all utilities
 export * from "./utils/bashParser.js";
 export * from "./utils/convertMessagesForAPI.js";

package/dist/managers/MemoryRuleManager.d.ts

@@ -1,4 +1,5 @@
 import type { MemoryRule } from "../types/memoryRule.js";
+import { Container } from "../utils/container.js";
 export interface MemoryRuleRegistryState {
     /** All discovered rules, indexed by ID */
     rules: Record<string, MemoryRule>;
@@ -9,10 +10,11 @@ export interface MemoryRuleManagerOptions {
     workdir: string;
 }
 export declare class MemoryRuleManager {
+    private container;
     private state;
     private workdir;
     private service;
-    constructor(options: MemoryRuleManagerOptions);
+    constructor(container: Container, options: MemoryRuleManagerOptions);
     /**
      * Scans .wave/rules and ~/.wave/rules for memory rule files.
      */

package/dist/managers/MemoryRuleManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MemoryRuleManager.d.ts","sourceRoot":"","sources":["../../src/managers/MemoryRuleManager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAOzD,MAAM,WAAW,uBAAuB;IACtC,0CAA0C;IAC1C,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAClC,0DAA0D;IAC1D,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAC5B;AAED,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,qBAAa,iBAAiB;IAC5B,OAAO,CAAC,KAAK,CAGX;IAEF,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,OAAO,CAAoB;gBAEvB,OAAO,EAAE,wBAAwB;IAK7C;;OAEG;IACG,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;YA8BtB,aAAa;YAyDb,YAAY;IAsB1B;;OAEG;IACH,cAAc,CAAC,cAAc,EAAE,MAAM,EAAE,GAAG,UAAU,EAAE;IAUtD;;OAEG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;CAG9B"}
+{"version":3,"file":"MemoryRuleManager.d.ts","sourceRoot":"","sources":["../../src/managers/MemoryRuleManager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAOzD,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAElD,MAAM,WAAW,uBAAuB;IACtC,0CAA0C;IAC1C,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAClC,0DAA0D;IAC1D,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAC5B;AAED,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,qBAAa,iBAAiB;IAU1B,OAAO,CAAC,SAAS;IATnB,OAAO,CAAC,KAAK,CAGX;IAEF,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,OAAO,CAAoB;gBAGzB,SAAS,EAAE,SAAS,EAC5B,OAAO,EAAE,wBAAwB;IAMnC;;OAEG;IACG,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;YA8BtB,aAAa;YAyDb,YAAY;IAsB1B;;OAEG;IACH,cAAc,CAAC,cAAc,EAAE,MAAM,EAAE,GAAG,UAAU,EAAE;IAUtD;;OAEG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;CAG9B"}

package/dist/managers/MemoryRuleManager.js

@@ -4,7 +4,8 @@ import * as path from "node:path";
 import * as os from "node:os";
 import { logger } from "../utils/globalLogger.js";
 export class MemoryRuleManager {
-    constructor(options) {
+    constructor(container, options) {
+        this.container = container;
         this.state = {
             rules: {},
             activeRuleIds: new Set(),

package/dist/managers/aiManager.d.ts

@@ -1,26 +1,14 @@
-import type { Logger, GatewayConfig, ModelConfig, Usage } from "../types/index.js";
-import type { ToolManager } from "./toolManager.js";
-import type { MessageManager } from "./messageManager.js";
-import type { BackgroundTaskManager } from "./backgroundTaskManager.js";
-import type { HookManager } from "./hookManager.js";
-import type { PermissionManager } from "./permissionManager.js";
+import type { GatewayConfig, ModelConfig, Usage } from "../types/index.js";
+import { Container } from "../utils/container.js";
 export interface AIManagerCallbacks {
     onCompressionStateChange?: (isCompressing: boolean) => void;
     onUsageAdded?: (usage: Usage) => void;
 }
 export interface AIManagerOptions {
-    messageManager: MessageManager;
-    toolManager: ToolManager;
-    taskManager: import("../services/taskManager.js").TaskManager;
-    logger?: Logger;
-    backgroundTaskManager?: BackgroundTaskManager;
-    hookManager?: HookManager;
-    permissionManager?: PermissionManager;
     callbacks?: AIManagerCallbacks;
     workdir: string;
     systemPrompt?: string;
     subagentType?: string;
-    reversionManager?: import("./reversionManager.js").ReversionManager;
     /**Whether to use streaming mode for AI responses - defaults to true */
     stream?: boolean;
     getGatewayConfig: () => GatewayConfig;
@@ -30,17 +18,10 @@ export interface AIManagerOptions {
     getEnvironmentVars?: () => Record<string, string>;
 }
 export declare class AIManager {
+    private container;
     isLoading: boolean;
     private abortController;
     private toolAbortController;
-    private logger?;
-    private toolManager;
-    private messageManager;
-    private taskManager;
-    private backgroundTaskManager?;
-    private hookManager?;
-    private reversionManager?;
-    private permissionManager?;
     private workdir;
     private systemPrompt?;
     private subagentType?;
@@ -50,7 +31,14 @@ export declare class AIManager {
     private getMaxInputTokensFn;
     private getLanguageFn;
     private getEnvironmentVarsFn?;
-    constructor(options: AIManagerOptions);
+    constructor(container: Container, options: AIManagerOptions);
+    private get toolManager();
+    private get messageManager();
+    private get taskManager();
+    private get backgroundTaskManager();
+    private get hookManager();
+    private get reversionManager();
+    private get permissionManager();
     getGatewayConfig(): GatewayConfig;
     getModelConfig(): ModelConfig;
     getMaxInputTokens(): number;
@@ -67,6 +55,8 @@ export declare class AIManager {
     private handleTokenUsageAndCompression;
     getIsCompressing(): boolean;
     setIsCompressing(isCompressing: boolean): void;
+    private get subagentManager();
+    private get skillManager();
     sendAIMessage(options?: {
         recursionDepth?: number;
         model?: string;

package/dist/managers/aiManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"aiManager.d.ts","sourceRoot":"","sources":["../../src/managers/aiManager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"aiManager.d.ts","sourceRoot":"","sources":["../../src/managers/aiManager.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAY3E,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAIlD,MAAM,WAAW,kBAAkB;IACjC,wBAAwB,CAAC,EAAE,CAAC,aAAa,EAAE,OAAO,KAAK,IAAI,CAAC;IAC5D,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;CACvC;AAED,MAAM,WAAW,gBAAgB;IAC/B,SAAS,CAAC,EAAE,kBAAkB,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,uEAAuE;IACvE,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB,gBAAgB,EAAE,MAAM,aAAa,CAAC;IACtC,cAAc,EAAE,MAAM,WAAW,CAAC;IAClC,iBAAiB,EAAE,MAAM,MAAM,CAAC;IAChC,WAAW,EAAE,MAAM,MAAM,GAAG,SAAS,CAAC;IACtC,kBAAkB,CAAC,EAAE,MAAM,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACnD;AAED,qBAAa,SAAS;IAkBlB,OAAO,CAAC,SAAS;IAjBZ,SAAS,EAAE,OAAO,CAAS;IAClC,OAAO,CAAC,eAAe,CAAgC;IACvD,OAAO,CAAC,mBAAmB,CAAgC;IAC3D,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,YAAY,CAAC,CAAS;IAC9B,OAAO,CAAC,YAAY,CAAC,CAAS;IAC9B,OAAO,CAAC,MAAM,CAAU;IAGxB,OAAO,CAAC,kBAAkB,CAAsB;IAChD,OAAO,CAAC,gBAAgB,CAAoB;IAC5C,OAAO,CAAC,mBAAmB,CAAe;IAC1C,OAAO,CAAC,aAAa,CAA2B;IAChD,OAAO,CAAC,oBAAoB,CAAC,CAA+B;gBAIlD,SAAS,EAAE,SAAS,EAC5B,OAAO,EAAE,gBAAgB;IAgB3B,OAAO,KAAK,WAAW,GAEtB;IAED,OAAO,KAAK,cAAc,GAEzB;IAED,OAAO,KAAK,WAAW,GAItB;IAED,OAAO,KAAK,qBAAqB,GAEhC;IAED,OAAO,KAAK,WAAW,GAEtB;IAED,OAAO,KAAK,gBAAgB,GAM3B;IAED,OAAO,KAAK,iBAAiB,GAE5B;IAGM,gBAAgB,IAAI,aAAa;IAIjC,cAAc,IAAI,WAAW;IAI7B,iBAAiB,IAAI,MAAM;IAI3B,WAAW,IAAI,MAAM,GAAG,SAAS;IAIxC,OAAO,CAAC,aAAa,CAAkB;IACvC,OAAO,CAAC,SAAS,CAAqB;IAEtC;;OAEG;IACH,OAAO,CAAC,sBAAsB;IAYvB,YAAY,CAAC,SAAS,EAAE,OAAO,GAAG,IAAI;IAItC,cAAc,IAAI,IAAI;IAuB7B,OAAO,CAAC,qBAAqB;YAsBf,8BAA8B;IA6ErC,gBAAgB,IAAI,OAAO;IAI3B,gBAAgB,CAAC,aAAa,EAAE,OAAO,GAAG,IAAI;IAOrD,OAAO,KAAK,eAAe,GAE1B;IAED,OAAO,KAAK,YAAY,GAEvB;IAEY,aAAa,CACxB,OAAO,GAAE;QACP,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,oEAAoE;QACpE,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;QACxB,iEAAiE;QACjE,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;QACjB,SAAS,CAAC,EAAE,MAAM,CAAC;KACf,GACL,OAAO,CAAC,IAAI,CAAC;IAugBhB;;;;OAIG;YACW,gBAAgB;IAiE9B;;;OAGG;YACW,sBAAsB;IA6DpC;;OAEG;YACW,uBAAuB;CAwDtC"}

package/dist/managers/aiManager.js

@@ -1,22 +1,17 @@
-import { callAgent, compressMessages, } from "../services/aiService.js";
+import * as aiService from "../services/aiService.js";
 import { convertMessagesForAPI } from "../utils/convertMessagesForAPI.js";
 import { calculateComprehensiveTotalTokens } from "../utils/tokenCalculation.js";
 import * as fs from "node:fs/promises";
 import { buildSystemPrompt } from "../prompts/index.js";
+import { logger } from "../utils/globalLogger.js";
 export class AIManager {
-    constructor(options) {
+    // Service overrides
+    constructor(container, options) {
+        this.container = container;
         this.isLoading = false;
         this.abortController = null;
         this.toolAbortController = null;
         this.isCompressing = false;
-        this.messageManager = options.messageManager;
-        this.toolManager = options.toolManager;
-        this.taskManager = options.taskManager;
-        this.backgroundTaskManager = options.backgroundTaskManager;
-        this.hookManager = options.hookManager;
-        this.reversionManager = options.reversionManager;
-        this.permissionManager = options.permissionManager;
-        this.logger = options.logger;
         this.workdir = options.workdir;
         this.systemPrompt = options.systemPrompt;
         this.subagentType = options.subagentType; // Store subagent type
@@ -29,6 +24,27 @@ export class AIManager {
         this.getLanguageFn = options.getLanguage;
         this.getEnvironmentVarsFn = options.getEnvironmentVars;
     }
+    get toolManager() {
+        return this.container.get("ToolManager");
+    }
+    get messageManager() {
+        return this.container.get("MessageManager");
+    }
+    get taskManager() {
+        return this.container.get("TaskManager");
+    }
+    get backgroundTaskManager() {
+        return this.container.get("BackgroundTaskManager");
+    }
+    get hookManager() {
+        return this.container.get("HookManager");
+    }
+    get reversionManager() {
+        return this.container.get("ReversionManager");
+    }
+    get permissionManager() {
+        return this.container.get("PermissionManager");
+    }
     // Getter methods for accessing dynamic configuration
     getGatewayConfig() {
         return this.getGatewayConfigFn();
@@ -64,7 +80,7 @@ export class AIManager {
                 this.abortController.abort();
             }
             catch (error) {
-                this.logger?.error("Failed to abort AI service:", error);
+                logger?.error("Failed to abort AI service:", error);
             }
         }
         // Interrupt tool execution
@@ -73,7 +89,7 @@ export class AIManager {
                 this.toolAbortController.abort();
             }
             catch (error) {
-                this.logger?.error("Failed to abort tool execution:", error);
+                logger?.error("Failed to abort tool execution:", error);
             }
         }
         this.setIsLoading(false);
@@ -93,7 +109,7 @@ export class AIManager {
             }
         }
         catch (error) {
-            this.logger?.warn("Failed to generate compactParams", error);
+            logger?.warn("Failed to generate compactParams", error);
         }
         return "";
     }
@@ -109,7 +125,7 @@ export class AIManager {
             (usage.cache_read_input_tokens || 0) +
             (usage.cache_creation_input_tokens || 0) >
             this.getMaxInputTokens()) {
-            this.logger?.debug(`Token usage exceeded ${this.getMaxInputTokens()}, compressing messages...`);
+            logger?.debug(`Token usage exceeded ${this.getMaxInputTokens()}, compressing messages...`);
             // Check if messages need compression
             const messagesToCompress = this.messageManager.getMessages();
             // If there are messages to compress, perform compression
@@ -119,7 +135,7 @@ export class AIManager {
                 await this.messageManager.saveSession();
                 this.setIsCompressing(true);
                 try {
-                    const compressionResult = await compressMessages({
+                    const compressionResult = await aiService.compressMessages({
                         gatewayConfig: this.getGatewayConfig(),
                         modelConfig: this.getModelConfig(),
                         messages: recentChatMessages,
@@ -143,10 +159,10 @@ export class AIManager {
                     if (compressionUsage && this.callbacks?.onUsageAdded) {
                         this.callbacks.onUsageAdded(compressionUsage);
                     }
-                    this.logger?.debug(`Successfully compressed ${messagesToCompress.length} messages and updated session`);
+                    logger?.debug(`Successfully compressed ${messagesToCompress.length} messages and updated session`);
                 }
                 catch (compressError) {
-                    this.logger?.error("Failed to compress messages:", compressError);
+                    logger?.error("Failed to compress messages:", compressError);
                 }
                 finally {
                     this.setIsCompressing(false);
@@ -163,6 +179,12 @@ export class AIManager {
             this.callbacks.onCompressionStateChange?.(isCompressing);
         }
     }
+    get subagentManager() {
+        return this.container.get("SubagentManager");
+    }
+    get skillManager() {
+        return this.container.get("SkillManager");
+    }
     async sendAIMessage(options = {}) {
         const { recursionDepth = 0, model, allowedRules, tools, maxTokens, } = options;
         // Only check isLoading for the initial call (recursionDepth === 0)
@@ -201,7 +223,7 @@ export class AIManager {
             const combinedMemory = await this.messageManager.getCombinedMemory();
             // Track if assistant message has been created
             let assistantMessageCreated = false;
-            this.logger?.debug("modelConfig in sendAIMessage", this.getModelConfig());
+            logger?.debug("modelConfig in sendAIMessage", this.getModelConfig());
             // Get current permission mode and plan file path
             const currentMode = this.permissionManager?.getCurrentEffectiveMode(this.getModelConfig().permissionMode);
             const toolsConfig = this.getFilteredToolsConfig(tools);
@@ -224,6 +246,9 @@ export class AIManager {
                     planModeOptions = { planFilePath, planExists };
                 }
             }
+            // Get available subagents and skills for dynamic prompts
+            const availableSubagents = this.subagentManager?.getConfigurations();
+            const availableSkills = this.skillManager?.getAvailableSkills();
             // Call AI service with streaming callbacks if enabled
             const callAgentOptions = {
                 gatewayConfig: this.getGatewayConfig(),
@@ -240,6 +265,8 @@ export class AIManager {
                     language: this.getLanguage(),
                     isSubagent: !!this.subagentType,
                     planMode: planModeOptions,
+                    availableSubagents,
+                    availableSkills,
                 }), // Pass custom system prompt
                 maxTokens: maxTokens, // Pass max tokens override
             };
@@ -280,7 +307,7 @@ export class AIManager {
                     this.messageManager.updateCurrentMessageReasoning(reasoning);
                 };
             }
-            const result = await callAgent(callAgentOptions);
+            const result = await aiService.callAgent(callAgentOptions);
             const createdByStreaming = assistantMessageCreated;
             // For non-streaming mode, create assistant message after callAgent returns
             // Also create if streaming mode but no streaming callbacks were called (e.g., when content comes directly in result)
@@ -294,12 +321,12 @@ export class AIManager {
             if (result.finish_reason) {
                 // Log warning headers when finish reason is length
                 if (result.finish_reason === "length") {
-                    this.logger?.warn("AI response truncated due to length limit. Response headers:", result.response_headers);
+                    logger?.warn("AI response truncated due to length limit. Response headers:", result.response_headers);
                 }
             }
             if (result.response_headers &&
                 Object.keys(result.response_headers).length > 0) {
-                this.logger?.debug("AI response headers:", result.response_headers);
+                logger?.debug("AI response headers:", result.response_headers);
             }
             if (result.additionalFields &&
                 Object.keys(result.additionalFields).length > 0) {
@@ -387,7 +414,7 @@ export class AIManager {
                                 errorMessage +=
                                     " (output truncated, please reduce your output)";
                             }
-                            this.logger?.error(errorMessage, parseError);
+                            logger?.error(errorMessage, parseError);
                             this.messageManager.updateToolBlock({
                                 id: toolId,
                                 parameters: argsString,
@@ -416,7 +443,7 @@ export class AIManager {
                         const shouldExecuteTool = await this.executePreToolUseHooks(toolName, toolArgs, toolId);
                         // If PreToolUse hooks blocked execution, skip tool execution
                         if (!shouldExecuteTool) {
-                            this.logger?.info(`Tool ${toolName} execution blocked by PreToolUse hooks`);
+                            logger?.info(`Tool ${toolName} execution blocked by PreToolUse hooks`);
                             return; // Skip this tool and return from this map function
                         }
                         // Create tool execution context
@@ -449,6 +476,7 @@ export class AIManager {
                             name: toolName,
                             shortResult: toolResult.shortResult,
                             isManuallyBackgrounded: toolResult.isManuallyBackgrounded,
+                            startLineNumber: toolResult.startLineNumber,
                         });
                         // Execute PostToolUse hooks after successful tool completion
                         await this.executePostToolUseHooks(toolId, toolName, toolArgs, toolResult);
@@ -492,7 +520,7 @@ export class AIManager {
                 const hasBackgrounded = toolBlocks.length > 0 &&
                     toolBlocks.some((block) => block.isManuallyBackgrounded);
                 if (hasBackgrounded) {
-                    this.logger?.info("Some tools were manually backgrounded, stopping recursion.");
+                    logger?.info("Some tools were manually backgrounded, stopping recursion.");
                 }
                 else if (!isCurrentlyAborted) {
                     // Recursively call AI service, increment recursion depth, and pass same configuration
@@ -535,7 +563,7 @@ export class AIManager {
                     // If Stop/SubagentStop hooks indicate we should continue (due to blocking errors),
                     // restart the AI conversation cycle
                     if (shouldContinue) {
-                        this.logger?.info(`${this.subagentType ? "SubagentStop" : "Stop"} hooks indicate issues need fixing, continuing conversation...`);
+                        logger?.info(`${this.subagentType ? "SubagentStop" : "Stop"} hooks indicate issues need fixing, continuing conversation...`);
                         // Restart the conversation to let AI fix the issues
                         // Use recursionDepth = 0 to set loading false again for continuation
                         await this.sendAIMessage({
@@ -579,13 +607,13 @@ export class AIManager {
                 const processResult = this.hookManager.processHookResults(hookName, results, this.messageManager);
                 // If hook processing indicates we should block (exit code 2), continue conversation
                 if (processResult.shouldBlock) {
-                    this.logger?.info(`${hookName} hook blocked stopping with error:`, processResult.errorMessage);
+                    logger?.info(`${hookName} hook blocked stopping with error:`, processResult.errorMessage);
                     shouldContinue = true;
                 }
             }
             // Log hook execution results for debugging
             if (results.length > 0) {
-                this.logger?.debug(`Executed ${results.length} ${hookName} hook(s):`, results.map((r) => ({
+                logger?.debug(`Executed ${results.length} ${hookName} hook(s):`, results.map((r) => ({
                     success: r.success,
                     duration: r.duration,
                     exitCode: r.exitCode,
@@ -597,7 +625,7 @@ export class AIManager {
         }
         catch (error) {
             // Hook execution errors should not interrupt the main workflow
-            this.logger?.error(`${this.subagentType ? "SubagentStop" : "Stop"} hook execution failed:`, error);
+            logger?.error(`${this.subagentType ? "SubagentStop" : "Stop"} hook execution failed:`, error);
             return false;
         }
     }
@@ -631,7 +659,7 @@ export class AIManager {
             }
             // Log hook execution results for debugging
             if (results.length > 0) {
-                this.logger?.debug(`Executed ${results.length} PreToolUse hook(s) for ${toolName}:`, results.map((r) => ({
+                logger?.debug(`Executed ${results.length} PreToolUse hook(s) for ${toolName}:`, results.map((r) => ({
                     success: r.success,
                     duration: r.duration,
                     exitCode: r.exitCode,
@@ -643,7 +671,7 @@ export class AIManager {
         }
         catch (error) {
             // Hook execution errors should not interrupt the main workflow
-            this.logger?.error("PreToolUse hook execution failed:", error);
+            logger?.error("PreToolUse hook execution failed:", error);
             return true; // Allow tool execution on hook errors
         }
     }
@@ -674,7 +702,7 @@ export class AIManager {
             }
             // Log hook execution results for debugging
             if (results.length > 0) {
-                this.logger?.debug(`Executed ${results.length} PostToolUse hook(s) for ${toolName}:`, results.map((r) => ({
+                logger?.debug(`Executed ${results.length} PostToolUse hook(s) for ${toolName}:`, results.map((r) => ({
                     success: r.success,
                     duration: r.duration,
                     exitCode: r.exitCode,
@@ -685,7 +713,7 @@ export class AIManager {
         }
         catch (error) {
             // Hook execution errors should not interrupt the main workflow
-            this.logger?.error("PostToolUse hook execution failed:", error);
+            logger?.error("PostToolUse hook execution failed:", error);
         }
     }
 }

package/dist/managers/backgroundTaskManager.d.ts

@@ -1,5 +1,6 @@
 import { type ChildProcess } from "child_process";
 import { BackgroundTask } from "../types/processes.js";
+import { Container } from "../utils/container.js";
 export interface BackgroundTaskManagerCallbacks {
     onTasksChange?: (tasks: BackgroundTask[]) => void;
 }
@@ -8,11 +9,12 @@ export interface BackgroundTaskManagerOptions {
     workdir: string;
 }
 export declare class BackgroundTaskManager {
+    private container;
     private tasks;
     private nextId;
     private callbacks;
     private workdir;
-    constructor(options: BackgroundTaskManagerOptions);
+    constructor(container: Container, options: BackgroundTaskManagerOptions);
     private notifyTasksChange;
     generateId(): string;
     addTask(task: BackgroundTask): void;

package/dist/managers/backgroundTaskManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"backgroundTaskManager.d.ts","sourceRoot":"","sources":["../../src/managers/backgroundTaskManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,YAAY,EAAE,MAAM,eAAe,CAAC;AACzD,OAAO,EAAE,cAAc,EAAmB,MAAM,uBAAuB,CAAC;AAIxE,MAAM,WAAW,8BAA8B;IAC7C,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,cAAc,EAAE,KAAK,IAAI,CAAC;CACnD;AAED,MAAM,WAAW,4BAA4B;IAC3C,SAAS,CAAC,EAAE,8BAA8B,CAAC;IAC3C,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,qBAAa,qBAAqB;IAChC,OAAO,CAAC,KAAK,CAAqC;IAClD,OAAO,CAAC,MAAM,CAAK;IACnB,OAAO,CAAC,SAAS,CAAiC;IAClD,OAAO,CAAC,OAAO,CAAS;gBAEZ,OAAO,EAAE,4BAA4B;IAKjD,OAAO,CAAC,iBAAiB;IAIlB,UAAU,IAAI,MAAM;IAIpB,OAAO,CAAC,IAAI,EAAE,cAAc,GAAG,IAAI;IAKnC,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS;IAI/C,WAAW,IAAI,cAAc,EAAE;IAI/B,UAAU,CACf,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,MAAM,GACf;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,YAAY,CAAC;QAAC,MAAM,EAAE,MAAM,IAAI,CAAA;KAAE;IA8GnD,YAAY,CACjB,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,MAAM,EACf,aAAa,GAAE,MAAW,EAC1B,aAAa,GAAE,MAAW,GACzB,MAAM;IAoEF,SAAS,CACd,EAAE,EAAE,MAAM,EACV,MAAM,CAAC,EAAE,MAAM,GACd;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IAiCrD,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO;IA+B7B,OAAO,IAAI,IAAI;CAUvB"}
+{"version":3,"file":"backgroundTaskManager.d.ts","sourceRoot":"","sources":["../../src/managers/backgroundTaskManager.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,YAAY,EAAE,MAAM,eAAe,CAAC;AACzD,OAAO,EAAE,cAAc,EAAmB,MAAM,uBAAuB,CAAC;AAGxE,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAElD,MAAM,WAAW,8BAA8B;IAC7C,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,cAAc,EAAE,KAAK,IAAI,CAAC;CACnD;AAED,MAAM,WAAW,4BAA4B;IAC3C,SAAS,CAAC,EAAE,8BAA8B,CAAC;IAC3C,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,qBAAa,qBAAqB;IAO9B,OAAO,CAAC,SAAS;IANnB,OAAO,CAAC,KAAK,CAAqC;IAClD,OAAO,CAAC,MAAM,CAAK;IACnB,OAAO,CAAC,SAAS,CAAiC;IAClD,OAAO,CAAC,OAAO,CAAS;gBAGd,SAAS,EAAE,SAAS,EAC5B,OAAO,EAAE,4BAA4B;IAMvC,OAAO,CAAC,iBAAiB;IAIlB,UAAU,IAAI,MAAM;IAIpB,OAAO,CAAC,IAAI,EAAE,cAAc,GAAG,IAAI;IAKnC,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS;IAI/C,WAAW,IAAI,cAAc,EAAE;IAI/B,UAAU,CACf,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,MAAM,GACf;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,YAAY,CAAC;QAAC,MAAM,EAAE,MAAM,IAAI,CAAA;KAAE;IA8GnD,YAAY,CACjB,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,MAAM,EACf,aAAa,GAAE,MAAW,EAC1B,aAAa,GAAE,MAAW,GACzB,MAAM;IAoEF,SAAS,CACd,EAAE,EAAE,MAAM,EACV,MAAM,CAAC,EAAE,MAAM,GACd;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IAiCrD,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO;IA+B7B,OAAO,IAAI,IAAI;CAUvB"}