Engine (`cmd/lsp_nav.rs`, on the pending outcomes of 20d1d28):
- `lsp.definition` (F12) and `lsp.references` (Shift+F12, sorted, with
line previews) return project-relative locations; locations outside
the project, such as PHAR stubs and symlink escapes, are dropped.
- `lsp.prepareRename` uses the word at the cursor when the server has
no prepareProvider.
- `lsp.rename` (F2) applies the workspace edit (`lsp_nav/edit.rs`):
1. Check everything first: inside the project, ranges fit (UTF-16,
CRLF), open buffers unchanged since the request, no file
operations, no incomplete edit.
2. Write closed files atomically through the VFS, restoring earlier
writes when a later one fails.
3. Change open buffers through `buffer.edit` (dirty, undoable).
4. Send each written file to Phpactor as didOpen/didSave/didClose
plus didChangeWatchedFiles; without this its index kept the old
names. Then the summary notification `notification.lsp.renamed`.
UI (`components/editor/nav/`):
- Mod+click goes to the definition, with a pointer cursor while Mod is
held.
- A location picker for several definitions (exclusive modal).
- A References tab in the bottom panel, grouped by file.
- An inline rename field with a use/file count (exclusive modal).
- `BufferSync.beginUndoableRemote` puts the engine's rename edit into
the editor history as one undo step per buffer.
- Catalog strings and tokens only.
Fake LSP server: `--script FILE` with scripted capabilities and
answers (additive next to M3.4's arms).
Tests:
- `crates/engine/tests/lsp_nav.rs` (fake): definition; bad positions;
references; prepareRename; a multi-file rename incl. a closed CRLF
file; refusals for outside the project, a bad range, a stale buffer,
bad names and no server.
- The ignored real-Phpactor test covers definition, references and a
rename and back across 3 files.
- Vitest `ui/tests/nav/`.
Live (Phpactor 2026.06.25.0, Windows, port 7935, tick on):
- definition 93 ms cold / 7-18 ms warm
- references ~140 ms
- prepareRename ~11 ms
- rename 28-59 ms
- index follows written files in 140 ms
- Phpactor 57 MB working set, ~1.6% of a core while ticking idle
Gate: 13 steps, 197 s, Vitest 484 + 1 skipped.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
5.1 KiB
5.1 KiB
Milestones
Status: M0 done, M1 done, M2 in progress · Last updated: 2026-10-22
Hours are agent wall-clock hours for one agent; M0 and M1 so far are measured, the rest estimated. Since cycle C1 (factor 0.07) M1–M3 are scaled ×0.1; M4–M6 keep their first raw estimates (multiply by ~0.1 for the calibrated value).
| Milestone | Goal | State | Hours |
|---|---|---|---|
| M0 | Foundation: workspace, lints, quality gate, command registry, control channel, empty window | done 2026-10-14 (CI workflow written, not yet run: hosted on Forgejo, runners unknown) | ~2 (measured) |
| M1 | Editor and project: open folder, tree, tabs, editor, save, recovery, palette, settings, themes | done 2026-10-16 (M1.1 text, M1.2 VFS, M1.5 tree UI, M1.3 engine workspace, M1.4 desktop bridge, M1.6 tabs and editor, M1.11 message catalog, M1.9a settings backend, M1.10 themes, M1.7 recovery journal, M1.12 notifications, M1.13 C1 follow-ups, M1.8 command palette and keymap, M1.14 app icon, M1.9b settings dialog; C2 live checks pending, gaming mode) | ~5.6 (measured: C1 2.5, C2 3.1) |
| M2 | Syntax and search: highlighting, structure, find in files, go to file/class/symbol | done 2026-10-17 (C3: M2.1 tree-sitter syntax, M2.2 highlighting + editor.reveal, M2.3 search backend, M2.4 Find tool window, M2.5 symbol index + go-to commands, M2.6 go-to popup, M2.7 Structure tool window) |
~6.1 (measured) |
| M3 | LSP, terminal, CLI: completion, diagnostics, go to definition, hover, rename; terminal; lutra CLI and MCP — MVP |
in progress (M3.7 CLI and single instance, M3.8 MCP server, M3.10 autosave, M3.6 integrated terminal, M3.3 engine wiring and diagnostics, M3.4 completion, hover and signature help, M3.5 definition, references and rename done) | ~12 |
| M4 | Git: status, diff, commit, branches, log, blame, conflicts | not started | ~150 |
| M5 | Debugger (Xdebug via DAP), PHPUnit/Pest runner, Composer, run configurations | not started | ~300 |
| M6 | Own indexer and inspections; Symfony, Laravel, Shopware, WordPress support | not started | ~1,100 |
| M7 | Workbench and tools: Deployment (FTP/SFTP/local mappings, upload/download, compare with server, save before deploy, optional upload on save per server), Local History, diff tool (files/folders), scratch files, macros, keymap editor, user themes, plug-in system, Database tools and SQL, HTTP Client, SSH/Docker/Vagrant/WSL, File Watchers, external tools, TODO view, tasks and contexts | not started | ~900 |
| M8 | Web languages: JavaScript/TypeScript intelligence (via LSP), Node.js and npm, Vue, CSS/Sass/Less, Emmet, Twig and Blade, XML, OpenAPI, test runners for JS | not started | ~400 |
| M9 | Remote development, Dev Containers, AI features (chat, inline prompts, commit messages; MCP already in M3), diagrams, IDE scripting console, Vim mode, LightEdit mode | not started | ~350 |
Alpha gate
Alpha is reached when these six core workflows work end to end on macOS, Windows and Linux, with save and reopen:
- Open a project, browse and edit files, save, recover after a crash.
- Navigate: go to file, class, symbol and definition; find in files.
- Write code with completion and diagnostics.
- Run commands in the integrated terminal.
- Commit, diff and switch branches with Git.
- Drive all of the above from the CLI, the control channel and MCP.
By the raw estimates the alpha gate needs M1–M4 plus cross-platform verification, about 350 h; calibrated with cycle C1's factor, about 35 h of agent time. Calendar time is dominated by reviews and owner decisions, not agent time.
Revision history
| Date | Change | Summary |
|---|---|---|
| 2026-10-22 | minor | M3.5 definition, references, rename |
| 2026-10-22 | minor | M3.4 completion, hover and signature help |
| 2026-10-21 | minor | M3.3 engine wiring and diagnostics |
| 2026-10-20 | minor | M3.10 autosave |
| 2026-10-18 | minor | M3.6 integrated terminal |
| 2026-10-18 | minor | M7–M9 added from the full PhpStorm help inventory (155 feature units); raw hours, calibrate ×0.15 |
| 2026-10-19 | minor | M3.8 MCP server |
| 2026-10-17 | minor | M3.7 CLI and single instance |
| 2026-10-17 | minor | M2 done (C3 review), M3 ~12 h at ×0.15 |
| 2026-10-17 | minor | M2.6 go-to popup |
| 2026-10-17 | minor | M2.7 Structure tool window |
| 2026-10-17 | minor | M2.4 Find tool window |
| 2026-10-16 | minor | M2 in progress: M2.2 highlighting and editor.reveal |
| 2026-10-16 | minor | Cycle C2 review: M1 hours measured |
| 2026-10-16 | minor | M1.9b settings dialog; M1 done |
| 2026-10-16 | minor | M1.8 command palette, global keymap, UI commands |
| 2026-10-16 | minor | M1.12 notifications |
| 2026-10-16 | minor | M1.13 C1 follow-ups |
| 2026-10-16 | minor | M1.7 recovery journal |
| 2026-10-16 | minor | M1.9a settings backend, M1.10 themes |
| 2026-10-15 | minor | M1.11 message catalog |
| 2026-10-15 | minor | Cycle C1 review: M1–M3 hours recalibrated ×0.1, M0 CI note |
| 2026-10-15 | minor | M1.6 tabs and editor |
| 2026-10-15 | minor | M1.4 desktop bridge |
| 2026-10-14 | minor | M1 in progress |
| 2026-10-14 | minor | M0 done; hours per milestone |
| 2026-10-13 | major | Initial milestones |