Handle enabled global dictation fallback

Author: danielcadev

updater/src/builder.rs

@@ -122,7 +122,12 @@ pub async fn build_update_from(
     state.artifact_paths.workspace_dir = Some(workspace.workspace_dir.clone());
     state.save(&paths.state_file)?;
 
-    copy_builder_bundle(bundle_source, &workspace.bundle_dir)?;
+    let feature_config = crate::config::effective_feature_config_path(config);
+    copy_builder_bundle(
+        bundle_source,
+        &workspace.bundle_dir,
+        feature_config.as_deref(),
+    )?;
 
     state.status = UpdateStatus::PatchingApp;
     state.save(&paths.state_file)?;
@@ -146,7 +151,7 @@ pub async fn build_update_from(
     // writes it to a stable per-user path) so the rebuild stages exactly those
     // features. Only set it when the file actually exists; an absent path would
     // make linux-features.js see an empty enabled set and stage nothing.
-    if let Some(feature_config) = crate::config::effective_feature_config_path(config) {
+    if let Some(feature_config) = feature_config {
         install.env("CODEX_LINUX_FEATURES_CONFIG", &feature_config);
     }
     run_and_log(&mut install, &workspace.install_log)
@@ -246,7 +251,11 @@ fn package_build_script(bundle_dir: &Path) -> PathBuf {
     }
 }
 
-fn copy_builder_bundle(source_root: &Path, destination_root: &Path) -> Result<()> {
+fn copy_builder_bundle(
+    source_root: &Path,
+    destination_root: &Path,
+    feature_config: Option<&Path>,
+) -> Result<()> {
     let manifest_path = source_root.join(UPDATE_BUILDER_MANIFEST);
     if manifest_path.exists() {
         return copy_builder_bundle_from_manifest(source_root, destination_root, &manifest_path);
@@ -268,9 +277,34 @@ fn copy_builder_bundle(source_root: &Path, destination_root: &Path) -> Result<()
         )?;
     }
 
+    if linux_feature_enabled_in_config(feature_config, "global-dictation") {
+        copy_entry(
+            &source_root.join("global-dictation-linux"),
+            &destination_root.join("global-dictation-linux"),
+            false,
+        )?;
+    }
+
     Ok(())
 }
 
+fn linux_feature_enabled_in_config(feature_config: Option<&Path>, feature_id: &str) -> bool {
+    let Some(feature_config) = feature_config else {
+        return false;
+    };
+    let Ok(contents) = fs::read_to_string(feature_config) else {
+        return false;
+    };
+    let Ok(config) = serde_json::from_str::<serde_json::Value>(&contents) else {
+        return false;
+    };
+
+    config
+        .get("enabled")
+        .and_then(serde_json::Value::as_array)
+        .is_some_and(|enabled| enabled.iter().any(|id| id.as_str() == Some(feature_id)))
+}
+
 fn copy_builder_bundle_from_manifest(
     source_root: &Path,
     destination_root: &Path,
@@ -950,12 +984,7 @@ fi
         Ok(())
     }
 
-    #[test]
-    fn bundle_copy_skips_missing_optional_package_scripts() -> Result<()> {
-        let temp = tempdir()?;
-        let source_root = temp.path().join("source");
-        let destination_root = temp.path().join("destination");
-
+    fn write_fake_fallback_bundle(source_root: &Path) -> Result<()> {
         fs::create_dir_all(source_root.join("scripts/lib"))?;
         fs::create_dir_all(source_root.join("launcher"))?;
         fs::create_dir_all(source_root.join("packaging/linux"))?;
@@ -1003,8 +1032,18 @@ fi
         )?;
         fs::write(source_root.join("assets/codex.png"), b"png")?;
         fs::write(source_root.join("assets/codex-linux.png"), b"linux png")?;
+        Ok(())
+    }
 
-        copy_builder_bundle(&source_root, &destination_root)?;
+    #[test]
+    fn bundle_copy_skips_missing_optional_package_scripts() -> Result<()> {
+        let temp = tempdir()?;
+        let source_root = temp.path().join("source");
+        let destination_root = temp.path().join("destination");
+
+        write_fake_fallback_bundle(&source_root)?;
+
+        copy_builder_bundle(&source_root, &destination_root, None)?;
 
         assert!(destination_root.join("scripts/build-deb.sh").exists());
         assert!(destination_root
@@ -1041,6 +1080,36 @@ fi
         Ok(())
     }
 
+    #[test]
+    fn fallback_bundle_copies_global_dictation_source_when_enabled() -> Result<()> {
+        let temp = tempdir()?;
+        let source_root = temp.path().join("source");
+        let destination_root = temp.path().join("destination");
+        let feature_config = temp.path().join("linux-features.json");
+
+        write_fake_fallback_bundle(&source_root)?;
+        fs::create_dir_all(source_root.join("global-dictation-linux/src"))?;
+        fs::write(
+            source_root.join("global-dictation-linux/Cargo.toml"),
+            b"[package]\nname = \"codex-global-dictation-linux\"\nversion = \"0.1.0\"\nedition = \"2021\"\n",
+        )?;
+        fs::write(
+            source_root.join("global-dictation-linux/src/main.rs"),
+            b"fn main() {}\n",
+        )?;
+        fs::write(&feature_config, b"{\"enabled\":[\"global-dictation\"]}\n")?;
+
+        copy_builder_bundle(&source_root, &destination_root, Some(&feature_config))?;
+
+        assert!(destination_root
+            .join("global-dictation-linux/Cargo.toml")
+            .exists());
+        assert!(destination_root
+            .join("global-dictation-linux/src/main.rs")
+            .exists());
+        Ok(())
+    }
+
     #[test]
     fn bundle_copy_prefers_packaged_update_builder_manifest() -> Result<()> {
         let temp = tempdir()?;
@@ -1062,7 +1131,7 @@ fi
             b"# generated\nassets/codex-linux.png\nrecord-replay-linux/Cargo.toml\n",
         )?;
 
-        copy_builder_bundle(&source_root, &destination_root)?;
+        copy_builder_bundle(&source_root, &destination_root, None)?;
 
         assert!(destination_root.join("assets/codex-linux.png").exists());
         assert!(destination_root
@@ -1082,7 +1151,7 @@ fi
         fs::create_dir_all(source_root.join(".codex-linux"))?;
         fs::write(source_root.join(UPDATE_BUILDER_MANIFEST), b"../escape\n")?;
 
-        let error = copy_builder_bundle(&source_root, &destination_root)
+        let error = copy_builder_bundle(&source_root, &destination_root, None)
             .expect_err("manifest parent path should be rejected");
         assert!(error
             .to_string()
@@ -1099,7 +1168,7 @@ fi
         fs::create_dir_all(source_root.join(".codex-linux"))?;
         fs::write(source_root.join(UPDATE_BUILDER_MANIFEST), b"/tmp/escape\n")?;
 
-        let error = copy_builder_bundle(&source_root, &destination_root)
+        let error = copy_builder_bundle(&source_root, &destination_root, None)
             .expect_err("manifest absolute path should be rejected");
         assert!(error
             .to_string()