@slashfi/agents-sdk 0.11.2 → 0.13.0

package/src/agent-definitions/integrations.ts

@@ -342,7 +342,10 @@ export async function exchangeCodeForToken(
     throw new Error(`Token exchange failed (${response.status}): ${text}`);
   }
 
-  const data = (await response.json()) as Record<string, unknown>;
+  const responseText = await response.text();
+  console.log("[token-exchange] Slack response:", responseText.substring(0, 500));
+  let data: Record<string, unknown>;
+  try { data = JSON.parse(responseText); } catch (e) { throw new Error(`Failed to parse JSON: ${responseText.substring(0, 200)}`); }
 
   return {
     accessToken: String(data[oauth.accessTokenField ?? "access_token"] ?? ""),
@@ -408,7 +411,10 @@ export async function refreshAccessToken(
     throw new Error(`Token refresh failed (${response.status}): ${text}`);
   }
 
-  const data = (await response.json()) as Record<string, unknown>;
+  const responseText = await response.text();
+  console.log("[token-exchange] Slack response:", responseText.substring(0, 500));
+  let data: Record<string, unknown>;
+  try { data = JSON.parse(responseText); } catch (e) { throw new Error(`Failed to parse JSON: ${responseText.substring(0, 200)}`); }
 
   return {
     accessToken: String(data[oauth.accessTokenField ?? "access_token"] ?? ""),
@@ -489,21 +495,13 @@ export interface IntegrationsAgentOptions {
   store: IntegrationStore;
 
   /**
-   * Callback to list all registered agents.
-   * Used by list_integrations to discover agents with integrationMethods.
-   * Typically wired to registry.list().
-   */
-  getAgents?: () => AgentDefinition[];
 
   /** Registry instance for calling other agents' internal tools */
   registry?: {
+    list?(): AgentDefinition[];
     call(request: any): Promise<any>;
   };
 
-  /** Integrations store for tracking installed integrations */
-  integrationsStore?: {
-    create(input: { agentPath: string; config: Record<string, unknown>; installedBy?: string; tenantId?: string }): Promise<any>;
-  };
 
   /** Secret store for storing/resolving client credentials and tokens */
   secretStore: {
@@ -535,7 +533,7 @@ const SYSTEM_OWNER = "__integrations__";
 export function createIntegrationsAgent(
   options: IntegrationsAgentOptions,
 ): AgentDefinition {
-  const { store, callbackBaseUrl, secretStore, getAgents, integrationsStore } = options;
+  const { store, callbackBaseUrl, secretStore } = options;
 
   // ---- setup_integration ----
   const setupTool = defineTool({
@@ -681,15 +679,20 @@ export function createIntegrationsAgent(
 
       await store.upsertProvider(config);
 
-      // Also track in integrations table
-      if (integrationsStore) {
+      // Delegate to agent's setup_integration tool via registry.call()
+      if (config.agentPath && options.registry) {
         try {
-          await integrationsStore.create({
-            agentPath: config.agentPath ?? `@${config.id}`,
-            config: { providerId: config.id, ...input },
-            installedBy: _ctx.callerId,
+          const setupResult = await options.registry.call({
+            action: 'execute_tool',
+            path: config.agentPath,
+            tool: 'setup_integration',
+            params: input.config ?? input,
+            callerType: 'system',
           });
-        } catch {}
+          result.setupResult = (setupResult as any)?.result ?? setupResult;
+        } catch (err) {
+          result.setupError = err instanceof Error ? err.message : String(err);
+        }
       }
 
       result.provider = config;
@@ -736,8 +739,8 @@ export function createIntegrationsAgent(
       }> = [];
 
       // 1. Agent-backed integrations
-      if (getAgents) {
-        for (const agent of getAgents()) {
+      if (options.registry) {
+        for (const agent of (options.registry.list?.() ?? [])) {
           if (agent.config?.integration) {
             const ic = agent.config.integration;
             catalog.push({
@@ -831,11 +834,12 @@ export function createIntegrationsAgent(
         });
       }
 
-      // 2. Agent-backed integrations (agents with config.integration + integrationMethods)
-      if (getAgents) {
-        const agents = getAgents();
+      // 2. Agent-backed integrations (agents with config.integration + list_integrations tool)
+      if (options.registry) {
+        const agents = options.registry.list?.() ?? [];
         for (const agent of agents) {
-          if (agent.integrationMethods?.list && agent.config?.integration) {
+          const hasListTool = agent.tools?.some((t: any) => t.name === 'list_integrations');
+          if (hasListTool && agent.config?.integration) {
             const meta = {
               provider: agent.config.integration.provider,
               agentPath: agent.path,
@@ -845,7 +849,8 @@ export function createIntegrationsAgent(
               description: agent.config.integration.description,
             };
             try {
-              const result = await agent.integrationMethods.list({}, { ...ctx, provider: agent.config.integration.provider });
+              const callResult = options.registry ? await options.registry.call({ action: 'execute_tool', path: agent.path!, tool: 'list_integrations', params: {}, callerType: 'system' }) : null;
+              const result = (callResult as any)?.result ?? callResult ?? { success: false };
               if (result.success && result.data) {
                 // Flatten: if data has an array field, each item becomes an integration
                 const items = Array.isArray(result.data)
@@ -929,6 +934,19 @@ export function createIntegrationsAgent(
     ) => {
       const config = await store.getProvider(input.provider);
       if (!config) return { error: `Provider '${input.provider}' not found` };
+
+      // Delegate to agent's connect_integration tool via registry.call()
+      if (config.agentPath && options.registry) {
+        const connectResult = await options.registry.call({
+          action: 'execute_tool',
+          path: config.agentPath,
+          tool: 'connect_integration',
+          params: { ...input, registryId: config.id },
+          callerType: 'system',
+        });
+        return (connectResult as any)?.result ?? connectResult;
+      }
+
       if (!config.auth)
         return { error: `Provider '${input.provider}' has no OAuth config` };
       if (!callbackBaseUrl)
@@ -1158,6 +1176,19 @@ export function createIntegrationsAgent(
     ) => {
       const config = await store.getProvider(input.provider);
       if (!config) return { error: `Provider '${input.provider}' not found` };
+
+      // Delegate to agent's connect_integration tool via registry.call()
+      if (config.agentPath && options.registry) {
+        const connectResult = await options.registry.call({
+          action: 'execute_tool',
+          path: config.agentPath,
+          tool: 'connect_integration',
+          params: { ...input, registryId: config.id },
+          callerType: 'system',
+        });
+        return (connectResult as any)?.result ?? connectResult;
+      }
+
       if (!config.auth)
         return { error: `Provider '${input.provider}' has no OAuth config` };
       if (!callbackBaseUrl) return { error: "No callbackBaseUrl configured" };
@@ -1347,7 +1378,7 @@ export function createIntegrationsAgent(
     visibility: "public" as const,
     inputSchema: { type: "object" as const, properties: {} },
     execute: async () => {
-      const agents = getAgents?.() ?? [];
+      const agents = options.registry?.list?.() ?? [];
       const results: any[] = [];
       if (options.registry) {
         for (const agent of agents) {
@@ -1385,7 +1416,7 @@ export function createIntegrationsAgent(
       },
     },
     execute: async (input: { agent_path?: string }) => {
-      const agents = getAgents?.() ?? [];
+      const agents = options.registry?.list?.() ?? [];
       const results: any[] = [];
       if (options.registry) {
         const targetAgents = input.agent_path