Basic Workflows

Learn the basic workflows for using Sculptor. This guide covers how to start tasks, review an agent's changes, merge new code, and resolve merge conflicts.

Creating agents

  1. On your projects homepage, describe your task to the agent.

  2. Press “Start task” or CMD+Enter to start the task. Press Enter to start a new line in your task description.

  3. Your new agent will appear in the sidebar. Click into it to see the changes as the agent works.

create a new agent from the homepage

When you’re viewing an agent’s task, you can press the + New Agent button or CMD+N to quickly create a new agent.

create a new agent from modal

Note: for now, your first agent will take about a minute to start. We're working on making it instant!

Testing the agent’s changes

Each agent runs in a safe container with a copy of your repo. Their branch lives in the container. Pairing Mode lets you bring an agent's branch into your IDE so you can instantly test its changes, while it sees your edits in real-time. When you turn it on, it checks out the agent's branch locally and keep your files + git state synced.

  1. Click the Pairing Mode button in the sidebar or the top right corner to turn it on

click the pairing mode buttons
  1. Run the agent’s code, run terminal commands, make edits in your IDE, or keep working with the agent in chat while in Pairing Mode. Any local changes you make will sync back to the agent’s branch and persist after turning off Pairing Mode.

pairing mode activated state

Note: Currently Pairing Mode will be disabled if you have uncommitted or unstashed changes in your current local branch. Stash or commit changes to enable Pairing Mode using git stash --include-untracked.

local git state with uncommitted changes

Merging the agent’s changes

  1. Turn off Pairing Mode to switch your local state back to where it was.

turn off pairing mode from the main panel
turn off pairing mode from the sidebar
  1. Commit the agent’s changes in Sculptor.

commit the agent's changes in the Changes panel
  1. Press the Merge button in the top right corner, select your target branch, and pull the agent’s changes.

merge the changes by pulling from the agent's branch

For power users: you can also commit and merge the agent's changes locally while Pairing Mode is on using git commit on the branch, checking out the target branch, and git merge <source-branch>.

Resolving merge conflicts

If you expect merge conflicts, the agent can help you resolve them!

  1. Push your target branch to the agent’s branch using the Merge panel.

  2. Tell the agent to resolve any merge conflicts that arise.

  3. After it’s done, merge the agent branch into your target branch as described in the last section (Merging the agent’s changes).

push your local branch to the agent's
ask the agent to resolve merge conflicts

If you try merging the agent's branch into your target branch, and merge conflicts arise, you will see this dialog. Choose whether to force merge or abort if there are conflicts that can’t be resolved.

decide how you want to handle potential merge conflicts on pull

Last updated