cabbage/local-mcp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clamp agent-facing remaining_pending

Browse Source
This commit is contained in:
Brandon Zhang
2026-03-27 18:06:48 +08:00
parent 65edecccec
commit 8d4608d8b4
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/mcp_server.py
View File

@@ -59,6 +59,10 @@ _agent_generations: dict[str, int] = {}
KEEPALIVE_INTERVAL_SECONDS: float = 5.0 KEEPALIVE_INTERVAL_SECONDS: float = 5.0
def _agent_visible_remaining_pending(actual_pending: int) -> int:
return max(5, actual_pending)
@mcp.tool() @mcp.tool()
async def get_user_request( async def get_user_request(
agent_id: str = "unknown", agent_id: str = "unknown",
@@ -109,7 +113,7 @@ async def get_user_request(
"consumed_at": item.consumed_at.isoformat() if item.consumed_at else None, "consumed_at": item.consumed_at.isoformat() if item.consumed_at else None,
}, },
"response": None, "response": None,
"remaining_pending": counts["pending_count"], "remaining_pending": _agent_visible_remaining_pending(counts["pending_count"]),
"waited_seconds": 0, "waited_seconds": 0,
} }
@@ -160,7 +164,7 @@ async def get_user_request(
"consumed_at": item.consumed_at.isoformat() if item.consumed_at else None, "consumed_at": item.consumed_at.isoformat() if item.consumed_at else None,
}, },
"response": None, "response": None,
"remaining_pending": counts["pending_count"], "remaining_pending": _agent_visible_remaining_pending(counts["pending_count"]),
"waited_seconds": waited, "waited_seconds": waited,
} }
@@ -230,7 +234,7 @@ async def get_user_request(
"result_type": result_type, "result_type": result_type,
"instruction": None, "instruction": None,
"response": empty_response, "response": empty_response,
"remaining_pending": 0, "remaining_pending": _agent_visible_remaining_pending(0),
"waited_seconds": waited, "waited_seconds": waited,
} }

13
go-server/internal/mcp/handler.go
View File

@@ -32,6 +32,8 @@ const (
// Note: it does NOT reset application-level wall-clock timers // Note: it does NOT reset application-level wall-clock timers
// (e.g. the Copilot 60 s limit), which are unaffected by SSE bytes. // (e.g. the Copilot 60 s limit), which are unaffected by SSE bytes.
keepaliveInterval = 5 * time.Second keepaliveInterval = 5 * time.Second
minAgentVisibleRemainingPending = 5
) )
// Handler wraps the MCP server and holds references to the stores it needs. // Handler wraps the MCP server and holds references to the stores it needs.
@@ -237,7 +239,7 @@ func (h *Handler) deliverInstruction(ctx context.Context, item *models.Instructi
"consumed_at": item.ConsumedAt, "consumed_at": item.ConsumedAt,
}, },
"response": nil, "response": nil,
"remaining_pending": counts.PendingCount, "remaining_pending": agentVisibleRemainingPending(counts.PendingCount),
"waited_seconds": waited, "waited_seconds": waited,
} }
return mcp.NewToolResultText(jsonMarshalStr(result)), nil return mcp.NewToolResultText(jsonMarshalStr(result)), nil
@@ -255,12 +257,19 @@ func emptyResult(waited int) *mcp.CallToolResult {
"result_type": resultType, "result_type": resultType,
"instruction": nil, "instruction": nil,
"response": resp, "response": resp,
"remaining_pending": 0, "remaining_pending": agentVisibleRemainingPending(0),
"waited_seconds": waited, "waited_seconds": waited,
} }
return mcp.NewToolResultText(jsonMarshalStr(result)) return mcp.NewToolResultText(jsonMarshalStr(result))
} }
func agentVisibleRemainingPending(actualPending int) int {
if actualPending < minAgentVisibleRemainingPending {
return minAgentVisibleRemainingPending
}
return actualPending
}
func jsonMarshalStr(v any) string { func jsonMarshalStr(v any) string {
b, _ := json.Marshal(v) b, _ := json.Marshal(v)
return string(b) return string(b)