Skip to content

armgit / avibe

Public Imported from GitHub
0

Make your computer a home for your AI partner. Avibe is the local-first Agent OS: Vibey, its built-in AI partner, works out of the box, and Claude Code, Codex & OpenCode run unchanged beside it — reach them from your browser, phone, or any chat app.

fix(desktop): align overlay title bar with native lights (#3093)

Max4eec1be2f23e
diff --git a/desktop/README.md b/desktop/README.md
index 15625bd35..81b308cf0 100644
--- a/desktop/README.md
+++ b/desktop/README.md
@@ -349,7 +349,7 @@ visibility, and routes are not restored. An absent or corrupt store uses the
centered 1200×800 default.
On macOS the main window uses an overlay title bar with a hidden title. The
-traffic lights are centered in the 48px top row. The complete chat toolbar sits
+traffic lights are centered in the 28px top row. The complete chat toolbar sits
beside them, with the same 1080px content width and responsive gutters as the web
toolbar, transcript and composer. Back, title editing, agent/model/effort selection,
Visualize and sharing keep their existing handlers and state. There is no extra
@@ -369,7 +369,7 @@ not a locally emulated macOS double-click preference.
The shell publishes `--shell-titlebar-inset: 28px` and
`__AVIBE_DESKTOP_DRAG__` before page scripts run. The native sidebar and chat
-override that clearance to 48px for the window toolbar. The native frame stays
+use that clearance for the window toolbar. The native frame stays
transparent even when an adopted Runtime serves older UI without drag metadata;
pages that predate drag regions need a Runtime UI update to provide those gestures.
The metadata declarations remain for older shells, but the current Workbench
diff --git a/desktop/src-tauri/tauri.conf.json b/desktop/src-tauri/tauri.conf.json
index ea4151341..b95b5cd76 100644
--- a/desktop/src-tauri/tauri.conf.json
+++ b/desktop/src-tauri/tauri.conf.json
@@ -24,7 +24,7 @@
"resizable": true,
"dragDropEnabled": false,
"titleBarStyle": "Overlay",
- "trafficLightPosition": { "x": 12, "y": 24 },
+ "trafficLightPosition": { "x": 12, "y": 14 },
"hiddenTitle": true
}
],
diff --git a/desktop/src-tauri/tests/shell_boundaries.rs b/desktop/src-tauri/tests/shell_boundaries.rs
index b76d50176..61b89080d 100644
--- a/desktop/src-tauri/tests/shell_boundaries.rs
+++ b/desktop/src-tauri/tests/shell_boundaries.rs
@@ -815,6 +815,8 @@ fn the_macos_overlay_title_bar_keeps_its_layout_and_defaults_to_no_inset() {
let window = &config()["app"]["windows"][0];
assert_eq!(window["titleBarStyle"], "Overlay");
assert_eq!(window["hiddenTitle"], true);
+ assert_eq!(window["trafficLightPosition"]["x"], 12);
+ assert_eq!(window["trafficLightPosition"]["y"], 14);
// Bootstrap management and window gestures have separate capability grants.
assert!(!read_to_string(&crate_dir().join("capabilities/bootstrap.json")).contains("start-dragging"));
let css = read_to_string(&crate_dir().join("../../ui/src/index.css"));
diff --git a/ui/e2e/workbench-general/desktop-window-chrome.spec.ts b/ui/e2e/workbench-general/desktop-window-chrome.spec.ts
index b15d60f18..3ff8049cb 100644
--- a/ui/e2e/workbench-general/desktop-window-chrome.spec.ts
+++ b/ui/e2e/workbench-general/desktop-window-chrome.spec.ts
@@ -67,14 +67,14 @@ for (const desktop of [false, true]) {
await expect(page.locator('[data-desktop-window-chrome] [data-chat-header]')).toHaveCount(1);
await expect(page.locator('main [data-chat-header]')).toHaveCount(0);
const bounds = await page.locator('[data-desktop-window-chrome]').boundingBox();
- expect(bounds).toEqual({ x: 0, y: 0, width: 1200, height: 48 });
+ expect(bounds).toEqual({ x: 0, y: 0, width: 1200, height: 28 });
// Every rendered drag surface is confined to the same top row, including
// the sidebar clearance. The transcript and composer never join it.
for (const region of await page.locator('[data-tauri-drag-region]').all()) {
const rect = await region.boundingBox();
if (rect) {
expect(rect.y).toBeGreaterThanOrEqual(0);
- expect(rect.y + rect.height).toBeLessThanOrEqual(48);
+ expect(rect.y + rect.height).toBeLessThanOrEqual(28);
}
await expect(region).toHaveAttribute('data-tauri-drag-region', '');
}
@@ -142,9 +142,10 @@ for (const desktop of [false, true]) {
const topRow = sidebar.locator(':scope > [data-tauri-drag-region]');
const topBounds = await topRow.boundingBox();
expect(topBounds?.y).toBe(0);
- expect(topBounds?.height).toBe(48);
+ expect(topBounds?.height).toBe(28);
expect(topBounds?.width).toBe((await sidebar.boundingBox())?.width);
- await expect(topRow).toHaveCSS('border-bottom-width', '1px');
+ await expect(topRow).toHaveCSS('border-bottom-width', '0px');
+ await expect(sidebar).toHaveCSS('border-right-width', '1px');
const brandMark = brand.locator('img');
const brandMarkBounds = await brandMark.boundingBox();
expect(brandMarkBounds?.x).toBeCloseTo((await sidebar.boundingBox())!.x + 16, 0);
diff --git a/ui/src/components/AppShell.tsx b/ui/src/components/AppShell.tsx
index 2242f0390..48a5db304 100644
--- a/ui/src/components/AppShell.tsx
+++ b/ui/src/components/AppShell.tsx
@@ -513,7 +513,6 @@ export const AppShell: React.FC = () => {
{/* Chromeless (single-app tab): the locked full-viewport column applies on DESKTOP too —
the app fills the browser area exactly, with nothing to scroll around it. */}
<div
- style={windowChrome && !settingsOpen ? { '--shell-titlebar-inset': '48px' } as React.CSSProperties : undefined}
className={clsx(
'flex h-[var(--app-shell-h)] flex-col overflow-hidden bg-background text-foreground',
!chromeless && 'md:block md:h-auto md:min-h-screen md:overflow-visible'
@@ -534,9 +533,6 @@ export const AppShell: React.FC = () => {
<aside
aria-hidden={settingsCoversSidebar || undefined}
inert={settingsCoversSidebar || undefined}
- // Keep the native sidebar at the chat toolbar's height on every route.
- // Scope the clearance here so home-page controls keep their own layout.
- style={desktopDragRegion() !== undefined ? { '--shell-titlebar-inset': '48px' } as React.CSSProperties : undefined}
className={clsx(
'fixed inset-y-0 left-0 z-10 hidden w-[var(--app-sidebar-w)] flex-col justify-between gap-6 border-r border-border bg-[var(--sidebar-background)] px-4 pb-4 md:flex',
desktopDragRegion() !== undefined
@@ -545,7 +541,7 @@ export const AppShell: React.FC = () => {
settingsCoversSidebar && 'invisible pointer-events-none',
)}
>
- <DesktopDragRegion className="absolute left-0 -right-px top-0 border-b border-border bg-[var(--sidebar-background)]" />
+ <DesktopDragRegion className="absolute left-0 -right-px top-0 bg-[var(--sidebar-background)]" />
<div className="flex min-h-0 flex-1 flex-col">
{isDesktop && (
<RouteSurfaceActivityBoundary active={!settingsCoversSidebar}>
diff --git a/ui/src/components/DesktopWindowChrome.tsx b/ui/src/components/DesktopWindowChrome.tsx
index 726234da3..25e0ef5dc 100644
--- a/ui/src/components/DesktopWindowChrome.tsx
+++ b/ui/src/components/DesktopWindowChrome.tsx
@@ -16,14 +16,14 @@ export function DesktopWindowChrome({ enabled, hidden, children }: {
data-desktop-window-chrome=""
hidden={hidden}
inert={hidden || undefined}
- className="fixed inset-x-0 top-0 z-30 h-12 border-b border-border bg-background"
+ className="fixed inset-x-0 top-0 z-30 h-[var(--shell-titlebar-inset)]"
>
{/* Native traffic lights occupy the left of the sidebar; its remaining
width is a drag target. No transparent overlay covers controls. */}
<div
aria-hidden="true"
data-tauri-drag-region={desktopDragRegion()}
- className="absolute inset-y-0 left-0 w-[var(--app-sidebar-w)] select-none bg-[var(--sidebar-background)]"
+ className="absolute inset-y-0 left-0 w-[var(--app-sidebar-w)] select-none"
/>
<div
ref={setSlot}
diff --git a/ui/src/components/workbench/ChatPage.tsx b/ui/src/components/workbench/ChatPage.tsx
index b105277cc..c0bbd6fc5 100644
--- a/ui/src/components/workbench/ChatPage.tsx
+++ b/ui/src/components/workbench/ChatPage.tsx
@@ -2911,7 +2911,7 @@ export const ChatPage: React.FC = () => {
there). */}
<div
ref={chatSurfaceRef}
- style={windowChrome ? { paddingTop: '48px' } : undefined}
+ style={windowChrome ? { paddingTop: 'var(--shell-titlebar-inset)' } : undefined}
className="fixed inset-x-0 bottom-0 top-[var(--macos-stale-login-session-notice-h,0px)] z-40 flex flex-col bg-background pt-[env(safe-area-inset-top)] md:relative md:inset-auto md:z-auto md:-mx-10 md:-my-8 md:h-[var(--app-vvh)] md:bg-transparent md:pt-0"
onKeyDown={annotation.handleShortcutKeyDown}
onPointerDownCapture={focusCanvas}