@stack-spot/portal-network 0.201.0-beta.1 → 0.202.0-beta.1

package/src/client/ai.ts

@@ -64,6 +64,7 @@ import { StreamedJson } from '../utils/StreamedJson'
 import { formatJson } from '../utils/string'
 import { agentToolsClient } from './agent-tools'
 import {
+  AgentInfo,
   ChatAgentTool,
   ChatResponseWithSteps,
   FixedChatRequest,
@@ -367,6 +368,10 @@ class AIClient extends ReactQueryNetworkClient {
       { method: 'post', body: JSON.stringify(request), headers, signal: abortController.signal },
     )
 
+    const DYNAMIC_TOOL_ID = 'dynamic'
+    function isDynamicTool(info: AgentInfo) {
+      return info.type === 'tool' && info.id === DYNAMIC_TOOL_ID
+    }
     /**
      * This function treats events in the streaming that deals with the execution of tools. Since these events are not concatenated like
      * normal streamings of data, we need this separate function to deal with them. It transforms the internal data model of the
@@ -374,12 +379,10 @@ class AIClient extends ReactQueryNetworkClient {
      */
     async function transform(event: Partial<FixedChatResponse>, data: Partial<ChatResponseWithSteps>) {
       const info = event.agent_info
-
       if (!info) return
-
       const tools = await AIClient.toolsOfAgent(request.context?.agent_id)
       data.steps = data.steps ? [...data.steps] : []
-
+    
       if (info.type === 'planning' && info.action === 'end') {
         data.steps.push({
           id: 'planning',
@@ -448,6 +451,39 @@ class AIClient extends ReactQueryNetworkClient {
         }
       }
 
+      if (info.type === 'tool_calls' && info.action === 'start') {
+        const hasPlanning = data.steps.find(s => s.type === 'planning')
+        // On the first tool_calls:start, create the synthetic planning ("dynamic") step.
+        if (!hasPlanning) {
+          const userPrompt = request.user_prompt  === 'string' ? request.user_prompt : JSON.stringify(request.user_prompt)
+          data.steps.push({
+            id: 'dynamic',
+            type: 'planning',
+            status: 'success',
+            steps: [],
+            goal: userPrompt,
+            user_question: userPrompt,
+          })
+        }
+        const toolsStepId = data.steps.filter(s => s.id === 'tools' || s.id.startsWith('tools-')).length + 1
+        data.steps.push({
+          id: `tools-${toolsStepId.toString()}`,
+          type: 'step',
+          status: 'running',
+          attempts: [{ tools: [] }],
+        } as StepChatStep)
+      }
+      
+      if (info.type === 'tool_calls' && info.action === 'end') {
+        const lastStep = findLast(data.steps, s => s.id === 'tools' || s.id.startsWith('tools-')) as StepChatStep
+        if (lastStep) {
+          lastStep.status = 'success'
+          lastStep.duration = info.duration
+          const lastAttemptOfLastTool = last(lastStep.attempts.map(a => a.tools).flat())
+          lastStep.output = lastAttemptOfLastTool?.output
+        }
+      }
+
       if (info.type === 'tool' && info.action === 'awaiting_approval') {
         const tool = tools.find(({ id }) => id === info.data?.tool_id)
         data.steps.push({
@@ -471,13 +507,14 @@ class AIClient extends ReactQueryNetworkClient {
       }
 
       if (info.type === 'tool' && info.action === 'start') {
-        const currentStep = data.steps.find(s => s.status === 'running') as StepChatStep
         if (!info.data) return
+        const input = formatJson(info.data.input)
+        const tool = findLast(tools, ({ id }) => id === info.data?.tool_id) ?? { id: info.data?.tool_id, name: info.data?.tool_id }
+        
+        const currentStep = findLast(data.steps, s => s.status === 'running') as StepChatStep
 
         //There might be a tool with status awaiting_approval, so we want to inform tool has already started
-        if (!currentStep || !currentStep.attempts[0].tools) {
-          const input = formatJson(info.data.input)
-          const tool = tools.find(({ id }) => id === info.data?.tool_id) ?? { id: info.data?.tool_id, name: info.data?.tool_id }
+        if (!currentStep || !currentStep?.attempts?.[0]?.tools) {
           data.steps.push({
             id: info.id,
             type: 'tool',
@@ -490,23 +527,23 @@ class AIClient extends ReactQueryNetworkClient {
             }],
           })
         } else {
-          const toolInFirstAttempt = currentStep.attempts[0].tools?.find(t => t.executionId === info.id)
+          const toolInFirstAttempt = findLast(currentStep?.attempts?.[0]?.tools, t => t.executionId === info.id)
           //One step might have multiple tools. When in an approval mode, we might not have all the tools in the array yet.
-          //So we make sure to add any tools that are not in there.
-          if (!toolInFirstAttempt) {
-            const input = formatJson(info.data.input)
-            const tool = tools?.find(({ id }) => id === info.data?.tool_id) ?? { id: info.data?.tool_id, name: info.data?.tool_id }
-            currentStep.attempts[info.data.attempt - 1].tools?.push({
+          //For dynamic tools (id === 'dynamic'), we always push a new tool, since dynamic executions can trigger
+          //multiple tool runs in the same step and do not follow the planned tool structure.
+          //So we make sure to add any tools that are not in there, or always add for dynamic tools.
+          if (!toolInFirstAttempt || isDynamicTool(info)) {            
+            currentStep.attempts?.[0].tools?.push({
               ...tool,
               executionId: info.id,
               input,
+              status: 'running',
             })
           } else {
             const input = formatJson(info.data.input)
             if (info.data.attempt === 1) {
               toolInFirstAttempt.input = input
             } else {
-              const tool = tools.find(({ id }) => id === info.data?.tool_id) ?? { id: info.data?.tool_id, name: info.data?.tool_id }
               currentStep.attempts[info.data.attempt - 1] ??= { tools: [] }
               currentStep.attempts[info.data.attempt - 1].tools?.push({
                 ...tool,
@@ -521,10 +558,14 @@ class AIClient extends ReactQueryNetworkClient {
       if (info.type === 'tool' && info.action === 'end') {
         const currentStep = data.steps.find(s => s.status === 'running') as StepChatStep
         if (!currentStep || !info.data) return
-        const tool = currentStep.attempts[info.data.attempt - 1]?.tools?.find(t => t.executionId === info.id)
+        
+        // attempt index for tool execution starts at 0 for dynamically executed tools,while for planned tools it starts at 1
+        const attempt = isDynamicTool(info) ? info.data.attempt : info.data.attempt - 1
+        const tool = last(currentStep?.attempts?.[attempt]?.tools)
         if (tool) {
           tool.output = formatJson(info.data.output)
           tool.duration = info.duration
+          tool.status = 'success'
         }
       }
 
@@ -533,11 +574,14 @@ class AIClient extends ReactQueryNetworkClient {
         if (answerStep) answerStep.status = 'running'
       }
 
+
       if (info.type === 'chat' && info.action === 'end') {
-        const answerStep = last(data.steps)
-        if (answerStep) {
-          answerStep.status = 'success'
-          answerStep.duration = info.duration
+        const lastStep = last(data.steps)
+        if (lastStep?.type === 'answer') {
+          lastStep.status = 'success'
+          lastStep.duration = info.duration
+        } else {
+          data.steps.push({ id: 'answer', type: 'answer', status: 'success' })
         }
       }
     }

package/src/client/types.ts

@@ -247,6 +247,7 @@ export interface ChatAgentTool {
   input?: string,
   output?: string,
   goal?: string,
+  status?: 'running' | 'success' | 'error',
 }
 
 export interface ChatStepAttempt {
@@ -308,10 +309,10 @@ export interface AnswerChatStep extends BaseChatStep {
 export type ChatStep = PlanningChatStep | StepChatStep | AnswerChatStep | ToolChatStep
 
 export interface BaseAgentInfo {
-  type: 'chat' | 'planning' | 'step' | 'tool' | 'final_answer',
+  type: 'chat' | 'planning' | 'step' | 'tool' | 'final_answer' | 'tool_calls',
   action: 'start' | 'end' | 'awaiting_approval',
   duration?: number,
-  id: string,
+  id?: string,
 }
 
 export interface AgentTool {
@@ -355,7 +356,15 @@ export interface GenericAgentInfo extends BaseAgentInfo {
   type: 'chat' | 'final_answer',
 }
 
-export type AgentInfo = GenericAgentInfo | PlanningAgentInfo | StepAgentInfo | ToolAgentInfo
+export interface ToolCallsAgentInfo extends BaseAgentInfo {
+  type: 'tool_calls',
+  data?: {
+    tools?: string[],
+    duration?: number,
+  },
+}
+
+export type AgentInfo = GenericAgentInfo | PlanningAgentInfo | StepAgentInfo | ToolAgentInfo | ToolCallsAgentInfo
 
 export interface FixedChatResponse extends ChatResponse3 {
   agent_info: AgentInfo,

package/src/network/NetworkClient.ts

@@ -1,4 +1,4 @@
-import { AuthenticationError, SessionExpiredError } from '@stack-spot/auth'
+import { AuthenticationError, Session, SessionExpiredError } from '@stack-spot/auth'
 import { requestPermission, setup as setupPermissions } from '@stack-spot/opa'
 import { events } from 'fetch-event-stream'
 import { getApisBaseUrlConfig, getBaseUrlByTenantWithOverride, getPermissionsAPIMap } from '../api-addresses'
@@ -44,12 +44,12 @@ export abstract class NetworkClient {
     NetworkClient.tenant = tenant
     const url = getApisBaseUrlConfig(env, tenant).permissionValidation
     const apiMap = getPermissionsAPIMap(env, tenant)
-    sessionManager.onChange?.((session) => {
-      if (session) {
-        queryClient.invalidateQueries()
-        setupPermissions({ url, session, apiMap })
-      }
-    })
+    const onChange = (session?: Session) => {
+      queryClient.invalidateQueries()
+      session && setupPermissions({ url, session, apiMap })
+    }
+    sessionManager.onChange?.(onChange)
+    if (sessionManager.hasSession()) onChange(sessionManager.getSession())
   }
 
   /**