Files
paseo/public-docs/worktrees.md
T
Mohamed BoudraandMatt Cowger 9fb7808191 feat(worktrees): let plugins choose creation options and placement (#8117)
* feat(worktrees): let plugins choose creation options and placement

Await the worktree creation request hook before Git source planning so plugins can change placement, branch and base without undoing a fetch. Manage arbitrary destinations through marker and registry ownership, and restore them at their recorded paths.

Co-authored-by: Matt Cowger <matt@cowger.us>

* fix(worktrees): compare repository paths across Windows aliases

Deletion must recognize the same repository through Git native and long path spellings. Reuse ownership path equivalence instead of comparing canonical strings, and let the recovery fixture accept Git platform line endings.

Co-authored-by: Matt Cowger <matt@cowger.us>

* fix(worktrees): respect recorded ownership and creation intent

Keep branch checkout distinct from branch-off, validate plugin placement once at the daemon boundary, and share default path collision resolution. A restored external worktree's marker must never override its recorded non-ownership.

Co-authored-by: Matt Cowger <matt@cowger.us>

* test(worktrees): record ownership in session archive fixture

The fixture creates a Paseo-owned worktree, so its durable record must say so. Archive now treats a recorded false value as authoritative instead of replacing it with filesystem discovery.

Co-authored-by: Matt Cowger <matt@cowger.us>

* test(plugins): retry temp cleanup after worktree archive on Windows

Windows releases directory handles after the daemon closes, so rmdir on the
source repository can hit EBUSY. Retry like the other git temp-dir tests.

* test(plugins): compare plugin-chosen worktree paths in canonical spelling

Windows temp directories come back as 8.3 aliases while the daemon records
the resolved spelling, so normalize the expected root the same way.

---------

Co-authored-by: Matt Cowger <matt@cowger.us>
2026-10-28 18:55:50 +07:00

10 KiB

title, description, nav, order, category
title description nav order category
Git worktrees Run agents in isolated git worktrees with setup hooks, scripts, and long-running services. Git worktrees 11 Workspaces

Git worktrees

Git worktrees are one kind of workspace.

A workspace is the place where a task happens. When that workspace is backed by a git worktree, Paseo creates a separate directory on a separate branch so parallel agents never step on each other.

This page covers the git-specific details: where worktrees live, how branches are chosen, and how to configure setup hooks, scripts, terminals, and long-running services through paseo.json.

Layout and workflow

Worktrees live under $PASEO_HOME/worktrees/ by default, grouped by a hash of the source checkout path. You can change the base directory with worktrees.root in config.json. Each worktree gets a slug and a branch when its workspace is created.

~/.paseo/worktrees/
└── 1vnnm9k3/               # hash of source checkout path
    ├── tidy-fox/           # worktree slug
    └── bold-owl/

With a custom root, Paseo keeps the same hashed layout under that directory:

{
  "worktrees": {
    "root": "/mnt/fast/paseo-worktrees"
  }
}

Plugins can choose a location anywhere on disk with worktree.create.before. The worktree-placement example places worktrees next to the source checkout. Paseo validates the path, refuses an existing destination, and manages listing, archive, and deletion there. Recovery uses the recorded path without running creation hooks.

  1. Create a workspace with worktree isolation, Paseo creates the worktree and runs your setup hooks
  2. Launch one or more agents in that workspace
  3. Review the diff against the base branch
  4. Merge or archive the workspace; after the last workspace using it is archived, Paseo runs teardown and removes the worktree

Scheduled runs archive their workspaces when they finish by default. Turn off Archive on finish in the schedule's app form to keep run workspaces and their worktrees until you archive them.

Create a worktree-backed workspace

The examples below use the current directory as the source checkout. Pass --path ~/dev/my-app to create the workspace from another checkout.

Branch off from a base branch:

paseo workspace create \
  --isolation worktree \
  --mode branch-off \
  --new-branch feature/auth \
  --worktree-slug feature-auth \
  --base origin/main

Use origin/main rather than main. Paseo fetches remote refs in the background, so the remote-tracking branch is current, while your local main is whatever you last pulled. An unqualified main resolves to that local branch first, and the worktree starts from stale history. Prefixing the remote names the fetched ref explicitly.

Check out an existing branch:

paseo workspace create \
  --isolation worktree \
  --mode checkout-branch \
  --branch feature/existing \
  --worktree-slug existing-copy

Or open a pull request in its own workspace:

paseo workspace create \
  --isolation worktree \
  --mode checkout-pr \
  --pr-number 2186

Add --forge <name> when Paseo cannot infer the forge from the source checkout.

Copy local files with .worktreeinclude

Create .worktreeinclude at the root of your source checkout to copy selected gitignored files into new worktrees:

.env
config/*.local.json

Patterns use gitignore syntax. A file must match .worktreeinclude and be gitignored to be copied. Tracked files are never copied, and existing destination files are never overwritten. Without .worktreeinclude, no local files are copied. Symlinked directories and nested repositories inside an included path cause the copy to fail and abort worktree creation.

The built-in worktree-include plugin copies from the checkout you create the worktree from, including when that checkout is another worktree. Copying finishes before setup, terminals, and the first agent. A copy failure aborts creation and removes the new worktree. Copies use copy-on-write clones on APFS and btrfs when supported, with a regular copy elsewhere.

paseo.json

Drop a paseo.json in your repo root. Paseo reads it from the committed version of the base branch you picked, so uncommitted changes in other branches don't apply.

{
  "worktree": {
    "setup": "npm ci",
    "teardown": "rm -rf .cache"
  },
  "scripts": {
    "test": { "command": "npm test" },
    "web": { "command": "npm run dev", "type": "service", "port": 3000 }
  }
}

Setup and teardown

Plugins can use worktree.create.after to write files before setup, terminals, and the first agent.

setup runs once after the worktree is created. Use setup to install dependencies and run project initialization. Use .worktreeinclude to copy ignored files such as .env. teardown runs during archive, before the directory is removed.

{
  "worktree": {
    "setup": "npm ci\nnpm run db:migrate",
    "teardown": "npm run db:drop || true"
  }
}

Both fields accept a multiline shell script or an array of commands; commands run sequentially either way.

Commands run with the worktree as cwd. Use $PASEO_SOURCE_CHECKOUT_PATH to reach files in the original checkout (untracked config, local caches, etc).

Scripts and services

scripts are named commands you can run inside a worktree on demand. Mark one as a service and Paseo supervises it as a long-running process, assigns it a port, and routes HTTP traffic to it through the daemon's reverse proxy.

Run them from the app, or manage them from automation with paseo script and the workspace-script MCP tools.

Plain scripts

{
  "scripts": {
    "test": { "command": "npm test" },
    "lint": { "command": "npm run lint" },
    "generate": { "command": "npm run codegen" }
  }
}

Services

{
  "scripts": {
    "web": {
      "type": "service",
      "command": "npm run dev -- --port $PASEO_PORT",
      "port": 3000
    },
    "api": {
      "type": "service",
      "command": "npm run api -- --port $PASEO_PORT"
    }
  }
}

Omit port to let Paseo auto-assign one. Bind your process to $PASEO_PORT rather than hard-coding, each worktree gets a distinct port so multiple copies of the same service coexist.

Dynamic port allocation

By default, Paseo asks the OS for an available ephemeral port. Configure a range globally in ~/.paseo/config.json or per project in paseo.json:

// ~/.paseo/config.json
{
  "worktrees": {
    "servicePorts": { "range": "3000-4000" }
  }
}
// paseo.json
{
  "worktree": {
    "servicePorts": { "range": "3000-4000" }
  }
}

The range is inclusive. A project servicePorts block replaces the global block. An explicit service port always wins over either setting.

For an external allocator, configure portScript instead:

{
  "worktree": {
    "servicePorts": { "portScript": "/usr/bin/portmake" }
  }
}

Paseo runs the executable in the workspace directory with four arguments: service name, workspace ID, branch name, and worktree path. Since the script is executed directly without a shell, portScript must point to a real executable (such as a compiled binary or a script with a proper shebang line like #!/bin/bash) rather than an inline shell command or pipeline. If you need shell evaluation or pipelines, wrap them in a small executable script. A missing branch is passed as an empty string. The same values are available as PASEO_SCRIPTNAME, PASEO_WORKSPACE_ID, PASEO_BRANCH_NAME, and PASEO_WORKTREE_PATH. It must print one valid TCP port to stdout. portScript wins over range in the same block. Paseo trusts the external allocator, so the returned port may already be in use, for example by a service Paseo will attach to.

Reverse proxy

Every service is reachable through the daemon at a deterministic hostname:

http://<script>--<branch>--<project>.localhost:<daemon-port>

# on the default branch, the branch label is dropped:
http://<script>--<project>.localhost:<daemon-port>

*.localhost resolves to 127.0.0.1 on modern systems, so these URLs work out of the box. The proxy supports WebSocket upgrades.

Service-to-service

Services launched from the same workspace see each other's ports and proxy URLs. Given web and api above, each process gets:

PASEO_PORT=3000                         # this service's port
PASEO_URL=http://web--my-app.localhost:6767  # this service's proxy URL
PASEO_SERVICE_API_PORT=51732
PASEO_SERVICE_API_URL=http://api--my-app.localhost:6767
PASEO_SERVICE_WEB_PORT=3000
PASEO_SERVICE_WEB_URL=http://web--my-app.localhost:6767

Script names are upper-cased and non-alphanumerics become _. Point your frontend at $PASEO_SERVICE_API_URL instead of hard-coding a port.

Terminals

Open terminals automatically when a worktree is created. Useful for tailing logs or leaving a REPL ready to go.

{
  "worktree": {
    "terminals": [
      { "name": "logs", "command": "tail -f dev.log" },
      { "name": "shell", "command": "bash" }
    ]
  }
}

Environment variables

Setup, teardown, scripts, and services all see:

  • $PASEO_SOURCE_CHECKOUT_PATH, the original repo root
  • $PASEO_WORKTREE_PATH, the worktree directory
  • $PASEO_BRANCH_NAME, the worktree's branch
  • $PASEO_WORKTREE_PORT, legacy per-worktree port (prefer $PASEO_PORT inside services)

Services additionally get:

  • $PASEO_PORT, this service's assigned port
  • $PASEO_URL, this service's proxy URL
  • $PASEO_SERVICE_<NAME>_PORT / _URL, peer service ports and URLs
  • $HOST, 127.0.0.1 for local-only daemons, 0.0.0.0 when the daemon binds all interfaces

Manage the workspace

paseo workspace ls
paseo run --workspace <workspace-id> "implement auth"
paseo workspace rename <workspace-id> "Auth rework"
paseo workspace archive <workspace-id>

For the common case, paseo run --new-workspace worktree --worktree-mode branch-off --new-branch feature/auth --base origin/main "implement auth" creates both the workspace and its first agent.