Merge pull request #1793 from entireio/delete-manual-commit-strat-references

15f57fa→main·

Drop strategy name from entire status output

Changes

3

• cmd/entire/cli
  • integration_test
    • Msetup_cmd_test.go+3/-3
  • Mstatus.go+3/-13
  • Mstatus_test.go+15/-52

208 unmodified lines

Error("Expected enabled to be true")
    }

// Verify status shows manual-commit (the only strategy)
    // Verify status shows the enabled state
    stdout = env.RunCLI("status")
    if !strings.Contains(stdout, "manual-commit") {
        Errorf("Expected status to show 'manual-commit', got: %s", stdout)
    }
    if !strings.Contains(stdout, "Enabled") {
        Errorf("Expected status to show 'Enabled', got: %s", stdout)
    }
}

Mcmd/entire/cli/integration_test/setup_cmd_test.go+3/-3

17 unmodified lines

func formatSettingsStatusShort(ctx context.Context, s *EntireSettings, sty statusStyles) string {
    displayName := strategy.StrategyNameManualCommit

var b strings.Builder

if s.Enabled {
        b.WriteString(sty.render(sty.bold, "Enabled"))
    } else {
        b.WriteString(sty.render(sty.bold, "Disabled"))
    }

b.WriteString(sty.render(sty.dim, " · "))
    b.WriteString(displayName)

// Resolve branch from repo root
    if repoRoot, err := paths.WorktreeRoot(ctx); err == nil {
        if branch := resolveWorktreeBranch(ctx, repoRoot); branch != "" {
            b.WriteString(sty.render(sty.dim, " · " + branch))
        }
    }

return b.String()
}

Mcmd/entire/cli/status.go+3/-13

func TestRunStatus_BothProjectAndLocal(t *testing.T) {
    setupTestRepo(t)
    // Project: enabled=true, strategy=manual-commit
    // Local: enabled=false, strategy=manual-commit
    // Project: enabled=true
    // Local: enabled=false
    // Detailed mode shows effective status first, then each file separately
    writeSettings(t, `{"enabled": true}`)
    writeLocalSettings(t, `{"enabled": false}`)

output := stdout.String()
    // Should show effective status first (local overrides project)
    if !strings.Contains(output, "Disabled") || !strings.Contains(output, "manual-commit") {
        Errorf("Expected output to show effective 'Disabled' with 'manual-commit', got: %s", output)
    }
    // Should show both settings separately
    if !strings.Contains(output, "Project") || !strings.Contains(output, "manual-commit") {
        Errorf("Expected output to show Project with manual-commit, got: %s", output)
    }
}

func TestRunStatus_ShowsManualCommitStrategy(t *testing.T) {
    setupTestRepo(t)
    writeSettings(t, `{"enabled": false}`)

var stdout bytes.Buffer
    if err := runStatus(context.Background(), &stdout, true, false); err != nil {
        Fatalf("runStatus() error = %v", err)
    }

output := stdout.String()
    // Should show effective status first
    if !strings.Contains(output, "Disabled") || !strings.Contains(output, "manual-commit") {
        Errorf("Expected output to show effective 'Disabled' with 'manual-commit', got: %s", output)
    }
}

sty := statusStyles{colorEnabled: false, width: 60}

s := &EntireSettings{
    Enabled:  true,
    Strategy: "manual-commit",
}

result := formatSettingsStatusShort(context.Background(), s, sty)

if !strings.Contains(result, "Enabled") {
    Errorf("Expected 'Enabled' in output, got: %q", result)
}
if !strings.Contains(result, "manual-commit") {
    Errorf("Expected strategy in output, got: %q", result)
}

func TestFormatSettingsStatusShort_Disabled(t *testing.T) {
    sty := statusStyles{colorEnabled: false, width: 60}
    s := &EntireSettings{
        Enabled:  false,
        Strategy: "manual-commit",
    }

result := formatSettingsStatusShort(context.Background(), s, sty)

if !strings.Contains(result, "Disabled") {
        Errorf("Expected 'Disabled' in output, got: %q", result)
    }
}

st := statusStyles{colorEnabled: false, width: 60}
    s := &EntireSettings{
    Enabled:  true,
    Strategy: "manual-commit",
}

result := formatSettingsStatus("Project", s, sty)

```go
func TestWriteActiveSessions_StaleIndicator(t *testing.T) {
    sty := statusStyles{colorEnabled: false, width: 60}
    s := &EntireSettings{
    Enabled:  true,
    Strategy: "manual-commit",
}

result := formatSettingsStatus("Local", s, sty)