@@ -287,6 +287,9 @@ func (p *chatPage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
287287 case tea.KeyPressMsg:
288288 switch {
289289 case key.Matches(msg, p.keyMap.NewSession):
290+ if p.app.CoderAgent.IsBusy() {
291+ return p, util.ReportWarn("Agent is busy, please wait before starting a new session...")
292+ }
290293 return p, p.newSession()
291294 case key.Matches(msg, p.keyMap.AddAttachment):
292295 agentCfg := config.Get().Agents["coder"]