guito 0.5.4 → 0.6.0

package/CHANGELOG.md

@@ -2,6 +2,35 @@
 
 All notable changes to Guito are documented in this file. The project follows [Semantic Versioning](https://semver.org/spec/v2.0.0.html), and this changelog is structured around [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 
+## [0.6.0] - 2026-09-07
+
+### Added
+
+- Stage and unstage individual files, selected ranges, or all changes from the Uncommitted changes panel, with Ctrl/Cmd and Shift selection and separate index/working-tree diff previews.
+- Write a commit subject and optional description, then commit staged changes without leaving Guito. Drafts survive panel closure and failed commits during the session.
+- Rename and delete local branches from the branch context menu. Deleting the checked-out branch is disabled, the branches dropdown follows renames, and it falls back to "Show All" when the selected branch is deleted.
+- Navigate commit search results with up/down arrows (or Enter and Shift+Enter in the search box) instead of filtering the list. Matches are highlighted in place, the counter shows the focused match, and navigating to a match outside the loaded history fetches more commits until it can be selected and scrolled into view.
+- Choose the reset type when resetting the current branch to a commit. A dialog offers soft (keep changes staged), mixed (keep changes unstaged), and hard (discard all changes) resets.
+- Add a tag context menu with view details, delete tag, push tag, create archive, and copy tag name actions. Pushing a tag uploads it to the remote through the new `/api/tag/push` endpoint.
+- Clear the commit search with a dedicated button.
+- Persist column widths and the commit message draft across sessions using browser storage.
+- Stash all, staged, or unstaged changes directly from the Uncommitted changes panel. Staged-only stashes keep unstaged work in place, and unstaged stashes keep staged changes staged.
+- Discard selected or all unstaged changes from the Uncommitted changes panel after a confirmation dialog. Discarding unstaged edits preserves staged changes for files with both.
+- Added browser regressions and Git integration coverage for search, table alignment, staging, committing, and branch management.
+
+### Changed
+
+- Remove the per-file stage/unstage buttons from file rows in the Uncommitted changes panel; staging and unstaging now use the selection and bulk actions in each section header.
+
+### Fixed
+
+- Keep the table header, uncommitted row, graph, and commit columns aligned while scrolling horizontally or resizing columns.
+- Restore virtual rows after searching or clearing empty results; show loading feedback during search, refresh, history loading, and graph computation.
+- Recover pending graph work when its worker fails, ignore superseded search requests, and allow explicit retries without automatic failure loops.
+- Preserve the last known working status after errors and support initial commits, partial staging, renamed/deleted files, and literal filenames.
+- Reject blank subjects, empty-index commits, and unresolved conflicts, and prevent overlapping UI mutations.
+- Keep commit graph edges connected across viewport boundaries while scrolling, so long merge edges no longer disappear from view.
+
 ## [0.5.4] - 2026-09-06
 
 ### Changed

package/CONTRIBUTION.md

@@ -96,8 +96,14 @@ Run the same core checks used by the release workflow:
 npm run check
 npm run build
 npm test
+npx playwright install chromium --only-shell
+npm run test:browser
 ```
 
+The browser suite uses a disposable repository and authenticated API fixtures. Failure traces are saved under `test-results/`.
+
+On Windows, after building, `node tests/browser/vscode-smoke.mjs` also opens an isolated Extension Development Host, stages a fixture file, and commits it through the authenticated webview. Set `GUITO_CODE_EXE` if VS Code is installed outside its default per-user location. The test closes its host and removes its temporary profile and repository afterward.
+
 - Add or update tests when changing server routes, authentication, repository selection, or Git behavior.
 - Test UI changes against a disposable repository with branches, merges, remote references, working-tree changes, and untracked files where relevant.
 - Exercise destructive operations only in a disposable repository.

package/README.md

@@ -9,12 +9,13 @@ The name combines **GUI** and **Git**: **G**u**IT**o. It is also a [Portuguese w
 ## Features
 
 - Visual commit graph with branch and tag references.
-- Commit search by subject, author, or hash.
+- 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.
 - 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.
+- Stage and unstage files with multi-selection, preview staged and unstaged diffs, and commit staged changes.
 - Browser-based CLI and a VS Code extension with local, Remote SSH, Dev Container, and Codespaces support.
 
 > [!CAUTION]
@@ -48,6 +49,12 @@ After installing the extension, open a trusted workspace containing a Git reposi
 
 In a multi-root workspace, Guito asks which repository to open. Git must be available on the local or remote VS Code extension host.
 
+## Stage and commit changes
+
+Click **Uncommitted changes** to open the staged and unstaged file lists. Click to select a file, Ctrl/Cmd-click to toggle individual files, or Shift-click to select a range. Use the per-file buttons, selected-file actions, or **Stage all** / **Unstage all**. The separate **Diff** button previews only the changes in that list.
+
+Enter a commit message and optional description, then choose **Commit staged changes**. Only staged changes are committed; unstaged edits remain on disk. Commit drafts stay available when you close and reopen the panel during the session.
+
 ## CLI options
 
 ```text

package/bin/guito-server.js

@@ -8,6 +8,7 @@ import fastifyCors from '@fastify/cors';
 import fastifyCompress from '@fastify/compress';
 import { simpleGit } from 'simple-git';
 import { promisify } from 'node:util';
+import { workingTree } from './working-tree.js';
 const execFileAsync = promisify(execFile);
 export async function startGuitoServer({ repositoryPath, uiRoot, host, port = 8080, apiToken, }) {
     // Initialize server
@@ -128,6 +129,14 @@ export async function startGuitoServer({ repositoryPath, uiRoot, host, port = 80
             files.push(current);
         return files;
     }
+    const working = workingTree(git, parseUnifiedDiff);
+    // Keep validation and the corresponding index mutation in one operation.
+    let mutationQueue = Promise.resolve();
+    const mutate = (action) => {
+        const result = mutationQueue.then(action);
+        mutationQueue = result.catch(() => { });
+        return result;
+    };
     const repoRoot = async () => (await git.revparse(['--show-toplevel'])).trim();
     // ==================== Repository ====================
     app.get('/api/repo', async (_req, resp) => {
@@ -208,9 +217,12 @@ export async function startGuitoServer({ repositoryPath, uiRoot, host, port = 80
                 `--grep=${query}`,
                 '--format=%H',
             ]);
-            return resp
-                .type('application/json')
-                .send({ hashes: raw.split('\n').map((hash) => hash.trim()).filter(Boolean) });
+            return resp.type('application/json').send({
+                hashes: raw
+                    .split('\n')
+                    .map((hash) => hash.trim())
+                    .filter(Boolean),
+            });
         }
         catch (err) {
             if (/does not have any commits yet|unknown revision|bad default revision/i.test(err.message ?? '')) {
@@ -221,8 +233,8 @@ export async function startGuitoServer({ repositoryPath, uiRoot, host, port = 80
     });
     app.post('/api/commit', async (req, resp) => {
         try {
-            const { message, description } = req.body;
-            await git.commit([message, ...(description ? [description] : [])], { '--allow-empty': null });
+            const { message, description } = req.body ?? {};
+            await mutate(() => working.commit(message, description));
             return resp.type('application/json').send({ success: true });
         }
         catch (err) {
@@ -272,7 +284,8 @@ export async function startGuitoServer({ repositoryPath, uiRoot, host, port = 80
     });
     app.post('/api/reset-commit', async (req, resp) => {
         try {
-            await git.raw(['reset', '--hard', req.body.commit]);
+            const mode = ['soft', 'mixed', 'hard'].includes(req.body?.mode) ? req.body.mode : 'hard';
+            await git.raw(['reset', `--${mode}`, req.body.commit]);
             return resp.type('application/json').send({ success: true });
         }
         catch (err) {
@@ -291,10 +304,7 @@ export async function startGuitoServer({ repositoryPath, uiRoot, host, port = 80
     });
     app.post('/api/stage', async (req, resp) => {
         try {
-            const { files } = req.body;
-            if (Array.isArray(files) && files.length > 0) {
-                await git.add(files);
-            }
+            await mutate(() => working.stage(req.body?.files));
             return resp.type('application/json').send({ success: true });
         }
         catch (err) {
@@ -303,10 +313,7 @@ export async function startGuitoServer({ repositoryPath, uiRoot, host, port = 80
     });
     app.post('/api/unstage', async (req, resp) => {
         try {
-            const { files } = req.body;
-            if (Array.isArray(files) && files.length > 0) {
-                await git.reset(['HEAD', ...files]);
-            }
+            await mutate(() => working.unstage(req.body?.files));
             return resp.type('application/json').send({ success: true });
         }
         catch (err) {
@@ -472,8 +479,22 @@ export async function startGuitoServer({ repositoryPath, uiRoot, host, port = 80
     });
     app.post('/api/stash/save', async (req, resp) => {
         try {
-            const { message } = req.body;
-            await git.stash(['save', message || '']);
+            const { message, scope } = req.body ?? {};
+            // 'staged' → index only (--staged, git ≥ 2.35); 'unstaged' → working tree only
+            // (--keep-index leaves staged changes staged); 'all' → index + working tree.
+            // Untracked files ride along for 'all'/'unstaged' since the panel lists them as unstaged.
+            const args = ['push'];
+            if (scope === 'staged') {
+                args.push('--staged');
+            }
+            else {
+                if (scope === 'unstaged')
+                    args.push('--keep-index');
+                args.push('-u');
+            }
+            if (message)
+                args.push('-m', message);
+            await git.stash(args);
             return resp.type('application/json').send({ success: true });
         }
         catch (err) {
@@ -555,6 +576,19 @@ export async function startGuitoServer({ repositoryPath, uiRoot, host, port = 80
             return resp.status(400).type('application/json').send({ error: err.message });
         }
     });
+    app.post('/api/tag/push', async (req, resp) => {
+        try {
+            const { name, remote } = req.body;
+            if (!name) {
+                return resp.status(400).type('application/json').send({ error: 'name required' });
+            }
+            await git.push(remote || 'origin', `refs/tags/${name}`);
+            return resp.type('application/json').send({ success: true });
+        }
+        catch (err) {
+            return resp.status(400).type('application/json').send({ error: err.message });
+        }
+    });
     // ==================== Remote Operations ====================
     app.get('/api/fetch', async (_req, resp) => {
         try {
@@ -620,7 +654,9 @@ export async function startGuitoServer({ repositoryPath, uiRoot, host, port = 80
                 '--format=%H%x00%aI%x00%s%x00%b%x00%aN%x00%aE%x00%P',
                 hash,
             ]);
-            const [fullHash, date, message, body, authorName, authorEmail, parents] = raw.trimEnd().split('\u0000');
+            const [fullHash, date, message, body, authorName, authorEmail, parents] = raw
+                .trimEnd()
+                .split('\u0000');
             return resp.type('application/json').send({
                 hash: fullHash,
                 date,
@@ -664,57 +700,8 @@ export async function startGuitoServer({ repositoryPath, uiRoot, host, port = 80
     // ==================== Working Changes ====================
     app.get('/api/working-changes', async (_req, resp) => {
         try {
-            const root = await repoRoot();
-            // Combined diff of the working tree + index against HEAD.
-            const rawDiff = await git.raw(['diff', 'HEAD', '--no-color', '--find-renames']);
-            const files = parseUnifiedDiff(rawDiff);
-            // Untracked files are not part of `git diff` — add them as new files.
-            const status = await git.status();
-            for (const file of status.not_added ?? []) {
-                let isBinary = false;
-                let content = '';
-                try {
-                    const buffer = await readFile(join(root, file));
-                    if (buffer.includes(0)) {
-                        isBinary = true;
-                    }
-                    else {
-                        content = buffer.toString('utf8');
-                    }
-                }
-                catch {
-                    content = '';
-                }
-                if (isBinary) {
-                    files.push({
-                        path: file,
-                        oldPath: '',
-                        status: 'binary',
-                        lines: [],
-                        additions: 0,
-                        deletions: 0,
-                    });
-                }
-                else {
-                    const lines = content.length > 0 ? content.split('\n') : [];
-                    files.push({
-                        path: file,
-                        oldPath: '',
-                        status: 'added',
-                        lines: lines.map((text, index) => ({ type: 'add', newLine: index + 1, text })),
-                        additions: lines.length,
-                        deletions: 0,
-                    });
-                }
-            }
-            const stagedRaw = await git.raw(['diff', '--name-only', '--cached']);
-            const unstagedRaw = await git.raw(['diff', '--name-only']);
-            return resp.type('application/json').send({
-                files,
-                staged: stagedRaw.split('\n').filter(Boolean),
-                unstaged: unstagedRaw.split('\n').filter(Boolean),
-                untracked: status.not_added ?? [],
-            });
+            await mutationQueue;
+            return resp.type('application/json').send(await working.snapshot());
         }
         catch (err) {
             return resp.status(400).type('application/json').send({ error: err.message });
@@ -750,7 +737,7 @@ export async function startGuitoServer({ repositoryPath, uiRoot, host, port = 80
                 return resp.type('application/json').send({ content: '' });
             }
             try {
-                const content = await git.raw(['show', `${ref}:${path}`]);
+                const content = await git.raw(['show', ref === 'INDEX' ? `:${path}` : `${ref}:${path}`]);
                 if (content.includes('\u0000')) {
                     return resp.type('application/json').send({ binary: true, content: '' });
                 }
@@ -768,7 +755,7 @@ export async function startGuitoServer({ repositoryPath, uiRoot, host, port = 80
     // ==================== Discard ====================
     app.post('/api/discard', async (req, resp) => {
         try {
-            const { files } = req.body;
+            const { files, mode } = req.body;
             if (!Array.isArray(files) || files.length === 0) {
                 return resp.status(400).type('application/json').send({ error: 'files required' });
             }
@@ -778,7 +765,20 @@ export async function startGuitoServer({ repositoryPath, uiRoot, host, port = 80
             const tracked = files.filter((file) => !untracked.has(file));
             const removed = files.filter((file) => untracked.has(file));
             if (tracked.length > 0) {
-                await git.raw(['checkout', 'HEAD', '--', ...tracked]);
+                if (mode === 'unstaged') {
+                    // Restore from the index so staged changes survive; unmerged (conflicted)
+                    // paths cannot be restored from the index and fall back to HEAD.
+                    const conflicted = new Set(status.conflicted ?? []);
+                    const restorable = tracked.filter((file) => !conflicted.has(file));
+                    const unmerged = tracked.filter((file) => conflicted.has(file));
+                    if (restorable.length > 0)
+                        await git.raw(['checkout', '--', ...restorable]);
+                    if (unmerged.length > 0)
+                        await git.raw(['checkout', 'HEAD', '--', ...unmerged]);
+                }
+                else {
+                    await git.raw(['checkout', 'HEAD', '--', ...tracked]);
+                }
             }
             for (const file of removed) {
                 await rm(join(root, file), { force: true, recursive: true });

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