fix(computer-use): 修复权限检查和应用列表获取的问题#157
Open
mcjjin wants to merge 4 commits intoclaude-code-best:mainfrom
Open
fix(computer-use): 修复权限检查和应用列表获取的问题#157mcjjin wants to merge 4 commits intoclaude-code-best:mainfrom
mcjjin wants to merge 4 commits intoclaude-code-best:mainfrom
Conversation
修复 macOS 平台下权限检查的 JXA 回退逻辑，确保在没有原生模块时仍能正确检测权限 改进应用列表获取方式，使用 mdls 获取真实的 bundleId 而非生成伪 ID
📝 WalkthroughWalkthroughThis pull request updates the macOS computer-use backend to improve application discovery and permission handling. The app enumeration now scans multiple standard directories and retrieves bundle identifiers via Spotlight metadata instead of AppleScript. Permission checks add JXA-based fallback probes when the native Swift module is unavailable, and the hotkey module access is now protected with optional chaining. Changes
Estimated Code Review Effort🎯 3 (Moderate) | ⏱️ ~25 minutes Possibly Related PRs
Suggested Reviewers
Poem
🚥 Pre-merge checks | ✅ 2 | ❌ 1❌ Failed checks (1 inconclusive)
✅ Passed checks (2 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 2
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In `@packages/`@ant/computer-use-swift/src/backends/darwin.ts:
- Around line 166-172: The current scan only matches "*.app" at the top level
and misses nested app bundles; update the command built for Bun.spawn (where
proc is created using expanded from dirs) to recursively find .app bundles
(e.g., use find "${expanded}" -type d -name '*.app' -print0 and iterate over
results) so nested apps like /System/Applications/Utilities/Terminal.app are
included; adjust the parsing logic that reads each result (the code that
extracts path, name, and bundle id) to handle the find output (null-separated or
newline-separated) and continue populating allApps/InstalledApp entries
accordingly.
- Around line 171-179: The current loop sets displayName from the bundle
directory name (basename "$f"), which breaks matching against
InstalledApp.displayName; update the shell pipeline in the for loop that builds
each line so it extracts a localized display name from bundle metadata (e.g.,
use mdls -name kMDItemDisplayName or fall back to
kMDItemCFBundleName/kMDItemDisplayName extraction) and only use basename "$f"
when no metadata display name is present, then keep using the parsed displayName
variable when pushing into allApps (refer to the for (...) command that defines
path|displayName|bundleId and the allApps.push({ bundleId, displayName, path })
code).
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: defaults
Review profile: CHILL
Plan: Pro
Run ID: fafb91a5-1337-4678-aebf-7425e0816b37
⛔ Files ignored due to path filters (1)
contributors.svgis excluded by!**/*.svg
📒 Files selected for processing (3)
packages/@ant/computer-use-swift/src/backends/darwin.tssrc/utils/computerUse/escHotkey.tssrc/utils/computerUse/hostAdapter.ts
Comment on lines
+166
to
+172
| const dirs = ['/Applications', '~/Applications', '/System/Applications'] | ||
| const allApps: InstalledApp[] = [] | ||
| for (const dir of dirs) { | ||
| const expanded = dir.startsWith('~') ? join(process.env.HOME ?? '~', dir.slice(1)) : dir | ||
| const proc = Bun.spawn( | ||
| ['bash', '-c', `for f in "${expanded}"/*.app; do [ -d "$f" ] || continue; bid=$(mdls -name kMDItemCFBundleIdentifier "$f" 2>/dev/null | sed 's/.*= "//;s/"//'); name=$(basename "$f" .app); echo "$f|$name|$bid"; done`], | ||
| { stdout: 'pipe', stderr: 'pipe' }, |
There was a problem hiding this comment.
Scan nested app folders too.
Line 171 only matches *.app directly under each root. That misses common locations like /System/Applications/Utilities/Terminal.app and vendor subfolders under /Applications, so those apps never reach listInstalled() and cannot be granted/launched later.
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In `@packages/`@ant/computer-use-swift/src/backends/darwin.ts around lines 166 -
172, The current scan only matches "*.app" at the top level and misses nested
app bundles; update the command built for Bun.spawn (where proc is created using
expanded from dirs) to recursively find .app bundles (e.g., use find
"${expanded}" -type d -name '*.app' -print0 and iterate over results) so nested
apps like /System/Applications/Utilities/Terminal.app are included; adjust the
parsing logic that reads each result (the code that extracts path, name, and
bundle id) to handle the find output (null-separated or newline-separated) and
continue populating allApps/InstalledApp entries accordingly.
Comment on lines
+171
to
+179
| ['bash', '-c', `for f in "${expanded}"/*.app; do [ -d "$f" ] || continue; bid=$(mdls -name kMDItemCFBundleIdentifier "$f" 2>/dev/null | sed 's/.*= "//;s/"//'); name=$(basename "$f" .app); echo "$f|$name|$bid"; done`], | ||
| { stdout: 'pipe', stderr: 'pipe' }, | ||
| ) | ||
| const text = await new Response(proc.stdout).text() | ||
| await proc.exited | ||
| for (const line of text.split('\n').filter(Boolean)) { | ||
| const [path, displayName, bundleId] = line.split('|', 3) | ||
| if (path && displayName && bundleId && bundleId !== '(null)') { | ||
| allApps.push({ bundleId, displayName, path }) |
There was a problem hiding this comment.
Don't use the bundle directory name as displayName.
resolveRequestedApps() in packages/@ant/computer-use-mcp/src/toolCalls.ts, Lines 791-830 matches user requests against InstalledApp.displayName. Using basename "$f" here changes that field to the filesystem name, so localized/system apps can stop matching what the user actually sees. Populate displayName from bundle metadata and only fall back to the basename when metadata is missing.
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In `@packages/`@ant/computer-use-swift/src/backends/darwin.ts around lines 171 -
179, The current loop sets displayName from the bundle directory name (basename
"$f"), which breaks matching against InstalledApp.displayName; update the shell
pipeline in the for loop that builds each line so it extracts a localized
display name from bundle metadata (e.g., use mdls -name kMDItemDisplayName or
fall back to kMDItemCFBundleName/kMDItemDisplayName extraction) and only use
basename "$f" when no metadata display name is present, then keep using the
parsed displayName variable when pushing into allApps (refer to the for (...)
command that defines path|displayName|bundleId and the allApps.push({ bundleId,
displayName, path }) code).
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
修复 macOS 平台下权限检查的 JXA 回退逻辑，确保在没有原生模块时仍能正确检测权限
改进应用列表获取方式，使用 mdls 获取真实的 bundleId 而非生成伪 ID
Summary by CodeRabbit
Release Notes