tasktree-manager 2.10.0__tar.gz → 2.11.1__tar.gz

{tasktree_manager-2.10.0 → tasktree_manager-2.11.1}/CHANGELOG.md

@@ -15,6 +15,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Git hooks support
 - Custom task metadata
 
+## [2.11.1] - 2026-07-31
+
+### Fixed
+- **tui**: Open editor in new terminal tab, drop Enter shell binding
+
+
+## [2.11.0] - 2026-07-30
+
+### Added
+- Add agent dashboard, forge-aware safety, finish/status CLI
+
+### Changed
+- **cli**: Collapse multi-line f-string per ruff format
+
+
 ## [2.10.0] - 2026-07-23
 
 ### Added

{tasktree_manager-2.10.0 → tasktree_manager-2.11.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tasktree-manager
-Version: 2.10.0
+Version: 2.11.1
 Summary: TUI application for managing worktree-based tasks
 License-File: LICENSE
 Requires-Python: >=3.10

{tasktree_manager-2.10.0 → tasktree_manager-2.11.1}/README.md

@@ -18,7 +18,10 @@
 - ⌨️ **Keyboard-First** - Navigate and control everything without touching the mouse
 - 🚀 **Fast & Responsive** - Parallel git operations with loading indicators
 - 🔧 **Flexible Configuration** - TOML config file, custom keybindings, environment variables
-- 🤖 **Headless CLI** - Create, list, and delete tasks from scripts and AI agents without opening the TUI
+- 🤖 **Headless CLI** - Create, list, inspect, finish, and delete tasks from scripts and AI agents without opening the TUI
+- 🛰️ **Agent Dashboard** - Live Claude Code session state per worktree (from `claude agents`), plus one-key background-agent dispatch — the multi-repo agent view Claude Code lacks natively
+- 🔀 **Forge-Aware Safety** - MR/PR and CI state via `glab`/`gh`; squash- and rebase-merged branches count as merged instead of blocking deletion forever
+- 📦 **Finish Flow with Archives** - Ending a task saves its combined diff (committed-but-unmerged + uncommitted) to an archive before deleting
 
 ## 📊 Status Indicators
 
@@ -26,12 +29,15 @@
 |-----------|---------|
 | `●` red | Uncommitted changes |
 | `◆` blue | Has CLAUDE.md file |
-| `⟳` magenta | Claude Code session running |
+| `⟳` magenta | Claude Code session running / agent working |
 | `!` yellow | Claude Code session waiting for input |
+| `▣` green | Agent session ready (idle) |
 | `✓` green | Clean worktree / Claude session ended |
 | `✗ N` red | N files changed |
 | `↑N` green | N commits ahead of remote |
 | `↓N` yellow | N commits behind remote |
+| `○` green / `●` magenta / `×` red | MR open / merged / closed |
+| `◐` yellow / `✔` green / `✘` red | CI running / passed / failed |
 
 ## 🚀 Quick Start
 
@@ -57,7 +63,7 @@ On first run, you'll configure:
 ### Basic Workflow
 
 1. **Create a task** - Press `n`, enter task name, select repositories
-2. **Work on code** - Press `e` for editor, `g` for lazygit, or `Enter` for shell
+2. **Work on code** - Press `e` for editor, `g` for lazygit, or `o` for a shell in a new terminal tab
 3. **Review changes** - Press `h` to view the diff in [hunk](https://github.com/modem-dev/hunk) (all repos from the task panel, one repo from the worktree panel)
 4. **Push changes** - Press `p` to push all worktrees
 5. **Delete task** - Press `d` when finished
@@ -74,11 +80,16 @@ tasktree-manager create DIC-1901-argocd-tls --repos backend,frontend  # --base o
 tasktree-manager list --json     # tasks with repos and dirty state (plain text without --json)
 tasktree-manager repos           # available repos in REPOS_DIR
 tasktree-manager add-repo DIC-1901-argocd-tls infra
-tasktree-manager delete DIC-1901-argocd-tls   # refuses on unfinished work; --force overrides
+tasktree-manager status                       # current task inferred from $PWD; also --json / --oneline / --forge
+tasktree-manager finish DIC-1901-argocd-tls   # safety sweep -> archive diff -> delete; --push / --no-archive / --force
+tasktree-manager delete DIC-1901-argocd-tls   # low-level delete; refuses on unfinished work; --force overrides
 ```
 
-Exit code is 0 on success, 1 on failure with the reason on stderr. `delete` runs the same
-safety check as the TUI (uncommitted, unpushed, or unmerged work blocks deletion).
+Exit code is 0 on success, 1 on failure with the reason on stderr. `delete` and `finish` run
+the same safety check as the TUI (uncommitted, unpushed, or unmerged work blocks deletion);
+with `glab`/`gh` installed, squash/rebase-merged branches are recognized as merged.
+`status --oneline` emits a compact `TASK repoA✓ repoB●2↑1` summary that slots straight into
+a Claude Code statusline or shell prompt.
 
 ## 📖 Documentation
 
@@ -96,8 +107,9 @@ safety check as the TUI (uncommitted, unpushed, or unmerged work blocks deletion
 | `a` | Add repo | `h` | Show diff (hunk) |
 | `d` | Delete task | `e` | Open editor |
 | `p` | Push all | `o` | Open folder |
-| `P` | Pull all | `Enter` | Open shell |
+| `P` | Pull all | `y` | Clone task |
 | `c` | Claude (resume) | `C` | Claude (new) |
+| `b` | Dispatch agent | `D` | Delete worktree |
 | `r` | Refresh | `s` | Sort tasks |
 | `S` | Group worktrees | `m` | Messages |
 | `t` | Cycle theme | `Tab` | Next panel |
@@ -177,11 +189,13 @@ For comprehensive troubleshooting, see the [Troubleshooting Guide](docs/troubles
 
 ## 🗺️ Roadmap
 
-Current: **v0.2.0** - Configuration system, themes, comprehensive documentation
+Recently shipped: agent dashboard (per-worktree Claude session badges + background dispatch),
+forge-aware merged detection (glab/gh, squash/rebase merges), MR/CI status badges,
+guided `finish` flow with diff archiving, `status` subcommand for scripts and statuslines.
 
 Upcoming:
-- **v0.3.0** - Search/filter, task templates, archiving
-- **v0.4.0** - JIRA integration, git hooks, automation
+- **v0.3.0** - Search/filter, task templates
+- **v0.4.0** - JIRA status column, git hooks, automation
 - **v1.0.0** - Stable release
 
 See [ROADMAP.md](ROADMAP.md) and [CHANGELOG.md](CHANGELOG.md) for details.

{tasktree_manager-2.10.0 → tasktree_manager-2.11.1}/docs/configuration.md

@@ -79,6 +79,11 @@ repos_dir = "/Users/username/repos"
 # Created automatically if it doesn't exist
 tasks_dir = "/Users/username/tasks"
 
+# Directory for finished-task diff archives
+# Relative paths resolve under tasks_dir (never the current directory)
+# Default: "" (uses <tasks_dir>/.archive)
+archive_dir = ""
+
 # ============================================================================
 # UI Settings
 # ============================================================================
@@ -99,6 +104,16 @@ show_hidden_files = false
 # Default: 30
 refresh_interval = 30
 
+# Claude agent session poll interval in seconds (0 = disabled)
+# Polls `claude agents --json` for per-worktree session state badges
+# Default: 10
+agent_poll_interval = 10
+
+# MR/CI forge status poll interval in seconds (0 = disabled)
+# Polls glab/gh for MR and pipeline state badges in the worktree list
+# Default: 60
+forge_poll_interval = 60
+
 # ============================================================================
 # Git Settings
 # ============================================================================
@@ -165,10 +180,31 @@ claude_memory_dir = "~/.claude/tasktree-memory"
 # Default: true
 claude_repo_memory = true
 
-# Preferred shell
-# Leave empty to use $SHELL environment variable
-# Default: "" (uses $SHELL, falls back to /bin/bash)
-shell = ""
+# Path to glab executable (GitLab CLI, used for MR/CI status)
+# Default: "glab" (searches PATH)
+glab_path = "glab"
+
+# Path to gh executable (GitHub CLI, used for PR/CI status)
+# Default: "gh" (searches PATH)
+gh_path = "gh"
+
+# ============================================================================
+# Forge (MR/PR state via glab/gh)
+# ============================================================================
+[forge]
+
+# Query MR/PR and CI state from GitLab/GitHub CLIs.
+# Used for worktree badges, squash-merge-aware safety checks, and
+# `status --forge`. Set to false to disable all forge lookups
+# (e.g. air-gapped environments).
+# Default: true
+enabled = true
+
+# Extra self-hosted GitLab hostnames. Hosts containing "gitlab" and
+# github.com are auto-detected from each repo's origin URL; list hosts
+# here only when the hostname doesn't contain "gitlab".
+# Default: []
+gitlab_hosts = []
 
 # ============================================================================
 # Keybindings
@@ -187,13 +223,13 @@ help = "?"              # Show help modal
 new_task = "n"          # Create new task
 add_repo = "a"          # Add repository to current task
 delete_task = "d"       # Delete/finish task
+delete_worktree = "D"   # Remove single worktree from task (shift+d)
 
 # Git operations
 open_lazygit = "g"      # Open lazygit in selected worktree
 show_diff = "h"         # Open hunk diff (task panel = all repos, worktree panel = one repo)
 open_editor = "e"       # Open editor in selected task/worktree
 open_folder = "o"       # Open folder in new terminal tab
-open_shell = "enter"    # Open shell in selected worktree
 push_all = "p"          # Push all worktrees in current task
 pull_all = "P"          # Pull all worktrees in current task (shift+p)
 refresh = "r"           # Refresh git status
@@ -201,6 +237,7 @@ refresh = "r"           # Refresh git status
 # Claude Code integration
 open_claude_resume = "c"    # Open Claude CLI (resume if a session exists, else new)
 open_claude_gui_code = "C"  # Open Claude desktop on Code page in task folder (shift+c)
+dispatch_agent = "b"        # Dispatch background Claude agent in selected worktree
 
 # Messages panel
 toggle_messages = "m"       # Show/hide the activity messages panel
@@ -245,6 +282,7 @@ blocklist = [
 |------------|------|-----------|---------------------|------------------------------------------------|
 | `repos_dir` | path | `~/repos` | `REPOS_DIR`         | Directory containing your git repositories     |
 | `tasks_dir` | path | `~/tasks` | `TASKS_DIR`         | Directory where task worktrees will be created |
+| `archive_dir` | path | `""` (`<tasks_dir>/.archive`) | - | Directory for finished-task diff archives |
 
 ### Details
 
@@ -280,6 +318,8 @@ tasks_dir = "/Volumes/FastSSD/worktrees"
 | `theme`            | string  | `tasktree`      | `TASKTREE_THEME`     | Color theme for the interface            |
 | `show_hidden_files` | boolean | `false`         | -                     | Show hidden files in listings            |
 | `refresh_interval`  | integer | `30`            | -                     | Auto-refresh interval in seconds (0 = disabled) |
+| `agent_poll_interval` | integer | `10`          | -                     | Claude agent session poll in seconds (0 = disabled) |
+| `forge_poll_interval` | integer | `60`          | -                     | MR/CI forge status poll in seconds (0 = disabled) |
 
 ### `theme`
 
@@ -353,7 +393,23 @@ refresh_interval = 15  # Refresh every 15 seconds
 | `editor`      | string | `""`        | `EDITOR`            | Command to launch your editor        |
 | `lazygit_path` | string | `"lazygit"` | -                   | Path to lazygit executable           |
 | `hunk_path`   | string | `"hunk"`    | -                   | Path to hunk diff-viewer executable  |
-| `shell`       | string | `""`        | `SHELL`             | Shell to use when opening terminals  |
+| `glab_path`   | string | `"glab"`    | -                   | Path to GitLab CLI (MR/CI status)    |
+| `gh_path`     | string | `"gh"`      | -                   | Path to GitHub CLI (PR/CI status)    |
+
+## Forge Settings
+
+MR/PR and CI state is looked up through the GitLab (`glab`) and GitHub (`gh`)
+CLIs. The provider is auto-detected per repository from its `origin` URL:
+`github.com` uses `gh`; hosts containing "gitlab" (or listed in
+`gitlab_hosts`) use `glab`; anything else (including local-path remotes) is
+skipped. Lookups power the worktree MR/CI badges, squash-merge-aware safety
+checks, and `tasktree-manager status --forge`. Missing CLIs or network
+failures degrade silently — features fall back to plain git behavior.
+
+| Option         | Type       | Default | Description                                        |
+|----------------|------------|---------|----------------------------------------------------|
+| `enabled`      | boolean    | `true`  | Master switch for all forge lookups                |
+| `gitlab_hosts` | array[str] | `[]`    | Extra self-hosted GitLab hostnames to auto-detect  |
 
 ### Details
 
@@ -375,12 +431,6 @@ refresh_interval = 15  # Refresh every 15 seconds
 - Install hunk: `brew install hunk` (macOS) or `npm i -g hunkdiff`
 - Used when pressing `h`: from the task panel it opens a combined diff across all the task's repos; from the worktree panel it opens the selected repo's diff
 
-**`shell`:**
-- Leave empty (`""`) to use `$SHELL` environment variable
-- Fallback: `/bin/bash`
-- Examples: `"/bin/zsh"`, `"/bin/fish"`, `"/usr/local/bin/bash"`
-- Used when pressing `Enter` to open shell in worktree
-
 ## Symlinks
 
 When creating worktrees, tasktree-manager automatically symlinks gitignored files (like `.env`) from the source repository. This allows environment files to be shared without copying.
@@ -542,7 +592,6 @@ All 22 customizable keybindings with descriptions:
 | `show_diff`    | `h`      | Open hunk diff (task = all repos, worktree = one) | `show_diff = "ctrl+h"` |
 | `open_editor`  | `e`      | Open editor in task/worktree folder   | `open_editor = "ctrl+e"`    |
 | `open_folder`  | `o`      | Open folder in new terminal tab       | `open_folder = "ctrl+o"`    |
-| `open_shell`   | `enter`  | Open shell in selected worktree       | `open_shell = "ctrl+t"`     |
 | `push_all`     | `p`      | Push all worktrees in current task    | `push_all = "ctrl+p"`       |
 | `pull_all`     | `P`      | Pull all worktrees in current task    | `pull_all = "ctrl+shift+p"` |
 | `refresh`      | `r`      | Refresh git status for all worktrees  | `refresh = "F5"`            |
@@ -612,7 +661,7 @@ focus_previous = "h"
 [keybindings]
 new_task = "ctrl+n"
 delete_task = "ctrl+d"
-open_shell = "ctrl+t"
+open_folder = "ctrl+t"
 refresh = "F5"
 quit = "ctrl+q"
 ```

{tasktree_manager-2.10.0 → tasktree_manager-2.11.1}/docs/troubleshooting.md

@@ -732,8 +732,8 @@ HEAD detached at abc1234
 
 **Solution:**
 ```bash
-# Open shell in worktree
-Press Enter
+# Open worktree in a new terminal tab
+Press o
 
 # Create/checkout branch
 git checkout -b FEAT-123
@@ -1008,7 +1008,7 @@ Create
 
 # Your work is in the remote branch
 # Pull it down in the new worktree
-Press Enter (shell)
+Press o (new terminal tab)
 git pull origin FEAT-123
 ```
 

{tasktree_manager-2.10.0 → tasktree_manager-2.11.1}/docs/user-guide.md

@@ -140,10 +140,10 @@ A **worktree** is a git working directory for a specific repository within a tas
    - Exit hunk (press `q`)
 
 4. **Or open a shell:**
-   - Press `Enter` to open a shell in the worktree
+   - Press `o` to open the worktree in a new terminal tab
    - Make changes with your editor/IDE
    - Run build/test commands
-   - Exit shell (type `exit`)
+   - Close the tab (or switch back) when done
 
 5. **Push changes:**
    - Press `p` to push all worktrees in the task
@@ -337,8 +337,7 @@ Useful when you're spinning up several similar tasks that share the same set of
 |---------|--------------------|------------------------------------------------------|
 | `g`     | Open lazygit       | Open lazygit in the selected worktree                |
 | `h`     | Show diff          | Open hunk: all repos from the task panel, the selected repo from the worktree panel |
-| `e`     | Open editor        | Open editor in task/worktree folder (runs `$EDITOR .`) |
-| `Enter` | Open shell         | Open a shell in the selected worktree                |
+| `e`     | Open editor        | Open editor in a new terminal tab at the task/worktree folder (runs `$EDITOR .`; the TUI keeps running) |
 | `p`     | Push all           | Push all worktrees in the current task (parallel)    |
 | `P`     | Pull all           | Pull all worktrees in the current task (parallel)    |
 | `r`     | Refresh status     | Refresh git status for all tasks and worktrees       |
@@ -364,6 +363,7 @@ Useful when you're spinning up several similar tasks that share the same set of
 |---------|-------------------------|------------------------------------------------------------|
 | `c`     | Open Claude CLI         | Resume the task's Claude Code session if one exists, otherwise start a new one |
 | `C`     | Open Claude desktop     | Open the Claude desktop app on the Code page at the task folder |
+| `b`     | Dispatch agent          | Run a background Claude agent (`claude --bg`) in the selected worktree |
 
 **How it works:**
 - `c` opens Claude Code CLI in a new Ghostty terminal tab at the task directory.
@@ -374,6 +374,35 @@ Useful when you're spinning up several similar tasks that share the same set of
 - Both variants point the session's Claude Code auto-memory at a shared pool (`claude_memory_dir`, default `~/.claude/tasktree-memory`). Task folders are not git repos, so without this each task would get its own memory directory that is orphaned when the task is deleted; with the shared pool, what Claude learns in one task carries over to future tasks.
 - Each worktree additionally gets its own `.claude/settings.local.json` pointing auto-memory at the **main repo's** memory directory (`claude_repo_memory`, enabled by default). Sessions started manually inside a worktree (`cd` + `claude`) would otherwise key their memory to the worktree path and lose it when the worktree is deleted; with this, what Claude learns about a repo persists across worktrees and is shared with sessions in the main checkout. The file is git-excluded so worktrees stay clean, and these sessions also report status back to the task indicator.
 
+**Agent dashboard:**
+
+Claude Code's native agent view is scoped to a single repository — it has no concept of a
+task spanning several repos. tasktree-manager fills that gap:
+
+- The worktree list polls `claude agents --json` (every `agent_poll_interval` seconds,
+  default 10) and shows a per-worktree session badge: `⟳` working, `!` needs input,
+  `▣` ready/idle. Any Claude session whose working directory is inside a worktree counts,
+  whether started from the TUI, the dashboard, or a plain terminal.
+- `b` prompts for an instruction and dispatches a background agent
+  (`claude --bg -n <task>/<repo>`) into the selected worktree. Dispatch results land in
+  the messages panel (`m`), and the session appears in `claude agents` under the
+  `<task>/<repo>` name. Dispatch to several worktrees in parallel is fine.
+- If the `claude` CLI is missing or too old for `agents --json`, polling disables itself
+  after three failed attempts (one note in the messages panel) — the rest of the app is
+  unaffected.
+
+**Forge badges (MR/CI):**
+
+With the GitLab (`glab`) or GitHub (`gh`) CLI installed and authenticated, the worktree
+list also shows each branch's MR state (`○` open, `●` merged, `×` closed) and CI state
+(`◐` running, `✔` passed, `✘` failed; GitHub only — GitLab's MR list API carries no
+pipeline data). The provider is auto-detected from each repo's origin URL; self-hosted
+GitLab works when the hostname contains "gitlab" or is listed under `[forge]
+gitlab_hosts`. The same lookup makes safety checks recognize squash/rebase-merged
+branches: a branch whose MR is merged no longer blocks task deletion even though
+`git merge-base` cannot see the merge. Set `[forge] enabled = false` to turn all of
+this off.
+
 ### General
 
 | Key     | Action                  | Description                                  |
@@ -404,9 +433,9 @@ Create
 # Work in backend
 Tab (to worktree list)
 j (to highlight backend)
-Enter (open shell)
+o (open new terminal tab)
 
-# In shell: make changes
+# In the tab: make changes
 cd src
 vim auth.py
 # ... make changes ...
@@ -486,7 +515,7 @@ Select: backend
 Create
 
 Tab
-Enter (open shell)
+o (open new terminal tab)
 git fetch origin feat-789:feat-789
 git checkout feat-789
 exit
@@ -523,7 +552,7 @@ q (quit tasktree-manager)
 tasktree-manager
 j (select FEAT-999)
 Tab
-Enter (shell in first worktree)
+o (new tab in first worktree)
 
 # Merge main into feature branch
 git fetch origin main:main
@@ -601,7 +630,7 @@ d (delete task)
 **Working in worktree:**
 - Press `e` to open editor directly in worktree
 - Press `g` for lazygit (recommended for git operations)
-- Press `Enter` for shell (for building, testing, or other commands)
+- Press `o` for a shell in a new terminal tab (building, testing, other commands)
 
 **Git operations:**
 - **Staging/committing**: Use lazygit (`g`)
@@ -623,14 +652,24 @@ d (delete task)
 - tasktree-manager checks for uncommitted changes
 - Checks for unpushed commits
 - Offers to push before deletion
+- With `glab`/`gh` installed, branches whose MR/PR was squash- or rebase-merged count as
+  merged (plain `git merge-base` cannot see those merges)
 - Force delete available (with confirmation)
 
 **What happens on delete:**
+- ✅ The task's remaining diff (committed-but-unmerged + uncommitted work) is archived to
+  `archive_dir` (default `<tasks_dir>/.archive/<task>-<timestamp>.patch`) before anything
+  is removed — the messages panel (`m`) shows the archive path
 - ✅ Worktrees removed from `TASKS_DIR`
 - ✅ Branches remain on remote (if pushed)
 - ✅ Original repos in `REPOS_DIR` untouched
 - ❌ Local branches remain in original repos (cleanup manually if needed)
 
+**From scripts:** `tasktree-manager finish <task>` runs the same guided flow headlessly
+(safety sweep → optional `--push` → archive → delete), and `tasktree-manager status
+[--json|--oneline] [--forge]` reports per-worktree state — see the README's Headless CLI
+section.
+
 ### Manual Cleanup
 
 If tasktree-manager crashes or worktrees are corrupted:
@@ -724,9 +763,9 @@ editor = "nvim"  # or "vim", "code", "emacs", etc.
 
 Or set the `$EDITOR` environment variable.
 
-**Alternative: Open shell first:**
-1. Press `Enter` (open shell)
-2. In shell:
+**Alternative: Open a terminal tab first:**
+1. Press `o` (new terminal tab in the worktree)
+2. In the tab:
    ```bash
    vim .               # Vim
    nvim .              # Neovim
@@ -767,7 +806,7 @@ tasktree-manager creates normal git branches, so CI/CD works seamlessly:
 Integrate with GitHub CLI for PR creation:
 
 ```bash
-# In worktree shell (press Enter in tasktree-manager)
+# In a worktree tab (press o in tasktree-manager)
 gh pr create --title "Add authentication" --body "Implements FEAT-123"
 
 # Or after pushing all worktrees

{tasktree_manager-2.10.0 → tasktree_manager-2.11.1}/pyproject.toml

@@ -70,7 +70,7 @@ version-file = "tasktree_manager/_version.py"
 # Semantic Release Configuration
 [tool.semantic_release]
 version_toml = ["pyproject.toml:tool.semantic_release.version"]
-version = "2.10.0"
+version = "2.11.1"
 tag_format = "v{version}"
 branch = "main"
 commit_message = "chore(release): {version} [skip ci]"

{tasktree_manager-2.10.0 → tasktree_manager-2.11.1}/tasktree_manager/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '2.10.0'
-__version_tuple__ = version_tuple = (2, 10, 0)
+__version__ = version = '2.11.1'
+__version_tuple__ = version_tuple = (2, 11, 1)
 
 __commit_id__ = commit_id = None