| commit | 26f3f34c25e21717001f0230d1abe7debbc5e0c0 | [log] [tgz] |
|---|---|---|
| author | David Crawshaw <david@zentus.com> | Sat Jun 14 19:58:32 2025 +0000 |
| committer | David Crawshaw <david@zentus.com> | Sat Jun 14 16:20:07 2025 -0700 |
| tree | 0ba518a643b4d165dd871b4a2cd28e5f096a017f | |
| parent | 938d2dcde4aaea8119e1c09ffa453de48560dd57 [diff] |
webui: implement multi-file diff view with continuous scrolling
Replace file selector with GitHub PR-style continuous scrolling through
multiple files in a single view, improving diff navigation experience
while maintaining all Monaco editor features.
Problem Analysis:
The existing diff view required users to navigate between files using a
dropdown selector and Previous/Next buttons. This created friction when
reviewing multi-file changes and broke the natural scrolling flow that
users expect from GitHub PR views or other modern diff interfaces.
The limitation was that Monaco doesn't provide a built-in multi-file diff
widget, requiring custom implementation with multiple IStandaloneDiffEditor
instances properly configured for stacking and auto-sizing.
Implementation Changes:
1. Multi-File Layout (sketch-diff2-view.ts):
- Replaced sketch-diff-file-picker with simple file count display
- Implemented renderFileDiff() to create separate diff sections per file
- Added renderFileHeader() with status badges and path information
- Created multi-file-diff-container with vertical stacking layout
- Added loadAllFileContents() for parallel content loading
- Replaced single originalCode/modifiedCode with Map<string, FileContent>
2. Monaco Auto-Sizing (sketch-monaco-view.ts):
- Configured diff editors with hidden scrollbars per Monaco ≥0.49 pattern
- Added setupAutoSizing() with content height calculation
- Implemented fitEditorToContent() using getContentHeight() callbacks
- Set automaticLayout: false for manual size control
- Added scrollbar: { vertical: 'hidden', horizontal: 'hidden', handleMouseWheel: false }
- Enabled minimap: false and scrollBeyondLastLine: false
3. CSS Styling (sketch-diff2-view.ts):
- Added file-diff-section with bottom borders for visual separation
- Implemented sticky file headers with proper z-index
- Created status badges (added, modified, deleted, renamed) with color coding
- Added file-count display replacing old file picker interface
- Configured diff-container with overflow: auto for outer scrolling
4. Content Management:
- Parallel loading of all file contents with error handling
- Maintains editability detection per file based on commit range
- Preserves comment and save functionality for individual files
- Updated toggleHideUnchangedRegions to apply to all editors
Technical Details:
- Uses Monaco's getContentHeight() and onDidContentSizeChange() for auto-sizing
- Each diff editor sized to Math.max(originalHeight, modifiedHeight) + 18px padding
- Outer container handles all scrolling while inner editors are sized to content
- File headers show status (Added/Modified/Deleted/Renamed) with appropriate styling
- Sticky positioning keeps file context visible during scrolling
- Maintains all existing features: editing, commenting, expand/collapse toggles
Benefits:
- Natural scrolling workflow similar to GitHub PR reviews
- Eliminates need for dropdown navigation between files
- Better visual context with file headers and status indicators
- Continuous viewing experience for multi-file changes
- Preserves all advanced Monaco features (editing, commenting, etc.)
- Improved performance with parallel content loading
Testing:
- Verified multi-file diff display with various commit ranges
- Tested scrolling behavior between files works smoothly
- Confirmed auto-sizing works correctly for different file sizes
- Validated file headers show correct status and change counts
- Ensured editing and commenting functionality preserved
- Tested expand/collapse toggles apply to all editors
This implementation follows the Monaco ≥0.49 multi-file diff pattern with
disabled inner scrollbars, auto-sizing to content, and outer scroll container,
providing a modern diff experience while maintaining full editor functionality.
Co-Authored-By: sketch <hello@sketch.dev>
Change-ID: s0724a00944669c80k
Sketch is an agentic coding tool. It draws the 🦉
Sketch runs in your terminal, has a web UI, understands your code, and helps you get work done. To keep your environment pristine, sketch starts a docker container and outputs its work onto a branch in your host git repository.
Sketch helps with most programming environments, but Sketch has extra goodies for Go.
go install sketch.dev/cmd/sketch@latest sketch
Currently, Sketch runs on macOS and Linux. It uses Docker for containers.
| Platform | Installation |
|---|---|
| macOS | brew install colima (or Docker Desktop/Orbstack) |
| Linux | apt install docker.io (or equivalent for your distro) |
| WSL2 | Install Docker Desktop for Windows (docker entirely inside WSL2 is tricky) |
The sketch.dev service is used to provide access to an LLM service and give you a way to access the web UI from anywhere.
Start Sketch by running sketch in a Git repository. It will open your browser to the Sketch chat interface, but you can also use the CLI interface. Use -open=false if you want to use just the CLI interface.
Ask Sketch about your codebase or ask it to implement a feature. It may take a little while for Sketch to do its work, so hit the bell (🔔) icon to enable browser notifications. We won't spam you or anything; it will notify you when the Sketch agent's turn is done, and there's something to look at.
When you start Sketch, it:
This design lets you run multiple sketches in parallel since they each have their own sandbox. It also lets Sketch work without worry: it can trash its own container, but it can't trash your machine.
Sketch's agentic loop uses tool calls (mostly shell commands, but also a handful of other important tools) to allow the LLM to interact with your codebase.
Sketch is trained to make Git commits. When those happen, they are automatically pushed to the git repository where you started sketch with branch names sketch/*.
Finding Sketch branches:
git branch -a --sort=creatordate | grep sketch/ | tail
The UI keeps track of the latest branch it pushed and displays it prominently. You can use standard Git workflows to pull those branches into your workspace:
git cherry-pick $(git merge-base origin/main sketch/foo)
or merge the branch
git merge sketch/foo
or reset to the branch
git reset --hard sketch/foo
Ie use the same workflows you would if you were pulling in a friend's Pull Request.
Advanced: You can ask Sketch to git fetch sketch-host and rebase onto another commit. This will also fetch where you started Sketch, and we do a bit of "git fetch refspec configuration" to make origin/main work as a git reference.
Don't be afraid of asking Sketch to help you rebase, merge/squash commits, rewrite commit messages, and so forth; it's good at it!
The diff view shows you changes since Sketch started. Leaving comments on lines adds them to the chat box, and, when you hit Send (at the bottom of the page), Sketch goes to work addressing your comments.
You can interact directly with the container in three ways:
ssh sketch-ilik-eske-tcha-lott. We have automatically configured your SSH configuration to make these special hostnames work.Using SSH (and/or VSCode) allows you to forward ports from the container to your machine. For example, if you want to start your development webserver, you can do something like this:
# Forward container port 8888 to local port 8000 ssh -L8000:localhost:8888 sketch-ilik-epor-tfor-ward go run ./cmd/server
This makes http://localhost:8000/ on your machine point to localhost:8888 inside the container.
You can ask Sketch to browse a web page and take screenshots. There are tools both for taking screenshots and "reading images", the latter of which sends the image to the LLM. This functionality is handy if you're working on a web page and want to see what the in-progress change looks like.
Docker images, containers, and so forth tend to pile up. Ask Docker to prune unused images and containers:
docker system prune -a
See CONTRIBUTING.md for development guidelines.
Sketch is open source. It is right here in this repository! Have a look around and mod away.
If you want to run Sketch entirely without the sketch.dev service, you can set the flag -skaband-addr="" and then provide an ANTHROPIC_API_KEY environment variable. (More LLM services coming soon!)