- Terminal: undo an inherited "ignore Ctrl+C" flag before starting a
ConPTY shell (lutra_proc::enable_ctrl_c). Lutra started by the lutra
CLI (CREATE_NEW_PROCESS_GROUP) passed it to every shell, so Ctrl+C
stopped nothing. Test reruns itself with that flag.
- Engine: an edited .gitignore/.ignore reports TreeChanged for its
folder, so the tree greys newly ignored files (Add to .gitignore).
- Find: "1 match", "1 file" instead of "1 files".
- docs/alpha-checklist.md: steps corrected after the Windows dry run.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
- crates/vcs chunk.rs: chunks of a file (buffer text vs index, HEAD vs
index), a minimal patch applied with git apply --cached, revert as a
byte edit; token refusal when buffer, index or HEAD changed; CRLF
(autocrlf and stored), no final newline, BOM, staged renames, first
commit; binary and untracked refused. Real-git tests + property test.
- engine: git.chunks, git.stageChunk, git.unstageChunk, git.revertChunk
(revert edits the buffer under the lock, undoable in the editor);
cmd::start_then; git.lineChanges shares the vcs line diff.
- UI: chunk popup on a gutter marker click (Stage / Unstage / Revert /
Previous / Next), hollow staged markers, vcs.showChunk, diff viewer
hint, "partly staged" badge in the Changes window.
- Docs: G8 row, Git parity row evidence, ui-parity, architecture.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
- xtask bundle builds lutra-cli and adds it as a Tauri external binary
through a --config override (lutra.exe next to the app on Windows,
Lutra.app/Contents/MacOS/lutra on macOS); prints path, version, size.
- NSIS: "Add lutra to PATH" page, unticked by default, /ADDTOPATH for
silent installs. Changes HKCU\Environment Path only, keeps its type,
broadcasts WM_SETTINGCHANGE, records the entry; the uninstaller removes
exactly that entry. A PATH too long for NSIS strings is left alone.
- lutra CLI resolves a symlinked executable before looking for the app.
- localStorage: the UI never used webview storage, so there is nothing to
migrate; docs corrected, ESLint now bans localStorage, sessionStorage
and indexedDB, with tests.
- docs/install.md: CLI, PATH, macOS link step, webview folder.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
- Finish page starts Lutra through Explorer (Exec, returns at once)
instead of RunAsUser/ShellExecute on the setup's UI thread. The 0.0.0
setup hung there while the new, unsigned exe was checked (Norton 360
active); Windows ended it and left lutra-desktop.exe suspended.
The NSIS template is an adapted copy of tauri-bundler 2.10.2's.
- installer/hooks.nsh registers Lutra only under OpenWithProgids and
Applications\lutra-desktop.exe for .php/.phtml/.phpt/.inc; the
default app stays. The uninstaller removes exactly those entries.
macOS gets an Alternate-rank CFBundleDocumentTypes entry and handles
RunEvent::Opened.
- A file path argument opens the file inside its Git/Composer root (or
folder); a running instance takes it over, switching projects only
when the file lies outside (never over unsaved changes).
- Version 0.1.0-alpha in the workspace, tauri.conf.json and ui; a test
keeps tauri.conf.json in step with the crate version.
- xtask bundle passes CARGO_TARGET_DIR to the Tauri CLI as an absolute
path.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
- App identifier com.tyrveil.lutra (D26) in tauri.conf.json and
rendezvous::APP_IDENTIFIER; a test keeps them equal.
- First normal start copies settings.json, recovery/ and tools/ once from
the dev.lutra.desktop directories (staging dir + rename, logged, info
notification); old directories stay untouched.
- Bundling on: per-user NSIS setup (English, German, Start menu, optional
desktop shortcut, uninstaller) and DMG; `cargo xtask bundle` builds the
platform's installer, joining the DMG backgrounds into a HiDPI TIFF on
macOS. build.rs also writes icons/512x512.png for the .icns.
- Installer images from the banner, designed by Amy, generated by
`cargo xtask installer-images` (assets/installer/, ASSETS.md rows);
approved by Daniel.
- docs/install.md (SmartScreen, Gatekeeper, uninstall, data locations),
README install section, architecture, development and macOS notes.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The editor store already has settled(id) for buffer sync; a second
declaration shadowed it (caught by vue-tsc).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
docs/alpha-checklist.md turns the six alpha workflows into manual steps
for Windows and macOS (action, expected result, a box per platform,
about 40 minutes each) and says how to report a failure.
cargo xtask demo-project DIR creates the offline demo the steps run
against: a small PHP shop (classes, an interface, a function, one
deliberate error), a history by three authors from 2024 to 2026 with a
merged branch and a tag, the branch feature/discounts that conflicts
with main, and a bare origin.git holding a remote-only branch and one
commit the project has not fetched yet. Tested against real git.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
A relative path is resolved against the app's working directory before
the capture, and the answer names that absolute path, so a file written
elsewhere than expected is visible. After writing, the file is read back
and a missing or short file is an error.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The summary and the per-file count tooltip pick one/other catalog
messages ("1 error", "3 errors") instead of the plural-free wording.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Over the control channel, a toggle right after file.open ran before the
new tab was adopted (bufferOpened fetches the buffer first), so it found
no active tab. The editor store now exposes settled() for adoptions in
flight.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
- docs/macos.md: step-by-step setup for a fresh Apple Silicon Mac (Xcode
CLT, Homebrew, git, PHP, Composer, Node 22, pnpm, rustup, clone from
Forgejo), the machine report, Gatekeeper notes, macOS differences and
what Windows cannot check.
- cargo xtask mac-report: versions, the gate steps, the bundled-UI desktop
build and a self-check over the control channel (project, file,
Phpactor, hover, git.status, terminal, screenshot, quit); every step
times out and runs in a lutra_proc group; one report.md to send back.
- Fixes: macOS native menu (system menus only; Cmd+W stays buffer.close,
Cmd+Q runs app.quit), xcap screenshot region in points on macOS
(Retina), login shell (-l, /bin/zsh fallback) and LANG for the
terminal on macOS, PHP lookup in Homebrew/MacPorts dirs for Finder
starts, case-insensitive LSP path mapping on macOS, rendezvous file
mode re-set to 0600, CLI-started desktop in its own process group.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Found by A2 while writing the alpha checklist: Windows PowerShell 5.1
prefixes piped stdin with a BOM, which lutra mcp rejected; the Problems
summary read "1 errors".
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
git.ignore appends one anchored, escaped literal pattern per path to the
work tree root's .gitignore, skipping patterns already there. The Changes
window gets a row context menu (right click, Shift+F10, context-menu key)
with Open and Add to .gitignore.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
git.mergeMessage reads MERGE_MSG without its comment lines while a merge
is in progress. The Changes window fills an empty box with it once per
merge when conflicts show up, and again on vcs.commit.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Each command module keeps its own COMMAND_IDS next to its commands; the
engine listing test checks their union against the registry, so a missing
or extra command still fails without one shared list. The menu and palette
tests derive their expectation from the listing and check grouping and
ordering rules; the catalog's runtime keys are scanned from the sources.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
- crates/vcs: blame.rs (git blame --porcelain, --contents - from a
buffer, revisions, untracked files and empty repositories give no
lines; property-tested parser, ISO dates without a date crate)
- engine: git.blame {path, rev?} -> {lines, version} through start_with;
an open buffer is blamed as it would be saved (line ending, BOM)
- ui: blame.ts gutter toggled per file (vcs.toggleBlame, Git menu, no
shortcut), date + author per run, bar coloured by age from tokens,
hover card with the full commit message, click opens the commit in
the Log (vcs.showCommit); refreshed on edits and gitChanged
- docs: architecture "Blame (M4.7)"
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
A WebView2 capture that does not arrive within 10 s now says whether the
main thread never ran the request or WebView2 accepted it without drawing
a frame; in the latter case the page's document.visibilityState is read
and a hidden page is reported with its likely causes (locked session,
display asleep, minimised, other virtual desktop). Docs record that a
--control instance started from the foreground app's process tree can
still take the foreground at start (open, F2c).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
- crates/vcs: stash.rs (append) with Repo::stash, stash_list, stash_apply
and stash_drop; refusals decided structurally (no commit, nothing to
stash, unmerged files, conflicts after apply, missing or changed entry)
plus hints for overwritten and untracked files. Works around git leaving
untracked files behind under --literal-pathspecs. Repo::lock is
pub(crate), as for M4.8.
- engine: git.stash, git.stashList, git.stashApply {index, pop, hash?},
git.stashDrop through the M4.6 hook; gitChanged after changes.
- ui: stash dialog (vcs.stash, vcs.showStashes; Git menu, no shortcuts),
two buttons in the Changes window, dirty buffers saved first, drop asks.
- Tests: vcs integration and property tests, engine test, 13 Vitest tests.
- Docs: architecture section, G8, tooling checklist, roadmap, Git row
evidence (score left to the PM).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Backend (crates/vcs/src/merge.rs, cmd/git_merge.rs via start_with):
git.merge {branch} -> {result: merged|upToDate|conflicts, conflicts},
git.mergeAbort, git.conflictVersions {path} -> {base?, ours, theirs,
binary, tooLarge} from the index stages :1:/:2:/:3:, git.markResolved
{paths}. Repo::lock becomes pub(crate) so merge and abort hold the
mutation lock.
UI (ui/src/components/vcs/merge/): merge dialog with branch picker,
conflicts list from the shared status store, a three-pane resolve view
(ours / editable result / theirs) with accept left/right per chunk,
accept all, previous/next conflict, Apply through the file's buffer then
mark resolved, keep-a-side for modify/delete, abort after confirmation.
Own three-way line merge on @codemirror/merge's diff. UI commands
vcs.merge, vcs.resolveConflicts, vcs.abortMerge (no default shortcuts);
the Changes window opens conflicted rows in the resolve view.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Owner decision D23: Lutra runs fetch, pull (merge or rebase per the new
git.pull.mode setting), push (upstream set on the first push) and clone
through the user's git. Any HTTPS or SSH server works; sign-in stays with
git's credential helper (its own window is allowed for network calls only)
and the ssh agent. Terminal prompts stay off, ext:: is refused, and URL
userinfo is redacted in every message, progress line and remote listing.
- vcs: Call::network with a 30 min timeout, a stderr progress sink and a
Cancel flag that kills git's process group; remote.rs with clone_repo,
fetch, pull, push (--porcelain rejections), remotes and add/set-url/
remove; explained refusals (rejected push, sign-in, host key, not found,
unreachable, no upstream, local changes, conflicts).
- engine: git.fetch/pull/push/clone/cancel/remotes/remoteAdd/remoteSetUrl/
remoteRemove, one network call at a time, gitProgress events,
gitChanged after changes.
- ui: status-bar progress with Cancel and ahead/behind, vcs.fetch/pull/
push/clone/manageRemotes (Git menu, no default shortcuts), Clone
Repository and Manage Remotes dialogs; desktop pick_dir IPC.
- Tests against local bare repositories only (vcs 8, engine 3, Vitest 11)
plus unit and property tests; docs updated.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
- crates/vcs log.rs: Repo::log (topological, all refs, paging, literal
message/author filters, a path's history with --follow), show_commit
(message and files against the first parent, renames) and show_at
(a file at any commit); parsers property-tested.
- Engine git.log, git.showCommit, git.showAt in cmd/git_log.rs through
the step-1 hook.
- Log tab in the bottom panel: graph lanes carried across pages, ref
badges, filters, lazy paging, keyboard; commit details whose files open
a read-only diff at that commit in M4.3's viewer.
- vcs.showLog and vcs.showHistory (menu, tree context menu, active
editor tab), no default shortcuts.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Repo::run, check_name and SMALL_CAP become pub(crate); cmd/git.rs gains
Op::Custom, start_with and a pub(super) rel_path, so a new module adds an
Op::Custom through start_with instead of editing git.rs or repo.rs.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
- lutra_proc::spawn_suspended: CREATE_SUSPENDED, join the kill-on-close
job, resume via a Tool Help thread snapshot. Opt-in for long-lived
children (Phpactor); git, php -l and the probe keep spawn because the
snapshot costs ~60 ms per start.
- lutra_proc::adopt + Guard (Windows): the terminal's ConPTY shell joins a
job, so processes it started end with the tab or with Lutra.
- lsp.completion cancels the previous pending completion on the same
server ($/cancelRequest); the cancelled command resolves empty.
- Syntax proptests compare leaf kinds, outline and folding instead of the
S-expression (tree-sitter-php 0.25.1 keeps a union_type wrapper after
an undo); Malte's seed added.
- docs/development.md: data dirs, target dir inside the repo, parallel
builds, deleting ui/node_modules.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
- vcs: checking out a remote-tracking branch reads remote.<name>.fetch;
without a matching refspec it creates the local branch with --no-track
instead of leaving a dirty tree after git fails to set up tracking.
- vcs + engine: git.lastMessage returns HEAD's full message (null before
the first commit); the Changes window prefills Amend with it.
- ui: stores/vcsStatus.ts is the only git.status caller; the Changes
window, tree/tab colours and the branch item read its snapshot, so a
gitChanged costs one status query. RepoSummary carries upstream,
ahead and behind.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
On Windows the webview renders itself into a PNG through WebView2
CapturePreview (scheduled on the main thread via with_webview, 10 s
timeout, PNG signature and 64 MiB cap checked). macOS and Linux keep the
xcap screen-region capture as a documented fallback, now without focusing.
app.focus is the only control method that changes focus. A --control
instance opens its window without taking the foreground. An ignored live
test samples the foreground window while the app starts and takes five
screenshots and fails if Lutra ever owns it.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The status bar shows the current branch (short hash when detached). Its
popup lists local, then remote branches with a filter and New branch;
checkout runs flushDirty first and toasts git's refusal. Commands
vcs.branches, vcs.newBranch and vcs.checkout.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
vcs.showDiff {path?, staged?} (Mod+Alt+Shift+D) opens a "Diff: <name>"
tab in the editor area: @codemirror/merge (MIT, loaded lazily, 27 kB /
9.7 kB gzip), with the index (or HEAD for the staged view) read-only on
the left, line breaks normalised to LF, and the working copy on the right,
editable through its normal engine buffer. vcs.nextChange (Alt+Shift+])
and vcs.previousChange (Alt+Shift+[) move between chunks. Binary, too
large, failed and deleted files show a notice. Entry points: the Changes
window, a new project tree context menu (Open, Show Diff; right click or
Shift+F10) and the palette/menu. Colours come from the --lt-vcs-* tokens.
21 Vitest tests; parity docs updated (Git 6% -> 8%, est.).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Depth headline inputs updated for H3 (Inspections 5%) and H4 (Settings 8%):
570/101, still ~5.6%.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>