From 2b0f08d720ed76d2f51238656eee11b6a2b33b9b Mon Sep 17 00:00:00 2001 From: flora131 Date: Sun, 22 Feb 2026 20:17:41 -0800 Subject: [PATCH 1/3] chore(skills): simplify sl-commit and sl-submit-diff skill docs Remove unused Sapling commands (bookmark, smartlog, absorb) and duplicate conventional commits section from sl-commit. Simplify sl-submit-diff to use only jf submit with --draft mode by default and remove arc diff references and prerequisites section. Assistant-model: Claude Code --- .claude/skills/sl-commit/SKILL.md | 16 +--------------- .claude/skills/sl-submit-diff/SKILL.md | 16 +++++----------- .github/skills/sl-commit/SKILL.md | 16 +--------------- .github/skills/sl-submit-diff/SKILL.md | 16 +++++----------- .opencode/skills/sl-commit/SKILL.md | 16 +--------------- .opencode/skills/sl-submit-diff/SKILL.md | 16 +++++----------- 6 files changed, 18 insertions(+), 78 deletions(-) diff --git a/.claude/skills/sl-commit/SKILL.md b/.claude/skills/sl-commit/SKILL.md index 9878fbbfd..272faf163 100644 --- a/.claude/skills/sl-commit/SKILL.md +++ b/.claude/skills/sl-commit/SKILL.md @@ -24,9 +24,7 @@ Create well-formatted commits following the Conventional Commits specification u ## Commands to Use - `sl status` - Check repository state -- `sl bookmark` - Get current bookmark -- `sl smartlog -l 5` - View recent commits with graphical history -- `sl diff --stat` - View pending changes +- `sl diff` - View pending changes - `sl add ` - Add untracked files - `sl commit -m ""` - Create commit @@ -34,8 +32,6 @@ Create well-formatted commits following the Conventional Commits specification u - **No staging area**: Sapling commits all pending changes directly - **Amend with auto-restack**: `sl amend` automatically rebases descendant commits -- **Smartlog**: Use `sl smartlog` or `sl ssl` for graphical commit history -- **Absorb**: Use `sl absorb` to intelligently integrate pending changes - **Stacked Diffs**: Each commit becomes a separate Phabricator diff ## Sapling Commit Commands Reference @@ -46,17 +42,7 @@ Create well-formatted commits following the Conventional Commits specification u | `sl commit -A` | Add untracked files and commit | | `sl amend` | Amend current commit (auto-rebases descendants) | | `sl amend --to COMMIT` | Amend changes to a specific commit in stack | -| `sl absorb` | Intelligently absorb changes into stack commits | -## Conventional Commits Format - -``` -[optional scope]: - -[optional body] - -[optional footer(s)] -``` **Types:** diff --git a/.claude/skills/sl-submit-diff/SKILL.md b/.claude/skills/sl-submit-diff/SKILL.md index ca21f2bd9..de82f1863 100644 --- a/.claude/skills/sl-submit-diff/SKILL.md +++ b/.claude/skills/sl-submit-diff/SKILL.md @@ -5,7 +5,7 @@ description: Submit commits as Phabricator diffs for code review using Sapling. # Submit Diff (Sapling + Phabricator) -Submit commits to Phabricator for code review using `jf submit` (Meta) or `arc diff` (open-source). +Submit commits to Phabricator for code review using `jf submit` (Meta). @@ -15,7 +15,7 @@ Submit commits to Phabricator for code review using `jf submit` (Meta) or `arc d ## What This Skill Does 1. If there are uncommitted changes, first run `/commit` to create a commit -2. Submit commits to Phabricator using `jf submit` (or `arc diff`) +2. Submit commits to Phabricator using `jf submit --draft`. Submit for review using DRAFT mode 3. Each commit in the stack becomes a separate Phabricator diff (D12345) 4. Commit messages are updated with `Differential Revision:` link @@ -23,15 +23,15 @@ Submit commits to Phabricator for code review using `jf submit` (Meta) or `arc d - `sl status` - Check for uncommitted changes - `sl ssl` - View commits with diff status -- `jf submit` - Submit commits to Phabricator +- `jf submit --draft` - Submit commits to Phabricator in DRAFT mode - `sl diff --since-last-submit` - View changes since last submission ## Common Operations | Task | Command | | ----------------------- | --------------------------------- | -| Submit current commit | `jf submit` | -| Update diff after amend | `sl amend && jf submit` | +| Submit current commit | `jf submit --draft` | +| Update diff after amend | `sl amend && jf submit --draft` | | View diff status | `sl ssl` | | Check sync status | `sl log -T '{syncstatus}\n' -r .` | | Get diff ID | `sl log -T '{phabdiff}\n' -r .` | @@ -52,12 +52,6 @@ Sapling naturally supports stacked commits. When submitting: - Diffs are linked with proper dependency relationships - Reviewers can review each diff independently -## Prerequisites - -1. **`.arcconfig`** must exist in repository root with Phabricator URL -2. **`~/.arcrc`** must contain authentication credentials -3. **`fbcodereview`** extension must be enabled in Sapling config - ## Important Notes - Unlike GitHub PRs, Phabricator diffs are tied to commits via `Differential Revision:` diff --git a/.github/skills/sl-commit/SKILL.md b/.github/skills/sl-commit/SKILL.md index 9878fbbfd..272faf163 100644 --- a/.github/skills/sl-commit/SKILL.md +++ b/.github/skills/sl-commit/SKILL.md @@ -24,9 +24,7 @@ Create well-formatted commits following the Conventional Commits specification u ## Commands to Use - `sl status` - Check repository state -- `sl bookmark` - Get current bookmark -- `sl smartlog -l 5` - View recent commits with graphical history -- `sl diff --stat` - View pending changes +- `sl diff` - View pending changes - `sl add ` - Add untracked files - `sl commit -m ""` - Create commit @@ -34,8 +32,6 @@ Create well-formatted commits following the Conventional Commits specification u - **No staging area**: Sapling commits all pending changes directly - **Amend with auto-restack**: `sl amend` automatically rebases descendant commits -- **Smartlog**: Use `sl smartlog` or `sl ssl` for graphical commit history -- **Absorb**: Use `sl absorb` to intelligently integrate pending changes - **Stacked Diffs**: Each commit becomes a separate Phabricator diff ## Sapling Commit Commands Reference @@ -46,17 +42,7 @@ Create well-formatted commits following the Conventional Commits specification u | `sl commit -A` | Add untracked files and commit | | `sl amend` | Amend current commit (auto-rebases descendants) | | `sl amend --to COMMIT` | Amend changes to a specific commit in stack | -| `sl absorb` | Intelligently absorb changes into stack commits | -## Conventional Commits Format - -``` -[optional scope]: - -[optional body] - -[optional footer(s)] -``` **Types:** diff --git a/.github/skills/sl-submit-diff/SKILL.md b/.github/skills/sl-submit-diff/SKILL.md index ca21f2bd9..de82f1863 100644 --- a/.github/skills/sl-submit-diff/SKILL.md +++ b/.github/skills/sl-submit-diff/SKILL.md @@ -5,7 +5,7 @@ description: Submit commits as Phabricator diffs for code review using Sapling. # Submit Diff (Sapling + Phabricator) -Submit commits to Phabricator for code review using `jf submit` (Meta) or `arc diff` (open-source). +Submit commits to Phabricator for code review using `jf submit` (Meta). @@ -15,7 +15,7 @@ Submit commits to Phabricator for code review using `jf submit` (Meta) or `arc d ## What This Skill Does 1. If there are uncommitted changes, first run `/commit` to create a commit -2. Submit commits to Phabricator using `jf submit` (or `arc diff`) +2. Submit commits to Phabricator using `jf submit --draft`. Submit for review using DRAFT mode 3. Each commit in the stack becomes a separate Phabricator diff (D12345) 4. Commit messages are updated with `Differential Revision:` link @@ -23,15 +23,15 @@ Submit commits to Phabricator for code review using `jf submit` (Meta) or `arc d - `sl status` - Check for uncommitted changes - `sl ssl` - View commits with diff status -- `jf submit` - Submit commits to Phabricator +- `jf submit --draft` - Submit commits to Phabricator in DRAFT mode - `sl diff --since-last-submit` - View changes since last submission ## Common Operations | Task | Command | | ----------------------- | --------------------------------- | -| Submit current commit | `jf submit` | -| Update diff after amend | `sl amend && jf submit` | +| Submit current commit | `jf submit --draft` | +| Update diff after amend | `sl amend && jf submit --draft` | | View diff status | `sl ssl` | | Check sync status | `sl log -T '{syncstatus}\n' -r .` | | Get diff ID | `sl log -T '{phabdiff}\n' -r .` | @@ -52,12 +52,6 @@ Sapling naturally supports stacked commits. When submitting: - Diffs are linked with proper dependency relationships - Reviewers can review each diff independently -## Prerequisites - -1. **`.arcconfig`** must exist in repository root with Phabricator URL -2. **`~/.arcrc`** must contain authentication credentials -3. **`fbcodereview`** extension must be enabled in Sapling config - ## Important Notes - Unlike GitHub PRs, Phabricator diffs are tied to commits via `Differential Revision:` diff --git a/.opencode/skills/sl-commit/SKILL.md b/.opencode/skills/sl-commit/SKILL.md index 9878fbbfd..272faf163 100644 --- a/.opencode/skills/sl-commit/SKILL.md +++ b/.opencode/skills/sl-commit/SKILL.md @@ -24,9 +24,7 @@ Create well-formatted commits following the Conventional Commits specification u ## Commands to Use - `sl status` - Check repository state -- `sl bookmark` - Get current bookmark -- `sl smartlog -l 5` - View recent commits with graphical history -- `sl diff --stat` - View pending changes +- `sl diff` - View pending changes - `sl add ` - Add untracked files - `sl commit -m ""` - Create commit @@ -34,8 +32,6 @@ Create well-formatted commits following the Conventional Commits specification u - **No staging area**: Sapling commits all pending changes directly - **Amend with auto-restack**: `sl amend` automatically rebases descendant commits -- **Smartlog**: Use `sl smartlog` or `sl ssl` for graphical commit history -- **Absorb**: Use `sl absorb` to intelligently integrate pending changes - **Stacked Diffs**: Each commit becomes a separate Phabricator diff ## Sapling Commit Commands Reference @@ -46,17 +42,7 @@ Create well-formatted commits following the Conventional Commits specification u | `sl commit -A` | Add untracked files and commit | | `sl amend` | Amend current commit (auto-rebases descendants) | | `sl amend --to COMMIT` | Amend changes to a specific commit in stack | -| `sl absorb` | Intelligently absorb changes into stack commits | -## Conventional Commits Format - -``` -[optional scope]: - -[optional body] - -[optional footer(s)] -``` **Types:** diff --git a/.opencode/skills/sl-submit-diff/SKILL.md b/.opencode/skills/sl-submit-diff/SKILL.md index ca21f2bd9..de82f1863 100644 --- a/.opencode/skills/sl-submit-diff/SKILL.md +++ b/.opencode/skills/sl-submit-diff/SKILL.md @@ -5,7 +5,7 @@ description: Submit commits as Phabricator diffs for code review using Sapling. # Submit Diff (Sapling + Phabricator) -Submit commits to Phabricator for code review using `jf submit` (Meta) or `arc diff` (open-source). +Submit commits to Phabricator for code review using `jf submit` (Meta). @@ -15,7 +15,7 @@ Submit commits to Phabricator for code review using `jf submit` (Meta) or `arc d ## What This Skill Does 1. If there are uncommitted changes, first run `/commit` to create a commit -2. Submit commits to Phabricator using `jf submit` (or `arc diff`) +2. Submit commits to Phabricator using `jf submit --draft`. Submit for review using DRAFT mode 3. Each commit in the stack becomes a separate Phabricator diff (D12345) 4. Commit messages are updated with `Differential Revision:` link @@ -23,15 +23,15 @@ Submit commits to Phabricator for code review using `jf submit` (Meta) or `arc d - `sl status` - Check for uncommitted changes - `sl ssl` - View commits with diff status -- `jf submit` - Submit commits to Phabricator +- `jf submit --draft` - Submit commits to Phabricator in DRAFT mode - `sl diff --since-last-submit` - View changes since last submission ## Common Operations | Task | Command | | ----------------------- | --------------------------------- | -| Submit current commit | `jf submit` | -| Update diff after amend | `sl amend && jf submit` | +| Submit current commit | `jf submit --draft` | +| Update diff after amend | `sl amend && jf submit --draft` | | View diff status | `sl ssl` | | Check sync status | `sl log -T '{syncstatus}\n' -r .` | | Get diff ID | `sl log -T '{phabdiff}\n' -r .` | @@ -52,12 +52,6 @@ Sapling naturally supports stacked commits. When submitting: - Diffs are linked with proper dependency relationships - Reviewers can review each diff independently -## Prerequisites - -1. **`.arcconfig`** must exist in repository root with Phabricator URL -2. **`~/.arcrc`** must contain authentication credentials -3. **`fbcodereview`** extension must be enabled in Sapling config - ## Important Notes - Unlike GitHub PRs, Phabricator diffs are tied to commits via `Differential Revision:` From b4330f0b9b0cab872fdad1d9b57a3a95b40a94da Mon Sep 17 00:00:00 2001 From: flora131 Date: Sun, 22 Feb 2026 20:39:17 -0800 Subject: [PATCH 2/3] chore(skills): remove redundant commit types list from sl-commit docs The conventional commit types are already documented in the full Conventional Commits specification referenced by the skill. Removing the duplicate list reduces maintenance burden and avoids drift. Assistant-model: Claude Code --- .claude/skills/sl-commit/SKILL.md | 12 ------------ .github/skills/sl-commit/SKILL.md | 12 ------------ .opencode/skills/sl-commit/SKILL.md | 12 ------------ 3 files changed, 36 deletions(-) diff --git a/.claude/skills/sl-commit/SKILL.md b/.claude/skills/sl-commit/SKILL.md index 272faf163..8ae7e7465 100644 --- a/.claude/skills/sl-commit/SKILL.md +++ b/.claude/skills/sl-commit/SKILL.md @@ -43,18 +43,6 @@ Create well-formatted commits following the Conventional Commits specification u | `sl amend` | Amend current commit (auto-rebases descendants) | | `sl amend --to COMMIT` | Amend changes to a specific commit in stack | - -**Types:** - -- `feat:` - New feature (MINOR version bump) -- `fix:` - Bug fix (PATCH version bump) -- `docs:` - Documentation changes -- `style:` - Code style changes -- `refactor:` - Code refactoring -- `perf:` - Performance improvements -- `test:` - Adding or updating tests -- `chore:` - Maintenance tasks - ## Important Notes - Follow pre-commit checks if configured diff --git a/.github/skills/sl-commit/SKILL.md b/.github/skills/sl-commit/SKILL.md index 272faf163..8ae7e7465 100644 --- a/.github/skills/sl-commit/SKILL.md +++ b/.github/skills/sl-commit/SKILL.md @@ -43,18 +43,6 @@ Create well-formatted commits following the Conventional Commits specification u | `sl amend` | Amend current commit (auto-rebases descendants) | | `sl amend --to COMMIT` | Amend changes to a specific commit in stack | - -**Types:** - -- `feat:` - New feature (MINOR version bump) -- `fix:` - Bug fix (PATCH version bump) -- `docs:` - Documentation changes -- `style:` - Code style changes -- `refactor:` - Code refactoring -- `perf:` - Performance improvements -- `test:` - Adding or updating tests -- `chore:` - Maintenance tasks - ## Important Notes - Follow pre-commit checks if configured diff --git a/.opencode/skills/sl-commit/SKILL.md b/.opencode/skills/sl-commit/SKILL.md index 272faf163..8ae7e7465 100644 --- a/.opencode/skills/sl-commit/SKILL.md +++ b/.opencode/skills/sl-commit/SKILL.md @@ -43,18 +43,6 @@ Create well-formatted commits following the Conventional Commits specification u | `sl amend` | Amend current commit (auto-rebases descendants) | | `sl amend --to COMMIT` | Amend changes to a specific commit in stack | - -**Types:** - -- `feat:` - New feature (MINOR version bump) -- `fix:` - Bug fix (PATCH version bump) -- `docs:` - Documentation changes -- `style:` - Code style changes -- `refactor:` - Code refactoring -- `perf:` - Performance improvements -- `test:` - Adding or updating tests -- `chore:` - Maintenance tasks - ## Important Notes - Follow pre-commit checks if configured From cd120065e773846c0be6c81f230508c160451458 Mon Sep 17 00:00:00 2001 From: flora131 Date: Sun, 22 Feb 2026 21:03:43 -0800 Subject: [PATCH 3/3] chore(skills): remove sl ssl and status query commands from sl-submit-diff docs Assistant-model: Claude Code --- .claude/skills/sl-submit-diff/SKILL.md | 4 ---- .github/skills/sl-submit-diff/SKILL.md | 4 ---- .opencode/skills/sl-submit-diff/SKILL.md | 4 ---- 3 files changed, 12 deletions(-) diff --git a/.claude/skills/sl-submit-diff/SKILL.md b/.claude/skills/sl-submit-diff/SKILL.md index de82f1863..3a53cf532 100644 --- a/.claude/skills/sl-submit-diff/SKILL.md +++ b/.claude/skills/sl-submit-diff/SKILL.md @@ -22,7 +22,6 @@ Submit commits to Phabricator for code review using `jf submit` (Meta). ## Commands to Use - `sl status` - Check for uncommitted changes -- `sl ssl` - View commits with diff status - `jf submit --draft` - Submit commits to Phabricator in DRAFT mode - `sl diff --since-last-submit` - View changes since last submission @@ -32,9 +31,6 @@ Submit commits to Phabricator for code review using `jf submit` (Meta). | ----------------------- | --------------------------------- | | Submit current commit | `jf submit --draft` | | Update diff after amend | `sl amend && jf submit --draft` | -| View diff status | `sl ssl` | -| Check sync status | `sl log -T '{syncstatus}\n' -r .` | -| Get diff ID | `sl log -T '{phabdiff}\n' -r .` | ## Diff Status Values diff --git a/.github/skills/sl-submit-diff/SKILL.md b/.github/skills/sl-submit-diff/SKILL.md index de82f1863..3a53cf532 100644 --- a/.github/skills/sl-submit-diff/SKILL.md +++ b/.github/skills/sl-submit-diff/SKILL.md @@ -22,7 +22,6 @@ Submit commits to Phabricator for code review using `jf submit` (Meta). ## Commands to Use - `sl status` - Check for uncommitted changes -- `sl ssl` - View commits with diff status - `jf submit --draft` - Submit commits to Phabricator in DRAFT mode - `sl diff --since-last-submit` - View changes since last submission @@ -32,9 +31,6 @@ Submit commits to Phabricator for code review using `jf submit` (Meta). | ----------------------- | --------------------------------- | | Submit current commit | `jf submit --draft` | | Update diff after amend | `sl amend && jf submit --draft` | -| View diff status | `sl ssl` | -| Check sync status | `sl log -T '{syncstatus}\n' -r .` | -| Get diff ID | `sl log -T '{phabdiff}\n' -r .` | ## Diff Status Values diff --git a/.opencode/skills/sl-submit-diff/SKILL.md b/.opencode/skills/sl-submit-diff/SKILL.md index de82f1863..3a53cf532 100644 --- a/.opencode/skills/sl-submit-diff/SKILL.md +++ b/.opencode/skills/sl-submit-diff/SKILL.md @@ -22,7 +22,6 @@ Submit commits to Phabricator for code review using `jf submit` (Meta). ## Commands to Use - `sl status` - Check for uncommitted changes -- `sl ssl` - View commits with diff status - `jf submit --draft` - Submit commits to Phabricator in DRAFT mode - `sl diff --since-last-submit` - View changes since last submission @@ -32,9 +31,6 @@ Submit commits to Phabricator for code review using `jf submit` (Meta). | ----------------------- | --------------------------------- | | Submit current commit | `jf submit --draft` | | Update diff after amend | `sl amend && jf submit --draft` | -| View diff status | `sl ssl` | -| Check sync status | `sl log -T '{syncstatus}\n' -r .` | -| Get diff ID | `sl log -T '{phabdiff}\n' -r .` | ## Diff Status Values