fix(opencode): sessions lost after git init in existing project#16814
Merged
rekram1-node merged 4 commits intoanomalyco:devfrom Mar 13, 2026
Merged
fix(opencode): sessions lost after git init in existing project#16814rekram1-node merged 4 commits intoanomalyco:devfrom
rekram1-node merged 4 commits intoanomalyco:devfrom
Conversation
Contributor
|
Hey! Your PR title Please update it to start with one of:
Where See CONTRIBUTING.md for details. |
Contributor
|
The following comment was made by an LLM, it may be inaccurate: Based on my search, I found one related PR that might be worth noting: Related PR (not a duplicate):
PR #15772 -
No duplicate PRs found |
michaeldwan
changed the title
This was referenced Mar 10, 2026
michaeldwan
changed the title
6 tasks
michaeldwan
force-pushed
the
md/fix-orphan-post-git-init
branch
from
300436f to
32309e3
Compare
…y startup migrateFromGlobal had two bugs: it ran before the target project row was inserted (FK constraint silently rejected the update), and it only ran on first project creation so late-arriving global sessions were permanently orphaned. Move the call after the upsert and remove the first-creation gate so it runs on every startup.
michaeldwan
force-pushed
the
md/fix-orphan-post-git-init
branch
from
b75985a to
b6b4b5b
Compare
Collaborator
|
looks like there is a merge conflict now |
…-init # Conflicts: # packages/opencode/src/project/project.ts
Contributor
Author
|
@rekram1-node looks like upstream replaced all the |
Collaborator
|
Sweet thanks! looking over it now |
Collaborator
|
it looks like the migrateFromGlobal function never got touched rlly after the sqlite migration, it should have been updated it looks very inefficient now, not that it matters too much. I'll fix that separately. This lgtm tho Thanks for the PR! |
Open
6 tasks
ConanXu-math
pushed a commit
to ConanXu-math/opencode
that referenced
this pull request
Mar 17, 2026
…alyco#16814) Co-authored-by: Aiden Cline <[email protected]>
demostanis
pushed a commit
to demostanis/opencode
that referenced
this pull request
Mar 19, 2026
…alyco#16814) Co-authored-by: Aiden Cline <[email protected]>
demostanis
pushed a commit
to demostanis/opencode
that referenced
this pull request
Mar 20, 2026
…alyco#16814) Co-authored-by: Aiden Cline <[email protected]>
balcsida
pushed a commit
to balcsida/opencode
that referenced
this pull request
Mar 24, 2026
…alyco#16814) Co-authored-by: Aiden Cline <[email protected]>
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.
Issue for this PR
Closes #16812
Closes #15678
Type of change
What does this PR do?
migrateFromGlobal()had two bugs that caused sessions created under the shared"global"project ID to become permanently orphaned when a git repo is initialized:session.project_id → project.idsilently rejected the update, and the.catch()handler swallowed the error.if (!row)branch). Sessions that accumulated under"global"after the real project ID already existed were never migrated.The fix moves the call to after the project row upsert and removes the first-creation gate so it runs on every startup. This is safe because the function already filters by directory match and is a no-op when no global sessions exist (two cheap indexed reads).
Related PR: #16389 — fixes a different orphaning scenario (worktree cache location and
rev-list --allinstability).How did you verify your code works?
Screenshots / recordings
If this is a UI change, please include a screenshot or recording.
Checklist
If you do not follow this template your PR will be automatically rejected.