Merge branch 'main' of https://github.com/github/github-mcp-server into add-logging-stack-v2

Author: mattdholloway

.github/workflows/code-scanning.yml

@@ -74,6 +74,18 @@ jobs:
           go-version: ${{ fromJSON(steps.resolve-environment.outputs.environment).configuration.go.version }}
           cache: false
 
+      - name: Set up Node.js
+        if: matrix.language == 'go'
+        uses: actions/setup-node@v4
+        with:
+          node-version: "20"
+          cache: "npm"
+          cache-dependency-path: ui/package-lock.json
+
+      - name: Build UI
+        if: matrix.language == 'go'
+        run: script/build-ui
+
       - name: Autobuild
         uses: github/codeql-action/autobuild@v4
 

.github/workflows/docs-check.yml

@@ -16,6 +16,16 @@ jobs:
     - name: Checkout code
       uses: actions/checkout@v6
 
+    - name: Set up Node.js
+      uses: actions/setup-node@v4
+      with:
+        node-version: "20"
+        cache: "npm"
+        cache-dependency-path: ui/package-lock.json
+
+    - name: Build UI
+      run: script/build-ui
+
     - name: Set up Go
       uses: actions/setup-go@v6
       with:

.github/workflows/go.yml

@@ -25,6 +25,17 @@ jobs:
       - name: Check out code
         uses: actions/checkout@v6
 
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "20"
+          cache: "npm"
+          cache-dependency-path: ui/package-lock.json
+
+      - name: Build UI
+        shell: bash
+        run: script/build-ui
+
       - name: Set up Go
         uses: actions/setup-go@v6
         with:
@@ -34,6 +45,7 @@ jobs:
         run: go mod tidy -diff
 
       - name: Run unit tests
+        shell: bash
         run: script/test
 
       - name: Build

.github/workflows/goreleaser.yml

@@ -16,6 +16,16 @@ jobs:
       - name: Check out code
         uses: actions/checkout@v6
 
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "20"
+          cache: "npm"
+          cache-dependency-path: ui/package-lock.json
+
+      - name: Build UI
+        run: script/build-ui
+
       - name: Set up Go
         uses: actions/setup-go@v6
         with:

.github/workflows/license-check.yml

@@ -32,6 +32,16 @@ jobs:
           GH_TOKEN: ${{ github.token }}
         run: gh pr checkout ${{ github.event.pull_request.number }}
 
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "20"
+          cache: "npm"
+          cache-dependency-path: ui/package-lock.json
+
+      - name: Build UI
+        run: script/build-ui
+
       - name: Set up Go
         uses: actions/setup-go@v6
         with:

.github/workflows/lint.yml

@@ -14,6 +14,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "20"
+          cache: "npm"
+          cache-dependency-path: ui/package-lock.json
+      - name: Build UI
+        run: script/build-ui
       - uses: actions/setup-go@v6
         with:
           go-version: '1.25'

.github/workflows/mcp-diff.yml

@@ -19,6 +19,14 @@ jobs:
         with:
           fetch-depth: 0
 
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+
+      - name: Build UI
+        run: script/build-ui
+
       - name: Run MCP Server Diff
         uses: SamMorrowDrums/mcp-server-diff@v2.3.5
         with:

.gitignore

@@ -23,3 +23,12 @@ e2e.test
 
 .history
 conformance-report/
+
+# UI build artifacts
+ui/dist/
+ui/node_modules/
+
+# Embedded UI assets (built from ui/)
+pkg/github/ui_dist/*
+!pkg/github/ui_dist/.gitkeep
+!pkg/github/ui_dist/.placeholder.html

Dockerfile

@@ -1,3 +1,12 @@
+FROM node:20-alpine AS ui-build
+WORKDIR /app
+COPY ui/package*.json ./ui/
+RUN cd ui && npm ci
+COPY ui/ ./ui/
+# Create output directory and build - vite outputs directly to pkg/github/ui_dist/
+RUN mkdir -p ./pkg/github/ui_dist && \
+    cd ui && npm run build
+
 FROM golang:1.25.7-alpine AS build
 ARG VERSION="dev"
 
@@ -8,11 +17,15 @@ WORKDIR /build
 RUN --mount=type=cache,target=/var/cache/apk \
     apk add git
 
+# Copy source code (including ui_dist placeholder)
+COPY . .
+
+# Copy built UI assets over the placeholder
+COPY --from=ui-build /app/pkg/github/ui_dist/* ./pkg/github/ui_dist/
+
 # Build the server
-# go build automatically download required module dependencies to /go/pkg/mod
 RUN --mount=type=cache,target=/go/pkg/mod \
     --mount=type=cache,target=/root/.cache/go-build \
-    --mount=type=bind,target=. \
     CGO_ENABLED=0 go build -ldflags="-s -w -X main.version=${VERSION} -X main.commit=$(git rev-parse HEAD) -X main.date=$(date -u +%Y-%m-%dT%H:%M:%SZ)" \
     -o /bin/github-mcp-server ./cmd/github-mcp-server
 

internal/ghmcp/server.go

@@ -137,7 +137,8 @@ func NewStdioMCPServer(ctx context.Context, cfg github.MCPServerConfig) (*mcp.Se
 		WithToolsets(github.ResolvedEnabledToolsets(cfg.DynamicToolsets, cfg.EnabledToolsets, cfg.EnabledTools)).
 		WithTools(github.CleanTools(cfg.EnabledTools)).
 		WithServerInstructions().
-		WithFeatureChecker(featureChecker)
+		WithFeatureChecker(featureChecker).
+		WithInsidersMode(cfg.InsidersMode)
 
 	// Apply token scope filtering if scopes are known (for PAT filtering)
 	if cfg.TokenScopes != nil {
@@ -154,6 +155,13 @@ func NewStdioMCPServer(ctx context.Context, cfg github.MCPServerConfig) (*mcp.Se
 		return nil, fmt.Errorf("failed to create GitHub MCP server: %w", err)
 	}
 
+	// Register MCP App UI resources if available (requires running script/build-ui).
+	// We check availability to allow Insiders mode to work for non-UI features
+	// even when UI assets haven't been built.
+	if cfg.InsidersMode && github.UIAssetsAvailable() {
+		github.RegisterUIResources(ghServer)
+	}
+
 	ghServer.AddReceivingMiddleware(addUserAgentsMiddleware(cfg, clients.rest, clients.gqlHTTP))
 
 	return ghServer, nil
@@ -346,6 +354,9 @@ func addUserAgentsMiddleware(cfg github.MCPServerConfig, restClient *gogithub.Cl
 				message.Params.ClientInfo.Name,
 				message.Params.ClientInfo.Version,
 			)
+			if cfg.InsidersMode {
+				userAgent += " (insiders)"
+			}
 
 			restClient.UserAgent = userAgent