fix: address review feedback

- Fix onSubmitAnswer type signature to return Promise<void> for proper error handling
- Add null safety guard for tool call function name access
- Add type="button" to tab navigation to prevent form submission
- Make AskUserQuestion handleSubmit async with loading state
- Include missing/empty agentStatus in 5s polling tier
- Re-throw errors in sendToolAnswer for component error handling
- Fix namespace collision in event store by using namespace-qualified session IDs

Co-Authored-By: Claude <noreply@anthropic.com>

Author: 2 people

components/backend/handlers/sessions.go

@@ -43,6 +43,7 @@ var (
 	DeriveRepoFolderFromURL           func(string) string
 	// DeriveAgentStatusFromEvents derives agentStatus from the persisted event log.
 	// Set by the websocket package at init to avoid circular imports.
+	// sessionID should be namespace-qualified (e.g., "namespace/sessionName") to avoid cross-project collisions.
 	DeriveAgentStatusFromEvents func(sessionID string) string
 	// LEGACY: SendMessageToSession removed - AG-UI server uses HTTP/SSE instead of WebSocket
 )
@@ -375,10 +376,13 @@ func enrichAgentStatus(session *types.AgenticSession) {
 		return
 	}
 	name, _ := session.Metadata["name"].(string)
-	if name == "" {
+	namespace, _ := session.Metadata["namespace"].(string)
+	if name == "" || namespace == "" {
 		return
 	}
-	if derived := DeriveAgentStatusFromEvents(name); derived != "" {
+	// Use namespace-qualified key to avoid cross-project collisions in the event store
+	sessionID := namespace + "/" + name
+	if derived := DeriveAgentStatusFromEvents(sessionID); derived != "" {
 		session.Status.AgentStatus = types.StringPtr(derived)
 	}
 }

components/backend/websocket/agui_proxy.go

@@ -257,10 +257,13 @@ func HandleAGUIRunProxy(c *gin.Context) {
 
 	log.Printf("AGUI Proxy: run=%s session=%s/%s msgs=%d", truncID(runID), projectName, sessionName, len(rawMessages))
 
+	// Use namespace-qualified session ID to avoid cross-project collisions
+	namespacedSessionID := projectName + "/" + sessionName
+
 	sessionLastSeen.Store(sessionName, time.Now())
 
 	// Store project→session mapping for activity tracking in persistStreamedEvent
-	sessionProjectMap.Store(sessionName, projectName)
+	sessionProjectMap.Store(namespacedSessionID, projectName)
 
 	// Resolve and cache the runner port for this session from the registry.
 	cacheSessionPort(projectName, sessionName)
@@ -297,7 +300,7 @@ func HandleAGUIRunProxy(c *gin.Context) {
 	runnerURL := getRunnerEndpoint(projectName, sessionName)
 
 	// Start background goroutine to proxy runner SSE → persist + broadcast
-	go proxyRunnerStream(runnerURL, bodyBytes, sessionName, runID, threadID)
+	go proxyRunnerStream(runnerURL, bodyBytes, sessionName, namespacedSessionID, runID, threadID)
 
 	// Return metadata immediately — events arrive via GET /agui/events
 	c.JSON(http.StatusOK, gin.H{
@@ -309,21 +312,22 @@ func HandleAGUIRunProxy(c *gin.Context) {
 // proxyRunnerStream connects to the runner's SSE endpoint, reads events,
 // persists them, and publishes them to the live broadcast pipe.  Runs in
 // a background goroutine so the POST /agui/run handler can return immediately.
-func proxyRunnerStream(runnerURL string, bodyBytes []byte, sessionName, runID, threadID string) {
+// namespacedSessionID is the namespace-qualified session ID (e.g., "namespace/sessionName") for event persistence.
+func proxyRunnerStream(runnerURL string, bodyBytes []byte, sessionName, namespacedSessionID, runID, threadID string) {
 	log.Printf("AGUI Proxy: connecting to runner at %s", runnerURL)
 	resp, err := connectToRunner(runnerURL, bodyBytes)
 	if err != nil {
 		log.Printf("AGUI Proxy: runner unavailable for %s: %v", sessionName, err)
 		// Publish error events so GET /agui/events subscribers see the failure
-		publishAndPersistErrorEvents(sessionName, runID, threadID, "Runner is not available")
+		publishAndPersistErrorEvents(sessionName, namespacedSessionID, runID, threadID, "Runner is not available")
 		return
 	}
 	defer resp.Body.Close()
 
 	if resp.StatusCode != http.StatusOK {
 		body, _ := io.ReadAll(resp.Body)
 		log.Printf("AGUI Proxy: runner returned %d: %s", resp.StatusCode, string(body))
-		publishAndPersistErrorEvents(sessionName, runID, threadID, fmt.Sprintf("Runner error: HTTP %d", resp.StatusCode))
+		publishAndPersistErrorEvents(sessionName, namespacedSessionID, runID, threadID, fmt.Sprintf("Runner error: HTTP %d", resp.StatusCode))
 		return
 	}
 
@@ -343,7 +347,7 @@ func proxyRunnerStream(runnerURL string, bodyBytes []byte, sessionName, runID, t
 		// Persist every data event to JSONL
 		if strings.HasPrefix(trimmed, "data: ") {
 			jsonData := strings.TrimPrefix(trimmed, "data: ")
-			persistStreamedEvent(sessionName, runID, threadID, jsonData)
+			persistStreamedEvent(namespacedSessionID, runID, threadID, jsonData)
 		}
 
 		// Publish raw SSE line to all GET /agui/events subscribers
@@ -356,14 +360,15 @@ func proxyRunnerStream(runnerURL string, bodyBytes []byte, sessionName, runID, t
 // publishAndPersistErrorEvents generates RUN_STARTED + RUN_ERROR events,
 // persists them, and publishes to the live broadcast so subscribers get
 // notified of runner failures.
-func publishAndPersistErrorEvents(sessionName, runID, threadID, message string) {
+// sessionName is used for broadcasting; namespacedSessionID is used for persistence.
+func publishAndPersistErrorEvents(sessionName, namespacedSessionID, runID, threadID, message string) {
 	// RUN_STARTED
 	startEvt := map[string]interface{}{
 		"type":     "RUN_STARTED",
 		"threadId": threadID,
 		"runId":    runID,
 	}
-	persistEvent(sessionName, startEvt)
+	persistEvent(namespacedSessionID, startEvt)
 	startData, _ := json.Marshal(startEvt)
 	publishLine(sessionName, fmt.Sprintf("data: %s\n\n", startData))
 
@@ -374,7 +379,7 @@ func publishAndPersistErrorEvents(sessionName, runID, threadID, message string)
 		"threadId": threadID,
 		"runId":    runID,
 	}
-	persistEvent(sessionName, errEvt)
+	persistEvent(namespacedSessionID, errEvt)
 	errData, _ := json.Marshal(errEvt)
 	publishLine(sessionName, fmt.Sprintf("data: %s\n\n", errData))
 }

components/backend/websocket/agui_store.go

@@ -198,8 +198,10 @@ func loadEvents(sessionID string) []map[string]interface{} {
 // DeriveAgentStatus reads a session's event log and returns the agent
 // status derived from the last significant events.
 //
+// sessionID should be namespace-qualified (e.g., "namespace/sessionName") to avoid cross-project collisions.
 // Returns "" if the status cannot be determined (no events, file missing, etc.).
 func DeriveAgentStatus(sessionID string) string {
+	// sessionID is now namespace-qualified, e.g., "default/session-123"
 	path := fmt.Sprintf("%s/sessions/%s/agui-events.jsonl", StateBaseDir, sessionID)
 
 	// Read only the tail of the file to avoid loading entire event log into memory.

components/frontend/src/app/projects/[name]/sessions/[sessionName]/page.tsx

@@ -1406,6 +1406,7 @@ export default function ProjectSessionDetailPage({
       });
     } catch (err) {
       toast.error(err instanceof Error ? err.message : "Failed to send answer");
+      throw err;
     }
   };
 

components/frontend/src/components/session/ask-user-question.tsx

@@ -19,7 +19,7 @@ export type AskUserQuestionMessageProps = {
   toolUseBlock: ToolUseBlock;
   resultBlock?: ToolResultBlock;
   timestamp?: string;
-  onSubmitAnswer?: (formattedAnswer: string) => void;
+  onSubmitAnswer?: (formattedAnswer: string) => Promise<void>;
   isNewest?: boolean;
 };
 
@@ -56,7 +56,8 @@ export const AskUserQuestionMessage: React.FC<AskUserQuestionMessageProps> = ({
 
   // Only interactive when newest message AND not already answered/submitted
   const [submitted, setSubmitted] = useState(false);
-  const disabled = alreadyAnswered || submitted || !isNewest;
+  const [isSubmitting, setIsSubmitting] = useState(false);
+  const disabled = alreadyAnswered || submitted || isSubmitting || !isNewest;
 
   // Active tab index (for multi-question tabbed view)
   const [activeTab, setActiveTab] = useState(0);
@@ -108,7 +109,7 @@ export const AskUserQuestionMessage: React.FC<AskUserQuestionMessageProps> = ({
 
   const allQuestionsAnswered = questions.every(isQuestionAnswered);
 
-  const handleSubmit = () => {
+  const handleSubmit = async () => {
     if (!onSubmitAnswer || !allQuestionsAnswered || disabled) return;
 
     // Build the structured response matching Claude SDK format
@@ -120,8 +121,13 @@ export const AskUserQuestionMessage: React.FC<AskUserQuestionMessageProps> = ({
 
     // Send as JSON matching the AskUserQuestion response format
     const response = JSON.stringify({ questions, answers });
-    onSubmitAnswer(response);
-    setSubmitted(true);
+    try {
+      setIsSubmitting(true);
+      await onSubmitAnswer(response);
+      setSubmitted(true);
+    } finally {
+      setIsSubmitting(false);
+    }
   };
 
   if (questions.length === 0) return null;
@@ -276,6 +282,7 @@ export const AskUserQuestionMessage: React.FC<AskUserQuestionMessageProps> = ({
                   const active = idx === activeTab;
                   return (
                     <button
+                      type="button"
                       key={idx}
                       onClick={() => setActiveTab(idx)}
                       className={cn(

components/frontend/src/components/ui/stream-message.tsx

@@ -13,7 +13,7 @@ import { FeedbackButtons } from "@/components/feedback";
 export type StreamMessageProps = {
   message: (MessageObject | ToolUseMessages | HierarchicalToolMessage) & { streaming?: boolean };
   onGoToResults?: () => void;
-  onSubmitAnswer?: (formattedAnswer: string) => void;
+  onSubmitAnswer?: (formattedAnswer: string) => Promise<void>;
   plainCard?: boolean;
   isNewest?: boolean;
   agentName?: string;

components/frontend/src/hooks/use-agent-status.ts

@@ -38,7 +38,7 @@ export function useAgentStatus(
 
       // Check the last tool call on this message
       const lastTc = msg.toolCalls[msg.toolCalls.length - 1];
-      if (isAskUserQuestionTool(lastTc.function.name)) {
+      if (lastTc.function?.name && isAskUserQuestionTool(lastTc.function.name)) {
         const hasResult =
           lastTc.result !== undefined &&
           lastTc.result !== null &&

components/frontend/src/services/queries/use-sessions.ts

@@ -55,7 +55,7 @@ export function useSessionsPaginated(projectName: string, params: PaginationPara
 
       // Tier 2: Any session with agent actively working → moderate (5s)
       const hasWorking = items.some((s) => {
-        return s.status?.phase === 'Running' && s.status?.agentStatus === 'working';
+        return s.status?.phase === 'Running' && (!s.status?.agentStatus || s.status?.agentStatus === 'working');
       });
       if (hasWorking) return 5000;