Repository navigation
fix(cli): explain embedded database lock conflicts - #1684
Merged
Shashankss1205 merged 1 commit intoSep 2, 2026
Merged
Shashankss1205 merged 1 commit into
Shashankss1205 merged 1 commit into
Conversation
|
@donovan-yohan is attempting to deploy a commit to the shashankss1205's projects Team on Vercel. A member of the Team first needs to authorize it. |
Shashankss1205
approved these changes
Sep 2, 2026
Shashankss1205
left a comment
Shashankss1205
left a comment
Collaborator
There was a problem hiding this comment.
Verified on a local trial-merge: the lock-conflict branch keys on the actual Kùzu/Ladybug lock error text, the message tells the user the true situation (a Gateway/watcher owns the database) instead of sending them to cgc doctor for a non-configuration problem, and unrelated connection errors keep the existing guidance. Both tests pass; full suite green. Scoping Gateway auto-delegation out until a discovery mechanism exists is the right call — thanks @donovan-yohan. Addresses the guidance half of #1683.
github-project-automation
Bot
moved this from Backlog tasks
to Done
in CGC Progress Board
Shashankss1205
added a commit
that referenced
this pull request
Sep 2, 2026
* fix(viz): display source filenames for synthetic module nodes * fix(jobs): serialize last update time in job responses (#1679) * fix(cli): explain embedded database lock conflicts (#1684) * fix(setup-wizard): stop replacing IDE settings that are JSONC (#1677) VS Code and its forks write settings.json as JSONC. json.load rejects comments and trailing commas, and the wizard treated that rejection as "no settings yet" before writing the file back, so a user's whole configuration was replaced by a lone mcpServers key. Parse JSONC before giving up, and if the file still cannot be parsed, leave it alone instead of overwriting it. Back up the file before writing either way, and say so when comments are present, since json.dump cannot preserve them. Fixes #660 Signed-off-by: Aloys Jehwin <[email protected]> * feat(cgcignore): treat .gitignore as an ignore source (#1680) Anything git ignores is now ignored by the indexer, so a repository no longer needs a .cgcignore that restates its .gitignore. Patterns are layered defaults -> .gitignore -> .cgcignore. Matching is last-match-wins, so a negated pattern in .cgcignore can still bring a git-ignored path back into the graph. Fixes #729 Signed-off-by: Aloys Jehwin <[email protected]> * normalize module-node label to the plain filename in all render sites --------- Signed-off-by: Aloys Jehwin <[email protected]> Co-authored-by: Donovan Yohan <[email protected]> Co-authored-by: Aloys Jehwin <[email protected]> Co-authored-by: Shashank Shekhar Singh <[email protected]>
Shashankss1205
added a commit
that referenced
this pull request
Sep 2, 2026
* fix: find functions by argument type * fix(jobs): serialize last update time in job responses (#1679) * fix(cli): explain embedded database lock conflicts (#1684) * fix(setup-wizard): stop replacing IDE settings that are JSONC (#1677) VS Code and its forks write settings.json as JSONC. json.load rejects comments and trailing commas, and the wizard treated that rejection as "no settings yet" before writing the file back, so a user's whole configuration was replaced by a lone mcpServers key. Parse JSONC before giving up, and if the file still cannot be parsed, leave it alone instead of overwriting it. Back up the file before writing either way, and say so when comments are present, since json.dump cannot preserve them. Fixes #660 Signed-off-by: Aloys Jehwin <[email protected]> * feat(cgcignore): treat .gitignore as an ignore source (#1680) Anything git ignores is now ignored by the indexer, so a repository no longer needs a .cgcignore that restates its .gitignore. Patterns are layered defaults -> .gitignore -> .cgcignore. Matching is last-match-wins, so a negated pattern in .cgcignore can still bring a git-ignored path back into the graph. Fixes #729 Signed-off-by: Aloys Jehwin <[email protected]> * fix(viz): display source filenames for synthetic module nodes (#1682) * fix(viz): display source filenames for synthetic module nodes * fix(jobs): serialize last update time in job responses (#1679) * fix(cli): explain embedded database lock conflicts (#1684) * fix(setup-wizard): stop replacing IDE settings that are JSONC (#1677) VS Code and its forks write settings.json as JSONC. json.load rejects comments and trailing commas, and the wizard treated that rejection as "no settings yet" before writing the file back, so a user's whole configuration was replaced by a lone mcpServers key. Parse JSONC before giving up, and if the file still cannot be parsed, leave it alone instead of overwriting it. Back up the file before writing either way, and say so when comments are present, since json.dump cannot preserve them. Fixes #660 Signed-off-by: Aloys Jehwin <[email protected]> * feat(cgcignore): treat .gitignore as an ignore source (#1680) Anything git ignores is now ignored by the indexer, so a repository no longer needs a .cgcignore that restates its .gitignore. Patterns are layered defaults -> .gitignore -> .cgcignore. Matching is last-match-wins, so a negated pattern in .cgcignore can still bring a git-ignored path back into the graph. Fixes #729 Signed-off-by: Aloys Jehwin <[email protected]> * normalize module-node label to the plain filename in all render sites --------- Signed-off-by: Aloys Jehwin <[email protected]> Co-authored-by: Donovan Yohan <[email protected]> Co-authored-by: Aloys Jehwin <[email protected]> Co-authored-by: Shashank Shekhar Singh <[email protected]> * fix the argument query so it filters f; behavioral pin on real kuzu --------- Signed-off-by: Aloys Jehwin <[email protected]> Co-authored-by: Donovan Yohan <[email protected]> Co-authored-by: Aloys Jehwin <[email protected]> Co-authored-by: Upanshi Mittal <[email protected]> Co-authored-by: Shashank Shekhar Singh <[email protected]>
Shashankss1205
added a commit
that referenced
this pull request
Sep 2, 2026
…1676) * feat: add SSL connection parameters to cassandra_ingester.py * feat: add SSL connection parameters to mysql_ingester.py * fix(jobs): serialize last update time in job responses (#1679) * fix(cli): explain embedded database lock conflicts (#1684) * fix(setup-wizard): stop replacing IDE settings that are JSONC (#1677) VS Code and its forks write settings.json as JSONC. json.load rejects comments and trailing commas, and the wizard treated that rejection as "no settings yet" before writing the file back, so a user's whole configuration was replaced by a lone mcpServers key. Parse JSONC before giving up, and if the file still cannot be parsed, leave it alone instead of overwriting it. Back up the file before writing either way, and say so when comments are present, since json.dump cannot preserve them. Fixes #660 Signed-off-by: Aloys Jehwin <[email protected]> * feat(cgcignore): treat .gitignore as an ignore source (#1680) Anything git ignores is now ignored by the indexer, so a repository no longer needs a .cgcignore that restates its .gitignore. Patterns are layered defaults -> .gitignore -> .cgcignore. Matching is last-match-wins, so a negated pattern in .cgcignore can still bring a git-ignored path back into the graph. Fixes #729 Signed-off-by: Aloys Jehwin <[email protected]> * fix(viz): display source filenames for synthetic module nodes (#1682) * fix(viz): display source filenames for synthetic module nodes * fix(jobs): serialize last update time in job responses (#1679) * fix(cli): explain embedded database lock conflicts (#1684) * fix(setup-wizard): stop replacing IDE settings that are JSONC (#1677) VS Code and its forks write settings.json as JSONC. json.load rejects comments and trailing commas, and the wizard treated that rejection as "no settings yet" before writing the file back, so a user's whole configuration was replaced by a lone mcpServers key. Parse JSONC before giving up, and if the file still cannot be parsed, leave it alone instead of overwriting it. Back up the file before writing either way, and say so when comments are present, since json.dump cannot preserve them. Fixes #660 Signed-off-by: Aloys Jehwin <[email protected]> * feat(cgcignore): treat .gitignore as an ignore source (#1680) Anything git ignores is now ignored by the indexer, so a repository no longer needs a .cgcignore that restates its .gitignore. Patterns are layered defaults -> .gitignore -> .cgcignore. Matching is last-match-wins, so a negated pattern in .cgcignore can still bring a git-ignored path back into the graph. Fixes #729 Signed-off-by: Aloys Jehwin <[email protected]> * normalize module-node label to the plain filename in all render sites --------- Signed-off-by: Aloys Jehwin <[email protected]> Co-authored-by: Donovan Yohan <[email protected]> Co-authored-by: Aloys Jehwin <[email protected]> Co-authored-by: Shashank Shekhar Singh <[email protected]> * fix: find functions by argument type (#1686) * fix: find functions by argument type * fix(jobs): serialize last update time in job responses (#1679) * fix(cli): explain embedded database lock conflicts (#1684) * fix(setup-wizard): stop replacing IDE settings that are JSONC (#1677) VS Code and its forks write settings.json as JSONC. json.load rejects comments and trailing commas, and the wizard treated that rejection as "no settings yet" before writing the file back, so a user's whole configuration was replaced by a lone mcpServers key. Parse JSONC before giving up, and if the file still cannot be parsed, leave it alone instead of overwriting it. Back up the file before writing either way, and say so when comments are present, since json.dump cannot preserve them. Fixes #660 Signed-off-by: Aloys Jehwin <[email protected]> * feat(cgcignore): treat .gitignore as an ignore source (#1680) Anything git ignores is now ignored by the indexer, so a repository no longer needs a .cgcignore that restates its .gitignore. Patterns are layered defaults -> .gitignore -> .cgcignore. Matching is last-match-wins, so a negated pattern in .cgcignore can still bring a git-ignored path back into the graph. Fixes #729 Signed-off-by: Aloys Jehwin <[email protected]> * fix(viz): display source filenames for synthetic module nodes (#1682) * fix(viz): display source filenames for synthetic module nodes * fix(jobs): serialize last update time in job responses (#1679) * fix(cli): explain embedded database lock conflicts (#1684) * fix(setup-wizard): stop replacing IDE settings that are JSONC (#1677) VS Code and its forks write settings.json as JSONC. json.load rejects comments and trailing commas, and the wizard treated that rejection as "no settings yet" before writing the file back, so a user's whole configuration was replaced by a lone mcpServers key. Parse JSONC before giving up, and if the file still cannot be parsed, leave it alone instead of overwriting it. Back up the file before writing either way, and say so when comments are present, since json.dump cannot preserve them. Fixes #660 Signed-off-by: Aloys Jehwin <[email protected]> * feat(cgcignore): treat .gitignore as an ignore source (#1680) Anything git ignores is now ignored by the indexer, so a repository no longer needs a .cgcignore that restates its .gitignore. Patterns are layered defaults -> .gitignore -> .cgcignore. Matching is last-match-wins, so a negated pattern in .cgcignore can still bring a git-ignored path back into the graph. Fixes #729 Signed-off-by: Aloys Jehwin <[email protected]> * normalize module-node label to the plain filename in all render sites --------- Signed-off-by: Aloys Jehwin <[email protected]> Co-authored-by: Donovan Yohan <[email protected]> Co-authored-by: Aloys Jehwin <[email protected]> Co-authored-by: Shashank Shekhar Singh <[email protected]> * fix the argument query so it filters f; behavioral pin on real kuzu --------- Signed-off-by: Aloys Jehwin <[email protected]> Co-authored-by: Donovan Yohan <[email protected]> Co-authored-by: Aloys Jehwin <[email protected]> Co-authored-by: Upanshi Mittal <[email protected]> Co-authored-by: Shashank Shekhar Singh <[email protected]> * fix(viz): render FalkorDB relationships in the live graph (#1689) parse_element classified relationships by class name, matching only Relationship/KuzuRelationship. FalkorDB's edge class is named Edge, so it matched no branch and every FalkorDB relationship was silently dropped — on the backend that is CGC's default on Unix under Python 3.12+. parse_rel directly below already reads FalkorDB edges correctly; it was never reached. The offline renderer in cli_helpers already classified by duck typing and handled this (#1453). Both renderers now share those predicates in utils/graph_shapes, so classification cannot drift apart again. * expose --ssl-verify/--ssl-ca-certs on the datasource CLI; test the driver kwargs --------- Signed-off-by: Aloys Jehwin <[email protected]> Co-authored-by: Donovan Yohan <[email protected]> Co-authored-by: Aloys Jehwin <[email protected]> Co-authored-by: Upanshi Mittal <[email protected]> Co-authored-by: Shashank Shekhar Singh <[email protected]> Co-authored-by: Mansurshakh Japarov <[email protected]> Co-authored-by: Abhinav Singh <[email protected]>
Shashankss1205
added
gssoc:approved
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
2 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.
Improves #1683 by replacing the misleading
cgc doctorsuggestion for embedded-database lock conflicts with guidance to use the running Gateway's MCP/HTTP interface or stop the lock-owning process.Automatic CLI-to-Gateway delegation is intentionally out of scope; the repository has no canonical Gateway discovery mechanism yet. Unrelated connection errors retain the existing guidance.
Verification:
.venv/bin/pytest tests/unit/cli tests/integration/cli -q— 133 passed./tests/run_tests.sh fast— 1497 passed, 7 skipped, 13 failed; all 13 failures reproduce unchanged onorigin/main(04c8d390) under the same environment