Skip to content
Open
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
6 changes: 4 additions & 2 deletions .claude/skills/restack/SKILL.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
name: restack
description: Use when user asks to "restack", "resolve conflicts", "gt restack", or mentions restack conflicts. Guides through gt restack conflicts with intelligent diagnostics and resolution.
allowed-tools: Bash(gt restack:*), Bash(gt continue:*), Bash(git show:*), Bash(git diff:*), Bash(git log:*), Bash(git ls-tree:*), Bash(pnpm install:*), Bash(git status:*), Bash(gt log:*), Bash(rm pnpm-lock.yaml), Bash(gt add -A:*), Bash(git checkout --theirs:*), Bash(git checkout --ours:*)
allowed-tools: Bash(gt restack:*), Bash(gt continue:*), Bash(gt abort:*), Bash(git show:*), Bash(git diff:*), Bash(git log:*), Bash(git ls-tree:*), Bash(pnpm install:*), Bash(git status:*), Bash(gt log:*), Bash(rm pnpm-lock.yaml), Bash(gt add -A:*), Bash(git checkout --theirs:*), Bash(git checkout --ours:*), Bash(git --no-pager -c color.ui=false status:*), Bash(gt log short --stack:*), Bash(git --no-pager -c color.ui=false diff --name-only --diff-filter=U --no-renames:*), Bash(git --no-pager -c color.ui=false diff:*)
---

<critical>
Expand All @@ -17,13 +17,14 @@ allowed-tools: Bash(gt restack:*), Bash(gt continue:*), Bash(git show:*), Bash(g
!`git --no-pager -c color.ui=false status`

**Current stack:**
!`gt --no-color log short --stack`
!`gt log short --stack`

## Workflow

### 1. Analyze State

Check `git status` output above:

- **"rebase in progress"** or **"Unmerged paths"** → Already in conflict, skip to step 3
- **Clean working tree** → Proceed to step 2

Expand All @@ -34,6 +35,7 @@ gt restack
```

**Outcomes:**

- **Success** → Acknowledge and skip to step 4
- **Conflicts** → Proceed to step 3

Expand Down
4 changes: 4 additions & 0 deletions .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,7 @@ runs:
- name: Install dependencies
shell: bash
run: pnpm install --frozen-lockfile --prefer-offline

- name: Rebuild packages that need postinstall (onlyBuiltDependencies)
shell: bash
run: pnpm rebuild supabase sharp
12 changes: 1 addition & 11 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,22 +22,12 @@ jobs:
with:
fetch-depth: 0

- uses: pnpm/action-setup@v4
with:
version: '10.20.0'

- uses: actions/setup-node@v4
with:
node-version: '24'
cache: 'pnpm'

- name: Setup Atlas
uses: ariga/setup-atlas@master
with:
cloud-token: ${{ secrets.ATLAS_CLOUD_TOKEN }}

- name: Install Dependencies
run: pnpm install --frozen-lockfile
- uses: ./.github/actions/setup

- name: Create Release Pull Request
uses: changesets/action@v1
Expand Down
12 changes: 1 addition & 11 deletions .github/workflows/type-test-health.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,7 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: pnpm/action-setup@v2
with:
version: 10.20.0

- uses: actions/setup-node@v4
with:
node-version: '24'
cache: 'pnpm'

- name: Install dependencies
run: pnpm install --frozen-lockfile
- uses: ./.github/actions/setup

- name: Run Type Testing Health Check
run: pnpm nx test:types:health dsl
Expand Down
Loading