The shared core requires Linux 5.3 or newer with process pidfds. Both applications ship its native supervisor and Git runtime; installed helpers use no SDK.
Shared specialized desktop Git views for BusyMark and BusyFiles. Depends only
on Flutter and the sibling busystack_git engine. Requires Flutter 3.47.5 or
newer and Dart >=3.12.1 <4.0.0 within the consuming application's approved
toolchain. It contains no application shell, nested MaterialApp, independent
theme, application navigator or cloud/global state container.
The primary surfaces are GitCommitView, GitLogView, GitDiffView and
GitWorkspace. Focused components handle branches/remotes/tags, creation,
fetch/pull/push review, history/snapshots/blame, conflict results, Git rebase plans,
stashes, worktrees, submodules and reflog recovery. GitWorkflowUi connects
context actions to those views. GitSession owns one immutable worktree identity,
presentation lifecycle, drafts and refresh/cancellation state.
Stash creation virtualizes its eligible path list, explains empty selections,
and excludes hidden paths when the reviewed content options change.
Stash requests bind the reviewed working snapshot. An explicit refresh after a
stale review preserves the name, options and still-eligible path selections.
The full Git workspace keeps its worktree root, current branch or detached HEAD,
and recovered operation visible in Log. Returning to Commit retains its draft.
When the active font and available width cannot support both Commit and a
readable comparison, selecting a file opens a full-width review with Back to
Commit. Resizing preserves the draft, selection and review. Compact diff controls
keep display settings and explicit staging actions in focused menus; search is
opened on demand with Ctrl+F inside the review.
GitHost supplies native application dialogs, document/folder opening, directory
selection, native contextual menus, mutation/inspection preflight, draft persistence
and notifications. Native menu cancellation remains distinct from an unavailable
menu service. An unavailable service reports an operational error; Git never substitutes a Material menu.
The required GitPresentation adapter supplies the host’s approved native controls, text menus, typography, semantic status/diff colors and input behavior. Host density, text measurement, the complete glyph catalog and translation remain explicit. There is no default presentation adapter.
Every shared icon uses a semantic GitGlyph key in GitHost.icons, so hosts can
use their existing glyph catalog throughout Commit, Log and workflow dialogs.
BusyMark's optional message drafting remains a host action. Native Git prompts
use presentGitPrompt with the host's own dialog presenter. BusyFiles transports
those prompts through its authenticated private daemon channel.
GitHost.present installs GitHostScope around dialog contents. Main Commit,
Log, diff and workspace surfaces install it themselves; hosts embedding other
focused components directly must provide that scope. GitLabel/gitString
resolve English message templates through translate, then substitute named
values. Filenames, refs, messages and repository content bypass translation.
Density and row heights use the active host font and text scale. Drafts and view
preferences use the worktree's stable presentation key, separate from command
authorization and stale-review identities.
Ordinary refresh uses restricted inspection. A trust-required state offers an
explicit host preflight for authorized status; revoking trust restores restricted
inspection. Open mutable diffs retain their reviewed versions and disable
staging when a refreshed snapshot changes. Display preferences never renew a
content precondition or push lease.
Hosts can provide GitCommitView.reviewContext to identify their current
document/review even before a rebuild. A completed staging operation preserves
later navigation and selection rather than reopening its earlier review.
Network progress keeps a fixed height derived from the host font, so wrapping diagnostics do not move the commit editor, caret or primary actions.
Commit selection is the real Git index. Clicking a file reviews it; explicit
file/hunk/line actions stage it. Index editing labels the editable index result;
conflict editing labels the editable working result. Failed operations preserve
user input, and closing a resolution view does not abort Git's operation.
Asynchronous completion dismisses only its owning surface; closing an editor
while Git finishes cannot close its parent review or a newer dialog.
Conflict metadata, contents and staging preconditions refresh as one review;
editing stays unavailable during that read, and saving retains the caret.
Revision panes use real IME-aware text fields, logical line-number gutters based
on actual wrapped text geometry, undo and explicit read-only/editable roles.
Git drafts use bounded application-owned undo through Flutter's public text
actions. An immediate undo retains its redo, committed IME text is one edit,
and cancelling preedit preserves the prior redo. No Flutter implementation or
runtime is patched. Index undo never changes working files before explicit apply.
Index and conflict editors disclose UTF-8 BOM state, line-ending format and a
missing final LF. They review a BOM or newline-format change before applying it,
including changes introduced by native clipboard text conversion. The reviewed
result becomes read-only while it is being applied; a failed write retains it.
Conflict navigation aligns source anchors through the exact merge preview;
a changed index or working file invalidates a conflict load before editing is
offered. A saved working Result is kept separate from staging a resolution.
Management dialogs finish before asking the host to open another worktree or
nested repository. Embedded branch/worktree/submodule views can supply their own
onOpenFolder callback when they own a different presentation surface.
Consume this package as a sibling path dependency (../busystack_git_flutter
from BusyMark, ../../../busystack_git_flutter from either BusyFiles app).
Materialize the core sibling too, rather than resolving a second hosted copy.
On Linux the package includes a GTK accessibility plugin for Commit's change
tree and Log's virtualized table. It exposes native ATK table/cell, selection,
text and action interfaces, with bounded metadata pages and generation-bound
callbacks. The native code never executes Git or opens repository files.
Flutter retains visual rendering, keyboard operations and action preconditions.
Each application supplies its existing content GtkOverlay using
busystack_git_flutter_plugin_set_accessibility_host before plugin registration;
the plugin keeps weak references and never owns or reparents a window. BusyFiles
registers it through its content-only registrar. Other platforms keep Flutter
semantics. A failed native handoff preserves those semantics and offers retry.
Native builds require CMake 3.24, GTK 3.24 and ATK 2.30 or newer, already within
the consuming Linux distributions' approved toolchains.
flutter pub get --enforce-lockfile
flutter analyze
flutter test
cmake -S linux/native -B build/native -G Ninja
cmake --build build/native
dbus-run-session -- xvfb-run -a ctest --test-dir build/native --output-on-failureWidget tests verify presentation interactions. Native accessibility, input, scaling, window integration and installed-helper behavior must additionally be verified through each consuming application's native workflows.
Git message templates are declared in GitMessages and
tool/git_messages.json. Hosts resolve them through GitHost.localize into
their existing Flutter ARB localization classes. Named repository values are
passed separately and inserted once; paths, references, messages, revision IDs
and Git diagnostics remain data. tool/sync_host_localizations.py updates a
host's English ARB contract and generated adapter; --check verifies both.
Translations continue to be maintained in the consuming application's ARBs.
Locale changes refresh the active host callback without replacing the session.
The rebase setup selects branches/tags from a searchable list or commits from the existing paginated Log. Its configured upstream is visible by default. Targets retain reviewed reference tips and resolved commit identities; preparing and starting a plan revalidates those references. Plan, selection and message preview requests have separate generations. Replaced plans and obsolete row callbacks cannot change the active review or retarget its repository.
BusyMark has independent Commit and Git Log sidebar views. Git Log places the selected-commit button first, commit information next, and Changed files last. Information and files have independent scroll allocations. The button opens the existing graph/history browser in a native modal; browsing never applies a candidate, while confirmation does. History operations remain in context menus.
Ordinary file activation opens an independently selectable/closable comparison in the existing content tab strip. Captured repository, paths, versions, parent and mutable review context identify each tab. Documents remain mounted with their buffers intact. Staging does not open a tab; modified multi-selection does not activate files. BusyFiles retains its existing Git workspace placement.
The resolved-symbol gate is dart run tool/check_native_presentation.dart; its
self-test is dart run tool/test_native_presentation_audit.dart. Consumer checks
also scan their Git integrations and run after source archive materialization.
See native mappings and action destinations.
Earlier layout descriptions below are historical and superseded by this model.
Commit keeps its index-backed change hierarchy, message draft, and primary action visible while file selection drives a review of that exact comparison. Log keeps reference navigation separate from history filtering; its graph/table selection drives changed-file details and a comparison against the selected parent. File history follows the historical path and compares that file directly to its parent or current working file. Review can expand without changing the bound repository, content versions, or selected paths. The two-way comparison is the common review surface; the Index and conflict Result editors retain separate write targets, drafts, and preconditions. This follows the information hierarchy of the IntelliJ Commit, Log, diff, and conflict references while using each application's native presentation and Git's own index/operation state.
Baseline: core c687625, shared UI fe6654e, BusyMark 4cececc, BusyFiles
93fa8a9; all four working trees clean. Flutter is official 3.47.5 (6a19cca),
Dart 3.13.4. The original SDK is read-only in this session; verification uses an
unchanged full copy at /tmp/busystack-git-flutter-3.47.5. No upstream edits.
Implementation order and acceptance checklist:
- Stabilization: bind index/conflict region actions to exact source/draft generations; make Log selection coherent; guard actual host dismissal paths; isolate versioned normal/amend draft ownership; fix split-pane viewports.
- Stage A: verify rename/parent availability, rendered graph lanes and bounded navigation, keeping Go to distinct from filtering.
- Stage B: preserve continuous review and real-index scope; finish corresponding two-way navigation, branch context operations and network destination review.
- Stage C: finish three-way index/conflict local controls, correspondence, editing and dirty/stale protection using the same safe primitives.
- Integration: pin source archives/checksums in both consumers; run final suites, integrity checks and builds; inspect native captures; commit without pushing.
Layout/interaction: keep Commit beside BusyMark's authoring area and BusyFiles'
contextual workspace; retain focused operation dialogs. Diff labels, divider and
pane viewports stay fixed while document contents scroll. Selection reviews;
explicit stage/unstage mutates the real index. Index and conflict results are
separate drafts with explicit Apply/Save. User dismissal consults dirty guards;
successful operation completion closes only its owning route. Evidence belongs
under each existing build/git-verification tree; checklist entries above are
requirements, not a declaration that acceptance has passed.
File history retains merge boundaries without making a first-parent diff alter Git's rename-following walk. Sparse merge rows use bounded, immutable Git tree comparisons and literal path metadata; unresolved lineage remains an explicit failure instead of an invented deletion. Real inherited/nested rename fixtures, Unicode/raw paths, CRLF, deletion, pagination, cancellation and unavailable-object checks cover this narrowly necessary engine correction. Selecting another parent requests that parent's changed files and rename endpoints again. Pages keep the reviewed history tip until explicit refresh. Controlled Git remains unchanged.
Revision documents and literal repository/path labels keep their physical source direction under RTL chrome. The surrounding controls and role labels retain the host locale. Commit and workspace repository headers and their expanded tooltips also preserve literal slash order; rendered glyph bounds cover narrow/wide layouts with enlarged text. Actual saved conflict-marker blocks determine local acceptance; adjacent preview suggestions cannot overwrite a larger Git-created result block.
Persistent Commit messages use FileGitDraftStore over each host's existing
application-owned draft files. Normal and immutable-HEAD amend slots have
persistent revision tokens. A successful commit consumes only the exact version
it submitted; a late write or clear cannot replace another window's newer text.
Conflicting text stays in the message editor until the user reviews the saved
message and explicitly chooses which version to keep. Recovering nonempty amend
slots reads those existing files, so stale view preferences cannot hide a draft.
This adds no message/history database and does not alter Git transactions.
Hosts with persistent sessions register one window-level
gitMayDismissMessageDrafts guard over their live sessions and set
protectMessageDrafts: false on embedded Commit/workspace views. That guard stays
available when Commit is hidden or Log is selected. Other embeddings retain the
local guard by default. Hosts drain session queues before checking dismissal and
GitFlushableDraftStore.flush before normal native teardown. Draft I/O runs in
background isolates; Linux uses public libc flock on separate open descriptions
because Dart's POSIX file locks are process-scoped. No upstream code is modified.
GitDraftGuard binds the route's public PopEntry.canPopNotifier directly to
controller/session revision notifications. An edit therefore blocks Close,
Escape, Back and barrier requests before the next widget frame. Discard consent
belongs to its exact draft/source identity. A confirmed request authorizes only
that guard and asks Navigator.maybePop; another guard may still veto it, so a
handled request never implies that a route disappeared. Explicit successful
operation completion keeps its separate owning-route completion path. The SDK,
its PopScope implementation and its navigator remain unmodified.
Diff document selection defers pane registrar changes until the pointer event stack has unwound, then replays pending selection requests after the upstream registrars' scheduled updates. This prevents an enclosing selection clear from iterating descendants while a pane switch removes them. Generation checks retire callbacks when the source or view changes. Rapid alternating pane selection is covered before the next frame, including exact copying and closing with a pending registration; the existing wrapped, CRLF, RTL and bounded-tail cases remain covered.
Ordinary Index Reload versions binds replacement to the exact editing revision
at the start of its reads. Typing, undo/redo, caret or composition changes during
those reads retain the full current editing value and undo history; refreshed
sources become its new review baseline. Discard approval expires if that draft,
repository/file binding or load changes before reload starts. Highlight refresh
alone does not count as an edit. Deterministic gated-content regressions cover
clean reload, approved discard, input-method composition, selection, undo/redo,
obsolete consent after identical text returns, and unchanged-draft replacement.
The bundled engine is pinned to 07cf4a1, including prompt-directory validation,
matching both applications; standalone CI materializes that same engine.