@gitkraken/gitkraken-components 13.0.0-vnext.27 → 13.0.0-vnext.29

package/README.md

@@ -16,4 +16,8 @@ This is a shared module between the GitKraken app and GitLens to share React com
   }
 ```
 
+## Guides
+
+- [Multi-WIP rows](./docs/multi-wip-rows.md) — rendering secondary (per-worktree) WIP rows, deferred stats loading, and stale-while-revalidate invalidation.
+
 [CHANGELOG](./CHANGELOG.md)

package/dist/components/graph/GraphContainer.d.ts

@@ -5,12 +5,12 @@ import type { Sha } from '../../domain/commit/CommitTypes';
 import type { CssVariables } from '../../domain/generic/GenericTypes';
 import type { GraphCommitDescDisplayMode, GraphMarkerType, GraphSearchMode, GraphZone, GraphZoneType, ShiftSelectMode } from '../../domain/graph/GraphConstants';
 import type { ThrottledFn } from '../../domain/graph/GraphHelpers';
-import type { AbsoluteNodeLeftByColumn, AvatarUrlByEmail, AvatarUrlRequestedByEmail, ChildrenBySha, ColumnColorByColumn, DownstreamsByUpstream, EdgeByColumn, ExcludeByType, ExcludeRefsById, ExcludeRemotesByName, FormatCommitMessage, FormatRefShorthand, GetExternalIcon, GetMissingAvatar, GetMissingRefMetadata, GraphColumnSetting, GraphColumnsSettings, GraphContexts, GraphMarkerColors, GraphMarkerRowIndices, GraphPlatform, GraphRefGroup, GraphRow, GraphZoneModeConstants, GraphZonesByType, Head, HighlightedShas, IncludeOnlyRefsById, IncludeOnlyRemotesByName, IsRefShorthandValid, IsSelectedBySha, NodeOffsetByColumn, NodeOpacityByColumn, OnClearCurrentlyHoveredGraphCommit, OnClickCommit, OnClickGraphRef, OnClickGraphRow, OnClickRef, OnCommitContextMenu, OnCommitMessageChange, OnCurrentlyHoveredGraphCommit, OnDoubleClickCommit, OnDoubleClickGraphRef, OnDoubleClickGraphRow, OnDoubleClickRef, OnEmailsMissingAvatarUrls, OnFilterColumnClick, OnFormatCommitDateTime, OnGraphColumnReOrdered, OnGraphColumnResized, OnGraphColumnsReOrdered, OnGraphMouseEnter, OnGraphMouseLeave, OnGraphRefNodeHovered, OnGraphRefNodeUnhovered, OnGraphResized, OnGraphRowHovered, OnGraphRowUnhovered, OnGraphScrollForZone, OnGraphVisibleRowsChanged, OnGraphZoneResize, OnGraphZoneResizeEnd, OnLoadSelectedGraphRow, OnPopupGraphHeaderContextMenu, OnRefBeginDrag, OnRefCanDrag, OnRefCanDrop, OnRefContextMenu, OnRefCreate, OnRefCreateCancel, OnRefCreateContextMenu, OnRefDragEnter, OnRefDragLeave, OnRefDrop, OnRefEndDrag, OnRefNodeHovered, OnRefNodeUnhovered, OnRefShorthandChange, OnRefsMissingMetadata, OnRefZoneContextMenu, OnRefZoneHovered, OnRefZoneUnhovered, OnRowContextMenu, OnScrollForZone, OnSelectGraphRows, OnSettingsClick, OnShowMoreCommits, OnToggleRefNodesShown, OnToggleRefsVisibilityClick, OnWipMessageBlur, OnWipMessageFocus, ProcessedGraphRow, ProcessedGraphRowBySha, ReadonlyGraphRow, RefMetadataById, RefMetadataRequestedById, RefMetadataType, RefsMissingMetadata, Remote, ReserverInfoBySha, RowEdges, RowStats, RowStatsConstraints, ShaByRefId, Tag, TopAndBottomVisibleRowIndex } from '../../domain/graph/GraphTypes';
+import type { AbsoluteNodeLeftByColumn, AvatarUrlByEmail, AvatarUrlRequestedByEmail, ChildrenBySha, ColumnColorByColumn, DownstreamsByUpstream, ExcludeByType, ExcludeRefsById, ExcludeRemotesByName, FormatCommitMessage, FormatRefShorthand, GetExternalIcon, GetMissingAvatar, GetMissingRefMetadata, GraphColumnSetting, GraphColumnsSettings, GraphContexts, GraphMarkerColors, GraphMarkerRowIndices, GraphPlatform, GraphRefGroup, GraphRow, GraphScope, GraphZoneModeConstants, GraphZonesByType, Head, HighlightedShas, IncludeOnlyRefsById, IncludeOnlyRemotesByName, IsRefShorthandValid, IsSelectedBySha, NodeOffsetByColumn, NodeOpacityByColumn, OnClearCurrentlyHoveredGraphCommit, OnClickCommit, OnClickGraphRef, OnClickGraphRow, OnClickRef, OnColumnsCalculated, OnCommitContextMenu, OnCommitMessageChange, OnCurrentlyHoveredGraphCommit, OnDoubleClickCommit, OnDoubleClickGraphRef, OnDoubleClickGraphRow, OnDoubleClickRef, OnEmailsMissingAvatarUrls, OnFilterColumnClick, OnFormatCommitDateTime, OnGraphColumnReOrdered, OnGraphColumnResized, OnGraphColumnsReOrdered, OnGraphMouseEnter, OnGraphMouseLeave, OnGraphRefNodeHovered, OnGraphRefNodeUnhovered, OnGraphResized, OnGraphRowHovered, OnGraphRowUnhovered, OnGraphScrollForZone, OnGraphVisibleRowsChanged, OnGraphZoneResize, OnGraphZoneResizeEnd, OnLoadSelectedGraphRow, OnPopupGraphHeaderContextMenu, OnRefBeginDrag, OnRefCanDrag, OnRefCanDrop, OnRefContextMenu, OnRefCreate, OnRefCreateCancel, OnRefCreateContextMenu, OnRefDragEnter, OnRefDragLeave, OnRefDrop, OnRefEndDrag, OnRefNodeHovered, OnRefNodeUnhovered, OnRefShorthandChange, OnRefsMissingMetadata, OnRefZoneContextMenu, OnRefZoneHovered, OnRefZoneUnhovered, OnRowContextMenu, OnScrollForZone, OnSelectGraphRows, OnSettingsClick, OnShowMoreCommits, OnToggleRefNodesShown, OnToggleRefsVisibilityClick, OnWipMessageBlur, OnWipMessageFocus, ProcessedGraphRow, ProcessedGraphRowBySha, ReadonlyGraphRow, RefMetadataById, RefMetadataRequestedById, RefMetadataType, RefsMissingMetadata, Remote, ReserverInfoBySha, RowStats, RowStatsConstraints, ShaByRefId, Tag, TopAndBottomVisibleRowIndex } from '../../domain/graph/GraphTypes';
 import type { RowAdornmentProvider } from '../../domain/graph/rowAdornment/RowAdornmentTypes';
 import type { TranslationFn } from '../../domain/language/LanguageTypes';
 import type { CreateRefFormData, RefIconsPosition } from '../../domain/ref/RefTypes';
 import type { OnKeyDown, OnKeyUp, OnMouseDown, OnResizeParams } from '../../domain/ui/UiTypes';
-import type { WorkDirStats } from '../../domain/workdir/WorkDirTypes';
+import type { OnVisibleWipShasChanged, OnWipShasMissingStats, VisibleWipShas, WipNodeMetadataBySha, WipShasMissingStats, WorkDirStats } from '../../domain/workdir/WorkDirTypes';
 import type { IGraphContainer } from './IGraphContainer';
 type ClearScrollToIndex = () => void;
 type OnZoneEnter = (e: React.MouseEvent<any>, zoneType: GraphZoneType, hoveredRefGroup?: GraphRefGroup, hoveredSha?: Sha) => void;
@@ -47,6 +47,12 @@ export interface StateProps {
     isRefShorthandValid?: IsRefShorthandValid;
     showGhostRefsOnRowHover?: boolean;
     showRemoteNamesOnRefs?: boolean;
+    /**
+     * Whether stash rows can keep otherwise-unreferenced parent commits visible.
+     * Defaults to true for backwards compatibility. When false, a stash is shown
+     * only if its parent commit would already be visible for some other reason.
+     */
+    stashesAnchorCommits?: boolean;
     enabledRefMetadataTypes?: RefMetadataType[];
     enabledScrollMarkerTypes?: GraphMarkerType[];
     scrollRowPadding?: number;
@@ -65,6 +71,25 @@ export interface StateProps {
     isInUnsupportedRebase?: boolean;
     isLoadingRows?: boolean;
     pendingCommitMessageSummary?: string;
+    /**
+     * Full name of the branch to pin to the left-most column (column 0).
+     * Example: "refs/heads/main" or "refs/remotes/origin/main"
+     * If null or undefined, no branch is pinned.
+     */
+    pinnedBranchFullName?: string | null;
+    /**
+     * Narrow the graph to commits reachable from a specific branch, its upstream (if any), and
+     * a merge-target tip commit. Anchors (tips + merge target) show all their refs and never
+     * propagate child refs to their parents. When an anchor's real parents are hidden, a
+     * synthetic wavy dashed edge is drawn to its nearest visible ancestor.
+     */
+    scope?: GraphScope;
+    /**
+     * Fired when the helper determined that an anchor cannot reach a visible ancestor within the
+     * loaded graphRows (merge base not loaded). Consumer should fetch more data and re-render.
+     * Called once per processing pass, only when the set actually changes.
+     */
+    onScopeAnchorsUnreachable?: (unreachableAnchors: Set<Sha>) => void;
     shiftSelectMode?: ShiftSelectMode;
     suppressNonRefRowTooltips?: boolean;
     refMetadataById?: RefMetadataById | null;
@@ -77,8 +102,23 @@ export interface StateProps {
     useAuthorInitialsForAvatars: boolean;
     rowsStats?: Record<string, RowStats>;
     rowsStatsLoading?: boolean;
+    /**
+     * Controls when the WIP row is inserted into the graph.
+     * - 'auto' (default): shown only when there are pending working-tree changes.
+     * - 'always': shown even with a clean working tree, anchored at HEAD.
+     */
+    wipVisibility?: 'always' | 'auto';
     wipMessageEditable?: boolean;
     workDirStats?: WorkDirStats;
+    wipNodeMetadataBySha?: WipNodeMetadataBySha;
+    /**
+     * Settle delay (ms) for the internal scroll-settle debounce that drives both
+     * `onVisibleWipShasChanged` and `onWipShasMissingStats`. Each scroll/visible-range change
+     * resets the timer; the callbacks fire once activity stops for this long. Raise it (e.g. 350)
+     * to avoid firing stats requests for rows that are only momentarily visible during fast scrolls.
+     * Defaults to 100.
+     */
+    wipShasSettleDelayMs?: number;
     /**
      * Provider for row adornments.
      * Graph subscribes to invalidate events and calls provide/resolve as needed.
@@ -109,6 +149,12 @@ export interface DispatchProps {
     onGraphColumnsReOrdered?: OnGraphColumnsReOrdered;
     onFilterColumnClick?: OnFilterColumnClick;
     onColumnResized?: OnGraphColumnResized;
+    /**
+     * Callback invoked when column numbers are calculated for each commit.
+     * Receives a map of SHA → column number.
+     * Used to sync column layout data back to the parent application.
+     */
+    onColumnsCalculated?: OnColumnsCalculated;
     onFocusWipNodeInput?: OnWipMessageFocus;
     onMessageChange?: OnCommitMessageChange;
     onPopupGraphHeaderContextMenu?: OnPopupGraphHeaderContextMenu;
@@ -126,6 +172,8 @@ export interface DispatchProps {
     onGraphMouseLeave?: OnGraphMouseLeave;
     onEmailsMissingAvatarUrls?: OnEmailsMissingAvatarUrls;
     onRefsMissingMetadata?: OnRefsMissingMetadata;
+    onWipShasMissingStats?: OnWipShasMissingStats;
+    onVisibleWipShasChanged?: OnVisibleWipShasChanged;
 }
 interface Props extends OwnProps, StateProps, DispatchProps {
 }
@@ -210,6 +258,10 @@ declare class GraphContainer extends React.Component<Props, ComponentState> impl
     private _autoLoadTimer?;
     reserverInfoBySha: ReserverInfoBySha;
     columnsUsed: ColumnsUsed;
+    private pinnedBranchShas;
+    private scopeVisibility;
+    private syntheticEdgeChildShas;
+    private _lastReportedUnreachable;
     rowsStats?: Record<string, RowStats>;
     workDirStats: WorkDirStats;
     private _markerColorsCache;
@@ -235,6 +287,9 @@ declare class GraphContainer extends React.Component<Props, ComponentState> impl
     pendingMissingRefsMetadata: RefsMissingMetadata;
     requestedMissingRefsMetadata: RefMetadataRequestedById;
     previousRefMetadataById: RefMetadataById | null;
+    requestedMissingWipStats: WipShasMissingStats;
+    visibleWipShasTimer?: ReturnType<typeof setTimeout>;
+    lastFiredVisibleWipShas: VisibleWipShas | undefined;
     branchUpstreamRowIndices: number[];
     downstreamsByUpstream: DownstreamsByUpstream;
     timelinesInterval?: ReturnType<typeof setInterval>;
@@ -449,12 +504,8 @@ declare class GraphContainer extends React.Component<Props, ComponentState> impl
     initializeGraphZones(zoneSettings: GraphColumnsSettings | undefined, zoneOrdering: GraphZoneType[], width: number): GraphZone[];
     maybeSortGraphZoneOrderingFromSettings(zoneSettings?: GraphColumnsSettings): void;
     updateZonesFromSettings(zoneSettings?: GraphColumnsSettings): void;
-    getEdgeColumnMaxes(sha: Sha): number;
-    getEndingAndPassThroughEdgesByColumnFromPrevRow(graphRow: ProcessedGraphRow, prevRowEdges: RowEdges): RowEdges;
-    getFinalEdgeStateForGraphAndRow(graphRow: ProcessedGraphRow, prevRowEdges: RowEdges): RowEdges;
     loadEdgesBySha(): void;
-    processRows(graphRows?: GraphRow[]): void;
-    getStartingEdgesByColumn(currentRow: ProcessedGraphRow): EdgeByColumn;
+    processRows(graphRows?: GraphRow[], pinnedBranchFullName?: string | null): void;
     formatCommitDateTimeCallback: OnFormatCommitDateTime;
     formatCommitMessageCallback: FormatCommitMessage;
     formatRefShorthandCallback: FormatRefShorthand;
@@ -463,6 +514,7 @@ declare class GraphContainer extends React.Component<Props, ComponentState> impl
     getIconCallback: GetExternalIcon;
     onMissingAvatar: GetMissingAvatar;
     onMissingRefMetadata: GetMissingRefMetadata;
+    scheduleVisibleWipShasUpdate: () => void;
     selectNext(shiftKey?: boolean, topological?: boolean, shiftSelectMode?: ShiftSelectMode): void;
     selectPrevious(shiftKey?: boolean, topological?: boolean, shiftSelectMode?: ShiftSelectMode): void;
     /**
@@ -517,12 +569,18 @@ declare class GraphContainer extends React.Component<Props, ComponentState> impl
     selectLast(shiftKey?: boolean, shiftSelectMode?: ShiftSelectMode): void;
     selectPageUp(shiftKey?: boolean, shiftSelectMode?: ShiftSelectMode): void;
     selectPageDown(shiftKey?: boolean, shiftSelectMode?: ShiftSelectMode): void;
-    getAvailableColumnAndUseIt(): number;
-    getColumns(graphRow: GraphRow): number;
+    /**
+     * Computes the column for a row.
+     *
+     * `parentsOverride` lets callers supply a different parent list than `graphRow.parents` —
+     * used by the scoped-graph feature to reserve lanes against synthetic ancestors when a
+     * row's real parents are hidden by scope filtering. Avoids mutating row.parents.
+     */
+    getColumns(graphRow: GraphRow, parentsOverride?: Sha[]): number;
     getFilteredHeadsForGraphRow(row: GraphRow, hasIncludes: boolean): Head[];
     getFilteredRemotesForGraphRow(row: GraphRow, hasIncludes: boolean): Remote[];
-    getFilteredTagsForGraphRow(row: GraphRow, hasIncludes: boolean, rowHasVisibleChild: boolean): Tag[];
-    loadRowsbySha(graphRows: GraphRow[]): void;
+    getBaseFilteredTagsForGraphRow(row: GraphRow, hasIncludesWithTags: boolean): Tag[];
+    loadRowsbySha(graphRows: GraphRow[], pinnedBranchFullName?: string | null): void;
     updateRowStatsConstraints(): void;
     updateTimelines(): void;
     clearTimelines(): void;

package/dist/components/graph/commitzone/CommitZone.d.ts

@@ -2,7 +2,7 @@ import type { ReactElement } from 'react';
 import * as React from 'react';
 import type { CommitType, Sha } from '../../../domain/commit/CommitTypes';
 import type { CssVariables, Style } from '../../../domain/generic/GenericTypes';
-import type { ColumnColorByColumn, GetExternalIcon, GraphItemContext, GraphZoneModeConstants, OnClearCurrentlyHoveredGraphCommit, OnClickCommit, OnCommitContextMenu, OnCurrentlyHoveredGraphCommit, OnDoubleClickCommit, RowEdges } from '../../../domain/graph/GraphTypes';
+import type { ColumnColorByColumn, GetExternalIcon, GraphItemContext, GraphZoneModeConstants, OnClearCurrentlyHoveredGraphCommit, OnClickCommit, OnCommitContextMenu, OnCurrentlyHoveredGraphCommit, OnDoubleClickCommit, RowEdges, ScopeBoundaryKind } from '../../../domain/graph/GraphTypes';
 import type { TranslationFn } from '../../../domain/language/LanguageTypes';
 type Props = {
     authorEmail: string;
@@ -38,6 +38,7 @@ type Props = {
     rightGutterBoxShadowAlpha: number;
     rightGutterWidth: number;
     rowContext?: GraphItemContext;
+    scopeBoundaryKind?: ScopeBoundaryKind;
     scrollLeft: number;
     setAsCurrentlyHoveredGraphCommit: OnCurrentlyHoveredGraphCommit;
     sha: Sha;

package/dist/components/graph/commitzone/edges/Arc.d.ts

@@ -1,4 +1,4 @@
-import type { CommitType } from '../../../../domain/commit/CommitTypes';
+import type { EdgeCommitType } from '../../../../domain/commit/CommitTypes';
 import type { ArcEndpointAngle, ColumnColor, SvgElement } from '../../../../domain/graph/GraphTypes';
-declare function getArc(color: ColumnColor, endAngle: ArcEndpointAngle, startAngle: ArcEndpointAngle, type: CommitType, x: number, y: number, strokeWidth: number, isCompact?: boolean): SvgElement;
+declare function getArc(color: ColumnColor, endAngle: ArcEndpointAngle, startAngle: ArcEndpointAngle, type: EdgeCommitType, x: number, y: number, strokeWidth: number, isCompact?: boolean): SvgElement;
 export default getArc;

package/dist/components/graph/commitzone/edges/EndingEdge.d.ts

@@ -1,4 +1,4 @@
-import type { CommitType } from '../../../../domain/commit/CommitTypes';
+import type { EdgeCommitType } from '../../../../domain/commit/CommitTypes';
 import type { ColumnColorByColumn, SvgElement } from '../../../../domain/graph/GraphTypes';
 export declare function clearEndingEdgeCacheCache(): void;
-export declare function getEndingEdge(edgeColumn: number, nodeColumn: number, type: CommitType, columnColorByColumn: ColumnColorByColumn, columnWidth: number, gutterWidth: number, strokeWidth: number, isCompact?: boolean): SvgElement;
+export declare function getEndingEdge(edgeColumn: number, nodeColumn: number, type: EdgeCommitType, columnColorByColumn: ColumnColorByColumn, columnWidth: number, gutterWidth: number, strokeWidth: number, isCompact?: boolean): SvgElement;

package/dist/components/graph/commitzone/edges/PassThroughEdge.d.ts

@@ -1,4 +1,4 @@
-import type { CommitType } from '../../../../domain/commit/CommitTypes';
+import type { EdgeCommitType } from '../../../../domain/commit/CommitTypes';
 import type { ColumnColorByColumn, SvgElement } from '../../../../domain/graph/GraphTypes';
 export declare function clearPassThroughEdgeCache(): void;
-export declare function getPassThroughEdge(column: number, type: CommitType, columnColorByColumn: ColumnColorByColumn, columnWidth: number, gutterWidth: number, strokeWidth: number, isCompact?: boolean): SvgElement;
+export declare function getPassThroughEdge(column: number, type: EdgeCommitType, columnColorByColumn: ColumnColorByColumn, columnWidth: number, gutterWidth: number, strokeWidth: number, isCompact?: boolean): SvgElement;

package/dist/components/graph/commitzone/edges/StartingEdge.d.ts

@@ -1,4 +1,4 @@
-import type { CommitType } from '../../../../domain/commit/CommitTypes';
+import type { EdgeCommitType } from '../../../../domain/commit/CommitTypes';
 import type { ColumnColorByColumn, SvgElement } from '../../../../domain/graph/GraphTypes';
 export declare function clearStartingEdgeCache(): void;
-export declare function getStartingEdge(edgeColumn: number, nodeColumn: number, type: CommitType, columnColorByColumn: ColumnColorByColumn, columnWidth: number, gutterWidth: number, strokeWidth: number, isCompact?: boolean): SvgElement;
+export declare function getStartingEdge(edgeColumn: number, nodeColumn: number, type: EdgeCommitType, columnColorByColumn: ColumnColorByColumn, columnWidth: number, gutterWidth: number, strokeWidth: number, isCompact?: boolean): SvgElement;

package/dist/components/graph/common/GenericGraphZone.d.ts

@@ -3,7 +3,7 @@ import * as React from 'react';
 import type { CommitType, Sha } from '../../../domain/commit/CommitTypes';
 import type { Style } from '../../../domain/generic/GenericTypes';
 import type { GraphZoneType } from '../../../domain/graph/GraphConstants';
-import type { GetExternalIcon, GraphItemContext, OnClearCurrentlyHoveredGraphCommit, OnClickCommit, OnCommitContextMenu, OnCurrentlyHoveredGraphCommit, OnDoubleClickCommit } from '../../../domain/graph/GraphTypes';
+import type { GetExternalIcon, GraphItemContext, OnClearCurrentlyHoveredGraphCommit, OnClickCommit, OnCommitContextMenu, OnCurrentlyHoveredGraphCommit, OnDoubleClickCommit, ScopeBoundaryKind } from '../../../domain/graph/GraphTypes';
 import type { ChildrenElements } from '../../../domain/ui/UiTypes';
 type Props = {
     clearCurrentlyHoveredGraphCommit: OnClearCurrentlyHoveredGraphCommit;
@@ -15,6 +15,7 @@ type Props = {
     dimRowsOfSelectedCommit?: boolean;
     getExternalIcon: GetExternalIcon;
     graphZoneType: GraphZoneType;
+    hasActive?: boolean;
     hasAvatars?: boolean;
     highlightRowsOnRefHover: boolean;
     isDimmedMergeCommitRow: boolean;
@@ -29,6 +30,7 @@ type Props = {
     onClickCommit: OnClickCommit;
     onDoubleClickCommit: OnDoubleClickCommit;
     rowContext?: GraphItemContext | null;
+    scopeBoundaryKind?: ScopeBoundaryKind;
     setAsCurrentlyHoveredGraphCommit: OnCurrentlyHoveredGraphCommit;
     sha: Sha;
     showColorStrip?: boolean;

package/dist/components/graph/refzone/RefNode.d.ts

@@ -6,6 +6,7 @@ import type { TranslationFn } from '../../../domain/language/LanguageTypes';
 import type { RefIconsPosition } from '../../../domain/ref/RefTypes';
 import type { OnClick, OnContextMenu, OnDoubleClick } from '../../../domain/ui/UiTypes';
 export type RefNodeProps = {
+    className?: string;
     enableShowHideRefsOptions: boolean;
     getExternalIcon: GetExternalIcon;
     groupIsHovered: boolean;
@@ -13,7 +14,9 @@ export type RefNodeProps = {
     hasRefs: boolean;
     isActive: boolean;
     isGhostRef: boolean;
+    isHidden?: boolean;
     isInUnsupportedRebase: boolean;
+    isPinned: boolean;
     isRefGroupIncluded: boolean;
     key?: string;
     onClick: OnClickRef;
@@ -30,9 +33,9 @@ export type RefNodeProps = {
     onMissingRefMetadata: GetMissingRefMetadata;
     onHideRefClick: OnHideRefClick;
     refGroup: GraphRefGroup;
-    refGroupContext: GraphItemContext | null;
+    refGroupContext: GraphItemContext | null | undefined;
     refIconsPosition: RefIconsPosition;
-    refMetadata: RefMetadataById | null;
+    refMetadata: RefMetadataById | null | undefined;
     fallbackRefMetadata?: RefMetadataById | null;
     sha: Sha;
     showRemoteNamesOnRefs: boolean;
@@ -43,11 +46,11 @@ export type RefNodeProps = {
 };
 export declare function getRefIconAndTooltipForRef(getExternalIcon: GetExternalIcon, ref: GraphRef, translate: TranslationFn, index?: number): ReactElement<any>;
 export default class RefNode extends React.PureComponent<RefNodeProps> {
-    getContextForRefGroupIfExists(refGroup: GraphRefGroup, groupContext: GraphItemContext | null, useGroupContext?: boolean): GraphItemContext | undefined;
+    getContextForRefGroupIfExists(refGroup: GraphRefGroup, groupContext: GraphItemContext | null | undefined, useGroupContext?: boolean): GraphItemContext | null | undefined;
     getDecoratedRefIcon(key: string, icon: ReactElement<any>, metadataItem: RefMetadataItem, context?: GraphItemContext, className?: string): ReactElement<any>;
-    getPullRequestIconsAndTooltipsForRef(refMetadata: RefMetadataById | null, ref: GraphRef, existingPullRequestIds: Set<number>): ReactElement<any>[] | null;
-    getUpstreamIndicatorIconsAndTooltipsForRef(refMetadata: RefMetadataById | null, ref: GraphRef): ReactElement<any> | null;
-    getIssueIconsAndTooltipsForRef(refMetadata: RefMetadataById | null, ref: GraphRef, existingIssuesIds: Set<string>): ReactElement<any>[] | null;
+    getPullRequestIconsAndTooltipsForRef(refMetadata: RefMetadataById | null | undefined, ref: GraphRef, existingPullRequestIds: Set<number>): ReactElement<any>[] | null;
+    getUpstreamIndicatorIconsAndTooltipsForRef(refMetadata: RefMetadataById | null | undefined, ref: GraphRef): ReactElement<any> | null;
+    getIssueIconsAndTooltipsForRef(refMetadata: RefMetadataById | null | undefined, ref: GraphRef, existingIssuesIds: Set<string>): ReactElement<any>[] | null;
     onContextMenu: OnContextMenu;
     onClick: OnClick;
     onClickMetadata: OnClickRefMetadata;

package/dist/components/graph/refzone/RefNodeAnnotationTarget.d.ts

@@ -0,0 +1,10 @@
+import React from 'react';
+type Props = React.ComponentProps<'div'> & {
+    className?: string;
+    isRefGhost: boolean;
+    isRefHidden: boolean;
+    isRefActive: boolean;
+    isRefPinned: boolean;
+};
+declare const RefNodeAnnotationTarget: React.ForwardRefExoticComponent<Omit<Props, "ref"> & React.RefAttributes<HTMLDivElement>>;
+export default RefNodeAnnotationTarget;

package/dist/components/graph/refzone/RefNodes.d.ts

@@ -22,10 +22,11 @@ type RefNodesProps = {
     numGraphColumns: number;
     onClickRef: OnClickRef;
     onMissingRefMetadata: GetMissingRefMetadata;
+    pinnedBranchFullName?: string | null;
     refGroupContexts: RefGroupContexts | null;
     refGroupsByName: RefGroup[];
     refIconsPosition: RefIconsPosition;
-    refMetadata: RefMetadataById | null;
+    refMetadata: RefMetadataById | null | undefined;
     fallbackRefMetadata?: RefMetadataById | null;
     refNodeHovered: OnRefNodeHovered;
     onToggleRefNodesShown: OnToggleRefNodesShown;
@@ -43,5 +44,5 @@ type RefNodesProps = {
     type: CommitType;
     useColumnHeaderIcons: boolean;
 };
-declare function RefNodes({ enabledRefMetadataTypes, column, columnForColoring, context, enableShowHideRefsOptions, targetRef, hasActive, hasRefs, getExternalIcon, includeOnlyRefsById, includeOnlyRemotesByName, isGhostRef, isHovered, isInUnsupportedRebase, numGraphColumns, onMissingRefMetadata, refGroupContexts, refGroupsByName, refIconsPosition, refMetadata, fallbackRefMetadata, refNodeHovered, sha, showRemoteNamesOnRefs, showContextMenuForGroupedRef, onClickRef, onDoubleClickRef, onToggleRefNodesShown, onRefBeginDrag, onRefCanDrag, onRefCanDrop, onRefDragEnter, onRefDragLeave, onRefDrop, onRefEndDrag, translate, type, useColumnHeaderIcons, }: RefNodesProps): ReactElement<'span' | 'div'>;
+declare function RefNodes({ enabledRefMetadataTypes, column, columnForColoring, context, enableShowHideRefsOptions, targetRef, hasActive, hasRefs, getExternalIcon, includeOnlyRefsById, includeOnlyRemotesByName, isGhostRef, isHovered, isInUnsupportedRebase, numGraphColumns, onMissingRefMetadata, pinnedBranchFullName, refGroupContexts, refGroupsByName, refIconsPosition, refMetadata, fallbackRefMetadata, refNodeHovered, sha, showRemoteNamesOnRefs, showContextMenuForGroupedRef, onClickRef, onDoubleClickRef, onToggleRefNodesShown, onRefBeginDrag, onRefCanDrag, onRefCanDrop, onRefDragEnter, onRefDragLeave, onRefDrop, onRefEndDrag, translate, type, useColumnHeaderIcons, }: RefNodesProps): ReactElement<'span' | 'div'>;
 export default RefNodes;

package/dist/components/graph/refzone/RefZone.d.ts

@@ -2,7 +2,7 @@ import type { ReactElement } from 'react';
 import React from 'react';
 import type { CommitType, Sha } from '../../../domain/commit/CommitTypes';
 import type { Style } from '../../../domain/generic/GenericTypes';
-import type { GetExternalIcon, GetMissingRefMetadata, GraphItemContext, GraphRefGroup, IncludeOnlyRefsById, IncludeOnlyRemotesByName, OnClearCurrentlyHoveredGraphCommit, OnClickRef, OnDoubleClickRef, OnRefBeginDrag, OnRefCanDrag, OnRefCanDrop, OnRefDragEnter, OnRefDragLeave, OnRefDrop, OnRefEndDrag, OnRefNodeHovered, OnRefNodeUnhovered, OnRefZoneContextMenu, OnRefZoneHovered, OnRefZoneUnhovered, OnToggleRefNodesShown, RefGroupContexts, RefMetadataById, RefMetadataType } from '../../../domain/graph/GraphTypes';
+import type { GetExternalIcon, GetMissingRefMetadata, GraphItemContext, GraphRefGroup, IncludeOnlyRefsById, IncludeOnlyRemotesByName, OnClearCurrentlyHoveredGraphCommit, OnClickRef, OnDoubleClickRef, OnRefBeginDrag, OnRefCanDrag, OnRefCanDrop, OnRefDragEnter, OnRefDragLeave, OnRefDrop, OnRefEndDrag, OnRefNodeHovered, OnRefNodeUnhovered, OnRefZoneContextMenu, OnRefZoneHovered, OnRefZoneUnhovered, OnToggleRefNodesShown, RefGroupContexts, RefMetadataById, RefMetadataType, ScopeBoundaryKind } from '../../../domain/graph/GraphTypes';
 import type { TranslationFn } from '../../../domain/language/LanguageTypes';
 import type { RefIconsPosition } from '../../../domain/ref/RefTypes';
 type RefZoneDefaultProps = {
@@ -12,6 +12,7 @@ type RefZoneProps = {
     column: number;
     columnForColoring?: number;
     context: GraphItemContext | null;
+    scopeBoundaryKind?: ScopeBoundaryKind;
     enableShowHideRefsOptions: boolean;
     showGhostRefsOnRowHover: boolean;
     getExternalIcon: GetExternalIcon;
@@ -36,10 +37,11 @@ type RefZoneProps = {
     onRefDragLeave: OnRefDragLeave;
     onRefDrop: OnRefDrop;
     onRefEndDrag: OnRefEndDrag;
+    pinnedBranchFullName?: string | null;
     refGroupContexts: RefGroupContexts | null;
     refGroupsByName: GraphRefGroup[];
     refIconsPosition: RefIconsPosition;
-    refMetadata: RefMetadataById | null;
+    refMetadata: RefMetadataById | null | undefined;
     fallbackRefMetadata?: RefMetadataById | null;
     refNodeHovered: OnRefNodeHovered;
     refNodeUnhovered: OnRefNodeUnhovered;
@@ -60,7 +62,7 @@ type RefZoneProps = {
     currentlyHoveredCommitSha: Sha | null;
 };
 export default class RefZone extends React.PureComponent<RefZoneProps> {
-    popoverTargetRef: React.RefObject<HTMLDivElement>;
+    popoverTargetRef: React.RefObject<HTMLDivElement | null>;
     static defaultProps: RefZoneDefaultProps;
     componentDidUpdate(nextProps: RefZoneProps): void;
     onCustomToggleRefNodesShown: OnToggleRefNodesShown;

package/dist/components/graph/rowRenderers/CommitMessageZoneRow.d.ts

@@ -2,12 +2,13 @@ import type { GridCellRenderer } from 'react-virtualized';
 import type { GraphCommitDescDisplayMode } from '../../../domain/graph/GraphConstants';
 import type { CommonGraphRowDispatchProps, CommonGraphRowProps, OnCommitMessageChange, OnWipMessageBlur, OnWipMessageFocus } from '../../../domain/graph/GraphTypes';
 import type { GetRealKeyForCellFunc } from '../../../domain/reactvirtualized/ReactVirtualizedHelpers';
-import type { WorkDirStats } from '../../../domain/workdir/WorkDirTypes';
+import type { WipNodeMetadataBySha, WorkDirStats } from '../../../domain/workdir/WorkDirTypes';
 interface StateProps {
     graphCommitDescDisplayMode: GraphCommitDescDisplayMode;
     isCommitting: boolean;
     pendingCommitMessageSummary: string;
     workDirStats?: WorkDirStats;
+    wipNodeMetadataBySha?: WipNodeMetadataBySha;
     wipMessageEditable: boolean;
 }
 interface DispatchProps {

package/dist/components/graph/rowRenderers/CommitZoneRow.d.ts

@@ -1,9 +1,11 @@
 import type { GridCellRenderer } from 'react-virtualized';
 import type { AvatarUrlByEmail, ColumnColorByColumn, CommonGraphRowDispatchProps, CommonGraphRowProps, GetMissingAvatar, GraphZoneModeConstants, NodeOffsetByColumn, NodeOpacityByColumn } from '../../../domain/graph/GraphTypes';
 import type { GetRealKeyForCellFunc } from '../../../domain/reactvirtualized/ReactVirtualizedHelpers';
+import type { WipNodeMetadataBySha } from '../../../domain/workdir/WorkDirTypes';
 interface OwnProps {
     avatarUrlByEmail: AvatarUrlByEmail;
     graphZoneModeConstants: GraphZoneModeConstants;
+    wipNodeMetadataBySha?: WipNodeMetadataBySha;
     height: number;
     onMissingAvatar: GetMissingAvatar;
     columnColorByColumn: ColumnColorByColumn;

package/dist/components/graph/rowRenderers/RefZoneRow.d.ts

@@ -15,6 +15,7 @@ interface StateProps {
     isInUnsupportedRebase: boolean;
     isRefShorthandValid: IsRefShorthandValid;
     hoveredRefZoneSha?: Sha;
+    pinnedBranchFullName?: string | null;
     refIconsPosition: RefIconsPosition;
     refMetadataById?: RefMetadataById | null;
     fallbackRefMetadataById?: RefMetadataById | null;

package/dist/domain/commit/CommitHelpers.d.ts

@@ -1,5 +1,5 @@
-import type { Author, CommitType, Sha, ShortSha } from './CommitTypes';
-export declare const hasPendingChanges: (type: CommitType) => boolean;
+import type { Author, EdgeCommitType, Sha, ShortSha } from './CommitTypes';
+export declare const hasPendingChanges: (type: EdgeCommitType) => boolean;
 export declare const getShortSha: (sha?: Sha | null, shaLength?: number) => ShortSha;
 export declare function getCommitMessageDescription(commitMessage: string, lineEnding?: string): string;
 export declare function getCommitMessageCoauthors(commitMessageDescription: string): Author[];

package/dist/domain/commit/CommitTypes.d.ts

@@ -3,6 +3,7 @@ export type Sha = string;
 export type ShortSha = string;
 export type WorkDirType = typeof mergeConflictNodeType | typeof unsupportedRebaseWarningNodeType | typeof workDirType;
 export type CommitType = typeof commitNodeType | typeof mergeNodeType | typeof stashNodeType | WorkDirType;
+export type EdgeCommitType = CommitType | 'synthetic-edge';
 export type Author = {
     name: string;
     email: string;

package/dist/domain/edge/EdgeHelpers.d.ts

@@ -1,10 +1,10 @@
-import type { CommitType } from '../commit/CommitTypes';
+import type { EdgeCommitType } from '../commit/CommitTypes';
 import type { ColumnColor, LineSvgProps, RowEdges, SvgElement, SvgElementName, SvgProps, SvgStyles } from '../graph/GraphTypes';
 export declare function getXValueAtColumn(column: number, columnWidth: number, gutterWidth: number, isCompact?: boolean): number;
 export declare function clearXValueAtColumnCache(): void;
 export declare function getSvgElement(element: SvgElementName, props: SvgProps): SvgElement;
 export declare function getLineElement(props: LineSvgProps): SvgElement;
-export declare function getSvgStyles(type: CommitType, color: ColumnColor, strokeWidth: number, isCompact?: boolean): SvgStyles;
-export declare function buildStartingOrEndingEdgeHash(edgeColumn: number, nodeColumn: number, type: CommitType | undefined, isCompact?: boolean): string;
-export declare function buildPassThroughEdgeHash(column: number, type: CommitType | undefined, isCompact?: boolean): string;
+export declare function getSvgStyles(type: EdgeCommitType, color: ColumnColor, strokeWidth: number, isCompact?: boolean): SvgStyles;
+export declare function buildStartingOrEndingEdgeHash(edgeColumn: number, nodeColumn: number, type: EdgeCommitType | undefined, isCompact?: boolean): string;
+export declare function buildPassThroughEdgeHash(column: number, type: EdgeCommitType | undefined, isCompact?: boolean): string;
 export declare function buildEdgeHash(edges: RowEdges, edgeColumnMax: number, nodeColumn: number, isCompact?: boolean): string;

package/dist/domain/graph/GraphConstants.d.ts

@@ -31,6 +31,8 @@ export declare const REF_ZONE_MARGIN_LEFT = 2;
 export declare const REF_ZONE_MARGIN_RIGHT = 6;
 export declare const REF_NODE_ICON_WIDTH = 14;
 export declare const REF_NODE_ICON_MARGIN = 5;
+export declare const REF_NODE_ACTIVE_ANNOTATION_ID = "gk-graph-ref-active";
+export declare const REF_NODE_PINNED_ANNOTATION_ID = "gk-graph-ref-pinned";
 export declare const REF_NODE_ICON_SPACING: number;
 export declare const REF_NODE_OUTER_SPACING = 10;
 export declare const REF_ZONE_SHOW_ICON_WIDTH = 55;
@@ -89,7 +91,7 @@ export declare enum GraphColumnMode {
     Rich = "rich",
     Text = "text"
 }
-export type GraphMarkerType = 'head' | 'highlights' | 'localBranches' | 'pullRequests' | 'remoteBranches' | 'selection' | 'stashes' | 'tags' | 'upstream';
+export type GraphMarkerType = 'head' | 'highlights' | 'localBranches' | 'pullRequests' | 'remoteBranches' | 'selection' | 'stashes' | 'tags' | 'upstream' | 'wip';
 export declare enum GraphMarkerShape {
     Block = "block",
     FullLine = "fullLine",

package/dist/domain/graph/GraphEdgeHelpers.d.ts

@@ -0,0 +1,34 @@
+import type { Sha } from '../commit/CommitTypes';
+import type { EdgeByColumn, ProcessedGraphRow, RowEdges } from './GraphTypes';
+/**
+ * Derives the ending/passThrough edges that the current row inherits from the previous row's
+ * edge state. For each column the previous row occupied, the inherited edge is either:
+ *  - an ending, if its parentSha matches the current row's sha
+ *  - a passThrough, otherwise
+ *
+ * Between a concurrent passThrough and starting in the same column (which can happen when a
+ * chain above passes through a row that also starts a new edge in the same lane), we prefer
+ * the non-pending (real commit/merge) edge so that a WIP/synthetic edge doesn't shadow a
+ * real commit chain mid-flight. The bare fallback still carries pending edges forward when
+ * that's the only thing available.
+ */
+export declare function getEndingAndPassThroughEdgesByColumnFromPrevRow(currentSha: Sha, prevRowEdges: RowEdges): RowEdges;
+/**
+ * Builds the set of starting edges for a row — one per parent it points to. Edges for rows
+ * in `syntheticEdgeChildShas` are tagged `synthetic-edge` so the renderer draws them wavy.
+ *
+ * `columnBySha` maps already-processed shas to their assigned column. This is used for the
+ * non-first parents of a row (which reserve lanes beside the row's own column). The first
+ * parent lives on the current row's own column.
+ */
+export declare function getStartingEdgesByColumn(currentRow: ProcessedGraphRow, columnBySha: (sha: Sha) => number | undefined, syntheticEdgeChildShas: Set<Sha>): EdgeByColumn;
+/**
+ * Composes the full edge state for a row: inherited ending/passThrough edges from the prev
+ * row merged with this row's own starting edges.
+ */
+export declare function getFinalEdgeStateForGraphAndRow(currentRow: ProcessedGraphRow, prevRowEdges: RowEdges, columnBySha: (sha: Sha) => number | undefined, syntheticEdgeChildShas: Set<Sha>): RowEdges;
+/**
+ * Returns the highest column index present in an edges map. Edges render from column 0 up
+ * to (inclusive) this value, so the caller uses it as a loop bound when emitting SVG.
+ */
+export declare function getEdgeColumnMax(edges: RowEdges | undefined | null): number;

package/dist/domain/graph/GraphHelpers.d.ts

@@ -9,6 +9,11 @@ import { GraphColumnMode } from './GraphConstants';
 import type { BaseMetadata, ExternalIconKeys, GetMissingRefMetadata, GraphColumnWidthConstraints, GraphItemContext, GraphRef, GraphRefGroup, GraphRow, GraphZoneModeConstants, Head, HighlightedShas, ProcessedGraphRow, ProcessedGraphRowBySha, Ref, RefMetadata, RefMetadataById, RefMetadataType, RowStatsConstraints } from './GraphTypes';
 export type DebouncableFn = (...args: any) => void;
 export type DebouncedFn = (...args: any) => void;
+export type CachedRowVisibilityState = {
+    hasBaseFilteredTags: boolean;
+    hasFilteredBranches: boolean;
+};
+export declare function getVisibleRowShasWithoutStashAnchoring(graphRows: GraphRow[], cachedRowVisibilityByIndex: CachedRowVisibilityState[], tagsRequireBranchOrVisibleChild: boolean): Set<Sha>;
 export declare const debounceFrame: (func: DebouncableFn) => DebouncedFn;
 export type ThrottleableFn = (...args: any) => void;
 export type ThrottledFn = (...args: any) => void;
@@ -17,7 +22,7 @@ export declare function hasScrolledToBottom(htmlElement: HTMLElement): boolean;
 export declare function hasScrolledToRight(htmlElement: HTMLElement): boolean;
 export declare function parseContext(context?: GraphItemContext | null): string | null;
 export declare function getRowStatsConstraints(stats: number[]): RowStatsConstraints;
-export declare function getOrAskForRefMetadata(ref: GraphRef, refMetadata: RefMetadataById | undefined, onMissingRefMetadata: GetMissingRefMetadata, refMetadataType?: RefMetadataType, fallbackRefMetadata?: RefMetadataById | null): RefMetadata | BaseMetadata | BaseMetadata[] | null | undefined;
+export declare function getOrAskForRefMetadata(ref: GraphRef, refMetadata: RefMetadataById | undefined | null, onMissingRefMetadata: GetMissingRefMetadata, refMetadataType?: RefMetadataType, fallbackRefMetadata?: RefMetadataById | null): RefMetadata | BaseMetadata | BaseMetadata[] | null | undefined;
 export declare function getTimelineLabelAndValue(diffMs: number): {
     label: string;
     value: number;
@@ -65,6 +70,7 @@ export declare function getHeadRefShaFromGraphRows(graphRows: GraphRow[]): Sha |
 export declare function isWorkDirNodeType(nodeType: CommitType): boolean;
 export declare function isCommitNodeType(nodeType: CommitType): boolean;
 export declare function workDirStatsHaveChanges(workDirStats?: WorkDirStats): boolean;
+export declare function shouldShowWorkDirRow(workDirStats: WorkDirStats | undefined, wipVisibility: 'always' | 'auto' | undefined): boolean;
 export declare function hasSingleSelectedSha(selectedShas: Set<Sha>): boolean;
 export declare function isSingleSelected(selectedShas: Set<Sha>, sha: Sha): boolean;
 export declare function getScrollToAlignment(rowHeight: number, clientHeight: number, scrollTop: number, scrollToIndex: number): Alignment;