M4.10: remotes: fetch, pull, push, clone and manage remotes
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>
This commit is contained in:
parent
48b892a6d5
commit
d097558ba5
36 changed files with 4426 additions and 45 deletions
|
|
@ -1,6 +1,6 @@
|
|||
# Architecture
|
||||
|
||||
> **Status:** M0 decisions recorded, M1 workspace, desktop bridge, tabs and editor, message catalog, engine construction, settings, themes, the recovery journal, notifications, UI commands, the palette, the settings dialog, the app icon and the syntax layer documented; M2 highlighting and `editor.reveal`, plus the search backend, the Find tool window, the symbol index, the Structure tool window and the go-to popup; M3 CLI and single instance, LSP client library, toolchain (PHP detection, Phpactor download), the app menu, MCP server, autosave and `flushDirty`, integrated terminal; engine ↔ Phpactor wiring and diagnostics (M3.3), pending outcomes (M3.5), completion, hover and signature help (M3.4); C5 child process groups (H1), settings dialog string and path controls and assist settings (H4), the banner-aligned themes and diagnostic/VCS tokens (H5), Phpactor UX: fast tick, messages, progress, `php -l` (H3); Git backend (M4.1), Changes tool window (M4.2); line changes, gutter markers and status colours (M4.4), diff viewer (M4.3), branches (M4.5) · **Last updated:** 2026-10-26
|
||||
> **Status:** M0 decisions recorded, M1 workspace, desktop bridge, tabs and editor, message catalog, engine construction, settings, themes, the recovery journal, notifications, UI commands, the palette, the settings dialog, the app icon and the syntax layer documented; M2 highlighting and `editor.reveal`, plus the search backend, the Find tool window, the symbol index, the Structure tool window and the go-to popup; M3 CLI and single instance, LSP client library, toolchain (PHP detection, Phpactor download), the app menu, MCP server, autosave and `flushDirty`, integrated terminal; engine ↔ Phpactor wiring and diagnostics (M3.3), pending outcomes (M3.5), completion, hover and signature help (M3.4); C5 child process groups (H1), settings dialog string and path controls and assist settings (H4), the banner-aligned themes and diagnostic/VCS tokens (H5), Phpactor UX: fast tick, messages, progress, `php -l` (H3); Git backend (M4.1), Changes tool window (M4.2); line changes, gutter markers and status colours (M4.4), diff viewer (M4.3), branches (M4.5); remotes: fetch, pull, push, clone and remote management (M4.10) · **Last updated:** 2026-10-28
|
||||
|
||||
## Overview
|
||||
|
||||
|
|
@ -561,7 +561,7 @@ Watched directories: the VFS watcher is non-recursive, so `project.children` wat
|
|||
|
||||
### Git backend (M4.1)
|
||||
|
||||
- **Owner decision D20:** Git runs through the user's installed `git` (minimum 2.30), found through the setting `git.executable` (string, section `git`; `""` means `git` from `PATH`). No network operation exists (no fetch, pull, push), and no call can open a credential or terminal prompt.
|
||||
- **Owner decision D20:** Git runs through the user's installed `git` (minimum 2.30), found through the setting `git.executable` (string, section `git`; `""` means `git` from `PATH`). No call can open a terminal prompt. Network calls (fetch, pull, push, clone) came with M4.10 under D23; see Remotes (M4.10).
|
||||
- **Crate `lutra-vcs` (L3, `crates/vcs`):**
|
||||
- `runner::run` is the only way git starts, and `runner::spawn` the only place a process starts, through H1's `lutra_proc::spawn`, so git and its hooks die with Lutra. Arguments are an array, never a shell. Every call gets `--no-pager --literal-pathspecs -c core.quotepath=false -c color.ui=false`, `GIT_TERMINAL_PROMPT=0`, `GCM_INTERACTIVE=never`, `GIT_OPTIONAL_LOCKS=0` for reads, no console window on Windows, and the variables that redirect git (`GIT_DIR`, `GIT_WORK_TREE`, `GIT_INDEX_FILE`, …) removed.
|
||||
- Timeouts: 30 s; commit, checkout and branch creation 120 s (hooks). A call past its timeout, or whose stdout passes its cap, is killed (a guard kills and reaps the child on every early return).
|
||||
|
|
@ -660,6 +660,43 @@ Watched directories: the VFS watcher is non-recursive, so `project.children` wat
|
|||
- **Commands** (UI commands, menu group Git, no default shortcuts): `vcs.branches` (Git › Branches…), `vcs.newBranch {name?, checkout?}` (Git › New Branch…; with a `name` it creates the branch without the popup, checked out unless `checkout: false`, and toasts a refusal), `vcs.checkout {branch}` (without `branch`, as from the palette, it opens the popup; a `branch` that is no non-blank string toasts an error). All are enabled while `git.branches` is (an open project).
|
||||
- **Tests:** `ui/tests/vcs/Branches.test.ts` (16 Vitest tests against a fake engine: parsing, filter, head label, the item's states, popup order and marking, filtering, keyboard, checkout after `flushDirty` through `runWaiting`, a refusal toast, a cancelled checkout, creating with a blank name, a refusal and success, Escape back to the list, the commands' registration, params and enabled state).
|
||||
|
||||
### Remotes (M4.10)
|
||||
|
||||
- **Owner decision D23 (2026-10-26):** Lutra may fetch, pull, push and clone through the user's git. Any HTTPS or SSH remote works (GitHub, GitLab, Forgejo, Bitbucket, a self-hosted server), and so does a local path, because git does the transport.
|
||||
- **Credentials stay with git.** HTTPS sign-in goes through git's credential helper. It may show its own window, such as Git Credential Manager's: network calls do not set `GCM_INTERACTIVE=never`, every other call still does. SSH remotes use the user's `ssh` with its agent and keys, `~/.ssh/config` and `known_hosts`; Lutra sets no `GIT_SSH_COMMAND` and touches no key. Terminal prompts stay off (`GIT_TERMINAL_PROMPT=0`, stdin closed, no console). A remote that needs a password nobody supplies, a passphrase key without an agent, or an unknown host key therefore fails with a message instead of hanging. Lutra never reads, stores or logs a credential.
|
||||
- **Redaction:** `runner::redact_urls` replaces the userinfo of every `scheme://user:secret@host` URL with `***` (`https://***@host/…`). It applies to every runner error message (`Output::message`), every progress line, and the URLs `git.remotes` returns. scp-like addresses (`git@host:path`) carry only a user name and stay as they are. Unit and property tests cover it.
|
||||
- **Crate (`crates/vcs/src/remote.rs`, plus the runner):**
|
||||
- `Call::network(cwd, args)`: a 30-minute timeout (`NETWORK_TIMEOUT`), a progress sink (stderr split at `\r`/`\n`, 1 KiB per line) and a `Cancel` flag. The runner polls the flag every 50 ms. When it is set, git and every process it started (`git-remote-https`, `ssh`, hooks) are killed through the `lutra_proc` group, and the call ends with `VcsError::Cancelled`.
|
||||
- Every network call runs with `-c protocol.ext.allow=never`, and `check_url` refuses `ext::` URLs, blank URLs, URLs starting with `-`, control characters and anything over 4,096 bytes. Remote names are checked for `-`, whitespace and control characters; git checks the rest. Arguments follow `--end-of-options`.
|
||||
- `Git::clone_repo(url, dir, net)` needs no repository. It runs `git clone --progress` in the parent folder, which must exist; `dir` must be absolute and missing or empty. A failed or cancelled clone removes what it left: the folder if the clone created it, else only its contents.
|
||||
- `Repo::fetch(remote?)`: `fetch --progress <remote>`, or `--all`. `Repo::pull(mode)`: `pull --progress --no-rebase --no-edit` or `--rebase`. `Repo::push(remote?)`: the current branch with `--porcelain`. With an upstream (`branch.<b>.remote` and `.merge`) it goes there as `refs/heads/<b>:<merge>`. Without one it goes to `<remote>` (the given one, else the only remote, else `origin`) as `refs/heads/<b>:refs/heads/<b>` with `--set-upstream`. Rejected refs (`!` lines) fail the push even if the exit status says otherwise.
|
||||
- `Repo::remotes()` reads `config -z --get-regexp ^remote\..*\.(url|pushurl)$` in config order. `remote_add`, `remote_set_url` and `remote_remove` run `git remote …`. Changes hold the repository's mutation lock.
|
||||
- **Clear messages:** `explain` puts one sentence before git's own text when the cause is known: a rejected push (pull first), a push the server refused (protected branch, hook), an unknown SSH host key, a failed sign-in (pointing at the credential helper and the ssh agent), a repository not found, a remote that cannot be reached, no upstream, local changes in the way, conflicts after a pull, diverged branches, a full clone target.
|
||||
- **Engine (`crates/engine/src/cmd/git_remote.rs`):** pending outcomes on `lutra-git-remote` threads, which detect git and open the repository for each call. `git.clone` needs no project.
|
||||
- `git.fetch {remote?}` → `{}`.
|
||||
- `git.pull {mode?: merge|rebase}` → `{}`; the default comes from the setting `git.pull.mode` (enum `merge`|`rebase`, default `merge`, section Git).
|
||||
- `git.push {remote?}` → `{remote, branch, upstreamSet}`.
|
||||
- `git.clone {url, dir}` → `{root}`.
|
||||
- `git.remotes` → `{remotes: [{name, fetchUrl?, pushUrl?}]}`.
|
||||
- `git.remoteAdd {name, url}`, `git.remoteSetUrl {name, url}`, `git.remoteRemove {name}` → `{}`.
|
||||
- `git.cancel` (immediate) → `{cancelled: true}`; disabled while nothing runs.
|
||||
- Bad URLs, names, modes and relative clone folders are `invalid_params`; git's refusals are `failed` with the explained text.
|
||||
- One network call runs at a time; a second is refused while one runs.
|
||||
- **Event `gitProgress {active, operation?, phase?, percent?}`:** sent from the pump when the running call's latest line changed (at most once per pump). `active: false` follows when the call ends; when the call failed, it arrives with the next pump. `gitChanged` follows every successful change in the open project.
|
||||
- **UI (`ui/src/components/vcs/remote/`):**
|
||||
- `remote.ts` is the Pinia store.
|
||||
- `RemoteStatusItem.vue` goes in the status bar, before the branch item. While a call runs it shows "Fetching: Receiving objects 45%" with a Cancel button (`git.cancel`). Otherwise it shows `↑ahead ↓behind` against the upstream from the shared status store, hidden when in step. The item supplies the UI commands and mounts the dialogs.
|
||||
- `vcs.fetch`, `vcs.pull` and `vcs.push` (Git › Fetch / Pull / Push) end in a toast: done, cancelled, or git's explained refusal. Pull runs `flushDirty()` first and cancels when a save fails. Push says when it set the upstream.
|
||||
- `vcs.clone` (Git › Clone Repository…, also without a project) opens a dialog with a URL field and a folder field. "Browse…" uses the new `pick_dir` IPC, the shell's native folder picker. The folder is the chosen parent plus the repository's name and follows URL edits until it is typed by hand. Clone runs `git.clone`, then `project.open`. git's refusal stays in the dialog. Cancel stops a running clone.
|
||||
- `vcs.manageRemotes` (Git › Manage Remotes…) lists the remotes with redacted URLs and a separate push URL. Each row offers "Edit URL" (the field starts empty when the URL is redacted, so `***` is never saved) and "Remove" (asked in the row). A form adds a remote. Refusals show in the dialog.
|
||||
- Both dialogs are exclusive modals (`clone`, `remotes`).
|
||||
- No default shortcuts. Commands are enabled with a project (clone always) and while no network call runs.
|
||||
- **Tests:**
|
||||
- `crates/vcs/tests/remote.rs`: 8 tests against local bare repositories, never the network. Clone with progress; a full or missing target and clean-up; a cancelled clone; push with and without upstream; a rejected push; fetch and pull by merge and rebase; pull without upstream; remote management with redacted URLs; cancel of a running push held by a sleeping `pre-receive` hook, which stops in well under 10 s.
|
||||
- Unit and property tests of the redaction, the progress lines, `explain`, the URL and name checks, and the parsers.
|
||||
- `crates/engine/tests/git_remote.rs`: 3 tests. Clone without a project, remotes, push with upstream and `gitChanged`, fetch and pull; cancel and the one-call rule; bad params.
|
||||
- `ui/tests/vcs/Remote.test.ts`: 11 Vitest tests.
|
||||
|
||||
## Decisions (M0)
|
||||
|
||||
| Question | Decision | Why |
|
||||
|
|
@ -678,6 +715,7 @@ Watched directories: the VFS watcher is non-recursive, so `project.children` wat
|
|||
| Date | Change | Summary |
|
||||
|---|---|---|
|
||||
| 2026-10-28 | minor | M4.6: history backend (`git.log`, `git.showCommit`, `git.showAt`), the shared hook for new git commands, the Log tab, diffs at a commit |
|
||||
| 2026-10-28 | minor | M4.10: remotes (`Call::network` with progress and cancel, URL redaction, `git.fetch/pull/push/clone/cancel/remotes/remoteAdd/remoteSetUrl/remoteRemove`, `gitProgress`, `git.pull.mode`, the clone and remotes dialogs) |
|
||||
| 2026-10-27 | minor | F3: `lutra_proc::spawn_suspended` (Phpactor) and `adopt` (ConPTY shell in a job), cancel superseded completions, syntax proptests compare leaf kinds |
|
||||
| 2026-10-27 | minor | C6 F1: remote branch checkout without a configured remote (`--no-track`), `git.lastMessage` and the Amend prefill, one shared git status store |
|
||||
| 2026-10-27 | minor | F2: `ui.screenshot` through WebView2 `CapturePreview` without focus; region fallback elsewhere; `--control` windows open unfocused |
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Gaps
|
||||
|
||||
> **Status:** M0 closed G1; G2 under way (text buffer, engine buffers, tabs and editor in the app, recovery journal, autosave); G3 M1 part done (project tree, palette, settings dialog with string and path controls, themes) plus the app menu (M3.9); G4 under way (tree-sitter outline and folding library, Lezer highlighting, Structure tool window); G5 under way (search backend, Find tool window, symbol index, go-to popup); G6 under way (LSP client library, PHP detection, Phpactor download, engine wiring and diagnostics, completion and hover, definition, references and rename, Phpactor dies with Lutra, faster indexing, progress and messages, `php -l` on Windows); G7 under way (`lutra` CLI and single instance, MCP server, integrated terminal); G8 under way (Git backend, M4.1; Changes window, M4.2; gutter markers and status colours, M4.4; diff viewer, M4.3; branch widget and popup, M4.5); G14 English UI catalog in place · **Last updated:** 2026-10-26
|
||||
> **Status:** M0 closed G1; G2 under way (text buffer, engine buffers, tabs and editor in the app, recovery journal, autosave); G3 M1 part done (project tree, palette, settings dialog with string and path controls, themes) plus the app menu (M3.9); G4 under way (tree-sitter outline and folding library, Lezer highlighting, Structure tool window); G5 under way (search backend, Find tool window, symbol index, go-to popup); G6 under way (LSP client library, PHP detection, Phpactor download, engine wiring and diagnostics, completion and hover, definition, references and rename, Phpactor dies with Lutra, faster indexing, progress and messages, `php -l` on Windows); G7 under way (`lutra` CLI and single instance, MCP server, integrated terminal); G8 under way (Git backend, M4.1; Changes window, M4.2; gutter markers and status colours, M4.4; diff viewer, M4.3; branch widget and popup, M4.5; remotes, M4.10); G14 English UI catalog in place · **Last updated:** 2026-10-26
|
||||
|
||||
Every known shortfall, ranked. This is the work list: unless the owner gives a task, take the highest open gap. Hours are agent wall-clock hours for one agent, all estimated.
|
||||
|
||||
|
|
@ -13,7 +13,7 @@ Every known shortfall, ranked. This is the work list: unless the owner gives a t
|
|||
| G5 | Search and navigation: find in files, go to file/class/symbol, first index | M2 | ~35 h |
|
||||
| G6 | Language server: completion, definition, hover, rename via Phpactor (~~PHP detection and Phpactor download~~, M3.1; ~~engine wiring and diagnostics~~, M3.3; ~~completion, hover, signature help~~, M3.4; ~~definition, references, rename~~, M3.5) | M3 | ~15 h |
|
||||
| G7 | ~~Terminal~~ (M3.6: PTY sessions, xterm.js sub-tabs in the bottom panel; settings, persistence, links and search still open), ~~`lutra` CLI and single instance~~ (M3.7: open folders and files at a line, `--wait`, forwarding a second start, token-protected rendezvous), ~~MCP server~~ (M3.8: `lutra mcp` with list/execute every command, screenshot, read buffer, recent events, open buffers as resources; still missing: resource and tool change notifications, progress for long commands), files outside the open project (the CLI refuses them; needs out-of-project buffers or a second window), `lutra diff` | M3 | ~16 h |
|
||||
| G8 | Git integration: ~~backend through the installed git~~ (M4.1: status, stage/unstage, commit and amend, file contents at HEAD/index, branches, checkout, branch creation, `gitChanged`), ~~Changes window~~ (M4.2: staged/changes/untracked groups, stage and unstage per file and group, commit and amend after saving, amend prefilled with the last message (C6 F1), no chunk staging), ~~gutter markers and status colours~~ (M4.4: added/modified/deleted against the index, tree and tab colours; no chunk actions), ~~diff viewer~~ (M4.3: side by side against the index or HEAD, editable working copy, next/previous change; no unified view, chunk actions or other revisions), ~~branch popup~~ (M4.5: status-bar branch, popup with local and remote branches and a filter, checkout after saving, new branch from HEAD; no merge, rebase, rename or delete), ~~log~~ (M4.6: Log tab with graph lanes, filters, paging, commit details, diffs at a commit, file history; no date or branch filters, no actions on commits), blame, conflicts, stash, remotes | M4 | ~122 h |
|
||||
| G8 | Git integration: ~~backend through the installed git~~ (M4.1: status, stage/unstage, commit and amend, file contents at HEAD/index, branches, checkout, branch creation, `gitChanged`), ~~Changes window~~ (M4.2: staged/changes/untracked groups, stage and unstage per file and group, commit and amend after saving, amend prefilled with the last message (C6 F1), no chunk staging), ~~gutter markers and status colours~~ (M4.4: added/modified/deleted against the index, tree and tab colours; no chunk actions), ~~diff viewer~~ (M4.3: side by side against the index or HEAD, editable working copy, next/previous change; no unified view, chunk actions or other revisions), ~~branch popup~~ (M4.5: status-bar branch, popup with local and remote branches and a filter, checkout after saving, new branch from HEAD; no merge, rebase, rename or delete), ~~log~~ (M4.6: Log tab with graph lanes, filters, paging, commit details, diffs at a commit, file history; no date or branch filters, no actions on commits), ~~remotes~~ (M4.10: fetch, pull by merge or rebase, push with the upstream set on the first push, clone, manage remotes, progress and cancel, explained refusals, any HTTPS or SSH server through git's credential helper and the ssh agent; no force push, tags, per-branch push targets or hosting features such as pull requests), blame, conflicts, stash | M4 | ~122 h |
|
||||
| G9 | Debugger, test runner, Composer, run configurations | M5 | ~300 h |
|
||||
| G10 | Own indexer, type inference, inspections, refactorings | M6 | ~800 h |
|
||||
| G11 | Stability: crash-free operation on real projects and machines (~~recovery journal~~, M1.7) | ongoing | ~95 h |
|
||||
|
|
@ -55,6 +55,7 @@ G6 progress: M3.2 landed the LSP client library in `crates/lsp`: JSON-RPC framin
|
|||
| Date | Change | Summary |
|
||||
|---|---|---|
|
||||
| 2026-10-28 | patch | G8: log and file history (M4.6) |
|
||||
| 2026-10-28 | minor | G8 shrunk: remotes (M4.10) |
|
||||
| 2026-10-27 | minor | G11 note: suspended Phpactor start, terminal shell in a job, completion cancel, syntax proptest (F3) |
|
||||
| 2026-10-27 | patch | G8: amend prefill, remote checkout fix, shared status store (C6 F1) |
|
||||
| 2026-10-27 | minor | Screenshot item shrunk: webview capture without focus on Windows (F2) |
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Milestones
|
||||
|
||||
> **Status:** M0–M3 done, M4 in progress (C5: Git backend, Changes window, gutter markers and status colours, diff viewer, branches; C6: log) · **Last updated:** 2026-10-28
|
||||
> **Status:** M0–M3 done, M4 in progress (C5: Git backend, Changes window, gutter markers and status colours, diff viewer, branches; C6: log, remotes) · **Last updated:** 2026-10-28
|
||||
|
||||
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 were scaled ×0.1 to ×0.15 (measured factors: C1 0.07, C2 0.10, C3 0.14, C4 0.17; next cycle ×0.18); M4–M6 keep their first raw estimates (multiply by ~0.1 for the calibrated value).
|
||||
|
||||
|
|
@ -10,7 +10,7 @@ Hours are agent wall-clock hours for one agent; M0 and M1 so far are measured, t
|
|||
| 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** | done 2026-10-22 (C4: M3.1 PHP detection and Phpactor download, M3.2 LSP client, M3.3 engine wiring and diagnostics, M3.4 completion, hover and signature help, M3.5 definition, references and rename, M3.6 integrated terminal, M3.7 CLI and single instance, M3.8 MCP server, M3.9 app menu, M3.10 autosave; live check with real key presses pending) | ~14 (measured) |
|
||||
| M4 | Git: status, diff, commit, branches, log, blame, conflicts | in progress (C5: M4.1 backend, M4.2 Changes window, M4.4 gutter markers and status colours, M4.3 diff viewer, M4.5 branches done; C6: M4.6 log done) | ~122 |
|
||||
| M4 | Git: status, diff, commit, branches, log, blame, conflicts | in progress (C5: M4.1 backend, M4.2 Changes window, M4.4 gutter markers and status colours, M4.3 diff viewer, M4.5 branches done; C6: M4.6 log, M4.10 remotes done) | ~122 |
|
||||
| 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 |
|
||||
|
|
@ -35,6 +35,7 @@ By the raw estimates the alpha gate needs M1–M4 plus cross-platform verificati
|
|||
| Date | Change | Summary |
|
||||
|---|---|---|
|
||||
| 2026-10-28 | minor | M4.6 log and file history |
|
||||
| 2026-10-28 | minor | M4.10 remotes (fetch, pull, push, clone, manage remotes) |
|
||||
| 2026-10-26 | minor | M4.5 branch widget and popup |
|
||||
| 2026-10-26 | minor | M4.3 diff viewer |
|
||||
| 2026-10-25 | minor | M4.4 gutter markers and status colours |
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -1,6 +1,6 @@
|
|||
# Tooling checklist
|
||||
|
||||
> **Status:** integrated terminal partial (M3.6), Git backend, Changes window, diff viewer and branches, log partial (M4.1, M4.2, M4.3, M4.5, M4.6) · **Last updated:** 2026-10-28
|
||||
> **Status:** integrated terminal partial (M3.6), Git backend, Changes window, diff viewer, branches, log and remotes partial (M4.1, M4.2, M4.3, M4.5, M4.6, M4.10) · **Last updated:** 2026-10-28
|
||||
|
||||
- [ ] Integrated terminal with tabs
|
||||
- M3.6 (2026-10-18): PTY sessions (pwsh → powershell → cmd on Windows, `$SHELL` or `/bin/sh` on Unix; cwd = project root) in the bottom panel's Terminal tab, several terminals as sub-tabs, xterm.js rendering with Lutra's colours, copy/paste, resize, exit codes; closed with the project. Missing: settings, persistence across restarts, split tabs, search, links, the PHP interpreter in `PATH`.
|
||||
|
|
@ -9,6 +9,7 @@
|
|||
- M4.3 (2026-10-26): a side-by-side diff of the working copy against the staged version or the last commit, editable on the right, with next/previous change. Missing: comparing with other revisions or branches, a unified view, three-way merge for conflicts.
|
||||
- M4.5 (2026-10-26): current branch in the status bar, switch to a local or remote branch (saving open files first, git's refusal shown) and create a branch from HEAD in the branches popup. Missing: merge, rebase, rename, delete, push/pull, log, blame, conflicts, stash.
|
||||
- M4.6 (2026-10-28): Log tab with graph lanes, message and author filters and lazy paging; commit details with each file's diff at that commit; history of a file from the tree, the editor or the menu. Missing: date and branch filters, actions on commits (cherry-pick, revert, reset, checkout), comparing two commits, blame, conflicts, stash, push/pull.
|
||||
- M4.10 (2026-10-28): fetch, pull (merge or rebase, setting `git.pull.mode`; open files saved first) and push (upstream set on the first push), each with progress and Cancel in the status bar and explained refusals; Clone Repository… from any HTTPS or SSH URL or a path, then the project opens; Manage Remotes… (list with redacted URLs, add, change URL, remove). Sign-in stays with git's credential helper (its own window is allowed) and the ssh agent; terminal prompts are off, so a missing credential fails with a message. Tested against local bare repositories only. Missing: force push, tags, pushing to another branch name, fetch/pull of one branch, prune options, hosting features (pull requests, issues), checked against a real GitHub/GitLab/Forgejo server.
|
||||
- [ ] Composer: install, update, require, scripts
|
||||
- [ ] PHP interpreters: local, Docker
|
||||
- [ ] Xdebug via DAP: breakpoints, stepping, variables, watches
|
||||
|
|
@ -23,6 +24,7 @@
|
|||
| Date | Change | Summary |
|
||||
|---|---|---|
|
||||
| 2026-10-28 | minor | Git: log and file history (M4.6) |
|
||||
| 2026-10-28 | minor | Git: fetch, pull, push, clone and remote management (M4.10) |
|
||||
| 2026-10-26 | minor | Git: branch widget, checkout and new branch (M4.5) |
|
||||
| 2026-10-26 | minor | Git: diff viewer (M4.3) |
|
||||
| 2026-10-25 | minor | Git: status, staging and commit from the Changes tab (M4.2) |
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# UI parity checklist
|
||||
|
||||
> **Status:** main window layout (M1.5), project tree running against the engine (M1.4), editor tabs with a CodeMirror editor (M1.6), light and dark themes (M1.10), restore dialog for unsaved changes (M1.7), notification toasts (M1.12), command palette and global keymap (M1.8), settings dialog with search (M1.9b), syntax highlighting and `editor.reveal` (M2.2), Find tool window in the bottom panel (M2.4), go-to popup (M2.6), left stripe and Structure tool window (M2.7), app menu (M3.9), Terminal tool window and bottom panel tabs (M3.6), Problems tool window and editor diagnostics (M3.3), completion, quick documentation and parameter info (M3.4), string and path settings with completion and tooltip settings (H4), banner-aligned themes with diagnostic and VCS colours (H5), Changes tool window (M4.2), Git change markers and status colours (M4.4), diff viewer and the project tree's context menu (M4.3), branch widget and popup (M4.5) · **Last updated:** 2026-10-26
|
||||
> **Status:** main window layout (M1.5), project tree running against the engine (M1.4), editor tabs with a CodeMirror editor (M1.6), light and dark themes (M1.10), restore dialog for unsaved changes (M1.7), notification toasts (M1.12), command palette and global keymap (M1.8), settings dialog with search (M1.9b), syntax highlighting and `editor.reveal` (M2.2), Find tool window in the bottom panel (M2.4), go-to popup (M2.6), left stripe and Structure tool window (M2.7), app menu (M3.9), Terminal tool window and bottom panel tabs (M3.6), Problems tool window and editor diagnostics (M3.3), completion, quick documentation and parameter info (M3.4), string and path settings with completion and tooltip settings (H4), banner-aligned themes with diagnostic and VCS colours (H5), Changes tool window (M4.2), Git change markers and status colours (M4.4), diff viewer and the project tree's context menu (M4.3), branch widget and popup (M4.5), fetch/pull/push progress, the clone and remotes dialogs (M4.10) · **Last updated:** 2026-10-28
|
||||
|
||||
- [ ] Main window: tool window stripes, editor area, status bar, navigation bar
|
||||
- M2.7 (2026-10-17): a left stripe with one tab per left tool window (Project, Structure); the shown one is marked, clicking it again hides the window. Still missing: right docking, several bottom tool windows, drag to rearrange, navigation bar, layout persistence.
|
||||
|
|
@ -45,11 +45,13 @@
|
|||
- M4.4 (2026-10-25): the editor gutter shows a bar beside lines added or changed since the staged version and a notch where lines were deleted (tooltips from the catalog), updated 150 ms after typing and whenever Git changes; file names in the project tree and the tabs take the Git status colour (added, modified, deleted, untracked, conflicted; ignored entries inside a repository). Vitest. Missing: clicking a marker to see the old text, revert or stage the chunk, next/previous change, markers against HEAD, coloured directories.
|
||||
- M4.3 (2026-10-26): "Diff: <name>" tabs in the editor area after the file tabs (`vcs.showDiff` `Mod+Alt+Shift+D`, menu Git › Show Diff; double-click or Enter in Changes; right click or Shift+F10 on a file in the project tree → Show Diff): the staged version or the last commit on the left, read-only, and the working copy on the right, editable like its own tab; a caption says what is compared; changed lines and words tinted with the VCS tokens, a change bar in each gutter, unchanged stretches collapsed to a clickable row; next/previous change `Alt+Shift+]` / `Alt+Shift+[` (wrapping); notices for binary, too large and deleted files and for git's errors. The project tree got its first context menu (Open, Show Diff; WAI-ARIA menu, keyboard). Vitest. Missing: unified view, revert/stage arrows between the sides, synchronised horizontal scrolling, whitespace and highlighting options, comparing with any revision, a diff window of its own, more tree context menu items.
|
||||
- M4.5 (2026-10-26): the status bar shows the current branch (Lucide `git-branch`), or the short hash when detached, hidden outside a repository. A click or `vcs.branches` (menu Git › Branches…) opens a popup above it: a filter field, "New branch…", Local (current one checked, upstream beside it) and Remote headings; Up/Down/Page keys, Enter or a click checks out, Escape or a click outside closes and returns the focus. "New branch…" switches to a name field with a "Check out" checkbox; git's refusal shows under the field. An exclusive modal. Vitest (16 tests). Missing: merge, rebase, rename, delete, compare with current, favourites, recent branches first, incoming/outgoing markers, a submenu per branch.
|
||||
- M4.10 (2026-10-28): Git › Fetch / Pull / Push (`vcs.fetch`, `vcs.pull`, `vcs.push`, no default shortcuts) with a status-bar item left of the branch: "Fetching: Receiving objects 45%" and a Cancel button while one runs, otherwise `↑ahead ↓behind` against the upstream (hidden when in step); toasts for done, cancelled and git's explained refusal. Git › Clone Repository… (`vcs.clone`, also without a project): URL and folder fields, Browse… (native folder picker; the folder follows the repository name in the URL), git's refusal in the dialog, then the cloned project opens. Git › Manage Remotes… (`vcs.manageRemotes`): remotes with redacted URLs and push URLs, Edit URL, Remove (asked in the row), an add form. Both dialogs are exclusive modals. Vitest (11 tests). Missing: push dialog with the commits to push and a target branch, force push, tags, pull options per call, a clone dialog listing the user's repositories on a hosting service.
|
||||
|
||||
## Revision history
|
||||
|
||||
| Date | Change | Summary |
|
||||
|---|---|---|
|
||||
| 2026-10-28 | minor | Fetch/pull/push with progress, clone and remotes dialogs (M4.10) |
|
||||
| 2026-10-26 | minor | Branch widget and popup (M4.5) |
|
||||
| 2026-10-26 | minor | Diff viewer and the project tree's context menu (M4.3) |
|
||||
| 2026-10-25 | minor | Git change markers in the gutter, status colours in the tree and tabs (M4.4) |
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue