Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,8 @@ are picked up automatically.
When several AI sessions have the **same local checkout** open at once (two
Claude Code tabs, a CLI + the IDE extension, two terminals) they can clobber
each other — branch switches under uncommitted edits, racing pushes, duplicate
builds. The **`session-lock`** skill (alias `deconflict-sessions`) is the
builds.
The **`session-lock`** skill is the
local-filesystem counterpart to `claim-pr`: a small registry CLI
(`skills/session-lock/scripts/ai-session.sh`) keeps a machine-local list of
active sessions under `.git/ai-sessions/`, so sessions can see each other,
Expand Down

This file was deleted.

26 changes: 0 additions & 26 deletions codex-skills/address-rebut-defer-iterate-all/SKILL.md

This file was deleted.

26 changes: 0 additions & 26 deletions codex-skills/address-rebut-defer-iterate/SKILL.md

This file was deleted.

26 changes: 0 additions & 26 deletions codex-skills/address-rebut-defer/SKILL.md

This file was deleted.

26 changes: 0 additions & 26 deletions codex-skills/antigravity-review-workflow/SKILL.md

This file was deleted.

26 changes: 0 additions & 26 deletions codex-skills/deconflict-sessions/SKILL.md

This file was deleted.

26 changes: 0 additions & 26 deletions codex-skills/grab-issues-and-iterate-all/SKILL.md

This file was deleted.

26 changes: 0 additions & 26 deletions codex-skills/merge-skills/SKILL.md

This file was deleted.

26 changes: 0 additions & 26 deletions codex-skills/prune-worktrees/SKILL.md

This file was deleted.

2 changes: 1 addition & 1 deletion docs/local-session-deconfliction.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ GitHub/GitLab PR or issue) via comment claims.
| Piece | Path | Role |
|-------|------|------|
| Registry CLI | `skills/session-lock/scripts/ai-session.sh` | the system: register / check / list / worktree / release / prune |
| Skill | `skills/session-lock/SKILL.md` | how an agent should use it (with `deconflict-sessions` as an alias) |
| Skill | `skills/session-lock/SKILL.md` | how an agent should use it |
| Optional hook | `skills/session-lock/hooks/session-start-register.sh` | auto-register on `SessionStart` and surface conflicts |

Once `bootstrap.sh` has run, the script lives at
Expand Down
Loading
Loading