Clarify alacritty_terminal origins for some terminal model code.#9513
Merged
Clarify alacritty_terminal origins for some terminal model code.#9513
alacritty_terminal origins for some terminal model code.#9513Conversation
Contributor
|
I'm starting a first review of this pull request. You can view the conversation on Warp. I completed the review and posted feedback on this pull request. Comment Powered by Oz |
Contributor
There was a problem hiding this comment.
Overview
This PR adds Alacritty-origin notices to selected terminal model and local TTY source files, adds the Apache-2.0 license text for Alacritty-derived code, and includes that license in bundled third-party license generation for Unix and Windows.
Concerns
- No blocking correctness, packaging, or security concerns found in the changed lines.
Verdict
Found: 0 critical, 0 important, 0 suggestions
Approve
Comment /oz-review on this pull request to retrigger a review (up to 3 times on the same pull request).
Powered by Oz
alokedesai
approved these changes
Apr 30, 2026
2 tasks
vorporeal
pushed a commit
that referenced
this pull request
Apr 30, 2026
… (#9563) ## Description Refs #9522. After #9513 bundled `LICENSE-ALACRITTY` and added attribution headers to the original tranche of derivative files, [@chrisduerr (Alacritty maintainer) followed up](#9522 (comment)) and named two specific files that were still missing attribution: > - This is an almost verbatim copy of VTE's ansi.rs module: > `crates/warp_terminal/src/model/ansi/control_sequence_parameters.rs` > - This function (and several others) are also verbatim copies: > `app/src/terminal/grid_renderer/cell_type.rs:L160` This PR adds the same two-line "adapted from … under the Apache license" comment header that #9513 introduced, pointing to the same bundled `crates/warp_terminal/src/model/LICENSE-ALACRITTY`: | File | Attribution | | ---- | ----------- | | `crates/warp_terminal/src/model/ansi/control_sequence_parameters.rs` | "adapted from the vte crate (an Alacritty project)" — file-wide | | `app/src/terminal/grid_renderer/cell_type.rs` | "color-mapping helpers (`compute_fg_rgb`, `compute_bg_rgb`, `get_override_color`) below are adapted from the alacritty_terminal crate" — scoped because `Secret` / `IsFocused` / `CellType` at the top of the file are Warp-specific | Both files now point to the existing `crates/warp_terminal/src/model/LICENSE-ALACRITTY` (Apache-2.0 — the same license `vte` and `alacritty_terminal` both ship under). No license-file changes are needed. This is documentation/attribution only — no functional changes. ## Scope This PR addresses the **two files explicitly cited** in #9522 by the Alacritty maintainer. The cited comment also says "this function and several others" — the "several others" likely includes the immediately-adjacent `compute_bg_rgb` and `get_override_color` helpers in the same `cell_type.rs` (they are similar verbatim ports), which is why this PR's attribution covers all three of them. A broader audit of files that *might* be derivative beyond what's explicitly cited is best done by Warp's team or the Alacritty maintainers directly, since it requires intimate knowledge of upstream history; happy to extend this PR to cover any additional files that get flagged. ## Testing Documentation/comments only. `cargo fmt -- --check` clean. No code paths affected. ## Server API dependencies - [ ] No server impact. ## Agent Mode - [ ] Warp Agent Mode ## Changelog Entries for Stable (None — internal/legal attribution metadata.)
2 tasks
vorporeal
pushed a commit
that referenced
this pull request
May 4, 2026
## Description Refs #9522. After #9513 and #9563 added attribution headers to the original set of derivative files, two more files remain unattributed: | File | Upstream origin | | --- | --- | | `app/src/terminal/model/grid/grid_storage/resize.rs` | `alacritty_terminal/src/grid/resize.rs` — grid resize/reflow logic. The parent `grid_storage.rs` was attributed in #9513; this child module was missed. | | `app/src/terminal/ref_tests/mod.rs` | `alacritty_terminal/tests/ref.rs` — test harness, including the `ref_tests!` macro, JSON fixture loading, and the `.alacritty.recording` data format. | Both files now carry the same two-line attribution comment that #9513 and #9563 introduced, pointing to the existing `crates/warp_terminal/src/model/LICENSE-ALACRITTY` (Apache-2.0). ## Linked Issue - [x] The linked issue is labeled `ready-to-spec` or `ready-to-implement`. ## Screenshots / Videos Not applicable — documentation/comments only. ## Testing No code paths changed. `cargo clippy --workspace --all-targets --all-features --tests -- -D warnings` clean. Note: `cargo fmt --check` reports pre-existing import-ordering failures in both files that are present on `master` before this change (confirmed by checking `git stash` baseline). These are not introduced by this PR. ## Agent Mode - [ ] Warp Agent Mode - This PR was created via Warp's AI Agent Mode
wolverine2k
pushed a commit
to wolverine2k/warp
that referenced
this pull request
May 5, 2026
…arpdotdev#9513) ## Description Explicitly identifies, in source files, which ones were inherited from Alacritty when Warp was initially built, and separately bundles in the Alacritty license.
wolverine2k
pushed a commit
to wolverine2k/warp
that referenced
this pull request
May 5, 2026
…dotdev#9522) (warpdotdev#9563) ## Description Refs warpdotdev#9522. After warpdotdev#9513 bundled `LICENSE-ALACRITTY` and added attribution headers to the original tranche of derivative files, [@chrisduerr (Alacritty maintainer) followed up](warpdotdev#9522 (comment)) and named two specific files that were still missing attribution: > - This is an almost verbatim copy of VTE's ansi.rs module: > `crates/warp_terminal/src/model/ansi/control_sequence_parameters.rs` > - This function (and several others) are also verbatim copies: > `app/src/terminal/grid_renderer/cell_type.rs:L160` This PR adds the same two-line "adapted from … under the Apache license" comment header that warpdotdev#9513 introduced, pointing to the same bundled `crates/warp_terminal/src/model/LICENSE-ALACRITTY`: | File | Attribution | | ---- | ----------- | | `crates/warp_terminal/src/model/ansi/control_sequence_parameters.rs` | "adapted from the vte crate (an Alacritty project)" — file-wide | | `app/src/terminal/grid_renderer/cell_type.rs` | "color-mapping helpers (`compute_fg_rgb`, `compute_bg_rgb`, `get_override_color`) below are adapted from the alacritty_terminal crate" — scoped because `Secret` / `IsFocused` / `CellType` at the top of the file are Warp-specific | Both files now point to the existing `crates/warp_terminal/src/model/LICENSE-ALACRITTY` (Apache-2.0 — the same license `vte` and `alacritty_terminal` both ship under). No license-file changes are needed. This is documentation/attribution only — no functional changes. ## Scope This PR addresses the **two files explicitly cited** in warpdotdev#9522 by the Alacritty maintainer. The cited comment also says "this function and several others" — the "several others" likely includes the immediately-adjacent `compute_bg_rgb` and `get_override_color` helpers in the same `cell_type.rs` (they are similar verbatim ports), which is why this PR's attribution covers all three of them. A broader audit of files that *might* be derivative beyond what's explicitly cited is best done by Warp's team or the Alacritty maintainers directly, since it requires intimate knowledge of upstream history; happy to extend this PR to cover any additional files that get flagged. ## Testing Documentation/comments only. `cargo fmt -- --check` clean. No code paths affected. ## Server API dependencies - [ ] No server impact. ## Agent Mode - [ ] Warp Agent Mode ## Changelog Entries for Stable (None — internal/legal attribution metadata.)
wolverine2k
pushed a commit
to wolverine2k/warp
that referenced
this pull request
May 5, 2026
…arpdotdev#9707) ## Description Refs warpdotdev#9522. After warpdotdev#9513 and warpdotdev#9563 added attribution headers to the original set of derivative files, two more files remain unattributed: | File | Upstream origin | | --- | --- | | `app/src/terminal/model/grid/grid_storage/resize.rs` | `alacritty_terminal/src/grid/resize.rs` — grid resize/reflow logic. The parent `grid_storage.rs` was attributed in warpdotdev#9513; this child module was missed. | | `app/src/terminal/ref_tests/mod.rs` | `alacritty_terminal/tests/ref.rs` — test harness, including the `ref_tests!` macro, JSON fixture loading, and the `.alacritty.recording` data format. | Both files now carry the same two-line attribution comment that warpdotdev#9513 and warpdotdev#9563 introduced, pointing to the existing `crates/warp_terminal/src/model/LICENSE-ALACRITTY` (Apache-2.0). ## Linked Issue - [x] The linked issue is labeled `ready-to-spec` or `ready-to-implement`. ## Screenshots / Videos Not applicable — documentation/comments only. ## Testing No code paths changed. `cargo clippy --workspace --all-targets --all-features --tests -- -D warnings` clean. Note: `cargo fmt --check` reports pre-existing import-ordering failures in both files that are present on `master` before this change (confirmed by checking `git stash` baseline). These are not introduced by this PR. ## Agent Mode - [ ] Warp Agent Mode - This PR was created via Warp's AI Agent Mode
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.

Description
Explicitly identifies, in source files, which ones were inherited from Alacritty when Warp was initially built, and separately bundles in the Alacritty license.