Today we're shipping one of our most requested features: Workspace Forking. Now you can branch your AI conversations just like you branch your code.

The Problem: Exploring Without Losing Progress

You're deep into a conversation with Claude. You've shared context, explained your architecture, maybe even given it access to some secrets or API keys. Claude has proposed a solution, but you're not sure it's the right one. You want to try a different approach, but you don't want to lose everything you've built up.

Sound familiar?

Until now, your options were limited:

  • Start over — Lose all your context and re-explain everything
  • Continue and hope — Commit to one path and pray it works out
  • Manual juggling — Copy messages, manage multiple workspaces yourself

None of these are great.

The Solution: Fork Your Workspace

With workspace forking, you can now branch off from any message in your conversation. Here's what happens when you fork:

  1. A new Git branch is created from your current HEAD
  2. A new worktree is set up with all your uncommitted changes copied over
  3. Your Claude session is forked — including conversation history and any secrets you've shared
  4. Messages are copied up to your fork point
  5. You're automatically switched to the new workspace

It's like git checkout -b for your entire development context.

Why This Matters

Explore Different Approaches

"What if we used a different database?" "What if we built this with a different pattern?" Now you can actually try both approaches in parallel, each with full Claude context.

Preserve Sensitive Context

When you fork a workspace, Claude's session is truly forked — not just copied. This means any secrets, API keys, or sensitive context you've shared stays available in both the original and forked workspace. No need to re-authenticate or re-share.

Safe Experimentation

Your original workspace stays exactly as it was. If the new direction doesn't work out, just delete the forked worktree. Your main work is untouched.

Full Git Integration

Because forking creates a real Git branch and worktree, you get all the benefits of Git:

  • Clear history of what changed where
  • Easy comparison between approaches
  • Standard merge workflow when you're ready

How to Use It

  1. Find the fork point — Hover over any message in your conversation
  2. Click the fork button — It's in the message actions menu
  3. Name your fork — Give it a descriptive branch name
  4. Start exploring — You're now in a new workspace with full context

That's it. Three clicks and you're exploring a new direction with all your context intact.

Technical Details

For those curious about the implementation:

  • Git worktrees are created using gix (pure Rust Git implementation)
  • Uncommitted files are copied to the new worktree automatically
  • Claude sessions are stored per-project and copied with a new session ID
  • All fork operations go through our sync layer, so forked workspaces sync across devices

Try It Today

Workspace forking is available now in the latest version of Sonars. Update your app and start exploring multiple solutions in parallel.

We can't wait to see how you use it.