M4.3: side-by-side diff viewer with next/previous change

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>
This commit is contained in:
danny 2026-10-26 17:23:52 +01:00
parent 468b9928a7
commit 8360ffc2e2
23 changed files with 1836 additions and 24 deletions

View file

@ -2,7 +2,7 @@
**Stage: pre-alpha (M3 done: MVP feature-complete)** · next: hardening and Git (M4); alpha when the six core workflows work end to end (see [docs/roadmap.md › Alpha gate](docs/roadmap.md#alpha-gate))
> **Last reviewed:** 2026-10-22 · **Last updated:** 2026-10-25 · **Change:** minor (M4.4: gutter markers and status colours, Git 6%) · **Target:** JetBrains PhpStorm 2026.x, described from public documentation only
> **Last reviewed:** 2026-10-22 · **Last updated:** 2026-10-26 · **Change:** minor (M4.3: diff viewer, Git 8%) · **Target:** JetBrains PhpStorm 2026.x, described from public documentation only
Lutra is a clean-room, open-source PHP IDE with a Rust core and a Tauri + Vue interface, targeting the PhpStorm workflow. Agents can drive all of it over MCP, the `lutra` CLI and a JSON control channel. This page is the summary; the evidence is in [`docs/target-app-parity.md`](docs/target-app-parity.md) and the work list in [`docs/gaps.md`](docs/gaps.md).
@ -13,7 +13,7 @@ Lutra is a clean-room, open-source PHP IDE with a Rust core and a Tauri + Vue in
| | Value | Kind |
|---|---|---|
| **Feature breadth** (PhpStorm's actions, tool windows, languages, integrations exist) | **~21%** (32 of 155 feature units of the public PhpStorm help have at least partial support) | estimated |
| **Feature depth** (weighted by use, scored by behaviour) | **~5.6%** (Editor core 11% × weight 12, Navigation 13% × weight 10, Code completion 5% × weight 10, Inspections 5% × weight 8, Refactoring 3% × weight 7, Project view 8% × weight 6, Search and replace 8% × weight 6, Terminal 15% × weight 3, Git 6% × weight 8, Settings 8% × weight 1, of 101 = 570/101) | estimated |
| **Feature depth** (weighted by use, scored by behaviour) | **~5.8%** (Editor core 11% × weight 12, Navigation 13% × weight 10, Code completion 5% × weight 10, Inspections 5% × weight 8, Refactoring 3% × weight 7, Project view 8% × weight 6, Search and replace 8% × weight 6, Terminal 15% × weight 3, Git 8% × weight 8, Settings 8% × weight 1, of 101 = 586/101) | estimated |
| **MVP (M1–M3)** | **done** in ~26 h of agent time (M1 ~5.6 h, M2 ~6.1 h, M3 ~14 h, measured); was ~190 h before calibration | measured (factor per cycle: C1 0.07, C2 0.10, C3 0.14, C4 0.17) |
| **To full parity** | **~520 h** at the current factor of ~0.18 (range 300–3,300 h; the factor has risen each cycle, and deep areas such as type inference and inspections have no data yet) | estimated |
@ -49,7 +49,7 @@ Stability 8%: no-panic lints, the engine guard, a fuzzed control protocol and a
| Inspections and quick-fixes | 4% (est.) | ~290 |
| Refactoring | 3% (est.) | ~244 |
| Code style and formatting | 0% | ~120 |
| Version control (Git) | 6% (est.) | ~136 |
| Version control (Git) | 8% (est.) | ~128 |
| Terminal | 15% (est.) | ~26 |
| Run configurations | 0% | ~50 |
| Debugger (Xdebug) | 0% | ~120 |
@ -75,6 +75,7 @@ All hours estimated. Weights, evidence and the missing items per area: [target-a
| Date | What landed |
|---|---|
| 2026-10-26 | M4.3: see what you changed side by side. Double-click a file in the Changes tab, right-click it in the project tree, or press `Mod+Alt+Shift+D`, and a "Diff: <name>" tab shows the staged version (or the last commit) on the left and your file on the right, where you can keep editing. `Alt+Shift+]` and `Alt+Shift+[` jump between changes; binary and very large files get a short notice instead. |
| 2026-10-25 | M4.4: Lutra shows what you changed. A coloured bar in the gutter marks lines you added or edited since the staged version, and a small notch marks deleted lines; it follows your typing. File names in the project tree and the tabs are coloured by their Git status: new, modified, deleted, untracked, conflicted and ignored. |
| 2026-10-25 | M4.2: a Changes tab for Git (`Mod+Alt+Shift+G`, menu Git › Changes) lists staged, changed and untracked files. Tick a file or a whole group to stage it, untick to unstage, write a message and press Commit (or Ctrl+Enter); Amend rewrites the last commit. Lutra saves your open files first, and the toast shows the new commit's short hash. Double-click opens the file (the diff viewer follows). |
| 2026-10-22 | M3.4: PHP code completes as you type. After `->`, `::`, `$` or a few letters Lutra shows Phpactor's suggestions with an icon per kind, and accepting one also adds its import. Resting the mouse on a class or method shows its documentation (`Mod+I` at the cursor), and typing `(` or `,` shows the parameters with the current one highlighted. A suggestion takes about 60–110 ms on Windows. |
@ -103,6 +104,7 @@ All hours estimated. Weights, evidence and the missing items per area: [target-a
| Date | Change | Summary |
|---|---|---|
| 2026-10-26 | minor | M4.3: diff viewer; Git 6% → 8% (est.), hours ~136 → ~128, feature depth ~5.6% → ~5.8%, progress log |
| 2026-10-25 | minor | M4.4: gutter change markers and status colours; Git 4% → 6% (est.), hours ~138 → ~136, feature depth ~5.4% → ~5.6%, progress log |
| 2026-10-25 | minor | M4.2: Changes tool window; Git 0% → 4% (est.), feature depth ~5.1% → ~5.4%, progress log |
| 2026-10-22 | minor | C4 review: M3 done (MVP feature-complete, ~14 h measured), breadth recounted 28 → 32 units (~21%), factor 0.17, full parity ~520 h at ×0.18 |