fix: seperate the installation script

fix: dont format

fix: dont block

revert: .

Author: cenk1cenk2

bundled_build.lua

@@ -78,23 +78,5 @@ else
         error("Failed to install mcp-hub: " .. npm_install_result.stderr)
     end
 
-    status("Installing RPC proxy dependencies...", vim.log.levels.INFO)
-    local proxy_install_result = vim.system({
-        "npm",
-        "install",
-    }, {
-        cwd = root .. "/scripts",
-        stdout = on_stdout,
-        stderr = on_stderr,
-    }):wait()
-    if proxy_install_result.code ~= 0 then
-        status(
-            "Warning: Failed to install RPC proxy dependencies: " .. proxy_install_result.stderr,
-            vim.log.levels.WARN
-        )
-    else
-        status("RPC proxy dependencies installed successfully", vim.log.levels.INFO)
-    end
-
     status("Build complete!", vim.log.levels.INFO)
 end

bundled_scripts.lua

@@ -0,0 +1,55 @@
+-- Get plugin root directory
+---@return string
+local function get_root()
+    return vim.fn.fnamemodify(debug.getinfo(1, "S").source:sub(2), ":p:h")
+end
+
+---@param msg string
+---@param level? number default: TRACE
+local function status(msg, level)
+    vim.schedule(function()
+        print(msg)
+        --INFO: This is not working as expected
+        -- coroutine.yield({
+        --   msg = msg,
+        --   level = level or vim.log.levels.TRACE,
+        -- })
+    end)
+end
+
+local root = get_root()
+
+local function on_stdout(err, data)
+    if data then
+        status(data, vim.log.levels.INFO)
+    end
+    if err then
+        status(err, vim.log.levels.ERROR)
+    end
+end
+
+local function on_stderr(err, data)
+    if data then
+        status(data, vim.log.levels.ERROR)
+    end
+    if err then
+        status(err, vim.log.levels.ERROR)
+    end
+end
+
+status("Installing bundled script dependencies...", vim.log.levels.INFO)
+local result = vim.system({
+    "npm",
+    "install",
+}, {
+    cwd = root .. "/scripts",
+    stdout = on_stdout,
+    stderr = on_stderr,
+}):wait()
+if result.code ~= 0 then
+    status("Warning: Failed to install RPC proxy dependencies: " .. result.stderr, vim.log.levels.WARN)
+else
+    status("RPC proxy dependencies installed successfully", vim.log.levels.INFO)
+end
+
+status("Build complete!", vim.log.levels.INFO)

lua/mcphub/extensions/proxy/init.lua

@@ -49,43 +49,7 @@ function M.get_all_servers()
         return {}
     end
 
-    local servers = hub:get_servers()
-
-    local formatted_servers = {}
-    for _, server in ipairs(servers) do
-        table.insert(formatted_servers, {
-            name = server.name,
-            displayName = server.displayName,
-            description = server.description,
-            status = server.status,
-            capabilities = {
-                tools = vim.tbl_map(function(t)
-                    return {
-                        name = t.name,
-                        description = t.description,
-                        inputSchema = t.inputSchema,
-                    }
-                end, server.capabilities.tools or {}),
-                resources = vim.tbl_map(function(r)
-                    return {
-                        uri = r.uri,
-                        name = r.name,
-                        description = r.description,
-                        mimeType = r.mimeType,
-                    }
-                end, server.capabilities.resources or {}),
-                prompts = vim.tbl_map(function(p)
-                    return {
-                        name = p.name,
-                        description = p.description,
-                        arguments = p.arguments,
-                    }
-                end, server.capabilities.prompts or {}),
-            },
-        })
-    end
-
-    return formatted_servers
+    return hub:get_servers()
 end
 
 --- Send result back to proxy.js via notification
@@ -134,20 +98,23 @@ function M.call_tool(request_id, server_name, tool_name, params)
             return
         end
 
-        local result, err = hub:call_tool(server_name, tool_name, arguments, {
+        -- Use callback to avoid blocking vim.wait() in NativeServer:call_tool
+        -- This allows interactive tools like edit_file to work properly
+        hub:call_tool(server_name, tool_name, arguments, {
             parse_response = false,
             caller = vim.tbl_extend("force", caller, { auto_approve = approval.approve }),
+            callback = function(result, err)
+                if err then
+                    send_result(request_id, { error = err })
+                elseif result and result.result then
+                    send_result(request_id, result.result)
+                elseif result then
+                    send_result(request_id, result)
+                else
+                    send_result(request_id, { error = "No result returned from hub" })
+                end
+            end,
         })
-
-        if err then
-            send_result(request_id, { error = err })
-        elseif result and result.result then
-            send_result(request_id, result.result)
-        elseif result then
-            send_result(request_id, result)
-        else
-            send_result(request_id, { error = "No result returned from hub" })
-        end
     end)
 end
 
@@ -189,20 +156,22 @@ function M.access_resource(request_id, server_name, uri, params)
             return
         end
 
-        local result, err = hub:access_resource(server_name, uri, {
+        -- Use callback to avoid blocking vim.wait() in NativeServer:access_resource
+        hub:access_resource(server_name, uri, {
             parse_response = false,
             caller = vim.tbl_extend("force", caller, { auto_approve = approval.approve }),
+            callback = function(result, err)
+                if err then
+                    send_result(request_id, { error = err })
+                elseif result and result.result then
+                    send_result(request_id, result.result)
+                elseif result then
+                    send_result(request_id, result)
+                else
+                    send_result(request_id, { error = "No result returned from hub" })
+                end
+            end,
         })
-
-        if err then
-            send_result(request_id, { error = err })
-        elseif result and result.result then
-            send_result(request_id, result.result)
-        elseif result then
-            send_result(request_id, result)
-        else
-            send_result(request_id, { error = "No result returned from hub" })
-        end
     end)
 end
 

lua/mcphub/extensions/shared.lua

@@ -292,19 +292,20 @@ function M.show_mcp_tool_prompt(params)
     return confirmed, cancelled
 end
 
---- Check auto-approval status without showing any dialog
 ---@param parsed_params MCPHub.ParsedParams
 ---@return {error?:string, approve:boolean}
-function M.check_auto_approval(parsed_params)
+function M.handle_auto_approval_decision(parsed_params)
     local auto_approve = State.config.auto_approve or false
     local status = { approve = false, error = nil }
-
-    -- Check global auto_approve config (can be boolean or function)
+    --- If user has a custom function that decides whether to auto-approve
+    --- call that with params + saved autoApprove state as is_auto_approved_in_server field
     if type(auto_approve) == "function" then
         local ok, res = pcall(auto_approve, parsed_params)
         if not ok or type(res) == "string" then
+            --- If auto_approve function throws an error, or returns a string, treat it as an error
             status = { approve = false, error = res }
         elseif type(res) == "boolean" then
+            --- If auto_approve function returns a boolean, use that as the decision
             status = { approve = res, error = nil }
         end
     elseif type(auto_approve) == "boolean" then
@@ -316,14 +317,6 @@ function M.check_auto_approval(parsed_params)
         status = { approve = true, error = nil }
     end
 
-    return status
-end
-
----@param parsed_params MCPHub.ParsedParams
----@return {error?:string, approve:boolean}
-function M.handle_auto_approval_decision(parsed_params)
-    local status = M.check_auto_approval(parsed_params)
-
     if status.error then
         return { error = status.error or "Something went wrong with auto-approval", approve = false }
     end
@@ -332,7 +325,6 @@ function M.handle_auto_approval_decision(parsed_params)
         local confirmed, _ = M.show_mcp_tool_prompt(parsed_params)
         return { error = not confirmed and "User cancelled the operation", approve = confirmed }
     end
-
     return status
 end