diff --git a/packages/webui/components/kanban/kanban-board.tsx b/packages/webui/components/kanban/kanban-board.tsx
index c9f3fa63..cf24f368 100644
--- a/packages/webui/components/kanban/kanban-board.tsx
+++ b/packages/webui/components/kanban/kanban-board.tsx
@@ -249,7 +249,7 @@ export function KanbanBoard({
const targetData = target.data as
| { type?: 'reorder'; task?: KanbanTaskInfo; position?: 'before' | 'after' }
- | { type?: 'kanban_column'; status?: KanbanTaskStatus }
+ | { type?: 'kanban_column'; status?: KanbanTaskStatus; lastTask?: KanbanTaskInfo }
| undefined
if (!targetData) return
@@ -279,6 +279,26 @@ export function KanbanBoard({
if (targetData.type === 'kanban_column' && targetData.status) {
const toStatus = targetData.status
+ const lastTask = targetData.lastTask
+
+ if (lastTask) {
+ if (task.id === lastTask.id) {
+ if (task.status === toStatus) return
+ updateTask({ taskId: task.id, fromStatus: task.status, status: toStatus })
+ return
+ }
+
+ updateTask({
+ taskId: task.id,
+ fromStatus: task.status,
+ status: toStatus,
+ afterIndex: lastTask.sortIndex ?? undefined,
+ targetTaskId: lastTask.id,
+ position: 'after',
+ })
+ return
+ }
+
if (task.status === toStatus) return
updateTask({ taskId: task.id, fromStatus: task.status, status: toStatus })
diff --git a/packages/webui/components/kanban/kanban-card.tsx b/packages/webui/components/kanban/kanban-card.tsx
index 98d017f0..c4ea56d3 100644
--- a/packages/webui/components/kanban/kanban-card.tsx
+++ b/packages/webui/components/kanban/kanban-card.tsx
@@ -31,6 +31,7 @@ interface KanbanCardProps {
onDelete?: (task: KanbanTaskInfo) => void
disabled?: boolean
isFirst?: boolean
+ isLast?: boolean
showBottomIndicator?: boolean
currentUserId?: string
currentUserRole?: string
@@ -42,6 +43,7 @@ export function KanbanCard({
onDelete,
disabled,
isFirst,
+ isLast,
showBottomIndicator,
currentUserId,
currentUserRole,
@@ -109,7 +111,8 @@ export function KanbanCard({
diff --git a/packages/webui/components/kanban/kanban-column.tsx b/packages/webui/components/kanban/kanban-column.tsx
index fc4eaa93..9f6db4fe 100644
--- a/packages/webui/components/kanban/kanban-column.tsx
+++ b/packages/webui/components/kanban/kanban-column.tsx
@@ -38,30 +38,6 @@ export function KanbanColumn({
const isOwnerOrEditor =
currentUserRole?.toLowerCase() === 'owner' || currentUserRole?.toLowerCase() === 'editor'
- const { ref: setDroppableRef, isDropTarget } = useDroppable({
- id: status,
- data: {
- type: 'kanban_column',
- status,
- },
- })
-
- const { source, target } = useDragOperation()
- const isDraggingTask = source?.data?.type === 'kanban_task'
- const isOverThisColumn =
- isDraggingTask &&
- (isDropTarget ||
- (target?.data?.type === 'kanban_column' && target.data.status === status) ||
- (target?.data?.type === 'reorder' &&
- (target.data.task as KanbanTaskInfo | undefined)?.status === status))
-
- const isOverColumnEmptySpace =
- isDraggingTask && target?.data?.type === 'kanban_column' && target.data.status === status
-
- const { ref: loadMoreRef, inView } = useInView({
- threshold: 0.1,
- })
-
const assigneeId = scope === 'my' ? currentUserId : undefined
const { data, fetchNextPage, hasNextPage, isFetchingNextPage, isLoading } = useInfiniteQuery({
@@ -86,6 +62,10 @@ export function KanbanColumn({
enabled: !!teamId,
})
+ const { ref: loadMoreRef, inView } = useInView({
+ threshold: 0.1,
+ })
+
useEffect(() => {
if (inView && hasNextPage && !isFetchingNextPage) {
fetchNextPage()
@@ -96,7 +76,29 @@ export function KanbanColumn({
return data?.pages?.flatMap((page) => (Array.isArray(page?.data) ? page.data : [])) || []
}, [data])
+ const { source, target } = useDragOperation()
const lastVisibleTask = allTasks.filter((t) => t.id !== source?.id).at(-1)
+
+ const { ref: setDroppableRef, isDropTarget } = useDroppable({
+ id: status,
+ data: {
+ type: 'kanban_column',
+ status,
+ lastTask: lastVisibleTask,
+ },
+ })
+
+ const isDraggingTask = source?.data?.type === 'kanban_task'
+ const isOverThisColumn =
+ isDraggingTask &&
+ (isDropTarget ||
+ (target?.data?.type === 'kanban_column' && target.data.status === status) ||
+ (target?.data?.type === 'reorder' &&
+ (target.data.task as KanbanTaskInfo | undefined)?.status === status))
+
+ const isOverColumnEmptySpace =
+ isDraggingTask && target?.data?.type === 'kanban_column' && target.data.status === status
+
const totalCount = data?.pages?.[0]?.pageInfo?.total ?? allTasks.length
const statusColor = getStatusColor(status)
@@ -132,10 +134,7 @@ export function KanbanColumn({
) : allTasks.length === 0 ? (
-
- {isOverColumnEmptySpace && (
-
- )}
+
) : (
@@ -146,6 +145,7 @@ export function KanbanColumn({
onClick={onTaskClick}
onDelete={onDeleteTask}
isFirst={index === 0}
+ isLast={index === allTasks.length - 1}
showBottomIndicator={isOverColumnEmptySpace && task.id === lastVisibleTask?.id}
currentUserId={currentUserId}
currentUserRole={currentUserRole}
diff --git a/packages/webui/components/kanban/kanban.test.tsx b/packages/webui/components/kanban/kanban.test.tsx
index b1b9dadd..e920707d 100644
--- a/packages/webui/components/kanban/kanban.test.tsx
+++ b/packages/webui/components/kanban/kanban.test.tsx
@@ -29,6 +29,7 @@ import { KanbanCreateTaskDialog } from './kanban-create-task-dialog'
import { TaskRelatedAssets } from './task-related-assets'
import { TaskCommentCard } from './edit-task-dialog/task-comment-card'
import { TaskCommentInput } from './edit-task-dialog/task-comment-input'
+import { TaskEventTimeline } from './edit-task-dialog/task-event-timeline'
import type { KanbanTaskAssetInfo } from '@shumai/dtos'
import { client } from '@/ui/api/client'
@@ -857,4 +858,76 @@ describe('Kanban UI Unit & Component Tests', () => {
expect(screen.queryByText(/Create Task|创建任务/i)).toBeNull()
})
})
+
+ describe('Kanban UI Alignment & DnD Improvements', () => {
+ it('TaskEventTimeline: renders timeline line and circles with aligned center positioning', () => {
+ const mockEvents = [
+ {
+ id: 'ev-1',
+ taskId: 't-1',
+ type: KanbanTaskEventType.CREATED,
+ actor: { id: 'u-1', name: 'Alice' },
+ fromStatus: null,
+ toStatus: KanbanTaskStatus.TODO,
+ data: null,
+ createdAt: '2026-08-20T00:00:00.000Z',
+ },
+ ]
+
+ const { container } = render(
+
,
+ { wrapper: createWrapper() },
+ )
+
+ // Container has pl-5 and before:left-[4px] before:w-[2px]
+ const timelineContainer = container.querySelector('.pl-5')
+ expect(timelineContainer).toBeDefined()
+ expect(timelineContainer?.className).toContain('before:left-[4px]')
+ expect(timelineContainer?.className).toContain('before:w-[2px]')
+
+ // Circle node has -left-5 top-[3px] w-2.5 h-2.5
+ const circleNode = container.querySelector('.-left-5')
+ expect(circleNode).toBeDefined()
+ expect(circleNode?.className).toContain('top-[3px]')
+ expect(circleNode?.className).toContain('w-2.5')
+ })
+
+ it('KanbanCard: expands bottom drop zone when isLast is true', () => {
+ const mockTask: KanbanTaskInfo = {
+ id: 'task-last',
+ title: 'Last Task',
+ isAgentTask: false,
+ status: KanbanTaskStatus.TODO,
+ priority: KanbanTaskPriority.MEDIUM,
+ startDate: null,
+ dueDate: null,
+ startedAt: null,
+ completedAt: null,
+ teamId: 'team-1',
+ projectId: null,
+ creator: { id: 'u-1', name: 'Alice' },
+ reporter: null,
+ assignee: null,
+ goal: null,
+ targetFolderId: null,
+ latestStatusEvent: null,
+ commentCount: 0,
+ dependencyCount: 0,
+ dependentCount: 0,
+ assetCount: 0,
+ createdAt: '2026-08-20T00:00:00.000Z',
+ updatedAt: '2026-08-20T00:00:00.000Z',
+ }
+
+ const { container, rerender } = render(
+
,
+ )
+ // When isLast is false, uses standard h-1/2 without -bottom-6
+ expect(container.querySelector('.-bottom-6')).toBeNull()
+
+ // When isLast is true, expands drop area with -bottom-6
+ rerender(
)
+ expect(container.querySelector('.-bottom-6')).toBeDefined()
+ })
+ })
})