Display git currently checked-out branch in context and file explorer modals

[sallyom]

• Show the branch name as a badge next to each repository in the Context accordion and in the File Explorer. This helps users quickly identify which branch each repository is using.
• Properly handle multiple branches of same repositories
• This PR is included here: fix: Fresh client per turn + custom restart tool for Claude SDK #502

[sallyom]

The git repo context needs more of an overhaul than this PR- the platform needs to be aware of remotes and branches in general. This PR offers a slight improvement, but doesn't help with the platform's overall awareness of branches and remotes.
I'm seeing an edge case where if I add a 2nd branch as context, the platform doesn't know what to do with it - the frontend happily reports it's been cloned - but the actual pod does not include the new branch:

(app-root) sh-5.1$ git branch
* git-context-show-branch
  main

[codecov]

Codecov Report

✅ All modified and coverable lines are covered by tests.

📢 Thoughts on this report? Let us know!

[Gkrumbach07]

Why use timestamp, can't you use the session id so it's easier to trace back

[github-actions]

Claude Code Review

Summary

This PR adds git branch visualization and multi-branch support for repositories in the Context and File Explorer modals. The implementation spans backend (Go), frontend (TypeScript/React), operator (Go), and runner (Python) components. Overall, the code quality is good with solid architecture patterns, but there are several critical security issues and code quality concerns that must be addressed before merge.

Key Changes:

• Added autoBranch field to AgenticSession CRD and session types
• Implemented ComputeAutoBranch() helper for consistent branch naming
• Enhanced frontend to display branch badges in UI
• Added /repos/status endpoint for fetching active git branches
• Improved runner to create feature branches on repo clone
• Updated operator to sync repo status to CR

Issues by Severity

🚫 Blocker Issues

NONE - No blocking issues that prevent merge after critical issues are fixed.

🔴 Critical Issues

1. Type Assertions Without Checking (Backend) - VIOLATED RULE #4

// components/backend/handlers/sessions.go:1559
session.Metadata = updated.Object["metadata"].(map[string]interface{})

Issue: Direct type assertion without checking. This will panic if metadata is not a map.

Required Fix (from CLAUDE.md patterns):

metadata, found, err := unstructured.NestedMap(updated.Object, "metadata")
if !found || err != nil {
    log.Printf("Failed to get metadata: %v", err)
    c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to parse session metadata"})
    return
}
session.Metadata = metadata

Location: components/backend/handlers/sessions.go:1559 (and similar at line 1473)

---

2. Missing User Token Validation on New Endpoint - VIOLATED RULE #1

// components/backend/handlers/sessions.go:1721
func GetReposStatus(c *gin.Context) {
    project := c.GetString("project")
    // ... NO user token validation!

Issue: The new GetReposStatus endpoint does NOT call GetK8sClientsForRequest(c) to validate the user token. This violates the User Token Authentication Required rule.

Required Fix:

func GetReposStatus(c *gin.Context) {
    project := c.GetString("project")
    sessionName := c.Param("sessionName")
    
    // REQUIRED: Validate user token
    reqK8s, reqDyn := GetK8sClientsForRequest(c)
    if reqK8s == nil {
        c.JSON(http.StatusUnauthorized, gin.H{"error": "Invalid or missing token"})
        c.Abort()
        return
    }
    
    // ... rest of handler
}

Location: components/backend/handlers/sessions.go:1721

---

3. Frontend: Missing Error Boundary for New useReposStatus Query

// components/frontend/src/app/projects/[name]/sessions/[sessionName]/page.tsx
const { data: reposStatus } = useReposStatus(params.name, params.sessionName);

Issue: No error handling for the new useReposStatus query. If the backend endpoint fails, the UI will silently fail or show undefined data.

Required Fix:

const { data: reposStatus, error: reposStatusError } = useReposStatus(params.name, params.sessionName);

// Handle error state
if (reposStatusError) {
  console.error('Failed to fetch repos status:', reposStatusError);
  // Optionally show user-friendly error message
}

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

---

🟡 Major Issues

4. Inconsistent Error Handling in RemoveRepo

// components/backend/handlers/sessions.go:1490-1493
reconciledRepos, found, err := unstructured.NestedSlice(status, "reconciledRepos")
if !found || err != nil {
    log.Printf("Failed to get reconciledRepos: %v", err)
    reconciledRepos = []interface{}{}
}

Issue: Logs error but continues silently. This could hide data corruption issues.

Recommendation: Consider returning an error if err != nil (actual error vs. simply not found).

Location: components/backend/handlers/sessions.go:1490-1493

---

5. Python: Race Condition Risk with _restart_requested Flag

# components/runners/claude-code-runner/adapter.py:415
adapter_ref._restart_requested = True

Issue: The _restart_requested flag is set in an async context without locking. If multiple concurrent runs occur, this could cause race conditions.

Recommendation: Use asyncio.Lock() or make this flag thread-safe.

Location: components/runners/claude-code-runner/adapter.py:415

---

6. Frontend: Polling Interval Not Conditional

// components/frontend/src/services/queries/use-sessions.ts:115
export const useReposStatus = (projectName: string, sessionName: string) => {
  return useQuery({
    queryKey: ["reposStatus", projectName, sessionName],
    queryFn: () => sessionApi.getReposStatus(projectName, sessionName),
    refetchInterval: 5000, // Always polls every 5s
  });
};

Issue: Always polls every 5 seconds, even when session is not running. This wastes resources.

Recommendation: Make refetchInterval conditional based on session phase:

refetchInterval: (query) => {
  const session = queryClient.getQueryData(['sessions', projectName, sessionName]);
  return session?.status?.phase === 'Running' ? 5000 : false;
}

Location: components/frontend/src/services/queries/use-sessions.ts:115

---

🔵 Minor Issues

7. Missing JSDoc Comments for New Functions

New backend functions lack documentation:

• ComputeAutoBranch (components/backend/handlers/helpers.go:55)
• GetReposStatus (components/backend/handlers/sessions.go:1721)

Recommendation: Add GoDoc comments explaining purpose, parameters, and return values.

---

8. Frontend: Hardcoded Colors in Badge Component

// components/frontend/src/app/projects/[name]/sessions/[sessionName]/components/accordions/repositories-accordion.tsx:145
<Badge className="ml-2 bg-purple-100 text-purple-800">

Issue: Hardcoded colors don't respect dark mode or theme system.

Recommendation: Use Shadcn badge variants or define theme-aware colors in Tailwind config.

Location: components/frontend/src/app/projects/[name]/sessions/[sessionName]/components/accordions/repositories-accordion.tsx:145

---

9. Operator: Missing OwnerReference on Status Update (Potential)

The operator updates status.reconciledRepos but doesn't show explicit OwnerReference setting in the diff. Verify that OwnerReferences are maintained when updating status.

Location: components/operator/internal/handlers/sessions.go:125-134

---

10. Python: Logging Verbosity

# components/runners/claude-code-runner/adapter.py:561
logger.info(f"[ClaudeSDKClient Message #{message_count}]: {message}")

Issue: Logs every message from Claude SDK. This could be noisy in production.

Recommendation: Use logger.debug() for per-message logs, keep logger.info() for summaries.

---

Positive Highlights

✅ Excellent: ComputeAutoBranch() helper provides single source of truth for branch naming
✅ Good: Proper use of unstructured.NestedString in several places (e.g., sessions.go:1503)
✅ Good: Frontend uses React Query hooks consistently for new useReposStatus
✅ Good: CRD update includes proper reconciledRepos array in status subresource
✅ Good: Runner creates feature branches automatically (improves UX)
✅ Good: Idempotency check in clone_repo_at_runtime prevents duplicate notifications
✅ Strong: Frontend properly uses Shadcn UI components (Badge, Accordion, etc.)

Recommendations

Priority 1 (Must Fix Before Merge)

1. Fix type assertion in sessions.go:1559 - Use unstructured.NestedMap()
2. Add user token validation to GetReposStatus - Call GetK8sClientsForRequest(c)
3. Add error handling for useReposStatus in frontend - Check for query errors

Priority 2 (Should Fix)

4. Fix inconsistent error handling in RemoveRepo (reconciledRepos logic)
5. Add conditional polling to useReposStatus to avoid unnecessary API calls
6. Add thread safety to _restart_requested flag in Python adapter

Priority 3 (Nice to Have)

7. Add JSDoc/GoDoc comments for new functions
8. Use theme-aware colors for branch badges
9. Reduce logging verbosity in Python adapter

Testing Recommendations

• Test GetReposStatus with invalid/missing user tokens (should return 401)
• Test RemoveRepo with repos that only exist in status.reconciledRepos (not in spec)
• Test frontend behavior when useReposStatus query fails
• Test concurrent repo additions (verify idempotency)
• Verify feature branch creation on runner pod startup

---

Pre-Merge Checklist

Before approving:

• Fix critical issue Outcome: Reduce Refinement Time with agent System #1: Type assertions with unstructured helpers
• Fix critical issue Epic: RAT Architecture & Design #2: User token validation on GetReposStatus
• Fix critical issue Epic: Data Source Integration #3: Error handling for useReposStatus
• Run gofmt -w components/backend components/operator
• Run go vet ./... in backend and operator
• Run golangci-lint run in backend and operator
• Run npm run build in frontend (should pass with 0 warnings)
• Manual testing: Add repo, verify branch badge appears, verify /repos/status endpoint works

---

Overall Assessment: This is a solid feature with good architecture decisions, but has 3 critical security/safety issues that must be fixed before merge. The code follows most established patterns but violates a few key rules from CLAUDE.md. After addressing the critical issues, this PR will be ready to merge.