Repository navigation
docs(fork): rebased upstream heads of the Session volume series - #558
Merged
Merged
Conversation
Signed-off-by: Timo Derstappen <teemow@gmail.com>
teemow
force-pushed
the
docs/fork-session-series-rebased
branch
from
October 14, 2026 04:58
5256102 to
5e88ffe
Compare
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
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.
Problem
The upstream pull requests of the Session volume series (kagent-dev#3155, kagent-dev#3156, kagent-dev#3157, kagent-dev#3158) conflict with upstream
main, which moved 17 commits since their base: kagent-dev#3153 replaced the controller's application environment variables with a config schema, kagent-dev#3160 changed the PostgreSQL config, kagent-dev#3080 the Agent's template shape, kagent-dev#3185 the import grouping. The carried files still name only the old heads.Proposed solution
Each carried file of the series names its rebased upstream head, prepared on the mirror
main@b42a6c53aand queued on the team's upstream review list (rows 207 and 208):api-workspace-volume-reference-and-admission-token:upstream/session-volume-source-3.session-configurable-admission-verifying-a-signed:upstream/session-admission-jwt-3, configured by the controller config'ssessions.admission.jwtupstream; the line keeps its environment variables until the re-pin onto thatmain.harness-claude-in-its-session-directory-changed:upstream/claude-session-directory-2.adk-set-up-the-session-directory:upstream/adk-session-directory-2.harness-tell-a-returning-claude-session-its-directory-was-set-up-again:upstream/claude-fresh-directory-notice-2.The open upstream pull requests are not touched; their owner moves them to the new heads.
Acceptance criteria
scripts/fork/carried.sh --checkpasses (fork-ledger)