fix(acp): gracefully clean the queue on interrupt to stop

fix: update message

fix: .

fix: .

fix: .

fix: add guard for prompt

Author: cenk1cenk2

lua/codecompanion/acp/prompt_builder.lua

@@ -201,6 +201,7 @@ function PromptBuilder:handle_permission_request(id, params)
   if not id or not params then
     return
   end
+
   local tool_call = params.toolCall
   local options = params.options or {}
 
@@ -248,7 +249,9 @@ function PromptBuilder:handle_error(error)
     utils.fire("RequestFinished", self.options)
   end
 
-  self.connection._active_prompt = nil
+  if self.connection._active_prompt == self then
+    self.connection._active_prompt = nil
+  end
 end
 
 ---Handle done event from the server
@@ -281,7 +284,9 @@ function PromptBuilder:handle_done(stop_reason)
     self.options.status = status
     utils.fire("RequestFinished", self.options)
   end
-  self.connection._active_prompt = nil
+  if self.connection._active_prompt == self then
+    self.connection._active_prompt = nil
+  end
 end
 
 ---Cancel the prompt
@@ -297,7 +302,15 @@ function PromptBuilder:cancel()
       utils.fire("RequestFinished", self.options)
     end
   end
-  self.connection._active_prompt = nil
+
+  -- Keep _active_prompt alive so the agent's completion response can drain
+  -- through handle_done. Set a timeout to clean up if the agent never responds.
+  vim.defer_fn(function()
+    if self.connection._active_prompt == self then
+      log:debug("[acp::prompt_builder] Cancel timeout: cleaning up active prompt")
+      self.connection._active_prompt = nil
+    end
+  end, 5000)
 end
 
 PromptBuilder.new = PromptBuilder.new

lua/codecompanion/interactions/chat/acp/handler.lua

@@ -284,6 +284,11 @@ end
 ---@param request table
 ---@return nil
 function ACPHandler:handle_permission_request(request)
+  if self.chat.status == "cancelling" then
+    request.respond(nil, true)
+    return
+  end
+
   local tool_call = request.tool_call
 
   if

lua/codecompanion/interactions/chat/init.lua

@@ -1222,6 +1222,7 @@ function Chat:submit(opts)
       vim.cmd("stopinsert")
     end
     self.ui:lock_buf()
+    self.ui:reset_cursor_state()
     self.header_line = api.nvim_buf_line_count(self.bufnr) + 2 -- this accounts for the LLM header
   end
 
@@ -1555,6 +1556,10 @@ function Chat:stop()
   end
 
   vim.schedule(function()
+    if self.status ~= CONSTANTS.STATUS_CANCELLING then
+      return
+    end
+
     log:debug("Chat request cancelled")
     self:done(nil, nil, nil, nil, { status = "stopped" })
   end)

lua/codecompanion/interactions/chat/ui/init.lua

@@ -623,6 +623,13 @@ function UI:move_cursor(cursor_has_moved)
   end
 end
 
+---Reset cursor tracking state so auto-scroll resumes on next response
+---@return nil
+function UI:reset_cursor_state()
+  self.cursor.has_moved = false
+  self.cursor.pos = nil
+end
+
 ---Lock the chat buffer from editing
 ---@return nil
 function UI:lock_buf()