diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9cf981ad..f94d5232 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -37,8 +37,9 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
           cache: pnpm
       - run: pnpm install --frozen-lockfile
+      - run: pnpm typecheck
       - run: pnpm lint
-      - run: pnpm exec tsc --noEmit --project tsconfig.check.json
+      - run: pnpm typecheck:all
 
   # ─────────────────────────────────────────────
   # Stage 2: Unit Tests
@@ -57,7 +58,8 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
           cache: pnpm
       - run: pnpm install --frozen-lockfile
-      - run: pnpm test
+      - run: pnpm test:unit
+      - run: pnpm test:integration
 
   # ─────────────────────────────────────────────
   # Stage 3: Build matrix (parallel per platform)
@@ -121,8 +123,8 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - arch: x64
-            builder_args: --win --x64
+          - arch: x64-ia32
+            builder_args: --win --x64 --ia32
           - arch: arm64
             builder_args: --win --arm64
     steps:
diff --git a/electron-builder.yml b/electron-builder.yml
index 289a04af..da409870 100644
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -39,10 +39,8 @@ win:
     - target: nsis
       arch:
         - x64
+        - ia32
         - arm64
-    - target: portable
-      arch:
-        - x64
 
 linux:
   icon: assets/icon.png
@@ -58,9 +56,7 @@ linux:
     - target: rpm
       arch:
         - x64
-    - target: snap
-      arch:
-        - x64
+        - arm64
   category: Development
 
 nsis:
@@ -79,8 +75,3 @@ deb:
     - libatspi2.0-0
     - libuuid1
     - libsecret-1-0
-
-snap:
-  plugs:
-    - default
-    - removable-media
diff --git a/package.json b/package.json
index 0ca9a791..dfebeaa3 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,6 @@
 {
   "name": "agent-company",
-<<<<<<< Updated upstream
-  "version": "0.4.148",
-=======
-  "version": "0.4.136",
->>>>>>> Stashed changes
+  "version": "0.4.150",
   "private": true,
   "type": "module",
   "description": "Cross-platform Electron desktop control plane for local-first AI agent companies.",
@@ -20,15 +16,16 @@
     "build": "electron-vite build && node scripts/build-desktop.mjs",
     "build:dir": "electron-vite build && node scripts/build-desktop.mjs --dir",
     "build:all": "node scripts/build-all-platforms.mjs",
+    "release:local": "node scripts/release-local.mjs",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
-    "test": "vitest run",
+    "test": "node scripts/run-vitest.mjs run",
     "typecheck": "tsc --noEmit",
     "typecheck:all": "pnpm -r typecheck",
-    "test:unit": "vitest run --config vitest.config.ts tests/unit",
-    "test:integration": "vitest run --config vitest.config.ts tests/integration",
+    "test:unit": "node scripts/run-vitest.mjs run --config vitest.config.ts tests/unit",
+    "test:integration": "node scripts/run-vitest.mjs run --config vitest.config.ts tests/integration",
     "test:packages": "echo 'no standalone package tests'",
-    "test:e2e": "playwright test -c tests/e2e/playwright.config.ts",
+    "test:e2e": "node --no-warnings ./node_modules/@playwright/test/cli.js test -c tests/e2e/playwright.config.ts",
     "test:run": "pnpm test:unit && pnpm test:integration && pnpm test:packages && pnpm test:e2e",
     "verify": "pnpm typecheck && pnpm lint && pnpm typecheck:all && pnpm test:unit && pnpm test:integration && pnpm test:packages && pnpm test:e2e",
     "verify:release": "pnpm verify && pnpm build:dir",