From 4ff4c3bd8b1873adc336f221fc9a7c83578c2185 Mon Sep 17 00:00:00 2001
From: Jaayden Halko <jaayden@coder.com>
Date: Wed, 11 Feb 2026 17:08:08 +0000
Subject: [PATCH] =?UTF-8?q?=F0=9F=A4=96=20fix:=20restore=20browser=20favic?=
 =?UTF-8?q?on=20loading=20in=20web=20UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Switch the browser favicon links to PNG assets with relative paths, update theme-based favicon swapping to resolve against the document base URL, and harden static serving so missing asset requests are not rewritten to index.html.

Also add PNG favicon outputs to icon generation, include .ico files in npm packaging for compatibility, and extend tests around static asset fallback and themed favicon behavior.

---

_Generated with `mux` • Model: `openai:gpt-5.3-codex` • Thinking: `xhigh` • Cost: `$0.73`_

<!-- mux-attribution: model=openai:gpt-5.3-codex thinking=xhigh costs=0.73 -->
---
 index.html                                 |   5 +-
 package.json                               |   1 +
 public/favicon-dark.png                    | Bin 0 -> 1926 bytes
 public/favicon.png                         | Bin 0 -> 1947 bytes
 scripts/generate-icons.ts                  |  14 ++-
 src/browser/contexts/ThemeContext.test.tsx |  20 +++++
 src/browser/contexts/ThemeContext.tsx      |  22 +++--
 src/node/orpc/server.test.ts               |  96 ++++++++++++++++++++-
 src/node/orpc/server.ts                    |  46 ++++++++--
 src/node/services/serverService.ts         |  10 ++-
 10 files changed, 198 insertions(+), 16 deletions(-)
 create mode 100644 public/favicon-dark.png
 create mode 100644 public/favicon.png

diff --git a/index.html b/index.html
index 499ddd9c44..80a14492a8 100644
--- a/index.html
+++ b/index.html
@@ -9,8 +9,9 @@
     <meta name="description" content="Parallel agentic development with Electron + React" />
     <meta name="theme-color" content="#1e1e1e" />
     <link rel="manifest" href="/manifest.json" crossorigin="use-credentials" vite-ignore />
-    <link rel="icon" href="/favicon.ico" data-theme-icon vite-ignore />
-    <link rel="apple-touch-icon" href="/icon.png" vite-ignore />
+    <!-- Keep favicon paths relative so browser mode still resolves icons behind URL prefixes. -->
+    <link rel="icon" href="favicon.png" type="image/png" data-theme-icon />
+    <link rel="apple-touch-icon" href="icon.png" />
     <title>mux - coder multiplexer</title>
     <style>
       body {
diff --git a/package.json b/package.json
index 31e9c7e389..5bbfb250e3 100644
--- a/package.json
+++ b/package.json
@@ -241,6 +241,7 @@
     "dist/**/*.woff2",
     "dist/**/*.json",
     "dist/**/*.png",
+    "dist/**/*.ico",
     "dist/**/*.webm",
     "dist/assets/**/*",
     "scripts/postinstall.sh",
diff --git a/public/favicon-dark.png b/public/favicon-dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..14806b329ee222b094fa5361aa286627a7df4b27
GIT binary patch
literal 1926
zcmeHI>r>KM7(N)8<zRNRw6ZMJT`6_byyfDhn`mRYdA|j<X`70MYxolotnI#J`!ke`
z)M{HP2{0|q$V--nnAT`eSXqgZny|teqLhpN2m7IKduGl&XWsXH=6&AF%sCwvx)Zg)
zW&r>Ig$vsD695R~69LRjjgUa%CL3XXW>9Pv0Om_(E&`NrRsb;13%4yGB8M~jCZ3xf
zxw>ua%AozH1*|jq7ZQbQdz>R8qGFI%b6J-8OLySs>cb+6R$V>0j<c*`={_XEwk+7}
zjAhN*db>co()K^sZd`n({C-g*yYTz;g%o0!JmvR0QX&;AY(9Bxs!?{apCaX?cH9e@
z5%vwvclP2dXx(HxQPBM2+@h}ndp$K~Q`)5ZWGvi<hC<<52Z#<Ap!FRFmzNWL>QK^Q
zIP32F?I9!*taOAZFlNx&@3LYE4$D?(&>0t}JH#tFdqC0rCI@@(E#i4Fb&I$!>yv6X
zDGS!2p<x>(EeS4g(C5MPqS(5<xV#cYJ-Qg}oz8SKZ@Qf~=e(jFT^nuiIdEM41x9<`
zsyp>LF2U0QB3zRVJwj)MlH!N;5?}4{jmg+Ud59QkHsIqDcVkbep-$1?Yl3P0)7nh9
zBAUu{4kqoCPe#GT(h{h+EWoJ9e|w5wd%jmg;&i-xY7b0arMwCyz=C92YYxp$yuTnt
zb-Zl*Y+P587uX%5xx?$rL5%%I+rZYsuUSvMV8u}<%rxDv0Bl&oIFlrlH0vhNwaHlx
zn@U>*!WicuO<S6@tWXpPq=CRG_Ysr^cNZF5FOlCM;tUI?QeoMPQw%boEH;uUJuIyt
zg+iSOw-R^529MqYhM0e-h=ajKV*k0h<2TZZ>5kC2?aK2WP|5A$vVw~6w+Q$3U|FJ%
z3wOCa<l3v0;Yx)e0DEEdNFkW<JV<?OJ5`+~NImlEv=_1c)sf|DPZK`k6An1l@B7N5
zUt-=j?Rrz?MSRliN?eb{ft$uEutf^bS9#qPCb-h7>lIER&dV9Y$nvXu2k;Xquv=lm
zrDFq6u$~^T%xZQ4pX`qe&eWRGbqH=S@Y&p8?sdw-+&|Jp7(frw6ryW8YUQ>!ex+oZ
zPvbOa_1>Ug<QGKhJMl2Peh=di68}_XO&+j^q!0DOH~Ot!>XY>8b^hcL!=p0CjUALI
zSl1anBpX1PgfRh6>^JB*v`Txesx@7RQ*|U8oW+--*yE4%`=5;|(?+XjgN9Uhqi^M^
zd|Y^r4*J8=5&jo!#LuF$8K^Gbx<qhu5u?@ibr);on$?SoS~nmgP$T}aZu3@OPpuOW
zSZxCRip-0^{qtCV?5-^qAI9e2k8OFF8+#pUe4Zm!@?Fo)O!-7BGoT_WF02Brr%4Ef
z)T&nA7XIFv9M$_4=U9RjBE|ur9#l(@mMm24_TXguX3&ENpvLaZx0q=5)|p*euaiy6
z=xzB_Vx^IOW00p66>sL~vM?QXK!Pm)BQ@29tH%?wtHZ~Y+Aa#xR<79JIp~eV8>ML`
z<>rU5?6#BCyLB3R;58^d-Ljr=+<Mk2=f{nYPM<q=@3GdDpYg+puX_BK{=sF*mW%@?
z!Xc&;#+fT~XX|Jv<!Z9u-Au^>H?yWqh=cDWsO3Eqm5&cmpcbgF$b%S9FrBR;;YDV^
zWp_Vm<zLk{ofLxHlHr3a&zHn)<U-+0&*2_TlT)Mj!8O%bw{$cA)y5RPk-93bitjZ-
zW2XGLe%AP`3A57WW=X;7#`|Nue)W#D05ELHFim=$6aIz!fk*Zz%@!p;KMH#60E*L>
z6HXHtjWwL?QnE-Q^gwX80t-B7h(8>K_}CkkyZLJgZ->iG;H%00Y=Nhsu1A}=j#-pv
zY#m~OUC96OzxN>$u7qEAzZ(&?X00&}&NIH#r)x@LDi~v8sMA|<s&Uqvq+^x6Uq|PB
ggO3J)FpGw1liU`B&4y;or<n}6?V;QFf%v2U0>Ohd*#H0l

literal 0
HcmV?d00001

diff --git a/public/favicon.png b/public/favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..62a6a216a0843f25ae1e834bd6bdee67a86823c9
GIT binary patch
literal 1947
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
SI(8~|+X0h^P3ZYJ=i1*eN>zgZ

literal 0
HcmV?d00001

diff --git a/scripts/generate-icons.ts b/scripts/generate-icons.ts
index fdd46347b6..801f22c2f4 100644
--- a/scripts/generate-icons.ts
+++ b/scripts/generate-icons.ts
@@ -35,6 +35,8 @@ const PNG_OUTPUT = path.join(BUILD_DIR, "icon.png");
 const ICNS_OUTPUT = path.join(BUILD_DIR, "icon.icns");
 const FAVICON_OUTPUT = path.join(ROOT, "public", "favicon.ico");
 const FAVICON_DARK_OUTPUT = path.join(ROOT, "public", "favicon-dark.ico");
+const FAVICON_PNG_OUTPUT = path.join(ROOT, "public", "favicon.png");
+const FAVICON_DARK_PNG_OUTPUT = path.join(ROOT, "public", "favicon-dark.png");
 
 const THEME_FAVICON_STYLE = `<style>
   :root {
@@ -209,6 +211,11 @@ async function generateFavicon(source: string, output: string) {
   console.warn("  ⚠ ImageMagick not found, favicon.ico is single-resolution");
 }
 
+async function generateFaviconPng(source: string, output: string) {
+  const pngBuffer = await sharp(source).resize(256, 256).png().toBuffer();
+  await writeFile(output, pngBuffer);
+}
+
 async function generateThemeFaviconSvg(output: string) {
   const svg = await readFile(SOURCE_BLACK, "utf8");
   const withCurrentColor = svg.replace(/fill="(black|white)"/g, 'fill="currentColor"');
@@ -239,11 +246,16 @@ async function updateAllLogos() {
   await generateThemeFaviconSvg(docsFaviconPath);
   console.log("✓ docs/favicon.svg");
 
-  // Generate favicons (light/dark)
+  // Generate favicons (light/dark) in both ICO and PNG formats.
+  // Browser tabs use PNG to avoid MIME mismatches when ImageMagick is unavailable.
   await generateFavicon(MONO_ICON.source, FAVICON_OUTPUT);
   console.log(`✓ public/favicon.ico`);
   await generateFavicon(SOURCE_WHITE, FAVICON_DARK_OUTPUT);
   console.log(`✓ public/favicon-dark.ico`);
+  await generateFaviconPng(MONO_ICON.source, FAVICON_PNG_OUTPUT);
+  console.log(`✓ public/favicon.png`);
+  await generateFaviconPng(SOURCE_WHITE, FAVICON_DARK_PNG_OUTPUT);
+  console.log(`✓ public/favicon-dark.png`);
 
   console.log("\n✅ All logos updated successfully!");
 }
diff --git a/src/browser/contexts/ThemeContext.test.tsx b/src/browser/contexts/ThemeContext.test.tsx
index 4e216b6d9a..618d0b3d3f 100644
--- a/src/browser/contexts/ThemeContext.test.tsx
+++ b/src/browser/contexts/ThemeContext.test.tsx
@@ -105,4 +105,24 @@ describe("ThemeContext", () => {
     // Check that localStorage is still light (since forcedTheme doesn't write to storage by itself)
     expect(JSON.parse(window.localStorage.getItem(UI_THEME_KEY)!)).toBe("light");
   });
+
+  test("updates the browser tab favicon when the theme changes", () => {
+    const favicon = document.createElement("link");
+    favicon.rel = "icon";
+    favicon.dataset.themeIcon = "true";
+    favicon.href = "favicon.png";
+    document.head.appendChild(favicon);
+
+    try {
+      render(
+        <ThemeProvider forcedTheme="dark">
+          <TestComponent />
+        </ThemeProvider>
+      );
+
+      expect(favicon.href).toContain("favicon-dark.png");
+    } finally {
+      favicon.remove();
+    }
+  });
 });
diff --git a/src/browser/contexts/ThemeContext.tsx b/src/browser/contexts/ThemeContext.tsx
index 7900a9f7da..8e74e4acad 100644
--- a/src/browser/contexts/ThemeContext.tsx
+++ b/src/browser/contexts/ThemeContext.tsx
@@ -59,8 +59,8 @@ const THEME_COLORS: Record<ThemeMode, string> = {
 };
 
 const FAVICON_BY_SCHEME: Record<"light" | "dark", string> = {
-  light: "/favicon.ico",
-  dark: "/favicon-dark.ico",
+  light: "favicon.png",
+  dark: "favicon-dark.png",
 };
 
 /** Map theme mode to CSS color-scheme value */
@@ -79,9 +79,21 @@ function applyThemeFavicon(theme: ThemeMode) {
   }
 
   const scheme = getColorScheme(theme);
-  const nextHref = FAVICON_BY_SCHEME[scheme];
-  if (favicon.getAttribute("href") !== nextHref) {
-    favicon.setAttribute("href", nextHref);
+  // Use the document base URL so browser mode still resolves favicons behind URL
+  // prefixes, while falling back safely in minimal test DOMs without baseURI.
+  const baseHref =
+    document.baseURI || (typeof window !== "undefined" ? window.location.href : undefined);
+  let nextHref = FAVICON_BY_SCHEME[scheme];
+  if (baseHref) {
+    try {
+      nextHref = new URL(nextHref, baseHref).toString();
+    } catch {
+      // Keep the relative fallback when URL parsing is unavailable.
+    }
+  }
+
+  if (favicon.href !== nextHref) {
+    favicon.href = nextHref;
   }
 }
 
diff --git a/src/node/orpc/server.test.ts b/src/node/orpc/server.test.ts
index 82a3d31035..4d72167ae6 100644
--- a/src/node/orpc/server.test.ts
+++ b/src/node/orpc/server.test.ts
@@ -2,7 +2,7 @@ import { describe, expect, test } from "bun:test";
 import * as fs from "fs/promises";
 import * as os from "os";
 import * as path from "path";
-import { createOrpcServer } from "./server";
+import { createOrpcServer, resolveOrpcStaticDir } from "./server";
 import type { ORPCContext } from "./context";
 
 function getErrorCode(error: unknown): string | null {
@@ -18,6 +18,39 @@ function getErrorCode(error: unknown): string | null {
   return typeof code === "string" ? code : null;
 }
 
+describe("resolveOrpcStaticDir", () => {
+  test("prefers the dist layout when dist/index.html exists", async () => {
+    const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "mux-static-resolve-"));
+
+    try {
+      const baseDir = path.join(tempDir, "dist", "node", "orpc");
+      await fs.mkdir(baseDir, { recursive: true });
+      await fs.writeFile(path.join(tempDir, "dist", "index.html"), "dist-index", "utf-8");
+      await fs.writeFile(path.join(tempDir, "index.html"), "root-index", "utf-8");
+
+      const resolved = await resolveOrpcStaticDir(baseDir);
+      expect(resolved).toBe(path.join(tempDir, "dist"));
+    } finally {
+      await fs.rm(tempDir, { recursive: true, force: true });
+    }
+  });
+
+  test("falls back to the repo-root layout when dist/index.html is missing", async () => {
+    const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "mux-static-resolve-"));
+
+    try {
+      const baseDir = path.join(tempDir, "src", "node", "orpc");
+      await fs.mkdir(baseDir, { recursive: true });
+      await fs.writeFile(path.join(tempDir, "index.html"), "root-index", "utf-8");
+
+      const resolved = await resolveOrpcStaticDir(baseDir);
+      expect(resolved).toBe(tempDir);
+    } finally {
+      await fs.rm(tempDir, { recursive: true, force: true });
+    }
+  });
+});
+
 describe("createOrpcServer", () => {
   test("serveStatic fallback does not swallow /api routes", async () => {
     // Minimal context stub - router won't be exercised by this test.
@@ -55,6 +88,67 @@ describe("createOrpcServer", () => {
     }
   });
 
+  test("serveStatic does not rewrite missing asset requests to index.html", async () => {
+    const stubContext: Partial<ORPCContext> = {};
+
+    const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "mux-static-assets-"));
+    const indexHtml =
+      "<!doctype html><html><head><title>mux</title></head><body><div>ok</div></body></html>";
+
+    let server: Awaited<ReturnType<typeof createOrpcServer>> | null = null;
+
+    try {
+      await fs.writeFile(path.join(tempDir, "index.html"), indexHtml, "utf-8");
+
+      server = await createOrpcServer({
+        host: "127.0.0.1",
+        port: 0,
+        context: stubContext as ORPCContext,
+        authToken: "test-token",
+        serveStatic: true,
+        staticDir: tempDir,
+      });
+
+      const assetRes = await fetch(`${server.baseUrl}/favicon-missing.png`);
+      expect(assetRes.status).toBe(404);
+    } finally {
+      await server?.close();
+      await fs.rm(tempDir, { recursive: true, force: true });
+    }
+  });
+
+  test("serveStatic serves root-level assets from staticDir/public", async () => {
+    const stubContext: Partial<ORPCContext> = {};
+
+    const tempDir = await fs.mkdtemp(path.join(os.tmpdir(), "mux-static-public-"));
+    const indexHtml =
+      "<!doctype html><html><head><title>mux</title></head><body><div>ok</div></body></html>";
+
+    let server: Awaited<ReturnType<typeof createOrpcServer>> | null = null;
+
+    try {
+      await fs.writeFile(path.join(tempDir, "index.html"), indexHtml, "utf-8");
+      await fs.mkdir(path.join(tempDir, "public"), { recursive: true });
+      await fs.writeFile(path.join(tempDir, "public", "favicon.png"), "icon-bytes", "utf-8");
+
+      server = await createOrpcServer({
+        host: "127.0.0.1",
+        port: 0,
+        context: stubContext as ORPCContext,
+        authToken: "test-token",
+        serveStatic: true,
+        staticDir: tempDir,
+      });
+
+      const assetRes = await fetch(`${server.baseUrl}/favicon.png`);
+      expect(assetRes.status).toBe(200);
+      expect(await assetRes.text()).toBe("icon-bytes");
+    } finally {
+      await server?.close();
+      await fs.rm(tempDir, { recursive: true, force: true });
+    }
+  });
+
   test("OAuth callback routes accept POST redirects (query + form_post)", async () => {
     const stubContext: Partial<ORPCContext> = {
       muxGovernorOauthService: {
diff --git a/src/node/orpc/server.ts b/src/node/orpc/server.ts
index 2ef7fd3c12..167f004fed 100644
--- a/src/node/orpc/server.ts
+++ b/src/node/orpc/server.ts
@@ -40,7 +40,7 @@ export interface OrpcServerOptions {
   context: ORPCContext;
   /** Whether to serve static files and SPA fallback (default: false) */
   serveStatic?: boolean;
-  /** Directory to serve static files from (default: dist/ relative to dist/node/orpc/) */
+  /** Directory to serve static files from (default: auto-detect dist/ or repo root). */
   staticDir?: string;
   /** Custom error handler for oRPC errors */
   onOrpcError?: (error: unknown, options: unknown) => void;
@@ -118,6 +118,28 @@ function escapeHtml(input: string): string {
     .replaceAll("'", "&#39;");
 }
 
+async function pathExists(filePath: string): Promise<boolean> {
+  try {
+    await fs.access(filePath);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+export async function resolveOrpcStaticDir(baseDir: string = __dirname): Promise<string> {
+  const candidates = [path.join(baseDir, "../.."), path.join(baseDir, "../../..")];
+
+  for (const candidate of candidates) {
+    const indexPath = path.join(candidate, "index.html");
+    if (await pathExists(indexPath)) {
+      return candidate;
+    }
+  }
+
+  return candidates[0];
+}
+
 /**
  * Create an oRPC server with HTTP and WebSocket endpoints.
  *
@@ -132,8 +154,7 @@ export async function createOrpcServer({
   authToken,
   context,
   serveStatic = false,
-  // From dist/node/orpc/, go up 2 levels to reach dist/ where index.html lives
-  staticDir = path.join(__dirname, "../.."),
+  staticDir,
   onOrpcError = (error, options) => {
     // Auth failures are expected in browser mode while the user enters the token.
     // Avoid spamming error logs with stack traces on every unauthenticated request.
@@ -160,19 +181,28 @@ export async function createOrpcServer({
   app.use(express.json({ limit: "50mb" }));
   app.use(express.urlencoded({ extended: false }));
 
+  const resolvedStaticDir = staticDir ?? (await resolveOrpcStaticDir());
+
   let spaIndexHtml: string | null = null;
 
   // Static file serving (optional)
   if (serveStatic) {
     try {
-      const indexHtmlPath = path.join(staticDir, "index.html");
+      const indexHtmlPath = path.join(resolvedStaticDir, "index.html");
       const indexHtml = await fs.readFile(indexHtmlPath, "utf8");
       spaIndexHtml = injectBaseHref(indexHtml, "/");
     } catch (error) {
       log.error("Failed to read index.html for SPA fallback:", error);
     }
 
-    app.use(express.static(staticDir));
+    app.use(express.static(resolvedStaticDir));
+
+    // In source-mode layouts, index.html lives at repo root while favicons and
+    // other web assets live in ./public. Serve both so browser tabs can load icons.
+    const publicDir = path.join(resolvedStaticDir, "public");
+    if (await pathExists(publicDir)) {
+      app.use(express.static(publicDir));
+    }
   }
 
   // Health check endpoint
@@ -730,6 +760,12 @@ export async function createOrpcServer({
         return next();
       }
 
+      // Requests for explicit files (favicon, manifest, JS, etc.) should 404 when
+      // missing, rather than receiving HTML from SPA fallback.
+      if (path.extname(req.path)) {
+        return next();
+      }
+
       if (spaIndexHtml !== null) {
         res.setHeader("Content-Type", "text/html");
         res.send(spaIndexHtml);
diff --git a/src/node/services/serverService.ts b/src/node/services/serverService.ts
index 842cdd4f2f..8ca6eda60d 100644
--- a/src/node/services/serverService.ts
+++ b/src/node/services/serverService.ts
@@ -1,4 +1,9 @@
-import { createOrpcServer, type OrpcServer, type OrpcServerOptions } from "@/node/orpc/server";
+import {
+  createOrpcServer,
+  resolveOrpcStaticDir,
+  type OrpcServer,
+  type OrpcServerOptions,
+} from "@/node/orpc/server";
 import { ServerLockfile } from "./serverLockfile";
 import type { ORPCContext } from "@/node/orpc/context";
 import * as fs from "fs/promises";
@@ -223,7 +228,8 @@ export class ServerService {
 
     this.apiAuthToken = options.authToken;
 
-    const staticDir = path.join(__dirname, "../..");
+    // Resolve the renderer root across both compiled dist/ and source-tree layouts.
+    const staticDir = await resolveOrpcStaticDir();
     let serveStatic = options.serveStatic ?? false;
     if (serveStatic) {
       const indexPath = path.join(staticDir, "index.html");