Unify structured call completion and retain typed failures

This commit is contained in:
2026-11-16 14:27:54 +00:00
parent e98e525b5c
commit c2c8050bc8
18 changed files with 313 additions and 186 deletions

View File

@@ -2,7 +2,6 @@ package runner
import (
"context"
"errors"
"fmt"
"slices"
@@ -174,14 +173,9 @@ func repairCandidates(ctx context.Context, input validateSectionCandidatesInput,
branch.Attempts = append(branch.Attempts, record)
}
if callErr != nil {
var failure *structuredoutput.Failure
if errors.As(callErr, &failure) {
operation.FailureReason = failure.Reason
} else {
operation.FailureReason = outcomes.ReasonInternalFailure
}
structuredoutput.RecordFailure(&operation, callErr)
finishAttempt(callErr, nil, validateSectionCandidatesResult{})
if structuredoutput.IsRecoverable(callErr) {
if operation.FailureClass == outcomes.FailureRecoverable {
branch.Outcome = "unavailable"
return nil, nil
}
@@ -190,7 +184,7 @@ func repairCandidates(ctx context.Context, input validateSectionCandidatesInput,
var err error
response, err = proposal_generation.DecodeRepairResponse(completion.Content, position+1)
if err != nil {
operation.FailureReason = outcomes.ReasonInvalidOutput
structuredoutput.RecordFailure(&operation, err)
finishAttempt(err, nil, validateSectionCandidatesResult{})
branch.Outcome = "unavailable"
return nil, nil

View File

@@ -189,7 +189,7 @@ func TestRepairBranchTerminalOutcomes(t *testing.T) {
{"exhausted", []string{`{"proposal_ref":1,"decision":{"action":"revise","correction":{"id":1,"original_text":"absent","corrected_text":"dog"}}}`, `{"proposal_ref":1,"decision":{"action":"revise","correction":{"id":1,"original_text":"absent","corrected_text":"dog"}}}`}, nil, 2, "exhausted", 2},
{"no-effect revision", []string{`{"proposal_ref":1,"decision":{"action":"revise","correction":{"id":1,"original_text":"cat","corrected_text":"cat"}}}`}, nil, 2, "rejected", 1},
{"wrong reference", []string{`{"proposal_ref":2,"decision":{"action":"withdraw","correction":null}}`}, nil, 1, "unavailable", 1},
{"provider failure", nil, &structuredoutput.Failure{Class: structuredoutput.FailureRecoverable, Reason: outcomes.ReasonProviderFailed, Message: "provider failed"}, 1, "unavailable", 1},
{"provider failure", nil, &structuredoutput.Failure{Class: structuredoutput.FailureRecoverable, Reason: outcomes.ReasonProviderFailed, Message: "provider failed", Cause: errors.New("underlying provider error")}, 1, "unavailable", 1},
} {
t.Run(tc.name, func(t *testing.T) {
client := &repairClient{t: t, outputs: tc.outputs, err: tc.err}
@@ -199,13 +199,20 @@ func TestRepairBranchTerminalOutcomes(t *testing.T) {
if err != nil {
t.Fatal(err)
}
_, branches, err := repairCandidates(context.Background(), input, []int{1}, initial, "repair")
result, branches, err := repairCandidates(context.Background(), input, []int{1}, initial, "repair")
if err != nil {
t.Fatal(err)
}
if len(branches) != 1 || branches[0].Outcome != tc.outcome || len(client.calls) != tc.calls || branches[0].AttemptCount != tc.calls || len(branches[0].Attempts) != 0 {
t.Fatalf("branches=%+v calls=%d", branches, len(client.calls))
}
if tc.err != nil {
operation := result.operations[len(result.operations)-1]
if operation.FailureClass != outcomes.FailureRecoverable ||
operation.FailureReason != outcomes.ReasonProviderFailed || !errors.Is(operation.Cause, tc.err) {
t.Fatalf("repair lost typed failure facts: %+v", operation)
}
}
if tc.calls == 2 && client.calls[1].Context.RepairAttempt == nil {
t.Fatalf("history: %+v", client.calls[1].ContinueFrom)
}