Fix: allow native modules to install properly for ARM64

Author: itsjoyeb

.github/workflows/desktop-arm64-portable.yml

@@ -23,7 +23,7 @@ jobs:
         run: |
           $env:RUST_TARGET = "aarch64-pc-windows-msvc"
           bun ./scripts/prepare.ts
-          bun install --ignore-scripts
+          bun install
           bun run build
           npx electron-builder --win --arm64 --publish never --config electron-builder.config.ts
 

packages/desktop/src/main/index.ts

@@ -164,13 +164,7 @@ const main = Effect.gen(function* () {
     return
   }
 
-  const dataPath = app.isPackaged
-    ? join(dirname(app.getPath("exe")), "data")
-    : app.getPath("userData")
-  if (app.isPackaged && !existsSync(dataPath)) {
-    mkdirSync(dataPath, { recursive: true })
-  }
-  preferAppEnv(dataPath)
+  preferAppEnv(app.getPath("userData"))
 
   app.on("second-instance", (_event: Event, argv: string[]) => {
     const urls = argv.filter((arg: string) => arg.startsWith("opencode://"))
@@ -309,7 +303,7 @@ const main = Effect.gen(function* () {
         },
         {
           needsMigration,
-          userDataPath: dataPath,
+          userDataPath: app.getPath("userData"),
           onSqliteProgress: (progress) => initEmitter.emit("sqlite", progress),
           onStdout: (message) => logger.log("sidecar stdout", { message }),
           onStderr: (message) => logger.warn("sidecar stderr", { message }),

packages/desktop/src/main/logging.ts

@@ -1,31 +1,15 @@
 import { MainLogger } from "electron-log"
 import log from "electron-log/main.js"
-import { app } from "electron"
-import { mkdirSync, readFileSync, readdirSync, statSync, unlinkSync, existsSync } from "node:fs"
-import { dirname, join } from "node:path"
+import { readFileSync, readdirSync, statSync, unlinkSync } from "node:fs"
+import { dirname } from "node:path"
 
 const MAX_LOG_AGE_DAYS = 7
 const TAIL_LINES = 1000
 
 let logger: MainLogger
 export const getLogger = () => logger
 
-function getPortableLogPath(): string {
-  if (app.isPackaged) {
-    const exePath = app.getPath("exe")
-    const exeDir = dirname(exePath)
-    const logDir = join(exeDir, "data", "logs")
-    if (!existsSync(logDir)) {
-      mkdirSync(logDir, { recursive: true })
-    }
-    return logDir
-  }
-  return log.transports.file.getFile().path.replace(/[^\\\/]+$/, "")
-}
-
 export function initLogging() {
-  const logDir = getPortableLogPath()
-  log.transports.file.resolvePathFn = () => join(logDir, "opencode.log")
   log.transports.file.maxSize = 5 * 1024 * 1024
   initConsoleTransport()
   cleanup()

packages/desktop/src/main/store.ts

@@ -1,26 +1,16 @@
 import Store from "electron-store"
 import { app } from "electron"
-import { dirname, join } from "node:path"
 
 import { SETTINGS_STORE } from "./constants"
 
 const cache = new Map<string, Store>()
 
-function getPortableDataPath(): string {
-  if (app.isPackaged) {
-    const exePath = app.getPath("exe")
-    const exeDir = dirname(exePath)
-    return join(exeDir, "data")
-  }
-  return app.getPath("userData")
-}
-
 export function getStore(name = SETTINGS_STORE) {
   const cached = cache.get(name)
   if (cached) return cached
   const next = new Store({
     name,
-    cwd: getPortableDataPath(),
+    cwd: app.getPath("userData"),
     fileExtension: "",
     accessPropertiesByDotNotation: false,
   })