guito 1.0.8 → 1.0.10

package/CHANGELOG.md

@@ -4,6 +4,23 @@ All notable changes to Guito are documented in this file. The project follows [S
 
 ## [Unreleased]
 
+## [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
+
+- Every right-click menu now does what it says. The copy actions (commit hash, commit subject, tag, branch, stash and worktree names, worktree paths, file paths) reach the clipboard even where the browser's Async Clipboard API is unavailable — Guito served on a LAN address or inside a webview — and show a message when copying is refused instead of failing silently. Menu items are no longer swallowed by an in-flight background refresh either: while a fetch runs, items that change the repository are visibly disabled until it finishes, and read-only ones stay clickable.
+- **View Details** on a tag whose commit lies outside the loaded history now pages the log to it and selects it, exactly like clicking the tag row, and **Create Archive** on a side-panel row archives that row's ref instead of doing nothing.
+- Checking out a remote branch whose local name already exists no longer fails: the dialog warns before running, and the checkout switches to the existing local branch and fast-forwards it to the remote, reporting a warning when the two have diverged.
+- **Open Source Control View** works inside the VS Code panel (it now asks the extension host) instead of trying to open a `vscode://` link from an iframe.
+
 ## [1.0.8] - 2026-10-02
 
 ### Changed

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.

package/bin/guito-server.js

@@ -250,7 +250,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, showStashes, showTags, showRemoteBranches, issueRegex, issueUrl, allowMerge, fileListView, refListView, sidePanelSectionsExpanded, searchMode, searchCaseSensitive, worktreeSort, prSort, aiReview, azureRequestImpl, aiReviewModelImpl, avatarFetchImpl, onLog, }) {
     // Initialize server
     const app = fastify({
         logger: false,
@@ -685,6 +685,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;
@@ -738,6 +749,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,
@@ -1297,8 +1310,28 @@ export async function startGuitoServer({ repositoryPath, uiRoot, host, port = 80
                     : '';
                 if (newBranch) {
                     await verifyBranchName(newBranch);
-                    // --track sets the upstream when checking out a remote-tracking ref.
-                    await git.raw(['checkout', '-b', newBranch, ...(track ? ['--track'] : []), ref]);
+                    const branchExists = track && (await git.branchLocal()).all.includes(newBranch);
+                    if (branchExists) {
+                        // The name is taken: switch to the existing branch and sync it with
+                        // the remote ref instead of failing to create a duplicate.
+                        await git.raw(['checkout', newBranch]);
+                        try {
+                            await git.raw(['branch', '--set-upstream-to', ref, newBranch]);
+                        }
+                        catch {
+                            // Tracking is best effort; keep the branch's existing upstream.
+                        }
+                        try {
+                            await git.raw(['merge', '--ff-only', ref]);
+                        }
+                        catch (err) {
+                            warnings.push(`Branch "${newBranch}" was checked out but could not be synced with "${ref}". It may have diverged: ${err.message}`);
+                        }
+                    }
+                    else {
+                        // --track sets the upstream when checking out a remote-tracking ref.
+                        await git.raw(['checkout', '-b', newBranch, ...(track ? ['--track'] : []), ref]);
+                    }
                 }
                 else {
                     await git.raw(['checkout', ...(detach ? ['--detach'] : []), ref]);
@@ -1842,6 +1875,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;
             }
@@ -3628,6 +3672,8 @@ export async function startGuitoServer({ repositoryPath, uiRoot, host, port = 80
             sidePanelSectionsExpanded = settings.sidePanelSectionsExpanded;
             searchMode = settings.searchMode;
             searchCaseSensitive = settings.searchCaseSensitive;
+            worktreeSort = settings.worktreeSort;
+            prSort = settings.prSort;
             showTags = settings.showTags;
             showRemoteBranches = settings.showRemoteBranches;
             issueRegex = settings.issueRegex;

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-YO57LHBH.js" type="module"></script></body>
+<script src="polyfills-5CFQRCPP.js" type="module"></script><script src="main-PE4C5Y3Z.js" type="module"></script></body>
 </html>