@@ -8,6 +8,7 @@
88package agent
99
1010import (
11+ "cmp"
1112 "context"
1213 _ "embed"
1314 "errors"
@@ -32,6 +33,7 @@ import (
3233 "github.com/charmbracelet/crush/internal/message"
3334 "github.com/charmbracelet/crush/internal/permission"
3435 "github.com/charmbracelet/crush/internal/session"
36+ "github.com/charmbracelet/crush/internal/stringext"
3537)
3638
3739//go:embed templates/title.md
@@ -303,7 +305,7 @@ func (a *sessionAgent) Run(ctx context.Context, call SessionAgentCall) (*fantasy
303305 currentAssistant.AddToolCall(toolCall)
304306 return a.messages.Update(genCtx, *currentAssistant)
305307 },
306− OnRetry: func(err *fantasy.APICallError, delay time.Duration) {
308+ OnRetry: func(err *fantasy.ProviderError, delay time.Duration) {
307309 // TODO: implement
308310 },
309311 OnToolCall: func(tc fantasy.ToolCallContent) error {
@@ -459,12 +461,19 @@ func (a *sessionAgent) Run(ctx context.Context, call SessionAgentCall) (*fantasy
459461 return nil, createErr
460462 }
461463 }
464+ var fantasyErr *fantasy.Error
465+ var providerErr *fantasy.ProviderError
466+ const defaultTitle = "Provider Error"
462467 if isCancelErr {
463468 currentAssistant.AddFinish(message.FinishReasonCanceled, "User canceled request", "")
464469 } else if isPermissionErr {
465470 currentAssistant.AddFinish(message.FinishReasonPermissionDenied, "User denied permission", "")
471+ } else if errors.As(err, &providerErr) {
472+ currentAssistant.AddFinish(message.FinishReasonError, cmp.Or(stringext.Capitalize(providerErr.Title), defaultTitle), providerErr.Message)
473+ } else if errors.As(err, &fantasyErr) {
474+ currentAssistant.AddFinish(message.FinishReasonError, cmp.Or(stringext.Capitalize(fantasyErr.Title), defaultTitle), fantasyErr.Message)
466475 } else {
467− currentAssistant.AddFinish(message.FinishReasonError, "API Error", err.Error())
476+ currentAssistant.AddFinish(message.FinishReasonError, defaultTitle, err.Error())
468477 }
469478 // Note: we use the parent context here because the genCtx has been
470479 // cancelled.