oh-my-worktree 0.8.4 → 0.10.3

package/README.md

@@ -1,110 +1,182 @@
 # owt (oh-my-worktree)
 
-A TUI tool for managing Git worktrees in bare repositories.
+[한국어](./README.ko.md) | [English](./README.md)
 
-## Installation
+A fast terminal UI for developers who use Git branches as working contexts, not bookmarks.
+
+<img width="786" height="580" alt="Image" src="./owt.png" />
+
+## Why owt exists
+
+Modern development rarely happens on one branch at a time. You might be reviewing a PR, testing a hotfix, keeping a long-running feature open, and checking main before a release. Plain `git switch` makes that workflow expensive because every context switch drags along uncommitted files, dependencies, editor state, and mental state.
+
+Git worktrees solve the underlying problem. `owt` makes them easy enough to use every day.
+
+Open `owt`, pick a worktree, create another one, delete the stale ones, fetch, pull, push, or merge without remembering the exact Git incantation. It works from a normal repository and from the `.bare` layout if you prefer keeping all worktrees side by side.
+
+## What you get
+
+- A keyboard-first TUI for browsing and managing worktrees
+- First-class support for existing regular repositories
+- Optional `.bare` project layout for teams that like sibling worktrees
+- Fast worktree creation from local or remote branches
+- Dirty-state, ahead/behind, last-commit, and GitHub PR status visibility
+- Built-in fetch, pull, push, upstream merge, branch merge, editor open, terminal open, and path copy
+- Shell integration so `Enter` can move your shell into the selected worktree
+
+## Install
 
 ```bash
 npm install -g oh-my-worktree
 ```
 
-Or use with npx:
+Or run it without installing:
 
 ```bash
 npx oh-my-worktree
 ```
 
-## Quick Start
+From source:
+
+```bash
+git clone https://github.com/dding-g/oh-my-worktree.git
+cd oh-my-worktree
+cargo build --release
+```
+
+## Start from the repo you already have
+
+You do not need to convert your repository.
+
+```bash
+cd ~/src/my-app
+owt
+```
+
+In a regular repository, new worktrees are created under:
+
+```text
+~/.owt/worktree/<repo-name>/
+```
+
+Set `worktree_root` if you want them somewhere else.
+
+## Or start with a `.bare` workspace
+
+If you like all worktrees living inside one project folder, use `owt clone`.
 
 ```bash
-# Clone a repository as bare with first worktree
 owt clone https://github.com/user/repo.git
 cd repo/main
+owt
+```
+
+That creates a layout like this:
+
+```text
+repo/
+├── .bare/
+├── main/
+├── feature-login/
+└── hotfix-api/
+```
 
-# Run TUI
+`owt init` prints a conversion guide if you want to move an existing repository into this layout manually.
+
+## Daily workflow
+
+```bash
 owt
 ```
 
-## Key Bindings
+Then use the TUI:
 
-### Navigation
-| Key | Action |
-|-----|--------|
-| `j` / `↓` | Move down |
-| `k` / `↑` | Move up |
-| `g` | Jump to current worktree |
-| `gg` | Jump to top |
-| `G` | Jump to bottom |
-| `/` | Search/filter |
-
-### Worktree Actions
-| Key | Action |
-|-----|--------|
-| `Enter` | Enter selected worktree |
-| `a` | Add new worktree |
-| `d` | Delete worktree |
-| `o` | Open in editor |
-| `t` | Open in terminal |
-| `y` | Copy path to clipboard |
-
-### Other
 | Key | Action |
-|-----|--------|
+| --- | --- |
+| `j` / `k` | Move selection |
+| `Enter` | Enter the selected worktree |
+| `a` | Add a worktree |
+| `d` | Delete a worktree |
 | `f` | Fetch remotes |
-| `r` | Refresh list |
+| `p` / `P` | Pull / push |
+| `m` / `M` | Merge upstream / merge selected branch |
+| `o` / `t` | Open in editor / terminal |
+| `y` | Copy path |
+| `/` | Filter |
 | `s` | Cycle sort mode |
-| `c` | Open config |
-| `?` | Show help |
+| `c` | View config |
+| `?` | Help |
 | `q` | Quit |
 
-## Branch Types (v0.4.1+)
+## What the list tells you
 
-When adding a new worktree, select branch type for automatic base branch:
+| Signal | Meaning |
+| --- | --- |
+| `✓ clean` | No local changes |
+| `+ staged` | Staged changes |
+| `~ unstaged` | Unstaged changes |
+| `! conflict` | Merge conflict |
+| `* mixed` | Staged and unstaged changes |
+| `↑N` / `↓N` | Ahead / behind upstream |
+| `PR` | GitHub PR state: `open`, `closed`, `merged`, `draft`, or `-` |
 
-| Key | Type | Base |
-|-----|------|------|
-| `f` | feature | develop |
-| `h` | hotfix | main |
-| `r` | release | develop |
-| `b` | bugfix | develop |
-| `c` | custom | (select manually) |
+The `PR` column is GitHub-only and best-effort. No PR, non-GitHub remotes, missing auth, network failures, and unknown states all show `-` so the worktree list stays fast and reliable.
 
-In branch input screen:
-- `Shift+F` - Fetch remote base branch
-- `Shift+U` - Use remote as base
-- `Shift+L` - Use local as base
+## Shell integration
 
-## Status Icons
+Install the shell helper:
 
-| Icon | Meaning |
-|------|---------|
-| `✓` | Clean |
-| `+` | Staged changes |
-| `~` | Unstaged changes |
-| `!` | Conflicts |
-| `*` | Staged + Unstaged |
+```bash
+owt setup
+```
+
+Reload your shell. After that, pressing `Enter` in the TUI exits `owt` and moves the current shell into the selected worktree. Without shell integration, `owt` still prints the selected path for wrapper scripts and manual use.
 
 ## Configuration
 
-Config file: `~/.config/owt/config.toml`
+Config file:
+
+```text
+~/.config/owt/config.toml
+```
+
+Example:
 
 ```toml
 editor = "code"
 terminal = "Ghostty"
+worktree_root = "~/.owt/worktree"
 copy_files = [".env", ".envrc"]
-
-[[branch_types]]
-name = "feature"
-prefix = "feature/"
-base = "develop"
-shortcut = "f"
+run_post_add_script_in_tmux = false
 ```
 
+Useful options:
+
+| Option | Purpose |
+| --- | --- |
+| `editor` | Command used by `o` |
+| `terminal` | Terminal app used by `t` |
+| `worktree_root` | Root for new worktrees in regular repositories |
+| `copy_files` | Files copied into new worktrees |
+| `run_post_add_script_in_tmux` | Run `.owt/post-add.sh` in detached tmux after creating a worktree |
+
+## Commands
+
+| Command | Purpose |
+| --- | --- |
+| `owt [PATH]` | Open the TUI for a repository or worktree |
+| `owt clone <URL> [PATH]` | Clone into the `.bare` layout and create the first worktree |
+| `owt init` | Print a manual conversion guide for `.bare` layout |
+| `owt setup` | Install shell integration |
+| `owt --version` | Print version |
+
 ## Requirements
 
-- Git 2.5+ (for worktree support)
-- A bare Git repository
+- Git 2.5+
+- A regular Git repository or a `.bare` worktree layout
+- Optional: GitHub CLI `gh` for PR status
+- Optional: tmux for post-add setup scripts
 
-## More Information
+## License
 
-For more details, visit the [GitHub repository](https://github.com/dding-g/oh-my-worktree).
+MIT

package/bin/owt

@@ -4,7 +4,7 @@ const { spawn } = require('child_process');
 const path = require('path');
 const fs = require('fs');
 
-const binName = process.platform === 'win32' ? 'owt.exe' : 'owt';
+const binName = process.platform === 'win32' ? 'owt-bin.exe' : 'owt-bin';
 const binPath = path.join(__dirname, binName);
 
 if (!fs.existsSync(binPath)) {

package/install.js

@@ -108,7 +108,7 @@ async function install() {
   const binaryName = getPlatform();
   const version = getPackageVersion();
   const binDir = path.join(__dirname, 'bin');
-  const binPath = path.join(binDir, BINARY_NAME + (process.platform === 'win32' ? '.exe' : ''));
+  const binPath = path.join(binDir, BINARY_NAME + '-bin' + (process.platform === 'win32' ? '.exe' : ''));
 
   // Create bin directory
   if (!fs.existsSync(binDir)) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "oh-my-worktree",
-  "version": "0.8.4",
-  "description": "A TUI tool for managing Git worktrees in bare repositories with branch type support",
+  "version": "0.10.3",
+  "description": "A TUI tool for managing Git worktrees in bare and regular repositories",
   "keywords": [
     "git",
     "worktree",
@@ -20,7 +20,7 @@
     "type": "git",
     "url": "https://github.com/dding-g/oh-my-worktree"
   },
-  "homepage": "https://github.com/dding-g/oh-my-worktree#readme",
+  "homepage": "https://dding-g.github.io/oh-my-worktree/",
   "bugs": {
     "url": "https://github.com/dding-g/oh-my-worktree/issues"
   },