luan/gt:restack
local-plugins/plugins/gt/skills/restack/SKILL.md
Use this skill to rebase branches, sync with main/trunk, and resolve merge conflicts. REPLACES git rebase — never use it directly. Triggers: 'restack', 'rebase', 'rebase on main', 'sync with main', 'update stack', 'resolve conflicts', 'branches out of date'.
$ install --global
skillsauthnpx skillsauth add luan/dot-claude gt:restackInstall this skill globally with one command. Works with Claude Code, Cursor, and Windsurf.
Security Scan Results
3 of 9 scanners reported clean
Some scanners were skipped, did not run, or reported a non-clean status. Review each row below.
3
Scanners Passed
9
Scanners in report
Clean
TrivyContainer and dependency vulnerability scanner
95%
Clean
SemgrepStatic code analysis for vulnerabilities
95%
Clean
mcp-scan (Snyk)Model Context Protocol security validation
95%
Skipped
Snyk (dep)Open source security scanning
50%
Skipped
Socket.devSupply chain security analysis
50%
Skipped
VirusTotalMulti-engine malware detection
50%
Skipped
CrowdStrikeAdvanced threat intelligence
50%
Skipped
OSV-ScannerOpen Source Vulnerability database check
50%
Skipped
OWASP Dep-Check
50%
Last scanned: Apr 23, 2026, 12:21 PM27.8s1 file scanned
SKILL.md
- name:
- gt:restack
- description:
- >
- REPLACES git rebase — never use it directly. Triggers:
- restack', 'rebase', 'rebase on
- user-invocable:
- true
- agent:
- general-purpose
- - "Bash(gt:
- *)
- - "Bash(git add:
- *)
Restack
Rebase Graphite stack onto updated parents and resolve any merge conflicts.
Steps
-
Restack:
gt restack 2>&1 -
If clean: report which branches were restacked. Done.
-
If conflicts: loop until resolved — a. Read each conflicted file in full before editing b. Identify all conflict markers (
<<<<<<<,=======,>>>>>>>) in the file c. Resolve every conflict region in a single edit — never leave partial markers d.git add <file>each resolved file e.gt continue 2>&1f. If new conflicts appear (next branch in stack), repeat from (a) -
Report: list branches restacked, conflicts resolved, any issues.
Conflict Resolution Rules
- Read the full file first. Count all
<<<<<<<markers. Resolve all of them in one pass. - Take the semantically correct merge: understand what both sides changed, combine intent.
- For renames/refactors: apply the rename to the newer code from the child branch.
- After editing, verify no conflict markers remain:
rg -c '<<<<<<<' <file>beforegit add. - If a conflict is ambiguous and you can't determine the right resolution,
gt abortand report to the user.
Related Skills
luan/sym
tools
VerifiedTrustedCommunity
Tree-sitter indexed code navigator (ct sym CLI). Use INSTEAD OF Read/Grep/Glob/Bash when exploring existing code, understanding how something works, locating a symbol, tracing the call graph up (impact) or down (trace), finding implementations of an interface, scoping a diff to one symbol, or preparing to edit code you have not read yet. Triggers: 'how does X work', 'explain this class/file/symbol', 'walk me through X', 'what does X do', 'where is X defined', 'who calls X', 'what does X call', 'find implementations of', 'what breaks if I change X', 'outline this file', 'map imports', 'show me this symbol', exploring unfamiliar repo, tracing call graph, scoping diff to a symbol, preparing to edit code I haven't read, about to Read a file over ~500 lines to understand it. Do NOT use for: writing new code from scratch, editing prose or config, running tests, or when a stack trace already names the file and line.
4SKILL.mdUpdated Apr 22, 2026
luan/vibe
development
VerifiedTrustedCommunity
Fully autonomous development workflow from prompt to commit. Chains spec → develop → review → commit. Triggers: /vibe, 'vibe this', 'autonomous workflow', 'just do it all', 'build this end-to-end', 'full pipeline', 'handle everything'.
4SKILL.mdUpdated Apr 21, 2026
luan/vault-sweep
development
VerifiedTrustedCommunity
Comprehensive vault maintenance — cross-references blueprints against codebase state to produce a maintenance plan: archive consumed artifacts, audit docs for staleness, propose new docs for undocumented stable systems. Triggers: 'vault sweep', 'sweep the vault', 'clean up vault', 'vault maintenance', 'what can we archive', 'audit blueprints', 'vault hygiene', 'blueprint cleanup'. Use whenever the user wants a holistic view of vault health rather than archiving a single artifact (that's /archive). Also use when the user asks what's stale, what needs docs, or whether artifacts can be cleaned up.
4SKILL.mdUpdated Apr 21, 2026
luan/test-plan
development
VerifiedTrustedCommunity
Analyze current diff, classify changes by risk, and produce structured manual test plan. Triggers: 'test plan', 'what should I test', 'manual testing', 'verification steps', 'QA checklist'. Exits early for trivial changes. Do NOT use when: writing automated tests — use /develop with TDD. Do NOT use when: reviewing code quality — use /crit instead.
4SKILL.mdUpdated Apr 21, 2026