fix pc release packaging on github actions (#163)

* fix(pc-release): stabilize electron-builder packaging

* fix(pc-updates): preserve downloaded state

* fix(pc-updates): preserve downloaded state for skipped manifests

* chore(pc-release): publish macos only

Author: dvlin-dev

.github/workflows/release-pc.yml

@@ -85,9 +85,9 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: ${{ env.NODE_VERSION }}
-      - run: pnpm install --frozen-lockfile --prefer-offline
+      - run: pnpm install --frozen-lockfile --prefer-offline --config.node-linker=isolated
       - name: Build workspace dependencies
-        run: pnpm --filter "@moryflow/pc^..." --if-present build
+        run: pnpm --filter "@moryflow/pc..." --filter "!@moryflow/pc" --if-present build
       - name: Build renderer/main bundles
         run: pnpm --dir apps/moryflow/pc build
       - name: Build macOS arm64 installers
@@ -101,7 +101,7 @@ jobs:
   build-macos-x64:
     name: Build macOS x64
     needs: metadata
-    runs-on: macos-13
+    runs-on: macos-15-intel
     env:
       CSC_LINK: ${{ secrets.CSC_LINK }}
       CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
@@ -116,9 +116,9 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: ${{ env.NODE_VERSION }}
-      - run: pnpm install --frozen-lockfile --prefer-offline
+      - run: pnpm install --frozen-lockfile --prefer-offline --config.node-linker=isolated
       - name: Build workspace dependencies
-        run: pnpm --filter "@moryflow/pc^..." --if-present build
+        run: pnpm --filter "@moryflow/pc..." --filter "!@moryflow/pc" --if-present build
       - name: Build renderer/main bundles
         run: pnpm --dir apps/moryflow/pc build
       - name: Build macOS x64 installers
@@ -129,41 +129,12 @@ jobs:
           path: apps/moryflow/pc/release/${{ needs.metadata.outputs.version }}/*
           if-no-files-found: error
 
-  build-windows-x64:
-    name: Build Windows x64
-    needs: metadata
-    runs-on: windows-2022
-    env:
-      CSC_LINK: ${{ secrets.WIN_CSC_LINK }}
-      CSC_KEY_PASSWORD: ${{ secrets.WIN_CSC_KEY_PASSWORD }}
-    steps:
-      - uses: actions/checkout@v4
-      - uses: pnpm/action-setup@v4
-        with:
-          version: ${{ env.PNPM_VERSION }}
-      - uses: actions/setup-node@v4
-        with:
-          node-version: ${{ env.NODE_VERSION }}
-      - run: pnpm install --frozen-lockfile --prefer-offline
-      - name: Build workspace dependencies
-        run: pnpm --filter "@moryflow/pc^..." --if-present build
-      - name: Build renderer/main bundles
-        run: pnpm --dir apps/moryflow/pc build
-      - name: Build Windows x64 installer
-        run: pnpm --dir apps/moryflow/pc exec electron-builder --win nsis --x64 --publish never
-      - uses: actions/upload-artifact@v4
-        with:
-          name: win32-x64
-          path: apps/moryflow/pc/release/${{ needs.metadata.outputs.version }}/*
-          if-no-files-found: error
-
   publish:
     name: Publish Release
     needs:
       - metadata
       - build-macos-arm64
       - build-macos-x64
-      - build-windows-x64
     runs-on: ubuntu-latest
     permissions:
       contents: write
@@ -193,14 +164,16 @@ jobs:
             --base-url "${{ env.UPDATE_BASE_URL }}" \
             --input-dir ".artifacts" \
             --output-dir ".release-prepared" \
-            --github-repo "${{ env.GITHUB_REPO }}"
+            --github-repo "${{ env.GITHUB_REPO }}" \
+            --targets "darwin-arm64,darwin-x64"
       - name: Smoke check generated feeds
         run: |
           pnpm --dir apps/moryflow/pc exec tsx scripts/smoke-check-update-feed.ts \
             --version "${{ needs.metadata.outputs.version }}" \
             --channel "${{ needs.metadata.outputs.channel }}" \
             --base-url "${{ env.UPDATE_BASE_URL }}" \
-            --input-dir ".release-prepared"
+            --input-dir ".release-prepared" \
+            --targets "darwin-arm64,darwin-x64"
       - name: Publish GitHub release
         uses: softprops/action-gh-release@v2
         with:

apps/moryflow/pc/.gitignore

@@ -1,5 +1,6 @@
 # Authentication tokens
 .npmrc
+!.npmrc
 
 # Build output
 dist

apps/moryflow/pc/.npmrc

@@ -0,0 +1,3 @@
+# electron-builder resolves package-manager config from the app directory.
+# Keep packaging isolated here without changing the repo-wide hoisted baseline.
+node-linker=isolated

apps/moryflow/pc/package.json

@@ -149,7 +149,7 @@
     "clsx": "^2.1.1",
     "cmdk": "^1.1.1",
     "date-fns": "^4.1.0",
-    "electron": "^31.7.7",
+    "electron": "31.7.7",
     "electron-builder": "^26.0.12",
     "electron-vite": "^2.2.0",
     "embla-carousel-react": "^8.6.0",

apps/moryflow/pc/pnpm-lock.yaml

@@ -21,6 +21,7 @@ type ParsedArgs = {
   inputDir: string;
   outputDir: string;
   githubRepo: string;
+  targets: TargetDefinition[];
 };
 
 type TargetBundle = {
@@ -59,14 +60,45 @@ Reads per-platform electron-builder outputs from <input-dir>/<target>, rewrites
 to versioned download URLs, and prepares:
   - <output-dir>/releases/v<version>/...
   - <output-dir>/channels/<channel>/...
-  - <output-dir>/github-release-assets/...`;
+  - <output-dir>/github-release-assets/...
+
+Optional:
+  --targets <darwin-arm64,darwin-x64,win32-x64>`;
 
 const fail = (message: string): never => {
   throw new Error(message);
 };
 
 const isFlag = (value: string) => value.startsWith('--');
 
+const parseTargets = (value: string | undefined): TargetDefinition[] => {
+  if (!value) {
+    return TARGETS;
+  }
+
+  const keys = value
+    .split(',')
+    .map((item) => item.trim())
+    .filter(Boolean);
+
+  if (keys.length === 0) {
+    fail('Missing or invalid --targets');
+  }
+
+  const seen = new Set<TargetKey>();
+  const targets: TargetDefinition[] = [];
+  for (const key of keys) {
+    const target = TARGETS.find((item) => item.key === key);
+    if (!target) {
+      fail(`Unsupported --targets entry: ${key}`);
+    }
+    if (seen.has(target.key)) continue;
+    seen.add(target.key);
+    targets.push(target);
+  }
+  return targets;
+};
+
 const parseArgs = (argv: string[]): ParsedArgs => {
   if (argv.includes('--help') || argv.includes('-h')) {
     console.log(HELP_TEXT);
@@ -91,6 +123,7 @@ const parseArgs = (argv: string[]): ParsedArgs => {
   const inputDir = values.get('--input-dir');
   const outputDir = values.get('--output-dir');
   const githubRepo = values.get('--github-repo') ?? 'dvlin-dev/moryflow';
+  const targets = parseTargets(values.get('--targets'));
 
   if (!version) fail('Missing --version');
   if (!channel || (channel !== 'stable' && channel !== 'beta')) {
@@ -107,6 +140,7 @@ const parseArgs = (argv: string[]): ParsedArgs => {
     inputDir: path.resolve(inputDir),
     outputDir: path.resolve(outputDir),
     githubRepo,
+    targets,
   };
 };
 
@@ -252,7 +286,7 @@ const createManifest = async (bundles: TargetBundle[], args: ParsedArgs) => {
 
 const getBundles = async (args: ParsedArgs) => {
   const bundles: TargetBundle[] = [];
-  for (const target of TARGETS) {
+  for (const target of args.targets) {
     const sourceDir = path.join(args.inputDir, target.artifactDir);
     let stats: Awaited<ReturnType<typeof fs.stat>>;
     try {

apps/moryflow/pc/scripts/prepare-release-artifacts.ts

@@ -4,8 +4,9 @@ import fs from 'node:fs/promises';
 import path from 'node:path';
 
 type Channel = 'stable' | 'beta';
+type TargetKey = 'darwin-arm64' | 'darwin-x64' | 'win32-x64';
 type Target = {
-  key: 'darwin-arm64' | 'darwin-x64' | 'win32-x64';
+  key: TargetKey;
   releaseDir: string;
   feedFilename: string;
 };
@@ -18,14 +19,45 @@ const TARGETS: Target[] = [
 
 const HELP_TEXT = `Usage: pnpm exec tsx scripts/smoke-check-update-feed.ts --version <version> --channel <stable|beta> --base-url <url> --input-dir <dir>
 
-Validates generated manifest.json and latest*.yml outputs.`;
+Validates generated manifest.json and latest*.yml outputs.
+
+Optional:
+  --targets <darwin-arm64,darwin-x64,win32-x64>`;
 
 const fail = (message: string): never => {
   throw new Error(message);
 };
 
 const isFlag = (value: string) => value.startsWith('--');
 
+const parseTargets = (value: string | undefined): Target[] => {
+  if (!value) {
+    return TARGETS;
+  }
+
+  const keys = value
+    .split(',')
+    .map((item) => item.trim())
+    .filter(Boolean);
+
+  if (keys.length === 0) {
+    fail('Missing or invalid --targets');
+  }
+
+  const seen = new Set<TargetKey>();
+  const targets: Target[] = [];
+  for (const key of keys) {
+    const target = TARGETS.find((item) => item.key === key);
+    if (!target) {
+      fail(`Unsupported --targets entry: ${key}`);
+    }
+    if (seen.has(target.key)) continue;
+    seen.add(target.key);
+    targets.push(target);
+  }
+  return targets;
+};
+
 const parseArgs = (argv: string[]) => {
   if (argv.includes('--help') || argv.includes('-h')) {
     console.log(HELP_TEXT);
@@ -48,6 +80,7 @@ const parseArgs = (argv: string[]) => {
   const channel = values.get('--channel') as Channel | undefined;
   const baseUrl = values.get('--base-url');
   const inputDir = values.get('--input-dir');
+  const targets = parseTargets(values.get('--targets'));
 
   if (!version) fail('Missing --version');
   if (!channel || (channel !== 'stable' && channel !== 'beta')) {
@@ -61,6 +94,7 @@ const parseArgs = (argv: string[]) => {
     channel,
     baseUrl: baseUrl.replace(/\/+$/, ''),
     inputDir: path.resolve(inputDir),
+    targets,
   };
 };
 
@@ -105,7 +139,7 @@ const main = async () => {
 
   const yaml = await loadYamlModule();
 
-  for (const target of TARGETS) {
+  for (const target of args.targets) {
     const entry = manifest.downloads[target.key];
     if (!entry) {
       fail(`Missing manifest download entry for ${target.key}`);

apps/moryflow/pc/scripts/smoke-check-update-feed.ts

@@ -0,0 +1,20 @@
+import fs from 'node:fs/promises';
+import path from 'node:path';
+import { describe, expect, it } from 'vitest';
+
+describe('electron-builder package manager detection', () => {
+  it('pins the pc app directory to isolated node-linker for packaging', async () => {
+    const npmrc = await fs.readFile(path.join(process.cwd(), '.npmrc'), 'utf8');
+    expect(npmrc).toContain('node-linker=isolated');
+  });
+
+  it('detects the pc app directory as a pnpm project', async () => {
+    const { detect, getCollectorByPackageManager } =
+      await import('app-builder-lib/out/node-module-collector/index.js');
+
+    await expect(detect({ cwd: process.cwd() })).resolves.toBe('pnpm');
+
+    const collector = await getCollectorByPackageManager(process.cwd());
+    expect(collector.constructor.name).toBe('PnpmNodeModulesCollector');
+  });
+});

apps/moryflow/pc/src/main/app/electron-builder-package-manager.test.ts

@@ -99,6 +99,7 @@ import {
 import { getSkillsRegistry, SKILLS_DIR } from '../skills/index.js';
 import { searchIndexService } from '../search-index/index.js';
 import { telegramChannelService } from '../channels/telegram/index.js';
+import { parseSkipVersionPayload } from './update-payload-validation.js';
 
 type RegisterIpcHandlersOptions = {
   vaultWatcherController: VaultWatcherController;
@@ -125,7 +126,9 @@ type RegisterIpcHandlersOptions = {
     downloadUpdate: () => Promise<AppUpdateState>;
     restartToInstall: () => void;
     skipVersion: (version?: string | null) => AppUpdateSettings;
-    subscribe: (listener: (state: AppUpdateState, settings: AppUpdateSettings) => void) => () => void;
+    subscribe: (
+      listener: (state: AppUpdateState, settings: AppUpdateSettings) => void
+    ) => () => void;
   };
 };
 
@@ -337,13 +340,8 @@ export const registerIpcHandlers = ({
     }
   });
   ipcMain.handle('updates:skipVersion', (_event, payload) => {
-    const version =
-      payload?.version === null
-        ? null
-        : typeof payload?.version === 'string'
-          ? payload.version
-          : undefined;
-    if (payload && 'version' in payload && payload.version !== null && typeof payload.version !== 'string') {
+    const { isValid, version } = parseSkipVersionPayload(payload);
+    if (!isValid) {
       return {
         ok: false,
         error: {