stak-git 1.0.0

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 memorypasta
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/Makefile

@@ -0,0 +1,32 @@
+PREFIX ?= /usr/local
+BINDIR ?= $(PREFIX)/bin
+ZSHDIR ?= $(PREFIX)/share/zsh/site-functions
+
+.PHONY: install uninstall check-deps
+
+install: check-deps
+	@echo "Installing stak..."
+	@mkdir -p $(BINDIR)
+	@mkdir -p $(ZSHDIR)
+	install -m 755 stak $(BINDIR)/stak
+	install -m 644 _stak $(ZSHDIR)/_stak
+	@echo ""
+	@echo "✓ Installed stak to $(BINDIR)/stak"
+	@echo "✓ Installed zsh completion to $(ZSHDIR)/_stak"
+	@echo ""
+	@echo "For interactive features, install fzf:"
+	@echo "  brew install fzf      # macOS"
+	@echo "  apt install fzf       # Debian/Ubuntu"
+	@echo "  pacman -S fzf         # Arch"
+	@echo ""
+	@echo "Or run: stak setup-interactive"
+
+uninstall:
+	@echo "Uninstalling stak..."
+	rm -f $(BINDIR)/stak
+	rm -f $(ZSHDIR)/_stak
+	@echo "✓ Uninstalled"
+
+check-deps:
+	@command -v git >/dev/null 2>&1 || { echo "Error: git is required"; exit 1; }
+	@echo "✓ git found"

package/README.md

@@ -0,0 +1,193 @@
+# stak
+
+Minimal stacked changes for git.
+
+## What is it?
+
+Build big features as a chain of small, reviewable branches:
+
+```
+main → auth-types → auth-service → auth-ui
+```
+
+Each branch builds on the previous. Submit all for review at once. When you edit a lower branch, one command updates everything above.
+
+## Install
+
+```bash
+# Copy the script
+sudo cp stak /usr/local/bin/stak
+
+# Install zsh completions (optional)
+sudo mkdir -p /usr/local/share/zsh/site-functions
+sudo cp _stak /usr/local/share/zsh/site-functions/_stak
+exec zsh
+```
+
+## Commands
+
+| Command | Description |
+|---------|-------------|
+| `stak new <name>` | Create branch on top of current |
+| `stak insert` | Insert branch at any position (fzf) |
+| `stak split` | Split current branch's commits (fzf) |
+| `stak up` / `down` | Move up or down the stack |
+| `stak goto` | Jump to branch (fzf interactive) |
+| `stak status` | Show the stack |
+| `stak sync` | Rebase entire stack |
+| `stak continue` | Continue after resolving conflicts |
+| `stak abort` | Abort current rebase |
+| `stak push` | Push branches (fzf multi-select) |
+| `stak push -a` | Push all branches |
+| `stak drop` | Remove top branch |
+| `stak fold` | Fold branch (fzf interactive) |
+| `stak fold --down` | Fold into child (non-interactive) |
+| `stak land` | Clean up after PR merge |
+| `stak log` | View commits (fzf interactive) |
+| `stak log -a` | Show all branches |
+| `stak ls` | List all stacks |
+| `stak use` | Switch to stack (fzf interactive) |
+| `stak use <name>` | Switch/create stack by name |
+| `stak rm-stack` | Delete a stack (fzf interactive) |
+| `stak setup-interactive` | Install fzf |
+
+### Disable Interactive Mode
+
+```bash
+export STAK_NO_INTERACTIVE=1
+stak push    # pushes all without fzf prompt
+```
+
+## Basic Workflow
+
+```bash
+git checkout main
+
+# Build feature in parts
+stak new auth-types
+# ... commit ...
+
+stak new auth-service
+# ... commit ...
+
+stak new auth-ui
+# ... commit ...
+
+# See the stack
+stak status
+#     main
+#     auth-types (2 commits)
+#     auth-service (3 commits)
+#   → auth-ui (4 commits)
+
+# Push all for review
+stak push
+```
+
+## Editing a Lower Branch
+
+```bash
+# Go back to fix something
+stak down
+stak down
+# ... fix and commit ...
+
+# Update everything above
+stak sync
+
+# Push updates
+stak push
+```
+
+## Handling Conflicts
+
+```bash
+stak sync
+# Conflict in auth-service!
+
+# Fix the conflict in your editor
+git add .
+stak continue    # continues sync
+
+# Or abort and try differently
+stak abort
+```
+
+## Combining Branches
+
+**Fold up** (into parent - keep parent's name):
+```bash
+# Combine auth-service into auth-types
+stak down              # go to auth-service
+stak fold              # fold up into auth-types
+
+#     main
+#   → auth-types (combined)
+#     auth-ui
+```
+
+**Fold down** (into child - keep child's name):
+```bash
+# Combine auth-service into auth-ui
+stak down              # go to auth-service
+stak fold --down       # fold down into auth-ui
+
+#     main
+#     auth-types
+#   → auth-ui (combined)
+```
+
+## After PR Merges
+
+```bash
+# auth-types PR merged to main
+stak land        # removes auth-types, rebases rest onto main
+
+# Stack is now:
+#     main
+#   → auth-service
+#     auth-ui
+```
+
+## Multiple Stacks
+
+Work on different features simultaneously:
+
+```bash
+# Create stacks for different features
+stak use auth-feature     # creates & switches
+stak new auth-types
+stak new auth-service
+
+stak use billing-feature  # creates & switches
+stak new billing-api
+stak new billing-ui
+
+# Switch between them
+stak use auth-feature
+
+# List all stacks
+stak ls
+#   ● auth-feature (2 branches) ◀ current
+#   ○ billing-feature (2 branches)
+
+# Delete when done
+stak rm-stak billing-feature
+```
+
+Each stak tracks its own chain of branches independently.
+
+## Philosophy
+
+- **Minimal**: Only commands you need for stacked changes
+- **Transparent**: Just git branches. Use git directly anytime.
+- **No magic**: Stacks stored in `.git/stacks/`, one branch per line
+- **Conflict-friendly**: Resolve normally, then `stak continue`
+
+## Tips
+
+- Keep stacks shallow (2-3 branches). Deep stacks = more conflicts.
+- Commit before running `sync`, `fold`, or `drop`.
+- Use `stak status` often to see where you are.
+- You can always use raw git commands - stak just helps manage the chain.
+- Run `stak setup-interactive` to install fzf for interactive navigation.

package/_stak

@@ -0,0 +1,111 @@
+#compdef stak
+
+# Zsh completion for stak - stacked changes for git
+
+_stak_commands() {
+    local commands=(
+        'new:Create a new branch on top of current'
+        'insert:Insert branch at any position'
+        'split:Split current branch commits'
+        'up:Move up the stack'
+        'down:Move down the stack'
+        'goto:Jump to any branch in the stack'
+        'status:Show the current stack'
+        'st:Show the current stack (alias)'
+        'sync:Rebase entire stack'
+        'continue:Continue after resolving conflicts'
+        'abort:Abort current rebase'
+        'push:Push branches to remote'
+        'drop:Remove current branch from stack'
+        'fold:Fold branch into parent or child'
+        'land:Clean up after PR is merged'
+        'log:Show commits in the stack'
+        'ls:List all stacks'
+        'use:Switch to stack (creates if needed)'
+        'rm-stack:Delete a stack'
+        'setup-interactive:Install fzf for interactive mode'
+        'help:Show help'
+    )
+    _describe 'command' commands
+}
+
+_stak_names() {
+    local stacks_dir=".git/stacks"
+    if [[ -d "$stacks_dir" ]]; then
+        local stacks=(${(f)"$(ls $stacks_dir 2>/dev/null)"})
+        _describe 'stack' stacks
+    fi
+}
+
+_stak_branches() {
+    local current_stack_file=".git/stack-current"
+    local stacks_dir=".git/stacks"
+    local stack_name="default"
+    
+    [[ -f "$current_stack_file" ]] && stack_name=$(cat "$current_stack_file")
+    
+    local stack_file="$stacks_dir/$stack_name"
+    if [[ -f "$stack_file" ]]; then
+        local branches=(${(f)"$(cat $stack_file)"})
+        _describe 'branch' branches
+    fi
+}
+
+_stak() {
+    local curcontext="$curcontext" state line
+    
+    _arguments -C \
+        '1: :_stak_commands' \
+        '*::arg:->args'
+    
+    case $state in
+        args)
+            case $line[1] in
+                new)
+                    _message 'branch name'
+                    ;;
+                goto)
+                    _alternative \
+                        'branches:branch:_stak_branches' \
+                        'numbers:position:(1 2 3 4 5 6 7 8 9 10)'
+                    ;;
+                fold)
+                    _arguments \
+                        '--down[Fold into child branch]' \
+                        '-d[Fold into child branch]'
+                    ;;
+                push)
+                    _arguments \
+                        '--all[Push all branches]' \
+                        '-a[Push all branches]'
+                    ;;
+                log)
+                    _alternative \
+                        'options:option:(--all -a)' \
+                        'branches:branch:_stak_branches'
+                    ;;
+                land)
+                    _arguments \
+                        '--force[Force land for squash merges]' \
+                        '-f[Force land for squash merges]'
+                    ;;
+                use)
+                    _stak_names
+                    ;;
+                rm-stack)
+                    _stak_names
+                    ;;
+                insert)
+                    _arguments \
+                        '1:branch name:' \
+                        '--after[Insert after branch]:branch:_stak_branches'
+                    ;;
+                split)
+                    _message 'new branch name'
+                    ;;
+            esac
+            ;;
+    esac
+}
+
+_stak "$@"

package/package.json

@@ -0,0 +1,31 @@
+{
+  "name": "stak-git",
+  "version": "1.0.0",
+  "description": "Minimal stacked changes for git - build big features as small branches",
+  "bin": {
+    "stak": "./stak"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/memorypasta/stak.git"
+  },
+  "keywords": [
+    "git",
+    "stacked-diffs",
+    "stacked-branches",
+    "code-review",
+    "workflow",
+    "cli"
+  ],
+  "author": "memorypasta",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/memorypasta/stak/issues"
+  },
+  "homepage": "https://github.com/memorypasta/stak#readme",
+  "os": ["darwin", "linux"],
+  "engines": {
+    "node": ">=14"
+  }
+}
+

package/packaging/PKGBUILD

@@ -0,0 +1,30 @@
+# AUR PKGBUILD for stak
+# Maintainer: memorypasta <memorypasta@gmail.com>
+
+pkgname=stak
+pkgver=1.0.0
+pkgrel=1
+pkgdesc="Minimal stacked changes for git - build big features as small branches"
+arch=('any')
+url="https://github.com/memorypasta/stak"
+license=('MIT')
+depends=('git' 'bash')
+optdepends=('fzf: interactive branch selection')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/memorypasta/stak/archive/refs/tags/v$pkgver.tar.gz")
+sha256sums=('82a137dc6cdd0ceaac5d803c9be7767b1f2bcfe81925a9d27fdfa9cf2ece5d75')
+
+package() {
+    cd "$srcdir/stak-$pkgver"
+    
+    # Install main script
+    install -Dm755 stak "$pkgdir/usr/bin/stak"
+    
+    # Install zsh completion
+    install -Dm644 _stak "$pkgdir/usr/share/zsh/site-functions/_stak"
+    
+    # Install license
+    install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+    
+    # Install docs
+    install -Dm644 README.md "$pkgdir/usr/share/doc/$pkgname/README.md"
+}

package/packaging/install.sh

@@ -0,0 +1,57 @@
+#!/bin/bash
+# Quick install script for stak
+# Usage: curl -fsSL https://raw.githubusercontent.com/memorypasta/stak/main/packaging/install.sh | bash
+
+set -e
+
+REPO="memorypasta/stak"
+INSTALL_DIR="${INSTALL_DIR:-/usr/local/bin}"
+ZSH_COMPLETION_DIR="${ZSH_COMPLETION_DIR:-/usr/local/share/zsh/site-functions}"
+
+echo "Installing stak..."
+echo ""
+
+# Check dependencies
+if ! command -v git >/dev/null 2>&1; then
+    echo "Error: git is required but not installed."
+    exit 1
+fi
+
+# Download
+TMPDIR=$(mktemp -d)
+trap 'rm -rf "$TMPDIR"' EXIT
+
+echo "Downloading..."
+curl -fsSL "https://raw.githubusercontent.com/$REPO/main/stak" -o "$TMPDIR/stak"
+curl -fsSL "https://raw.githubusercontent.com/$REPO/main/_stak" -o "$TMPDIR/_stak"
+
+# Install (may need sudo)
+echo "Installing to $INSTALL_DIR..."
+if [ -w "$INSTALL_DIR" ]; then
+    install -m 755 "$TMPDIR/stak" "$INSTALL_DIR/stak"
+else
+    sudo install -m 755 "$TMPDIR/stak" "$INSTALL_DIR/stak"
+fi
+
+# Install zsh completion
+if [ -d "$ZSH_COMPLETION_DIR" ] || [ -w "$(dirname "$ZSH_COMPLETION_DIR")" ]; then
+    echo "Installing zsh completion..."
+    sudo mkdir -p "$ZSH_COMPLETION_DIR"
+    sudo install -m 644 "$TMPDIR/_stak" "$ZSH_COMPLETION_DIR/_stak"
+fi
+
+echo ""
+echo "✓ stak installed successfully!"
+echo ""
+echo "Quick start:"
+echo "  cd your-repo"
+echo "  stak new feature-part1"
+echo "  stak help"
+echo ""
+
+# Check for fzf
+if ! command -v fzf >/dev/null 2>&1; then
+    echo "Tip: Install fzf for interactive features:"
+    echo "  stak setup-interactive"
+    echo ""
+fi

package/pyproject.toml

@@ -0,0 +1,43 @@
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[project]
+name = "stak-git"
+version = "1.0.0"
+description = "Minimal stacked changes for git - build big features as small branches"
+readme = "README.md"
+license = "MIT"
+authors = [
+    { name = "memorypasta", email = "memorypasta@gmail.com" }
+]
+keywords = ["git", "stacked-diffs", "stacked-branches", "code-review", "workflow", "cli"]
+classifiers = [
+    "Development Status :: 4 - Beta",
+    "Environment :: Console",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: MacOS",
+    "Operating System :: POSIX :: Linux",
+    "Programming Language :: Unix Shell",
+    "Topic :: Software Development :: Version Control :: Git",
+]
+requires-python = ">=3.8"
+
+[project.urls]
+Homepage = "https://github.com/memorypasta/stak"
+Repository = "https://github.com/memorypasta/stak"
+Issues = "https://github.com/memorypasta/stak/issues"
+
+[project.scripts]
+stak = "stak_git:main"
+
+[tool.hatch.build.targets.wheel]
+packages = ["stak_git"]
+
+[tool.hatch.build.targets.sdist]
+include = ["stak_git", "stak", "_stak", "README.md", "LICENSE"]
+
+[tool.hatch.build.targets.wheel.shared-data]
+"stak" = "bin/stak"
+