Merge branch 'Shuffle:main' into timeout-fix

Author: satti-hari-krishna-reddy

ai.go

@@ -7457,6 +7457,33 @@ func HandleAiAgentExecutionStart(ctx context.Context, execution WorkflowExecutio
 				userMessage = oldAgentOutput.OriginalInput
 			}
 
+			// If the user continued the agent after a finish decision (via "Add more details"),
+			// the new input is stored in the "continue" field of the injected "ask" decision.
+			// Override userMessage so the LLM acts on the new instruction instead of the original one.
+			// Iterate from the end so we deterministically pick the most recent continuation.
+			for i := len(mappedResult.Decisions) - 1; i >= 0; i-- {
+				mappedDecision := mappedResult.Decisions[i]
+				if mappedDecision.Action != "ask" {
+					continue
+				}
+
+				foundContinuation := false
+				for _, field := range mappedDecision.Fields {
+					if field.Key == "continue" && len(field.Answer) > 0 {
+						if debug {
+							log.Printf("[DEBUG][%s] AI Agent continuation: overriding userMessage with 'continue' answer (length=%d)", execution.ExecutionId, len(field.Answer))
+						}
+
+						userMessage = field.Answer
+						foundContinuation = true
+						break
+					}
+				}
+				if foundContinuation {
+					break
+				}
+			}
+
 			if hasFailure {
 				log.Printf("[WARNING][%s] AI Agent: Detected failure in previous decisions. Last finished index: %d", execution.ExecutionId, lastFinishedIndex)
 
@@ -7878,6 +7905,8 @@ You are the Action Execution Agent for the Shuffle platform. You receive tools (
 		}
 	}
 
+	// Fix e.g. injected JSON and other quote/newline mechanics that aren't compatible
+	// Problem: The input data itself can be a reference.
 	completionRequest.Messages = append(completionRequest.Messages, openai.ChatCompletionMessage{
 		Role:    openai.ChatMessageRoleUser,
 		Content: fmt.Sprintf("USER REQUEST: %s", userMessage),
@@ -8059,6 +8088,7 @@ You are the Action Execution Agent for the Shuffle platform. You receive tools (
 
 	resultMapping.ExecutionId = execution.ExecutionId
 	resultMapping.Authorization = execution.Authorization
+	// Waiting 3
 	resultMapping.Status = "WAITING"
 	resultMapping.Action = startNode
 	resultMapping.Action.Name = "agent"
@@ -8090,7 +8120,9 @@ You are the Action Execution Agent for the Shuffle platform. You receive tools (
 					continue
 				}
 
-				log.Printf("[DEBUG][%s] AI Agent: Found body parameter which MAY contain the right user input. LEN: %d", execution.ExecutionId, len(param.Value))
+				if debug { 
+					log.Printf("[DEBUG][%s] AI Agent: Found body parameter which MAY contain the right user input. LEN: %d", execution.ExecutionId, len(param.Value))
+				}
 
 				if len(param.Value) > 0 {
 					parsedAgentInput = param.Value
@@ -8319,7 +8351,8 @@ You are the Action Execution Agent for the Shuffle platform. You receive tools (
 
 			ExecutionId: execution.ExecutionId,
 			NodeId:      startNode.ID,
-			StartedAt:   time.Now().Unix(),
+			StartedAt:   time.Now().UnixMicro(),
+			CompletedAt: 0,
 
 			Memory: memorizationEngine,
 
@@ -8328,6 +8361,7 @@ You are the Action Execution Agent for the Shuffle platform. You receive tools (
 
 		if len(errorMessage) > 0 {
 			agentOutput.Output = errorMessage
+			agentOutput.Status = "FAILURE"
 		}
 
 		if createNextActions == true {
@@ -8394,6 +8428,7 @@ You are the Action Execution Agent for the Shuffle platform. You receive tools (
 						execution.Results[resultIndex].Result = string(agentOutputMarshalled)
 					}
 
+					// Waiting 1 
 					execution.Results[resultIndex].Status = "WAITING"
 
 					// Update the result in cache as actions are self-corrective
@@ -8499,6 +8534,8 @@ You are the Action Execution Agent for the Shuffle platform. You receive tools (
 				}
 
 				decision.RunDetails.StartedAt = time.Now().Unix()
+
+				// Waiting 2
 				decision.RunDetails.Status = "WAITING"
 
 				agentOutput.Decisions[decisionIndex] = decision
@@ -8575,10 +8612,9 @@ You are the Action Execution Agent for the Shuffle platform. You receive tools (
 				}
 
 				agentOutput.Decisions[decisionIndex].RunDetails.StartedAt = time.Now().Unix()
-				agentOutput.Decisions[decisionIndex].RunDetails.Status = "RUNNING"
-
-
-
+				//agentOutput.Decisions[decisionIndex].RunDetails.Status = "RUNNING"
+				agentOutput.Decisions[decisionIndex].RunDetails.Status = "WAITING"
+				agentOutput.Status = "WAITING"
 
 			} else if decision.Category != "standalone" {
 				// Do we run the singul action directly?
@@ -8617,6 +8653,13 @@ You are the Action Execution Agent for the Shuffle platform. You receive tools (
 							Result: string(marshalledDecision),
 						}
 
+						for _, action := range execution.Workflow.Actions {
+							if action.ID == actionResult.Action.ID {
+								actionResult.Action = action
+								break
+							}
+						}
+
 						// This is required as the result for the agent isn't set yet on the first run. Minor delay to wait up a bit
 						if decisionIndex == 0 {
 							go func() {
@@ -8928,17 +8971,21 @@ func GenerateSingulWorkflows(resp http.ResponseWriter, request *http.Request) {
 	initialising := false
 	workflow, workflowErr := GetWorkflow(ctx, workflowId)
 	if workflowErr != nil || workflow.ID == "" {
-		log.Printf("[WARNING] Failed to get workflow by ID '%s' in GenerateSingulWorkflows: %s", workflowId, workflowErr)
+		//log.Printf("[WARNING] Failed to get workflow by ID '%s' in GenerateSingulWorkflows: %s", workflowId, workflowErr)
 		initialising = true
 	}
 
 	if categoryAction.ActionName == "remove" || categoryAction.ActionName == "disable" || categoryAction.ActionName == "stop" {
+
+
 		if workflowErr == nil && workflow.OrgId == user.ActiveOrg.Id {
 			// Delete the workflow
 			err = DeleteKey(ctx, "workflow", workflowId)
 			if err != nil {
 				log.Printf("[ERROR] Failed deleting workflow with ID %s in GenerateSingulWorkflows: %s", workflowId, err)
 			}
+
+			DeleteCache(ctx, fmt.Sprintf("%s_%s_workflows", "", user.ActiveOrg.Id))
 		} else {
 			log.Printf("[INFO] No existing workflow with ID %s to remove for category '%s'", workflowId, categoryAction.Label)
 			resp.WriteHeader(http.StatusOK)

app_upload/go.mod

@@ -42,7 +42,6 @@ require (
 	github.com/cncf/xds/go v0.0.0-20250121191232-2f005788dc42 // indirect
 	github.com/containerd/errdefs v1.0.0 // indirect
 	github.com/containerd/errdefs/pkg v0.3.0 // indirect
-	github.com/coreos/go-oidc/v3 v3.17.0 // indirect
 	github.com/cyphar/filepath-securejoin v0.4.1 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/distribution/reference v0.6.0 // indirect
@@ -54,7 +53,7 @@ require (
 	github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/frikky/kin-openapi v0.42.0 // indirect
-	github.com/frikky/schemaless v0.0.28 // indirect
+	github.com/frikky/schemaless v0.0.33 // indirect
 	github.com/fxamacker/cbor/v2 v2.9.0 // indirect
 	github.com/ghodss/yaml v1.0.0 // indirect
 	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect

app_upload/go.sum

@@ -93,8 +93,6 @@ github.com/containerd/errdefs/pkg v0.3.0 h1:9IKJ06FvyNlexW690DXuQNx2KA2cUJXx151X
 github.com/containerd/errdefs/pkg v0.3.0/go.mod h1:NJw6s9HwNuRhnjJhM7pylWwMyAkmCQvQ4GpJHEqRLVk=
 github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
 github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
-github.com/coreos/go-oidc/v3 v3.17.0 h1:hWBGaQfbi0iVviX4ibC7bk8OKT5qNr4klBaCHVNvehc=
-github.com/coreos/go-oidc/v3 v3.17.0/go.mod h1:wqPbKFrVnE90vty060SB40FCJ8fTHTxSwyXJqZH+sI8=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/cyphar/filepath-securejoin v0.4.1 h1:JyxxyPEaktOD+GAnqIqTf9A8tHyAG22rowi7HkoSU1s=
 github.com/cyphar/filepath-securejoin v0.4.1/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGLDGQL7h7bg04C/+u9jI=
@@ -129,8 +127,8 @@ github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2
 github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/frikky/kin-openapi v0.42.0 h1:d5Z6vnuQ6RnCCPIxZaDL+TH2ODLxT8abytOt+Zh+Kd0=
 github.com/frikky/kin-openapi v0.42.0/go.mod h1:ev9OZAw7Bv5p0w93j91++6a1ElPzGcCofst+kmrWsj4=
-github.com/frikky/schemaless v0.0.28 h1:gdurMqBwtvY4Y/5pcxn8bdGCJn/eolKGz+c5DcidLkI=
-github.com/frikky/schemaless v0.0.28/go.mod h1:m9s+6gALXhA5ZERCrJw+jI2rRtTPNa8mkl4vav9sxnY=
+github.com/frikky/schemaless v0.0.33 h1:5Soj6VQc+ozqLh4R6MatWOl/atAeNpdon+nV5EKwjOI=
+github.com/frikky/schemaless v0.0.33/go.mod h1:m9s+6gALXhA5ZERCrJw+jI2rRtTPNa8mkl4vav9sxnY=
 github.com/fxamacker/cbor/v2 v2.9.0 h1:NpKPmjDBgUfBms6tr6JZkTHtfFGcMKsw3eGcmD/sapM=
 github.com/fxamacker/cbor/v2 v2.9.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
 github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=

app_upload/stitcher.go

@@ -1007,8 +1007,8 @@ func main() {
 		bucketName = os.Args[5]
 	}
 
-	appname := "shuffle-ai"
-	appversion := "1.0.0"
+	appname := "shuffle-tools"
+	appversion := "1.2.0"
 	err := deployConfigToBackend(appfolder, appname, appversion)
 	if err != nil {
 		log.Printf("[WARNING] Failed uploading config: %s", err)