fix: eliminate three duplicate-code patterns across server and guard packages#2852

lpcox merged 3 commits intomaingithub/gh-aw-mcpg:mainfrom

copilot/duplicate-code-analysis-reportgithub/gh-aw-mcpg:copilot/duplicate-code-analysis-reportCopy head branch name to clipboard