cowork-os 0.3.59 → 0.3.61

package/README.md

@@ -44,8 +44,8 @@ Your AI needs a secure home. CoWork OS provides the runtime, security layers, an
 
 ### macOS App (Recommended)
 
-- Download DMG (Apple Silicon): [CoWork OS 0.3.28](https://github.com/CoWork-OS/CoWork-OS/releases/download/v0.3.28/CoWork-OS-0.3.28-arm64.dmg)
-- Latest releases: [GitHub Releases](https://github.com/CoWork-OS/CoWork-OS/releases/latest)
+- Download the latest build from [GitHub Releases](https://github.com/CoWork-OS/CoWork-OS/releases/latest)
+- In Assets, download the newest Apple Silicon DMG (`CoWork-OS-<version>-arm64.dmg`)
 - Open the `.dmg` and drag **CoWork OS** into **Applications**
 - Eject the mounted DMG after copying, then launch only **/Applications/CoWork OS.app** (prevents duplicate app instances/icons)
 - This app is currently distributed as an unsigned build. On first launch, use **System Settings > Privacy & Security > Open Anyway** once.
@@ -53,11 +53,11 @@ Your AI needs a secure home. CoWork OS provides the runtime, security layers, an
 - If the app closes immediately with a `dyld` signature error, run: `codesign --force --deep --sign - "/Applications/CoWork OS.app"`
 - `spctl --add` / `spctl --enable` are deprecated on newer macOS and may show "This operation is no longer supported"
 
-### From Source (Development)
+### From GitHub Source (Development)
 
 #### Prerequisites
 
-- Node.js 18+ and npm
+- Node.js 22+ and npm
 - macOS 12 (Monterey) or later
 - One of: any supported LLM provider credentials (API key/token or AWS credentials) or Ollama installed locally
 - Xcode Command Line Tools (needed to build `better-sqlite3` for Electron): `xcode-select --install`
@@ -67,7 +67,7 @@ Your AI needs a secure home. CoWork OS provides the runtime, security layers, an
 git clone https://github.com/CoWork-OS/CoWork-OS.git
 cd CoWork-OS
 
-# Install dependencies and set up native modules
+# Install dependencies and set up native modules (includes automatic macOS retry handling)
 npm run setup
 
 # Run in development mode
@@ -78,9 +78,13 @@ npm run dev
 
 #### Troubleshooting: macOS "Killed: 9" during setup
 
-If `npm run setup` fails with `Killed: 9`, macOS terminated the native build due to memory pressure.
+If you see `Killed: 9` during `npm run setup`, macOS terminated a native build due to memory pressure.
 
-This repo’s `setup:native` script automatically uses reduced parallelism on macOS and retries with exponential backoff if the OS kills the process. Let it finish retrying; if it still fails, close other apps and run `npm run setup` again.
+`npm run setup` already retries native setup automatically with backoff. Let it continue until it exits. If it still exits non-zero, close heavy apps and run the same command again:
+
+```bash
+npm run setup
+```
 
 #### Build for Production
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cowork-os",
-  "version": "0.3.59",
+  "version": "0.3.61",
   "description": "CoWork OS - The operating system for personal AI assistants",
   "overrides": {
     "undici": "^7.0.0"
@@ -43,7 +43,7 @@
     "setup": "npm install --no-audit --no-fund && { sleep 2; i=1; max=${COWORK_SETUP_NATIVE_OUTER_ATTEMPTS:-6}; delay=2; while [ $i -le $max ]; do echo \"[cowork] setup:native (outer attempt $i/$max)\"; sh scripts/setup_native_retry.sh; s=$?; if [ $s -eq 0 ]; then exit 0; fi; if [ $s -ne 137 ] && [ $s -ne 9 ]; then exit $s; fi; echo \"[cowork] setup:native was killed; retrying in ${delay}s...\"; sleep $delay; delay=$((delay * 2)); if [ $delay -gt 20 ]; then delay=20; fi; i=$((i + 1)); done; exit $s; }",
     "setup:native": "sleep 2; i=1; max=${COWORK_SETUP_NATIVE_OUTER_ATTEMPTS:-6}; delay=2; while [ $i -le $max ]; do echo \"[cowork] setup:native (outer attempt $i/$max)\"; sh scripts/setup_native_retry.sh; s=$?; if [ $s -eq 0 ]; then exit 0; fi; if [ $s -ne 137 ] && [ $s -ne 9 ]; then exit $s; fi; echo \"[cowork] setup:native was killed; retrying in ${delay}s...\"; sleep $delay; delay=$((delay * 2)); if [ $delay -gt 20 ]; then delay=20; fi; i=$((i + 1)); done; exit $s",
     "setup:server": "npm install && npm rebuild --ignore-scripts=false better-sqlite3",
-    "postinstall": "electron-rebuild -f -w better-sqlite3",
+    "postinstall": "node scripts/postinstall.mjs",
     "dev": "concurrently \"npm run dev:react\" \"npm run dev:electron\"",
     "dev:react": "vite",
     "dev:electron": "tsc -p tsconfig.electron.json && cross-env NODE_ENV=development electron .",
@@ -70,8 +70,7 @@
     "@pydantic/monty": "^0.0.4",
     "@slack/bolt": "^4.6.0",
     "@types/jszip": "^3.4.1",
-    "@whiskeysockets/baileys": "^6.7.16",
-    "better-sqlite3": "^12.6.2",
+    "@whiskeysockets/baileys": "6.7.16",
     "botbuilder": "^4.23.3",
     "chokidar": "^5.0.0",
     "discord.js": "^14.25.1",
@@ -99,6 +98,9 @@
     "ws": "^8.18.0",
     "zod": "^4.3.6"
   },
+  "optionalDependencies": {
+    "better-sqlite3": "12.6.2"
+  },
   "devDependencies": {
     "@electron/rebuild": "^4.0.3",
     "@types/better-sqlite3": "^7.6.8",
@@ -118,7 +120,6 @@
     "cross-env": "^10.1.0",
     "electron": "^40.1.0",
     "electron-builder": "^26.7.0",
-    "electron-rebuild": "^3.2.9",
     "eslint": "^9.39.2",
     "globals": "^17.3.0",
     "typescript": "^5.7.3",

package/scripts/postinstall.mjs

@@ -0,0 +1,69 @@
+#!/usr/bin/env node
+/**
+ * Best-effort postinstall hook.
+ *
+ * Why this exists:
+ * - npm installs of this package can run in environments where some build tools
+ *   are unavailable.
+ * - Postinstall must never hard-fail the whole install for end users.
+ *
+ * Behavior:
+ * - If Electron + better-sqlite3 are present, try native setup.
+ * - If setup fails, log a warning and continue (exit 0).
+ */
+
+import { spawnSync } from "node:child_process";
+import fs from "node:fs";
+import path from "node:path";
+import process from "node:process";
+
+function exists(relPath) {
+  return fs.existsSync(path.join(process.cwd(), relPath));
+}
+
+function log(msg) {
+  console.log(`[cowork] ${msg}`);
+}
+
+function warn(msg) {
+  console.warn(`[cowork] ${msg}`);
+}
+
+function main() {
+  const hasElectron = exists("node_modules/electron/package.json");
+  const hasBetterSqlite3 = exists("node_modules/better-sqlite3/package.json");
+
+  if (!hasElectron || !hasBetterSqlite3) {
+    log(
+      "postinstall: skipping native setup (electron or better-sqlite3 not present in this install context)."
+    );
+    process.exit(0);
+  }
+
+  const setupDriver = path.join(process.cwd(), "scripts", "setup_native_driver.mjs");
+  if (!fs.existsSync(setupDriver)) {
+    warn("postinstall: setup driver not found; skipping native setup.");
+    process.exit(0);
+  }
+
+  log("postinstall: running native setup (best effort)...");
+  const res = spawnSync(process.execPath, [setupDriver], {
+    stdio: "inherit",
+    env: process.env,
+    cwd: process.cwd(),
+  });
+
+  if (res.status === 0) {
+    log("postinstall: native setup complete.");
+    process.exit(0);
+  }
+
+  const detail = res.signal ? `signal ${res.signal}` : `exit ${res.status ?? 1}`;
+  warn(
+    `postinstall: native setup failed (${detail}). Install continues. ` +
+      "If needed, run `npm run setup` in the CoWork OS project."
+  );
+  process.exit(0);
+}
+
+main();

package/scripts/setup_native.mjs

@@ -21,6 +21,8 @@ import os from "node:os";
 import path from "node:path";
 import process from "node:process";
 
+const BETTER_SQLITE3_VERSION = "12.6.2";
+
 function run(cmd, args, opts = {}) {
   const pretty = [cmd, ...(args || [])].join(" ");
   console.log(`\n[cowork] $ ${pretty}`);
@@ -94,6 +96,35 @@ function testBetterSqlite3InElectron(env) {
   return res;
 }
 
+function ensureBetterSqlite3(env) {
+  const pkgPath = path.join(
+    process.cwd(),
+    "node_modules",
+    "better-sqlite3",
+    "package.json"
+  );
+
+  if (fs.existsSync(pkgPath)) {
+    return { status: 0, signal: null };
+  }
+
+  console.log(
+    `[cowork] better-sqlite3 is missing; installing ${BETTER_SQLITE3_VERSION}...`
+  );
+  return run(
+    "npm",
+    [
+      "install",
+      "--no-audit",
+      "--no-fund",
+      "--ignore-scripts=false",
+      "--no-save",
+      `better-sqlite3@${BETTER_SQLITE3_VERSION}`,
+    ],
+    { env }
+  );
+}
+
 function fail(res, context) {
   const sig = res.signal ? ` (signal ${res.signal})` : "";
   const code =
@@ -151,6 +182,10 @@ function main() {
     });
     if (installRes.status !== 0) return installRes;
 
+    // If optional dependency install was skipped/failed earlier, recover here.
+    const ensureBetterRes = ensureBetterSqlite3(env);
+    if (ensureBetterRes.status !== 0) return ensureBetterRes;
+
     const electronVersion = getElectronVersion();
     const electronAbi = getElectronModulesAbi(env);
 
@@ -193,15 +228,23 @@ function main() {
     }
 
     // 3) Fallback: electron-rebuild (most expensive). Keep it sequential and only rebuild the one module.
+    const electronRebuildCli = path.join(
+      "node_modules",
+      "@electron",
+      "rebuild",
+      "lib",
+      "cli.js"
+    );
+    if (!fs.existsSync(electronRebuildCli)) {
+      console.log(
+        "[cowork] @electron/rebuild is not installed; skipping fallback rebuild."
+      );
+      return testBetterSqlite3InElectron(env);
+    }
+
     const rebuildRes = run(
       process.execPath,
-      [
-        "node_modules/@electron/rebuild/lib/cli.js",
-        "-f",
-        "--only",
-        "better-sqlite3",
-        "--sequential",
-      ],
+      [electronRebuildCli, "-f", "--only", "better-sqlite3", "--sequential"],
       { env }
     );
     if (rebuildRes.status !== 0) return rebuildRes;