chore: resolve merge conflicts with main

- fix-ci: keep English description and Skill tool invocation
- pr-flow-ja: keep thin-wrapper version over pr-flow
- pr-flow: drop context injection block (not needed), use cd && gh pr view

Co-Authored-By: Claude <noreply@anthropic.com>

Author: nkoji21

.agents/skills/pr-flow/SKILL.md

@@ -7,17 +7,11 @@ allowed-tools: Bash, Skill, Agent
 
 Orchestrate the full pull request workflow from staged changes to squash-merged PR.
 
-**Current branch:** `!`git branch --show-current``
-
-**Working tree status:**
-```
-!`git status --short`
-```
-
 ## Phase 1: Worktree
 
 Use the Skill tool to invoke the `git-worktree` skill.
 
+
 It will return a worktree path (e.g. `/tmp/feat-foo`) and a branch name. Store both:
 - `WORKTREE_PATH` — absolute path to the worktree
 - `BRANCH_NAME` — the branch created inside the worktree
@@ -48,7 +42,7 @@ Use the Skill tool to invoke the `git-pr` skill with args `--path $WORKTREE_PATH
 
 After the skill completes, capture the PR URL:
 ```
-gh -C $WORKTREE_PATH pr view --json url --jq '.url'
+cd $WORKTREE_PATH && gh pr view --json url --jq '.url'
 ```
 
 If `gh pr create` failed because a PR already exists, retrieve the existing PR URL with the same command.

.cursor/settings.json

@@ -79,5 +79,8 @@
   ],
   "terminal.integrated.gpuAcceleration": "off",
   "window.systemColorTheme": "dark",
-  "window.autoDetectColorScheme": false
+  "window.autoDetectColorScheme": false,
+  "accessibility.signals.terminalBell": {
+    "sound": "on"
+  }
 }

.zshrc

@@ -130,8 +130,6 @@ man() {
 
 # ===== オプション =====
 
-# ビープ音を無効化
-setopt no_beep
 
 # ===== プラグイン =====