Skip to content

Fix #1911 #1931

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dgageot merged 1 commit into from
Mar 4, 2026
Merged

Fix #1911 #1931

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions cmd/root/debug.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func newDebugCmd() *cobra.Command {

// loadTeam loads an agent team from the given agent file and returns
// a cleanup function that must be deferred by the caller.
func (f *debugFlags) loadTeam(ctx context.Context, agentFilename string, opts ...teamloader.Opt) (*team.Team, func(), error) {
func (f *debugFlags) loadTeam(ctx context.Context, agentFilename string, opts ...teamloader.Opt) (*team.Team, func() error, error) {
agentSource, err := config.Resolve(agentFilename, f.runConfig.EnvProvider())
if err != nil {
return nil, nil, err
Expand All @@ -72,10 +72,8 @@ func (f *debugFlags) loadTeam(ctx context.Context, agentFilename string, opts ..
return nil, nil, err
}

cleanup := func() {
if err := t.StopToolSets(ctx); err != nil {
slog.Error("Failed to stop tool sets", "error", err)
}
cleanup := func() error {
return t.StopToolSets(ctx)
}

return t, cleanup, nil
Expand Down Expand Up @@ -106,7 +104,11 @@ func (f *debugFlags) runDebugToolsetsCommand(cmd *cobra.Command, args []string)
if err != nil {
return err
}
defer cleanup()
defer func() {
if err := cleanup(); err != nil {
slog.Error("Failed to stop tool sets", "error", err)
}
}()

out := cli.NewPrinter(cmd.OutOrStdout())

Expand Down Expand Up @@ -146,7 +148,11 @@ func (f *debugFlags) runDebugTitleCommand(cmd *cobra.Command, args []string) err
if err != nil {
return err
}
defer cleanup()
defer func() {
if err := cleanup(); err != nil {
slog.Error("Failed to stop tool sets", "error", err)
}
}()

agent, err := t.DefaultAgent()
if err != nil {
Expand Down