Skip to content

Commit abfcbc9

Browse files
peyton-altclaude
andcommitted
Fix configure flag precedence and add provider fallback logging
- Process both --checkpoint-remote and --summarize-provider flags when set together instead of silently dropping summary provider flags - Log when falling back to Claude Code (no providers installed, or non-interactive mode with multiple providers) - Make persistSummaryProviderSelection failure non-fatal: log warning and continue with resolved provider instead of aborting Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Entire-Checkpoint: 6aa3fd749d78
1 parent eb3ed03 commit abfcbc9

2 files changed

Lines changed: 20 additions & 8 deletions

File tree

cmd/entire/cli/explain_summary_provider.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88

99
"github.com/entireio/cli/cmd/entire/cli/agent"
1010
"github.com/entireio/cli/cmd/entire/cli/agent/types"
11+
"github.com/entireio/cli/cmd/entire/cli/logging"
1112
"github.com/entireio/cli/cmd/entire/cli/paths"
1213
"github.com/entireio/cli/cmd/entire/cli/settings"
1314
"github.com/entireio/cli/cmd/entire/cli/summarize"
@@ -49,18 +50,21 @@ func resolveCheckpointSummaryProvider(ctx context.Context, w io.Writer) (*checkp
4950

5051
switch len(candidates) {
5152
case 0:
53+
logging.Info(ctx, "no summary-capable agents installed, falling back to Claude Code")
5254
return buildCheckpointSummaryProvider(agent.AgentNameClaudeCode, "")
5355
case 1:
5456
provider, err := buildCheckpointSummaryProvider(candidates[0].Name, "")
5557
if err != nil {
5658
return nil, err
5759
}
5860
if saveErr := persistSummaryProviderSelection(ctx, provider.Name, provider.Model); saveErr != nil {
59-
return nil, saveErr
61+
logging.Warn(ctx, "failed to save summary provider selection, continuing without persistence",
62+
"error", saveErr.Error())
6063
}
6164
return provider, nil
6265
default:
6366
if !canPromptInteractively() {
67+
logging.Info(ctx, "non-interactive mode with multiple summary providers, falling back to Claude Code")
6468
return buildCheckpointSummaryProvider(agent.AgentNameClaudeCode, "")
6569
}
6670

@@ -74,7 +78,8 @@ func resolveCheckpointSummaryProvider(ctx context.Context, w io.Writer) (*checkp
7478
return nil, err
7579
}
7680
if saveErr := persistSummaryProviderSelection(ctx, provider.Name, provider.Model); saveErr != nil {
77-
return nil, saveErr
81+
logging.Warn(ctx, "failed to save summary provider selection, continuing without persistence",
82+
"error", saveErr.Error())
7883
}
7984
fmt.Fprintf(w, "Using %s for summary generation.\n", provider.DisplayName)
8085
return provider, nil

cmd/entire/cli/setup.go

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -510,12 +510,19 @@ Use --remove to remove a specific agent non-interactively:
510510
return setupAgentHooksNonInteractive(ctx, cmd.OutOrStdout(), ag, opts)
511511
}
512512

513-
// Settings-only mode: update strategy options without agent selection
514-
if hasStrategyFlags(cmd) && settings.IsSetUpAny(ctx) {
515-
return updateStrategyOptions(ctx, cmd.OutOrStdout(), opts)
516-
}
517-
if hasSummaryProviderFlags(cmd) && settings.IsSetUpAny(ctx) {
518-
return updateSummaryGenerationSettings(ctx, cmd.OutOrStdout(), summarizeProvider, summarizeModel, opts)
513+
// Settings-only mode: update strategy options / summary provider without agent selection
514+
if settings.IsSetUpAny(ctx) && (hasStrategyFlags(cmd) || hasSummaryProviderFlags(cmd)) {
515+
if hasStrategyFlags(cmd) {
516+
if err := updateStrategyOptions(ctx, cmd.OutOrStdout(), opts); err != nil {
517+
return err
518+
}
519+
}
520+
if hasSummaryProviderFlags(cmd) {
521+
if err := updateSummaryGenerationSettings(ctx, cmd.OutOrStdout(), summarizeProvider, summarizeModel, opts); err != nil {
522+
return err
523+
}
524+
}
525+
return nil
519526
}
520527

521528
// If already set up, show agents and let user add more

0 commit comments

Comments
 (0)