Skip to content

armgit / alook

Public Imported from GitHub
0

Multi-Agent Collaboration for Team and Friends

feat: sidebar drag-and-drop reordering for pinned & unpinned agents

Gus2e33e550e1eb
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 91532d053..a664d8968 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -119,6 +119,15 @@ importers:
'@dagrejs/dagre':
specifier: ^3.0.0
version: 3.0.0
+ '@dnd-kit/core':
+ specifier: ^6.3.1
+ '@dnd-kit/sortable':
+ specifier: ^10.0.0
+ '@dnd-kit/utilities':
+ specifier: ^3.2.2
+ version: 3.2.2([email protected])
'@gsap/react':
specifier: ^2.1.2
@@ -867,6 +876,28 @@ packages:
'@date-fns/[email protected]':
resolution: {integrity: sha512-P5LUNhtbj6YfI3iJjw5EL9eUAG6OitD0W3fWQcpQjDRc/QIsL0tRNuO1PcDvPccWL1fSTXXdE1ds+l95DV/OFA==}
+ '@dnd-kit/[email protected]':
+ resolution: {integrity: sha512-2P+YgaXF+gRsIihwwY1gCsQSYnu9Zyj2py8kY5fFvUM1qm2WA2u639R6YNVfU4GWr+ZM5mqEsfHZZLoRONbemw==}
+ peerDependencies:
+ react: '>=16.8.0'
+
+ '@dnd-kit/[email protected]':
+ resolution: {integrity: sha512-xkGBRQQab4RLwgXxoqETICr6S5JlogafbhNsidmrkVv2YRs5MLwpjoF2qpiGjQt8S9AoxtIV603s0GIUpY5eYQ==}
+ peerDependencies:
+ react: '>=16.8.0'
+ react-dom: '>=16.8.0'
+
+ '@dnd-kit/[email protected]':
+ resolution: {integrity: sha512-+xqhmIIzvAYMGfBYYnbKuNicfSsk4RksY2XdmJhT+HAC01nix6fHCztU68jooFiMUB01Ky3F0FyOvhG/BZrWkg==}
+ peerDependencies:
+ '@dnd-kit/core': ^6.3.0
+ react: '>=16.8.0'
+
+ '@dnd-kit/[email protected]':
+ resolution: {integrity: sha512-+MKAJEOfaBe5SmV6t34p80MMKhjvUz0vRrvVJbPT0WElzaOJ/1xs+D+KDv+tD/NE5ujfrChEcshd4fLn0wpiqg==}
+ peerDependencies:
+ react: '>=16.8.0'
+
'@dotenvx/[email protected]':
resolution: {integrity: sha512-GeDxvtjiRuoyWVU9nQneId879zIyNdL05bS7RKiqMkfBSKpHMWHLoRyRqjYWLaXmX/llKO1hTlqHDmatkQAjPA==}
hasBin: true
@@ -7970,6 +8001,31 @@ snapshots:
'@date-fns/[email protected]':
optional: true
+ dependencies:
+ react: 19.2.5
+ tslib: 2.8.1
+
+ dependencies:
+ '@dnd-kit/accessibility': 3.1.1([email protected])
+ '@dnd-kit/utilities': 3.2.2([email protected])
+ react: 19.2.5
+ react-dom: 19.2.5([email protected])
+ tslib: 2.8.1
+
+ dependencies:
+ '@dnd-kit/utilities': 3.2.2([email protected])
+ react: 19.2.5
+ tslib: 2.8.1
+
+ dependencies:
+ react: 19.2.5
+ tslib: 2.8.1
+
'@dotenvx/[email protected]':
dependencies:
commander: 11.1.0
diff --git a/src/shared/src/db/queries-index.ts b/src/shared/src/db/queries-index.ts
index b0ad330ff..020afa610 100644
--- a/src/shared/src/db/queries-index.ts
+++ b/src/shared/src/db/queries-index.ts
@@ -18,6 +18,7 @@ export * as emailAccount from "./queries/email-account";
export * as workspaceInvite from "./queries/workspace-invite";
export * as agentAccess from "./queries/agent-access";
export * as agentPin from "./queries/agent-pin";
+export * as agentSidebarOrder from "./queries/agent-sidebar-order";
export * as overview from "./queries/overview";
export * as meetingSession from "./queries/meeting-session";
export * as channel from "./queries/channel";
diff --git a/src/shared/src/db/queries/agent-pin.ts b/src/shared/src/db/queries/agent-pin.ts
index 2ef61305a..46f042a3e 100644
--- a/src/shared/src/db/queries/agent-pin.ts
+++ b/src/shared/src/db/queries/agent-pin.ts
@@ -1,4 +1,4 @@
-import { eq, and } from "drizzle-orm";
+import { eq, and, asc, sql } from "drizzle-orm";
import { agentPin } from "../schema";
import type { Database } from "../index";
@@ -6,13 +6,19 @@ export async function listPins(db: Database, workspaceId: string, userId: string
return db
.select()
.from(agentPin)
- .where(and(eq(agentPin.workspaceId, workspaceId), eq(agentPin.userId, userId)));
+ .where(and(eq(agentPin.workspaceId, workspaceId), eq(agentPin.userId, userId)))
+ .orderBy(asc(agentPin.position));
}
export async function pinAgent(db: Database, data: { agentId: string; workspaceId: string; userId: string }) {
+ const [maxRow] = await db
+ .select({ maxPos: sql<number>`COALESCE(MAX(${agentPin.position}), -1)` })
+ .from(agentPin)
+ .where(and(eq(agentPin.workspaceId, data.workspaceId), eq(agentPin.userId, data.userId)));
+ const nextPos = (maxRow?.maxPos ?? -1) + 1;
const rows = await db
.insert(agentPin)
- .values(data)
+ .values({ ...data, position: nextPos })
.onConflictDoNothing()
.returning();
return rows[0] ?? null;
@@ -31,3 +37,25 @@ export async function unpinAgent(db: Database, agentId: string, workspaceId: str
.returning();
return rows[0] ?? null;
}
+
+export async function reorderPins(
+ db: Database,
+ workspaceId: string,
+ userId: string,
+ orderedAgentIds: string[],
+) {
+ await db.transaction(async (tx) => {
+ for (let i = 0; i < orderedAgentIds.length; i++) {
+ await tx
+ .update(agentPin)
+ .set({ position: i })
+ .where(
+ and(
+ eq(agentPin.agentId, orderedAgentIds[i]),
+ eq(agentPin.workspaceId, workspaceId),
+ eq(agentPin.userId, userId),
+ )
+ );
+ }
+ });
+}
diff --git a/src/shared/src/db/queries/agent-sidebar-order.ts b/src/shared/src/db/queries/agent-sidebar-order.ts
new file mode 100644
index 000000000..ddd182460
--- /dev/null
+++ b/src/shared/src/db/queries/agent-sidebar-order.ts
@@ -0,0 +1,39 @@
+import { eq, and, asc } from "drizzle-orm";
+import { agentSidebarOrder } from "../schema";
+import type { Database } from "../index";
+
+export async function listOrder(db: Database, workspaceId: string, userId: string) {
+ return db
+ .select()
+ .from(agentSidebarOrder)
+ .where(and(eq(agentSidebarOrder.workspaceId, workspaceId), eq(agentSidebarOrder.userId, userId)))
+ .orderBy(asc(agentSidebarOrder.position));
+}
+
+export async function reorder(
+ db: Database,
+ workspaceId: string,
+ userId: string,
+ orderedAgentIds: string[],
+) {
+ await db.transaction(async (tx) => {
+ await tx
+ .delete(agentSidebarOrder)
+ .where(
+ and(
+ eq(agentSidebarOrder.workspaceId, workspaceId),
+ eq(agentSidebarOrder.userId, userId),
+ )
+ );
+ if (orderedAgentIds.length > 0) {
+ await tx.insert(agentSidebarOrder).values(
+ orderedAgentIds.map((agentId, i) => ({
+ agentId,
+ workspaceId,
+ userId,
+ position: i,
+ }))
+ );
+ }
+ });
+}
diff --git a/src/shared/src/db/schema.ts b/src/shared/src/db/schema.ts
index 135ebca55..d0d6e83c6 100644
--- a/src/shared/src/db/schema.ts
+++ b/src/shared/src/db/schema.ts
@@ -148,6 +148,7 @@ export const agentPin = sqliteTable(
.notNull()
.references(() => user.id, { onDelete: "cascade" }),
createdAt: text("created_at").notNull().$defaultFn(() => new Date().toISOString()),
+ position: integer("position").notNull().default(0),
},
(t) => [
unique("agent_pin_agent_ws_user").on(t.agentId, t.workspaceId, t.userId),
@@ -159,6 +160,27 @@ export const agentPin = sqliteTable(
]
);
+export const agentSidebarOrder = sqliteTable(
+ "agent_sidebar_order",
+ {
+ id: text("id").primaryKey().$defaultFn(() => nanoid()),
+ agentId: text("agent_id").notNull(),
+ workspaceId: text("workspace_id").notNull(),
+ userId: text("user_id")
+ .notNull()
+ .references(() => user.id, { onDelete: "cascade" }),
+ position: integer("position").notNull().default(0),
+ },
+ (t) => [
+ unique("agent_sidebar_order_agent_ws_user").on(t.agentId, t.workspaceId, t.userId),
+ index("idx_agent_sidebar_order_ws_user").on(t.workspaceId, t.userId),
+ foreignKey({
+ columns: [t.agentId, t.workspaceId],
+ foreignColumns: [agent.id, agent.workspaceId],
+ }).onDelete("cascade"),
+ ]
+);
+
export const machine = sqliteTable(
"machine",
{
diff --git a/src/web/migrations/0018_agent_pin_position.sql b/src/web/migrations/0018_agent_pin_position.sql
new file mode 100644
index 000000000..f260588d2
--- /dev/null
+++ b/src/web/migrations/0018_agent_pin_position.sql
@@ -0,0 +1,8 @@
+ALTER TABLE agent_pin ADD COLUMN position INTEGER NOT NULL DEFAULT 0;
+
+UPDATE agent_pin SET position = (
+ SELECT COUNT(*) FROM agent_pin AS p2
+ WHERE p2.workspace_id = agent_pin.workspace_id
+ AND p2.user_id = agent_pin.user_id
+ AND p2.created_at < agent_pin.created_at
+);
diff --git a/src/web/migrations/0019_agent_sidebar_order.sql b/src/web/migrations/0019_agent_sidebar_order.sql
new file mode 100644
index 000000000..91e70a8a4
--- /dev/null
+++ b/src/web/migrations/0019_agent_sidebar_order.sql
@@ -0,0 +1,11 @@
+CREATE TABLE agent_sidebar_order (
+ id TEXT PRIMARY KEY,
+ agent_id TEXT NOT NULL,
+ workspace_id TEXT NOT NULL,
+ user_id TEXT NOT NULL REFERENCES user(id) ON DELETE CASCADE,
+ position INTEGER NOT NULL DEFAULT 0,
+ UNIQUE(agent_id, workspace_id, user_id),
+ FOREIGN KEY (agent_id, workspace_id) REFERENCES agent(id, workspace_id) ON DELETE CASCADE
+);
+
+CREATE INDEX idx_agent_sidebar_order_ws_user ON agent_sidebar_order(workspace_id, user_id);
diff --git a/src/web/package.json b/src/web/package.json
index 261aa465e..9c4773340 100644
--- a/src/web/package.json
+++ b/src/web/package.json
@@ -21,6 +21,9 @@
"@alook/shared": "workspace:*",
"@base-ui/react": "^1.4.1",
"@dagrejs/dagre": "^3.0.0",
+ "@dnd-kit/core": "^6.3.1",
+ "@dnd-kit/sortable": "^10.0.0",
+ "@dnd-kit/utilities": "^3.2.2",
"@gsap/react": "^2.1.2",
"@icons-pack/react-simple-icons": "^13.13.0",
"@opennextjs/cloudflare": "^1.19.4",
diff --git a/src/web/src/app/api/agents/pins/reorder/route.ts b/src/web/src/app/api/agents/pins/reorder/route.ts
new file mode 100644
index 000000000..649da2bc7
--- /dev/null
+++ b/src/web/src/app/api/agents/pins/reorder/route.ts
@@ -0,0 +1,36 @@
+import { NextRequest } from "next/server";
+import { getCloudflareContext } from "@opennextjs/cloudflare";
+import { queries } from "@alook/shared";
+import { getDb } from "@/lib/db";
+import { withAuth } from "@/lib/middleware/auth";
+import { withWorkspaceMember } from "@/lib/middleware/workspace";
+import { writeError } from "@/lib/middleware/helpers";
+
+export const PUT = withAuth(async (req: NextRequest, ctx) => {
+ const ws = await withWorkspaceMember(req, ctx);
+ if (ws instanceof Response) return ws;
+
+ let raw: { ordered_agent_ids?: unknown };
+ try {
+ raw = await req.json();
+ } catch {
+ return writeError("invalid request body", 400);
+ }
+
+ const ids = raw.ordered_agent_ids;
+ if (!Array.isArray(ids) || ids.length === 0 || !ids.every((id) => typeof id === "string" && id.length > 0)) {
+ return writeError("ordered_agent_ids must be a non-empty array of strings", 400);
+ }
+
+ const { env } = await getCloudflareContext({ async: true });
+ const db = getDb((env as Env).DB);
+
+ const existingPins = await queries.agentPin.listPins(db, ws.workspaceId, ctx.userId);
+ const pinnedIds = new Set(existingPins.map((p) => p.agentId));
+ for (const id of ids) {
+ if (!pinnedIds.has(id)) return writeError(`Agent ${id} is not pinned`, 400);
+ }
+
+ await queries.agentPin.reorderPins(db, ws.workspaceId, ctx.userId, ids);
+ return new Response(null, { status: 204 });
+});
diff --git a/src/web/src/app/api/agents/pins/route.ts b/src/web/src/app/api/agents/pins/route.ts
index 3469a0dc5..95fadc12f 100644
--- a/src/web/src/app/api/agents/pins/route.ts
+++ b/src/web/src/app/api/agents/pins/route.ts
@@ -11,6 +11,12 @@ export const GET = withAuth(async (req: NextRequest, ctx) => {
if (ws instanceof Response) return ws;
const { env } = await getCloudflareContext({ async: true });
const db = getDb((env as Env).DB);
- const pins = await queries.agentPin.listPins(db, ws.workspaceId, ctx.userId);
- return writeJSON(pins.map((p) => ({ id: p.id, agent_id: p.agentId, created_at: p.createdAt })));
+ const [pins, sidebarOrder] = await Promise.all([
+ queries.agentPin.listPins(db, ws.workspaceId, ctx.userId),
+ queries.agentSidebarOrder.listOrder(db, ws.workspaceId, ctx.userId),
+ ]);
+ return writeJSON({
+ pins: pins.map((p) => ({ id: p.id, agent_id: p.agentId, created_at: p.createdAt, position: p.position })),
+ sidebar_order: sidebarOrder.map((o) => ({ agent_id: o.agentId, position: o.position })),
+ });
});
diff --git a/src/web/src/app/api/agents/sidebar/reorder/route.ts b/src/web/src/app/api/agents/sidebar/reorder/route.ts
new file mode 100644
index 000000000..ab5698b30
--- /dev/null
+++ b/src/web/src/app/api/agents/sidebar/reorder/route.ts
@@ -0,0 +1,41 @@
+import { NextRequest } from "next/server";
+import { getCloudflareContext } from "@opennextjs/cloudflare";
+import { queries } from "@alook/shared";
+import { getDb } from "@/lib/db";
+import { withAuth } from "@/lib/middleware/auth";
+import { withWorkspaceMember } from "@/lib/middleware/workspace";
+import { writeError } from "@/lib/middleware/helpers";
+
+export const PUT = withAuth(async (req: NextRequest, ctx) => {
+ const ws = await withWorkspaceMember(req, ctx);
+ if (ws instanceof Response) return ws;
+
+ let raw: { ordered_agent_ids?: unknown };
+ try {
+ raw = await req.json();
+ } catch {
+ return writeError("invalid request body", 400);
+ }
+
+ const ids = raw.ordered_agent_ids;
+ if (!Array.isArray(ids) || ids.length === 0 || !ids.every((id) => typeof id === "string" && id.length > 0)) {
+ return writeError("ordered_agent_ids must be a non-empty array of strings", 400);
+ }
+
+ const { env } = await getCloudflareContext({ async: true });
+ const db = getDb((env as Env).DB);
+
+ const [agents, existingPins] = await Promise.all([
+ queries.agent.listAgents(db, ws.workspaceId),
+ queries.agentPin.listPins(db, ws.workspaceId, ctx.userId),
+ ]);
+ const agentIds = new Set(agents.map((a) => a.id));
+ const pinnedIds = new Set(existingPins.map((p) => p.agentId));
+ for (const id of ids) {
+ if (!agentIds.has(id)) return writeError(`Agent ${id} not found`, 400);
+ if (pinnedIds.has(id)) return writeError(`Agent ${id} is pinned`, 400);
+ }
+
+ await queries.agentSidebarOrder.reorder(db, ws.workspaceId, ctx.userId, ids);
+ return new Response(null, { status: 204 });
+});
diff --git a/src/web/src/components/app-sidebar.tsx b/src/web/src/components/app-sidebar.tsx
index 4b69622f4..5b779164b 100644
--- a/src/web/src/components/app-sidebar.tsx
+++ b/src/web/src/components/app-sidebar.tsx
@@ -21,6 +21,9 @@ import {
import { AgentPreviewCard } from "@/components/agent-preview-card";
import { Popover, PopoverTrigger, PopoverContent } from "@/components/ui/popover";
import { AvatarRenderer, parseAvatarUrl } from "@/components/avatar";
+import { DndContext, closestCenter, PointerSensor, useSensor, useSensors, type DragEndEvent } from "@dnd-kit/core";
+import { SortableContext, verticalListSortingStrategy, useSortable, arrayMove } from "@dnd-kit/sortable";
+import { CSS } from "@dnd-kit/utilities";
function AgentSidebarButton({
agent,
@@ -101,11 +104,26 @@ function AgentSidebarButton({
);
}
+function SortableAgentButton({ id, children }: { id: string; children: React.ReactNode }) {
+ const { attributes, listeners, setNodeRef, transform, transition, isDragging } = useSortable({ id });
+ const style = {
+ transform: CSS.Transform.toString(transform),
+ transition,
+ opacity: isDragging ? 0.5 : 1,
+ zIndex: isDragging ? 10 : undefined,
+ };
+ return (
+ <div ref={setNodeRef} style={style} {...attributes} {...listeners}>
+ {children}
+ </div>
+ );
+}
+
export function AppSidebar({ onNavigate }: { onNavigate?: () => void } = {}) {
const router = useRouter();
const pathname = usePathname();
const searchParams = useSearchParams();
- const { agents, runtimes, loading, pins, handlePinAgent, handleUnpinAgent } = useAgentContext();
+ const { agents, runtimes, loading, pins, unpinnedOrder, handlePinAgent, handleUnpinAgent, handleReorderPins, handleReorderUnpinned } = useAgentContext();
const { slug } = useWorkspace();
const { resolvedTheme, setTheme } = useTheme();
@@ -113,10 +131,39 @@ export function AppSidebar({ onNavigate }: { onNavigate?: () => void } = {}) {
const pinned = agents
.filter((a) => pins.has(a.id))
- .sort((a, b) => (pins.get(a.id)! < pins.get(b.id)! ? -1 : 1));
+ .sort((a, b) => pins.get(a.id)!.position - pins.get(b.id)!.position);
const unpinned = agents
.filter((a) => !pins.has(a.id))
- .sort((a, b) => a.name.localeCompare(b.name));
+ .sort((a, b) => {
+ const posA = unpinnedOrder.get(a.id);
+ const posB = unpinnedOrder.get(b.id);
+ if (posA !== undefined && posB !== undefined) return posA - posB;
+ if (posA !== undefined) return -1;
+ if (posB !== undefined) return 1;
+ return a.name.localeCompare(b.name);
+ });
+
+ const sensors = useSensors(
+ useSensor(PointerSensor, { activationConstraint: { distance: 5 } })
+ );
+
+ function handleDragEnd(event: DragEndEvent) {
+ const { active, over } = event;
+ if (!over || active.id === over.id) return;
+ const oldIndex = pinned.findIndex((a) => a.id === active.id);
+ const newIndex = pinned.findIndex((a) => a.id === over.id);
+ const reordered = arrayMove(pinned, oldIndex, newIndex);
+ handleReorderPins(reordered.map((a) => a.id));
+ }
+
+ function handleUnpinnedDragEnd(event: DragEndEvent) {
+ const { active, over } = event;
+ if (!over || active.id === over.id) return;
+ const oldIndex = unpinned.findIndex((a) => a.id === active.id);
+ const newIndex = unpinned.findIndex((a) => a.id === over.id);
+ const reordered = arrayMove(unpinned, oldIndex, newIndex);
+ handleReorderUnpinned(reordered.map((a) => a.id));
+ }
const prefix = `/w/${slug}`;
const isHome = pathname === `${prefix}/home`;
@@ -166,11 +213,27 @@ export function AppSidebar({ onNavigate }: { onNavigate?: () => void } = {}) {
<Skeleton className="size-10 rounded-xl" />
) : (
<>
- {pinned.map(renderAgentButton)}
+ <DndContext sensors={sensors} collisionDetection={closestCenter} onDragEnd={handleDragEnd}>
+ <SortableContext items={pinned.map((a) => a.id)} strategy={verticalListSortingStrategy}>
+ {pinned.map((agent) => (
+ <SortableAgentButton key={agent.id} id={agent.id}>
+ {renderAgentButton(agent)}
+ </SortableAgentButton>
+ ))}
+ </SortableContext>
+ </DndContext>
{pinned.length > 0 && unpinned.length > 0 && (
<div className="w-6 border-t border-border/50" />
)}
- {unpinned.map(renderAgentButton)}
+ <DndContext sensors={sensors} collisionDetection={closestCenter} onDragEnd={handleUnpinnedDragEnd}>
+ <SortableContext items={unpinned.map((a) => a.id)} strategy={verticalListSortingStrategy}>
+ {unpinned.map((agent) => (
+ <SortableAgentButton key={agent.id} id={agent.id}>
+ {renderAgentButton(agent)}
+ </SortableAgentButton>
+ ))}
+ </SortableContext>
+ </DndContext>
</>
)}
diff --git a/src/web/src/components/avatar/avatar-generator.tsx b/src/web/src/components/avatar/avatar-generator.tsx
index 6420934d4..b0d4b1b1c 100644
--- a/src/web/src/components/avatar/avatar-generator.tsx
+++ b/src/web/src/components/avatar/avatar-generator.tsx
@@ -25,12 +25,14 @@ function Cycler<K extends string>({
value,
onChange,
renderThumb,
+ mobile = false,
}: {
label: string;
keys: K[];
value: K;
onChange: (v: K) => void;
renderThumb: (key: K) => React.ReactNode;
+ mobile?: boolean;
}) {
const idx = keys.indexOf(value);
const go = (delta: number) =>
@@ -47,7 +49,10 @@ function Cycler<K extends string>({
<button
type="button"
onClick={() => go(-1)}
- className="flex items-center justify-center size-7 rounded-md hover:bg-accent transition-colors"
+ className={cn(
+ "flex items-center justify-center rounded-md hover:bg-accent transition-colors",
+ mobile ? "size-10" : "size-7"
+ )}
>
<svg viewBox="0 0 24 24" width="16" height="16">
<path
@@ -88,7 +93,10 @@ function Cycler<K extends string>({
<button
type="button"
onClick={() => go(1)}
- className="flex items-center justify-center size-7 rounded-md hover:bg-accent transition-colors"
+ className={cn(
+ "flex items-center justify-center rounded-md hover:bg-accent transition-colors",
+ mobile ? "size-10" : "size-7"
+ )}
>
<svg viewBox="0 0 24 24" width="16" height="16">
<path
@@ -113,9 +121,11 @@ interface AvatarGeneratorProps {
onChange: (config: AvatarConfig) => void;
/** "horizontal" puts preview left + controls right; default is vertical stack */
layout?: "vertical" | "horizontal";
+ /** Mobile mode — smaller preview, bigger touch targets, 3-col grid */
+ mobile?: boolean;
}
-export function AvatarGenerator({ config, onChange, layout = "vertical" }: AvatarGeneratorProps) {
+export function AvatarGenerator({ config, onChange, layout = "vertical", mobile = false }: AvatarGeneratorProps) {
const [tab, setTab] = useState<"presets" | "custom">("presets");
const setField = useCallback(
@@ -185,13 +195,16 @@ export function AvatarGenerator({ config, onChange, layout = "vertical" }: Avata
const isHorizontal = layout === "horizontal";
+ const previewSize = isHorizontal ? 220 : mobile ? 120 : 160;
+
const preview = (
<div className={cn(
- "flex flex-col items-center gap-3 rounded-2xl bg-muted/30 p-4",
+ "flex flex-col items-center gap-3 rounded-2xl bg-muted/30",
+ mobile ? "p-3" : "p-4",
isHorizontal ? "w-[280px] shrink-0 justify-center" : ""
)}>
<div className={cn("rounded-2xl", shaking && "animate-[shake_0.45s_cubic-bezier(.36,.07,.19,.97)]")}>
- <AvatarRenderer config={config} size={isHorizontal ? 220 : 160} />
+ <AvatarRenderer config={config} size={previewSize} />
</div>
<button
type="button"
@@ -250,7 +263,7 @@ export function AvatarGenerator({ config, onChange, layout = "vertical" }: Avata
{/* Tab content — fixed height so dialog doesn't resize on tab switch */}
<div className={cn("flex-1 min-h-0", isHorizontal && "overflow-y-auto thin-scrollbar")}>
{tab === "presets" && (
- <div className="grid grid-cols-4 gap-2">
+ <div className={cn("grid gap-2", mobile ? "grid-cols-3" : "grid-cols-4")}>
{PRESETS.map((p) => {
const isActive =
p.config.shape === config.shape &&
@@ -287,6 +300,7 @@ export function AvatarGenerator({ config, onChange, layout = "vertical" }: Avata
value={config.shape}
onChange={(v) => setField("shape", v)}
renderThumb={renderShapeThumb}
+ mobile={mobile}
/>
<Cycler
label="Nose"
@@ -294,6 +308,7 @@ export function AvatarGenerator({ config, onChange, layout = "vertical" }: Avata
value={config.nose}
onChange={(v) => setField("nose", v)}
renderThumb={renderNoseThumb}
+ mobile={mobile}
/>
<Cycler
label="Eyes"
@@ -301,6 +316,7 @@ export function AvatarGenerator({ config, onChange, layout = "vertical" }: Avata
value={config.eye}
onChange={(v) => setField("eye", v)}
renderThumb={renderEyeThumb}
+ mobile={mobile}
/>
{/* Background colors */}
@@ -308,7 +324,7 @@ export function AvatarGenerator({ config, onChange, layout = "vertical" }: Avata
<div className="mb-2 text-xs font-medium text-muted-foreground">
Color
</div>
- <div className="flex flex-wrap gap-2 p-1">
+ <div className={cn("flex flex-wrap p-1", mobile ? "gap-3" : "gap-2")}>
{BG_COLORS.map((c, i) => (
<button
key={c.value}
@@ -316,7 +332,8 @@ export function AvatarGenerator({ config, onChange, layout = "vertical" }: Avata
onClick={() => setField("bg", i)}
title={c.name}
className={cn(
- "size-7 rounded-full transition-shadow",
+ "rounded-full transition-shadow",
+ mobile ? "size-8" : "size-7",
config.bg === i
? "ring-2 ring-primary ring-offset-2"
: "ring-1 ring-border"
diff --git a/src/web/src/components/avatar/avatar-picker-dialog.tsx b/src/web/src/components/avatar/avatar-picker-dialog.tsx
index b9c612c18..be5fcdd64 100644
--- a/src/web/src/components/avatar/avatar-picker-dialog.tsx
+++ b/src/web/src/components/avatar/avatar-picker-dialog.tsx
@@ -10,6 +10,7 @@ import {
} from "@/components/ui/dialog";
import { type AvatarConfig, AvatarRenderer } from "./avatar-parts";
import { AvatarGenerator } from "./avatar-generator";
+import { useIsMobile } from "@/hooks/use-mobile";
interface AvatarPickerDialogProps {
config: AvatarConfig;
@@ -19,6 +20,7 @@ interface AvatarPickerDialogProps {
export function AvatarPickerDialog({ config, onChange }: AvatarPickerDialogProps) {
const [open, setOpen] = useState(false);
const [draft, setDraft] = useState<AvatarConfig>(config);
+ const isMobile = useIsMobile();
return (
<Dialog
@@ -41,18 +43,32 @@ export function AvatarPickerDialog({ config, onChange }: AvatarPickerDialogProps
</DialogTrigger>
</div>
- <DialogContent className="sm:max-w-[720px]">
+ <DialogContent className={
+ isMobile
+ ? "top-auto left-0 translate-x-0 translate-y-0 bottom-0 max-w-full sm:max-w-full w-full rounded-b-none rounded-t-xl max-h-[85dvh] overflow-y-auto pb-[env(safe-area-inset-bottom)]"
+ : "sm:max-w-[720px]"
+ }>
<DialogHeader>
<DialogTitle>Choose Avatar</DialogTitle>
</DialogHeader>
<AvatarGenerator
config={draft}
- layout="horizontal"
+ layout={isMobile ? "vertical" : "horizontal"}
onChange={(next) => {
setDraft(next);
onChange(next);
}}
+ mobile={isMobile}
/>
+ {isMobile && (
+ <button
+ type="button"
+ onClick={() => setOpen(false)}
+ className="w-full rounded-xl bg-primary py-3 text-sm font-medium text-primary-foreground hover:bg-primary/90 transition-colors"
+ >
+ Done
+ </button>
+ )}
</DialogContent>
</Dialog>
);
diff --git a/src/web/src/contexts/agent-context.tsx b/src/web/src/contexts/agent-context.tsx
index 0cd184e22..136b6d16e 100644
--- a/src/web/src/contexts/agent-context.tsx
+++ b/src/web/src/contexts/agent-context.tsx
@@ -21,6 +21,8 @@ import {
listAgentPins,
pinAgent as pinAgentApi,
unpinAgent as unpinAgentApi,
+ reorderAgentPins,
+ reorderUnpinnedAgents,
type AgentPin,
} from "@/lib/api";
import type { AgentRuntime as Runtime } from "@alook/shared";
@@ -42,7 +44,7 @@ interface AgentContextValue {
runtimes: Runtime[];
loading: boolean;
activeTaskCounts: Record<string, number>;
- pins: Map<string, string>;
+ pins: Map<string, { created_at: string; position: number }>;
reload: () => Promise<void>;
subscribeWs: (fn: WsSubscriber) => () => void;
handleCreateAgent: (req: CreateAgentRequest) => Promise<Agent | null>;
@@ -50,6 +52,9 @@ interface AgentContextValue {
handleDeleteAgent: (id: string) => Promise<boolean>;
handlePinAgent: (agentId: string) => Promise<void>;
handleUnpinAgent: (agentId: string) => Promise<void>;
+ handleReorderPins: (orderedAgentIds: string[]) => Promise<void>;
+ unpinnedOrder: Map<string, number>;
+ handleReorderUnpinned: (orderedAgentIds: string[]) => Promise<void>;
getFirstOnlineRuntimeId: () => string;
handleGenerateToken: () => Promise<string | null>;
handleDeleteMachine: (daemonId: string) => Promise<boolean>;
@@ -74,7 +79,8 @@ export function AgentProvider({
const [runtimes, setRuntimes] = useState<Runtime[]>([]);
const [loading, setLoading] = useState(true);
const [activeTaskCounts, setActiveTaskCounts] = useState<Record<string, number>>({});
- const [pins, setPins] = useState<Map<string, string>>(new Map());
+ const [pins, setPins] = useState<Map<string, { created_at: string; position: number }>>(new Map());
+ const [unpinnedOrder, setUnpinnedOrder] = useState<Map<string, number>>(new Map());
const loadedRef = useRef(false);
const subscribersRef = useRef(new Set<WsSubscriber>());
const taskCountsMountedRef = useRef(true);
@@ -105,14 +111,15 @@ export function AgentProvider({
const reload = useCallback(async () => {
try {
- const [a, r, p] = await Promise.all([
+ const [a, r, pinsData] = await Promise.all([
listAgents(workspaceId),
listRuntimes(workspaceId),
listAgentPins(workspaceId),
]);
setAgents(a);
setRuntimes(r);
- setPins(new Map(p.map((pin) => [pin.agent_id, pin.created_at])));
+ setPins(new Map(pinsData.pins.map((pin) => [pin.agent_id, { created_at: pin.created_at, position: pin.position }])));
+ setUnpinnedOrder(new Map(pinsData.sidebar_order.map((o) => [o.agent_id, o.position])));
} catch (err) {
toast.error(err instanceof Error ? err.message : "Failed to load data");
} finally {
@@ -225,7 +232,10 @@ export function AgentProvider({
);
const handlePinAgent = useCallback(async (agentId: string) => {
- setPins((prev) => new Map(prev).set(agentId, new Date().toISOString()));
+ setPins((prev) => {
+ const maxPos = Math.max(-1, ...[...prev.values()].map((v) => v.position));
+ return new Map(prev).set(agentId, { created_at: new Date().toISOString(), position: maxPos + 1 });
+ });
try {
await pinAgentApi(workspaceId, agentId);
} catch {
@@ -235,7 +245,7 @@ export function AgentProvider({
}, [workspaceId]);
const handleUnpinAgent = useCallback(async (agentId: string) => {
- let savedValue: string | undefined;
+ let savedValue: { created_at: string; position: number } | undefined;
setPins((prev) => { savedValue = prev.get(agentId); const next = new Map(prev); next.delete(agentId); return next; });
try {
await unpinAgentApi(workspaceId, agentId);
@@ -245,6 +255,35 @@ export function AgentProvider({
}
}, [workspaceId]);
+ const handleReorderPins = useCallback(async (orderedAgentIds: string[]) => {
+ const prev = new Map(pins);
+ setPins((current) => {
+ const next = new Map(current);
+ orderedAgentIds.forEach((id, i) => {
+ const existing = next.get(id);
+ if (existing) next.set(id, { ...existing, position: i });
+ });
+ return next;
+ });
+ try {
+ await reorderAgentPins(workspaceId, orderedAgentIds);
+ } catch {
+ setPins(prev);
+ toast.error("Failed to reorder pins");
+ }
+ }, [workspaceId, pins]);
+
+ const handleReorderUnpinned = useCallback(async (orderedAgentIds: string[]) => {
+ const prev = new Map(unpinnedOrder);
+ setUnpinnedOrder(new Map(orderedAgentIds.map((id, i) => [id, i])));
+ try {
+ await reorderUnpinnedAgents(workspaceId, orderedAgentIds);
+ } catch {
+ setUnpinnedOrder(prev);
+ toast.error("Failed to reorder agents");
+ }
+ }, [workspaceId, unpinnedOrder]);
+
const getFirstOnlineRuntimeId = useCallback(() => {
const first = runtimes.find((r) => r.status === "online");
return first?.id ?? "";
@@ -294,6 +333,9 @@ export function AgentProvider({
handleDeleteAgent,
handlePinAgent,
handleUnpinAgent,
+ handleReorderPins,
+ unpinnedOrder,
+ handleReorderUnpinned,
getFirstOnlineRuntimeId,
handleGenerateToken,
handleDeleteMachine,
diff --git a/src/web/src/lib/api.ts b/src/web/src/lib/api.ts
index 9ef3b6784..e3a9cfd3d 100644
--- a/src/web/src/lib/api.ts
+++ b/src/web/src/lib/api.ts
@@ -815,10 +815,16 @@ export interface AgentPin {
id: string;
agent_id: string;
created_at: string;
+ position: number;
+}
+
+export interface SidebarOrder {
+ agent_id: string;
+ position: number;
}
export const listAgentPins = (workspaceId: string) =>
- apiFetch<AgentPin[]>(`/api/agents/pins${wsQuery(workspaceId)}`);
+ apiFetch<{ pins: AgentPin[]; sidebar_order: SidebarOrder[] }>(`/api/agents/pins${wsQuery(workspaceId)}`);
export const pinAgent = (workspaceId: string, agentId: string) =>
apiFetch<{ pinned: boolean }>(`/api/agents/${agentId}/pin${wsQuery(workspaceId)}`, { method: "POST" });
@@ -826,6 +832,18 @@ export const pinAgent = (workspaceId: string, agentId: string) =>
export const unpinAgent = (workspaceId: string, agentId: string) =>
apiFetch<void>(`/api/agents/${agentId}/pin${wsQuery(workspaceId)}`, { method: "DELETE" });
+export const reorderAgentPins = (workspaceId: string, orderedAgentIds: string[]) =>
+ apiFetch<void>(`/api/agents/pins/reorder${wsQuery(workspaceId)}`, {
+ method: "PUT",
+ body: JSON.stringify({ ordered_agent_ids: orderedAgentIds }),
+ });
+
+export const reorderUnpinnedAgents = (workspaceId: string, orderedAgentIds: string[]) =>
+ apiFetch<void>(`/api/agents/sidebar/reorder${wsQuery(workspaceId)}`, {
+ method: "PUT",
+ body: JSON.stringify({ ordered_agent_ids: orderedAgentIds }),
+ });
+
// Workspace file browsing
export const requestWorkspaceBrowse = (
agentId: string,