Agntree — Claude Code Session & Worktree Manager for VS Code & Cursor

The missing session manager for Claude Code. Resume, fork, search, and organize your Claude Code CLI sessions across git worktrees — all from a single VS Code sidebar. Works with VS Code & Cursor. Extensible architecture — contributions for Copilot, Cline, Aider, and more are welcome.

Why Agntree?

If you use Claude Code CLI across multiple projects and branches, you know the pain:

Lost sessions — finding and resuming Claude Code sessions means digging through ~/.claude/projects/ or remembering session IDs
No session overview — there's no way to see all your Claude Code conversations across repos and branches at a glance
Manual worktree juggling — running parallel Claude Code sessions on different branches requires manually creating worktrees and terminals
No session forking — exploring an alternative approach means manually copying Claude session files and setting up a new worktree
Blind changes — tracking what Claude Code modified requires constant git diff commands

Agntree gives Claude Code a visual session manager inside VS Code — resume any session with one click, fork conversations to explore alternatives, and see all changes across worktrees in a single sidebar.

Features

Claude Code Session Management

Create, resume, rename, and organize your Claude Code sessions. Every session links to a Claude Code session ID for seamless --resume support. Import existing sessions from ~/.claude/projects/ with multi-select. Search all Claude Code sessions across a repository's worktrees with the repository-level Search Sessions command.

Git Worktree Integration

Automatically detects git worktrees for each repository. Create new worktrees with one click — choose an existing branch or create a new one from any base branch. Worktrees are organized in a dedicated <repo>-worktrees/ folder.

Session Forking — Branch Your Claude Code Conversations

Fork an ongoing Claude Code session to explore alternative approaches — just like branching your code. Fork within the same worktree or create a new worktree with all uncommitted changes carried over. The full conversation history is preserved so Claude can resume from the forked point.

PR Checkout

Check out any GitHub pull request into a new worktree with one click. Works for PRs from both same-repo branches and forks — the gh CLI handles remote resolution automatically. Available from the repository's inline actions or context menu.

One-Click Quick Actions

Run Claude prompts or shell commands with a single click from the sidebar. Configure custom actions in settings — use Claude's headless mode with specific tools, or run any shell command. Play/stop controls with output displayed in a dedicated channel.

Built-in Changes Tracking

View staged and unstaged changes for the active worktree without leaving the sidebar. Inline stage, unstage, and discard actions. Click any file to open a side-by-side diff. Section headers show file count and total additions/deletions.

All Files Panel

Browse, create, rename, delete, copy, cut, and paste files and folders for the active worktree — all from the sidebar. Click the search icon in the panel toolbar to open VS Code's native Search scoped to that worktree's directory.

Demo

Quick Start

Install Claude Code CLI if you haven't already
Install Agntree from the VS Code Marketplace
Click the Agntree icon in the Activity Bar, add a repository, and start managing your Claude Code sessions

Installation

From VS Code Marketplace

Install directly from the VS Code Marketplace — search for "Agntree" in the Extensions panel, or click the link.

Works on both VS Code and Cursor (Cursor is a VS Code fork and supports VS Code extensions).

From VSIX

Download or build the .vsix file
In VS Code, open the Command Palette (Cmd+Shift+P / Ctrl+Shift+P)
Run Extensions: Install from VSIX...
Select the agntree-x.x.x.vsix file

From Source

git clone https://github.com/subhashkhileri/agntree.git
cd agntree
npm install
npm run compile
npx @vscode/vsce package
code --install-extension agntree-*.vsix

Requirements

VS Code 1.85.0+ or Cursor
Claude Code CLI installed and configured
Git installed and available in PATH
GitHub CLI (gh) for PR checkout feature (optional)

Agntree vs Manual Claude Code Workflow

Task	Without Agntree	With Agntree
Resume a Claude Code session	Find the session ID, run `claude --resume <id>`	Click a session in the sidebar
Find old Claude Code sessions	Browse `~/.claude/projects/` directories	Search Sessions across all worktrees
Run Claude Code on a new branch	Manually create worktree, cd, run `claude`	One-click worktree + session creation
Fork a Claude Code conversation	Copy session files, create worktree, set up manually	Right-click → Fork Session
Track what Claude Code changed	Run `git diff` repeatedly	Built-in changes panel with inline diffs
Common Claude Code prompts	Retype or search history	One-click quick actions
Manage Claude Code across repos	Separate windows per project	All repositories in one sidebar

Supported AI Coding Agents

Agntree is built for Claude Code — Anthropic's CLI coding agent. Full session management is supported: resume, fork, search, import, and organize Claude Code sessions. The architecture is open-source and extensible — contributions to add support for other AI coding agents are welcome.

Agent	IDE Support	Session Management	Status
Claude Code	VS Code, Cursor	Full support	Available
GitHub Copilot	—	—	Contributions welcome
Cline	—	—	Contributions welcome
Aider	—	—	Contributions welcome
Windsurf	—	—	Contributions welcome
Continue.dev	—	—	Contributions welcome

See CONTRIBUTING.md for a guide on adding support for new agents.

Usage Guide

Getting Started

Click the Agntree icon in the Activity Bar (left sidebar)
Click Add Local Repository or Clone from GitHub to add your first repository
The extension automatically detects worktrees in the repository

Managing Repositories

Action	How To
Add Local Repository	Click the folder icon in the Workspaces panel title bar
Clone from GitHub	Click the cloud icon in the Workspaces panel title bar
Create Worktree	Hover over repository → Click `+` icon, or right-click → Create Worktree
Remove Repository	Hover over repository → Click `×` icon, or right-click → Remove from Extension

Clone from GitHub: Enter a GitHub URL (https://github.com/owner/repo) or shorthand (owner/repo), select a parent folder, and the repository will be cloned and added automatically.

Working with Worktrees

Action	How To
Create Worktree	Right-click a repository → Create Worktree
Checkout PR	Hover over repository → Click PR icon, or right-click → Checkout PR
New Session	Hover over worktree → Click session icon, or right-click → New Session
Open Terminal	Hover over worktree → Click terminal icon
Copy Path	Right-click a worktree → Copy Path
Activate Workspace	Right-click a worktree → Activate Workspace (when auto-switch is OFF)
Open in New Window	Right-click a worktree → Open in New Window
Merge Branch	Right-click a worktree → Merge Branch Into This
Clear All Sessions	Right-click a worktree → Clear All Sessions
Delete Worktree	Right-click a worktree → Delete Worktree (option to also delete branch)

Create Worktree Flow:

Choose "Existing branch" or "New branch"
For new branches: select the base branch to branch from, then enter the new branch name
Confirm the worktree path (defaults to <repo>-worktrees/<branch-name>)

Worktrees are organized in a dedicated folder (e.g., my-repo-worktrees/) for cleaner organization.

Managing Sessions

Action	How To
New Session	Hover over worktree → Click `+` icon
Open/Resume Session	Click on a session
Rename Session	Hover over session → Click edit icon
Remove Session	Hover over session → Click `×` icon
Fork Session	Right-click a session → Fork Session (creates branch in same worktree)
Fork to New Worktree	Right-click a session → Fork Session to New Worktree (creates worktree with changes)
Import Sessions	Right-click a worktree → Import Existing Sessions
Search Sessions	Hover over repository → Click search icon, or right-click → Search Sessions

Note: Removing a session only removes it from the extension's list. The Claude session files in ~/.claude/ are preserved and can be re-imported later.

Fork Session to New Worktree: Creates a new git worktree, copies uncommitted changes from the current worktree, copies the Claude session data, and opens a forked session in the new worktree. Useful for exploring alternative approaches while preserving your current work.

Viewing Changes

The Changes panel shows uncommitted changes for the currently selected worktree:

Staged Changes section shows files ready to commit
Changes section shows unstaged modifications
Click on any file to open a diff view (toggle on/off)
Inline actions: Stage (+), Unstage (-), Discard changes
Section headers show file count and total additions/deletions
Changes are auto-refreshed when files are modified
Panel title shows active worktree and repository name

Quick Actions

The Quick Actions panel lets you run commands with one click:

Claude mode: Run Claude headlessly with a prompt and allowed tools
Command mode: Run any shell command directly (cross-platform)
Play/Stop buttons to start and terminate running actions
Output displayed in "Agntree Quick Actions" output channel
Panel title shows active worktree and repository name

Default quick actions:

Commit — Runs Claude with a commit prompt
Git Status — Runs git status command

Configuration (Settings → agntree.quickActions):

{
  "agntree.quickActions": [
    {
      "name": "Commit",
      "icon": "git-commit",
      "prompt": "Run the /commit-commands:commit slash command",
      "allowedTools": "Bash(git:*),Read,Glob,Grep"
    },
    {
      "name": "Build",
      "icon": "tools",
      "command": "npm run build"
    }
  ]
}

Settings

Setting	Default	Description
`agntree.autoSwitchWorkspaceFolder`	`false`	Automatically switch VS Code's workspace folder when selecting a worktree. Disable to prevent flickering from extension host restart.
`agntree.focusOnStartup`	`false`	Focus the Agntree panel automatically when VS Code starts, instead of the default File Explorer.
`agntree.quickActions`	See above	Array of quick actions. Each action needs `name` and either `command` (shell) or `prompt` + `allowedTools` (Claude).

Toggle autoSwitchWorkspaceFolder and focusOnStartup directly from the Workspaces panel toolbar — no need to open Settings.

Commands

All commands are available in the Command Palette (Cmd+Shift+P / Ctrl+Shift+P):

Command	Description
`Agntree: Add Local Repository`	Add an existing git repository
`Agntree: Clone from GitHub`	Clone a repository from GitHub and add it
`Agntree: Remove from Extension`	Remove repository from extension (files preserved)
`Agntree: Create Worktree`	Create a new git worktree
`Agntree: Delete Worktree`	Delete a worktree (optionally delete the branch too)
`Agntree: Merge Branch Into This`	Merge another branch into the selected worktree
`Agntree: New Session`	Start a new Claude Code session
`Agntree: Open Session`	Open/resume a session
`Agntree: Rename Session`	Rename a session
`Agntree: Remove from List`	Remove session from list (Claude session preserved)
`Agntree: Fork Session`	Fork a session in the same worktree
`Agntree: Fork Session to New Worktree`	Fork session to a new worktree with changes
`Agntree: Import Existing Sessions`	Import sessions from ~/.claude
`Agntree: Search Sessions`	Search all sessions across a repository's worktrees
`Agntree: Checkout PR`	Check out a GitHub PR into a new worktree
`Agntree: Activate Workspace`	Activate VS Code workspace for worktree folder
`Agntree: Open in New Window`	Open worktree in new VS Code window
`Agntree: Refresh Workspaces`	Refresh the workspaces tree
`Agntree: Refresh Changes`	Refresh the changes panel
`Agntree: Open Diff`	Open diff view for a changed file
`Agntree: Search in Files`	Open VS Code Search scoped to the active worktree directory

Architecture

src/
├── extension.ts              # Extension entry point
├── types.ts                  # TypeScript interfaces and types
├── commands/
│   ├── repository.ts         # Repository management commands
│   ├── worktree.ts           # Worktree commands
│   ├── chat.ts               # Session commands
│   └── quickActions.ts       # Quick action commands
├── providers/
│   ├── WorkspacesTreeProvider.ts   # Main sidebar tree view
│   ├── ChangesTreeProvider.ts      # Changes panel tree view
│   └── QuickActionsTreeProvider.ts # Quick actions panel tree view
└── services/
    ├── StorageService.ts     # Persistent storage (globalState)
    ├── GitService.ts         # Git operations (worktrees, diffs)
    ├── TerminalManager.ts    # VS Code terminal management
    ├── ClaudeSessionService.ts    # Claude session discovery & parsing
    └── SessionWatcher.ts     # Watches for new sessions, auto-naming

Data Flow

Repository Added → Stored in VS Code's globalState
Worktrees Detected → GitService runs git worktree list --porcelain
Session Created → TerminalManager spawns terminal with claude CLI
Session Linked → Session links to Claude Code's session ID for --resume

Extensibility

The architecture separates agent-specific logic (currently in ClaudeSessionService) from the core session management. Adding support for a new AI coding agent involves implementing a new session service that conforms to the same interface. See CONTRIBUTING.md for details.

FAQ

What is Agntree?

Agntree is a free, open-source VS Code extension that serves as a session manager for Claude Code CLI. It provides a visual sidebar to create, resume, fork, search, and organize your Claude Code sessions across git repositories and worktrees — replacing the need to manually track session IDs or browse ~/.claude/projects/.

Does Agntree work with Cursor?

Yes. Cursor is a fork of VS Code and supports VS Code extensions. Agntree works on both VS Code and Cursor without any modification.

Can I use Agntree with Copilot, Cline, or Aider?

Agntree currently provides full session management for Claude Code. The architecture is extensible and open-source — contributions to add support for GitHub Copilot, Cline, Aider, Windsurf, Continue.dev, and other AI coding agents are welcome. See the Contributing section.

What are git worktrees and why use them with Claude Code?

Git worktrees let you check out multiple branches of the same repository into separate directories simultaneously. This is powerful with Claude Code because you can run separate Claude Code sessions on separate branches in parallel, without conflicts. Agntree makes creating worktrees and launching Claude Code sessions on them effortless.

How is session forking different from starting a new Claude Code session?

When you fork a Claude Code session, the full conversation history is copied to the new session. Claude retains all context from the original conversation and can continue from that point. Starting a new session means Claude has no memory of previous work. Forking is ideal for exploring alternative approaches while keeping the original Claude Code session intact.

Is Agntree free?

Yes. Agntree is free and open-source under the MIT license. You need your own Claude Code subscription (Claude Pro, Max, or Team) to use the session management features.

Roadmap

Agntree's roadmap is community-driven. Key areas of interest:

Multi-agent support — Extensible architecture for Copilot, Cline, Aider, Windsurf, and other AI coding agents (contributions welcome)
Custom workflow templates — Sharable quick action configurations for teams
Team collaboration features — Shared session management across team members
Session analytics — Track AI-assisted development metrics across projects

Have ideas? Open an issue or start a discussion.

Contributing

Contributions are welcome! See CONTRIBUTING.md for detailed guidelines, including a section on adding support for new AI coding agents.

Quick start:

Fork the repository
Create a feature branch
Make your changes
Run npm run lint to check for issues
Submit a pull request

Star History

License

MIT — free for personal and commercial use.

Built for use with Claude Code by Anthropic. Agntree is an independent open-source project and is not affiliated with or endorsed by Anthropic.

Name		Name	Last commit message	Last commit date
Latest commit History 53 Commits
.claude/skills		.claude/skills
.github		.github
docs		docs
resources/icons		resources/icons
src		src
.gitignore		.gitignore
.vscodeignore		.vscodeignore
CHANGELOG.md		CHANGELOG.md
CLAUDE.md		CLAUDE.md
CODE_OF_CONDUCT.md		CODE_OF_CONDUCT.md
CONTRIBUTING.md		CONTRIBUTING.md
LICENSE		LICENSE
README.md		README.md
SECURITY.md		SECURITY.md
esbuild.js		esbuild.js
package-lock.json		package-lock.json
package.json		package.json
tsconfig.json		tsconfig.json

Folders and files

Latest commit

History

Repository files navigation

Agntree — Claude Code Session & Worktree Manager for VS Code & Cursor

Table of Contents

Why Agntree?

Features

Claude Code Session Management

Git Worktree Integration

Session Forking — Branch Your Claude Code Conversations

PR Checkout

One-Click Quick Actions

Built-in Changes Tracking

All Files Panel

Demo

Quick Start

Installation

From VS Code Marketplace

From VSIX

From Source

Requirements

Agntree vs Manual Claude Code Workflow

Supported AI Coding Agents

Usage Guide

Getting Started

Managing Repositories

Working with Worktrees

Managing Sessions

Viewing Changes

Quick Actions

Settings

Commands

Architecture

Data Flow

Extensibility

FAQ

What is Agntree?

Does Agntree work with Cursor?

Can I use Agntree with Copilot, Cline, or Aider?

What are git worktrees and why use them with Claude Code?

How is session forking different from starting a new Claude Code session?

Is Agntree free?

Roadmap

Contributing

Star History

License

About

Topics

Resources

License

Code of conduct

Contributing

Security policy

Uh oh!

Stars

Watchers

Forks

Releases 6

Packages 0

Uh oh!

Contributors

Uh oh!

Languages

Packages