Restore cloud session diffs on import - #10948
Merged
Merged
Conversation
![kilo-code-bot[bot]](https://avatars.githubusercontent.com/in/2193792?s=60&v=4){kind=small}
Contributor
Code Review SummaryStatus: No Issues Found | Recommendation: Merge OverviewAll previously flagged issues are resolved. The incremental diff (since Resolved Suggestions (all fixed)
Files Reviewed (incremental — 1 file changed)
Reviewed by claude-4.6-sonnet-20260217 · 500,276 tokens Review guidance: REVIEW.md from base branch |
eshurakov
approved these changes
Jun 8, 2026
iscekic
force-pushed
the
feat/session-diff-portability
branch
from
June 8, 2026 14:12
da53950 to
a6a3ce6
Compare
iscekic
enabled auto-merge (squash)
June 8, 2026 15:13
t7tran
pushed a commit
to t7tran/kilocode
that referenced
this pull request
Aug 14, 2026
* feat(cli): restore cloud session diffs on import * fix(cli): hide git diff restore subprocesses * fix(cli): harden session diff path guard * test(cli): keep diff restore test synchronous * test(cli): normalize diff restore line endings * fix(cli): preserve imported diffs across session forks * chore: remove session ingest findings doc * fix(cli): avoid duplicate cumulative session diffs * test(cli): isolate session export test failures * fix(cli): preserve cumulative cloud fork diffs * fix(cli): avoid cumulative diff prefix duplication
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.
Summary
sessionDiff/session_diffpayloads while keeping the legacy message-summary fallback.session_diffstorage after import so imported sessions keep local diff metadata.Notes
git apply --3way, file snapshots are constrained to the target workspace, and restore/storage failures are logged without blocking the session database import.Storageinto the HTTP API layer; the restore logic lives under Kilo-owned paths to keep the upstream diff small.