feat(agent-manager): Add session persistence for worktrees #5233
Conversation
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
🦋 Changeset detectedLatest commit: 21ff206 The changes in this PR will be included in the next version bump. This PR includes changesets to release 1 package
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
Contributor
Code Review SummaryStatus: 1 Issue Found | Recommendation: Address before merge Overview
Issue Details (click to expand)CRITICAL
Files Reviewed (6 files)
|
- Add sessionId field to WorktreeInfo interface - Add writeSessionId/readSessionId/removeSessionId methods to WorktreeManager - Add ensureWorktreeGitExclude to prevent .kilocode/ from being committed - Add onWorktreeSessionCreated callback to CliProcessHandler - Integrate session ID writing in AgentManagerProvider - Add Error Handling rules to AGENTS.md - Add comprehensive tests (33 passing)
Co-authored-by: kiloconnect[bot] <240665456+kiloconnect[bot]@users.noreply.github.com>
iscekic
approved these changes
Jan 22, 2026
- Resolved modify/delete conflict for CliProcessHandler.ts (deleted in main) - Ported onWorktreeSessionCreated callback to RuntimeProcessHandler - Fixed indentation in AgentManagerProvider.ts callbacks
This was referenced Jan 22, 2026
Merged
maywzh
pushed a commit
to maywzh/kilocode
that referenced
this pull request
Jan 25, 2026
…5233) * feat(agent-manager): Add session persistence for worktrees * feat(agent-manager): Add session persistence for worktrees - Add sessionId field to WorktreeInfo interface - Add writeSessionId/readSessionId/removeSessionId methods to WorktreeManager - Add ensureWorktreeGitExclude to prevent .kilocode/ from being committed - Add onWorktreeSessionCreated callback to CliProcessHandler - Integrate session ID writing in AgentManagerProvider - Add Error Handling rules to AGENTS.md - Add comprehensive tests (33 passing) * Update src/core/kilocode/agent-manager/AgentManagerProvider.ts Co-authored-by: kiloconnect[bot] <240665456+kiloconnect[bot]@users.noreply.github.com> --------- Co-authored-by: kiloconnect[bot] <240665456+kiloconnect[bot]@users.noreply.github.com>
maywzh
pushed a commit
to maywzh/kilocode
that referenced
this pull request
Jan 25, 2026
…5233) * feat(agent-manager): Add session persistence for worktrees * feat(agent-manager): Add session persistence for worktrees - Add sessionId field to WorktreeInfo interface - Add writeSessionId/readSessionId/removeSessionId methods to WorktreeManager - Add ensureWorktreeGitExclude to prevent .kilocode/ from being committed - Add onWorktreeSessionCreated callback to CliProcessHandler - Integrate session ID writing in AgentManagerProvider - Add Error Handling rules to AGENTS.md - Add comprehensive tests (33 passing) * Update src/core/kilocode/agent-manager/AgentManagerProvider.ts Co-authored-by: kiloconnect[bot] <240665456+kiloconnect[bot]@users.noreply.github.com> --------- Co-authored-by: kiloconnect[bot] <240665456+kiloconnect[bot]@users.noreply.github.com>
catrielmuller
pushed a commit
that referenced
this pull request
Jan 26, 2026
* feat(agent-manager): Add session persistence for worktrees * feat(agent-manager): Add session persistence for worktrees - Add sessionId field to WorktreeInfo interface - Add writeSessionId/readSessionId/removeSessionId methods to WorktreeManager - Add ensureWorktreeGitExclude to prevent .kilocode/ from being committed - Add onWorktreeSessionCreated callback to CliProcessHandler - Integrate session ID writing in AgentManagerProvider - Add Error Handling rules to AGENTS.md - Add comprehensive tests (33 passing) * Update src/core/kilocode/agent-manager/AgentManagerProvider.ts Co-authored-by: kiloconnect[bot] <240665456+kiloconnect[bot]@users.noreply.github.com> --------- Co-authored-by: kiloconnect[bot] <240665456+kiloconnect[bot]@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
Implements session persistence for Agent Manager by storing the session ID directly in each worktree's
.kilocode/session-idfile. This enables session recovery by matching worktrees to their corresponding sessions.Changes
WorktreeManager.ts
sessionIdfield toWorktreeInfointerfacewriteSessionId()- writes session ID to.kilocode/session-idin worktreereadSessionId()- reads session ID from worktreeremoveSessionId()- removes session ID file from worktreeensureWorktreeGitExclude()- adds.kilocode/to main repo's.git/info/excludediscoverWorktrees()to includesessionIdin discovered worktree infoCliProcessHandler.ts
onWorktreeSessionCreatedcallback toCliProcessHandlerCallbackshandleSessionCreated()andupgradeProvisionalSession()AgentManagerProvider.ts
handleWorktreeSessionCreated()method that writes session ID to worktreecreateCliProcessHandler()Tests
discoverWorktreeswith sessionId integrationDesign Decisions
.kilocode/session-idwithin each worktree, making the worktree itself the single source of truth.git/info/exclude(shared by all worktrees) to prevent.kilocode/from being committedonWorktreeSessionCreatedcallback notifies when to write session ID, keeping concerns separated