guito 1.0.9 → 1.0.11

package/CHANGELOG.md

@@ -4,6 +4,30 @@ All notable changes to Guito are documented in this file. The project follows [S
 
 ## [Unreleased]
 
+## [1.0.11] - 2026-10-12
+
+### Added
+
+- Keyboard shortcuts for the commit history. **Ctrl+F** focuses the commit search box, **Ctrl+J** selects and scrolls to the current branch's commit (or the checked-out commit when HEAD is detached), and **Ctrl+G** opens a **Go to Commit** dialog. Type a row number to jump to that row of the list as currently shown, or a commit hash (at least 4 characters) to jump to that commit. History that isn't loaded yet is fetched as needed, and the dialog explains when a row is out of range, a hash is ambiguous or unknown, or the commit is hidden by the current branch or search filter. On macOS, Cmd works in place of Ctrl. The shortcuts do nothing while a dialog is open.
+- **Code review of uncommitted changes.** A new **Code review** button sits after the stash buttons on the uncommitted changes panel. It has Claude Code review everything not yet committed: staged, unstaged and untracked files. While the review runs, the button turns into **Stop review**. When it finishes, the results open in a new tab: a VS Code editor tab inside the extension, or a browser tab in standalone Guito. Each finding shows its severity and comment and links to the file and line. Its **Auto fix** button has Claude Code fix that one problem in the working tree. Claude Code may only read and edit files; it cannot run commands or use git. The fix shows up as an ordinary uncommitted edit, and **Stop** cancels a running fix. Reviews and fixes use the configured review model, effort, instructions and timeout (`guito.aiReview.*`). The last review is kept per worktree in `.git/guito-working-review.json`.
+
+### Changed
+
+- Ref pills in the commit history now match the graph. Each branch pill takes the color of its graph line; the current branch stays filled, now in its line color instead of a fixed blue. Local and remote branches and tags share one pill style. Remote branches get a cloud icon and tags keep the tag icon, and tags use a soft yellow that no graph line uses. To keep that yellow unique, the graph's two yellowish line colors were replaced with violet and silver. Prefer a quieter look? The new **Gray branch and tag pills** setting (`guito.grayRefBadges` in VS Code, off by default) draws every branch and tag pill in one neutral gray, with the current branch filled.
+- The close buttons on the uncommitted changes panel, commit detail, settings, pull request, diff and merge conflict views, and the error banner's dismiss button now share one look and behavior, matching the commit panel's close button.
+
+### Removed
+
+- Stashes no longer appear in the commit history. The "Show stashes" setting (`guito.showStashes` in VS Code) is gone, and the latest stash commit is no longer drawn in the graph; stashes are listed only in the repository panel.
+
+## [1.0.10] - 2026-10-10
+
+### Added
+
+- Sort the repository panel's worktrees and pull requests. New **Worktree order** and **Pull request order** settings (`guito.worktreeSort` and `guito.prSort` inside the extension) order each section independently: worktrees offer Default order, Name A–Z and Name Z–A, while pull requests offer Newest first, Oldest first, Title A–Z and Title Z–A. The defaults keep the current behavior.
+- Both side panels can now be resized. Drag the thin handle on the repository panel's right edge or on a commit detail / working panel's left edge to give it more or less room; arrow keys resize too (hold Shift for bigger steps), and double-clicking the handle returns the panel to its default width. Each choice is remembered between sessions, and the two right-hand panels share one width so the detail view keeps its size as you move between commits and uncommitted changes.
+- The diff viewers now include a code minimap. A scaled-down preview of the changed file sits on the modified side of every diff — commits, working-tree and branch comparisons, and pull request reviews alike — with green marks where lines were added and red marks where lines were removed, so the shape of a change is visible without scrolling. Clicking or dragging the minimap moves the diff, and the diff dialog's header has a new **Toggle minimap** button for hiding it when you would rather give the code the full width.
+
 ## [1.0.9] - 2026-10-04
 
 ### Fixed

package/README.md

@@ -14,7 +14,7 @@ The name combines **GUI** and **Git**: **G**u**IT**o. It is also a [Portuguese w
 - Stashes listed in the commit table with apply, pop, and drop actions.
 - Commit search by subject, body, author, or hash, with loading feedback and retries.
 - Local and remote branch filtering.
-- Commit and working-tree diffs powered by the Monaco editor, with inline and side-by-side layouts.
+- Commit and working-tree diffs powered by the Monaco editor, with inline and side-by-side layouts and a code minimap preview of the changed file.
 - Fetch, pull, pull with rebase, push, and sync actions.
 - Context actions for creating branches and tags, checking out commits, cherry-picking, reverting, merging, rebasing, resetting, and exporting archives.
 - Working-tree actions for stashing changes, resetting tracked changes, and cleaning untracked files.
@@ -97,9 +97,9 @@ The settings dialog also manages preferences that have no VS Code equivalent: th
 | -------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | `guito.autoReload`               | Reload commits and the working tree automatically when the repository changes outside Guito, for example from a terminal. On by default.                 |
 | `guito.showGraph`                | Show the Git graph beside the commit history. On by default.                                                                                            |
-| `guito.showStashes`              | Show stash entries above the commit history. Off by default.                                                                                            |
 | `guito.showTags`                 | Show tag badges attached to commits. On by default.                                                                                                     |
 | `guito.showRemoteBranches`       | Show remote branches in the repository panel and the branch pills on commits. On by default.                                                            |
+| `guito.grayRefBadges`            | Show branch and tag pills in a single neutral gray instead of graph lane colors. Off by default.                                                        |
 | `guito.fileListView`             | How changed-file lists are shown: `flat` (default) lists every file with its full path, `tree` groups them into collapsible folders.                    |
 | `guito.refListView`              | How branches and tags are shown in the repository panel: `flat` (default) lists full names, `tree` groups them into collapsible namespace folders.      |
 | `guito.sidePanelSectionsExpanded`| Open the repository panel with all sections expanded. On by default.                                                                                    |

package/bin/ai-review.js

@@ -2,7 +2,7 @@ import { spawn } from 'node:child_process';
 import { createHash } from 'node:crypto';
 import { homedir } from 'node:os';
 import { join } from 'node:path';
-const SEVERITIES = ['blocker', 'concern', 'suggestion', 'nit'];
+export const SEVERITIES = ['blocker', 'concern', 'suggestion', 'nit'];
 /** Effort levels Claude Code accepts for --effort; '' leaves it to Claude Code. */
 export const AI_REVIEW_EFFORTS = ['', 'low', 'medium', 'high', 'xhigh', 'max'];
 /** How much a drafted commit message says beyond its subject line. */
@@ -267,7 +267,7 @@ export function parseModelReview(raw) {
     };
 }
 /** Identity of a finding across re-reviews: same place, same point. */
-function fingerprint(file, title) {
+export function fingerprint(file, title) {
     const normalized = title
         .toLowerCase()
         .replace(/[^a-z0-9]+/g, ' ')
@@ -275,7 +275,7 @@ function fingerprint(file, title) {
     return createHash('sha1').update(`${file}\u0000${normalized}`).digest('hex').slice(0, 16);
 }
 /** Renders one file's diff with the line numbers the model must cite. */
-function renderFileDiff(diff, budget) {
+export function renderFileDiff(diff, budget) {
     const header = `--- FILE: ${diff.path}${diff.oldPath && diff.oldPath !== diff.path ? ` (renamed from ${diff.oldPath})` : ''} [${diff.status}] ---`;
     if (diff.binary)
         return `${header}\n(binary file, not reviewable)\n`;
@@ -320,7 +320,7 @@ function renderThreads(threads) {
     })
         .join('\n');
 }
-const REVIEW_CONTRACT = `Reply with one JSON object and nothing else:
+export const REVIEW_CONTRACT = `Reply with one JSON object and nothing else:
 {"summary": "<one or two sentences on the change as a whole>",
  "findings": [
    {"file": "<path exactly as given in the diff header, or \\"\\" for the change as a whole>",

package/bin/guito-server.js

@@ -16,6 +16,7 @@ import { avatarCache } from './avatars.js';
 import { repositoryState } from './repository-state.js';
 import { createAiReviewer, resolveAiReviewConfig, } from './ai-review.js';
 import { generateCommitMessage } from './commit-message.js';
+import { WorkingReviewBusyError, createWorkingReviewer, } from './working-review.js';
 const execFileAsync = promisify(execFile);
 const AZURE_API_VERSION = '5.0-preview';
 // The Policy API has been GA since 4.1 and does not answer to the
@@ -250,7 +251,7 @@ const azureErrorMessage = (result) => {
         return result.body;
     }
 };
-export async function startGuitoServer({ repositoryPath, uiRoot, host, port = 8080, apiToken, azureDevOpsUrl, prBranchNameTemplate, autoReload, diffViewer, showGraph, showStashes, showTags, showRemoteBranches, issueRegex, issueUrl, allowMerge, fileListView, refListView, sidePanelSectionsExpanded, searchMode, searchCaseSensitive, aiReview, azureRequestImpl, aiReviewModelImpl, avatarFetchImpl, onLog, }) {
+export async function startGuitoServer({ repositoryPath, uiRoot, host, port = 8080, apiToken, azureDevOpsUrl, prBranchNameTemplate, autoReload, diffViewer, showGraph, showTags, showRemoteBranches, grayRefBadges, issueRegex, issueUrl, allowMerge, fileListView, refListView, sidePanelSectionsExpanded, searchMode, searchCaseSensitive, worktreeSort, prSort, aiReview, azureRequestImpl, aiReviewModelImpl, avatarFetchImpl, onLog, }) {
     // Initialize server
     const app = fastify({
         logger: false,
@@ -501,14 +502,18 @@ export async function startGuitoServer({ repositoryPath, uiRoot, host, port = 80
     // azureDevOpsUrl, which wins over the file.
     let settingsPath = '';
     let reviewStorePath = '';
+    // Per worktree: each one has its own uncommitted changes.
+    let workingReviewStorePath = '';
     try {
         const gitDir = (await git.revparse(['--absolute-git-dir'])).trim();
         settingsPath = join(gitDir, 'guito-settings.json');
         reviewStorePath = join(gitDir, 'guito-ai-reviews.json');
+        workingReviewStorePath = join(gitDir, 'guito-working-review.json');
     }
     catch {
         settingsPath = join(repositoryPath, '.git', 'guito-settings.json');
         reviewStorePath = join(repositoryPath, '.git', 'guito-ai-reviews.json');
+        workingReviewStorePath = join(repositoryPath, '.git', 'guito-working-review.json');
     }
     const readSettings = async () => {
         try {
@@ -674,9 +679,9 @@ export async function startGuitoServer({ repositoryPath, uiRoot, host, port = 80
         const [file, azure] = await Promise.all([readSettings(), effectiveAzureUrl()]);
         const fileAutoReload = typeof file.autoReload === 'boolean' ? file.autoReload : undefined;
         const fileShowGraph = typeof file.showGraph === 'boolean' ? file.showGraph : undefined;
-        const fileShowStashes = typeof file.showStashes === 'boolean' ? file.showStashes : undefined;
         const fileShowTags = typeof file.showTags === 'boolean' ? file.showTags : undefined;
         const fileShowRemoteBranches = typeof file.showRemoteBranches === 'boolean' ? file.showRemoteBranches : undefined;
+        const fileGrayRefBadges = typeof file.grayRefBadges === 'boolean' ? file.grayRefBadges : undefined;
         const fileFileListView = file.fileListView === 'tree' || file.fileListView === 'flat' ? file.fileListView : undefined;
         const fileRefListView = file.refListView === 'tree' || file.refListView === 'flat' ? file.refListView : undefined;
         const fileSidePanelSectionsExpanded = typeof file.sidePanelSectionsExpanded === 'boolean'
@@ -685,6 +690,17 @@ export async function startGuitoServer({ repositoryPath, uiRoot, host, port = 80
         const fileSearchMode = file.searchMode === 'filter' || file.searchMode === 'navigate' ? file.searchMode : undefined;
         const fileAllowMerge = typeof file.allowMerge === 'boolean' ? file.allowMerge : undefined;
         const fileSearchCaseSensitive = typeof file.searchCaseSensitive === 'boolean' ? file.searchCaseSensitive : undefined;
+        const fileWorktreeSort = file.worktreeSort === 'default' ||
+            file.worktreeSort === 'name-asc' ||
+            file.worktreeSort === 'name-desc'
+            ? file.worktreeSort
+            : undefined;
+        const filePrSort = file.prSort === 'newest' ||
+            file.prSort === 'oldest' ||
+            file.prSort === 'title-asc' ||
+            file.prSort === 'title-desc'
+            ? file.prSort
+            : undefined;
         const filePrBranchNameTemplate = typeof file.prBranchNameTemplate === 'string' && file.prBranchNameTemplate.trim()
             ? file.prBranchNameTemplate.trim()
             : undefined;
@@ -724,11 +740,11 @@ export async function startGuitoServer({ repositoryPath, uiRoot, host, port = 80
             autoReload: typeof autoReload === 'boolean' ? autoReload : (fileAutoReload ?? true),
             diffViewer: diffViewer === 'vscode' ? 'vscode' : 'guito',
             showGraph: typeof showGraph === 'boolean' ? showGraph : (fileShowGraph ?? true),
-            showStashes: typeof showStashes === 'boolean' ? showStashes : (fileShowStashes ?? false),
             showTags: typeof showTags === 'boolean' ? showTags : (fileShowTags ?? true),
             showRemoteBranches: typeof showRemoteBranches === 'boolean'
                 ? showRemoteBranches
                 : (fileShowRemoteBranches ?? true),
+            grayRefBadges: typeof grayRefBadges === 'boolean' ? grayRefBadges : (fileGrayRefBadges ?? false),
             fileListView: fileListView ?? fileFileListView ?? 'flat',
             refListView: refListView ?? fileRefListView ?? 'flat',
             sidePanelSectionsExpanded: typeof sidePanelSectionsExpanded === 'boolean'
@@ -738,6 +754,8 @@ export async function startGuitoServer({ repositoryPath, uiRoot, host, port = 80
             searchCaseSensitive: typeof searchCaseSensitive === 'boolean'
                 ? searchCaseSensitive
                 : (fileSearchCaseSensitive ?? false),
+            worktreeSort: worktreeSort ?? fileWorktreeSort ?? 'default',
+            prSort: prSort ?? filePrSort ?? 'newest',
             allowMerge: typeof allowMerge === 'boolean' ? allowMerge : (fileAllowMerge ?? true),
             aiReview: resolveAiReviewConfig(file.aiReview, aiReview),
             issueLinking,
@@ -791,6 +809,8 @@ export async function startGuitoServer({ repositoryPath, uiRoot, host, port = 80
                     author_email: '%aE',
                     parents: '%P',
                 },
+                // Stashes are listed only in the side panel, never in the history graph.
+                '--exclude=refs/stash': null,
                 '--all': null,
             };
             if (Number.isFinite(limit) && limit > 0) {
@@ -801,7 +821,7 @@ export async function startGuitoServer({ repositoryPath, uiRoot, host, port = 80
             }
             const [log, count, identity] = await Promise.all([
                 git.log(options),
-                git.raw(['rev-list', '--count', '--all']),
+                git.raw(['rev-list', '--count', '--exclude=refs/stash', '--all']),
                 configuredIdentity(),
             ]);
             const commits = log.all.map((commit) => ({
@@ -837,7 +857,7 @@ export async function startGuitoServer({ repositoryPath, uiRoot, host, port = 80
             // NUL separators are safe because Git commit messages cannot contain
             // NUL bytes. Searching in JS lets insensitive mode fold accents too,
             // which Git's --regexp-ignore-case does not do consistently.
-            const raw = await git.raw(['log', '--all', '--format=%H%x00%B%x00']);
+            const raw = await git.raw(['log', '--exclude=refs/stash', '--all', '--format=%H%x00%B%x00']);
             const fields = raw.split('\0');
             const normalizedQuery = normalizeSearchText(query, caseSensitive);
             const hashes = [];
@@ -1838,15 +1858,15 @@ export async function startGuitoServer({ repositoryPath, uiRoot, host, port = 80
             if (typeof body.autoReload === 'boolean') {
                 settings.autoReload = body.autoReload;
             }
-            if (typeof body.showStashes === 'boolean') {
-                settings.showStashes = body.showStashes;
-            }
             if (typeof body.showTags === 'boolean') {
                 settings.showTags = body.showTags;
             }
             if (typeof body.showRemoteBranches === 'boolean') {
                 settings.showRemoteBranches = body.showRemoteBranches;
             }
+            if (typeof body.grayRefBadges === 'boolean') {
+                settings.grayRefBadges = body.grayRefBadges;
+            }
             if (body.fileListView === 'tree' || body.fileListView === 'flat') {
                 settings.fileListView = body.fileListView;
             }
@@ -1862,6 +1882,17 @@ export async function startGuitoServer({ repositoryPath, uiRoot, host, port = 80
             if (typeof body.searchCaseSensitive === 'boolean') {
                 settings.searchCaseSensitive = body.searchCaseSensitive;
             }
+            if (body.worktreeSort === 'default' ||
+                body.worktreeSort === 'name-asc' ||
+                body.worktreeSort === 'name-desc') {
+                settings.worktreeSort = body.worktreeSort;
+            }
+            if (body.prSort === 'newest' ||
+                body.prSort === 'oldest' ||
+                body.prSort === 'title-asc' ||
+                body.prSort === 'title-desc') {
+                settings.prSort = body.prSort;
+            }
             if (typeof body.allowMerge === 'boolean') {
                 settings.allowMerge = body.allowMerge;
             }
@@ -3441,6 +3472,79 @@ export async function startGuitoServer({ repositoryPath, uiRoot, host, port = 80
             return resp.status(400).type('application/json').send({ error: err.message });
         }
     });
+    // ==================== Code review of uncommitted changes ====================
+    // One Claude Code run over everything not yet committed; the findings open
+    // in their own tab, where each one can be handed back to Claude Code to fix.
+    // Runs are started here and followed by polling GET /api/working-review.
+    const workingReviewer = createWorkingReviewer({
+        storePath: workingReviewStorePath,
+        cwd: repositoryPath,
+        loadChanges: async () => {
+            await mutationQueue;
+            const snapshot = await working.snapshot();
+            let branch = '';
+            try {
+                branch = await currentBranch();
+            }
+            catch {
+                branch = '';
+            }
+            return {
+                branch,
+                diffs: snapshot.files.map((file) => ({
+                    path: file.path,
+                    oldPath: file.oldPath ?? '',
+                    status: file.status,
+                    binary: file.status === 'binary',
+                    lines: file.lines ?? [],
+                })),
+            };
+        },
+        config: refreshAiReviewConfig,
+        runModel: aiReviewModelImpl,
+        log: (line) => onLog?.(line),
+    });
+    const workingReviewError = (resp, err) => resp
+        .status(err instanceof WorkingReviewBusyError ? 409 : 400)
+        .type('application/json')
+        .send({ error: err.message });
+    app.get('/api/working-review', async (_req, resp) => {
+        try {
+            return resp.type('application/json').send({ state: await workingReviewer.state() });
+        }
+        catch (err) {
+            return workingReviewError(resp, err);
+        }
+    });
+    app.post('/api/working-review', async (req, resp) => {
+        try {
+            const state = await workingReviewer.start({
+                model: strField(req.body?.model),
+                effort: typeof req.body?.effort === 'string' ? req.body.effort : undefined,
+            });
+            return resp.type('application/json').send({ state });
+        }
+        catch (err) {
+            return workingReviewError(resp, err);
+        }
+    });
+    app.post('/api/working-review/cancel', async (_req, resp) => {
+        workingReviewer.cancel();
+        return resp.type('application/json').send({ ok: true });
+    });
+    app.post('/api/working-review/findings/:id/fix', async (req, resp) => {
+        try {
+            const state = await workingReviewer.startFix(String(req.params?.id ?? ''));
+            return resp.type('application/json').send({ state });
+        }
+        catch (err) {
+            return workingReviewError(resp, err);
+        }
+    });
+    app.post('/api/working-review/fix/cancel', async (_req, resp) => {
+        workingReviewer.cancelFix();
+        return resp.type('application/json').send({ ok: true });
+    });
     // ==================== Commit Detail ====================
     app.post('/api/commit/detail', async (req, resp) => {
         try {
@@ -3633,8 +3737,11 @@ export async function startGuitoServer({ repositoryPath, uiRoot, host, port = 80
         address,
         aiReview: aiReviewer,
         generateCommitMessage: draftCommitMessage,
+        workingReview: workingReviewer,
         close: async () => {
             aiReviewer.stop();
+            workingReviewer.cancel();
+            workingReviewer.cancelFix();
             await app.close();
         },
         updateSettings: (settings) => {
@@ -3643,13 +3750,15 @@ export async function startGuitoServer({ repositoryPath, uiRoot, host, port = 80
             autoReload = settings.autoReload;
             diffViewer = settings.diffViewer;
             showGraph = settings.showGraph;
-            showStashes = settings.showStashes;
             fileListView = settings.fileListView;
             sidePanelSectionsExpanded = settings.sidePanelSectionsExpanded;
             searchMode = settings.searchMode;
             searchCaseSensitive = settings.searchCaseSensitive;
+            worktreeSort = settings.worktreeSort;
+            prSort = settings.prSort;
             showTags = settings.showTags;
             showRemoteBranches = settings.showRemoteBranches;
+            grayRefBadges = settings.grayRefBadges;
             issueRegex = settings.issueRegex;
             issueUrl = settings.issueUrl;
             allowMerge = settings.allowMerge;

package/bin/ui/browser/index.html

@@ -9,5 +9,5 @@
 <style>:root{--bg:#1e1e1e;--bg-alt:#232323;--bg-hover:#2a2d2e;--border:#3c3c3c;--text:#cccccc;--text-bright:#e8e8e8;--text-dim:#9d9d9d;--accent:#3794ff;--red:#f14c4c;--mono:ui-monospace, "Cascadia Code", "SF Mono", Menlo, Consolas, monospace}*{box-sizing:border-box}html,body{height:100%;margin:0}body{font-family:-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,sans-serif;font-size:13px;color:var(--text);background:var(--bg);overflow:hidden}</style><link rel="stylesheet" href="styles-I7K2YZTW.css" media="print" onload="this.media='all'"><noscript><link rel="stylesheet" href="styles-I7K2YZTW.css"></noscript></head>
 <body>
   <app-root></app-root>
-<script src="polyfills-5CFQRCPP.js" type="module"></script><script src="main-VNIXKHUJ.js" type="module"></script></body>
+<script src="polyfills-5CFQRCPP.js" type="module"></script><script src="main-3MOB345X.js" type="module"></script></body>
 </html>