diff --git a/agent/claude/go.mod b/agent/claude/go.mod index 1357dd0..2852035 100644 --- a/agent/claude/go.mod +++ b/agent/claude/go.mod @@ -2,7 +2,9 @@ module github.com/bborbe/agent/agent/claude go 1.26.3 -replace github.com/bborbe/agent/lib => ../../lib +replace ( + github.com/bborbe/agent/lib => ../../lib +) require ( github.com/bborbe/agent/lib v0.62.3 @@ -12,7 +14,7 @@ require ( github.com/bborbe/sentry v1.9.17 github.com/bborbe/service v1.10.0 github.com/bborbe/time v1.27.0 - github.com/bborbe/vault-cli v0.64.3 + github.com/bborbe/vault-cli v0.67.5 github.com/golang/glog v1.2.5 github.com/onsi/ginkgo/v2 v2.29.0 github.com/onsi/gomega v1.41.0 diff --git a/agent/claude/go.sum b/agent/claude/go.sum index 6b298d6..cc87a54 100644 --- a/agent/claude/go.sum +++ b/agent/claude/go.sum @@ -42,8 +42,8 @@ github.com/bborbe/time v1.27.0 h1:8iP02hL/c/DSx0VSUucl+Xag1DN/Gw6ktykTSf0t9/s= github.com/bborbe/time v1.27.0/go.mod h1:86k09AnUTL/ZifJH/kM3Cks3F15qpguuoCyiTujeyTk= github.com/bborbe/validation v1.4.13 h1:wpbMgKT6qcyzwZ8iIE2CTp+JDHwZ/9kSvZV5gIF5K7I= github.com/bborbe/validation v1.4.13/go.mod h1:fLQ2m4py+juzQeS2vk9BrPztrSH8XxhvPBHGLA/pTmA= -github.com/bborbe/vault-cli v0.64.3 h1:HHN2N6GhBCxdQB8Me++wSPS81fKMLHmJjsyxWf06K7M= -github.com/bborbe/vault-cli v0.64.3/go.mod h1:lrrbavFV9kLuszwnmRmoJusuIbo5brBsPOF+eKZCUVE= +github.com/bborbe/vault-cli v0.67.5 h1:rMVU82q8aUwf8yvz7SwvExWLY7MZEotscM9basaTOMM= +github.com/bborbe/vault-cli v0.67.5/go.mod h1:lrrbavFV9kLuszwnmRmoJusuIbo5brBsPOF+eKZCUVE= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= diff --git a/agent/claude/pkg/factory/factory.go b/agent/claude/pkg/factory/factory.go index 44b0733..82a3329 100644 --- a/agent/claude/pkg/factory/factory.go +++ b/agent/claude/pkg/factory/factory.go @@ -15,6 +15,7 @@ import ( "github.com/bborbe/errors" libkafka "github.com/bborbe/kafka" libtime "github.com/bborbe/time" + "github.com/bborbe/vault-cli/pkg/domain" "github.com/bborbe/agent/agent/claude/pkg/prompts" agentlib "github.com/bborbe/agent/lib" @@ -122,7 +123,7 @@ func CreateAgentFromRunner( }) return agentlib.NewAgent( agentlib.NewPhase("planning", step), - agentlib.NewPhase("in_progress", step), + agentlib.NewPhase(domain.TaskPhaseExecution, step), agentlib.NewPhase("ai_review", step), ) } diff --git a/agent/code/go.mod b/agent/code/go.mod index 77bcda2..ae980bf 100644 --- a/agent/code/go.mod +++ b/agent/code/go.mod @@ -2,7 +2,9 @@ module github.com/bborbe/agent/agent/code go 1.26.3 -replace github.com/bborbe/agent/lib => ../../lib +replace ( + github.com/bborbe/agent/lib => ../../lib +) require ( github.com/bborbe/agent/lib v0.0.0 @@ -12,7 +14,7 @@ require ( github.com/bborbe/sentry v1.9.17 github.com/bborbe/service v1.10.0 github.com/bborbe/time v1.27.0 - github.com/bborbe/vault-cli v0.64.3 + github.com/bborbe/vault-cli v0.67.5 github.com/golang/glog v1.2.5 github.com/onsi/ginkgo/v2 v2.29.0 github.com/onsi/gomega v1.41.0 diff --git a/agent/code/go.sum b/agent/code/go.sum index 6b298d6..cc87a54 100644 --- a/agent/code/go.sum +++ b/agent/code/go.sum @@ -42,8 +42,8 @@ github.com/bborbe/time v1.27.0 h1:8iP02hL/c/DSx0VSUucl+Xag1DN/Gw6ktykTSf0t9/s= github.com/bborbe/time v1.27.0/go.mod h1:86k09AnUTL/ZifJH/kM3Cks3F15qpguuoCyiTujeyTk= github.com/bborbe/validation v1.4.13 h1:wpbMgKT6qcyzwZ8iIE2CTp+JDHwZ/9kSvZV5gIF5K7I= github.com/bborbe/validation v1.4.13/go.mod h1:fLQ2m4py+juzQeS2vk9BrPztrSH8XxhvPBHGLA/pTmA= -github.com/bborbe/vault-cli v0.64.3 h1:HHN2N6GhBCxdQB8Me++wSPS81fKMLHmJjsyxWf06K7M= -github.com/bborbe/vault-cli v0.64.3/go.mod h1:lrrbavFV9kLuszwnmRmoJusuIbo5brBsPOF+eKZCUVE= +github.com/bborbe/vault-cli v0.67.5 h1:rMVU82q8aUwf8yvz7SwvExWLY7MZEotscM9basaTOMM= +github.com/bborbe/vault-cli v0.67.5/go.mod h1:lrrbavFV9kLuszwnmRmoJusuIbo5brBsPOF+eKZCUVE= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= diff --git a/agent/code/pkg/factory/factory.go b/agent/code/pkg/factory/factory.go index ff29524..9596d52 100644 --- a/agent/code/pkg/factory/factory.go +++ b/agent/code/pkg/factory/factory.go @@ -14,6 +14,7 @@ import ( "github.com/bborbe/errors" libkafka "github.com/bborbe/kafka" libtime "github.com/bborbe/time" + "github.com/bborbe/vault-cli/pkg/domain" "github.com/bborbe/agent/agent/code/pkg/steps" agentlib "github.com/bborbe/agent/lib" @@ -71,7 +72,7 @@ func CreateFileResultDeliverer(filePath string) agentlib.ResultDeliverer { func CreateAgent() *agentlib.Agent { return agentlib.NewAgent( agentlib.NewPhase("planning", steps.NewPlanStep()), - agentlib.NewPhase("in_progress", steps.NewExecuteStep()), + agentlib.NewPhase(domain.TaskPhaseExecution, steps.NewExecuteStep()), agentlib.NewPhase("ai_review", steps.NewVerifyStep()), ) } diff --git a/agent/code/pkg/steps/steps.go b/agent/code/pkg/steps/steps.go index 5f6c614..9b09c93 100644 --- a/agent/code/pkg/steps/steps.go +++ b/agent/code/pkg/steps/steps.go @@ -19,6 +19,7 @@ import ( "fmt" "github.com/bborbe/errors" + "github.com/bborbe/vault-cli/pkg/domain" agentlib "github.com/bborbe/agent/lib" ) @@ -72,13 +73,13 @@ func (s *PlanStep) Run(ctx context.Context, md *agentlib.Markdown) (*agentlib.Re plan := Plan{Operation: op, A: a, B: b} section, err := agentlib.MarshalSectionTyped(ctx, "## Plan", plan) if err != nil { - return nil, errors.Wrapf(ctx, err, "marshal plan") + return nil, errors.Wrap(ctx, err, "marshal plan") } md.ReplaceSection(section) return &agentlib.Result{ Status: agentlib.AgentStatusDone, - NextPhase: "in_progress", + NextPhase: string(domain.TaskPhaseExecution), }, nil } @@ -112,7 +113,7 @@ func (s *ExecuteStep) Run(ctx context.Context, md *agentlib.Markdown) (*agentlib result := Result{Operation: plan.Operation, Value: value} section, err := agentlib.MarshalSectionTyped(ctx, "## Result", result) if err != nil { - return nil, errors.Wrapf(ctx, err, "marshal result") + return nil, errors.Wrap(ctx, err, "marshal result") } md.ReplaceSection(section) @@ -163,7 +164,7 @@ func (s *VerifyStep) Run(ctx context.Context, md *agentlib.Markdown) (*agentlib. section, err := agentlib.MarshalSectionTyped(ctx, "## Review", review) if err != nil { - return nil, errors.Wrapf(ctx, err, "marshal review") + return nil, errors.Wrap(ctx, err, "marshal review") } md.ReplaceSection(section) diff --git a/agent/gemini/go.mod b/agent/gemini/go.mod index bfa148a..2f701b1 100644 --- a/agent/gemini/go.mod +++ b/agent/gemini/go.mod @@ -2,7 +2,9 @@ module github.com/bborbe/agent/agent/gemini go 1.26.3 -replace github.com/bborbe/agent/lib => ../../lib +replace ( + github.com/bborbe/agent/lib => ../../lib +) require ( github.com/bborbe/agent/lib v0.0.0 @@ -12,7 +14,7 @@ require ( github.com/bborbe/sentry v1.9.17 github.com/bborbe/service v1.10.0 github.com/bborbe/time v1.27.0 - github.com/bborbe/vault-cli v0.64.3 + github.com/bborbe/vault-cli v0.67.5 github.com/golang/glog v1.2.5 github.com/onsi/ginkgo/v2 v2.29.0 github.com/onsi/gomega v1.41.0 diff --git a/agent/gemini/go.sum b/agent/gemini/go.sum index 3bf86fe..8e88bcc 100644 --- a/agent/gemini/go.sum +++ b/agent/gemini/go.sum @@ -48,8 +48,8 @@ github.com/bborbe/time v1.27.0 h1:8iP02hL/c/DSx0VSUucl+Xag1DN/Gw6ktykTSf0t9/s= github.com/bborbe/time v1.27.0/go.mod h1:86k09AnUTL/ZifJH/kM3Cks3F15qpguuoCyiTujeyTk= github.com/bborbe/validation v1.4.13 h1:wpbMgKT6qcyzwZ8iIE2CTp+JDHwZ/9kSvZV5gIF5K7I= github.com/bborbe/validation v1.4.13/go.mod h1:fLQ2m4py+juzQeS2vk9BrPztrSH8XxhvPBHGLA/pTmA= -github.com/bborbe/vault-cli v0.64.3 h1:HHN2N6GhBCxdQB8Me++wSPS81fKMLHmJjsyxWf06K7M= -github.com/bborbe/vault-cli v0.64.3/go.mod h1:lrrbavFV9kLuszwnmRmoJusuIbo5brBsPOF+eKZCUVE= +github.com/bborbe/vault-cli v0.67.5 h1:rMVU82q8aUwf8yvz7SwvExWLY7MZEotscM9basaTOMM= +github.com/bborbe/vault-cli v0.67.5/go.mod h1:lrrbavFV9kLuszwnmRmoJusuIbo5brBsPOF+eKZCUVE= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= diff --git a/agent/gemini/pkg/factory/factory.go b/agent/gemini/pkg/factory/factory.go index f05d430..4529b41 100644 --- a/agent/gemini/pkg/factory/factory.go +++ b/agent/gemini/pkg/factory/factory.go @@ -15,6 +15,7 @@ import ( "github.com/bborbe/errors" libkafka "github.com/bborbe/kafka" libtime "github.com/bborbe/time" + "github.com/bborbe/vault-cli/pkg/domain" "github.com/bborbe/agent/agent/gemini/pkg/parser" "github.com/bborbe/agent/agent/gemini/pkg/steps" @@ -90,9 +91,14 @@ func CreateAgent(geminiParser agentlib.AIParser) *agentlib.Agent { return agentlib.NewAgent( agentlib.NewPhase( "planning", - agentlib.NewParseStep[steps.Plan]("parse-plan", geminiParser, "## Plan", "in_progress"), + agentlib.NewParseStep[steps.Plan]( + "parse-plan", + geminiParser, + "## Plan", + string(domain.TaskPhaseExecution), + ), ), - agentlib.NewPhase("in_progress", steps.NewExecuteStep()), + agentlib.NewPhase(domain.TaskPhaseExecution, steps.NewExecuteStep()), agentlib.NewPhase("ai_review", steps.NewVerifyStep()), ) }