safe-editing

确保AI代理在隔离的Git工作树中工作,以防止对主工作目录的更改。在AI即将进行会话中的首次代码修改或用户请求隔离/安全编辑时使用。触发条件包括开始编辑文件、实现功能或修复错误。

📖 中文导读:确保AI代理在隔离的Git工作树中工作,以防止对主工作目录的更改。在AI即将进行会话中的首次代码修改或用户请求隔离/安全编辑时使用。触发条件包括开始编辑文件、实现功能或修复错误。 以下正文为该技能的原始 SKILL.md 内容(英文),上方安装命令可直接使用。

name: safe-editing description: Ensure AI agents work in an isolated Git worktree to prevent changes to the main working directory. Use when AI is about to make its first code modification in a session, or when the user requests isolated/safe editing. Triggers include starting to edit files, implementing features, or fixing bugs.

Safe Editing

Use Git worktree to isolate AI-driven changes from the main working directory.

Trigger Conditions

Activate this skill when:

  • AI is about to make its first code modification in the current session
  • User explicitly requests safe/isolated editing
  • Starting a new feature implementation or bug fix

Workflow

1. Check Current State

git rev-parse --show-toplevel
git worktree list
git status --porcelain

Verify:

  • In a Git repository
  • No uncommitted changes in main directory
  • Not already in a worktree

If uncommitted changes exist, ask user how to proceed (stash, commit, or abort).

2. Determine Branch Name

Analyze the task and generate a branch name:

Task Type Branch Format Example
New feature feature/<scope>-<summary> feature/auth-add-oauth
Bug fix fix/<scope>-<summary> fix/api-null-pointer
Refactor refactor/<scope>-<summary> refactor/utils-cleanup
Docs docs/<summary> docs/update-readme
  • Use lowercase kebab-case
  • Translate Japanese to English
  • Keep concise but descriptive

3. Create Worktree

Use the gwt alias (defined in .zshrc):

gwt <branch-name>

This creates:

  • New branch: <branch-name>
  • Worktree at: ../git-worktrees/<repo-name>-<branch-name>

4. Navigate to Worktree

cd ../git-worktrees/<repo-name>-<branch-name>

Confirm the switch:

pwd
git branch --show-current

5. Perform Changes

Execute the requested modifications in the worktree directory. All file edits, creations, and deletions happen here.

6. Commit, Push, and Create PR

Use the commit-push-pr skill to:

  1. Stage and commit changes
  2. Push to remote
  3. Create pull request

7. Cleanup (After PR Merge)

Once the PR is merged, clean up the worktree:

cd <original-repo-path>
gwtr ../git-worktrees/<repo-name>-<branch-name>

Quick Reference

Alias Command Purpose
gwt <branch> git worktree add ../git-worktrees/<repo>-<branch> -b <branch> Create worktree
gwtl git worktree list List worktrees
gwtr <path> git worktree remove <path> Remove worktree

Notes

  • Always confirm with user before creating worktree
  • If worktree already exists for the task, reuse it
  • Keep main directory clean for other work