feat: Count the user messages in core.send_message rather than with the jobs

Author: guillaumeboehm

lua/opencode/core.lua

@@ -146,6 +146,7 @@ function M.send_message(prompt, opts)
   params.parts = context.format_message(prompt, opts.context)
   M.before_run(opts)
 
+  state.user_message_count = state.user_message_count + 1
   state.api_client
     :create_message(state.active_session.id, params)
     :and_then(function(response)
@@ -154,6 +155,7 @@ function M.send_message(prompt, opts)
         -- event manager
         ui.render_output()
       end
+      state.user_message_count = state.user_message_count - 1
 
       M.after_run(prompt)
     end)
@@ -366,7 +368,7 @@ function M.initialize_current_model()
   return state.current_model
 end
 
-local function on_job_count_change(_, new, old)
+local function on_user_message_count_change(_, new, old)
   local done_thinking = new == 0 and old > 0
   if config.hooks and config.hooks.on_done_thinking and done_thinking then
     pcall(config.hooks.on_done_thinking)
@@ -382,7 +384,7 @@ end
 
 function M.setup()
   state.subscribe('opencode_server', on_opencode_server)
-  state.subscribe('user_message_count', on_job_count_change)
+  state.subscribe('user_message_count', on_user_message_count_change)
   state.subscribe('current_permission', on_current_permission_change)
 
   vim.schedule(function()

lua/opencode/server_job.lua

@@ -27,14 +27,7 @@ end
 function M.call_api(url, method, body)
   local call_promise = Promise.new()
 
-  local function is_user_message()
-      return method == 'POST' and url:match("/message$") ~= nil
-  end
-
   state.job_count = state.job_count + 1
-  if is_user_message() then
-    state.user_message_count = state.user_message_count + 1
-  end
 
   local request_entry = { nil, call_promise }
   table.insert(M.requests, request_entry)
@@ -43,9 +36,6 @@ function M.call_api(url, method, body)
   local function remove_from_requests()
     for i, entry in ipairs(M.requests) do
       if entry == request_entry then
-        if is_user_message() then
-          state.user_message_count = state.user_message_count - 1
-        end
         table.remove(M.requests, i)
         break
       end