stage: retry pre-admission harness reach failures and widen repair deadline
Treat a failure to reach the harness before any prompt or tool call is admitted (connecting or creating the session) as a distinct retryable reach failure, so a transport blip at the first stage no longer ends a mutating run; keep post-admission readback/poll/agent failures retried only on an explicit read-only stage and never replay admitted tool work. Preserve the true cause when the context is already done (join ctx.Err with the typed transport error) and report a sanitized unknown provider error name/status instead of a blanket summary. Make the isolated format-repair deadline proportional to the stage timeout (floored, capped and clamped to remaining minus a margin) so a slow-but-repairable result is recovered without ever extending the stage deadline; the bounded ladder, value guard, deny-all formatter session, cumulative usage accounting and no-tool-replay rule are unchanged. Update docs/model-results.md, docs/pipeline-performance-review.md and the packaged skill references; add stage, opencode and server fixtures.
This commit is contained in:
@@ -97,10 +97,14 @@ func (c OpenCodeClient) call(ctx context.Context, method, path string, body any)
|
||||
evidenceStatus = c.connection.LastHTTPStatus
|
||||
}
|
||||
c.Operations.record(OperationEvidence{Operation: method + " " + path, Backend: c.Backend, Executable: opencode.Executable(), Directory: c.Directory, ExitCode: -1, HTTPStatus: evidenceStatus, NativeOperation: c.connection.LastHTTPOperation, Diagnostic: err.Error(), Stdout: string(data)}, started)
|
||||
if ctx.Err() != nil {
|
||||
return nil, ctx.Err()
|
||||
transport := &openCodeError{operation: method + " " + path, status: status, cause: err, diagnostic: err.Error()}
|
||||
if ctxErr := ctx.Err(); ctxErr != nil {
|
||||
// Keep the transport shape (operation/status) with the context
|
||||
// cause: a deadline that fired while the request was in flight is
|
||||
// both, and neither may be discarded.
|
||||
return nil, errors.Join(ctxErr, transport)
|
||||
}
|
||||
return nil, &openCodeError{operation: method + " " + path, status: status, cause: err, diagnostic: err.Error()}
|
||||
return nil, transport
|
||||
}
|
||||
return data, nil
|
||||
}
|
||||
@@ -146,14 +150,18 @@ func (c OpenCodeClient) call(ctx context.Context, method, path string, body any)
|
||||
code = exit.ExitCode()
|
||||
}
|
||||
c.Operations.record(OperationEvidence{Operation: method + " " + path, Backend: c.Backend, Executable: cmd.Path, Directory: directory, ExitCode: code, HTTPStatus: status, Diagnostic: safeCommandDiagnostic(err, stdout.Bytes()), Stdout: stdout.String(), Stderr: stderr.String()}, started)
|
||||
if ctx.Err() != nil {
|
||||
return nil, ctx.Err()
|
||||
}
|
||||
// Do not embed provider responses, prompts, credentials, or CLI logs in errors.
|
||||
// Keep the raw cause so errors.Is(err, exec.ErrWaitDelay) still holds while
|
||||
// Error() stays sanitized. This branch is only reached with a non-nil Run
|
||||
// error, so valid-looking partial stdout is never returned as success.
|
||||
return nil, &openCodeError{operation: method + " " + path, status: status, cause: err, diagnostic: safeCommandDiagnostic(err, stdout.Bytes())}
|
||||
transport := &openCodeError{operation: method + " " + path, status: status, cause: err, diagnostic: safeCommandDiagnostic(err, stdout.Bytes())}
|
||||
if ctxErr := ctx.Err(); ctxErr != nil {
|
||||
// Keep the sanitized transport detail (operation/status/exit) together
|
||||
// with errors.Is(err, context.DeadlineExceeded) so the true cause is
|
||||
// not replaced by a bare context error.
|
||||
return nil, errors.Join(ctxErr, transport)
|
||||
}
|
||||
return nil, transport
|
||||
}
|
||||
if stdout.overflow {
|
||||
return nil, fmt.Errorf("OpenCode response exceeds 1 MiB limit")
|
||||
@@ -259,7 +267,8 @@ func (c *OpenCodeClient) Generate(ctx context.Context, config ModelConfig, promp
|
||||
if c.command == nil {
|
||||
connection, err := opencode.Open(ctx, opencode.Executable(), c.Directory, c.Backend)
|
||||
if err != nil {
|
||||
return "", err
|
||||
// Connecting to the service failed before any session existed.
|
||||
return "", harnessUnreachable(err)
|
||||
}
|
||||
defer connection.Close()
|
||||
c.connection = connection
|
||||
@@ -288,7 +297,9 @@ func (c *OpenCodeClient) Generate(ctx context.Context, config ModelConfig, promp
|
||||
"permissions": []map[string]string{{"action": "*", "resource": "*", "effect": "deny"}},
|
||||
})
|
||||
if err != nil {
|
||||
return "", err
|
||||
// No prompt or tool call was admitted: a request failure here is a
|
||||
// reachable retry rather than a reason to end the run.
|
||||
return "", harnessUnreachable(err)
|
||||
}
|
||||
var session struct {
|
||||
Data struct {
|
||||
|
||||
Reference in New Issue
Block a user