Skip to content

fix(desktop): show the canonical Maka icon in the permission guide#3464

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jackwener merged 1 commit into from
Aug 22, 2026
Merged

fix(desktop): show the canonical Maka icon in the permission guide #3464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions apps/desktop/electron-builder.config.mjs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,10 +52,11 @@ export default {
to: 'bundled-tools.json',
},
{
// The app icon is read at runtime by the BrowserWindow `icon` option, and
// `files` above does not carry `assets/`. Electron reports the missing
// file as an empty image rather than an error, so without this the
// packaged app just draws no window icon.
// The app icon is read at runtime by the BrowserWindow `icon` option
// and by the permission-overlay card, and `files` above does not carry
// `assets/`. Electron reports the missing file as an empty image rather
// than an error, so without this the packaged app just draws no window
// icon; `assertPackagedResources` requires it on current builds.
from: 'assets',
to: 'assets',
},
Expand Down
23 changes: 1 addition & 22 deletions apps/desktop/src/main/__tests__/permission-overlay-controller.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,11 +20,7 @@ import {
type PermissionOverlayDeps,
type PermissionOverlayWindowLike,
} from '../permission-overlay/permission-overlay-controller.js';
import {
BUNDLE_ICON_OPTIONS,
loadNativeBundleIcon,
resolveAppBundle,
} from '../permission-overlay/app-bundle.js';
import { resolveAppBundle } from '../permission-overlay/app-bundle.js';

/** Deterministic timer wheel — no real time passes in these tests. */
function createClock() {
Expand DownExpand Up@@ -307,23 +303,6 @@ describe('drag-to-grant permission overlay', () => {
});

describe('app bundle resolution for the drag', () => {
it('never calls the native icon loader for an unpackaged app', async () => {
let calls = 0;
const icon = await loadNativeBundleIcon(false, async () => {
calls += 1;
return 'icon';
});
assert.equal(icon, null);
assert.equal(calls, 0, 'unpackaged development must not call app.getFileIcon()');
assert.equal(await loadNativeBundleIcon(true, async () => 'icon'), 'icon');
});

it('never requests the large icon size that kills packaged macOS builds', () => {
// 'large' hits a fatal NOTREACHED inside Chromium's IconLoader on
// macOS (SIGTRAP, not a catchable error) — see issue #3352.
assert.notEqual(BUNDLE_ICON_OPTIONS.size as string, 'large');
});

it('walks three levels up from the executable to the .app', () => {
assert.deepEqual(
resolveAppBundle({
Expand Down
28 changes: 0 additions & 28 deletions apps/desktop/src/main/permission-overlay/app-bundle.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,34 +34,6 @@ export interface ResolveAppBundleDeps {
exists(path: string): boolean;
}

/**
* The only size every platform can actually deliver. `'large'` is
* unsupported on macOS: Chromium's IconLoader hits a fatal NOTREACHED and
* the process dies with SIGTRAP before the promise settles — no JavaScript
* error is ever thrown, so the try/catch in `loadNativeBundleIcon` cannot
* save the app. Callers upscale the 32x32 result as needed.
*/
export const BUNDLE_ICON_OPTIONS = { size: 'normal' } as const;

/**
* Reading a bundle icon is presentation-only. The original unpackaged npm
* Electron runtime could terminate natively while macOS resolved its bundle
* icon, before the returned promise settled. Keep native icon loading for
* packaged Maka.app builds and let the signed Maka Dev workflow use an empty
* drag image instead.
*/
export async function loadNativeBundleIcon<T>(
isPackaged: boolean,
load: () => Promise<T>,
): Promise<T | null> {
if (!isPackaged) return null;
try {
return await load();
} catch {
return null;
}
}

export function resolveAppBundle(deps: ResolveAppBundleDeps): AppBundleResult {
const { executablePath, platform, exists } = deps;
if (platform !== 'darwin') {
Expand Down
46 changes: 23 additions & 23 deletions apps/desktop/src/main/permission-overlay/permission-overlay-main.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,9 +22,10 @@ import { createRequire } from 'node:module';
import { existsSync } from 'node:fs';
import { join } from 'node:path';
import type { UiLocale } from '@maka/core/ui-locale';
import { desktopAssetPath } from '../desktop-assets.js';
import { resolveOverlayAssetDir } from '../overlay-assets.js';
import { openSystemPermissionPane, requestPermissionAccess } from '../permissions-actions.js';
import { BUNDLE_ICON_OPTIONS, loadNativeBundleIcon, resolveAppBundle } from './app-bundle.js';
import { resolveAppBundle } from './app-bundle.js';
import { getPermissionOverlayCopy } from './permission-overlay-copy.js';
import {
createPermissionOverlayController,
Expand DownExpand Up@@ -64,7 +65,7 @@ export function createPermissionOverlayMain(
let locale: UiLocale = 'en';
let iconDataUrl: string | null = null;
const electron = requireElectron('electron') as Electron;
const { BrowserWindow, app, screen, systemPreferences } = electron;
const { BrowserWindow, app, nativeImage, screen, systemPreferences } = electron;

function isGranted(id: DragGrantPermissionId): boolean {
if (process.platform !== 'darwin') return false;
Expand All@@ -74,15 +75,21 @@ export function createPermissionOverlayMain(
return systemPreferences.getMediaAccessStatus('screen') === 'granted';
}

async function resolveAppIconDataUrl(bundlePath: string | null): Promise<string | null> {
if (!bundlePath) return null;
const icon = await loadNativeBundleIcon(app.isPackaged, () =>
app.getFileIcon(bundlePath, BUNDLE_ICON_OPTIONS),
function resolveAppIconDataUrl(): string | null {
// The canonical 1024px icon ships in assets/ — the same PNG
// electron-builder stamps onto the bundle. `app.getFileIcon()` is the
// wrong source for an identity: macOS reduces the path to its UTType
// and returns the generic application icon, never this app's own — and
// requesting it at size 'large' killed packaged builds outright with a
// fatal NOTREACHED inside Chromium's IconLoader (#3352).
const icon = nativeImage.createFromPath(
desktopAssetPath(
{ isPackaged: app.isPackaged, resourcesPath: process.resourcesPath },
'assets',
'icon.png',
),
);
if (!icon || icon.isEmpty()) return null;
// nativeImage.createFromPath does not decode .icns reliably. Asking
// macOS for the bundle icon returns the same image Finder and the TCC
// list display for packaged Maka builds.
if (icon.isEmpty()) return null;
return icon.resize({ width: 64, height: 64 }).toDataURL();
}

Expand DownExpand Up@@ -110,6 +117,10 @@ export function createPermissionOverlayMain(
exists: existsSync,
});
const bundlePath = bundle.ok ? bundle.bundlePath : null;
// Resolved here, at the only consumer, so a non-darwin start() never
// pays the PNG decode; a null result (asset missing) retries on the
// next card rather than caching the failure.
iconDataUrl ??= resolveAppIconDataUrl();
return {
permission: id,
appName: app.getName(),
Expand DownExpand Up@@ -187,12 +198,6 @@ export function createPermissionOverlayMain(
} catch (error) {
console.warn('[permission-overlay] locale lookup failed, keeping', locale, error);
}
const bundle = resolveAppBundle({
executablePath: app.getPath('exe'),
platform: process.platform,
exists: existsSync,
});
iconDataUrl = await resolveAppIconDataUrl(bundle.ok ? bundle.bundlePath : null);
return controller.start(id);
},
};
Expand DownExpand Up@@ -267,18 +272,13 @@ function attachCardGestures(win: import('electron').BrowserWindow): void {
payload && typeof payload === 'object' && 'iconDataUrl' in payload
? (payload as { iconDataUrl?: unknown }).iconDataUrl
: null;
// The file drag still works without a decorative drag image, so a
// failed decode degrades to an empty icon rather than a native read.
let icon = nativeImage.createEmpty();
if (typeof iconDataUrl === 'string' && iconDataUrl.startsWith('data:image/')) {
const fromRenderer = nativeImage.createFromDataURL(iconDataUrl);
if (!fromRenderer.isEmpty()) icon = fromRenderer;
}
if (icon.isEmpty()) {
const fallback = await loadNativeBundleIcon(app.isPackaged, () =>
app.getFileIcon(resolved.bundlePath, BUNDLE_ICON_OPTIONS),
);
if (fallback && !fallback.isEmpty()) icon = fallback.resize({ width: 64, height: 64 });
// The file drag still works without a decorative drag image.
}

if (!win.isDestroyed()) win.webContents.startDrag({ file: resolved.bundlePath, icon });
});
Expand Down
6 changes: 6 additions & 0 deletions scripts/verify-packaged-app.mjs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -714,6 +714,11 @@ export async function assertPackagedResources(
// build, which predates the disclaimer being packaged. Requiring it there
// would fail a release that was correct when it shipped.
requireDisclaimer = true,
// Same shape as the disclaimer: the canonical icon began shipping as an
// extra resource with the window-icon fix, and the permission overlay
// reads it at runtime, so current builds must carry it — but a
// previously released baseline predates it.
requireCanonicalIcon = true,
} = {},
) {
if (bundledGitContract !== 'forbidden' && bundledGitContract !== 'legacy-required') {
Expand All@@ -732,6 +737,7 @@ export async function assertPackagedResources(
join('licenses', 'git', 'NOTICE.txt'),
]
: []),
...(requireCanonicalIcon ? [join('assets', 'icon.png')] : []),
join('workers', 'filesystem-worker.js'),
join('licenses', 'maka', 'LICENSE'),
join('licenses', 'maka', 'NOTICE'),
Expand Down
36 changes: 36 additions & 0 deletions scripts/verify-packaged-app.test.mjs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ test('legacy packaged resources require the historical bundled Git contract', as
forbidPath: async (path) => forbidden.push(path),
requireWindowsSandbox: false,
bundledGitContract: 'legacy-required',
requireCanonicalIcon: false,
});

for (const path of [
Expand DownExpand Up@@ -304,3 +305,38 @@ describe('assertPackagedDependencyClosure', () => {
);
});
});

// The resource list is contract, not implementation: the permission overlay
// reads `assets/icon.png` at runtime, so a current build that drops it ships
// a regression the app cannot report. The check is driven through the
// injectable `requirePath`, so it needs no packaging and no platform.
describe('assertPackagedResources', () => {
const resources = join('fake', 'resources');
const iconPath = join(resources, 'assets', 'icon.png');
const requirePathMissing = (absent) => async (path) => {
if (path === absent) throw new Error(`MISSING ${path}`);
};
const forbidPath = async () => {};

test('a current build must carry the canonical icon', async () => {
await assert.rejects(
() =>
assertPackagedResources(resources, {
requirePath: requirePathMissing(iconPath),
forbidPath,
requireWindowsSandbox: false,
}),
/MISSING .*icon\.png/,
);
});

test('a legacy baseline predating the packaged icon is not required to carry it', async () => {
await assertPackagedResources(resources, {
requirePath: requirePathMissing(iconPath),
forbidPath,
requireWindowsSandbox: false,
requireDisclaimer: false,
requireCanonicalIcon: false,
});
});
});
1 change: 1 addition & 0 deletions scripts/verify-windows-x64.mjs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -110,6 +110,7 @@ export async function verifyPackagedWindowsApp(
requireWindowsSandbox: requiresCurrentContract,
requireDisclaimer: requiresCurrentContract,
bundledGitContract: requiresCurrentContract ? 'forbidden' : 'legacy-required',
requireCanonicalIcon: requiresCurrentContract,
});
if (requiresCurrentContract) await assertPackagedDependencyClosure(resources);
else await requirePath(join(resources, 'git', 'cmd', 'git.exe'));
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
fix(desktop): show the canonical Maka icon in the permission guide by UncertaintyDeterminesYou4ndMe · Pull Request #3464 · apache/maka · GitHub
Skip to content
fix(desktop): show the canonical Maka icon in the permission guide#3464

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jackwener
merged 1 commit into

from

Aug 22, 2026
 Merged


fix(desktop): show the canonical Maka icon in the permission guide
#3464
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


9 changes: 5 additions & 4 deletions
apps/desktop/electron-builder.config.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,10 +52,11 @@ export default {
 to: 'bundled-tools.json',
 },
 {
 // The app icon is read at runtime by the BrowserWindow `icon` option, and
 // `files` above does not carry `assets/`. Electron reports the missing
 // file as an empty image rather than an error, so without this the
 // packaged app just draws no window icon.
 // The app icon is read at runtime by the BrowserWindow `icon` option
 // and by the permission-overlay card, and `files` above does not carry
 // `assets/`. Electron reports the missing file as an empty image rather
 // than an error, so without this the packaged app just draws no window
 // icon; `assertPackagedResources` requires it on current builds.
 from: 'assets',
 to: 'assets',
 },
Expand Down

23 changes: 1 addition & 22 deletions
apps/desktop/src/main/__tests__/permission-overlay-controller.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,11 +20,7 @@ import {
 type PermissionOverlayDeps,
 type PermissionOverlayWindowLike,
} from '../permission-overlay/permission-overlay-controller.js';
import {
 BUNDLE_ICON_OPTIONS,
 loadNativeBundleIcon,
 resolveAppBundle,
} from '../permission-overlay/app-bundle.js';
import { resolveAppBundle } from '../permission-overlay/app-bundle.js';

/** Deterministic timer wheel — no real time passes in these tests. */
function createClock() {
Expand DownExpand Up@@ -307,23 +303,6 @@ describe('drag-to-grant permission overlay', () => {
});

describe('app bundle resolution for the drag', () => {
 it('never calls the native icon loader for an unpackaged app', async () => {
 let calls = 0;
 const icon = await loadNativeBundleIcon(false, async () => {
 calls += 1;
 return 'icon';
 });
 assert.equal(icon, null);
 assert.equal(calls, 0, 'unpackaged development must not call app.getFileIcon()');
 assert.equal(await loadNativeBundleIcon(true, async () => 'icon'), 'icon');
 });

 it('never requests the large icon size that kills packaged macOS builds', () => {
 // 'large' hits a fatal NOTREACHED inside Chromium's IconLoader on
 // macOS (SIGTRAP, not a catchable error) — see issue #3352.
 assert.notEqual(BUNDLE_ICON_OPTIONS.size as string, 'large');
 });

 it('walks three levels up from the executable to the .app', () => {
 assert.deepEqual(
 resolveAppBundle({
Expand Down

28 changes: 0 additions & 28 deletions
apps/desktop/src/main/permission-overlay/app-bundle.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,34 +34,6 @@ export interface ResolveAppBundleDeps {
 exists(path: string): boolean;
}

/**
 * The only size every platform can actually deliver. `'large'` is
 * unsupported on macOS: Chromium's IconLoader hits a fatal NOTREACHED and
 * the process dies with SIGTRAP before the promise settles — no JavaScript
 * error is ever thrown, so the try/catch in `loadNativeBundleIcon` cannot
 * save the app. Callers upscale the 32x32 result as needed.
 */
export const BUNDLE_ICON_OPTIONS = { size: 'normal' } as const;

/**
 * Reading a bundle icon is presentation-only. The original unpackaged npm
 * Electron runtime could terminate natively while macOS resolved its bundle
 * icon, before the returned promise settled. Keep native icon loading for
 * packaged Maka.app builds and let the signed Maka Dev workflow use an empty
 * drag image instead.
 */
export async function loadNativeBundleIcon<T>(
 isPackaged: boolean,
 load: () => Promise<T>,
): Promise<T | null> {
 if (!isPackaged) return null;
 try {
 return await load();
 } catch {
 return null;
 }
}

export function resolveAppBundle(deps: ResolveAppBundleDeps): AppBundleResult {
 const { executablePath, platform, exists } = deps;
 if (platform !== 'darwin') {
Expand Down

46 changes: 23 additions & 23 deletions
apps/desktop/src/main/permission-overlay/permission-overlay-main.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,9 +22,10 @@ import { createRequire } from 'node:module';
import { existsSync } from 'node:fs';
import { join } from 'node:path';
import type { UiLocale } from '@maka/core/ui-locale';
import { desktopAssetPath } from '../desktop-assets.js';
import { resolveOverlayAssetDir } from '../overlay-assets.js';
import { openSystemPermissionPane, requestPermissionAccess } from '../permissions-actions.js';
import { BUNDLE_ICON_OPTIONS, loadNativeBundleIcon, resolveAppBundle } from './app-bundle.js';
import { resolveAppBundle } from './app-bundle.js';
import { getPermissionOverlayCopy } from './permission-overlay-copy.js';
import {
 createPermissionOverlayController,
Expand DownExpand Up@@ -64,7 +65,7 @@ export function createPermissionOverlayMain(
 let locale: UiLocale = 'en';
 let iconDataUrl: string | null = null;
 const electron = requireElectron('electron') as Electron;
 const { BrowserWindow, app, screen, systemPreferences } = electron;
 const { BrowserWindow, app, nativeImage, screen, systemPreferences } = electron;

 function isGranted(id: DragGrantPermissionId): boolean {
 if (process.platform !== 'darwin') return false;
Expand All@@ -74,15 +75,21 @@ export function createPermissionOverlayMain(
 return systemPreferences.getMediaAccessStatus('screen') === 'granted';
 }

 async function resolveAppIconDataUrl(bundlePath: string | null): Promise<string | null> {
 if (!bundlePath) return null;
 const icon = await loadNativeBundleIcon(app.isPackaged, () =>
 app.getFileIcon(bundlePath, BUNDLE_ICON_OPTIONS),
 function resolveAppIconDataUrl(): string | null {
 // The canonical 1024px icon ships in assets/ — the same PNG
 // electron-builder stamps onto the bundle. `app.getFileIcon()` is the
 // wrong source for an identity: macOS reduces the path to its UTType
 // and returns the generic application icon, never this app's own — and
 // requesting it at size 'large' killed packaged builds outright with a
 // fatal NOTREACHED inside Chromium's IconLoader (#3352).
 const icon = nativeImage.createFromPath(
 desktopAssetPath(
 { isPackaged: app.isPackaged, resourcesPath: process.resourcesPath },
 'assets',
 'icon.png',
 ),
 );
 if (!icon || icon.isEmpty()) return null;
 // nativeImage.createFromPath does not decode .icns reliably. Asking
 // macOS for the bundle icon returns the same image Finder and the TCC
 // list display for packaged Maka builds.
 if (icon.isEmpty()) return null;
 return icon.resize({ width: 64, height: 64 }).toDataURL();
 }

Expand DownExpand Up@@ -110,6 +117,10 @@ export function createPermissionOverlayMain(
 exists: existsSync,
 });
 const bundlePath = bundle.ok ? bundle.bundlePath : null;
 // Resolved here, at the only consumer, so a non-darwin start() never
 // pays the PNG decode; a null result (asset missing) retries on the
 // next card rather than caching the failure.
 iconDataUrl ??= resolveAppIconDataUrl();
 return {
 permission: id,
 appName: app.getName(),
Expand DownExpand Up@@ -187,12 +198,6 @@ export function createPermissionOverlayMain(
 } catch (error) {
 console.warn('[permission-overlay] locale lookup failed, keeping', locale, error);
 }
 const bundle = resolveAppBundle({
 executablePath: app.getPath('exe'),
 platform: process.platform,
 exists: existsSync,
 });
 iconDataUrl = await resolveAppIconDataUrl(bundle.ok ? bundle.bundlePath : null);
 return controller.start(id);
 },
 };
Expand DownExpand Up@@ -267,18 +272,13 @@ function attachCardGestures(win: import('electron').BrowserWindow): void {
 payload && typeof payload === 'object' && 'iconDataUrl' in payload
 ? (payload as { iconDataUrl?: unknown }).iconDataUrl
 : null;
 // The file drag still works without a decorative drag image, so a
 // failed decode degrades to an empty icon rather than a native read.
 let icon = nativeImage.createEmpty();
 if (typeof iconDataUrl === 'string' && iconDataUrl.startsWith('data:image/')) {
 const fromRenderer = nativeImage.createFromDataURL(iconDataUrl);
 if (!fromRenderer.isEmpty()) icon = fromRenderer;
 }
 if (icon.isEmpty()) {
 const fallback = await loadNativeBundleIcon(app.isPackaged, () =>
 app.getFileIcon(resolved.bundlePath, BUNDLE_ICON_OPTIONS),
 );
 if (fallback && !fallback.isEmpty()) icon = fallback.resize({ width: 64, height: 64 });
 // The file drag still works without a decorative drag image.
 }

 if (!win.isDestroyed()) win.webContents.startDrag({ file: resolved.bundlePath, icon });
 });
Expand Down

6 changes: 6 additions & 0 deletions
scripts/verify-packaged-app.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -714,6 +714,11 @@ export async function assertPackagedResources(
 // build, which predates the disclaimer being packaged. Requiring it there
 // would fail a release that was correct when it shipped.
 requireDisclaimer = true,
 // Same shape as the disclaimer: the canonical icon began shipping as an
 // extra resource with the window-icon fix, and the permission overlay
 // reads it at runtime, so current builds must carry it — but a
 // previously released baseline predates it.
 requireCanonicalIcon = true,
 } = {},
) {
 if (bundledGitContract !== 'forbidden' && bundledGitContract !== 'legacy-required') {
Expand All@@ -732,6 +737,7 @@ export async function assertPackagedResources(
 join('licenses', 'git', 'NOTICE.txt'),
 ]
 : []),
 ...(requireCanonicalIcon ? [join('assets', 'icon.png')] : []),
 join('workers', 'filesystem-worker.js'),
 join('licenses', 'maka', 'LICENSE'),
 join('licenses', 'maka', 'NOTICE'),
Expand Down

36 changes: 36 additions & 0 deletions
scripts/verify-packaged-app.test.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ test('legacy packaged resources require the historical bundled Git contract', as
 forbidPath: async (path) => forbidden.push(path),
 requireWindowsSandbox: false,
 bundledGitContract: 'legacy-required',
 requireCanonicalIcon: false,
 });

 for (const path of [
Expand DownExpand Up@@ -304,3 +305,38 @@ describe('assertPackagedDependencyClosure', () => {
 );
 });
});

// The resource list is contract, not implementation: the permission overlay
// reads `assets/icon.png` at runtime, so a current build that drops it ships
// a regression the app cannot report. The check is driven through the
// injectable `requirePath`, so it needs no packaging and no platform.
describe('assertPackagedResources', () => {
 const resources = join('fake', 'resources');
 const iconPath = join(resources, 'assets', 'icon.png');
 const requirePathMissing = (absent) => async (path) => {
 if (path === absent) throw new Error(`MISSING ${path}`);
 };
 const forbidPath = async () => {};

 test('a current build must carry the canonical icon', async () => {
 await assert.rejects(
 () =>
 assertPackagedResources(resources, {
 requirePath: requirePathMissing(iconPath),
 forbidPath,
 requireWindowsSandbox: false,
 }),
 /MISSING .*icon\.png/,
 );
 });

 test('a legacy baseline predating the packaged icon is not required to carry it', async () => {
 await assertPackagedResources(resources, {
 requirePath: requirePathMissing(iconPath),
 forbidPath,
 requireWindowsSandbox: false,
 requireDisclaimer: false,
 requireCanonicalIcon: false,
 });
 });
});

1 change: 1 addition & 0 deletions
scripts/verify-windows-x64.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,6 +110,7 @@ export async function verifyPackagedWindowsApp(
 requireWindowsSandbox: requiresCurrentContract,
 requireDisclaimer: requiresCurrentContract,
 bundledGitContract: requiresCurrentContract ? 'forbidden' : 'legacy-required',
 requireCanonicalIcon: requiresCurrentContract,
 });
 if (requiresCurrentContract) await assertPackagedDependencyClosure(resources);
 else await requirePath(join(resources, 'git', 'cmd', 'git.exe'));
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(desktop): show the canonical Maka icon in the permission guide by UncertaintyDeterminesYou4ndMe · Pull Request #3464 · apache/maka · GitHub
Skip to content
fix(desktop): show the canonical Maka icon in the permission guide#3464

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jackwener
merged 1 commit into

from

Aug 22, 2026
 Merged


fix(desktop): show the canonical Maka icon in the permission guide
#3464
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


9 changes: 5 additions & 4 deletions
apps/desktop/electron-builder.config.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,10 +52,11 @@ export default {
 to: 'bundled-tools.json',
 },
 {
 // The app icon is read at runtime by the BrowserWindow `icon` option, and
 // `files` above does not carry `assets/`. Electron reports the missing
 // file as an empty image rather than an error, so without this the
 // packaged app just draws no window icon.
 // The app icon is read at runtime by the BrowserWindow `icon` option
 // and by the permission-overlay card, and `files` above does not carry
 // `assets/`. Electron reports the missing file as an empty image rather
 // than an error, so without this the packaged app just draws no window
 // icon; `assertPackagedResources` requires it on current builds.
 from: 'assets',
 to: 'assets',
 },
Expand Down

23 changes: 1 addition & 22 deletions
apps/desktop/src/main/__tests__/permission-overlay-controller.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,11 +20,7 @@ import {
 type PermissionOverlayDeps,
 type PermissionOverlayWindowLike,
} from '../permission-overlay/permission-overlay-controller.js';
import {
 BUNDLE_ICON_OPTIONS,
 loadNativeBundleIcon,
 resolveAppBundle,
} from '../permission-overlay/app-bundle.js';
import { resolveAppBundle } from '../permission-overlay/app-bundle.js';

/** Deterministic timer wheel — no real time passes in these tests. */
function createClock() {
Expand DownExpand Up@@ -307,23 +303,6 @@ describe('drag-to-grant permission overlay', () => {
});

describe('app bundle resolution for the drag', () => {
 it('never calls the native icon loader for an unpackaged app', async () => {
 let calls = 0;
 const icon = await loadNativeBundleIcon(false, async () => {
 calls += 1;
 return 'icon';
 });
 assert.equal(icon, null);
 assert.equal(calls, 0, 'unpackaged development must not call app.getFileIcon()');
 assert.equal(await loadNativeBundleIcon(true, async () => 'icon'), 'icon');
 });

 it('never requests the large icon size that kills packaged macOS builds', () => {
 // 'large' hits a fatal NOTREACHED inside Chromium's IconLoader on
 // macOS (SIGTRAP, not a catchable error) — see issue #3352.
 assert.notEqual(BUNDLE_ICON_OPTIONS.size as string, 'large');
 });

 it('walks three levels up from the executable to the .app', () => {
 assert.deepEqual(
 resolveAppBundle({
Expand Down

28 changes: 0 additions & 28 deletions
apps/desktop/src/main/permission-overlay/app-bundle.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,34 +34,6 @@ export interface ResolveAppBundleDeps {
 exists(path: string): boolean;
}

/**
 * The only size every platform can actually deliver. `'large'` is
 * unsupported on macOS: Chromium's IconLoader hits a fatal NOTREACHED and
 * the process dies with SIGTRAP before the promise settles — no JavaScript
 * error is ever thrown, so the try/catch in `loadNativeBundleIcon` cannot
 * save the app. Callers upscale the 32x32 result as needed.
 */
export const BUNDLE_ICON_OPTIONS = { size: 'normal' } as const;

/**
 * Reading a bundle icon is presentation-only. The original unpackaged npm
 * Electron runtime could terminate natively while macOS resolved its bundle
 * icon, before the returned promise settled. Keep native icon loading for
 * packaged Maka.app builds and let the signed Maka Dev workflow use an empty
 * drag image instead.
 */
export async function loadNativeBundleIcon<T>(
 isPackaged: boolean,
 load: () => Promise<T>,
): Promise<T | null> {
 if (!isPackaged) return null;
 try {
 return await load();
 } catch {
 return null;
 }
}

export function resolveAppBundle(deps: ResolveAppBundleDeps): AppBundleResult {
 const { executablePath, platform, exists } = deps;
 if (platform !== 'darwin') {
Expand Down

46 changes: 23 additions & 23 deletions
apps/desktop/src/main/permission-overlay/permission-overlay-main.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,9 +22,10 @@ import { createRequire } from 'node:module';
import { existsSync } from 'node:fs';
import { join } from 'node:path';
import type { UiLocale } from '@maka/core/ui-locale';
import { desktopAssetPath } from '../desktop-assets.js';
import { resolveOverlayAssetDir } from '../overlay-assets.js';
import { openSystemPermissionPane, requestPermissionAccess } from '../permissions-actions.js';
import { BUNDLE_ICON_OPTIONS, loadNativeBundleIcon, resolveAppBundle } from './app-bundle.js';
import { resolveAppBundle } from './app-bundle.js';
import { getPermissionOverlayCopy } from './permission-overlay-copy.js';
import {
 createPermissionOverlayController,
Expand DownExpand Up@@ -64,7 +65,7 @@ export function createPermissionOverlayMain(
 let locale: UiLocale = 'en';
 let iconDataUrl: string | null = null;
 const electron = requireElectron('electron') as Electron;
 const { BrowserWindow, app, screen, systemPreferences } = electron;
 const { BrowserWindow, app, nativeImage, screen, systemPreferences } = electron;

 function isGranted(id: DragGrantPermissionId): boolean {
 if (process.platform !== 'darwin') return false;
Expand All@@ -74,15 +75,21 @@ export function createPermissionOverlayMain(
 return systemPreferences.getMediaAccessStatus('screen') === 'granted';
 }

 async function resolveAppIconDataUrl(bundlePath: string | null): Promise<string | null> {
 if (!bundlePath) return null;
 const icon = await loadNativeBundleIcon(app.isPackaged, () =>
 app.getFileIcon(bundlePath, BUNDLE_ICON_OPTIONS),
 function resolveAppIconDataUrl(): string | null {
 // The canonical 1024px icon ships in assets/ — the same PNG
 // electron-builder stamps onto the bundle. `app.getFileIcon()` is the
 // wrong source for an identity: macOS reduces the path to its UTType
 // and returns the generic application icon, never this app's own — and
 // requesting it at size 'large' killed packaged builds outright with a
 // fatal NOTREACHED inside Chromium's IconLoader (#3352).
 const icon = nativeImage.createFromPath(
 desktopAssetPath(
 { isPackaged: app.isPackaged, resourcesPath: process.resourcesPath },
 'assets',
 'icon.png',
 ),
 );
 if (!icon || icon.isEmpty()) return null;
 // nativeImage.createFromPath does not decode .icns reliably. Asking
 // macOS for the bundle icon returns the same image Finder and the TCC
 // list display for packaged Maka builds.
 if (icon.isEmpty()) return null;
 return icon.resize({ width: 64, height: 64 }).toDataURL();
 }

Expand DownExpand Up@@ -110,6 +117,10 @@ export function createPermissionOverlayMain(
 exists: existsSync,
 });
 const bundlePath = bundle.ok ? bundle.bundlePath : null;
 // Resolved here, at the only consumer, so a non-darwin start() never
 // pays the PNG decode; a null result (asset missing) retries on the
 // next card rather than caching the failure.
 iconDataUrl ??= resolveAppIconDataUrl();
 return {
 permission: id,
 appName: app.getName(),
Expand DownExpand Up@@ -187,12 +198,6 @@ export function createPermissionOverlayMain(
 } catch (error) {
 console.warn('[permission-overlay] locale lookup failed, keeping', locale, error);
 }
 const bundle = resolveAppBundle({
 executablePath: app.getPath('exe'),
 platform: process.platform,
 exists: existsSync,
 });
 iconDataUrl = await resolveAppIconDataUrl(bundle.ok ? bundle.bundlePath : null);
 return controller.start(id);
 },
 };
Expand DownExpand Up@@ -267,18 +272,13 @@ function attachCardGestures(win: import('electron').BrowserWindow): void {
 payload && typeof payload === 'object' && 'iconDataUrl' in payload
 ? (payload as { iconDataUrl?: unknown }).iconDataUrl
 : null;
 // The file drag still works without a decorative drag image, so a
 // failed decode degrades to an empty icon rather than a native read.
 let icon = nativeImage.createEmpty();
 if (typeof iconDataUrl === 'string' && iconDataUrl.startsWith('data:image/')) {
 const fromRenderer = nativeImage.createFromDataURL(iconDataUrl);
 if (!fromRenderer.isEmpty()) icon = fromRenderer;
 }
 if (icon.isEmpty()) {
 const fallback = await loadNativeBundleIcon(app.isPackaged, () =>
 app.getFileIcon(resolved.bundlePath, BUNDLE_ICON_OPTIONS),
 );
 if (fallback && !fallback.isEmpty()) icon = fallback.resize({ width: 64, height: 64 });
 // The file drag still works without a decorative drag image.
 }

 if (!win.isDestroyed()) win.webContents.startDrag({ file: resolved.bundlePath, icon });
 });
Expand Down

6 changes: 6 additions & 0 deletions
scripts/verify-packaged-app.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -714,6 +714,11 @@ export async function assertPackagedResources(
 // build, which predates the disclaimer being packaged. Requiring it there
 // would fail a release that was correct when it shipped.
 requireDisclaimer = true,
 // Same shape as the disclaimer: the canonical icon began shipping as an
 // extra resource with the window-icon fix, and the permission overlay
 // reads it at runtime, so current builds must carry it — but a
 // previously released baseline predates it.
 requireCanonicalIcon = true,
 } = {},
) {
 if (bundledGitContract !== 'forbidden' && bundledGitContract !== 'legacy-required') {
Expand All@@ -732,6 +737,7 @@ export async function assertPackagedResources(
 join('licenses', 'git', 'NOTICE.txt'),
 ]
 : []),
 ...(requireCanonicalIcon ? [join('assets', 'icon.png')] : []),
 join('workers', 'filesystem-worker.js'),
 join('licenses', 'maka', 'LICENSE'),
 join('licenses', 'maka', 'NOTICE'),
Expand Down

36 changes: 36 additions & 0 deletions
scripts/verify-packaged-app.test.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ test('legacy packaged resources require the historical bundled Git contract', as
 forbidPath: async (path) => forbidden.push(path),
 requireWindowsSandbox: false,
 bundledGitContract: 'legacy-required',
 requireCanonicalIcon: false,
 });

 for (const path of [
Expand DownExpand Up@@ -304,3 +305,38 @@ describe('assertPackagedDependencyClosure', () => {
 );
 });
});

// The resource list is contract, not implementation: the permission overlay
// reads `assets/icon.png` at runtime, so a current build that drops it ships
// a regression the app cannot report. The check is driven through the
// injectable `requirePath`, so it needs no packaging and no platform.
describe('assertPackagedResources', () => {
 const resources = join('fake', 'resources');
 const iconPath = join(resources, 'assets', 'icon.png');
 const requirePathMissing = (absent) => async (path) => {
 if (path === absent) throw new Error(`MISSING ${path}`);
 };
 const forbidPath = async () => {};

 test('a current build must carry the canonical icon', async () => {
 await assert.rejects(
 () =>
 assertPackagedResources(resources, {
 requirePath: requirePathMissing(iconPath),
 forbidPath,
 requireWindowsSandbox: false,
 }),
 /MISSING .*icon\.png/,
 );
 });

 test('a legacy baseline predating the packaged icon is not required to carry it', async () => {
 await assertPackagedResources(resources, {
 requirePath: requirePathMissing(iconPath),
 forbidPath,
 requireWindowsSandbox: false,
 requireDisclaimer: false,
 requireCanonicalIcon: false,
 });
 });
});

1 change: 1 addition & 0 deletions
scripts/verify-windows-x64.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,6 +110,7 @@ export async function verifyPackagedWindowsApp(
 requireWindowsSandbox: requiresCurrentContract,
 requireDisclaimer: requiresCurrentContract,
 bundledGitContract: requiresCurrentContract ? 'forbidden' : 'legacy-required',
 requireCanonicalIcon: requiresCurrentContract,
 });
 if (requiresCurrentContract) await assertPackagedDependencyClosure(resources);
 else await requirePath(join(resources, 'git', 'cmd', 'git.exe'));
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(desktop): show the canonical Maka icon in the permission guide by UncertaintyDeterminesYou4ndMe · Pull Request #3464 · apache/maka · GitHub
Skip to content
fix(desktop): show the canonical Maka icon in the permission guide#3464

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jackwener
merged 1 commit into

from

Aug 22, 2026
 Merged


fix(desktop): show the canonical Maka icon in the permission guide
#3464
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


9 changes: 5 additions & 4 deletions
apps/desktop/electron-builder.config.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,10 +52,11 @@ export default {
 to: 'bundled-tools.json',
 },
 {
 // The app icon is read at runtime by the BrowserWindow `icon` option, and
 // `files` above does not carry `assets/`. Electron reports the missing
 // file as an empty image rather than an error, so without this the
 // packaged app just draws no window icon.
 // The app icon is read at runtime by the BrowserWindow `icon` option
 // and by the permission-overlay card, and `files` above does not carry
 // `assets/`. Electron reports the missing file as an empty image rather
 // than an error, so without this the packaged app just draws no window
 // icon; `assertPackagedResources` requires it on current builds.
 from: 'assets',
 to: 'assets',
 },
Expand Down

23 changes: 1 addition & 22 deletions
apps/desktop/src/main/__tests__/permission-overlay-controller.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,11 +20,7 @@ import {
 type PermissionOverlayDeps,
 type PermissionOverlayWindowLike,
} from '../permission-overlay/permission-overlay-controller.js';
import {
 BUNDLE_ICON_OPTIONS,
 loadNativeBundleIcon,
 resolveAppBundle,
} from '../permission-overlay/app-bundle.js';
import { resolveAppBundle } from '../permission-overlay/app-bundle.js';

/** Deterministic timer wheel — no real time passes in these tests. */
function createClock() {
Expand DownExpand Up@@ -307,23 +303,6 @@ describe('drag-to-grant permission overlay', () => {
});

describe('app bundle resolution for the drag', () => {
 it('never calls the native icon loader for an unpackaged app', async () => {
 let calls = 0;
 const icon = await loadNativeBundleIcon(false, async () => {
 calls += 1;
 return 'icon';
 });
 assert.equal(icon, null);
 assert.equal(calls, 0, 'unpackaged development must not call app.getFileIcon()');
 assert.equal(await loadNativeBundleIcon(true, async () => 'icon'), 'icon');
 });

 it('never requests the large icon size that kills packaged macOS builds', () => {
 // 'large' hits a fatal NOTREACHED inside Chromium's IconLoader on
 // macOS (SIGTRAP, not a catchable error) — see issue #3352.
 assert.notEqual(BUNDLE_ICON_OPTIONS.size as string, 'large');
 });

 it('walks three levels up from the executable to the .app', () => {
 assert.deepEqual(
 resolveAppBundle({
Expand Down

28 changes: 0 additions & 28 deletions
apps/desktop/src/main/permission-overlay/app-bundle.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,34 +34,6 @@ export interface ResolveAppBundleDeps {
 exists(path: string): boolean;
}

/**
 * The only size every platform can actually deliver. `'large'` is
 * unsupported on macOS: Chromium's IconLoader hits a fatal NOTREACHED and
 * the process dies with SIGTRAP before the promise settles — no JavaScript
 * error is ever thrown, so the try/catch in `loadNativeBundleIcon` cannot
 * save the app. Callers upscale the 32x32 result as needed.
 */
export const BUNDLE_ICON_OPTIONS = { size: 'normal' } as const;

/**
 * Reading a bundle icon is presentation-only. The original unpackaged npm
 * Electron runtime could terminate natively while macOS resolved its bundle
 * icon, before the returned promise settled. Keep native icon loading for
 * packaged Maka.app builds and let the signed Maka Dev workflow use an empty
 * drag image instead.
 */
export async function loadNativeBundleIcon<T>(
 isPackaged: boolean,
 load: () => Promise<T>,
): Promise<T | null> {
 if (!isPackaged) return null;
 try {
 return await load();
 } catch {
 return null;
 }
}

export function resolveAppBundle(deps: ResolveAppBundleDeps): AppBundleResult {
 const { executablePath, platform, exists } = deps;
 if (platform !== 'darwin') {
Expand Down

46 changes: 23 additions & 23 deletions
apps/desktop/src/main/permission-overlay/permission-overlay-main.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,9 +22,10 @@ import { createRequire } from 'node:module';
import { existsSync } from 'node:fs';
import { join } from 'node:path';
import type { UiLocale } from '@maka/core/ui-locale';
import { desktopAssetPath } from '../desktop-assets.js';
import { resolveOverlayAssetDir } from '../overlay-assets.js';
import { openSystemPermissionPane, requestPermissionAccess } from '../permissions-actions.js';
import { BUNDLE_ICON_OPTIONS, loadNativeBundleIcon, resolveAppBundle } from './app-bundle.js';
import { resolveAppBundle } from './app-bundle.js';
import { getPermissionOverlayCopy } from './permission-overlay-copy.js';
import {
 createPermissionOverlayController,
Expand DownExpand Up@@ -64,7 +65,7 @@ export function createPermissionOverlayMain(
 let locale: UiLocale = 'en';
 let iconDataUrl: string | null = null;
 const electron = requireElectron('electron') as Electron;
 const { BrowserWindow, app, screen, systemPreferences } = electron;
 const { BrowserWindow, app, nativeImage, screen, systemPreferences } = electron;

 function isGranted(id: DragGrantPermissionId): boolean {
 if (process.platform !== 'darwin') return false;
Expand All@@ -74,15 +75,21 @@ export function createPermissionOverlayMain(
 return systemPreferences.getMediaAccessStatus('screen') === 'granted';
 }

 async function resolveAppIconDataUrl(bundlePath: string | null): Promise<string | null> {
 if (!bundlePath) return null;
 const icon = await loadNativeBundleIcon(app.isPackaged, () =>
 app.getFileIcon(bundlePath, BUNDLE_ICON_OPTIONS),
 function resolveAppIconDataUrl(): string | null {
 // The canonical 1024px icon ships in assets/ — the same PNG
 // electron-builder stamps onto the bundle. `app.getFileIcon()` is the
 // wrong source for an identity: macOS reduces the path to its UTType
 // and returns the generic application icon, never this app's own — and
 // requesting it at size 'large' killed packaged builds outright with a
 // fatal NOTREACHED inside Chromium's IconLoader (#3352).
 const icon = nativeImage.createFromPath(
 desktopAssetPath(
 { isPackaged: app.isPackaged, resourcesPath: process.resourcesPath },
 'assets',
 'icon.png',
 ),
 );
 if (!icon || icon.isEmpty()) return null;
 // nativeImage.createFromPath does not decode .icns reliably. Asking
 // macOS for the bundle icon returns the same image Finder and the TCC
 // list display for packaged Maka builds.
 if (icon.isEmpty()) return null;
 return icon.resize({ width: 64, height: 64 }).toDataURL();
 }

Expand DownExpand Up@@ -110,6 +117,10 @@ export function createPermissionOverlayMain(
 exists: existsSync,
 });
 const bundlePath = bundle.ok ? bundle.bundlePath : null;
 // Resolved here, at the only consumer, so a non-darwin start() never
 // pays the PNG decode; a null result (asset missing) retries on the
 // next card rather than caching the failure.
 iconDataUrl ??= resolveAppIconDataUrl();
 return {
 permission: id,
 appName: app.getName(),
Expand DownExpand Up@@ -187,12 +198,6 @@ export function createPermissionOverlayMain(
 } catch (error) {
 console.warn('[permission-overlay] locale lookup failed, keeping', locale, error);
 }
 const bundle = resolveAppBundle({
 executablePath: app.getPath('exe'),
 platform: process.platform,
 exists: existsSync,
 });
 iconDataUrl = await resolveAppIconDataUrl(bundle.ok ? bundle.bundlePath : null);
 return controller.start(id);
 },
 };
Expand DownExpand Up@@ -267,18 +272,13 @@ function attachCardGestures(win: import('electron').BrowserWindow): void {
 payload && typeof payload === 'object' && 'iconDataUrl' in payload
 ? (payload as { iconDataUrl?: unknown }).iconDataUrl
 : null;
 // The file drag still works without a decorative drag image, so a
 // failed decode degrades to an empty icon rather than a native read.
 let icon = nativeImage.createEmpty();
 if (typeof iconDataUrl === 'string' && iconDataUrl.startsWith('data:image/')) {
 const fromRenderer = nativeImage.createFromDataURL(iconDataUrl);
 if (!fromRenderer.isEmpty()) icon = fromRenderer;
 }
 if (icon.isEmpty()) {
 const fallback = await loadNativeBundleIcon(app.isPackaged, () =>
 app.getFileIcon(resolved.bundlePath, BUNDLE_ICON_OPTIONS),
 );
 if (fallback && !fallback.isEmpty()) icon = fallback.resize({ width: 64, height: 64 });
 // The file drag still works without a decorative drag image.
 }

 if (!win.isDestroyed()) win.webContents.startDrag({ file: resolved.bundlePath, icon });
 });
Expand Down

6 changes: 6 additions & 0 deletions
scripts/verify-packaged-app.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -714,6 +714,11 @@ export async function assertPackagedResources(
 // build, which predates the disclaimer being packaged. Requiring it there
 // would fail a release that was correct when it shipped.
 requireDisclaimer = true,
 // Same shape as the disclaimer: the canonical icon began shipping as an
 // extra resource with the window-icon fix, and the permission overlay
 // reads it at runtime, so current builds must carry it — but a
 // previously released baseline predates it.
 requireCanonicalIcon = true,
 } = {},
) {
 if (bundledGitContract !== 'forbidden' && bundledGitContract !== 'legacy-required') {
Expand All@@ -732,6 +737,7 @@ export async function assertPackagedResources(
 join('licenses', 'git', 'NOTICE.txt'),
 ]
 : []),
 ...(requireCanonicalIcon ? [join('assets', 'icon.png')] : []),
 join('workers', 'filesystem-worker.js'),
 join('licenses', 'maka', 'LICENSE'),
 join('licenses', 'maka', 'NOTICE'),
Expand Down

36 changes: 36 additions & 0 deletions
scripts/verify-packaged-app.test.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ test('legacy packaged resources require the historical bundled Git contract', as
 forbidPath: async (path) => forbidden.push(path),
 requireWindowsSandbox: false,
 bundledGitContract: 'legacy-required',
 requireCanonicalIcon: false,
 });

 for (const path of [
Expand DownExpand Up@@ -304,3 +305,38 @@ describe('assertPackagedDependencyClosure', () => {
 );
 });
});

// The resource list is contract, not implementation: the permission overlay
// reads `assets/icon.png` at runtime, so a current build that drops it ships
// a regression the app cannot report. The check is driven through the
// injectable `requirePath`, so it needs no packaging and no platform.
describe('assertPackagedResources', () => {
 const resources = join('fake', 'resources');
 const iconPath = join(resources, 'assets', 'icon.png');
 const requirePathMissing = (absent) => async (path) => {
 if (path === absent) throw new Error(`MISSING ${path}`);
 };
 const forbidPath = async () => {};

 test('a current build must carry the canonical icon', async () => {
 await assert.rejects(
 () =>
 assertPackagedResources(resources, {
 requirePath: requirePathMissing(iconPath),
 forbidPath,
 requireWindowsSandbox: false,
 }),
 /MISSING .*icon\.png/,
 );
 });

 test('a legacy baseline predating the packaged icon is not required to carry it', async () => {
 await assertPackagedResources(resources, {
 requirePath: requirePathMissing(iconPath),
 forbidPath,
 requireWindowsSandbox: false,
 requireDisclaimer: false,
 requireCanonicalIcon: false,
 });
 });
});

1 change: 1 addition & 0 deletions
scripts/verify-windows-x64.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,6 +110,7 @@ export async function verifyPackagedWindowsApp(
 requireWindowsSandbox: requiresCurrentContract,
 requireDisclaimer: requiresCurrentContract,
 bundledGitContract: requiresCurrentContract ? 'forbidden' : 'legacy-required',
 requireCanonicalIcon: requiresCurrentContract,
 });
 if (requiresCurrentContract) await assertPackagedDependencyClosure(resources);
 else await requirePath(join(resources, 'git', 'cmd', 'git.exe'));
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
fix(desktop): show the canonical Maka icon in the permission guide by UncertaintyDeterminesYou4ndMe · Pull Request #3464 · apache/maka · GitHub
Skip to content
fix(desktop): show the canonical Maka icon in the permission guide#3464

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jackwener
merged 1 commit into

from

Aug 22, 2026
 Merged


fix(desktop): show the canonical Maka icon in the permission guide
#3464
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


9 changes: 5 additions & 4 deletions
apps/desktop/electron-builder.config.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,10 +52,11 @@ export default {
 to: 'bundled-tools.json',
 },
 {
 // The app icon is read at runtime by the BrowserWindow `icon` option, and
 // `files` above does not carry `assets/`. Electron reports the missing
 // file as an empty image rather than an error, so without this the
 // packaged app just draws no window icon.
 // The app icon is read at runtime by the BrowserWindow `icon` option
 // and by the permission-overlay card, and `files` above does not carry
 // `assets/`. Electron reports the missing file as an empty image rather
 // than an error, so without this the packaged app just draws no window
 // icon; `assertPackagedResources` requires it on current builds.
 from: 'assets',
 to: 'assets',
 },
Expand Down

23 changes: 1 addition & 22 deletions
apps/desktop/src/main/__tests__/permission-overlay-controller.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,11 +20,7 @@ import {
 type PermissionOverlayDeps,
 type PermissionOverlayWindowLike,
} from '../permission-overlay/permission-overlay-controller.js';
import {
 BUNDLE_ICON_OPTIONS,
 loadNativeBundleIcon,
 resolveAppBundle,
} from '../permission-overlay/app-bundle.js';
import { resolveAppBundle } from '../permission-overlay/app-bundle.js';

/** Deterministic timer wheel — no real time passes in these tests. */
function createClock() {
Expand DownExpand Up@@ -307,23 +303,6 @@ describe('drag-to-grant permission overlay', () => {
});

describe('app bundle resolution for the drag', () => {
 it('never calls the native icon loader for an unpackaged app', async () => {
 let calls = 0;
 const icon = await loadNativeBundleIcon(false, async () => {
 calls += 1;
 return 'icon';
 });
 assert.equal(icon, null);
 assert.equal(calls, 0, 'unpackaged development must not call app.getFileIcon()');
 assert.equal(await loadNativeBundleIcon(true, async () => 'icon'), 'icon');
 });

 it('never requests the large icon size that kills packaged macOS builds', () => {
 // 'large' hits a fatal NOTREACHED inside Chromium's IconLoader on
 // macOS (SIGTRAP, not a catchable error) — see issue #3352.
 assert.notEqual(BUNDLE_ICON_OPTIONS.size as string, 'large');
 });

 it('walks three levels up from the executable to the .app', () => {
 assert.deepEqual(
 resolveAppBundle({
Expand Down

28 changes: 0 additions & 28 deletions
apps/desktop/src/main/permission-overlay/app-bundle.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,34 +34,6 @@ export interface ResolveAppBundleDeps {
 exists(path: string): boolean;
}

/**
 * The only size every platform can actually deliver. `'large'` is
 * unsupported on macOS: Chromium's IconLoader hits a fatal NOTREACHED and
 * the process dies with SIGTRAP before the promise settles — no JavaScript
 * error is ever thrown, so the try/catch in `loadNativeBundleIcon` cannot
 * save the app. Callers upscale the 32x32 result as needed.
 */
export const BUNDLE_ICON_OPTIONS = { size: 'normal' } as const;

/**
 * Reading a bundle icon is presentation-only. The original unpackaged npm
 * Electron runtime could terminate natively while macOS resolved its bundle
 * icon, before the returned promise settled. Keep native icon loading for
 * packaged Maka.app builds and let the signed Maka Dev workflow use an empty
 * drag image instead.
 */
export async function loadNativeBundleIcon<T>(
 isPackaged: boolean,
 load: () => Promise<T>,
): Promise<T | null> {
 if (!isPackaged) return null;
 try {
 return await load();
 } catch {
 return null;
 }
}

export function resolveAppBundle(deps: ResolveAppBundleDeps): AppBundleResult {
 const { executablePath, platform, exists } = deps;
 if (platform !== 'darwin') {
Expand Down

46 changes: 23 additions & 23 deletions
apps/desktop/src/main/permission-overlay/permission-overlay-main.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,9 +22,10 @@ import { createRequire } from 'node:module';
import { existsSync } from 'node:fs';
import { join } from 'node:path';
import type { UiLocale } from '@maka/core/ui-locale';
import { desktopAssetPath } from '../desktop-assets.js';
import { resolveOverlayAssetDir } from '../overlay-assets.js';
import { openSystemPermissionPane, requestPermissionAccess } from '../permissions-actions.js';
import { BUNDLE_ICON_OPTIONS, loadNativeBundleIcon, resolveAppBundle } from './app-bundle.js';
import { resolveAppBundle } from './app-bundle.js';
import { getPermissionOverlayCopy } from './permission-overlay-copy.js';
import {
 createPermissionOverlayController,
Expand DownExpand Up@@ -64,7 +65,7 @@ export function createPermissionOverlayMain(
 let locale: UiLocale = 'en';
 let iconDataUrl: string | null = null;
 const electron = requireElectron('electron') as Electron;
 const { BrowserWindow, app, screen, systemPreferences } = electron;
 const { BrowserWindow, app, nativeImage, screen, systemPreferences } = electron;

 function isGranted(id: DragGrantPermissionId): boolean {
 if (process.platform !== 'darwin') return false;
Expand All@@ -74,15 +75,21 @@ export function createPermissionOverlayMain(
 return systemPreferences.getMediaAccessStatus('screen') === 'granted';
 }

 async function resolveAppIconDataUrl(bundlePath: string | null): Promise<string | null> {
 if (!bundlePath) return null;
 const icon = await loadNativeBundleIcon(app.isPackaged, () =>
 app.getFileIcon(bundlePath, BUNDLE_ICON_OPTIONS),
 function resolveAppIconDataUrl(): string | null {
 // The canonical 1024px icon ships in assets/ — the same PNG
 // electron-builder stamps onto the bundle. `app.getFileIcon()` is the
 // wrong source for an identity: macOS reduces the path to its UTType
 // and returns the generic application icon, never this app's own — and
 // requesting it at size 'large' killed packaged builds outright with a
 // fatal NOTREACHED inside Chromium's IconLoader (#3352).
 const icon = nativeImage.createFromPath(
 desktopAssetPath(
 { isPackaged: app.isPackaged, resourcesPath: process.resourcesPath },
 'assets',
 'icon.png',
 ),
 );
 if (!icon || icon.isEmpty()) return null;
 // nativeImage.createFromPath does not decode .icns reliably. Asking
 // macOS for the bundle icon returns the same image Finder and the TCC
 // list display for packaged Maka builds.
 if (icon.isEmpty()) return null;
 return icon.resize({ width: 64, height: 64 }).toDataURL();
 }

Expand DownExpand Up@@ -110,6 +117,10 @@ export function createPermissionOverlayMain(
 exists: existsSync,
 });
 const bundlePath = bundle.ok ? bundle.bundlePath : null;
 // Resolved here, at the only consumer, so a non-darwin start() never
 // pays the PNG decode; a null result (asset missing) retries on the
 // next card rather than caching the failure.
 iconDataUrl ??= resolveAppIconDataUrl();
 return {
 permission: id,
 appName: app.getName(),
Expand DownExpand Up@@ -187,12 +198,6 @@ export function createPermissionOverlayMain(
 } catch (error) {
 console.warn('[permission-overlay] locale lookup failed, keeping', locale, error);
 }
 const bundle = resolveAppBundle({
 executablePath: app.getPath('exe'),
 platform: process.platform,
 exists: existsSync,
 });
 iconDataUrl = await resolveAppIconDataUrl(bundle.ok ? bundle.bundlePath : null);
 return controller.start(id);
 },
 };
Expand DownExpand Up@@ -267,18 +272,13 @@ function attachCardGestures(win: import('electron').BrowserWindow): void {
 payload && typeof payload === 'object' && 'iconDataUrl' in payload
 ? (payload as { iconDataUrl?: unknown }).iconDataUrl
 : null;
 // The file drag still works without a decorative drag image, so a
 // failed decode degrades to an empty icon rather than a native read.
 let icon = nativeImage.createEmpty();
 if (typeof iconDataUrl === 'string' && iconDataUrl.startsWith('data:image/')) {
 const fromRenderer = nativeImage.createFromDataURL(iconDataUrl);
 if (!fromRenderer.isEmpty()) icon = fromRenderer;
 }
 if (icon.isEmpty()) {
 const fallback = await loadNativeBundleIcon(app.isPackaged, () =>
 app.getFileIcon(resolved.bundlePath, BUNDLE_ICON_OPTIONS),
 );
 if (fallback && !fallback.isEmpty()) icon = fallback.resize({ width: 64, height: 64 });
 // The file drag still works without a decorative drag image.
 }

 if (!win.isDestroyed()) win.webContents.startDrag({ file: resolved.bundlePath, icon });
 });
Expand Down

6 changes: 6 additions & 0 deletions
scripts/verify-packaged-app.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -714,6 +714,11 @@ export async function assertPackagedResources(
 // build, which predates the disclaimer being packaged. Requiring it there
 // would fail a release that was correct when it shipped.
 requireDisclaimer = true,
 // Same shape as the disclaimer: the canonical icon began shipping as an
 // extra resource with the window-icon fix, and the permission overlay
 // reads it at runtime, so current builds must carry it — but a
 // previously released baseline predates it.
 requireCanonicalIcon = true,
 } = {},
) {
 if (bundledGitContract !== 'forbidden' && bundledGitContract !== 'legacy-required') {
Expand All@@ -732,6 +737,7 @@ export async function assertPackagedResources(
 join('licenses', 'git', 'NOTICE.txt'),
 ]
 : []),
 ...(requireCanonicalIcon ? [join('assets', 'icon.png')] : []),
 join('workers', 'filesystem-worker.js'),
 join('licenses', 'maka', 'LICENSE'),
 join('licenses', 'maka', 'NOTICE'),
Expand Down

36 changes: 36 additions & 0 deletions
scripts/verify-packaged-app.test.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ test('legacy packaged resources require the historical bundled Git contract', as
 forbidPath: async (path) => forbidden.push(path),
 requireWindowsSandbox: false,
 bundledGitContract: 'legacy-required',
 requireCanonicalIcon: false,
 });

 for (const path of [
Expand DownExpand Up@@ -304,3 +305,38 @@ describe('assertPackagedDependencyClosure', () => {
 );
 });
});

// The resource list is contract, not implementation: the permission overlay
// reads `assets/icon.png` at runtime, so a current build that drops it ships
// a regression the app cannot report. The check is driven through the
// injectable `requirePath`, so it needs no packaging and no platform.
describe('assertPackagedResources', () => {
 const resources = join('fake', 'resources');
 const iconPath = join(resources, 'assets', 'icon.png');
 const requirePathMissing = (absent) => async (path) => {
 if (path === absent) throw new Error(`MISSING ${path}`);
 };
 const forbidPath = async () => {};

 test('a current build must carry the canonical icon', async () => {
 await assert.rejects(
 () =>
 assertPackagedResources(resources, {
 requirePath: requirePathMissing(iconPath),
 forbidPath,
 requireWindowsSandbox: false,
 }),
 /MISSING .*icon\.png/,
 );
 });

 test('a legacy baseline predating the packaged icon is not required to carry it', async () => {
 await assertPackagedResources(resources, {
 requirePath: requirePathMissing(iconPath),
 forbidPath,
 requireWindowsSandbox: false,
 requireDisclaimer: false,
 requireCanonicalIcon: false,
 });
 });
});

1 change: 1 addition & 0 deletions
scripts/verify-windows-x64.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,6 +110,7 @@ export async function verifyPackagedWindowsApp(
 requireWindowsSandbox: requiresCurrentContract,
 requireDisclaimer: requiresCurrentContract,
 bundledGitContract: requiresCurrentContract ? 'forbidden' : 'legacy-required',
 requireCanonicalIcon: requiresCurrentContract,
 });
 if (requiresCurrentContract) await assertPackagedDependencyClosure(resources);
 else await requirePath(join(resources, 'git', 'cmd', 'git.exe'));
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(desktop): show the canonical Maka icon in the permission guide by UncertaintyDeterminesYou4ndMe · Pull Request #3464 · apache/maka · GitHub
Skip to content
fix(desktop): show the canonical Maka icon in the permission guide#3464

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jackwener
merged 1 commit into

from

Aug 22, 2026
 Merged


fix(desktop): show the canonical Maka icon in the permission guide
#3464
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


9 changes: 5 additions & 4 deletions
apps/desktop/electron-builder.config.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,10 +52,11 @@ export default {
 to: 'bundled-tools.json',
 },
 {
 // The app icon is read at runtime by the BrowserWindow `icon` option, and
 // `files` above does not carry `assets/`. Electron reports the missing
 // file as an empty image rather than an error, so without this the
 // packaged app just draws no window icon.
 // The app icon is read at runtime by the BrowserWindow `icon` option
 // and by the permission-overlay card, and `files` above does not carry
 // `assets/`. Electron reports the missing file as an empty image rather
 // than an error, so without this the packaged app just draws no window
 // icon; `assertPackagedResources` requires it on current builds.
 from: 'assets',
 to: 'assets',
 },
Expand Down

23 changes: 1 addition & 22 deletions
apps/desktop/src/main/__tests__/permission-overlay-controller.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,11 +20,7 @@ import {
 type PermissionOverlayDeps,
 type PermissionOverlayWindowLike,
} from '../permission-overlay/permission-overlay-controller.js';
import {
 BUNDLE_ICON_OPTIONS,
 loadNativeBundleIcon,
 resolveAppBundle,
} from '../permission-overlay/app-bundle.js';
import { resolveAppBundle } from '../permission-overlay/app-bundle.js';

/** Deterministic timer wheel — no real time passes in these tests. */
function createClock() {
Expand DownExpand Up@@ -307,23 +303,6 @@ describe('drag-to-grant permission overlay', () => {
});

describe('app bundle resolution for the drag', () => {
 it('never calls the native icon loader for an unpackaged app', async () => {
 let calls = 0;
 const icon = await loadNativeBundleIcon(false, async () => {
 calls += 1;
 return 'icon';
 });
 assert.equal(icon, null);
 assert.equal(calls, 0, 'unpackaged development must not call app.getFileIcon()');
 assert.equal(await loadNativeBundleIcon(true, async () => 'icon'), 'icon');
 });

 it('never requests the large icon size that kills packaged macOS builds', () => {
 // 'large' hits a fatal NOTREACHED inside Chromium's IconLoader on
 // macOS (SIGTRAP, not a catchable error) — see issue #3352.
 assert.notEqual(BUNDLE_ICON_OPTIONS.size as string, 'large');
 });

 it('walks three levels up from the executable to the .app', () => {
 assert.deepEqual(
 resolveAppBundle({
Expand Down

28 changes: 0 additions & 28 deletions
apps/desktop/src/main/permission-overlay/app-bundle.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,34 +34,6 @@ export interface ResolveAppBundleDeps {
 exists(path: string): boolean;
}

/**
 * The only size every platform can actually deliver. `'large'` is
 * unsupported on macOS: Chromium's IconLoader hits a fatal NOTREACHED and
 * the process dies with SIGTRAP before the promise settles — no JavaScript
 * error is ever thrown, so the try/catch in `loadNativeBundleIcon` cannot
 * save the app. Callers upscale the 32x32 result as needed.
 */
export const BUNDLE_ICON_OPTIONS = { size: 'normal' } as const;

/**
 * Reading a bundle icon is presentation-only. The original unpackaged npm
 * Electron runtime could terminate natively while macOS resolved its bundle
 * icon, before the returned promise settled. Keep native icon loading for
 * packaged Maka.app builds and let the signed Maka Dev workflow use an empty
 * drag image instead.
 */
export async function loadNativeBundleIcon<T>(
 isPackaged: boolean,
 load: () => Promise<T>,
): Promise<T | null> {
 if (!isPackaged) return null;
 try {
 return await load();
 } catch {
 return null;
 }
}

export function resolveAppBundle(deps: ResolveAppBundleDeps): AppBundleResult {
 const { executablePath, platform, exists } = deps;
 if (platform !== 'darwin') {
Expand Down

46 changes: 23 additions & 23 deletions
apps/desktop/src/main/permission-overlay/permission-overlay-main.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,9 +22,10 @@ import { createRequire } from 'node:module';
import { existsSync } from 'node:fs';
import { join } from 'node:path';
import type { UiLocale } from '@maka/core/ui-locale';
import { desktopAssetPath } from '../desktop-assets.js';
import { resolveOverlayAssetDir } from '../overlay-assets.js';
import { openSystemPermissionPane, requestPermissionAccess } from '../permissions-actions.js';
import { BUNDLE_ICON_OPTIONS, loadNativeBundleIcon, resolveAppBundle } from './app-bundle.js';
import { resolveAppBundle } from './app-bundle.js';
import { getPermissionOverlayCopy } from './permission-overlay-copy.js';
import {
 createPermissionOverlayController,
Expand DownExpand Up@@ -64,7 +65,7 @@ export function createPermissionOverlayMain(
 let locale: UiLocale = 'en';
 let iconDataUrl: string | null = null;
 const electron = requireElectron('electron') as Electron;
 const { BrowserWindow, app, screen, systemPreferences } = electron;
 const { BrowserWindow, app, nativeImage, screen, systemPreferences } = electron;

 function isGranted(id: DragGrantPermissionId): boolean {
 if (process.platform !== 'darwin') return false;
Expand All@@ -74,15 +75,21 @@ export function createPermissionOverlayMain(
 return systemPreferences.getMediaAccessStatus('screen') === 'granted';
 }

 async function resolveAppIconDataUrl(bundlePath: string | null): Promise<string | null> {
 if (!bundlePath) return null;
 const icon = await loadNativeBundleIcon(app.isPackaged, () =>
 app.getFileIcon(bundlePath, BUNDLE_ICON_OPTIONS),
 function resolveAppIconDataUrl(): string | null {
 // The canonical 1024px icon ships in assets/ — the same PNG
 // electron-builder stamps onto the bundle. `app.getFileIcon()` is the
 // wrong source for an identity: macOS reduces the path to its UTType
 // and returns the generic application icon, never this app's own — and
 // requesting it at size 'large' killed packaged builds outright with a
 // fatal NOTREACHED inside Chromium's IconLoader (#3352).
 const icon = nativeImage.createFromPath(
 desktopAssetPath(
 { isPackaged: app.isPackaged, resourcesPath: process.resourcesPath },
 'assets',
 'icon.png',
 ),
 );
 if (!icon || icon.isEmpty()) return null;
 // nativeImage.createFromPath does not decode .icns reliably. Asking
 // macOS for the bundle icon returns the same image Finder and the TCC
 // list display for packaged Maka builds.
 if (icon.isEmpty()) return null;
 return icon.resize({ width: 64, height: 64 }).toDataURL();
 }

Expand DownExpand Up@@ -110,6 +117,10 @@ export function createPermissionOverlayMain(
 exists: existsSync,
 });
 const bundlePath = bundle.ok ? bundle.bundlePath : null;
 // Resolved here, at the only consumer, so a non-darwin start() never
 // pays the PNG decode; a null result (asset missing) retries on the
 // next card rather than caching the failure.
 iconDataUrl ??= resolveAppIconDataUrl();
 return {
 permission: id,
 appName: app.getName(),
Expand DownExpand Up@@ -187,12 +198,6 @@ export function createPermissionOverlayMain(
 } catch (error) {
 console.warn('[permission-overlay] locale lookup failed, keeping', locale, error);
 }
 const bundle = resolveAppBundle({
 executablePath: app.getPath('exe'),
 platform: process.platform,
 exists: existsSync,
 });
 iconDataUrl = await resolveAppIconDataUrl(bundle.ok ? bundle.bundlePath : null);
 return controller.start(id);
 },
 };
Expand DownExpand Up@@ -267,18 +272,13 @@ function attachCardGestures(win: import('electron').BrowserWindow): void {
 payload && typeof payload === 'object' && 'iconDataUrl' in payload
 ? (payload as { iconDataUrl?: unknown }).iconDataUrl
 : null;
 // The file drag still works without a decorative drag image, so a
 // failed decode degrades to an empty icon rather than a native read.
 let icon = nativeImage.createEmpty();
 if (typeof iconDataUrl === 'string' && iconDataUrl.startsWith('data:image/')) {
 const fromRenderer = nativeImage.createFromDataURL(iconDataUrl);
 if (!fromRenderer.isEmpty()) icon = fromRenderer;
 }
 if (icon.isEmpty()) {
 const fallback = await loadNativeBundleIcon(app.isPackaged, () =>
 app.getFileIcon(resolved.bundlePath, BUNDLE_ICON_OPTIONS),
 );
 if (fallback && !fallback.isEmpty()) icon = fallback.resize({ width: 64, height: 64 });
 // The file drag still works without a decorative drag image.
 }

 if (!win.isDestroyed()) win.webContents.startDrag({ file: resolved.bundlePath, icon });
 });
Expand Down

6 changes: 6 additions & 0 deletions
scripts/verify-packaged-app.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -714,6 +714,11 @@ export async function assertPackagedResources(
 // build, which predates the disclaimer being packaged. Requiring it there
 // would fail a release that was correct when it shipped.
 requireDisclaimer = true,
 // Same shape as the disclaimer: the canonical icon began shipping as an
 // extra resource with the window-icon fix, and the permission overlay
 // reads it at runtime, so current builds must carry it — but a
 // previously released baseline predates it.
 requireCanonicalIcon = true,
 } = {},
) {
 if (bundledGitContract !== 'forbidden' && bundledGitContract !== 'legacy-required') {
Expand All@@ -732,6 +737,7 @@ export async function assertPackagedResources(
 join('licenses', 'git', 'NOTICE.txt'),
 ]
 : []),
 ...(requireCanonicalIcon ? [join('assets', 'icon.png')] : []),
 join('workers', 'filesystem-worker.js'),
 join('licenses', 'maka', 'LICENSE'),
 join('licenses', 'maka', 'NOTICE'),
Expand Down

36 changes: 36 additions & 0 deletions
scripts/verify-packaged-app.test.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ test('legacy packaged resources require the historical bundled Git contract', as
 forbidPath: async (path) => forbidden.push(path),
 requireWindowsSandbox: false,
 bundledGitContract: 'legacy-required',
 requireCanonicalIcon: false,
 });

 for (const path of [
Expand DownExpand Up@@ -304,3 +305,38 @@ describe('assertPackagedDependencyClosure', () => {
 );
 });
});

// The resource list is contract, not implementation: the permission overlay
// reads `assets/icon.png` at runtime, so a current build that drops it ships
// a regression the app cannot report. The check is driven through the
// injectable `requirePath`, so it needs no packaging and no platform.
describe('assertPackagedResources', () => {
 const resources = join('fake', 'resources');
 const iconPath = join(resources, 'assets', 'icon.png');
 const requirePathMissing = (absent) => async (path) => {
 if (path === absent) throw new Error(`MISSING ${path}`);
 };
 const forbidPath = async () => {};

 test('a current build must carry the canonical icon', async () => {
 await assert.rejects(
 () =>
 assertPackagedResources(resources, {
 requirePath: requirePathMissing(iconPath),
 forbidPath,
 requireWindowsSandbox: false,
 }),
 /MISSING .*icon\.png/,
 );
 });

 test('a legacy baseline predating the packaged icon is not required to carry it', async () => {
 await assertPackagedResources(resources, {
 requirePath: requirePathMissing(iconPath),
 forbidPath,
 requireWindowsSandbox: false,
 requireDisclaimer: false,
 requireCanonicalIcon: false,
 });
 });
});

1 change: 1 addition & 0 deletions
scripts/verify-windows-x64.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,6 +110,7 @@ export async function verifyPackagedWindowsApp(
 requireWindowsSandbox: requiresCurrentContract,
 requireDisclaimer: requiresCurrentContract,
 bundledGitContract: requiresCurrentContract ? 'forbidden' : 'legacy-required',
 requireCanonicalIcon: requiresCurrentContract,
 });
 if (requiresCurrentContract) await assertPackagedDependencyClosure(resources);
 else await requirePath(join(resources, 'git', 'cmd', 'git.exe'));
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(desktop): show the canonical Maka icon in the permission guide by UncertaintyDeterminesYou4ndMe · Pull Request #3464 · apache/maka · GitHub
Skip to content
fix(desktop): show the canonical Maka icon in the permission guide#3464

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jackwener
merged 1 commit into

from

Aug 22, 2026
 Merged


fix(desktop): show the canonical Maka icon in the permission guide
#3464
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


9 changes: 5 additions & 4 deletions
apps/desktop/electron-builder.config.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,10 +52,11 @@ export default {
 to: 'bundled-tools.json',
 },
 {
 // The app icon is read at runtime by the BrowserWindow `icon` option, and
 // `files` above does not carry `assets/`. Electron reports the missing
 // file as an empty image rather than an error, so without this the
 // packaged app just draws no window icon.
 // The app icon is read at runtime by the BrowserWindow `icon` option
 // and by the permission-overlay card, and `files` above does not carry
 // `assets/`. Electron reports the missing file as an empty image rather
 // than an error, so without this the packaged app just draws no window
 // icon; `assertPackagedResources` requires it on current builds.
 from: 'assets',
 to: 'assets',
 },
Expand Down

23 changes: 1 addition & 22 deletions
apps/desktop/src/main/__tests__/permission-overlay-controller.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,11 +20,7 @@ import {
 type PermissionOverlayDeps,
 type PermissionOverlayWindowLike,
} from '../permission-overlay/permission-overlay-controller.js';
import {
 BUNDLE_ICON_OPTIONS,
 loadNativeBundleIcon,
 resolveAppBundle,
} from '../permission-overlay/app-bundle.js';
import { resolveAppBundle } from '../permission-overlay/app-bundle.js';

/** Deterministic timer wheel — no real time passes in these tests. */
function createClock() {
Expand DownExpand Up@@ -307,23 +303,6 @@ describe('drag-to-grant permission overlay', () => {
});

describe('app bundle resolution for the drag', () => {
 it('never calls the native icon loader for an unpackaged app', async () => {
 let calls = 0;
 const icon = await loadNativeBundleIcon(false, async () => {
 calls += 1;
 return 'icon';
 });
 assert.equal(icon, null);
 assert.equal(calls, 0, 'unpackaged development must not call app.getFileIcon()');
 assert.equal(await loadNativeBundleIcon(true, async () => 'icon'), 'icon');
 });

 it('never requests the large icon size that kills packaged macOS builds', () => {
 // 'large' hits a fatal NOTREACHED inside Chromium's IconLoader on
 // macOS (SIGTRAP, not a catchable error) — see issue #3352.
 assert.notEqual(BUNDLE_ICON_OPTIONS.size as string, 'large');
 });

 it('walks three levels up from the executable to the .app', () => {
 assert.deepEqual(
 resolveAppBundle({
Expand Down

28 changes: 0 additions & 28 deletions
apps/desktop/src/main/permission-overlay/app-bundle.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,34 +34,6 @@ export interface ResolveAppBundleDeps {
 exists(path: string): boolean;
}

/**
 * The only size every platform can actually deliver. `'large'` is
 * unsupported on macOS: Chromium's IconLoader hits a fatal NOTREACHED and
 * the process dies with SIGTRAP before the promise settles — no JavaScript
 * error is ever thrown, so the try/catch in `loadNativeBundleIcon` cannot
 * save the app. Callers upscale the 32x32 result as needed.
 */
export const BUNDLE_ICON_OPTIONS = { size: 'normal' } as const;

/**
 * Reading a bundle icon is presentation-only. The original unpackaged npm
 * Electron runtime could terminate natively while macOS resolved its bundle
 * icon, before the returned promise settled. Keep native icon loading for
 * packaged Maka.app builds and let the signed Maka Dev workflow use an empty
 * drag image instead.
 */
export async function loadNativeBundleIcon<T>(
 isPackaged: boolean,
 load: () => Promise<T>,
): Promise<T | null> {
 if (!isPackaged) return null;
 try {
 return await load();
 } catch {
 return null;
 }
}

export function resolveAppBundle(deps: ResolveAppBundleDeps): AppBundleResult {
 const { executablePath, platform, exists } = deps;
 if (platform !== 'darwin') {
Expand Down

46 changes: 23 additions & 23 deletions
apps/desktop/src/main/permission-overlay/permission-overlay-main.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,9 +22,10 @@ import { createRequire } from 'node:module';
import { existsSync } from 'node:fs';
import { join } from 'node:path';
import type { UiLocale } from '@maka/core/ui-locale';
import { desktopAssetPath } from '../desktop-assets.js';
import { resolveOverlayAssetDir } from '../overlay-assets.js';
import { openSystemPermissionPane, requestPermissionAccess } from '../permissions-actions.js';
import { BUNDLE_ICON_OPTIONS, loadNativeBundleIcon, resolveAppBundle } from './app-bundle.js';
import { resolveAppBundle } from './app-bundle.js';
import { getPermissionOverlayCopy } from './permission-overlay-copy.js';
import {
 createPermissionOverlayController,
Expand DownExpand Up@@ -64,7 +65,7 @@ export function createPermissionOverlayMain(
 let locale: UiLocale = 'en';
 let iconDataUrl: string | null = null;
 const electron = requireElectron('electron') as Electron;
 const { BrowserWindow, app, screen, systemPreferences } = electron;
 const { BrowserWindow, app, nativeImage, screen, systemPreferences } = electron;

 function isGranted(id: DragGrantPermissionId): boolean {
 if (process.platform !== 'darwin') return false;
Expand All@@ -74,15 +75,21 @@ export function createPermissionOverlayMain(
 return systemPreferences.getMediaAccessStatus('screen') === 'granted';
 }

 async function resolveAppIconDataUrl(bundlePath: string | null): Promise<string | null> {
 if (!bundlePath) return null;
 const icon = await loadNativeBundleIcon(app.isPackaged, () =>
 app.getFileIcon(bundlePath, BUNDLE_ICON_OPTIONS),
 function resolveAppIconDataUrl(): string | null {
 // The canonical 1024px icon ships in assets/ — the same PNG
 // electron-builder stamps onto the bundle. `app.getFileIcon()` is the
 // wrong source for an identity: macOS reduces the path to its UTType
 // and returns the generic application icon, never this app's own — and
 // requesting it at size 'large' killed packaged builds outright with a
 // fatal NOTREACHED inside Chromium's IconLoader (#3352).
 const icon = nativeImage.createFromPath(
 desktopAssetPath(
 { isPackaged: app.isPackaged, resourcesPath: process.resourcesPath },
 'assets',
 'icon.png',
 ),
 );
 if (!icon || icon.isEmpty()) return null;
 // nativeImage.createFromPath does not decode .icns reliably. Asking
 // macOS for the bundle icon returns the same image Finder and the TCC
 // list display for packaged Maka builds.
 if (icon.isEmpty()) return null;
 return icon.resize({ width: 64, height: 64 }).toDataURL();
 }

Expand DownExpand Up@@ -110,6 +117,10 @@ export function createPermissionOverlayMain(
 exists: existsSync,
 });
 const bundlePath = bundle.ok ? bundle.bundlePath : null;
 // Resolved here, at the only consumer, so a non-darwin start() never
 // pays the PNG decode; a null result (asset missing) retries on the
 // next card rather than caching the failure.
 iconDataUrl ??= resolveAppIconDataUrl();
 return {
 permission: id,
 appName: app.getName(),
Expand DownExpand Up@@ -187,12 +198,6 @@ export function createPermissionOverlayMain(
 } catch (error) {
 console.warn('[permission-overlay] locale lookup failed, keeping', locale, error);
 }
 const bundle = resolveAppBundle({
 executablePath: app.getPath('exe'),
 platform: process.platform,
 exists: existsSync,
 });
 iconDataUrl = await resolveAppIconDataUrl(bundle.ok ? bundle.bundlePath : null);
 return controller.start(id);
 },
 };
Expand DownExpand Up@@ -267,18 +272,13 @@ function attachCardGestures(win: import('electron').BrowserWindow): void {
 payload && typeof payload === 'object' && 'iconDataUrl' in payload
 ? (payload as { iconDataUrl?: unknown }).iconDataUrl
 : null;
 // The file drag still works without a decorative drag image, so a
 // failed decode degrades to an empty icon rather than a native read.
 let icon = nativeImage.createEmpty();
 if (typeof iconDataUrl === 'string' && iconDataUrl.startsWith('data:image/')) {
 const fromRenderer = nativeImage.createFromDataURL(iconDataUrl);
 if (!fromRenderer.isEmpty()) icon = fromRenderer;
 }
 if (icon.isEmpty()) {
 const fallback = await loadNativeBundleIcon(app.isPackaged, () =>
 app.getFileIcon(resolved.bundlePath, BUNDLE_ICON_OPTIONS),
 );
 if (fallback && !fallback.isEmpty()) icon = fallback.resize({ width: 64, height: 64 });
 // The file drag still works without a decorative drag image.
 }

 if (!win.isDestroyed()) win.webContents.startDrag({ file: resolved.bundlePath, icon });
 });
Expand Down

6 changes: 6 additions & 0 deletions
scripts/verify-packaged-app.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -714,6 +714,11 @@ export async function assertPackagedResources(
 // build, which predates the disclaimer being packaged. Requiring it there
 // would fail a release that was correct when it shipped.
 requireDisclaimer = true,
 // Same shape as the disclaimer: the canonical icon began shipping as an
 // extra resource with the window-icon fix, and the permission overlay
 // reads it at runtime, so current builds must carry it — but a
 // previously released baseline predates it.
 requireCanonicalIcon = true,
 } = {},
) {
 if (bundledGitContract !== 'forbidden' && bundledGitContract !== 'legacy-required') {
Expand All@@ -732,6 +737,7 @@ export async function assertPackagedResources(
 join('licenses', 'git', 'NOTICE.txt'),
 ]
 : []),
 ...(requireCanonicalIcon ? [join('assets', 'icon.png')] : []),
 join('workers', 'filesystem-worker.js'),
 join('licenses', 'maka', 'LICENSE'),
 join('licenses', 'maka', 'NOTICE'),
Expand Down

36 changes: 36 additions & 0 deletions
scripts/verify-packaged-app.test.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ test('legacy packaged resources require the historical bundled Git contract', as
 forbidPath: async (path) => forbidden.push(path),
 requireWindowsSandbox: false,
 bundledGitContract: 'legacy-required',
 requireCanonicalIcon: false,
 });

 for (const path of [
Expand DownExpand Up@@ -304,3 +305,38 @@ describe('assertPackagedDependencyClosure', () => {
 );
 });
});

// The resource list is contract, not implementation: the permission overlay
// reads `assets/icon.png` at runtime, so a current build that drops it ships
// a regression the app cannot report. The check is driven through the
// injectable `requirePath`, so it needs no packaging and no platform.
describe('assertPackagedResources', () => {
 const resources = join('fake', 'resources');
 const iconPath = join(resources, 'assets', 'icon.png');
 const requirePathMissing = (absent) => async (path) => {
 if (path === absent) throw new Error(`MISSING ${path}`);
 };
 const forbidPath = async () => {};

 test('a current build must carry the canonical icon', async () => {
 await assert.rejects(
 () =>
 assertPackagedResources(resources, {
 requirePath: requirePathMissing(iconPath),
 forbidPath,
 requireWindowsSandbox: false,
 }),
 /MISSING .*icon\.png/,
 );
 });

 test('a legacy baseline predating the packaged icon is not required to carry it', async () => {
 await assertPackagedResources(resources, {
 requirePath: requirePathMissing(iconPath),
 forbidPath,
 requireWindowsSandbox: false,
 requireDisclaimer: false,
 requireCanonicalIcon: false,
 });
 });
});

1 change: 1 addition & 0 deletions
scripts/verify-windows-x64.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,6 +110,7 @@ export async function verifyPackagedWindowsApp(
 requireWindowsSandbox: requiresCurrentContract,
 requireDisclaimer: requiresCurrentContract,
 bundledGitContract: requiresCurrentContract ? 'forbidden' : 'legacy-required',
 requireCanonicalIcon: requiresCurrentContract,
 });
 if (requiresCurrentContract) await assertPackagedDependencyClosure(resources);
 else await requirePath(join(resources, 'git', 'cmd', 'git.exe'));
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
fix(desktop): show the canonical Maka icon in the permission guide by UncertaintyDeterminesYou4ndMe · Pull Request #3464 · apache/maka · GitHub
Skip to content
fix(desktop): show the canonical Maka icon in the permission guide#3464

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jackwener
merged 1 commit into

from

Aug 22, 2026
 Merged


fix(desktop): show the canonical Maka icon in the permission guide
#3464
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


9 changes: 5 additions & 4 deletions
apps/desktop/electron-builder.config.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,10 +52,11 @@ export default {
 to: 'bundled-tools.json',
 },
 {
 // The app icon is read at runtime by the BrowserWindow `icon` option, and
 // `files` above does not carry `assets/`. Electron reports the missing
 // file as an empty image rather than an error, so without this the
 // packaged app just draws no window icon.
 // The app icon is read at runtime by the BrowserWindow `icon` option
 // and by the permission-overlay card, and `files` above does not carry
 // `assets/`. Electron reports the missing file as an empty image rather
 // than an error, so without this the packaged app just draws no window
 // icon; `assertPackagedResources` requires it on current builds.
 from: 'assets',
 to: 'assets',
 },
Expand Down

23 changes: 1 addition & 22 deletions
apps/desktop/src/main/__tests__/permission-overlay-controller.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,11 +20,7 @@ import {
 type PermissionOverlayDeps,
 type PermissionOverlayWindowLike,
} from '../permission-overlay/permission-overlay-controller.js';
import {
 BUNDLE_ICON_OPTIONS,
 loadNativeBundleIcon,
 resolveAppBundle,
} from '../permission-overlay/app-bundle.js';
import { resolveAppBundle } from '../permission-overlay/app-bundle.js';

/** Deterministic timer wheel — no real time passes in these tests. */
function createClock() {
Expand DownExpand Up@@ -307,23 +303,6 @@ describe('drag-to-grant permission overlay', () => {
});

describe('app bundle resolution for the drag', () => {
 it('never calls the native icon loader for an unpackaged app', async () => {
 let calls = 0;
 const icon = await loadNativeBundleIcon(false, async () => {
 calls += 1;
 return 'icon';
 });
 assert.equal(icon, null);
 assert.equal(calls, 0, 'unpackaged development must not call app.getFileIcon()');
 assert.equal(await loadNativeBundleIcon(true, async () => 'icon'), 'icon');
 });

 it('never requests the large icon size that kills packaged macOS builds', () => {
 // 'large' hits a fatal NOTREACHED inside Chromium's IconLoader on
 // macOS (SIGTRAP, not a catchable error) — see issue #3352.
 assert.notEqual(BUNDLE_ICON_OPTIONS.size as string, 'large');
 });

 it('walks three levels up from the executable to the .app', () => {
 assert.deepEqual(
 resolveAppBundle({
Expand Down

28 changes: 0 additions & 28 deletions
apps/desktop/src/main/permission-overlay/app-bundle.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,34 +34,6 @@ export interface ResolveAppBundleDeps {
 exists(path: string): boolean;
}

/**
 * The only size every platform can actually deliver. `'large'` is
 * unsupported on macOS: Chromium's IconLoader hits a fatal NOTREACHED and
 * the process dies with SIGTRAP before the promise settles — no JavaScript
 * error is ever thrown, so the try/catch in `loadNativeBundleIcon` cannot
 * save the app. Callers upscale the 32x32 result as needed.
 */
export const BUNDLE_ICON_OPTIONS = { size: 'normal' } as const;

/**
 * Reading a bundle icon is presentation-only. The original unpackaged npm
 * Electron runtime could terminate natively while macOS resolved its bundle
 * icon, before the returned promise settled. Keep native icon loading for
 * packaged Maka.app builds and let the signed Maka Dev workflow use an empty
 * drag image instead.
 */
export async function loadNativeBundleIcon<T>(
 isPackaged: boolean,
 load: () => Promise<T>,
): Promise<T | null> {
 if (!isPackaged) return null;
 try {
 return await load();
 } catch {
 return null;
 }
}

export function resolveAppBundle(deps: ResolveAppBundleDeps): AppBundleResult {
 const { executablePath, platform, exists } = deps;
 if (platform !== 'darwin') {
Expand Down

46 changes: 23 additions & 23 deletions
apps/desktop/src/main/permission-overlay/permission-overlay-main.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,9 +22,10 @@ import { createRequire } from 'node:module';
import { existsSync } from 'node:fs';
import { join } from 'node:path';
import type { UiLocale } from '@maka/core/ui-locale';
import { desktopAssetPath } from '../desktop-assets.js';
import { resolveOverlayAssetDir } from '../overlay-assets.js';
import { openSystemPermissionPane, requestPermissionAccess } from '../permissions-actions.js';
import { BUNDLE_ICON_OPTIONS, loadNativeBundleIcon, resolveAppBundle } from './app-bundle.js';
import { resolveAppBundle } from './app-bundle.js';
import { getPermissionOverlayCopy } from './permission-overlay-copy.js';
import {
 createPermissionOverlayController,
Expand DownExpand Up@@ -64,7 +65,7 @@ export function createPermissionOverlayMain(
 let locale: UiLocale = 'en';
 let iconDataUrl: string | null = null;
 const electron = requireElectron('electron') as Electron;
 const { BrowserWindow, app, screen, systemPreferences } = electron;
 const { BrowserWindow, app, nativeImage, screen, systemPreferences } = electron;

 function isGranted(id: DragGrantPermissionId): boolean {
 if (process.platform !== 'darwin') return false;
Expand All@@ -74,15 +75,21 @@ export function createPermissionOverlayMain(
 return systemPreferences.getMediaAccessStatus('screen') === 'granted';
 }

 async function resolveAppIconDataUrl(bundlePath: string | null): Promise<string | null> {
 if (!bundlePath) return null;
 const icon = await loadNativeBundleIcon(app.isPackaged, () =>
 app.getFileIcon(bundlePath, BUNDLE_ICON_OPTIONS),
 function resolveAppIconDataUrl(): string | null {
 // The canonical 1024px icon ships in assets/ — the same PNG
 // electron-builder stamps onto the bundle. `app.getFileIcon()` is the
 // wrong source for an identity: macOS reduces the path to its UTType
 // and returns the generic application icon, never this app's own — and
 // requesting it at size 'large' killed packaged builds outright with a
 // fatal NOTREACHED inside Chromium's IconLoader (#3352).
 const icon = nativeImage.createFromPath(
 desktopAssetPath(
 { isPackaged: app.isPackaged, resourcesPath: process.resourcesPath },
 'assets',
 'icon.png',
 ),
 );
 if (!icon || icon.isEmpty()) return null;
 // nativeImage.createFromPath does not decode .icns reliably. Asking
 // macOS for the bundle icon returns the same image Finder and the TCC
 // list display for packaged Maka builds.
 if (icon.isEmpty()) return null;
 return icon.resize({ width: 64, height: 64 }).toDataURL();
 }

Expand DownExpand Up@@ -110,6 +117,10 @@ export function createPermissionOverlayMain(
 exists: existsSync,
 });
 const bundlePath = bundle.ok ? bundle.bundlePath : null;
 // Resolved here, at the only consumer, so a non-darwin start() never
 // pays the PNG decode; a null result (asset missing) retries on the
 // next card rather than caching the failure.
 iconDataUrl ??= resolveAppIconDataUrl();
 return {
 permission: id,
 appName: app.getName(),
Expand DownExpand Up@@ -187,12 +198,6 @@ export function createPermissionOverlayMain(
 } catch (error) {
 console.warn('[permission-overlay] locale lookup failed, keeping', locale, error);
 }
 const bundle = resolveAppBundle({
 executablePath: app.getPath('exe'),
 platform: process.platform,
 exists: existsSync,
 });
 iconDataUrl = await resolveAppIconDataUrl(bundle.ok ? bundle.bundlePath : null);
 return controller.start(id);
 },
 };
Expand DownExpand Up@@ -267,18 +272,13 @@ function attachCardGestures(win: import('electron').BrowserWindow): void {
 payload && typeof payload === 'object' && 'iconDataUrl' in payload
 ? (payload as { iconDataUrl?: unknown }).iconDataUrl
 : null;
 // The file drag still works without a decorative drag image, so a
 // failed decode degrades to an empty icon rather than a native read.
 let icon = nativeImage.createEmpty();
 if (typeof iconDataUrl === 'string' && iconDataUrl.startsWith('data:image/')) {
 const fromRenderer = nativeImage.createFromDataURL(iconDataUrl);
 if (!fromRenderer.isEmpty()) icon = fromRenderer;
 }
 if (icon.isEmpty()) {
 const fallback = await loadNativeBundleIcon(app.isPackaged, () =>
 app.getFileIcon(resolved.bundlePath, BUNDLE_ICON_OPTIONS),
 );
 if (fallback && !fallback.isEmpty()) icon = fallback.resize({ width: 64, height: 64 });
 // The file drag still works without a decorative drag image.
 }

 if (!win.isDestroyed()) win.webContents.startDrag({ file: resolved.bundlePath, icon });
 });
Expand Down

6 changes: 6 additions & 0 deletions
scripts/verify-packaged-app.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -714,6 +714,11 @@ export async function assertPackagedResources(
 // build, which predates the disclaimer being packaged. Requiring it there
 // would fail a release that was correct when it shipped.
 requireDisclaimer = true,
 // Same shape as the disclaimer: the canonical icon began shipping as an
 // extra resource with the window-icon fix, and the permission overlay
 // reads it at runtime, so current builds must carry it — but a
 // previously released baseline predates it.
 requireCanonicalIcon = true,
 } = {},
) {
 if (bundledGitContract !== 'forbidden' && bundledGitContract !== 'legacy-required') {
Expand All@@ -732,6 +737,7 @@ export async function assertPackagedResources(
 join('licenses', 'git', 'NOTICE.txt'),
 ]
 : []),
 ...(requireCanonicalIcon ? [join('assets', 'icon.png')] : []),
 join('workers', 'filesystem-worker.js'),
 join('licenses', 'maka', 'LICENSE'),
 join('licenses', 'maka', 'NOTICE'),
Expand Down

36 changes: 36 additions & 0 deletions
scripts/verify-packaged-app.test.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ test('legacy packaged resources require the historical bundled Git contract', as
 forbidPath: async (path) => forbidden.push(path),
 requireWindowsSandbox: false,
 bundledGitContract: 'legacy-required',
 requireCanonicalIcon: false,
 });

 for (const path of [
Expand DownExpand Up@@ -304,3 +305,38 @@ describe('assertPackagedDependencyClosure', () => {
 );
 });
});

// The resource list is contract, not implementation: the permission overlay
// reads `assets/icon.png` at runtime, so a current build that drops it ships
// a regression the app cannot report. The check is driven through the
// injectable `requirePath`, so it needs no packaging and no platform.
describe('assertPackagedResources', () => {
 const resources = join('fake', 'resources');
 const iconPath = join(resources, 'assets', 'icon.png');
 const requirePathMissing = (absent) => async (path) => {
 if (path === absent) throw new Error(`MISSING ${path}`);
 };
 const forbidPath = async () => {};

 test('a current build must carry the canonical icon', async () => {
 await assert.rejects(
 () =>
 assertPackagedResources(resources, {
 requirePath: requirePathMissing(iconPath),
 forbidPath,
 requireWindowsSandbox: false,
 }),
 /MISSING .*icon\.png/,
 );
 });

 test('a legacy baseline predating the packaged icon is not required to carry it', async () => {
 await assertPackagedResources(resources, {
 requirePath: requirePathMissing(iconPath),
 forbidPath,
 requireWindowsSandbox: false,
 requireDisclaimer: false,
 requireCanonicalIcon: false,
 });
 });
});

1 change: 1 addition & 0 deletions
scripts/verify-windows-x64.mjs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -110,6 +110,7 @@ export async function verifyPackagedWindowsApp(
 requireWindowsSandbox: requiresCurrentContract,
 requireDisclaimer: requiresCurrentContract,
 bundledGitContract: requiresCurrentContract ? 'forbidden' : 'legacy-required',
 requireCanonicalIcon: requiresCurrentContract,
 });
 if (requiresCurrentContract) await assertPackagedDependencyClosure(resources);
 else await requirePath(join(resources, 'git', 'cmd', 'git.exe'));
Expand Down