pingdotgg · t3dotgg · Mar 9, 2026 · Mar 7, 2026 · Mar 8, 2026
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -262,6 +262,13 @@ jobs:
           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:

diff --git a/docs/release.md b/docs/release.md
@@ -36,6 +36,9 @@ This document covers how to run desktop releases from one tag, first without sig
   - platform installers (`.exe`, `.dmg`, `.AppImage`, plus macOS `.zip` for Squirrel.Mac update payloads)
   - `latest*.yml` metadata
   - `*.blockmap` files (used for differential downloads)
+- macOS metadata note:
+  - `electron-updater` reads `latest-mac.yml` for both Intel and Apple Silicon.
+  - The workflow merges the per-arch mac manifests into one `latest-mac.yml` before publishing the GitHub Release.
 
 ## 0) npm OIDC trusted publishing setup (CLI)
 

diff --git a/scripts/merge-mac-update-manifests.test.ts b/scripts/merge-mac-update-manifests.test.ts
@@ -0,0 +1,108 @@
+import { assert, describe, it } from "@effect/vitest";
+
+import {
+  mergeMacUpdateManifests,
+  parseMacUpdateManifest,
+  serializeMacUpdateManifest,
+} from "./merge-mac-update-manifests.ts";
+
+describe("merge-mac-update-manifests", () => {
+  it("merges arm64 and x64 macOS update manifests into one multi-arch manifest", () => {
+    const arm64 = parseMacUpdateManifest(
+      `version: 0.0.4
+files:
+  - url: T3-Code-0.0.4-arm64.zip
+    sha512: arm64zip
+    size: 125621344
+  - url: T3-Code-0.0.4-arm64.dmg
+    sha512: arm64dmg
+    size: 131754935
+path: T3-Code-0.0.4-arm64.zip
+sha512: arm64zip
+releaseDate: '2026-03-07T10:32:14.587Z'
+`,
+      "latest-mac.yml",
+    );
+
+    const x64 = parseMacUpdateManifest(
+      `version: 0.0.4
+files:
+  - url: T3-Code-0.0.4-x64.zip
+    sha512: x64zip
+    size: 132000112
+  - url: T3-Code-0.0.4-x64.dmg
+    sha512: x64dmg
+    size: 138148807
+path: T3-Code-0.0.4-x64.zip
+sha512: x64zip
+releaseDate: '2026-03-07T10:36:07.540Z'
+`,
+      "latest-mac-x64.yml",
+    );
+
+    const merged = mergeMacUpdateManifests(arm64, x64);
+
+    assert.equal(merged.version, "0.0.4");
+    assert.equal(merged.releaseDate, "2026-03-07T10:36:07.540Z");
+    assert.deepStrictEqual(
+      merged.files.map((file) => file.url),
+      [
+        "T3-Code-0.0.4-arm64.zip",
+        "T3-Code-0.0.4-arm64.dmg",
+        "T3-Code-0.0.4-x64.zip",
+        "T3-Code-0.0.4-x64.dmg",
+      ],
+    );
+
+    const serialized = serializeMacUpdateManifest(merged);
+    assert.ok(!serialized.includes("path:"));
+    assert.equal((serialized.match(/- url:/g) ?? []).length, 4);
+  });
+
+  it("rejects mismatched manifest versions", () => {
+    const arm64 = parseMacUpdateManifest(
+      `version: 0.0.4
+files:
+  - url: T3-Code-0.0.4-arm64.zip
+    sha512: arm64zip
+    size: 1
+releaseDate: '2026-03-07T10:32:14.587Z'
+`,
+      "latest-mac.yml",
+    );
+
+    const x64 = parseMacUpdateManifest(
+      `version: 0.0.5
+files:
+  - url: T3-Code-0.0.5-x64.zip
+    sha512: x64zip
+    size: 1
+releaseDate: '2026-03-07T10:36:07.540Z'
+`,
+      "latest-mac-x64.yml",
+    );
+
+    assert.throws(() => mergeMacUpdateManifests(arm64, x64), /different versions/);
+  });
+
+  it("preserves quoted scalars as strings", () => {
+    const manifest = parseMacUpdateManifest(
+      `version: '1.0'
+files:
+  - url: T3-Code-1.0-x64.zip
+    sha512: zipsha
+    size: 1
+releaseName: 'true'
+minimumSystemVersion: '13.0'
+stagingPercentage: 50
+releaseDate: '2026-03-07T10:36:07.540Z'
+`,
+      "latest-mac.yml",
+    );
+
+    assert.equal(manifest.version, "1.0");
+    assert.equal(manifest.extras.releaseName, "true");
+    assert.equal(manifest.extras.minimumSystemVersion, "13.0");
+    assert.equal(manifest.extras.stagingPercentage, 50);
+  });
+});