fix(quick_chat): remove duplicated instructions

Author: sudo-tee

lua/opencode/context/plain_text_formatter.lua

@@ -140,13 +140,11 @@ M.format_message = Promise.async(function(prompt, context_instance, opts)
     end
   end
 
-  -- Add selections
   for _, sel in ipairs(context_instance:get_selections() or {}) do
     table.insert(text_parts, '')
     table.insert(text_parts, M.format_selection(sel))
   end
 
-  -- Add diagnostics
   local diagnostics = context_instance:get_diagnostics(buf)
   if diagnostics and #diagnostics > 0 then
     local diag_range = nil
@@ -160,7 +158,6 @@ M.format_message = Promise.async(function(prompt, context_instance, opts)
     end
   end
 
-  -- Add cursor data
   if context_instance:is_context_enabled('cursor_data') then
     local current_buf, current_win = context_instance:get_current_buf()
     local cursor_data = context_instance:get_current_cursor_data(current_buf or buf, current_win or 0)
@@ -170,7 +167,6 @@ M.format_message = Promise.async(function(prompt, context_instance, opts)
     end
   end
 
-  -- Add git diff
   if context_instance:is_context_enabled('git_diff') then
     local diff_text = context_instance:get_git_diff():await()
     if diff_text and diff_text ~= '' then
@@ -179,13 +175,11 @@ M.format_message = Promise.async(function(prompt, context_instance, opts)
     end
   end
 
-  -- Add instruction
   table.insert(text_parts, '')
-  table.insert(text_parts, 'INSTRUCTION: ' .. prompt)
+  table.insert(text_parts, 'USER PROMPT: ' .. prompt)
 
   local full_text = table.concat(text_parts, '\n')
 
-  -- Return both the plain text and a parts array for the API
   return {
     text = full_text,
     parts = { { type = 'text', text = full_text } },

lua/opencode/quick_chat.lua

@@ -307,7 +307,6 @@ end
 local create_message = Promise.async(function(message, buf, range, context_instance, options)
   local quick_chat_config = config.quick_chat or {}
 
-  -- Generate instructions (allow user override)
   local instructions
   if quick_chat_config.instructions then
     instructions = quick_chat_config.instructions
@@ -323,12 +322,11 @@ local create_message = Promise.async(function(message, buf, range, context_insta
   local result = context.format_message_plain_text(message, context_instance, format_opts):await()
 
   local parts = {
-    { type = 'text', text = instructions_text },
-    { type = 'text', text = '\n\n' .. string.rep('=', 80) .. '\n\n' .. '# USER REQUEST\n\n' .. result.text },
+    { type = 'text', text = table.concat(instructions, '\n') },
+    { type = 'text', text = result.text },
   }
 
-  -- Use instructions as system prompt for models that support it
-  local params = { parts = parts, system = instructions_text }
+  local params = { parts = parts }
 
   local current_model = core.initialize_current_model():await()
   local target_model = options.model or quick_chat_config.default_model or current_model
@@ -339,13 +337,9 @@ local create_message = Promise.async(function(message, buf, range, context_insta
     end
   end
 
-  -- Set agent if specified
-  local target_mode = options.agent
-    or quick_chat_config.default_agent
-    or state.current_mode
-    or config.values.default_mode
-  if target_mode then
-    params.agent = target_mode
+  local target_agent = options.agent or quick_chat_config.default_agent or state.current_mode or config.default_mode
+  if target_agent then
+    params.agent = target_agent
   end
 
   return params