The selection criteria alone left workflow optional and defaulted an omitted or unrecognised value to implement, so a decide call could still skip the decision and send an unsettled capability straight to the builder. Omission is now a retryable rejection: CaptureTool gains RequiredWhenTrue, a conditional requirement a flat RequiredFields entry cannot express, because the close-without-change branch has no workflow to name and must not be made to invent one. A rejected call is not recorded, so it does not consume MaxCalls and the model retries with the field. A value outside the enum now fails the stage rather than degrading to implement: reaching OnResult with one means the model ignored its own schema. Splits validateCaptureArgs into per-constraint checks (cyclop) and carries the regenerated contracts.json.
412 lines
14 KiB
Go
412 lines
14 KiB
Go
package agentexec
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"fmt"
|
|
"log/slog"
|
|
"maps"
|
|
"path/filepath"
|
|
"slices"
|
|
"strings"
|
|
|
|
"github.com/samcharles93/ai-sdk/agentloop"
|
|
"github.com/samcharles93/ai-sdk/core"
|
|
"github.com/samcharles93/ai-sdk/runtime"
|
|
"github.com/samcharles93/ai-sdk/toolkit"
|
|
|
|
"github.com/samcharles93/archie-core/internal/skill"
|
|
"github.com/samcharles93/archie-core/internal/skillscript"
|
|
"github.com/samcharles93/archie-core/internal/tools"
|
|
)
|
|
|
|
// Runner executes one autonomous stage against an already prepared workspace.
|
|
type Runner interface {
|
|
// report, when non-nil, is notified once per completed tool call.
|
|
Run(ctx context.Context, workspace string, req Request, report ToolCallReporter) (Result, error)
|
|
}
|
|
|
|
type loopFunc func(context.Context, agentloop.Config) (agentloop.Result, error)
|
|
|
|
// LoopRunner executes one workflow stage through ai-sdk's agent loop. It is
|
|
// worker-local: archie-agent owns the complete workflow and uses this runner
|
|
// for each stage inside its task-scoped container.
|
|
type LoopRunner struct {
|
|
runtime *runtime.Runtime
|
|
log *slog.Logger
|
|
run loopFunc
|
|
tools *tools.Registry
|
|
|
|
// Limits bounds the size of tool results fed back into the stage. The
|
|
// zero value applies no limits.
|
|
Limits ToolLimits
|
|
}
|
|
|
|
func NewLoopRunner(
|
|
rt *runtime.Runtime,
|
|
log *slog.Logger,
|
|
registries ...*tools.Registry,
|
|
) *LoopRunner {
|
|
runner := &LoopRunner{runtime: rt, log: log, run: agentloop.Run}
|
|
if len(registries) > 0 {
|
|
runner.tools = registries[0]
|
|
}
|
|
return runner
|
|
}
|
|
|
|
// workspaceToolset names the central-registry toolset a task agent must not
|
|
// inherit. Those tools are rooted at the chat workspace, not the task's
|
|
// worktree, and they reach the filesystem through their own handlers -- so
|
|
// agentloop's ReadOnly and ProtectPaths, which gate only the tools agentloop
|
|
// registers itself, do not apply to them. A feasibility stage running
|
|
// ReadOnly could otherwise write, and a TDD fix stage could edit the very
|
|
// tests it is being graded against.
|
|
//
|
|
// This is an invariant of task execution rather than a deployment choice, so
|
|
// it is not configurable.
|
|
const workspaceToolset = "workspace"
|
|
|
|
func (r *LoopRunner) Run(ctx context.Context, workspace string, req Request, report ToolCallReporter) (Result, error) {
|
|
if err := req.Validate(); err != nil {
|
|
return Result{}, err
|
|
}
|
|
if r.runtime == nil {
|
|
return Result{}, fmt.Errorf("agent runtime is not configured")
|
|
}
|
|
if r.run == nil {
|
|
return Result{}, fmt.Errorf("agent loop is not configured")
|
|
}
|
|
|
|
notes := &memoryNotes{initial: req.Notes}
|
|
captures := make(map[string][]json.RawMessage)
|
|
toolOpts := r.Limits.Options(workspaceToolset)
|
|
toolOpts.OnToolCall = report
|
|
centralTools, err := BuildToolSet(r.tools, toolOpts)
|
|
if err != nil {
|
|
return Result{}, fmt.Errorf("build central tool set: %w", err)
|
|
}
|
|
captureTools := captureToolSet(req.CaptureTools, captures)
|
|
scriptTools := scriptToolSet(workspace)
|
|
pluginTools, err := pluginToolSet(req, workspace, centralTools, captureTools, scriptTools)
|
|
if err != nil {
|
|
return Result{}, err
|
|
}
|
|
res, err := r.run(ctx, agentloop.Config{
|
|
Runtime: r.runtime,
|
|
ModelRef: req.Model,
|
|
WorkDir: workspace,
|
|
Mission: req.Mission,
|
|
ExtraRules: projectScopedRules(workspace, req.ExtraRules),
|
|
Notes: notes,
|
|
Gate: toAgentGate(req.Gate),
|
|
Preflight: toAgentCommands(req.Preflight),
|
|
Budget: agentloop.Budget{
|
|
MaxSteps: req.Budget.MaxSteps,
|
|
WallClock: req.Budget.WallClock,
|
|
},
|
|
Compact: agentloop.CompactionConfig{
|
|
Enabled: req.ContextWindow > 0,
|
|
ContextWindow: req.ContextWindow,
|
|
ThresholdRatio: 0.5,
|
|
TargetRatio: 0.15,
|
|
},
|
|
Completion: agentloop.CompletionForceFinish,
|
|
ReadOnly: req.ReadOnly,
|
|
ProtectPaths: protectionMatcher(req.Protection, req.ReadOnly),
|
|
Extra: mergeToolSets(
|
|
centralTools,
|
|
captureTools,
|
|
scriptTools,
|
|
pluginTools,
|
|
),
|
|
Logger: r.logger(req),
|
|
})
|
|
result := resultFromRun(req, res, notes.appended, captures)
|
|
if cause := context.Cause(ctx); cause != nil {
|
|
return result, cause
|
|
}
|
|
return result, err
|
|
}
|
|
|
|
func resultFromRun(req Request, res agentloop.Result, appended []string, captures map[string][]json.RawMessage) Result {
|
|
result := Result{
|
|
Version: ProtocolVersion,
|
|
TaskID: req.TaskID,
|
|
Attempt: req.Attempt,
|
|
Stage: req.Stage,
|
|
Status: string(res.Status),
|
|
StopReason: res.StopReason,
|
|
Changes: res.Changes,
|
|
Iterations: res.Iterations,
|
|
TokensUsed: res.TokensUsed,
|
|
Usage: Usage{
|
|
PromptTokens: res.Usage.PromptTokens,
|
|
CompletionTokens: res.Usage.CompletionTokens,
|
|
TotalTokens: res.Usage.TotalTokens,
|
|
CachedTokens: res.Usage.CachedTokens,
|
|
CacheCreationTokens: res.Usage.CacheCreationTokens,
|
|
},
|
|
Summary: res.Summary,
|
|
Detail: res.Detail,
|
|
AppendedNotes: appended,
|
|
Captures: captures,
|
|
}
|
|
// agentloop may return a zero-valued status on early exit (model
|
|
// connectivity failure, empty response, etc.). Normalise it to a
|
|
// known value so protocol validation always passes.
|
|
if result.Status == "" {
|
|
result.Status = "blocked"
|
|
result.Detail = "agent returned no status (possible model connectivity issue)"
|
|
}
|
|
return result
|
|
}
|
|
|
|
func projectScopedRules(workspace, extra string) string {
|
|
rule := "Confine discovery to " + workspace + ". Do not inspect home directories, dependency/module caches, or unrelated projects unless the mission explicitly requests that external path."
|
|
if strings.TrimSpace(extra) == "" {
|
|
return rule
|
|
}
|
|
return rule + "\n" + extra
|
|
}
|
|
|
|
func pluginToolSet(req Request, workspace string, occupied ...core.ToolSet) (core.ToolSet, error) {
|
|
if req.ReadOnly || len(req.Protection.Suffixes)+len(req.Protection.Globs) > 0 || len(req.Gate.Commands) > 0 {
|
|
return nil, nil
|
|
}
|
|
builtins := toolkit.NewRegistry()
|
|
if err := toolkit.RegisterBuiltins(builtins, workspace); err != nil {
|
|
return nil, fmt.Errorf("register built-in tools for plugin collision check: %w", err)
|
|
}
|
|
reserved := map[string]struct{}{"finish": {}, "write_note": {}}
|
|
for _, name := range builtins.Names() {
|
|
reserved[name] = struct{}{}
|
|
}
|
|
set := make(core.ToolSet, len(req.Plugins))
|
|
for _, spec := range req.Plugins {
|
|
if _, exists := reserved[spec.Name]; exists {
|
|
return nil, fmt.Errorf("plugin tool %q conflicts with an agent-loop tool", spec.Name)
|
|
}
|
|
for _, tools := range occupied {
|
|
if _, exists := tools[spec.Name]; exists {
|
|
return nil, fmt.Errorf("plugin tool %q conflicts with an existing tool", spec.Name)
|
|
}
|
|
}
|
|
plugin := skill.Plugin{Name: spec.Name, Src: spec.Src}
|
|
set[spec.Name] = core.NewTypedTool(
|
|
spec.Name,
|
|
"Run the project-bundled "+spec.Name+" plugin.",
|
|
func(_ context.Context, args struct {
|
|
Input string `json:"input"`
|
|
},
|
|
) (string, error) {
|
|
return plugin.Run(args.Input)
|
|
},
|
|
)
|
|
}
|
|
return set, nil
|
|
}
|
|
|
|
func (r *LoopRunner) logger(req Request) *slog.Logger {
|
|
if r.log == nil {
|
|
return slog.New(slog.DiscardHandler)
|
|
}
|
|
return r.log.With("task", req.TaskID, "attempt", req.Attempt, "stage", req.Stage, "model", req.Model)
|
|
}
|
|
|
|
func toAgentGate(g Gate) agentloop.GateConfig {
|
|
return agentloop.GateConfig{
|
|
Commands: toAgentCommands(g.Commands),
|
|
MaxConsecutiveFailures: g.MaxConsecutiveFailures,
|
|
}
|
|
}
|
|
|
|
func toAgentCommands(commands []Command) []agentloop.GateCommand {
|
|
out := make([]agentloop.GateCommand, 0, len(commands))
|
|
for _, command := range commands {
|
|
out = append(out, agentloop.GateCommand{
|
|
Name: command.Name, Argv: command.Argv, ExpectFailure: command.ExpectFailure,
|
|
})
|
|
}
|
|
return out
|
|
}
|
|
|
|
func protectionMatcher(p Protection, readOnly bool) func(string) bool {
|
|
if readOnly || len(p.Suffixes)+len(p.Globs) == 0 {
|
|
return nil
|
|
}
|
|
return func(path string) bool {
|
|
for _, suffix := range p.Suffixes {
|
|
if strings.HasSuffix(path, suffix) {
|
|
return true
|
|
}
|
|
}
|
|
for _, glob := range p.Globs {
|
|
matchPath := path
|
|
if !strings.ContainsAny(glob, `/\`) {
|
|
matchPath = filepath.Base(path)
|
|
}
|
|
if matched, err := filepath.Match(glob, matchPath); err == nil && matched {
|
|
return true
|
|
}
|
|
}
|
|
return false
|
|
}
|
|
}
|
|
|
|
func captureToolSet(specs []CaptureTool, captures map[string][]json.RawMessage) core.ToolSet {
|
|
tools := make(core.ToolSet, len(specs))
|
|
for _, spec := range specs {
|
|
tools[spec.Name] = core.NewTool(spec.Name, spec.Description, spec.Parameters,
|
|
makeCaptureHandler(spec, captures))
|
|
}
|
|
return tools
|
|
}
|
|
|
|
// makeCaptureHandler builds a tool handler that validates and records
|
|
// capture-tool invocations.
|
|
func makeCaptureHandler(spec CaptureTool, captures map[string][]json.RawMessage) func(context.Context, string) (string, error) {
|
|
return func(_ context.Context, input string) (string, error) {
|
|
if spec.MaxCalls > 0 && len(captures[spec.Name]) >= spec.MaxCalls {
|
|
return fmt.Sprintf("%s rejected: maximum call count is %d", spec.Name, spec.MaxCalls), nil
|
|
}
|
|
value := json.RawMessage(input)
|
|
if !json.Valid(value) {
|
|
return spec.Name + " rejected: arguments are not valid JSON", nil
|
|
}
|
|
rejection, ok := validateCaptureArgs(spec, value)
|
|
if !ok {
|
|
return rejection, nil
|
|
}
|
|
captures[spec.Name] = append(captures[spec.Name], append(json.RawMessage(nil), value...))
|
|
return spec.Name + " recorded", nil
|
|
}
|
|
}
|
|
|
|
// validateCaptureArgs checks that the capture tool arguments satisfy all
|
|
// constraints. Returns a rejection message and false on failure, or "" and
|
|
// true on success. Each constraint is its own check so adding one does not
|
|
// grow a single branching function.
|
|
func validateCaptureArgs(spec CaptureTool, value json.RawMessage) (string, bool) {
|
|
var object map[string]json.RawMessage
|
|
if err := json.Unmarshal(value, &object); err != nil {
|
|
return spec.Name + " rejected: arguments must be a JSON object", false //nolint:nilerr // the agent loop must see malformed tool arguments as feedback it can correct, not as a failed tool call
|
|
}
|
|
for _, check := range []func(CaptureTool, map[string]json.RawMessage) (string, bool){
|
|
checkRequiredFields,
|
|
checkNonEmptyStrings,
|
|
checkBooleanFields,
|
|
checkRequiredWhenTrue,
|
|
} {
|
|
if rejection, ok := check(spec, object); !ok {
|
|
return rejection, false
|
|
}
|
|
}
|
|
return "", true
|
|
}
|
|
|
|
func checkRequiredFields(spec CaptureTool, object map[string]json.RawMessage) (string, bool) {
|
|
for _, field := range spec.RequiredFields {
|
|
if _, ok := object[field]; !ok {
|
|
return fmt.Sprintf("%s rejected: %s is required", spec.Name, field), false
|
|
}
|
|
}
|
|
return "", true
|
|
}
|
|
|
|
func checkNonEmptyStrings(spec CaptureTool, object map[string]json.RawMessage) (string, bool) {
|
|
for _, field := range spec.NonEmptyStrings {
|
|
if !isNonEmptyString(object, field) {
|
|
return fmt.Sprintf("%s rejected: %s must be a non-empty string", spec.Name, field), false
|
|
}
|
|
}
|
|
return "", true
|
|
}
|
|
|
|
func checkBooleanFields(spec CaptureTool, object map[string]json.RawMessage) (string, bool) {
|
|
for _, field := range spec.BooleanFields {
|
|
var val bool
|
|
if raw, ok := object[field]; !ok || json.Unmarshal(raw, &val) != nil {
|
|
return fmt.Sprintf("%s rejected: %s must be a boolean", spec.Name, field), false
|
|
}
|
|
}
|
|
return "", true
|
|
}
|
|
|
|
// checkRequiredWhenTrue enforces the conditional requirements. Triggers are
|
|
// visited in sorted order so a call violating two of them names the same one
|
|
// every run, rather than a different one on each retry.
|
|
func checkRequiredWhenTrue(spec CaptureTool, object map[string]json.RawMessage) (string, bool) {
|
|
for _, trigger := range slices.Sorted(maps.Keys(spec.RequiredWhenTrue)) {
|
|
var on bool
|
|
if raw, ok := object[trigger]; !ok || json.Unmarshal(raw, &on) != nil || !on {
|
|
continue
|
|
}
|
|
for _, field := range spec.RequiredWhenTrue[trigger] {
|
|
if !isNonEmptyString(object, field) {
|
|
return fmt.Sprintf("%s rejected: %s is required when %s is true", spec.Name, field, trigger), false
|
|
}
|
|
}
|
|
}
|
|
return "", true
|
|
}
|
|
|
|
func isNonEmptyString(object map[string]json.RawMessage, field string) bool {
|
|
var text string
|
|
raw, ok := object[field]
|
|
return ok && json.Unmarshal(raw, &text) == nil && strings.TrimSpace(text) != ""
|
|
}
|
|
|
|
// scriptToolSet exposes run_go_script: interpreting a Yaegi Go script
|
|
// bundled with a skill (.agents/skills/<skill>/scripts/*.go) or living
|
|
// anywhere else in the workspace, and returning what it printed. This is
|
|
// how an agent following a skill's instructions ("run scripts/gitleaks.go
|
|
// to scan for secrets") actually executes a .go helper without a Go
|
|
// toolchain in the sandbox.
|
|
func scriptToolSet(workspace string) core.ToolSet {
|
|
return core.ToolSet{
|
|
"run_go_script": core.NewTypedTool(
|
|
"run_go_script",
|
|
"Run a Yaegi-interpreted Go script (e.g. a skill's bundled scripts/*.go helper) and return everything it printed.",
|
|
func(ctx context.Context, args struct {
|
|
Path string `json:"path" jsonschema:"description=Path to the .go script, relative to the workspace root."`
|
|
},
|
|
) (string, error) {
|
|
if strings.TrimSpace(args.Path) == "" {
|
|
return "run_go_script rejected: arguments must be a JSON object with a non-empty path field", nil
|
|
}
|
|
full := filepath.Join(workspace, args.Path)
|
|
if rel, err := filepath.Rel(workspace, full); err != nil || strings.HasPrefix(rel, "..") {
|
|
return "run_go_script rejected: path escapes the workspace", nil //nolint:nilerr // rejection feedback lets the model retry with a valid path
|
|
}
|
|
out, err := skillscript.RunContext(ctx, full)
|
|
if err != nil {
|
|
return fmt.Sprintf("run_go_script failed: %v\n%s", err, out), nil
|
|
}
|
|
return out, nil
|
|
},
|
|
),
|
|
}
|
|
}
|
|
|
|
// mergeToolSets combines tool sets into one; later sets win on name
|
|
// collisions.
|
|
func mergeToolSets(sets ...core.ToolSet) core.ToolSet {
|
|
merged := core.ToolSet{}
|
|
for _, set := range sets {
|
|
maps.Copy(merged, set)
|
|
}
|
|
return merged
|
|
}
|
|
|
|
type memoryNotes struct {
|
|
initial string
|
|
appended []string
|
|
}
|
|
|
|
func (n *memoryNotes) Load(context.Context) (string, error) { return n.initial, nil }
|
|
|
|
func (n *memoryNotes) Append(_ context.Context, entry string) error {
|
|
n.appended = append(n.appended, entry)
|
|
return nil
|
|
}
|