Better handling of user tools

Signed-off-by: Ettore Di Giacinto <[email protected]>

Author: mudler

core/agent/agent.go

@@ -782,6 +782,7 @@ func (a *Agent) consumeJob(job *types.Job, role string) {
 	cogitoTools := availableActions.ToCogitoTools(job.GetContext(), a.sharedState)
 
 	var err error
+	var userTool bool
 
 	cogitoOpts := []cogito.Option{
 		cogito.WithMCPs(a.mcpSessions...),
@@ -985,7 +986,8 @@ func (a *Agent) consumeJob(job *types.Job, role string) {
 		a.llm, fragment,
 		cogitoOpts...,
 	)
-	if err != nil && !errors.Is(err, cogito.ErrNoToolSelected) && !errors.Is(err, cogito.ErrGoalNotAchieved) {
+
+	if err != nil && !errors.Is(err, cogito.ErrNoToolSelected) && !errors.Is(err, cogito.ErrGoalNotAchieved) && !userTool {
 		if obs != nil {
 			obs.Completion = &types.Completion{
 				Error: err.Error(),
@@ -997,6 +999,11 @@ func (a *Agent) consumeJob(job *types.Job, role string) {
 		return
 	}
 
+	if userTool {
+		job.Result.Finish(nil)
+		return
+	}
+
 	if len(fragment.Messages) > 0 &&
 		fragment.LastMessage().Role == "tool" {
 		toolToCall := fragment.Messages[len(fragment.Messages)-2].ToolCalls[0].Function.Name

go.mod

@@ -16,7 +16,7 @@ require (
 	github.com/google/go-github/v69 v69.2.0
 	github.com/google/uuid v1.6.0
 	github.com/modelcontextprotocol/go-sdk v1.0.0
-	github.com/mudler/cogito v0.3.4-0.20251022151954-5f46a5b9e3c4
+	github.com/mudler/cogito v0.3.4-0.20251023130443-7ff6cae505b1
 	github.com/onsi/ginkgo/v2 v2.25.3
 	github.com/onsi/gomega v1.38.2
 	github.com/philippgille/chromem-go v0.7.0

go.sum

@@ -208,6 +208,8 @@ github.com/mudler/cogito v0.3.4-0.20251021205807-8b24a604fc4f h1:C+cRbVD8qDTgfOj
 github.com/mudler/cogito v0.3.4-0.20251021205807-8b24a604fc4f/go.mod h1:abMwl+CUjCp87IufA2quZdZt0bbLaHHN79o17HbUKxU=
 github.com/mudler/cogito v0.3.4-0.20251022151954-5f46a5b9e3c4 h1:VwEEePUqeL+Lwu0nxMc2oRxlMx4dm5MZ48CyorpiYEA=
 github.com/mudler/cogito v0.3.4-0.20251022151954-5f46a5b9e3c4/go.mod h1:abMwl+CUjCp87IufA2quZdZt0bbLaHHN79o17HbUKxU=
+github.com/mudler/cogito v0.3.4-0.20251023130443-7ff6cae505b1 h1:JdB5ttL4P6N+oaVdYZZCZfos3SKOHiyhBTmMIGAiWbU=
+github.com/mudler/cogito v0.3.4-0.20251023130443-7ff6cae505b1/go.mod h1:abMwl+CUjCp87IufA2quZdZt0bbLaHHN79o17HbUKxU=
 github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
 github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
 github.com/onsi/ginkgo/v2 v2.25.3 h1:Ty8+Yi/ayDAGtk4XxmmfUy4GabvM+MegeB4cDLRi6nw=