Files
MealQuest/internal/ai/harness/guard.go
T
dev_agentandClaude Opus 5.5 d03068ace5
CI / ci (push) Successful in 1m34s
CI / ci (pull_request) Successful in 1m37s
Add concurrency guards to harness.Run: single-flight, semaphore and timeouts
harness.Run now takes a scope key. Concurrent runs of one skill with one
scope share a single in-flight run and its result, errors included, so
only one Generate call is made; different scopes run independently. A
process-wide Guard (NewGuard, DefaultMaxCalls = 2) bounds concurrent LLM
calls with a context-aware semaphore. Each skill declares Timeout()
(DefaultTimeout = 60 s), enforced via context over the whole run; a run
past it fails with an error matching llm.ErrTimeout. A caller whose
context ends gets the context error; the shared run is cancelled, and
its slot freed, once no caller waits for it.

llm.Fake results can now block (Release) and signal entry (Started), so
tests hold calls in flight.

Maestro task: 8f533721-32c9-4f73-af9f-9a9f0e94abf8

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-05 10:00:20 -04:00

134 lines
3.6 KiB
Go

package harness
import (
"context"
"fmt"
"sync"
"time"
"code.cubecraftlabs.com/Maniacs_Mansion/Meal-Quest/internal/ai/llm"
)
// DefaultMaxCalls is how many LLM calls a Guard lets run at once unless it
// is built with another limit.
const DefaultMaxCalls = 2
// DefaultTimeout is the run timeout a skill declares unless it needs
// another.
const DefaultTimeout = 60 * time.Second
// Guard bounds the process's runs. Runs of one skill with one scope share a
// single in-flight execution and its result (single-flight), and at most
// its limit of LLM calls run at once across every run (the semaphore).
// Build one with NewGuard and share it between every run of the process.
type Guard struct {
slots chan struct{}
mu sync.Mutex
flights map[flightKey]*flight
}
// flightKey identifies the runs that share one execution.
type flightKey struct {
skill string
scope string
}
// flight is one in-flight execution and the callers waiting for it.
type flight struct {
done chan struct{}
val any
err error
// waiters counts the callers still waiting; when the last one gives
// up, cancel stops the execution.
waiters int
cancel context.CancelFunc
}
// NewGuard returns a Guard that lets maxCalls LLM calls run at once.
func NewGuard(maxCalls int) (*Guard, error) {
if maxCalls < 1 {
return nil, fmt.Errorf("harness: guard: max concurrent LLM calls %d is not positive", maxCalls)
}
return &Guard{slots: make(chan struct{}, maxCalls), flights: map[flightKey]*flight{}}, nil
}
// do returns the result of fn for key, starting fn unless a call for key is
// already in flight, in which case it waits for that call's result
// instead. fn runs on a context that keeps the first caller's values but
// not its cancellation, so one caller giving up does not fail the others.
// When ctx is done first, do returns its error; when no caller is left
// waiting, fn's context is cancelled and do returns only once fn has
// ended, so the abandoned execution has released its slot by then.
func (g *Guard) do(ctx context.Context, key flightKey, fn func(context.Context) (any, error)) (any, error) {
g.mu.Lock()
f, ok := g.flights[key]
if !ok {
fctx, cancel := context.WithCancel(context.WithoutCancel(ctx))
f = &flight{done: make(chan struct{}), cancel: cancel}
g.flights[key] = f
go func() {
defer cancel()
f.val, f.err = fn(fctx)
g.forget(key, f)
close(f.done)
}()
}
f.waiters++
g.mu.Unlock()
select {
case <-f.done:
return f.val, f.err
case <-ctx.Done():
}
g.mu.Lock()
f.waiters--
last := f.waiters == 0
if last {
// No caller may join an execution that is being abandoned.
g.forgetLocked(key, f)
f.cancel()
}
g.mu.Unlock()
if last {
<-f.done
}
return nil, ctx.Err()
}
// forget removes f from the in-flight executions if it is still there.
func (g *Guard) forget(key flightKey, f *flight) {
g.mu.Lock()
defer g.mu.Unlock()
g.forgetLocked(key, f)
}
func (g *Guard) forgetLocked(key flightKey, f *flight) {
if g.flights[key] == f {
delete(g.flights, key)
}
}
// limited is a Provider whose Generate calls hold one of its Guard's slots.
type limited struct {
llm.Provider
slots chan struct{}
}
// Generate waits for a free slot, or for ctx to be done, then sends req
// and frees the slot when the call returns.
func (p limited) Generate(ctx context.Context, req llm.Request) (llm.Response, error) {
// A done context never takes a slot, even when one is free.
if err := ctx.Err(); err != nil {
return llm.Response{}, err
}
select {
case p.slots <- struct{}{}:
case <-ctx.Done():
return llm.Response{}, ctx.Err()
}
defer func() { <-p.slots }()
return p.Provider.Generate(ctx, req)
}