Refactor session status handling and update frontend display logic

- Removed the finalOutput field from the AgenticSessionStatus type and related CRD, streamlining session status management.
- Updated the ProjectSessionDetailPage to display results using the new result field instead of finalOutput, enhancing clarity in session details.
- Simplified the status update logic in the SimpleClaudeRunner by eliminating the finalOutput parameter, focusing on essential status fields.
- Improved message handling in the frontend to align with the updated session status structure, ensuring a consistent user experience.

Author: Gkrumbach07

components/backend/handlers.go

@@ -438,9 +438,6 @@ func listSessions(c *gin.Context) {
 
 		if status, ok := item.Object["status"].(map[string]interface{}); ok {
 			session.Status = parseStatus(status)
-			if session.Status != nil {
-				enrichStatusFromContentService(c, project, item.GetName(), session.Status)
-			}
 		}
 
 		sessions = append(sessions, session)
@@ -798,11 +795,6 @@ func getSession(c *gin.Context) {
 		session.Status = parseStatus(status)
 	}
 
-	// Augment from PVC via content service when possible
-	if session.Status != nil {
-		enrichStatusFromContentService(c, project, sessionName, session.Status)
-	}
-
 	c.JSON(http.StatusOK, session)
 }
 
@@ -924,77 +916,6 @@ func mergeGitConfigs(userConfig, defaultConfig *GitConfig) *GitConfig {
 	return merged
 }
 
-// Read session data from persistent files and populate status
-func readDataFromFiles(sessionName string, status *AgenticSessionStatus) {
-	sessionDir := filepath.Join(stateBaseDir, sessionName)
-	status.StateDir = sessionDir
-	finalOutputFile := filepath.Join(sessionDir, "final-output.txt")
-	if finalOutputBytes, err := ioutil.ReadFile(finalOutputFile); err == nil {
-		status.FinalOutput = string(finalOutputBytes)
-	}
-
-	messagesFile := filepath.Join(sessionDir, "messages.json")
-	if messagesBytes, err := ioutil.ReadFile(messagesFile); err == nil {
-		var messages []MessageObject
-		if err := json.Unmarshal(messagesBytes, &messages); err == nil {
-			status.Messages = messages
-			status.MessagesCount = len(messages)
-		} else {
-			log.Printf("Warning: failed to unmarshal messages for %s: %v", sessionName, err)
-		}
-	}
-
-	// Count artifacts under sessionDir/artifacts if present
-	status.ArtifactsCount = countArtifacts(filepath.Join(sessionDir, "artifacts"))
-}
-
-// Enrich status by fetching PVC-backed files via the per-namespace content service
-func enrichStatusFromContentService(c *gin.Context, project string, sessionName string, status *AgenticSessionStatus) {
-	base := os.Getenv("CONTENT_SERVICE_BASE")
-	if base == "" {
-		base = "http://ambient-content.%s.svc:8080"
-	}
-	endpoint := fmt.Sprintf(base, project)
-
-	httpGet := func(path string) (string, error) {
-		u := fmt.Sprintf("%s/content/file?path=%s", endpoint, url.QueryEscape(path))
-		req, _ := http.NewRequestWithContext(c.Request.Context(), http.MethodGet, u, nil)
-		if auth := c.GetHeader("Authorization"); strings.TrimSpace(auth) != "" {
-			req.Header.Set("Authorization", auth)
-		}
-		resp, err := http.DefaultClient.Do(req)
-		if err != nil {
-			return "", err
-		}
-		defer resp.Body.Close()
-		if resp.StatusCode != http.StatusOK {
-			return "", fmt.Errorf("status %d", resp.StatusCode)
-		}
-		b, _ := ioutil.ReadAll(resp.Body)
-		return string(b), nil
-	}
-
-	fetchedAny := false
-
-	if s, err := httpGet(fmt.Sprintf("/sessions/%s/messages.json", sessionName)); err == nil {
-		var messages []MessageObject
-		if jerr := json.Unmarshal([]byte(s), &messages); jerr == nil {
-			status.Messages = messages
-			status.MessagesCount = len(messages)
-			fetchedAny = true
-		}
-	}
-	if s, err := httpGet(fmt.Sprintf("/sessions/%s/final-output.txt", sessionName)); err == nil {
-		status.FinalOutput = s
-		fetchedAny = true
-	}
-
-	// Fallback to legacy on-pod files if content service unavailable
-	if !fetchedAny {
-		readDataFromFiles(sessionName, status)
-	}
-}
-
 // countArtifacts recursively counts files under the provided directory (returns 0 if missing)
 func countArtifacts(artifactsDir string) int {
 	info, err := os.Stat(artifactsDir)
@@ -1491,7 +1412,7 @@ func updateSessionStatus(c *gin.Context) {
 
 	// Accept standard fields and result summary fields from runner
 	allowed := map[string]struct{}{
-		"phase": {}, "completionTime": {}, "cost": {}, "finalOutput": {}, "message": {},
+		"phase": {}, "completionTime": {}, "cost": {}, "message": {},
 		"subtype": {}, "duration_ms": {}, "duration_api_ms": {}, "is_error": {},
 		"num_turns": {}, "session_id": {}, "total_cost_usd": {}, "usage": {}, "result": {},
 	}
@@ -1539,10 +1460,6 @@ func proxyContentWrites(c *gin.Context, project, sessionName string, statusUpdat
 	// Serialize writes we care about
 	writes := []writeReq{}
 
-	if v, ok := statusUpdate["finalOutput"].(string); ok && v != "" {
-		writes = append(writes, writeReq{Path: fmt.Sprintf("/sessions/%s/final-output.txt", sessionName), Content: v, Encoding: "utf8"})
-		delete(statusUpdate, "finalOutput")
-	}
 	if msgs, ok := statusUpdate["messages"].([]interface{}); ok && len(msgs) > 0 {
 		if b, err := json.Marshal(msgs); err == nil {
 			writes = append(writes, writeReq{Path: fmt.Sprintf("/sessions/%s/messages.json", sessionName), Content: string(b), Encoding: "utf8"})

components/backend/main.go

@@ -298,27 +298,20 @@ type MessageObject struct {
 }
 
 type AgenticSessionStatus struct {
-	Phase          string          `json:"phase,omitempty"`
-	Message        string          `json:"message,omitempty"`
-	StartTime      *string         `json:"startTime,omitempty"`
-	CompletionTime *string         `json:"completionTime,omitempty"`
-	JobName        string          `json:"jobName,omitempty"`
-	FinalOutput    string          `json:"finalOutput,omitempty"`
-	Cost           *float64        `json:"cost,omitempty"`
-	Messages       []MessageObject `json:"messages,omitempty"`
-	StateDir       string          `json:"stateDir,omitempty"`
-	ArtifactsCount int             `json:"artifactsCount,omitempty"`
-	MessagesCount  int             `json:"messagesCount,omitempty"`
+	Phase          string  `json:"phase,omitempty"`
+	Message        string  `json:"message,omitempty"`
+	StartTime      *string `json:"startTime,omitempty"`
+	CompletionTime *string `json:"completionTime,omitempty"`
+	JobName        string  `json:"jobName,omitempty"`
+	StateDir       string  `json:"stateDir,omitempty"`
 	// Result summary fields from runner
-	Subtype       string                 `json:"subtype,omitempty"`
-	DurationMs    int                    `json:"duration_ms,omitempty"`
-	DurationApiMs int                    `json:"duration_api_ms,omitempty"`
-	IsError       bool                   `json:"is_error,omitempty"`
-	NumTurns      int                    `json:"num_turns,omitempty"`
-	SessionID     string                 `json:"session_id,omitempty"`
-	TotalCostUSD  *float64               `json:"total_cost_usd,omitempty"`
-	Usage         map[string]interface{} `json:"usage,omitempty"`
-	Result        *string                `json:"result,omitempty"`
+	Subtype      string                 `json:"subtype,omitempty"`
+	IsError      bool                   `json:"is_error,omitempty"`
+	NumTurns     int                    `json:"num_turns,omitempty"`
+	SessionID    string                 `json:"session_id,omitempty"`
+	TotalCostUSD *float64               `json:"total_cost_usd,omitempty"`
+	Usage        map[string]interface{} `json:"usage,omitempty"`
+	Result       *string                `json:"result,omitempty"`
 }
 
 type CreateAgenticSessionRequest struct {
@@ -758,87 +751,11 @@ func parseStatus(status map[string]interface{}) *AgenticSessionStatus {
 		result.JobName = jobName
 	}
 
-	if finalOutput, ok := status["finalOutput"].(string); ok {
-		result.FinalOutput = finalOutput
-	}
-
-	if cost, ok := status["cost"].(float64); ok {
-		result.Cost = &cost
-	}
-
-	if messages, ok := status["messages"].([]interface{}); ok {
-		result.Messages = make([]MessageObject, len(messages))
-		for i, msg := range messages {
-			if msgMap, ok := msg.(map[string]interface{}); ok {
-				messageObj := MessageObject{}
-
-				// New structured fields (optional)
-				if mt, ok := msgMap["type"].(string); ok {
-					messageObj.Type = mt
-				}
-				if cb, ok := msgMap["content"].([]interface{}); ok {
-					messageObj.Content = cb
-				}
-				if st, ok := msgMap["subtype"].(string); ok {
-					messageObj.Subtype = st
-				}
-				if data, ok := msgMap["data"].(map[string]interface{}); ok {
-					messageObj.Data = data
-				}
-
-				// Assistant fields
-				if model, ok := msgMap["model"].(string); ok {
-					messageObj.Model = model
-				}
-
-				// Result fields
-				if dms, ok := msgMap["duration_ms"].(float64); ok {
-					messageObj.DurationMs = int(dms)
-				}
-				if dams, ok := msgMap["duration_api_ms"].(float64); ok {
-					messageObj.DurationApiMs = int(dams)
-				}
-				if isErr, ok := msgMap["is_error"].(bool); ok {
-					messageObj.IsError = isErr
-				}
-				if nt, ok := msgMap["num_turns"].(float64); ok {
-					messageObj.NumTurns = int(nt)
-				}
-				if sid, ok := msgMap["session_id"].(string); ok {
-					messageObj.SessionID = sid
-				}
-				if tcu, ok := msgMap["total_cost_usd"].(float64); ok {
-					messageObj.TotalCostUSD = &tcu
-				}
-				if usage, ok := msgMap["usage"].(map[string]interface{}); ok {
-					messageObj.Usage = usage
-				}
-				if res, ok := msgMap["result"].(string); ok {
-					messageObj.Result = &res
-				}
-
-				// If content is a string (legacy runner), still store it (overwrites any array set above)
-				if content, ok := msgMap["content"].(string); ok {
-					messageObj.Content = content
-				}
-
-				// legacy tool_* fields no longer supported
-
-				result.Messages[i] = messageObj
-			}
-		}
-	}
-
 	// New: result summary fields (top-level in status)
 	if st, ok := status["subtype"].(string); ok {
 		result.Subtype = st
 	}
-	if dms, ok := status["duration_ms"].(float64); ok {
-		result.DurationMs = int(dms)
-	}
-	if dams, ok := status["duration_api_ms"].(float64); ok {
-		result.DurationApiMs = int(dams)
-	}
+
 	if ie, ok := status["is_error"].(bool); ok {
 		result.IsError = ie
 	}
@@ -861,12 +778,6 @@ func parseStatus(status map[string]interface{}) *AgenticSessionStatus {
 	if stateDir, ok := status["stateDir"].(string); ok {
 		result.StateDir = stateDir
 	}
-	if ac, ok := status["artifactsCount"].(float64); ok {
-		result.ArtifactsCount = int(ac)
-	}
-	if mc, ok := status["messagesCount"].(float64); ok {
-		result.MessagesCount = int(mc)
-	}
 
 	return result
 }

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

@@ -546,7 +546,7 @@ export default function ProjectSessionDetailPage({ params }: { params: Promise<{
         )}
 
         {/* Agentic Results */}
-        {session.status?.message && (
+        {session.status?.result && (
           <Card>
             <CardHeader>
               <CardTitle>Agentic Results</CardTitle>
@@ -555,7 +555,7 @@ export default function ProjectSessionDetailPage({ params }: { params: Promise<{
             <CardContent>
               <div className="bg-white rounded-lg border p-6 prose prose-sm max-w-none prose-headings:text-gray-900 prose-p:text-gray-700 prose-strong:text-gray-900 prose-code:bg-gray-100 prose-code:px-1 prose-code:py-0.5 prose-code:rounded prose-pre:bg-gray-900 prose-pre:text-gray-100">
                 <ReactMarkdown remarkPlugins={[remarkGfm]} rehypePlugins={[rehypeHighlight]} components={outputComponents}>
-                  {session.status.finalOutput}
+                  {session.status.result}
                 </ReactMarkdown>
               </div>
             </CardContent>

components/frontend/src/types/agentic-session.ts

@@ -112,7 +112,6 @@ export type AgenticSessionStatus = {
 	startTime?: string;
 	completionTime?: string;
 	jobName?: string;
-	finalOutput?: string;
 	cost?: number;
   	// Storage & counts (align with CRD)
   	stateDir?: string;

components/manifests/crds/agenticsessions-crd.yaml

@@ -109,9 +109,6 @@ spec:
               message:
                 type: string
                 description: "Status message or error details"
-              finalOutput:
-                type: string
-                description: "Final textual output for the session"
               startTime:
                 type: string
                 format: date-time
@@ -121,28 +118,13 @@ spec:
               jobName:
                 type: string
                 description: "Name of the Kubernetes job created for this session"
-              cost:
-                type: number
-                description: "Total cost of the agentic session in USD"
               stateDir:
                 type: string
                 description: "Directory path where session state files are stored"
-              artifactsCount:
-                type: integer
-                description: "Number of artifacts (screenshots, files) generated"
-              messagesCount:
-                type: integer
-                description: "Number of messages in the conversation"
               # Result summary fields from the runner's ResultMessage
               subtype:
                 type: string
                 description: "Result subtype (e.g., success, error, interrupted)"
-              duration_ms:
-                type: integer
-                description: "Total duration of the run in milliseconds"
-              duration_api_ms:
-                type: integer
-                description: "Total API time in milliseconds"
               is_error:
                 type: boolean
                 description: "Whether the run ended with an error"

components/runners/claude-code-runner/auth_handler.py

@@ -187,15 +187,12 @@ async def update_session_status(self, session_name: str, status_data: Dict[str,
                 pass
 
         # Filter allowed fields only
-        allowed = {"phase", "completionTime", "cost", "finalOutput", "message"}
-        filtered = {k: v for k, v in status_data.items() if k in allowed}
-
         try:
             async with aiohttp.ClientSession() as session:
                 async with session.put(
                     endpoint,
                     headers=headers,
-                    data=json.dumps(filtered)
+                    data=json.dumps(status_data)
                 ) as response:
                     if response.status == 200:
                         logger.info(f"Successfully updated session status")