Skip to content

Commit 7d6be3a

Browse files
committed
Merge Guido's inset panel (#912) into the design uplift
Conflicts: - page-parts.tsx: PageEmpty takes Guido's empty-state pattern. - Home: Guido's layout and Bot cards. The default skin keeps its subheader above the composer and the rotating examples. The composer keeps its stock frame.
2 parents b1b8ed1 + 12a20dd commit 7d6be3a

47 files changed

Lines changed: 749 additions & 440 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CHANGELOG.md‎

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,17 @@ Newest first. `Unreleased` is what is on `main` and not yet tagged.
7878
`COMPUTER_MEMORY_HIGH_PERCENT=0` and `COMPUTER_TAB_IDLE_MS=0` (Helm: `computers.memoryHighPercent`
7979
and `computers.tabIdleMs`) keep the old behaviour.
8080

81+
### The default look: an inset page, slate greys and quieter headings
82+
83+
Each page now sits in a panel inset from the window, on a darker frame shared with the sidebar,
84+
with white cards on a light grey page; admin and settings scroll inside it like the rest of the
85+
app. The greys are Tailwind's slate rather than neutral, and page and section headings are lighter.
86+
Rows show an app's logo or initial instead of the same plug; Home shows Bots as compact cards; a
87+
Bot's page leads with its own one-liner; Connections tiles no longer cut their text off; and the
88+
Composio directory shows its rows loading. Empty states carry a faint dot pattern whose file,
89+
colour and strength are theme tokens (`--empty-pattern*` in `theme.css`), so a deployment can
90+
replace it or turn it off. Skins are unchanged.
91+
8192
### A computer closes browsers nobody is using when its memory runs high
8293

8394
A computer runs one browser for each Bot that is browsing, and the only limits were a count and half
@@ -135,12 +146,17 @@ changes for a deployment.
135146

136147
### Generated interfaces use A2UI 1.0
137148

138-
With generative UI on, a Bot builds an interface from the A2UI 1.0 basic components instead of the
139-
A2UI 0.9 ones. It's the same set of 18: text, images, icons, video, audio, rows, columns, lists,
140-
cards, tabs, dividers, dialogs, buttons, checkboxes, text fields, date pickers, choice pickers and
141-
sliders. They now take OpenBot's colours, radii and font, in light and dark. The gallery components a
142-
Bot is granted are unchanged. `OPENBOT_GENERATIVE_UI=false` still switches it all off, on the server
143-
as well as in the browser.
149+
With generative UI on, a Bot builds an interface from CopilotKit's standard catalog on A2UI 1.0
150+
instead of the 18 A2UI 0.9 basic components. That's 65 components for layout, text, inputs, tables,
151+
charts, media and composites such as entity cards and image grids, including the A2UI 1.0 basic
152+
components under their A2UI names. They take OpenBot's colours, radii and font, in light and dark.
153+
154+
Four are left out. Map needs a map library OpenBot does not ship. Favicon, LinkCard and Citation load
155+
site icons from Google's favicon service, which would send every linked domain to Google.
156+
157+
None of these is listed in the components gallery, and an admin can't turn one off for a Bot. The
158+
gallery components a Bot is granted are unchanged. `OPENBOT_GENERATIVE_UI=false` still switches it
159+
all off, on the server as well as in the browser.
144160

145161
### CopilotKit 1.83
146162

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Each coworker gets a real browser with its own logins, its own files, and only t
1313
[![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE)
1414
![Beta](https://img.shields.io/badge/status-beta-yellow.svg)
1515

16+
[![GitHub Trending: #5 Repository Of The Day](https://trendshift.io/api/badge/repositories/175080)](https://trendshift.io/repositories/175080)
1617
[![Trendshift: #3 Repository Of The Day](https://trendshift.io/api/badge/trendshift/repositories/175080/daily)](https://trendshift.io/repositories/175080)
1718

1819
</div>
Lines changed: 136 additions & 0 deletions
Loading

‎app/src/components/admin/admin-sidebar.tsx‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
import {
22
IconArrowLeft,
33
IconBuildingBank,
4+
IconBulb,
45
IconChecks,
56
IconCode,
67
IconDeviceDesktop,
7-
IconFileText,
88
IconKey,
99
IconLayoutGrid,
1010
IconListDetails,
1111
IconPuzzle,
1212
IconShieldCheck,
13+
IconSlash,
1314
IconUsers,
1415
} from "@tabler/icons-react";
1516
import { Link, type LinkOptions } from "@tanstack/react-router";
@@ -79,12 +80,12 @@ const GROUPS: {
7980
},
8081
{
8182
title: "Skills",
82-
icon: IconFileText,
83+
icon: IconSlash,
8384
linkOptions: { to: "/admin/skills" },
8485
},
8586
{
8687
title: "Automatic learning",
87-
icon: IconFileText,
88+
icon: IconBulb,
8889
linkOptions: { to: "/admin/learning" },
8990
},
9091
{
@@ -130,7 +131,7 @@ export function AdminSidebar({
130131
...props
131132
}: React.ComponentProps<typeof Sidebar>) {
132133
return (
133-
<Sidebar {...props}>
134+
<Sidebar variant="inset" {...props}>
134135
{/*
135136
* Pinned to the same height as the app sidebar's header. Left to itself this one is 60px
136137
* against the app's 45px — `p-2` around a `size="lg"` button rather than a fixed height — so

‎app/src/components/agents/agent-card.tsx‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,23 @@ export function AgentCard({
99
appearance = "compact",
1010
}: {
1111
agent: AgentProfile;
12-
appearance?: "compact" | "tile";
12+
appearance?: "compact" | "row";
1313
}) {
14-
if (appearance === "tile") {
14+
if (appearance === "row") {
1515
return (
16-
<div className="flex h-[180px] w-[144px] flex-col overflow-hidden rounded-2xl border border-border bg-card p-3 transition-colors hover:border-ring dark:border-transparent">
16+
/*
17+
* The avatar beside the name rather than above it: a tall card left most of its height empty
18+
* between the two, and a row reads the name and what the Bot is for in one glance.
19+
*/
20+
<div className="flex h-16 min-w-0 items-center gap-3 rounded-xl border border-border bg-card px-3 transition-colors hover:border-ring dark:border-transparent">
1721
<div aria-hidden="true" className="flex shrink-0">
18-
<AbstractAvatar name={agent.name} seed={agent.avatarSeed} size={36} />
22+
<AbstractAvatar name={agent.name} seed={agent.avatarSeed} size={32} />
1923
</div>
20-
{/* Bottom-aligned, where the text sat on the earlier artwork card; the avatar holds the top. */}
21-
<div className="mt-auto flex min-w-0 flex-col gap-2">
22-
<span
23-
className="line-clamp-1 break-words text-sm font-medium leading-5"
24-
title={agent.name}
25-
>
24+
<div className="flex min-w-0 flex-col gap-0.5">
25+
<span className="truncate text-sm font-medium" title={agent.name}>
2626
{agent.name}
2727
</span>
28-
<span className="line-clamp-3 break-words text-xs leading-4 text-muted-foreground">
28+
<span className="truncate text-xs text-muted-foreground">
2929
{agent.roleDescription}
3030
</span>
3131
</div>

‎app/src/components/agents/handoff-panel.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { IconArrowsExchange, IconLock, IconRobot } from "@tabler/icons-react";
1+
import { IconArrowsExchange, IconBolt, IconLock } from "@tabler/icons-react";
22
import { useMutation, useQuery } from "@tanstack/react-query";
33
import { Fragment } from "react";
44
import { AbstractAvatar } from "@/components/agents/abstract-avatar";
@@ -102,7 +102,7 @@ export function HandoffPanel({ agentId }: { agentId: string }) {
102102
) : null}
103103

104104
{grantable && total === 0 ? (
105-
<PageEmpty icon={IconRobot} title="No other Bots yet">
105+
<PageEmpty icon={IconBolt} title="No other Bots yet">
106106
When there are more, you can let this Bot ask them here.
107107
</PageEmpty>
108108
) : null}

‎app/src/components/app-sidebar/app-sidebar.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ export function AppSidebar({ ...props }: React.ComponentProps<typeof Sidebar>) {
228228
const navigation = navigationFor(currentUser?.role);
229229

230230
return (
231-
<Sidebar {...props}>
231+
<Sidebar variant="inset" {...props}>
232232
<SidebarHeader className="h-12 p-2">
233233
<SidebarMenu>
234234
<SidebarMenuItem className="flex flex-row gap-1.5">

‎app/src/components/app-sidebar/channel-item-content.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export function ChannelItemContent({
3636
/** An approval or a question in this conversation waits on the person. */
3737
waiting?: boolean;
3838
}) {
39-
const primaryText = `text-[0.9rem] leading-5 tracking-[-1%] ${unread ? "font-semibold" : "font-medium"}`;
39+
const primaryText = `text-sm leading-5 tracking-[-1%] ${unread ? "font-semibold" : "font-medium"}`;
4040
const secondaryText = "text-[12px] leading-4 text-muted-foreground";
4141

4242
return (

0 commit comments

Comments
 (0)