Repository navigation
Conversation
Runs daily (and on demand) and merges a configurable list of branches from JabRef/jabref and JabRef/jabref-koppor on top of the existing all-branches-merged branch. Branches that have disappeared and branches that conflict are reported via ::warning and skipped, so one dead or conflicting branch does not stop the remaining merges. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01AiaGjSfwh9uqDGtbW8tLfU
The branch only exists on JabRef/jabref, not on the koppor fork, so the previous koppor/ entry warned and skipped on every run. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01AiaGjSfwh9uqDGtbW8tLfU
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01AiaGjSfwh9uqDGtbW8tLfU
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01AiaGjSfwh9uqDGtbW8tLfU
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01AiaGjSfwh9uqDGtbW8tLfU
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01AiaGjSfwh9uqDGtbW8tLfU
The branch was deleted upstream after JabRef#16151 merged. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_016Ww52ZvR7zTL8ZnLHBWhkQ
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_014f69UBH8mjRLVQHs7CgnFj
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01B4rMv9fuZY4fsHzNiuUcNt
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01HKn7io1Av1DrQyqCRqEAWY
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01HKn7io1Av1DrQyqCRqEAWY
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01QP88ao94XmLMgPK1weN1HS
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_018zp2dm93rwWgk6KAy2nm1D
Add PR link comments after each branch entry so the merge source is traceable. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01JD6B4ZoMN5d4Ejk9ys37mf
directory-rest-api is the tip of that stack and contains it, so the same conflict was reported twice. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Vr3E1Gg5DRU4LQDDVnhPys
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01Vr3E1Gg5DRU4LQDDVnhPys
origin/keyword-separator-per-library (JabRef#16835) and origin/show-diff-button (JabRef#16832) no longer exist on either remote; last night's run warned about both. Upstream has landed the keyword-separator work itself, so experimental picks it up via origin/main. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01NPHwSBqteEYM7E2QgWhk8U
…list origin/common-style (JabRef#16708), origin/fulltext-context-menu (JabRef#16829) and origin/fulltext-download-background-task (JabRef#16831) no longer exist upstream; last night's run warned about all three. Upstream has landed each of them itself: the StyleClasses migration, the GroupChangeDetailsView extraction and the background full text search (req~fetchers.fulltext-background-search~1) all arrived via origin/main, so experimental keeps the work without the branches. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01KEfEAwaU63aKf2XzAKa7p8
Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_017MRditeYFDXHjiR6iyibin
The side pane becomes a TabPane of docks (closable, drag-reorderable) instead of stacked panels with up/down buttons, and the entry editor moves from the bottom into a right dock of the same split pane. Docks get a flat Godot-like tab style, checkboxes a filled borderless box. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_017MRditeYFDXHjiR6iyibin
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_017MRditeYFDXHjiR6iyibin
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_017MRditeYFDXHjiR6iyibin
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_017MRditeYFDXHjiR6iyibin
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_017MRditeYFDXHjiR6iyibin
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_017MRditeYFDXHjiR6iyibin
|
🤖 Generated with Claude Code Merging
No compile check was run. Generated by Claude Code |
|
🤖 Generated with Claude Code Update to my note of 2026-09-13: a third file now conflicts. Still not pushed; New since then — The two conflicts from my earlier note are unchanged ( Generated by Claude Code |
|
🤖 Generated with Claude Code Update to my note of 2026-09-14: still not pushed ( Genuinely blocking, both need your call:
New since 2026-09-14, all mechanical: Generated by Claude Code |
# Conflicts: # .github/workflows/update-experimental.yml # jabgui/src/main/java/org/jabref/gui/frame/JabRefFrame.java # jabgui/src/main/java/org/jabref/gui/sidepane/GroupsSidePaneComponent.java # jabgui/src/main/java/org/jabref/gui/sidepane/SidePane.java # jabgui/src/main/java/org/jabref/gui/sidepane/SidePaneComponent.java # jabgui/src/main/resources/org/jabref/gui/theme/jabref-theme.css Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01JQLhzuyHc67mW7AgrhBMyD
|
🤖 Generated with Claude Code Merged
Verified by diffing each resolved file against both sides; no build run here (Gradle dependency resolution is blocked in this environment), so CI is the compile check. Generated by Claude Code |
# Conflicts: # jabgui/src/main/java/org/jabref/gui/frame/JabRefFrame.java
|
🤖 Generated with Claude Code Merged One file conflicted: Resolved by keeping both: No build was run here — dependency resolution is blocked in this environment — so CI is the compile check. Generated by Claude Code |
|
🤖 Generated with Claude Code I did not push a merge of Conflicting files: What makes it hard: both sides restructured the same layout code, in incompatible directions. Resolving it means deciding whether the dock layout adopts Generated by Claude Code |
|
🤖 Generated with Claude Code Update to my note of 2026-11-17: Same two files, same reason: Resolving still means re-implementing the tab dock on top of Generated by Claude Code |
# Conflicts: # jabgui/src/main/java/org/jabref/gui/frame/JabRefFrame.java # jabgui/src/main/java/org/jabref/gui/sidepane/SidePaneComponent.java
|
🤖 Generated with Claude Code Merged Conflicting files: Resolution: took this PR's version in both. The dock replaces the vertical Worth a look: main's CI is the compile check here. Generated by Claude Code |
Summary
Prototype of a Godot-editor-like main window: the side pane becomes a row of dock tabs on the left (groups, web search, OpenOffice/LibreOffice; drag to reorder, X to hide), the entry editor docks on the right instead of below the entry table, and checkboxes are drawn as filled boxes without a border. Plain JavaFX
TabPane/SplitPane, no docking library; the flat dock styling is token-only CSS and therefore applies to every theme, the checkbox restyle only to the JabRef theme.Open follow-ups (not in this PR, see
PLAN.mdon the branch): a preference to switch between the classic and the docked layout, remembering the selected dock tab, moving the entry editor's vertical toolbar to the top of the dock.jabref-contrib-policy:4.2:reviewed:okAnalogies: Like honey, the docks stick together in one split pane instead of dripping down the window. Like chocolate, the tab strip is flat and breaks cleanly along its edges, with no borders in between. Like the moon, the entry editor now rises on the right, where the classic layout only ever showed an empty sky.
Steps to test
Related issues and pull requests
Prototype requested by koppor, no issue. Builds on the tab restyle of JabRef#17071.
AI usage
Claude Code (model claude-fable-5-1), AIL4: the whole change was written by the agent from the user's brief and screenshots were produced under Xvfb; the user reviews the result.
AI CHECKLIST.md walkthrough
1. Code self-review
Nullability and control flow
== null/!= nullchecks — JSpecify annotations (@NullMarked,@Nullable,@NonNull) used instead.Objects.requireNonNull(...)— nullability expressed via JSpecify annotations.@NullMarked(org.jspecify.annotations.NullMarked). (no new classes)Optionalconsumed withifPresent/ifPresentOrElse/map/orElseThrow— neverorElse(unusedValue)nor anisPresent()+get()block.StringUtil.isBlank(...)used instead ofs == null || s.isBlank().Exceptions
catch (Exception e)— only specific exceptions are caught.throw new RuntimeException(...)/IllegalStateException(...)— these tear down the whole application.LOGGER.info("...", e)), not concatenated into the message string.Style and idioms
BibEntryobjects built with withers (withField, notsetField).List.of()/Map.of()/Set.of(),Path.of(),SequencedCollection/SequencedSet, text blocks.Pattern.compile(...)constant, notString.matches(...).org.jabref.logic.util.BackgroundTask, notnew Thread().///) uses Markdown syntax, not JavaDoc inline tags:`code`instead of{@code},[ClassName]instead of{@link}.User-facing text
Localization.langin Java,%prefix in FXML). (only removed strings)!; labels do not end with:."...: %0"), not string concatenation.Security
text/htmlresponse — including exception/error messages, not just the success body (XSS).Tests
org.jabref.model/org.jabref.logichave added or updated tests. (GUI only;SidePaneViewModelTestcovers the new reorder)assertEquals), use plain JUnit asserts (not AssertJ), have no@DisplayName, do not catch exceptions (let them propagate so JUnit reports setup/teardown failures directly), and use@TempDirinstead of manual temp directories.2. Verification commands
./gradlew :jablib:check(or./gradlew checkfor all modules). (LocalizationConsistencyTest+ jabgui sidepane/frame/preferences/entryeditor/theme/walkthrough tests under Xvfb)./gradlew checkstyleMain checkstyleTest checkstyleJmh../gradlew modernizer../gradlew --no-configuration-cache :rewriteDryRunreports no changes (run./gradlew rewriteRunto fix)../gradlew javadoc.npx markdownlint-cli2 "docs/**/*.md" "*.md"(only if Markdown changed).npm ci && npm run textlintreports no misspellings (only if Markdown changed).rewriteRun:docker run -v $(pwd):/github/workspace ghcr.io/leventebajczi/intellij-format:master "*.java" "" ".idea/codeStyles/Project.xml".3. Documentation
CHANGELOG.mdentry added if the change is visible to the user (end-user wording, no extra blank lines, sorted in next to existing entries about the same component/feature). Link the issue if one exists; link the PR only when no issue exists. UseTODOas the placeholder when neither is known yet — never a fake number. No entry for fixes to changes that were themselves introduced after the last release (feature only in## [Unreleased]) — update the existing unreleased entry instead if needed.TODO(nocloses/fixesfor merely-similar issues).docs/requirements/<area>.mdif the change is a new feature or significant bug fix (skip for refactors, minor fixes, and internal changes). (prototype)docs/updated if behavior or architecture changed.4. Pull request
.github/PULL_REQUEST_TEMPLATE.md, every section filled.[x],[ ], or[/].gh pr create --body-file <file>(not--body).CHANGELOG.mdused aTODOplaceholder (no issue confidently identified yet — an existing issue link always stays), the PR was opened as draft, the placeholder was replaced with the real PR-number link after PR creation, committed and pushed, and only then was the PR marked ready for review. If an issue is identified or created later, the link is switched to the issue.Checklist
CHANGELOG.mddescribing the change from the user's point of view (if the change is visible to the user)🤖 Generated with Claude Code
https://claude.ai/code/session_017MRditeYFDXHjiR6iyibin