gitbutlerapp
diff --git a/‎Cargo.lock‎
Lines changed: 6 additions & 0 deletions b/‎Cargo.lock‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎apps/desktop/src/components/branchesPage/BranchListCard.svelte‎
Lines changed: 1 addition & 1 deletion b/‎apps/desktop/src/components/branchesPage/BranchListCard.svelte‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎apps/desktop/src/components/upstream/IntegrateUpstreamModal.svelte‎
Lines changed: 18 additions & 16 deletions b/‎apps/desktop/src/components/upstream/IntegrateUpstreamModal.svelte‎
Lines changed: 18 additions & 16 deletions
diff --git a/‎apps/desktop/src/components/workspace/EditCommitPanel.svelte‎
Lines changed: 4 additions & 6 deletions b/‎apps/desktop/src/components/workspace/EditCommitPanel.svelte‎
Lines changed: 4 additions & 6 deletions
diff --git a/‎apps/desktop/src/lib/branches/branch.ts‎
Lines changed: 0 additions & 18 deletions b/‎apps/desktop/src/lib/branches/branch.ts‎
Lines changed: 0 additions & 18 deletions
diff --git a/‎apps/desktop/src/lib/branches/branchEndpoints.ts‎
Lines changed: 6 additions & 5 deletions b/‎apps/desktop/src/lib/branches/branchEndpoints.ts‎
Lines changed: 6 additions & 5 deletions
diff --git a/‎apps/desktop/src/lib/branches/branchListing.ts‎
Lines changed: 1 addition & 98 deletions b/‎apps/desktop/src/lib/branches/branchListing.ts‎
Lines changed: 1 addition & 98 deletions
diff --git a/‎apps/desktop/src/lib/dragging/stackingReorderDropzoneManager.ts‎
Lines changed: 1 addition & 1 deletion b/‎apps/desktop/src/lib/dragging/stackingReorderDropzoneManager.ts‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎apps/desktop/src/lib/files/conflictEntryPresence.ts‎
Lines changed: 2 additions & 5 deletions b/‎apps/desktop/src/lib/files/conflictEntryPresence.ts‎
Lines changed: 2 additions & 5 deletions
diff --git a/‎apps/desktop/src/lib/files/conflicts.ts‎
Lines changed: 2 additions & 4 deletions b/‎apps/desktop/src/lib/files/conflicts.ts‎
Lines changed: 2 additions & 4 deletions
@@ -1,6 +1,5 @@
 <script lang="ts">
 	import BranchesCardLayout from "$components/branchesPage/BranchesCardLayout.svelte";
-	import { type BranchListing, type BranchListingDetails } from "$lib/branches/branchListing";
 	import { BRANCH_SERVICE } from "$lib/branches/branchService.svelte";
 	import { GIT_CONFIG_SERVICE } from "$lib/config/gitConfigService";
 	import { getPrStatus } from "$lib/forge/interface/prUtils";
@@ -11,6 +10,7 @@
 	import { gravatarUrlFromEmail } from "@gitbutler/ui/components/avatar/gravatar";
 	import type { ReviewUnitInfo } from "$lib/forge/interface/forgePrService";
 	import type { PullRequest } from "$lib/forge/interface/types";
+	import type { BranchListing, BranchListingDetails } from "@gitbutler/core/api";
 
 	interface Props {
 		reviewUnit: ReviewUnitInfo | undefined;
 
@@ -6,11 +6,7 @@
 	import { DEFAULT_FORGE_FACTORY } from "$lib/forge/forgeFactory.svelte";
 	import {
 		getBaseBranchResolution,
-		type BaseBranchResolutionApproach,
-		type Resolution,
-		type StackStatus,
 		stackFullyIntegrated,
-		type BranchStatus,
 		sortStatusInfoV3,
 		getResolutionApproachV3,
 		type StackStatusInfoV3,
@@ -40,9 +36,14 @@
 	import { tick } from "svelte";
 	import { SvelteMap } from "svelte/reactivity";
 	import type { PullRequest } from "$lib/forge/interface/types";
+	import type {
+		BaseBranchResolutionApproach,
+		BranchStatus,
+		Resolution,
+		StackStatus,
+	} from "@gitbutler/core/api";
 
 	type OperationState = "inert" | "loading" | "completed";
-	type OperationType = "rebase" | "merge" | "unapply" | "delete";
 
 	interface Props {
 		projectId: string;
@@ -64,6 +65,11 @@
 	let integratingUpstream = $state<OperationState>("inert");
 	const results = new SvelteMap<string, Resolution>();
 	let statuses = $state<StackStatusInfoV3[]>([]);
+	const baseResolutionOptions = [
+		{ label: "Rebase", value: "rebase" as const },
+		{ label: "Merge", value: "merge" as const },
+		{ label: "Hard reset", value: "hardReset" as const },
+	];
 	let baseResolutionApproach = $state<BaseBranchResolutionApproach | undefined>();
 	let targetCommitOid = $state<string | undefined>(undefined);
 	let branchStatuses = $state<StackStatusesWithBranchesV3 | undefined>();
@@ -132,7 +138,7 @@
 			upstreamIntegrationService
 				.resolveUpstreamIntegrationMutation({
 					projectId,
-					resolutionApproach: { type: baseResolutionApproach },
+					resolutionApproach: baseResolutionApproach,
 				})
 				.then((result) => {
 					targetCommitOid = result;
@@ -174,16 +180,16 @@
 		return `integrate-upstream-modal:dont-delete-branch:${projectId}:${branchName}`;
 	}
 
-	function handleBaseResolutionSelection(value: string) {
-		baseResolutionApproach = value as BaseBranchResolutionApproach;
+	function handleBaseResolutionSelection(value: BaseBranchResolutionApproach["type"]) {
+		baseResolutionApproach = { type: value };
 	}
 
 	async function integrate() {
 		integratingUpstream = "loading";
 		await tick();
 		const baseResolution = getBaseBranchResolution(
 			targetCommitOid,
-			baseResolutionApproach || "hardReset",
+			baseResolutionApproach ?? { type: "hardReset" },
 		);
 
 		await integrateUpstream({
@@ -314,7 +320,7 @@
 				maxWidth={130}
 				onselect={(value) => {
 					const result = results.get(stackId)!;
-					results.set(stackId, { ...result, approach: { type: value as OperationType } });
+					results.set(stackId, { ...result, approach: { type: value } });
 				}}
 				options={integrationOptions(stackStatus)}
 			>
@@ -405,14 +411,10 @@
 
 				<div class="target-divergence-action">
 					<Select
-						value={baseResolutionApproach}
+						value={baseResolutionApproach?.type}
 						placeholder="Choose…"
 						onselect={handleBaseResolutionSelection}
-						options={[
-							{ label: "Rebase", value: "rebase" },
-							{ label: "Merge", value: "merge" },
-							{ label: "Hard reset", value: "hardReset" },
-						]}
+						options={baseResolutionOptions}
 					>
 						{#snippet itemSnippet({ item, highlighted })}
 							<SelectItem selected={highlighted} {highlighted}>
 
@@ -4,14 +4,10 @@
 	import ReduxResult from "$components/shared/ReduxResult.svelte";
 	import { getEditorUri, URL_SERVICE } from "$lib/backend/url";
 	import { splitMessage } from "$lib/commits/commitMessage";
-	import {
-		conflictEntryHint,
-		getConflictState,
-		type ConflictEntryPresence,
-	} from "$lib/files/conflictEntryPresence";
+	import { conflictEntryHint, getConflictState } from "$lib/files/conflictEntryPresence";
 	import { FILE_SERVICE } from "$lib/files/fileService";
 	import { computeChangeStatus } from "$lib/files/fileStatus";
-	import { MODE_SERVICE, type EditModeMetadata } from "$lib/mode/modeService";
+	import { MODE_SERVICE } from "$lib/mode/modeService";
 	import { vscodePath } from "$lib/project/project";
 	import { PROJECTS_SERVICE } from "$lib/project/projectsService";
 	import { createCommitSelection } from "$lib/selection/key";
@@ -35,6 +31,8 @@
 	import { derived, fromStore, readable, toStore, type Readable } from "svelte/store";
 	import type { FileInfo } from "$lib/files/file";
 	import type { TreeChange } from "$lib/hunks/change";
+	import type { EditModeMetadata } from "@gitbutler/core/api";
+	import type { ConflictEntryPresence } from "@gitbutler/core/api";
 	import type { FileStatus } from "@gitbutler/ui/components/file/types";
 
 	type Props = {
 
@@ -7,15 +7,16 @@ import {
 } from "$lib/state/tags";
 import { createEntityAdapter, type EntityState } from "@reduxjs/toolkit";
 import type { BaseBranch, ForgeProvider, RemoteBranchInfo } from "$lib/baseBranch/baseBranch";
-import type { BranchListing, BranchListingDetails } from "$lib/branches/branchListing";
 import type { BackendEndpointBuilder } from "$lib/state/backendApi";
 import type {
 	BaseBranchResolution,
 	BaseBranchResolutionApproach,
-	BranchStatusesResponse,
+	BranchListing,
+	BranchListingDetails,
 	IntegrationOutcome,
 	Resolution,
-} from "$lib/upstream/types";
+	StackStatuses,
+} from "@gitbutler/core/api";
 
 export function buildBranchEndpoints(build: BackendEndpointBuilder) {
 	return {
@@ -102,7 +103,7 @@ export function buildBranchEndpoints(build: BackendEndpointBuilder) {
 
 		// ── Upstream Integration ─────────────────────────────────────
 		upstreamIntegrationStatuses: build.query<
-			BranchStatusesResponse,
+			StackStatuses,
 			{ projectId: string; targetCommitOid?: string }
 		>({
 			extraOptions: { command: "upstream_integration_statuses" },
@@ -130,7 +131,7 @@ export function buildBranchEndpoints(build: BackendEndpointBuilder) {
 		}),
 		resolveUpstreamIntegration: build.mutation<
 			string,
-			{ projectId: string; resolutionApproach: { type: BaseBranchResolutionApproach } }
+			{ projectId: string; resolutionApproach: BaseBranchResolutionApproach }
 		>({
 			extraOptions: {
 				command: `resolve_upstream_integration`,
 
@@ -1,110 +1,13 @@
 import { msSinceDaysAgo } from "$lib/utils/time";
 import { isDefined } from "@gitbutler/ui/utils/typeguards";
 import type { ForgeUser, PullRequest } from "$lib/forge/interface/types";
+import type { BranchListing } from "@gitbutler/core/api";
 
 export type GroupedSidebarEntries = Record<
 	"applied" | "authored" | "review" | "today" | "yesterday" | "lastWeek" | "older",
 	SidebarEntrySubject[]
 >;
 
-/**
- * Represents a branch that exists for the repository
- * This also combines the concept of a remote, local and virtual branch in order to provide a unified interface for the UI
- * Branch entry is not meant to contain all of the data a branch can have (e.g. full commit history, all files and diffs, etc.).
- * It is intended a summary that can be quickly retrieved and displayed in the UI.
- * For more detailed information, each branch can be queried individually for it's `BranchData`.
- */
-export type BranchListing = {
-	/** The name of the branch (e.g. `main`, `feature/branch`), excluding the remote name */
-	name: string;
-	/**
-	 * This is a list of remote that this branch can be found on (e.g. `origin`, `upstream` etc.).
-	 * If this branch is a local branch, this list will be empty.
-	 */
-	remotes: string[];
-	/** The branch may or may not have a virtual branch associated with it */
-	stack?: StackReference | undefined;
-	/**
-	 * Timestamp in milliseconds since the branch was last updated.
-	 * This includes any commits, uncommitted changes or even updates to the branch metadata (e.g. renaming).
-	 */
-	updatedAt: string;
-	/** The person who committed the head commit */
-	lastCommiter: Author;
-	/** Whether or not there is a local branch as part of the grouping */
-	hasLocal: boolean;
-};
-
-/** Represents a reference to an associated virtual branch */
-export type StackReference = {
-	/** A non-normalized name of the branch, set by the user */
-	givenName: string;
-	/** Virtual Branch UUID identifier */
-	id: string;
-	/** Determines if the virtual branch is applied in the workspace */
-	inWorkspace: boolean;
-	/**
-   List of branch names that are part of the stack
-   Ordered from newest to oldest (the most recent branch is first in the list)
-    */
-	branches: string[];
-	/** Pull Request numbes by branch name associated with the stack */
-	pullRequests: Record<string, number>;
-};
-
-/** Represents a "commit author" or "signature", based on the data from there git history */
-export type Author = {
-	/** The name of the author as configured in the git config */
-	name?: string | undefined;
-	/** The email of the author as configured in the git config */
-	email?: string | undefined;
-	/** The gravatar id of the author */
-	gravatarUrl?: string | undefined;
-};
-
-/** Represents a fat struct with all the data associated with a branch */
-export interface BranchListingDetails {
-	/** The name of the branch (e.g. `main`, `feature/branch`), excluding the remote name */
-	name: string;
-	/**
-	 * The number of lines added within the branch
-	 * Since the virtual branch, local branch and the remote one can have different number of lines removed,
-	 * the value from the virtual branch (if present) takes the highest precedence,
-	 * followed by the local branch and then the remote branches (taking the max if there are multiple).
-	 * If this branch has a virtual branch, lines_added does NOT include the uncommitted lines.
-	 */
-	linesAdded: number;
-	/**
-	 * The number of lines removed within the branch
-	 * Since the virtual branch, local branch and the remote one can have different number of lines removed,
-	 * the value from the virtual branch (if present) takes the highest precedence,
-	 * followed by the local branch and then the remote branches (taking the max if there are multiple)
-	 * If this branch has a virtual branch, lines_removed does NOT include the uncommitted lines.
-	 */
-	linesRemoved: number;
-	/**
-	 * The number of files that were modified within the branch
-	 * Since the virtual branch, local branch and the remote one can have different number files modified,
-	 * the value from the virtual branch (if present) takes the highest precedence,
-	 * followed by the local branch and then the remote branches (taking the max if there are multiple)
-	 */
-	numberOfFiles: number;
-	/**
-	 * The number of commits associated with a branch
-	 * Since the virtual branch, local branch and the remote one can have different number of commits,
-	 * the value from the virtual branch (if present) takes the highest precedence,
-	 * followed by the local branch and then the remote branches (taking the max if there are multiple)
-	 */
-	numberOfCommits: number;
-	/**
-	 * A list of authors that have contributes commits to this branch.
-	 * In the case of multiple remote tracking branches, it takes the full list of unique authors.
-	 */
-	authors: Author[];
-	/** The branch may or may not have a virtual branch associated with it */
-	stack?: StackReference | undefined;
-}
-
 type PullRequestEntrySubject = {
 	type: "pullRequest";
 	subject: PullRequest;
 
@@ -1,8 +1,8 @@
 import { CommitDropData } from "$lib/dragging/dropHandlers/commitDropHandler";
 import { InjectionToken } from "@gitbutler/core/context";
-import type { StackOrder } from "$lib/branches/branch";
 import type { DropzoneHandler } from "$lib/dragging/handler";
 import type { StackService } from "$lib/stacks/stackService.svelte";
+import type { StackOrder } from "@gitbutler/core/api";
 
 export class ReorderCommitDzHandler implements DropzoneHandler {
 	constructor(
 
@@ -1,8 +1,5 @@
-export interface ConflictEntryPresence {
-	ours: boolean;
-	theirs: boolean;
-	ancestor: boolean;
-}
+export type { ConflictEntryPresence } from "@gitbutler/core/api";
+import type { ConflictEntryPresence } from "@gitbutler/core/api";
 
 export function emptyConflictEntryPresence(): ConflictEntryPresence {
 	return {
 
@@ -1,7 +1,5 @@
-import {
-	emptyConflictEntryPresence,
-	type ConflictEntryPresence,
-} from "$lib/files/conflictEntryPresence";
+import { emptyConflictEntryPresence } from "$lib/files/conflictEntryPresence";
+import type { ConflictEntryPresence } from "@gitbutler/core/api";
 
 export class ConflictEntries {
 	public entries: Map<string, ConflictEntryPresence> = new Map();