Add standalone awmg CLI for MCP server aggregation

.github/aw/schemas/agentic-workflow.json

@@ -2023,7 +2023,6 @@
                   "description": "API key for authenticating with the MCP gateway (supports ${{ secrets.* }} syntax)"
                 }
               },
-              "required": ["container"],
               "additionalProperties": false
             }
           },

.github/workflows/dev.md

@@ -2,35 +2,43 @@
 on: 
   workflow_dispatch:
 name: Dev
-description: Add a poem to the latest discussion
+description: Test MCP gateway with issue creation in staged mode
 timeout-minutes: 5
 strict: true
 engine: copilot
 
 permissions:
   contents: read
-  discussions: read
+  issues: read
+
+sandbox:
+  mcp:
+    port: 8080
 
 tools:
   github:
-    toolsets: [discussions]
+    toolsets: [issues]
+safe-outputs:
+  create-issue:
+    title-prefix: "[Poetry Test] "
+    max: 1
 imports:
   - shared/gh.md
-safe-outputs:
-  update-discussion:
-    target: "*"
-    body:
-  messages:
-    footer: "> 📝 Poetry generated by [{workflow_name}]({run_url})"
-    footer-install: "> Want to add poems to your discussions? Install with `gh aw add {workflow_source}`"
 ---
 
-Find the latest discussion in this repository and update its body by appending a short, creative poem about GitHub Agentic Workflows.
+# Test MCP Gateway: Read Last Issue and Write Poem in Staged Mode
 
-The poem should:
-- Be 4-8 lines long
-- Mention automation, AI agents, or workflow concepts
-- Be uplifting and inspiring
-- Be added to the existing discussion body
+Read the most recent issue from the repository and write a creative poem about it in a new issue using **staged mode** (preview mode).
 
-You MUST use the update_discussion tool to update a discussion with a poem in the body. This is required.
+**Requirements:**
+1. Use the GitHub tools to fetch the most recent issue from this repository
+2. Read the issue title and body to understand what it's about
+3. Write a short, creative poem (4-6 lines) inspired by the content of that issue
+4. Create a new issue with:
+   - Title: Start with the prefix "[Poetry Test]" followed by a creative title that relates to the original issue
+   - Body: Your poem about the issue, plus a reference to the original issue number
+5. **IMPORTANT**: Use staged mode (add `staged: true` to your create-issue call) so the issue is previewed with the 🎭 indicator but not actually created
+6. Confirm that:
+   - You successfully read the last issue
+   - You created a poem inspired by it
+   - The new issue was created in staged mode with the 🎭 indicator

.github/workflows/smoke-copilot.md

@@ -21,6 +21,8 @@ network:
     - github
 sandbox:
   agent: awf  # Firewall enabled
+  mcp:
+    port: 8080
 tools:
   cache-memory: true
   edit:
@@ -54,7 +56,8 @@ strict: true
 3. **Bash Tool Testing**: Execute bash commands to verify file creation was successful (use `cat` to read the file back)
 4. **GitHub MCP Default Toolset Testing**: Verify that the `get_me` tool is NOT available with default toolsets. Try to use it and confirm it fails with a tool not found error.
 5. **Cache Memory Testing**: Write a test file to `/tmp/gh-aw/cache-memory/smoke-test-${{ github.run_id }}.txt` with content "Cache memory test for run ${{ github.run_id }}" and verify it was created successfully
-6. **Available Tools Display**: List all available tools that you have access to in this workflow execution.
+6. **MCP Gateway Testing**: Verify that the MCP gateway is running by checking if the container is active and the health endpoint is accessible
+7. **Available Tools Display**: List all available tools that you have access to in this workflow execution.
 
 ## Output
 

.gitignore

@@ -43,6 +43,12 @@ Thumbs.db
 /gh-aw-darwin-arm64
 /gh-aw-linux-amd64
 /gh-aw-linux-arm64
+/awmg
+/awmg-darwin-amd64
+/awmg-darwin-arm64
+/awmg-linux-amd64
+/awmg-linux-arm64
+/awmg-windows-amd64.exe
 
 # credentials
 .credentials/

DEVGUIDE.md

@@ -38,6 +38,13 @@ make lint
 # Build and test the binary
 make build
 ./gh-aw --help
+
+# Build the awmg (MCP gateway) standalone binary
+make build-awmg
+./awmg --help
+
+# Build both binaries
+make all
 ```
 
 ### 4. Install the Extension Locally for Testing

Makefile

@@ -2,20 +2,26 @@
 
 # Variables
 BINARY_NAME=gh-aw
+AWMG_BINARY_NAME=awmg
 VERSION ?= $(shell git describe --tags --always --dirty)
 
 # Build flags
 LDFLAGS=-ldflags "-s -w -X main.version=$(VERSION)"
 
 # Default target
 .PHONY: all
-all: build
+all: build build-awmg
 
 # Build the binary, run make deps before this
 .PHONY: build
 build: sync-templates sync-action-pins
 	go build $(LDFLAGS) -o $(BINARY_NAME) ./cmd/gh-aw
 
+# Build the awmg (MCP gateway) binary
+.PHONY: build-awmg
+build-awmg:
+	go build $(LDFLAGS) -o $(AWMG_BINARY_NAME) ./cmd/awmg
+
 # Build for all platforms
 .PHONY: build-all
 build-all: build-linux build-darwin build-windows
@@ -24,15 +30,20 @@ build-all: build-linux build-darwin build-windows
 build-linux:
 	GOOS=linux GOARCH=amd64 go build $(LDFLAGS) -o $(BINARY_NAME)-linux-amd64 ./cmd/gh-aw
 	GOOS=linux GOARCH=arm64 go build $(LDFLAGS) -o $(BINARY_NAME)-linux-arm64 ./cmd/gh-aw
+	GOOS=linux GOARCH=amd64 go build $(LDFLAGS) -o $(AWMG_BINARY_NAME)-linux-amd64 ./cmd/awmg
+	GOOS=linux GOARCH=arm64 go build $(LDFLAGS) -o $(AWMG_BINARY_NAME)-linux-arm64 ./cmd/awmg
 
 .PHONY: build-darwin
 build-darwin:
 	GOOS=darwin GOARCH=amd64 go build $(LDFLAGS) -o $(BINARY_NAME)-darwin-amd64 ./cmd/gh-aw
 	GOOS=darwin GOARCH=arm64 go build $(LDFLAGS) -o $(BINARY_NAME)-darwin-arm64 ./cmd/gh-aw
+	GOOS=darwin GOARCH=amd64 go build $(LDFLAGS) -o $(AWMG_BINARY_NAME)-darwin-amd64 ./cmd/awmg
+	GOOS=darwin GOARCH=arm64 go build $(LDFLAGS) -o $(AWMG_BINARY_NAME)-darwin-arm64 ./cmd/awmg
 
 .PHONY: build-windows
 build-windows:
 	GOOS=windows GOARCH=amd64 go build $(LDFLAGS) -o $(BINARY_NAME)-windows-amd64.exe ./cmd/gh-aw
+	GOOS=windows GOARCH=amd64 go build $(LDFLAGS) -o $(AWMG_BINARY_NAME)-windows-amd64.exe ./cmd/awmg
 
 # Test the code (runs both unit and integration tests)
 .PHONY: test
@@ -170,6 +181,7 @@ clean:
 	@echo "Cleaning build artifacts..."
 	@# Remove main binary and platform-specific binaries
 	rm -f $(BINARY_NAME) $(BINARY_NAME)-*
+	rm -f $(AWMG_BINARY_NAME) $(AWMG_BINARY_NAME)-*
 	@# Remove bundle-js binary
 	rm -f bundle-js
 	@# Remove coverage files
@@ -476,7 +488,8 @@ agent-finish: deps-dev fmt lint build test-all fix recompile dependabot generate
 help:
 	@echo "Available targets:"
 	@echo "  build            - Build the binary for current platform"
-	@echo "  build-all        - Build binaries for all platforms"
+	@echo "  build-awmg       - Build the awmg (MCP gateway) binary for current platform"
+	@echo "  build-all        - Build binaries for all platforms (gh-aw and awmg)"
 	@echo "  test             - Run Go tests (unit + integration)"
 	@echo "  test-unit        - Run Go unit tests only (faster)"
 	@echo "  test-security    - Run security regression tests"

cmd/awmg/main.go

@@ -0,0 +1,73 @@
+package main
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/githubnext/gh-aw/pkg/cli"
+	"github.com/githubnext/gh-aw/pkg/console"
+)
+
+// Build-time variables
+var (
+	version = "dev"
+)
+
+func main() {
+	// Set version info
+	cli.SetVersionInfo(version)
+
+	// Create the mcp-gateway command
+	cmd := cli.NewMCPGatewayCommand()
+
+	// Update command usage to reflect standalone binary
+	cmd.Use = "awmg"
+	cmd.Short = "MCP Gateway - Aggregate multiple MCP servers into a single HTTP gateway"
+	cmd.Long = `awmg (Agentic Workflows MCP Gateway) - Aggregate multiple MCP servers into a single HTTP gateway.
+
+The gateway:
+- Integrates by default with the sandbox.mcp extension point
+- Imports Claude/Copilot/Codex MCP server JSON configuration
+- Starts each MCP server and mounts an MCP client on each
+- Mounts an HTTP MCP server that acts as a gateway to the MCP clients
+- Supports most MCP gestures through the go-MCP SDK
+- Provides extensive logging to file in the MCP log folder
+
+Configuration can be provided via:
+1. --config flag(s) pointing to JSON config file(s) (can be specified multiple times)
+2. stdin (reads JSON configuration from standard input)
+
+Multiple config files are merged in order, with later files overriding earlier ones.
+
+Configuration format:
+{
+  "mcpServers": {
+    "server-name": {
+      "command": "command",
+      "args": ["arg1", "arg2"],
+      "env": {"KEY": "value"}
+    }
+  },
+  "gateway": {
+    "port": 8080,
+    "apiKey": "optional-key"
+  }
+}
+
+Examples:
+  awmg --config config.json                    # From single file
+  awmg --config base.json --config override.json # From multiple files (merged)
+  awmg --port 8080                             # From stdin
+  echo '{"mcpServers":{...}}' | awmg           # Pipe config
+  awmg --config config.json --log-dir /tmp/logs # Custom log dir`
+
+	// Add version flag
+	cmd.Version = version
+	cmd.SetVersionTemplate("awmg version {{.Version}}\n")
+
+	// Execute command
+	if err := cmd.Execute(); err != nil {
+		fmt.Fprintf(os.Stderr, "%s\n", console.FormatErrorMessage(err.Error()))
+		os.Exit(1)
+	}
+}