feat(source-control): commit, push, pull, and sync actions in panel#1211
Open
mralexsaavedra wants to merge 6 commits intostablyai:mainfrom
Open
feat(source-control): commit, push, pull, and sync actions in panel#1211mralexsaavedra wants to merge 6 commits intostablyai:mainfrom
mralexsaavedra wants to merge 6 commits intostablyai:mainfrom
Conversation
mralexsaavedra
force-pushed
the
feat/source-control-commit-push-graph
branch
2 times, most recently
from
1def37c to
2afcf2f
Compare
Contributor
Author
Screenshot
|
Contributor
|
@brennanb2025 can you review this? It's a cool feature :-D |
- commit message textarea with per-worktree draft persistence - Cmd+Enter / Ctrl+Enter shortcut (platform-aware) - placeholder shows shortcut + branch name, matching VSCode UX - disabled states: empty message, no staged files, unresolved conflicts - inline error on hook/GPG failure, draft preserved - IPC: git:commit with SSH provider routing via relay - split relay git-handler into focused modules to stay under max-lines - new tests: CommitArea, IPC handler, relay commit, draft restoration Closes stablyai#1170 Co-authored-by: Orca <help@stably.ai>
Surface publish, push, pull, and sync controls in Source Control so branches can stay aligned with their upstream without leaving Orca. Co-authored-by: Orca <help@stably.ai>
Keep remote git errors on the editor store toast path so publish and push failures show actionable feedback without crashing the sidebar. Co-authored-by: Orca <help@stably.ai>
Co-authored-by: Orca <help@stably.ai>
Raw IPC wrapper text was leaking into the push failure toast. Extends resolveRemoteOperationErrorMessage with isPush flag to map 'non-fast-forward' / 'Updates were rejected' to a clean actionable message; other push errors get a generic fallback. Co-authored-by: Orca <help@stably.ai>
- Non-fast-forward detection runs before publish/isPush split so both flows show the same actionable rejection message - Generic push fallback uses extractPublishFailureDetail to surface fatal/remote git lines instead of hiding them - Publish null-detail fallback returns friendly message instead of leaking raw error.message - Tests added for publish+rejected, publish+generic, publish+fallback Co-authored-by: Orca <help@stably.ai>
mralexsaavedra
force-pushed
the
feat/source-control-commit-push-graph
branch
from
2afcf2f to
225cc9a
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
3 participants
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.
Closes #1170
Summary
Changes
src/renderer/src/components/right-sidebar/SourceControl.tsxsrc/renderer/src/store/slices/editor.tssrc/main/git/remote.tssrc/main/git/status.tssrc/relay/git-handler.ts+ split ops filessrc/preload/api-types.d.ts+index.tssrc/shared/types.ts*.test.ts / *.test.tsxTest Plan
pnpm test)Made with Orca 🐋