fix(desktop): exclude opposite-arch Darwin node-pty prebuild from mac packages - #53

Merged
buluma merged 1 commit into
mainfrom
fix/desktop-mac-node-pty-arch-exclusion
Sep 2, 2026
Merged

fix(desktop): exclude opposite-arch Darwin node-pty prebuild from mac packages#53
buluma merged 1 commit into
mainfrom
fix/desktop-mac-node-pty-arch-exclusion

Conversation

@buluma

@bulumabuluma commented Sep 2, 2026

Copy link
Copy Markdown
Owner

node-pty ships prebuilt pty.node/spawn-helper binaries for both darwin-x64 and darwin-arm64 in the same package. A single-architecture mac build only ever loads its own arch's prebuild, but electron-builder's static files list had no way to know that, so the opposite-arch prebuild rode along and macOS flagged the arm64 app as containing Intel-only nested binaries.

Adds resolveMacFileExclusions(arch) and threads arch into createBuildConfig, scoped to platform === "mac" — universal builds (and any caller that omits arch) keep both prebuilds, unchanged from before.

Ported from pingdotgg/t3code#9240.

Windows ships the same opposite-arch bloat (win32-x64/win32-arm64) but that's out of scope for this PR.

Testing

  • vp test run scripts/build-desktop-artifact.test.ts — 32/32 pass, including two new tests covering the resolver and the wired-through createBuildConfig output
  • tsc --noEmit on scripts, vp lint — both clean

Summary by CodeRabbit

  • Bug Fixes
    • Improved macOS desktop builds by excluding incompatible node-pty binaries for the selected architecture.
    • Added support for correct exclusions in universal macOS builds.
    • Increased verification of architecture-specific file lists and signed macOS build configurations.

… packages
node-pty ships prebuilt pty.node/spawn-helper binaries for both darwin-x64
and darwin-arm64 in the same package. A single-architecture mac build only
loads its own arch's prebuild, but electron-builder's static files list had
no way to know that, so the opposite-arch prebuild rode along and macOS
flagged the arm64 app as containing Intel-only nested binaries.
Add resolveMacFileExclusions(arch), thread arch into createBuildConfig, and
scope the exclusion to platform === "mac" so universal builds (and any
caller that omits arch) keep both prebuilds unchanged. Windows ships the
same opposite-arch bloat but is out of scope here.
Ported from pingdotgg/t3code#9240.
@coderabbitai

coderabbitaiBot commented Sep 2, 2026

Copy link
Copy Markdown

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Team

Run ID: f9c666d6-2160-43b3-b33c-4b22afef4e63

📥 Commits

Reviewing files that changed from the base of the PR and between 3c9cf9c and 214d89c.

📒 Files selected for processing (2)
  • scripts/build-desktop-artifact.test.ts
  • scripts/build-desktop-artifact.ts

Included review availability: Your plan provides up to 8 included reviews per hour; 7 remain after this review.


📝 Walkthrough

Walkthrough

The desktop build configuration now accepts an architecture and excludes opposite-architecture macOS node-pty prebuilds. Tests cover arm64, x64, universal macOS builds, and existing signed, Linux, and Windows configurations.

Changes

Desktop artifact architecture handling

Layer / File(s)Summary
Architecture-specific exclusion resolution
scripts/build-desktop-artifact.ts
createBuildConfig now receives the target architecture and appends the matching macOS node-pty exclusion. Staged builds pass options.arch.
Configuration and integration tests
scripts/build-desktop-artifact.test.ts
Tests verify opposite-architecture exclusions for arm64 and x64 builds, no architecture-specific exclusions for universal builds, and explicit architectures for other build configurations.

Estimated code review effort: 2 (Simple) | ~10 minutes

Merge Risk:⚪ Minimal · up to 214d8

The change narrowly excludes opposite-architecture Darwin binaries from single-architecture macOS packages while preserving universal-build behavior; no actionable merge-blocking risk remains after normal checks and review.

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check nameStatusExplanation
Title check✅ PassedThe title clearly identifies the primary change: excluding opposite-architecture Darwin node-pty prebuilds from macOS packages.
Description check✅ PassedThe description clearly explains what changed, why it changed, the scope limits, and the test results. It omits the template headings and checklist, but it provides the required information and remain…
Docstring Coverage✅ PassedDocstring coverage is 100.00% which is sufficient. The required threshold is 80.00%. Docstring coverage is scoped to functions touched by this diff. Analyzed 1 functions across 2 files.
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.
Full details: Description check

Explanation

The description clearly explains what changed, why it changed, the scope limits, and the test results. It omits the template headings and checklist, but it provides the required information and remains focused.

✨ Finishing Touches
📝 Generate docstrings
  • Create stacked PR
  • Commit on current branch
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch fix/desktop-mac-node-pty-arch-exclusion

Comment @coderabbitai help to get the list of available commands.

@buluma
buluma merged commit a862909 into mainSep 2, 2026
16 checks passed
@buluma
buluma deleted the fix/desktop-mac-node-pty-arch-exclusion branch September 2, 2026 23:29
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@buluma
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

fix(desktop): exclude opposite-arch Darwin node-pty prebuild from mac packages - #53

Merged
buluma merged 1 commit into
mainfrom
fix/desktop-mac-node-pty-arch-exclusion
Sep 2, 2026
Merged

fix(desktop): exclude opposite-arch Darwin node-pty prebuild from mac packages#53
buluma merged 1 commit into
mainfrom
fix/desktop-mac-node-pty-arch-exclusion

Conversation

@buluma

@bulumabuluma commented Sep 2, 2026

Copy link
Copy Markdown
Owner

node-pty ships prebuilt pty.node/spawn-helper binaries for both darwin-x64 and darwin-arm64 in the same package. A single-architecture mac build only ever loads its own arch's prebuild, but electron-builder's static files list had no way to know that, so the opposite-arch prebuild rode along and macOS flagged the arm64 app as containing Intel-only nested binaries.

Adds resolveMacFileExclusions(arch) and threads arch into createBuildConfig, scoped to platform === "mac" — universal builds (and any caller that omits arch) keep both prebuilds, unchanged from before.

Ported from pingdotgg/t3code#9240.

Windows ships the same opposite-arch bloat (win32-x64/win32-arm64) but that's out of scope for this PR.

Testing

  • vp test run scripts/build-desktop-artifact.test.ts — 32/32 pass, including two new tests covering the resolver and the wired-through createBuildConfig output
  • tsc --noEmit on scripts, vp lint — both clean

Summary by CodeRabbit

  • Bug Fixes
    • Improved macOS desktop builds by excluding incompatible node-pty binaries for the selected architecture.
    • Added support for correct exclusions in universal macOS builds.
    • Increased verification of architecture-specific file lists and signed macOS build configurations.

… packages
node-pty ships prebuilt pty.node/spawn-helper binaries for both darwin-x64
and darwin-arm64 in the same package. A single-architecture mac build only
loads its own arch's prebuild, but electron-builder's static files list had
no way to know that, so the opposite-arch prebuild rode along and macOS
flagged the arm64 app as containing Intel-only nested binaries.
Add resolveMacFileExclusions(arch), thread arch into createBuildConfig, and
scope the exclusion to platform === "mac" so universal builds (and any
caller that omits arch) keep both prebuilds unchanged. Windows ships the
same opposite-arch bloat but is out of scope here.
Ported from pingdotgg/t3code#9240.
@coderabbitai

coderabbitaiBot commented Sep 2, 2026

Copy link
Copy Markdown

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Team

Run ID: f9c666d6-2160-43b3-b33c-4b22afef4e63

📥 Commits

Reviewing files that changed from the base of the PR and between 3c9cf9c and 214d89c.

📒 Files selected for processing (2)
  • scripts/build-desktop-artifact.test.ts
  • scripts/build-desktop-artifact.ts

Included review availability: Your plan provides up to 8 included reviews per hour; 7 remain after this review.


📝 Walkthrough

Walkthrough

The desktop build configuration now accepts an architecture and excludes opposite-architecture macOS node-pty prebuilds. Tests cover arm64, x64, universal macOS builds, and existing signed, Linux, and Windows configurations.

Changes

Desktop artifact architecture handling

Layer / File(s)Summary
Architecture-specific exclusion resolution
scripts/build-desktop-artifact.ts
createBuildConfig now receives the target architecture and appends the matching macOS node-pty exclusion. Staged builds pass options.arch.
Configuration and integration tests
scripts/build-desktop-artifact.test.ts
Tests verify opposite-architecture exclusions for arm64 and x64 builds, no architecture-specific exclusions for universal builds, and explicit architectures for other build configurations.

Estimated code review effort: 2 (Simple) | ~10 minutes

Merge Risk:⚪ Minimal · up to 214d8

The change narrowly excludes opposite-architecture Darwin binaries from single-architecture macOS packages while preserving universal-build behavior; no actionable merge-blocking risk remains after normal checks and review.

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check nameStatusExplanation
Title check✅ PassedThe title clearly identifies the primary change: excluding opposite-architecture Darwin node-pty prebuilds from macOS packages.
Description check✅ PassedThe description clearly explains what changed, why it changed, the scope limits, and the test results. It omits the template headings and checklist, but it provides the required information and remain…
Docstring Coverage✅ PassedDocstring coverage is 100.00% which is sufficient. The required threshold is 80.00%. Docstring coverage is scoped to functions touched by this diff. Analyzed 1 functions across 2 files.
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.
Full details: Description check

Explanation

The description clearly explains what changed, why it changed, the scope limits, and the test results. It omits the template headings and checklist, but it provides the required information and remains focused.

✨ Finishing Touches
📝 Generate docstrings
  • Create stacked PR
  • Commit on current branch
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch fix/desktop-mac-node-pty-arch-exclusion

Comment @coderabbitai help to get the list of available commands.

@buluma
buluma merged commit a862909 into mainSep 2, 2026
16 checks passed
@buluma
buluma deleted the fix/desktop-mac-node-pty-arch-exclusion branch September 2, 2026 23:29
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@buluma
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

fix(desktop): exclude opposite-arch Darwin node-pty prebuild from mac packages - #53

Merged
buluma merged 1 commit into
mainfrom
fix/desktop-mac-node-pty-arch-exclusion
Sep 2, 2026
Merged

fix(desktop): exclude opposite-arch Darwin node-pty prebuild from mac packages#53
buluma merged 1 commit into
mainfrom
fix/desktop-mac-node-pty-arch-exclusion

Conversation

@buluma

@bulumabuluma commented Sep 2, 2026

Copy link
Copy Markdown
Owner

node-pty ships prebuilt pty.node/spawn-helper binaries for both darwin-x64 and darwin-arm64 in the same package. A single-architecture mac build only ever loads its own arch's prebuild, but electron-builder's static files list had no way to know that, so the opposite-arch prebuild rode along and macOS flagged the arm64 app as containing Intel-only nested binaries.

Adds resolveMacFileExclusions(arch) and threads arch into createBuildConfig, scoped to platform === "mac" — universal builds (and any caller that omits arch) keep both prebuilds, unchanged from before.

Ported from pingdotgg/t3code#9240.

Windows ships the same opposite-arch bloat (win32-x64/win32-arm64) but that's out of scope for this PR.

Testing

  • vp test run scripts/build-desktop-artifact.test.ts — 32/32 pass, including two new tests covering the resolver and the wired-through createBuildConfig output
  • tsc --noEmit on scripts, vp lint — both clean

Summary by CodeRabbit

  • Bug Fixes
    • Improved macOS desktop builds by excluding incompatible node-pty binaries for the selected architecture.
    • Added support for correct exclusions in universal macOS builds.
    • Increased verification of architecture-specific file lists and signed macOS build configurations.

… packages
node-pty ships prebuilt pty.node/spawn-helper binaries for both darwin-x64
and darwin-arm64 in the same package. A single-architecture mac build only
loads its own arch's prebuild, but electron-builder's static files list had
no way to know that, so the opposite-arch prebuild rode along and macOS
flagged the arm64 app as containing Intel-only nested binaries.
Add resolveMacFileExclusions(arch), thread arch into createBuildConfig, and
scope the exclusion to platform === "mac" so universal builds (and any
caller that omits arch) keep both prebuilds unchanged. Windows ships the
same opposite-arch bloat but is out of scope here.
Ported from pingdotgg/t3code#9240.
@coderabbitai

coderabbitaiBot commented Sep 2, 2026

Copy link
Copy Markdown

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Team

Run ID: f9c666d6-2160-43b3-b33c-4b22afef4e63

📥 Commits

Reviewing files that changed from the base of the PR and between 3c9cf9c and 214d89c.

📒 Files selected for processing (2)
  • scripts/build-desktop-artifact.test.ts
  • scripts/build-desktop-artifact.ts

Included review availability: Your plan provides up to 8 included reviews per hour; 7 remain after this review.


📝 Walkthrough

Walkthrough

The desktop build configuration now accepts an architecture and excludes opposite-architecture macOS node-pty prebuilds. Tests cover arm64, x64, universal macOS builds, and existing signed, Linux, and Windows configurations.

Changes

Desktop artifact architecture handling

Layer / File(s)Summary
Architecture-specific exclusion resolution
scripts/build-desktop-artifact.ts
createBuildConfig now receives the target architecture and appends the matching macOS node-pty exclusion. Staged builds pass options.arch.
Configuration and integration tests
scripts/build-desktop-artifact.test.ts
Tests verify opposite-architecture exclusions for arm64 and x64 builds, no architecture-specific exclusions for universal builds, and explicit architectures for other build configurations.

Estimated code review effort: 2 (Simple) | ~10 minutes

Merge Risk:⚪ Minimal · up to 214d8

The change narrowly excludes opposite-architecture Darwin binaries from single-architecture macOS packages while preserving universal-build behavior; no actionable merge-blocking risk remains after normal checks and review.

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check nameStatusExplanation
Title check✅ PassedThe title clearly identifies the primary change: excluding opposite-architecture Darwin node-pty prebuilds from macOS packages.
Description check✅ PassedThe description clearly explains what changed, why it changed, the scope limits, and the test results. It omits the template headings and checklist, but it provides the required information and remain…
Docstring Coverage✅ PassedDocstring coverage is 100.00% which is sufficient. The required threshold is 80.00%. Docstring coverage is scoped to functions touched by this diff. Analyzed 1 functions across 2 files.
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.
Full details: Description check

Explanation

The description clearly explains what changed, why it changed, the scope limits, and the test results. It omits the template headings and checklist, but it provides the required information and remains focused.

✨ Finishing Touches
📝 Generate docstrings
  • Create stacked PR
  • Commit on current branch
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch fix/desktop-mac-node-pty-arch-exclusion

Comment @coderabbitai help to get the list of available commands.

@buluma
buluma merged commit a862909 into mainSep 2, 2026
16 checks passed
@buluma
buluma deleted the fix/desktop-mac-node-pty-arch-exclusion branch September 2, 2026 23:29
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@buluma
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

fix(desktop): exclude opposite-arch Darwin node-pty prebuild from mac packages - #53

Merged
buluma merged 1 commit into
mainfrom
fix/desktop-mac-node-pty-arch-exclusion
Sep 2, 2026
Merged

fix(desktop): exclude opposite-arch Darwin node-pty prebuild from mac packages#53
buluma merged 1 commit into
mainfrom
fix/desktop-mac-node-pty-arch-exclusion

Conversation

@buluma

@bulumabuluma commented Sep 2, 2026

Copy link
Copy Markdown
Owner

node-pty ships prebuilt pty.node/spawn-helper binaries for both darwin-x64 and darwin-arm64 in the same package. A single-architecture mac build only ever loads its own arch's prebuild, but electron-builder's static files list had no way to know that, so the opposite-arch prebuild rode along and macOS flagged the arm64 app as containing Intel-only nested binaries.

Adds resolveMacFileExclusions(arch) and threads arch into createBuildConfig, scoped to platform === "mac" — universal builds (and any caller that omits arch) keep both prebuilds, unchanged from before.

Ported from pingdotgg/t3code#9240.

Windows ships the same opposite-arch bloat (win32-x64/win32-arm64) but that's out of scope for this PR.

Testing

  • vp test run scripts/build-desktop-artifact.test.ts — 32/32 pass, including two new tests covering the resolver and the wired-through createBuildConfig output
  • tsc --noEmit on scripts, vp lint — both clean

Summary by CodeRabbit

  • Bug Fixes
    • Improved macOS desktop builds by excluding incompatible node-pty binaries for the selected architecture.
    • Added support for correct exclusions in universal macOS builds.
    • Increased verification of architecture-specific file lists and signed macOS build configurations.

… packages
node-pty ships prebuilt pty.node/spawn-helper binaries for both darwin-x64
and darwin-arm64 in the same package. A single-architecture mac build only
loads its own arch's prebuild, but electron-builder's static files list had
no way to know that, so the opposite-arch prebuild rode along and macOS
flagged the arm64 app as containing Intel-only nested binaries.
Add resolveMacFileExclusions(arch), thread arch into createBuildConfig, and
scope the exclusion to platform === "mac" so universal builds (and any
caller that omits arch) keep both prebuilds unchanged. Windows ships the
same opposite-arch bloat but is out of scope here.
Ported from pingdotgg/t3code#9240.
@coderabbitai

coderabbitaiBot commented Sep 2, 2026

Copy link
Copy Markdown

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Team

Run ID: f9c666d6-2160-43b3-b33c-4b22afef4e63

📥 Commits

Reviewing files that changed from the base of the PR and between 3c9cf9c and 214d89c.

📒 Files selected for processing (2)
  • scripts/build-desktop-artifact.test.ts
  • scripts/build-desktop-artifact.ts

Included review availability: Your plan provides up to 8 included reviews per hour; 7 remain after this review.


📝 Walkthrough

Walkthrough

The desktop build configuration now accepts an architecture and excludes opposite-architecture macOS node-pty prebuilds. Tests cover arm64, x64, universal macOS builds, and existing signed, Linux, and Windows configurations.

Changes

Desktop artifact architecture handling

Layer / File(s)Summary
Architecture-specific exclusion resolution
scripts/build-desktop-artifact.ts
createBuildConfig now receives the target architecture and appends the matching macOS node-pty exclusion. Staged builds pass options.arch.
Configuration and integration tests
scripts/build-desktop-artifact.test.ts
Tests verify opposite-architecture exclusions for arm64 and x64 builds, no architecture-specific exclusions for universal builds, and explicit architectures for other build configurations.

Estimated code review effort: 2 (Simple) | ~10 minutes

Merge Risk:⚪ Minimal · up to 214d8

The change narrowly excludes opposite-architecture Darwin binaries from single-architecture macOS packages while preserving universal-build behavior; no actionable merge-blocking risk remains after normal checks and review.

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check nameStatusExplanation
Title check✅ PassedThe title clearly identifies the primary change: excluding opposite-architecture Darwin node-pty prebuilds from macOS packages.
Description check✅ PassedThe description clearly explains what changed, why it changed, the scope limits, and the test results. It omits the template headings and checklist, but it provides the required information and remain…
Docstring Coverage✅ PassedDocstring coverage is 100.00% which is sufficient. The required threshold is 80.00%. Docstring coverage is scoped to functions touched by this diff. Analyzed 1 functions across 2 files.
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.
Full details: Description check

Explanation

The description clearly explains what changed, why it changed, the scope limits, and the test results. It omits the template headings and checklist, but it provides the required information and remains focused.

✨ Finishing Touches
📝 Generate docstrings
  • Create stacked PR
  • Commit on current branch
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch fix/desktop-mac-node-pty-arch-exclusion

Comment @coderabbitai help to get the list of available commands.

@buluma
buluma merged commit a862909 into mainSep 2, 2026
16 checks passed
@buluma
buluma deleted the fix/desktop-mac-node-pty-arch-exclusion branch September 2, 2026 23:29
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@buluma
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

fix(desktop): exclude opposite-arch Darwin node-pty prebuild from mac packages - #53

Merged
buluma merged 1 commit into
mainfrom
fix/desktop-mac-node-pty-arch-exclusion
Sep 2, 2026
Merged

fix(desktop): exclude opposite-arch Darwin node-pty prebuild from mac packages#53
buluma merged 1 commit into
mainfrom
fix/desktop-mac-node-pty-arch-exclusion

Conversation

@buluma

@bulumabuluma commented Sep 2, 2026

Copy link
Copy Markdown
Owner

node-pty ships prebuilt pty.node/spawn-helper binaries for both darwin-x64 and darwin-arm64 in the same package. A single-architecture mac build only ever loads its own arch's prebuild, but electron-builder's static files list had no way to know that, so the opposite-arch prebuild rode along and macOS flagged the arm64 app as containing Intel-only nested binaries.

Adds resolveMacFileExclusions(arch) and threads arch into createBuildConfig, scoped to platform === "mac" — universal builds (and any caller that omits arch) keep both prebuilds, unchanged from before.

Ported from pingdotgg/t3code#9240.

Windows ships the same opposite-arch bloat (win32-x64/win32-arm64) but that's out of scope for this PR.

Testing

  • vp test run scripts/build-desktop-artifact.test.ts — 32/32 pass, including two new tests covering the resolver and the wired-through createBuildConfig output
  • tsc --noEmit on scripts, vp lint — both clean

Summary by CodeRabbit

  • Bug Fixes
    • Improved macOS desktop builds by excluding incompatible node-pty binaries for the selected architecture.
    • Added support for correct exclusions in universal macOS builds.
    • Increased verification of architecture-specific file lists and signed macOS build configurations.

… packages
node-pty ships prebuilt pty.node/spawn-helper binaries for both darwin-x64
and darwin-arm64 in the same package. A single-architecture mac build only
loads its own arch's prebuild, but electron-builder's static files list had
no way to know that, so the opposite-arch prebuild rode along and macOS
flagged the arm64 app as containing Intel-only nested binaries.
Add resolveMacFileExclusions(arch), thread arch into createBuildConfig, and
scope the exclusion to platform === "mac" so universal builds (and any
caller that omits arch) keep both prebuilds unchanged. Windows ships the
same opposite-arch bloat but is out of scope here.
Ported from pingdotgg/t3code#9240.
@coderabbitai

coderabbitaiBot commented Sep 2, 2026

Copy link
Copy Markdown

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Team

Run ID: f9c666d6-2160-43b3-b33c-4b22afef4e63

📥 Commits

Reviewing files that changed from the base of the PR and between 3c9cf9c and 214d89c.

📒 Files selected for processing (2)
  • scripts/build-desktop-artifact.test.ts
  • scripts/build-desktop-artifact.ts

Included review availability: Your plan provides up to 8 included reviews per hour; 7 remain after this review.


📝 Walkthrough

Walkthrough

The desktop build configuration now accepts an architecture and excludes opposite-architecture macOS node-pty prebuilds. Tests cover arm64, x64, universal macOS builds, and existing signed, Linux, and Windows configurations.

Changes

Desktop artifact architecture handling

Layer / File(s)Summary
Architecture-specific exclusion resolution
scripts/build-desktop-artifact.ts
createBuildConfig now receives the target architecture and appends the matching macOS node-pty exclusion. Staged builds pass options.arch.
Configuration and integration tests
scripts/build-desktop-artifact.test.ts
Tests verify opposite-architecture exclusions for arm64 and x64 builds, no architecture-specific exclusions for universal builds, and explicit architectures for other build configurations.

Estimated code review effort: 2 (Simple) | ~10 minutes

Merge Risk:⚪ Minimal · up to 214d8

The change narrowly excludes opposite-architecture Darwin binaries from single-architecture macOS packages while preserving universal-build behavior; no actionable merge-blocking risk remains after normal checks and review.

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check nameStatusExplanation
Title check✅ PassedThe title clearly identifies the primary change: excluding opposite-architecture Darwin node-pty prebuilds from macOS packages.
Description check✅ PassedThe description clearly explains what changed, why it changed, the scope limits, and the test results. It omits the template headings and checklist, but it provides the required information and remain…
Docstring Coverage✅ PassedDocstring coverage is 100.00% which is sufficient. The required threshold is 80.00%. Docstring coverage is scoped to functions touched by this diff. Analyzed 1 functions across 2 files.
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.
Full details: Description check

Explanation

The description clearly explains what changed, why it changed, the scope limits, and the test results. It omits the template headings and checklist, but it provides the required information and remains focused.

✨ Finishing Touches
📝 Generate docstrings
  • Create stacked PR
  • Commit on current branch
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch fix/desktop-mac-node-pty-arch-exclusion

Comment @coderabbitai help to get the list of available commands.

@buluma
buluma merged commit a862909 into mainSep 2, 2026
16 checks passed
@buluma
buluma deleted the fix/desktop-mac-node-pty-arch-exclusion branch September 2, 2026 23:29
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@buluma
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

fix(desktop): exclude opposite-arch Darwin node-pty prebuild from mac packages - #53

Merged
buluma merged 1 commit into
mainfrom
fix/desktop-mac-node-pty-arch-exclusion
Sep 2, 2026
Merged

fix(desktop): exclude opposite-arch Darwin node-pty prebuild from mac packages#53
buluma merged 1 commit into
mainfrom
fix/desktop-mac-node-pty-arch-exclusion

Conversation

@buluma

@bulumabuluma commented Sep 2, 2026

Copy link
Copy Markdown
Owner

node-pty ships prebuilt pty.node/spawn-helper binaries for both darwin-x64 and darwin-arm64 in the same package. A single-architecture mac build only ever loads its own arch's prebuild, but electron-builder's static files list had no way to know that, so the opposite-arch prebuild rode along and macOS flagged the arm64 app as containing Intel-only nested binaries.

Adds resolveMacFileExclusions(arch) and threads arch into createBuildConfig, scoped to platform === "mac" — universal builds (and any caller that omits arch) keep both prebuilds, unchanged from before.

Ported from pingdotgg/t3code#9240.

Windows ships the same opposite-arch bloat (win32-x64/win32-arm64) but that's out of scope for this PR.

Testing

  • vp test run scripts/build-desktop-artifact.test.ts — 32/32 pass, including two new tests covering the resolver and the wired-through createBuildConfig output
  • tsc --noEmit on scripts, vp lint — both clean

Summary by CodeRabbit

  • Bug Fixes
    • Improved macOS desktop builds by excluding incompatible node-pty binaries for the selected architecture.
    • Added support for correct exclusions in universal macOS builds.
    • Increased verification of architecture-specific file lists and signed macOS build configurations.

… packages
node-pty ships prebuilt pty.node/spawn-helper binaries for both darwin-x64
and darwin-arm64 in the same package. A single-architecture mac build only
loads its own arch's prebuild, but electron-builder's static files list had
no way to know that, so the opposite-arch prebuild rode along and macOS
flagged the arm64 app as containing Intel-only nested binaries.
Add resolveMacFileExclusions(arch), thread arch into createBuildConfig, and
scope the exclusion to platform === "mac" so universal builds (and any
caller that omits arch) keep both prebuilds unchanged. Windows ships the
same opposite-arch bloat but is out of scope here.
Ported from pingdotgg/t3code#9240.
@coderabbitai

coderabbitaiBot commented Sep 2, 2026

Copy link
Copy Markdown

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Team

Run ID: f9c666d6-2160-43b3-b33c-4b22afef4e63

📥 Commits

Reviewing files that changed from the base of the PR and between 3c9cf9c and 214d89c.

📒 Files selected for processing (2)
  • scripts/build-desktop-artifact.test.ts
  • scripts/build-desktop-artifact.ts

Included review availability: Your plan provides up to 8 included reviews per hour; 7 remain after this review.


📝 Walkthrough

Walkthrough

The desktop build configuration now accepts an architecture and excludes opposite-architecture macOS node-pty prebuilds. Tests cover arm64, x64, universal macOS builds, and existing signed, Linux, and Windows configurations.

Changes

Desktop artifact architecture handling

Layer / File(s)Summary
Architecture-specific exclusion resolution
scripts/build-desktop-artifact.ts
createBuildConfig now receives the target architecture and appends the matching macOS node-pty exclusion. Staged builds pass options.arch.
Configuration and integration tests
scripts/build-desktop-artifact.test.ts
Tests verify opposite-architecture exclusions for arm64 and x64 builds, no architecture-specific exclusions for universal builds, and explicit architectures for other build configurations.

Estimated code review effort: 2 (Simple) | ~10 minutes

Merge Risk:⚪ Minimal · up to 214d8

The change narrowly excludes opposite-architecture Darwin binaries from single-architecture macOS packages while preserving universal-build behavior; no actionable merge-blocking risk remains after normal checks and review.

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check nameStatusExplanation
Title check✅ PassedThe title clearly identifies the primary change: excluding opposite-architecture Darwin node-pty prebuilds from macOS packages.
Description check✅ PassedThe description clearly explains what changed, why it changed, the scope limits, and the test results. It omits the template headings and checklist, but it provides the required information and remain…
Docstring Coverage✅ PassedDocstring coverage is 100.00% which is sufficient. The required threshold is 80.00%. Docstring coverage is scoped to functions touched by this diff. Analyzed 1 functions across 2 files.
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.
Full details: Description check

Explanation

The description clearly explains what changed, why it changed, the scope limits, and the test results. It omits the template headings and checklist, but it provides the required information and remains focused.

✨ Finishing Touches
📝 Generate docstrings
  • Create stacked PR
  • Commit on current branch
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch fix/desktop-mac-node-pty-arch-exclusion

Comment @coderabbitai help to get the list of available commands.

@buluma
buluma merged commit a862909 into mainSep 2, 2026
16 checks passed
@buluma
buluma deleted the fix/desktop-mac-node-pty-arch-exclusion branch September 2, 2026 23:29
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@buluma
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

fix(desktop): exclude opposite-arch Darwin node-pty prebuild from mac packages - #53

Merged
buluma merged 1 commit into
mainfrom
fix/desktop-mac-node-pty-arch-exclusion
Sep 2, 2026
Merged

fix(desktop): exclude opposite-arch Darwin node-pty prebuild from mac packages#53
buluma merged 1 commit into
mainfrom
fix/desktop-mac-node-pty-arch-exclusion

Conversation

@buluma

@bulumabuluma commented Sep 2, 2026

Copy link
Copy Markdown
Owner

node-pty ships prebuilt pty.node/spawn-helper binaries for both darwin-x64 and darwin-arm64 in the same package. A single-architecture mac build only ever loads its own arch's prebuild, but electron-builder's static files list had no way to know that, so the opposite-arch prebuild rode along and macOS flagged the arm64 app as containing Intel-only nested binaries.

Adds resolveMacFileExclusions(arch) and threads arch into createBuildConfig, scoped to platform === "mac" — universal builds (and any caller that omits arch) keep both prebuilds, unchanged from before.

Ported from pingdotgg/t3code#9240.

Windows ships the same opposite-arch bloat (win32-x64/win32-arm64) but that's out of scope for this PR.

Testing

  • vp test run scripts/build-desktop-artifact.test.ts — 32/32 pass, including two new tests covering the resolver and the wired-through createBuildConfig output
  • tsc --noEmit on scripts, vp lint — both clean

Summary by CodeRabbit

  • Bug Fixes
    • Improved macOS desktop builds by excluding incompatible node-pty binaries for the selected architecture.
    • Added support for correct exclusions in universal macOS builds.
    • Increased verification of architecture-specific file lists and signed macOS build configurations.

… packages
node-pty ships prebuilt pty.node/spawn-helper binaries for both darwin-x64
and darwin-arm64 in the same package. A single-architecture mac build only
loads its own arch's prebuild, but electron-builder's static files list had
no way to know that, so the opposite-arch prebuild rode along and macOS
flagged the arm64 app as containing Intel-only nested binaries.
Add resolveMacFileExclusions(arch), thread arch into createBuildConfig, and
scope the exclusion to platform === "mac" so universal builds (and any
caller that omits arch) keep both prebuilds unchanged. Windows ships the
same opposite-arch bloat but is out of scope here.
Ported from pingdotgg/t3code#9240.
@coderabbitai

coderabbitaiBot commented Sep 2, 2026

Copy link
Copy Markdown

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Team

Run ID: f9c666d6-2160-43b3-b33c-4b22afef4e63

📥 Commits

Reviewing files that changed from the base of the PR and between 3c9cf9c and 214d89c.

📒 Files selected for processing (2)
  • scripts/build-desktop-artifact.test.ts
  • scripts/build-desktop-artifact.ts

Included review availability: Your plan provides up to 8 included reviews per hour; 7 remain after this review.


📝 Walkthrough

Walkthrough

The desktop build configuration now accepts an architecture and excludes opposite-architecture macOS node-pty prebuilds. Tests cover arm64, x64, universal macOS builds, and existing signed, Linux, and Windows configurations.

Changes

Desktop artifact architecture handling

Layer / File(s)Summary
Architecture-specific exclusion resolution
scripts/build-desktop-artifact.ts
createBuildConfig now receives the target architecture and appends the matching macOS node-pty exclusion. Staged builds pass options.arch.
Configuration and integration tests
scripts/build-desktop-artifact.test.ts
Tests verify opposite-architecture exclusions for arm64 and x64 builds, no architecture-specific exclusions for universal builds, and explicit architectures for other build configurations.

Estimated code review effort: 2 (Simple) | ~10 minutes

Merge Risk:⚪ Minimal · up to 214d8

The change narrowly excludes opposite-architecture Darwin binaries from single-architecture macOS packages while preserving universal-build behavior; no actionable merge-blocking risk remains after normal checks and review.

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check nameStatusExplanation
Title check✅ PassedThe title clearly identifies the primary change: excluding opposite-architecture Darwin node-pty prebuilds from macOS packages.
Description check✅ PassedThe description clearly explains what changed, why it changed, the scope limits, and the test results. It omits the template headings and checklist, but it provides the required information and remain…
Docstring Coverage✅ PassedDocstring coverage is 100.00% which is sufficient. The required threshold is 80.00%. Docstring coverage is scoped to functions touched by this diff. Analyzed 1 functions across 2 files.
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.
Full details: Description check

Explanation

The description clearly explains what changed, why it changed, the scope limits, and the test results. It omits the template headings and checklist, but it provides the required information and remains focused.

✨ Finishing Touches
📝 Generate docstrings
  • Create stacked PR
  • Commit on current branch
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch fix/desktop-mac-node-pty-arch-exclusion

Comment @coderabbitai help to get the list of available commands.

@buluma
buluma merged commit a862909 into mainSep 2, 2026
16 checks passed
@buluma
buluma deleted the fix/desktop-mac-node-pty-arch-exclusion branch September 2, 2026 23:29
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@buluma
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

fix(desktop): exclude opposite-arch Darwin node-pty prebuild from mac packages - #53

Merged
buluma merged 1 commit into
mainfrom
fix/desktop-mac-node-pty-arch-exclusion
Sep 2, 2026
Merged

fix(desktop): exclude opposite-arch Darwin node-pty prebuild from mac packages#53
buluma merged 1 commit into
mainfrom
fix/desktop-mac-node-pty-arch-exclusion

Conversation

@buluma

@bulumabuluma commented Sep 2, 2026

Copy link
Copy Markdown
Owner

node-pty ships prebuilt pty.node/spawn-helper binaries for both darwin-x64 and darwin-arm64 in the same package. A single-architecture mac build only ever loads its own arch's prebuild, but electron-builder's static files list had no way to know that, so the opposite-arch prebuild rode along and macOS flagged the arm64 app as containing Intel-only nested binaries.

Adds resolveMacFileExclusions(arch) and threads arch into createBuildConfig, scoped to platform === "mac" — universal builds (and any caller that omits arch) keep both prebuilds, unchanged from before.

Ported from pingdotgg/t3code#9240.

Windows ships the same opposite-arch bloat (win32-x64/win32-arm64) but that's out of scope for this PR.

Testing

  • vp test run scripts/build-desktop-artifact.test.ts — 32/32 pass, including two new tests covering the resolver and the wired-through createBuildConfig output
  • tsc --noEmit on scripts, vp lint — both clean

Summary by CodeRabbit

  • Bug Fixes
    • Improved macOS desktop builds by excluding incompatible node-pty binaries for the selected architecture.
    • Added support for correct exclusions in universal macOS builds.
    • Increased verification of architecture-specific file lists and signed macOS build configurations.

… packages
node-pty ships prebuilt pty.node/spawn-helper binaries for both darwin-x64
and darwin-arm64 in the same package. A single-architecture mac build only
loads its own arch's prebuild, but electron-builder's static files list had
no way to know that, so the opposite-arch prebuild rode along and macOS
flagged the arm64 app as containing Intel-only nested binaries.
Add resolveMacFileExclusions(arch), thread arch into createBuildConfig, and
scope the exclusion to platform === "mac" so universal builds (and any
caller that omits arch) keep both prebuilds unchanged. Windows ships the
same opposite-arch bloat but is out of scope here.
Ported from pingdotgg/t3code#9240.
@coderabbitai

coderabbitaiBot commented Sep 2, 2026

Copy link
Copy Markdown

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Team

Run ID: f9c666d6-2160-43b3-b33c-4b22afef4e63

📥 Commits

Reviewing files that changed from the base of the PR and between 3c9cf9c and 214d89c.

📒 Files selected for processing (2)
  • scripts/build-desktop-artifact.test.ts
  • scripts/build-desktop-artifact.ts

Included review availability: Your plan provides up to 8 included reviews per hour; 7 remain after this review.


📝 Walkthrough

Walkthrough

The desktop build configuration now accepts an architecture and excludes opposite-architecture macOS node-pty prebuilds. Tests cover arm64, x64, universal macOS builds, and existing signed, Linux, and Windows configurations.

Changes

Desktop artifact architecture handling

Layer / File(s)Summary
Architecture-specific exclusion resolution
scripts/build-desktop-artifact.ts
createBuildConfig now receives the target architecture and appends the matching macOS node-pty exclusion. Staged builds pass options.arch.
Configuration and integration tests
scripts/build-desktop-artifact.test.ts
Tests verify opposite-architecture exclusions for arm64 and x64 builds, no architecture-specific exclusions for universal builds, and explicit architectures for other build configurations.

Estimated code review effort: 2 (Simple) | ~10 minutes

Merge Risk:⚪ Minimal · up to 214d8

The change narrowly excludes opposite-architecture Darwin binaries from single-architecture macOS packages while preserving universal-build behavior; no actionable merge-blocking risk remains after normal checks and review.

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check nameStatusExplanation
Title check✅ PassedThe title clearly identifies the primary change: excluding opposite-architecture Darwin node-pty prebuilds from macOS packages.
Description check✅ PassedThe description clearly explains what changed, why it changed, the scope limits, and the test results. It omits the template headings and checklist, but it provides the required information and remain…
Docstring Coverage✅ PassedDocstring coverage is 100.00% which is sufficient. The required threshold is 80.00%. Docstring coverage is scoped to functions touched by this diff. Analyzed 1 functions across 2 files.
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.
Full details: Description check

Explanation

The description clearly explains what changed, why it changed, the scope limits, and the test results. It omits the template headings and checklist, but it provides the required information and remains focused.

✨ Finishing Touches
📝 Generate docstrings
  • Create stacked PR
  • Commit on current branch
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch fix/desktop-mac-node-pty-arch-exclusion

Comment @coderabbitai help to get the list of available commands.

@buluma
buluma merged commit a862909 into mainSep 2, 2026
16 checks passed
@buluma
buluma deleted the fix/desktop-mac-node-pty-arch-exclusion branch September 2, 2026 23:29
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

@buluma