Fix spelling and grammatical errors across repository

apps/desktop/README.md

@@ -18,7 +18,7 @@ Execute the following command on your terminal \
 cargo run -p but-server
 ```
 
-This shoud start the server on th default port 6978
+This should start the server on th default port 6978
 
 #### 2. Run the FE dev server
 

apps/desktop/cypress/e2e/branches.cy.ts

@@ -168,7 +168,7 @@ describe('Branches', () => {
 		cy.getByTestId('delete-local-branch-confirmation-modal').should('not.exist');
 	});
 
-	it('should be able to preivew multiple branches', () => {
+	it('should be able to preview multiple branches', () => {
 		// Should be able to navigate the different branches
 		for (const branch of mockBackend.branchListings) {
 			cy.getByTestId('branch-list-card', branch.name).first().should('be.visible').click();

apps/desktop/cypress/e2e/errorHandling.cy.ts

@@ -146,7 +146,7 @@ describe('Error handling - commit actions', () => {
 		expect(mockBackend.getDiff).to.have.callCount(0);
 	});
 
-	it('Fully failing to commit with rejection reasons shuold be handled graceful', () => {
+	it('Fully failing to commit with rejection reasons should be handled graceful', () => {
 		mockCommand('create_commit_from_worktree_changes', () =>
 			mockBackend.commitFailureWithReasons(null)
 		);
@@ -208,7 +208,7 @@ describe('Error handling - commit actions', () => {
 		cy.getByTestId('commit-drawer-description-input').should('contain', newCommitMessageBody);
 	});
 
-	it('Partially failing to commit with rejection reasons shuold be handled graceful', () => {
+	it('Partially failing to commit with rejection reasons should be handled graceful', () => {
 		const newCommitId = '29384726398746289374';
 		mockCommand('create_commit_from_worktree_changes', () =>
 			mockBackend.commitFailureWithReasons(newCommitId)

apps/desktop/cypress/e2e/selection.cy.ts

@@ -32,7 +32,7 @@ describe('Selection', () => {
 		cy.getByTestId('branch-header').should('contain', mockBackend.stackId);
 
 		const stacks = mockBackend.getStacks();
-		// There shuold be three stacks
+		// There should be three stacks
 		cy.getByTestId('stack').should('have.length', stacks.length);
 
 		// Select the second stack
@@ -45,7 +45,7 @@ describe('Selection', () => {
 			cy.getByTestIdByValue('branch-header', stackName)
 				.click()
 				.within(() => {
-					// Shouls have the stack url
+					// Should have the stack url
 					cy.urlMatches(`/${PROJECT_ID}/workspace`);
 				});
 			// Check if the file list is updated
@@ -68,7 +68,7 @@ describe('Selection', () => {
 
 		const stacks = mockBackend.getStacks();
 		const stack = stacks[0]!;
-		// There shuold be three stacks
+		// There should be three stacks
 		cy.getByTestId('stack').should('have.length', stacks.length);
 
 		// Select the initial commit which should be local only
@@ -92,7 +92,7 @@ describe('Selection', () => {
 		cy.getByTestId('branch-header').should('contain', mockBackend.stackWithTwoCommits);
 
 		const stacks = mockBackend.getStacks();
-		// There shuold be three stacks
+		// There should be three stacks
 		cy.getByTestId('stack').should('have.length', stacks.length);
 
 		cy.getByTestIdByValue('stack', mockBackend.stackWithTwoCommits)
@@ -153,7 +153,7 @@ describe('Selection', () => {
 		cy.getByTestId('branch-header').should('contain', mockBackend.stackWithTwoCommits);
 
 		const stacks = mockBackend.getStacks();
-		// There shuold be three stacks
+		// There should be three stacks
 		cy.getByTestId('stack').should('have.length', stacks.length);
 
 		cy.getByTestIdByValue('stack', mockBackend.stackWithTwoCommits)
@@ -239,7 +239,7 @@ describe('Selection with upstream changes', () => {
 		cy.getByTestId('branch-header').should('contain', mockBackend.stackId);
 
 		const stacks = mockBackend.getStacks();
-		// There shuold be three stacks
+		// There should be three stacks
 		cy.getByTestId('stack').should('have.length', stacks.length);
 
 		// Select the initial commit which should be local only

apps/desktop/cypress/e2e/unifiedDiffView.cy.ts

@@ -348,7 +348,7 @@ describe('Unified Diff View with complex hunks', () => {
 		// Click on start a commit
 		cy.getByTestId('start-commit-button').first().click();
 
-		// Unstage everything expet the long hunk file
+		// Unstage everything expect the long hunk file
 		cy.getByTestId('uncommitted-changes-file-list').within(() => {
 			cy.getByTestId('file-list-item').each((item) => {
 				const fileName = item.text().trim();

apps/desktop/cypress/e2e/workspace.cy.ts

@@ -9,7 +9,7 @@ describe('Workspace', () => {
 	});
 
 	it('Should be redirected to the workspace', () => {
-		// This is basically jsut a smoke test to check that the workspace is loaded
+		// This is basically just a smoke test to check that the workspace is loaded
 		cy.visit('/');
 
 		// Should be redirected to the workspac

apps/desktop/src/components/BranchHeader.svelte

@@ -128,7 +128,7 @@
 		class="branch-header"
 		class:selected
 		class:active
-		class:commiting={isCommitting}
+		class:committing={isCommitting}
 		{onclick}
 		onkeypress={onclick}
 		tabindex="0"

apps/desktop/src/components/ChunkyList.svelte

@@ -5,7 +5,7 @@
 <script lang="ts" generics="T">
 	/**
 	 * Lazily renders a list of many many items. This is intended to be used
-	 * in contexts where simply rendering the quanity of items causes the DOM
+	 * in contexts where simply rendering the quantity of items causes the DOM
 	 * to have poor performance, rather than computing the initial list being
 	 * the blocker.
 	 */

apps/desktop/src/components/CommitLineOverlay.svelte

@@ -4,10 +4,10 @@
 	interface Props {
 		hovered: boolean;
 		activated: boolean;
-		advertize?: boolean;
+		advertise?: boolean;
 	}
 
-	const { hovered, activated, advertize }: Props = $props();
+	const { hovered, activated, advertise }: Props = $props();
 
 	let containerElement = $state<HTMLDivElement>();
 	let indicatorElement = $state<HTMLDivElement>();
@@ -46,7 +46,7 @@
 	bind:this={containerElement}
 	class="dropzone-target container"
 	class:activated
-	class:advertize
+	class:advertise
 	class:hovered
 >
 	<div bind:this={indicatorElement} class="indicator-placeholder"></div>
@@ -56,7 +56,7 @@
 	<div
 		class="indicator-portal"
 		class:hovered
-		class:advertize
+		class:advertise
 		use:portal={stackViewElement}
 		style:top="{indicatorRect.top}px"
 		style:left="{indicatorRect.left}px"

apps/desktop/src/components/DraftBranchHeader.svelte

@@ -33,7 +33,7 @@
 		data-testid={TestId.BranchHeader}
 		data-testid-branch-header={branchName}
 		class="branch-header"
-		class:commiting={isCommitting}
+		class:committing={isCommitting}
 		data-remove-from-panning
 	>
 		<div class="branch-header__content">

apps/desktop/src/components/Drawer.svelte

@@ -114,7 +114,7 @@
 		<!--
 			This ternarny statement captures the nuance of maxHeight possibly
 			being lower than minHeight.
-			TODO: Move this logic into the resizer so it applies everwhere.
+			TODO: Move this logic into the resizer so it applies everywhere.
 		-->
 		{@const maxHeight =
 			resizer.maxHeight && resizer.minHeight

apps/desktop/src/components/GithubIntegration.svelte

@@ -150,7 +150,7 @@
 <div class="stack-v gap-16">
 	<CardGroup>
 		<ReduxResult result={accounts.result}>
-			<!-- IF ERRROR -->
+			<!-- IF ERROR -->
 			{#snippet error()}
 				<CardGroup.Item>
 					{#snippet title()}

apps/desktop/src/components/IntegrateUpstreamModal.svelte

@@ -152,10 +152,10 @@
 	// 		// This is to handle the case where the reviews might dictacte that
 	// 		// we should remove a branch, but we don't have the have the merge
 	// 		// commit yet. If we were to handle a branch as "integrated" without
-	// 		// the merge commit, files might dissapear for a users working tree
+	// 		// the merge commit, files might disappear for a users working tree
 	// 		// in a supprising way.
 	// 		//
-	// 		// We could query both of these simultaniously using Promise.all,
+	// 		// We could query both of these simultaneously using Promise.all,
 	// 		// but that is extra complexity that is not needed for now.
 	// 		await baseBranchService.fetchFromRemotes(projectId);
 	// 		const reviews = await forgeListingService.fetchByBranch(projectId, appliedBranches);

apps/desktop/src/components/MultiStackView.svelte

@@ -164,7 +164,7 @@
 	use:resizeObserver={(data) => {
 		// An experiment in prevent content shift. Currently this mechanism
 		// allows content shift if the main viewport is scrolled to the left,
-		// because the content shift is most annoyin when there are many
+		// because the content shift is most annoying when there are many
 		// lanes and you are e.g. making a commit to one of them.
 		if (lastWidth && lanesScrollableEl) {
 			// Only offset for sudden large changes.

apps/desktop/src/components/NewRuleMenu.svelte

@@ -60,7 +60,7 @@
 		/>
 		<ContextMenuItem
 			icon="tag"
-			label="Work catergory (coming soon)"
+			label="Work category (coming soon)"
 			disabled={filterHasBeenAdded('semanticType') || true}
 			onclick={() => {
 				handleAddFilter('semanticType');

apps/desktop/src/components/PullRequestCard.svelte

@@ -212,7 +212,7 @@
 						<span class="label italic">No reviewers</span>
 					{/if}
 				</div>
-				<span class="seperator">•</span>
+				<span class="separator">•</span>
 				<div class="factoid">
 					<span class="label">
 						<Icon name="chat-small" />
@@ -257,7 +257,7 @@
 		}
 	}
 
-	.seperator {
+	.separator {
 		transform: translateY(-1.5px);
 		color: var(--clr-text-3);
 	}

apps/desktop/src/components/Resizer.svelte

@@ -154,7 +154,7 @@
 		// handling of this event.
 		if (resizeGroup) {
 			const subtracted = resizeGroup.resize(resizerId, offsetRem);
-			// The initial offset needs to be adjusted if an adjustement
+			// The initial offset needs to be adjusted if an adjustment
 			// means the whole resizer has moved.
 			initial = initial - remToPx(subtracted, zoom);
 			return;

apps/desktop/src/components/UnifiedDiffView.svelte

@@ -67,7 +67,7 @@
 	const projectState = $derived(uiState.project(projectId));
 	const exclusiveAction = $derived(projectState.exclusiveAction.current);
 
-	const isCommiting = $derived(
+	const isCommitting = $derived(
 		exclusiveAction?.type === 'commit' && selectionId.type === 'worktree'
 	);
 
@@ -214,7 +214,7 @@
 					>
 						<HunkDiff
 							draggingDisabled={!draggable}
-							hideCheckboxes={!isCommiting}
+							hideCheckboxes={!isCommitting}
 							filePath={change.path}
 							hunkStr={hunk.diff}
 							staged={selection.current.selected}

apps/desktop/src/components/editor/MessageEditor.svelte

@@ -541,7 +541,7 @@
 		padding: 2px 0;
 		text-align: center;
 
-		/* remove numver arrows */
+		/* remove number arrows */
 		&::-webkit-inner-spin-button,
 		&::-webkit-outer-spin-button {
 			-webkit-appearance: none;

apps/desktop/src/components/projectSettings/AppearanceSettings.svelte

@@ -331,7 +331,7 @@
 				Stage all files
 			{/snippet}
 			{#snippet caption()}
-				Stage all files assigned to the stack on commit. If no files are staged, all unassinged
+				Stage all files assigned to the stack on commit. If no files are staged, all unassigned
 				files will be staged.
 			{/snippet}
 			{#snippet actions()}

apps/desktop/src/components/test/readme.md

@@ -4,5 +4,5 @@ It's often excessive to test functionality of a language, framework, or library,
 but in cases where documentation is lacking or is poorly defined, it can be
 reasonable to ensure that assumptions do indeed hold.
 
-Test cases defined here likly should be upstreamed to define the behaviors
+Test cases defined here likely should be upstreamed to define the behaviors
 perminently.

apps/desktop/src/lib/actions/types.ts

@@ -77,7 +77,7 @@ export class ButlerAction {
 	createdAt!: Date;
 	/** A description of the change that was made and why it was made - i.e. the information that can be obtained from the caller. */
 	externalSummary!: string;
-	/** The prompt used that triggered this thingy stuff figgure it out yourself */
+	/** The prompt used that triggered this thingy stuff figure it out yourself */
 	externalPrompt!: string;
 	/** The handler / implementation that performed the action. */
 	handler!: ActionHandler;
@@ -137,7 +137,7 @@ export type Trigger =
 export type Status =
 	| { readonly type: 'completed' }
 	| { readonly type: 'failed'; readonly subject: string }
-	| { readonly type: 'interupted'; readonly subject: string };
+	| { readonly type: 'interrupted'; readonly subject: string };
 
 /** Represents a workflow that was executed by GitButler. */
 export class Workflow {

apps/desktop/src/lib/ai/prompts.ts

@@ -141,7 +141,7 @@ ${prBodyTemplate}
 export const SHORT_DEFAULT_PR_TEMPLATE: Prompt = [
 	{
 		role: MessageRole.System,
-		content: `You're a helpful coding assitant.
+		content: `You're a helpful coding assistant.
 Create a description for a pull request.
 Use the provided context, like the COMMIT_MESSAGES, PR_TEMPLATE, current TITLE and BODY.
 The list of commit messages is separated by this token: <###>.

apps/desktop/src/lib/ai/service.ts

@@ -188,7 +188,7 @@ export class AIService {
 	}
 
 	/**
-	 * Returns the diff length limit with a specificed upper bound of characers in order to not inundate the API.
+	 * Returns the diff length limit with a specified upper bound of characters in order to not inundate the API.
 	 */
 	async getDiffLengthLimitConsideringAPI() {
 		const diffLengthLimit = await this.getDiffLengthLimit();

apps/desktop/src/lib/backend/clipboard.ts

@@ -11,7 +11,7 @@ export default class ClipboardService {
 	 * information about the success of this operation.
 	 *
 	 * @param text text to be copied into the system clipboard.
-	 * @param errorMessage optional custom error message which will be displayed if the operation failes. If this is
+	 * @param errorMessage optional custom error message which will be displayed if the operation fails. If this is
 	 *                     not provided, a default generic message will be used.
 	 */
 	async write(

apps/desktop/src/lib/backend/web.ts

@@ -101,7 +101,7 @@ async function webHomeDirectory(): Promise<string> {
 }
 
 async function webJoinPath(pathSegment: string, ...paths: string[]): Promise<string> {
-	// TODO: We might want to expose some endpoint in the backedn to handle path joining in the right way.
+	// TODO: We might want to expose some endpoint in the backend to handle path joining in the right way.
 	// This will break on windows
 	return await Promise.resolve([pathSegment, ...paths].join(webPathSeparator()));
 }

apps/desktop/src/lib/branches/branch.ts

@@ -9,7 +9,7 @@ export type StackOrder = {
 /**
  * @desc Represents the order of changes (commits) in a series (branch).
  * @property name - Unique name of the series (branch). Must already exist in the stack.
- * @property commitIds - This is the desired commit order for the series. Because the commits will be rabased, naturally, the the commit ids will be different afte updating. The changes are ordered from newest to oldest (most recent changes go first)
+ * @property commitIds - This is the desired commit order for the series. Because the commits will be rabased, naturally, the the commit ids will be different after updating. The changes are ordered from newest to oldest (most recent changes go first)
  */
 
 type SeriesOrder = {

apps/desktop/src/lib/branches/branchListing.ts

@@ -29,10 +29,10 @@ export type BranchListing = {
 	stack?: StackReference | undefined;
 	/**
 	 * Timestamp in milliseconds since the branch was last updated.
-	 * This includes any commits, uncommited changes or even updates to the branch metadata (e.g. renaming).
+	 * This includes any commits, uncommitted changes or even updates to the branch metadata (e.g. renaming).
 	 */
 	updatedAt: string;
-	/** The person who commited the head commit */
+	/** The person who committed the head commit */
 	lastCommiter: Author;
 	/** Whether or not there is a local branch as part of the grouping */
 	hasLocal: boolean;
@@ -55,7 +55,7 @@ export type StackReference = {
 	pullRequests: Record<string, number>;
 };
 
-/** Represents a "commit author" or "signature", based on the data from ther git history */
+/** 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;
@@ -74,15 +74,15 @@ export class BranchListingDetails {
 	 * 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 virutal branch, lines_added does NOT include the uncommitted lines.
+	 * 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 virutal branch, lines_removed does NOT include the uncommitted lines.
+	 * If this branch has a virtual branch, lines_removed does NOT include the uncommitted lines.
 	 */
 	linesRemoved!: number;
 	/**

apps/desktop/src/lib/codegen/messages.ts

@@ -346,7 +346,7 @@ const webRequestCost = 10;
  * because the "assistant" ones come in more frequently.
  *
  * For some reason the final quantity of tokens ends up slightly greater than if
- * you were using the result. I'm not entirly sure where the discrepency is.
+ * you were using the result. I'm not entirely sure where the discrepancy is.
  */
 export function usageStats(events: ClaudeMessage[]): {
 	tokens: number;