Generate feature branch of context repos only when user does not provide one

Co-Authored-By: Claude Sonnet 4.5 <[email protected]>
Signed-off-by: sallyom <[email protected]>

Author: sallyom

components/backend/handlers/helpers.go

@@ -48,6 +48,14 @@ func RetryWithBackoff(maxRetries int, initialDelay, maxDelay time.Duration, oper
 	return fmt.Errorf("operation failed after %d retries: %w", maxRetries, lastErr)
 }
 
+// ComputeAutoBranch generates the auto-branch name from a session name
+// This is the single source of truth for auto-branch naming in the backend
+// IMPORTANT: Keep pattern in sync with runner (main.py)
+// Pattern: ambient/{session-name}
+func ComputeAutoBranch(sessionName string) string {
+	return fmt.Sprintf("ambient/%s", sessionName)
+}
+
 // ValidateSecretAccess checks if the user has permission to perform the given verb on secrets
 // Returns an error if the user lacks the required permission
 // Accepts kubernetes.Interface for compatibility with dependency injection in tests

components/backend/handlers/sessions.go

@@ -409,6 +409,8 @@ func ListSessions(c *gin.Context) {
 			session.Status = parseStatus(status)
 		}
 
+		session.AutoBranch = ComputeAutoBranch(item.GetName())
+
 		sessions = append(sessions, session)
 	}
 
@@ -553,9 +555,10 @@ func CreateSession(c *gin.Context) {
 		timeout = *req.Timeout
 	}
 
-	// Generate unique name
+	// Generate unique name (timestamp-based)
+	// Note: Runner will create branch as "ambient/{session-name}"
 	timestamp := time.Now().Unix()
-	name := fmt.Sprintf("ambient-%d", timestamp)
+	name := fmt.Sprintf("%d", timestamp)
 
 	// Create the custom resource
 	// Metadata
@@ -722,9 +725,10 @@ func CreateSession(c *gin.Context) {
 	// This ensures consistent behavior whether sessions are created via API or kubectl.
 
 	c.JSON(http.StatusCreated, gin.H{
-		"message": "Agentic session created successfully",
-		"name":    name,
-		"uid":     created.GetUID(),
+		"message":    "Agentic session created successfully",
+		"name":       name,
+		"uid":        created.GetUID(),
+		"autoBranch": ComputeAutoBranch(name),
 	})
 }
 
@@ -773,6 +777,8 @@ func GetSession(c *gin.Context) {
 		session.Status = parseStatus(status)
 	}
 
+	session.AutoBranch = ComputeAutoBranch(sessionName)
+
 	c.JSON(http.StatusOK, session)
 }
 

components/backend/types/session.go

@@ -7,6 +7,9 @@ type AgenticSession struct {
 	Metadata   map[string]interface{} `json:"metadata"`
 	Spec       AgenticSessionSpec     `json:"spec"`
 	Status     *AgenticSessionStatus  `json:"status,omitempty"`
+	// Computed field: auto-generated branch name if user doesn't provide one
+	// IMPORTANT: Keep in sync with runner (main.py) and frontend (add-context-modal.tsx)
+	AutoBranch string `json:"autoBranch,omitempty"`
 }
 
 type AgenticSessionSpec struct {

components/frontend/src/app/projects/[name]/sessions/[sessionName]/components/modals/add-context-modal.tsx

@@ -16,7 +16,7 @@ type AddContextModalProps = {
   onAddRepository: (url: string, branch: string, autoPush?: boolean) => Promise<void>;
   onUploadFile?: () => void;
   isLoading?: boolean;
-  sessionName?: string;
+  autoBranch?: string;   // Auto-generated branch from backend (single source of truth)
 };
 
 export function AddContextModal({
@@ -25,27 +25,28 @@ export function AddContextModal({
   onAddRepository,
   onUploadFile,
   isLoading = false,
-  sessionName,
+  autoBranch,
 }: AddContextModalProps) {
   const [contextUrl, setContextUrl] = useState("");
-  const [contextBranch, setContextBranch] = useState("main");
+  const [contextBranch, setContextBranch] = useState("");  // Empty = use auto-generated branch
   const [autoPush, setAutoPush] = useState(false);
 
   const handleSubmit = async () => {
     if (!contextUrl.trim()) return;
 
-    const defaultBranch = sessionName ? `sessions/${sessionName}` : 'main';
+    // Use autoBranch from backend (single source of truth), or empty to let runner auto-generate
+    const defaultBranch = autoBranch || '';
     await onAddRepository(contextUrl.trim(), contextBranch.trim() || defaultBranch, autoPush);
 
     // Reset form
     setContextUrl("");
-    setContextBranch("main");
+    setContextBranch("");
     setAutoPush(false);
   };
 
   const handleCancel = () => {
     setContextUrl("");
-    setContextBranch("main");
+    setContextBranch("");
     setAutoPush(false);
     onOpenChange(false);
   };
@@ -85,7 +86,8 @@ export function AddContextModal({
             <Label htmlFor="context-branch">Branch (optional)</Label>
             <Input
               id="context-branch"
-              placeholder={sessionName ? `sessions/${sessionName}` : "main"}
+              // Use autoBranch from backend (single source of truth)
+              placeholder={autoBranch}
               value={contextBranch}
               onChange={(e) => setContextBranch(e.target.value)}
             />

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

@@ -1666,7 +1666,7 @@ export default function ProjectSessionDetailPage({
                                 if (option) setSelectedDirectory(option);
                               }}
                             >
-                              <SelectTrigger className="w-[250px] h-8">
+                              <SelectTrigger className="w-[300px] min-h-[2.5rem]">
                                 <SelectValue />
                               </SelectTrigger>
                               <SelectContent>
@@ -1699,6 +1699,7 @@ export default function ProjectSessionDetailPage({
                                     <SelectItem
                                       key={`${opt.type}:${opt.path}`}
                                       value={`${opt.type}:${opt.path}`}
+                                      className="py-2"
                                     >
                                       <div className="flex items-center gap-2 flex-wrap w-full">
                                         {opt.type === "artifacts" && (
@@ -2013,7 +2014,7 @@ export default function ProjectSessionDetailPage({
         }}
         onUploadFile={() => setUploadModalOpen(true)}
         isLoading={addRepoMutation.isPending}
-        sessionName={sessionName}
+        autoBranch={session?.autoBranch}
       />
 
       <UploadFileModal

components/frontend/src/types/api/sessions.ts

@@ -109,6 +109,9 @@ export type AgenticSession = {
   };
   spec: AgenticSessionSpec;
   status?: AgenticSessionStatus;
+  // Computed field from backend - auto-generated branch name
+  // IMPORTANT: Keep in sync with backend (sessions.go) and runner (main.py)
+  autoBranch?: string;
 };
 
 export type CreateAgenticSessionRequest = {
@@ -130,6 +133,7 @@ export type CreateAgenticSessionResponse = {
   message: string;
   name: string;
   uid: string;
+  autoBranch: string;  // Auto-generated branch name (e.g., "ambient/1234567890")
 };
 
 export type GetAgenticSessionResponse = {