Skip to content

docs(fork): rebased upstream heads of the Session volume series - #558

Merged
teemow merged 1 commit into
giantswarmfrom
docs/fork-session-series-rebased
Oct 14, 2026
Merged

teemow merged 1 commit into
giantswarmfrom
docs/fork-session-series-rebased

Conversation

@teemow

@teemow teemow commented Oct 14, 2026

Copy link
Copy Markdown
Member

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 @ b42a6c53a and 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's sessions.admission.jwt upstream; the line keeps its environment variables until the re-pin onto that main.
  • 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 --check passes (fork-ledger)
  • Each carried file of the series names its rebased branch and review-list row

@teemow
teemow requested a review from a team as a code owner October 14, 2026 04:56
Signed-off-by: Timo Derstappen <teemow@gmail.com>
@teemow
teemow force-pushed the docs/fork-session-series-rebased branch from 5256102 to 5e88ffe Compare October 14, 2026 04:58
@teemow
teemow merged commit 600b1f9 into giantswarm Oct 14, 2026
42 checks passed
@teemow
teemow deleted the docs/fork-session-series-rebased branch October 14, 2026 06:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant