Skip to content

Clarify alacritty_terminal origins for some terminal model code.#9513

Merged
vorporeal merged 1 commit intomasterfrom
david/clarify-alacritty-origins-for-grid-code
Apr 30, 2026
Merged

Clarify alacritty_terminal origins for some terminal model code.#9513
vorporeal merged 1 commit intomasterfrom
david/clarify-alacritty-origins-for-grid-code

Conversation

@vorporeal
Copy link
Copy Markdown
Contributor

Description

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

@cla-bot cla-bot Bot added the cla-signed label Apr 29, 2026
@oz-for-oss
Copy link
Copy Markdown
Contributor

oz-for-oss Bot commented Apr 29, 2026

@vorporeal

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 /oz-review on this pull request to retrigger a review (up to 3 times on the same pull request).

Powered by Oz

Copy link
Copy Markdown
Contributor Author

This stack of pull requests is managed by Graphite. Learn more about stacking.

@vorporeal vorporeal requested a review from alokedesai April 29, 2026 23:09
Copy link
Copy Markdown
Contributor

@oz-for-oss oz-for-oss Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@vorporeal vorporeal merged commit a8f57a8 into master Apr 30, 2026
29 of 31 checks passed
@vorporeal vorporeal deleted the david/clarify-alacritty-origins-for-grid-code branch April 30, 2026 01:43
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.)
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants