Stacking Agent Development Environment that isolates each agent and rebases stacked PRs when the base moves

Open a Git repo. Give each agent its own workspace. Treq rebases dependent workspaces when the target branch moves.

Download Treq for macOS Read the docs

Available for

Works with

Claude CodeCodexCursor

Review the diff on your machine. Send it back as Plan or Edit.

The workspace tabs are Code, Commits, and Changes. Line comments stay local. Send them to an agent as Plan or Edit.

How reviews work

When the target branch moves, dependent workspaces rebase.

Git worktrees cannot restack a chain of branches for you. Treq uses Jujutsu for that rebase. You still push and pull with Git. You never have to learn Jujutsu.

How workspaces work

Sidebar showing stacked workspace hierarchy

Split a feature into a stack. Keep the chain current.

Stack creates a workspace that targets another workspace. When you land the base, Treq rebases the rest. Merge locally with familiar and stack-native merge strategies.

Merging workspaces

Delegate workspaces. Let agents move work and start more agents.

Agents start more agents

Tell one agent to split the work across three agents in three workspaces. Each agent gets its own checkout and can keep going in parallel.

Agent prompt: Split the work across 3 agents in 3 different workspaces — Before

Sidebar after three new agent workspaces appear — After

Agent prompt: Move my changes to a new workspace and continue the fix there

Move changes between workspaces

Tell an agent to move your changes to a new workspace and continue the fix there. Agents can move commits, working-copy files, and hunks through the treq CLI.

Agent prompt: Break up this workspace into smaller stacked or separate workspaces

Break up a large workspace

Tell an agent to break this workspace into smaller stacked or separate workspaces. Each slice gets its own checkout.

Facts

The constraints that stay on your machine

Diffs, comments, and terminal metadata stay on your machine. The desktop app does not upload your code.

Changes

Read the whole change, or one commit, on the same screen

File navigation, the diff, and inline comments stay together. When a workspace has an open GitHub pull request, Changes can also show GitHub review threads. Quoting a thread does not reply on GitHub.

Changes and reviews Treq Changes tab with a resolved GitHub review thread and a local comment that says remove this

An uncommitted change in one workspace never shows up in another. Agents can write in parallel without sharing your main checkout.

From the Workspaces docs

Changes in feat/keyvalues-cache with an uncommitted cache.ts edit

Changes in feat/empty-event-message with a different uncommitted Home.tsx edit

telemetry events from the desktop app

Product

Features

Review locally. Rebase the stack. Let agents open workspaces through the CLI.

Code reviews

Inspect every change before it leaves the machine. Read diffs like a GitHub pull request, annotate line ranges, and send comments back with Plan or Edit.

Isolated workspaces

Each agent gets its own checkout. An uncommitted change in one workspace never shows up in another.

.treq
- workspaces
  - feat-event-ingest
    - packages/
    - README.md
  - feat-empty-event-message
    - packages/
    - README.md
  - feat-keyvalues-cache

Auto-rebase

When the base moves, Treq rebases dependent workspaces.

Conflict resolution

Send a conflict to an agent from Changes with Plan or Edit. The agent can land a new commit that resolves the markers. On the Commits tab, Resolve conflicts starts an agent that rewrites the conflicted commit in place. That path does not add a follow-up commit.

Changes tab Resolve conflicts popover with Plan and Edit — New commit

Resolve commit conflicts inplace dialog — In place

Agent CLI

Workspace management can be delegated to agents through the treq CLI. Prompt an agent to create a workspace for this fix and it can run the same commands you would.

Agent prompt asking to create a workspace for this fix

Send files from the agent

Tell an agent to send you the screenshots and the updated research draft. A thumbnail lands in that terminal. Click it to open the file.

Terminal pane with an asset thumbnail from treq send — Before

Asset lightbox open after clicking the thumbnail — After

Schedule work

Hide a workspace until a time you pick. Shift commit timestamps into the future, or set them to now. Prepare the work ahead of time and release it on a schedule you control.