Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

fix(desktop): allow camera and microphone in the macOS app (#8577)

Eric Hayesedf2ef4aea13
diff --git a/apps/web/tauri/desktop-cef/AGENTS.md b/apps/web/tauri/desktop-cef/AGENTS.md
index 320cb7065a..269e5f7232 100644
--- a/apps/web/tauri/desktop-cef/AGENTS.md
+++ b/apps/web/tauri/desktop-cef/AGENTS.md
@@ -48,7 +48,9 @@ thin binary over `../src-tauri` (`app_lib::run_with`) that selects
framework and helper apps from macOS bundles.
- Keep `entitlements.plist` on the CEF config and the Nix DMG signing step. The
release signs the unsigned Nix app after bundling, and Chromium needs the JIT
- entitlements under the hardened runtime.
+ entitlements under the hardened runtime. Calls and dictation need its camera
+ and audio-input entitlements, plus the usage descriptions in
+ `../src-tauri/icons/macos/Info.plist`; without either, macOS refuses capture.
- Keep `tauri.conf.json` aligned with `../src-tauri/tauri.conf.json` and
`tauri.macos.conf.json`: the CLI bundles from this file, while the app's
runtime config still comes from `../src-tauri`.
diff --git a/apps/web/tauri/desktop-cef/entitlements.plist b/apps/web/tauri/desktop-cef/entitlements.plist
index f2eb2ecb0a..daf3f433e5 100644
--- a/apps/web/tauri/desktop-cef/entitlements.plist
+++ b/apps/web/tauri/desktop-cef/entitlements.plist
@@ -2,6 +2,10 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
+ <key>com.apple.security.device.audio-input</key>
+ <true/>
+ <key>com.apple.security.device.camera</key>
+ <true/>
<key>com.apple.security.cs.allow-jit</key>
<true/>
<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
diff --git a/apps/web/tauri/src-tauri/README.md b/apps/web/tauri/src-tauri/README.md
index cc6f667d0c..5c82e78b59 100644
--- a/apps/web/tauri/src-tauri/README.md
+++ b/apps/web/tauri/src-tauri/README.md
@@ -11,7 +11,8 @@ Only desktop icons carry the ALPHA badge; iOS and Android icons are unbadged.
The macOS icon uses the badged artwork in the Icon Composer source
`icons/macos/Macro.icon`; this artwork is no longer copied from iOS. The macOS-only
Tauri configuration bundles its compiled `Assets.car` and `Macro.icns`, and
-merges the generated icon names into Info.plist. Tahoe uses the icon
+declares the icon names in the hand-maintained `icons/macos/Info.plist`, which
+the script below does not overwrite. Tahoe uses the icon
composition; older macOS uses the generated fallback. The artwork has no
baked-in rounded tile or transparent border for macOS to place inside another
enclosure.
diff --git a/apps/web/tauri/src-tauri/icons/macos/Info.plist b/apps/web/tauri/src-tauri/icons/macos/Info.plist
index 255cc15e4a..9040487348 100644
--- a/apps/web/tauri/src-tauri/icons/macos/Info.plist
+++ b/apps/web/tauri/src-tauri/icons/macos/Info.plist
@@ -10,5 +10,9 @@
<array>
<string>INSendMessageIntent</string>
</array>
+ <key>NSCameraUsageDescription</key>
+ <string>Macro uses the camera for video calls.</string>
+ <key>NSMicrophoneUsageDescription</key>
+ <string>Macro uses the microphone for calls and dictation.</string>
</dict>
</plist>
diff --git a/apps/web/tauri/src-tauri/icons/macos/regenerate.sh b/apps/web/tauri/src-tauri/icons/macos/regenerate.sh
index ab04252708..ea280c4920 100644
--- a/apps/web/tauri/src-tauri/icons/macos/regenerate.sh
+++ b/apps/web/tauri/src-tauri/icons/macos/regenerate.sh
@@ -13,4 +13,6 @@ xcrun actool "$icon_dir/Macro.icon" \
--output-partial-info-plist "$output_dir/Info.plist" \
--output-format human-readable-text
-cp "$output_dir/Assets.car" "$output_dir/Macro.icns" "$output_dir/Info.plist" "$icon_dir/"
+# Info.plist holds hand-written keys (usage descriptions, activity types), so
+# it is not regenerated; keep its CFBundleIcon* keys in step with --app-icon.
+cp "$output_dir/Assets.car" "$output_dir/Macro.icns" "$icon_dir/"