diff --git a/src/shell/server.cpp b/src/shell/server.cpp
index c02efbc6c3..39359ee198 100644
--- a/src/shell/server.cpp
+++ b/src/shell/server.cpp
@@ -424,9 +424,9 @@ void server::handle_request(server::cmd_req const & req) {
     if (command == "sync") {
         send_msg(handle_sync(req));
     } else if (command == "complete") {
-        handle_complete(req);
+        handle_async_response(req, handle_complete(req));
     } else if (command == "info") {
-        handle_info(req);
+        handle_async_response(req, handle_info(req));
     } else if (command == "roi") {
         send_msg(handle_roi(req));
     } else if (command == "sleep") {
@@ -440,6 +440,17 @@ void server::handle_request(server::cmd_req const & req) {
     }
 }
 
+void server::handle_async_response(server::cmd_req const & req, task<cmd_res> const & res) {
+    taskq().submit(task_builder<unit>([this, req, res] {
+        try {
+            send_msg(get(res));
+        } catch (throwable & ex) {
+            send_msg(cmd_res(req.m_seq_num, std::string(ex.what())));
+        }
+        return unit{};
+    }).depends_on(res).build());
+}
+
 server::cmd_res server::handle_sync(server::cmd_req const & req) {
     std::string new_file_name = req.m_payload.at("file_name");
     std::string new_content = req.m_payload.at("content");
@@ -524,7 +535,7 @@ json server::autocomplete(std::shared_ptr<module_info const> const & mod_info, b
     return j;
 }
 
-void server::handle_complete(cmd_req const & req) {
+task<server::cmd_res> server::handle_complete(cmd_req const & req) {
     cancel(m_bg_task_ctok);
     m_bg_task_ctok = mk_cancellation_token();
 
@@ -536,20 +547,10 @@ void server::handle_complete(cmd_req const & req) {
 
     auto mod_info = m_mod_mgr->get_module(fn);
 
-    auto complete_gen_task =
-        task_builder<json>([=] { return autocomplete(mod_info, skip_completions, pos); })
+    return task_builder<cmd_res>([=] { return cmd_res(req.m_seq_num, autocomplete(mod_info, skip_completions, pos)); })
         .wrap(library_scopes(log_tree::node()))
         .set_cancellation_token(m_bg_task_ctok)
         .build();
-
-    taskq().submit(task_builder<unit>([this, req, complete_gen_task] {
-        try {
-            send_msg(cmd_res(req.m_seq_num, get(complete_gen_task)));
-        } catch (throwable & ex) {
-            send_msg(cmd_res(req.m_seq_num, std::string(ex.what())));
-        }
-        return unit{};
-    }).depends_on(complete_gen_task).build());
 }
 
 static void get_info_managers(log_tree::node const & n, std::vector<info_manager> & infoms) {
@@ -586,7 +587,7 @@ json server::info(std::shared_ptr<module_info const> const & mod_info, pos_info
     return j;
 }
 
-void server::handle_info(server::cmd_req const & req) {
+task<server::cmd_res> server::handle_info(server::cmd_req const & req) {
     cancel(m_bg_task_ctok);
     m_bg_task_ctok = mk_cancellation_token();
 
@@ -595,19 +596,10 @@ void server::handle_info(server::cmd_req const & req) {
 
     auto mod_info = m_mod_mgr->get_module(fn);
 
-    auto info_gen_task = task_builder<json>([=] {
-        return info(mod_info, pos);
+    return task_builder<cmd_res>([=] {
+        return cmd_res(req.m_seq_num, info(mod_info, pos));
     }).wrap(library_scopes(log_tree::node()))
       .set_cancellation_token(m_bg_task_ctok).build();
-
-    taskq().submit(task_builder<unit>([this, req, info_gen_task] {
-        try {
-            send_msg(cmd_res(req.m_seq_num, get(info_gen_task)));
-        } catch (throwable & ex) {
-            send_msg(cmd_res(req.m_seq_num, std::string(ex.what())));
-        }
-        return unit{};
-    }).depends_on(info_gen_task).build());
 }
 
 std::tuple<std::string, module_src, time_t> server::load_module(module_id const & id, bool can_use_olean) {
diff --git a/src/shell/server.h b/src/shell/server.h
index 5c73977bf9..9bd34c69eb 100644
--- a/src/shell/server.h
+++ b/src/shell/server.h
@@ -86,15 +86,17 @@ class server : public module_vfs {
     template <class Msg>
     void send_msg(Msg const &);
 
+    template <class Msg>
+    void send_async_msg(task<Msg> const &);
+
     struct cmd_res;
     struct cmd_req;
     void handle_request(cmd_req const & req);
+    void handle_async_response(cmd_req const & req, task<cmd_res> const & res);
 
     cmd_res handle_sync(cmd_req const & req);
-    class auto_complete_task;
-    void handle_complete(cmd_req const & req);
-    class info_task;
-    void handle_info(cmd_req const & req);
+    task<cmd_res> handle_complete(cmd_req const & req);
+    task<cmd_res> handle_info(cmd_req const & req);
     cmd_res handle_roi(cmd_req const & req);
 
     json autocomplete(std::shared_ptr<module_info const> const & mod_info, bool skip_completions, pos_info const & pos);