Wire up workspace_integrate_upstream API for stack rebase and upstream integration#13678
Draft
Wire up workspace_integrate_upstream API for stack rebase and upstream integration#13678
Conversation
mtsgrd
force-pushed
the
add-rebase-stack-modal
branch
from
36effc6 to
7c228ad
Compare
mtsgrd
changed the title
mtsgrd
force-pushed
the
add-rebase-stack-modal
branch
from
7c228ad to
93001e3
Compare
mtsgrd
force-pushed
the
add-rebase-stack-modal
branch
2 times, most recently
from
90da8d5 to
576b1a6
Compare
Contributor
Author
|
@Caleb-T-Owens is the new API ready for the svelte app to migrate? |
mtsgrd
force-pushed
the
add-rebase-stack-modal
branch
3 times, most recently
from
a6744da to
cf6188c
Compare
**New features:** - "Rebase onto target" context menu action with dry-run preview modal (`RebaseStackModal`) - Per-stack resolution picker: rebase, merge, or "leave as is" (skip) - Dry-run preview showing how many commits will be rewritten **`IntegrateUpstreamModal` refactor:** - Migrated from old Resolution API to `BottomUpdate[]` API - Imperative status fetch → reactive `useQuery` subscription (auto-invalidates on background fetch) - Wrapped statuses section in `<ReduxResult>` for loading/error handling - Statuses computed via `computeStatuses(rawData)` — pure function taking the query response as param - `buildUpdates(statuses)` parameterized instead of reading module-level state - Dry-run cache invalidation skipped when `args.dryRun` is true **Backend (`upstream_integration.rs`):** - Exposed `bottom_selector` on `StackStatus` for building `BottomUpdate`s **E2E tests:** - "Leave as is" preserves branch base while other branches advance - Helpers: `openIntegrateModal()`, `integrationRow()`, `getBranchBase()` **Cleanup:** - Merged `UpstreamIntegrationService` into `stackService` — upstream status queries and mutations now live alongside other stack operations - Removed `StackStatusesWithBranchesV3` type (joining now happens in the modal) - Deleted old `integrate_upstream` endpoint and dead code in `branchEndpoints.ts` - Removed `dryRunPromise` — dry-run errors handled via async try/catch
mtsgrd
force-pushed
the
add-rebase-stack-modal
branch
from
cf6188c to
9257088
Compare
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
1 participant
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.
Summary
workspace_integrate_upstreamAPI for upstream integration in the desktop appIntegrateUpstreamModalfrom imperative fetching to reactive query subscriptions withReduxResultbottom_selectoronStackStatusso the frontend can constructBottomUpdateselectorsTest plan
🤖 Generated with Claude Code