Merge branch 'main' into jaaydenh/dynamic-params-beta-badge

jaaydenh · web-flow · commit 65f08fb8ccb9 · 2025-06-18T18:43:29.000+01:00
diff --git a/agent/agentssh/agentssh.go b/agent/agentssh/agentssh.go
@@ -454,7 +454,7 @@ func (s *Server) sessionHandler(session ssh.Session) {
 
 	x11, hasX11 := session.X11()
 	if hasX11 {
-		display, handled := s.x11Handler(session.Context(), x11)
+		display, handled := s.x11Handler(ctx, x11)
 		if !handled {
 			logger.Error(ctx, "x11 handler failed")
 			closeCause("x11 handler failed")
@@ -973,7 +973,7 @@ func (s *Server) handleConn(l net.Listener, c net.Conn) {
 		return
 	}
 	defer s.trackConn(l, c, false)
-	logger.Info(context.Background(), "started serving connection")
+	logger.Info(context.Background(), "started serving ssh connection")
 	// note: srv.ConnectionCompleteCallback logs completion of the connection
 	s.srv.HandleConn(c)
 }
diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -8500,7 +8500,7 @@ func (q *FakeQuerier) HasTemplateVersionsWithAITask(_ context.Context) (bool, er
 	defer q.mutex.RUnlock()
 
 	for _, templateVersion := range q.templateVersions {
-		if templateVersion.HasAITask {
+		if templateVersion.HasAITask.Valid && templateVersion.HasAITask.Bool {
 			return true, nil
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -8500,7 +8500,7 @@ func (q *FakeQuerier) HasTemplateVersionsWithAITask(_ context.Context) (bool, er`
`8500`	`8500`	`defer q.mutex.RUnlock()`
`8501`	`8501`
`8502`	`8502`	`for _, templateVersion := range q.templateVersions {`
`8503`		`- if templateVersion.HasAITask {`
	`8503`	`+ if templateVersion.HasAITask.Valid && templateVersion.HasAITask.Bool {`
`8504`	`8504`	`return true, nil`
`8505`	`8505`	`}`
`8506`	`8506`	`}`