feat(gpui): diff edit mode and stacked pull requests#110
Conversation
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 2ede344efa
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
hewigovens
force-pushed
the
gpui-diffedit-stacked-pr
branch
from
2ede344 to
dc3a38e
Compare
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: dc3a38ea3a
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
hewigovens
force-pushed
the
gpui-diffedit-stacked-pr
branch
from
dc3a38e to
58c331c
Compare
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 58c331c7e4
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
hewigovens
force-pushed
the
gpui-diffedit-stacked-pr
branch
from
58c331c to
291b0c8
Compare
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 291b0c8063
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
hewigovens
force-pushed
the
gpui-diffedit-stacked-pr
branch
from
291b0c8 to
0e27fbb
Compare
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 0e27fbb7de
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
|
|
||
| pub(crate) fn warning(&self, index: usize) -> Option<&'static str> { | ||
| let name = self.inputs.get(index)?.text(); | ||
| if name.is_empty() || !is_valid_bookmark_name(name) { |
There was a problem hiding this comment.
When a GPUI user edits a stack layer to main/trunk or another bookmark that already points outside the detected stack, this validator still enables Submit because it only checks syntax and in-stack duplicates. The submit path creates-or-moves those bookmarks before pushing, so a valid-looking name can fast-forward the repo's base branch to the feature stack; compare edited names against the current bookmark list/base bookmark and reject occupied or protected names unless the bookmark already belongs to that same layer.
Useful? React with 👍 / 👎.
hewigovens
force-pushed
the
gpui-diffedit-stacked-pr
branch
from
0e27fbb to
4e3eb39
Compare
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 4e3eb39564
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
| if self.diff_edit_selection_summary().0 == 0 { | ||
| self.show_toast(EMPTY_SELECTION_MESSAGE, cx); | ||
| return; | ||
| } | ||
| let message = self.diff_edit.message.text().to_owned(); | ||
| self.apply_diff_edit(destination, message, cx); |
There was a problem hiding this comment.
If a user clicks Select All on a large multi-file change and then immediately clicks an apply destination while the header still says Selecting..., diff_edit_selection_summary() can already be nonzero from the files that were loaded first, so this path proceeds and build_diff_edit_request omits any paths still in select_all_pending. Fresh evidence in this revision is that Select All now tracks pending preloads, but the apply entry point does not check selecting_all/select_all_pending; please disable or reject apply until the bulk selection has finished.
Useful? React with 👍 / 👎.
hewigovens
force-pushed
the
gpui-diffedit-stacked-pr
branch
from
4e3eb39 to
57d58e7
Compare
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 57d58e7a91
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
| "{{project}}/Resources/DockIcon/jayjay-dock-light.png" \ | ||
| "{{project}}/Resources/DockIcon/jayjay-dock-dark.png" |
There was a problem hiding this comment.
On a clean checkout shell/mac/Resources/DockIcon is not present (I checked the resource tree with fdfind), but release-dry-run and release both depend on sync-icon, which now writes the rendered PNGs directly into that directory. The Swift renderer will fail with “Could not write Dock icon…” before the app build starts unless a developer has created the directory locally; add a mkdir -p "{{project}}/Resources/DockIcon" before these output paths or commit a tracked resource directory/file.
Useful? React with 👍 / 👎.
| dock_plugin="$app_path/Contents/PlugIns/JayJayDockTilePlugin.plugin" | ||
| if [[ ! -x "$dock_plugin/Contents/MacOS/JayJayDockTilePlugin" ]]; then |
There was a problem hiding this comment.
This verifier now rejects every release archive unless Contents/PlugIns/JayJayDockTilePlugin.plugin exists, but the repo does not define or copy any JayJayDockTilePlugin target/source (repo-wide rg only finds these new verifier lines). As a result the normal just shell::release-dry-run/just shell::release archives built from shell/mac/project.yml fail verification even when the signed app is otherwise valid; either add the plugin to the app bundle or do not make this check mandatory yet.
Useful? React with 👍 / 👎.
| let Some(cached) = vm | ||
| .diff_cache | ||
| .values() | ||
| .find(|loaded| loaded.diff.path == path && loaded.projection.is_none()) |
There was a problem hiding this comment.
When an async preload from a previously selected change finishes after select_change has cleared the cache, it can still insert a LoadedDiff keyed by the old rev; this lookup then accepts it by path only while Diff Edit is active on a different change with the same file path. In that race, the Diff Edit card is built from stale old/new content and selections either fail as stale or are shown against the wrong file version, so this should look up the exact cache key for the active rev/hunk/ignore-whitespace (or generation-guard preloads) instead of scanning diff_cache.values().
Useful? React with 👍 / 👎.
1 participant
Closes the two largest shell-parity gaps (both rows now Yes in the matrix).
Diff edit mode — enter via the Edit Diff button or gutter menu; checkbox selection of lines, change groups, files, or select-all (SwiftUI's exact full-diff-index model); apply to all four core destinations (Discard, Move to Working Copy, New Child, New Parallel) with the shared staleness/conflict guards, plus a new core-level
ensure_commit_mutablecheck on every diffedit flow. Unified-view-only editing with view-mode restore, post-apply file re-selection. 11 component tests incl. per-destination end-to-end and stale rejection.Stacked pull requests — panel from the change context menu over the shared core engine: async stack detection, inline bookmark editing with validity/duplicate checks, AI naming for auto-assigned layers via the provider chain (user edits always win), submit with per-layer Created/Updated/Failed outcomes and PR links. 8 component tests.
Shell-only work reusing existing core APIs (one small core addition: the immutability guard). Parity matrix + guide updated.