Rewrite phase 2: split EVCore, protocols, AppEnvironment injection

- Split EVCore.swift → BundleIdentifiers + ContainerPaths + AppSettingsStore
  (shim stays for compatibility, will be removed in phase 3)
- Add protocol seams: TunnelControlling, ConfigurationRepository, AppSettingsProviding
- AppEnvironment assembles all singletons, injects via .environmentObject
- All Views migrated to @EnvironmentObject — no more .shared in the UI layer

Author: decoder-dev

CHANGELOG.md

@@ -17,6 +17,15 @@ All notable changes to **decoder sec.** are documented here.
 - In-app log console
 - Signed TestFlight builds
 
+## [0.1.0-beta.14] — 2026-08-12
+
+### Rewrite Phase 2 — зависимости и протоколы
+- `EVCore.swift` разбит на три модуля: `BundleIdentifiers`, `ContainerPaths`, `AppSettingsStore`
+- Введены протоколы-швы: `TunnelControlling`, `ConfigurationRepository`, `AppSettingsProviding`
+- `AppEnvironment` — единая точка сборки зависимостей, заменяет прямые `.shared` во всех Views
+- Views (Home, Content, Configs, Settings, Editor) переведены на `@EnvironmentObject` инжекцию
+- `DecoderSecApp` применяет `AppEnvironment.modifier` на корневой сцене
+
 ## [0.1.0-beta.13] — 2026-08-12
 
 ### Changed

DecoderSec/App/AppEnvironment.swift

@@ -0,0 +1,50 @@
+//
+//  AppEnvironment.swift
+//  DecoderSec/App
+//
+//  Single assembly point: builds every singleton once, exposes them
+//  via .environmentObject / @EnvironmentObject so no View ever reaches
+//  for .shared directly. Phase 2 rewrite.
+//
+
+import SwiftUI
+
+/// Owns the app's singletons and injects them into the SwiftUI tree.
+/// Add it to the root scene modifier chain once:
+///
+///     WindowGroup { ContentView() }
+///         .modifier(AppEnvironment.modifier)
+///
+@MainActor
+final class AppEnvironment: ObservableObject {
+
+    // MARK: - Singletons (assembled once here, injected everywhere else)
+
+    let tunnel     = TunnelManager.shared
+    let store      = ConfigurationStore.shared
+    let appState   = AppState.shared
+    let deepLinks  = DeepLinkCenter.shared
+    let routing    = RoutingProfileStore.shared
+
+    // MARK: - Singleton (environment modifier)
+
+    static let shared = AppEnvironment()
+
+    private init() {}
+
+    /// Apply to the root `WindowGroup` scene.
+    struct Modifier: ViewModifier {
+        @ObservedObject private var env = AppEnvironment.shared
+
+        func body(content: Content) -> some View {
+            content
+                .environmentObject(env.tunnel)
+                .environmentObject(env.store)
+                .environmentObject(env.appState)
+                .environmentObject(env.deepLinks)
+                .environmentObject(env.routing)
+        }
+    }
+
+    static var modifier: Modifier { Modifier() }
+}

DecoderSec/App/ContentView.swift

@@ -9,8 +9,8 @@ import NetworkExtension
 import SwiftUI
 
 struct ContentView: View {
-    @ObservedObject private var tunnel = TunnelManager.shared
-    @ObservedObject private var store = ConfigurationStore.shared
+    @EnvironmentObject private var tunnel: TunnelManager
+    @EnvironmentObject private var store: ConfigurationStore
     @EnvironmentObject private var deepLinks: DeepLinkCenter
     @State private var minimized: Bool = false
 
@@ -111,9 +111,9 @@ struct ContentView: View {
 }
 
 private struct RunningRootView: View {
-    @ObservedObject private var store = ConfigurationStore.shared
-    @ObservedObject private var appState = AppState.shared
-    @ObservedObject private var tunnel = TunnelManager.shared
+    @EnvironmentObject private var store: ConfigurationStore
+    @EnvironmentObject private var appState: AppState
+    @EnvironmentObject private var tunnel: TunnelManager
     @State private var pulse = false
 
     var body: some View {

DecoderSec/App/DecoderSecApp.swift

@@ -2,14 +2,11 @@
 //  DecoderSecApp.swift
 //  DecoderSec
 //
-//  Created by NodePassProject on 5/2/26.
-//
 
 import SwiftUI
 
 @main
 struct DecoderSecApp: App {
-    @ObservedObject private var deepLinks = DeepLinkCenter.shared
 
     init() {
         _ = PersistenceController.shared
@@ -18,13 +15,13 @@ struct DecoderSecApp: App {
     var body: some Scene {
         WindowGroup {
             ContentView()
-                .environmentObject(deepLinks)
+                .modifier(AppEnvironment.modifier)
                 .onOpenURL { url in
-                    deepLinks.handle(url: url)
+                    AppEnvironment.shared.deepLinks.handle(url: url)
                 }
                 .onContinueUserActivity(NSUserActivityTypeBrowsingWeb) { activity in
                     if let url = activity.webpageURL {
-                        deepLinks.handle(url: url)
+                        AppEnvironment.shared.deepLinks.handle(url: url)
                     }
                 }
         }

DecoderSec/Core/Protocols/AppSettingsProviding.swift

@@ -0,0 +1,20 @@
+//
+//  AppSettingsProviding.swift
+//  DecoderSec/Core/Protocols
+//
+//  Protocol seam for observable app settings — separates the SwiftUI binding
+//  layer from the raw UserDefaults storage. Phase 2 rewrite.
+//
+
+import Foundation
+
+@MainActor
+protocol AppSettingsProviding: AnyObject, ObservableObject {
+    var alwaysOnEnabled: Bool { get set }
+    var dnsServers: [String] { get set }
+    var tunnelIncludeAllNetworks: Bool { get set }
+    var tunnelIncludeLocalNetworks: Bool { get set }
+    var tunnelIncludeAPNs: Bool { get set }
+    var tunnelIncludeCellularServices: Bool { get set }
+    var useZashboardEnabled: Bool { get set }
+}

DecoderSec/Core/Protocols/ConfigurationRepository.swift

@@ -0,0 +1,26 @@
+//
+//  ConfigurationRepository.swift
+//  DecoderSec/Core/Protocols
+//
+//  Protocol seam for config storage — lets Views test against a fake store.
+//  Phase 2 rewrite.
+//
+
+import Foundation
+
+@MainActor
+protocol ConfigurationRepository: AnyObject, ObservableObject {
+    var configurations: [Configuration] { get }
+    var storeError: String? { get }
+    var selectedCore: CoreType { get set }
+    var activeIDByCoreType: [CoreType: UUID] { get }
+    var active: Configuration? { get }
+    var configurationsForSelectedCore: [Configuration] { get }
+
+    @discardableResult
+    func create(name: String, type: CoreType, content: String, sourceURL: String?) -> Configuration?
+    func update(_ config: Configuration, name: String)
+    func update(_ config: Configuration, content: String)
+    func delete(_ config: Configuration)
+    func setActive(_ config: Configuration)
+}

DecoderSec/Core/Protocols/TunnelControlling.swift

@@ -0,0 +1,25 @@
+//
+//  TunnelControlling.swift
+//  DecoderSec/Core/Protocols
+//
+//  Protocol seam for the tunnel lifecycle — lets Views and DeepLinkCenter
+//  depend on an abstraction instead of TunnelManager.shared directly.
+//  Phase 2 rewrite.
+//
+
+import Foundation
+import NetworkExtension
+
+@MainActor
+protocol TunnelControlling: AnyObject, ObservableObject {
+    var status: NEVPNStatus { get }
+    var isReady: Bool { get }
+    var coreRunning: Bool { get }
+    var lastError: String? { get }
+    var pendingReconnect: Bool { get }
+
+    func setEnabled(_ on: Bool, configuration: Configuration?) async
+    func reconnect() async
+    func applyAlwaysOn(_ enabled: Bool) async
+    func clearLastError()
+}

DecoderSec/Features/Configurations/ConfigurationsView.swift

@@ -9,8 +9,8 @@ import SwiftUI
 import UniformTypeIdentifiers
 
 struct ConfigurationsView: View {
-    @ObservedObject private var store = ConfigurationStore.shared
-    @ObservedObject private var tunnel = TunnelManager.shared
+    @EnvironmentObject private var store: ConfigurationStore
+    @EnvironmentObject private var tunnel: TunnelManager
     @State private var pendingDelete: Configuration?
     @State private var blockedAlert = false
     @State private var fileImporting = false

DecoderSec/Features/Configurations/SubscribeSheet.swift

@@ -9,7 +9,7 @@ import SwiftUI
 
 struct SubscribeSheet: View {
     @Environment(\.dismiss) private var dismiss
-    @ObservedObject private var deepLinks = DeepLinkCenter.shared
+    @EnvironmentObject private var deepLinks: DeepLinkCenter
     @State private var raw = ""
     @State private var localError: String?
     @FocusState private var focused: Bool

DecoderSec/Features/Editor/ConfigEditorScreen.swift

@@ -9,7 +9,7 @@ import SwiftUI
 
 struct ConfigEditorScreen: View {
     @ObservedObject var configuration: Configuration
-    @ObservedObject private var store = ConfigurationStore.shared
+    @EnvironmentObject private var store: ConfigurationStore
     @State private var draft: String = ""
 
     var body: some View {