ワンクリックでManusで任意のスキルを実行

始める

commit-conventions

スター1

フォーク0

更新日2026年4月20日 23:37

TermQ commit, branch, and PR conventions. Load when creating commits, branches, or pull requests.

インストール

Codex または Claude でインストールこの Prompt をコピーして Codex、Claude、または他のアシスタントに貼り付けると、Skill ページを確認してインストールできます。

Manusで実行

ソース

eyelock

eyelock/TermQ

GitHub リポジトリを開く Creator のリポジトリを見る

ダウンロード

Manusで実行

Commit Conventions

ABSOLUTE RULE — NEVER COMMIT DIRECTLY TO MAIN OR DEVELOP

Every change goes through a branch and PR — no exceptions, no matter how small or urgent.

Feature/fix work: branch from develop, PR back into develop
Release promotion: PR from develop → main (you open this at release time)
Hotfix: branch from a release tag, fix directly on hotfix branch, CI passes, tag fires release from hotfix branch — main never receives the commit directly; fix reaches develop via a forward-port PR after shipping

If the user has not yet created a branch, create one before touching any files:

git checkout -b <type>-<description>

Only the user can authorise a direct push to main or develop, and only for a specific stated technical reason. Never decide this unilaterally.

Branch Naming

Use hyphens (not slashes) — keeps worktree directories flat and scannable:

feat-<description>
fix-<description>
refactor-<description>
docs-<description>
ci-<description>
test-<description>

Examples: feat-terminal-quick-actions, fix-terminal-selection-focus, ci-persistent-permissions

Commit Message Format

Use Conventional Commits:

<type>(<scope>): <subject>

<body — explain WHY, not WHAT>

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

Types: feat fix refactor docs test ci perf style chore

Scopes (optional): cli mcp ui core build localization

Pass via HEREDOC to avoid quoting issues:

git commit -m "$(cat <<'EOF'
feat(ui): Add quick terminal creation button

Adds a "+" button in the toolbar for quickly creating terminals
without using keyboard shortcuts.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
EOF
)"

Commit Count Before Pushing

Ask: what is the minimum number of commits that meaningfully separates this work?

Feature/fix branch PRs use squash-merge (gh pr merge --squash), so branch commits are ephemeral — they become one commit on develop regardless. Their only job is to help a reviewer understand the PR. That means:

Lean toward 1–3 commits per PR, one per logical concern
WIP checkpoints, format commits, and implementation-journey fixes → squash them away
The PR description carries the narrative; commits are just grouping for review

git log origin/develop..HEAD --oneline   # read it — if you'd be embarrassed showing it, squash
git rebase -i origin/develop             # fixup/reword until only meaningful separations remain

A common clean split: one commit for code changes, one for documentation or tooling changes. Don't over-invest in commit granularity on a branch that will be squashed.

Note: for the develop → main release promotion PR, these become origin/main.

Before Creating a PR

Ensure the branch is up-to-date with the base branch (develop for feature branches):

git fetch origin develop
git log HEAD..origin/develop --oneline   # if output, merge first
git merge origin/develop
git push

PR Description Template

## Summary
Brief overview of changes and why.

## Changes
- Change 1
- Change 2

## Testing
- [ ] make check passes
- [ ] Manual testing completed
- [ ] Localization validated (if UI changes)

## Related Issues
Fixes #123

🤖 Generated with [Claude Code](https://claude.com/claude-code)

PR Title

Same format as commit message: feat(scope): Brief description

Merge Rules

NEVER use gh pr merge --admin — bypasses CI, strictly forbidden. NEVER use gh pr merge --auto — sets auto-merge on GitHub; only the user may do this.

Only merge when:

All CI checks pass
All review comments addressed and conversations resolved
Branch is up-to-date with base

gh pr checks         # verify all pass
gh pr view --comments  # verify no unresolved comments
gh pr merge --squash   # feature/fix branches → develop

Exception — release promotion PR (develop → main): always use --merge (true merge), never --squash. Squash loses ancestry and makes git log v{VERSION}..develop show the entire history as if nothing was released.

gh pr merge --merge   # develop → main only

Post-Merge Cleanup

Order matters — follow exactly to avoid CWD becoming invalid.

# 1. Capture the main repo path and branch name BEFORE moving anywhere
MAIN_REPO=$(git rev-parse --show-toplevel 2>/dev/null || echo "<main-repo-path>")
BRANCH=<branch-name>

# 2. Verify merged into develop (feature branches) or main (release PRs)
git -C "$MAIN_REPO" branch -r --merged origin/develop | grep "$BRANCH"

# 3. Pivot CWD to main repo FIRST (before removing worktree — once removed, CWD is invalid)
cd "$MAIN_REPO"

# 4. Remove worktree (path relative to main repo)
git worktree remove ../TermQ-worktrees/"$BRANCH"

# 5. Delete local branch
git branch -d "$BRANCH"

# 6. Delete remote branch only if it still exists (GitHub auto-deletes on merge)
git ls-remote --exit-code origin "$BRANCH" 2>/dev/null && git push origin --delete "$BRANCH" || echo "Remote branch already deleted"

Never run cleanup from inside the worktree — git worktree remove and git branch -d must run from the main repo. Never assume the remote branch still exists after merge.

このリポジトリの他の Skills

同じリポジトリ

release

eyelock/TermQ

TermQ release procedures. Load when executing any release — stable, beta, or hotfix. Covers versioning, tagging, monitoring, and verification.

2026-06-131

termq-dev

eyelock/TermQ

TermQ development context. Load at session start and when working on TermQ. Covers project structure, module layout, toolchain rules, worktree workflow, settings architecture, and debugging (TermQLogger categories, log streaming, TERMQ_DEBUG mode).

2026-05-091

quality-gate

eyelock/TermQ

TermQ code quality gate. Load when running verification checks before committing. Defines the four checks that must all pass with zero errors.

2026-04-211

localization-procedures

eyelock/TermQ

TermQ localization workflows. Load when performing any localization task — extracting strings, translating, validating, auditing, or syncing language files.

2026-04-151

sparkle-updater

eyelock/TermQ

Sparkle auto-update system for TermQ. Load when working on release workflows, appcast generation, update signing, or debugging update failures. Covers the full update pipeline from signing through delivery.

2026-04-121

code-style

eyelock/TermQ

TermQ Swift code style and patterns. Load when writing or reviewing Swift code. Covers Swift 6 concurrency, error handling, memory management, UI components, and testing.

2026-04-121

name	commit-conventions
description	TermQ commit, branch, and PR conventions. Load when creating commits, branches, or pull requests.

Commit Conventions

ABSOLUTE RULE — NEVER COMMIT DIRECTLY TO MAIN OR DEVELOP

Every change goes through a branch and PR — no exceptions, no matter how small or urgent.

Feature/fix work: branch from develop, PR back into develop
Release promotion: PR from develop → main (you open this at release time)
Hotfix: branch from a release tag, fix directly on hotfix branch, CI passes, tag fires release from hotfix branch — main never receives the commit directly; fix reaches develop via a forward-port PR after shipping

If the user has not yet created a branch, create one before touching any files:

git checkout -b <type>-<description>

Only the user can authorise a direct push to main or develop, and only for a specific stated technical reason. Never decide this unilaterally.

Branch Naming

Use hyphens (not slashes) — keeps worktree directories flat and scannable:

feat-<description>
fix-<description>
refactor-<description>
docs-<description>
ci-<description>
test-<description>

Examples: feat-terminal-quick-actions, fix-terminal-selection-focus, ci-persistent-permissions

Commit Message Format

Use Conventional Commits:

<type>(<scope>): <subject>

<body — explain WHY, not WHAT>

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

Types: feat fix refactor docs test ci perf style chore

Scopes (optional): cli mcp ui core build localization

Pass via HEREDOC to avoid quoting issues:

git commit -m "$(cat <<'EOF'
feat(ui): Add quick terminal creation button

Adds a "+" button in the toolbar for quickly creating terminals
without using keyboard shortcuts.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
EOF
)"

Commit Count Before Pushing

Ask: what is the minimum number of commits that meaningfully separates this work?

Lean toward 1–3 commits per PR, one per logical concern
WIP checkpoints, format commits, and implementation-journey fixes → squash them away
The PR description carries the narrative; commits are just grouping for review

git log origin/develop..HEAD --oneline   # read it — if you'd be embarrassed showing it, squash
git rebase -i origin/develop             # fixup/reword until only meaningful separations remain

A common clean split: one commit for code changes, one for documentation or tooling changes. Don't over-invest in commit granularity on a branch that will be squashed.

Note: for the develop → main release promotion PR, these become origin/main.

Before Creating a PR

Ensure the branch is up-to-date with the base branch (develop for feature branches):

git fetch origin develop
git log HEAD..origin/develop --oneline   # if output, merge first
git merge origin/develop
git push

PR Description Template

## Summary
Brief overview of changes and why.

## Changes
- Change 1
- Change 2

## Testing
- [ ] make check passes
- [ ] Manual testing completed
- [ ] Localization validated (if UI changes)

## Related Issues
Fixes #123

🤖 Generated with [Claude Code](https://claude.com/claude-code)

PR Title

Same format as commit message: feat(scope): Brief description

Merge Rules

NEVER use gh pr merge --admin — bypasses CI, strictly forbidden. NEVER use gh pr merge --auto — sets auto-merge on GitHub; only the user may do this.

Only merge when:

All CI checks pass
All review comments addressed and conversations resolved
Branch is up-to-date with base

gh pr checks         # verify all pass
gh pr view --comments  # verify no unresolved comments
gh pr merge --squash   # feature/fix branches → develop

gh pr merge --merge   # develop → main only

Post-Merge Cleanup

Order matters — follow exactly to avoid CWD becoming invalid.

# 1. Capture the main repo path and branch name BEFORE moving anywhere
MAIN_REPO=$(git rev-parse --show-toplevel 2>/dev/null || echo "<main-repo-path>")
BRANCH=<branch-name>

# 2. Verify merged into develop (feature branches) or main (release PRs)
git -C "$MAIN_REPO" branch -r --merged origin/develop | grep "$BRANCH"

# 3. Pivot CWD to main repo FIRST (before removing worktree — once removed, CWD is invalid)
cd "$MAIN_REPO"

# 4. Remove worktree (path relative to main repo)
git worktree remove ../TermQ-worktrees/"$BRANCH"

# 5. Delete local branch
git branch -d "$BRANCH"

# 6. Delete remote branch only if it still exists (GitHub auto-deletes on merge)
git ls-remote --exit-code origin "$BRANCH" 2>/dev/null && git push origin --delete "$BRANCH" || echo "Remote branch already deleted"

Never run cleanup from inside the worktree — git worktree remove and git branch -d must run from the main repo. Never assume the remote branch still exists after merge.