diff --git a/.github/workflows/metrics-collector.lock.yml b/.github/workflows/metrics-collector.lock.yml
index 73a229a1f72..f1713c33de1 100644
--- a/.github/workflows/metrics-collector.lock.yml
+++ b/.github/workflows/metrics-collector.lock.yml
@@ -1196,6 +1196,7 @@ jobs:
         env:
           GH_AW_SETUP_WORKFLOW_NAME: "Metrics Collector - Infrastructure Agent"
           GH_AW_CURRENT_WORKFLOW_REF: ${{ github.repository }}/.github/workflows/metrics-collector.lock.yml@${{ github.ref }}
+          GH_AW_INFO_VERSION: "1.0.40"
       - name: Download agent output artifact
         id: download-agent-output
         continue-on-error: true
diff --git a/pkg/cli/mcp_server_unit_test.go b/pkg/cli/mcp_server_unit_test.go
new file mode 100644
index 00000000000..6d596166bfd
--- /dev/null
+++ b/pkg/cli/mcp_server_unit_test.go
@@ -0,0 +1,126 @@
+//go:build !integration
+
+package cli
+
+import (
+	"context"
+	"encoding/json"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strings"
+	"testing"
+
+	"github.com/modelcontextprotocol/go-sdk/mcp"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+)
+
+// TestMCPServerUnit_ListTools verifies that the MCP server exposes exactly the
+// expected set of tools without spawning a subprocess.
+func TestMCPServerUnit_ListTools(t *testing.T) {
+	server := createMCPServer("", "", false, "")
+	session := connectInMemory(t, server)
+
+	ctx := context.Background()
+	result, err := session.ListTools(ctx, &mcp.ListToolsParams{})
+	require.NoError(t, err, "ListTools should succeed")
+
+	// expectedTools must match the tools registered in createMCPServer.
+	// Keep this list in sync with mcp_server_tools_test.go (integration tests).
+	expectedTools := []string{"status", "compile", "logs", "audit", "audit-diff", "checks", "mcp-inspect", "add", "update", "fix"}
+	toolNames := make(map[string]bool)
+	for _, tool := range result.Tools {
+		toolNames[tool.Name] = true
+	}
+
+	for _, name := range expectedTools {
+		assert.True(t, toolNames[name], "expected tool %q to be registered", name)
+	}
+	assert.Len(t, result.Tools, len(expectedTools), "server should expose exactly %d tools", len(expectedTools))
+}
+
+// TestMCPServerUnit_ServerCapabilities verifies that the server advertises the
+// Tools capability with ListChanged=false (tools are static, no notifications needed).
+func TestMCPServerUnit_ServerCapabilities(t *testing.T) {
+	server := createMCPServer("", "", false, "")
+	session := connectInMemory(t, server)
+
+	initResult := session.InitializeResult()
+	require.NotNil(t, initResult, "InitializeResult should not be nil")
+	require.NotNil(t, initResult.Capabilities.Tools, "server should advertise Tools capability")
+	assert.False(t, initResult.Capabilities.Tools.ListChanged, "Tools.ListChanged should be false (tools are static)")
+}
+
+// TestMCPServerUnit_StatusTool verifies that the status tool can be called
+// in-process and returns valid JSON output without spawning a subprocess.
+func TestMCPServerUnit_StatusTool(t *testing.T) {
+	// Create a temporary directory with an empty .github/workflows dir so
+	// GetWorkflowStatuses returns an empty array rather than an error.
+	tmpDir := t.TempDir()
+	workflowsDir := filepath.Join(tmpDir, ".github", "workflows")
+	require.NoError(t, os.MkdirAll(workflowsDir, 0o755), "should create workflows dir")
+
+	origDir, err := os.Getwd()
+	require.NoError(t, err, "should get current dir")
+	require.NoError(t, os.Chdir(tmpDir), "should change to temp dir")
+	t.Cleanup(func() { _ = os.Chdir(origDir) })
+
+	server := createMCPServer("", "", false, "")
+	session := connectInMemory(t, server)
+
+	ctx := context.Background()
+	result, err := session.CallTool(ctx, &mcp.CallToolParams{
+		Name:      "status",
+		Arguments: map[string]any{},
+	})
+	require.NoError(t, err, "status tool should not return a protocol error")
+	require.NotNil(t, result, "status tool should return a result")
+	assert.False(t, result.IsError, "status tool should not return an error envelope")
+	require.NotEmpty(t, result.Content, "status tool should return content")
+
+	textContent, ok := result.Content[0].(*mcp.TextContent)
+	require.True(t, ok, "status tool should return text content")
+
+	// With no workflow files in the directory, the response should be a valid empty JSON array
+	// (not null — the contract is always an array).
+	var statuses []any
+	require.NoError(t, json.Unmarshal([]byte(textContent.Text), &statuses), "status tool should return valid JSON")
+	require.NotNil(t, statuses, "status tool should return a JSON array, not null")
+	assert.Empty(t, statuses, "status should be empty when no workflow files exist")
+}
+
+// TestMCPServerUnit_CompileTool verifies that the compile tool can be called
+// in-process using a mock execCmd so no compiled binary is required.
+func TestMCPServerUnit_CompileTool(t *testing.T) {
+	const fakeOutput = `[{"workflow":"test.md","valid":true,"errors":[],"warnings":[]}]`
+
+	var capturedArgs []string
+	mockExecCmd := func(ctx context.Context, args ...string) *exec.Cmd {
+		capturedArgs = append([]string(nil), args...)
+		return exec.CommandContext(ctx, "sh", "-c", `printf '%s' "$1"`, "sh", fakeOutput)
+	}
+
+	server := mcp.NewServer(&mcp.Implementation{Name: "gh-aw", Version: "test"}, nil)
+	require.NoError(t, registerCompileTool(server, mockExecCmd, ""), "registerCompileTool should succeed")
+	session := connectInMemory(t, server)
+
+	ctx := context.Background()
+	result, err := session.CallTool(ctx, &mcp.CallToolParams{
+		Name:      "compile",
+		Arguments: map[string]any{},
+	})
+	require.NoError(t, err, "compile tool should not return a protocol error")
+	require.NotNil(t, result, "compile tool should return a result")
+	assert.False(t, result.IsError, "compile tool should not return an error envelope")
+	require.NotEmpty(t, result.Content, "compile tool should return content")
+
+	textContent, ok := result.Content[0].(*mcp.TextContent)
+	require.True(t, ok, "compile tool should return text content")
+	assert.JSONEq(t, fakeOutput, textContent.Text, "compile tool should return the subprocess stdout")
+
+	// Verify the compile subcommand was invoked with the expected flags.
+	require.NotEmpty(t, capturedArgs, "execCmd should have been called")
+	assert.Equal(t, "compile", capturedArgs[0], "first arg should be 'compile'")
+	assert.Contains(t, strings.Join(capturedArgs, " "), "--json", "compile should pass --json flag")
+}