Two gaps surfaced by a live fan-out smoke in a downstream host (mort): 1) A single-loop run that exhausts its step budget (ErrMaxSteps / ErrToolLoop) returned empty Output + a hard error, discarding all the reasoning it had produced — unlike the phased path, which already salvages a partial transcript and continues. Add opt-in single-loop salvage (Defaults.SalvageSingleLoopMaxSteps, default off): on budget exhaustion with empty Output, reconstruct a best-effort answer from the step narration (reusing salvagePhaseTranscript) and downgrade the run to a successful partial result. Off by default so a structured-output host keeps its clean hard error; an interactive host opts in. 2) RunnableAgent carried no tool-call ceiling — MaxIterations bounds STEPS, but one step can dispatch several tool calls, so a host's "max tool calls" cap had nowhere to land. Add RunnableAgent.MaxToolCalls (<=0 = unlimited, backward-compatible): the step observer counts executed calls and, once the cap is reached, stepCeilingOption forces the loop to exit; the resulting ErrMaxSteps is relabeled to the new ErrMaxToolCalls sentinel. Enforced single-loop only for now (phased is a follow-up). A cap hit is budget exhaustion, so salvage recovers its partial reasoning too. isPhaseBudgetExhaustion becomes the shared isBudgetExhaustion (now also matching ErrMaxToolCalls) so the phased and single-loop paths never drift, and the RunStateAccessor now reports the real tool-call cap (was hardcoded 0). Additive + backward-compatible: new optional DTO field, new opt-in Defaults flag, new exported sentinel; unlimited/off reproduce prior behavior exactly. No new dependencies (go mod tidy clean). Tests cover salvage on/off/no-prose, cap enforcement + sentinel, cap+salvage, unlimited no-op, and cap-overrides-critic. Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected]> Claude-Session: https://claude.ai/code/session_01Q1eJh5NVR11z6RzyxLANMK
103 lines
4.5 KiB
Go
103 lines
4.5 KiB
Go
package run
|
|
|
|
import "time"
|
|
|
|
// RunnableAgent is the kernel's view of "a thing to run": an identity, a model
|
|
// tier, a system prompt, execution caps, and a tool palette. It is a plain DTO
|
|
// on purpose — the run kernel never imports a noun battery. The persona Agent
|
|
// and the saved Skill each LOWER themselves into a RunnableAgent (a ToRunnable
|
|
// method on the battery side), and the kernel runs the DTO. This is the
|
|
// inversion of mort's agentexec.Executor.Run(*agents.Agent): the executor no
|
|
// longer depends on the persona struct, only on this shape.
|
|
//
|
|
// A light host can build a RunnableAgent inline (model tier + prompt + a few
|
|
// tool names) for a one-shot bounded run, with no persona or skill battery at
|
|
// all — that is exactly gadfly's swarm task.
|
|
type RunnableAgent struct {
|
|
// ID is a stable identifier for the run subject (an agent/skill UUID, or
|
|
// any host-chosen id). Used for audit attribution and dispatch-guard
|
|
// genealogy. Empty is allowed for anonymous one-shot runs.
|
|
ID string
|
|
|
|
// Name is a human label (audit/logs/delivery). Empty is allowed.
|
|
Name string
|
|
|
|
// SystemPrompt is the agent's base system prompt (before per-run
|
|
// personalization, which a host layers via Ports).
|
|
SystemPrompt string
|
|
|
|
// ModelTier is a tier alias or concrete spec resolved through
|
|
// model.ParseModelForContext. Empty resolves to the host's default tier.
|
|
ModelTier string
|
|
|
|
// MaxIterations caps the agent loop's tool-dispatch steps. 0 = kernel
|
|
// default. MaxRuntime caps wall-clock for the whole run (the kernel starts
|
|
// this clock AFTER any lane dequeue, not at submission). 0 = kernel
|
|
// default.
|
|
MaxIterations int
|
|
MaxRuntime time.Duration
|
|
|
|
// MaxToolCalls caps the TOTAL number of tool calls across the whole run,
|
|
// independent of the step ceiling (one step can carry several parallel tool
|
|
// calls). 0 (or negative) = unlimited — the backward-compatible default, so
|
|
// a run that never sets it is unaffected. Enforced at step granularity: the
|
|
// loop stops after the step in which the cumulative tool-call count reaches
|
|
// the cap, surfacing ErrMaxToolCalls. Single-loop runs only today (phased
|
|
// pipelines are a follow-up).
|
|
MaxToolCalls int
|
|
|
|
// LowLevelTools are tool-registry names the run may call directly.
|
|
// SkillPalette / SubAgentPalette name saved skills / sub-agents exposed as
|
|
// skill__<name> / agent__<name> delegation tools, resolved through
|
|
// Ports.Palette (nil Palette => those entries are inert).
|
|
LowLevelTools []string
|
|
SkillPalette []string
|
|
SubAgentPalette []string
|
|
// SkillPacks names SKILL.md skill-pack subscriptions activated for the run
|
|
// via Ports.SkillPacks: each pack's name+description joins a catalog folded
|
|
// into the system prompt, and a skill_use tool loads a pack's body on demand
|
|
// (progressive disclosure). nil Ports.SkillPacks => inert.
|
|
SkillPacks []string
|
|
|
|
// Phases optionally model a multi-step pipeline (each phase its own prompt
|
|
// + tier + tools). An empty slice is a single-phase run — the common case.
|
|
Phases []Phase
|
|
|
|
// Critic configures the optional two-tier run-critic (Ports.Critic). The
|
|
// zero value (disabled) is the light-host default.
|
|
Critic CriticConfig
|
|
}
|
|
|
|
// Phase is one step of a multi-step run: its own system prompt, model tier,
|
|
// iteration cap, and tool subset. Phase prompts are Go text/template strings
|
|
// expanded against {{.Query}} (the original input) and {{.<PhaseName>}} (a
|
|
// prior phase's output) before the phase runs, so a phase can consume earlier
|
|
// work. The final phase's output is the run's output.
|
|
type Phase struct {
|
|
Name string
|
|
SystemPrompt string
|
|
ModelTier string
|
|
MaxIterations int
|
|
Tools []string
|
|
// Optional swallows a phase's error and substitutes FallbackMessage (or a
|
|
// generated note) as its output, so a non-critical phase failing does not
|
|
// abort the pipeline.
|
|
Optional bool
|
|
// FallbackMessage is the substitute output when an Optional phase fails.
|
|
// Empty → a generated "(phase %q encountered an error…)" note.
|
|
FallbackMessage string
|
|
// IsRunFunc marks a phase as a single bare LLM call (no tool loop, no tools
|
|
// array) — a deterministic transform step (plan/synthesize) rather than an
|
|
// agentic loop. Its Tools/MaxIterations are ignored.
|
|
IsRunFunc bool
|
|
}
|
|
|
|
// CriticConfig configures the optional run-critic. Enabled gates whether a
|
|
// critic monitor is started at all; BackstopMultiplier sets the hard-kill
|
|
// deadline as a multiple of the soft trigger (MaxRuntime). A non-positive
|
|
// multiplier uses the kernel default.
|
|
type CriticConfig struct {
|
|
Enabled bool
|
|
BackstopMultiplier float64
|
|
}
|