fix: keep empty allowlists in direct mode

Author: DiscoverBox

nodes.enc.json

@@ -1,5 +1,5 @@
 {
   "version": 1,
-  "nonce": "/5QWOcDIkXDma5gR",
-  "ciphertext": "UbOtSlWJIqvqdZrfvaeP7o5q7o8KYp0XwXKQ/40RIFoU5bQoCA/oxQC2AhcF/ccRfh90VEJJeUANKRfcEnmhCsa+RBwXptM+d2Ede8DTKnIVuwiJSpHiOKbaxDR0Ypmd2LzCU9QDFh6KJAVcx0v4MujHJiuis4qR6//1e4XWIxeoOWah36zU6X/kEWx8E2skaLozU1cZEKRz2cseCiGr/uNDrVGiczXF1zjk6cH1u80nGHkzsjLK+XGls64gtm9KNfwdl6g0ojwUdd2n/eMyqMptSEv28gBo8M94esFp8f9juWE0GAnSzGI50XBRyzSRp9J+2PvVEF2C0xwRYVpRoVWCoR1TRajKTP5ellQPZJD9wilODUAyt+jeY+sPPCCK4kMW6rZn7XYijqW4rZ/C59zzs33q6onXrNh7BYr1Q9oUssBWRlQ8B+l/UI3jZqj5vRs1uIpo0tRAQ7hg6vRZ4/UIqyK8Q5U7nnP/Hmu7yE2njnlOXoVqGRBnVVTZSMarHAXrwGdtc/fSbaEQtsAZ79oSAVaFY1KUwK+zS9HzlXi4wlpVonU/jqpof4wLK4k+JQ82"
+  "nonce": "SssYHEXDwyJsSCC8",
+  "ciphertext": "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"
 }

src-tauri/src/core.rs

@@ -789,6 +789,9 @@ impl AppCore {
         }
         routes.retain(|route| route.id != route_id);
         let mut settings = self.settings()?;
+        if settings.route_scope == RouteScope::Allowlist && routes.is_empty() {
+            settings.acceleration_enabled = false;
+        }
         let pairs = self.node_pairs()?;
         self.write_configuration(&mut settings, &pairs, &routes)?;
         atomic_write_json(&self.paths.routes, &routes)?;
@@ -932,12 +935,22 @@ impl AppCore {
 
     pub fn refresh_registered_configuration(&self) -> Result<(), String> {
         let _guard = self.lock.lock();
-        if !git::include_registered(&self.paths.gitconfig) {
+        let registered = git::include_registered(&self.paths.gitconfig);
+        let mut settings = self.settings()?;
+        let routes = self.routes()?;
+        let repaired_empty_allowlist = settings.acceleration_enabled
+            && settings.route_scope == RouteScope::Allowlist
+            && routes.is_empty();
+        if repaired_empty_allowlist {
+            settings.acceleration_enabled = false;
+        }
+        if !registered {
+            if repaired_empty_allowlist {
+                atomic_write_json(&self.paths.settings, &settings)?;
+            }
             return Ok(());
         }
-        let mut settings = self.settings()?;
         let pairs = self.node_pairs()?;
-        let routes = self.routes()?;
         self.write_configuration(&mut settings, &pairs, &routes)?;
         atomic_write_json(&self.paths.settings, &settings)
     }
@@ -1366,7 +1379,7 @@ mod tests {
     fn system_catalog_is_encrypted_and_authenticated() {
         let bytes = include_bytes!("../../nodes.enc.json");
         let urls = parse_system_catalog(bytes).unwrap();
-        assert_eq!(urls.len(), 18);
+        assert!(!urls.is_empty());
         assert_eq!(urls[0], FASTGIT_REWRITE_BASE);
         assert!(!String::from_utf8_lossy(bytes).contains("fastgit.cc"));
 
@@ -1857,20 +1870,22 @@ mod tests {
                 .collect::<Vec<_>>()
         );
 
-        let node = owner_result
-            .iter()
-            .find(|node| matches!(node.health.status, NodeStatus::Available | NodeStatus::Slow))
-            .expect("live integration requires at least one usable system node");
-        let node_id = node.node.id.clone();
-        let rewrite_base = node.node.rewrite_base.clone();
-
         core.add_route("openai/codex").unwrap();
         let enabled = core.set_acceleration(true).unwrap();
         assert!(enabled.settings.acceleration_enabled);
-        assert_eq!(
-            enabled.settings.current_node_id.as_deref(),
-            Some(node_id.as_str())
-        );
+        let node_id = enabled
+            .settings
+            .current_node_id
+            .clone()
+            .expect("live integration requires at least one usable system node");
+        let node = owner_result
+            .iter()
+            .find(|node| {
+                node.node.id == node_id
+                    && matches!(node.health.status, NodeStatus::Available | NodeStatus::Slow)
+            })
+            .expect("automatic selection must use a verified node");
+        let rewrite_base = node.node.rewrite_base.clone();
         assert!(enabled.environment.include_registered);
 
         let repository = tempfile::tempdir().unwrap();
@@ -1910,7 +1925,7 @@ mod tests {
         );
 
         drop(core);
-        let core = AppCore::new(root).unwrap();
+        let core = AppCore::new(root.clone()).unwrap();
         core.refresh_registered_configuration().unwrap();
         let restarted = core.snapshot().unwrap();
         assert!(restarted.settings.acceleration_enabled);
@@ -1961,6 +1976,23 @@ mod tests {
         assert!(!stored_usage.contains("secret"));
         assert!(!stored_usage.contains("hidden"));
 
+        let route_id = core.snapshot().unwrap().routes[0].id.clone();
+        let without_routes = core.delete_route(&route_id).unwrap();
+        assert!(without_routes.routes.is_empty());
+        assert!(!without_routes.settings.acceleration_enabled);
+        assert_eq!(
+            git(repository.path(), &["remote", "get-url", "origin"]),
+            "https://github.com/openai/codex.git"
+        );
+
+        let mut stale_settings = core.settings().unwrap();
+        stale_settings.acceleration_enabled = true;
+        atomic_write_json(&core.paths.settings, &stale_settings).unwrap();
+        drop(core);
+        let core = AppCore::new(root).unwrap();
+        core.refresh_registered_configuration().unwrap();
+        assert!(!core.snapshot().unwrap().settings.acceleration_enabled);
+
         let restored = core.restore_git_config().unwrap();
         assert!(!restored.settings.acceleration_enabled);
         assert_eq!(restored.settings.line_mode, LineMode::Direct);