electron-cli 0.3.0-alpha.15 → 0.3.0-alpha.17

package/src/commands/package.rs

@@ -5,6 +5,7 @@ use std::{
 };
 
 use anyhow::{bail, Context, Result};
+use apple_codesign::{BundleSigner, CodeSignatureFlags, SettingsScope, SigningSettings};
 use camino::Utf8PathBuf;
 use plist::{Dictionary as PlistDictionary, Value as PlistValue};
 use serde::Serialize;
@@ -18,6 +19,7 @@ pub(crate) struct PackageReport {
     app_name: String,
     executable_name: String,
     metadata: PackageMetadata,
+    signing: PackageSigningPlan,
     platform: String,
     arch: String,
     electron_dist: Utf8PathBuf,
@@ -55,6 +57,39 @@ struct IconResource {
     to: Utf8PathBuf,
 }
 
+#[derive(Clone, Debug, Serialize)]
+struct PackageSigningPlan {
+    macos: MacosSigningPlan,
+}
+
+#[derive(Clone, Debug, Serialize)]
+struct MacosSigningPlan {
+    sign: MacosSignPlan,
+    notarize: MacosNotarizePlan,
+}
+
+#[derive(Clone, Debug, Serialize)]
+struct MacosSignPlan {
+    configured: bool,
+    enabled: bool,
+    will_execute: bool,
+    method: Option<String>,
+    identity: Option<String>,
+    entitlements: Vec<Utf8PathBuf>,
+    entitlements_inherit: Option<Utf8PathBuf>,
+    hardened_runtime: Option<bool>,
+    gatekeeper_assess: Option<bool>,
+}
+
+#[derive(Clone, Debug, Serialize)]
+struct MacosNotarizePlan {
+    configured: bool,
+    enabled: bool,
+    auth_method: Option<String>,
+    keychain_profile: Option<String>,
+    keychain: Option<String>,
+}
+
 #[derive(Clone, Copy, Debug, Serialize)]
 #[serde(rename_all = "kebab-case")]
 enum PackageStatus {
@@ -82,6 +117,35 @@ struct PackagerConfig {
     icon: Vec<String>,
     extra_resource: Vec<String>,
     darwin_dark_mode_support: bool,
+    osx_sign: MacosSignConfig,
+    osx_notarize: MacosNotarizeConfig,
+}
+
+#[derive(Clone, Debug, Default)]
+struct MacosSignConfig {
+    configured: bool,
+    enabled: bool,
+    invalid_type: bool,
+    identity: Option<String>,
+    entitlements: Vec<String>,
+    entitlements_inherit: Option<String>,
+    hardened_runtime: Option<bool>,
+    gatekeeper_assess: Option<bool>,
+}
+
+#[derive(Clone, Debug, Default)]
+struct MacosNotarizeConfig {
+    configured: bool,
+    enabled: bool,
+    invalid_type: bool,
+    apple_id_set: bool,
+    apple_id_password_set: bool,
+    team_id_set: bool,
+    apple_api_key: Option<String>,
+    apple_api_key_id_set: bool,
+    apple_api_issuer_set: bool,
+    keychain_profile: Option<String>,
+    keychain: Option<String>,
 }
 
 pub fn run(args: PackageArgs) -> Result<()> {
@@ -133,6 +197,7 @@ pub(crate) fn build_report(snapshot: ProjectSnapshot, args: &PackageArgs) -> Res
         &app_resources_dir,
         &platform,
     )?;
+    let (signing, signing_warnings) = package_signing(root, &package_config, &platform)?;
 
     let mut warnings = package_config.warnings.clone();
     if snapshot.package_json.is_none() {
@@ -170,6 +235,7 @@ pub(crate) fn build_report(snapshot: ProjectSnapshot, args: &PackageArgs) -> Res
 
     warnings.extend(runtime_dependency_warnings(root, &snapshot));
     warnings.extend(metadata_warnings);
+    warnings.extend(signing_warnings);
 
     let create_dirs = vec![package_root.clone(), app_resources_dir.clone()];
     let mut copy_steps = vec![
@@ -200,6 +266,7 @@ pub(crate) fn build_report(snapshot: ProjectSnapshot, args: &PackageArgs) -> Res
         app_name,
         executable_name,
         metadata,
+        signing,
         platform,
         arch,
         electron_dist: utf8_path(electron_dist)?,
@@ -299,10 +366,111 @@ pub(crate) fn execute_package(report: &PackageReport, force: bool) -> Result<()>
         &app_dir,
         &report.project,
     )?;
+    execute_macos_signing(report)?;
 
     Ok(())
 }
 
+fn execute_macos_signing(report: &PackageReport) -> Result<()> {
+    if report.platform != "darwin" || !report.signing.macos.sign.will_execute {
+        return Ok(());
+    }
+
+    let bundle_dir = Path::new(report.bundle_dir.as_str());
+    let bundle_parent = bundle_dir
+        .parent()
+        .context("macOS bundle output has no parent directory")?;
+    let bundle_name = bundle_dir
+        .file_name()
+        .context("macOS bundle output has no bundle directory name")?;
+    let unique_suffix = std::time::SystemTime::now()
+        .duration_since(std::time::UNIX_EPOCH)
+        .context("system clock is before the Unix epoch")?
+        .as_nanos();
+    let signing_parent = bundle_parent.join(format!(
+        ".electron-cli-signing-{}-{unique_suffix}",
+        std::process::id()
+    ));
+    let signed_bundle_dir = signing_parent.join(bundle_name);
+
+    if signing_parent.exists() {
+        fs::remove_dir_all(&signing_parent)
+            .with_context(|| format!("Could not remove {}", signing_parent.display()))?;
+    }
+
+    let signing_result = (|| -> Result<()> {
+        let mut signer = BundleSigner::new_from_path(bundle_dir).with_context(|| {
+            format!(
+                "Could not prepare macOS bundle signing for {}",
+                bundle_dir.display()
+            )
+        })?;
+        signer
+            .collect_nested_bundles()
+            .context("Could not discover nested macOS bundles for signing")?;
+
+        let settings = macos_signing_settings(report)?;
+        signer
+            .write_signed_bundle(&signed_bundle_dir, &settings)
+            .with_context(|| {
+                format!(
+                    "Could not write signed macOS bundle to {}",
+                    signed_bundle_dir.display()
+                )
+            })?;
+
+        Ok(())
+    })();
+
+    if let Err(error) = signing_result {
+        let _ = fs::remove_dir_all(&signing_parent);
+        return Err(error);
+    }
+
+    fs::remove_dir_all(bundle_dir)
+        .with_context(|| format!("Could not remove {}", bundle_dir.display()))?;
+    fs::rename(&signed_bundle_dir, bundle_dir).with_context(|| {
+        format!(
+            "Could not move signed macOS bundle from {} to {}",
+            signed_bundle_dir.display(),
+            bundle_dir.display()
+        )
+    })?;
+    let _ = fs::remove_dir_all(&signing_parent);
+
+    Ok(())
+}
+
+fn macos_signing_settings(report: &PackageReport) -> Result<SigningSettings<'static>> {
+    let sign = &report.signing.macos.sign;
+    let mut settings = SigningSettings::default();
+    settings.set_binary_identifier(SettingsScope::Main, &report.metadata.bundle_identifier);
+
+    if sign.hardened_runtime.unwrap_or(false) {
+        settings.add_code_signature_flags(SettingsScope::Main, CodeSignatureFlags::RUNTIME);
+    }
+
+    if let Some(entitlements) = sign.entitlements.first() {
+        let entitlements_path = Path::new(entitlements.as_str());
+        let entitlements_xml = fs::read_to_string(entitlements_path).with_context(|| {
+            format!(
+                "Could not read macOS entitlements file {}",
+                entitlements_path.display()
+            )
+        })?;
+        settings
+            .set_entitlements_xml(SettingsScope::Main, entitlements_xml)
+            .with_context(|| {
+                format!(
+                    "Could not parse macOS entitlements file {}",
+                    entitlements_path.display()
+                )
+            })?;
+    }
+
+    Ok(settings)
+}
+
 fn print_report(report: &PackageReport, json: bool) -> Result<()> {
     if json {
         return output::json(report);
@@ -325,6 +493,44 @@ fn print_report(report: &PackageReport, json: bool) -> Result<()> {
     println!("  target: {} {}", report.platform, report.arch);
     println!("  status: {}", report.status.as_str());
 
+    if report.signing.macos.sign.configured || report.signing.macos.notarize.configured {
+        println!();
+        println!("Signing");
+        println!(
+            "  macOS signing: {}",
+            if report.signing.macos.sign.enabled {
+                "configured"
+            } else {
+                "disabled"
+            }
+        );
+        if let Some(identity) = &report.signing.macos.sign.identity {
+            println!("  identity: {identity}");
+        }
+        if let Some(method) = &report.signing.macos.sign.method {
+            println!("  signing method: {method}");
+        }
+        println!(
+            "  signing execution: {}",
+            if report.signing.macos.sign.will_execute {
+                "enabled"
+            } else {
+                "not available"
+            }
+        );
+        println!(
+            "  macOS notarization: {}",
+            if report.signing.macos.notarize.enabled {
+                "configured"
+            } else {
+                "disabled"
+            }
+        );
+        if let Some(method) = &report.signing.macos.notarize.auth_method {
+            println!("  notarization auth: {method}");
+        }
+    }
+
     println!();
     println!("Output");
     println!("  {}", report.bundle_dir);
@@ -400,6 +606,114 @@ fn parse_packager_config(value: &JsonValue) -> PackagerConfig {
             .get("darwinDarkModeSupport")
             .and_then(JsonValue::as_bool)
             .unwrap_or(false),
+        osx_sign: parse_macos_sign_config(value.get("osxSign")),
+        osx_notarize: parse_macos_notarize_config(value.get("osxNotarize")),
+    }
+}
+
+fn parse_macos_sign_config(value: Option<&JsonValue>) -> MacosSignConfig {
+    match value {
+        None => MacosSignConfig::default(),
+        Some(JsonValue::Bool(false)) => MacosSignConfig {
+            configured: true,
+            enabled: false,
+            ..MacosSignConfig::default()
+        },
+        Some(JsonValue::Bool(true)) => MacosSignConfig {
+            configured: true,
+            enabled: true,
+            ..MacosSignConfig::default()
+        },
+        Some(JsonValue::Object(object)) => {
+            let entitlements = [
+                "entitlements",
+                "entitlementsInherit",
+                "entitlementsLoginHelper",
+            ]
+            .iter()
+            .filter_map(|key| {
+                object
+                    .get(*key)
+                    .and_then(JsonValue::as_str)
+                    .map(ToOwned::to_owned)
+            })
+            .collect();
+
+            MacosSignConfig {
+                configured: true,
+                enabled: true,
+                invalid_type: false,
+                identity: object
+                    .get("identity")
+                    .or_else(|| object.get("identityName"))
+                    .and_then(JsonValue::as_str)
+                    .map(ToOwned::to_owned),
+                entitlements,
+                entitlements_inherit: object
+                    .get("entitlementsInherit")
+                    .and_then(JsonValue::as_str)
+                    .map(ToOwned::to_owned),
+                hardened_runtime: object.get("hardenedRuntime").and_then(JsonValue::as_bool),
+                gatekeeper_assess: object.get("gatekeeperAssess").and_then(JsonValue::as_bool),
+            }
+        }
+        Some(_) => MacosSignConfig {
+            configured: true,
+            invalid_type: true,
+            ..MacosSignConfig::default()
+        },
+    }
+}
+
+fn parse_macos_notarize_config(value: Option<&JsonValue>) -> MacosNotarizeConfig {
+    match value {
+        None => MacosNotarizeConfig::default(),
+        Some(JsonValue::Bool(false)) => MacosNotarizeConfig {
+            configured: true,
+            enabled: false,
+            ..MacosNotarizeConfig::default()
+        },
+        Some(JsonValue::Bool(true)) => MacosNotarizeConfig {
+            configured: true,
+            enabled: true,
+            ..MacosNotarizeConfig::default()
+        },
+        Some(JsonValue::Object(object)) => MacosNotarizeConfig {
+            configured: true,
+            enabled: true,
+            invalid_type: false,
+            apple_id_set: object.get("appleId").and_then(JsonValue::as_str).is_some(),
+            apple_id_password_set: object
+                .get("appleIdPassword")
+                .and_then(JsonValue::as_str)
+                .is_some(),
+            team_id_set: object.get("teamId").and_then(JsonValue::as_str).is_some(),
+            apple_api_key: object
+                .get("appleApiKey")
+                .and_then(JsonValue::as_str)
+                .map(ToOwned::to_owned),
+            apple_api_key_id_set: object
+                .get("appleApiKeyId")
+                .and_then(JsonValue::as_str)
+                .is_some(),
+            apple_api_issuer_set: object
+                .get("appleApiIssuer")
+                .and_then(JsonValue::as_str)
+                .is_some(),
+            keychain_profile: object
+                .get("keychainProfile")
+                .and_then(JsonValue::as_str)
+                .map(ToOwned::to_owned),
+            keychain: object
+                .get("keychain")
+                .and_then(JsonValue::as_str)
+                .map(ToOwned::to_owned),
+        },
+        Some(_) => MacosNotarizeConfig {
+            configured: true,
+            invalid_type: true,
+            ..MacosNotarizeConfig::default()
+        },
     }
 }
 
@@ -473,6 +787,202 @@ fn package_metadata(
     ))
 }
 
+fn package_signing(
+    root: &Path,
+    config: &PackageJsonConfig,
+    platform: &str,
+) -> Result<(PackageSigningPlan, Vec<String>)> {
+    let mut warnings = Vec::new();
+    let sign = macos_sign_plan(root, &config.packager.osx_sign, platform, &mut warnings)?;
+    let notarize = macos_notarize_plan(root, config, platform, &mut warnings);
+
+    Ok((
+        PackageSigningPlan {
+            macos: MacosSigningPlan { sign, notarize },
+        },
+        warnings,
+    ))
+}
+
+fn macos_sign_plan(
+    root: &Path,
+    config: &MacosSignConfig,
+    platform: &str,
+    warnings: &mut Vec<String>,
+) -> Result<MacosSignPlan> {
+    if config.invalid_type {
+        warnings.push("packagerConfig.osxSign must be false, true, or an object.".to_string());
+    }
+
+    let entitlements = config
+        .entitlements
+        .iter()
+        .filter(|path| !path.trim().is_empty())
+        .map(|path| {
+            let resolved = resolve_project_path(root, path);
+            if !resolved.exists() {
+                warnings.push(format!(
+                    "Configured macOS entitlements file does not exist: {}.",
+                    resolved.display()
+                ));
+            }
+            utf8_path(resolved)
+        })
+        .collect::<Result<Vec<_>>>()?;
+    let entitlements_inherit = config
+        .entitlements_inherit
+        .as_deref()
+        .filter(|path| !path.trim().is_empty())
+        .map(|path| utf8_path(resolve_project_path(root, path)))
+        .transpose()?;
+    if let Some(path) = &entitlements_inherit {
+        if !Path::new(path.as_str()).exists() {
+            warnings.push(format!(
+                "Configured macOS inherited entitlements file does not exist: {}.",
+                path
+            ));
+        }
+    }
+
+    let identity = config.identity.as_deref().map(str::trim);
+    let ad_hoc_identity = matches!(identity, None | Some("-"));
+    let will_execute = config.enabled && platform == "darwin" && ad_hoc_identity;
+    let method = if config.enabled && platform == "darwin" {
+        if ad_hoc_identity {
+            Some("ad-hoc".to_string())
+        } else {
+            Some("certificate-identity".to_string())
+        }
+    } else {
+        None
+    };
+
+    if config.configured && platform != "darwin" {
+        warnings.push(format!(
+            "macOS signing is configured but ignored for target platform {platform}."
+        ));
+    } else if config.enabled && !will_execute {
+        warnings.push(
+            "macOS signing identity is configured, but Rust-native certificate/keychain signing is not implemented yet; package output will be unsigned. Use identity '-' or omit identity for experimental ad-hoc signing.".to_string(),
+        );
+    } else if will_execute {
+        if config.entitlements.len() > 1 {
+            warnings.push(
+                "Rust-native ad-hoc signing applies the first macOS entitlements file only; inherited/login-helper entitlement scoping is not implemented yet.".to_string(),
+            );
+        }
+        if config.entitlements_inherit.is_some() {
+            warnings.push(
+                "packagerConfig.osxSign.entitlementsInherit is recognized but not applied to nested bundles by Rust-native ad-hoc signing yet.".to_string(),
+            );
+        }
+        if config.gatekeeper_assess.is_some() {
+            warnings.push(
+                "packagerConfig.osxSign.gatekeeperAssess is recognized but Gatekeeper assessment is not implemented yet.".to_string(),
+            );
+        }
+    }
+
+    Ok(MacosSignPlan {
+        configured: config.configured,
+        enabled: config.enabled,
+        will_execute,
+        method,
+        identity: config.identity.clone(),
+        entitlements,
+        entitlements_inherit,
+        hardened_runtime: config.hardened_runtime,
+        gatekeeper_assess: config.gatekeeper_assess,
+    })
+}
+
+fn macos_notarize_plan(
+    root: &Path,
+    package_config: &PackageJsonConfig,
+    platform: &str,
+    warnings: &mut Vec<String>,
+) -> MacosNotarizePlan {
+    let config = &package_config.packager.osx_notarize;
+    if config.invalid_type {
+        warnings.push("packagerConfig.osxNotarize must be false, true, or an object.".to_string());
+    }
+
+    let auth_method = macos_notarize_auth_method(config);
+    if config.configured && platform != "darwin" {
+        warnings.push(format!(
+            "macOS notarization is configured but ignored for target platform {platform}."
+        ));
+    } else if config.enabled {
+        warnings.push(
+            "macOS notarization is configured, but Rust-native notarization is not implemented yet.".to_string(),
+        );
+    }
+
+    if config.enabled && !package_config.packager.osx_sign.enabled {
+        warnings.push(
+            "macOS notarization requires packagerConfig.osxSign to be enabled first.".to_string(),
+        );
+    }
+    if config.enabled
+        && platform == "darwin"
+        && package_config.packager.osx_sign.enabled
+        && matches!(
+            package_config
+                .packager
+                .osx_sign
+                .identity
+                .as_deref()
+                .map(str::trim),
+            None | Some("-")
+        )
+    {
+        warnings.push(
+            "macOS notarization requires a Developer ID signature; Rust-native ad-hoc signing is not notarizable.".to_string(),
+        );
+    }
+    if config.enabled && auth_method.is_none() {
+        warnings.push(
+            "macOS notarization config is missing a complete notarytool authentication set: appleId/appleIdPassword/teamId, appleApiKey/appleApiKeyId/appleApiIssuer, or keychainProfile.".to_string(),
+        );
+    }
+    if let Some(api_key) = &config.apple_api_key {
+        let path = resolve_project_path(root, api_key);
+        if !path.exists() {
+            warnings.push(format!(
+                "Configured Apple API key file does not exist: {}.",
+                path.display()
+            ));
+        }
+    }
+
+    MacosNotarizePlan {
+        configured: config.configured,
+        enabled: config.enabled,
+        auth_method,
+        keychain_profile: config.keychain_profile.clone(),
+        keychain: config.keychain.clone(),
+    }
+}
+
+fn macos_notarize_auth_method(config: &MacosNotarizeConfig) -> Option<String> {
+    if config
+        .keychain_profile
+        .as_deref()
+        .is_some_and(|value| !value.trim().is_empty())
+    {
+        Some("keychain-profile".to_string())
+    } else if config.apple_api_key.is_some()
+        && config.apple_api_key_id_set
+        && config.apple_api_issuer_set
+    {
+        Some("app-store-connect-api-key".to_string())
+    } else if config.apple_id_set && config.apple_id_password_set && config.team_id_set {
+        Some("apple-id".to_string())
+    } else {
+        None
+    }
+}
+
 fn resolve_icon_resource(
     root: &Path,
     configured_icons: &[String],
@@ -795,6 +1305,7 @@ fn apply_macos_metadata(report: &PackageReport) -> Result<()> {
         "CFBundleIdentifier",
         &report.metadata.bundle_identifier,
     );
+    set_plist_string(&mut dictionary, "CFBundlePackageType", "APPL");
 
     if let Some(version) = &report.metadata.app_version {
         set_plist_string(&mut dictionary, "CFBundleShortVersionString", version);
@@ -1158,6 +1669,12 @@ impl PackagerConfig {
         }
         self.darwin_dark_mode_support =
             other.darwin_dark_mode_support || self.darwin_dark_mode_support;
+        if other.osx_sign.configured {
+            self.osx_sign = other.osx_sign;
+        }
+        if other.osx_notarize.configured {
+            self.osx_notarize = other.osx_notarize;
+        }
     }
 }
 
@@ -1423,6 +1940,183 @@ mod tests {
         let _ = fs::remove_dir_all(root);
     }
 
+    #[test]
+    fn plans_macos_signing_and_notarization_without_serializing_secrets() {
+        let root = unique_temp_dir("macos-signing-plan");
+        write_package_json(&root);
+        fs::write(root.join("entitlements.plist"), "<plist></plist>")
+            .expect("entitlements should be written");
+        fs::write(root.join("AuthKey_TEST.p8"), "secret api key")
+            .expect("api key should be written");
+        fs::write(
+            root.join("forge.config.js"),
+            r#"
+            module.exports = {
+              packagerConfig: {
+                osxSign: {
+                  identity: 'Developer ID Application: Example, Inc. (TEAMID1234)',
+                  entitlements: 'entitlements.plist',
+                  entitlementsInherit: 'entitlements.plist',
+                  hardenedRuntime: true,
+                  gatekeeperAssess: false,
+                },
+                osxNotarize: {
+                  appleApiKey: 'AuthKey_TEST.p8',
+                  appleApiKeyId: 'SECRET_KEY_ID',
+                  appleApiIssuer: 'SECRET_ISSUER_ID',
+                },
+              },
+            };
+            "#,
+        )
+        .expect("forge config should be written");
+        write_app_file(&root);
+        write_fake_electron_dist(&root);
+
+        let args = PackageArgs {
+            cwd: root.clone(),
+            out_dir: PathBuf::from("out"),
+            name: None,
+            platform: Some("darwin".to_string()),
+            arch: Some("arm64".to_string()),
+            force: false,
+            dry_run: true,
+            json: true,
+        };
+        let snapshot = crate::project::inspect(&root).expect("project should inspect");
+        let report = build_report(snapshot, &args).expect("report should build");
+
+        assert!(report.signing.macos.sign.configured);
+        assert!(report.signing.macos.sign.enabled);
+        assert!(!report.signing.macos.sign.will_execute);
+        assert_eq!(
+            report.signing.macos.sign.method.as_deref(),
+            Some("certificate-identity")
+        );
+        assert_eq!(
+            report.signing.macos.sign.identity.as_deref(),
+            Some("Developer ID Application: Example, Inc. (TEAMID1234)")
+        );
+        assert_eq!(report.signing.macos.sign.hardened_runtime, Some(true));
+        assert_eq!(report.signing.macos.sign.gatekeeper_assess, Some(false));
+        assert_eq!(report.signing.macos.sign.entitlements.len(), 2);
+        assert!(report.signing.macos.notarize.configured);
+        assert_eq!(
+            report.signing.macos.notarize.auth_method.as_deref(),
+            Some("app-store-connect-api-key")
+        );
+        assert!(report
+            .warnings
+            .iter()
+            .any(|warning| warning.contains("Rust-native certificate/keychain signing")));
+        assert!(report
+            .warnings
+            .iter()
+            .any(|warning| warning.contains("Rust-native notarization is not implemented")));
+
+        let json = serde_json::to_string(&report).expect("report should serialize");
+        assert!(!json.contains("SECRET_KEY_ID"));
+        assert!(!json.contains("SECRET_ISSUER_ID"));
+        assert!(!json.contains("secret api key"));
+
+        let _ = fs::remove_dir_all(root);
+    }
+
+    #[test]
+    fn plans_macos_ad_hoc_signing_execution() {
+        let root = unique_temp_dir("macos-ad-hoc-signing-plan");
+        write_package_json(&root);
+        fs::write(
+            root.join("forge.config.js"),
+            r#"
+            module.exports = {
+              packagerConfig: {
+                osxSign: {
+                  identity: '-',
+                  hardenedRuntime: true,
+                },
+              },
+            };
+            "#,
+        )
+        .expect("forge config should be written");
+        write_app_file(&root);
+        write_fake_electron_dist(&root);
+
+        let args = PackageArgs {
+            cwd: root.clone(),
+            out_dir: PathBuf::from("out"),
+            name: None,
+            platform: Some("darwin".to_string()),
+            arch: Some("arm64".to_string()),
+            force: false,
+            dry_run: true,
+            json: true,
+        };
+        let snapshot = crate::project::inspect(&root).expect("project should inspect");
+        let report = build_report(snapshot, &args).expect("report should build");
+
+        assert!(report.signing.macos.sign.configured);
+        assert!(report.signing.macos.sign.enabled);
+        assert!(report.signing.macos.sign.will_execute);
+        assert_eq!(report.signing.macos.sign.method.as_deref(), Some("ad-hoc"));
+        assert_eq!(report.signing.macos.sign.identity.as_deref(), Some("-"));
+        assert_eq!(report.signing.macos.sign.hardened_runtime, Some(true));
+        assert!(!report.warnings.iter().any(|warning| {
+            warning.contains("Rust-native certificate/keychain signing")
+                || warning.contains("Rust-native signing is not implemented")
+        }));
+
+        let _ = fs::remove_dir_all(root);
+    }
+
+    #[test]
+    fn warns_when_macos_notarization_is_configured_without_signing() {
+        let root = unique_temp_dir("notarize-without-sign");
+        write_package_json(&root);
+        fs::write(
+            root.join("forge.config.js"),
+            r#"
+            module.exports = {
+              packagerConfig: {
+                osxSign: false,
+                osxNotarize: {
+                  keychainProfile: 'notary-profile',
+                },
+              },
+            };
+            "#,
+        )
+        .expect("forge config should be written");
+        write_app_file(&root);
+        write_fake_electron_dist(&root);
+
+        let args = PackageArgs {
+            cwd: root.clone(),
+            out_dir: PathBuf::from("out"),
+            name: None,
+            platform: Some("darwin".to_string()),
+            arch: Some("arm64".to_string()),
+            force: false,
+            dry_run: true,
+            json: true,
+        };
+        let snapshot = crate::project::inspect(&root).expect("project should inspect");
+        let report = build_report(snapshot, &args).expect("report should build");
+
+        assert!(report.signing.macos.sign.configured);
+        assert!(!report.signing.macos.sign.enabled);
+        assert_eq!(
+            report.signing.macos.notarize.auth_method.as_deref(),
+            Some("keychain-profile")
+        );
+        assert!(report.warnings.iter().any(|warning| {
+            warning.contains("macOS notarization requires packagerConfig.osxSign")
+        }));
+
+        let _ = fs::remove_dir_all(root);
+    }
+
     #[test]
     fn packages_macos_info_plist_metadata() {
         if current_platform() != "darwin" {
@@ -1478,6 +2172,10 @@ mod tests {
             plist_string(dictionary, "CFBundleIdentifier"),
             Some("com.example.starter")
         );
+        assert_eq!(
+            plist_string(dictionary, "CFBundlePackageType"),
+            Some("APPL")
+        );
         assert_eq!(
             plist_string(dictionary, "CFBundleShortVersionString"),
             Some("2.3.4")
@@ -1501,6 +2199,59 @@ mod tests {
         let _ = fs::remove_dir_all(root);
     }
 
+    #[test]
+    fn packages_macos_bundle_with_ad_hoc_signature() {
+        if current_platform() != "darwin" {
+            return;
+        }
+
+        let root = unique_temp_dir("macos-ad-hoc-signing-execute");
+        fs::write(
+            root.join("package.json"),
+            r#"{"name":"starter-app","version":"0.1.0","main":"src/main.js","devDependencies":{"electron":"30.0.0"},"electronCli":{"packagerConfig":{"appBundleId":"com.example.signed","osxSign":true}}}"#,
+        )
+        .expect("package.json should be written");
+        write_app_file(&root);
+        write_macho_electron_dist(&root);
+
+        let args = PackageArgs {
+            cwd: root.clone(),
+            out_dir: PathBuf::from("out"),
+            name: None,
+            platform: None,
+            arch: None,
+            force: false,
+            dry_run: false,
+            json: false,
+        };
+        let snapshot = crate::project::inspect(&root).expect("project should inspect");
+        let report = build_report(snapshot, &args).expect("report should build");
+
+        assert!(report.signing.macos.sign.will_execute);
+        assert_eq!(report.signing.macos.sign.method.as_deref(), Some("ad-hoc"));
+        assert!(report.warnings.is_empty());
+
+        execute_package(&report, false).expect("package should succeed");
+
+        let bundle_dir = Path::new(report.bundle_dir.as_str());
+        assert!(bundle_dir
+            .join("Contents/_CodeSignature/CodeResources")
+            .exists());
+
+        let executable = bundle_dir
+            .join("Contents/MacOS")
+            .join(&report.executable_name);
+        let executable_data = fs::read(executable).expect("signed executable should read");
+        let macho = apple_codesign::MachFile::parse(&executable_data)
+            .expect("signed executable should parse as Mach-O");
+        assert!(macho.iter_macho().all(|binary| binary
+            .code_signature()
+            .expect("code signature should parse")
+            .is_some()));
+
+        let _ = fs::remove_dir_all(root);
+    }
+
     #[test]
     fn missing_required_runtime_dependency_fails() {
         let root = unique_temp_dir("runtime-deps");
@@ -1654,6 +2405,16 @@ mod tests {
         }
     }
 
+    fn write_macho_electron_dist(root: &Path) {
+        let app = root.join("node_modules/electron/dist/Electron.app/Contents/MacOS");
+        fs::create_dir_all(&app).expect("macOS Electron app should be created");
+        fs::copy(
+            std::env::current_exe().expect("current test executable should resolve"),
+            app.join("Electron"),
+        )
+        .expect("Mach-O test executable should be copied");
+    }
+
     fn unique_temp_dir(label: &str) -> PathBuf {
         let nanos = std::time::SystemTime::now()
             .duration_since(std::time::UNIX_EPOCH)