Merge remote-tracking branch 'origin/main'

# Conflicts:
#	apps/desktop/src/main.ts
#	apps/web/src/components/Sidebar.tsx

Author: hlsitechio

.github/pull_request_template.md

@@ -0,0 +1,33 @@
+<!--
+⚠️ READ BEFORE OPENING ⚠️
+
+We are not actively accepting contributions right now.
+
+You can still open a PR, but please do so knowing there is a high chance
+we may close it without merging it, or never review it.
+
+- Small, focused PRs are strongly preferred. Bug fixes are most likely to be merged.
+- New features will most likely just annoy us.
+- 1,000+ line PRs with a bunch of new features will probably get you banned from the repo.
+-->
+
+## What Changed
+
+<!-- Describe the change clearly and keep scope tight. -->
+
+## Why
+
+<!-- Explain the problem being solved and why this approach is the right one. -->
+
+## UI Changes
+
+<!-- If this PR changes UI, include clear before/after screenshots.
+     If the change involves motion or interaction, include a short video.
+     Delete this section if not applicable. -->
+
+## Checklist
+
+- [ ] This PR is small and focused
+- [ ] I explained what changed and why
+- [ ] I included before/after screenshots for any UI changes
+- [ ] I included a video for animation/interaction changes

.github/workflows/release.yml

@@ -259,13 +259,30 @@ jobs:
     if: always() && needs.preflight.result == 'success' && needs.build.result == 'success'
     runs-on: ubuntu-24.04
     steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ needs.preflight.outputs.ref }}
+
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: package.json
+
       - name: Download all desktop artifacts
         uses: actions/download-artifact@v4
         with:
           pattern: desktop-*
           merge-multiple: true
           path: release-assets
 
+      - name: Merge macOS updater manifests
+        run: |
+          node scripts/merge-mac-update-manifests.ts \
+            release-assets/latest-mac.yml \
+            release-assets/latest-mac-x64.yml
+          rm -f release-assets/latest-mac-x64.yml
+
       - name: Publish release
         uses: softprops/action-gh-release@v2
         with:

CONTRIBUTING.md

@@ -0,0 +1,61 @@
+# Contributing
+
+## Read This First
+
+We are not actively accepting contributions right now.
+
+You can still open an issue or PR, but please do so knowing there is a high chance we close it, defer it forever, or never look at it.
+
+If that sounds annoying, that is because it is. This project is still early and we are trying to keep scope, quality, and direction under control.
+
+## What We Are Most Likely To Accept
+
+Small, focused bug fixes.
+
+Small reliability fixes.
+
+Small performance improvements.
+
+Tightly scoped maintenance work that clearly improves the project without changing its direction.
+
+## What We Are Least Likely To Accept
+
+Large PRs.
+
+Drive-by feature work.
+
+Opinionated rewrites.
+
+Anything that expands product scope without us asking for it first.
+
+If you open a 1,000+ line PR full of new features, we will probably close it quickly and remember that you ignored the clearly written instructions.
+
+## If You Still Want To Open A PR
+
+Keep it small.
+
+Explain exactly what changed.
+
+Explain exactly why the change should exist.
+
+Do not mix unrelated fixes together.
+
+If the PR makes anything resembling a UI change, include clear before/after images.
+
+If the change depends on motion, timing, transitions, or interaction details, include a short video.
+
+If we have to guess what changed, we are much less likely to review it.
+
+## Issues First
+
+If you are thinking about a non-trivial change, open an issue first.
+
+That still does not mean we will want the PR, but it gives you a chance to avoid wasting your time.
+
+## Be Realistic
+
+Opening a PR does not create an obligation on our side.
+
+We may close it. We may ignore it. We may ask you to shrink it. We may reimplement the idea ourselves later.
+
+If you are fine with that, proceed.

README.md

@@ -138,4 +138,8 @@ The app also checks for updates automatically on launch via GitHub Releases.
 
 We are very early in this project. Expect bugs.
 
+## If you REALLY want to contribute still.... read this first
+
+Read [CONTRIBUTING.md](./CONTRIBUTING.md) before opening an issue or PR.
+
 Need support? Join the [Discord](https://discord.gg/jn4EGJjrvv).