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
67 changes: 67 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
name: Release

on:
push:
tags:
- "v*"
workflow_dispatch:
Comment thread
coderabbitai[bot] marked this conversation as resolved.

permissions:
contents: write

jobs:
create-release:
name: Create Release
if: startsWith(github.ref, 'refs/tags/v')
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v4

- name: Create GitHub release
uses: taiki-e/create-gh-release-action@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}

upload-binaries:
name: Build ${{ matrix.target }}
if: startsWith(github.ref, 'refs/tags/v')
needs: create-release
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
include:
- os: ubuntu-latest
target: x86_64-unknown-linux-musl
build-tool: cargo-zigbuild
- os: macos-26
target: aarch64-apple-darwin
build-tool: cargo
- os: windows-latest
target: x86_64-pc-windows-msvc
build-tool: cargo
Comment on lines +39 to +44

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧹 Nitpick | 🔵 Trivial

Consider adding an x86_64-apple-darwin target for Intel Mac users.

The matrix only includes aarch64-apple-darwin (ARM), leaving Intel Mac users without a prebuilt binary. If Intel Mac support is desired, add a matrix entry:

- os: macos-15-intel
  target: x86_64-apple-darwin
  build-tool: cargo

If this omission is intentional (e.g., Intel Macs are being phased out), no action needed.

🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.

In @.github/workflows/release.yml around lines 37 - 42, Add an additional
macOS/Intel matrix entry so Intel Macs get a build: in the GitHub Actions matrix
where the current entries list os, target and build-tool (e.g., the existing
target value "aarch64-apple-darwin"), add a new matrix object with os set to an
Intel macOS runner (e.g., "macos-15-intel"), target set to
"x86_64-apple-darwin", and build-tool set to "cargo" so the workflow produces an
x86_64 macOS binary alongside the existing aarch64 build.


steps:
- name: Checkout
uses: actions/checkout@v4

- name: Install Rust toolchain
uses: dtolnay/rust-toolchain@stable
with:
toolchain: 1.90
targets: ${{ matrix.target }}

- name: Upload release archive
uses: taiki-e/upload-rust-binary-action@v1
with:
bin: wisp
package: wisp
manifest-path: crates/wisp-bin/Cargo.toml
target: ${{ matrix.target }}
archive: wisp-$target
build-tool: ${{ matrix.build-tool }}
include: README.md LICENSE
checksum: sha256
token: ${{ secrets.GITHUB_TOKEN }}
4 changes: 2 additions & 2 deletions AGENTS.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# AGENTS.md

Wisp is a Rust 2024 tmux navigation workspace built around one canonical session model in `wisp-core`, thin integration adapters (`wisp-tmux`, `wisp-zoxide`, `wisp-preview`), and multiple projections/renderers (`wisp-ui`, `wisp-status`, `wisp-bin`). Keep logic in the lowest pure crate that can own it.
Wisp is a Rust 2024 tmux navigation workspace built around one canonical session model in `wisp-core`, thin integration adapters (`wisp-tmux`, `wisp-zoxide`, `wisp-preview`), and multiple projections/renderers (`wisp-ui`, `wisp-status`, `wisp`). Keep logic in the lowest pure crate that can own it.

## Testing expectations

Expand All @@ -9,7 +9,7 @@ Wisp is a Rust 2024 tmux navigation workspace built around one canonical session
- `cargo clippy --workspace --all-targets --all-features -- -D warnings`
- `cargo test --workspace --all-targets`
- If you touch tmux integration, run the real isolated-socket tests in `crates/wisp-tmux/tests/integration.rs`.
- If you touch CLI behavior, run `cargo test -p wisp-bin --test smoke`.
- If you touch CLI behavior, run `cargo test -p wisp --test smoke`.
- If you touch hot-path projections or status formatting, make sure the benches still compile.

## Performance expectations
Expand Down
20 changes: 10 additions & 10 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ version = "0.1.0"
edition = "2024"
rust-version = "1.90"
license = "MIT"
repository = "https://github.com/Pajn/wisp"
Comment thread
coderabbitai[bot] marked this conversation as resolved.
publish = false

[workspace.lints.rust]
Expand All @@ -38,3 +39,12 @@ serde = { version = "1", features = ["derive"] }
serde_ignored = "0.1"
thiserror = "2"
toml = "0.8"
wisp-app = { version = "0.1.0", path = "crates/wisp-app" }
wisp-config = { version = "0.1.0", path = "crates/wisp-config" }
wisp-core = { version = "0.1.0", path = "crates/wisp-core" }
wisp-fuzzy = { version = "0.1.0", path = "crates/wisp-fuzzy" }
wisp-preview = { version = "0.1.0", path = "crates/wisp-preview" }
wisp-status = { version = "0.1.0", path = "crates/wisp-status" }
wisp-tmux = { version = "0.1.0", path = "crates/wisp-tmux" }
wisp-ui = { version = "0.1.0", path = "crates/wisp-ui" }
wisp-zoxide = { version = "0.1.0", path = "crates/wisp-zoxide" }
21 changes: 21 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2026 Emma

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.
21 changes: 19 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Wisp is a native Rust tmux navigation tool inspired by `tmux-sessionx`. It share

- tmux-aware session discovery, switching, and attachment
- sidebar pane and sidebar popup surfaces in addition to the main picker
- git worktree-aware picker: see only sessions for the current repo, or browse all worktrees
- zoxide-backed directory discovery
- fuzzy filtering and session previews
- configurable behavior through TOML config plus environment overrides
Expand All @@ -22,7 +23,7 @@ Wisp is a native Rust tmux navigation tool inspired by `tmux-sessionx`. It share
- `wisp-ui`: shared ratatui renderers and key translation
- `wisp-status`: status-line formatting and dedup logic
- `wisp-app`: app-facing state assembly helpers
- `wisp-bin`: CLI entrypoint and runtime wiring
- `wisp`: CLI entrypoint and runtime wiring

## Quick start

Expand All @@ -38,23 +39,39 @@ Install the CLI:
cargo install --git https://github.com/Pajn/wisp.git --bin wisp
```

Install the latest tagged binary with `cargo-binstall`:

```bash
cargo binstall --git https://github.com/Pajn/wisp.git wisp
```

If you want a specific revision while the project is evolving, pin a branch, tag, or commit:

```bash
cargo install --git https://github.com/Pajn/wisp.git --bin wisp --branch main
```

For a specific tagged release with `cargo-binstall`, pin the tag:

```bash
cargo binstall --git https://github.com/Pajn/wisp.git wisp --tag v0.1.0
```

Common commands after install:

```bash
wisp doctor
wisp popup
wisp popup --worktree
wisp fullscreen
wisp fullscreen --worktree
wisp sidebar-popup
wisp sidebar-pane
wisp statusline install
```

Use `--worktree` (or `-w`) to start the picker in worktree mode, which shows only sessions belonging to worktrees of the current repo alongside worktrees that don't yet have sessions.

Example tmux binding:

Add this to `~/.tmux.conf` to open Wisp with `prefix + o`:
Expand Down Expand Up @@ -106,7 +123,7 @@ Config file discovery:
cargo fmt --check
cargo clippy --workspace --all-targets --all-features -- -D warnings
cargo test --workspace --all-targets
cargo test -p wisp-bin --test smoke
cargo test -p wisp --test smoke
cargo bench -p wisp-core --bench projections --no-run
cargo bench -p wisp-status --bench formatting --no-run
```
16 changes: 10 additions & 6 deletions crates/wisp-app/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
[package]
name = "wisp-app"
version = "0.1.0"
edition = "2024"
version.workspace = true
edition.workspace = true
rust-version.workspace = true
license.workspace = true
repository.workspace = true
description = "application state assembly for Wisp"

[dependencies]
wisp-config = { path = "../wisp-config" }
wisp-core = { path = "../wisp-core" }
wisp-tmux = { path = "../wisp-tmux" }
wisp-zoxide = { path = "../wisp-zoxide" }
wisp-config.workspace = true
wisp-core.workspace = true
wisp-tmux.workspace = true
wisp-zoxide.workspace = true

[lints]
workspace = true
37 changes: 25 additions & 12 deletions crates/wisp-bin/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,25 +1,38 @@
[package]
name = "wisp-bin"
version = "0.1.0"
edition = "2024"
name = "wisp"
version.workspace = true
edition.workspace = true
rust-version.workspace = true
license.workspace = true
repository.workspace = true
description = "tmux-aware workspace navigator and status UI"

[[bin]]
name = "wisp"
path = "src/main.rs"

[package.metadata.binstall]
pkg-url = "{ repo }/releases/download/v{ version }/{ bin }-{ target }.{ archive-format }"
pkg-fmt = "tar.gz"
bin-dir = "{ bin }{ binary-ext }"

[package.metadata.binstall.overrides.x86_64-pc-windows-msvc]
pkg-fmt = "zip"
bin-dir = "{ bin }.exe"
Comment thread
coderabbitai[bot] marked this conversation as resolved.

[dependencies]
argh = "0.1"
crossterm.workspace = true
ratatui.workspace = true
wisp-app = { path = "../wisp-app" }
wisp-config = { path = "../wisp-config" }
wisp-core = { path = "../wisp-core" }
wisp-fuzzy = { path = "../wisp-fuzzy" }
wisp-preview = { path = "../wisp-preview" }
wisp-status = { path = "../wisp-status" }
wisp-tmux = { path = "../wisp-tmux" }
wisp-ui = { path = "../wisp-ui" }
wisp-zoxide = { path = "../wisp-zoxide" }
wisp-app.workspace = true
wisp-config.workspace = true
wisp-core.workspace = true
wisp-fuzzy.workspace = true
wisp-preview.workspace = true
wisp-status.workspace = true
wisp-tmux.workspace = true
wisp-ui.workspace = true
wisp-zoxide.workspace = true

[lints]
workspace = true
Loading
Loading