@@ -1,5 +1,10 @@
 # Multiple Accounts with the CLI - v2.40.0
 
+> [!NOTE]
+> This document describes multi-account support as it was introduced in v2.40.0
+> and is retained for historical context. Some implementation details, including
+> automatic configuration migration, are outdated.
+
 Since its creation, `gh` has enforced a mapping of one account per host. Functionally, this meant that when targeting a
 single host (e.g. github.com) each `auth login` would replace the token being used for API requests, and for git
 operations when `gh` was configured as a git credential manager. Removing this limitation has been a [long requested
 
@@ -693,7 +693,7 @@ func TestUserWorksRightAfterMigration(t *testing.T) {
 	require.NoError(t, err)
 
 	// When we migrate
-	var m migration.MultiAccount
+	var m migration.MultiAccountDeprecated
 	c := cfg{authCfg.cfg}
 	require.NoError(t, c.Migrate(m))
 
@@ -710,7 +710,7 @@ func TestGitProtocolWorksRightAfterMigration(t *testing.T) {
 	require.NoError(t, err)
 
 	// When we migrate
-	var m migration.MultiAccount
+	var m migration.MultiAccountDeprecated
 	c := cfg{authCfg.cfg}
 	require.NoError(t, c.Migrate(m))
 
@@ -727,7 +727,7 @@ func TestHostsWorksRightAfterMigration(t *testing.T) {
 	require.NoError(t, err)
 
 	// When we migrate
-	var m migration.MultiAccount
+	var m migration.MultiAccountDeprecated
 	c := cfg{authCfg.cfg}
 	require.NoError(t, c.Migrate(m))
 
@@ -743,7 +743,7 @@ func TestDefaultHostWorksRightAfterMigration(t *testing.T) {
 	require.NoError(t, err)
 
 	// When we migrate
-	var m migration.MultiAccount
+	var m migration.MultiAccountDeprecated
 	c := cfg{authCfg.cfg}
 	require.NoError(t, c.Migrate(m))
 
@@ -760,7 +760,7 @@ func TestTokenWorksRightAfterMigration(t *testing.T) {
 	require.NoError(t, err)
 
 	// When we migrate
-	var m migration.MultiAccount
+	var m migration.MultiAccountDeprecated
 	c := cfg{authCfg.cfg}
 	require.NoError(t, c.Migrate(m))
 
@@ -837,7 +837,7 @@ func TestLogoutRightAfterMigrationRemovesHost(t *testing.T) {
 	require.NoError(t, err)
 
 	// When we migrate and logout
-	var m migration.MultiAccount
+	var m migration.MultiAccountDeprecated
 	c := cfg{authCfg.cfg}
 	require.NoError(t, c.Migrate(m))
 
@@ -852,7 +852,7 @@ func TestLoginInsecurePostMigrationUsesConfigForToken(t *testing.T) {
 	authCfg := newTestAuthConfig(t)
 
 	// When we migrate and login with insecure storage
-	var m migration.MultiAccount
+	var m migration.MultiAccountDeprecated
 	c := cfg{authCfg.cfg}
 	require.NoError(t, c.Migrate(m))
 
@@ -871,7 +871,7 @@ func TestLoginPostMigrationSetsGitProtocol(t *testing.T) {
 	// Given we have logged in after migration
 	authCfg := newTestAuthConfig(t)
 
-	var m migration.MultiAccount
+	var m migration.MultiAccountDeprecated
 	c := cfg{authCfg.cfg}
 	require.NoError(t, c.Migrate(m))
 
@@ -890,7 +890,7 @@ func TestLoginPostMigrationSetsUser(t *testing.T) {
 	// Given we have logged in after migration
 	authCfg := newTestAuthConfig(t)
 
-	var m migration.MultiAccount
+	var m migration.MultiAccountDeprecated
 	c := cfg{authCfg.cfg}
 	require.NoError(t, c.Migrate(m))
 
@@ -912,7 +912,7 @@ func TestLoginSecurePostMigrationRemovesTokenFromConfig(t *testing.T) {
 	require.NoError(t, err)
 
 	// When we migrate and login again with secure storage
-	var m migration.MultiAccount
+	var m migration.MultiAccountDeprecated
 	c := cfg{authCfg.cfg}
 	require.NoError(t, c.Migrate(m))
 
 
@@ -68,22 +68,31 @@ type tokenSource struct {
 // breaking existing users of go-gh which looks at a specific location
 // in the config for oauth tokens that are stored insecurely.
 
-type MultiAccount struct {
+// MultiAccountDeprecated migrates the pre-v2.40 one-account-per-host
+// configuration into the multi-account schema.
+//
+// This migration no longer runs automatically. Its compatibility window
+// covered upgrades from versions that predated the multi-account schema.
+// Supported configurations now already use that schema, so running it before
+// every command no longer provides value. The implementation remains as
+// executable documentation of the original migration and its compatibility
+// constraints.
+type MultiAccountDeprecated struct {
 	// Allow injecting a transport layer in tests.
 	Transport http.RoundTripper
 }
 
-func (m MultiAccount) PreVersion() string {
+func (m MultiAccountDeprecated) PreVersion() string {
 	// It is expected that there is no version key since this migration
 	// introduces it.
 	return ""
 }
 
-func (m MultiAccount) PostVersion() string {
+func (m MultiAccountDeprecated) PostVersion() string {
 	return "1"
 }
 
-func (m MultiAccount) Do(c *config.Config) error {
+func (m MultiAccountDeprecated) Do(c *config.Config) error {
 	hostnames, err := c.Keys(hostsKey)
 	// [github.com, github.localhost]
 	// We wouldn't expect to have a hosts key when this is the first time anyone
 
@@ -12,7 +12,7 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestMigration(t *testing.T) {
+func TestMultiAccountDeprecatedMigration(t *testing.T) {
 	cfg := config.ReadFromString(`
 hosts:
   github.com:
@@ -25,7 +25,7 @@ hosts:
     git_protocol: https
 `)
 
-	var m migration.MultiAccount
+	var m migration.MultiAccountDeprecated
 	require.NoError(t, m.Do(cfg))
 
 	// First we'll check that the oauth tokens have been moved to their new locations
@@ -60,7 +60,7 @@ hosts:
 	require.NoError(t, keyring.Set("gh:github.com", "", userOneToken))
 	require.NoError(t, keyring.Set("gh:enterprise.com", "", userTwoToken))
 
-	var m migration.MultiAccount
+	var m migration.MultiAccountDeprecated
 	require.NoError(t, m.Do(cfg))
 
 	// Verify token gets stored with host and username
@@ -96,19 +96,19 @@ hosts:
 }
 
 func TestPreVersionIsEmptyString(t *testing.T) {
-	var m migration.MultiAccount
+	var m migration.MultiAccountDeprecated
 	require.Equal(t, "", m.PreVersion())
 }
 
 func TestPostVersion(t *testing.T) {
-	var m migration.MultiAccount
+	var m migration.MultiAccountDeprecated
 	require.Equal(t, "1", m.PostVersion())
 }
 
 func TestMigrationReturnsSuccessfullyWhenNoHostsEntry(t *testing.T) {
 	cfg := config.ReadFromString(``)
 
-	var m migration.MultiAccount
+	var m migration.MultiAccountDeprecated
 	require.NoError(t, m.Do(cfg))
 }
 
@@ -117,7 +117,7 @@ func TestMigrationReturnsSuccessfullyWhenEmptyHosts(t *testing.T) {
 hosts:
 `)
 
-	var m migration.MultiAccount
+	var m migration.MultiAccountDeprecated
 	require.NoError(t, m.Do(cfg))
 }
 
@@ -142,7 +142,7 @@ hosts:
 		httpmock.StringResponse(`{"data":{"viewer":{"login":"monalisa"}}}`),
 	)
 
-	m := migration.MultiAccount{Transport: reg}
+	m := migration.MultiAccountDeprecated{Transport: reg}
 	require.NoError(t, m.Do(cfg))
 
 	require.Equal(t, fmt.Sprintf("token %s", token), reg.Requests[0].Header.Get("Authorization"))
@@ -182,7 +182,7 @@ hosts:
 		httpmock.StringResponse(`{"data":{"viewer":{"login":"monalisa"}}}`),
 	)
 
-	m := migration.MultiAccount{Transport: reg}
+	m := migration.MultiAccountDeprecated{Transport: reg}
 	require.NoError(t, m.Do(cfg))
 
 	require.Equal(t, "token test-token", reg.Requests[0].Header.Get("Authorization"))
@@ -201,7 +201,7 @@ hosts:
     git_protocol: ssh
 `)
 
-	m := migration.MultiAccount{}
+	m := migration.MultiAccountDeprecated{}
 	require.NoError(t, m.Do(cfg))
 
 	requireNoKey(t, cfg, []string{"hosts", "github.com"})
@@ -218,7 +218,7 @@ hosts:
     git_protocol: ssh
 `)
 
-	m := migration.MultiAccount{}
+	m := migration.MultiAccountDeprecated{}
 	err := m.Do(cfg)
 
 	require.ErrorContains(t, err, `couldn't find oauth token for "github.com": keyring test error`)
 
@@ -21,7 +21,6 @@ import (
 	"github.com/cli/cli/v2/internal/build"
 	"github.com/cli/cli/v2/internal/ci"
 	"github.com/cli/cli/v2/internal/config"
-	"github.com/cli/cli/v2/internal/config/migration"
 	"github.com/cli/cli/v2/internal/gh"
 	"github.com/cli/cli/v2/internal/gh/ghtelemetry"
 	"github.com/cli/cli/v2/internal/telemetry"
@@ -133,14 +132,6 @@ func Main() exitCode {
 
 	cmdFactory := factory.New(buildVersion, string(invokingAgent), cfgFunc, ioStreams, ghExecutablePath, telemetryService)
 
-	if cfgErr == nil {
-		var m migration.MultiAccount
-		if err := cfg.Migrate(m); err != nil {
-			fmt.Fprintln(stderr, err)
-			return exitError
-		}
-	}
-
 	ctx := context.Background()
 	updateCtx, updateCancel := context.WithCancel(ctx)
 	defer updateCancel()