fix(web): merge chat status bar into single row and switch task on archive (#460)

This commit is contained in:
Carlos Florêncio
2026-03-24 23:22:20 +00:00
committed by GitHub
parent 8f0939d650
commit df70eee749
8 changed files with 347 additions and 20 deletions
@@ -20,7 +20,7 @@ import {
formatPlanCommentsAsMarkdown,
} from "@/lib/state/slices/comments/format";
import { setChatDraftContent } from "@/lib/local-storage";
import { useTaskActions } from "@/hooks/use-task-actions";
import { useArchiveAndSwitchTask } from "@/hooks/use-task-actions";
import { useToast } from "@/components/toast-provider";
import type { DiffComment } from "@/lib/diff/types";
import type { useChatPanelState } from "./use-chat-panel-state";
@@ -254,28 +254,32 @@ After completing the implementation, provide a summary of what was done.
function PRMergedBanner({ taskId }: { taskId: string }) {
const taskPR = useAppStore((state) => state.taskPRs.byTaskId[taskId]);
const [dismissed, setDismissed] = useState(false);
const { archiveTaskById } = useTaskActions();
const archiveAndSwitch = useArchiveAndSwitchTask();
const { toast } = useToast();
const handleArchive = useCallback(async () => {
try {
await archiveTaskById(taskId);
await archiveAndSwitch(taskId);
toast({ description: "Task archived" });
} catch {
toast({ description: "Failed to archive task", variant: "error" });
}
}, [taskId, archiveTaskById, toast]);
}, [taskId, archiveAndSwitch, toast]);
if (taskPR?.state !== "merged" || dismissed) return null;
return (
<div className="flex items-center gap-2 mx-1 mb-1 px-3 py-1.5 text-xs rounded-md bg-purple-500/10 text-purple-600 dark:text-purple-400">
<div
data-testid="pr-merged-banner"
className="flex flex-1 items-center gap-2 rounded-md bg-purple-500/10 px-2 py-1 text-purple-600 dark:text-purple-400"
>
<IconGitMerge className="h-3.5 w-3.5 shrink-0" />
<span className="flex-1">
PR #{taskPR.pr_number} has been merged. You can archive this task.
</span>
<button
type="button"
data-testid="pr-merged-archive-button"
onClick={handleArchive}
className="underline underline-offset-2 hover:text-purple-700 dark:hover:text-purple-300 cursor-pointer"
>
@@ -299,12 +303,22 @@ type TodoDisplayItem = {
status?: "pending" | "in_progress" | "completed" | "failed";
};
function SessionStatusBar({ todoItems }: { todoItems: TodoDisplayItem[] }) {
function ChatStatusBar({
todoItems,
taskId,
}: {
todoItems: TodoDisplayItem[];
taskId: string | null;
}) {
const showTodos = todoItems.length > 0;
if (!showTodos) return null;
// PRMergedBanner returns null internally when not applicable
return (
<div className="flex items-center gap-1.5 px-3 py-1 text-xs text-muted-foreground">
<TodoIndicator todos={todoItems} />
<div
data-testid="chat-status-bar"
className="flex items-center gap-1.5 py-1 text-xs text-muted-foreground"
>
{showTodos && <TodoIndicator todos={todoItems} />}
{taskId && <PRMergedBanner key={taskId} taskId={taskId} />}
</div>
);
}
@@ -387,8 +401,7 @@ export function ChatInputArea({
);
return (
<div className="bg-card flex-shrink-0 px-2 pb-2 pt-1">
<SessionStatusBar todoItems={todoItems} />
{taskId && <PRMergedBanner key={taskId} taskId={taskId} />}
<ChatStatusBar todoItems={todoItems} taskId={taskId} />
<ChatInputContainer
ref={chatInputRef}
key={clarificationKey}
@@ -72,6 +72,7 @@ export function TodoIndicator({ todos }: TodoIndicatorProps) {
<HoverCardTrigger asChild>
<button
type="button"
data-testid="todo-indicator"
className={cn(
"flex items-center gap-1.5 px-2 py-0.5 text-xs transition-colors rounded cursor-pointer",
allComplete
@@ -15,7 +15,7 @@ import { SHORTCUTS } from "@/lib/keyboard/constants";
import type { CommandItem } from "@/lib/commands/types";
import { replaceSessionUrl } from "@/lib/links";
import { useAllWorkflowSnapshots } from "@/hooks/domains/kanban/use-all-workflow-snapshots";
import { useTaskActions } from "@/hooks/use-task-actions";
import { useTaskActions, useArchiveAndSwitchTask } from "@/hooks/use-task-actions";
import { useTaskRemoval } from "@/hooks/use-task-removal";
import { performLayoutSwitch, useDockviewStore } from "@/lib/state/dockview-store";
import { INTENT_PR_REVIEW } from "@/lib/state/layout-manager";
@@ -256,7 +256,8 @@ function useSidebarActions(store: StoreApi) {
const setActiveSession = useAppStore((state) => state.setActiveSession);
const [deletingTaskId, setDeletingTaskId] = useState<string | null>(null);
const [preparingTaskId, setPreparingTaskId] = useState<string | null>(null);
const { deleteTaskById, archiveTaskById, renameTaskById } = useTaskActions();
const { deleteTaskById, renameTaskById } = useTaskActions();
const archiveAndSwitch = useArchiveAndSwitchTask({ useLayoutSwitch: true });
const { removeTaskFromBoard, loadTaskSessionsForTask } = useTaskRemoval({
store,
useLayoutSwitch: true,
@@ -302,18 +303,13 @@ function useSidebarActions(store: StoreApi) {
const handleArchiveTask = useCallback(
async (taskId: string) => {
// Capture active state before the async API call — the WS "task.updated"
// handler removes the archived task from kanbans before removeTaskFromBoard runs.
const { activeTaskId: wasActiveTaskId, activeSessionId: wasActiveSessionId } =
store.getState().tasks;
try {
await archiveTaskById(taskId);
await removeTaskFromBoard(taskId, { wasActiveTaskId, wasActiveSessionId });
await archiveAndSwitch(taskId);
} catch (error) {
console.error("Failed to archive task:", error);
}
},
[archiveTaskById, removeTaskFromBoard, store],
[archiveAndSwitch],
);
const handleDeleteTask = useCallback(