Skip to content

Merge main into sand-box-resolve: resolve conflicts and preserve advanced features #227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
malikrohail wants to merge 17 commits into
base: main
Choose a base branch
from
Open

Merge main into sand-box-resolve: resolve conflicts and preserve advanced features #227

malikrohail wants to merge 17 commits into from

Conversation

@malikrohail
Copy link
Collaborator

@malikrohail malikrohail commented Aug 14, 2025 •
edited
Loading

  1. Configure your path, git credentials and API key on frontend UI
  2. It will send a HTTPS request to ws-mcp (both docker if configured)
  3. It will follow your hard coded file path, and make a new directory per project, and you can set num of files changes 'int' parameter under the setting to trigger branch creation as well as push to GH.
  4. GH toggle is on by default, and if turned off, it will not push changes remotely.

malikrohail and others added 16 commits August 3, 2025 17:38
@malikrohail
removing personal token + fix docker read path
2e73dc5
@malikrohail
fix docker path
3e89804
@malikrohail
fix docker path
41f36a8
@malikrohail
adding readme for docker + git setup
888decc
@malikrohail
adding insturction + background worker for faster commit
32f8f78
@malikrohail
hypergridv1: docs + rollback/commit integration + config updates
5156642
@malik-savyminds
docs on how to configure rollback/commit
d03afc7
@malikrohail
undockering kibitz FE
0e1d17a
@malikrohail
Your commit message
15e8b88
@malikrohail
cleaning code
c457bf0
@malikrohail
Update database, config, and chat header component
48747ec
@malikrohail
Merge main into sand-box-resolve: resolve git conflicts and preserve …
6b7b652 
…advanced features

- Resolved merge conflicts in AdminView, ChatView, and type definitions
- Preserved advanced features: auto-commit, workspace management, GitHub integration
- Updated database schema to version 10 with auto-commit branch support
- Maintained rollback functionality and conversation metadata tracking
- Removed conflicting package-lock.json for clean dependency resolution
@malikrohail
fix lint issues + testing all edge cases after to make sure commit + …
e568fc8 
…docker works after fixing lint
@malikrohail
Update sand-box-resolve branch with latest changes
259daf1
@malikrohail
lint errors fix
8cd72d5
@malikrohail
fix: remove env.local from commit
c5aed0f
@malikrohail
Copy link
Collaborator Author

malikrohail commented Aug 18, 2025

short demo
https://github.com/user-attachments/assets/2f9119f8-5443-4f98-b420-bdd395116d1e

@malikrohail malikrohail requested a review from nick1udwig August 19, 2025 17:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nick1udwig nick1udwig Awaiting requested review from nick1udwig

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@malikrohail @malik-savyminds