Merge commit '6207dbca7d586e90545013241143f3a4e628a7fe'

Author: dantman

INDEX.md

@@ -40,5 +40,5 @@ These consolidated files group related configurations for single-fetch efficienc
 @github https://raw.githubusercontent.com/dantman/stack/refs/heads/main/INDEX.md
 ```
 
-*Generated: Fri Jun 13 09:48:22 PDT 2025*
+*Generated: Sun Jul 27 00:42:25 UTC 2025*
 *Repository: https://github.com/dantman/stack*

consolidated/tooling.md

@@ -387,5 +387,5 @@ npm run format
 
 ---
 
-*Consolidated from multiple source files on Fri Jun 13 09:48:22 PDT 2025*
+*Consolidated from multiple source files on Sun Jul 27 00:42:25 UTC 2025*
 *Source files: tooling/prettier/setup.md tooling/dependabot.md tooling/package-scripts.md*

consolidated/vscode.md

@@ -272,14 +272,14 @@ Create `.vscode/mcp.json` in your project root:
 - No Docker or PAT required for most users
 - Simplifies setup and works out-of-the-box with Copilot-enabled accounts
 
-## Git MCP Server
+## Git MCP Server (Local)
 
 For local Git repository integration:
 
 ```json
 {
   "servers": {
-    "git-mcp-server": {
+    "git": {
       "command": "npx",
       "args": [
         "-y",
@@ -295,6 +295,49 @@ For local Git repository integration:
 - Node.js and npm installed
 - Git repository initialized
 
+## Git MCP Server in Devcontainers (Recommended)
+
+> **Note:** When using a devcontainer, npx-based MCP servers are often broken. Instead, run the Git MCP server as a background task and connect to it via HTTP.
+
+**Add this task to your `.vscode/tasks.json`:**
+
+```json
+// @note npx based MCP servers are broken in devcontainers so we run them as tasks
+{
+  "type": "process",
+  "label": "mcp-server: git",
+  "command": "npx",
+  "args": [
+    "-y",
+    "@cyanheads/git-mcp-server"
+  ],
+  "options": {
+    "env": {
+      "MCP_TRANSPORT_TYPE": "http"
+    }
+  },
+  "problemMatcher": [],
+  "runOptions": {
+    "runOn": "folderOpen"
+  }
+}
+```
+
+**And use this in your `.vscode/mcp.json`:**
+
+```json
+{
+  "servers": {
+    "git": {
+      "url": "http://localhost:3010/mcp/"
+    }
+  }
+}
+```
+
+- This approach is only needed when a devcontainer setup is present.
+- The task will start the MCP server in HTTP mode, and the client connects to it via `localhost:3010`.
+
 ## Atlassian Jira MCP Server
 
 For Jira issue tracking integration (use only if project uses Jira):
@@ -375,5 +418,5 @@ These extensions are recommended for specific workflows or environments:
 
 ---
 
-*Consolidated from multiple source files on Fri Jun 13 09:48:22 PDT 2025*
+*Consolidated from multiple source files on Sun Jul 27 00:42:25 UTC 2025*
 *Source files: tooling/vscode/settings.md tooling/vscode/tasks.md tooling/vscode/mcp-servers.md tooling/vscode/extensions.md*

consolidated/workspace.md

@@ -57,5 +57,5 @@ You are setting up a new project workspace. Your job is to configure the workspa
 
 ---
 
-*Consolidated from multiple source files on Fri Jun 13 09:48:22 PDT 2025*
+*Consolidated from multiple source files on Sun Jul 27 00:42:25 UTC 2025*
 *Source files: tooling/WorkspaceSetup.prompt.md*