Hook `DiffStateModel` to remote server by MaggieShan · Pull Request #10470 · warpdotdev/warp

MaggieShan · 2026-05-08T11:27:29Z

Description

Built on Add proto messages for remote DiffStateModel #10428
Adds the server-side changes to support DiffStateModel and git states on remote environments
- Adds type conversions
- Adds a GlobalDiffStateModel to track each LocalDiffStateModel per repo_path, diff_mode
- Adds subscription to repositories to send server messages
- Adds handlers for client messages

Linked Issue

APP-4355

Testing

No-op

Agent Mode

Warp Agent Mode - This PR was created via Warp's AI Agent Mode

oz-for-oss · 2026-05-08T14:19:19Z

@MaggieShan

I'm starting a first review of this pull request.

You can view the conversation on Warp.

I completed the review and no human review was requested for 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

oz-for-oss

Overview

This PR adds server-side diff-state models, proto conversions, subscriptions, and remote-client event forwarding for diff-state snapshots and deltas.

Concerns

New GetDiffState requests can be left pending forever when repo detection does not produce a LocalDiffStateModel event.
Immediate snapshots for already-loaded models drop content_at_head, so later subscribers do not receive the same renderable diff data as the initial async load.

Security

DiscardFiles forwards client-supplied file paths into destructive git restore/clean/stash behavior without validating that every path is repo-relative and contained by the requested repo.

Verdict

Found: 0 critical, 3 important, 0 suggestions

Request changes

Comment /oz-review on this pull request to retrigger a review (up to 3 times on the same pull request).

Powered by Oz

MaggieShan · 2026-05-11T19:22:49Z

/oz-review

oz-for-oss · 2026-05-11T19:23:02Z

@MaggieShan

I'm re-reviewing this pull request in response to a review request.

You can view the conversation on Warp.

I completed the review and no human review was requested for 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

oz-for-oss

Overview

This PR adds server-side diff-state subscriptions, proto conversions, and discard-files handling for remote environments.

Concerns

DiscardFilesResponse reports success before the async git operation completes, so failures are only logged and the client can present a false success state.
Client-controlled discard inputs need stronger validation before they reach destructive git operations.
Manual testing is required for changes that can be manually tested. Please include screenshots or a screen recording that show the remote diff/discard flow working end to end, or justify why manual testing is not possible.

Security

Renamed-file old_path and branch_name are accepted from the client without enough validation before being passed into git restore/checkout paths.

Verdict

Found: 0 critical, 3 important, 0 suggestions

Request changes

Comment /oz-review on this pull request to retrigger a review (up to 3 times on the same pull request).

Powered by Oz

oz-for-oss · 2026-05-11T19:30:40Z

+            m.discard_files(file_infos, msg.should_stash, msg.branch_name, ctx);
+        });
+
+        HandlerOutcome::Sync(server_message::Message::DiscardFilesResponse(


⚠️ [IMPORTANT] This returns success before the async git restore/stash finishes; discard_files only logs failures, so clients can report a successful discard while files remain unchanged. Keep the request pending until the git result and return an error on failure.

The current request and response set up is closer to an ack than an actual success - this follows the local model which currently also doesn't handle success or errors. Alternatively, can update this to a fire and forget client message - don't have a strong opinion for this

kevinyang372 · 2026-05-08T18:39:57Z

+        conn_id: ConnectionId,
+        ctx: &mut ModelContext<Self>,
+    ) -> HandlerOutcome {
+        let Some(mode_proto) = &msg.mode else {


Mode should never be empty no? Should we enforce that in the proto schema?

kevinyang372 · 2026-05-11T23:02:22Z

+            .iter()
+            .filter(|(_, conns)| conns.contains(&conn_id))
+            .map(|(key, _)| key.clone())
+            .collect_vec();


Do we need to collect here?

## Description * Built on #10428 * Adds the server-side changes to support `DiffStateModel` and git states on remote environments * Adds type conversions * Adds a `GlobalDiffStateModel` to track each `LocalDiffStateModel` per `repo_path`, `diff_mode` * Adds subscription to repositories to send server messages * Adds handlers for client messages ## Linked Issue [APP-4355](https://linear.app/warpdotdev/issue/APP-4355/hook-up-diffstatemodel-to-remote-server) ## Testing No-op ## Agent Mode - [x] Warp Agent Mode - This PR was created via Warp's AI Agent Mode

## Description * Built on #10470 * Adds client-side wiring to support git states and the code review view in remote environments * Moves shared types out of `LocalDiffStateModel` * Updates `RemoteDiffStateModel` with real logic to handle and emit the server events * Update `RemoteServerManager` to handle server events and send client events * Note: UI for reconnection is still tbd ## Linked Issue [APP-4356](https://linear.app/warpdotdev/issue/APP-4356/create-remotediffstatemodel-for-the-client) ## Testing Should be no-op. Confirmed all unit tests are passing as expected. - [x] I have manually tested my changes locally with `./script/run` ## Agent Mode - [x] Warp Agent Mode - This PR was created via Warp's AI Agent Mode

cla-bot Bot added the cla-signed label May 8, 2026

MaggieShan changed the title ~~hook diffstatemodel to remote server~~ Hook DiffStateModel to remote server May 8, 2026

MaggieShan force-pushed the maggs/hook-diffstatemodel-to-server branch from 6d72bb7 to 56a3a62 Compare May 8, 2026 13:37

MaggieShan marked this pull request as ready for review May 8, 2026 14:19

oz-for-oss Bot reviewed May 8, 2026

View reviewed changes

Comment thread app/src/remote_server/diff_state_proto.rs Outdated

Comment thread app/src/remote_server/server_model.rs Outdated

Comment thread app/src/remote_server/server_model.rs Outdated

MaggieShan force-pushed the maggs/hook-diffstatemodel-to-server branch 2 times, most recently from d837ed7 to 04a8618 Compare May 8, 2026 16:28

MaggieShan force-pushed the maggs/diffstatemodel-protos branch from d72a06a to faad40b Compare May 8, 2026 21:32

MaggieShan force-pushed the maggs/hook-diffstatemodel-to-server branch 3 times, most recently from 1f57582 to 7e9e78e Compare May 8, 2026 22:47

MaggieShan force-pushed the maggs/diffstatemodel-protos branch from faad40b to 527e04a Compare May 11, 2026 13:33

MaggieShan force-pushed the maggs/hook-diffstatemodel-to-server branch from 7e9e78e to f4013d8 Compare May 11, 2026 13:37

MaggieShan force-pushed the maggs/diffstatemodel-protos branch from 527e04a to 672bfdb Compare May 11, 2026 14:15

Base automatically changed from maggs/diffstatemodel-protos to master May 11, 2026 15:24

MaggieShan force-pushed the maggs/hook-diffstatemodel-to-server branch 3 times, most recently from 5b7dab4 to f90b9ce Compare May 11, 2026 18:32

oz-for-oss Bot reviewed May 11, 2026

View reviewed changes

MaggieShan requested a review from kevinyang372 May 11, 2026 20:01

kevinyang372 reviewed May 11, 2026

View reviewed changes

kevinyang372 approved these changes May 11, 2026

View reviewed changes

MaggieShan added 5 commits May 12, 2026 05:17

hook diffstatemodel to remote server

023b220

add tests

2cdb463

oz review

870dd9b

fix tests

5ece66a

pr comments

440c76e

MaggieShan force-pushed the maggs/hook-diffstatemodel-to-server branch from b518a57 to 440c76e Compare May 12, 2026 09:17

MaggieShan enabled auto-merge (squash) May 12, 2026 09:30

MaggieShan merged commit adceb65 into master May 12, 2026
24 of 25 checks passed

MaggieShan deleted the maggs/hook-diffstatemodel-to-server branch May 12, 2026 09:35

MaggieShan mentioned this pull request May 12, 2026

Add RemoteDiffStateModel #10489

Merged

2 tasks

Conversation

MaggieShan commented May 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Linked Issue

Testing

Agent Mode

Uh oh!

oz-for-oss Bot commented May 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

oz-for-oss Bot left a comment

Choose a reason for hiding this comment

Overview

Concerns

Security

Verdict

Uh oh!

Uh oh!

Uh oh!

Uh oh!

MaggieShan commented May 11, 2026

Uh oh!

oz-for-oss Bot commented May 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

oz-for-oss Bot left a comment

Choose a reason for hiding this comment

Overview

Concerns

Security

Verdict

Uh oh!

Uh oh!

Uh oh!

oz-for-oss Bot May 11, 2026

Choose a reason for hiding this comment

Uh oh!

MaggieShan May 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

kevinyang372 May 8, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

kevinyang372 May 11, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

MaggieShan commented May 8, 2026 •

edited

Loading

oz-for-oss Bot commented May 8, 2026 •

edited

Loading

oz-for-oss Bot commented May 11, 2026 •

edited

Loading

MaggieShan May 11, 2026 •

edited

Loading