From a1a5467ef9ec93381289b40779c64939e6c77665 Mon Sep 17 00:00:00 2001
From: Hibryda <hibryda@protonmail.com>
Date: Thu, 26 Mar 2026 02:06:39 +0100
Subject: [PATCH] fix(electrobun): copy sidecar/dist into build output + fix
 runner path resolution

---
 ui-electrobun/electrobun.config.ts       |  1 +
 ui-electrobun/src/bun/sidecar-manager.ts | 14 ++++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/ui-electrobun/electrobun.config.ts b/ui-electrobun/electrobun.config.ts
index db9d9d8..dfb2154 100644
--- a/ui-electrobun/electrobun.config.ts
+++ b/ui-electrobun/electrobun.config.ts
@@ -31,6 +31,7 @@ export default {
 		copy: {
 			"dist/index.html": "views/mainview/index.html",
 			"dist/assets": "views/mainview/assets",
+			"../sidecar/dist": "sidecar/dist",
 		},
 		watchIgnore: ["dist/**"],
 		mac: {
diff --git a/ui-electrobun/src/bun/sidecar-manager.ts b/ui-electrobun/src/bun/sidecar-manager.ts
index cdbc7c0..8e39237 100644
--- a/ui-electrobun/src/bun/sidecar-manager.ts
+++ b/ui-electrobun/src/bun/sidecar-manager.ts
@@ -125,10 +125,12 @@ function resolveRunnerPath(provider: ProviderId): string {
   const envRoot = process.env.AGOR_ROOT;
   if (envRoot) return join(envRoot, "sidecar", "dist", `${provider}-runner.mjs`);
 
-  // Try multiple candidate roots (dev build output vs source tree)
+  // Try multiple candidate roots
   const candidates = [
+    join(import.meta.dir, ".."),                                // build: bin/ → AppRoot/ (sidecar/dist copied here)
     join(import.meta.dir, "..", "..", ".."),                    // source: src/bun/ → repo root
-    join(import.meta.dir, "..", "..", "..", "..", "..", ".."),   // build: build/dev-linux-x64/App/... → repo root
+    join(import.meta.dir, "..", "..", "..", "..", "..", ".."),   // deep build: → repo root
+    process.cwd(),                                              // cwd fallback
   ];
 
   for (const root of candidates) {
@@ -139,10 +141,10 @@ function resolveRunnerPath(provider: ProviderId): string {
     }
   }
 
-  // Fallback: try finding from cwd
-  const cwdPath = join(process.cwd(), "sidecar", "dist", `${provider}-runner.mjs`);
-  dbg(`Trying cwd fallback: ${cwdPath}`);
-  return cwdPath;
+  // Last resort: hardcoded dev path
+  const devPath = join(homedir(), "code", "ai", "agent-orchestrator", "sidecar", "dist", `${provider}-runner.mjs`);
+  dbg(`Trying hardcoded dev fallback: ${devPath}`);
+  return devPath;
 }
 
 function findNodeRuntime(): string {