indusagi-coding-agent 0.1.43 → 0.1.45

package/dist/runtime/agent-session.js

@@ -234,7 +234,7 @@ import { ExtensionRunner, wrapRegisteredTools, wrapToolsWithExtensions, } from "
 import { expandPromptTemplate } from "./prompt-templates.js";
 import { buildSystemPrompt } from "./system-prompt.js";
 import { HookRunner } from "./lifecycle/index.js";
-import { createAllTools } from "./tooling/index.js";
+import { ComposioService, createAllTools, } from "./tooling/index.js";
 import { createMemory, createMemoryTools, DEFAULT_WORKING_MEMORY_TEMPLATE } from "./tooling/memory.js";
 import { SubagentStore } from "./subagents.js";
 import { createSessionTodoStore } from "./tooling/index.js";
@@ -294,6 +294,7 @@ export class AgentSession {
         this._memoryTools = [];
         this._memoryThreadId = "";
         this._memoryResourceId = "default-user";
+        this._composioTools = [];
         // Tool registry for extension getTools/setTools
         this._toolRegistry = new Map();
         // Base system prompt (without extension appends) - used to apply fresh appends each turn
@@ -335,6 +336,7 @@ export class AgentSession {
         this._customTools = config.customTools ?? [];
         this._cwd = config.cwd;
         this._modelRegistry = config.modelRegistry;
+        this._providerService = config.providerService;
         this._agentDir = config.agentDir ?? getAgentDir();
         this._todoStore = createSessionTodoStore({
             sessionManager: this.sessionManager,
@@ -396,6 +398,20 @@ export class AgentSession {
     _rebuildTodoStore() {
         this._todoStore.rebuildFromBranch();
     }
+    _getComposioService() {
+        if (!this._composioService) {
+            this._composioService = new ComposioService();
+        }
+        return this._composioService;
+    }
+    _createComposioToolOptions() {
+        return {
+            service: this._getComposioService(),
+            onEnable: async (tools) => {
+                this.registerComposioTools(tools);
+            },
+        };
+    }
     _consumeQueuedUserMessage(event) {
         if (event.type !== "message_start" || event.message.role !== "user") {
             return;
@@ -591,6 +607,9 @@ export class AgentSession {
      * Call this when completely done with the session.
      */
     dispose() {
+        if (this.model && this._providerService?.usesAdapter(this.model)) {
+            void this._providerService.stopCurrent(this.model).catch(() => { });
+        }
         this._disconnectFromAgent();
         this._observeAgentEventsUnsubscribe?.();
         this._observeAgentEventsUnsubscribe = undefined;
@@ -779,16 +798,18 @@ export class AgentSession {
                 "Then use /model to select a model.");
         }
         // Validate API key
-        const apiKey = await this._modelRegistry.getApiKey(this.model);
-        if (!apiKey) {
-            const isOAuth = this._modelRegistry.isUsingOAuth(this.model);
-            if (isOAuth) {
-                throw new Error(`Authentication failed for "${this.model.provider}". ` +
-                    `Credentials may have expired or network is unavailable. ` +
-                    `Run '/login ${this.model.provider}' to re-authenticate.`);
+        if (this._modelRegistry.providerNeedsAuth(this.model.provider)) {
+            const apiKey = await this._modelRegistry.getApiKey(this.model);
+            if (!apiKey) {
+                const isOAuth = this._modelRegistry.isUsingOAuth(this.model);
+                if (isOAuth) {
+                    throw new Error(`Authentication failed for "${this.model.provider}". ` +
+                        `Credentials may have expired or network is unavailable. ` +
+                        `Run '/login ${this.model.provider}' to re-authenticate.`);
+                }
+                throw new Error(`No API key found for ${this.model.provider}.\n\n` +
+                    `Use /login or set an API key environment variable. See ${join(getDocsPath(), "authentication.md")}`);
             }
-            throw new Error(`No API key found for ${this.model.provider}.\n\n` +
-                `Use /login or set an API key environment variable. See ${join(getDocsPath(), "authentication.md")}`);
         }
         // Check if we need to compact before sending (catches aborted responses)
         const lastAssistant = this._findLastAssistantMessage();
@@ -1108,6 +1129,9 @@ export class AgentSession {
      */
     async abort() {
         this.abortRetry();
+        if (this.model && this._providerService?.usesAdapter(this.model)) {
+            await this._providerService.interruptCurrent(this.model);
+        }
         this.agent.abort();
         await this.agent.waitForIdle();
     }
@@ -1134,6 +1158,9 @@ export class AgentSession {
             }
             this._disconnectFromAgent();
             await this.abort();
+            if (this.model && this._providerService?.usesAdapter(this.model)) {
+                await this._providerService.stopCurrent(this.model);
+            }
             this.agent.reset();
             this.sessionManager.newSession(options);
             this._rebuildTodoStore();
@@ -1190,11 +1217,16 @@ export class AgentSession {
      * @throws Error if no API key available for the model
      */
     async setModel(model) {
-        const apiKey = await this._modelRegistry.getApiKey(model);
-        if (!apiKey) {
-            throw new Error(`No API key for ${model.provider}/${model.id}`);
+        if (this._modelRegistry.providerNeedsAuth(model.provider)) {
+            const apiKey = await this._modelRegistry.getApiKey(model);
+            if (!apiKey) {
+                throw new Error(`No API key for ${model.provider}/${model.id}`);
+            }
         }
         const previousModel = this.model;
+        if (previousModel && !modelsAreEqual(previousModel, model) && this._providerService?.usesAdapter(previousModel)) {
+            await this._providerService.stopCurrent(previousModel);
+        }
         this.agent.setModel(model);
         this.sessionManager.appendModelChange(model.provider, model.id);
         this.settingsManager.setDefaultModelAndProvider(model.provider, model.id);
@@ -1224,10 +1256,14 @@ export class AgentSession {
         const len = this._scopedModels.length;
         const nextIndex = direction === "forward" ? (currentIndex + 1) % len : (currentIndex - 1 + len) % len;
         const next = this._scopedModels[nextIndex];
-        // Validate API key
-        const apiKey = await this._modelRegistry.getApiKey(next.model);
-        if (!apiKey) {
-            throw new Error(`No API key for ${next.model.provider}/${next.model.id}`);
+        if (this._modelRegistry.providerNeedsAuth(next.model.provider)) {
+            const apiKey = await this._modelRegistry.getApiKey(next.model);
+            if (!apiKey) {
+                throw new Error(`No API key for ${next.model.provider}/${next.model.id}`);
+            }
+        }
+        if (currentModel && !modelsAreEqual(currentModel, next.model) && this._providerService?.usesAdapter(currentModel)) {
+            await this._providerService.stopCurrent(currentModel);
         }
         // Apply model
         this.agent.setModel(next.model);
@@ -1249,9 +1285,14 @@ export class AgentSession {
         const len = availableModels.length;
         const nextIndex = direction === "forward" ? (currentIndex + 1) % len : (currentIndex - 1 + len) % len;
         const nextModel = availableModels[nextIndex];
-        const apiKey = await this._modelRegistry.getApiKey(nextModel);
-        if (!apiKey) {
-            throw new Error(`No API key for ${nextModel.provider}/${nextModel.id}`);
+        if (this._modelRegistry.providerNeedsAuth(nextModel.provider)) {
+            const apiKey = await this._modelRegistry.getApiKey(nextModel);
+            if (!apiKey) {
+                throw new Error(`No API key for ${nextModel.provider}/${nextModel.id}`);
+            }
+        }
+        if (currentModel && !modelsAreEqual(currentModel, nextModel) && this._providerService?.usesAdapter(currentModel)) {
+            await this._providerService.stopCurrent(currentModel);
         }
         this.agent.setModel(nextModel);
         this.sessionManager.appendModelChange(nextModel.provider, nextModel.id);
@@ -1723,9 +1764,11 @@ export class AgentSession {
             getAllTools: () => this.getAllTools(),
             setActiveTools: (toolNames) => this.setActiveToolsByName(toolNames),
             setModel: async (model) => {
-                const key = await this.modelRegistry.getApiKey(model);
-                if (!key)
-                    return false;
+                if (this.modelRegistry.providerNeedsAuth(model.provider)) {
+                    const key = await this.modelRegistry.getApiKey(model);
+                    if (!key)
+                        return false;
+                }
                 await this.setModel(model);
                 return true;
             },
@@ -1779,6 +1822,7 @@ export class AgentSession {
                 bash: { commandPrefix: shellCommandPrefix },
                 task: taskOptions,
                 todoStore: this._todoStore,
+                composio: this._createComposioToolOptions(),
             });
         this._baseToolRegistry = new Map(Object.entries(baseTools).map(([name, tool]) => [name, tool]));
         const extensionsResult = this._resourceLoader.getExtensions();
@@ -1831,7 +1875,18 @@ export class AgentSession {
         const activeMCPTools = this._mcpTools.filter((tool) => activeToolNameSet.has(tool.name));
         // Include memory tools that are in the active set
         const activeMemoryTools = this._memoryTools.filter((tool) => activeToolNameSet.has(tool.name));
-        const activeToolsArray = [...activeBaseTools, ...activeExtensionTools, ...activeMCPTools, ...activeMemoryTools];
+        // Include Composio toolkit tools that are in the active set
+        const activeComposioTools = this._composioTools.filter((tool) => activeToolNameSet.has(tool.name));
+        for (const tool of [...this._mcpTools, ...this._memoryTools, ...this._composioTools]) {
+            toolRegistry.set(tool.name, tool);
+        }
+        const activeToolsArray = [
+            ...activeBaseTools,
+            ...activeExtensionTools,
+            ...activeMCPTools,
+            ...activeMemoryTools,
+            ...activeComposioTools,
+        ];
         const shouldWrapTools = Boolean(this._extensionRunner || this._hookRunner);
         if (shouldWrapTools) {
             const wrappedActiveTools = wrapToolsWithExtensions(activeToolsArray, this._extensionRunner, this._hookRunner, this.sessionId);
@@ -2132,6 +2187,9 @@ export class AgentSession {
             }
             this._disconnectFromAgent();
             await this.abort();
+            if (this.model && this._providerService?.usesAdapter(this.model)) {
+                await this._providerService.stopCurrent(this.model);
+            }
             this._steeringMessages = [];
             this._followUpMessages = [];
             this._pendingNextTurnMessages = [];
@@ -2677,6 +2735,135 @@ export class AgentSession {
         });
     }
     // =========================================================================
+    // Composio
+    // =========================================================================
+    /**
+     * Register Composio toolkit tools with the session.
+     * These are hydrated native agent tools produced by composio_enable or startup preload.
+     */
+    registerComposioTools(tools) {
+        const mergedTools = new Map(this._composioTools.map((tool) => [tool.name, tool]));
+        for (const tool of tools) {
+            mergedTools.set(tool.name, tool);
+            this._toolRegistry.set(tool.name, tool);
+        }
+        this._composioTools = Array.from(mergedTools.values());
+        const currentActive = this.getActiveToolNames();
+        const activeToolNames = Array.from(new Set([...currentActive, ...tools.map((tool) => tool.name)]));
+        this.setActiveToolsByName(activeToolNames);
+        this._rebuildRuntimeState({
+            activeToolNames,
+            includeAllExtensionTools: true,
+        });
+        void this._refreshObserveSession();
+        void this._logObserve({
+            name: "composio.register_tools",
+            summary: "registered Composio tools",
+            attributes: {
+                toolCount: tools.length,
+                toolNames: tools.map((tool) => tool.name),
+            },
+        });
+    }
+    /**
+     * Enable Composio toolkit tools for the current session.
+     */
+    async enableComposio(options = {}) {
+        return this._runObserveOperation("composio.enable", "custom", async () => {
+            const persistSettings = options.persistSettings ?? false;
+            const toolkits = options.toolkits?.length ? options.toolkits : this.settingsManager.getComposioDefaultToolkits();
+            const toolSlugs = options.toolSlugs ?? [];
+            if (toolkits.length === 0 && toolSlugs.length === 0) {
+                throw new Error("Composio requires at least one toolkit or tool slug.");
+            }
+            const tools = await this._getComposioService().createAgentTools({
+                toolkits,
+                toolSlugs,
+                authConfigs: options.authConfigs,
+                connectedAccounts: options.connectedAccounts,
+                authConfigId: options.authConfigId,
+                connectedAccountId: options.connectedAccountId,
+            });
+            this.registerComposioTools(tools);
+            if (persistSettings) {
+                this.settingsManager.setComposioSettings({
+                    enabled: true,
+                    autoConnect: toolkits.length > 0,
+                    defaultToolkits: toolkits,
+                    mode: toolkits.length > 0 ? "preload" : "control",
+                });
+            }
+            await this._refreshObserveSession();
+            return tools;
+        }, {
+            attributes: {
+                toolkits: options.toolkits ?? [],
+                toolSlugs: options.toolSlugs ?? [],
+                persistSettings: options.persistSettings ?? false,
+            },
+        });
+    }
+    /**
+     * Remove hydrated Composio toolkit tools from the current session.
+     */
+    async clearComposioTools(options) {
+        await this._runObserveOperation("composio.clear", "custom", async () => {
+            const persistSettings = options?.persistSettings ?? false;
+            const composioToolNames = new Set(this._composioTools.map((tool) => tool.name));
+            const activeWithoutComposio = this.getActiveToolNames().filter((name) => !composioToolNames.has(name));
+            this._composioTools = [];
+            this._rebuildRuntimeState({
+                activeToolNames: activeWithoutComposio,
+                includeAllExtensionTools: true,
+            });
+            if (persistSettings) {
+                this.settingsManager.setComposioSettings({
+                    autoConnect: false,
+                    defaultToolkits: [],
+                    mode: "control",
+                });
+            }
+            await this._refreshObserveSession();
+        }, {
+            attributes: {
+                persistSettings: options?.persistSettings ?? false,
+            },
+        });
+    }
+    getComposioToolNames() {
+        return this._composioTools.map((tool) => tool.name);
+    }
+    getComposioTools() {
+        return this._composioTools;
+    }
+    async connectComposio(options) {
+        return this._runObserveOperation("composio.connect", "custom", () => this._getComposioService().connectAccount({
+            toolkit: options.toolkit,
+            connectedAccountId: options.connectedAccountId,
+            authConfigId: options.authConfigId,
+            callbackUrl: options.callbackUrl,
+        }), {
+            attributes: {
+                toolkit: options.toolkit ?? "",
+                connectedAccountId: options.connectedAccountId ?? "",
+            },
+        });
+    }
+    async listComposioAccounts(filters) {
+        return this._runObserveOperation("composio.accounts", "custom", () => this._getComposioService().listAccounts({
+            toolkitSlugs: filters?.toolkits,
+            statuses: filters?.statuses,
+            limit: filters?.limit,
+            cursor: filters?.cursor,
+            authConfigIds: filters?.authConfigIds,
+        }), {
+            attributes: {
+                toolkits: filters?.toolkits ?? [],
+                statuses: filters?.statuses ?? [],
+            },
+        });
+    }
+    // =========================================================================
     // Memory System
     // =========================================================================
     /**