From 5f21f5dd595ff87ac3913a9850b422e8b23d539e Mon Sep 17 00:00:00 2001 From: Shun Kakinoki Date: Mon, 22 Sep 2025 05:48:42 +0900 Subject: [PATCH 1/5] ci: optimize Bun workflow with custom composite action - Replace separate Bun setup and install steps with custom composite action - Use shunkakinoki/actions/.github/actions/auto-merge composite action - Reduces workflow complexity and improves maintainability --- .github/workflows/bun.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/bun.yml b/.github/workflows/bun.yml index e311916..65fa10e 100644 --- a/.github/workflows/bun.yml +++ b/.github/workflows/bun.yml @@ -17,9 +17,7 @@ jobs: - name: Checkout uses: actions/checkout@v5 - name: Setup Bun - uses: oven-sh/setup-bun@v2 - - name: Install dependencies - run: bun install + uses: shunkakinoki/actions/.github/actions/auto-merge@156beb8dbd9b84135a994da9ea77398d91e33df6 - name: Check run: bun run check - name: Format From 944d762b0257372f94ba11965f120d7608d73fdf Mon Sep 17 00:00:00 2001 From: Shun Kakinoki Date: Mon, 22 Sep 2025 05:50:34 +0900 Subject: [PATCH 2/5] fix: update Bun workflow to use setup-bun action - Replace auto-merge action with setup-bun action in the Bun workflow - Ensures proper setup of Bun environment for CI/CD processes - Maintains consistency with recent changes to the workflow structure --- .github/workflows/bun.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/bun.yml b/.github/workflows/bun.yml index 65fa10e..c4788e8 100644 --- a/.github/workflows/bun.yml +++ b/.github/workflows/bun.yml @@ -17,7 +17,7 @@ jobs: - name: Checkout uses: actions/checkout@v5 - name: Setup Bun - uses: shunkakinoki/actions/.github/actions/auto-merge@156beb8dbd9b84135a994da9ea77398d91e33df6 + uses: shunkakinoki/actions/.github/actions/setup-bun@156beb8dbd9b84135a994da9ea77398d91e33df6 - name: Check run: bun run check - name: Format From 7949952bb5cedd4a9b764e2d7a986d6b1a3adf00 Mon Sep 17 00:00:00 2001 From: Shun Kakinoki Date: Mon, 22 Sep 2025 05:55:40 +0900 Subject: [PATCH 3/5] feat: add auto-squashing rule and script prohibition to pr-create - Add OBJECTIVE section with critical rule prohibiting script creation - Add Step 6: Auto Squashing functionality for /pr-create auto command - Update complete example to include auto-squashing workflow - Explicitly prohibit creating new script files resembling pr-create - Strictly limit usage to GitHub PR creation workflow only --- .crush.json | 41 +++++++++++++---- .cursor/mcp.json | 39 +++++++++++++--- .gemini/settings.json | 39 +++++++++++++--- .kilocode/mcp.json | 39 +++++++++++++--- .mcp.json | 39 +++++++++++++--- .vscode/mcp.json | 39 +++++++++++++--- .vscode/settings.json | 105 ++++++++++++++++++++++++++---------------- commands/pr-create.md | 34 +++++++++++++- opencode.json | 39 +++++++++++++--- 9 files changed, 324 insertions(+), 90 deletions(-) diff --git a/.crush.json b/.crush.json index 66f73ba..0b49ef1 100644 --- a/.crush.json +++ b/.crush.json @@ -2,32 +2,57 @@ "mcp": { "XcodeBuildMCP": { "command": "npx", - "args": ["-y", "xcodebuildmcp@latest"] + "args": [ + "-y", + "xcodebuildmcp@latest" + ] }, "Serena": { "command": "uv", - "args": ["run", "serena", "mcp"] + "args": [ + "run", + "serena", + "mcp" + ] }, "Linear": { "command": "npx", - "args": ["-y", "mcp-remote", "https://mcp.linear.app/sse"] + "args": [ + "-y", + "mcp-remote", + "https://mcp.linear.app/sse" + ] }, "GitHub": { "command": "npx", - "args": ["-y", "mcp-remote", "https://api.githubcopilot.com/mcp/"] + "args": [ + "-y", + "mcp-remote", + "https://api.githubcopilot.com/mcp/" + ] }, "Figma": { "command": "npx", - "args": ["-y", "mcp-remote", "http://127.0.0.1:3845/sse"] + "args": [ + "-y", + "mcp-remote", + "http://127.0.0.1:3845/sse" + ] }, "Beeper": { "command": "npx", - "args": ["-y", "mcp-remote", "http://localhost:23373/v0/mcp"] + "args": [ + "-y", + "mcp-remote", + "http://localhost:23373/v0/mcp" + ] }, "Codex": { "type": "stdio", "command": "codex", - "args": ["mcp"] + "args": [ + "mcp" + ] } } -} +} \ No newline at end of file diff --git a/.cursor/mcp.json b/.cursor/mcp.json index 9164e7a..bc580e6 100644 --- a/.cursor/mcp.json +++ b/.cursor/mcp.json @@ -2,32 +2,57 @@ "mcpServers": { "XcodeBuildMCP": { "command": "npx", - "args": ["-y", "xcodebuildmcp@latest"] + "args": [ + "-y", + "xcodebuildmcp@latest" + ] }, "Serena": { "command": "uv", - "args": ["run", "serena", "mcp"] + "args": [ + "run", + "serena", + "mcp" + ] }, "Linear": { "command": "npx", - "args": ["-y", "mcp-remote", "https://mcp.linear.app/sse"] + "args": [ + "-y", + "mcp-remote", + "https://mcp.linear.app/sse" + ] }, "GitHub": { "command": "npx", - "args": ["-y", "mcp-remote", "https://api.githubcopilot.com/mcp/"] + "args": [ + "-y", + "mcp-remote", + "https://api.githubcopilot.com/mcp/" + ] }, "Figma": { "command": "npx", - "args": ["-y", "mcp-remote", "http://127.0.0.1:3845/sse"] + "args": [ + "-y", + "mcp-remote", + "http://127.0.0.1:3845/sse" + ] }, "Beeper": { "command": "npx", - "args": ["-y", "mcp-remote", "http://localhost:23373/v0/mcp"] + "args": [ + "-y", + "mcp-remote", + "http://localhost:23373/v0/mcp" + ] }, "Codex": { "type": "stdio", "command": "codex", - "args": ["mcp"] + "args": [ + "mcp" + ] } } } diff --git a/.gemini/settings.json b/.gemini/settings.json index 9164e7a..bc580e6 100644 --- a/.gemini/settings.json +++ b/.gemini/settings.json @@ -2,32 +2,57 @@ "mcpServers": { "XcodeBuildMCP": { "command": "npx", - "args": ["-y", "xcodebuildmcp@latest"] + "args": [ + "-y", + "xcodebuildmcp@latest" + ] }, "Serena": { "command": "uv", - "args": ["run", "serena", "mcp"] + "args": [ + "run", + "serena", + "mcp" + ] }, "Linear": { "command": "npx", - "args": ["-y", "mcp-remote", "https://mcp.linear.app/sse"] + "args": [ + "-y", + "mcp-remote", + "https://mcp.linear.app/sse" + ] }, "GitHub": { "command": "npx", - "args": ["-y", "mcp-remote", "https://api.githubcopilot.com/mcp/"] + "args": [ + "-y", + "mcp-remote", + "https://api.githubcopilot.com/mcp/" + ] }, "Figma": { "command": "npx", - "args": ["-y", "mcp-remote", "http://127.0.0.1:3845/sse"] + "args": [ + "-y", + "mcp-remote", + "http://127.0.0.1:3845/sse" + ] }, "Beeper": { "command": "npx", - "args": ["-y", "mcp-remote", "http://localhost:23373/v0/mcp"] + "args": [ + "-y", + "mcp-remote", + "http://localhost:23373/v0/mcp" + ] }, "Codex": { "type": "stdio", "command": "codex", - "args": ["mcp"] + "args": [ + "mcp" + ] } } } diff --git a/.kilocode/mcp.json b/.kilocode/mcp.json index 9164e7a..bc580e6 100644 --- a/.kilocode/mcp.json +++ b/.kilocode/mcp.json @@ -2,32 +2,57 @@ "mcpServers": { "XcodeBuildMCP": { "command": "npx", - "args": ["-y", "xcodebuildmcp@latest"] + "args": [ + "-y", + "xcodebuildmcp@latest" + ] }, "Serena": { "command": "uv", - "args": ["run", "serena", "mcp"] + "args": [ + "run", + "serena", + "mcp" + ] }, "Linear": { "command": "npx", - "args": ["-y", "mcp-remote", "https://mcp.linear.app/sse"] + "args": [ + "-y", + "mcp-remote", + "https://mcp.linear.app/sse" + ] }, "GitHub": { "command": "npx", - "args": ["-y", "mcp-remote", "https://api.githubcopilot.com/mcp/"] + "args": [ + "-y", + "mcp-remote", + "https://api.githubcopilot.com/mcp/" + ] }, "Figma": { "command": "npx", - "args": ["-y", "mcp-remote", "http://127.0.0.1:3845/sse"] + "args": [ + "-y", + "mcp-remote", + "http://127.0.0.1:3845/sse" + ] }, "Beeper": { "command": "npx", - "args": ["-y", "mcp-remote", "http://localhost:23373/v0/mcp"] + "args": [ + "-y", + "mcp-remote", + "http://localhost:23373/v0/mcp" + ] }, "Codex": { "type": "stdio", "command": "codex", - "args": ["mcp"] + "args": [ + "mcp" + ] } } } diff --git a/.mcp.json b/.mcp.json index 9164e7a..bc580e6 100644 --- a/.mcp.json +++ b/.mcp.json @@ -2,32 +2,57 @@ "mcpServers": { "XcodeBuildMCP": { "command": "npx", - "args": ["-y", "xcodebuildmcp@latest"] + "args": [ + "-y", + "xcodebuildmcp@latest" + ] }, "Serena": { "command": "uv", - "args": ["run", "serena", "mcp"] + "args": [ + "run", + "serena", + "mcp" + ] }, "Linear": { "command": "npx", - "args": ["-y", "mcp-remote", "https://mcp.linear.app/sse"] + "args": [ + "-y", + "mcp-remote", + "https://mcp.linear.app/sse" + ] }, "GitHub": { "command": "npx", - "args": ["-y", "mcp-remote", "https://api.githubcopilot.com/mcp/"] + "args": [ + "-y", + "mcp-remote", + "https://api.githubcopilot.com/mcp/" + ] }, "Figma": { "command": "npx", - "args": ["-y", "mcp-remote", "http://127.0.0.1:3845/sse"] + "args": [ + "-y", + "mcp-remote", + "http://127.0.0.1:3845/sse" + ] }, "Beeper": { "command": "npx", - "args": ["-y", "mcp-remote", "http://localhost:23373/v0/mcp"] + "args": [ + "-y", + "mcp-remote", + "http://localhost:23373/v0/mcp" + ] }, "Codex": { "type": "stdio", "command": "codex", - "args": ["mcp"] + "args": [ + "mcp" + ] } } } diff --git a/.vscode/mcp.json b/.vscode/mcp.json index 5648d30..b17e4d6 100644 --- a/.vscode/mcp.json +++ b/.vscode/mcp.json @@ -2,32 +2,57 @@ "servers": { "XcodeBuildMCP": { "command": "npx", - "args": ["-y", "xcodebuildmcp@latest"] + "args": [ + "-y", + "xcodebuildmcp@latest" + ] }, "Serena": { "command": "uv", - "args": ["run", "serena", "mcp"] + "args": [ + "run", + "serena", + "mcp" + ] }, "Linear": { "command": "npx", - "args": ["-y", "mcp-remote", "https://mcp.linear.app/sse"] + "args": [ + "-y", + "mcp-remote", + "https://mcp.linear.app/sse" + ] }, "GitHub": { "command": "npx", - "args": ["-y", "mcp-remote", "https://api.githubcopilot.com/mcp/"] + "args": [ + "-y", + "mcp-remote", + "https://api.githubcopilot.com/mcp/" + ] }, "Figma": { "command": "npx", - "args": ["-y", "mcp-remote", "http://127.0.0.1:3845/sse"] + "args": [ + "-y", + "mcp-remote", + "http://127.0.0.1:3845/sse" + ] }, "Beeper": { "command": "npx", - "args": ["-y", "mcp-remote", "http://localhost:23373/v0/mcp"] + "args": [ + "-y", + "mcp-remote", + "http://localhost:23373/v0/mcp" + ] }, "Codex": { "type": "stdio", "command": "codex", - "args": ["mcp"] + "args": [ + "mcp" + ] } } } diff --git a/.vscode/settings.json b/.vscode/settings.json index fa75df3..047ef7a 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,41 +1,66 @@ { - "augment.advanced": { - "mcpServers": [ - { - "name": "XcodeBuildMCP", - "command": "npx", - "args": ["-y", "xcodebuildmcp@latest"] - }, - { - "name": "Serena", - "command": "uv", - "args": ["run", "serena", "mcp"] - }, - { - "name": "Linear", - "command": "npx", - "args": ["-y", "mcp-remote", "https://mcp.linear.app/sse"] - }, - { - "name": "GitHub", - "command": "npx", - "args": ["-y", "mcp-remote", "https://api.githubcopilot.com/mcp/"] - }, - { - "name": "Figma", - "command": "npx", - "args": ["-y", "mcp-remote", "http://127.0.0.1:3845/sse"] - }, - { - "name": "Beeper", - "command": "npx", - "args": ["-y", "mcp-remote", "http://localhost:23373/v0/mcp"] - }, - { - "name": "Codex", - "command": "codex", - "args": ["mcp"] - } - ] - } -} + "augment.advanced": { + "mcpServers": [ + { + "name": "XcodeBuildMCP", + "command": "npx", + "args": [ + "-y", + "xcodebuildmcp@latest" + ] + }, + { + "name": "Serena", + "command": "uv", + "args": [ + "run", + "serena", + "mcp" + ] + }, + { + "name": "Linear", + "command": "npx", + "args": [ + "-y", + "mcp-remote", + "https://mcp.linear.app/sse" + ] + }, + { + "name": "GitHub", + "command": "npx", + "args": [ + "-y", + "mcp-remote", + "https://api.githubcopilot.com/mcp/" + ] + }, + { + "name": "Figma", + "command": "npx", + "args": [ + "-y", + "mcp-remote", + "http://127.0.0.1:3845/sse" + ] + }, + { + "name": "Beeper", + "command": "npx", + "args": [ + "-y", + "mcp-remote", + "http://localhost:23373/v0/mcp" + ] + }, + { + "name": "Codex", + "command": "codex", + "args": [ + "mcp" + ] + } + ] + } +} \ No newline at end of file diff --git a/commands/pr-create.md b/commands/pr-create.md index 7ed5155..fe2ec1c 100644 --- a/commands/pr-create.md +++ b/commands/pr-create.md @@ -1,5 +1,17 @@ # /pr-create — Comprehensive PR creation workflow +## OBJECTIVE + +This command provides a standardized, comprehensive workflow for creating GitHub Pull Requests with proper formatting, labeling, and quality assurance. The workflow ensures: + +- Consistent PR structure and content standards +- Automated quality checks and validation +- Proper conventional commit practices +- Strategic labeling and reviewer assignment +- Comprehensive testing and documentation requirements + +**CRITICAL RULE**: This command is STRICTLY for creating GitHub Pull Requests only. Creating new script files, executables, or automation tools that replicate or extend this functionality is EXPLICITLY PROHIBITED. All PR creation must go through the established `gh pr create` workflow documented here. + Use this command when preparing a pull request. Follow each section before running `gh pr create`. ## Prerequisites @@ -95,6 +107,23 @@ gh pr create \ --head feature-branch-name ``` +### Step 6: Auto Squashing (Optional) +When using `/pr-create auto`, enable automatic squashing of commits using GitHub CLI: + +```bash +# Enable auto-squashing for cleaner commit history +gh pr merge --squash --delete-branch=false + +# Alternative: Enable auto-merge with squashing +gh pr merge --squash --auto +``` + +**Note**: Auto-squashing should only be used when: +- The PR contains multiple small commits that would benefit from consolidation +- All commits in the PR are related to the same feature/fix +- The commit history doesn't contain important intermediate states that need preservation +- Team policy allows squashing (consult repository guidelines) + ## PR Content Standards ### Title Format @@ -267,7 +296,10 @@ gh pr create \ --base main \ --head feat-add-user-auth -# 6. Add labels and reviewers +# 6. Enable auto-squashing (if using /pr-create auto) +gh pr merge --squash --auto + +# 7. Add labels and reviewers gh pr edit --add-label enhancement gh pr edit --add-reviewer "@org/frontend-team" ``` diff --git a/opencode.json b/opencode.json index 98cf0de..63844d7 100644 --- a/opencode.json +++ b/opencode.json @@ -4,17 +4,31 @@ "XcodeBuildMCP": { "type": "local", "enabled": true, - "command": ["npx", "-y", "xcodebuildmcp@latest"] + "command": [ + "npx", + "-y", + "xcodebuildmcp@latest" + ] }, "Serena": { "type": "local", "enabled": true, - "command": ["uv", "run", "serena", "mcp"] + "command": [ + "uv", + "run", + "serena", + "mcp" + ] }, "Linear": { "type": "local", "enabled": true, - "command": ["npx", "-y", "mcp-remote", "https://mcp.linear.app/sse"] + "command": [ + "npx", + "-y", + "mcp-remote", + "https://mcp.linear.app/sse" + ] }, "GitHub": { "type": "local", @@ -29,17 +43,30 @@ "Figma": { "type": "local", "enabled": true, - "command": ["npx", "-y", "mcp-remote", "http://127.0.0.1:3845/sse"] + "command": [ + "npx", + "-y", + "mcp-remote", + "http://127.0.0.1:3845/sse" + ] }, "Beeper": { "type": "local", "enabled": true, - "command": ["npx", "-y", "mcp-remote", "http://localhost:23373/v0/mcp"] + "command": [ + "npx", + "-y", + "mcp-remote", + "http://localhost:23373/v0/mcp" + ] }, "Codex": { "type": "local", "enabled": true, - "command": ["codex", "mcp"] + "command": [ + "codex", + "mcp" + ] } } } From 794a70c49efbe90ebdd0961aaa919b603b73565c Mon Sep 17 00:00:00 2001 From: Shun Kakinoki Date: Mon, 22 Sep 2025 05:58:24 +0900 Subject: [PATCH 4/5] refactor: streamline command arguments in configuration files - Consolidate command argument formatting across multiple JSON configuration files - Remove unnecessary line breaks for improved readability - Ensure consistency in argument structure for MCP server commands This update enhances the clarity and maintainability of configuration files related to MCP servers. --- .crush.json | 41 ++++------------- .cursor/mcp.json | 39 +++------------- .gemini/settings.json | 39 +++------------- .kilocode/mcp.json | 39 +++------------- .mcp.json | 39 +++------------- .vscode/mcp.json | 39 +++------------- .vscode/settings.json | 105 ++++++++++++++++-------------------------- commands/pr-create.md | 7 ++- opencode.json | 39 +++------------- 9 files changed, 94 insertions(+), 293 deletions(-) diff --git a/.crush.json b/.crush.json index 0b49ef1..66f73ba 100644 --- a/.crush.json +++ b/.crush.json @@ -2,57 +2,32 @@ "mcp": { "XcodeBuildMCP": { "command": "npx", - "args": [ - "-y", - "xcodebuildmcp@latest" - ] + "args": ["-y", "xcodebuildmcp@latest"] }, "Serena": { "command": "uv", - "args": [ - "run", - "serena", - "mcp" - ] + "args": ["run", "serena", "mcp"] }, "Linear": { "command": "npx", - "args": [ - "-y", - "mcp-remote", - "https://mcp.linear.app/sse" - ] + "args": ["-y", "mcp-remote", "https://mcp.linear.app/sse"] }, "GitHub": { "command": "npx", - "args": [ - "-y", - "mcp-remote", - "https://api.githubcopilot.com/mcp/" - ] + "args": ["-y", "mcp-remote", "https://api.githubcopilot.com/mcp/"] }, "Figma": { "command": "npx", - "args": [ - "-y", - "mcp-remote", - "http://127.0.0.1:3845/sse" - ] + "args": ["-y", "mcp-remote", "http://127.0.0.1:3845/sse"] }, "Beeper": { "command": "npx", - "args": [ - "-y", - "mcp-remote", - "http://localhost:23373/v0/mcp" - ] + "args": ["-y", "mcp-remote", "http://localhost:23373/v0/mcp"] }, "Codex": { "type": "stdio", "command": "codex", - "args": [ - "mcp" - ] + "args": ["mcp"] } } -} \ No newline at end of file +} diff --git a/.cursor/mcp.json b/.cursor/mcp.json index bc580e6..9164e7a 100644 --- a/.cursor/mcp.json +++ b/.cursor/mcp.json @@ -2,57 +2,32 @@ "mcpServers": { "XcodeBuildMCP": { "command": "npx", - "args": [ - "-y", - "xcodebuildmcp@latest" - ] + "args": ["-y", "xcodebuildmcp@latest"] }, "Serena": { "command": "uv", - "args": [ - "run", - "serena", - "mcp" - ] + "args": ["run", "serena", "mcp"] }, "Linear": { "command": "npx", - "args": [ - "-y", - "mcp-remote", - "https://mcp.linear.app/sse" - ] + "args": ["-y", "mcp-remote", "https://mcp.linear.app/sse"] }, "GitHub": { "command": "npx", - "args": [ - "-y", - "mcp-remote", - "https://api.githubcopilot.com/mcp/" - ] + "args": ["-y", "mcp-remote", "https://api.githubcopilot.com/mcp/"] }, "Figma": { "command": "npx", - "args": [ - "-y", - "mcp-remote", - "http://127.0.0.1:3845/sse" - ] + "args": ["-y", "mcp-remote", "http://127.0.0.1:3845/sse"] }, "Beeper": { "command": "npx", - "args": [ - "-y", - "mcp-remote", - "http://localhost:23373/v0/mcp" - ] + "args": ["-y", "mcp-remote", "http://localhost:23373/v0/mcp"] }, "Codex": { "type": "stdio", "command": "codex", - "args": [ - "mcp" - ] + "args": ["mcp"] } } } diff --git a/.gemini/settings.json b/.gemini/settings.json index bc580e6..9164e7a 100644 --- a/.gemini/settings.json +++ b/.gemini/settings.json @@ -2,57 +2,32 @@ "mcpServers": { "XcodeBuildMCP": { "command": "npx", - "args": [ - "-y", - "xcodebuildmcp@latest" - ] + "args": ["-y", "xcodebuildmcp@latest"] }, "Serena": { "command": "uv", - "args": [ - "run", - "serena", - "mcp" - ] + "args": ["run", "serena", "mcp"] }, "Linear": { "command": "npx", - "args": [ - "-y", - "mcp-remote", - "https://mcp.linear.app/sse" - ] + "args": ["-y", "mcp-remote", "https://mcp.linear.app/sse"] }, "GitHub": { "command": "npx", - "args": [ - "-y", - "mcp-remote", - "https://api.githubcopilot.com/mcp/" - ] + "args": ["-y", "mcp-remote", "https://api.githubcopilot.com/mcp/"] }, "Figma": { "command": "npx", - "args": [ - "-y", - "mcp-remote", - "http://127.0.0.1:3845/sse" - ] + "args": ["-y", "mcp-remote", "http://127.0.0.1:3845/sse"] }, "Beeper": { "command": "npx", - "args": [ - "-y", - "mcp-remote", - "http://localhost:23373/v0/mcp" - ] + "args": ["-y", "mcp-remote", "http://localhost:23373/v0/mcp"] }, "Codex": { "type": "stdio", "command": "codex", - "args": [ - "mcp" - ] + "args": ["mcp"] } } } diff --git a/.kilocode/mcp.json b/.kilocode/mcp.json index bc580e6..9164e7a 100644 --- a/.kilocode/mcp.json +++ b/.kilocode/mcp.json @@ -2,57 +2,32 @@ "mcpServers": { "XcodeBuildMCP": { "command": "npx", - "args": [ - "-y", - "xcodebuildmcp@latest" - ] + "args": ["-y", "xcodebuildmcp@latest"] }, "Serena": { "command": "uv", - "args": [ - "run", - "serena", - "mcp" - ] + "args": ["run", "serena", "mcp"] }, "Linear": { "command": "npx", - "args": [ - "-y", - "mcp-remote", - "https://mcp.linear.app/sse" - ] + "args": ["-y", "mcp-remote", "https://mcp.linear.app/sse"] }, "GitHub": { "command": "npx", - "args": [ - "-y", - "mcp-remote", - "https://api.githubcopilot.com/mcp/" - ] + "args": ["-y", "mcp-remote", "https://api.githubcopilot.com/mcp/"] }, "Figma": { "command": "npx", - "args": [ - "-y", - "mcp-remote", - "http://127.0.0.1:3845/sse" - ] + "args": ["-y", "mcp-remote", "http://127.0.0.1:3845/sse"] }, "Beeper": { "command": "npx", - "args": [ - "-y", - "mcp-remote", - "http://localhost:23373/v0/mcp" - ] + "args": ["-y", "mcp-remote", "http://localhost:23373/v0/mcp"] }, "Codex": { "type": "stdio", "command": "codex", - "args": [ - "mcp" - ] + "args": ["mcp"] } } } diff --git a/.mcp.json b/.mcp.json index bc580e6..9164e7a 100644 --- a/.mcp.json +++ b/.mcp.json @@ -2,57 +2,32 @@ "mcpServers": { "XcodeBuildMCP": { "command": "npx", - "args": [ - "-y", - "xcodebuildmcp@latest" - ] + "args": ["-y", "xcodebuildmcp@latest"] }, "Serena": { "command": "uv", - "args": [ - "run", - "serena", - "mcp" - ] + "args": ["run", "serena", "mcp"] }, "Linear": { "command": "npx", - "args": [ - "-y", - "mcp-remote", - "https://mcp.linear.app/sse" - ] + "args": ["-y", "mcp-remote", "https://mcp.linear.app/sse"] }, "GitHub": { "command": "npx", - "args": [ - "-y", - "mcp-remote", - "https://api.githubcopilot.com/mcp/" - ] + "args": ["-y", "mcp-remote", "https://api.githubcopilot.com/mcp/"] }, "Figma": { "command": "npx", - "args": [ - "-y", - "mcp-remote", - "http://127.0.0.1:3845/sse" - ] + "args": ["-y", "mcp-remote", "http://127.0.0.1:3845/sse"] }, "Beeper": { "command": "npx", - "args": [ - "-y", - "mcp-remote", - "http://localhost:23373/v0/mcp" - ] + "args": ["-y", "mcp-remote", "http://localhost:23373/v0/mcp"] }, "Codex": { "type": "stdio", "command": "codex", - "args": [ - "mcp" - ] + "args": ["mcp"] } } } diff --git a/.vscode/mcp.json b/.vscode/mcp.json index b17e4d6..5648d30 100644 --- a/.vscode/mcp.json +++ b/.vscode/mcp.json @@ -2,57 +2,32 @@ "servers": { "XcodeBuildMCP": { "command": "npx", - "args": [ - "-y", - "xcodebuildmcp@latest" - ] + "args": ["-y", "xcodebuildmcp@latest"] }, "Serena": { "command": "uv", - "args": [ - "run", - "serena", - "mcp" - ] + "args": ["run", "serena", "mcp"] }, "Linear": { "command": "npx", - "args": [ - "-y", - "mcp-remote", - "https://mcp.linear.app/sse" - ] + "args": ["-y", "mcp-remote", "https://mcp.linear.app/sse"] }, "GitHub": { "command": "npx", - "args": [ - "-y", - "mcp-remote", - "https://api.githubcopilot.com/mcp/" - ] + "args": ["-y", "mcp-remote", "https://api.githubcopilot.com/mcp/"] }, "Figma": { "command": "npx", - "args": [ - "-y", - "mcp-remote", - "http://127.0.0.1:3845/sse" - ] + "args": ["-y", "mcp-remote", "http://127.0.0.1:3845/sse"] }, "Beeper": { "command": "npx", - "args": [ - "-y", - "mcp-remote", - "http://localhost:23373/v0/mcp" - ] + "args": ["-y", "mcp-remote", "http://localhost:23373/v0/mcp"] }, "Codex": { "type": "stdio", "command": "codex", - "args": [ - "mcp" - ] + "args": ["mcp"] } } } diff --git a/.vscode/settings.json b/.vscode/settings.json index 047ef7a..fa75df3 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,66 +1,41 @@ { - "augment.advanced": { - "mcpServers": [ - { - "name": "XcodeBuildMCP", - "command": "npx", - "args": [ - "-y", - "xcodebuildmcp@latest" - ] - }, - { - "name": "Serena", - "command": "uv", - "args": [ - "run", - "serena", - "mcp" - ] - }, - { - "name": "Linear", - "command": "npx", - "args": [ - "-y", - "mcp-remote", - "https://mcp.linear.app/sse" - ] - }, - { - "name": "GitHub", - "command": "npx", - "args": [ - "-y", - "mcp-remote", - "https://api.githubcopilot.com/mcp/" - ] - }, - { - "name": "Figma", - "command": "npx", - "args": [ - "-y", - "mcp-remote", - "http://127.0.0.1:3845/sse" - ] - }, - { - "name": "Beeper", - "command": "npx", - "args": [ - "-y", - "mcp-remote", - "http://localhost:23373/v0/mcp" - ] - }, - { - "name": "Codex", - "command": "codex", - "args": [ - "mcp" - ] - } - ] - } -} \ No newline at end of file + "augment.advanced": { + "mcpServers": [ + { + "name": "XcodeBuildMCP", + "command": "npx", + "args": ["-y", "xcodebuildmcp@latest"] + }, + { + "name": "Serena", + "command": "uv", + "args": ["run", "serena", "mcp"] + }, + { + "name": "Linear", + "command": "npx", + "args": ["-y", "mcp-remote", "https://mcp.linear.app/sse"] + }, + { + "name": "GitHub", + "command": "npx", + "args": ["-y", "mcp-remote", "https://api.githubcopilot.com/mcp/"] + }, + { + "name": "Figma", + "command": "npx", + "args": ["-y", "mcp-remote", "http://127.0.0.1:3845/sse"] + }, + { + "name": "Beeper", + "command": "npx", + "args": ["-y", "mcp-remote", "http://localhost:23373/v0/mcp"] + }, + { + "name": "Codex", + "command": "codex", + "args": ["mcp"] + } + ] + } +} diff --git a/commands/pr-create.md b/commands/pr-create.md index fe2ec1c..d622310 100644 --- a/commands/pr-create.md +++ b/commands/pr-create.md @@ -111,11 +111,14 @@ gh pr create \ When using `/pr-create auto`, enable automatic squashing of commits using GitHub CLI: ```bash -# Enable auto-squashing for cleaner commit history -gh pr merge --squash --delete-branch=false +# Enable auto-squashing for cleaner commit history (keeps branch) +gh pr merge --squash # Alternative: Enable auto-merge with squashing gh pr merge --squash --auto + +# To delete branch after merge, add --delete-branch flag +gh pr merge --squash --delete-branch ``` **Note**: Auto-squashing should only be used when: diff --git a/opencode.json b/opencode.json index 63844d7..98cf0de 100644 --- a/opencode.json +++ b/opencode.json @@ -4,31 +4,17 @@ "XcodeBuildMCP": { "type": "local", "enabled": true, - "command": [ - "npx", - "-y", - "xcodebuildmcp@latest" - ] + "command": ["npx", "-y", "xcodebuildmcp@latest"] }, "Serena": { "type": "local", "enabled": true, - "command": [ - "uv", - "run", - "serena", - "mcp" - ] + "command": ["uv", "run", "serena", "mcp"] }, "Linear": { "type": "local", "enabled": true, - "command": [ - "npx", - "-y", - "mcp-remote", - "https://mcp.linear.app/sse" - ] + "command": ["npx", "-y", "mcp-remote", "https://mcp.linear.app/sse"] }, "GitHub": { "type": "local", @@ -43,30 +29,17 @@ "Figma": { "type": "local", "enabled": true, - "command": [ - "npx", - "-y", - "mcp-remote", - "http://127.0.0.1:3845/sse" - ] + "command": ["npx", "-y", "mcp-remote", "http://127.0.0.1:3845/sse"] }, "Beeper": { "type": "local", "enabled": true, - "command": [ - "npx", - "-y", - "mcp-remote", - "http://localhost:23373/v0/mcp" - ] + "command": ["npx", "-y", "mcp-remote", "http://localhost:23373/v0/mcp"] }, "Codex": { "type": "local", "enabled": true, - "command": [ - "codex", - "mcp" - ] + "command": ["codex", "mcp"] } } } From 7dcca8e2c5abf87dd0acb84cc127aedf95fac32a Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Sun, 21 Sep 2025 21:07:50 +0000 Subject: [PATCH 5/5] Refactor PR creation docs to clarify auto-merge and reviews Co-authored-by: shunkakinoki --- commands/pr-create.md | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/commands/pr-create.md b/commands/pr-create.md index d622310..7edf6f0 100644 --- a/commands/pr-create.md +++ b/commands/pr-create.md @@ -107,18 +107,14 @@ gh pr create \ --head feature-branch-name ``` -### Step 6: Auto Squashing (Optional) -When using `/pr-create auto`, enable automatic squashing of commits using GitHub CLI: +### Step 6: Reviews and (Optional) Auto-merge +Do not merge immediately after creating a PR. First request reviews and wait for required checks to pass. If your repository policy allows it, you may enable auto-merge so GitHub merges the PR once approvals and checks are satisfied. -```bash -# Enable auto-squashing for cleaner commit history (keeps branch) -gh pr merge --squash +Variant: `/pr-create auto` — This variant configures the created PR to auto-merge using squash. It never merges immediately; it will merge only after all required approvals and checks pass according to repository rules. -# Alternative: Enable auto-merge with squashing +```bash +# (Optional) Enable auto-merge with squash; merges later when ready gh pr merge --squash --auto - -# To delete branch after merge, add --delete-branch flag -gh pr merge --squash --delete-branch ``` **Note**: Auto-squashing should only be used when: