Skip to content

armgit / alook

Public Imported from GitHub
0

Multi-Agent Collaboration for Team and Friends

feat: redesign issue sidecar with draggable width, frameless layout, and timeline UI

Gusdc35a903fd14
diff --git a/src/web/src/app/(app)/w/[slug]/issues/page.tsx b/src/web/src/app/(app)/w/[slug]/issues/page.tsx
index c49d50897..f2d36401f 100644
--- a/src/web/src/app/(app)/w/[slug]/issues/page.tsx
+++ b/src/web/src/app/(app)/w/[slug]/issues/page.tsx
@@ -1,8 +1,8 @@
"use client";
-import { useCallback, useEffect, useMemo, useState } from "react";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import { useLocalStorage } from "@/hooks/use-local-storage";
-import { Check, CheckCircle2, CircleDot, ExternalLink, File as FileIcon, GitBranch, Loader2, MessageSquare, Plus, Trash2, X } from "lucide-react";
+import { Check, CheckCircle2, CircleDot, File as FileIcon, GitBranch, Loader2, MessageSquare, Plus, Trash2, X } from "lucide-react";
import Link from "next/link";
import type { Agent, Artifact, Issue, IssueComment, Message, WsMessage } from "@alook/shared";
import { isTerminalIssueStatus } from "@alook/shared";
@@ -22,7 +22,7 @@ import {
} from "@/components/ui/dialog";
import { MarkdownEditor } from "@/components/ui/markdown-editor";
import { Popover, PopoverTrigger, PopoverContent } from "@/components/ui/popover";
-import { Sheet, SheetContent, SheetHeader, SheetTitle, SheetBody } from "@/components/ui/sheet";
+import { Sheet, SheetContent, SheetHeader, SheetTitle } from "@/components/ui/sheet";
import { AvatarRenderer, parseAvatarUrl } from "@/components/avatar";
import { ContextMenu, ContextMenuContent, ContextMenuItem, ContextMenuTrigger } from "@/components/ui/context-menu";
import { Textarea } from "@/components/ui/textarea";
@@ -34,6 +34,10 @@ import { Streamdown } from "streamdown";
// const MAX_ATTACHMENT_SIZE = 10 * 1024 * 1024;
// const MAX_ATTACHMENTS = 10;
+const SIDECAR_MIN_WIDTH = 320;
+const SIDECAR_MAX_WIDTH_RATIO = 0.8;
+const SIDECAR_DEFAULT_WIDTH = 448;
+
const ACTIVE_COLUMNS = [
{ id: "todo", label: "Todo" },
{ id: "in_progress", label: "In Progress" },
@@ -220,7 +224,7 @@ function CommentInput({ issueId, workspaceId, onCommented }: { issueId: string;
};
return (
- <div className="border-t border-border/60 pt-3 space-y-2">
+ <div className="pt-3 space-y-2">
<Textarea
placeholder="Leave a comment..."
value={content}
@@ -274,6 +278,9 @@ export default function IssuesPage() {
const [activeTask, setActiveTask] = useState<TaskApi | null>(null);
const [taskLatestText, setTaskLatestText] = useState<string>("");
const [form, setForm] = useState({ title: "", description: "", agentId: "" });
+ const [sidecarWidth, setSidecarWidth] = useState(SIDECAR_DEFAULT_WIDTH);
+ const sidecarDragging = useRef(false);
+ const timelineRef = useRef<HTMLDivElement>(null);
const completedIssues = useMemo(
() => issues.filter((issue) => TERMINAL_STATUSES.includes(issue.status)),
@@ -395,6 +402,12 @@ export default function IssuesPage() {
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [detailConvId, selectedId, subscribeWs]);
+ useEffect(() => {
+ if (timelineRef.current) {
+ timelineRef.current.scrollTop = timelineRef.current.scrollHeight;
+ }
+ }, [detail]);
+
async function handleCreate() {
if (!form.title.trim() || !form.agentId) return;
setCreating(true);
@@ -432,6 +445,18 @@ export default function IssuesPage() {
}
}, [workspaceId, selectedId]);
+ const onSidecarPointerDown = useCallback((e: React.PointerEvent) => {
+ e.preventDefault();
+ sidecarDragging.current = true;
+ (e.target as HTMLElement).setPointerCapture(e.pointerId);
+ }, []);
+ const onSidecarPointerMove = useCallback((e: React.PointerEvent) => {
+ if (!sidecarDragging.current) return;
+ const maxW = window.innerWidth * SIDECAR_MAX_WIDTH_RATIO;
+ setSidecarWidth(Math.min(maxW, Math.max(SIDECAR_MIN_WIDTH, window.innerWidth - e.clientX)));
+ }, []);
+ const onSidecarPointerUp = useCallback(() => { sidecarDragging.current = false; }, []);
+
// TODO: attachment functions disabled until Codex CLI fixes image_url serialization bug
// function handleFileSelect(event: React.ChangeEvent<HTMLInputElement>) { ... }
// function removeAttachment(index: number) { ... }
@@ -669,97 +694,135 @@ export default function IssuesPage() {
</div>
<Sheet open={!!selectedId} onOpenChange={(open) => { if (!open) { setSelectedId(null); setDetail(null); setActiveTask(null); setTaskLatestText(""); } }}>
- <SheetContent side="right" showCloseButton>
- <SheetHeader>
+ <SheetContent
+ side="right"
+ showCloseButton={false}
+ className="data-[side=right]:sm:inset-y-2 data-[side=right]:sm:right-2 data-[side=right]:sm:h-auto data-[side=right]:sm:rounded-xl data-[side=right]:sm:border"
+ style={{ width: `min(${sidecarWidth}px, 100vw)`, maxWidth: "none" }}
+ >
+ <div
+ onPointerDown={onSidecarPointerDown}
+ onPointerMove={onSidecarPointerMove}
+ onPointerUp={onSidecarPointerUp}
+ onLostPointerCapture={onSidecarPointerUp}
+ className="hidden sm:block absolute -left-px top-0 bottom-0 w-1.5 cursor-col-resize z-10 hover:bg-primary/20 active:bg-primary/30 transition-colors rounded-l-xl"
+ />
+ <SheetHeader className="border-b-0 pb-2">
<SheetTitle>
{detailLoading || !detail ? (
- <Skeleton className="h-5 w-56" />
+ <div className="space-y-2">
+ <Skeleton className="h-5 w-56" />
+ <Skeleton className="h-4 w-40" />
+ </div>
) : (
- <div className="flex items-center gap-2 mr-6">
- <Badge variant={detail.issue.status === "in_progress" ? "default" : "outline"} className="shrink-0 text-[10px] px-1.5 py-0">
- {detail.issue.status === "in_progress" && <Loader2 className="mr-1 size-3 animate-spin" />}
- {statusLabel(detail.issue.status)}
- </Badge>
- <span className="min-w-0 flex-1 truncate text-sm font-semibold">{detail.issue.title}</span>
- <span className="shrink-0 text-xs text-muted-foreground">{agentName(detail.issue.agent_id)}</span>
- <span className="shrink-0 text-xs text-muted-foreground">{formatDate(detail.issue.updated_at)}</span>
+ <div className="space-y-1">
+ <div className="flex items-center gap-2">
+ <span className="min-w-0 flex-1 truncate text-base font-semibold">{detail.issue.title}</span>
+ <Button variant="ghost" size="icon-sm" className="ml-auto shrink-0" onClick={() => { setSelectedId(null); setDetail(null); setActiveTask(null); setTaskLatestText(""); }}>
+ <X className="size-4" />
+ </Button>
+ </div>
+ <div className="flex items-center gap-2 text-xs text-muted-foreground">
+ <div className="flex items-center gap-0.5">
+ <Link
+ href={`/w/${slug}/agents/${detail.issue.agent_id}?conv=${detail.issue.conversation_id}${detail.issue.latest_task_id ? `&task=${detail.issue.latest_task_id}` : ""}`}
+ className="group inline-flex items-center rounded-lg text-xs text-muted-foreground h-7 px-2 hover:bg-muted hover:text-foreground transition-all"
+ >
+ <MessageSquare className="size-3 shrink-0" />
+ <span className="max-w-0 opacity-0 group-hover:max-w-16 group-hover:opacity-100 group-hover:ml-1 group-hover:delay-300 overflow-hidden transition-all duration-500 ease-out">Chat</span>
+ </Link>
+ {detail.issue.trace_id && (
+ <Link
+ href={`/w/${slug}/threads/${detail.issue.trace_id}`}
+ className="group inline-flex items-center rounded-lg text-xs text-muted-foreground h-7 px-2 hover:bg-muted hover:text-foreground transition-all"
+ >
+ <GitBranch className="size-3 shrink-0" />
+ <span className="max-w-0 opacity-0 group-hover:max-w-20 group-hover:opacity-100 group-hover:ml-1 group-hover:delay-300 overflow-hidden transition-all duration-500 ease-out">Thread</span>
+ </Link>
+ )}
+ </div>
+ <Badge variant={detail.issue.status === "in_progress" ? "default" : "outline"} className="shrink-0 text-[10px] px-1.5 py-0">
+ {detail.issue.status === "in_progress" && <Loader2 className="mr-1 size-3 animate-spin" />}
+ {statusLabel(detail.issue.status)}
+ </Badge>
+ {agentsById.get(detail.issue.agent_id) && (
+ <span className="flex items-center gap-1">
+ <AgentAvatar agent={agentsById.get(detail.issue.agent_id)} size={14} />
+ <span className="truncate">{agentName(detail.issue.agent_id)}</span>
+ </span>
+ )}
+ <span className="shrink-0">{formatDate(detail.issue.updated_at)}</span>
+ </div>
</div>
)}
</SheetTitle>
</SheetHeader>
- <SheetBody>
- {detailLoading || !detail ? (
- <div className="space-y-3">
- <Skeleton className="h-24" />
- <Skeleton className="h-16" />
- </div>
- ) : (
- <div className="space-y-5">
+ {detailLoading || !detail ? (
+ <div className="flex-1 px-6 py-5 space-y-3">
+ <Skeleton className="h-24" />
+ <Skeleton className="h-16" />
+ </div>
+ ) : (
+ <>
+ <div className="shrink-0 space-y-6 px-6 pt-2 pb-3">
{detail.issue.description && (
<div className="prose prose-sm dark:prose-invert max-w-none text-sm break-words">
<Streamdown>{detail.issue.description}</Streamdown>
</div>
)}
- <div className="grid grid-cols-2 gap-2">
- {detail.issue.trace_id && (
- <Link
- href={`/w/${slug}/threads/${detail.issue.trace_id}`}
- className="flex items-center gap-2 rounded-lg border border-border/60 bg-background/55 px-3 py-2 text-sm text-muted-foreground transition-colors hover:bg-accent hover:text-foreground"
- >
- <GitBranch className="size-4" />
- <span>Thread</span>
- <ExternalLink className="ml-auto size-3.5" />
- </Link>
- )}
- <Link
- href={`/w/${slug}/agents/${detail.issue.agent_id}?conv=${detail.issue.conversation_id}${detail.issue.latest_task_id ? `&task=${detail.issue.latest_task_id}` : ""}`}
- className="flex items-center gap-2 rounded-lg border border-border/60 bg-background/55 px-3 py-2 text-sm text-muted-foreground transition-colors hover:bg-accent hover:text-foreground"
- >
- <MessageSquare className="size-4" />
- <span>Chat</span>
- <ExternalLink className="ml-auto size-3.5" />
- </Link>
- </div>
<AttachmentList artifacts={detail.artifacts ?? []} workspaceId={workspaceId} />
- <div className="space-y-2 border-t border-border/60 pt-4">
- {(() => {
- const events = detail.messages
- .filter((m) => m.role === "event")
- .map((m) => ({ kind: "event" as const, id: m.id, created_at: m.created_at, data: m }));
- const comments = (detail.comments ?? [])
- .map((c) => ({ kind: "comment" as const, id: c.id, created_at: c.created_at, data: c }));
- const timeline = [...events, ...comments].sort(
- (a, b) => new Date(a.created_at).getTime() - new Date(b.created_at).getTime()
- );
-
- if (timeline.length === 0 && !isTaskActive) {
- return <div className="text-xs text-muted-foreground">No activity yet.</div>;
- }
+ </div>
- return timeline.map((item) =>
- item.kind === "event"
- ? <MessageRow key={item.id} message={item.data} />
- : <CommentRow key={item.id} comment={item.data} agents={agents} />
- );
- })()}
- {isTaskActive && (
- <div className="rounded-md border border-emerald-500/30 bg-emerald-500/10 px-3 py-2">
- <div className="flex items-center gap-2 text-xs text-emerald-600 dark:text-emerald-400">
- <span className="size-1.5 rounded-full bg-emerald-500 animate-pulse" />
- Working
+ <div ref={timelineRef} className="flex-1 min-h-0 overflow-y-auto thin-scrollbar mx-6 mt-2 mb-4 px-4 py-4 space-y-3 border rounded-lg">
+ {(() => {
+ const events = detail.messages
+ .filter((m) => m.role === "event")
+ .map((m) => ({ kind: "event" as const, id: m.id, created_at: m.created_at, data: m }));
+ const comments = (detail.comments ?? [])
+ .map((c) => ({ kind: "comment" as const, id: c.id, created_at: c.created_at, data: c }));
+ const timeline = [...events, ...comments].sort(
+ (a, b) => new Date(a.created_at).getTime() - new Date(b.created_at).getTime()
+ );
+
+ if (timeline.length === 0 && !isTaskActive) {
+ return <div className="text-xs text-muted-foreground">No activity yet.</div>;
+ }
+
+ return (
+ <div className="relative pl-4">
+ <div className="absolute left-[5px] top-2 bottom-2 w-px bg-border" />
+ <div className="space-y-3">
+ {timeline.map((item) => (
+ <div key={item.id} className="relative">
+ <div className="absolute -left-4 top-2.5 size-2.5 rounded-full border-2 border-background bg-muted-foreground/40" />
+ {item.kind === "event"
+ ? <MessageRow message={item.data} />
+ : <CommentRow comment={item.data} agents={agents} />
+ }
+ </div>
+ ))}
+ {isTaskActive && (
+ <div className="relative">
+ <div className="absolute -left-4 top-2.5 size-2.5 rounded-full border-2 border-background bg-emerald-500 animate-pulse" />
+ <div className="rounded-md border border-emerald-500/30 bg-emerald-500/10 px-3 py-2">
+ <div className="flex items-center gap-2 text-xs text-emerald-600 dark:text-emerald-400">Working</div>
+ {taskLatestText && <p className="mt-1 text-[11px] text-muted-foreground line-clamp-2">{taskLatestText}</p>}
+ </div>
+ </div>
+ )}
</div>
- {taskLatestText && (
- <p className="mt-1 text-[11px] text-muted-foreground line-clamp-2">{taskLatestText}</p>
- )}
</div>
- )}
- </div>
- {!isTaskActive && !isTerminalIssueStatus(detail.issue.status) && (
- <CommentInput issueId={detail.issue.id} workspaceId={workspaceId} onCommented={() => openIssue(detail.issue.id)} />
- )}
+ );
+ })()}
</div>
- )}
- </SheetBody>
+
+ {!isTaskActive && !isTerminalIssueStatus(detail.issue.status) && (
+ <div className="shrink-0 px-6 pb-4">
+ <CommentInput issueId={detail.issue.id} workspaceId={workspaceId} onCommented={() => openIssue(detail.issue.id)} />
+ </div>
+ )}
+ </>
+ )}
</SheetContent>
</Sheet>
</div>
diff --git a/src/web/src/app/api/issues/[id]/route.test.ts b/src/web/src/app/api/issues/[id]/route.test.ts
index 81b180af9..d40b86782 100644
--- a/src/web/src/app/api/issues/[id]/route.test.ts
+++ b/src/web/src/app/api/issues/[id]/route.test.ts
@@ -134,7 +134,7 @@ describe("DELETE /api/issues/[id]", () => {
const res = await DELETE(req, { params: { id: "iss_1" } } as any);
expect(res.status).toBe(204);
expect(mockDeleteIssue).toHaveBeenCalledWith({}, "iss_1", "w1");
- expect(mockCancelActiveTask).toHaveBeenCalledWith("c1", "w1", { skipDispatch: true });
+ expect(mockCancelActiveTask).toHaveBeenCalledWith("c1", "w1", { skipDispatch: true, reason: "Task cancelled: issue deleted" });
});
it("cancels via traceId when latestTask has a traceId", async () => {
@@ -144,7 +144,7 @@ describe("DELETE /api/issues/[id]", () => {
const req = new NextRequest("http://localhost/api/issues/iss_1", { method: "DELETE" });
const res = await DELETE(req, { params: { id: "iss_1" } } as any);
expect(res.status).toBe(204);
- expect(mockCancelTrace).toHaveBeenCalledWith("trace_1", "w1");
+ expect(mockCancelTrace).toHaveBeenCalledWith("trace_1", "w1", { reason: "Task cancelled: issue deleted" });
expect(mockCancelActiveTask).not.toHaveBeenCalled();
expect(mockDeleteIssue).toHaveBeenCalled();
});
@@ -156,10 +156,22 @@ describe("DELETE /api/issues/[id]", () => {
const req = new NextRequest("http://localhost/api/issues/iss_1", { method: "DELETE" });
const res = await DELETE(req, { params: { id: "iss_1" } } as any);
expect(res.status).toBe(204);
- expect(mockCancelActiveTask).toHaveBeenCalledWith("c1", "w1", { skipDispatch: true });
+ expect(mockCancelActiveTask).toHaveBeenCalledWith("c1", "w1", { skipDispatch: true, reason: "Task cancelled: issue deleted" });
expect(mockCancelTrace).not.toHaveBeenCalled();
});
+ it("falls back to cancelActiveTask when latestTaskId exists but task row is missing", async () => {
+ mockGetIssue.mockResolvedValue({ id: "iss_1", conversationId: "c1", latestTaskId: "t_gone" });
+ mockGetTask.mockResolvedValue(null);
+ mockDeleteIssue.mockResolvedValue({ id: "iss_1" });
+ const req = new NextRequest("http://localhost/api/issues/iss_1", { method: "DELETE" });
+ const res = await DELETE(req, { params: { id: "iss_1" } } as any);
+ expect(res.status).toBe(204);
+ expect(mockCancelActiveTask).toHaveBeenCalledWith("c1", "w1", { skipDispatch: true, reason: "Task cancelled: issue deleted" });
+ expect(mockCancelTrace).not.toHaveBeenCalled();
+ expect(mockDeleteIssue).toHaveBeenCalled();
+ });
+
it("still deletes the issue when cancellation throws", async () => {
mockGetIssue.mockResolvedValue({ id: "iss_1", conversationId: "c1", latestTaskId: null });
mockCancelActiveTask.mockRejectedValue(new Error("cancel failed"));
diff --git a/src/web/src/app/api/issues/[id]/route.ts b/src/web/src/app/api/issues/[id]/route.ts
index ae7416db6..d6aedc138 100644
--- a/src/web/src/app/api/issues/[id]/route.ts
+++ b/src/web/src/app/api/issues/[id]/route.ts
@@ -100,10 +100,11 @@ export const DELETE = withAuth(async (req: NextRequest, ctx) => {
const task = issue.latestTaskId
? await queries.task.getTask(db, issue.latestTaskId, ws.workspaceId)
: null;
+ const reason = "Task cancelled: issue deleted";
if (task?.traceId) {
- await taskService.cancelTrace(task.traceId, ws.workspaceId);
+ await taskService.cancelTrace(task.traceId, ws.workspaceId, { reason });
} else {
- await taskService.cancelActiveTask(issue.conversationId, ws.workspaceId, { skipDispatch: true });
+ await taskService.cancelActiveTask(issue.conversationId, ws.workspaceId, { skipDispatch: true, reason });
}
} catch (err) {
log.warn("failed to cancel tasks during issue deletion", { issueId: id, err });
diff --git a/src/web/src/lib/services/task.ts b/src/web/src/lib/services/task.ts
index ae86e11a3..e57ab308e 100644
--- a/src/web/src/lib/services/task.ts
+++ b/src/web/src/lib/services/task.ts
@@ -245,7 +245,7 @@ export class TaskService {
return { oldTask: marked, newTask };
}
- async cancelActiveTask(conversationId: string, workspaceId: string, opts?: { skipDispatch?: boolean }) {
+ async cancelActiveTask(conversationId: string, workspaceId: string, opts?: { skipDispatch?: boolean; reason?: string }) {
const activeTask = await taskQueries.getActiveTaskByConversation(this.db, conversationId, workspaceId);
if (!activeTask) return null;
@@ -267,7 +267,7 @@ export class TaskService {
await messageQueries.createMessage(this.db, {
conversationId,
role: "assistant",
- content: "Task cancelled by user",
+ content: opts?.reason ?? "Task cancelled by user",
taskId: activeTask.id,
});
@@ -343,7 +343,7 @@ export class TaskService {
}
}
- async cancelTrace(traceId: string, workspaceId: string) {
+ async cancelTrace(traceId: string, workspaceId: string, opts?: { reason?: string }) {
const tasks = await taskQueries.getTraceTree(this.db, traceId, workspaceId);
const activeConvIds = [...new Set(
tasks
@@ -352,7 +352,7 @@ export class TaskService {
)];
for (const convId of activeConvIds) {
try {
- await this.cancelActiveTask(convId, workspaceId, { skipDispatch: true });
+ await this.cancelActiveTask(convId, workspaceId, { skipDispatch: true, reason: opts?.reason });
} catch (err) {
log.warn("cancelTrace: failed to cancel task", { traceId, convId, err });
}