-
Agent
+
+
+ {label}
void;
isLoading?: boolean;
isAgentWorking?: boolean;
+ taskId?: string;
taskDescription?: string;
};
-export function TaskChatPanel({ agents, onSend, isLoading, isAgentWorking, taskDescription }: TaskChatPanelProps) {
+export function TaskChatPanel({
+ agents,
+ onSend,
+ isLoading,
+ isAgentWorking,
+ taskId,
+ taskDescription,
+}: TaskChatPanelProps) {
const [messageInput, setMessageInput] = useState('');
const [selectedAgent, setSelectedAgent] = useState(agents[0]?.id ?? '');
const [planModeEnabled, setPlanModeEnabled] = useState(false);
const [isSending, setIsSending] = useState(false);
- const [isAwaitingResponse, setIsAwaitingResponse] = useState(false);
const messagesContainerRef = useRef(null);
const lastAgentMessageCountRef = useRef(0);
const wasAtBottomRef = useRef(true);
- const commentsState = useAppStore((state) => state.comments);
- const comments = commentsState?.items ?? [];
- const commentsLoading = commentsState?.isLoading ?? false;
- const isInitialLoading = commentsLoading && comments.length === 0;
- const { loadMore, hasMore, isLoading: isLoadingMore } = useLazyLoadComments(
- commentsState?.taskId ?? null
+ const messagesState = useAppStore((state) => state.messages);
+ const messages = messagesState?.items ?? [];
+ const messagesLoading = messagesState?.isLoading ?? false;
+ const isInitialLoading = messagesLoading && messages.length === 0;
+ const showLoadingState = (isLoading || isInitialLoading) && !isAgentWorking;
+ const { loadMore, hasMore, isLoading: isLoadingMore } = useLazyLoadMessages(
+ messagesState?.sessionId ?? null
);
// Filter to only show chat-relevant types.
- const visibleComments = comments.filter((comment) =>
- !comment.type ||
- comment.type === 'message' ||
- comment.type === 'content' ||
- comment.type === 'tool_call' ||
- comment.type === 'progress' ||
- comment.type === 'status' ||
- comment.type === 'error' ||
- comment.type === 'thinking' ||
- comment.type === 'todo'
+ const visibleMessages = messages.filter((message) =>
+ !message.type ||
+ message.type === 'message' ||
+ message.type === 'content' ||
+ message.type === 'tool_call' ||
+ message.type === 'progress' ||
+ message.type === 'status' ||
+ message.type === 'error' ||
+ message.type === 'thinking' ||
+ message.type === 'todo'
);
// Create a synthetic "user" message for the task description
- const taskDescriptionMessage: Comment | null = taskDescription ? {
- id: 'task-description',
- task_id: commentsState?.taskId ?? '',
- author_type: 'user',
- content: taskDescription,
- type: 'message',
- created_at: '',
- } : null;
+ const taskDescriptionMessage: Message | null =
+ taskDescription && visibleMessages.length === 0
+ ? {
+ id: 'task-description',
+ task_id: taskId ?? '',
+ agent_session_id: messagesState?.sessionId ?? '',
+ author_type: 'user',
+ content: taskDescription,
+ type: 'message',
+ created_at: '',
+ }
+ : null;
- // Combine task description with visible comments
+ // Combine task description with visible messages
const allMessages = taskDescriptionMessage
- ? [taskDescriptionMessage, ...visibleComments]
- : visibleComments;
+ ? [taskDescriptionMessage, ...visibleMessages]
+ : visibleMessages;
- const latestTodos = [...visibleComments]
+ const latestTodos = [...visibleMessages]
.reverse()
- .find((comment) => comment.type === 'todo' || (comment.metadata as { todos?: unknown })?.todos);
+ .find((message) => message.type === 'todo' || (message.metadata as { todos?: unknown })?.todos);
const todoItems = (latestTodos?.metadata as { todos?: Array<{ text: string; done?: boolean } | string> } | undefined)
?.todos
@@ -93,20 +105,19 @@ export function TaskChatPanel({ agents, onSend, isLoading, isAgentWorking, taskD
.filter((item) => item.text) ?? [];
// Count agent messages to detect new responses
- const agentMessageCount = visibleComments.filter((c) => c.author_type !== 'user').length;
+ const agentMessageCount = visibleMessages.filter((c) => c.author_type !== 'user').length;
// Clear awaiting state when a new agent message arrives
useEffect(() => {
- if (agentMessageCount > lastAgentMessageCountRef.current) {
- setIsAwaitingResponse(false);
- }
lastAgentMessageCountRef.current = agentMessageCount;
}, [agentMessageCount]);
- // Show typing indicator when awaiting response AND agent session is active
- const showTypingIndicator = isAwaitingResponse && isAgentWorking;
+ const lastVisibleMessage = visibleMessages[visibleMessages.length - 1];
+ const lastMessageRequestsInput = Boolean(lastVisibleMessage?.requests_input);
+ const shouldShowTypingIndicator = Boolean(isAgentWorking) && !lastMessageRequestsInput;
+ const typingIndicatorLabel = visibleMessages.length === 0 ? 'Agent is starting...' : 'Agent is thinking...';
- const itemCount = allMessages.length + (showTypingIndicator ? 1 : 0);
+ const itemCount = allMessages.length + (shouldShowTypingIndicator ? 1 : 0);
const virtualizer = useVirtualizer({
count: itemCount,
@@ -129,7 +140,7 @@ export function TaskChatPanel({ agents, onSend, isLoading, isAgentWorking, taskD
return () => element.removeEventListener('scroll', checkAtBottom);
}, [checkAtBottom]);
- // Scroll to bottom when new comments arrive or when typing indicator appears
+ // Scroll to bottom when new messages arrive or when typing indicator appears
useEffect(() => {
if (itemCount === 0) return;
if (wasAtBottomRef.current) {
@@ -189,13 +200,13 @@ export function TaskChatPanel({ agents, onSend, isLoading, isAgentWorking, taskD
Loading older messages...
)}
- {(isLoading || isInitialLoading) && (
+ {showLoadingState && (
- Loading comments...
+ Loading messages...
)}
- {!isLoading && !isInitialLoading && allMessages.length === 0 && (
+ {!isLoading && !isInitialLoading && visibleMessages.length === 0 && !isAgentWorking && (
No messages yet. Start the conversation!
@@ -203,7 +214,7 @@ export function TaskChatPanel({ agents, onSend, isLoading, isAgentWorking, taskD
{!isLoading && !isInitialLoading && itemCount > 0 && (
{virtualizer.getVirtualItems().map((virtualRow) => {
- const isTypingRow = showTypingIndicator && virtualRow.index === allMessages.length;
+ const isTypingRow = shouldShowTypingIndicator && virtualRow.index === allMessages.length;
const message = allMessages[virtualRow.index];
return (
-
- {isTypingRow ? (
-
- ) : (
-
- )}
-
+
+ {isTypingRow ? (
+
+ ) : (
+
+ )}
+
);
})}
diff --git a/apps/web/components/task/task-layout.tsx b/apps/web/components/task/task-layout.tsx
index 334f22f842..62625841a5 100644
--- a/apps/web/components/task/task-layout.tsx
+++ b/apps/web/components/task/task-layout.tsx
@@ -13,7 +13,7 @@ const DEFAULT_HORIZONTAL_LAYOUT: [number, number] = [75, 25];
type TaskLayoutProps = {
taskId: string | null;
taskDescription?: string;
- isLoadingComments: boolean;
+ isLoadingMessages: boolean;
isAgentWorking: boolean;
onSendMessage: (content: string) => Promise
;
};
@@ -21,7 +21,7 @@ type TaskLayoutProps = {
export const TaskLayout = memo(function TaskLayout({
taskId,
taskDescription,
- isLoadingComments,
+ isLoadingMessages,
isAgentWorking,
onSendMessage,
}: TaskLayoutProps) {
@@ -61,7 +61,7 @@ export const TaskLayout = memo(function TaskLayout({
);
});
-
diff --git a/apps/web/components/task/task-left-panel.tsx b/apps/web/components/task/task-left-panel.tsx
index 7d32850328..9fb156cecc 100644
--- a/apps/web/components/task/task-left-panel.tsx
+++ b/apps/web/components/task/task-left-panel.tsx
@@ -18,7 +18,7 @@ const AGENTS = [
type TaskLeftPanelProps = {
taskId: string | null;
taskDescription?: string;
- isLoadingComments: boolean;
+ isLoadingMessages: boolean;
isAgentWorking: boolean;
onSendMessage: (content: string) => Promise;
selectedDiffPath: string | null;
@@ -30,7 +30,7 @@ type TaskLeftPanelProps = {
export const TaskLeftPanel = memo(function TaskLeftPanel({
taskId,
taskDescription,
- isLoadingComments,
+ isLoadingMessages,
isAgentWorking,
onSendMessage,
selectedDiffPath: externalSelectedDiffPath,
@@ -163,8 +163,9 @@ export const TaskLeftPanel = memo(function TaskLeftPanel({
) : (
@@ -183,4 +184,3 @@ export const TaskLeftPanel = memo(function TaskLeftPanel({
);
});
-
diff --git a/apps/web/components/task/task-top-bar.tsx b/apps/web/components/task/task-top-bar.tsx
index f29becfbee..d80d7e8090 100644
--- a/apps/web/components/task/task-top-bar.tsx
+++ b/apps/web/components/task/task-top-bar.tsx
@@ -19,6 +19,13 @@ import {
IconCheck,
} from '@tabler/icons-react';
import { Button } from '@kandev/ui/button';
+import {
+ Dialog,
+ DialogContent,
+ DialogFooter,
+ DialogHeader,
+ DialogTitle,
+} from '@kandev/ui/dialog';
import {
DropdownMenu,
DropdownMenuContent,
@@ -26,6 +33,7 @@ import {
DropdownMenuTrigger,
} from '@kandev/ui/dropdown-menu';
import { Tooltip, TooltipContent, TooltipTrigger } from '@kandev/ui/tooltip';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@kandev/ui/select';
import { Popover, PopoverContent, PopoverTrigger } from '@kandev/ui/popover';
import { SessionsDropdown } from './sessions-dropdown';
import { CommitStatBadge, LineStat } from '@/components/diff-stat';
@@ -36,7 +44,7 @@ type TaskTopBarProps = {
taskTitle?: string;
taskDescription?: string;
baseBranch?: string;
- onStartAgent?: () => void;
+ onStartAgent?: (agentProfileId: string) => void;
onStopAgent?: () => void;
isAgentRunning?: boolean;
isAgentLoading?: boolean;
@@ -63,9 +71,19 @@ const TaskTopBar = memo(function TaskTopBar({
const [popoverOpen, setPopoverOpen] = useState(false);
const [copiedRepo, setCopiedRepo] = useState(false);
const [copiedWorktree, setCopiedWorktree] = useState(false);
+ const [startDialogOpen, setStartDialogOpen] = useState(false);
+ const [selectedAgentProfileId, setSelectedAgentProfileId] = useState
(null);
// Get git status from store
const gitStatus = useAppStore((state) => state.gitStatus);
+ const agentProfiles = useAppStore((state) => state.agentProfiles.items);
+
+ const resolvedAgentProfileId = useMemo(() => {
+ if (selectedAgentProfileId && agentProfiles.some((profile) => profile.id === selectedAgentProfileId)) {
+ return selectedAgentProfileId;
+ }
+ return agentProfiles[0]?.id ?? '';
+ }, [agentProfiles, selectedAgentProfileId]);
@@ -280,8 +298,8 @@ const TaskTopBar = memo(function TaskTopBar({
size="sm"
variant="default"
className="cursor-pointer"
- onClick={onStartAgent}
- disabled={isAgentLoading}
+ onClick={() => setStartDialogOpen(true)}
+ disabled={isAgentLoading || agentProfiles.length === 0}
>
{isAgentLoading ? (
@@ -291,10 +309,56 @@ const TaskTopBar = memo(function TaskTopBar({
Start Agent
- Start the agent on this task
+
+ {agentProfiles.length === 0 ? 'Add an agent profile to start.' : 'Start the agent on this task'}
+
)}
+
+
{/* Editor Button */}
diff --git a/apps/web/hooks/use-lazy-load-comments.ts b/apps/web/hooks/use-lazy-load-comments.ts
deleted file mode 100644
index c4033bb841..0000000000
--- a/apps/web/hooks/use-lazy-load-comments.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { useCallback } from 'react';
-import { listTaskComments } from '@/lib/http';
-import { useAppStore } from '@/components/state-provider';
-
-export function useLazyLoadComments(taskId: string | null) {
- const { hasMore, oldestCursor, isLoading } = useAppStore((state) => state.comments);
- const prependComments = useAppStore((state) => state.prependComments);
- const setCommentsMetadata = useAppStore((state) => state.setCommentsMetadata);
-
- const loadMore = useCallback(async () => {
- if (!taskId || !hasMore || isLoading || !oldestCursor) {
- return 0;
- }
-
- setCommentsMetadata({ isLoading: true });
- try {
- const response = await listTaskComments(taskId, {
- limit: 20,
- before: oldestCursor,
- sort: 'desc',
- });
- const orderedComments = [...(response.comments ?? [])].reverse();
- prependComments(orderedComments, {
- hasMore: response.has_more,
- oldestCursor: response.cursor || (orderedComments[0]?.id ?? null),
- });
- return orderedComments.length;
- } catch {
- setCommentsMetadata({ isLoading: false });
- return 0;
- }
- }, [taskId, hasMore, isLoading, oldestCursor, prependComments, setCommentsMetadata]);
-
- return { loadMore, hasMore, isLoading };
-}
diff --git a/apps/web/hooks/use-lazy-load-messages.ts b/apps/web/hooks/use-lazy-load-messages.ts
new file mode 100644
index 0000000000..e2d2b8e57b
--- /dev/null
+++ b/apps/web/hooks/use-lazy-load-messages.ts
@@ -0,0 +1,35 @@
+import { useCallback } from 'react';
+import { listAgentSessionMessages } from '@/lib/http';
+import { useAppStore } from '@/components/state-provider';
+
+export function useLazyLoadMessages(sessionId: string | null) {
+ const { hasMore, oldestCursor, isLoading } = useAppStore((state) => state.messages);
+ const prependMessages = useAppStore((state) => state.prependMessages);
+ const setMessagesMetadata = useAppStore((state) => state.setMessagesMetadata);
+
+ const loadMore = useCallback(async () => {
+ if (!sessionId || !hasMore || isLoading || !oldestCursor) {
+ return 0;
+ }
+
+ setMessagesMetadata({ isLoading: true });
+ try {
+ const response = await listAgentSessionMessages(sessionId, {
+ limit: 20,
+ before: oldestCursor,
+ sort: 'desc',
+ });
+ const orderedMessages = [...(response.messages ?? [])].reverse();
+ prependMessages(orderedMessages, {
+ hasMore: response.has_more,
+ oldestCursor: response.cursor || (orderedMessages[0]?.id ?? null),
+ });
+ return orderedMessages.length;
+ } catch {
+ setMessagesMetadata({ isLoading: false });
+ return 0;
+ }
+ }, [sessionId, hasMore, isLoading, oldestCursor, prependMessages, setMessagesMetadata]);
+
+ return { loadMore, hasMore, isLoading };
+}
diff --git a/apps/web/hooks/use-task-agent.ts b/apps/web/hooks/use-task-agent.ts
index fd2b70d0c6..eb8629de1f 100644
--- a/apps/web/hooks/use-task-agent.ts
+++ b/apps/web/hooks/use-task-agent.ts
@@ -1,25 +1,48 @@
import { useCallback, useEffect, useState } from 'react';
import { getWebSocketClient } from '@/lib/ws/connection';
-import type { Task } from '@/lib/types/http';
+import { useAppStore } from '@/components/state-provider';
+import type { AgentSessionState, Task } from '@/lib/types/http';
interface UseTaskAgentReturn {
isAgentRunning: boolean;
isAgentLoading: boolean;
+ agentSessionId: string | null;
+ agentSessionState: AgentSessionState | null;
worktreePath: string | null;
worktreeBranch: string | null;
- handleStartAgent: () => Promise;
+ handleStartAgent: (agentProfileId: string) => Promise;
handleStopAgent: () => Promise;
}
export function useTaskAgent(task: Task | null): UseTaskAgentReturn {
const [isAgentRunning, setIsAgentRunning] = useState(false);
const [isAgentLoading, setIsAgentLoading] = useState(false);
+ const [agentSessionId, setAgentSessionId] = useState(null);
+ const [agentSessionState, setAgentSessionState] = useState(null);
const [worktreePath, setWorktreePath] = useState(task?.worktree_path ?? null);
const [worktreeBranch, setWorktreeBranch] = useState(task?.worktree_branch ?? null);
+ const connectionStatus = useAppStore((state) => state.connection.status);
+ const wsAgentSessionState = useAppStore((state) =>
+ task?.id ? state.agentSessionStatesByTaskId[task.id] : undefined
+ );
+
+ useEffect(() => {
+ setIsAgentRunning(false);
+ setAgentSessionId(null);
+ setAgentSessionState(null);
+ setWorktreePath(task?.worktree_path ?? null);
+ setWorktreeBranch(task?.worktree_branch ?? null);
+ }, [task?.id, task?.worktree_path, task?.worktree_branch]);
+
+ useEffect(() => {
+ if (!wsAgentSessionState) return;
+ setAgentSessionState(wsAgentSessionState as AgentSessionState);
+ }, [wsAgentSessionState]);
// Fetch task execution status from orchestrator on mount
useEffect(() => {
if (!task?.id) return;
+ if (connectionStatus !== 'connected') return;
const checkExecution = async () => {
const client = getWebSocketClient();
@@ -29,12 +52,23 @@ export function useTaskAgent(task: Task | null): UseTaskAgentReturn {
const response = await client.request<{
has_execution: boolean;
task_id: string;
- status?: string;
+ state?: string;
+ agent_session_id?: string;
}>('task.execution', { task_id: task.id });
console.log('[useTaskAgent] Task execution check:', response);
if (response.has_execution) {
setIsAgentRunning(true);
+ if (response.state) {
+ setAgentSessionState(response.state as AgentSessionState);
+ }
+ if (response.agent_session_id) {
+ setAgentSessionId(response.agent_session_id);
+ }
+ } else {
+ setIsAgentRunning(false);
+ setAgentSessionId(null);
+ setAgentSessionState(null);
}
} catch (err) {
console.error('[useTaskAgent] Failed to check task execution:', err);
@@ -42,35 +76,47 @@ export function useTaskAgent(task: Task | null): UseTaskAgentReturn {
};
checkExecution();
- }, [task?.id]);
+ const interval = setInterval(() => {
+ if (connectionStatus === 'connected') {
+ checkExecution();
+ }
+ }, 2000);
- const handleStartAgent = useCallback(async () => {
+ return () => clearInterval(interval);
+ }, [connectionStatus, task?.id]);
+
+ const handleStartAgent = useCallback(async (agentProfileId: string) => {
if (!task?.id) return;
+ if (!agentProfileId) return;
const client = getWebSocketClient();
if (!client) return;
- // Require agent_profile_id to be set on the task
- if (!task.agent_profile_id) {
- console.error('No agent profile configured for this task. Please edit the task to select an agent profile.');
- return;
- }
-
setIsAgentLoading(true);
try {
interface StartResponse {
success: boolean;
task_id: string;
agent_instance_id: string;
- status: string;
+ agent_session_id?: string;
+ state: string;
worktree_path?: string;
worktree_branch?: string;
}
+ console.log('[useTaskAgent] orchestrator.start request', {
+ taskId: task.id,
+ agentProfileId,
+ });
const response = await client.request('orchestrator.start', {
task_id: task.id,
- agent_profile_id: task.agent_profile_id,
+ agent_profile_id: agentProfileId,
}, 15000);
+ console.log('[useTaskAgent] orchestrator.start response', response);
setIsAgentRunning(true);
+ setAgentSessionState(response.state as AgentSessionState);
+ if (response?.agent_session_id) {
+ setAgentSessionId(response.agent_session_id);
+ }
// Update worktree info from response
if (response?.worktree_path) {
@@ -82,7 +128,7 @@ export function useTaskAgent(task: Task | null): UseTaskAgentReturn {
} finally {
setIsAgentLoading(false);
}
- }, [task?.id, task?.agent_profile_id]);
+ }, [task?.id]);
const handleStopAgent = useCallback(async () => {
if (!task?.id) return;
@@ -94,6 +140,8 @@ export function useTaskAgent(task: Task | null): UseTaskAgentReturn {
try {
await client.request('orchestrator.stop', { task_id: task.id }, 15000);
setIsAgentRunning(false);
+ setAgentSessionId(null);
+ setAgentSessionState(null);
} catch (error) {
console.error('Failed to stop agent:', error);
} finally {
@@ -104,10 +152,11 @@ export function useTaskAgent(task: Task | null): UseTaskAgentReturn {
return {
isAgentRunning,
isAgentLoading,
+ agentSessionId,
+ agentSessionState,
worktreePath,
worktreeBranch,
handleStartAgent,
handleStopAgent,
};
}
-
diff --git a/apps/web/hooks/use-task-comments.ts b/apps/web/hooks/use-task-comments.ts
deleted file mode 100644
index 4e4abaa94e..0000000000
--- a/apps/web/hooks/use-task-comments.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import { useEffect, useState } from 'react';
-import { getWebSocketClient } from '@/lib/ws/connection';
-import { useAppStore, useAppStoreApi } from '@/components/state-provider';
-import type { Comment } from '@/lib/types/http';
-
-interface UseTaskCommentsReturn {
- isLoading: boolean;
-}
-
-export function useTaskComments(taskId: string | null): UseTaskCommentsReturn {
- const store = useAppStoreApi();
- const commentsState = useAppStore((state) => state.comments);
- const [isLoading, setIsLoading] = useState(false);
-
- // Fetch comments on mount and when task changes
- useEffect(() => {
- if (!taskId) return;
-
- // Set taskId immediately so that incoming WebSocket notifications are processed
- // before the API call completes (fixes race condition on first agent start)
- store.getState().setCommentsTaskId(taskId);
-
- // Clear git status when switching tasks to avoid showing stale data
- store.getState().clearGitStatus();
-
- if (commentsState.taskId === taskId) {
- return;
- }
-
- const fetchComments = async () => {
- const client = getWebSocketClient();
- if (!client) return;
-
- setIsLoading(true);
- store.getState().setCommentsLoading(true);
-
- try {
- const response = await client.request<{ comments: Comment[] }>('comment.list', { task_id: taskId }, 10000);
- console.log('[useTaskComments] comment.list response:', JSON.stringify(response, null, 2));
- store.getState().setComments(taskId, response.comments ?? []);
- } catch (error) {
- console.error('Failed to fetch comments:', error);
- store.getState().setComments(taskId, []);
- } finally {
- setIsLoading(false);
- }
- };
-
- fetchComments();
- }, [commentsState.taskId, taskId, store]);
-
- // Subscribe to task for real-time updates
- useEffect(() => {
- if (!taskId) return;
-
- const client = getWebSocketClient();
- if (!client) return;
-
- // Subscribe to task updates
- client.subscribe(taskId);
-
- return () => {
- // Unsubscribe when leaving
- client.unsubscribe(taskId);
- };
- }, [taskId]);
-
- return {
- isLoading,
- };
-}
-
diff --git a/apps/web/hooks/use-task-messages.ts b/apps/web/hooks/use-task-messages.ts
new file mode 100644
index 0000000000..b14c446e68
--- /dev/null
+++ b/apps/web/hooks/use-task-messages.ts
@@ -0,0 +1,177 @@
+import { useEffect, useRef, useState } from 'react';
+import { getWebSocketClient } from '@/lib/ws/connection';
+import { useAppStore, useAppStoreApi } from '@/components/state-provider';
+import type { Message } from '@/lib/types/http';
+import type { AgentSessionState } from '@/lib/types/http';
+
+interface UseTaskMessagesReturn {
+ isLoading: boolean;
+}
+
+export function useTaskMessages(
+ taskId: string | null,
+ agentSessionId: string | null
+): UseTaskMessagesReturn {
+ const store = useAppStoreApi();
+ const messagesState = useAppStore((state) => state.messages);
+ const agentSessionState = useAppStore((state) =>
+ taskId ? (state.agentSessionStatesByTaskId[taskId] ?? null) : null
+ );
+ const connectionStatus = useAppStore((state) => state.connection.status);
+ const [isLoading, setIsLoading] = useState(false);
+ const [isWaitingForInitialMessages, setIsWaitingForInitialMessages] = useState(false);
+ const initialFetchStartRef = useRef(null);
+ const lastFetchedSessionIdRef = useRef(null);
+ const lastFetchStateKeyRef = useRef(null);
+ const hasAgentMessage = messagesState.items.some((message) => message.author_type === 'agent');
+
+ useEffect(() => {
+ if (!taskId) return;
+ store.getState().clearGitStatus();
+ }, [store, taskId]);
+
+ useEffect(() => {
+ store.getState().setMessagesSessionId(agentSessionId);
+ if (!agentSessionId) {
+ console.log('[useTaskMessages] no agent_session_id yet, clearing messages');
+ store.getState().setMessages(null, []);
+ initialFetchStartRef.current = null;
+ lastFetchedSessionIdRef.current = null;
+ setIsWaitingForInitialMessages(false);
+ }
+ }, [agentSessionId, store]);
+
+ useEffect(() => {
+ if (!agentSessionId) return;
+ if (messagesState.items.length > 0) return;
+ if (initialFetchStartRef.current === null) {
+ initialFetchStartRef.current = Date.now();
+ setIsWaitingForInitialMessages(true);
+ }
+ }, [agentSessionId, messagesState.items.length]);
+
+ // Fetch messages on mount and when session changes
+ useEffect(() => {
+ if (!agentSessionId) return;
+ if (connectionStatus !== 'connected') {
+ console.warn('[useTaskMessages] WebSocket not connected yet, waiting to fetch messages');
+ return;
+ }
+
+ // Set sessionId immediately so that incoming WebSocket notifications are processed
+ // before the API call completes (fixes race condition on first agent start)
+ store.getState().setMessagesSessionId(agentSessionId);
+
+ if (lastFetchedSessionIdRef.current === agentSessionId && messagesState.items.length > 0) {
+ return;
+ }
+
+ const fetchMessages = async () => {
+ const client = getWebSocketClient();
+ if (!client) {
+ console.warn('[useTaskMessages] WebSocket client not ready');
+ return;
+ }
+
+ setIsLoading(true);
+ store.getState().setMessagesLoading(true);
+ if (initialFetchStartRef.current === null) {
+ initialFetchStartRef.current = Date.now();
+ setIsWaitingForInitialMessages(true);
+ }
+
+ try {
+ console.log('[useTaskMessages] requesting message.list', { agentSessionId });
+ const response = await client.request<{ messages: Message[] }>(
+ 'message.list',
+ { agent_session_id: agentSessionId },
+ 10000
+ );
+ console.log('[useTaskMessages] message.list response:', JSON.stringify(response, null, 2));
+ store.getState().setMessages(agentSessionId, response.messages ?? []);
+ lastFetchedSessionIdRef.current = agentSessionId;
+ if ((response.messages ?? []).length > 0) {
+ setIsWaitingForInitialMessages(false);
+ }
+ } catch (error) {
+ console.error('Failed to fetch messages:', error);
+ store.getState().setMessages(agentSessionId, []);
+ lastFetchedSessionIdRef.current = agentSessionId;
+ } finally {
+ setIsLoading(false);
+ }
+ };
+
+ fetchMessages();
+ }, [agentSessionId, connectionStatus, messagesState.items.length, store]);
+
+ // Subscribe to task for real-time updates
+ useEffect(() => {
+ if (!taskId) return;
+
+ const client = getWebSocketClient();
+ if (!client) {
+ console.warn('[useTaskMessages] WebSocket client not ready for subscribe');
+ return;
+ }
+
+ // Subscribe to task updates
+ console.log('[useTaskMessages] subscribing to task', { taskId });
+ client.subscribe(taskId);
+
+ return () => {
+ // Unsubscribe when leaving
+ console.log('[useTaskMessages] unsubscribing from task', { taskId });
+ client.unsubscribe(taskId);
+ };
+ }, [taskId]);
+
+ useEffect(() => {
+ if (!agentSessionId || !agentSessionState || !taskId) return;
+ if (hasAgentMessage) return;
+
+ const terminalStates: AgentSessionState[] = ['WAITING_FOR_INPUT', 'COMPLETED', 'FAILED'];
+ if (!terminalStates.includes(agentSessionState)) {
+ return;
+ }
+
+ const key = `${agentSessionId}:${agentSessionState}`;
+ if (lastFetchStateKeyRef.current === key) {
+ return;
+ }
+ lastFetchStateKeyRef.current = key;
+
+ const fetchMessages = async () => {
+ const client = getWebSocketClient();
+ if (!client) {
+ console.warn('[useTaskMessages] WebSocket client not ready for state fetch');
+ return;
+ }
+
+ setIsLoading(true);
+ store.getState().setMessagesLoading(true);
+ try {
+ console.log('[useTaskMessages] requesting message.list after state change', { agentSessionId, agentSessionState });
+ const response = await client.request<{ messages: Message[] }>(
+ 'message.list',
+ { agent_session_id: agentSessionId },
+ 10000
+ );
+ store.getState().setMessages(agentSessionId, response.messages ?? []);
+ if ((response.messages ?? []).length > 0) {
+ setIsWaitingForInitialMessages(false);
+ }
+ } catch (error) {
+ console.error('Failed to fetch messages after state change:', error);
+ } finally {
+ setIsLoading(false);
+ }
+ };
+
+ fetchMessages();
+ }, [agentSessionId, agentSessionState, hasAgentMessage, store, taskId]);
+
+ return {
+ isLoading: isLoading || isWaitingForInitialMessages,
+ };
+}
diff --git a/apps/web/hooks/use-user-display-settings.ts b/apps/web/hooks/use-user-display-settings.ts
index 395ed7cbaa..a07d9bc799 100644
--- a/apps/web/hooks/use-user-display-settings.ts
+++ b/apps/web/hooks/use-user-display-settings.ts
@@ -1,7 +1,7 @@
import { useCallback, useEffect, useMemo } from 'react';
import { getWebSocketClient } from '@/lib/ws/connection';
import { fetchUserSettings, updateUserSettings } from '@/lib/http';
-import { mapSelectedRepositoryPaths } from '@/lib/kanban/filters';
+import { mapSelectedRepositoryIds } from '@/lib/kanban/filters';
import { useAppStore } from '@/components/state-provider';
import { useRepositories } from '@/hooks/use-repositories';
@@ -133,8 +133,8 @@ export function useUserDisplaySettings({
}, [commitSettings, repositories, userSettings.boardId, userSettings.loaded, userSettings.repositoryIds, userSettings.workspaceId]);
const allRepositoriesSelected = userSettings.repositoryIds.length === 0;
- const selectedRepositoryPaths = useMemo(
- () => mapSelectedRepositoryPaths(repositories, userSettings.repositoryIds),
+ const selectedRepositoryIds = useMemo(
+ () => mapSelectedRepositoryIds(repositories, userSettings.repositoryIds),
[repositories, userSettings.repositoryIds]
);
@@ -144,6 +144,6 @@ export function useUserDisplaySettings({
repositories,
repositoriesLoading,
allRepositoriesSelected,
- selectedRepositoryPaths,
+ selectedRepositoryIds,
};
}
diff --git a/apps/web/lib/config.ts b/apps/web/lib/config.ts
index 03246ccd93..cef6f34a79 100644
--- a/apps/web/lib/config.ts
+++ b/apps/web/lib/config.ts
@@ -3,6 +3,7 @@ export type AppConfig = {
};
const DEFAULT_API_BASE_URL = 'http://localhost:8080';
+export const DEBUG_UI = process.env.NEXT_PUBLIC_KANDEV_DEBUG === 'true';
export function getBackendConfig(): AppConfig {
if (typeof window === 'undefined') {
diff --git a/apps/web/lib/http/index.ts b/apps/web/lib/http/index.ts
index 38adba193a..c1b0352471 100644
--- a/apps/web/lib/http/index.ts
+++ b/apps/web/lib/http/index.ts
@@ -8,7 +8,7 @@ import type {
ListExecutorsResponse,
ListRepositoriesResponse,
ListWorkspacesResponse,
- ListCommentsResponse,
+ ListMessagesResponse,
RepositoryBranchesResponse,
Task,
UserSettingsResponse,
@@ -92,11 +92,8 @@ export async function createTask(
title: string;
description?: string;
position?: number;
- repository_url?: string;
- branch?: string;
- agent_profile_id?: string;
- environment_id?: string;
- executor_id?: string;
+ repository_id?: string;
+ base_branch?: string;
state?: Task['state'];
},
options?: ApiRequestOptions
@@ -113,9 +110,10 @@ export async function updateTask(
title?: string;
description?: string;
position?: number;
- agent_profile_id?: string;
assigned_to?: string;
state?: Task['state'];
+ repository_id?: string;
+ base_branch?: string;
},
options?: ApiRequestOptions
) {
@@ -161,8 +159,8 @@ export async function fetchTask(taskId: string, options?: ApiRequestOptions) {
return fetchJson(`/api/v1/tasks/${taskId}`, options);
}
-export async function listTaskComments(
- taskId: string,
+export async function listAgentSessionMessages(
+ agentSessionId: string,
params?: { limit?: number; before?: string; after?: string; sort?: 'asc' | 'desc' },
options?: ApiRequestOptions
) {
@@ -172,8 +170,8 @@ export async function listTaskComments(
if (params?.after) query.set('after', params.after);
if (params?.sort) query.set('sort', params.sort);
const suffix = query.toString();
- const url = `/api/v1/tasks/${taskId}/comments${suffix ? `?${suffix}` : ''}`;
- return fetchJson(url, options);
+ const url = `/api/v1/agent-sessions/${agentSessionId}/messages${suffix ? `?${suffix}` : ''}`;
+ return fetchJson(url, options);
}
export async function listExecutors(options?: ApiRequestOptions): Promise {
diff --git a/apps/web/lib/kanban/filters.ts b/apps/web/lib/kanban/filters.ts
index c88124911a..6b42102073 100644
--- a/apps/web/lib/kanban/filters.ts
+++ b/apps/web/lib/kanban/filters.ts
@@ -3,36 +3,34 @@ import type { KanbanState } from '@/lib/state/store';
export type KanbanTask = KanbanState['tasks'][number];
-// Minimal task type for filtering - only needs id and repositoryUrl
+// Minimal task type for filtering - only needs id and repositoryId
export type FilterableTask = {
id: string;
- repositoryUrl?: string;
+ repositoryId?: string;
};
-export function mapSelectedRepositoryPaths(
+export function mapSelectedRepositoryIds(
repositories: Repository[],
selectedIds: string[]
): Set {
if (selectedIds.length === 0) {
return new Set();
}
- const repoById = new Map(repositories.map((repo) => [repo.id, repo]));
- const paths = new Set();
- selectedIds.forEach((id) => {
- const repo = repoById.get(id);
- if (repo?.local_path) {
- paths.add(repo.local_path);
+ const repoIds = new Set();
+ repositories.forEach((repo) => {
+ if (selectedIds.includes(repo.id)) {
+ repoIds.add(repo.id);
}
});
- return paths;
+ return repoIds;
}
export function filterTasksByRepositories(
tasks: T[],
- selectedRepositoryPaths: Set
+ selectedRepositoryIds: Set
): T[] {
- if (selectedRepositoryPaths.size === 0) {
+ if (selectedRepositoryIds.size === 0) {
return tasks;
}
- return tasks.filter((task) => task.repositoryUrl && selectedRepositoryPaths.has(task.repositoryUrl));
+ return tasks.filter((task) => task.repositoryId && selectedRepositoryIds.has(task.repositoryId));
}
diff --git a/apps/web/lib/ssr/mapper.ts b/apps/web/lib/ssr/mapper.ts
index 30766afe6a..4678746732 100644
--- a/apps/web/lib/ssr/mapper.ts
+++ b/apps/web/lib/ssr/mapper.ts
@@ -1,5 +1,5 @@
import type { AppState, KanbanState } from '@/lib/state/store';
-import type { BoardSnapshot, Comment, Task } from '@/lib/types/http';
+import type { BoardSnapshot, Message, Task } from '@/lib/types/http';
type KanbanTask = KanbanState['tasks'][number];
@@ -15,7 +15,7 @@ export function snapshotToState(snapshot: BoardSnapshot): Partial {
description: task.description ?? undefined,
position: task.position ?? 0,
state: task.state,
- repositoryUrl: task.repository_url ?? undefined,
+ repositoryId: task.repository_id ?? undefined,
} as KanbanTask;
})
.filter((task): task is KanbanTask => task !== null);
@@ -36,19 +36,19 @@ export function snapshotToState(snapshot: BoardSnapshot): Partial {
export function taskToState(
task: Task,
- comments?: { items: Comment[]; hasMore?: boolean; oldestCursor?: string | null }
+ messages?: { items: Message[]; hasMore?: boolean; oldestCursor?: string | null }
): Partial {
return {
tasks: {
activeTaskId: task.id,
},
- comments: comments
+ messages: messages
? {
- taskId: task.id,
- items: comments.items,
+ sessionId: messages.items[0]?.agent_session_id ?? null,
+ items: messages.items,
isLoading: false,
- hasMore: comments.hasMore ?? false,
- oldestCursor: comments.oldestCursor ?? (comments.items[0]?.id ?? null),
+ hasMore: messages.hasMore ?? false,
+ oldestCursor: messages.oldestCursor ?? (messages.items[0]?.id ?? null),
}
: undefined,
};
diff --git a/apps/web/lib/state/store.ts b/apps/web/lib/state/store.ts
index 14e43271cd..047ebadf6e 100644
--- a/apps/web/lib/state/store.ts
+++ b/apps/web/lib/state/store.ts
@@ -3,9 +3,9 @@ import type {
Agent,
AgentDiscovery,
Branch,
- Comment,
Environment,
Executor,
+ Message,
Repository,
TaskState as TaskStatus,
} from '@/lib/types/http';
@@ -22,7 +22,7 @@ export type KanbanState = {
description?: string;
position: number;
state?: TaskStatus;
- repositoryUrl?: string;
+ repositoryId?: string;
}>;
};
@@ -143,9 +143,9 @@ export type ConnectionState = {
error: string | null;
};
-export type CommentsState = {
- taskId: string | null;
- items: Comment[];
+export type MessagesState = {
+ sessionId: string | null;
+ items: Message[];
isLoading: boolean;
hasMore: boolean;
oldestCursor: string | null;
@@ -170,7 +170,8 @@ export type AppState = {
diffs: DiffState;
gitStatus: GitStatusState;
connection: ConnectionState;
- comments: CommentsState;
+ messages: MessagesState;
+ agentSessionStatesByTaskId: Record;
hydrate: (state: Partial) => void;
setActiveWorkspace: (workspaceId: string | null) => void;
setWorkspaces: (workspaces: WorkspaceState['items']) => void;
@@ -189,17 +190,18 @@ export type AppState = {
setUserSettings: (settings: UserSettingsState) => void;
setTerminalOutput: (terminalId: string, data: string) => void;
setConnectionStatus: (status: ConnectionState['status'], error?: string | null) => void;
- setComments: (
- taskId: string,
- comments: Comment[],
+ setMessages: (
+ sessionId: string | null,
+ messages: Message[],
meta?: { hasMore?: boolean; oldestCursor?: string | null }
) => void;
- setCommentsTaskId: (taskId: string | null) => void;
- addComment: (comment: Comment) => void;
- updateComment: (comment: Comment) => void;
- prependComments: (comments: Comment[], meta?: { hasMore?: boolean; oldestCursor?: string | null }) => void;
- setCommentsMetadata: (meta: { hasMore?: boolean; isLoading?: boolean; oldestCursor?: string | null }) => void;
- setCommentsLoading: (loading: boolean) => void;
+ setMessagesSessionId: (sessionId: string | null) => void;
+ addMessage: (message: Message) => void;
+ updateMessage: (message: Message) => void;
+ prependMessages: (messages: Message[], meta?: { hasMore?: boolean; oldestCursor?: string | null }) => void;
+ setMessagesMetadata: (meta: { hasMore?: boolean; isLoading?: boolean; oldestCursor?: string | null }) => void;
+ setMessagesLoading: (loading: boolean) => void;
+ setAgentSessionState: (taskId: string, state: string) => void;
setGitStatus: (taskId: string, gitStatus: Omit) => void;
clearGitStatus: () => void;
bumpAgentProfilesVersion: () => void;
@@ -239,7 +241,8 @@ const defaultState: AppState = {
timestamp: null,
},
connection: { status: 'disconnected', error: null },
- comments: { taskId: null, items: [], isLoading: false, hasMore: false, oldestCursor: null },
+ messages: { sessionId: null, items: [], isLoading: false, hasMore: false, oldestCursor: null },
+ agentSessionStatesByTaskId: {},
hydrate: () => undefined,
setActiveWorkspace: () => undefined,
setWorkspaces: () => undefined,
@@ -258,13 +261,14 @@ const defaultState: AppState = {
setUserSettings: () => undefined,
setTerminalOutput: () => undefined,
setConnectionStatus: () => undefined,
- setComments: () => undefined,
- setCommentsTaskId: () => undefined,
- addComment: () => undefined,
- updateComment: () => undefined,
- prependComments: () => undefined,
- setCommentsMetadata: () => undefined,
- setCommentsLoading: () => undefined,
+ setMessages: () => undefined,
+ setMessagesSessionId: () => undefined,
+ addMessage: () => undefined,
+ updateMessage: () => undefined,
+ prependMessages: () => undefined,
+ setMessagesMetadata: () => undefined,
+ setMessagesLoading: () => undefined,
+ setAgentSessionState: () => undefined,
setGitStatus: () => undefined,
clearGitStatus: () => undefined,
bumpAgentProfilesVersion: () => undefined,
@@ -292,13 +296,14 @@ function mergeInitialState(
| 'setUserSettings'
| 'setTerminalOutput'
| 'setConnectionStatus'
- | 'setComments'
- | 'setCommentsTaskId'
- | 'addComment'
- | 'updateComment'
- | 'prependComments'
- | 'setCommentsMetadata'
- | 'setCommentsLoading'
+ | 'setMessages'
+ | 'setMessagesSessionId'
+ | 'addMessage'
+ | 'updateMessage'
+ | 'prependMessages'
+ | 'setMessagesMetadata'
+ | 'setMessagesLoading'
+ | 'setAgentSessionState'
| 'setGitStatus'
| 'clearGitStatus'
| 'bumpAgentProfilesVersion'
@@ -323,7 +328,11 @@ function mergeInitialState(
diffs: { ...defaultState.diffs, ...initialState.diffs },
gitStatus: { ...defaultState.gitStatus, ...initialState.gitStatus },
connection: { ...defaultState.connection, ...initialState.connection },
- comments: { ...defaultState.comments, ...initialState.comments },
+ messages: { ...defaultState.messages, ...initialState.messages },
+ agentSessionStatesByTaskId: {
+ ...defaultState.agentSessionStatesByTaskId,
+ ...initialState.agentSessionStatesByTaskId,
+ },
};
}
@@ -352,7 +361,10 @@ export function createAppStore(initialState?: Partial) {
if (state.terminal) Object.assign(draft.terminal, state.terminal);
if (state.diffs) Object.assign(draft.diffs, state.diffs);
if (state.connection) Object.assign(draft.connection, state.connection);
- if (state.comments) Object.assign(draft.comments, state.comments);
+ if (state.messages) Object.assign(draft.messages, state.messages);
+ if (state.agentSessionStatesByTaskId) {
+ Object.assign(draft.agentSessionStatesByTaskId, state.agentSessionStatesByTaskId);
+ }
}),
setActiveWorkspace: (workspaceId) =>
set((draft) => {
@@ -444,94 +456,104 @@ export function createAppStore(initialState?: Partial) {
draft.connection.status = status;
draft.connection.error = error;
}),
- setComments: (taskId, comments, meta) =>
+ setMessages: (sessionId, messages, meta) =>
set((draft) => {
- draft.comments.taskId = taskId;
- draft.comments.items = comments;
- draft.comments.isLoading = false;
- draft.comments.hasMore = meta?.hasMore ?? false;
+ draft.messages.sessionId = sessionId;
+ draft.messages.items = messages;
+ draft.messages.isLoading = false;
+ draft.messages.hasMore = meta?.hasMore ?? false;
if (meta?.oldestCursor !== undefined) {
- draft.comments.oldestCursor = meta.oldestCursor;
- } else if (comments.length) {
- draft.comments.oldestCursor = comments[0].id;
+ draft.messages.oldestCursor = meta.oldestCursor;
+ } else if (messages.length) {
+ draft.messages.oldestCursor = messages[0].id;
} else {
- draft.comments.oldestCursor = null;
+ draft.messages.oldestCursor = null;
}
}),
- setCommentsTaskId: (taskId) =>
+ setMessagesSessionId: (sessionId) =>
set((draft) => {
- draft.comments.taskId = taskId;
- // Initialize items array if null to allow addComment to work
- // before setComments is called
- if (draft.comments.items === null) {
- draft.comments.items = [];
+ draft.messages.sessionId = sessionId;
+ // Initialize items array if null to allow addMessage to work
+ // before setMessages is called
+ if (draft.messages.items === null) {
+ draft.messages.items = [];
}
}),
- addComment: (comment) =>
+ addMessage: (message) =>
set((draft) => {
// Initialize items array if null
- if (draft.comments.items === null) {
- draft.comments.items = [];
+ if (draft.messages.items === null) {
+ draft.messages.items = [];
}
- // Only add if this comment is for the current task
- if (draft.comments.taskId === comment.task_id) {
- // Check if comment already exists (avoid duplicates)
- const exists = draft.comments.items.some((c) => c.id === comment.id);
+ if (!draft.messages.sessionId) {
+ draft.messages.sessionId = message.agent_session_id;
+ }
+ // Only add if this message is for the current session
+ if (draft.messages.sessionId === message.agent_session_id) {
+ // Check if message already exists (avoid duplicates)
+ const exists = draft.messages.items.some((item) => item.id === message.id);
if (!exists) {
- draft.comments.items.push(comment);
- if (!draft.comments.oldestCursor) {
- draft.comments.oldestCursor = comment.id;
+ draft.messages.items.push(message);
+ if (!draft.messages.oldestCursor) {
+ draft.messages.oldestCursor = message.id;
}
}
}
}),
- updateComment: (comment) =>
+ updateMessage: (message) =>
set((draft) => {
- // Only update if this comment is for the current task
- if (draft.comments.taskId === comment.task_id && draft.comments.items) {
- const index = draft.comments.items.findIndex((c) => c.id === comment.id);
+ if (!draft.messages.sessionId) {
+ draft.messages.sessionId = message.agent_session_id;
+ }
+ // Only update if this message is for the current session
+ if (draft.messages.sessionId === message.agent_session_id && draft.messages.items) {
+ const index = draft.messages.items.findIndex((item) => item.id === message.id);
if (index !== -1) {
- draft.comments.items[index] = comment;
+ draft.messages.items[index] = message;
}
}
}),
- prependComments: (comments, meta) =>
+ prependMessages: (messages, meta) =>
set((draft) => {
- if (draft.comments.items === null) {
- draft.comments.items = [];
+ if (draft.messages.items === null) {
+ draft.messages.items = [];
}
- const existingIds = new Set(draft.comments.items.map((comment) => comment.id));
- const incoming = comments.filter((comment) => !existingIds.has(comment.id));
+ const existingIds = new Set(draft.messages.items.map((item) => item.id));
+ const incoming = messages.filter((item) => !existingIds.has(item.id));
if (incoming.length) {
- draft.comments.items = [...incoming, ...draft.comments.items];
+ draft.messages.items = [...incoming, ...draft.messages.items];
}
if (meta?.hasMore !== undefined) {
- draft.comments.hasMore = meta.hasMore;
+ draft.messages.hasMore = meta.hasMore;
}
if (meta?.oldestCursor !== undefined) {
- draft.comments.oldestCursor = meta.oldestCursor;
- } else if (draft.comments.items.length) {
- draft.comments.oldestCursor = draft.comments.items[0].id;
+ draft.messages.oldestCursor = meta.oldestCursor;
+ } else if (draft.messages.items.length) {
+ draft.messages.oldestCursor = draft.messages.items[0].id;
} else {
- draft.comments.oldestCursor = null;
+ draft.messages.oldestCursor = null;
}
- draft.comments.isLoading = false;
+ draft.messages.isLoading = false;
}),
- setCommentsMetadata: (meta) =>
+ setMessagesMetadata: (meta) =>
set((draft) => {
if (meta.hasMore !== undefined) {
- draft.comments.hasMore = meta.hasMore;
+ draft.messages.hasMore = meta.hasMore;
}
if (meta.isLoading !== undefined) {
- draft.comments.isLoading = meta.isLoading;
+ draft.messages.isLoading = meta.isLoading;
}
if (meta.oldestCursor !== undefined) {
- draft.comments.oldestCursor = meta.oldestCursor;
+ draft.messages.oldestCursor = meta.oldestCursor;
}
}),
- setCommentsLoading: (loading) =>
+ setMessagesLoading: (loading) =>
set((draft) => {
- draft.comments.isLoading = loading;
+ draft.messages.isLoading = loading;
+ }),
+ setAgentSessionState: (taskId, state) =>
+ set((draft) => {
+ draft.agentSessionStatesByTaskId[taskId] = state;
}),
setGitStatus: (taskId, gitStatus) =>
set((draft) => {
diff --git a/apps/web/lib/types/backend.ts b/apps/web/lib/types/backend.ts
index 670c3ffe15..4d4a0aadac 100644
--- a/apps/web/lib/types/backend.ts
+++ b/apps/web/lib/types/backend.ts
@@ -18,8 +18,9 @@ export type BackendMessageType =
| 'column.created'
| 'column.updated'
| 'column.deleted'
- | 'comment.added'
- | 'comment.updated'
+ | 'message.added'
+ | 'message.updated'
+ | 'agent_session.state_changed'
| 'executor.created'
| 'executor.updated'
| 'executor.deleted'
@@ -64,7 +65,7 @@ export type TaskEventPayload = {
state?: TaskState;
priority?: number;
position?: number;
- repository_url?: string;
+ repository_id?: string;
};
export type AgentUpdatePayload = {
@@ -126,9 +127,10 @@ export type ColumnPayload = {
updated_at?: string;
};
-export type CommentAddedPayload = {
+export type MessageAddedPayload = {
task_id: string;
- comment_id: string;
+ message_id: string;
+ agent_session_id: string;
author_type: 'user' | 'agent';
author_id?: string;
content: string;
@@ -138,6 +140,13 @@ export type CommentAddedPayload = {
created_at: string;
};
+export type AgentSessionStateChangedPayload = {
+ task_id: string;
+ agent_session_id: string;
+ old_state?: string;
+ new_state: string;
+};
+
export type FileInfo = {
path: string;
status: 'modified' | 'added' | 'deleted' | 'untracked' | 'renamed';
@@ -234,8 +243,9 @@ export type BackendMessageMap = {
'column.created': BackendMessage<'column.created', ColumnPayload>;
'column.updated': BackendMessage<'column.updated', ColumnPayload>;
'column.deleted': BackendMessage<'column.deleted', ColumnPayload>;
- 'comment.added': BackendMessage<'comment.added', CommentAddedPayload>;
- 'comment.updated': BackendMessage<'comment.updated', CommentAddedPayload>;
+ 'message.added': BackendMessage<'message.added', MessageAddedPayload>;
+ 'message.updated': BackendMessage<'message.updated', MessageAddedPayload>;
+ 'agent_session.state_changed': BackendMessage<'agent_session.state_changed', AgentSessionStateChangedPayload>;
'executor.created': BackendMessage<'executor.created', ExecutorPayload>;
'executor.updated': BackendMessage<'executor.updated', ExecutorPayload>;
'executor.deleted': BackendMessage<'executor.deleted', ExecutorPayload>;
diff --git a/apps/web/lib/types/http.ts b/apps/web/lib/types/http.ts
index f582ec57d0..f3a55e1339 100644
--- a/apps/web/lib/types/http.ts
+++ b/apps/web/lib/types/http.ts
@@ -10,6 +10,15 @@ export type TaskState =
| 'FAILED'
| 'CANCELLED';
+export type AgentSessionState =
+ | 'CREATED'
+ | 'STARTING'
+ | 'RUNNING'
+ | 'WAITING_FOR_INPUT'
+ | 'COMPLETED'
+ | 'FAILED'
+ | 'CANCELLED';
+
export type Board = {
id: string;
workspace_id: string;
@@ -79,9 +88,8 @@ export type Task = {
description: string;
state: TaskState;
priority: number;
- agent_profile_id?: string | null;
- repository_url?: string | null;
- branch?: string | null;
+ repository_id?: string | null;
+ base_branch?: string | null;
assigned_agent_id?: string | null;
created_at: string;
updated_at: string;
@@ -212,15 +220,15 @@ export type ListEnvironmentsResponse = {
total: number;
};
-export type ListCommentsResponse = {
- comments: Comment[];
+export type ListMessagesResponse = {
+ messages: Message[];
total: number;
has_more: boolean;
cursor: string;
};
-export type CommentAuthorType = 'user' | 'agent';
-export type CommentType =
+export type MessageAuthorType = 'user' | 'agent';
+export type MessageType =
| 'message'
| 'content'
| 'tool_call'
@@ -230,13 +238,14 @@ export type CommentType =
| 'thinking'
| 'todo';
-export type Comment = {
+export type Message = {
id: string;
+ agent_session_id: string;
task_id: string;
- author_type: CommentAuthorType;
+ author_type: MessageAuthorType;
author_id?: string;
content: string;
- type: CommentType;
+ type: MessageType;
metadata?: Record;
requests_input?: boolean;
created_at: string;
diff --git a/apps/web/lib/ws/handlers/agent-session.ts b/apps/web/lib/ws/handlers/agent-session.ts
index 56a1ed27aa..224c88820a 100644
--- a/apps/web/lib/ws/handlers/agent-session.ts
+++ b/apps/web/lib/ws/handlers/agent-session.ts
@@ -3,6 +3,13 @@ import type { AppState } from '@/lib/state/store';
import type { WsHandlers } from '@/lib/ws/handlers/types';
export function registerAgentSessionHandlers(store: StoreApi): WsHandlers {
- void store;
- return {};
+ return {
+ 'agent_session.state_changed': (message) => {
+ const payload = message.payload;
+ if (!payload?.task_id || !payload?.new_state) {
+ return;
+ }
+ store.getState().setAgentSessionState(payload.task_id, payload.new_state);
+ },
+ };
}
diff --git a/apps/web/lib/ws/handlers/git-status.ts b/apps/web/lib/ws/handlers/git-status.ts
index 291cb8357a..b749813e50 100644
--- a/apps/web/lib/ws/handlers/git-status.ts
+++ b/apps/web/lib/ws/handlers/git-status.ts
@@ -18,9 +18,9 @@ export function registerGitStatusHandlers(store: StoreApi): WsHandlers
// Only update git status if it's for the current task
// This prevents stale data from showing when switching tasks
- if (state.comments.taskId !== payload.task_id) {
+ if (state.tasks.activeTaskId !== payload.task_id) {
console.log('[WS] Ignoring git.status for different task:', {
- current_task: state.comments.taskId,
+ current_task: state.tasks.activeTaskId,
received_task: payload.task_id,
});
return;
diff --git a/apps/web/lib/ws/handlers/comments.ts b/apps/web/lib/ws/handlers/messages.ts
similarity index 64%
rename from apps/web/lib/ws/handlers/comments.ts
rename to apps/web/lib/ws/handlers/messages.ts
index 570795e92e..0a40d62e2d 100644
--- a/apps/web/lib/ws/handlers/comments.ts
+++ b/apps/web/lib/ws/handlers/messages.ts
@@ -2,18 +2,19 @@ import type { StoreApi } from 'zustand';
import type { AppState } from '@/lib/state/store';
import type { WsHandlers } from '@/lib/ws/handlers/types';
-export function registerCommentsHandlers(store: StoreApi): WsHandlers {
+export function registerMessagesHandlers(store: StoreApi): WsHandlers {
return {
- 'comment.added': (message) => {
+ 'message.added': (message) => {
const payload = message.payload;
- console.log('[WS] comment.added payload:', JSON.stringify(payload, null, 2));
+ console.log('[WS] message.added payload:', JSON.stringify(payload, null, 2));
const state = store.getState();
console.log('[WS] store state:', {
- hasAddComment: typeof state.addComment,
- commentsTaskId: state.comments?.taskId,
+ hasAddMessage: typeof state.addMessage,
+ messagesSessionId: state.messages?.sessionId,
});
- state.addComment({
- id: payload.comment_id,
+ state.addMessage({
+ id: payload.message_id,
+ agent_session_id: payload.agent_session_id,
task_id: payload.task_id,
author_type: payload.author_type,
author_id: payload.author_id,
@@ -23,14 +24,15 @@ export function registerCommentsHandlers(store: StoreApi): WsHandlers
requests_input: payload.requests_input,
created_at: payload.created_at,
});
- console.log('[WS] addComment called');
+ console.log('[WS] addMessage called');
},
- 'comment.updated': (message) => {
+ 'message.updated': (message) => {
const payload = message.payload;
- console.log('[WS] comment.updated payload:', JSON.stringify(payload, null, 2));
+ console.log('[WS] message.updated payload:', JSON.stringify(payload, null, 2));
const state = store.getState();
- state.updateComment({
- id: payload.comment_id,
+ state.updateMessage({
+ id: payload.message_id,
+ agent_session_id: payload.agent_session_id,
task_id: payload.task_id,
author_type: payload.author_type,
author_id: payload.author_id,
@@ -40,7 +42,7 @@ export function registerCommentsHandlers(store: StoreApi): WsHandlers
requests_input: payload.requests_input,
created_at: payload.created_at,
});
- console.log('[WS] updateComment called');
+ console.log('[WS] updateMessage called');
},
};
}
diff --git a/apps/web/lib/ws/handlers/tasks.ts b/apps/web/lib/ws/handlers/tasks.ts
index 18a9d9f019..625ca95f88 100644
--- a/apps/web/lib/ws/handlers/tasks.ts
+++ b/apps/web/lib/ws/handlers/tasks.ts
@@ -17,7 +17,7 @@ export function registerTasksHandlers(store: StoreApi): WsHandlers {
description: message.payload.description,
position: message.payload.position ?? 0,
state: message.payload.state,
- repositoryUrl: message.payload.repository_url,
+ repositoryId: message.payload.repository_id,
};
return {
...state,
@@ -42,7 +42,7 @@ export function registerTasksHandlers(store: StoreApi): WsHandlers {
description: message.payload.description,
position: message.payload.position ?? 0,
state: message.payload.state,
- repositoryUrl: message.payload.repository_url,
+ repositoryId: message.payload.repository_id,
};
return {
...state,
@@ -86,7 +86,7 @@ export function registerTasksHandlers(store: StoreApi): WsHandlers {
description: message.payload.description,
position: message.payload.position ?? 0,
state: message.payload.state,
- repositoryUrl: message.payload.repository_url,
+ repositoryId: message.payload.repository_id,
};
console.log('[WS Router] Next task:', nextTask);
return {
diff --git a/apps/web/lib/ws/router.ts b/apps/web/lib/ws/router.ts
index 7cadbfce31..07c259f737 100644
--- a/apps/web/lib/ws/router.ts
+++ b/apps/web/lib/ws/router.ts
@@ -4,7 +4,7 @@ import { registerAgentsHandlers } from '@/lib/ws/handlers/agents';
import { registerAgentSessionHandlers } from '@/lib/ws/handlers/agent-session';
import { registerBoardsHandlers } from '@/lib/ws/handlers/boards';
import { registerColumnsHandlers } from '@/lib/ws/handlers/columns';
-import { registerCommentsHandlers } from '@/lib/ws/handlers/comments';
+import { registerMessagesHandlers } from '@/lib/ws/handlers/messages';
import { registerDiffsHandlers } from '@/lib/ws/handlers/diffs';
import { registerEnvironmentsHandlers } from '@/lib/ws/handlers/environments';
import { registerExecutorsHandlers } from '@/lib/ws/handlers/executors';
@@ -30,7 +30,7 @@ export function registerWsHandlers(store: StoreApi) {
...registerUsersHandlers(store),
...registerTerminalsHandlers(store),
...registerDiffsHandlers(store),
- ...registerCommentsHandlers(store),
+ ...registerMessagesHandlers(store),
...registerGitStatusHandlers(store),
...registerSystemEventsHandlers(store),
};