@stack-spot/portal-network 0.179.0 → 0.179.1-beta.1

package/src/client/ai.ts

@@ -264,7 +264,10 @@ class AIClient extends ReactQueryNetworkClient {
       if (!agent) return []
       const tools: (Omit<ChatAgentTool, 'duration' | 'prompt' | 'output'>)[] = []
       agent.toolkits?.builtin_toolkits?.forEach(kit => kit.tools?.forEach(({ id, name, description }) => {
-        if (id) tools.push({ image: kit.image_url, id, name: name || id, description })
+        if (id) tools.push({ image: kit.image_url, id, name: name || id, description, goal: '' })
+      }))
+      agent.toolkits?.custom_toolkits?.forEach(kit => kit.tools?.forEach(({ id, name, url, description }) => {
+        if (id) tools.push({ image: url, id, name: name || id, description, goal: '' })
       }))
       return tools
     } catch {
@@ -293,7 +296,7 @@ class AIClient extends ReactQueryNetworkClient {
       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',
@@ -303,6 +306,7 @@ class AIClient extends ReactQueryNetworkClient {
           steps: info.data?.steps?.map(s => s.goal) ?? [],
           goal: info.data?.plan_goal ?? '',
         })
+        
         info.data?.steps.forEach(s => data.steps?.push({
           id: s.id,
           type: 'step',
@@ -312,6 +316,33 @@ class AIClient extends ReactQueryNetworkClient {
             tools: s.tools?.map(t => ({
               ...(tools.find(({ id }) => id === t.tool_id) ?? { id: t.tool_id, name: t.tool_id }),
               executionId: t.tool_execution_id,
+              goal: t.goal,
+            })),
+          }],
+        }))
+        data.steps.push({ id: 'answer', type: 'answer', status: 'pending' })
+      }
+
+      if (info.type === 'planning' && info.action === 'awaiting_approval') {
+        data.steps.push({
+          id: 'planning',
+          type: 'planning',
+          status: 'awaiting_approval',
+          user_question: info.data?.user_question,
+          duration: info.duration || 0,
+          steps: info.data?.steps?.map(s => s.goal) ?? [],
+          goal: info.data?.plan_goal ?? '',
+        })
+        info.data?.steps.forEach(s => data.steps?.push({
+          id: s.id,
+          type: 'step',
+          status: 'pending',
+          input: s.goal,
+          attempts: [{
+            tools: s.tools?.map(t => ({
+              ...(tools.find(({ id }) => id === t.tool_id) ?? { id: t.tool_id, name: t.tool_id }),
+              executionId: t.tool_execution_id,
+              goal: t.goal,
             })),
           }],
         }))
@@ -334,20 +365,46 @@ class AIClient extends ReactQueryNetworkClient {
         }
       }
 
+      if (info.type === 'tool' && info.action === 'awaiting_approval') {
+        const tool = tools.find(({ id }) => id === info.data?.tool_id) 
+        data.steps.push({
+          id: info.id,
+          type: 'tool',
+          status: 'awaiting_approval',
+          duration: info.duration || 0,
+          input: info.data?.input,
+          user_question: info.data?.user_question,
+          attempts: [{
+            tools: [{
+              executionId: info.id,
+              id: info.data?.tool_id ?? '',
+              name: tool?.name ?? '',
+              goal: tool?.goal ?? '',
+              ...tool,
+            }],
+          }],
+        })
+        data.steps.push({ id: 'answer', type: 'answer', status: 'pending' })
+      }
+
       if (info.type === 'tool' && info.action === 'start') {
         const currentStep = data.steps.find(s => s.status === 'running') as StepChatStep
-        if (!currentStep || !info.data || !currentStep.attempts[0].tools) return
-        const toolInFirstAttempt = currentStep.attempts[0].tools.find(t => t.executionId === info.id)
-        if (!toolInFirstAttempt) return
-        const input = formatJson(info.data.input)
-        if (info.data.attempt === 0) {
-          toolInFirstAttempt.input = input
-        } else {
-          currentStep.attempts[info.data.attempt] ??= { tools: [] }
-          currentStep.attempts[info.data.attempt].tools?.push({
-            ...toolInFirstAttempt,
-            input,
-          })
+        if (!info.data) return
+        
+        //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 toolInFirstAttempt = currentStep.attempts[0].tools.find(t => t.executionId === info.id)
+          if (!toolInFirstAttempt) return
+          const input = formatJson(info.data.input)
+          if (info.data.attempt === 1) {
+            toolInFirstAttempt.input = input
+          } else {
+            currentStep.attempts[info.data.attempt] ??= { tools: [] }
+            currentStep.attempts[info.data.attempt].tools?.push({
+              ...toolInFirstAttempt,
+              input,
+            })
+          }
         }
       }
 
@@ -393,3 +450,4 @@ class AIClient extends ReactQueryNetworkClient {
 }
 
 export const aiClient = new AIClient()
+

package/src/client/code-shift.ts

@@ -58,6 +58,12 @@ import {
   getModuleV1ModulesModuleIdGet,
   analyticsProgramGroupsTargetDetailsV1AnalyticsProgramGroupsTargetDetailsGet,
   analyticsProgramGroupsTargetDetailsDownloadV1AnalyticsProgramGroupsTargetDetailsDownloadGet,
+  analyticsRepositoryTargetDetailsV1AnalyticsRepositoriesTargetDetailsGet,
+  analyticsRepositoryTargetDetailsDownloadV1AnalyticsRepositoriesTargetDetailsDownloadGet,
+  searchReposScmServiceV2ReposSearchScmPost,
+  importReposWithTagsScmServiceV2ReposSearchScmSearchIdPost,
+  searchReposScmV2V2ReposSearchScmSearchIdGet,
+  putCustomerRatingReportV1ReportsReportIdCustomerRatingPut,
 } from '../api/codeShift'
 import { DefaultAPIError } from '../error/DefaultAPIError'
 import { codeShiftDictionary } from '../error/dictionary/code-shift'
@@ -159,6 +165,18 @@ class CodeShift extends ReactQueryNetworkClient {
    * Downloads file with found repositories
    */
   downloadSearchRepository = this.mutation(removeAuthorizationParam(downloadSearchReposScmServiceV1ReposSearchScmSearchRepoIdDownloadGet))
+  /**
+   * Searches for repositories (v2)
+   */
+  searchRepositoryV2 = this.mutation(removeAuthorizationParam(searchReposScmServiceV2ReposSearchScmPost))
+  /**
+   * Imports repositories (v2)
+   */
+  importRepositories = this.mutation(removeAuthorizationParam(importReposWithTagsScmServiceV2ReposSearchScmSearchIdPost))
+  /**
+   * Gets repositories search by id (v2)
+   */
+  getRepositoriesBySearchId = this.query(removeAuthorizationParam(searchReposScmV2V2ReposSearchScmSearchIdGet))
   /**
    * Validate if the user has permission. 
    * We do not use opa in this api, so this is the fn needed to check permissions.
@@ -330,6 +348,24 @@ class CodeShift extends ReactQueryNetworkClient {
   analyticsProgramGroupsTargetDetailsDownload = this.query(
     removeAuthorizationParam(analyticsProgramGroupsTargetDetailsDownloadV1AnalyticsProgramGroupsTargetDetailsDownloadGet),
   )
+  /** 
+   * Analytics Repository Target Details
+   */
+  analyticsRepositoryTargetDetails = this.query(
+    removeAuthorizationParam(analyticsRepositoryTargetDetailsV1AnalyticsRepositoriesTargetDetailsGet),
+  )
+  /**
+   * Analytics Repository Target Details Download
+   */
+  analyticsRepositoryTargetDetailsDownload = this.query(
+    removeAuthorizationParam(analyticsRepositoryTargetDetailsDownloadV1AnalyticsRepositoriesTargetDetailsDownloadGet),
+  )
+  /**
+   * Put Customer Rating Report
+   */
+  updateReportRating = this.mutation(
+    removeAuthorizationParam(putCustomerRatingReportV1ReportsReportIdCustomerRatingPut),
+  )
 }
 
 export const codeShiftClient = new CodeShift()

package/src/client/types.ts

@@ -245,19 +245,20 @@ export interface ChatAgentTool {
   image?: string,
   input?: string,
   output?: string,
+  goal: string,
 }
 
 export interface ChatStepAttempt {
   /**
    * The tools used by this step.
    */
-  tools?: ChatAgentTool[],
+  tools?: Partial<ChatAgentTool>[],
 }
 
 export interface BaseChatStep {
   id: string,
-  type: 'planning' | 'step' | 'answer',
-  status: 'pending' | 'running' | 'success' | 'error',
+  type: 'planning' | 'step' | 'answer' | 'tool',
+  status: 'pending' | 'running' | 'success' | 'error' | 'awaiting_approval',
   /**
    * Duration in seconds.
    */
@@ -266,9 +267,24 @@ export interface BaseChatStep {
 
 export interface PlanningChatStep extends BaseChatStep {
   type: 'planning',
-  status: 'success',
+  status: 'success' | 'awaiting_approval',
   steps: string[],
   goal: string,
+  user_question?: string,
+}
+
+export interface ToolChatStep extends BaseChatStep {
+  type: 'tool',
+  status: 'running' | 'success' | 'error' | 'awaiting_approval',
+  /**
+   * Each step might attempt to run for multiple times, with different inputs and outputs. If first attempt succeeds, this array will have
+   * only one element.
+   * 
+   * This array never has less than one element, despite the step's status.
+   */
+  attempts: ChatStepAttempt[],
+  input?: Record<string, any>,
+  user_question?: string,
 }
 
 export interface StepChatStep extends BaseChatStep {
@@ -288,17 +304,19 @@ export interface AnswerChatStep extends BaseChatStep {
   type: 'answer',
 }
 
-export type ChatStep = PlanningChatStep | StepChatStep | AnswerChatStep
+export type ChatStep = PlanningChatStep | StepChatStep | AnswerChatStep | ToolChatStep
 
 export interface BaseAgentInfo {
   type: 'chat' | 'planning' | 'step' | 'tool' | 'final_answer',
-  action: 'start' | 'end',
+  action: 'start' | 'end' | 'awaiting_approval',
   duration?: number,
+  id: string,
 }
 
 export interface AgentTool {
   tool_id: string,
   tool_execution_id: string,
+  goal: string,
 }
 
 export interface PlanningAgentInfo extends BaseAgentInfo {
@@ -311,6 +329,7 @@ export interface PlanningAgentInfo extends BaseAgentInfo {
       goal: string,
       tools?: AgentTool[],
     }[],
+    user_question?: string,
   },
 }
 
@@ -326,6 +345,8 @@ export interface ToolAgentInfo extends BaseAgentInfo {
     input?: any,
     attempt: number,
     output?: string,
+    user_question?: string,
+    tool_id: string,
   },
 }
 

package/src/error/DefaultAPIError.ts

@@ -1,4 +1,4 @@
-import { Dictionary, Language } from '@stack-spot/portal-translate'
+import { Dictionary } from '@stack-spot/portal-translate'
 import { every, isString } from 'lodash'
 import { actionDetails } from './dictionary/action-details'
 import { baseDictionary } from './dictionary/base'
@@ -24,7 +24,7 @@ const detailsDictionary = {
   actionapi: actionDetails,
 }
 
-function getTitle(status: number, raw: ErrorResponse, dictionary: Dictionary, language: Language) {
+function getTitle(status: number, raw: ErrorResponse, dictionary: Dictionary, language: 'pt' | 'en') {
   if (ignoredTitleErrorCodes.includes(raw.code)) return ' '
   if (dictionary[language][raw.code]) return dictionary[language][raw.code]
   if (raw.details && !ignoredDescriptions.includes(raw.details)) return raw.details
@@ -35,8 +35,8 @@ function getValues(detail: ValidationDetails) {
   return detail.values && every(detail.values, isString) ? `\n${detail.values.join('\n')}` : ''
 }
 
-function getSuggestedMessages(suggestedMessage: ErrorResponse['suggestedMessages'] | null | undefined, language?: Language) {
-  const parseLanguage: Record<Language, LanguageSuggestedMessageKeys> = { pt: 'ptBr', en: 'enUs' }
+function getSuggestedMessages(suggestedMessage: ErrorResponse['suggestedMessages'] | null | undefined, language?: 'pt' | 'en') {
+  const parseLanguage: Record<'pt' | 'en', LanguageSuggestedMessageKeys> = { pt: 'ptBr', en: 'enUs' }
   return suggestedMessage?.[parseLanguage?.[language || 'en']]
 }
 
@@ -60,7 +60,7 @@ export function interpolateErrors(message: string, values: string[], fieldValues
 }
 
 
-function createMessage(status: number, raw: ErrorResponse, dictionary: Dictionary, language?: Language): ErrorDetailsProperties {
+function createMessage(status: number, raw: ErrorResponse, dictionary: Dictionary, language?: 'pt' | 'en'): ErrorDetailsProperties {
   const title = getTitle(status, raw, dictionary, language || 'en')
   const api = raw.code?.split(/[-_]/)[0]
   const dictDetails = (detailsDictionary[api?.toLowerCase() as keyof typeof detailsDictionary] ?? {})[language || 'en']

package/src/error/StackspotAPIError.ts

@@ -1,6 +1,6 @@
-import { Language, getLanguage } from '@stack-spot/portal-translate'
+import { getLanguage, ptEn } from '@stack-spot/portal-translate'
 
-export type InternationalizedMessage = (language: Language) => string | ErrorDetailsProperties
+export type InternationalizedMessage = (language: 'pt' | 'en') => string | ErrorDetailsProperties
 
 export interface ErrorDetailsProperties {
   /**
@@ -81,7 +81,7 @@ export class StackspotAPIError extends Error {
    * @param language 
    * @returns an error message
    */
-  translate(language: Language = getLanguage()): string {
+  translate(language = getLanguage(ptEn)): string {
     const unknown = language === 'en' ? 'unknown error' : 'erro desconhecido'
     
     const error = this.intl?.(language) 
@@ -89,7 +89,7 @@ export class StackspotAPIError extends Error {
     return message ?? this.message ?? this.code ?? (this.status === 0 ? unknown : `${this.status}`)
   }
 
-  translateDetails(language: Language = getLanguage()): ErrorDetailsProperties {
+  translateDetails(language = getLanguage(ptEn)): ErrorDetailsProperties {
     const unknown = language === 'en' ? 'unknown error' : 'erro desconhecido'
     const errorMessage = this.intl?.(language)
     if (typeof errorMessage === 'string')