feat: ensure we can't stay in a loading state forever

Author: sudo-tee

lua/opencode/core.lua

@@ -69,47 +69,64 @@ function M.open(opts)
     state.windows = ui.create_windows()
   end
 
-  server_job.ensure_server():and_then(function(server)
-    state.opencode_server = server
+  if opts.focus == 'input' then
+    ui.focus_input({ restore_position = are_windows_closed, start_insert = opts.start_insert == true })
+  elseif opts.focus == 'output' then
+    ui.focus_output({ restore_position = are_windows_closed })
+  end
 
-    M.ensure_current_mode()
+  server_job
+    .ensure_server()
+    :and_then(function(server)
+      local ok, err = pcall(function()
+        state.opencode_server = server
 
-    if opts.new_session then
-      state.active_session = nil
-      state.last_sent_context = nil
+        M.ensure_current_mode()
 
-      state.current_model = nil
-      state.current_mode = nil
-      M.ensure_current_mode()
+        if opts.new_session then
+          state.active_session = nil
+          state.last_sent_context = nil
+
+          state.current_model = nil
+          state.current_mode = nil
+          M.ensure_current_mode()
 
-      state.active_session = M.create_new_session()
-    else
-      if not state.active_session then
-        state.active_session = session.get_last_workspace_session()
-        if not state.active_session then
           state.active_session = M.create_new_session()
+        else
+          if not state.active_session then
+            state.active_session = session.get_last_workspace_session()
+            if not state.active_session then
+              state.active_session = M.create_new_session()
+            end
+          else
+            if not state.display_route and are_windows_closed then
+              -- We're not displaying /help or something like that but we have an active session
+              -- and the windows were closed so we need to do a full refresh. This mostly happens
+              -- when opening the window after having closed it since we're not currently clearing
+              -- the session on api.close()
+              ui.render_output()
+            end
+          end
         end
-      else
-        if not state.display_route and are_windows_closed then
-          -- We're not displaying /help or something like that but we have an active session
-          -- and the windows were closed so we need to do a full refresh. This mostly happens
-          -- when opening the window after having closed it since we're not currently clearing
-          -- the session on api.close()
-          ui.render_output()
-        end
-      end
-    end
-    promise:resolve()
-    state.is_opening = false
 
-    if opts.focus == 'input' then
-      ui.focus_input({ restore_position = are_windows_closed, start_insert = opts.start_insert == true })
-    elseif opts.focus == 'output' then
-      ui.focus_output({ restore_position = are_windows_closed })
-    end
+        state.is_opencode_focused = true
+      end)
 
-    state.is_opencode_focused = true
-  end)
+      state.is_opening = false
+
+      if not ok then
+        promise:reject(err)
+        vim.notify('Error opening panel: ' .. tostring(err), vim.log.levels.ERROR)
+        return
+      end
+
+      promise:resolve()
+    end)
+    :catch(function(err)
+      state.is_opening = false
+      promise:reject(err)
+      vim.notify('Error ensuring server: ' .. tostring(err), vim.log.levels.ERROR)
+    end)
   return promise
 end
 

tests/unit/core_spec.lua

@@ -182,6 +182,39 @@ describe('opencode.core', function()
       assert.truthy(state.active_session)
       assert.truthy(state.active_session.id)
     end)
+
+    it('resets is_opening flag when error occurs', function()
+      state.windows = nil
+      state.is_opening = false
+      
+      -- Simply cause an error by stubbing a function that will be called
+      local original_create_new_session = core.create_new_session
+      core.create_new_session = function()
+        error('Test error in create_new_session')
+      end
+
+      local notify_stub = stub(vim, 'notify')
+      local result_promise = core.open({ new_session = true, focus = 'input' })
+      
+      -- Wait for async operations to complete
+      local ok, err = pcall(function()
+        result_promise:wait()
+      end)
+
+      -- Should fail due to the error
+      assert.is_false(ok)
+      assert.truthy(err)
+      
+      -- is_opening should be reset to false even when error occurs
+      assert.is_false(state.is_opening)
+      
+      -- Should have notified about the error
+      assert.stub(notify_stub).was_called()
+      
+      -- Restore original function
+      core.create_new_session = original_create_new_session
+      notify_stub:revert()
+    end)
   end)
 
   describe('select_session', function()