mirror of
https://github.com/morluto/rea.git
synced 2026-11-05 06:45:22 +00:00
[PR #2040] [MERGED] fix(native): select one slice when universal Mach-O slices share a CPU type #4983
Closed
opened 2026-10-31 00:57:40 +00:00 by bsakaguchi
·
0 comments
No Branch/Tag specified
main
codex/procedure-reference-stacked
release-please--branches--main--components--rea-agents
release-please--branches--main--components--rea-agents--release-notes
codex/kuna-independent-retry
codex/byte-search-overlay-coverage
codex/open-failure-target-receipt
codex/kuna-xref-evidence
codex/ghidra-ambiguous-procedure-recovery
codex/function-source-bundle
codex/trace-function-integration-prototype
codex/snapshot-source-closure
codex/recorded-evidence-array-pages
codex/evidence-recovery-redesign
codex/trace-feature-address-scope
codex/call-discovery-scope
codex/ghidra-literal-candidate-evidence
codex/decompile-directory-independent-retry
codex/retry-provenance-base
codex/value-flow-capability-experiment
codex/ghidra-containing-instruction
cursor/readme-discord-button-ef9f
dependabot/github_actions/actions/setup-node-7.1.0
dependabot/github_actions/actions/upload-artifact-7.0.2
dependabot/npm_and_yarn/npm-minor-and-patch-d8d97ce6df
codex/kuna-1989
fix/8559-native-ui-fixture-ownership
fix/8555-go-verifier-mcp-ownership
codex/provider-capability-recovery
fix/8642-rizin-target-stdin
codex/ghidra-memory-effect-scope
codex/ghidra-annotation-entry-selector
codex/ghidra-readonly-recovery
codex/ghidra-regex-verifier-recovery
codex/evidence-discovery-view-guidance
fix/8545-bulk-append-overflow
fix/8428-navigation-refusal-alternatives
codex/address-context-recovery
codex/matching-member-limitations
codex/unknown-scope-contract
codex/evidence-view-guidance
feat/8373-native-trace-views
codex/ghidra-snapshot-verifier-binding
codex/elf-export-visibility
codex/evidence-view-recovery
codex/native-reference-cli-help
codex/provider-candidate-observation-scope
codex/kuna-session-verification
codex/ghidra-switch-lifetime-guidance
codex/pseudocode-paging-discovery
codex/clarify-evidence-view-support
codex/kuna-xrefs-selector-recovery
codex/context-capacity-recovery
codex/evidence-closure-large-links
codex/same-function-evidence-identity
codex/ghidra-verifier-inspected-jdk
codex/audit-guided-workflows
codex/crash-prompt-retained-dossiers
codex/analysis-view-error-recovery
codex/kuna-verifier-target-selection
codex/ghidra-selected-project-call-coverage
codex/docs-native-analysis-scope
codex/ghidra-java-socket-boundary
codex/ghidra-retained-snapshot-verifier
codex/ghidra-search-inventory-facts
fix/8284-zero-argument-parameter-bindings
fix/8198-ui-action-handler-offset
fix/8257-elf-entry-label-identity
fix/8304-deferred-output-schema-projection
fix/8277-call-path-computed-target-uncertainty
fix/pr-8089-conflicts
fix/ci-static-duplicate-export
dependabot/npm_and_yarn/lint-staged-17.6.0
dependabot/github_actions/actions/download-artifact-8.0.2
dependabot/npm_and_yarn/write-file-atomic-8.0.0
dependabot/npm_and_yarn/canonicalize-5.1.0
dependabot/github_actions/actions/cache/restore-6.1.0
dependabot/npm_and_yarn/toon-format/toon-4.4.0
dependabot/github_actions/actions/deploy-pages-5.0.1
codex/review-fixes-pr-2403
codex/review-fixes-pr-2400
codex/process-terminal-width
codex/test-brittleness-cleanup
verify/7167-browser-connect-macos
fix/7167-browser-connect
feat/native-matching-allowance-setting
feat/browser-scenario-dry-run
test/managed-caller-parameters-20261024
codex/parser-fortythird-boundaries
fix/6926-pinvoke-platform-decorations-20261023
fix/6889-har-body-encoding-20261023
fix/6888-sqlite-schema-budget-20261023
fix/dependency-security-gates-6708
cursor/evidence-overwrite-rebase-b4ac
feat/4057-verify-native-exports
fix/windows-acl-observer-overhead-20261022
cursor/erlang-beam-restack-4476
cursor/pe-certificate-review-bf32
fix/6116-javascript-application-fs-errors
fix/6061-unmapped-runtime-script-unknown
feat/browser-scenario-summary
fix/pe-certificates
codex/verify-3407
cursor/rebase-5699
cursor/rebase-5352
cursor/rebase-5600
cursor/fix-cli-schema-omission-10a8
codex/audit-hopper-shutdown-reasons-20261021
fix/demangle-swift-omitted-record
fix/nib-boolean-value-types
cursor/cancellation-partial-observation-a5ac
fix/ib-object-limit-reasons
fix/electron-fuse-limit-advice
fix/kuna-doctor-dangling-cache
fix/fixed-budget-refusal-advice
fix/js-ipc-listener-dedup
fix/js-return-member-provenance
fix/dmg-integrity-retry-advice
fix/ida-doctor-readiness
fix/kuna-version-probe-output-drain
fix/legacy-swift-runtime-name-matching
fix/dylib-lazy-load-commands
fix/browser-scenario-startup-cancel
fix/swift-nested-punycode-classification
fix/compare-unselected-scopes
fix/objc-method-budget-coverage
fix/dmg-mounted-root-observations
audit/ci-tests-20261019-round2
release/6.7.0
fix/wabt-cleanup-retry-resolution
fix/electron-fuse-elf-pe-architecture
fix/native-plist-descriptor-ownership
fix/kuna-caller-cleanup-ownership
experiment/atomic-codemode-20261016
review/first-contributor-3776
fix/call-resolution-full-read-cycles
fix/member-mutation-selection-repeat
experiment/atomic-re-tools-20261015
perf/member-mutation-lazy-origins
perf/static-network-mutation-index
fix/hopper-startup-lifecycle
audit/3050-windows-proof-20261015
feat/windows-window-capture-2183
audit/3049-windows-proof-20261015
audit/3735-macos-fixtures-20261015
fix/batch-decompile-null-pseudocode
fix/kuna-inventory-honors-jobs
experiment/browser-codemode-tool-design-20261015
fix/hopper-clean-runtime-argv
codex/review-2049-27f1b367
review-fixes/pr-2787-routing
fix/3360-scoped-this-emitters
fix/3367-replaced-global-effects
fix/3838-compact-any-value-items
test/hopper-download-probe-20261015
codex/windows-runtime-creation-red-green-20261015
codex/windows-readonly-root-red-green-20261015
codex/windows-root-share-red-green-20261015
codex/exp-1685-win-mcp-startup
codex/bug-sweep-20261015
investigate/2190-windows-package-phases
investigate/3543-macos-cli-deadline
perf/3281-reverse-tools-feedback-quality
fix/3406-hopper-doctor-fixture
fix/3341-wrapper-require-test-context
fix/3301-owned-uninstall-fixtures
fix/3164-compiler-input-ownership
fix/pcap-cleanup-stdout-newline-20261014
perf/interface-builder-summary
codex/review-fixes-pr-1977
fix/ghidra-effective-jvm-platform
fix/docs-turkish-rust-link-20261013
fix/main-maintenance-ci-20261010
fix/recover-binary-session-process-effects
codex/review-fixes-pr-2457
codex/ci-required-cancellation-gate
fix/main-format-baseline-20261013
fix/setup-preserve-entry-fields
cursor/restore-main-checks-1ffc
fix/ghidra-bridge-hashmap-import
codex/shared-ci-jadx-json-default-20261013
codex/shared-ci-ghidra-test-groups-20261013
codex/shared-ci-java-fixture-format-20261013
codex/fix-intrinsic-invocation-boundaries
test/release-preflight-reusable-jobs
test/js-parameter-provenance-expectation
fix/linux-hopper-verification-current
test/2419-ghidra-elf-probe-size
followup/pr-1544-native-ida
codex/fold-pr-2230-contribution
docs/readme-responsible-use
fix/issue-2064
fix/issue-2050
fix/issue-2053
fix/issue-1968
fix/issue-1945
experiment/codemode-bridge-20261011
fix/tool-effects-negative-wording-1904-20261012
fix/1842-electron-interop-provenance
feat/recover-javascript-multi-input
refactor/website-i18n-prep
fix/nativeaot-pe-virtual-extent
fix/browser-verifier-ci-hang
fix/pe-resources-input-selection
docs/beginner-friendly-guides
docs/beginner-setup-guide
fix/javascript-analysis-worker-1563
fix/1649-ghidra-duplicate-names
fix/javascript-export-keys-integration-1369
test/maintenance-boundary-contracts-20261011
review/javascript-export-keys-1369
review/process-live-progress-1483
test/javascript-1495-growth-ratio
fix/ci-escape-timing
docs/normalized-terminal-geometry-1450
release/6.3.0
archive/release-6.3.0-pr1381
release/6.2.0
fix/electron-preload-dynamic-override
fix/javascript-self-referential-bundler-edges
release/6.1.0
cursor/grok-client-cherry-pick-0b56
feat/signature-posture
feat/dyld-shared-cache
feat/artifact-integrity-policy
feat/pkg-inventory
release/6.0.0
chore/sync-release-5.0.0
release/5.0.0
cursor/cloud-agent-node-787e
fix/javascript-xhr-open-endpoints
review/pr-711-realpath-fallback-wording
cleanup/replay-confinement
codex/test-suite-performance
codex/issue-foundations
codex/address-open-issues-2026-07-20
agent/javascript-vite-rollup-esbuild-adapters
agent/process-cleanup
agent/triage-integration
agent/unknown-commands-registry
feat/mcp-identity-metadata
morlvps/issue_cleanup
codex/installer-redesign
morl/roadmap-investigation-core
morl/roadmap-investigation-docs
release-please--branches--main--components--rea
rea-agents-6.8.0
rea-agents-6.7.0
rea-agents-6.6.0
experiment/atomic-codemode-wait-runtime-20261016
rea-agents-6.5.0
rea-agents-6.4.0
rea-agents-6.3.0
rea-agents-6.2.0
rea-agents-6.1.0
rea-agents-6.0.0
rea-agents-5.0.0
rea-agents-4.1.0
rea-agents-4.0.1
rea-agents-4.0.0
rea-agents-3.2.1
rea-agents-3.2.0
rea-agents-3.1.0
rea-agents-3.0.0
rea-agents-2.7.0
rea-agents-2.6.0
rea-agents-2.5.1
rea-agents-2.5.0
rea-agents-2.4.0
rea-agents-2.3.0
rea-agents-2.2.0
rea-agents-2.1.0
rea-agents-2.0.0
rea-agents-1.7.0
rea-agents-1.6.0
rea-agents-1.5.0
rea-agents-1.4.0
rea-agents-1.3.0
rea-agents-1.2.0
rea-agents-1.1.0
rea-agents-1.0.0
rea-agents-0.5.0
rea-agents-0.4.0
rea-agents-0.3.0
rea-0.2.1
rea-0.2.0
Labels
Clear labels
area: bridge
area: bridge
area: build
area: build
area: build
area: cli
area: domain
area: evidence
area: mcp
area: native
area: providers
area: runtime
area: server
area: setup
area: tests
bug
design
documentation
enhancement
enhancement
enhancement
experiment
help wanted
i18n
invalid
P0: critical
P1: high
P2: medium
P2: medium
P2: medium
P3: low
performance
provider-request
pull-request
Mirrored from GitHub Pull Request
question
roadmap
triage
No labels
area: bridge
area: bridge
area: build
area: build
area: build
area: cli
area: domain
area: evidence
area: mcp
area: native
area: providers
area: runtime
area: server
area: setup
area: tests
bug
design
documentation
enhancement
enhancement
enhancement
experiment
help wanted
i18n
invalid
P0: critical
P1: high
P2: medium
P2: medium
P2: medium
P3: low
performance
provider-request
pull-request
question
roadmap
triage
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".
No due date set.
Dependencies
No dependencies set.
Reference
morluto/rea#4983
Loading…
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "%!s()"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
📋 Pull Request Information
Original PR: https://github.com/morluto/rea/pull/2040
Author: @hemanthrayuduu
Created: 10/12/2026
Status: ✅ Merged
Merged: 10/13/2026
Merged by: @morluto
Base:
main← Head:fix/macho-same-cpu-slices📝 Commits (4)
9c74fbafix(native): select one slice when universal Mach-O slices share a CPU type59d18f8fix(native): share Mach-O slice preference across inspectionsbf14a31chore: merge main into Mach-O slice selection branch7456d81chore: preserve upstream process capture test during merge📊 Changes
9 files changed (+328 additions, -59 deletions)
View changed files
📝
src/native/AppleMachoSelection.test.ts(+47 -1)📝
src/native/AppleMachoSelection.ts(+34 -23)➕
src/native/MachoArchitectureSelection.ts(+54 -0)📝
src/native/NativeMachoInspection.test.ts(+58 -0)📝
src/native/NativeMachoInspection.ts(+18 -15)📝
tests/boundary/providers/native/nativeSelectedArchitecture.test.ts(+64 -20)➕
tests/fixtures/native-macos/lipo-same-cpu/README.md(+19 -0)➕
tests/fixtures/native-macos/lipo-same-cpu/calculator.txt(+17 -0)➕
tests/fixtures/native-macos/lipo-same-cpu/shortcut-droplet.txt(+17 -0)📄 Description
Summary
On macOS 27, most system binaries are universal files whose slices all have
CPU_TYPE_ARM64. Calculator and TextEdit are arm64e + arm64e.x1,/bin/lsis x86_64 + arm64e + arm64e.x1, and ShortcutDroplet is arm64 + arm64e.x1. Target admission names slices by CPU family, so these targets getavailableArchitectures: ["arm64"]even though the file holds two arm64 slices. Two native tools treated that one-entry family list as if it were the slice list:inspect_machodecided the file needed no-archand ran otool, nm, dyld_info, dwarfdump and vtool against both slices. ShortcutDroplet fails outright, and Calculator returns both slices' data mixed into one result.inspect_native_dispatch_metadatamatched FAT slices by CPU type alone and refuses/bin/lsand TextEdit as "Ambiguous FAT architecture slice".After this change, both tools pick exactly one slice, using the same preference order.
I didn't open an issue first. I found this while checking the other arm64e.x1 paths after #1765. That issue's naming fix landed in
f598bab, and #1772 covers its dyld-resolution side. Neither touches the two functions changed here.Problem and expected behavior
Smallest trigger:
rea inspect-macho /System/Library/CoreServices/ShortcutDroplet.app/Contents/MacOS/ShortcutDroplet. lipo lists two slices,arm64andarm64e.x1. Because the target has one CPU family,selectArchitecturereturned "unfiltered" and otool printed both slices. The parser then rejected 40 load commands againstncmds 20.The broken invariant: a slice tool must get
-archwhenever the file holds more than one slice. One slice per CPU family isn't guaranteed. Likewise,selectMachoSliceshould choose one slice when several share the requested CPU type, the way lipo's family names do, and report ambiguity only for slices it really can't tell apart.Change and scope
src/native/NativeMachoInspection.ts:selectArchitecturenow also filters when lipo listed more than one slice. Before, it only checked the family count. The existing preference is unchanged: the exact family name, thenarm64e, then the firstarm64e.<variant>. I kept the family check as well, so a file whose header has two families but whose lipo output lists fewer still gets today's "lipo did not list X" refusal. It doesn't fall back to an unfiltered run.src/native/AppleMachoSelection.ts:selectMachoSliceranks slices of the requested CPU type by base subtype, with the capability byte masked off. The order is arm64 (0, then 1) or x86_64 (3), then arm64e (2), then any other variant (arm64e.x1 is 12, x86_64h is 8) in FAT table order. It still throws "Ambiguous FAT architecture slice" when the top-ranked slices share a base subtype. So the identical-entry FAT64 test inAppleDispatchMetadata.test.tspasses unchanged.On the four binaries above, both tools now read the same slice: arm64e for Calculator, TextEdit and
/bin/ls, and arm64 for ShortcutDroplet.I fixed the slice decision in these two functions rather than admission. BinaryTarget's family grouping is intentional (see the comment in
selectArchitecture), and lipo and the FAT table are where the slice facts come from. Ghidra admission has the same root cause (below), so I've left it for a separate change.Not included:
src/ghidra/GhidraProvider.ts, theavailableArchitectures.length > 1check). An arm64e + arm64e.x1 file reports one CPU family, so it gets past the "analyze a thinned Mach-O slice instead" refusal, which then never fires for it. Testing a fix needs a real Ghidra, which I don't have set up.NativeMacOSProvider.ts(around line 997) doesn't acceptarm64e.x1.endianis alwaysnullon real universal binaries, becausefile -bdoesn't print an endianness for them.machoCpuSubtypeBasehelper. This PR keeps a local mask so the two don't conflict. Whichever lands second can switch over.Contract and boundary impact
selectArchitecture(tool arguments forinspect_macho) andselectMachoSlice(FAT selection for dispatch metadata). Admission and BinaryTarget are unchanged.inspect_machonow fillsselected_architecture, andinspect_native_dispatch_metadatareturns a result instead of an execution failure.inspect_machoevidence for these files now describes one slice. The provenance shows the-archarguments, and slice-based evidence locations now appear (Calculator has 7 locations, up from 2), with the "selected Mach-O slice is unknown" limitation gone.-archor--arch=added. Nothing else changes.docs/public/product-catalog.json), package, or installation impact: none.Evidence and regression coverage
Tests added or updated:
tests/boundary/providers/native/nativeSelectedArchitecture.test.ts: I moved the existing "fail any slice command without the expected-arch" runner into a shared helper and added two cases that use reallipo -detailed_infocaptures from Calculator and ShortcutDroplet, with the target set toavailableArchitectures: ["arm64"]as admission produces. The captures and their provenance are intests/fixtures/native-macos/lipo-same-cpu/.src/native/AppleMachoSelection.test.ts: FAT fixtures with the real macOS 27 subtypes. arm64e (0x80000002) + arm64e.x1 (0x8000000c) and arm64 (0x0) + arm64e.x1 run in both orders, plus the/bin/lslayout and x86_64h + x86_64. An arm64e + arm64e duplicate must still be reported as ambiguous.Base reproduction or other evidence: with only the tests applied on top of
ee50ed1,npm run test:focusedon the two test files gave 8 failed, 18 passed. The 6 selection cases threw "Ambiguous FAT architecture slice", and the 2 real-capture cases failed because otool ran without-arch. The duplicate case and the refactored existing cases passed.User-visible CLI/MCP output:
node scripts/rea.mjs <command> <path> --format jsonon macOS 27.0.1 (26A434), arm64, built fromee50ed1before the change and from this branch after it:inspect-machoShortcutDropletunreadable_output: "Malformed otool load-command output" (2 Mach headers, 40 load commands,ncmds20 each)selected_architecture{ name: "arm64", container_file_offset: 16384 }, 20 load commands, every slice tool ran with-arch arm64inspect-machoCalculatorselected_architecture{ name: null, container_file_offset: null }, 4138 imports, and 2 of 3 exports were nm's… (for architecture arm64e):/(… arm64e.x1):header lines{ name: "arm64e", container_file_offset: 16384 }, 2069 imports, 1 export (__mh_execute_header)inspect-native-dispatch-metadata/bin/lsDYLD_CHAINED_PTR_ARM64Einspect-native-dispatch-metadataTextEditTextEdit's Swift conformance and vtable coverage is
partial, because of decoder limits that have nothing to do with slice selection. It was never reached before this change, since the run failed earlier.Remaining proof gaps:
arm64v8) rank right after plain arm64 in the dispatch selector. inspect_macho's name matching has noarm64v8rule, so the two selectors could still disagree on such a file. I didn't try to find one.endianitems above remain open.For evidence-bearing changes:
Validation performed
All runs used Node 24.18.0 and npm 11.16.0 on macOS 27.0.1, arm64.
npm ci: installed.npm run test:focused -- src/native/AppleMachoSelection.test.ts tests/boundary/providers/native/nativeSelectedArchitecture.test.tswith only the tests applied onee50ed1: 8 failed, 18 passed (described above).npm run test:focused -- src/native/AppleMachoSelection.test.ts tests/boundary/providers/native/nativeSelectedArchitecture.test.ts src/native/AppleDispatchMetadata.test.ts src/native/NativeMachoInspection.test.ts tests/boundary/providers/native/nativeProvider.test.ts tests/boundary/providers/native/nativeMachoHeader.golden.test.ts tests/boundary/cli/nativeMachoEchoedPathCli.test.ts: 7 files, 97 tests passed.npx vitest run src/native tests/boundary/providers/native src/artifacts/apple src/domain/apple tests/boundary/cli/nativeMacho: 55 files, 518 tests passed.npm run test:fast: 392 files, 5035 passed, 7 skipped.npm run check:fast: passed.npm run check: passed (typecheck, lint and module boundaries, format check, knip, metadata, architecture guards).npm run verify:test-discovery: "Discovered all 901 test files exactly once."git diff --check: clean.npm run build:cached: passed.I didn't run
npm run docs:checkornpm run check:pr, since no contracts, docs or generated metadata changed.Compatibility, safety, and release
-archargument.Review checklist
type(scope): outcome.🤖 Generated with Claude Code
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.