diff --git a/packages/desktop/src/main/index.ts b/packages/desktop/src/main/index.ts
index 183fc634db01..2f08b57cb93a 100644
--- a/packages/desktop/src/main/index.ts
+++ b/packages/desktop/src/main/index.ts
@@ -193,7 +193,10 @@ const main = Effect.gen(function* () {
   app.commandLine.appendSwitch("proxy-bypass-list", "<-loopback>")
   const features = app.commandLine.getSwitchValue("enable-features")
   app.commandLine.appendSwitch("enable-features", features ? `${jsCallStackFeature},${features}` : jsCallStackFeature)
-  if (!app.isPackaged) app.commandLine.appendSwitch("remote-debugging-port", "9222")
+  if (!app.isPackaged) {
+    const debugPort = process.env.OPENCODE_REMOTE_DEBUGGING_PORT ?? "9223"
+    app.commandLine.appendSwitch("remote-debugging-port", debugPort)
+  }
 
   if (!app.requestSingleInstanceLock()) {
     app.quit()
diff --git a/packages/opencode/script/build.ts b/packages/opencode/script/build.ts
index ce45f770f04e..7f24150c8644 100755
--- a/packages/opencode/script/build.ts
+++ b/packages/opencode/script/build.ts
@@ -20,6 +20,7 @@ const singleFlag = process.argv.includes("--single")
 const baselineFlag = process.argv.includes("--baseline")
 const skipInstall = process.argv.includes("--skip-install")
 const sourcemapsFlag = process.argv.includes("--sourcemaps")
+const noMinifyFlag = process.argv.includes("--no-minify")
 const plugin = createSolidTransformPlugin()
 const skipEmbedWebUi = process.argv.includes("--skip-embed-web-ui")
 
@@ -166,7 +167,7 @@ for (const item of targets) {
     plugins: [plugin],
     external: ["node-gyp"],
     format: "esm",
-    minify: true,
+    minify: !noMinifyFlag,
     sourcemap: sourcemapsFlag ? "linked" : "none",
     splitting: true,
     compile: {