chore: finalized purification and stabilization pipeline

Author: IchimaruGin728

.github/workflows/release.yml

@@ -6,6 +6,7 @@ on:
     paths:
       - 'scheme/**'
       - 'lua/**'
+      - 'dicts/**'
       - 'rime.lua'
   workflow_dispatch:
 
@@ -34,6 +35,22 @@ jobs:
           # Copy Lua engine (Crucial for functionality)
           cp -r lua dist/scheme/
           cp rime.lua dist/scheme/
+
+          # Unified Dictionary Consolidation (Merging Core and Thematic dicts)
+          mkdir -p dist/scheme/dicts
+          
+          # 1. Copy core dictionaries from scheme/shared/core/dicts
+          if [ -d "scheme/shared/core/dicts" ]; then
+            cp scheme/shared/core/dicts/*.dict.yaml dist/scheme/dicts/ 2>/dev/null || true
+          fi
+          
+          # 2. Copy thematic dictionaries from root dicts/ folder
+          if [ -d "dicts" ]; then
+            cp -r dicts/* dist/scheme/dicts/ 2>/dev/null || true
+          fi
+          
+          # Cleanup: ensure no original wanxiang-branded files leaked (safety check)
+          find dist/scheme -type f -name "wanxiang*" -delete
           
           cd dist
           tar -czf scheme.tar.gz scheme/

.github/workflows/sync-upstream.yml

@@ -35,26 +35,37 @@ jobs:
         run: |
           git clone --depth 1 https://github.com/amzxyz/rime_wanxiang.git /tmp/core
           
-          # 1. Sync Scheme YAMLs
-          mkdir -p scheme/shared/core
+          # 1. Sync Scheme YAMLs & Dictionaries
+          mkdir -p scheme/shared/core/dicts
           cp /tmp/core/wanxiang.schema.yaml         scheme/shared/core/core.schema.yaml
           cp /tmp/core/wanxiang_algebra.yaml        scheme/shared/core/core_algebra.yaml
           cp /tmp/core/wanxiang_symbols.yaml        scheme/shared/core/core_symbols.yaml
-          cp /tmp/core/wanxiang_english.dict.yaml   scheme/shared/core/core_english.dict.yaml
-          cp /tmp/core/wanxiang_mixedcode.dict.yaml scheme/shared/core/core_mixedcode.dict.yaml
-          cp /tmp/core/wanxiang_reverse.dict.yaml   scheme/shared/core/core_reverse.dict.yaml
+          
+          # Sync core dictionaries (Crucial for engine functionality)
+          cp /tmp/core/wanxiang_english.dict.yaml   scheme/shared/core/dicts/core_english.dict.yaml
+          cp /tmp/core/wanxiang_mixedcode.dict.yaml scheme/shared/core/dicts/core_mixedcode.dict.yaml
+          cp /tmp/core/wanxiang_reverse.dict.yaml   scheme/shared/core/dicts/core_reverse.dict.yaml
           cp /tmp/core/wanxiang_reverse.schema.yaml  scheme/shared/core/core_reverse.schema.yaml
           
+          # Sync all other core dictionary files
+          cp /tmp/core/*.dict.yaml scheme/shared/core/dicts/ 2>/dev/null || true
+          
+          # Apply purification to internal dictionary names
+          find scheme/shared/core/dicts -name "*.dict.yaml" -type f -exec sed -i 's/wanxiang/core/g' {} +
+          find scheme/shared/core/dicts -name "*.dict.yaml" -type f -exec sed -i 's/万象/核心/g' {} +
+          
           # 2. Sync Lua Logic & Purify
           rm -rf lua/core lua/data
           mkdir -p lua/core lua/data
           cp -r /tmp/core/lua/wanxiang/. lua/core/
           cp -r /tmp/core/lua/data/. lua/data/
           mv lua/core/wanxiang.lua lua/core/core.lua
           
-          # Apply branding purification to Lua
+          # Apply branding purification to Lua & YAML content (Deep Purification)
           find lua/core -name "*.lua" -type f -exec sed -i 's/wanxiang/core/g' {} +
           find lua/core -name "*.lua" -type f -exec sed -i 's/万象/核心/g' {} +
+          find scheme/shared/core -name "*.yaml" -type f -exec sed -i 's/wanxiang/core/g' {} +
+          find scheme/shared/core -name "*.yaml" -type f -exec sed -i 's/万象/核心/g' {} +
           
           # 3. Generate Purified rime.lua
           cat <<EOF > rime.lua

scheme/shared/gins.dict.yaml

@@ -14,7 +14,7 @@ import_tables:
   - dicts/renming
   - dicts/wuzhong
   - dicts/cn&en
-  - zhwiki
-  - tone_moe
-  - gins-shici
+  - dicts/zhwiki
+  - dicts/tone_moe
+  - dicts/gins-shici
 ...

tools/gins-rime-cli/Sources/GinsRime/Commands/Status.swift

@@ -32,12 +32,12 @@ struct Status: AsyncParsableCommand {
             ("dicts/wuzhong.dict.yaml",  "wuzhong  物种"),
         ]
         let externalDicts: [(String, String)] = [
-            ("tone_moe.dict.yaml",   "tone_moe  萌娘百科"),
-            ("zhwiki.dict.yaml",     "zhwiki    维基百科标题"),
-            ("gins-shici.dict.yaml", "gins-shici 古诗词补充"),
+            ("dicts/tone_moe.dict.yaml",   "tone_moe  萌娘百科"),
+            ("dicts/zhwiki.dict.yaml",     "zhwiki    维基百科标题"),
+            ("dicts/gins-shici.dict.yaml", "gins-shici 古诗词补充"),
         ]
 
-        print("万象内置词库:")
+        print("核心内置词库:")
         for (file, label) in builtinDicts {
             let exists = fm.fileExists(atPath: rimeDir.appendingPathComponent(file).path)
             print("  \(exists ? "✓" : "✗") \(label)")
@@ -47,7 +47,7 @@ struct Status: AsyncParsableCommand {
         let versions = loadVersions()
         for (file, label) in externalDicts {
             let exists = fm.fileExists(atPath: rimeDir.appendingPathComponent(file).path)
-            let dictName = file.replacingOccurrences(of: ".dict.yaml", with: "")
+            let dictName = file.replacingOccurrences(of: "dicts/", with: "").replacingOccurrences(of: ".dict.yaml", with: "")
             let ver = versions[dictName].map { " (\($0))" } ?? ""
             print("  \(exists ? "✓" : "✗") \(label)\(ver)")
         }

tools/gins-rime-cli/Sources/GinsRime/Commands/Update.swift

@@ -111,7 +111,10 @@ struct Update: AsyncParsableCommand {
 
     private func downloadDict(_ name: String) async throws {
         let url = URL(string: "\(GinsSettings.workerBase)/dicts/\(name)")!
-        let dest = RimePaths.user.appendingPathComponent("\(name).dict.yaml")
+        let dictsDir = RimePaths.user.appendingPathComponent("dicts")
+        try FileManager.default.createDirectory(at: dictsDir, withIntermediateDirectories: true)
+        
+        let dest = dictsDir.appendingPathComponent("\(name).dict.yaml")
         let (tmp, _) = try await URLSession.shared.download(from: url)
         if FileManager.default.fileExists(atPath: dest.path) {
             try FileManager.default.removeItem(at: dest)