refactor: 统一配置 section 顺序

- 按 tmpSettingsSort.txt 调整所有公开 section 的输出顺序

- 将 General 规范化为 CustomVersionText 并兼容读取旧名称

- 为配置 section 增加通用读取别名支持

Author: clansty

packages/applechu-schema/src/generator/parser.rs

@@ -60,6 +60,12 @@ impl Parse for SectionDecl {
             let metadata: Ident = content.parse()?;
             content.parse::<Token![:]>()?;
             match metadata.to_string().as_str() {
+                "aliases" => {
+                    let aliases_content;
+                    syn::bracketed!(aliases_content in content);
+                    let _ = aliases_content
+                        .parse_terminated(|input| input.parse::<LitStr>(), Token![,])?;
+                }
                 "export" => export = Some(content.parse::<LitBool>()?.value),
                 "group" => group = Some(content.parse()?),
                 "community" => community = content.parse::<LitBool>()?.value,

packages/applechu-schema/src/lib.rs

@@ -1005,6 +1005,64 @@ mod tests {
         assert!(config.contains("[SliderDevice]"));
     }
 
+    #[test]
+    fn default_config_follows_settings_sort_order() {
+        // Given: Rust 声明生成完整的公开配置 schema。
+        let schema = generated_schema();
+
+        // When: 默认配置按 section 顺序输出。
+        let config = schema.default_config_toml();
+        let sections = config
+            .lines()
+            .filter_map(|line| line.strip_prefix('[')?.strip_suffix(']'))
+            .collect::<Vec<_>>();
+
+        // Then: 顺序与设置管理器约定完全一致。
+        assert_eq!(
+            sections,
+            [
+                "System",
+                "Amdaemon",
+                "Dns",
+                "AllowLocalhost",
+                "Keychip",
+                "Aime",
+                "Io4",
+                "SliderDevice",
+                "ChuniIo",
+                "Led",
+                "Led15093",
+                "Vfd",
+                "Window",
+                "FreePlay",
+                "CreditFreeze",
+                "SkipStartup",
+                "DisableTimer",
+                "CustomTimers",
+                "UnlockTracks",
+                "SkipMapAnimation",
+                "Unlocker",
+                "ForceSharedAudio",
+                "Force2chAudio",
+                "CustomVersionText",
+                "DisableEncryption",
+                "DisableTLS",
+                "Unlock120fps",
+                "Bypass1080p",
+                "Bypass120hz",
+                "BypassAppUser",
+                "NetLog",
+                "Autoplay",
+                "FpsDisplay",
+                "FrameLock",
+                "DpiAware",
+                "PCBID",
+                "VFS",
+                "NetEnv",
+            ]
+        );
+    }
+
     #[test]
     fn rejects_malformed_entries_instead_of_silently_dropping_them() {
         let source = r#"

packages/applechu/src/aime/mod.rs

@@ -45,7 +45,7 @@ static EXTERNAL: Lazy<Mutex<Option<ExternalAimeIo>>> = Lazy::new(|| Mutex::new(N
 crate::config_section! {
     pub(crate) struct AimeSectionConfig => AIME_CONFIG_SECTION {
         section: "Aime",
-        order: 300,
+        order: 50,
         default_on: true,
         always_enabled: false,
         hidden: false,

packages/applechu/src/amdaemon.rs

@@ -104,7 +104,7 @@ impl Drop for AutoStartedChild {
 crate::config_section! {
     pub(crate) struct AmdaemonConfig => AMDAEMON_CONFIG_SECTION {
         section: "Amdaemon",
-        order: 5,
+        order: 20,
         default_on: true,
         always_enabled: false,
         hidden: false,
@@ -132,7 +132,7 @@ crate::config_section! {
 crate::config_section! {
     pub struct AllowLocalhostConfig => ALLOW_LOCALHOST_CONFIG_SECTION {
         section: "AllowLocalhost",
-        order: 6,
+        order: 35,
         default_on: false,
         always_enabled: false,
         hidden: false,
@@ -144,7 +144,7 @@ crate::config_section! {
 crate::config_section! {
     pub struct CreditFreezeConfig => CREDIT_FREEZE_CONFIG_SECTION {
         section: "CreditFreeze",
-        order: 7,
+        order: 140,
         default_on: false,
         always_enabled: false,
         hidden: false,
@@ -156,7 +156,7 @@ crate::config_section! {
 crate::config_section! {
     pub struct DnsConfig => DNS_CONFIG_SECTION {
         section: "Dns",
-        order: 980,
+        order: 30,
         default_on: true,
         always_enabled: false,
         hidden: false,
@@ -189,7 +189,7 @@ crate::config_section! {
 crate::config_section! {
     pub struct KeychipConfig => KEYCHIP_CONFIG_SECTION {
         section: "Keychip",
-        order: 970,
+        order: 40,
         default_on: true,
         always_enabled: false,
         hidden: false,
@@ -221,7 +221,7 @@ crate::config_section! {
 crate::config_section! {
     pub struct NetEnvConfig => NETENV_CONFIG_SECTION {
         section: "NetEnv",
-        order: 975,
+        order: 370,
         default_on: true,
         always_enabled: false,
         hidden: false,

packages/applechu/src/autoplay/mod.rs

@@ -20,7 +20,7 @@ use crate::util::api::Api;
 crate::config_section! {
     pub(crate) struct AutoplayConfig => AUTOPLAY_CONFIG_SECTION {
         section: "Autoplay",
-        order: 180,
+        order: 310,
         default_on: false,
         always_enabled: false,
         hidden: false,

packages/applechu/src/chuniio/led_output.rs

@@ -29,7 +29,7 @@ const GENERIC_WRITE: u32 = 0x4000_0000;
 crate::config_section! {
     pub(crate) struct LedOutputConfig => LED_OUTPUT_CONFIG_SECTION {
         section: "Led",
-        order: 313,
+        order: 90,
         default_on: true,
         always_enabled: false,
         hidden: false,

packages/applechu/src/chuniio/mod.rs

@@ -20,7 +20,7 @@ use self::led_output::LedOutputConfig;
 crate::config_section! {
     pub(crate) struct ExternalChuniIoConfig => CHUNI_IO_CONFIG_SECTION {
         section: "ChuniIo",
-        order: 309,
+        order: 80,
         default_on: true,
         always_enabled: false,
         hidden: false,

packages/applechu/src/config.rs

@@ -38,6 +38,7 @@ macro_rules! config_section {
             default_on: $default_on:expr,
             always_enabled: $always_enabled:expr,
             hidden: $hidden:expr,
+            $(aliases: [$($alias:literal),* $(,)?],)?
             $(export: $export:expr,)?
             $(group: $group:literal,)?
             $(community: $community:expr,)?
@@ -154,6 +155,7 @@ macro_rules! config_section {
                 default_on: $default_on,
                 always_enabled: $always_enabled,
                 hidden: $hidden,
+                aliases: &[$($($alias),*)?],
                 comment: $comment,
                 type_id: std::any::TypeId::of::<$name>,
                 parse: $name::parse_config_section,

packages/applechu/src/config/document.rs

@@ -6,8 +6,8 @@ use std::path::{Path, PathBuf};
 use std::sync::OnceLock;
 
 use super::schema::{
-    append_comment, find_section, ConfigDiagnostic, ConfigSection, DiagnosticLevel, LoadedSection,
-    SectionDescriptor, SectionRef, CONFIG_SECTIONS,
+    append_comment, find_section_for, ConfigDiagnostic, ConfigSection, DiagnosticLevel,
+    LoadedSection, SectionDescriptor, SectionRef, CONFIG_SECTIONS,
 };
 use super::validation::{validate_document, validate_registry, warn_unknown_sections};
 
@@ -146,7 +146,7 @@ impl Config {
         let mut sections = HashMap::new();
         for descriptor in &descriptors {
             let table = (!descriptor.builtin())
-                .then(|| find_section(root, descriptor.name))
+                .then(|| find_section_for(root, descriptor))
                 .flatten();
             let loaded = (descriptor.parse)(table, &mut diagnostics);
             sections.insert((descriptor.type_id)(), loaded);
@@ -160,7 +160,7 @@ impl Config {
                     && value.is_table()
                     && !descriptors
                         .iter()
-                        .any(|descriptor| applechu_schema::keys_equal(descriptor.name, name))
+                        .any(|descriptor| descriptor.matches_name(name))
             })
             .filter_map(|(name, value)| value.as_table().map(|table| (name.clone(), table.clone())))
             .collect();

packages/applechu/src/config/schema.rs

@@ -40,6 +40,7 @@ pub struct SectionDescriptor {
     pub default_on: bool,
     pub always_enabled: bool,
     pub hidden: bool,
+    pub aliases: &'static [&'static str],
     pub comment: &'static str,
     pub type_id: fn() -> TypeId,
     pub parse: fn(Option<&toml::Table>, &mut Vec<ConfigDiagnostic>) -> LoadedSection,
@@ -63,6 +64,14 @@ impl SectionDescriptor {
         crate::schema_embed::section(self.name).map_or(self.hidden, |section| section.hidden)
     }
 
+    pub fn matches_name(&self, name: &str) -> bool {
+        applechu_schema::keys_equal(self.name, name)
+            || self
+                .aliases
+                .iter()
+                .any(|alias| applechu_schema::keys_equal(alias, name))
+    }
+
     /// schema 中没有声明的运行时栏目属于内置实现，不写入玩家配置
     pub fn builtin(&self) -> bool {
         self.hidden() && crate::schema_embed::section(self.name).is_none()
@@ -156,6 +165,15 @@ pub fn find_section<'a>(root: &'a toml::Table, name: &str) -> Option<&'a toml::T
         .and_then(toml::Value::as_table)
 }
 
+pub fn find_section_for<'a>(
+    root: &'a toml::Table,
+    descriptor: &SectionDescriptor,
+) -> Option<&'a toml::Table> {
+    root.iter()
+        .find(|(key, _)| descriptor.matches_name(key))
+        .and_then(|(_, value)| value.as_table())
+}
+
 fn section_enabled(
     table: Option<&toml::Table>,
     descriptor: &SectionDescriptor,