diff --git a/.planning/config.json b/.planning/config.json
index faeb5db9..758c1fd8 100644
--- a/.planning/config.json
+++ b/.planning/config.json
@@ -9,4 +9,4 @@
     "plan_check": true,
     "verifier": true
   }
-}
\ No newline at end of file
+}
diff --git a/.planning/debug/viewer3d-standalone.html b/.planning/debug/viewer3d-standalone.html
index ae928bac..f45d4ca7 100644
--- a/.planning/debug/viewer3d-standalone.html
+++ b/.planning/debug/viewer3d-standalone.html
@@ -292,8 +292,8 @@ <h2>Debug Log</h2>
 
   <script type="module">
     import * as THREE from 'three';
-    import { GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader.js';
     import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls.js';
+    import { GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader.js';
 
     // Make available globally for onclick handlers
     window.THREE = THREE;
diff --git a/biome.json b/biome.json
index e1ca172a..b33c2a8b 100644
--- a/biome.json
+++ b/biome.json
@@ -1,6 +1,6 @@
 {
-  "$schema": "https://biomejs.dev/schemas/1.9.0/schema.json",
-  "organizeImports": { "enabled": true },
+  "$schema": "https://biomejs.dev/schemas/2.4.4/schema.json",
+  "assist": { "actions": { "source": { "organizeImports": "on" } } },
   "linter": { "enabled": true, "rules": { "recommended": true } },
   "formatter": { "enabled": true, "indentStyle": "space", "indentWidth": 2 }
 }
diff --git a/docs/.vitepress/config.mts b/docs/.vitepress/config.mts
index 8d0149b2..c80b1c97 100644
--- a/docs/.vitepress/config.mts
+++ b/docs/.vitepress/config.mts
@@ -5,7 +5,12 @@ export default defineConfig({
   description: "A visual Git client built with Tauri, React, and TypeScript",
   base: "/FlowForge/",
 
-  head: [["link", { rel: "icon", type: "image/svg+xml", href: "/FlowForge/logo.svg" }]],
+  head: [
+    [
+      "link",
+      { rel: "icon", type: "image/svg+xml", href: "/FlowForge/logo.svg" },
+    ],
+  ],
 
   themeConfig: {
     nav: [
@@ -72,7 +77,10 @@ export default defineConfig({
     },
 
     socialLinks: [
-      { icon: "github", link: "https://github.com/Atypical-Consulting/FlowForge" },
+      {
+        icon: "github",
+        link: "https://github.com/Atypical-Consulting/FlowForge",
+      },
     ],
   },
 
diff --git a/index.html b/index.html
index 37c884bd..cc8ce5bb 100644
--- a/index.html
+++ b/index.html
@@ -7,7 +7,7 @@
         <title>FlowForge</title>
         <!-- FOUC Prevention: Set theme class before React loads -->
         <script>
-            (function () {
+            (() => {
                 const stored = localStorage.getItem("flowforge-theme");
                 let theme = stored;
 
diff --git a/renovate.json b/renovate.json
index 692ce4a5..22a99432 100644
--- a/renovate.json
+++ b/renovate.json
@@ -1 +1,4 @@
-{"$schema":"https://docs.renovatebot.com/renovate-schema.json","extends":["config:recommended"]}
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": ["config:recommended"]
+}
diff --git a/src/App.tsx b/src/App.tsx
index e69c644d..a4f1ef49 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,57 +1,131 @@
-import { listen } from "@tauri-apps/api/event";
 import { useQueryClient } from "@tanstack/react-query";
+import { listen } from "@tauri-apps/api/event";
 import { useSelector } from "@xstate/react";
 import { Suspense, useCallback, useEffect } from "react";
 import "./core/workflows";
 import "./core/commands";
 import "./core/commands/toolbar-actions";
 import "./core/blades/_discovery";
+import { gitHookBus } from "@/core/services/gitHookBus";
 import { CommandPalette } from "@/framework/command-palette/components";
+import { ExtensionAPI } from "@/framework/extension-system/ExtensionAPI";
+import { BladeRenderer } from "@/framework/layout/BladeRenderer";
+import { useBladeRegistry } from "@/framework/layout/bladeRegistry";
+import {
+  getNavigationActor,
+  NavigationProvider,
+  useNavigationActorRef,
+} from "@/framework/layout/navigation/context";
+import { selectBladeStack } from "@/framework/layout/navigation/selectors";
+import { commands as tauriCommands } from "./bindings";
 import { Header } from "./core/components/Header";
 import { RepositoryView } from "./core/components/RepositoryView";
 import { ContextMenuPortal } from "./core/components/ui/ContextMenu";
 import { StatusBar } from "./core/components/ui/StatusBar";
 import { ToastContainer } from "./core/components/ui/ToastContainer";
 import { useKeyboardShortcuts } from "./core/hooks/useKeyboardShortcuts";
-import { BladeRenderer } from "@/framework/layout/BladeRenderer";
-import { getNavigationActor, NavigationProvider, useNavigationActorRef } from "@/framework/layout/navigation/context";
-import { selectBladeStack } from "@/framework/layout/navigation/selectors";
-import { usePreferencesStore as useBranchMetadataStore } from "./core/stores/domain/preferences";
-import { usePreferencesStore as useNavigationStore } from "./core/stores/domain/preferences";
-import { useGitOpsStore } from "./core/stores/domain/git-ops";
-import { useGitOpsStore as useRepositoryStore } from "./core/stores/domain/git-ops";
-import { usePreferencesStore as useReviewChecklistStore } from "./core/stores/domain/preferences";
-import { usePreferencesStore as useSettingsStore } from "./core/stores/domain/preferences";
-import { usePreferencesStore as useThemeStore } from "./core/stores/domain/preferences";
-import { useGitOpsStore as useUndoStore } from "./core/stores/domain/git-ops";
-import { useBladeRegistry } from "@/framework/layout/bladeRegistry";
 import { modKeyLabel } from "./core/lib/platform";
-import { useExtensionHost, configureExtensionHost } from "./extensions";
-import { ExtensionAPI } from "@/framework/extension-system/ExtensionAPI";
-import { gitHookBus } from "@/core/services/gitHookBus";
-import { commands as tauriCommands } from "./bindings";
-import { onActivate as viewerCodeActivate, onDeactivate as viewerCodeDeactivate } from "./extensions/viewer-code";
-import { onActivate as viewerMarkdownActivate, onDeactivate as viewerMarkdownDeactivate } from "./extensions/viewer-markdown";
-import { onActivate as viewer3dActivate, onDeactivate as viewer3dDeactivate } from "./extensions/viewer-3d";
-import { onActivate as ccActivate, onDeactivate as ccDeactivate } from "./extensions/conventional-commits";
-import { onActivate as gitflowActivate, onDeactivate as gitflowDeactivate } from "./extensions/gitflow";
-import { onActivate as worktreesActivate, onDeactivate as worktreesDeactivate } from "./extensions/worktrees";
-import { onActivate as githubActivate, onDeactivate as githubDeactivate } from "./extensions/github";
-import { onActivate as initRepoActivate, onDeactivate as initRepoDeactivate } from "./extensions/init-repo";
-import { onActivate as viewerImageActivate, onDeactivate as viewerImageDeactivate } from "./extensions/viewer-image";
-import { onActivate as viewerNupkgActivate, onDeactivate as viewerNupkgDeactivate } from "./extensions/viewer-nupkg";
-import { onActivate as viewerPlaintextActivate, onDeactivate as viewerPlaintextDeactivate } from "./extensions/viewer-plaintext";
-import { onActivate as welcomeActivate, onDeactivate as welcomeDeactivate } from "./extensions/welcome-screen";
-import { onActivate as topologyActivate, onDeactivate as topologyDeactivate } from "./extensions/topology";
-import { onActivate as conflictActivate, onDeactivate as conflictDeactivate } from "./extensions/conflict-resolution";
-import { onActivate as insightsActivate, onDeactivate as insightsDeactivate } from "./extensions/git-insights";
-import { onActivate as repositoryExtActivate, onDeactivate as repositoryExtDeactivate } from "./extensions/repository";
-import { onActivate as branchesExtActivate, onDeactivate as branchesExtDeactivate } from "./extensions/branches";
-import { onActivate as syncExtActivate, onDeactivate as syncExtDeactivate } from "./extensions/sync";
-import { onActivate as diffExtActivate, onDeactivate as diffExtDeactivate } from "./extensions/diff";
-import { onActivate as commitsExtActivate, onDeactivate as commitsExtDeactivate } from "./extensions/commits";
-import { onActivate as stashExtActivate, onDeactivate as stashExtDeactivate } from "./extensions/stash";
-import { onActivate as tagsExtActivate, onDeactivate as tagsExtDeactivate } from "./extensions/tags";
+import {
+  useGitOpsStore,
+  useGitOpsStore as useRepositoryStore,
+  useGitOpsStore as useUndoStore,
+} from "./core/stores/domain/git-ops";
+import {
+  usePreferencesStore as useBranchMetadataStore,
+  usePreferencesStore as useNavigationStore,
+  usePreferencesStore as useReviewChecklistStore,
+  usePreferencesStore as useSettingsStore,
+  usePreferencesStore as useThemeStore,
+} from "./core/stores/domain/preferences";
+import { configureExtensionHost, useExtensionHost } from "./extensions";
+import {
+  onActivate as branchesExtActivate,
+  onDeactivate as branchesExtDeactivate,
+} from "./extensions/branches";
+import {
+  onActivate as commitsExtActivate,
+  onDeactivate as commitsExtDeactivate,
+} from "./extensions/commits";
+import {
+  onActivate as conflictActivate,
+  onDeactivate as conflictDeactivate,
+} from "./extensions/conflict-resolution";
+import {
+  onActivate as ccActivate,
+  onDeactivate as ccDeactivate,
+} from "./extensions/conventional-commits";
+import {
+  onActivate as diffExtActivate,
+  onDeactivate as diffExtDeactivate,
+} from "./extensions/diff";
+import {
+  onActivate as insightsActivate,
+  onDeactivate as insightsDeactivate,
+} from "./extensions/git-insights";
+import {
+  onActivate as gitflowActivate,
+  onDeactivate as gitflowDeactivate,
+} from "./extensions/gitflow";
+import {
+  onActivate as githubActivate,
+  onDeactivate as githubDeactivate,
+} from "./extensions/github";
+import {
+  onActivate as initRepoActivate,
+  onDeactivate as initRepoDeactivate,
+} from "./extensions/init-repo";
+import {
+  onActivate as repositoryExtActivate,
+  onDeactivate as repositoryExtDeactivate,
+} from "./extensions/repository";
+import {
+  onActivate as stashExtActivate,
+  onDeactivate as stashExtDeactivate,
+} from "./extensions/stash";
+import {
+  onActivate as syncExtActivate,
+  onDeactivate as syncExtDeactivate,
+} from "./extensions/sync";
+import {
+  onActivate as tagsExtActivate,
+  onDeactivate as tagsExtDeactivate,
+} from "./extensions/tags";
+import {
+  onActivate as topologyActivate,
+  onDeactivate as topologyDeactivate,
+} from "./extensions/topology";
+import {
+  onActivate as viewer3dActivate,
+  onDeactivate as viewer3dDeactivate,
+} from "./extensions/viewer-3d";
+import {
+  onActivate as viewerCodeActivate,
+  onDeactivate as viewerCodeDeactivate,
+} from "./extensions/viewer-code";
+import {
+  onActivate as viewerImageActivate,
+  onDeactivate as viewerImageDeactivate,
+} from "./extensions/viewer-image";
+import {
+  onActivate as viewerMarkdownActivate,
+  onDeactivate as viewerMarkdownDeactivate,
+} from "./extensions/viewer-markdown";
+import {
+  onActivate as viewerNupkgActivate,
+  onDeactivate as viewerNupkgDeactivate,
+} from "./extensions/viewer-nupkg";
+import {
+  onActivate as viewerPlaintextActivate,
+  onDeactivate as viewerPlaintextDeactivate,
+} from "./extensions/viewer-plaintext";
+import {
+  onActivate as welcomeActivate,
+  onDeactivate as welcomeDeactivate,
+} from "./extensions/welcome-screen";
+import {
+  onActivate as worktreesActivate,
+  onDeactivate as worktreesDeactivate,
+} from "./extensions/worktrees";
 
 // Configure ExtensionHost with Tauri-specific discovery
 configureExtensionHost({
@@ -68,12 +142,17 @@ function WelcomeFallback() {
   const { openRepository } = useGitOpsStore();
   const actorRef = useNavigationActorRef();
   const bladeStack = useSelector(actorRef, selectBladeStack);
-  const pushedBlade = bladeStack.length > 1 ? bladeStack[bladeStack.length - 1] : null;
+  const pushedBlade =
+    bladeStack.length > 1 ? bladeStack[bladeStack.length - 1] : null;
 
   const openDialog = useCallback(async () => {
     const { open } = await import("@tauri-apps/plugin-dialog");
     const { commands } = await import("./bindings");
-    const selected = await open({ directory: true, multiple: false, title: "Open Git Repository" });
+    const selected = await open({
+      directory: true,
+      multiple: false,
+      title: "Open Git Repository",
+    });
     if (selected && typeof selected === "string") {
       const isRepo = await commands.isGitRepository(selected);
       if (isRepo.status === "ok" && isRepo.data) {
@@ -85,7 +164,8 @@ function WelcomeFallback() {
   useEffect(() => {
     const handler = () => openDialog();
     document.addEventListener("open-repository-dialog", handler);
-    return () => document.removeEventListener("open-repository-dialog", handler);
+    return () =>
+      document.removeEventListener("open-repository-dialog", handler);
   }, [openDialog]);
 
   // Render blades pushed via command palette / toolbar (e.g. Extension Manager, Settings)
@@ -161,7 +241,10 @@ function App() {
         (defaultTab === "topology" || defaultTab === "history") &&
         useBladeRegistry.getState().items.has("topology-graph")
       ) {
-        getNavigationActor().send({ type: "SWITCH_WORKFLOW", workflow: "topology" });
+        getNavigationActor().send({
+          type: "SWITCH_WORKFLOW",
+          workflow: "topology",
+        });
       }
     });
     initNavigation();
@@ -344,7 +427,14 @@ function App() {
       activate: tagsExtActivate,
       deactivate: tagsExtDeactivate,
     });
-  }, [initTheme, initSettings, initNavigation, initMetadata, initChecklist, registerBuiltIn]);
+  }, [
+    initTheme,
+    initSettings,
+    initNavigation,
+    initMetadata,
+    initChecklist,
+    registerBuiltIn,
+  ]);
 
   // Discover and activate extensions when a repository is opened
   useEffect(() => {
diff --git a/src/bindings.ts b/src/bindings.ts
index 13fdb42c..d6f07f1c 100644
--- a/src/bindings.ts
+++ b/src/bindings.ts
@@ -1,2687 +1,3542 @@
-
 // This file was generated by [tauri-specta](https://github.com/oscartbeaumont/tauri-specta). Do not edit this file manually.
 
 /** user-defined commands **/
 
-
 export const commands = {
+  /**
+   * Open a Git repository at the specified path.
+   *
+   * Validates the path exists and is a git repository,
+   * then stores it as the current active repository.
+   * Also starts a file watcher to detect external changes.
+   */
+  async openRepository(path: string): Promise<Result<RepoStatus, GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("open_repository", { path }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Get the current repository status.
+   *
+   * Returns branch name and dirty status for the currently open repository.
+   */
+  async getRepositoryStatus(): Promise<Result<RepoStatus, GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("get_repository_status"),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Check if a path is a valid Git repository.
+   *
+   * Used for drag-drop validation before attempting to open.
+   */
+  async isGitRepository(path: string): Promise<Result<boolean, GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("is_git_repository", { path }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Close the current repository.
+   *
+   * Stops the file watcher and clears the stored repository path.
+   */
+  async closeRepository(): Promise<Result<null, GitError>> {
+    try {
+      return { status: "ok", data: await TAURI_INVOKE("close_repository") };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Get the current staging status of the repository.
+   *
+   * Returns files grouped by staged (in index), unstaged (modified in workdir),
+   * and untracked (new files not yet added).
+   */
+  async getStagingStatus(): Promise<Result<StagingStatus, GitError>> {
+    try {
+      return { status: "ok", data: await TAURI_INVOKE("get_staging_status") };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Stage a single file for commit.
+   *
+   * The path must be relative to the repository root.
+   */
+  async stageFile(path: string): Promise<Result<null, GitError>> {
+    try {
+      return { status: "ok", data: await TAURI_INVOKE("stage_file", { path }) };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Unstage a single file (remove from index, keep workdir changes).
+   *
+   * The path must be relative to the repository root.
+   */
+  async unstageFile(path: string): Promise<Result<null, GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("unstage_file", { path }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Stage multiple files for commit in a single operation.
+   *
+   * More efficient than calling stage_file repeatedly — performs a single index write.
+   * Paths must be relative to the repository root.
+   */
+  async stageFiles(paths: string[]): Promise<Result<null, GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("stage_files", { paths }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Unstage multiple files (remove from index, keep workdir changes).
+   *
+   * More efficient than calling unstage_file repeatedly — performs a single reset.
+   * Paths must be relative to the repository root.
+   */
+  async unstageFiles(paths: string[]): Promise<Result<null, GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("unstage_files", { paths }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Stage all changed files.
+   *
+   * Adds all modified, deleted, and new files to the index.
+   */
+  async stageAll(): Promise<Result<null, GitError>> {
+    try {
+      return { status: "ok", data: await TAURI_INVOKE("stage_all") };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Unstage all staged files.
+   *
+   * Resets the index to match HEAD, keeping workdir changes.
+   */
+  async unstageAll(): Promise<Result<null, GitError>> {
+    try {
+      return { status: "ok", data: await TAURI_INVOKE("unstage_all") };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Get the diff for a specific file.
+   *
+   * If `staged` is true, shows diff between HEAD and index.
+   * If `staged` is false, shows diff between index and workdir.
+   */
+  async getFileDiff(
+    path: string,
+    staged: boolean,
+    contextLines: number,
+  ): Promise<Result<FileDiff, GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("get_file_diff", {
+          path,
+          staged,
+          contextLines,
+        }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Get the diff for a specific file at a given commit.
+   *
+   * Shows the changes introduced by the commit (parent -> commit).
+   */
+  async getCommitFileDiff(
+    oid: string,
+    path: string,
+    contextLines: number,
+  ): Promise<Result<FileDiff, GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("get_commit_file_diff", {
+          oid,
+          path,
+          contextLines,
+        }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Get a file's binary content as a base64 data URI from the working tree.
+   *
+   * Returns a data URI like `data:image/png;base64,...` for use in `<img>` tags.
+   */
+  async getFileBase64(filePath: string): Promise<Result<string, GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("get_file_base64", { filePath }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Get a file's binary content as a base64 data URI from a specific commit.
+   *
+   * Extracts the blob from the commit's tree and returns it as a data URI.
+   */
+  async getCommitFileBase64(
+    oid: string,
+    filePath: string,
+  ): Promise<Result<string, GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("get_commit_file_base64", { oid, filePath }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Get per-line diff detail for a specific file.
+   *
+   * Returns enhanced hunk data with individual line information for interactive staging.
+   */
+  async getFileDiffHunks(
+    path: string,
+    staged: boolean,
+  ): Promise<Result<DiffHunkDetail[], GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("get_file_diff_hunks", { path, staged }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Stage specific hunks of a file.
+   *
+   * Applies only the selected hunks from the workdir diff to the index,
+   * leaving other hunks unstaged.
+   */
+  async stageHunks(
+    path: string,
+    hunkIndices: number[],
+  ): Promise<Result<null, GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("stage_hunks", { path, hunkIndices }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Unstage specific hunks of a file.
+   *
+   * Reverts the selected hunks from the index back to HEAD state,
+   * keeping other staged hunks intact.
+   */
+  async unstageHunks(
+    path: string,
+    hunkIndices: number[],
+  ): Promise<Result<null, GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("unstage_hunks", { path, hunkIndices }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Stage specific lines within a hunk of a file.
+   *
+   * Lines are identified by their position in the diff. Only additions and deletions
+   * within the specified line ranges are staged.
+   */
+  async stageLines(
+    path: string,
+    hunkIndex: number,
+    lineRanges: LineRange[],
+  ): Promise<Result<null, GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("stage_lines", {
+          path,
+          hunkIndex,
+          lineRanges,
+        }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Unstage specific lines within a hunk of a file.
+   *
+   * Reverts the selected lines from the index back to HEAD state,
+   * keeping other staged lines intact.
+   */
+  async unstageLines(
+    path: string,
+    hunkIndex: number,
+    lineRanges: LineRange[],
+  ): Promise<Result<null, GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("unstage_lines", {
+          path,
+          hunkIndex,
+          lineRanges,
+        }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Create a new commit from staged changes.
+   *
+   * Creates a commit with the given message from the current index (staged changes).
+   * If `amend` is true, replaces the last commit instead of creating a new one.
+   *
+   * # Errors
+   * - `NoStagedChanges` if index is empty (nothing staged)
+   * - `SignatureError` if git config lacks user.name/email
+   * - Various git2 errors for other failures
+   */
+  async createCommit(
+    message: string,
+    amend: boolean,
+  ): Promise<Result<CommitInfo, GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("create_commit", { message, amend }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Get the last commit message for amend pre-fill.
+   *
+   * Returns the HEAD commit's message parsed into subject and body components.
+   */
+  async getLastCommitMessage(): Promise<Result<LastCommitMessage, GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("get_last_commit_message"),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Get paginated commit history.
+   *
+   * Returns commits starting from HEAD, sorted by time.
+   * Use skip and limit for pagination.
+   */
+  async getCommitHistory(
+    skip: number,
+    limit: number,
+  ): Promise<Result<CommitSummary[], GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("get_commit_history", { skip, limit }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Get full details of a specific commit.
+   */
+  async getCommitDetails(
+    oid: string,
+  ): Promise<Result<CommitDetails, GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("get_commit_details", { oid }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Search commits by message text.
+   * Returns up to `limit` commits whose message contains `query` (case-insensitive).
+   */
+  async searchCommits(
+    query: string,
+    limit: number,
+  ): Promise<Result<CommitSummary[], GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("search_commits", { query, limit }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * IPC command to get the commit graph for visualization.
+   *
+   * # Arguments
+   * * `limit` - Maximum number of commits to return (default: 100, max: 500)
+   * * `offset` - Number of commits to skip (default: 0)
+   * * `state` - Repository state containing the current repo path
+   *
+   * # Returns
+   * A CommitGraph containing nodes and edges for visualization.
+   */
+  async getCommitGraph(
+    limit: number | null,
+    offset: number | null,
+  ): Promise<Result<CommitGraph, GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("get_commit_graph", { limit, offset }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * List all configured remotes for the current repository.
+   */
+  async getRemotes(): Promise<Result<RemoteInfo[], GitError>> {
+    try {
+      return { status: "ok", data: await TAURI_INVOKE("get_remotes") };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Fetch from a remote without merging.
+   *
+   * Downloads objects and refs from the remote but does not modify
+   * the working directory or current branch.
+   */
+  async fetchFromRemote(
+    remote: string,
+    onProgress: TAURI_CHANNEL<SyncProgress>,
+  ): Promise<Result<SyncResult, GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("fetch_from_remote", { remote, onProgress }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Push current branch to a remote.
+   *
+   * Sends local commits to the remote repository.
+   */
+  async pushToRemote(
+    remote: string,
+    onProgress: TAURI_CHANNEL<SyncProgress>,
+  ): Promise<Result<SyncResult, GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("push_to_remote", { remote, onProgress }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Pull from a remote (fetch + merge).
+   *
+   * Downloads objects from the remote and merges the tracking branch
+   * into the current branch. Fast-forward merges are preferred.
+   */
+  async pullFromRemote(
+    remote: string,
+    onProgress: TAURI_CHANNEL<SyncProgress>,
+  ): Promise<Result<SyncResult, GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("pull_from_remote", { remote, onProgress }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * List all local branches in the repository.
+   */
+  async listBranches(): Promise<Result<BranchInfo[], GitError>> {
+    try {
+      return { status: "ok", data: await TAURI_INVOKE("list_branches") };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Create a new branch from HEAD.
+   */
+  async createBranch(
+    name: string,
+    checkout: boolean,
+  ): Promise<Result<BranchInfo, GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("create_branch", { name, checkout }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Switch to an existing branch.
+   */
+  async checkoutBranch(branchName: string): Promise<Result<null, GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("checkout_branch", { branchName }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Delete a local branch.
+   */
+  async deleteBranch(
+    branchName: string,
+    force: boolean,
+  ): Promise<Result<null, GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("delete_branch", { branchName, force }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * List all branches (local and optionally remote) in the repository.
+   */
+  async listAllBranches(
+    includeRemote: boolean,
+  ): Promise<Result<BranchInfo[], GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("list_all_branches", { includeRemote }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Checkout a remote branch by creating a local tracking branch.
+   */
+  async checkoutRemoteBranch(
+    remoteBranch: string,
+  ): Promise<Result<null, GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("checkout_remote_branch", { remoteBranch }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Delete multiple local branches in a single batch operation.
+   */
+  async batchDeleteBranches(
+    branchNames: string[],
+    force: boolean,
+  ): Promise<Result<BatchDeleteResult, GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("batch_delete_branches", {
+          branchNames,
+          force,
+        }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Get recently checked-out branches from the HEAD reflog.
+   */
+  async getRecentCheckouts(
+    limit: number | null,
+  ): Promise<Result<RecentCheckout[], GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("get_recent_checkouts", { limit }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Get ahead/behind counts for a local branch relative to its upstream.
+   *
+   * Returns `{ ahead: 0, behind: 0 }` when the branch has no upstream tracking branch.
+   */
+  async getBranchAheadBehind(
+    branchName: string,
+  ): Promise<Result<AheadBehind, GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("get_branch_ahead_behind", { branchName }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * List all stash entries in the repository.
+   */
+  async listStashes(): Promise<Result<StashEntry[], GitError>> {
+    try {
+      return { status: "ok", data: await TAURI_INVOKE("list_stashes") };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Save current changes to stash.
+   */
+  async stashSave(
+    message: string | null,
+    includeUntracked: boolean,
+  ): Promise<Result<string, GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("stash_save", { message, includeUntracked }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Apply a stash by index without removing it.
+   */
+  async stashApply(index: number): Promise<Result<null, GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("stash_apply", { index }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Apply a stash by index and remove it from the stash list.
+   */
+  async stashPop(index: number): Promise<Result<null, GitError>> {
+    try {
+      return { status: "ok", data: await TAURI_INVOKE("stash_pop", { index }) };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Drop a stash by index without applying it.
+   */
+  async stashDrop(index: number): Promise<Result<null, GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("stash_drop", { index }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * List all tags in the repository.
+   */
+  async listTags(): Promise<Result<TagInfo[], GitError>> {
+    try {
+      return { status: "ok", data: await TAURI_INVOKE("list_tags") };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Create a new tag.
+   */
+  async createTag(
+    name: string,
+    message: string | null,
+    targetOid: string | null,
+  ): Promise<Result<TagInfo, GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("create_tag", { name, message, targetOid }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Delete a tag by name.
+   */
+  async deleteTag(name: string): Promise<Result<null, GitError>> {
+    try {
+      return { status: "ok", data: await TAURI_INVOKE("delete_tag", { name }) };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Merge a source branch into the current branch.
+   */
+  async mergeBranch(
+    sourceBranch: string,
+  ): Promise<Result<MergeResult, GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("merge_branch", { sourceBranch }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Get the status of an in-progress merge.
+   */
+  async getMergeStatus(): Promise<Result<MergeStatus, GitError>> {
+    try {
+      return { status: "ok", data: await TAURI_INVOKE("get_merge_status") };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Abort an in-progress merge.
+   */
+  async abortMerge(): Promise<Result<null, GitError>> {
+    try {
+      return { status: "ok", data: await TAURI_INVOKE("abort_merge") };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * List all conflicted file paths from the git index.
+   *
+   * Returns an empty Vec if no conflicts exist (not an error).
+   */
+  async listConflictFiles(): Promise<Result<string[], GitError>> {
+    try {
+      return { status: "ok", data: await TAURI_INVOKE("list_conflict_files") };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Read ours/theirs/base content for a specific conflicted file from index stages.
+   *
+   * Uses git2 index stages (1=ancestor, 2=ours, 3=theirs) to read clean content
+   * without conflict markers. Returns NotFound if the file is not in the conflict list.
+   */
+  async getConflictContent(
+    path: string,
+  ): Promise<Result<ConflictContent, GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("get_conflict_content", { path }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Write resolved content to a conflicted file, stage it, and clear the conflict.
+   *
+   * Writes the resolved content to the working directory file, then stages it
+   * via `index.add_path()` which automatically clears the conflict entry.
+   */
+  async resolveConflictFile(
+    path: string,
+    content: string,
+  ): Promise<Result<null, GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("resolve_conflict_file", { path, content }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Initialize Gitflow on a repository.
+   *
+   * This command:
+   * 1. Verifies the main branch exists
+   * 2. Creates the develop branch if it doesn't exist
+   * 3. Stores configuration in .git/config for git-flow CLI compatibility
+   * 4. Checks out the develop branch
+   * 5. Optionally pushes develop to origin
+   */
+  async initGitflow(
+    config: GitflowConfig,
+    pushDevelop: boolean,
+  ): Promise<Result<GitflowInitResult, GitflowError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("init_gitflow", { config, pushDevelop }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Start a new feature branch from develop.
+   */
+  async startFeature(name: string): Promise<Result<string, GitflowError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("start_feature", { name }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Finish the current feature branch, merging to develop.
+   */
+  async finishFeature(): Promise<Result<null, GitflowError>> {
+    try {
+      return { status: "ok", data: await TAURI_INVOKE("finish_feature") };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Start a new release branch from develop.
+   */
+  async startRelease(version: string): Promise<Result<string, GitflowError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("start_release", { version }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Finish the current release branch.
+   * Merges to main AND develop, creates version tag, deletes branch.
+   */
+  async finishRelease(
+    tagMessage: string | null,
+  ): Promise<Result<string, GitflowError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("finish_release", { tagMessage }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Start a new hotfix branch from main.
+   */
+  async startHotfix(name: string): Promise<Result<string, GitflowError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("start_hotfix", { name }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Finish the current hotfix branch.
+   * Merges to main AND develop, creates tag, deletes branch.
+   */
+  async finishHotfix(
+    tagMessage: string | null,
+  ): Promise<Result<string, GitflowError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("finish_hotfix", { tagMessage }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Get current Gitflow status for UI.
+   */
+  async getGitflowStatus(): Promise<Result<GitflowStatus, GitflowError>> {
+    try {
+      return { status: "ok", data: await TAURI_INVOKE("get_gitflow_status") };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Abort current Gitflow operation, returning to source branch.
+   */
+  async abortGitflow(): Promise<Result<null, GitflowError>> {
+    try {
+      return { status: "ok", data: await TAURI_INVOKE("abort_gitflow") };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Validate a conventional commit message.
+   *
+   * Returns validation result with errors and warnings.
+   */
+  async validateConventionalCommit(message: string): Promise<ValidationResult> {
+    return await TAURI_INVOKE("validate_conventional_commit", { message });
+  },
+  /**
+   * Suggest a commit type based on staged files.
+   *
+   * Analyzes the currently staged files and returns a type suggestion
+   * with confidence level.
+   */
+  async suggestCommitType(): Promise<Result<TypeSuggestion, GitError>> {
+    try {
+      return { status: "ok", data: await TAURI_INVOKE("suggest_commit_type") };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Get scope suggestions from commit history.
+   *
+   * Extracts scopes used in previous commits, sorted by frequency.
+   */
+  async getScopeSuggestions(
+    limit: number | null,
+  ): Promise<Result<ScopeSuggestion[], GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("get_scope_suggestions", { limit }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Infer scope from staged files based on common directory.
+   */
+  async inferScopeFromStaged(): Promise<Result<string | null, GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("infer_scope_from_staged"),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Generate a changelog from commit history.
+   *
+   * Generates markdown changelog grouped by commit type.
+   */
+  async generateChangelogCmd(
+    fromRef: string | null,
+    toRef: string | null,
+    version: string | null,
+  ): Promise<Result<ChangelogOutput, GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("generate_changelog_cmd", {
+          fromRef,
+          toRef,
+          version,
+        }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * List all worktrees for the current repository.
+   */
+  async listWorktrees(): Promise<Result<WorktreeInfo[], GitError>> {
+    try {
+      return { status: "ok", data: await TAURI_INVOKE("list_worktrees") };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Create a new worktree.
+   */
+  async createWorktree(
+    options: CreateWorktreeOptions,
+  ): Promise<Result<WorktreeInfo, GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("create_worktree", { options }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Delete a worktree.
+   */
+  async deleteWorktree(
+    name: string,
+    force: boolean,
+    deleteBranch: boolean,
+  ): Promise<Result<null, GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("delete_worktree", {
+          name,
+          force,
+          deleteBranch,
+        }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Get information about what can be undone.
+   * Looks at HEAD reflog to find the previous state.
+   */
+  async getUndoInfo(): Promise<Result<UndoInfo, GitError>> {
+    try {
+      return { status: "ok", data: await TAURI_INVOKE("get_undo_info") };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Undo the last operation by resetting HEAD to the previous reflog entry.
+   */
+  async undoLastOperation(): Promise<Result<null, GitError>> {
+    try {
+      return { status: "ok", data: await TAURI_INVOKE("undo_last_operation") };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Clone a Git repository with progress tracking.
+   *
+   * Clones a repository from a URL to a local destination path,
+   * sending progress events through the provided channel.
+   *
+   * # Arguments
+   * * `url` - The repository URL (HTTPS or SSH)
+   * * `destination` - Local path where the repository will be cloned
+   * * `on_progress` - Channel for sending progress events
+   *
+   * # Returns
+   * The path to the cloned repository on success
+   */
+  async cloneRepository(
+    url: string,
+    destination: string,
+    onProgress: TAURI_CHANNEL<CloneProgress>,
+  ): Promise<Result<string, GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("clone_repository", {
+          url,
+          destination,
+          onProgress,
+        }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Initialize a new Git repository at the specified path.
+   *
+   * Validates the path exists and is a directory that is not already a git repository,
+   * then creates a new repository with an optional default branch name.
+   *
+   * # Arguments
+   * * `path` - Directory where the repository will be initialized
+   * * `default_branch` - Optional initial branch name (defaults to "main")
+   */
+  async gitInit(
+    path: string,
+    defaultBranch: string | null,
+  ): Promise<Result<InitResult, GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("git_init", { path, defaultBranch }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * List all available .gitignore template names.
+   *
+   * Attempts to fetch from GitHub API with a 5s timeout, falling back to
+   * bundled templates on any error.
+   */
+  async listGitignoreTemplates(): Promise<
+    Result<GitignoreTemplateList, GitError>
+  > {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("list_gitignore_templates"),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Get the content of a single .gitignore template by name.
+   *
+   * Tries GitHub API first, falls back to bundled templates.
+   */
+  async getGitignoreTemplate(
+    name: string,
+  ): Promise<Result<GitignoreTemplate, GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("get_gitignore_template", { name }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Detect project types by scanning for marker files in a directory.
+   *
+   * Returns all detected project types with recommended .gitignore templates.
+   */
+  async detectProjectType(
+    path: string,
+  ): Promise<Result<ProjectDetection, GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("detect_project_type", { path }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Write initialization files (.gitignore, README.md, etc.) to a directory.
+   */
+  async writeInitFiles(
+    path: string,
+    files: InitFile[],
+  ): Promise<Result<null, GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("write_init_files", { path, files }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Fetch NuGet package information by package ID.
+   *
+   * Queries the NuGet Search API and Registration API, returning
+   * combined package metadata.
+   */
+  async fetchNugetInfo(
+    packageId: string,
+  ): Promise<Result<NugetPackageInfo, GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("fetch_nuget_info", { packageId }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * List files and directories at a given path within the repository.
+   *
+   * Merges entries from the HEAD tree and the working directory so that
+   * uncommitted/untracked files are also visible in the browser.
+   * Pass an empty string for `path` to list the root directory.
+   * Returns directories first, then files, both sorted alphabetically.
+   */
+  async listRepoFiles(
+    path: string,
+  ): Promise<Result<RepoFileEntry[], GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("list_repo_files", { path }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Read file content from the repository at HEAD, with working-directory fallback.
+   *
+   * First tries the git HEAD tree. If the file is not found there (e.g. uncommitted),
+   * falls back to reading from the working directory on disk.
+   * Binary files are returned as base64-encoded content.
+   * Text files are returned as UTF-8 strings.
+   */
+  async readRepoFile(
+    filePath: string,
+  ): Promise<Result<RepoFileContent, GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("read_repo_file", { filePath }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Get aggregated repository insights for a given time period.
+   */
+  async getRepoInsights(days: number): Promise<Result<RepoInsights, GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("get_repo_insights", { days }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Get branch health information for all branches.
+   */
+  async getBranchHealth(
+    staleDays: number,
+  ): Promise<Result<BranchHealthInfo[], GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("get_branch_health", { staleDays }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Read the user's global git configuration.
+   *
+   * Returns None for any value that is not set. Never errors —
+   * if the config file cannot be opened, all fields are None.
+   */
+  async getGitGlobalConfig(): Promise<Result<GitGlobalConfig, GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("get_git_global_config"),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Set a value in the user's global git configuration.
+   *
+   * # Arguments
+   * * `key` - The config key (e.g. "user.name", "user.email", "init.defaultBranch")
+   * * `value` - The value to set
+   */
+  async setGitGlobalConfig(
+    key: string,
+    value: string,
+  ): Promise<Result<null, GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("set_git_global_config", { key, value }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Discover extensions by scanning subdirectories for `flowforge.extension.json` manifests.
+   *
+   * - If the `extensions_dir` does not exist, returns an empty array (extensions are optional).
+   * - Invalid manifests (bad JSON, missing required fields) are skipped with a warning log.
+   * - Only truly unrecoverable I/O errors (e.g. permission denied on an existing directory)
+   * return `Err`.
+   */
+  async discoverExtensions(
+    extensionsDir: string,
+  ): Promise<Result<ExtensionManifest[], string>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("discover_extensions", { extensionsDir }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Fetch an extension manifest from a Git repository URL.
+   *
+   * Clones the repo to a temp directory, reads the manifest file,
+   * and returns both the manifest JSON and the temp path for subsequent install.
+   */
+  async extensionFetchManifest(
+    gitUrl: string,
+  ): Promise<Result<ExtensionFetchResult, string>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("extension_fetch_manifest", { gitUrl }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Install an extension from a previously fetched temp path.
+   *
+   * Moves the cloned repository to the extensions directory under
+   * the extension's ID extracted from the manifest.
+   */
+  async extensionInstall(
+    tempPath: string,
+    extensionsDir: string,
+  ): Promise<Result<null, string>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("extension_install", {
+          tempPath,
+          extensionsDir,
+        }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Uninstall an extension by removing its directory.
+   */
+  async extensionUninstall(
+    extensionId: string,
+    extensionsDir: string,
+  ): Promise<Result<null, string>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("extension_uninstall", {
+          extensionId,
+          extensionsDir,
+        }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Cancel an in-progress extension install by cleaning up the temp directory.
+   */
+  async extensionCancelInstall(
+    tempPath: string,
+  ): Promise<Result<null, string>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("extension_cancel_install", { tempPath }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Initiate the GitHub OAuth Device Flow.
+   *
+   * Returns device_code, user_code, and verification_uri for the frontend
+   * to display to the user. The user visits the URI and enters the code.
+   */
+  async githubStartDeviceFlow(
+    scopes: string[],
+  ): Promise<Result<DeviceFlowResponse, GitHubError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("github_start_device_flow", { scopes }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Poll GitHub for authorization status (single attempt).
+   *
+   * This is NOT a loop -- the frontend controls polling via setTimeout
+   * and calls this command once per interval. This avoids long-running
+   * Tauri commands and gives the frontend full control over the UX.
+   *
+   * Returns `AuthResult` on success or specific error variants that
+   * the frontend uses for control flow:
+   * - `AuthorizationPending`: user hasn't authorized yet, keep polling
+   * - `SlowDown`: increase polling interval by 5 seconds
+   * - `ExpiredToken`: device code expired, need to restart flow
+   * - `AccessDenied`: user denied authorization
+   */
+  async githubPollAuth(
+    deviceCode: string,
+    interval: number,
+  ): Promise<Result<AuthResult, GitHubError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("github_poll_auth", { deviceCode, interval }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Check if the user is authenticated and return their info.
+   * Validates the stored token against the GitHub API.
+   * If the token is invalid, auto-deletes it from the keychain.
+   */
+  async githubGetAuthStatus(): Promise<Result<AuthResult, GitHubError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("github_get_auth_status"),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Sign out by deleting the token from the OS keychain.
+   */
+  async githubSignOut(): Promise<Result<null, GitHubError>> {
+    try {
+      return { status: "ok", data: await TAURI_INVOKE("github_sign_out") };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Detect all GitHub remotes in the currently open repository.
+   *
+   * Opens the git repository from RepositoryState (same pattern as
+   * existing git commands) and iterates all remotes, parsing each
+   * URL to find GitHub repositories.
+   */
+  async githubDetectRemotes(): Promise<
+    Result<GitHubRemoteInfo[], GitHubError>
+  > {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("github_detect_remotes"),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Check the current GitHub API rate limit for the authenticated user.
+   *
+   * Retrieves the token from the keychain and queries the GitHub
+   * rate limit endpoint to return current usage information.
+   */
+  async githubCheckRateLimit(): Promise<Result<RateLimitInfo, GitHubError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("github_check_rate_limit"),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * List pull requests for a repository with pagination.
+   *
+   * Returns a paginated list of pull request summaries sorted by
+   * most recently updated. The `state` parameter can be "open",
+   * "closed", or "all".
+   */
+  async githubListPullRequests(
+    owner: string,
+    repo: string,
+    state: string,
+    page: number,
+    perPage: number,
+  ): Promise<Result<PullRequestListResponse, GitHubError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("github_list_pull_requests", {
+          owner,
+          repo,
+          state,
+          page,
+          perPage,
+        }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Fetch full details for a single pull request including comments.
+   *
+   * Makes two API calls: one for the PR detail and one for
+   * the issue comments (which includes general discussion comments).
+   */
+  async githubGetPullRequest(
+    owner: string,
+    repo: string,
+    number: number,
+  ): Promise<Result<PullRequestDetail, GitHubError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("github_get_pull_request", {
+          owner,
+          repo,
+          number,
+        }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * List issues for a repository with pagination.
+   *
+   * Returns a paginated list of issue summaries sorted by most recently
+   * updated. Pull requests are filtered out (GitHub's issues API returns
+   * both issues and PRs). The `state` parameter can be "open", "closed",
+   * or "all".
+   */
+  async githubListIssues(
+    owner: string,
+    repo: string,
+    state: string,
+    page: number,
+    perPage: number,
+  ): Promise<Result<IssueListResponse, GitHubError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("github_list_issues", {
+          owner,
+          repo,
+          state,
+          page,
+          perPage,
+        }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Fetch full details for a single issue including comments.
+   *
+   * Makes two API calls: one for the issue detail and one for
+   * all comments on the issue.
+   */
+  async githubGetIssue(
+    owner: string,
+    repo: string,
+    number: number,
+  ): Promise<Result<IssueDetail, GitHubError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("github_get_issue", { owner, repo, number }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Merge a pull request with a specified merge strategy.
+   *
+   * Calls the GitHub REST API PUT endpoint for merging.
+   * Supports merge commit, squash, and rebase strategies.
+   */
+  async githubMergePullRequest(
+    owner: string,
+    repo: string,
+    pullNumber: number,
+    mergeMethod: string,
+    commitTitle: string | null,
+    commitMessage: string | null,
+    sha: string | null,
+  ): Promise<Result<MergePullRequestResult, GitHubError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("github_merge_pull_request", {
+          owner,
+          repo,
+          pullNumber,
+          mergeMethod,
+          commitTitle,
+          commitMessage,
+          sha,
+        }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Create a new pull request.
+   *
+   * Creates a PR from the specified head branch to the base branch.
+   * Optionally creates it as a draft.
+   */
+  async githubCreatePullRequest(
+    owner: string,
+    repo: string,
+    title: string,
+    head: string,
+    base: string,
+    body: string | null,
+    draft: boolean | null,
+  ): Promise<Result<CreatePullRequestResult, GitHubError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("github_create_pull_request", {
+          owner,
+          repo,
+          title,
+          head,
+          base,
+          body,
+          draft,
+        }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Get branch information for pre-filling the Create PR form.
+   *
+   * Reads the current branch, detects the default base (main/master),
+   * generates a title from the branch name, and collects commit
+   * messages ahead of the base branch.
+   */
+  async githubGetBranchInfoForPr(): Promise<
+    Result<BranchInfoForPr, GitHubError>
+  > {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("github_get_branch_info_for_pr"),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Quick health check for a repository by path.
+   * Opens a temporary repo handle — does NOT affect the active repository.
+   * Returns status (clean/dirty/ahead/behind/diverged/unknown), branch name, and ahead/behind counts.
+   */
+  async getRepoHealthQuick(
+    path: string,
+  ): Promise<Result<RepoHealth, GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("get_repo_health_quick", { path }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+  /**
+   * Open the user's configured terminal at the given path.
+   * Spawns the terminal application with platform-specific handling.
+   */
+  async openInTerminal(
+    path: string,
+    terminal: string,
+  ): Promise<Result<null, GitError>> {
+    try {
+      return {
+        status: "ok",
+        data: await TAURI_INVOKE("open_in_terminal", { path, terminal }),
+      };
+    } catch (e) {
+      if (e instanceof Error) throw e;
+      else return { status: "error", error: e as any };
+    }
+  },
+};
+
+/** user-defined events **/
+
+/** user-defined constants **/
+
+/** user-defined types **/
+
 /**
- * Open a Git repository at the specified path.
- * 
- * Validates the path exists and is a git repository,
- * then stores it as the current active repository.
- * Also starts a file watcher to detect external changes.
- */
-async openRepository(path: string) : Promise<Result<RepoStatus, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("open_repository", { path }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Get the current repository status.
- * 
- * Returns branch name and dirty status for the currently open repository.
- */
-async getRepositoryStatus() : Promise<Result<RepoStatus, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("get_repository_status") };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Check if a path is a valid Git repository.
- * 
- * Used for drag-drop validation before attempting to open.
- */
-async isGitRepository(path: string) : Promise<Result<boolean, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("is_git_repository", { path }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Close the current repository.
- * 
- * Stops the file watcher and clears the stored repository path.
- */
-async closeRepository() : Promise<Result<null, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("close_repository") };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Get the current staging status of the repository.
- * 
- * Returns files grouped by staged (in index), unstaged (modified in workdir),
- * and untracked (new files not yet added).
- */
-async getStagingStatus() : Promise<Result<StagingStatus, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("get_staging_status") };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Stage a single file for commit.
- * 
- * The path must be relative to the repository root.
- */
-async stageFile(path: string) : Promise<Result<null, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("stage_file", { path }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Unstage a single file (remove from index, keep workdir changes).
- * 
- * The path must be relative to the repository root.
- */
-async unstageFile(path: string) : Promise<Result<null, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("unstage_file", { path }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Stage multiple files for commit in a single operation.
- * 
- * More efficient than calling stage_file repeatedly — performs a single index write.
- * Paths must be relative to the repository root.
- */
-async stageFiles(paths: string[]) : Promise<Result<null, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("stage_files", { paths }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Unstage multiple files (remove from index, keep workdir changes).
- * 
- * More efficient than calling unstage_file repeatedly — performs a single reset.
- * Paths must be relative to the repository root.
- */
-async unstageFiles(paths: string[]) : Promise<Result<null, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("unstage_files", { paths }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Stage all changed files.
- * 
- * Adds all modified, deleted, and new files to the index.
- */
-async stageAll() : Promise<Result<null, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("stage_all") };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Unstage all staged files.
- * 
- * Resets the index to match HEAD, keeping workdir changes.
- */
-async unstageAll() : Promise<Result<null, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("unstage_all") };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Get the diff for a specific file.
- * 
- * If `staged` is true, shows diff between HEAD and index.
- * If `staged` is false, shows diff between index and workdir.
- */
-async getFileDiff(path: string, staged: boolean, contextLines: number) : Promise<Result<FileDiff, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("get_file_diff", { path, staged, contextLines }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Get the diff for a specific file at a given commit.
- * 
- * Shows the changes introduced by the commit (parent -> commit).
- */
-async getCommitFileDiff(oid: string, path: string, contextLines: number) : Promise<Result<FileDiff, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("get_commit_file_diff", { oid, path, contextLines }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Get a file's binary content as a base64 data URI from the working tree.
- * 
- * Returns a data URI like `data:image/png;base64,...` for use in `<img>` tags.
- */
-async getFileBase64(filePath: string) : Promise<Result<string, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("get_file_base64", { filePath }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Get a file's binary content as a base64 data URI from a specific commit.
- * 
- * Extracts the blob from the commit's tree and returns it as a data URI.
- */
-async getCommitFileBase64(oid: string, filePath: string) : Promise<Result<string, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("get_commit_file_base64", { oid, filePath }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Get per-line diff detail for a specific file.
- * 
- * Returns enhanced hunk data with individual line information for interactive staging.
- */
-async getFileDiffHunks(path: string, staged: boolean) : Promise<Result<DiffHunkDetail[], GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("get_file_diff_hunks", { path, staged }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Stage specific hunks of a file.
- * 
- * Applies only the selected hunks from the workdir diff to the index,
- * leaving other hunks unstaged.
- */
-async stageHunks(path: string, hunkIndices: number[]) : Promise<Result<null, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("stage_hunks", { path, hunkIndices }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Unstage specific hunks of a file.
- * 
- * Reverts the selected hunks from the index back to HEAD state,
- * keeping other staged hunks intact.
- */
-async unstageHunks(path: string, hunkIndices: number[]) : Promise<Result<null, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("unstage_hunks", { path, hunkIndices }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Stage specific lines within a hunk of a file.
- * 
- * Lines are identified by their position in the diff. Only additions and deletions
- * within the specified line ranges are staged.
- */
-async stageLines(path: string, hunkIndex: number, lineRanges: LineRange[]) : Promise<Result<null, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("stage_lines", { path, hunkIndex, lineRanges }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Unstage specific lines within a hunk of a file.
- * 
- * Reverts the selected lines from the index back to HEAD state,
- * keeping other staged lines intact.
- */
-async unstageLines(path: string, hunkIndex: number, lineRanges: LineRange[]) : Promise<Result<null, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("unstage_lines", { path, hunkIndex, lineRanges }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Create a new commit from staged changes.
- * 
- * Creates a commit with the given message from the current index (staged changes).
- * If `amend` is true, replaces the last commit instead of creating a new one.
- * 
- * # Errors
- * - `NoStagedChanges` if index is empty (nothing staged)
- * - `SignatureError` if git config lacks user.name/email
- * - Various git2 errors for other failures
- */
-async createCommit(message: string, amend: boolean) : Promise<Result<CommitInfo, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("create_commit", { message, amend }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Get the last commit message for amend pre-fill.
- * 
- * Returns the HEAD commit's message parsed into subject and body components.
- */
-async getLastCommitMessage() : Promise<Result<LastCommitMessage, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("get_last_commit_message") };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Get paginated commit history.
- * 
- * Returns commits starting from HEAD, sorted by time.
- * Use skip and limit for pagination.
- */
-async getCommitHistory(skip: number, limit: number) : Promise<Result<CommitSummary[], GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("get_commit_history", { skip, limit }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Get full details of a specific commit.
- */
-async getCommitDetails(oid: string) : Promise<Result<CommitDetails, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("get_commit_details", { oid }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Search commits by message text.
- * Returns up to `limit` commits whose message contains `query` (case-insensitive).
- */
-async searchCommits(query: string, limit: number) : Promise<Result<CommitSummary[], GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("search_commits", { query, limit }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * IPC command to get the commit graph for visualization.
- * 
- * # Arguments
- * * `limit` - Maximum number of commits to return (default: 100, max: 500)
- * * `offset` - Number of commits to skip (default: 0)
- * * `state` - Repository state containing the current repo path
- * 
- * # Returns
- * A CommitGraph containing nodes and edges for visualization.
- */
-async getCommitGraph(limit: number | null, offset: number | null) : Promise<Result<CommitGraph, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("get_commit_graph", { limit, offset }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * List all configured remotes for the current repository.
- */
-async getRemotes() : Promise<Result<RemoteInfo[], GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("get_remotes") };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Fetch from a remote without merging.
- * 
- * Downloads objects and refs from the remote but does not modify
- * the working directory or current branch.
- */
-async fetchFromRemote(remote: string, onProgress: TAURI_CHANNEL<SyncProgress>) : Promise<Result<SyncResult, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("fetch_from_remote", { remote, onProgress }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Push current branch to a remote.
- * 
- * Sends local commits to the remote repository.
- */
-async pushToRemote(remote: string, onProgress: TAURI_CHANNEL<SyncProgress>) : Promise<Result<SyncResult, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("push_to_remote", { remote, onProgress }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Pull from a remote (fetch + merge).
- * 
- * Downloads objects from the remote and merges the tracking branch
- * into the current branch. Fast-forward merges are preferred.
- */
-async pullFromRemote(remote: string, onProgress: TAURI_CHANNEL<SyncProgress>) : Promise<Result<SyncResult, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("pull_from_remote", { remote, onProgress }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * List all local branches in the repository.
- */
-async listBranches() : Promise<Result<BranchInfo[], GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("list_branches") };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Create a new branch from HEAD.
- */
-async createBranch(name: string, checkout: boolean) : Promise<Result<BranchInfo, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("create_branch", { name, checkout }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Switch to an existing branch.
- */
-async checkoutBranch(branchName: string) : Promise<Result<null, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("checkout_branch", { branchName }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Delete a local branch.
- */
-async deleteBranch(branchName: string, force: boolean) : Promise<Result<null, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("delete_branch", { branchName, force }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * List all branches (local and optionally remote) in the repository.
- */
-async listAllBranches(includeRemote: boolean) : Promise<Result<BranchInfo[], GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("list_all_branches", { includeRemote }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Checkout a remote branch by creating a local tracking branch.
- */
-async checkoutRemoteBranch(remoteBranch: string) : Promise<Result<null, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("checkout_remote_branch", { remoteBranch }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Delete multiple local branches in a single batch operation.
- */
-async batchDeleteBranches(branchNames: string[], force: boolean) : Promise<Result<BatchDeleteResult, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("batch_delete_branches", { branchNames, force }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Get recently checked-out branches from the HEAD reflog.
- */
-async getRecentCheckouts(limit: number | null) : Promise<Result<RecentCheckout[], GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("get_recent_checkouts", { limit }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Get ahead/behind counts for a local branch relative to its upstream.
- * 
- * Returns `{ ahead: 0, behind: 0 }` when the branch has no upstream tracking branch.
- */
-async getBranchAheadBehind(branchName: string) : Promise<Result<AheadBehind, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("get_branch_ahead_behind", { branchName }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * List all stash entries in the repository.
- */
-async listStashes() : Promise<Result<StashEntry[], GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("list_stashes") };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Save current changes to stash.
- */
-async stashSave(message: string | null, includeUntracked: boolean) : Promise<Result<string, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("stash_save", { message, includeUntracked }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Apply a stash by index without removing it.
- */
-async stashApply(index: number) : Promise<Result<null, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("stash_apply", { index }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Apply a stash by index and remove it from the stash list.
- */
-async stashPop(index: number) : Promise<Result<null, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("stash_pop", { index }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Drop a stash by index without applying it.
- */
-async stashDrop(index: number) : Promise<Result<null, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("stash_drop", { index }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * List all tags in the repository.
- */
-async listTags() : Promise<Result<TagInfo[], GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("list_tags") };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Create a new tag.
- */
-async createTag(name: string, message: string | null, targetOid: string | null) : Promise<Result<TagInfo, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("create_tag", { name, message, targetOid }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Delete a tag by name.
- */
-async deleteTag(name: string) : Promise<Result<null, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("delete_tag", { name }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Merge a source branch into the current branch.
- */
-async mergeBranch(sourceBranch: string) : Promise<Result<MergeResult, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("merge_branch", { sourceBranch }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Get the status of an in-progress merge.
- */
-async getMergeStatus() : Promise<Result<MergeStatus, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("get_merge_status") };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Abort an in-progress merge.
- */
-async abortMerge() : Promise<Result<null, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("abort_merge") };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * List all conflicted file paths from the git index.
- * 
- * Returns an empty Vec if no conflicts exist (not an error).
- */
-async listConflictFiles() : Promise<Result<string[], GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("list_conflict_files") };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Read ours/theirs/base content for a specific conflicted file from index stages.
- * 
- * Uses git2 index stages (1=ancestor, 2=ours, 3=theirs) to read clean content
- * without conflict markers. Returns NotFound if the file is not in the conflict list.
- */
-async getConflictContent(path: string) : Promise<Result<ConflictContent, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("get_conflict_content", { path }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Write resolved content to a conflicted file, stage it, and clear the conflict.
- * 
- * Writes the resolved content to the working directory file, then stages it
- * via `index.add_path()` which automatically clears the conflict entry.
+ * Information about active Gitflow workflow.
  */
-async resolveConflictFile(path: string, content: string) : Promise<Result<null, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("resolve_conflict_file", { path, content }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Initialize Gitflow on a repository.
- * 
- * This command:
- * 1. Verifies the main branch exists
- * 2. Creates the develop branch if it doesn't exist
- * 3. Stores configuration in .git/config for git-flow CLI compatibility
- * 4. Checks out the develop branch
- * 5. Optionally pushes develop to origin
- */
-async initGitflow(config: GitflowConfig, pushDevelop: boolean) : Promise<Result<GitflowInitResult, GitflowError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("init_gitflow", { config, pushDevelop }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
+export type ActiveFlow = {
+  flowType: FlowType;
+  name: string;
+  sourceBranch: string;
+};
 /**
- * Start a new feature branch from develop.
+ * How many commits a local branch is ahead/behind its upstream.
  */
-async startFeature(name: string) : Promise<Result<string, GitflowError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("start_feature", { name }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
+export type AheadBehind = {
+  /**
+   * Commits on local not yet on upstream
+   */
+  ahead: number;
+  /**
+   * Commits on upstream not yet on local
+   */
+  behind: number;
+};
 /**
- * Finish the current feature branch, merging to develop.
+ * Result of an authentication check or successful auth flow.
+ * NEVER contains the actual token -- only metadata about the
+ * authenticated user. The token stays in Rust/keychain.
  */
-async finishFeature() : Promise<Result<null, GitflowError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("finish_feature") };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
+export type AuthResult = {
+  authenticated: boolean;
+  username: string | null;
+  avatarUrl: string | null;
+  scopes: string[];
+};
 /**
- * Start a new release branch from develop.
+ * Result of a batch branch deletion operation.
  */
-async startRelease(version: string) : Promise<Result<string, GitflowError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("start_release", { version }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
+export type BatchDeleteResult = {
+  /**
+   * Per-branch results
+   */
+  results: BranchDeleteResult[];
+  /**
+   * Count of successfully deleted branches
+   */
+  totalDeleted: number;
+  /**
+   * Count of branches that failed to delete
+   */
+  totalFailed: number;
+};
 /**
- * Finish the current release branch.
- * Merges to main AND develop, creates version tag, deletes branch.
+ * Result of deleting a single branch in a batch operation.
  */
-async finishRelease(tagMessage: string | null) : Promise<Result<string, GitflowError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("finish_release", { tagMessage }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
+export type BranchDeleteResult = {
+  /**
+   * Branch name that was targeted
+   */
+  name: string;
+  /**
+   * Whether the branch was successfully deleted
+   */
+  deleted: boolean;
+  /**
+   * Error message if deletion failed
+   */
+  error: string | null;
+};
 /**
- * Start a new hotfix branch from main.
+ * Branch health information for the insights dashboard.
  */
-async startHotfix(name: string) : Promise<Result<string, GitflowError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("start_hotfix", { name }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
+export type BranchHealthInfo = {
+  /**
+   * Branch name
+   */
+  name: string;
+  /**
+   * Whether this is the current HEAD branch
+   */
+  isHead: boolean;
+  /**
+   * Whether this is a remote tracking branch
+   */
+  isRemote: boolean;
+  /**
+   * Date of last commit in YYYY-MM-DD format
+   */
+  lastCommitDate: string;
+  /**
+   * Timestamp of last commit in milliseconds
+   */
+  lastCommitTimestampMs: number;
+  /**
+   * Summary of the last commit message
+   */
+  lastCommitMessage: string;
+  /**
+   * Commits ahead of HEAD
+   */
+  ahead: number;
+  /**
+   * Commits behind HEAD
+   */
+  behind: number;
+  /**
+   * Whether the branch is stale (no commits within stale_days)
+   */
+  isStale: boolean;
+  /**
+   * Whether the branch is merged into HEAD (None if IS head)
+   */
+  isMerged: boolean | null;
+};
 /**
- * Finish the current hotfix branch.
- * Merges to main AND develop, creates tag, deletes branch.
+ * Information about a branch (local or remote).
  */
-async finishHotfix(tagMessage: string | null) : Promise<Result<string, GitflowError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("finish_hotfix", { tagMessage }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
+export type BranchInfo = {
+  /**
+   * Branch name (e.g., "main", "feature/login", "origin/feature/x")
+   */
+  name: string;
+  /**
+   * True if this is the currently checked out branch
+   */
+  isHead: boolean;
+  /**
+   * Short OID of the branch tip commit (7 chars)
+   */
+  lastCommitOid: string;
+  /**
+   * Summary line of the tip commit
+   */
+  lastCommitMessage: string;
+  /**
+   * Whether branch is merged into HEAD (None if IS head)
+   */
+  isMerged: boolean | null;
+  /**
+   * True for remote tracking branches, false for local
+   */
+  isRemote: boolean;
+  /**
+   * Remote name (e.g., "origin") for remote branches, None for local
+   */
+  remoteName: string | null;
+};
 /**
- * Get current Gitflow status for UI.
+ * Branch information for pre-filling the Create PR form.
  */
-async getGitflowStatus() : Promise<Result<GitflowStatus, GitflowError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("get_gitflow_status") };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
+export type BranchInfoForPr = {
+  currentBranch: string;
+  defaultBase: string;
+  suggestedTitle: string;
+  commitMessages: string[];
+};
 /**
- * Abort current Gitflow operation, returning to source branch.
+ * Branch type classification for Gitflow-based coloring.
  */
-async abortGitflow() : Promise<Result<null, GitflowError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("abort_gitflow") };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
+export type BranchType =
+  /**
+   * Main/master branch - stable production code
+   */
+  | "main"
+  /**
+   * Develop branch - integration branch for features
+   */
+  | "develop"
+  /**
+   * Feature branches - new features in development
+   */
+  | "feature"
+  /**
+   * Release branches - preparing for production release
+   */
+  | "release"
+  /**
+   * Hotfix branches - urgent production fixes
+   */
+  | "hotfix"
+  /**
+   * Other branches that don't follow Gitflow naming
+   */
+  | "other";
 /**
- * Validate a conventional commit message.
- * 
- * Returns validation result with errors and warnings.
+ * A commit entry for the changelog.
  */
-async validateConventionalCommit(message: string) : Promise<ValidationResult> {
-    return await TAURI_INVOKE("validate_conventional_commit", { message });
-},
+export type ChangelogCommit = {
+  /**
+   * Short commit hash.
+   */
+  hash: string;
+  /**
+   * Commit scope (optional).
+   */
+  scope: string | null;
+  /**
+   * Commit description.
+   */
+  description: string;
+  /**
+   * Whether this is a breaking change.
+   */
+  breaking: boolean;
+  /**
+   * Commit author name.
+   */
+  author: string;
+  /**
+   * Commit date in ISO format.
+   */
+  date: string;
+};
 /**
- * Suggest a commit type based on staged files.
- * 
- * Analyzes the currently staged files and returns a type suggestion
- * with confidence level.
+ * Output from changelog generation.
  */
-async suggestCommitType() : Promise<Result<TypeSuggestion, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("suggest_commit_type") };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Get scope suggestions from commit history.
- * 
- * Extracts scopes used in previous commits, sorted by frequency.
- */
-async getScopeSuggestions(limit: number | null) : Promise<Result<ScopeSuggestion[], GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("get_scope_suggestions", { limit }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Infer scope from staged files based on common directory.
- */
-async inferScopeFromStaged() : Promise<Result<string | null, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("infer_scope_from_staged") };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Generate a changelog from commit history.
- * 
- * Generates markdown changelog grouped by commit type.
- */
-async generateChangelogCmd(fromRef: string | null, toRef: string | null, version: string | null) : Promise<Result<ChangelogOutput, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("generate_changelog_cmd", { fromRef, toRef, version }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * List all worktrees for the current repository.
- */
-async listWorktrees() : Promise<Result<WorktreeInfo[], GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("list_worktrees") };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Create a new worktree.
- */
-async createWorktree(options: CreateWorktreeOptions) : Promise<Result<WorktreeInfo, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("create_worktree", { options }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Delete a worktree.
- */
-async deleteWorktree(name: string, force: boolean, deleteBranch: boolean) : Promise<Result<null, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("delete_worktree", { name, force, deleteBranch }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Get information about what can be undone.
- * Looks at HEAD reflog to find the previous state.
- */
-async getUndoInfo() : Promise<Result<UndoInfo, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("get_undo_info") };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Undo the last operation by resetting HEAD to the previous reflog entry.
- */
-async undoLastOperation() : Promise<Result<null, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("undo_last_operation") };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Clone a Git repository with progress tracking.
- * 
- * Clones a repository from a URL to a local destination path,
- * sending progress events through the provided channel.
- * 
- * # Arguments
- * * `url` - The repository URL (HTTPS or SSH)
- * * `destination` - Local path where the repository will be cloned
- * * `on_progress` - Channel for sending progress events
- * 
- * # Returns
- * The path to the cloned repository on success
- */
-async cloneRepository(url: string, destination: string, onProgress: TAURI_CHANNEL<CloneProgress>) : Promise<Result<string, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("clone_repository", { url, destination, onProgress }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Initialize a new Git repository at the specified path.
- * 
- * Validates the path exists and is a directory that is not already a git repository,
- * then creates a new repository with an optional default branch name.
- * 
- * # Arguments
- * * `path` - Directory where the repository will be initialized
- * * `default_branch` - Optional initial branch name (defaults to "main")
- */
-async gitInit(path: string, defaultBranch: string | null) : Promise<Result<InitResult, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("git_init", { path, defaultBranch }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * List all available .gitignore template names.
- * 
- * Attempts to fetch from GitHub API with a 5s timeout, falling back to
- * bundled templates on any error.
- */
-async listGitignoreTemplates() : Promise<Result<GitignoreTemplateList, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("list_gitignore_templates") };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Get the content of a single .gitignore template by name.
- * 
- * Tries GitHub API first, falls back to bundled templates.
- */
-async getGitignoreTemplate(name: string) : Promise<Result<GitignoreTemplate, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("get_gitignore_template", { name }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Detect project types by scanning for marker files in a directory.
- * 
- * Returns all detected project types with recommended .gitignore templates.
- */
-async detectProjectType(path: string) : Promise<Result<ProjectDetection, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("detect_project_type", { path }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Write initialization files (.gitignore, README.md, etc.) to a directory.
- */
-async writeInitFiles(path: string, files: InitFile[]) : Promise<Result<null, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("write_init_files", { path, files }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Fetch NuGet package information by package ID.
- * 
- * Queries the NuGet Search API and Registration API, returning
- * combined package metadata.
- */
-async fetchNugetInfo(packageId: string) : Promise<Result<NugetPackageInfo, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("fetch_nuget_info", { packageId }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * List files and directories at a given path within the repository.
- * 
- * Merges entries from the HEAD tree and the working directory so that
- * uncommitted/untracked files are also visible in the browser.
- * Pass an empty string for `path` to list the root directory.
- * Returns directories first, then files, both sorted alphabetically.
- */
-async listRepoFiles(path: string) : Promise<Result<RepoFileEntry[], GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("list_repo_files", { path }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Read file content from the repository at HEAD, with working-directory fallback.
- * 
- * First tries the git HEAD tree. If the file is not found there (e.g. uncommitted),
- * falls back to reading from the working directory on disk.
- * Binary files are returned as base64-encoded content.
- * Text files are returned as UTF-8 strings.
- */
-async readRepoFile(filePath: string) : Promise<Result<RepoFileContent, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("read_repo_file", { filePath }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Get aggregated repository insights for a given time period.
- */
-async getRepoInsights(days: number) : Promise<Result<RepoInsights, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("get_repo_insights", { days }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Get branch health information for all branches.
- */
-async getBranchHealth(staleDays: number) : Promise<Result<BranchHealthInfo[], GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("get_branch_health", { staleDays }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Read the user's global git configuration.
- * 
- * Returns None for any value that is not set. Never errors —
- * if the config file cannot be opened, all fields are None.
- */
-async getGitGlobalConfig() : Promise<Result<GitGlobalConfig, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("get_git_global_config") };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Set a value in the user's global git configuration.
- * 
- * # Arguments
- * * `key` - The config key (e.g. "user.name", "user.email", "init.defaultBranch")
- * * `value` - The value to set
- */
-async setGitGlobalConfig(key: string, value: string) : Promise<Result<null, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("set_git_global_config", { key, value }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Discover extensions by scanning subdirectories for `flowforge.extension.json` manifests.
- * 
- * - If the `extensions_dir` does not exist, returns an empty array (extensions are optional).
- * - Invalid manifests (bad JSON, missing required fields) are skipped with a warning log.
- * - Only truly unrecoverable I/O errors (e.g. permission denied on an existing directory)
- * return `Err`.
- */
-async discoverExtensions(extensionsDir: string) : Promise<Result<ExtensionManifest[], string>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("discover_extensions", { extensionsDir }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Fetch an extension manifest from a Git repository URL.
- * 
- * Clones the repo to a temp directory, reads the manifest file,
- * and returns both the manifest JSON and the temp path for subsequent install.
- */
-async extensionFetchManifest(gitUrl: string) : Promise<Result<ExtensionFetchResult, string>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("extension_fetch_manifest", { gitUrl }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Install an extension from a previously fetched temp path.
- * 
- * Moves the cloned repository to the extensions directory under
- * the extension's ID extracted from the manifest.
- */
-async extensionInstall(tempPath: string, extensionsDir: string) : Promise<Result<null, string>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("extension_install", { tempPath, extensionsDir }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Uninstall an extension by removing its directory.
- */
-async extensionUninstall(extensionId: string, extensionsDir: string) : Promise<Result<null, string>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("extension_uninstall", { extensionId, extensionsDir }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Cancel an in-progress extension install by cleaning up the temp directory.
- */
-async extensionCancelInstall(tempPath: string) : Promise<Result<null, string>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("extension_cancel_install", { tempPath }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Initiate the GitHub OAuth Device Flow.
- * 
- * Returns device_code, user_code, and verification_uri for the frontend
- * to display to the user. The user visits the URI and enters the code.
- */
-async githubStartDeviceFlow(scopes: string[]) : Promise<Result<DeviceFlowResponse, GitHubError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("github_start_device_flow", { scopes }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Poll GitHub for authorization status (single attempt).
- * 
- * This is NOT a loop -- the frontend controls polling via setTimeout
- * and calls this command once per interval. This avoids long-running
- * Tauri commands and gives the frontend full control over the UX.
- * 
- * Returns `AuthResult` on success or specific error variants that
- * the frontend uses for control flow:
- * - `AuthorizationPending`: user hasn't authorized yet, keep polling
- * - `SlowDown`: increase polling interval by 5 seconds
- * - `ExpiredToken`: device code expired, need to restart flow
- * - `AccessDenied`: user denied authorization
- */
-async githubPollAuth(deviceCode: string, interval: number) : Promise<Result<AuthResult, GitHubError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("github_poll_auth", { deviceCode, interval }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Check if the user is authenticated and return their info.
- * Validates the stored token against the GitHub API.
- * If the token is invalid, auto-deletes it from the keychain.
- */
-async githubGetAuthStatus() : Promise<Result<AuthResult, GitHubError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("github_get_auth_status") };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Sign out by deleting the token from the OS keychain.
- */
-async githubSignOut() : Promise<Result<null, GitHubError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("github_sign_out") };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Detect all GitHub remotes in the currently open repository.
- * 
- * Opens the git repository from RepositoryState (same pattern as
- * existing git commands) and iterates all remotes, parsing each
- * URL to find GitHub repositories.
- */
-async githubDetectRemotes() : Promise<Result<GitHubRemoteInfo[], GitHubError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("github_detect_remotes") };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Check the current GitHub API rate limit for the authenticated user.
- * 
- * Retrieves the token from the keychain and queries the GitHub
- * rate limit endpoint to return current usage information.
- */
-async githubCheckRateLimit() : Promise<Result<RateLimitInfo, GitHubError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("github_check_rate_limit") };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * List pull requests for a repository with pagination.
- * 
- * Returns a paginated list of pull request summaries sorted by
- * most recently updated. The `state` parameter can be "open",
- * "closed", or "all".
- */
-async githubListPullRequests(owner: string, repo: string, state: string, page: number, perPage: number) : Promise<Result<PullRequestListResponse, GitHubError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("github_list_pull_requests", { owner, repo, state, page, perPage }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Fetch full details for a single pull request including comments.
- * 
- * Makes two API calls: one for the PR detail and one for
- * the issue comments (which includes general discussion comments).
- */
-async githubGetPullRequest(owner: string, repo: string, number: number) : Promise<Result<PullRequestDetail, GitHubError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("github_get_pull_request", { owner, repo, number }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * List issues for a repository with pagination.
- * 
- * Returns a paginated list of issue summaries sorted by most recently
- * updated. Pull requests are filtered out (GitHub's issues API returns
- * both issues and PRs). The `state` parameter can be "open", "closed",
- * or "all".
- */
-async githubListIssues(owner: string, repo: string, state: string, page: number, perPage: number) : Promise<Result<IssueListResponse, GitHubError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("github_list_issues", { owner, repo, state, page, perPage }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Fetch full details for a single issue including comments.
- * 
- * Makes two API calls: one for the issue detail and one for
- * all comments on the issue.
- */
-async githubGetIssue(owner: string, repo: string, number: number) : Promise<Result<IssueDetail, GitHubError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("github_get_issue", { owner, repo, number }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Merge a pull request with a specified merge strategy.
- * 
- * Calls the GitHub REST API PUT endpoint for merging.
- * Supports merge commit, squash, and rebase strategies.
- */
-async githubMergePullRequest(owner: string, repo: string, pullNumber: number, mergeMethod: string, commitTitle: string | null, commitMessage: string | null, sha: string | null) : Promise<Result<MergePullRequestResult, GitHubError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("github_merge_pull_request", { owner, repo, pullNumber, mergeMethod, commitTitle, commitMessage, sha }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Create a new pull request.
- * 
- * Creates a PR from the specified head branch to the base branch.
- * Optionally creates it as a draft.
- */
-async githubCreatePullRequest(owner: string, repo: string, title: string, head: string, base: string, body: string | null, draft: boolean | null) : Promise<Result<CreatePullRequestResult, GitHubError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("github_create_pull_request", { owner, repo, title, head, base, body, draft }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Get branch information for pre-filling the Create PR form.
- * 
- * Reads the current branch, detects the default base (main/master),
- * generates a title from the branch name, and collects commit
- * messages ahead of the base branch.
- */
-async githubGetBranchInfoForPr() : Promise<Result<BranchInfoForPr, GitHubError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("github_get_branch_info_for_pr") };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Quick health check for a repository by path.
- * Opens a temporary repo handle — does NOT affect the active repository.
- * Returns status (clean/dirty/ahead/behind/diverged/unknown), branch name, and ahead/behind counts.
- */
-async getRepoHealthQuick(path: string) : Promise<Result<RepoHealth, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("get_repo_health_quick", { path }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-},
-/**
- * Open the user's configured terminal at the given path.
- * Spawns the terminal application with platform-specific handling.
- */
-async openInTerminal(path: string, terminal: string) : Promise<Result<null, GitError>> {
-    try {
-    return { status: "ok", data: await TAURI_INVOKE("open_in_terminal", { path, terminal }) };
-} catch (e) {
-    if(e instanceof Error) throw e;
-    else return { status: "error", error: e  as any };
-}
-}
-}
-
-/** user-defined events **/
-
-
-
-/** user-defined constants **/
-
-
-
-/** user-defined types **/
-
-/**
- * Information about active Gitflow workflow.
- */
-export type ActiveFlow = { flowType: FlowType; name: string; sourceBranch: string }
-/**
- * How many commits a local branch is ahead/behind its upstream.
- */
-export type AheadBehind = { 
-/**
- * Commits on local not yet on upstream
- */
-ahead: number; 
-/**
- * Commits on upstream not yet on local
- */
-behind: number }
-/**
- * Result of an authentication check or successful auth flow.
- * NEVER contains the actual token -- only metadata about the
- * authenticated user. The token stays in Rust/keychain.
- */
-export type AuthResult = { authenticated: boolean; username: string | null; avatarUrl: string | null; scopes: string[] }
-/**
- * Result of a batch branch deletion operation.
- */
-export type BatchDeleteResult = { 
-/**
- * Per-branch results
- */
-results: BranchDeleteResult[]; 
-/**
- * Count of successfully deleted branches
- */
-totalDeleted: number; 
-/**
- * Count of branches that failed to delete
- */
-totalFailed: number }
-/**
- * Result of deleting a single branch in a batch operation.
- */
-export type BranchDeleteResult = { 
-/**
- * Branch name that was targeted
- */
-name: string; 
-/**
- * Whether the branch was successfully deleted
- */
-deleted: boolean; 
-/**
- * Error message if deletion failed
- */
-error: string | null }
-/**
- * Branch health information for the insights dashboard.
- */
-export type BranchHealthInfo = { 
-/**
- * Branch name
- */
-name: string; 
-/**
- * Whether this is the current HEAD branch
- */
-isHead: boolean; 
-/**
- * Whether this is a remote tracking branch
- */
-isRemote: boolean; 
-/**
- * Date of last commit in YYYY-MM-DD format
- */
-lastCommitDate: string; 
-/**
- * Timestamp of last commit in milliseconds
- */
-lastCommitTimestampMs: number; 
-/**
- * Summary of the last commit message
- */
-lastCommitMessage: string; 
-/**
- * Commits ahead of HEAD
- */
-ahead: number; 
-/**
- * Commits behind HEAD
- */
-behind: number; 
-/**
- * Whether the branch is stale (no commits within stale_days)
- */
-isStale: boolean; 
-/**
- * Whether the branch is merged into HEAD (None if IS head)
- */
-isMerged: boolean | null }
-/**
- * Information about a branch (local or remote).
- */
-export type BranchInfo = { 
-/**
- * Branch name (e.g., "main", "feature/login", "origin/feature/x")
- */
-name: string; 
-/**
- * True if this is the currently checked out branch
- */
-isHead: boolean; 
-/**
- * Short OID of the branch tip commit (7 chars)
- */
-lastCommitOid: string; 
-/**
- * Summary line of the tip commit
- */
-lastCommitMessage: string; 
-/**
- * Whether branch is merged into HEAD (None if IS head)
- */
-isMerged: boolean | null; 
-/**
- * True for remote tracking branches, false for local
- */
-isRemote: boolean; 
-/**
- * Remote name (e.g., "origin") for remote branches, None for local
- */
-remoteName: string | null }
-/**
- * Branch information for pre-filling the Create PR form.
- */
-export type BranchInfoForPr = { currentBranch: string; defaultBase: string; suggestedTitle: string; commitMessages: string[] }
-/**
- * Branch type classification for Gitflow-based coloring.
- */
-export type BranchType = 
-/**
- * Main/master branch - stable production code
- */
-"main" | 
-/**
- * Develop branch - integration branch for features
- */
-"develop" | 
-/**
- * Feature branches - new features in development
- */
-"feature" | 
-/**
- * Release branches - preparing for production release
- */
-"release" | 
-/**
- * Hotfix branches - urgent production fixes
- */
-"hotfix" | 
-/**
- * Other branches that don't follow Gitflow naming
- */
-"other"
-/**
- * A commit entry for the changelog.
- */
-export type ChangelogCommit = { 
-/**
- * Short commit hash.
- */
-hash: string; 
-/**
- * Commit scope (optional).
- */
-scope: string | null; 
-/**
- * Commit description.
- */
-description: string; 
-/**
- * Whether this is a breaking change.
- */
-breaking: boolean; 
-/**
- * Commit author name.
- */
-author: string; 
-/**
- * Commit date in ISO format.
- */
-date: string }
-/**
- * Output from changelog generation.
- */
-export type ChangelogOutput = { 
-/**
- * Rendered markdown changelog.
- */
-markdown: string; 
-/**
- * Total number of commits included.
- */
-commitCount: number; 
-/**
- * Commits grouped by type.
- */
-groups: CommitGroup[] }
-/**
- * Progress events for clone operations.
- * 
- * Uses tagged enum serialization for frontend type safety.
- */
-export type CloneProgress = 
-/**
- * Clone operation started
- */
-{ event: "started"; data: { url: string } } | 
-/**
- * Receiving objects from remote
- */
-{ event: "receiving"; data: { received: number; total: number; bytes: number } } | 
-/**
- * Resolving deltas
- */
-{ event: "resolving"; data: { current: number; total: number } } | 
-/**
- * Checking out files
- */
-{ event: "checkout"; data: { current: number; total: number; path: string } } | 
-/**
- * Clone completed successfully
- */
-{ event: "finished"; data: { path: string } }
-/**
- * Comment info for frontend display.
- */
-export type CommentInfo = { id: string; authorLogin: string; authorAvatarUrl: string; body: string; createdAt: string; updatedAt: string; htmlUrl: string }
-/**
- * Full details of a commit.
- */
-export type CommitDetails = { oid: string; shortOid: string; message: string; authorName: string; authorEmail: string; 
-/**
- * Unix timestamp in milliseconds (safe for JS Number)
- */
-authorTimestampMs: number; committerName: string; committerEmail: string; 
-/**
- * Unix timestamp in milliseconds (safe for JS Number)
- */
-committerTimestampMs: number; parentOids: string[]; filesChanged: FileChanged[] }
-/**
- * Complete commit graph with nodes and edges for visualization.
- */
-export type CommitGraph = { 
-/**
- * All commit nodes in topological order
- */
-nodes: GraphNode[]; 
-/**
- * Edges representing parent-child relationships
- */
-edges: GraphEdge[] }
-/**
- * A group of commits by type.
- */
-export type CommitGroup = { 
-/**
- * Commit type (e.g., "feat", "fix").
- */
-commitType: string; 
-/**
- * Display title (e.g., "Features", "Bug Fixes").
- */
-title: string; 
-/**
- * Emoji for the commit type (e.g., sparkles for feat).
- */
-emoji: string; 
-/**
- * Commits in this group.
- */
-commits: ChangelogCommit[] }
-/**
- * Information about a created commit.
- * 
- * Returned after successful commit creation to confirm
- * the commit was made and provide its identifiers.
- */
-export type CommitInfo = { 
-/**
- * Full commit OID (40 hex characters)
- */
-oid: string; 
-/**
- * Short commit OID (7 characters)
- */
-shortOid: string; 
-/**
- * Commit message
- */
-message: string }
-/**
- * Summary of a commit for list display.
- */
-export type CommitSummary = { oid: string; shortOid: string; messageSubject: string; authorName: string; authorEmail: string; 
-/**
- * Unix timestamp in milliseconds (safe for JS Number up to year 275760)
- */
-timestampMs: number }
-/**
- * Commit type enumeration.
- */
-export type CommitType = "feat" | "fix" | "docs" | "style" | "refactor" | "perf" | "test" | "chore" | "ci" | "build" | "revert"
-/**
- * Confidence level for type inference.
- */
-export type Confidence = "high" | "medium" | "low"
-/**
- * Content from all three sides of a merge conflict.
- */
-export type ConflictContent = { 
-/**
- * Path of the conflicted file (relative to repo root)
- */
-path: string; 
-/**
- * Content from the "ours" side (current branch / HEAD)
- */
-ours: string | null; 
-/**
- * Content from the "theirs" side (incoming branch)
- */
-theirs: string | null; 
-/**
- * Content from the common ancestor (base)
- */
-base: string | null; 
-/**
- * Label for the "ours" side (e.g., "main" or "HEAD")
- */
-oursName: string; 
-/**
- * Label for the "theirs" side (e.g., "feature/xyz")
- */
-theirsName: string }
-/**
- * Contributor statistics aggregated from commit history.
- */
-export type ContributorStats = { 
-/**
- * Author name
- */
-name: string; 
-/**
- * Author email
- */
-email: string; 
-/**
- * Total number of commits by this contributor
- */
-commitCount: number; 
-/**
- * Percentage of total commits
- */
-percentage: number; 
-/**
- * Timestamp of first commit in milliseconds
- */
-firstCommitMs: number; 
-/**
- * Timestamp of last commit in milliseconds
- */
-lastCommitMs: number }
-/**
- * Result of creating a pull request.
- */
-export type CreatePullRequestResult = { number: number; htmlUrl: string; title: string; state: string }
-/**
- * Options for creating a new worktree.
- */
-export type CreateWorktreeOptions = { 
-/**
- * Name for the worktree
- */
-name: string; 
-/**
- * Path where the worktree will be created
- */
-path: string; 
-/**
- * Branch to checkout (None for detached HEAD at current commit)
- */
-branch: string | null; 
-/**
- * If true and branch is Some, create a new branch with that name
- */
-createBranch: boolean }
-/**
- * Daily commit count for a specific date.
- */
-export type DailyCommitCount = { 
-/**
- * Date in YYYY-MM-DD format
- */
-date: string; 
-/**
- * Number of commits on this date
- */
-count: number }
-export type DetectedProject = { projectType: string; markerFile: string; recommendedTemplates: string[] }
-/**
- * Response from GitHub's device code endpoint.
- * Returned to the frontend so it can display the user_code
- * and verification_uri to the user.
- */
-export type DeviceFlowResponse = { deviceCode: string; userCode: string; verificationUri: string; expiresIn: number; interval: number }
-/**
- * A single diff hunk with line range information.
- */
-export type DiffHunk = { oldStart: number; oldLines: number; newStart: number; newLines: number; header: string }
-/**
- * Enhanced diff hunk with per-line detail for interactive staging.
- */
-export type DiffHunkDetail = { index: number; oldStart: number; oldLines: number; newStart: number; newLines: number; header: string; lines: DiffLine[] }
-/**
- * A single line in a diff hunk with origin and line numbers.
- */
-export type DiffLine = { origin: DiffLineOrigin; oldLineno: number | null; newLineno: number | null; content: string }
-/**
- * Origin type of a diff line.
- */
-export type DiffLineOrigin = "context" | "addition" | "deletion"
-/**
- * A blade type contributed by an extension.
- */
-export type ExtensionBladeContribution = { 
-/**
- * The blade type identifier (used as the `type` field in navigation).
- */
-type: string; 
-/**
- * Display title for the blade.
- */
-title: string; 
-/**
- * Whether only one instance of this blade can be open at a time.
- */
-singleton: boolean | null }
-/**
- * A command contributed by an extension.
- */
-export type ExtensionCommandContribution = { 
-/**
- * Unique command identifier.
- */
-id: string; 
-/**
- * Display title for the command (shown in command palette).
- */
-title: string; 
-/**
- * Optional category for grouping in the command palette.
- */
-category: string | null }
-/**
- * Contribution points an extension can register.
- */
-export type ExtensionContributes = { 
-/**
- * Blade types contributed by this extension.
- */
-blades: ExtensionBladeContribution[] | null; 
-/**
- * Commands contributed by this extension.
- */
-commands: ExtensionCommandContribution[] | null; 
-/**
- * Toolbar actions contributed by this extension.
- */
-toolbar: ExtensionToolbarContribution[] | null }
-/**
- * Result of fetching an extension manifest from a Git URL.
- */
-export type ExtensionFetchResult = { manifestJson: string; tempPath: string }
-/**
- * Extension manifest parsed from `flowforge.extension.json`.
- * 
- * Matches the JSON schema that extensions ship alongside their entry point.
- * All field names use camelCase in JSON via the `rename_all` attribute.
- */
-export type ExtensionManifest = { 
-/**
- * Unique identifier for the extension (e.g. "github").
- */
-id: string; 
-/**
- * Human-readable display name.
- */
-name: string; 
-/**
- * Semantic version of the extension (e.g. "1.0.0").
- */
-version: string; 
-/**
- * Optional longer description of what the extension does.
- */
-description: string | null; 
-/**
- * API version the extension targets (e.g. "1").
- */
-apiVersion: string; 
-/**
- * Relative path to the JavaScript entry point (e.g. "index.js").
- */
-main: string; 
-/**
- * Contributions the extension registers (blades, commands, toolbar items).
- */
-contributes: ExtensionContributes | null; 
-/**
- * Permissions the extension requests (e.g. ["fs:read", "network"]).
- */
-permissions: string[] | null; 
-/**
- * Absolute path to the extension directory on disk.
- * Populated by discovery after parsing — not present in the JSON file.
- */
-basePath?: string | null; 
-/**
- * Trust level for the extension.
- * "built-in" for bundled extensions, "user-trusted" for user-installed,
- * "sandboxed" for untrusted third-party (future).
- * Defaults to "sandboxed" when not specified in the manifest JSON.
- */
-trustLevel?: string }
-/**
- * A toolbar action contributed by an extension.
- */
-export type ExtensionToolbarContribution = { 
-/**
- * Unique toolbar action identifier.
- */
-id: string; 
-/**
- * Display label for the toolbar action.
- */
-label: string; 
-/**
- * Toolbar group to place the action in (e.g. "vcs", "tools").
- */
-group: string | null; 
-/**
- * Sort priority within the group (lower values appear first).
- */
-priority: number | null }
-/**
- * A single file change with its status and optional diff stats.
- */
-export type FileChange = { path: string; status: FileStatus; additions: number | null; deletions: number | null }
-/**
- * A file changed in a commit.
- */
-export type FileChanged = { path: string; status: string; additions: number; deletions: number }
-/**
- * Complete file diff with old/new content for Monaco DiffEditor.
- */
-export type FileDiff = { path: string; oldContent: string; newContent: string; hunks: DiffHunk[]; isBinary: boolean; language: string }
-/**
- * Status of a file in the working directory or index.
- */
-export type FileStatus = "modified" | "added" | "deleted" | { renamed: { old_path: string } } | "untracked" | "conflicted"
-/**
- * Flow type for active workflow.
- */
-export type FlowType = "feature" | "release" | "hotfix"
-/**
- * Git operation errors that serialize across the IPC boundary.
- * 
- * These errors are sent to the frontend as typed objects,
- * allowing proper error handling in TypeScript.
- */
-export type GitError = { type: "NotFound"; message: string } | { type: "NotARepository"; message: string } | { type: "EmptyRepository" } | { type: "StatusError"; message: string } | { type: "OperationFailed"; message: string } | { type: "PathNotFound"; message: string } | { type: "Internal"; message: string } | { type: "NoStagedChanges" } | { type: "SignatureError"; message: string } | { type: "RemoteNotFound"; message: string } | { type: "AuthenticationFailed"; message: string } | { type: "PushRejected"; message: string } | { type: "NetworkError"; message: string } | { type: "BranchNotFound"; message: string } | { type: "CannotDeleteCurrentBranch" } | { type: "BranchNotMerged"; message: string } | { type: "InvalidBranchName"; message: string } | { type: "BranchAlreadyExists"; message: string } | { type: "DirtyWorkingDirectory" } | { type: "StashNotFound"; message: number } | { type: "NothingToStash" } | { type: "TagAlreadyExists"; message: string } | { type: "TagNotFound"; message: string } | { type: "NoMergeInProgress" } | { type: "FileNotConflicted"; message: string } | { type: "InvalidUrl"; message: string } | { type: "PathExists"; message: string } | { type: "CloneFailed"; message: string } | { type: "InvalidPath"; message: string } | { type: "HunkIndexOutOfRange"; message: number } | { type: "LineRangeInvalid"; message: string } | { type: "BinaryPartialStaging" }
-/**
- * Snapshot of relevant global git configuration values.
- */
-export type GitGlobalConfig = { 
-/**
- * user.name from global config, or None if unset.
- */
-userName: string | null; 
-/**
- * user.email from global config, or None if unset.
- */
-userEmail: string | null; 
-/**
- * init.defaultBranch from global config, or None if unset.
- */
-defaultBranch: string | null }
-/**
- * GitHub operation errors that serialize across the IPC boundary.
- * 
- * These errors are sent to the frontend as typed objects,
- * allowing proper error handling in TypeScript. The frontend
- * checks `err.type` to decide control flow (e.g., continue polling
- * on `AuthorizationPending`, increase interval on `SlowDown`).
- */
-export type GitHubError = { type: "OAuthFailed"; message: string } | { type: "AuthorizationPending" } | { type: "AccessDenied" } | { type: "ExpiredToken" } | { type: "SlowDown" } | { type: "KeychainError"; message: string } | { type: "NetworkError"; message: string } | { type: "NotAuthenticated" } | { type: "RateLimitExceeded"; message: string } | { type: "Internal"; message: string } | { type: "Cancelled" } | { type: "ApiError"; message: string } | { type: "NotFound"; message: string } | { type: "Forbidden"; message: string } | { type: "MergeNotAllowed"; message: string } | { type: "HeadChanged"; message: string } | { type: "ValidationFailed"; message: string }
-/**
- * Information about a detected GitHub remote in the current repository.
- */
-export type GitHubRemoteInfo = { remoteName: string; owner: string; repo: string; url: string }
-/**
- * Configuration for Gitflow initialization.
- */
-export type GitflowConfig = { 
-/**
- * Main/production branch name (e.g., "main" or "master")
- */
-mainBranch: string; 
-/**
- * Development branch name (e.g., "develop")
- */
-developBranch: string; 
-/**
- * Prefix for feature branches (e.g., "feature/")
- */
-featurePrefix: string; 
-/**
- * Prefix for release branches (e.g., "release/")
- */
-releasePrefix: string; 
-/**
- * Prefix for hotfix branches (e.g., "hotfix/")
- */
-hotfixPrefix: string }
-/**
- * Context about the repository's Gitflow state.
- */
-export type GitflowContext = { 
-/**
- * Current Gitflow state derived from branch name
- */
-state: GitflowState; 
-/**
- * Current branch name
- */
-currentBranch: string; 
-/**
- * Whether the repository has a main/master branch
- */
-hasMain: boolean; 
-/**
- * Whether the repository has a develop branch
- */
-hasDevelop: boolean; 
-/**
- * Whether the repository has Gitflow initialized (config in .git/config)
- */
-isInitialized: boolean }
+export type ChangelogOutput = {
+  /**
+   * Rendered markdown changelog.
+   */
+  markdown: string;
+  /**
+   * Total number of commits included.
+   */
+  commitCount: number;
+  /**
+   * Commits grouped by type.
+   */
+  groups: CommitGroup[];
+};
 /**
- * Gitflow operation errors that serialize across the IPC boundary.
+ * Progress events for clone operations.
+ *
+ * Uses tagged enum serialization for frontend type safety.
  */
-export type GitflowError = 
+export type CloneProgress =
+  /**
+   * Clone operation started
+   */
+  | { event: "started"; data: { url: string } }
+  /**
+   * Receiving objects from remote
+   */
+  | {
+      event: "receiving";
+      data: { received: number; total: number; bytes: number };
+    }
+  /**
+   * Resolving deltas
+   */
+  | { event: "resolving"; data: { current: number; total: number } }
+  /**
+   * Checking out files
+   */
+  | {
+      event: "checkout";
+      data: { current: number; total: number; path: string };
+    }
+  /**
+   * Clone completed successfully
+   */
+  | { event: "finished"; data: { path: string } };
 /**
- * Wrong branch context for the requested operation
+ * Comment info for frontend display.
  */
-{ type: "InvalidContext"; data: { expected: string; actual: string } } | 
+export type CommentInfo = {
+  id: string;
+  authorLogin: string;
+  authorAvatarUrl: string;
+  body: string;
+  createdAt: string;
+  updatedAt: string;
+  htmlUrl: string;
+};
 /**
- * Operation requires being on a feature branch
+ * Full details of a commit.
  */
-{ type: "NotOnFeatureBranch" } | 
+export type CommitDetails = {
+  oid: string;
+  shortOid: string;
+  message: string;
+  authorName: string;
+  authorEmail: string;
+  /**
+   * Unix timestamp in milliseconds (safe for JS Number)
+   */
+  authorTimestampMs: number;
+  committerName: string;
+  committerEmail: string;
+  /**
+   * Unix timestamp in milliseconds (safe for JS Number)
+   */
+  committerTimestampMs: number;
+  parentOids: string[];
+  filesChanged: FileChanged[];
+};
 /**
- * Operation requires being on a release branch
+ * Complete commit graph with nodes and edges for visualization.
  */
-{ type: "NotOnReleaseBranch" } | 
+export type CommitGraph = {
+  /**
+   * All commit nodes in topological order
+   */
+  nodes: GraphNode[];
+  /**
+   * Edges representing parent-child relationships
+   */
+  edges: GraphEdge[];
+};
 /**
- * Operation requires being on a hotfix branch
+ * A group of commits by type.
  */
-{ type: "NotOnHotfixBranch" } | 
+export type CommitGroup = {
+  /**
+   * Commit type (e.g., "feat", "fix").
+   */
+  commitType: string;
+  /**
+   * Display title (e.g., "Features", "Bug Fixes").
+   */
+  title: string;
+  /**
+   * Emoji for the commit type (e.g., sparkles for feat).
+   */
+  emoji: string;
+  /**
+   * Commits in this group.
+   */
+  commits: ChangelogCommit[];
+};
 /**
- * A release is already in progress
+ * Information about a created commit.
+ *
+ * Returned after successful commit creation to confirm
+ * the commit was made and provide its identifiers.
  */
-{ type: "ReleaseInProgress"; data: string } | 
+export type CommitInfo = {
+  /**
+   * Full commit OID (40 hex characters)
+   */
+  oid: string;
+  /**
+   * Short commit OID (7 characters)
+   */
+  shortOid: string;
+  /**
+   * Commit message
+   */
+  message: string;
+};
 /**
- * A hotfix is already in progress
+ * Summary of a commit for list display.
  */
-{ type: "HotfixInProgress"; data: string } | 
+export type CommitSummary = {
+  oid: string;
+  shortOid: string;
+  messageSubject: string;
+  authorName: string;
+  authorEmail: string;
+  /**
+   * Unix timestamp in milliseconds (safe for JS Number up to year 275760)
+   */
+  timestampMs: number;
+};
 /**
- * Merge conflicts encountered during finish operation
+ * Commit type enumeration.
  */
-{ type: "MergeConflict" } | 
+export type CommitType =
+  | "feat"
+  | "fix"
+  | "docs"
+  | "style"
+  | "refactor"
+  | "perf"
+  | "test"
+  | "chore"
+  | "ci"
+  | "build"
+  | "revert";
 /**
- * Working directory has uncommitted changes
+ * Confidence level for type inference.
  */
-{ type: "DirtyWorkingTree" } | 
+export type Confidence = "high" | "medium" | "low";
 /**
- * Repository has no commits yet
+ * Content from all three sides of a merge conflict.
  */
-{ type: "UnbornHead" } | 
+export type ConflictContent = {
+  /**
+   * Path of the conflicted file (relative to repo root)
+   */
+  path: string;
+  /**
+   * Content from the "ours" side (current branch / HEAD)
+   */
+  ours: string | null;
+  /**
+   * Content from the "theirs" side (incoming branch)
+   */
+  theirs: string | null;
+  /**
+   * Content from the common ancestor (base)
+   */
+  base: string | null;
+  /**
+   * Label for the "ours" side (e.g., "main" or "HEAD")
+   */
+  oursName: string;
+  /**
+   * Label for the "theirs" side (e.g., "feature/xyz")
+   */
+  theirsName: string;
+};
 /**
- * Specified branch was not found
+ * Contributor statistics aggregated from commit history.
  */
-{ type: "BranchNotFound"; data: string } | 
+export type ContributorStats = {
+  /**
+   * Author name
+   */
+  name: string;
+  /**
+   * Author email
+   */
+  email: string;
+  /**
+   * Total number of commits by this contributor
+   */
+  commitCount: number;
+  /**
+   * Percentage of total commits
+   */
+  percentage: number;
+  /**
+   * Timestamp of first commit in milliseconds
+   */
+  firstCommitMs: number;
+  /**
+   * Timestamp of last commit in milliseconds
+   */
+  lastCommitMs: number;
+};
 /**
- * Branch already exists
+ * Result of creating a pull request.
  */
-{ type: "BranchExists"; data: string } | 
+export type CreatePullRequestResult = {
+  number: number;
+  htmlUrl: string;
+  title: string;
+  state: string;
+};
 /**
- * Repository is not configured for Gitflow (missing main or develop)
+ * Options for creating a new worktree.
  */
-{ type: "NotGitflowRepo" } | 
+export type CreateWorktreeOptions = {
+  /**
+   * Name for the worktree
+   */
+  name: string;
+  /**
+   * Path where the worktree will be created
+   */
+  path: string;
+  /**
+   * Branch to checkout (None for detached HEAD at current commit)
+   */
+  branch: string | null;
+  /**
+   * If true and branch is Some, create a new branch with that name
+   */
+  createBranch: boolean;
+};
 /**
- * Invalid branch name for Gitflow
+ * Daily commit count for a specific date.
  */
-{ type: "InvalidBranchName"; data: string } | 
+export type DailyCommitCount = {
+  /**
+   * Date in YYYY-MM-DD format
+   */
+  date: string;
+  /**
+   * Number of commits on this date
+   */
+  count: number;
+};
+export type DetectedProject = {
+  projectType: string;
+  markerFile: string;
+  recommendedTemplates: string[];
+};
 /**
- * Wrapped git2 error
+ * Response from GitHub's device code endpoint.
+ * Returned to the frontend so it can display the user_code
+ * and verification_uri to the user.
  */
-{ type: "Git"; data: string }
+export type DeviceFlowResponse = {
+  deviceCode: string;
+  userCode: string;
+  verificationUri: string;
+  expiresIn: number;
+  interval: number;
+};
 /**
- * Result of Gitflow initialization.
+ * A single diff hunk with line range information.
  */
-export type GitflowInitResult = { 
+export type DiffHunk = {
+  oldStart: number;
+  oldLines: number;
+  newStart: number;
+  newLines: number;
+  header: string;
+};
 /**
- * Whether the develop branch was created (false if it already existed)
+ * Enhanced diff hunk with per-line detail for interactive staging.
  */
-developCreated: boolean; 
+export type DiffHunkDetail = {
+  index: number;
+  oldStart: number;
+  oldLines: number;
+  newStart: number;
+  newLines: number;
+  header: string;
+  lines: DiffLine[];
+};
 /**
- * Whether we switched to the develop branch
+ * A single line in a diff hunk with origin and line numbers.
  */
-switchedToDevelop: boolean }
+export type DiffLine = {
+  origin: DiffLineOrigin;
+  oldLineno: number | null;
+  newLineno: number | null;
+  content: string;
+};
 /**
- * The current state of the Gitflow workflow.
+ * Origin type of a diff line.
  */
-export type GitflowState = 
+export type DiffLineOrigin = "context" | "addition" | "deletion";
 /**
- * No active workflow (on main, develop, or other)
+ * A blade type contributed by an extension.
  */
-{ type: "Idle" } | 
+export type ExtensionBladeContribution = {
+  /**
+   * The blade type identifier (used as the `type` field in navigation).
+   */
+  type: string;
+  /**
+   * Display title for the blade.
+   */
+  title: string;
+  /**
+   * Whether only one instance of this blade can be open at a time.
+   */
+  singleton: boolean | null;
+};
 /**
- * Working on a feature branch
+ * A command contributed by an extension.
  */
-{ type: "Feature"; data: { name: string } } | 
+export type ExtensionCommandContribution = {
+  /**
+   * Unique command identifier.
+   */
+  id: string;
+  /**
+   * Display title for the command (shown in command palette).
+   */
+  title: string;
+  /**
+   * Optional category for grouping in the command palette.
+   */
+  category: string | null;
+};
 /**
- * Working on a release branch
+ * Contribution points an extension can register.
  */
-{ type: "Release"; data: { version: string } } | 
+export type ExtensionContributes = {
+  /**
+   * Blade types contributed by this extension.
+   */
+  blades: ExtensionBladeContribution[] | null;
+  /**
+   * Commands contributed by this extension.
+   */
+  commands: ExtensionCommandContribution[] | null;
+  /**
+   * Toolbar actions contributed by this extension.
+   */
+  toolbar: ExtensionToolbarContribution[] | null;
+};
 /**
- * Working on a hotfix branch
+ * Result of fetching an extension manifest from a Git URL.
  */
-{ type: "Hotfix"; data: { name: string } }
+export type ExtensionFetchResult = { manifestJson: string; tempPath: string };
 /**
- * Status of Gitflow operations for UI consumption.
+ * Extension manifest parsed from `flowforge.extension.json`.
+ *
+ * Matches the JSON schema that extensions ship alongside their entry point.
+ * All field names use camelCase in JSON via the `rename_all` attribute.
  */
-export type GitflowStatus = { currentBranch: string; isGitflowReady: boolean; canStartFeature: boolean; canFinishFeature: boolean; canStartRelease: boolean; canFinishRelease: boolean; canStartHotfix: boolean; canFinishHotfix: boolean; canAbort: boolean; activeFlow: ActiveFlow | null; 
+export type ExtensionManifest = {
+  /**
+   * Unique identifier for the extension (e.g. "github").
+   */
+  id: string;
+  /**
+   * Human-readable display name.
+   */
+  name: string;
+  /**
+   * Semantic version of the extension (e.g. "1.0.0").
+   */
+  version: string;
+  /**
+   * Optional longer description of what the extension does.
+   */
+  description: string | null;
+  /**
+   * API version the extension targets (e.g. "1").
+   */
+  apiVersion: string;
+  /**
+   * Relative path to the JavaScript entry point (e.g. "index.js").
+   */
+  main: string;
+  /**
+   * Contributions the extension registers (blades, commands, toolbar items).
+   */
+  contributes: ExtensionContributes | null;
+  /**
+   * Permissions the extension requests (e.g. ["fs:read", "network"]).
+   */
+  permissions: string[] | null;
+  /**
+   * Absolute path to the extension directory on disk.
+   * Populated by discovery after parsing — not present in the JSON file.
+   */
+  basePath?: string | null;
+  /**
+   * Trust level for the extension.
+   * "built-in" for bundled extensions, "user-trusted" for user-installed,
+   * "sandboxed" for untrusted third-party (future).
+   * Defaults to "sandboxed" when not specified in the manifest JSON.
+   */
+  trustLevel?: string;
+};
 /**
- * Context about the repository's Gitflow state
+ * A toolbar action contributed by an extension.
  */
-context: GitflowContext }
-export type GitignoreTemplate = { name: string; content: string; source: string }
-export type GitignoreTemplateList = { templates: GitignoreTemplateName[]; source: string }
-export type GitignoreTemplateName = { name: string; category: string }
+export type ExtensionToolbarContribution = {
+  /**
+   * Unique toolbar action identifier.
+   */
+  id: string;
+  /**
+   * Display label for the toolbar action.
+   */
+  label: string;
+  /**
+   * Toolbar group to place the action in (e.g. "vcs", "tools").
+   */
+  group: string | null;
+  /**
+   * Sort priority within the group (lower values appear first).
+   */
+  priority: number | null;
+};
 /**
- * An edge in the commit graph connecting parent and child commits.
+ * A single file change with its status and optional diff stats.
  */
-export type GraphEdge = { 
+export type FileChange = {
+  path: string;
+  status: FileStatus;
+  additions: number | null;
+  deletions: number | null;
+};
 /**
- * SHA of the child commit (the commit that has this parent)
+ * A file changed in a commit.
  */
-from: string; 
+export type FileChanged = {
+  path: string;
+  status: string;
+  additions: number;
+  deletions: number;
+};
 /**
- * SHA of the parent commit
+ * Complete file diff with old/new content for Monaco DiffEditor.
  */
-to: string }
+export type FileDiff = {
+  path: string;
+  oldContent: string;
+  newContent: string;
+  hunks: DiffHunk[];
+  isBinary: boolean;
+  language: string;
+};
 /**
- * A node in the commit graph representing a single commit.
+ * Status of a file in the working directory or index.
  */
-export type GraphNode = { 
+export type FileStatus =
+  | "modified"
+  | "added"
+  | "deleted"
+  | { renamed: { old_path: string } }
+  | "untracked"
+  | "conflicted";
 /**
- * Full SHA-1 hash of the commit (40 chars)
+ * Flow type for active workflow.
  */
-oid: string; 
+export type FlowType = "feature" | "release" | "hotfix";
 /**
- * Short SHA-1 hash of the commit (7 chars)
+ * Git operation errors that serialize across the IPC boundary.
+ *
+ * These errors are sent to the frontend as typed objects,
+ * allowing proper error handling in TypeScript.
  */
-shortOid: string; 
+export type GitError =
+  | { type: "NotFound"; message: string }
+  | { type: "NotARepository"; message: string }
+  | { type: "EmptyRepository" }
+  | { type: "StatusError"; message: string }
+  | { type: "OperationFailed"; message: string }
+  | { type: "PathNotFound"; message: string }
+  | { type: "Internal"; message: string }
+  | { type: "NoStagedChanges" }
+  | { type: "SignatureError"; message: string }
+  | { type: "RemoteNotFound"; message: string }
+  | { type: "AuthenticationFailed"; message: string }
+  | { type: "PushRejected"; message: string }
+  | { type: "NetworkError"; message: string }
+  | { type: "BranchNotFound"; message: string }
+  | { type: "CannotDeleteCurrentBranch" }
+  | { type: "BranchNotMerged"; message: string }
+  | { type: "InvalidBranchName"; message: string }
+  | { type: "BranchAlreadyExists"; message: string }
+  | { type: "DirtyWorkingDirectory" }
+  | { type: "StashNotFound"; message: number }
+  | { type: "NothingToStash" }
+  | { type: "TagAlreadyExists"; message: string }
+  | { type: "TagNotFound"; message: string }
+  | { type: "NoMergeInProgress" }
+  | { type: "FileNotConflicted"; message: string }
+  | { type: "InvalidUrl"; message: string }
+  | { type: "PathExists"; message: string }
+  | { type: "CloneFailed"; message: string }
+  | { type: "InvalidPath"; message: string }
+  | { type: "HunkIndexOutOfRange"; message: number }
+  | { type: "LineRangeInvalid"; message: string }
+  | { type: "BinaryPartialStaging" };
 /**
- * First line of the commit message
+ * Snapshot of relevant global git configuration values.
  */
-message: string; 
+export type GitGlobalConfig = {
+  /**
+   * user.name from global config, or None if unset.
+   */
+  userName: string | null;
+  /**
+   * user.email from global config, or None if unset.
+   */
+  userEmail: string | null;
+  /**
+   * init.defaultBranch from global config, or None if unset.
+   */
+  defaultBranch: string | null;
+};
 /**
- * Author name
+ * GitHub operation errors that serialize across the IPC boundary.
+ *
+ * These errors are sent to the frontend as typed objects,
+ * allowing proper error handling in TypeScript. The frontend
+ * checks `err.type` to decide control flow (e.g., continue polling
+ * on `AuthorizationPending`, increase interval on `SlowDown`).
  */
-author: string; 
+export type GitHubError =
+  | { type: "OAuthFailed"; message: string }
+  | { type: "AuthorizationPending" }
+  | { type: "AccessDenied" }
+  | { type: "ExpiredToken" }
+  | { type: "SlowDown" }
+  | { type: "KeychainError"; message: string }
+  | { type: "NetworkError"; message: string }
+  | { type: "NotAuthenticated" }
+  | { type: "RateLimitExceeded"; message: string }
+  | { type: "Internal"; message: string }
+  | { type: "Cancelled" }
+  | { type: "ApiError"; message: string }
+  | { type: "NotFound"; message: string }
+  | { type: "Forbidden"; message: string }
+  | { type: "MergeNotAllowed"; message: string }
+  | { type: "HeadChanged"; message: string }
+  | { type: "ValidationFailed"; message: string };
 /**
- * Unix timestamp in milliseconds (safe for JS Number up to year 275760)
+ * Information about a detected GitHub remote in the current repository.
  */
-timestampMs: number; 
+export type GitHubRemoteInfo = {
+  remoteName: string;
+  owner: string;
+  repo: string;
+  url: string;
+};
 /**
- * Parent commit SHAs
+ * Configuration for Gitflow initialization.
  */
-parents: string[]; 
+export type GitflowConfig = {
+  /**
+   * Main/production branch name (e.g., "main" or "master")
+   */
+  mainBranch: string;
+  /**
+   * Development branch name (e.g., "develop")
+   */
+  developBranch: string;
+  /**
+   * Prefix for feature branches (e.g., "feature/")
+   */
+  featurePrefix: string;
+  /**
+   * Prefix for release branches (e.g., "release/")
+   */
+  releasePrefix: string;
+  /**
+   * Prefix for hotfix branches (e.g., "hotfix/")
+   */
+  hotfixPrefix: string;
+};
 /**
- * Classification of the branch type for coloring
+ * Context about the repository's Gitflow state.
  */
-branchType: BranchType; 
+export type GitflowContext = {
+  /**
+   * Current Gitflow state derived from branch name
+   */
+  state: GitflowState;
+  /**
+   * Current branch name
+   */
+  currentBranch: string;
+  /**
+   * Whether the repository has a main/master branch
+   */
+  hasMain: boolean;
+  /**
+   * Whether the repository has a develop branch
+   */
+  hasDevelop: boolean;
+  /**
+   * Whether the repository has Gitflow initialized (config in .git/config)
+   */
+  isInitialized: boolean;
+};
 /**
- * Lane/column position for visual layout (0-indexed from left)
+ * Gitflow operation errors that serialize across the IPC boundary.
  */
-column: number; 
+export type GitflowError =
+  /**
+   * Wrong branch context for the requested operation
+   */
+  | { type: "InvalidContext"; data: { expected: string; actual: string } }
+  /**
+   * Operation requires being on a feature branch
+   */
+  | { type: "NotOnFeatureBranch" }
+  /**
+   * Operation requires being on a release branch
+   */
+  | { type: "NotOnReleaseBranch" }
+  /**
+   * Operation requires being on a hotfix branch
+   */
+  | { type: "NotOnHotfixBranch" }
+  /**
+   * A release is already in progress
+   */
+  | { type: "ReleaseInProgress"; data: string }
+  /**
+   * A hotfix is already in progress
+   */
+  | { type: "HotfixInProgress"; data: string }
+  /**
+   * Merge conflicts encountered during finish operation
+   */
+  | { type: "MergeConflict" }
+  /**
+   * Working directory has uncommitted changes
+   */
+  | { type: "DirtyWorkingTree" }
+  /**
+   * Repository has no commits yet
+   */
+  | { type: "UnbornHead" }
+  /**
+   * Specified branch was not found
+   */
+  | { type: "BranchNotFound"; data: string }
+  /**
+   * Branch already exists
+   */
+  | { type: "BranchExists"; data: string }
+  /**
+   * Repository is not configured for Gitflow (missing main or develop)
+   */
+  | { type: "NotGitflowRepo" }
+  /**
+   * Invalid branch name for Gitflow
+   */
+  | { type: "InvalidBranchName"; data: string }
+  /**
+   * Wrapped git2 error
+   */
+  | { type: "Git"; data: string };
 /**
- * Branch names pointing to this commit
+ * Result of Gitflow initialization.
  */
-branchNames: string[]; 
+export type GitflowInitResult = {
+  /**
+   * Whether the develop branch was created (false if it already existed)
+   */
+  developCreated: boolean;
+  /**
+   * Whether we switched to the develop branch
+   */
+  switchedToDevelop: boolean;
+};
 /**
- * Whether this commit is a first-parent ancestor of HEAD
+ * The current state of the Gitflow workflow.
  */
-isHeadAncestor: boolean; 
+export type GitflowState =
+  /**
+   * No active workflow (on main, develop, or other)
+   */
+  | { type: "Idle" }
+  /**
+   * Working on a feature branch
+   */
+  | { type: "Feature"; data: { name: string } }
+  /**
+   * Working on a release branch
+   */
+  | { type: "Release"; data: { version: string } }
+  /**
+   * Working on a hotfix branch
+   */
+  | { type: "Hotfix"; data: { name: string } };
 /**
- * The "ideological branch" name that owns this commit for coloring
+ * Status of Gitflow operations for UI consumption.
  */
-ideologicalBranch: string }
-export type InitFile = { filename: string; content: string }
+export type GitflowStatus = {
+  currentBranch: string;
+  isGitflowReady: boolean;
+  canStartFeature: boolean;
+  canFinishFeature: boolean;
+  canStartRelease: boolean;
+  canFinishRelease: boolean;
+  canStartHotfix: boolean;
+  canFinishHotfix: boolean;
+  canAbort: boolean;
+  activeFlow: ActiveFlow | null;
+  /**
+   * Context about the repository's Gitflow state
+   */
+  context: GitflowContext;
+};
+export type GitignoreTemplate = {
+  name: string;
+  content: string;
+  source: string;
+};
+export type GitignoreTemplateList = {
+  templates: GitignoreTemplateName[];
+  source: string;
+};
+export type GitignoreTemplateName = { name: string; category: string };
 /**
- * Result of a successful git init operation.
+ * An edge in the commit graph connecting parent and child commits.
  */
-export type InitResult = { 
+export type GraphEdge = {
+  /**
+   * SHA of the child commit (the commit that has this parent)
+   */
+  from: string;
+  /**
+   * SHA of the parent commit
+   */
+  to: string;
+};
 /**
- * Absolute path to the initialized repository.
+ * A node in the commit graph representing a single commit.
  */
-repoPath: string; 
+export type GraphNode = {
+  /**
+   * Full SHA-1 hash of the commit (40 chars)
+   */
+  oid: string;
+  /**
+   * Short SHA-1 hash of the commit (7 chars)
+   */
+  shortOid: string;
+  /**
+   * First line of the commit message
+   */
+  message: string;
+  /**
+   * Author name
+   */
+  author: string;
+  /**
+   * Unix timestamp in milliseconds (safe for JS Number up to year 275760)
+   */
+  timestampMs: number;
+  /**
+   * Parent commit SHAs
+   */
+  parents: string[];
+  /**
+   * Classification of the branch type for coloring
+   */
+  branchType: BranchType;
+  /**
+   * Lane/column position for visual layout (0-indexed from left)
+   */
+  column: number;
+  /**
+   * Branch names pointing to this commit
+   */
+  branchNames: string[];
+  /**
+   * Whether this commit is a first-parent ancestor of HEAD
+   */
+  isHeadAncestor: boolean;
+  /**
+   * The "ideological branch" name that owns this commit for coloring
+   */
+  ideologicalBranch: string;
+};
+export type InitFile = { filename: string; content: string };
 /**
- * Name of the initial branch (e.g. "main").
+ * Result of a successful git init operation.
  */
-initialBranch: string }
+export type InitResult = {
+  /**
+   * Absolute path to the initialized repository.
+   */
+  repoPath: string;
+  /**
+   * Name of the initial branch (e.g. "main").
+   */
+  initialBranch: string;
+};
 /**
  * Full issue detail with body, assignees, milestone, and comments.
  */
-export type IssueDetail = { number: number; title: string; state: string; authorLogin: string; authorAvatarUrl: string; labels: LabelInfo[]; assignees: UserInfo[]; milestone: MilestoneInfo | null; body: string; createdAt: string; updatedAt: string; closedAt: string | null; htmlUrl: string; commentCount: number; comments: CommentInfo[] }
+export type IssueDetail = {
+  number: number;
+  title: string;
+  state: string;
+  authorLogin: string;
+  authorAvatarUrl: string;
+  labels: LabelInfo[];
+  assignees: UserInfo[];
+  milestone: MilestoneInfo | null;
+  body: string;
+  createdAt: string;
+  updatedAt: string;
+  closedAt: string | null;
+  htmlUrl: string;
+  commentCount: number;
+  comments: CommentInfo[];
+};
 /**
  * Paginated list of issue summaries.
  */
-export type IssueListResponse = { items: IssueSummary[]; hasNextPage: boolean; nextPage: number | null }
+export type IssueListResponse = {
+  items: IssueSummary[];
+  hasNextPage: boolean;
+  nextPage: number | null;
+};
 /**
  * Summary of an issue for list views.
  */
-export type IssueSummary = { number: number; title: string; state: string; authorLogin: string; authorAvatarUrl: string; labels: LabelInfo[]; assigneeLogins: string[]; milestoneTitle: string | null; createdAt: string; updatedAt: string; htmlUrl: string; commentCount: number }
+export type IssueSummary = {
+  number: number;
+  title: string;
+  state: string;
+  authorLogin: string;
+  authorAvatarUrl: string;
+  labels: LabelInfo[];
+  assigneeLogins: string[];
+  milestoneTitle: string | null;
+  createdAt: string;
+  updatedAt: string;
+  htmlUrl: string;
+  commentCount: number;
+};
 /**
  * Label info for frontend display.
  */
-export type LabelInfo = { name: string; color: string; description: string | null }
+export type LabelInfo = {
+  name: string;
+  color: string;
+  description: string | null;
+};
 /**
  * Last commit message with subject and body parsed separately.
- * 
+ *
  * Used for amend commit pre-fill functionality.
  */
-export type LastCommitMessage = { 
-/**
- * First line of the commit message
- */
-subject: string; 
-/**
- * Everything after the first blank line (if exists)
- */
-body: string | null; 
-/**
- * Full commit message
- */
-fullMessage: string }
+export type LastCommitMessage = {
+  /**
+   * First line of the commit message
+   */
+  subject: string;
+  /**
+   * Everything after the first blank line (if exists)
+   */
+  body: string | null;
+  /**
+   * Full commit message
+   */
+  fullMessage: string;
+};
 /**
  * A contiguous range of lines for partial staging operations.
  */
-export type LineRange = { start: number; end: number }
+export type LineRange = { start: number; end: number };
 /**
  * Result of merge analysis.
  */
-export type MergeAnalysisResult = 
-/**
- * Already merged, nothing to do
- */
-"upToDate" | 
-/**
- * Can fast-forward without merge commit
- */
-"fastForward" | 
-/**
- * Requires merge commit
- */
-"normal" | 
-/**
- * HEAD doesn't exist yet
- */
-"unborn"
+export type MergeAnalysisResult =
+  /**
+   * Already merged, nothing to do
+   */
+  | "upToDate"
+  /**
+   * Can fast-forward without merge commit
+   */
+  | "fastForward"
+  /**
+   * Requires merge commit
+   */
+  | "normal"
+  /**
+   * HEAD doesn't exist yet
+   */
+  | "unborn";
 /**
  * Result of merging a pull request.
  */
-export type MergePullRequestResult = { merged: boolean; sha: string | null; message: string }
+export type MergePullRequestResult = {
+  merged: boolean;
+  sha: string | null;
+  message: string;
+};
 /**
  * Result of a merge operation.
  */
-export type MergeResult = { 
-/**
- * Whether the merge was successful
- */
-success: boolean; 
-/**
- * Analysis result (what type of merge was performed)
- */
-analysis: MergeAnalysisResult; 
-/**
- * OID of merge commit (if created)
- */
-commitOid: string | null; 
-/**
- * True if fast-forward was used
- */
-fastForwarded: boolean; 
-/**
- * True if conflicts remain
- */
-hasConflicts: boolean; 
-/**
- * List of conflicted file paths
- */
-conflictedFiles: string[] }
+export type MergeResult = {
+  /**
+   * Whether the merge was successful
+   */
+  success: boolean;
+  /**
+   * Analysis result (what type of merge was performed)
+   */
+  analysis: MergeAnalysisResult;
+  /**
+   * OID of merge commit (if created)
+   */
+  commitOid: string | null;
+  /**
+   * True if fast-forward was used
+   */
+  fastForwarded: boolean;
+  /**
+   * True if conflicts remain
+   */
+  hasConflicts: boolean;
+  /**
+   * List of conflicted file paths
+   */
+  conflictedFiles: string[];
+};
 /**
  * Status of an in-progress merge.
  */
-export type MergeStatus = { 
-/**
- * Whether a merge is currently in progress
- */
-inProgress: boolean; 
-/**
- * List of conflicted file paths
- */
-conflictedFiles: string[] }
+export type MergeStatus = {
+  /**
+   * Whether a merge is currently in progress
+   */
+  inProgress: boolean;
+  /**
+   * List of conflicted file paths
+   */
+  conflictedFiles: string[];
+};
 /**
  * Milestone info for frontend display.
  */
-export type MilestoneInfo = { number: number; title: string; state: string }
-export type NugetPackageInfo = { id: string; version: string; description: string; authors: string; totalDownloads: number; published: string; projectUrl: string | null; licenseUrl: string | null; tags: string[]; nugetUrl: string }
-export type ProjectDetection = { detectedTypes: DetectedProject[] }
+export type MilestoneInfo = { number: number; title: string; state: string };
+export type NugetPackageInfo = {
+  id: string;
+  version: string;
+  description: string;
+  authors: string;
+  totalDownloads: number;
+  published: string;
+  projectUrl: string | null;
+  licenseUrl: string | null;
+  tags: string[];
+  nugetUrl: string;
+};
+export type ProjectDetection = { detectedTypes: DetectedProject[] };
 /**
  * Full pull request detail with body, stats, and comments.
  */
-export type PullRequestDetail = { number: number; title: string; state: string; draft: boolean; merged: boolean; authorLogin: string; authorAvatarUrl: string; headRef: string; headSha: string; baseRef: string; labels: LabelInfo[]; body: string; createdAt: string; updatedAt: string; htmlUrl: string; commentCount: number; reviewCommentCount: number; commits: number; additions: number; deletions: number; changedFiles: number; comments: CommentInfo[] }
+export type PullRequestDetail = {
+  number: number;
+  title: string;
+  state: string;
+  draft: boolean;
+  merged: boolean;
+  authorLogin: string;
+  authorAvatarUrl: string;
+  headRef: string;
+  headSha: string;
+  baseRef: string;
+  labels: LabelInfo[];
+  body: string;
+  createdAt: string;
+  updatedAt: string;
+  htmlUrl: string;
+  commentCount: number;
+  reviewCommentCount: number;
+  commits: number;
+  additions: number;
+  deletions: number;
+  changedFiles: number;
+  comments: CommentInfo[];
+};
 /**
  * Paginated list of pull request summaries.
  */
-export type PullRequestListResponse = { items: PullRequestSummary[]; hasNextPage: boolean; nextPage: number | null }
+export type PullRequestListResponse = {
+  items: PullRequestSummary[];
+  hasNextPage: boolean;
+  nextPage: number | null;
+};
 /**
  * Summary of a pull request for list views.
  */
-export type PullRequestSummary = { number: number; title: string; state: string; draft: boolean; merged: boolean; authorLogin: string; authorAvatarUrl: string; headRef: string; baseRef: string; labels: LabelInfo[]; createdAt: string; updatedAt: string; htmlUrl: string; commentCount: number }
+export type PullRequestSummary = {
+  number: number;
+  title: string;
+  state: string;
+  draft: boolean;
+  merged: boolean;
+  authorLogin: string;
+  authorAvatarUrl: string;
+  headRef: string;
+  baseRef: string;
+  labels: LabelInfo[];
+  createdAt: string;
+  updatedAt: string;
+  htmlUrl: string;
+  commentCount: number;
+};
 /**
  * Rate limit information from the GitHub API.
  */
-export type RateLimitInfo = { limit: number; remaining: number; reset: number; used: number }
+export type RateLimitInfo = {
+  limit: number;
+  remaining: number;
+  reset: number;
+  used: number;
+};
 /**
  * A recently checked-out branch extracted from the reflog.
  */
-export type RecentCheckout = { 
-/**
- * Branch name (bare, without refs/heads/ prefix)
- */
-name: string; 
-/**
- * Unix timestamp in milliseconds when the checkout occurred
- */
-lastCheckoutMs: number }
+export type RecentCheckout = {
+  /**
+   * Branch name (bare, without refs/heads/ prefix)
+   */
+  name: string;
+  /**
+   * Unix timestamp in milliseconds when the checkout occurred
+   */
+  lastCheckoutMs: number;
+};
 /**
  * Information about a configured remote.
  */
-export type RemoteInfo = { name: string; url: string }
+export type RemoteInfo = { name: string; url: string };
 /**
  * File content read from the repository at HEAD.
  */
-export type RepoFileContent = { content: string; isBinary: boolean; size: number }
+export type RepoFileContent = {
+  content: string;
+  isBinary: boolean;
+  size: number;
+};
 /**
  * A single entry in a repository directory listing.
  */
-export type RepoFileEntry = { name: string; path: string; isDir: boolean; size: number }
+export type RepoFileEntry = {
+  name: string;
+  path: string;
+  isDir: boolean;
+  size: number;
+};
 /**
  * Quick health check result for a repository.
  * Used by the welcome screen to show status dots without affecting the active repo.
  */
-export type RepoHealth = { status: string; branchName: string; ahead: number; behind: number; isDirty: boolean }
+export type RepoHealth = {
+  status: string;
+  branchName: string;
+  ahead: number;
+  behind: number;
+  isDirty: boolean;
+};
 /**
  * Aggregated repository insights over a time period.
  */
-export type RepoInsights = { 
-/**
- * Total number of commits in the time period
- */
-totalCommits: number; 
-/**
- * Number of active branches (local + remote)
- */
-activeBranches: number; 
-/**
- * Number of unique contributors
- */
-contributorCount: number; 
-/**
- * Timestamp of the earliest commit seen (milliseconds)
- */
-firstCommitMs: number; 
-/**
- * Daily commit counts sorted by date ascending
- */
-dailyCommits: DailyCommitCount[]; 
-/**
- * Contributor statistics sorted by commit count descending
- */
-contributors: ContributorStats[] }
+export type RepoInsights = {
+  /**
+   * Total number of commits in the time period
+   */
+  totalCommits: number;
+  /**
+   * Number of active branches (local + remote)
+   */
+  activeBranches: number;
+  /**
+   * Number of unique contributors
+   */
+  contributorCount: number;
+  /**
+   * Timestamp of the earliest commit seen (milliseconds)
+   */
+  firstCommitMs: number;
+  /**
+   * Daily commit counts sorted by date ascending
+   */
+  dailyCommits: DailyCommitCount[];
+  /**
+   * Contributor statistics sorted by commit count descending
+   */
+  contributors: ContributorStats[];
+};
 /**
  * Repository status information sent to frontend.
- * 
+ *
  * This is a lightweight summary - we don't send raw git2 objects
  * across the IPC boundary.
  */
-export type RepoStatus = { 
-/**
- * Current branch name (or short commit hash if detached)
- */
-branchName: string; 
-/**
- * Whether the working directory has uncommitted changes
- */
-isDirty: boolean; 
-/**
- * Absolute path to the repository root
- */
-repoPath: string; 
-/**
- * Repository display name (folder name)
- */
-repoName: string }
+export type RepoStatus = {
+  /**
+   * Current branch name (or short commit hash if detached)
+   */
+  branchName: string;
+  /**
+   * Whether the working directory has uncommitted changes
+   */
+  isDirty: boolean;
+  /**
+   * Absolute path to the repository root
+   */
+  repoPath: string;
+  /**
+   * Repository display name (folder name)
+   */
+  repoName: string;
+};
 /**
  * A scope suggestion from commit history.
  */
-export type ScopeSuggestion = { 
-/**
- * The scope string.
- */
-scope: string; 
-/**
- * Number of times this scope has been used.
- */
-usageCount: number }
+export type ScopeSuggestion = {
+  /**
+   * The scope string.
+   */
+  scope: string;
+  /**
+   * Number of times this scope has been used.
+   */
+  usageCount: number;
+};
 /**
  * Complete staging status showing staged, unstaged, and untracked files.
  */
-export type StagingStatus = { staged: FileChange[]; unstaged: FileChange[]; untracked: FileChange[] }
+export type StagingStatus = {
+  staged: FileChange[];
+  unstaged: FileChange[];
+  untracked: FileChange[];
+};
 /**
  * A stash entry representing saved work.
  */
-export type StashEntry = { 
-/**
- * 0-based index for stash operations
- */
-index: number; 
-/**
- * Stash message
- */
-message: string; 
-/**
- * Commit OID of the stash
- */
-oid: string }
+export type StashEntry = {
+  /**
+   * 0-based index for stash operations
+   */
+  index: number;
+  /**
+   * Stash message
+   */
+  message: string;
+  /**
+   * Commit OID of the stash
+   */
+  oid: string;
+};
 /**
  * Progress events for remote sync operations.
  * Uses tagged enum serialization for frontend type safety.
  */
-export type SyncProgress = { event: "started"; data: { operation: string } } | { event: "counting"; data: { current: number; total: number } } | { event: "compressing"; data: { current: number; total: number } } | { event: "transferring"; data: { current: number; total: number; bytes: number } } | { event: "resolving"; data: { current: number; total: number } } | { event: "finished"; data: { operation: string } } | { event: "error"; data: { message: string } }
+export type SyncProgress =
+  | { event: "started"; data: { operation: string } }
+  | { event: "counting"; data: { current: number; total: number } }
+  | { event: "compressing"; data: { current: number; total: number } }
+  | {
+      event: "transferring";
+      data: { current: number; total: number; bytes: number };
+    }
+  | { event: "resolving"; data: { current: number; total: number } }
+  | { event: "finished"; data: { operation: string } }
+  | { event: "error"; data: { message: string } };
 /**
  * Result of a sync operation (push/pull/fetch).
  */
-export type SyncResult = { success: boolean; message: string; commitsTransferred: number }
+export type SyncResult = {
+  success: boolean;
+  message: string;
+  commitsTransferred: number;
+};
 /**
  * Information about a git tag.
  */
-export type TagInfo = { 
-/**
- * Tag name (e.g., "v1.0.0")
- */
-name: string; 
-/**
- * OID of the tag object (for annotated) or target commit (for lightweight)
- */
-oid: string; 
-/**
- * OID of the commit the tag points to
- */
-targetOid: string; 
-/**
- * Tag message (None for lightweight tags)
- */
-message: string | null; 
-/**
- * Tagger name (None for lightweight tags)
- */
-tagger: string | null; 
-/**
- * True for annotated tags, false for lightweight
- */
-isAnnotated: boolean; 
-/**
- * Creation timestamp in milliseconds since epoch
- */
-createdAtMs: number }
+export type TagInfo = {
+  /**
+   * Tag name (e.g., "v1.0.0")
+   */
+  name: string;
+  /**
+   * OID of the tag object (for annotated) or target commit (for lightweight)
+   */
+  oid: string;
+  /**
+   * OID of the commit the tag points to
+   */
+  targetOid: string;
+  /**
+   * Tag message (None for lightweight tags)
+   */
+  message: string | null;
+  /**
+   * Tagger name (None for lightweight tags)
+   */
+  tagger: string | null;
+  /**
+   * True for annotated tags, false for lightweight
+   */
+  isAnnotated: boolean;
+  /**
+   * Creation timestamp in milliseconds since epoch
+   */
+  createdAtMs: number;
+};
 /**
  * A suggested commit type based on file analysis.
  */
-export type TypeSuggestion = { 
-/**
- * The suggested commit type.
- */
-suggestedType: CommitType; 
-/**
- * Confidence level of the suggestion.
- */
-confidence: Confidence; 
-/**
- * Reason for the suggestion.
- */
-reason: string }
+export type TypeSuggestion = {
+  /**
+   * The suggested commit type.
+   */
+  suggestedType: CommitType;
+  /**
+   * Confidence level of the suggestion.
+   */
+  confidence: Confidence;
+  /**
+   * Reason for the suggestion.
+   */
+  reason: string;
+};
 /**
  * Information about what can be undone
  */
-export type UndoInfo = { 
-/**
- * Whether undo is available
- */
-canUndo: boolean; 
-/**
- * Description of what will be undone
- */
-description: string | null; 
-/**
- * The reflog entry message
- */
-reflogMessage: string | null; 
-/**
- * The commit OID to revert to
- */
-targetOid: string | null }
+export type UndoInfo = {
+  /**
+   * Whether undo is available
+   */
+  canUndo: boolean;
+  /**
+   * Description of what will be undone
+   */
+  description: string | null;
+  /**
+   * The reflog entry message
+   */
+  reflogMessage: string | null;
+  /**
+   * The commit OID to revert to
+   */
+  targetOid: string | null;
+};
 /**
  * Minimal user info for frontend display.
  */
-export type UserInfo = { login: string; avatarUrl: string }
+export type UserInfo = { login: string; avatarUrl: string };
 /**
  * A validation error.
  */
-export type ValidationError = { 
-/**
- * Error code for programmatic handling.
- */
-code: string; 
-/**
- * Human-readable error message.
- */
-message: string; 
-/**
- * Optional suggestion for fixing the error.
- */
-suggestion: string | null }
+export type ValidationError = {
+  /**
+   * Error code for programmatic handling.
+   */
+  code: string;
+  /**
+   * Human-readable error message.
+   */
+  message: string;
+  /**
+   * Optional suggestion for fixing the error.
+   */
+  suggestion: string | null;
+};
 /**
  * Result of validating a commit message.
  */
-export type ValidationResult = { 
-/**
- * Whether the message is valid.
- */
-isValid: boolean; 
-/**
- * Validation errors (if any).
- */
-errors: ValidationError[]; 
-/**
- * Validation warnings (if any).
- */
-warnings: ValidationWarning[] }
+export type ValidationResult = {
+  /**
+   * Whether the message is valid.
+   */
+  isValid: boolean;
+  /**
+   * Validation errors (if any).
+   */
+  errors: ValidationError[];
+  /**
+   * Validation warnings (if any).
+   */
+  warnings: ValidationWarning[];
+};
 /**
  * A validation warning.
  */
-export type ValidationWarning = { 
-/**
- * Warning code for programmatic handling.
- */
-code: string; 
-/**
- * Human-readable warning message.
- */
-message: string }
+export type ValidationWarning = {
+  /**
+   * Warning code for programmatic handling.
+   */
+  code: string;
+  /**
+   * Human-readable warning message.
+   */
+  message: string;
+};
 /**
  * Information about a git worktree.
  */
-export type WorktreeInfo = { 
-/**
- * Worktree name (for linked worktrees) or "main" for the main worktree
- */
-name: string; 
-/**
- * Absolute path to the worktree directory
- */
-path: string; 
-/**
- * Branch checked out in this worktree (None if detached HEAD)
- */
-branch: string | null; 
-/**
- * Current status of the worktree
- */
-status: WorktreeStatus; 
-/**
- * True if this is the main worktree (not a linked worktree)
- */
-isMain: boolean; 
-/**
- * True if the worktree is locked
- */
-isLocked: boolean }
+export type WorktreeInfo = {
+  /**
+   * Worktree name (for linked worktrees) or "main" for the main worktree
+   */
+  name: string;
+  /**
+   * Absolute path to the worktree directory
+   */
+  path: string;
+  /**
+   * Branch checked out in this worktree (None if detached HEAD)
+   */
+  branch: string | null;
+  /**
+   * Current status of the worktree
+   */
+  status: WorktreeStatus;
+  /**
+   * True if this is the main worktree (not a linked worktree)
+   */
+  isMain: boolean;
+  /**
+   * True if the worktree is locked
+   */
+  isLocked: boolean;
+};
 /**
  * Status of a worktree's working directory.
  */
-export type WorktreeStatus = 
-/**
- * No uncommitted changes
- */
-"clean" | 
-/**
- * Has uncommitted changes
- */
-"dirty" | 
-/**
- * Has unresolved merge conflicts
- */
-"conflicts" | 
-/**
- * Worktree is invalid or corrupted
- */
-"invalid"
+export type WorktreeStatus =
+  /**
+   * No uncommitted changes
+   */
+  | "clean"
+  /**
+   * Has uncommitted changes
+   */
+  | "dirty"
+  /**
+   * Has unresolved merge conflicts
+   */
+  | "conflicts"
+  /**
+   * Worktree is invalid or corrupted
+   */
+  | "invalid";
 
 /** tauri-specta globals **/
 
 import {
-	invoke as TAURI_INVOKE,
-	Channel as TAURI_CHANNEL,
+  type Channel as TAURI_CHANNEL,
+  invoke as TAURI_INVOKE,
 } from "@tauri-apps/api/core";
 import * as TAURI_API_EVENT from "@tauri-apps/api/event";
-import { type WebviewWindow as __WebviewWindow__ } from "@tauri-apps/api/webviewWindow";
+import type { WebviewWindow as __WebviewWindow__ } from "@tauri-apps/api/webviewWindow";
 
 type __EventObj__<T> = {
-	listen: (
-		cb: TAURI_API_EVENT.EventCallback<T>,
-	) => ReturnType<typeof TAURI_API_EVENT.listen<T>>;
-	once: (
-		cb: TAURI_API_EVENT.EventCallback<T>,
-	) => ReturnType<typeof TAURI_API_EVENT.once<T>>;
-	emit: null extends T
-		? (payload?: T) => ReturnType<typeof TAURI_API_EVENT.emit>
-		: (payload: T) => ReturnType<typeof TAURI_API_EVENT.emit>;
+  listen: (
+    cb: TAURI_API_EVENT.EventCallback<T>,
+  ) => ReturnType<typeof TAURI_API_EVENT.listen<T>>;
+  once: (
+    cb: TAURI_API_EVENT.EventCallback<T>,
+  ) => ReturnType<typeof TAURI_API_EVENT.once<T>>;
+  emit: null extends T
+    ? (payload?: T) => ReturnType<typeof TAURI_API_EVENT.emit>
+    : (payload: T) => ReturnType<typeof TAURI_API_EVENT.emit>;
 };
 
 export type Result<T, E> =
-	| { status: "ok"; data: T }
-	| { status: "error"; error: E };
+  | { status: "ok"; data: T }
+  | { status: "error"; error: E };
 
 function __makeEvents__<T extends Record<string, any>>(
-	mappings: Record<keyof T, string>,
+  mappings: Record<keyof T, string>,
 ) {
-	return new Proxy(
-		{} as unknown as {
-			[K in keyof T]: __EventObj__<T[K]> & {
-				(handle: __WebviewWindow__): __EventObj__<T[K]>;
-			};
-		},
-		{
-			get: (_, event) => {
-				const name = mappings[event as keyof T];
+  return new Proxy(
+    {} as unknown as {
+      [K in keyof T]: __EventObj__<T[K]> &
+        ((handle: __WebviewWindow__) => __EventObj__<T[K]>);
+    },
+    {
+      get: (_, event) => {
+        const name = mappings[event as keyof T];
 
-				return new Proxy((() => {}) as any, {
-					apply: (_, __, [window]: [__WebviewWindow__]) => ({
-						listen: (arg: any) => window.listen(name, arg),
-						once: (arg: any) => window.once(name, arg),
-						emit: (arg: any) => window.emit(name, arg),
-					}),
-					get: (_, command: keyof __EventObj__<any>) => {
-						switch (command) {
-							case "listen":
-								return (arg: any) => TAURI_API_EVENT.listen(name, arg);
-							case "once":
-								return (arg: any) => TAURI_API_EVENT.once(name, arg);
-							case "emit":
-								return (arg: any) => TAURI_API_EVENT.emit(name, arg);
-						}
-					},
-				});
-			},
-		},
-	);
+        return new Proxy((() => {}) as any, {
+          apply: (_, __, [window]: [__WebviewWindow__]) => ({
+            listen: (arg: any) => window.listen(name, arg),
+            once: (arg: any) => window.once(name, arg),
+            emit: (arg: any) => window.emit(name, arg),
+          }),
+          get: (_, command: keyof __EventObj__<any>) => {
+            switch (command) {
+              case "listen":
+                return (arg: any) => TAURI_API_EVENT.listen(name, arg);
+              case "once":
+                return (arg: any) => TAURI_API_EVENT.once(name, arg);
+              case "emit":
+                return (arg: any) => TAURI_API_EVENT.emit(name, arg);
+            }
+          },
+        });
+      },
+    },
+  );
 }
diff --git a/src/core/blades/_discovery.ts b/src/core/blades/_discovery.ts
index 9dd9080a..f4971735 100644
--- a/src/core/blades/_discovery.ts
+++ b/src/core/blades/_discovery.ts
@@ -1,14 +1,19 @@
-import { clearCoreRegistry, getAllBladeTypes } from "@/framework/layout/bladeRegistry";
+import {
+  clearCoreRegistry,
+  getAllBladeTypes,
+} from "@/framework/layout/bladeRegistry";
 
 // Single-glob: scan per-blade registration files
 const modules = import.meta.glob(
   ["./*/registration.{ts,tsx}", "!./_shared/**"],
-  { eager: true }
+  { eager: true },
 );
 
 // Guard against misconfigured paths
 if (import.meta.env.DEV && Object.keys(modules).length === 0) {
-  console.error("[BladeRegistry] No registration modules found -- check src/blades/*/registration.{ts,tsx}");
+  console.error(
+    "[BladeRegistry] No registration modules found -- check src/blades/*/registration.{ts,tsx}",
+  );
 }
 
 // Dev-mode exhaustiveness check
@@ -16,32 +21,46 @@ if (import.meta.env.DEV && !import.meta.hot?.data?.isUpdate) {
   const registered = new Set(getAllBladeTypes());
 
   const CORE_BLADE_TYPES: string[] = [
-    "staging-changes", "commit-list-fallback", "settings",
-    "extension-manager", "extension-detail",
+    "staging-changes",
+    "commit-list-fallback",
+    "settings",
+    "extension-manager",
+    "extension-detail",
   ];
 
   const EXTENSION_BLADE_TYPES: string[] = [
-    "repo-browser", "branch-manager", "diff", "commit-details",
-    "topology-graph", "init-repo",
-    "conventional-commit", "changelog",
+    "repo-browser",
+    "branch-manager",
+    "diff",
+    "commit-details",
+    "topology-graph",
+    "init-repo",
+    "conventional-commit",
+    "changelog",
     "gitflow-cheatsheet",
-    "viewer-code", "viewer-markdown", "viewer-3d",
-    "viewer-image", "viewer-nupkg", "viewer-plaintext",
+    "viewer-code",
+    "viewer-markdown",
+    "viewer-3d",
+    "viewer-image",
+    "viewer-nupkg",
+    "viewer-plaintext",
     "welcome-screen",
   ];
 
-  const missingCore = CORE_BLADE_TYPES.filter(t => !registered.has(t as any));
+  const missingCore = CORE_BLADE_TYPES.filter((t) => !registered.has(t as any));
   if (missingCore.length > 0) {
     console.warn(
       `[BladeRegistry] Missing core registrations: ${missingCore.join(", ")}. ` +
-      `Check src/core/blades/{blade-name}/registration.ts for each.`
+        `Check src/core/blades/{blade-name}/registration.ts for each.`,
     );
   }
 
-  const missingExt = EXTENSION_BLADE_TYPES.filter(t => !registered.has(t as any));
+  const missingExt = EXTENSION_BLADE_TYPES.filter(
+    (t) => !registered.has(t as any),
+  );
   if (missingExt.length > 0) {
     console.debug(
-      `[BladeRegistry] Extension blade types not registered (extensions may be disabled): ${missingExt.join(", ")}`
+      `[BladeRegistry] Extension blade types not registered (extensions may be disabled): ${missingExt.join(", ")}`,
     );
   }
 }
diff --git a/src/core/blades/_shared/BladeBreadcrumb.tsx b/src/core/blades/_shared/BladeBreadcrumb.tsx
index 434d6dc7..f0b17df4 100644
--- a/src/core/blades/_shared/BladeBreadcrumb.tsx
+++ b/src/core/blades/_shared/BladeBreadcrumb.tsx
@@ -14,7 +14,10 @@ interface BladeBreadcrumbProps {
  * When `navigable` is true (default), clicking a parent segment replaces the
  * current blade with a repo-browser at that directory path.
  */
-export function BladeBreadcrumb({ path, navigable = true }: BladeBreadcrumbProps) {
+export function BladeBreadcrumb({
+  path,
+  navigable = true,
+}: BladeBreadcrumbProps) {
   const { bladeStack, popToIndex, replaceBlade } = useBladeNavigation();
   const segments = path ? path.split("/").filter(Boolean) : [];
 
diff --git a/src/core/blades/_shared/BladeContentEmpty.tsx b/src/core/blades/_shared/BladeContentEmpty.tsx
index a842ca4c..735a849b 100644
--- a/src/core/blades/_shared/BladeContentEmpty.tsx
+++ b/src/core/blades/_shared/BladeContentEmpty.tsx
@@ -13,14 +13,16 @@ interface BladeContentEmptyProps {
  * Standardized empty state for blades with no content to display.
  * Matches the placeholder blade layout pattern.
  */
-export function BladeContentEmpty({ icon: Icon, message, detail }: BladeContentEmptyProps) {
+export function BladeContentEmpty({
+  icon: Icon,
+  message,
+  detail,
+}: BladeContentEmptyProps) {
   return (
     <div className="flex-1 flex flex-col items-center justify-center gap-3 text-ctp-subtext0">
       <Icon className="w-10 h-10 text-ctp-overlay0" />
       <p className="text-sm">{message}</p>
-      {detail && (
-        <p className="text-xs text-ctp-overlay0">{detail}</p>
-      )}
+      {detail && <p className="text-xs text-ctp-overlay0">{detail}</p>}
     </div>
   );
 }
diff --git a/src/core/blades/_shared/BladeContentError.tsx b/src/core/blades/_shared/BladeContentError.tsx
index 63fce2ef..e6ee190f 100644
--- a/src/core/blades/_shared/BladeContentError.tsx
+++ b/src/core/blades/_shared/BladeContentError.tsx
@@ -13,13 +13,19 @@ interface BladeContentErrorProps {
  * Standardized error state for data-fetch failures within blades.
  * Shows a centered error message with an optional retry button.
  */
-export function BladeContentError({ message, detail, onRetry }: BladeContentErrorProps) {
+export function BladeContentError({
+  message,
+  detail,
+  onRetry,
+}: BladeContentErrorProps) {
   return (
     <div className="flex-1 flex flex-col items-center justify-center bg-ctp-mantle gap-3">
       <AlertTriangle className="w-8 h-8 text-ctp-red" />
       <p className="text-sm text-ctp-red">{message}</p>
       {detail && (
-        <p className="text-xs text-ctp-overlay0 max-w-md text-center">{detail}</p>
+        <p className="text-xs text-ctp-overlay0 max-w-md text-center">
+          {detail}
+        </p>
       )}
       {onRetry && (
         <button
diff --git a/src/core/blades/_shared/FileTreeBlade.tsx b/src/core/blades/_shared/FileTreeBlade.tsx
index ffd2a2be..81366b1f 100644
--- a/src/core/blades/_shared/FileTreeBlade.tsx
+++ b/src/core/blades/_shared/FileTreeBlade.tsx
@@ -62,7 +62,13 @@ function buildTree(files: FileChanged[]): TreeNode {
   return root;
 }
 
-function StatsBar({ additions, deletions }: { additions: number; deletions: number }) {
+function StatsBar({
+  additions,
+  deletions,
+}: {
+  additions: number;
+  deletions: number;
+}) {
   const total = additions + deletions;
   if (total === 0) return null;
 
@@ -73,10 +79,7 @@ function StatsBar({ additions, deletions }: { additions: number; deletions: numb
       <span className="text-xs text-ctp-green">+{additions}</span>
       <span className="text-xs text-ctp-red">-{deletions}</span>
       <div className="w-16 h-2 rounded-full overflow-hidden flex bg-ctp-surface0">
-        <div
-          className="bg-ctp-green h-full"
-          style={{ width: `${addPct}%` }}
-        />
+        <div className="bg-ctp-green h-full" style={{ width: `${addPct}%` }} />
         <div
           className="bg-ctp-red h-full"
           style={{ width: `${100 - addPct}%` }}
@@ -106,7 +109,12 @@ function FileRow({
         isSelected && "bg-ctp-surface0 ring-1 ring-ctp-blue/30",
       )}
     >
-      <span className={cn("w-4 text-center text-xs font-mono shrink-0", statusInfo.color)}>
+      <span
+        className={cn(
+          "w-4 text-center text-xs font-mono shrink-0",
+          statusInfo.color,
+        )}
+      >
         {statusInfo.label}
       </span>
       <span className="text-ctp-subtext1 truncate flex-1" title={file.path}>
@@ -165,8 +173,8 @@ function TreeView({
         <FileRow
           key={fileNode.path}
           file={fileNode.file!}
-          onSelect={() => onSelectFile(fileNode.file!.path)}
-          isSelected={selectedFile === fileNode.file!.path}
+          onSelect={() => onSelectFile(fileNode.file?.path)}
+          isSelected={selectedFile === fileNode.file?.path}
         />
       ))}
     </div>
diff --git a/src/core/blades/_shared/WorkflowNavigation.tsx b/src/core/blades/_shared/WorkflowNavigation.tsx
index 7e0972b2..1944936f 100644
--- a/src/core/blades/_shared/WorkflowNavigation.tsx
+++ b/src/core/blades/_shared/WorkflowNavigation.tsx
@@ -1,11 +1,11 @@
-import { Files, Network } from "lucide-react";
+import { useSelector } from "@xstate/react";
 import type { LucideIcon } from "lucide-react";
+import { Files, Network } from "lucide-react";
 import { useEffect, useMemo } from "react";
-import { useSelector } from "@xstate/react";
+import { useBladeRegistry } from "@/framework/layout/bladeRegistry";
 import { useNavigationActorRef } from "@/framework/layout/navigation/context";
 import { selectActiveWorkflow } from "@/framework/layout/navigation/selectors";
 import { getAllWorkflows } from "@/framework/layout/navigation/workflowRegistry";
-import { useBladeRegistry } from "@/framework/layout/bladeRegistry";
 import { cn } from "../../lib/utils";
 
 /** Map workflow IDs to icons. Falls back to Files for unknown workflows. */
@@ -29,7 +29,10 @@ export function WorkflowNavigation({ className }: WorkflowNavigationProps) {
     () =>
       allWorkflows.filter((w) => {
         // Always show workflows whose root blade is registered
-        return blades.has(w.rootBlade.type as string) || (w.fallbackBlade && blades.has(w.fallbackBlade.type as string));
+        return (
+          blades.has(w.rootBlade.type as string) ||
+          (w.fallbackBlade && blades.has(w.fallbackBlade.type as string))
+        );
       }),
     [blades, allWorkflows],
   );
@@ -37,7 +40,11 @@ export function WorkflowNavigation({ className }: WorkflowNavigationProps) {
   useEffect(() => {
     // If the active workflow's root blade is not registered and has no fallback, switch to first available
     const active = allWorkflows.find((w) => w.id === activeWorkflow);
-    if (active && !blades.has(active.rootBlade.type as string) && !active.fallbackBlade) {
+    if (
+      active &&
+      !blades.has(active.rootBlade.type as string) &&
+      !active.fallbackBlade
+    ) {
       const firstAvailable = visibleWorkflows[0];
       if (firstAvailable && firstAvailable.id !== activeWorkflow) {
         actorRef.send({ type: "SWITCH_WORKFLOW", workflow: firstAvailable.id });
@@ -52,7 +59,9 @@ export function WorkflowNavigation({ className }: WorkflowNavigationProps) {
         return (
           <button
             key={id}
-            onClick={() => actorRef.send({ type: "SWITCH_WORKFLOW", workflow: id })}
+            onClick={() =>
+              actorRef.send({ type: "SWITCH_WORKFLOW", workflow: id })
+            }
             className={cn(
               "px-3 py-1.5 rounded-md text-sm flex items-center gap-2 transition-colors",
               activeWorkflow === id
diff --git a/src/core/blades/_shared/index.ts b/src/core/blades/_shared/index.ts
index a4a8c524..2acb5488 100644
--- a/src/core/blades/_shared/index.ts
+++ b/src/core/blades/_shared/index.ts
@@ -1,14 +1,14 @@
 export { BladeContainer } from "@/framework/layout/BladeContainer";
-export { BladePanel } from "@/framework/layout/BladePanel";
-export { BladeStrip } from "@/framework/layout/BladeStrip";
-export { BladeRenderer } from "@/framework/layout/BladeRenderer";
 export { BladeErrorBoundary } from "@/framework/layout/BladeErrorBoundary";
 export { BladeLoadingFallback } from "@/framework/layout/BladeLoadingFallback";
-export { BladeToolbar } from "./BladeToolbar";
-export { BladeContentLoading } from "./BladeContentLoading";
-export { BladeContentError } from "./BladeContentError";
-export { BladeContentEmpty } from "./BladeContentEmpty";
-export { BladeBreadcrumb } from "./BladeBreadcrumb";
-export { WorkflowNavigation } from "./WorkflowNavigation";
+export { BladePanel } from "@/framework/layout/BladePanel";
+export { BladeRenderer } from "@/framework/layout/BladeRenderer";
+export { BladeStrip } from "@/framework/layout/BladeStrip";
 export { NavigationGuardDialog } from "@/framework/layout/NavigationGuardDialog";
+export { BladeBreadcrumb } from "./BladeBreadcrumb";
+export { BladeContentEmpty } from "./BladeContentEmpty";
+export { BladeContentError } from "./BladeContentError";
+export { BladeContentLoading } from "./BladeContentLoading";
+export { BladeToolbar } from "./BladeToolbar";
 export { FileTreeBlade } from "./FileTreeBlade";
+export { WorkflowNavigation } from "./WorkflowNavigation";
diff --git a/src/core/blades/commit-list-fallback/CommitListFallbackBlade.tsx b/src/core/blades/commit-list-fallback/CommitListFallbackBlade.tsx
index 333b4241..6433d022 100644
--- a/src/core/blades/commit-list-fallback/CommitListFallbackBlade.tsx
+++ b/src/core/blades/commit-list-fallback/CommitListFallbackBlade.tsx
@@ -6,7 +6,9 @@ export function CommitListFallbackBlade() {
 
   return (
     <div className="flex flex-col h-full">
-      <CommitHistory onCommitSelect={(oid) => openBlade("commit-details", { oid })} />
+      <CommitHistory
+        onCommitSelect={(oid) => openBlade("commit-details", { oid })}
+      />
     </div>
   );
 }
diff --git a/src/core/blades/extension-detail/ExtensionDetailBlade.tsx b/src/core/blades/extension-detail/ExtensionDetailBlade.tsx
index de68de90..6c03100f 100644
--- a/src/core/blades/extension-detail/ExtensionDetailBlade.tsx
+++ b/src/core/blades/extension-detail/ExtensionDetailBlade.tsx
@@ -1,4 +1,3 @@
-import { useState } from "react";
 import {
   AlertTriangle,
   Blocks,
@@ -15,43 +14,65 @@ import {
   Trash2,
   Wrench,
 } from "lucide-react";
-import { useExtensionHost } from "@/framework/extension-system/ExtensionHost";
-import { getExtensionReadme } from "../../../extensions/extensionReadme";
-import { MarkdownRenderer } from "../../components/markdown/MarkdownRenderer";
-import { useToolbarRegistry } from "@/framework/extension-system/toolbarRegistry";
+import { useState } from "react";
+import { getCommands } from "@/framework/command-palette/commandRegistry";
 import { useContextMenuRegistry } from "@/framework/extension-system/contextMenuRegistry";
-import { useSidebarPanelRegistry } from "@/framework/layout/sidebarPanelRegistry";
+import { useExtensionHost } from "@/framework/extension-system/ExtensionHost";
 import { useStatusBarRegistry } from "@/framework/extension-system/statusBarRegistry";
+import { useToolbarRegistry } from "@/framework/extension-system/toolbarRegistry";
+import type { TrustLevel } from "@/framework/extension-system/types";
 import { getAllBladeTypes } from "@/framework/layout/bladeRegistry";
-import { getCommands } from "@/framework/command-palette/commandRegistry";
+import { useSidebarPanelRegistry } from "@/framework/layout/sidebarPanelRegistry";
+import { toast } from "@/framework/stores/toast";
+import { getExtensionReadme } from "../../../extensions/extensionReadme";
+import { MarkdownRenderer } from "../../components/markdown/MarkdownRenderer";
 import { Button } from "../../components/ui/button";
 import { ToggleSwitch } from "../../components/ui/ToggleSwitch";
-import { toast } from "@/framework/stores/toast";
 import { cn } from "../../lib/utils";
-import type { TrustLevel } from "@/framework/extension-system/types";
 
 interface ExtensionDetailBladeProps {
   extensionId: string;
 }
 
 const STATUS_STYLES: Record<string, { label: string; className: string }> = {
-  active: { label: "Active", className: "bg-ctp-green/15 text-ctp-green border-ctp-green/30" },
-  disabled: { label: "Disabled", className: "bg-ctp-surface1/50 text-ctp-overlay0 border-ctp-surface2" },
-  deactivated: { label: "Deactivated", className: "bg-ctp-surface1/50 text-ctp-overlay0 border-ctp-surface2" },
-  error: { label: "Error", className: "bg-ctp-red/15 text-ctp-red border-ctp-red/30" },
-  discovered: { label: "Discovered", className: "bg-ctp-blue/15 text-ctp-blue border-ctp-blue/30" },
-  activating: { label: "Activating...", className: "bg-ctp-yellow/15 text-ctp-yellow border-ctp-yellow/30" },
+  active: {
+    label: "Active",
+    className: "bg-ctp-green/15 text-ctp-green border-ctp-green/30",
+  },
+  disabled: {
+    label: "Disabled",
+    className: "bg-ctp-surface1/50 text-ctp-overlay0 border-ctp-surface2",
+  },
+  deactivated: {
+    label: "Deactivated",
+    className: "bg-ctp-surface1/50 text-ctp-overlay0 border-ctp-surface2",
+  },
+  error: {
+    label: "Error",
+    className: "bg-ctp-red/15 text-ctp-red border-ctp-red/30",
+  },
+  discovered: {
+    label: "Discovered",
+    className: "bg-ctp-blue/15 text-ctp-blue border-ctp-blue/30",
+  },
+  activating: {
+    label: "Activating...",
+    className: "bg-ctp-yellow/15 text-ctp-yellow border-ctp-yellow/30",
+  },
 };
 
 const TRUST_STYLES: Record<TrustLevel, { label: string; className: string }> = {
   "built-in": { label: "Built-in", className: "text-ctp-green" },
   "user-trusted": { label: "User Trusted", className: "text-ctp-blue" },
-  "sandboxed": { label: "Sandboxed", className: "text-ctp-yellow" },
+  sandboxed: { label: "Sandboxed", className: "text-ctp-yellow" },
 };
 
-export function ExtensionDetailBlade({ extensionId }: ExtensionDetailBladeProps) {
+export function ExtensionDetailBlade({
+  extensionId,
+}: ExtensionDetailBladeProps) {
   const [isToggling, setIsToggling] = useState(false);
-  const { extensions, activateExtension, deactivateExtension } = useExtensionHost();
+  const { extensions, activateExtension, deactivateExtension } =
+    useExtensionHost();
   const toolbarActions = useToolbarRegistry((s) => s.items);
   const contextMenuItems = useContextMenuRegistry((s) => s.items);
   const sidebarPanels = useSidebarPanelRegistry((s) => s.items);
@@ -70,8 +91,10 @@ export function ExtensionDetailBlade({ extensionId }: ExtensionDetailBladeProps)
   const isActive = extension.status === "active";
   const isError = extension.status === "error";
   const isBuiltIn = extension.builtIn === true;
-  const statusStyle = STATUS_STYLES[extension.status] ?? STATUS_STYLES.discovered;
-  const trustStyle = TRUST_STYLES[extension.trustLevel] ?? TRUST_STYLES.sandboxed;
+  const statusStyle =
+    STATUS_STYLES[extension.status] ?? STATUS_STYLES.discovered;
+  const trustStyle =
+    TRUST_STYLES[extension.trustLevel] ?? TRUST_STYLES.sandboxed;
 
   // Gather live contributions from registries
   const extSource = `ext:${extensionId}`;
@@ -122,7 +145,9 @@ export function ExtensionDetailBlade({ extensionId }: ExtensionDetailBladeProps)
         toast.success(`${extension.name} enabled`);
       }
     } catch (e) {
-      toast.error(`Failed to toggle: ${e instanceof Error ? e.message : String(e)}`);
+      toast.error(
+        `Failed to toggle: ${e instanceof Error ? e.message : String(e)}`,
+      );
     } finally {
       setIsToggling(false);
     }
@@ -179,7 +204,12 @@ export function ExtensionDetailBlade({ extensionId }: ExtensionDetailBladeProps)
           </span>
         )}
 
-        <span className={cn("flex items-center gap-1 text-xs", trustStyle.className)}>
+        <span
+          className={cn(
+            "flex items-center gap-1 text-xs",
+            trustStyle.className,
+          )}
+        >
           <Shield className="w-3 h-3" />
           {trustStyle.label}
         </span>
@@ -196,7 +226,9 @@ export function ExtensionDetailBlade({ extensionId }: ExtensionDetailBladeProps)
           <div className="flex items-start gap-2">
             <AlertTriangle className="w-4 h-4 text-ctp-red shrink-0 mt-0.5" />
             <div>
-              <p className="text-sm font-medium text-ctp-red">Activation Error</p>
+              <p className="text-sm font-medium text-ctp-red">
+                Activation Error
+              </p>
               <p className="text-xs text-ctp-red/80 mt-1">{extension.error}</p>
             </div>
           </div>
@@ -257,7 +289,9 @@ export function ExtensionDetailBlade({ extensionId }: ExtensionDetailBladeProps)
               <ContributionGroup
                 icon={MonitorCog}
                 label="Status Bar Items"
-                items={registeredStatusBar.map((i) => i.id.replace(extPrefix, ""))}
+                items={registeredStatusBar.map((i) =>
+                  i.id.replace(extPrefix, ""),
+                )}
               />
             )}
           </div>
@@ -265,7 +299,9 @@ export function ExtensionDetailBlade({ extensionId }: ExtensionDetailBladeProps)
       )}
 
       {/* Manifest-declared contributions (static, from manifest JSON) */}
-      {(manifestBlades.length > 0 || manifestCommands.length > 0 || manifestToolbar.length > 0) && (
+      {(manifestBlades.length > 0 ||
+        manifestCommands.length > 0 ||
+        manifestToolbar.length > 0) && (
         <Section title="Manifest Contributions" icon={Blocks}>
           <div className="space-y-3">
             {manifestBlades.length > 0 && (
diff --git a/src/core/blades/extension-manager/ExtensionManagerBlade.tsx b/src/core/blades/extension-manager/ExtensionManagerBlade.tsx
index a9ffe5f0..db2dd981 100644
--- a/src/core/blades/extension-manager/ExtensionManagerBlade.tsx
+++ b/src/core/blades/extension-manager/ExtensionManagerBlade.tsx
@@ -1,4 +1,4 @@
-import { useState, useMemo } from "react";
+import type { LucideIcon } from "lucide-react";
 import {
   Eye,
   FolderOpen,
@@ -9,19 +9,19 @@ import {
   Search,
   Workflow,
 } from "lucide-react";
-import type { LucideIcon } from "lucide-react";
+import { useMemo, useState } from "react";
 import { useExtensionHost } from "@/framework/extension-system/ExtensionHost";
-import { useGitOpsStore as useRepositoryStore } from "../../stores/domain/git-ops";
-import { commands } from "../../../bindings";
 import { toast } from "@/framework/stores/toast";
-import { Button } from "../../components/ui/button";
-import { ExtensionCard } from "./components/ExtensionCard";
-import { InstallExtensionDialog } from "./components/InstallExtensionDialog";
+import { commands } from "../../../bindings";
 import {
-  groupExtensionsByCategory,
-  getCategoryMeta,
   type ExtensionCategory,
+  getCategoryMeta,
+  groupExtensionsByCategory,
 } from "../../../extensions/extensionCategories";
+import { Button } from "../../components/ui/button";
+import { useGitOpsStore as useRepositoryStore } from "../../stores/domain/git-ops";
+import { ExtensionCard } from "./components/ExtensionCard";
+import { InstallExtensionDialog } from "./components/InstallExtensionDialog";
 
 const CATEGORY_ICONS: Record<ExtensionCategory, LucideIcon> = {
   "source-control": GitBranch,
@@ -38,7 +38,7 @@ export function ExtensionManagerBlade() {
   const discoverExtensions = useExtensionHost((s) => s.discoverExtensions);
   const repoPath = useRepositoryStore((s) => s.repoStatus?.repoPath ?? "");
 
-  const extensionsDir = repoPath ? repoPath + "/.flowforge/extensions" : "";
+  const extensionsDir = repoPath ? `${repoPath}/.flowforge/extensions` : "";
 
   // Convert Map to sorted array, filtered by search, grouped by category
   const { categorizedBuiltIn, installedExts } = useMemo(() => {
@@ -53,7 +53,9 @@ export function ExtensionManagerBlade() {
       : all;
 
     const builtIn = filtered.filter((ext) => ext.builtIn);
-    const installed = filtered.filter((ext) => !ext.builtIn).sort((a, b) => a.name.localeCompare(b.name));
+    const installed = filtered
+      .filter((ext) => !ext.builtIn)
+      .sort((a, b) => a.name.localeCompare(b.name));
 
     return {
       categorizedBuiltIn: groupExtensionsByCategory(builtIn),
@@ -64,7 +66,10 @@ export function ExtensionManagerBlade() {
   const handleUninstall = async (extensionId: string) => {
     if (!extensionsDir) return;
     try {
-      const result = await commands.extensionUninstall(extensionId, extensionsDir);
+      const result = await commands.extensionUninstall(
+        extensionId,
+        extensionsDir,
+      );
       if (result.status === "error") {
         toast.error(`Uninstall failed: ${result.error}`);
         return;
@@ -75,7 +80,9 @@ export function ExtensionManagerBlade() {
         await discoverExtensions(repoPath);
       }
     } catch (e) {
-      toast.error(`Uninstall failed: ${e instanceof Error ? e.message : String(e)}`);
+      toast.error(
+        `Uninstall failed: ${e instanceof Error ? e.message : String(e)}`,
+      );
     }
   };
 
@@ -160,7 +167,9 @@ export function ExtensionManagerBlade() {
           <div className="flex flex-col items-center justify-center py-12 text-ctp-overlay0">
             <Puzzle className="w-10 h-10 mb-3 opacity-50" />
             <p className="text-sm">
-              {searchQuery ? "No extensions match your search" : "No extensions found"}
+              {searchQuery
+                ? "No extensions match your search"
+                : "No extensions found"}
             </p>
           </div>
         )}
diff --git a/src/core/blades/extension-manager/components/ExtensionCard.tsx b/src/core/blades/extension-manager/components/ExtensionCard.tsx
index a309cce1..991bdda3 100644
--- a/src/core/blades/extension-manager/components/ExtensionCard.tsx
+++ b/src/core/blades/extension-manager/components/ExtensionCard.tsx
@@ -1,12 +1,12 @@
-import { useState } from "react";
 import { ChevronRight, Trash2 } from "lucide-react";
+import { useState } from "react";
+import { useExtensionHost } from "@/framework/extension-system/ExtensionHost";
 import type { ExtensionInfo } from "@/framework/extension-system/types";
-import { ToggleSwitch } from "../../../components/ui/ToggleSwitch";
+import { toast } from "@/framework/stores/toast";
+import { Button } from "../../../components/ui/button";
 import { PermissionBadge } from "../../../components/ui/PermissionBadge";
-import { useExtensionHost } from "@/framework/extension-system/ExtensionHost";
+import { ToggleSwitch } from "../../../components/ui/ToggleSwitch";
 import { useBladeNavigation } from "../../../hooks/useBladeNavigation";
-import { Button } from "../../../components/ui/button";
-import { toast } from "@/framework/stores/toast";
 import { cn } from "../../../lib/utils";
 
 interface ExtensionCardProps {
@@ -42,14 +42,20 @@ export function ExtensionCard({ extension, onUninstall }: ExtensionCardProps) {
         toast.success(`${extension.name} enabled`);
       }
     } catch (e) {
-      toast.error(`Failed to toggle: ${e instanceof Error ? e.message : String(e)}`);
+      toast.error(
+        `Failed to toggle: ${e instanceof Error ? e.message : String(e)}`,
+      );
     } finally {
       setIsToggling(false);
     }
   };
 
   const handleOpenDetail = () => {
-    openBlade("extension-detail", { extensionId: extension.id }, extension.name);
+    openBlade(
+      "extension-detail",
+      { extensionId: extension.id },
+      extension.name,
+    );
   };
 
   return (
@@ -77,7 +83,9 @@ export function ExtensionCard({ extension, onUninstall }: ExtensionCardProps) {
             <span className="text-sm font-medium text-ctp-text truncate">
               {extension.name}
             </span>
-            <span className="text-xs text-ctp-overlay0">{extension.version}</span>
+            <span className="text-xs text-ctp-overlay0">
+              {extension.version}
+            </span>
             {isBuiltIn && (
               <span className="text-[10px] px-1.5 py-0.5 rounded-full bg-ctp-surface1 text-ctp-subtext0 font-medium">
                 Built-in
@@ -116,7 +124,10 @@ export function ExtensionCard({ extension, onUninstall }: ExtensionCardProps) {
 
         {/* Right side */}
         {/* eslint-disable-next-line jsx-a11y/click-events-have-key-events, jsx-a11y/no-static-element-interactions */}
-        <div className="flex items-center gap-2 shrink-0" onClick={(e) => e.stopPropagation()}>
+        <div
+          className="flex items-center gap-2 shrink-0"
+          onClick={(e) => e.stopPropagation()}
+        >
           {!isError && (
             <ToggleSwitch
               checked={isActive}
diff --git a/src/core/blades/extension-manager/components/InstallExtensionDialog.tsx b/src/core/blades/extension-manager/components/InstallExtensionDialog.tsx
index 380b7ef8..5325aa05 100644
--- a/src/core/blades/extension-manager/components/InstallExtensionDialog.tsx
+++ b/src/core/blades/extension-manager/components/InstallExtensionDialog.tsx
@@ -1,11 +1,23 @@
-import { useState } from "react";
 import { CheckCircle, Download, Loader2, XCircle } from "lucide-react";
-import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogFooter } from "../../../components/ui/dialog";
+import { useState } from "react";
+import { commands } from "../../../../bindings";
 import { Button } from "../../../components/ui/button";
+import {
+  Dialog,
+  DialogContent,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from "../../../components/ui/dialog";
 import { PermissionBadge } from "../../../components/ui/PermissionBadge";
-import { commands } from "../../../../bindings";
 
-type Step = "input" | "fetching" | "review" | "installing" | "success" | "error";
+type Step =
+  | "input"
+  | "fetching"
+  | "review"
+  | "installing"
+  | "success"
+  | "error";
 
 interface InstallExtensionDialogProps {
   open: boolean;
@@ -88,7 +100,9 @@ export function InstallExtensionDialog({
   let manifest: Record<string, unknown> | null = null;
   try {
     if (manifestJson) manifest = JSON.parse(manifestJson);
-  } catch { /* ignore */ }
+  } catch {
+    /* ignore */
+  }
 
   return (
     <Dialog open={open} onOpenChange={handleClose}>
@@ -104,7 +118,10 @@ export function InstallExtensionDialog({
         {step === "input" && (
           <div className="space-y-4">
             <div>
-              <label htmlFor="ext-url" className="block text-xs font-medium text-ctp-subtext1 mb-1">
+              <label
+                htmlFor="ext-url"
+                className="block text-xs font-medium text-ctp-subtext1 mb-1"
+              >
                 Git Repository URL
               </label>
               <input
@@ -119,7 +136,9 @@ export function InstallExtensionDialog({
               />
             </div>
             <DialogFooter>
-              <Button variant="ghost" onClick={handleClose}>Cancel</Button>
+              <Button variant="ghost" onClick={handleClose}>
+                Cancel
+              </Button>
               <Button onClick={handleFetch} disabled={!url.trim()}>
                 Fetch Manifest
               </Button>
@@ -148,15 +167,21 @@ export function InstallExtensionDialog({
                 </span>
               </div>
               {typeof manifest.description === "string" && (
-                <p className="text-xs text-ctp-overlay0">{manifest.description}</p>
+                <p className="text-xs text-ctp-overlay0">
+                  {manifest.description}
+                </p>
               )}
 
               {/* Permissions */}
               {(() => {
-                const perms = Array.isArray(manifest.permissions) ? (manifest.permissions as string[]) : [];
+                const perms = Array.isArray(manifest.permissions)
+                  ? (manifest.permissions as string[])
+                  : [];
                 return perms.length > 0 ? (
                   <div className="space-y-1">
-                    <p className="text-xs font-medium text-ctp-subtext1">Permissions</p>
+                    <p className="text-xs font-medium text-ctp-subtext1">
+                      Permissions
+                    </p>
                     <div className="flex gap-1 flex-wrap">
                       {perms.map((perm) => (
                         <PermissionBadge key={perm} permission={perm} />
@@ -170,9 +195,13 @@ export function InstallExtensionDialog({
               {(() => {
                 if (!manifest.contributes) return null;
                 const c = manifest.contributes as Record<string, unknown>;
-                const bladeCount = Array.isArray(c.blades) ? c.blades.length : 0;
-                const cmdCount = Array.isArray(c.commands) ? c.commands.length : 0;
-                return (bladeCount > 0 || cmdCount > 0) ? (
+                const bladeCount = Array.isArray(c.blades)
+                  ? c.blades.length
+                  : 0;
+                const cmdCount = Array.isArray(c.commands)
+                  ? c.commands.length
+                  : 0;
+                return bladeCount > 0 || cmdCount > 0 ? (
                   <div className="text-[10px] text-ctp-overlay0 flex gap-3">
                     {bladeCount > 0 && <span>Blades: {bladeCount}</span>}
                     {cmdCount > 0 && <span>Commands: {cmdCount}</span>}
@@ -182,7 +211,9 @@ export function InstallExtensionDialog({
             </div>
 
             <DialogFooter>
-              <Button variant="ghost" onClick={handleClose}>Cancel</Button>
+              <Button variant="ghost" onClick={handleClose}>
+                Cancel
+              </Button>
               <Button onClick={handleInstall}>Install &amp; Activate</Button>
             </DialogFooter>
           </div>
@@ -202,7 +233,9 @@ export function InstallExtensionDialog({
             <div className="flex flex-col items-center py-6 gap-3">
               <CheckCircle className="w-10 h-10 text-ctp-green" />
               <p className="text-sm text-ctp-text font-medium">
-                {manifest?.name ? `${manifest.name as string} installed` : "Extension installed"}
+                {manifest?.name
+                  ? `${manifest.name as string} installed`
+                  : "Extension installed"}
               </p>
             </div>
             <DialogFooter>
@@ -219,7 +252,9 @@ export function InstallExtensionDialog({
               <p className="text-sm text-ctp-red">{errorMessage}</p>
             </div>
             <DialogFooter>
-              <Button variant="ghost" onClick={handleClose}>Cancel</Button>
+              <Button variant="ghost" onClick={handleClose}>
+                Cancel
+              </Button>
               <Button onClick={reset}>Try Again</Button>
             </DialogFooter>
           </div>
diff --git a/src/core/blades/extension-manager/registration.ts b/src/core/blades/extension-manager/registration.ts
index 33ca1435..2064198a 100644
--- a/src/core/blades/extension-manager/registration.ts
+++ b/src/core/blades/extension-manager/registration.ts
@@ -2,7 +2,9 @@ import { lazy } from "react";
 import { registerBlade } from "@/framework/layout/bladeRegistry";
 
 const ExtensionManagerBlade = lazy(() =>
-  import("./ExtensionManagerBlade").then((m) => ({ default: m.ExtensionManagerBlade })),
+  import("./ExtensionManagerBlade").then((m) => ({
+    default: m.ExtensionManagerBlade,
+  })),
 );
 
 registerBlade({
diff --git a/src/core/blades/settings/SettingsBlade.tsx b/src/core/blades/settings/SettingsBlade.tsx
index a4269383..19c1ec16 100644
--- a/src/core/blades/settings/SettingsBlade.tsx
+++ b/src/core/blades/settings/SettingsBlade.tsx
@@ -1,14 +1,14 @@
-import { useCallback } from "react";
 import {
   ClipboardCheck,
   GitBranch,
-  PanelTop,
   Palette,
+  PanelTop,
   Settings,
   Wrench,
 } from "lucide-react";
-import type { SettingsCategory } from "../../stores/domain/preferences/settings.slice";
+import { useCallback } from "react";
 import { usePreferencesStore as useSettingsStore } from "../../stores/domain/preferences";
+import type { SettingsCategory } from "../../stores/domain/preferences/settings.slice";
 import { AppearanceSettings } from "./components/AppearanceSettings";
 import { GeneralSettings } from "./components/GeneralSettings";
 import { GitSettings } from "./components/GitSettings";
@@ -63,7 +63,10 @@ const settingsTabs: SettingsTab[] = [
 ];
 
 export function SettingsBlade() {
-  const { settingsActiveCategory: activeCategory, setSettingsCategory: setCategory } = useSettingsStore();
+  const {
+    settingsActiveCategory: activeCategory,
+    setSettingsCategory: setCategory,
+  } = useSettingsStore();
 
   const activeTab =
     settingsTabs.find((t) => t.id === activeCategory) ?? settingsTabs[0];
diff --git a/src/core/blades/settings/components/AppearanceSettings.tsx b/src/core/blades/settings/components/AppearanceSettings.tsx
index 0711260e..0a63af3c 100644
--- a/src/core/blades/settings/components/AppearanceSettings.tsx
+++ b/src/core/blades/settings/components/AppearanceSettings.tsx
@@ -1,6 +1,6 @@
 import { Monitor, Moon, Sun } from "lucide-react";
-import type { Theme } from "../../../stores/domain/preferences/theme.slice";
 import { usePreferencesStore as useThemeStore } from "../../../stores/domain/preferences";
+import type { Theme } from "../../../stores/domain/preferences/theme.slice";
 
 const themeOptions: { value: Theme; icon: React.ReactNode; label: string }[] = [
   { value: "light", icon: <Sun className="w-4 h-4" />, label: "Light" },
diff --git a/src/core/blades/settings/components/GeneralSettings.tsx b/src/core/blades/settings/components/GeneralSettings.tsx
index 8d4e5e28..c38af091 100644
--- a/src/core/blades/settings/components/GeneralSettings.tsx
+++ b/src/core/blades/settings/components/GeneralSettings.tsx
@@ -30,7 +30,11 @@ export function GeneralSettings() {
                     key={option.value}
                     type="button"
                     disabled={disabled}
-                    title={disabled ? "Enable the Topology extension to use this option" : undefined}
+                    title={
+                      disabled
+                        ? "Enable the Topology extension to use this option"
+                        : undefined
+                    }
                     onClick={() =>
                       updateSetting("general", "defaultTab", option.value)
                     }
diff --git a/src/core/blades/settings/components/GitSettings.tsx b/src/core/blades/settings/components/GitSettings.tsx
index f404260c..3ecc588a 100644
--- a/src/core/blades/settings/components/GitSettings.tsx
+++ b/src/core/blades/settings/components/GitSettings.tsx
@@ -58,7 +58,7 @@ export function GitSettings() {
     (
       key: string,
       value: string,
-      timerRef: React.MutableRefObject<ReturnType<typeof setTimeout> | null>
+      timerRef: React.MutableRefObject<ReturnType<typeof setTimeout> | null>,
     ) => {
       if (timerRef.current) clearTimeout(timerRef.current);
 
@@ -77,7 +77,7 @@ export function GitSettings() {
         }, 2000);
       }, GIT_CONFIG_DEBOUNCE_MS);
     },
-    []
+    [],
   );
 
   const handleNameChange = useCallback(
@@ -85,7 +85,7 @@ export function GitSettings() {
       setUserName(e.target.value);
       saveGitConfig("user.name", e.target.value, nameTimerRef);
     },
-    [saveGitConfig]
+    [saveGitConfig],
   );
 
   const handleEmailChange = useCallback(
@@ -93,7 +93,7 @@ export function GitSettings() {
       setUserEmail(e.target.value);
       saveGitConfig("user.email", e.target.value, emailTimerRef);
     },
-    [saveGitConfig]
+    [saveGitConfig],
   );
 
   const handleBranchChange = useCallback(
@@ -101,7 +101,7 @@ export function GitSettings() {
       setDefaultBranch(e.target.value);
       saveGitConfig("init.defaultBranch", e.target.value, branchTimerRef);
     },
-    [saveGitConfig]
+    [saveGitConfig],
   );
 
   return (
@@ -219,7 +219,7 @@ export function GitSettings() {
                     updateSetting(
                       "git",
                       "autoFetchInterval",
-                      e.target.checked ? 5 : null
+                      e.target.checked ? 5 : null,
                     )
                   }
                   className="w-4 h-4 rounded border-ctp-surface1 bg-ctp-surface0 text-ctp-blue focus:ring-ctp-blue focus:ring-offset-0"
@@ -239,7 +239,7 @@ export function GitSettings() {
                       updateSetting(
                         "git",
                         "autoFetchInterval",
-                        parseInt(e.target.value) || 5
+                        parseInt(e.target.value, 10) || 5,
                       )
                     }
                     className="w-20 px-3 py-2 bg-ctp-surface0 border border-ctp-surface1 rounded-md text-sm text-ctp-text focus:outline-none focus:ring-2 focus:ring-ctp-blue focus:border-transparent"
diff --git a/src/core/blades/settings/components/IntegrationsSettings.tsx b/src/core/blades/settings/components/IntegrationsSettings.tsx
index d27cf4bb..9b9987d4 100644
--- a/src/core/blades/settings/components/IntegrationsSettings.tsx
+++ b/src/core/blades/settings/components/IntegrationsSettings.tsx
@@ -1,10 +1,10 @@
 import { useMemo, useState } from "react";
-import { usePreferencesStore as useSettingsStore } from "../../../stores/domain/preferences";
 import {
   type AppOption,
   getEditorOptions,
   getTerminalOptions,
 } from "../../../lib/integrations-options";
+import { usePreferencesStore as useSettingsStore } from "../../../stores/domain/preferences";
 import { SettingsField } from "./SettingsField";
 
 const CUSTOM_SENTINEL = "__custom__";
@@ -107,9 +107,7 @@ export function IntegrationsSettings() {
   return (
     <div className="space-y-6">
       <div>
-        <h3 className="text-lg font-medium text-ctp-text mb-1">
-          Integrations
-        </h3>
+        <h3 className="text-lg font-medium text-ctp-text mb-1">Integrations</h3>
         <p className="text-sm text-ctp-subtext0 mb-4">
           Configure which external editor and terminal to open from FlowForge.
         </p>
diff --git a/src/core/blades/settings/components/ReviewSettings.tsx b/src/core/blades/settings/components/ReviewSettings.tsx
index d6d828f9..74fa8b26 100644
--- a/src/core/blades/settings/components/ReviewSettings.tsx
+++ b/src/core/blades/settings/components/ReviewSettings.tsx
@@ -1,7 +1,10 @@
 import { Plus, RotateCcw, Trash2 } from "lucide-react";
 import { useCallback, useState } from "react";
-import { DEFAULT_CHECKLIST, type FlowType } from "../../../stores/domain/preferences/review-checklist.slice";
 import { usePreferencesStore as useReviewChecklistStore } from "../../../stores/domain/preferences";
+import {
+  DEFAULT_CHECKLIST,
+  type FlowType,
+} from "../../../stores/domain/preferences/review-checklist.slice";
 
 const inputClassName =
   "w-full max-w-xs px-3 py-2 bg-ctp-surface0 border border-ctp-surface1 rounded-md text-sm text-ctp-text placeholder-ctp-overlay0 focus:outline-none focus:ring-2 focus:ring-ctp-blue focus:border-transparent";
@@ -12,9 +15,18 @@ const FLOW_TYPES: { type: FlowType; label: string }[] = [
   { type: "hotfix", label: "Hotfix" },
 ];
 
-function FlowSection({ flowType, label }: { flowType: FlowType; label: string }) {
-  const { getChecklistItems: getItems, updateChecklistItems: updateItems, resetChecklistToDefaults: resetToDefaults } =
-    useReviewChecklistStore();
+function FlowSection({
+  flowType,
+  label,
+}: {
+  flowType: FlowType;
+  label: string;
+}) {
+  const {
+    getChecklistItems: getItems,
+    updateChecklistItems: updateItems,
+    resetChecklistToDefaults: resetToDefaults,
+  } = useReviewChecklistStore();
   const items = getItems(flowType);
   const [newLabel, setNewLabel] = useState("");
 
diff --git a/src/core/blades/settings/components/SettingsField.tsx b/src/core/blades/settings/components/SettingsField.tsx
index b6ce0809..ce5972dc 100644
--- a/src/core/blades/settings/components/SettingsField.tsx
+++ b/src/core/blades/settings/components/SettingsField.tsx
@@ -5,7 +5,12 @@ interface SettingsFieldProps {
   children: React.ReactNode;
 }
 
-export function SettingsField({ label, description, htmlFor, children }: SettingsFieldProps) {
+export function SettingsField({
+  label,
+  description,
+  htmlFor,
+  children,
+}: SettingsFieldProps) {
   return (
     <div>
       <label
diff --git a/src/core/blades/settings/components/ToolbarSettings.tsx b/src/core/blades/settings/components/ToolbarSettings.tsx
index 6f4b6950..3086d259 100644
--- a/src/core/blades/settings/components/ToolbarSettings.tsx
+++ b/src/core/blades/settings/components/ToolbarSettings.tsx
@@ -1,11 +1,11 @@
 import {
-  type ToolbarAction,
+  getGroupedToolbarActions,
   TOOLBAR_GROUP_ORDER,
+  type ToolbarAction,
   useToolbarRegistry,
-  getGroupedToolbarActions,
 } from "@/framework/extension-system/toolbarRegistry";
-import { usePreferencesStore as useSettingsStore } from "../../../stores/domain/preferences";
 import { formatShortcut } from "../../../hooks/useKeyboardShortcuts";
+import { usePreferencesStore as useSettingsStore } from "../../../stores/domain/preferences";
 
 /**
  * Settings panel for showing/hiding individual toolbar actions.
@@ -16,7 +16,7 @@ export function ToolbarSettings() {
   const { settingsData, updateSetting } = useSettingsStore();
   const hiddenActions = settingsData.toolbar?.hiddenActions ?? [];
 
-  const grouped = getGroupedToolbarActions();
+  const _grouped = getGroupedToolbarActions();
 
   // Get all actions (not filtered by when()) so users can configure
   // visibility of repo-specific actions even when no repo is open
diff --git a/src/core/blades/staging-changes/StagingChangesBlade.test.tsx b/src/core/blades/staging-changes/StagingChangesBlade.test.tsx
index 99af6376..0553fe7f 100644
--- a/src/core/blades/staging-changes/StagingChangesBlade.test.tsx
+++ b/src/core/blades/staging-changes/StagingChangesBlade.test.tsx
@@ -7,7 +7,14 @@ const mockCommands = vi.hoisted(() => ({
   }),
   getFileDiff: vi.fn().mockResolvedValue({
     status: "ok",
-    data: { path: "", oldContent: "", newContent: "", hunks: [], isBinary: false, language: "text" },
+    data: {
+      path: "",
+      oldContent: "",
+      newContent: "",
+      hunks: [],
+      isBinary: false,
+      language: "text",
+    },
   }),
   stageFile: vi.fn().mockResolvedValue({ status: "ok", data: null }),
   unstageFile: vi.fn().mockResolvedValue({ status: "ok", data: null }),
diff --git a/src/core/blades/staging-changes/StagingChangesBlade.tsx b/src/core/blades/staging-changes/StagingChangesBlade.tsx
index 46209881..6e19a747 100644
--- a/src/core/blades/staging-changes/StagingChangesBlade.tsx
+++ b/src/core/blades/staging-changes/StagingChangesBlade.tsx
@@ -1,18 +1,21 @@
 import { useQuery, useQueryClient } from "@tanstack/react-query";
 import { type FocusEvent, useCallback, useMemo, useRef, useState } from "react";
-import type { FileChange } from "../../../bindings";
 import { commands } from "../../../bindings";
+import { SplitPaneLayout } from "../../components/layout";
 import { useBladeNavigation } from "../../hooks/useBladeNavigation";
-import { useStagingKeyboard } from "./hooks/useStagingKeyboard";
 import { useUIStore as useStagingStore } from "../../stores/domain/ui-state";
-import { SplitPaneLayout } from "../../components/layout";
 import { StagingDiffPreview } from "./components/StagingDiffPreview";
 import { StagingPanel } from "./components/StagingPanel";
+import { useStagingKeyboard } from "./hooks/useStagingKeyboard";
 
 export function StagingChangesBlade() {
   const { openStagingDiff } = useBladeNavigation();
   const queryClient = useQueryClient();
-  const { stagingSelectedFile: selectedFile, stagingSelectedSection: selectedSection, selectFile } = useStagingStore();
+  const {
+    stagingSelectedFile: selectedFile,
+    stagingSelectedSection: selectedSection,
+    selectFile,
+  } = useStagingStore();
   const [fileListFocused, setFileListFocused] = useState(false);
   const fileListRef = useRef<HTMLDivElement>(null);
 
@@ -101,7 +104,6 @@ export function StagingChangesBlade() {
       primary={
         <div
           ref={fileListRef}
-          tabIndex={0}
           role="region"
           aria-label="Changed files"
           onFocus={handleFocus}
diff --git a/src/core/blades/staging-changes/components/DiffPreviewHeader.tsx b/src/core/blades/staging-changes/components/DiffPreviewHeader.tsx
index 6654dc84..0539dfe1 100644
--- a/src/core/blades/staging-changes/components/DiffPreviewHeader.tsx
+++ b/src/core/blades/staging-changes/components/DiffPreviewHeader.tsx
@@ -20,8 +20,7 @@ export function DiffPreviewHeader({
 }: DiffPreviewHeaderProps) {
   const lastSlash = filePath.lastIndexOf("/");
   const dir = lastSlash >= 0 ? filePath.slice(0, lastSlash + 1) : "";
-  const filename =
-    lastSlash >= 0 ? filePath.slice(lastSlash + 1) : filePath;
+  const filename = lastSlash >= 0 ? filePath.slice(lastSlash + 1) : filePath;
 
   return (
     <div className="flex items-center gap-2 px-3 py-1.5 border-b border-ctp-surface0 bg-ctp-crust shrink-0">
diff --git a/src/core/blades/staging-changes/components/FileItem.tsx b/src/core/blades/staging-changes/components/FileItem.tsx
index 4913b690..74731c52 100644
--- a/src/core/blades/staging-changes/components/FileItem.tsx
+++ b/src/core/blades/staging-changes/components/FileItem.tsx
@@ -3,9 +3,9 @@ import { AlertTriangle, Check, X } from "lucide-react";
 import { useEffect, useRef } from "react";
 import type { FileChange, FileStatus } from "../../../../bindings";
 import { commands } from "../../../../bindings";
+import { FileTypeIcon } from "../../../components/icons/FileTypeIcon";
 import { cn } from "../../../lib/utils";
 import { useUIStore as useStagingStore } from "../../../stores/domain/ui-state";
-import { FileTypeIcon } from "../../../components/icons/FileTypeIcon";
 
 interface FileItemProps {
   file: FileChange;
@@ -112,9 +112,7 @@ export function FileItem({
         <FileTypeIcon path={file.path} className="w-4 h-4" />
         {file.status === "conflicted" ? (
           <span title="Conflicted">
-            <AlertTriangle
-              className="absolute -bottom-0.5 -right-1 w-3 h-3 text-ctp-red"
-            />
+            <AlertTriangle className="absolute -bottom-0.5 -right-1 w-3 h-3 text-ctp-red" />
           </span>
         ) : (
           <span
diff --git a/src/core/blades/staging-changes/components/FileTreeSearch.tsx b/src/core/blades/staging-changes/components/FileTreeSearch.tsx
index d9052a90..9d8bc786 100644
--- a/src/core/blades/staging-changes/components/FileTreeSearch.tsx
+++ b/src/core/blades/staging-changes/components/FileTreeSearch.tsx
@@ -23,7 +23,7 @@ export function FileTreeSearch({
         className={cn(
           "w-full pl-8 pr-8 py-1.5 text-sm bg-ctp-surface0 border border-ctp-surface1 rounded",
           "text-ctp-text placeholder:text-ctp-overlay0",
-          "focus:outline-none focus:border-ctp-blue focus:ring-1 focus:ring-ctp-blue"
+          "focus:outline-none focus:border-ctp-blue focus:ring-1 focus:ring-ctp-blue",
         )}
       />
       {value && (
diff --git a/src/core/blades/staging-changes/components/FileTreeView.tsx b/src/core/blades/staging-changes/components/FileTreeView.tsx
index e2db77a5..904fe3a9 100644
--- a/src/core/blades/staging-changes/components/FileTreeView.tsx
+++ b/src/core/blades/staging-changes/components/FileTreeView.tsx
@@ -1,8 +1,8 @@
 import { Check, ChevronDown, ChevronRight, X } from "lucide-react";
 import { useMemo, useState } from "react";
 import type { FileChange } from "../../../../bindings";
-import { cn } from "../../../lib/utils";
 import { FileTypeIcon } from "../../../components/icons/FileTypeIcon";
+import { cn } from "../../../lib/utils";
 import { FileItem } from "./FileItem";
 
 interface FileTreeNode {
@@ -251,7 +251,9 @@ function TreeNode({
                     section={section}
                     depth={0}
                     showFilenameOnly
-                    isPartiallyStaged={partiallyStagedPaths?.has(child.file.path)}
+                    isPartiallyStaged={partiallyStagedPaths?.has(
+                      child.file.path,
+                    )}
                   />
                 ) : null}
               </ConnectorRow>
diff --git a/src/core/blades/staging-changes/components/NonTextPlaceholder.tsx b/src/core/blades/staging-changes/components/NonTextPlaceholder.tsx
index 04737717..2294c61c 100644
--- a/src/core/blades/staging-changes/components/NonTextPlaceholder.tsx
+++ b/src/core/blades/staging-changes/components/NonTextPlaceholder.tsx
@@ -1,5 +1,5 @@
-import type { ComponentType } from "react";
 import { Maximize2 } from "lucide-react";
+import type { ComponentType } from "react";
 
 interface NonTextPlaceholderProps {
   icon: ComponentType<{ className?: string }>;
diff --git a/src/core/blades/staging-changes/components/StagingDiffPreview.tsx b/src/core/blades/staging-changes/components/StagingDiffPreview.tsx
index ba0f655e..a76b9eff 100644
--- a/src/core/blades/staging-changes/components/StagingDiffPreview.tsx
+++ b/src/core/blades/staging-changes/components/StagingDiffPreview.tsx
@@ -24,12 +24,17 @@ export function StagingDiffPreview({
   hasPrev,
   hasNext,
 }: StagingDiffPreviewProps) {
-  const { stagingScrollPositions: scrollPositions, saveStagingScrollPosition: saveScrollPosition } = useStagingStore();
+  const {
+    stagingScrollPositions: scrollPositions,
+    saveStagingScrollPosition: saveScrollPosition,
+  } = useStagingStore();
 
   if (!file) {
     return (
       <div className="flex-1 flex items-center justify-center bg-ctp-mantle">
-        <p className="text-ctp-overlay0 text-sm">Select a file to preview diff</p>
+        <p className="text-ctp-overlay0 text-sm">
+          Select a file to preview diff
+        </p>
       </div>
     );
   }
diff --git a/src/core/blades/staging-changes/components/StagingPanel.tsx b/src/core/blades/staging-changes/components/StagingPanel.tsx
index 752a2a73..cf873049 100644
--- a/src/core/blades/staging-changes/components/StagingPanel.tsx
+++ b/src/core/blades/staging-changes/components/StagingPanel.tsx
@@ -3,19 +3,26 @@ import { AlertTriangle, FileCheck, FolderTree, List } from "lucide-react";
 import { useEffect, useMemo, useRef, useState } from "react";
 import type { FileChange } from "../../../../bindings";
 import { commands } from "../../../../bindings";
+import { Button } from "../../../components/ui/button";
+import { EmptyState } from "../../../components/ui/EmptyState";
+import { Skeleton } from "../../../components/ui/Skeleton";
 import { formatShortcut } from "../../../hooks/useKeyboardShortcuts";
 import { cn } from "../../../lib/utils";
 import { useUIStore as useStagingStore } from "../../../stores/domain/ui-state";
-import { EmptyState } from "../../../components/ui/EmptyState";
-import { Skeleton } from "../../../components/ui/Skeleton";
-import { Button } from "../../../components/ui/button";
 import { FileList } from "./FileList";
 import { FileTreeSearch } from "./FileTreeSearch";
 import { FileTreeView } from "./FileTreeView";
 
 export function StagingPanel() {
   const queryClient = useQueryClient();
-  const { stagingViewMode: viewMode, setStagingViewMode: setViewMode, stagingSelectedFile: selectedFile, selectFile, stagingFileListScrollTop: fileListScrollTop, setStagingFileListScrollTop: setFileListScrollTop } = useStagingStore();
+  const {
+    stagingViewMode: viewMode,
+    setStagingViewMode: setViewMode,
+    stagingSelectedFile: selectedFile,
+    selectFile,
+    stagingFileListScrollTop: fileListScrollTop,
+    setStagingFileListScrollTop: setFileListScrollTop,
+  } = useStagingStore();
   const [searchFilter, setSearchFilter] = useState("");
   const [showConflictsOnly, setShowConflictsOnly] = useState(false);
   const scrollRef = useRef<HTMLDivElement>(null);
@@ -69,9 +76,11 @@ export function StagingPanel() {
   }, [result, selectedFile, selectFile]);
 
   // Reconcile selected file after stage/unstage (file moves between sections)
-  const stagedLen = result?.status === "ok" ? result.data.staged.length : 0;
-  const unstagedLen = result?.status === "ok" ? result.data.unstaged.length : 0;
-  const untrackedLen = result?.status === "ok" ? result.data.untracked.length : 0;
+  const _stagedLen = result?.status === "ok" ? result.data.staged.length : 0;
+  const _unstagedLen =
+    result?.status === "ok" ? result.data.unstaged.length : 0;
+  const _untrackedLen =
+    result?.status === "ok" ? result.data.untracked.length : 0;
 
   useEffect(() => {
     if (!selectedFile || !result || result.status !== "ok") return;
@@ -89,14 +98,14 @@ export function StagingPanel() {
     } else if (inUntracked) {
       selectFile(inUntracked, "untracked");
     }
-  }, [stagedLen, unstagedLen, untrackedLen]);
+  }, [result, selectFile, selectedFile]);
 
   // Restore scroll position on mount
   useEffect(() => {
     if (scrollRef.current && fileListScrollTop > 0) {
       scrollRef.current.scrollTop = fileListScrollTop;
     }
-  }, []);
+  }, [fileListScrollTop]);
 
   // Save scroll position on unmount
   useEffect(() => {
@@ -202,7 +211,9 @@ export function StagingPanel() {
               variant={showConflictsOnly ? "secondary" : "ghost"}
               size="sm"
               onClick={() => setShowConflictsOnly(!showConflictsOnly)}
-              title={showConflictsOnly ? "Show all files" : "Show only conflicts"}
+              title={
+                showConflictsOnly ? "Show all files" : "Show only conflicts"
+              }
               className={cn(
                 "h-6 px-1.5 gap-1 text-xs",
                 showConflictsOnly && "text-ctp-red",
diff --git a/src/core/commands/layout.ts b/src/core/commands/layout.ts
index a27d573a..9284d303 100644
--- a/src/core/commands/layout.ts
+++ b/src/core/commands/layout.ts
@@ -1,8 +1,8 @@
 import { Maximize2, PanelLeft, RotateCcw } from "lucide-react";
 import { registerCommand } from "@/framework/command-palette/commandRegistry";
 import { LAYOUT_PRESETS } from "@/framework/layout/layoutPresets";
-import { usePreferencesStore } from "../stores/domain/preferences";
 import { useGitOpsStore as useRepositoryStore } from "../stores/domain/git-ops";
+import { usePreferencesStore } from "../stores/domain/preferences";
 
 // Register one command per layout preset
 for (const preset of LAYOUT_PRESETS) {
diff --git a/src/core/commands/navigation.ts b/src/core/commands/navigation.ts
index 38996803..35356c62 100644
--- a/src/core/commands/navigation.ts
+++ b/src/core/commands/navigation.ts
@@ -1,9 +1,9 @@
 import { FileText, History, Search } from "lucide-react";
 import { registerCommand } from "@/framework/command-palette/commandRegistry";
+import { usePaletteStore as useCommandPaletteStore } from "@/framework/command-palette/paletteStore";
 import { useBladeRegistry } from "@/framework/layout/bladeRegistry";
 import { getNavigationActor } from "@/framework/layout/navigation/context";
 import { useGitOpsStore as useRepositoryStore } from "../stores/domain/git-ops";
-import { usePaletteStore as useCommandPaletteStore } from "@/framework/command-palette/paletteStore";
 
 registerCommand({
   id: "command-palette",
@@ -40,9 +40,11 @@ registerCommand({
   action: () => {
     const hasTopology = useBladeRegistry.getState().items.has("topology-graph");
     if (hasTopology) {
-      getNavigationActor().send({ type: "SWITCH_WORKFLOW", workflow: "topology" });
+      getNavigationActor().send({
+        type: "SWITCH_WORKFLOW",
+        workflow: "topology",
+      });
     }
   },
   enabled: () => !!useRepositoryStore.getState().repoStatus,
 });
-
diff --git a/src/core/commands/settings.ts b/src/core/commands/settings.ts
index caba35d8..c7906b82 100644
--- a/src/core/commands/settings.ts
+++ b/src/core/commands/settings.ts
@@ -1,8 +1,8 @@
 import { Settings, Sun } from "lucide-react";
 import { registerCommand } from "@/framework/command-palette/commandRegistry";
 import { openBlade } from "@/framework/layout/bladeOpener";
-import type { Theme } from "../stores/domain/preferences/theme.slice";
 import { usePreferencesStore as useThemeStore } from "../stores/domain/preferences";
+import type { Theme } from "../stores/domain/preferences/theme.slice";
 
 registerCommand({
   id: "open-settings",
diff --git a/src/core/commands/toolbar-actions.ts b/src/core/commands/toolbar-actions.ts
index fcc97334..9f011c67 100644
--- a/src/core/commands/toolbar-actions.ts
+++ b/src/core/commands/toolbar-actions.ts
@@ -10,17 +10,13 @@
  * Import this file at app startup (e.g., from App.tsx or commands/index.ts).
  */
 
+import { Palette, Search, Settings } from "lucide-react";
 import { createElement } from "react";
-import {
-  Palette,
-  Search,
-  Settings,
-} from "lucide-react";
-import { ThemeToggle } from "../components/ui/ThemeToggle";
-import { openBlade } from "@/framework/layout/bladeOpener";
+import { usePaletteStore as useCommandPaletteStore } from "@/framework/command-palette/paletteStore";
 import type { ToolbarAction } from "@/framework/extension-system/toolbarRegistry";
 import { useToolbarRegistry } from "@/framework/extension-system/toolbarRegistry";
-import { usePaletteStore as useCommandPaletteStore } from "@/framework/command-palette/paletteStore";
+import { openBlade } from "@/framework/layout/bladeOpener";
+import { ThemeToggle } from "../components/ui/ThemeToggle";
 
 // --- Core Actions ---
 
diff --git a/src/core/components/Header.tsx b/src/core/components/Header.tsx
index f735eada..0c4aa84f 100644
--- a/src/core/components/Header.tsx
+++ b/src/core/components/Header.tsx
@@ -1,17 +1,19 @@
 import { useCallback, useState } from "react";
-import { useRecentRepos } from "../hooks/useRecentRepos";
-import { useGitOpsStore as useBranchStore } from "../stores/domain/git-ops";
 import { getNavigationActor } from "@/framework/layout/navigation/context";
-import { usePreferencesStore as useNavigationStore } from "../stores/domain/preferences";
-import { useGitOpsStore as useRepositoryStore } from "../stores/domain/git-ops";
-import { useGitOpsStore as useStashStore } from "../stores/domain/git-ops";
-import { useGitOpsStore as useTagStore } from "../stores/domain/git-ops";
 import { toast } from "@/framework/stores/toast";
-import { useGitOpsStore as useUndoStore } from "../stores/domain/git-ops";
-import { WorkflowNavigation } from "../blades/_shared";
-import { MenuBar } from "./menu-bar";
 import { BranchSwitcher } from "../../extensions/branches/components/BranchSwitcher";
 import { RepoSwitcher } from "../../extensions/repository/components/RepoSwitcher";
+import { WorkflowNavigation } from "../blades/_shared";
+import { useRecentRepos } from "../hooks/useRecentRepos";
+import {
+  useGitOpsStore as useBranchStore,
+  useGitOpsStore as useRepositoryStore,
+  useGitOpsStore as useStashStore,
+  useGitOpsStore as useTagStore,
+  useGitOpsStore as useUndoStore,
+} from "../stores/domain/git-ops";
+import { usePreferencesStore as useNavigationStore } from "../stores/domain/preferences";
+import { MenuBar } from "./menu-bar";
 import { Toolbar } from "./toolbar/Toolbar";
 import { Button } from "./ui/button";
 
@@ -21,9 +23,13 @@ interface StashConfirmTarget {
 }
 
 export function Header() {
-  const { repoStatus: status, openRepository, refreshRepoStatus: refreshStatus } =
-    useRepositoryStore();
-  const { loadBranches, checkoutBranch, checkoutRemoteBranch } = useBranchStore();
+  const {
+    repoStatus: status,
+    openRepository,
+    refreshRepoStatus: refreshStatus,
+  } = useRepositoryStore();
+  const { loadBranches, checkoutBranch, checkoutRemoteBranch } =
+    useBranchStore();
   const { loadStashes, saveStash } = useStashStore();
   const { loadTags } = useTagStore();
   const { loadUndoInfo } = useUndoStore();
@@ -71,7 +77,17 @@ export function Header() {
         );
       }
     },
-    [status, navigationStore, openRepository, addRecentRepo, checkoutBranch, loadBranches, loadStashes, loadTags, loadUndoInfo],
+    [
+      status,
+      navigationStore,
+      openRepository,
+      addRecentRepo,
+      checkoutBranch,
+      loadBranches,
+      loadStashes,
+      loadTags,
+      loadUndoInfo,
+    ],
   );
 
   // Perform the actual branch switch (local or remote)
@@ -83,9 +99,14 @@ export function Header() {
           : await checkoutBranch(branchName);
 
         if (success) {
-          const localName = isRemote ? branchName.replace(/^[^/]+\//, "") : branchName;
+          const localName = isRemote
+            ? branchName.replace(/^[^/]+\//, "")
+            : branchName;
           if (status) {
-            await navigationStore.addNavRecentBranch(status.repoPath, localName);
+            await navigationStore.addNavRecentBranch(
+              status.repoPath,
+              localName,
+            );
           }
           await refreshStatus();
           toast.info(`Switched to ${localName}`);
@@ -96,7 +117,13 @@ export function Header() {
         );
       }
     },
-    [checkoutBranch, checkoutRemoteBranch, status, navigationStore, refreshStatus],
+    [
+      checkoutBranch,
+      checkoutRemoteBranch,
+      status,
+      navigationStore,
+      refreshStatus,
+    ],
   );
 
   // Branch switching: check dirty state first
@@ -117,7 +144,10 @@ export function Header() {
     const { branchName, isRemote } = stashConfirmTarget;
     setStashConfirmTarget(null);
 
-    const stashed = await saveStash(`Auto-stash before switching to ${branchName}`, true);
+    const stashed = await saveStash(
+      `Auto-stash before switching to ${branchName}`,
+      true,
+    );
     if (stashed) {
       await performBranchSwitch(branchName, isRemote);
     } else {
diff --git a/src/core/components/RepositoryView.tsx b/src/core/components/RepositoryView.tsx
index 042674bc..3e10ab43 100644
--- a/src/core/components/RepositoryView.tsx
+++ b/src/core/components/RepositoryView.tsx
@@ -1,24 +1,28 @@
-import {
-  Archive,
-  GitBranch,
-  Plus,
-  Tag,
-} from "lucide-react";
-import { Component, useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { Archive, GitBranch, Plus, Tag } from "lucide-react";
 import type { ErrorInfo, ReactNode } from "react";
-import { useGroupRef, usePanelRef } from "react-resizable-panels";
+import {
+  Component,
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from "react";
 import type { Layout } from "react-resizable-panels";
-import { useSidebarPanelRegistry, getVisiblePanels } from "@/framework/layout/sidebarPanelRegistry";
+import { useGroupRef, usePanelRef } from "react-resizable-panels";
 import { getPresetById } from "@/framework/layout/layoutPresets";
-import { useGitOpsStore as useRepositoryStore } from "../stores/domain/git-ops";
-import { usePreferencesStore } from "../stores/domain/preferences";
-import { BladeContainer } from "../blades/_shared";
+import {
+  getVisiblePanels,
+  useSidebarPanelRegistry,
+} from "@/framework/layout/sidebarPanelRegistry";
 import { BranchList } from "../../extensions/branches/components/BranchList";
-import { CommitForm } from "./commit/CommitForm";
-import { ResizablePanelLayout, ResizablePanel, ResizeHandle } from "./layout";
 import { StashList } from "../../extensions/stash/components/StashList";
 import { TagList } from "../../extensions/tags/components/TagList";
-
+import { BladeContainer } from "../blades/_shared";
+import { useGitOpsStore as useRepositoryStore } from "../stores/domain/git-ops";
+import { usePreferencesStore } from "../stores/domain/preferences";
+import { CommitForm } from "./commit/CommitForm";
+import { ResizablePanel, ResizablePanelLayout, ResizeHandle } from "./layout";
 
 // Minimal error boundary for extension panels (react-error-boundary not in deps)
 class ExtensionPanelErrorBoundary extends Component<
@@ -48,13 +52,10 @@ class ExtensionPanelErrorBoundary extends Component<
 }
 
 function DynamicSidebarPanels() {
-  const panels = useSidebarPanelRegistry((s) => s.items);
-  const visibilityTick = useSidebarPanelRegistry((s) => s.visibilityTick);
+  const _panels = useSidebarPanelRegistry((s) => s.items);
+  const _visibilityTick = useSidebarPanelRegistry((s) => s.visibilityTick);
 
-  const visiblePanels = useMemo(
-    () => getVisiblePanels(),
-    [panels, visibilityTick],
-  );
+  const visiblePanels = useMemo(() => getVisiblePanels(), []);
 
   if (visiblePanels.length === 0) return null;
 
@@ -69,15 +70,16 @@ function DynamicSidebarPanels() {
           <summary className="p-3 cursor-pointer hover:bg-ctp-surface0/50 flex items-center gap-2 select-none sticky top-0 z-10 bg-ctp-base/70 backdrop-blur-lg border-b border-ctp-surface0/50">
             <panel.icon className="w-4 h-4" />
             <span className="font-semibold text-sm flex-1">{panel.title}</span>
-            {panel.badge && (() => {
-              const value = panel.badge!();
-              if (value == null || value === 0 || value === '') return null;
-              return (
-                <span className="bg-ctp-blue text-ctp-base text-[10px] font-medium px-1.5 min-w-[18px] text-center rounded-full">
-                  {value}
-                </span>
-              );
-            })()}
+            {panel.badge &&
+              (() => {
+                const value = panel.badge?.();
+                if (value == null || value === 0 || value === "") return null;
+                return (
+                  <span className="bg-ctp-blue text-ctp-base text-[10px] font-medium px-1.5 min-w-[18px] text-center rounded-full">
+                    {value}
+                  </span>
+                );
+              })()}
             {panel.renderAction?.()}
           </summary>
           <ExtensionPanelErrorBoundary>
@@ -158,7 +160,15 @@ export function RepositoryView() {
       });
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [layoutState.focusedPanel]);
+  }, [
+    layoutState.focusedPanel,
+    groupRef.current,
+    layoutState.activePreset,
+    layoutState.hiddenPanels.includes,
+    layoutState.panelSizes,
+    sidebarRef.current?.collapse,
+    sidebarRef.current?.expand,
+  ]);
 
   // Handle sidebar toggle via hiddenPanels
   useEffect(() => {
@@ -190,126 +200,126 @@ export function RepositoryView() {
   if (!status) return null;
 
   return (
-    <>
-      <ResizablePanelLayout
-        autoSaveId="repo-layout"
-        direction="horizontal"
-        groupRef={groupRef}
-        onLayoutChanged={handleLayoutChanged}
+    <ResizablePanelLayout
+      autoSaveId="repo-layout"
+      direction="horizontal"
+      groupRef={groupRef}
+      onLayoutChanged={handleLayoutChanged}
+    >
+      {/* Left sidebar - Branches, Stash, Tags */}
+      <ResizablePanel
+        id="sidebar"
+        defaultSize={20}
+        minSize={15}
+        maxSize={30}
+        panelRef={sidebarRef}
+        collapsible
+        collapsedSize={0}
       >
-        {/* Left sidebar - Branches, Stash, Tags */}
-        <ResizablePanel
-          id="sidebar"
-          defaultSize={20}
-          minSize={15}
-          maxSize={30}
-          panelRef={sidebarRef}
-          collapsible
-          collapsedSize={0}
-        >
-          <div className="h-full border-r border-ctp-surface0 bg-ctp-base flex flex-col">
-            {/* Scrollable sections container */}
-            <div className="flex-1 overflow-y-auto">
-              {/* Branches section */}
-              <details open className="border-b border-ctp-surface0">
-                <summary className="p-3 cursor-pointer hover:bg-ctp-surface0/50 flex items-center gap-2 select-none sticky top-0 z-10 bg-ctp-base/70 backdrop-blur-lg border-b border-ctp-surface0/50">
-                  <GitBranch className="w-4 h-4" />
-                  <span className="font-semibold text-sm flex-1">Branches</span>
-                  <button
-                    type="button"
-                    onClick={(e) => {
-                      e.preventDefault();
-                      setShowBranchDialog(true);
-                    }}
-                    className="p-1 hover:bg-ctp-surface1 rounded text-ctp-subtext0 hover:text-ctp-text"
-                    title="Create new branch"
-                  >
-                    <Plus className="w-3.5 h-3.5" />
-                  </button>
-                </summary>
-                <BranchList
-                  showCreateDialog={showBranchDialog}
-                  onCloseCreateDialog={() => setShowBranchDialog(false)}
-                />
-              </details>
-
-              {/* Stash section */}
-              <details className="border-b border-ctp-surface0">
-                <summary className="p-3 cursor-pointer hover:bg-ctp-surface0/50 flex items-center gap-2 select-none sticky top-0 z-10 bg-ctp-base/70 backdrop-blur-lg border-b border-ctp-surface0/50">
-                  <Archive className="w-4 h-4" />
-                  <span className="font-semibold text-sm flex-1">Stashes</span>
-                  <button
-                    type="button"
-                    onClick={(e) => {
-                      e.preventDefault();
-                      setShowStashDialog(true);
-                    }}
-                    className="p-1 hover:bg-ctp-surface1 rounded text-ctp-subtext0 hover:text-ctp-text"
-                    title="Save new stash"
-                  >
-                    <Plus className="w-3.5 h-3.5" />
-                  </button>
-                </summary>
-                <StashList
-                  showSaveDialog={showStashDialog}
-                  onCloseSaveDialog={() => setShowStashDialog(false)}
-                />
-              </details>
+        <div className="h-full border-r border-ctp-surface0 bg-ctp-base flex flex-col">
+          {/* Scrollable sections container */}
+          <div className="flex-1 overflow-y-auto">
+            {/* Branches section */}
+            <details open className="border-b border-ctp-surface0">
+              <summary className="p-3 cursor-pointer hover:bg-ctp-surface0/50 flex items-center gap-2 select-none sticky top-0 z-10 bg-ctp-base/70 backdrop-blur-lg border-b border-ctp-surface0/50">
+                <GitBranch className="w-4 h-4" />
+                <span className="font-semibold text-sm flex-1">Branches</span>
+                <button
+                  type="button"
+                  onClick={(e) => {
+                    e.preventDefault();
+                    setShowBranchDialog(true);
+                  }}
+                  className="p-1 hover:bg-ctp-surface1 rounded text-ctp-subtext0 hover:text-ctp-text"
+                  title="Create new branch"
+                >
+                  <Plus className="w-3.5 h-3.5" />
+                </button>
+              </summary>
+              <BranchList
+                showCreateDialog={showBranchDialog}
+                onCloseCreateDialog={() => setShowBranchDialog(false)}
+              />
+            </details>
 
-              {/* Tags section */}
-              <details className="border-b border-ctp-surface0">
-                <summary className="p-3 cursor-pointer hover:bg-ctp-surface0/50 flex items-center gap-2 select-none sticky top-0 z-10 bg-ctp-base/70 backdrop-blur-lg border-b border-ctp-surface0/50">
-                  <Tag className="w-4 h-4" />
-                  <span className="font-semibold text-sm flex-1">Tags</span>
-                  <button
-                    type="button"
-                    onClick={(e) => {
-                      e.preventDefault();
-                      setShowTagDialog(true);
-                    }}
-                    className="p-1 hover:bg-ctp-surface1 rounded text-ctp-subtext0 hover:text-ctp-text"
-                    title="Create new tag"
-                  >
-                    <Plus className="w-3.5 h-3.5" />
-                  </button>
-                </summary>
-                <TagList
-                  showCreateDialog={showTagDialog}
-                  onCloseCreateDialog={() => setShowTagDialog(false)}
-                  onOpenCreateDialog={() => setShowTagDialog(true)}
-                />
-              </details>
+            {/* Stash section */}
+            <details className="border-b border-ctp-surface0">
+              <summary className="p-3 cursor-pointer hover:bg-ctp-surface0/50 flex items-center gap-2 select-none sticky top-0 z-10 bg-ctp-base/70 backdrop-blur-lg border-b border-ctp-surface0/50">
+                <Archive className="w-4 h-4" />
+                <span className="font-semibold text-sm flex-1">Stashes</span>
+                <button
+                  type="button"
+                  onClick={(e) => {
+                    e.preventDefault();
+                    setShowStashDialog(true);
+                  }}
+                  className="p-1 hover:bg-ctp-surface1 rounded text-ctp-subtext0 hover:text-ctp-text"
+                  title="Save new stash"
+                >
+                  <Plus className="w-3.5 h-3.5" />
+                </button>
+              </summary>
+              <StashList
+                showSaveDialog={showStashDialog}
+                onCloseSaveDialog={() => setShowStashDialog(false)}
+              />
+            </details>
 
-              {/* Extension-contributed sidebar panels */}
-              <DynamicSidebarPanels />
-            </div>
+            {/* Tags section */}
+            <details className="border-b border-ctp-surface0">
+              <summary className="p-3 cursor-pointer hover:bg-ctp-surface0/50 flex items-center gap-2 select-none sticky top-0 z-10 bg-ctp-base/70 backdrop-blur-lg border-b border-ctp-surface0/50">
+                <Tag className="w-4 h-4" />
+                <span className="font-semibold text-sm flex-1">Tags</span>
+                <button
+                  type="button"
+                  onClick={(e) => {
+                    e.preventDefault();
+                    setShowTagDialog(true);
+                  }}
+                  className="p-1 hover:bg-ctp-surface1 rounded text-ctp-subtext0 hover:text-ctp-text"
+                  title="Create new tag"
+                >
+                  <Plus className="w-3.5 h-3.5" />
+                </button>
+              </summary>
+              <TagList
+                showCreateDialog={showTagDialog}
+                onCloseCreateDialog={() => setShowTagDialog(false)}
+                onOpenCreateDialog={() => setShowTagDialog(true)}
+              />
+            </details>
 
-            {/* Commit form at bottom of left panel */}
-            <div className="shrink-0 border-t border-ctp-surface0">
-              <CommitForm />
-            </div>
+            {/* Extension-contributed sidebar panels */}
+            <DynamicSidebarPanels />
           </div>
-        </ResizablePanel>
 
-        <ResizeHandle />
+          {/* Commit form at bottom of left panel */}
+          <div className="shrink-0 border-t border-ctp-surface0">
+            <CommitForm />
+          </div>
+        </div>
+      </ResizablePanel>
 
-        {/* Main area - Blade Container */}
-        <ResizablePanel id="blades" defaultSize={80}>
-          <BladeContainer
-            isFocusMode={layoutState.focusedPanel !== null}
-            onToggleFocusMode={() => {
-              const { layoutState: ls, enterFocusMode, exitFocusMode } =
-                usePreferencesStore.getState();
-              if (ls.focusedPanel) {
-                exitFocusMode();
-              } else {
-                enterFocusMode("blades");
-              }
-            }}
-          />
-        </ResizablePanel>
-      </ResizablePanelLayout>
+      <ResizeHandle />
 
-    </>
+      {/* Main area - Blade Container */}
+      <ResizablePanel id="blades" defaultSize={80}>
+        <BladeContainer
+          isFocusMode={layoutState.focusedPanel !== null}
+          onToggleFocusMode={() => {
+            const {
+              layoutState: ls,
+              enterFocusMode,
+              exitFocusMode,
+            } = usePreferencesStore.getState();
+            if (ls.focusedPanel) {
+              exitFocusMode();
+            } else {
+              enterFocusMode("blades");
+            }
+          }}
+        />
+      </ResizablePanel>
+    </ResizablePanelLayout>
   );
 }
diff --git a/src/core/components/commit/CommitForm.tsx b/src/core/components/commit/CommitForm.tsx
index 02cc9c96..18cad38f 100644
--- a/src/core/components/commit/CommitForm.tsx
+++ b/src/core/components/commit/CommitForm.tsx
@@ -1,22 +1,22 @@
+import { useQuery } from "@tanstack/react-query";
 import { Loader2, Maximize2, RotateCcw } from "lucide-react";
 import { useEffect, useState } from "react";
-import { useQuery } from "@tanstack/react-query";
 import { commands } from "../../../bindings";
-import { cn } from "../../lib/utils";
-import { useCommitExecution } from "../../hooks/useCommitExecution";
+import { useExtensionHost } from "../../../extensions";
+import { ConventionalCommitForm } from "../../../extensions/conventional-commits/components/ConventionalCommitForm";
 import { useAmendPrefill } from "../../../extensions/conventional-commits/hooks/useAmendPrefill";
 import { useBladeNavigation } from "../../hooks/useBladeNavigation";
-import { useExtensionHost } from "../../../extensions";
-import { ShortcutTooltip } from "../ui/ShortcutTooltip";
+import { useCommitExecution } from "../../hooks/useCommitExecution";
+import { cn } from "../../lib/utils";
 import { Button } from "../ui/button";
-import { ConventionalCommitForm } from "../../../extensions/conventional-commits/components/ConventionalCommitForm";
+import { ShortcutTooltip } from "../ui/ShortcutTooltip";
 
 export function CommitForm() {
   const [useConventional, setUseConventional] = useState(false);
   const [message, setMessage] = useState("");
   const { bladeStack, openBlade } = useBladeNavigation();
   const isCCActive = useExtensionHost(
-    (s) => s.extensions.get("conventional-commits")?.status === "active"
+    (s) => s.extensions.get("conventional-commits")?.status === "active",
   );
   const isCCBladeOpen = bladeStack.some(
     (b) => b.type === "conventional-commit",
diff --git a/src/core/components/commit/__tests__/CommitForm.test.tsx b/src/core/components/commit/__tests__/CommitForm.test.tsx
index bc3e81d4..5fab2e01 100644
--- a/src/core/components/commit/__tests__/CommitForm.test.tsx
+++ b/src/core/components/commit/__tests__/CommitForm.test.tsx
@@ -1,6 +1,6 @@
-import { describe, it, expect, vi, beforeEach } from "vitest";
-import { render, screen } from "@testing-library/react";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { render, screen } from "@testing-library/react";
+import { beforeEach, describe, expect, it, vi } from "vitest";
 
 // Mock the extensions module to control isCCActive
 const mockExtensionStatus = vi.hoisted(() => ({
@@ -10,9 +10,7 @@ const mockExtensionStatus = vi.hoisted(() => ({
 vi.mock("../../../../extensions", () => ({
   useExtensionHost: (selector: (s: any) => any) =>
     selector({
-      extensions: new Map([
-        ["conventional-commits", mockExtensionStatus],
-      ]),
+      extensions: new Map([["conventional-commits", mockExtensionStatus]]),
     }),
 }));
 
@@ -53,9 +51,12 @@ vi.mock("../../../../bindings", () => ({
 }));
 
 // Mock ConventionalCommitForm since it has deep dependencies
-vi.mock("../../../../extensions/conventional-commits/components/ConventionalCommitForm", () => ({
-  ConventionalCommitForm: () => <div data-testid="cc-form">CC Form</div>,
-}));
+vi.mock(
+  "../../../../extensions/conventional-commits/components/ConventionalCommitForm",
+  () => ({
+    ConventionalCommitForm: () => <div data-testid="cc-form">CC Form</div>,
+  }),
+);
 
 import { CommitForm } from "../CommitForm";
 
@@ -73,7 +74,7 @@ describe("CommitForm graceful degradation", () => {
     render(
       <QueryClientProvider client={queryClient}>
         <CommitForm />
-      </QueryClientProvider>
+      </QueryClientProvider>,
     );
 
   it("hides CC toggle when extension is inactive", () => {
@@ -94,7 +95,9 @@ describe("CommitForm graceful degradation", () => {
     mockExtensionStatus.status = "inactive";
     renderCommitForm();
 
-    expect(screen.getByPlaceholderText("Commit message...")).toBeInTheDocument();
+    expect(
+      screen.getByPlaceholderText("Commit message..."),
+    ).toBeInTheDocument();
     expect(screen.getByRole("button", { name: "Commit" })).toBeInTheDocument();
   });
 
diff --git a/src/core/components/layout/index.ts b/src/core/components/layout/index.ts
index 891337fd..bcf0744a 100644
--- a/src/core/components/layout/index.ts
+++ b/src/core/components/layout/index.ts
@@ -1,7 +1,7 @@
+export type { Layout } from "react-resizable-panels";
 export {
-  ResizablePanelLayout,
   ResizablePanel,
+  ResizablePanelLayout,
   ResizeHandle,
 } from "@/framework/layout/ResizablePanelLayout";
 export { SplitPaneLayout } from "@/framework/layout/SplitPaneLayout";
-export type { Layout } from "react-resizable-panels";
diff --git a/src/core/components/markdown/MarkdownImage.tsx b/src/core/components/markdown/MarkdownImage.tsx
index 42b310e2..c73f49c2 100644
--- a/src/core/components/markdown/MarkdownImage.tsx
+++ b/src/core/components/markdown/MarkdownImage.tsx
@@ -13,7 +13,11 @@ interface MarkdownImageProps {
  * External/data URLs are used directly.
  * Relative paths are fetched from git HEAD via readRepoFile.
  */
-export function MarkdownImage({ src, alt, currentFilePath }: MarkdownImageProps) {
+export function MarkdownImage({
+  src,
+  alt,
+  currentFilePath,
+}: MarkdownImageProps) {
   const [imageSrc, setImageSrc] = useState<string | null>(null);
   const [loading, setLoading] = useState(true);
   const [error, setError] = useState(false);
@@ -93,10 +97,6 @@ export function MarkdownImage({ src, alt, currentFilePath }: MarkdownImageProps)
   }
 
   return (
-    <img
-      src={imageSrc}
-      alt={alt || ""}
-      className="max-w-full rounded my-2"
-    />
+    <img src={imageSrc} alt={alt || ""} className="max-w-full rounded my-2" />
   );
 }
diff --git a/src/core/components/markdown/MarkdownRenderer.tsx b/src/core/components/markdown/MarkdownRenderer.tsx
index 90136c97..7d9257ca 100644
--- a/src/core/components/markdown/MarkdownRenderer.tsx
+++ b/src/core/components/markdown/MarkdownRenderer.tsx
@@ -1,7 +1,7 @@
 import Markdown from "react-markdown";
-import remarkGfm from "remark-gfm";
 import rehypeHighlight from "rehype-highlight";
 import rehypeSanitize, { defaultSchema } from "rehype-sanitize";
+import remarkGfm from "remark-gfm";
 import "@catppuccin/highlightjs/css/catppuccin-mocha.css";
 import { useMemo } from "react";
 import { createMarkdownComponents } from "./markdownComponents";
@@ -18,10 +18,7 @@ const sanitizeSchema = {
       ...(defaultSchema.attributes?.code || []),
       ["className", /^hljs-/, /^language-/],
     ],
-    span: [
-      ...(defaultSchema.attributes?.span || []),
-      ["className", /^hljs-/],
-    ],
+    span: [...(defaultSchema.attributes?.span || []), ["className", /^hljs-/]],
   },
 };
 
@@ -56,10 +53,7 @@ export function MarkdownRenderer({
     <div className={className}>
       <Markdown
         remarkPlugins={[remarkGfm]}
-        rehypePlugins={[
-          rehypeHighlight,
-          [rehypeSanitize, sanitizeSchema],
-        ]}
+        rehypePlugins={[rehypeHighlight, [rehypeSanitize, sanitizeSchema]]}
         components={components}
       >
         {content}
diff --git a/src/core/components/markdown/markdownComponents.tsx b/src/core/components/markdown/markdownComponents.tsx
index b660ff64..2443702a 100644
--- a/src/core/components/markdown/markdownComponents.tsx
+++ b/src/core/components/markdown/markdownComponents.tsx
@@ -1,18 +1,16 @@
-import type { Components } from "react-markdown";
 import type { ReactNode } from "react";
+import type { Components } from "react-markdown";
 import { cn } from "../../lib/utils";
 import { CopyCodeButton } from "./CopyCodeButton";
-import { MarkdownLink } from "./MarkdownLink";
 import { MarkdownImage } from "./MarkdownImage";
+import { MarkdownLink } from "./MarkdownLink";
 
 /**
  * Create Catppuccin-styled component overrides for react-markdown.
  *
  * @param currentFilePath - The file being rendered (for resolving relative links/images)
  */
-export function createMarkdownComponents(
-  currentFilePath: string,
-): Components {
+export function createMarkdownComponents(currentFilePath: string): Components {
   return {
     // Headings
     h1: ({ children, ...props }) => (
@@ -40,17 +38,26 @@ export function createMarkdownComponents(
       </h3>
     ),
     h4: ({ children, ...props }) => (
-      <h4 className="text-base font-semibold text-ctp-subtext1 mt-3 mb-1" {...props}>
+      <h4
+        className="text-base font-semibold text-ctp-subtext1 mt-3 mb-1"
+        {...props}
+      >
         {children}
       </h4>
     ),
     h5: ({ children, ...props }) => (
-      <h5 className="text-sm font-semibold text-ctp-subtext0 mt-3 mb-1" {...props}>
+      <h5
+        className="text-sm font-semibold text-ctp-subtext0 mt-3 mb-1"
+        {...props}
+      >
         {children}
       </h5>
     ),
     h6: ({ children, ...props }) => (
-      <h6 className="text-sm font-medium text-ctp-overlay1 mt-2 mb-1" {...props}>
+      <h6
+        className="text-sm font-medium text-ctp-overlay1 mt-2 mb-1"
+        {...props}
+      >
         {children}
       </h6>
     ),
@@ -104,7 +111,6 @@ export function createMarkdownComponents(
         <div className="relative group my-3">
           <pre
             className="bg-ctp-crust rounded-md p-4 overflow-x-auto text-sm"
-            tabIndex={0}
             {...props}
           >
             {children}
@@ -201,11 +207,7 @@ export function createMarkdownComponents(
 
     // Links — custom handler
     a: ({ href, children, ...props }) => (
-      <MarkdownLink
-        href={href}
-        currentFilePath={currentFilePath}
-        {...props}
-      >
+      <MarkdownLink href={href} currentFilePath={currentFilePath} {...props}>
         {children}
       </MarkdownLink>
     ),
diff --git a/src/core/components/menu-bar/MenuBar.tsx b/src/core/components/menu-bar/MenuBar.tsx
index f8051adc..020b2f4b 100644
--- a/src/core/components/menu-bar/MenuBar.tsx
+++ b/src/core/components/menu-bar/MenuBar.tsx
@@ -1,8 +1,11 @@
 import { useCallback } from "react";
-import { executeCommand, getCommandById } from "@/framework/command-palette/commandRegistry";
+import {
+  executeCommand,
+  getCommandById,
+} from "@/framework/command-palette/commandRegistry";
+import { MenuBarItem } from "./MenuBarItem";
 import type { MenuItemDef } from "./menu-definitions";
 import { menuDefinitions } from "./menu-definitions";
-import { MenuBarItem } from "./MenuBarItem";
 import { useMenuBar } from "./useMenuBar";
 
 const menuIds = menuDefinitions.map((m) => m.id);
@@ -34,7 +37,6 @@ export function MenuBar() {
   return (
     <nav
       ref={containerRef}
-      role="menubar"
       aria-label="Application menu"
       className="flex items-center"
     >
diff --git a/src/core/components/menu-bar/MenuBarItem.tsx b/src/core/components/menu-bar/MenuBarItem.tsx
index 6b37a446..f41f4f9e 100644
--- a/src/core/components/menu-bar/MenuBarItem.tsx
+++ b/src/core/components/menu-bar/MenuBarItem.tsx
@@ -1,7 +1,7 @@
 import { AnimatePresence } from "framer-motion";
 import { cn } from "../../lib/utils";
-import type { MenuEntryDef, MenuItemDef } from "./menu-definitions";
 import { MenuDropdown } from "./MenuDropdown";
+import type { MenuEntryDef, MenuItemDef } from "./menu-definitions";
 
 interface MenuBarItemProps {
   label: string;
diff --git a/src/core/components/menu-bar/MenuDropdown.tsx b/src/core/components/menu-bar/MenuDropdown.tsx
index 6beb6d26..d7eb3f39 100644
--- a/src/core/components/menu-bar/MenuDropdown.tsx
+++ b/src/core/components/menu-bar/MenuDropdown.tsx
@@ -1,9 +1,9 @@
 import { motion, useReducedMotion } from "framer-motion";
 import { useEffect, useRef } from "react";
 import { getCommandById } from "@/framework/command-palette/commandRegistry";
-import type { MenuEntryDef, MenuItemDef } from "./menu-definitions";
 import { MenuDivider } from "./MenuDivider";
 import { MenuItem } from "./MenuItem";
+import type { MenuEntryDef, MenuItemDef } from "./menu-definitions";
 
 const slideDown = {
   hidden: { opacity: 0, y: -8 },
diff --git a/src/core/components/menu-bar/MenuItem.tsx b/src/core/components/menu-bar/MenuItem.tsx
index 0a65e23b..3dad6876 100644
--- a/src/core/components/menu-bar/MenuItem.tsx
+++ b/src/core/components/menu-bar/MenuItem.tsx
@@ -1,6 +1,6 @@
 import type { LucideIcon } from "lucide-react";
-import { cn } from "../../lib/utils";
 import { formatShortcut } from "../../hooks/useKeyboardShortcuts";
+import { cn } from "../../lib/utils";
 
 interface MenuItemProps {
   label: string;
diff --git a/src/core/components/menu-bar/menu-definitions.ts b/src/core/components/menu-bar/menu-definitions.ts
index e6097918..4f85f477 100644
--- a/src/core/components/menu-bar/menu-definitions.ts
+++ b/src/core/components/menu-bar/menu-definitions.ts
@@ -1,3 +1,4 @@
+import type { LucideIcon } from "lucide-react";
 import {
   ArrowDown,
   ArrowUp,
@@ -22,7 +23,6 @@ import {
   Sun,
   X,
 } from "lucide-react";
-import type { LucideIcon } from "lucide-react";
 
 export interface MenuItemDef {
   type: "action";
diff --git a/src/core/components/toolbar/Toolbar.tsx b/src/core/components/toolbar/Toolbar.tsx
index a723c3cf..259c1ed3 100644
--- a/src/core/components/toolbar/Toolbar.tsx
+++ b/src/core/components/toolbar/Toolbar.tsx
@@ -1,12 +1,12 @@
 import { useMemo } from "react";
 import {
-  type ToolbarAction,
+  getGroupedToolbarActions,
   TOOLBAR_GROUP_ORDER,
+  type ToolbarAction,
   useToolbarRegistry,
-  getGroupedToolbarActions,
 } from "@/framework/extension-system/toolbarRegistry";
-import { usePreferencesStore } from "../../stores/domain/preferences";
 import { useGitOpsStore as useRepositoryStore } from "../../stores/domain/git-ops";
+import { usePreferencesStore } from "../../stores/domain/preferences";
 import { ToolbarButton } from "./ToolbarButton";
 import { ToolbarGroup } from "./ToolbarGroup";
 import { ToolbarOverflowMenu } from "./ToolbarOverflowMenu";
@@ -23,13 +23,13 @@ import { useToolbarOverflow } from "./useToolbarOverflow";
  */
 export function Toolbar() {
   // Subscribe to registry changes for reactivity
-  const actions = useToolbarRegistry((s) => s.items);
-  const visibilityTick = useToolbarRegistry((s) => s.visibilityTick);
+  const _actions = useToolbarRegistry((s) => s.items);
+  const _visibilityTick = useToolbarRegistry((s) => s.visibilityTick);
   const hiddenActions = usePreferencesStore(
     (s) => s.settingsData.toolbar?.hiddenActions ?? [],
   );
   // Subscribe to repoStatus so when() conditions re-evaluate on repo change
-  const repoStatus = useRepositoryStore((s) => s.repoStatus);
+  const _repoStatus = useRepositoryStore((s) => s.repoStatus);
 
   const { containerRef, visibleCount } = useToolbarOverflow();
 
@@ -50,7 +50,7 @@ export function Toolbar() {
 
     return { orderedActions: ordered, groupBoundaries: boundaries };
     // eslint-disable-next-line react-hooks/exhaustive-deps -- repoStatus + visibilityTick trigger when() re-eval
-  }, [actions, hiddenActions, repoStatus, visibilityTick]);
+  }, [hiddenActions]);
 
   // Split into inline and overflowed
   const inlineActions = orderedActions.slice(0, visibleCount);
diff --git a/src/core/components/toolbar/ToolbarButton.tsx b/src/core/components/toolbar/ToolbarButton.tsx
index 9a2437e6..45d113ad 100644
--- a/src/core/components/toolbar/ToolbarButton.tsx
+++ b/src/core/components/toolbar/ToolbarButton.tsx
@@ -1,7 +1,7 @@
 import { memo } from "react";
 import type { ToolbarAction } from "@/framework/extension-system/toolbarRegistry";
-import { ShortcutTooltip } from "../ui/ShortcutTooltip";
 import { Button } from "../ui/button";
+import { ShortcutTooltip } from "../ui/ShortcutTooltip";
 
 interface ToolbarButtonProps {
   action: ToolbarAction;
@@ -21,7 +21,7 @@ export const ToolbarButton = memo(function ToolbarButton({
   const Icon = action.icon;
 
   const badgeValue = action.badge?.() ?? null;
-  const showBadge = badgeValue != null && badgeValue !== 0 && badgeValue !== '';
+  const showBadge = badgeValue != null && badgeValue !== 0 && badgeValue !== "";
 
   return (
     <ShortcutTooltip shortcut={action.shortcut ?? ""} label={action.label}>
diff --git a/src/core/components/toolbar/useRovingTabindex.ts b/src/core/components/toolbar/useRovingTabindex.ts
index 9750abed..69e727aa 100644
--- a/src/core/components/toolbar/useRovingTabindex.ts
+++ b/src/core/components/toolbar/useRovingTabindex.ts
@@ -45,8 +45,9 @@ export function useRovingTabindex(itemCount: number) {
       setActiveIndex(newIndex);
 
       // Focus the element at the new index
-      const items =
-        e.currentTarget.querySelectorAll<HTMLElement>("[data-toolbar-item]");
+      const items = e.currentTarget.querySelectorAll<HTMLElement>(
+        "[data-toolbar-item]",
+      );
       items[newIndex]?.focus();
     },
     [activeIndex, itemCount],
diff --git a/src/core/components/toolbar/useToolbarOverflow.ts b/src/core/components/toolbar/useToolbarOverflow.ts
index e36e724c..0702d4b1 100644
--- a/src/core/components/toolbar/useToolbarOverflow.ts
+++ b/src/core/components/toolbar/useToolbarOverflow.ts
@@ -19,7 +19,9 @@ export function useToolbarOverflow() {
     const container = containerRef.current;
     if (!container) return;
 
-    const items = container.querySelectorAll<HTMLElement>("[data-toolbar-item]");
+    const items = container.querySelectorAll<HTMLElement>(
+      "[data-toolbar-item]",
+    );
     if (items.length === 0) {
       setVisibleCount(Infinity);
       return;
diff --git a/src/core/components/ui/ContextMenu.tsx b/src/core/components/ui/ContextMenu.tsx
index 548d1cdd..5501f1bc 100644
--- a/src/core/components/ui/ContextMenu.tsx
+++ b/src/core/components/ui/ContextMenu.tsx
@@ -24,9 +24,8 @@ export function ContextMenuPortal() {
   // Focus first menu item on mount
   useEffect(() => {
     if (!activeMenu || !menuRef.current) return;
-    const firstItem = menuRef.current.querySelector<HTMLButtonElement>(
-      '[role="menuitem"]',
-    );
+    const firstItem =
+      menuRef.current.querySelector<HTMLButtonElement>('[role="menuitem"]');
     firstItem?.focus();
   }, [activeMenu]);
 
@@ -37,15 +36,25 @@ export function ContextMenuPortal() {
   for (const item of activeMenu.items) {
     const group = item.group ?? "__default__";
     if (!groupMap.has(group)) groupMap.set(group, []);
-    groupMap.get(group)!.push(item);
+    groupMap.get(group)?.push(item);
   }
   const groups = Array.from(groupMap.entries());
 
   // Clamp position to viewport
   const menuWidth = 200;
-  const menuHeight = Math.min(groups.reduce((acc, [, items]) => acc + items.length * 32, 0) + groups.length * 8, 400);
-  const left = Math.min(activeMenu.position.x, window.innerWidth - menuWidth - 8);
-  const top = Math.min(activeMenu.position.y, window.innerHeight - menuHeight - 8);
+  const menuHeight = Math.min(
+    groups.reduce((acc, [, items]) => acc + items.length * 32, 0) +
+      groups.length * 8,
+    400,
+  );
+  const left = Math.min(
+    activeMenu.position.x,
+    window.innerWidth - menuWidth - 8,
+  );
+  const top = Math.min(
+    activeMenu.position.y,
+    window.innerHeight - menuHeight - 8,
+  );
 
   return createPortal(
     <div
diff --git a/src/core/components/ui/StatusBar.tsx b/src/core/components/ui/StatusBar.tsx
index 6a688ecf..a28232ec 100644
--- a/src/core/components/ui/StatusBar.tsx
+++ b/src/core/components/ui/StatusBar.tsx
@@ -1,6 +1,10 @@
 import { useMemo } from "react";
-import { useStatusBarRegistry, getLeftItems, getRightItems } from "@/framework/extension-system/statusBarRegistry";
 import type { StatusBarItem } from "@/framework/extension-system/statusBarRegistry";
+import {
+  getLeftItems,
+  getRightItems,
+  useStatusBarRegistry,
+} from "@/framework/extension-system/statusBarRegistry";
 
 function StatusBarWidget({ item }: { item: StatusBarItem }) {
   const content = item.renderCustom();
@@ -29,17 +33,11 @@ function StatusBarWidget({ item }: { item: StatusBarItem }) {
 }
 
 export function StatusBar() {
-  const items = useStatusBarRegistry((s) => s.items);
-  const visibilityTick = useStatusBarRegistry((s) => s.visibilityTick);
+  const _items = useStatusBarRegistry((s) => s.items);
+  const _visibilityTick = useStatusBarRegistry((s) => s.visibilityTick);
 
-  const leftItems = useMemo(
-    () => getLeftItems(),
-    [items, visibilityTick],
-  );
-  const rightItems = useMemo(
-    () => getRightItems(),
-    [items, visibilityTick],
-  );
+  const leftItems = useMemo(() => getLeftItems(), []);
+  const rightItems = useMemo(() => getRightItems(), []);
 
   if (leftItems.length === 0 && rightItems.length === 0) return null;
 
diff --git a/src/core/components/ui/ThemeToggle.tsx b/src/core/components/ui/ThemeToggle.tsx
index 07fa8920..716b42e6 100644
--- a/src/core/components/ui/ThemeToggle.tsx
+++ b/src/core/components/ui/ThemeToggle.tsx
@@ -1,10 +1,14 @@
 import { Monitor, Moon, Sun } from "lucide-react";
-import type { Theme } from "../../stores/domain/preferences/theme.slice";
 import { usePreferencesStore as useThemeStore } from "../../stores/domain/preferences";
+import type { Theme } from "../../stores/domain/preferences/theme.slice";
 import { Button } from "./button";
 
 export function ThemeToggle() {
-  const { themePreference: theme, setTheme, themeIsLoading: isLoading } = useThemeStore();
+  const {
+    themePreference: theme,
+    setTheme,
+    themeIsLoading: isLoading,
+  } = useThemeStore();
 
   if (isLoading) {
     return null;
diff --git a/src/core/components/ui/Toast.tsx b/src/core/components/ui/Toast.tsx
index 1df18daf..73f50d95 100644
--- a/src/core/components/ui/Toast.tsx
+++ b/src/core/components/ui/Toast.tsx
@@ -1,8 +1,8 @@
 import { motion } from "framer-motion";
 import { AlertCircle, AlertTriangle, CheckCircle, Info, X } from "lucide-react";
 import { useEffect, useState } from "react";
-import { cn } from "../../lib/utils";
 import type { Toast as ToastType } from "@/framework/stores/toast";
+import { cn } from "../../lib/utils";
 
 interface ToastProps {
   toast: ToastType;
diff --git a/src/core/components/ui/button.tsx b/src/core/components/ui/button.tsx
index 36f1539e..894f015c 100644
--- a/src/core/components/ui/button.tsx
+++ b/src/core/components/ui/button.tsx
@@ -1,4 +1,4 @@
-import { type VariantProps, cva } from "class-variance-authority";
+import { cva, type VariantProps } from "class-variance-authority";
 import { Loader2 } from "lucide-react";
 import * as React from "react";
 import { cn } from "../../lib/utils";
@@ -32,8 +32,7 @@ const buttonVariants = cva(
 );
 
 export interface ButtonProps
-  extends
-    React.ButtonHTMLAttributes<HTMLButtonElement>,
+  extends React.ButtonHTMLAttributes<HTMLButtonElement>,
     VariantProps<typeof buttonVariants> {
   loading?: boolean;
   loadingText?: string;
diff --git a/src/core/components/ui/dialog.tsx b/src/core/components/ui/dialog.tsx
index 88319aef..15c417f8 100644
--- a/src/core/components/ui/dialog.tsx
+++ b/src/core/components/ui/dialog.tsx
@@ -1,4 +1,4 @@
-import { type VariantProps, cva } from "class-variance-authority";
+import { cva, type VariantProps } from "class-variance-authority";
 import { AnimatePresence, motion } from "framer-motion";
 import { X } from "lucide-react";
 import * as React from "react";
@@ -53,8 +53,7 @@ const dialogContentVariants = cva(
 );
 
 interface DialogContentProps
-  extends
-    React.HTMLAttributes<HTMLDivElement>,
+  extends React.HTMLAttributes<HTMLDivElement>,
     VariantProps<typeof dialogContentVariants> {}
 
 const DialogContent = React.forwardRef<HTMLDivElement, DialogContentProps>(
diff --git a/src/core/components/ui/input.tsx b/src/core/components/ui/input.tsx
index 6cbe3748..328a6a47 100644
--- a/src/core/components/ui/input.tsx
+++ b/src/core/components/ui/input.tsx
@@ -1,4 +1,4 @@
-import { type VariantProps, cva } from "class-variance-authority";
+import { cva, type VariantProps } from "class-variance-authority";
 import * as React from "react";
 import { cn } from "../../lib/utils";
 
@@ -19,8 +19,7 @@ const inputVariants = cva(
 );
 
 export interface InputProps
-  extends
-    React.InputHTMLAttributes<HTMLInputElement>,
+  extends React.InputHTMLAttributes<HTMLInputElement>,
     VariantProps<typeof inputVariants> {}
 
 const Input = React.forwardRef<HTMLInputElement, InputProps>(
@@ -54,8 +53,7 @@ const textareaVariants = cva(
 );
 
 export interface TextareaProps
-  extends
-    React.TextareaHTMLAttributes<HTMLTextAreaElement>,
+  extends React.TextareaHTMLAttributes<HTMLTextAreaElement>,
     VariantProps<typeof textareaVariants> {}
 
 const Textarea = React.forwardRef<HTMLTextAreaElement, TextareaProps>(
diff --git a/src/core/hooks/useBladeNavigation.ts b/src/core/hooks/useBladeNavigation.ts
index 316615a8..c9c1e693 100644
--- a/src/core/hooks/useBladeNavigation.ts
+++ b/src/core/hooks/useBladeNavigation.ts
@@ -1,17 +1,20 @@
 import { useSelector } from "@xstate/react";
-import type { FileChange } from "../../bindings";
 import { getBladeRegistration } from "@/framework/layout/bladeRegistry";
-import { bladeTypeForFile } from "../lib/fileTypeUtils";
-import {
-  useNavigationActorRef,
-} from "@/framework/layout/navigation/context";
+import { useNavigationActorRef } from "@/framework/layout/navigation/context";
 import {
   selectActiveWorkflow,
   selectBladeStack,
-  selectLastAction,
   selectDirtyBladeIds,
+  selectLastAction,
 } from "@/framework/layout/navigation/selectors";
-import type { BladeType, BladePropsMap, CoreBladeType, WorkflowType, TypedBlade } from "@/framework/layout/navigation/types";
+import type {
+  BladePropsMap,
+  BladeType,
+  CoreBladeType,
+  WorkflowType,
+} from "@/framework/layout/navigation/types";
+import type { FileChange } from "../../bindings";
+import { bladeTypeForFile } from "../lib/fileTypeUtils";
 
 export function useBladeNavigation() {
   const actorRef = useNavigationActorRef();
@@ -42,9 +45,14 @@ export function useBladeNavigation() {
       title ??
       (typeof reg?.defaultTitle === "function"
         ? reg.defaultTitle(props as any)
-        : reg?.defaultTitle ?? type);
+        : (reg?.defaultTitle ?? type));
 
-    actorRef.send({ type: "PUSH_BLADE", bladeType: type as BladeType, title: resolvedTitle, props });
+    actorRef.send({
+      type: "PUSH_BLADE",
+      bladeType: type as BladeType,
+      title: resolvedTitle,
+      props,
+    });
   }
 
   /** Push a diff/viewer blade for a historical commit file */
@@ -77,7 +85,13 @@ export function useBladeNavigation() {
     if (type === "diff" || type === "viewer-markdown") {
       openBlade(
         "diff",
-        { source: { mode: "staging", filePath: file.path, staged: section === "staged" } },
+        {
+          source: {
+            mode: "staging",
+            filePath: file.path,
+            staged: section === "staged",
+          },
+        },
         title,
       );
     } else if (type === "viewer-image") {
@@ -150,12 +164,16 @@ export function useBladeNavigation() {
     goToRoot: () => actorRef.send({ type: "RESET_STACK" }),
     pushBlade,
     popBlade: () => actorRef.send({ type: "POP_BLADE" }),
-    popToIndex: (index: number) => actorRef.send({ type: "POP_TO_INDEX", index }),
+    popToIndex: (index: number) =>
+      actorRef.send({ type: "POP_TO_INDEX", index }),
     replaceBlade,
     resetStack: () => actorRef.send({ type: "RESET_STACK" }),
-    setWorkflow: (workflow: WorkflowType) => actorRef.send({ type: "SWITCH_WORKFLOW", workflow }),
-    markDirty: (bladeId: string) => actorRef.send({ type: "MARK_DIRTY", bladeId }),
-    markClean: (bladeId: string) => actorRef.send({ type: "MARK_CLEAN", bladeId }),
+    setWorkflow: (workflow: WorkflowType) =>
+      actorRef.send({ type: "SWITCH_WORKFLOW", workflow }),
+    markDirty: (bladeId: string) =>
+      actorRef.send({ type: "MARK_DIRTY", bladeId }),
+    markClean: (bladeId: string) =>
+      actorRef.send({ type: "MARK_CLEAN", bladeId }),
     bladeStack,
     activeWorkflow,
     lastAction,
diff --git a/src/core/hooks/useBranchScopes.ts b/src/core/hooks/useBranchScopes.ts
index 7073918d..af35d83b 100644
--- a/src/core/hooks/useBranchScopes.ts
+++ b/src/core/hooks/useBranchScopes.ts
@@ -1,11 +1,14 @@
 import { useMemo } from "react";
-import { useBranches } from "./useBranches";
+import { getPrimaryScopes, getScope } from "../lib/branchScopes";
 import { usePreferencesStore as useBranchMetadataStore } from "../stores/domain/preferences";
-import { getScope, getPrimaryScopes } from "../lib/branchScopes";
+import { useBranches } from "./useBranches";
 
 export function useBranchScopes() {
   const { branches, repoPath, ...rest } = useBranches();
-  const { getMetaScopePreference: getScopePreference, setMetaScopePreference: setScopePreference } = useBranchMetadataStore();
+  const {
+    getMetaScopePreference: getScopePreference,
+    setMetaScopePreference: setScopePreference,
+  } = useBranchMetadataStore();
 
   const activeScopeId = getScopePreference(repoPath) || "local";
   const activeScope = getScope(activeScopeId);
diff --git a/src/core/hooks/useBranches.ts b/src/core/hooks/useBranches.ts
index 6e7819ef..ab5369bf 100644
--- a/src/core/hooks/useBranches.ts
+++ b/src/core/hooks/useBranches.ts
@@ -1,13 +1,21 @@
 import { useMemo } from "react";
-import { useGitOpsStore as useBranchStore } from "../stores/domain/git-ops";
-import { usePreferencesStore as useBranchMetadataStore } from "../stores/domain/preferences";
-import { useGitOpsStore as useRepositoryStore } from "../stores/domain/git-ops";
 import { classifyBranch, type EnrichedBranch } from "../lib/branchClassifier";
+import {
+  useGitOpsStore as useBranchStore,
+  useGitOpsStore as useRepositoryStore,
+} from "../stores/domain/git-ops";
+import { usePreferencesStore as useBranchMetadataStore } from "../stores/domain/preferences";
 
 export function useBranches() {
   const repoPath = useRepositoryStore((s) => s.repoStatus?.repoPath ?? "");
-  const { branchList: branches, branchAllList: allBranches, branchIsLoading: isLoading, branchError: error, loadBranches, loadAllBranches } =
-    useBranchStore();
+  const {
+    branchList: branches,
+    branchAllList: allBranches,
+    branchIsLoading: isLoading,
+    branchError: error,
+    loadBranches,
+    loadAllBranches,
+  } = useBranchStore();
   const metadata = useBranchMetadataStore();
 
   const enriched = useMemo((): EnrichedBranch[] => {
@@ -27,7 +35,12 @@ export function useBranches() {
         lastVisited: recentMap.get(bareName) ?? null,
       };
     });
-  }, [allBranches, metadata.metaPinnedBranches, metadata.metaRecentBranches, repoPath]);
+  }, [
+    allBranches,
+    metadata.metaPinnedBranches,
+    metadata.metaRecentBranches,
+    repoPath,
+  ]);
 
   return {
     branches: enriched,
diff --git a/src/core/hooks/useBulkSelect.ts b/src/core/hooks/useBulkSelect.ts
index 06e1ad42..ce236eec 100644
--- a/src/core/hooks/useBulkSelect.ts
+++ b/src/core/hooks/useBulkSelect.ts
@@ -1,4 +1,4 @@
-import { useState, useCallback } from "react";
+import { useCallback, useState } from "react";
 
 export function useBulkSelect(branchNames: string[]) {
   const [selected, setSelected] = useState<Set<string>>(new Set());
@@ -14,9 +14,7 @@ export function useBulkSelect(branchNames: string[]) {
           const endIdx = branchNames.indexOf(name);
           if (startIdx !== -1 && endIdx !== -1) {
             const [from, to] =
-              startIdx < endIdx
-                ? [startIdx, endIdx]
-                : [endIdx, startIdx];
+              startIdx < endIdx ? [startIdx, endIdx] : [endIdx, startIdx];
             for (let i = from; i <= to; i++) {
               next.add(branchNames[i]);
             }
diff --git a/src/core/hooks/useCommitExecution.ts b/src/core/hooks/useCommitExecution.ts
index fac9859d..117d1c26 100644
--- a/src/core/hooks/useCommitExecution.ts
+++ b/src/core/hooks/useCommitExecution.ts
@@ -1,9 +1,9 @@
-import { Channel } from "@tauri-apps/api/core";
 import { useMutation, useQueryClient } from "@tanstack/react-query";
-import { type SyncProgress, commands } from "../../bindings";
-import { getErrorMessage } from "../lib/errors";
+import { Channel } from "@tauri-apps/api/core";
 import { gitHookBus } from "@/core/services/gitHookBus";
 import { toast } from "@/framework/stores/toast";
+import { commands, type SyncProgress } from "../../bindings";
+import { getErrorMessage } from "../lib/errors";
 
 interface UseCommitExecutionOptions {
   onCommitSuccess?: (message: string) => void;
@@ -74,7 +74,9 @@ export function useCommitExecution(options?: UseCommitExecutionOptions) {
   });
 
   const commit = async (message: string, amend = false) => {
-    const willResult = await gitHookBus.emitWill("commit", { commitMessage: message });
+    const willResult = await gitHookBus.emitWill("commit", {
+      commitMessage: message,
+    });
     if (willResult.cancel) {
       toast.warning(willResult.reason ?? "Commit cancelled by extension");
       return;
@@ -83,7 +85,9 @@ export function useCommitExecution(options?: UseCommitExecutionOptions) {
   };
 
   const commitAndPush = async (message: string, amend = false) => {
-    const willResult = await gitHookBus.emitWill("commit", { commitMessage: message });
+    const willResult = await gitHookBus.emitWill("commit", {
+      commitMessage: message,
+    });
     if (willResult.cancel) {
       toast.warning(willResult.reason ?? "Commit cancelled by extension");
       return;
diff --git a/src/core/hooks/useCommitGraph.ts b/src/core/hooks/useCommitGraph.ts
index 304db235..06c9ee63 100644
--- a/src/core/hooks/useCommitGraph.ts
+++ b/src/core/hooks/useCommitGraph.ts
@@ -1,6 +1,8 @@
 import { useEffect } from "react";
-import { useGitOpsStore as useRepositoryStore } from "../stores/domain/git-ops";
-import { useGitOpsStore as useTopologyStore } from "../stores/domain/git-ops";
+import {
+  useGitOpsStore as useRepositoryStore,
+  useGitOpsStore as useTopologyStore,
+} from "../stores/domain/git-ops";
 
 export function useCommitGraph() {
   const repoStatus = useRepositoryStore((s) => s.repoStatus);
diff --git a/src/core/hooks/useKeyboardShortcuts.ts b/src/core/hooks/useKeyboardShortcuts.ts
index f972432a..c215844a 100644
--- a/src/core/hooks/useKeyboardShortcuts.ts
+++ b/src/core/hooks/useKeyboardShortcuts.ts
@@ -1,16 +1,18 @@
-import { Channel } from "@tauri-apps/api/core";
 import { useMutation, useQueryClient } from "@tanstack/react-query";
+import { Channel } from "@tauri-apps/api/core";
 import { useHotkeys } from "react-hotkeys-hook";
-import { type SyncProgress, commands } from "../../bindings";
+import { executeCommand } from "@/framework/command-palette/commandRegistry";
+import { usePaletteStore as useCommandPaletteStore } from "@/framework/command-palette/paletteStore";
 import { openBlade } from "@/framework/layout/bladeOpener";
 import { useBladeRegistry } from "@/framework/layout/bladeRegistry";
-import { executeCommand } from "@/framework/command-palette/commandRegistry";
 import { getNavigationActor } from "@/framework/layout/navigation/context";
-import { usePaletteStore as useCommandPaletteStore } from "@/framework/command-palette/paletteStore";
-import { useGitOpsStore as useRepositoryStore } from "../stores/domain/git-ops";
-import { useGitOpsStore as useTopologyStore } from "../stores/domain/git-ops";
-import { usePreferencesStore } from "../stores/domain/preferences";
 import { toast } from "@/framework/stores/toast";
+import { commands, type SyncProgress } from "../../bindings";
+import {
+  useGitOpsStore as useRepositoryStore,
+  useGitOpsStore as useTopologyStore,
+} from "../stores/domain/git-ops";
+import { usePreferencesStore } from "../stores/domain/preferences";
 
 /**
  * Keyboard shortcuts for common Git operations.
@@ -268,7 +270,10 @@ export function useKeyboardShortcuts() {
     (e) => {
       e.preventDefault();
       if (status) {
-        getNavigationActor().send({ type: "SWITCH_WORKFLOW", workflow: "staging" });
+        getNavigationActor().send({
+          type: "SWITCH_WORKFLOW",
+          workflow: "staging",
+        });
       }
     },
     { preventDefault: true, enabled: !!status },
@@ -280,7 +285,10 @@ export function useKeyboardShortcuts() {
     (e) => {
       e.preventDefault();
       if (status && useBladeRegistry.getState().items.has("topology-graph")) {
-        getNavigationActor().send({ type: "SWITCH_WORKFLOW", workflow: "topology" });
+        getNavigationActor().send({
+          type: "SWITCH_WORKFLOW",
+          workflow: "topology",
+        });
       }
     },
     { preventDefault: true, enabled: !!status },
@@ -322,7 +330,9 @@ export function useKeyboardShortcuts() {
         topologyStore.topologySelectedCommit &&
         ctx.bladeStack.length === 1
       ) {
-        openBlade("commit-details", { oid: topologyStore.topologySelectedCommit });
+        openBlade("commit-details", {
+          oid: topologyStore.topologySelectedCommit,
+        });
       }
     },
     { enableOnFormTags: false, enabled: !!status },
diff --git a/src/core/hooks/useMergeWorkflow.ts b/src/core/hooks/useMergeWorkflow.ts
index 780d315b..9867fe6e 100644
--- a/src/core/hooks/useMergeWorkflow.ts
+++ b/src/core/hooks/useMergeWorkflow.ts
@@ -1,13 +1,13 @@
 import { useSelector } from "@xstate/react";
 import { getMergeActor } from "../machines/merge/context";
 import {
-  selectMergeState,
   selectConflicts,
+  selectIsAborting,
+  selectIsConflicted,
+  selectIsMerging,
   selectMergeError,
   selectMergeResult,
-  selectIsMerging,
-  selectIsConflicted,
-  selectIsAborting,
+  selectMergeState,
   selectSourceBranch,
 } from "../machines/merge/selectors";
 
diff --git a/src/core/hooks/useRecentRepos.ts b/src/core/hooks/useRecentRepos.ts
index 3d110bb4..3137772f 100644
--- a/src/core/hooks/useRecentRepos.ts
+++ b/src/core/hooks/useRecentRepos.ts
@@ -18,7 +18,7 @@ export function useRecentRepos() {
   // Load recent repos on mount
   useEffect(() => {
     loadRecentRepos();
-  }, []);
+  }, [loadRecentRepos]);
 
   const loadRecentRepos = async () => {
     try {
@@ -48,7 +48,12 @@ export function useRecentRepos() {
 
       // Add to front with updated timestamp, preserving pin state
       const updated: RecentRepo[] = [
-        { path, name: repoName, lastOpened: Date.now(), isPinned: existingEntry?.isPinned },
+        {
+          path,
+          name: repoName,
+          lastOpened: Date.now(),
+          isPinned: existingEntry?.isPinned,
+        },
         ...filtered,
       ].slice(0, MAX_RECENT_REPOS);
 
@@ -76,7 +81,7 @@ export function useRecentRepos() {
       const store = await getStore();
       const existing = (await store.get<RecentRepo[]>(RECENT_REPOS_KEY)) || [];
       const updated = existing.map((r) =>
-        r.path === path ? { ...r, isPinned: !r.isPinned } : r
+        r.path === path ? { ...r, isPinned: !r.isPinned } : r,
       );
       await store.set(RECENT_REPOS_KEY, updated);
       setRecentRepos(updated);
diff --git a/src/core/hooks/useRepoFile.ts b/src/core/hooks/useRepoFile.ts
index 5b92662f..b4beab78 100644
--- a/src/core/hooks/useRepoFile.ts
+++ b/src/core/hooks/useRepoFile.ts
@@ -18,7 +18,7 @@ export function useRepoFile(filePath: string) {
       throw new Error(
         result.error.type === "EmptyRepository"
           ? "Repository has no commits"
-          : `Failed to read file: ${filePath}`
+          : `Failed to read file: ${filePath}`,
       );
     },
     staleTime: 60_000,
diff --git a/src/core/lib/__tests__/contextMenuRegistry.test.ts b/src/core/lib/__tests__/contextMenuRegistry.test.ts
index 2fb70e3c..0a5cc159 100644
--- a/src/core/lib/__tests__/contextMenuRegistry.test.ts
+++ b/src/core/lib/__tests__/contextMenuRegistry.test.ts
@@ -1,8 +1,8 @@
-import { useContextMenuRegistry } from "@/framework/extension-system/contextMenuRegistry";
 import type {
-  ContextMenuItem,
   ContextMenuContext,
+  ContextMenuItem,
 } from "@/framework/extension-system/contextMenuRegistry";
+import { useContextMenuRegistry } from "@/framework/extension-system/contextMenuRegistry";
 
 const makeItem = (
   overrides: Partial<ContextMenuItem> & { id: string },
@@ -19,8 +19,7 @@ describe("ContextMenuRegistry", () => {
   });
 
   it("registers and retrieves item by location", () => {
-    const { register, getItemsForLocation } =
-      useContextMenuRegistry.getState();
+    const { register, getItemsForLocation } = useContextMenuRegistry.getState();
     register(makeItem({ id: "copy", location: "file-tree" }));
     register(makeItem({ id: "paste", location: "branch-list" }));
 
@@ -31,8 +30,7 @@ describe("ContextMenuRegistry", () => {
   });
 
   it("filters by when() condition", () => {
-    const { register, getItemsForLocation } =
-      useContextMenuRegistry.getState();
+    const { register, getItemsForLocation } = useContextMenuRegistry.getState();
     register(
       makeItem({
         id: "delete-branch",
@@ -55,8 +53,7 @@ describe("ContextMenuRegistry", () => {
   });
 
   it("sorts by priority descending within group", () => {
-    const { register, getItemsForLocation } =
-      useContextMenuRegistry.getState();
+    const { register, getItemsForLocation } = useContextMenuRegistry.getState();
     register(
       makeItem({
         id: "low",
@@ -81,14 +78,9 @@ describe("ContextMenuRegistry", () => {
   });
 
   it("separates items by group alphabetically", () => {
-    const { register, getItemsForLocation } =
-      useContextMenuRegistry.getState();
-    register(
-      makeItem({ id: "z-item", location: "file-tree", group: "zebra" }),
-    );
-    register(
-      makeItem({ id: "a-item", location: "file-tree", group: "alpha" }),
-    );
+    const { register, getItemsForLocation } = useContextMenuRegistry.getState();
+    register(makeItem({ id: "z-item", location: "file-tree", group: "zebra" }));
+    register(makeItem({ id: "a-item", location: "file-tree", group: "alpha" }));
 
     const ctx: ContextMenuContext = { location: "file-tree" };
     const items = getItemsForLocation("file-tree", ctx);
@@ -106,8 +98,7 @@ describe("ContextMenuRegistry", () => {
   });
 
   it("unregisterBySource removes all items for source", () => {
-    const { register, unregisterBySource } =
-      useContextMenuRegistry.getState();
+    const { register, unregisterBySource } = useContextMenuRegistry.getState();
     register(makeItem({ id: "ext-a", source: "ext:foo" }));
     register(makeItem({ id: "ext-b", source: "ext:foo" }));
     register(makeItem({ id: "core-a", source: "core" }));
@@ -125,13 +116,12 @@ describe("ContextMenuRegistry", () => {
     showMenu({ x: 100, y: 200 }, "file-tree", { location: "file-tree" });
     const { activeMenu } = useContextMenuRegistry.getState();
     expect(activeMenu).not.toBeNull();
-    expect(activeMenu!.items).toHaveLength(1);
-    expect(activeMenu!.position).toEqual({ x: 100, y: 200 });
+    expect(activeMenu?.items).toHaveLength(1);
+    expect(activeMenu?.position).toEqual({ x: 100, y: 200 });
   });
 
   it("hideMenu clears activeMenu", () => {
-    const { register, showMenu, hideMenu } =
-      useContextMenuRegistry.getState();
+    const { register, showMenu, hideMenu } = useContextMenuRegistry.getState();
     register(makeItem({ id: "action", location: "file-tree" }));
 
     showMenu({ x: 0, y: 0 }, "file-tree", { location: "file-tree" });
diff --git a/src/core/lib/__tests__/gitHookBus.test.ts b/src/core/lib/__tests__/gitHookBus.test.ts
index 1fae2294..7530c737 100644
--- a/src/core/lib/__tests__/gitHookBus.test.ts
+++ b/src/core/lib/__tests__/gitHookBus.test.ts
@@ -1,5 +1,5 @@
+import type { GitHookContext, GitOperation } from "@/core/services/gitHookBus";
 import { OperationBus } from "@/framework/extension-system/operationBus";
-import type { GitOperation, GitHookContext } from "@/core/services/gitHookBus";
 
 describe("GitHookBus (OperationBus)", () => {
   let bus: OperationBus<GitOperation, GitHookContext>;
diff --git a/src/core/lib/__tests__/sidebarPanelRegistry.test.ts b/src/core/lib/__tests__/sidebarPanelRegistry.test.ts
index 08d701e9..2198ce2a 100644
--- a/src/core/lib/__tests__/sidebarPanelRegistry.test.ts
+++ b/src/core/lib/__tests__/sidebarPanelRegistry.test.ts
@@ -1,6 +1,9 @@
-import { useSidebarPanelRegistry, getVisiblePanels } from "@/framework/layout/sidebarPanelRegistry";
-import type { SidebarPanelConfig } from "@/framework/layout/sidebarPanelRegistry";
 import { Folder } from "lucide-react";
+import type { SidebarPanelConfig } from "@/framework/layout/sidebarPanelRegistry";
+import {
+  getVisiblePanels,
+  useSidebarPanelRegistry,
+} from "@/framework/layout/sidebarPanelRegistry";
 
 const makePanel = (
   overrides: Partial<SidebarPanelConfig> & { id: string },
@@ -21,8 +24,7 @@ describe("SidebarPanelRegistry", () => {
   });
 
   it("registers and retrieves panel", () => {
-    const { register } =
-      useSidebarPanelRegistry.getState();
+    const { register } = useSidebarPanelRegistry.getState();
     register(makePanel({ id: "explorer" }));
 
     const panels = getVisiblePanels();
@@ -31,8 +33,7 @@ describe("SidebarPanelRegistry", () => {
   });
 
   it("getVisiblePanels sorts by priority descending", () => {
-    const { register } =
-      useSidebarPanelRegistry.getState();
+    const { register } = useSidebarPanelRegistry.getState();
     register(makePanel({ id: "low", priority: 10 }));
     register(makePanel({ id: "high", priority: 100 }));
 
@@ -42,8 +43,7 @@ describe("SidebarPanelRegistry", () => {
   });
 
   it("getVisiblePanels filters by when() condition", () => {
-    const { register } =
-      useSidebarPanelRegistry.getState();
+    const { register } = useSidebarPanelRegistry.getState();
     register(makePanel({ id: "visible", when: () => true }));
     register(makePanel({ id: "hidden", when: () => false }));
 
@@ -62,8 +62,7 @@ describe("SidebarPanelRegistry", () => {
   });
 
   it("unregisterBySource removes all panels for source", () => {
-    const { register, unregisterBySource } =
-      useSidebarPanelRegistry.getState();
+    const { register, unregisterBySource } = useSidebarPanelRegistry.getState();
     register(makePanel({ id: "ext-a", source: "ext:bar" }));
     register(makePanel({ id: "ext-b", source: "ext:bar" }));
     register(makePanel({ id: "core-a", source: "core" }));
diff --git a/src/core/lib/__tests__/statusBarRegistry.test.ts b/src/core/lib/__tests__/statusBarRegistry.test.ts
index c4fb4ae8..58b96b85 100644
--- a/src/core/lib/__tests__/statusBarRegistry.test.ts
+++ b/src/core/lib/__tests__/statusBarRegistry.test.ts
@@ -1,5 +1,9 @@
-import { useStatusBarRegistry, getLeftItems, getRightItems } from "@/framework/extension-system/statusBarRegistry";
 import type { StatusBarItem } from "@/framework/extension-system/statusBarRegistry";
+import {
+  getLeftItems,
+  getRightItems,
+  useStatusBarRegistry,
+} from "@/framework/extension-system/statusBarRegistry";
 
 const makeItem = (
   overrides: Partial<StatusBarItem> & { id: string },
@@ -65,8 +69,7 @@ describe("StatusBarRegistry", () => {
   });
 
   it("unregisterBySource removes all items for source", () => {
-    const { register, unregisterBySource } =
-      useStatusBarRegistry.getState();
+    const { register, unregisterBySource } = useStatusBarRegistry.getState();
     register(makeItem({ id: "ext-a", source: "ext:baz" }));
     register(makeItem({ id: "ext-b", source: "ext:baz" }));
     register(makeItem({ id: "core-a", source: "core" }));
diff --git a/src/core/lib/branchClassifier.ts b/src/core/lib/branchClassifier.ts
index 43b1e901..b8ce6117 100644
--- a/src/core/lib/branchClassifier.ts
+++ b/src/core/lib/branchClassifier.ts
@@ -32,8 +32,7 @@ export function classifyBranch(branchName: string): GitflowBranchType {
     return "feature";
   if (bare.startsWith("release/") || bare.startsWith("release-"))
     return "release";
-  if (bare.startsWith("hotfix/") || bare.startsWith("hotfix-"))
-    return "hotfix";
+  if (bare.startsWith("hotfix/") || bare.startsWith("hotfix-")) return "hotfix";
   return "other";
 }
 
diff --git a/src/core/lib/bulkBranchOps.ts b/src/core/lib/bulkBranchOps.ts
index 61c98d78..ab5811c3 100644
--- a/src/core/lib/bulkBranchOps.ts
+++ b/src/core/lib/bulkBranchOps.ts
@@ -1,4 +1,4 @@
-import type { GitflowStatus, BatchDeleteResult } from "../../bindings";
+import type { BatchDeleteResult, GitflowStatus } from "../../bindings";
 import { commands } from "../../bindings";
 
 export interface BulkDeleteOptions {
diff --git a/src/core/lib/file-icons.ts b/src/core/lib/file-icons.ts
index 3cafda68..c7d1dca1 100644
--- a/src/core/lib/file-icons.ts
+++ b/src/core/lib/file-icons.ts
@@ -13,8 +13,8 @@ import DatabaseIcon from "../assets/icons/file-types/database.svg?react";
 import DockerIcon from "../assets/icons/file-types/docker.svg?react";
 import EnvIcon from "../assets/icons/file-types/env.svg?react";
 import FileIcon from "../assets/icons/file-types/file.svg?react";
-import FolderOpenIcon from "../assets/icons/file-types/folder-open.svg?react";
 import FolderIcon from "../assets/icons/file-types/folder.svg?react";
+import FolderOpenIcon from "../assets/icons/file-types/folder-open.svg?react";
 import FontIcon from "../assets/icons/file-types/font.svg?react";
 import GitIcon from "../assets/icons/file-types/git.svg?react";
 import GoIcon from "../assets/icons/file-types/go.svg?react";
diff --git a/src/core/lib/fileDispatch.ts b/src/core/lib/fileDispatch.ts
index 7821f1cb..3740e2f1 100644
--- a/src/core/lib/fileDispatch.ts
+++ b/src/core/lib/fileDispatch.ts
@@ -33,12 +33,37 @@ const FILE_DISPATCH_MAP: ReadonlyMap<string, BladeType> = new Map([
  * Extensions known to be binary (no text preview fallback).
  */
 const BINARY_EXTENSIONS: ReadonlySet<string> = new Set([
-  "exe", "dll", "so", "dylib", "bin", "dat", "wasm",
-  "zip", "tar", "gz", "7z", "rar",
-  "pdf", "doc", "docx", "xls", "xlsx",
-  "mp3", "wav", "ogg", "mp4", "avi", "mov",
-  "woff", "woff2", "ttf", "otf", "eot",
-  "obj", "fbx", "stl",
+  "exe",
+  "dll",
+  "so",
+  "dylib",
+  "bin",
+  "dat",
+  "wasm",
+  "zip",
+  "tar",
+  "gz",
+  "7z",
+  "rar",
+  "pdf",
+  "doc",
+  "docx",
+  "xls",
+  "xlsx",
+  "mp3",
+  "wav",
+  "ogg",
+  "mp4",
+  "avi",
+  "mov",
+  "woff",
+  "woff2",
+  "ttf",
+  "otf",
+  "eot",
+  "obj",
+  "fbx",
+  "stl",
 ]);
 
 function getExtension(filePath: string): string {
diff --git a/src/core/lib/gitignoreCategories.ts b/src/core/lib/gitignoreCategories.ts
index f7dfdf5e..d1a40428 100644
--- a/src/core/lib/gitignoreCategories.ts
+++ b/src/core/lib/gitignoreCategories.ts
@@ -1,5 +1,12 @@
 import type { LucideIcon } from "lucide-react";
-import { Code, Layers, Monitor, Laptop, Sparkles, MoreHorizontal } from "lucide-react";
+import {
+  Code,
+  Laptop,
+  Layers,
+  Monitor,
+  MoreHorizontal,
+  Sparkles,
+} from "lucide-react";
 
 export interface GitignoreCategory {
   id: string;
@@ -20,41 +27,101 @@ export type CategoryId = (typeof GITIGNORE_CATEGORIES)[number]["id"];
 
 const TEMPLATE_CATEGORY_MAP: Record<string, CategoryId> = {
   // Languages
-  Node: "languages", Python: "languages", Java: "languages", "C++": "languages",
-  C: "languages", Go: "languages", Rust: "languages", Ruby: "languages",
-  Swift: "languages", Kotlin: "languages", Scala: "languages", Haskell: "languages",
-  Elixir: "languages", Erlang: "languages", Clojure: "languages", R: "languages",
-  Julia: "languages", Perl: "languages", PHP: "languages", Lua: "languages",
-  Dart: "languages", OCaml: "languages", Fortran: "languages", Pascal: "languages",
-  "Objective-C": "languages", Assembly: "languages", Nim: "languages",
-  Zig: "languages", V: "languages", Crystal: "languages", D: "languages",
-  Elm: "languages", PureScript: "languages", Racket: "languages",
-  Scheme: "languages", CommonLisp: "languages", FSharp: "languages",
-  TeX: "languages", Sass: "languages",
+  Node: "languages",
+  Python: "languages",
+  Java: "languages",
+  "C++": "languages",
+  C: "languages",
+  Go: "languages",
+  Rust: "languages",
+  Ruby: "languages",
+  Swift: "languages",
+  Kotlin: "languages",
+  Scala: "languages",
+  Haskell: "languages",
+  Elixir: "languages",
+  Erlang: "languages",
+  Clojure: "languages",
+  R: "languages",
+  Julia: "languages",
+  Perl: "languages",
+  PHP: "languages",
+  Lua: "languages",
+  Dart: "languages",
+  OCaml: "languages",
+  Fortran: "languages",
+  Pascal: "languages",
+  "Objective-C": "languages",
+  Assembly: "languages",
+  Nim: "languages",
+  Zig: "languages",
+  V: "languages",
+  Crystal: "languages",
+  D: "languages",
+  Elm: "languages",
+  PureScript: "languages",
+  Racket: "languages",
+  Scheme: "languages",
+  CommonLisp: "languages",
+  FSharp: "languages",
+  TeX: "languages",
+  Sass: "languages",
 
   // Frameworks
-  Rails: "frameworks", Django: "frameworks", Laravel: "frameworks",
-  Angular: "frameworks", Vue: "frameworks", Symfony: "frameworks",
-  Spring: "frameworks", Flutter: "frameworks", Android: "frameworks",
-  Unity: "frameworks", UnrealEngine: "frameworks", Godot: "frameworks",
-  ROS: "frameworks", Terraform: "frameworks", Packer: "frameworks",
-  Ansible: "frameworks", Zephyr: "frameworks", Yii: "frameworks",
-  CakePHP: "frameworks", CodeIgniter: "frameworks", Magento: "frameworks",
-  WordPress: "frameworks", Joomla: "frameworks", Drupal: "frameworks",
-  ExpressionEngine: "frameworks", SugarCRM: "frameworks",
-  Umbraco: "frameworks", PlayFramework: "frameworks", GWT: "frameworks",
-  Grails: "frameworks", Leiningen: "frameworks", Gradle: "frameworks",
+  Rails: "frameworks",
+  Django: "frameworks",
+  Laravel: "frameworks",
+  Angular: "frameworks",
+  Vue: "frameworks",
+  Symfony: "frameworks",
+  Spring: "frameworks",
+  Flutter: "frameworks",
+  Android: "frameworks",
+  Unity: "frameworks",
+  UnrealEngine: "frameworks",
+  Godot: "frameworks",
+  ROS: "frameworks",
+  Terraform: "frameworks",
+  Packer: "frameworks",
+  Ansible: "frameworks",
+  Zephyr: "frameworks",
+  Yii: "frameworks",
+  CakePHP: "frameworks",
+  CodeIgniter: "frameworks",
+  Magento: "frameworks",
+  WordPress: "frameworks",
+  Joomla: "frameworks",
+  Drupal: "frameworks",
+  ExpressionEngine: "frameworks",
+  SugarCRM: "frameworks",
+  Umbraco: "frameworks",
+  PlayFramework: "frameworks",
+  GWT: "frameworks",
+  Grails: "frameworks",
+  Leiningen: "frameworks",
+  Gradle: "frameworks",
   Maven: "frameworks",
 
   // Editors/IDEs
-  JetBrains: "editors", VisualStudioCode: "editors", Vim: "editors",
-  Emacs: "editors", SublimeText: "editors", Eclipse: "editors",
-  NetBeans: "editors", Xcode: "editors", "Notepad++": "editors",
-  NotepadPP: "editors", Kate: "editors", Atom: "editors",
-  TextMate: "editors", VisualStudio: "editors",
+  JetBrains: "editors",
+  VisualStudioCode: "editors",
+  Vim: "editors",
+  Emacs: "editors",
+  SublimeText: "editors",
+  Eclipse: "editors",
+  NetBeans: "editors",
+  Xcode: "editors",
+  "Notepad++": "editors",
+  NotepadPP: "editors",
+  Kate: "editors",
+  Atom: "editors",
+  TextMate: "editors",
+  VisualStudio: "editors",
 
   // Operating Systems
-  macOS: "os", Windows: "os", Linux: "os",
+  macOS: "os",
+  Windows: "os",
+  Linux: "os",
 };
 
 export function getCategoryForTemplate(name: string): CategoryId {
diff --git a/src/core/lib/machineRegistry.test.ts b/src/core/lib/machineRegistry.test.ts
index 7d16d83f..fd48a112 100644
--- a/src/core/lib/machineRegistry.test.ts
+++ b/src/core/lib/machineRegistry.test.ts
@@ -1,4 +1,4 @@
-import { describe, it, expect, beforeEach } from "vitest";
+import { beforeEach, describe, expect, it } from "vitest";
 import { setup } from "xstate";
 import { useMachineRegistry } from "@/framework/extension-system/machineRegistry";
 
@@ -43,9 +43,9 @@ describe("machineRegistry", () => {
 
     const entry = get("core:test");
     expect(entry).toBeDefined();
-    expect(entry!.id).toBe("core:test");
-    expect(entry!.source).toBe("core");
-    expect(entry!.category).toBe("workflow");
+    expect(entry?.id).toBe("core:test");
+    expect(entry?.source).toBe("core");
+    expect(entry?.category).toBe("workflow");
   });
 
   it("getActor returns the actor reference", () => {
diff --git a/src/core/lib/monacoTheme.ts b/src/core/lib/monacoTheme.ts
index d0ca0a58..616452c5 100644
--- a/src/core/lib/monacoTheme.ts
+++ b/src/core/lib/monacoTheme.ts
@@ -1,6 +1,6 @@
 import "./monacoWorkers";
-import * as monaco from "monaco-editor";
 import { loader } from "@monaco-editor/react";
+import * as monaco from "monaco-editor";
 
 // Tell @monaco-editor/react to use locally bundled Monaco
 loader.config({ monaco });
diff --git a/src/core/lib/monacoWorkers.ts b/src/core/lib/monacoWorkers.ts
index 0d50d2cc..e9c9559f 100644
--- a/src/core/lib/monacoWorkers.ts
+++ b/src/core/lib/monacoWorkers.ts
@@ -8,9 +8,9 @@
  * they are split into separate chunks and loaded on demand.
  */
 import editorWorker from "monaco-editor/esm/vs/editor/editor.worker?worker";
-import jsonWorker from "monaco-editor/esm/vs/language/json/json.worker?worker";
 import cssWorker from "monaco-editor/esm/vs/language/css/css.worker?worker";
 import htmlWorker from "monaco-editor/esm/vs/language/html/html.worker?worker";
+import jsonWorker from "monaco-editor/esm/vs/language/json/json.worker?worker";
 import tsWorker from "monaco-editor/esm/vs/language/typescript/ts.worker?worker";
 
 (globalThis as Record<string, unknown>).MonacoEnvironment = {
diff --git a/src/core/lib/previewRegistry.ts b/src/core/lib/previewRegistry.ts
index c1e1687f..c470b41a 100644
--- a/src/core/lib/previewRegistry.ts
+++ b/src/core/lib/previewRegistry.ts
@@ -1,8 +1,8 @@
 import type { ComponentType } from "react";
-import type { FileChange } from "../../bindings";
-import type { DiffSource } from "@/extensions/diff/blades";
 import { create } from "zustand";
 import { devtools } from "zustand/middleware";
+import type { DiffSource } from "@/extensions/diff/blades";
+import type { FileChange } from "../../bindings";
 
 export type PreviewMode = "inline-diff" | "placeholder" | "custom";
 
@@ -54,11 +54,7 @@ export const usePreviewRegistry = create<PreviewRegistryState>()(
 
       unregisterBySource: (source) => {
         const next = get().previews.filter((r) => r.source !== source);
-        set(
-          { previews: next },
-          false,
-          "preview-registry/unregisterBySource",
-        );
+        set({ previews: next }, false, "preview-registry/unregisterBySource");
       },
 
       getForFile: (filePath) => {
diff --git a/src/core/lib/xstate-example.test.ts b/src/core/lib/xstate-example.test.ts
index 4d1a2ba4..2d695bb1 100644
--- a/src/core/lib/xstate-example.test.ts
+++ b/src/core/lib/xstate-example.test.ts
@@ -2,7 +2,7 @@
 // This file demonstrates HOW to test machines with guards and transitions.
 // Phase 26 will replace this with the actual navigation FSM tests.
 
-import { setup, assign, createActor } from "xstate";
+import { assign, createActor, setup } from "xstate";
 
 const navigationMachine = setup({
   types: {
@@ -117,9 +117,7 @@ describe("XState navigation machine (example)", () => {
     actor.send({ type: "PUSH_BLADE", bladeType: "diff" });
     actor.send({ type: "POP_BLADE" });
 
-    expect(actor.getSnapshot().context.bladeStack).toEqual([
-      "staging-changes",
-    ]);
+    expect(actor.getSnapshot().context.bladeStack).toEqual(["staging-changes"]);
 
     actor.stop();
   });
@@ -131,9 +129,7 @@ describe("XState navigation machine (example)", () => {
     actor.send({ type: "OPEN_REPO", path: "/test/repo" });
     actor.send({ type: "POP_BLADE" });
 
-    expect(actor.getSnapshot().context.bladeStack).toEqual([
-      "staging-changes",
-    ]);
+    expect(actor.getSnapshot().context.bladeStack).toEqual(["staging-changes"]);
 
     actor.stop();
   });
diff --git a/src/core/machines/merge/actors.ts b/src/core/machines/merge/actors.ts
index 87844a76..d2737260 100644
--- a/src/core/machines/merge/actors.ts
+++ b/src/core/machines/merge/actors.ts
@@ -3,16 +3,15 @@ import type { MergeResult } from "../../../bindings";
 import { commands } from "../../../bindings";
 import { getErrorMessage } from "../../lib/errors";
 
-export const executeMerge = fromPromise<
-  MergeResult,
-  { sourceBranch: string }
->(async ({ input }) => {
-  const result = await commands.mergeBranch(input.sourceBranch);
-  if (result.status === "error") {
-    throw new Error(getErrorMessage(result.error));
-  }
-  return result.data;
-});
+export const executeMerge = fromPromise<MergeResult, { sourceBranch: string }>(
+  async ({ input }) => {
+    const result = await commands.mergeBranch(input.sourceBranch);
+    if (result.status === "error") {
+      throw new Error(getErrorMessage(result.error));
+    }
+    return result.data;
+  },
+);
 
 export const abortMergeActor = fromPromise<void, void>(async () => {
   const result = await commands.abortMerge();
diff --git a/src/core/machines/merge/context.ts b/src/core/machines/merge/context.ts
index 1a9f17a5..8d5abaa3 100644
--- a/src/core/machines/merge/context.ts
+++ b/src/core/machines/merge/context.ts
@@ -1,4 +1,4 @@
-import { createActor, type ActorRefFrom } from "xstate";
+import { type ActorRefFrom, createActor } from "xstate";
 import { mergeMachine } from "./mergeMachine";
 
 export type MergeActorRef = ActorRefFrom<typeof mergeMachine>;
diff --git a/src/core/machines/merge/index.ts b/src/core/machines/merge/index.ts
index f47cf692..1153ddff 100644
--- a/src/core/machines/merge/index.ts
+++ b/src/core/machines/merge/index.ts
@@ -1,13 +1,13 @@
-export { mergeMachine } from "./mergeMachine";
 export { getMergeActor, type MergeActorRef } from "./context";
+export { mergeMachine } from "./mergeMachine";
 export {
-  selectMergeState,
   selectConflicts,
+  selectIsAborting,
+  selectIsConflicted,
+  selectIsMerging,
   selectMergeError,
   selectMergeResult,
-  selectIsMerging,
-  selectIsConflicted,
-  selectIsAborting,
+  selectMergeState,
   selectSourceBranch,
 } from "./selectors";
 export type { MergeContext, MergeEvent, MergeState } from "./types";
diff --git a/src/core/machines/merge/mergeMachine.ts b/src/core/machines/merge/mergeMachine.ts
index b8c98f29..aa41e537 100644
--- a/src/core/machines/merge/mergeMachine.ts
+++ b/src/core/machines/merge/mergeMachine.ts
@@ -1,8 +1,8 @@
-import { setup, assign } from "xstate";
-import type { MergeResult } from "../../../bindings";
+import { assign, setup } from "xstate";
 import { gitHookBus } from "@/core/services/gitHookBus";
+import type { MergeResult } from "../../../bindings";
+import { abortMergeActor, executeMerge } from "./actors";
 import type { MergeContext, MergeEvent } from "./types";
-import { executeMerge, abortMergeActor } from "./actors";
 
 export const mergeMachine = setup({
   types: {
@@ -90,9 +90,10 @@ export const mergeMachine = setup({
         onError: {
           target: "error",
           actions: assign(({ event }) => ({
-            error: event.error instanceof Error
-              ? event.error.message
-              : "Unknown error",
+            error:
+              event.error instanceof Error
+                ? event.error.message
+                : "Unknown error",
           })),
         },
       },
@@ -112,9 +113,10 @@ export const mergeMachine = setup({
         onError: {
           target: "error",
           actions: assign(({ event }) => ({
-            error: event.error instanceof Error
-              ? event.error.message
-              : "Unknown error",
+            error:
+              event.error instanceof Error
+                ? event.error.message
+                : "Unknown error",
           })),
         },
       },
diff --git a/src/core/machines/merge/selectors.ts b/src/core/machines/merge/selectors.ts
index 3cfb2299..56e584cf 100644
--- a/src/core/machines/merge/selectors.ts
+++ b/src/core/machines/merge/selectors.ts
@@ -5,16 +5,14 @@ type MergeSnapshot = SnapshotFrom<typeof mergeMachine>;
 
 export const selectMergeState = (snap: MergeSnapshot) => snap.value;
 
-export const selectConflicts = (snap: MergeSnapshot) =>
-  snap.context.conflicts;
+export const selectConflicts = (snap: MergeSnapshot) => snap.context.conflicts;
 
 export const selectMergeError = (snap: MergeSnapshot) => snap.context.error;
 
 export const selectMergeResult = (snap: MergeSnapshot) =>
   snap.context.mergeResult;
 
-export const selectIsMerging = (snap: MergeSnapshot) =>
-  snap.matches("merging");
+export const selectIsMerging = (snap: MergeSnapshot) => snap.matches("merging");
 
 export const selectIsConflicted = (snap: MergeSnapshot) =>
   snap.matches("conflicted");
diff --git a/src/core/stores/bladeTypes.ts b/src/core/stores/bladeTypes.ts
index 69cb7946..87ee80ac 100644
--- a/src/core/stores/bladeTypes.ts
+++ b/src/core/stores/bladeTypes.ts
@@ -18,7 +18,7 @@ declare module "@/framework/layout/bladeTypes" {
     "topology-graph": Record<string, never>;
     "commit-list-fallback": Record<string, never>;
     "commit-details": { oid: string };
-    "diff": { source: DiffSource };
+    diff: { source: DiffSource };
     "viewer-nupkg": { filePath: string };
     "viewer-image": { filePath: string; oid?: string };
     "viewer-markdown": { filePath: string };
@@ -27,8 +27,8 @@ declare module "@/framework/layout/bladeTypes" {
     "viewer-plaintext": { filePath: string };
     "branch-manager": Record<string, never>;
     "repo-browser": { path?: string };
-    "settings": Record<string, never>;
-    "changelog": Record<string, never>;
+    settings: Record<string, never>;
+    changelog: Record<string, never>;
     "gitflow-cheatsheet": Record<string, never>;
     "init-repo": { directoryPath: string };
     "conventional-commit": { amend?: boolean };
@@ -41,9 +41,9 @@ declare module "@/framework/layout/bladeTypes" {
 // Re-export for backward compatibility
 export type {
   BladePropsMap,
+  BladeType,
   CoreBladeType,
   ExtensionBladeType,
-  BladeType,
   TypedBlade,
 } from "@/framework/layout/bladeTypes";
 export { isCoreBladeType } from "@/framework/layout/bladeTypes";
diff --git a/src/core/stores/createBladeStore.test.ts b/src/core/stores/createBladeStore.test.ts
index 22a77fe0..a072546f 100644
--- a/src/core/stores/createBladeStore.test.ts
+++ b/src/core/stores/createBladeStore.test.ts
@@ -10,13 +10,13 @@ describe("createBladeStore", () => {
   });
 
   it("auto-registers for reset", () => {
-    const useStore = createBladeStore<{ value: string; setValue: (v: string) => void }>(
-      "test-blade-reset",
-      (set) => ({
-        value: "initial",
-        setValue: (v: string) => set({ value: v }),
-      }),
-    );
+    const useStore = createBladeStore<{
+      value: string;
+      setValue: (v: string) => void;
+    }>("test-blade-reset", (set) => ({
+      value: "initial",
+      setValue: (v: string) => set({ value: v }),
+    }));
 
     useStore.getState().setValue("changed");
     expect(useStore.getState().value).toBe("changed");
diff --git a/src/core/stores/domain/git-ops/branches.slice.ts b/src/core/stores/domain/git-ops/branches.slice.ts
index 79263ece..ea8d313c 100644
--- a/src/core/stores/domain/git-ops/branches.slice.ts
+++ b/src/core/stores/domain/git-ops/branches.slice.ts
@@ -1,10 +1,10 @@
 import type { StateCreator } from "zustand";
+import { gitHookBus } from "@/core/services/gitHookBus";
 import type { BranchInfo } from "../../../../bindings";
 import { commands } from "../../../../bindings";
 import { getErrorMessage } from "../../../lib/errors";
-import { gitHookBus } from "@/core/services/gitHookBus";
-import type { GitOpsMiddleware } from "./types";
 import type { GitOpsStore } from "./index";
+import type { GitOpsMiddleware } from "./types";
 
 // Merge workflow moved to src/machines/merge/
 
@@ -35,27 +35,53 @@ export const createBranchSlice: StateCreator<
   branchError: null,
 
   loadBranches: async () => {
-    set({ branchIsLoading: true, branchError: null }, undefined, "gitOps:branch/load");
+    set(
+      { branchIsLoading: true, branchError: null },
+      undefined,
+      "gitOps:branch/load",
+    );
     const result = await commands.listBranches();
     if (result.status === "ok") {
-      set({ branchList: result.data, branchIsLoading: false }, undefined, "gitOps:branch/loadOk");
+      set(
+        { branchList: result.data, branchIsLoading: false },
+        undefined,
+        "gitOps:branch/loadOk",
+      );
     } else {
-      set({ branchError: getErrorMessage(result.error), branchIsLoading: false });
+      set({
+        branchError: getErrorMessage(result.error),
+        branchIsLoading: false,
+      });
     }
   },
 
   loadAllBranches: async (includeRemote: boolean) => {
-    set({ branchIsLoading: true, branchError: null }, undefined, "gitOps:branch/loadAll");
+    set(
+      { branchIsLoading: true, branchError: null },
+      undefined,
+      "gitOps:branch/loadAll",
+    );
     const result = await commands.listAllBranches(includeRemote);
     if (result.status === "ok") {
-      set({ branchAllList: result.data, branchIsLoading: false }, undefined, "gitOps:branch/loadAllOk");
+      set(
+        { branchAllList: result.data, branchIsLoading: false },
+        undefined,
+        "gitOps:branch/loadAllOk",
+      );
     } else {
-      set({ branchError: getErrorMessage(result.error), branchIsLoading: false });
+      set({
+        branchError: getErrorMessage(result.error),
+        branchIsLoading: false,
+      });
     }
   },
 
   createBranch: async (name, checkout) => {
-    set({ branchIsLoading: true, branchError: null }, undefined, "gitOps:branch/create");
+    set(
+      { branchIsLoading: true, branchError: null },
+      undefined,
+      "gitOps:branch/create",
+    );
     const result = await commands.createBranch(name, checkout);
     if (result.status === "ok") {
       await get().loadBranches();
@@ -67,7 +93,11 @@ export const createBranchSlice: StateCreator<
   },
 
   checkoutBranch: async (name) => {
-    set({ branchIsLoading: true, branchError: null }, undefined, "gitOps:branch/checkout");
+    set(
+      { branchIsLoading: true, branchError: null },
+      undefined,
+      "gitOps:branch/checkout",
+    );
     const result = await commands.checkoutBranch(name);
     if (result.status === "ok") {
       await get().loadBranches();
@@ -79,7 +109,11 @@ export const createBranchSlice: StateCreator<
   },
 
   checkoutRemoteBranch: async (remoteBranch: string) => {
-    set({ branchIsLoading: true, branchError: null }, undefined, "gitOps:branch/checkoutRemote");
+    set(
+      { branchIsLoading: true, branchError: null },
+      undefined,
+      "gitOps:branch/checkoutRemote",
+    );
     const result = await commands.checkoutRemoteBranch(remoteBranch);
     if (result.status === "ok") {
       await get().loadBranches();
@@ -90,7 +124,11 @@ export const createBranchSlice: StateCreator<
   },
 
   deleteBranch: async (name, force) => {
-    set({ branchIsLoading: true, branchError: null }, undefined, "gitOps:branch/delete");
+    set(
+      { branchIsLoading: true, branchError: null },
+      undefined,
+      "gitOps:branch/delete",
+    );
     const result = await commands.deleteBranch(name, force);
     if (result.status === "ok") {
       await get().loadBranches();
@@ -101,5 +139,6 @@ export const createBranchSlice: StateCreator<
     return false;
   },
 
-  clearBranchError: () => set({ branchError: null }, undefined, "gitOps:branch/clearError"),
+  clearBranchError: () =>
+    set({ branchError: null }, undefined, "gitOps:branch/clearError"),
 });
diff --git a/src/core/stores/domain/git-ops/clone.slice.ts b/src/core/stores/domain/git-ops/clone.slice.ts
index c7c31eeb..3193c9d2 100644
--- a/src/core/stores/domain/git-ops/clone.slice.ts
+++ b/src/core/stores/domain/git-ops/clone.slice.ts
@@ -1,7 +1,7 @@
 import type { StateCreator } from "zustand";
 import type { CloneProgress } from "../../../../bindings";
-import type { GitOpsMiddleware } from "./types";
 import type { GitOpsStore } from "./index";
+import type { GitOpsMiddleware } from "./types";
 
 export interface CloneSlice {
   cloneIsCloning: boolean;
@@ -26,7 +26,11 @@ export const createCloneSlice: StateCreator<
   cloneError: null,
 
   startClone: () => {
-    set({ cloneIsCloning: true, cloneProgress: null, cloneError: null }, undefined, "gitOps:clone/start");
+    set(
+      { cloneIsCloning: true, cloneProgress: null, cloneError: null },
+      undefined,
+      "gitOps:clone/start",
+    );
   },
 
   updateCloneProgress: (progress) => {
@@ -38,10 +42,18 @@ export const createCloneSlice: StateCreator<
   },
 
   setCloneError: (error) => {
-    set({ cloneIsCloning: false, cloneError: error }, undefined, "gitOps:clone/error");
+    set(
+      { cloneIsCloning: false, cloneError: error },
+      undefined,
+      "gitOps:clone/error",
+    );
   },
 
   resetClone: () => {
-    set({ cloneIsCloning: false, cloneProgress: null, cloneError: null }, undefined, "gitOps:clone/reset");
+    set(
+      { cloneIsCloning: false, cloneProgress: null, cloneError: null },
+      undefined,
+      "gitOps:clone/reset",
+    );
   },
 });
diff --git a/src/core/stores/domain/git-ops/git-ops.test.ts b/src/core/stores/domain/git-ops/git-ops.test.ts
index 6d3e6a84..888fed04 100644
--- a/src/core/stores/domain/git-ops/git-ops.test.ts
+++ b/src/core/stores/domain/git-ops/git-ops.test.ts
@@ -1,9 +1,9 @@
 import {
-  ok,
-  err,
   createBranchInfo,
-  createTagInfo,
   createStashEntry,
+  createTagInfo,
+  err,
+  ok,
 } from "../../../test-utils/mocks/tauri-commands";
 import { useGitOpsStore } from "./index";
 
@@ -134,10 +134,12 @@ describe("useGitOpsStore", () => {
       mockCommands.createBranch.mockResolvedValueOnce(ok(newBranch));
       mockCommands.listBranches.mockResolvedValueOnce(ok([newBranch]));
 
-      const result = await useGitOpsStore.getState().createBranch("feature/test", true);
+      const result = await useGitOpsStore
+        .getState()
+        .createBranch("feature/test", true);
 
       expect(result).not.toBeNull();
-      expect(result!.name).toBe("feature/test");
+      expect(result?.name).toBe("feature/test");
     });
   });
 
@@ -195,7 +197,9 @@ describe("useGitOpsStore", () => {
       mockCommands.stashSave.mockResolvedValueOnce(ok("stash@{0}"));
       mockCommands.listStashes.mockResolvedValueOnce(ok([]));
 
-      const result = await useGitOpsStore.getState().saveStash("test stash", false);
+      const result = await useGitOpsStore
+        .getState()
+        .saveStash("test stash", false);
 
       expect(result).toBe(true);
       expect(mockCommands.stashSave).toHaveBeenCalledWith("test stash", false);
diff --git a/src/core/stores/domain/git-ops/gitflow.slice.ts b/src/core/stores/domain/git-ops/gitflow.slice.ts
index 13afe8e8..6d5bdf37 100644
--- a/src/core/stores/domain/git-ops/gitflow.slice.ts
+++ b/src/core/stores/domain/git-ops/gitflow.slice.ts
@@ -2,8 +2,8 @@ import type { StateCreator } from "zustand";
 import type { GitflowConfig, GitflowStatus } from "../../../../bindings";
 import { commands } from "../../../../bindings";
 import { getErrorMessage } from "../../../lib/errors";
-import type { GitOpsMiddleware } from "./types";
 import type { GitOpsStore } from "./index";
+import type { GitOpsMiddleware } from "./types";
 
 // Gitflow operations (start/finish/abort) moved to src/extensions/gitflow/machines/
 
@@ -13,7 +13,10 @@ export interface GitflowSlice {
   gitflowError: string | null;
 
   refreshGitflow: () => Promise<void>;
-  initGitflow: (config: GitflowConfig, pushDevelop: boolean) => Promise<boolean>;
+  initGitflow: (
+    config: GitflowConfig,
+    pushDevelop: boolean,
+  ) => Promise<boolean>;
   clearGitflowError: () => void;
 }
 
@@ -28,25 +31,44 @@ export const createGitflowSlice: StateCreator<
   gitflowError: null,
 
   refreshGitflow: async () => {
-    set({ gitflowIsLoading: true, gitflowError: null }, undefined, "gitOps:gitflow/refresh");
+    set(
+      { gitflowIsLoading: true, gitflowError: null },
+      undefined,
+      "gitOps:gitflow/refresh",
+    );
     const result = await commands.getGitflowStatus();
     if (result.status === "ok") {
-      set({ gitflowStatus: result.data, gitflowIsLoading: false }, undefined, "gitOps:gitflow/refreshOk");
+      set(
+        { gitflowStatus: result.data, gitflowIsLoading: false },
+        undefined,
+        "gitOps:gitflow/refreshOk",
+      );
     } else {
-      set({ gitflowError: getErrorMessage(result.error), gitflowIsLoading: false });
+      set({
+        gitflowError: getErrorMessage(result.error),
+        gitflowIsLoading: false,
+      });
     }
   },
 
   initGitflow: async (config, pushDevelop) => {
-    set({ gitflowIsLoading: true, gitflowError: null }, undefined, "gitOps:gitflow/init");
+    set(
+      { gitflowIsLoading: true, gitflowError: null },
+      undefined,
+      "gitOps:gitflow/init",
+    );
     const result = await commands.initGitflow(config, pushDevelop);
     if (result.status === "ok") {
       await get().refreshGitflow();
       return true;
     }
-    set({ gitflowError: getErrorMessage(result.error), gitflowIsLoading: false });
+    set({
+      gitflowError: getErrorMessage(result.error),
+      gitflowIsLoading: false,
+    });
     return false;
   },
 
-  clearGitflowError: () => set({ gitflowError: null }, undefined, "gitOps:gitflow/clearError"),
+  clearGitflowError: () =>
+    set({ gitflowError: null }, undefined, "gitOps:gitflow/clearError"),
 });
diff --git a/src/core/stores/domain/git-ops/index.ts b/src/core/stores/domain/git-ops/index.ts
index cd58b8e0..e0ad880c 100644
--- a/src/core/stores/domain/git-ops/index.ts
+++ b/src/core/stores/domain/git-ops/index.ts
@@ -1,15 +1,18 @@
 import { create } from "zustand";
 import { devtools } from "zustand/middleware";
 import { registerStoreForReset } from "@/framework/stores/registry";
-import { createRepositorySlice, type RepositorySlice } from "./repository.slice";
-import { createBranchSlice, type BranchSlice } from "./branches.slice";
-import { createTagSlice, type TagSlice } from "./tags.slice";
-import { createStashSlice, type StashSlice } from "./stash.slice";
-import { createWorktreeSlice, type WorktreeSlice } from "./worktrees.slice";
+import { type BranchSlice, createBranchSlice } from "./branches.slice";
+import { type CloneSlice, createCloneSlice } from "./clone.slice";
 import { createGitflowSlice, type GitflowSlice } from "./gitflow.slice";
-import { createUndoSlice, type UndoSlice } from "./undo.slice";
+import {
+  createRepositorySlice,
+  type RepositorySlice,
+} from "./repository.slice";
+import { createStashSlice, type StashSlice } from "./stash.slice";
+import { createTagSlice, type TagSlice } from "./tags.slice";
 import { createTopologySlice, type TopologySlice } from "./topology.slice";
-import { createCloneSlice, type CloneSlice } from "./clone.slice";
+import { createUndoSlice, type UndoSlice } from "./undo.slice";
+import { createWorktreeSlice, type WorktreeSlice } from "./worktrees.slice";
 
 export type GitOpsStore = RepositorySlice &
   BranchSlice &
@@ -40,12 +43,12 @@ export const useGitOpsStore = create<GitOpsStore>()(
 
 registerStoreForReset(useGitOpsStore);
 
-export type { RepositorySlice } from "./repository.slice";
 export type { BranchSlice } from "./branches.slice";
-export type { TagSlice } from "./tags.slice";
-export type { StashSlice } from "./stash.slice";
-export type { WorktreeSlice } from "./worktrees.slice";
+export type { CloneSlice } from "./clone.slice";
 export type { GitflowSlice } from "./gitflow.slice";
-export type { UndoSlice } from "./undo.slice";
+export type { RepositorySlice } from "./repository.slice";
+export type { StashSlice } from "./stash.slice";
+export type { TagSlice } from "./tags.slice";
 export type { TopologySlice } from "./topology.slice";
-export type { CloneSlice } from "./clone.slice";
+export type { UndoSlice } from "./undo.slice";
+export type { WorktreeSlice } from "./worktrees.slice";
diff --git a/src/core/stores/domain/git-ops/repository.slice.ts b/src/core/stores/domain/git-ops/repository.slice.ts
index 413f1d6b..981bfd12 100644
--- a/src/core/stores/domain/git-ops/repository.slice.ts
+++ b/src/core/stores/domain/git-ops/repository.slice.ts
@@ -1,12 +1,12 @@
 import type { StateCreator } from "zustand";
+import { getNavigationActor } from "@/framework/layout/navigation/context";
+import { resetAllStores } from "@/framework/stores/registry";
+import { toast } from "@/framework/stores/toast";
 import type { RepoStatus } from "../../../../bindings";
 import { commands } from "../../../../bindings";
 import { getErrorMessage } from "../../../lib/errors";
-import { getNavigationActor } from "@/framework/layout/navigation/context";
-import { toast } from "@/framework/stores/toast";
-import { resetAllStores } from "@/framework/stores/registry";
-import type { GitOpsMiddleware } from "./types";
 import type { GitOpsStore } from "./index";
+import type { GitOpsMiddleware } from "./types";
 
 export interface RepositorySlice {
   repoStatus: RepoStatus | null;
@@ -30,20 +30,36 @@ export const createRepositorySlice: StateCreator<
   repoError: null,
 
   openRepository: async (path: string) => {
-    set({ repoIsLoading: true, repoError: null }, undefined, "gitOps:repo/open");
+    set(
+      { repoIsLoading: true, repoError: null },
+      undefined,
+      "gitOps:repo/open",
+    );
     try {
       const result = await commands.openRepository(path);
       if (result.status === "ok") {
-        set({ repoStatus: result.data, repoIsLoading: false }, undefined, "gitOps:repo/openOk");
+        set(
+          { repoStatus: result.data, repoIsLoading: false },
+          undefined,
+          "gitOps:repo/openOk",
+        );
       } else {
         const errorMsg = getErrorMessage(result.error);
-        set({ repoError: errorMsg, repoIsLoading: false, repoStatus: null }, undefined, "gitOps:repo/openFail");
+        set(
+          { repoError: errorMsg, repoIsLoading: false, repoStatus: null },
+          undefined,
+          "gitOps:repo/openFail",
+        );
         throw new Error(errorMsg);
       }
     } catch (e) {
       const errorMessage = e instanceof Error ? e.message : String(e);
       if (!get().repoError) {
-        set({ repoError: errorMessage, repoIsLoading: false, repoStatus: null });
+        set({
+          repoError: errorMessage,
+          repoIsLoading: false,
+          repoStatus: null,
+        });
       }
       throw e;
     }
@@ -76,5 +92,6 @@ export const createRepositorySlice: StateCreator<
     getNavigationActor().send({ type: "RESET_STACK" });
   },
 
-  clearRepoError: () => set({ repoError: null }, undefined, "gitOps:repo/clearError"),
+  clearRepoError: () =>
+    set({ repoError: null }, undefined, "gitOps:repo/clearError"),
 });
diff --git a/src/core/stores/domain/git-ops/stash.slice.ts b/src/core/stores/domain/git-ops/stash.slice.ts
index c12a4e36..4bcdc7ec 100644
--- a/src/core/stores/domain/git-ops/stash.slice.ts
+++ b/src/core/stores/domain/git-ops/stash.slice.ts
@@ -2,8 +2,8 @@ import type { StateCreator } from "zustand";
 import type { StashEntry } from "../../../../bindings";
 import { commands } from "../../../../bindings";
 import { getErrorMessage } from "../../../lib/errors";
-import type { GitOpsMiddleware } from "./types";
 import type { GitOpsStore } from "./index";
+import type { GitOpsMiddleware } from "./types";
 
 export interface StashSlice {
   stashList: StashEntry[];
@@ -11,7 +11,10 @@ export interface StashSlice {
   stashError: string | null;
 
   loadStashes: () => Promise<void>;
-  saveStash: (message: string | null, includeUntracked: boolean) => Promise<boolean>;
+  saveStash: (
+    message: string | null,
+    includeUntracked: boolean,
+  ) => Promise<boolean>;
   applyStash: (index: number) => Promise<boolean>;
   popStash: (index: number) => Promise<boolean>;
   dropStash: (index: number) => Promise<boolean>;
@@ -29,17 +32,29 @@ export const createStashSlice: StateCreator<
   stashError: null,
 
   loadStashes: async () => {
-    set({ stashIsLoading: true, stashError: null }, undefined, "gitOps:stash/load");
+    set(
+      { stashIsLoading: true, stashError: null },
+      undefined,
+      "gitOps:stash/load",
+    );
     const result = await commands.listStashes();
     if (result.status === "ok") {
-      set({ stashList: result.data, stashIsLoading: false }, undefined, "gitOps:stash/loadOk");
+      set(
+        { stashList: result.data, stashIsLoading: false },
+        undefined,
+        "gitOps:stash/loadOk",
+      );
     } else {
       set({ stashError: getErrorMessage(result.error), stashIsLoading: false });
     }
   },
 
   saveStash: async (message, includeUntracked) => {
-    set({ stashIsLoading: true, stashError: null }, undefined, "gitOps:stash/save");
+    set(
+      { stashIsLoading: true, stashError: null },
+      undefined,
+      "gitOps:stash/save",
+    );
     const result = await commands.stashSave(message, includeUntracked);
     if (result.status === "ok") {
       await get().loadStashes();
@@ -50,7 +65,11 @@ export const createStashSlice: StateCreator<
   },
 
   applyStash: async (index) => {
-    set({ stashIsLoading: true, stashError: null }, undefined, "gitOps:stash/apply");
+    set(
+      { stashIsLoading: true, stashError: null },
+      undefined,
+      "gitOps:stash/apply",
+    );
     const result = await commands.stashApply(index);
     if (result.status === "ok") {
       set({ stashIsLoading: false }, undefined, "gitOps:stash/applyOk");
@@ -61,7 +80,11 @@ export const createStashSlice: StateCreator<
   },
 
   popStash: async (index) => {
-    set({ stashIsLoading: true, stashError: null }, undefined, "gitOps:stash/pop");
+    set(
+      { stashIsLoading: true, stashError: null },
+      undefined,
+      "gitOps:stash/pop",
+    );
     const result = await commands.stashPop(index);
     if (result.status === "ok") {
       await get().loadStashes();
@@ -72,7 +95,11 @@ export const createStashSlice: StateCreator<
   },
 
   dropStash: async (index) => {
-    set({ stashIsLoading: true, stashError: null }, undefined, "gitOps:stash/drop");
+    set(
+      { stashIsLoading: true, stashError: null },
+      undefined,
+      "gitOps:stash/drop",
+    );
     const result = await commands.stashDrop(index);
     if (result.status === "ok") {
       await get().loadStashes();
@@ -82,5 +109,6 @@ export const createStashSlice: StateCreator<
     return false;
   },
 
-  clearStashError: () => set({ stashError: null }, undefined, "gitOps:stash/clearError"),
+  clearStashError: () =>
+    set({ stashError: null }, undefined, "gitOps:stash/clearError"),
 });
diff --git a/src/core/stores/domain/git-ops/tags.slice.ts b/src/core/stores/domain/git-ops/tags.slice.ts
index 1a51ab20..7172a161 100644
--- a/src/core/stores/domain/git-ops/tags.slice.ts
+++ b/src/core/stores/domain/git-ops/tags.slice.ts
@@ -2,8 +2,8 @@ import type { StateCreator } from "zustand";
 import type { TagInfo } from "../../../../bindings";
 import { commands } from "../../../../bindings";
 import { getErrorMessage } from "../../../lib/errors";
-import type { GitOpsMiddleware } from "./types";
 import type { GitOpsStore } from "./index";
+import type { GitOpsMiddleware } from "./types";
 
 export interface TagSlice {
   tagList: TagInfo[];
@@ -29,7 +29,11 @@ export const createTagSlice: StateCreator<
     set({ tagIsLoading: true, tagError: null }, undefined, "gitOps:tag/load");
     const result = await commands.listTags();
     if (result.status === "ok") {
-      set({ tagList: result.data, tagIsLoading: false }, undefined, "gitOps:tag/loadOk");
+      set(
+        { tagList: result.data, tagIsLoading: false },
+        undefined,
+        "gitOps:tag/loadOk",
+      );
     } else {
       set({ tagError: getErrorMessage(result.error), tagIsLoading: false });
     }
@@ -42,5 +46,6 @@ export const createTagSlice: StateCreator<
     }
   },
 
-  clearTagError: () => set({ tagError: null }, undefined, "gitOps:tag/clearError"),
+  clearTagError: () =>
+    set({ tagError: null }, undefined, "gitOps:tag/clearError"),
 });
diff --git a/src/core/stores/domain/git-ops/topology.slice.ts b/src/core/stores/domain/git-ops/topology.slice.ts
index ebbba9de..268eb66d 100644
--- a/src/core/stores/domain/git-ops/topology.slice.ts
+++ b/src/core/stores/domain/git-ops/topology.slice.ts
@@ -2,8 +2,8 @@ import type { StateCreator } from "zustand";
 import type { GraphEdge, GraphNode } from "../../../../bindings";
 import { commands } from "../../../../bindings";
 import { getErrorMessage } from "../../../lib/errors";
-import type { GitOpsMiddleware } from "./types";
 import type { GitOpsStore } from "./index";
+import type { GitOpsMiddleware } from "./types";
 
 const INITIAL_LIMIT = 100;
 const LOAD_MORE_AMOUNT = 50;
@@ -41,20 +41,31 @@ export const createTopologySlice: StateCreator<
   topologyCurrentOffset: 0,
 
   loadGraph: async () => {
-    set({ topologyIsLoading: true, topologyError: null }, undefined, "gitOps:topology/load");
+    set(
+      { topologyIsLoading: true, topologyError: null },
+      undefined,
+      "gitOps:topology/load",
+    );
     try {
       const result = await commands.getCommitGraph(INITIAL_LIMIT, 0);
       if (result.status === "ok") {
+        set(
+          {
+            nodes: result.data.nodes,
+            edges: result.data.edges,
+            topologyIsLoading: false,
+            topologyHasMore: result.data.nodes.length === INITIAL_LIMIT,
+            topologyCurrentOffset: result.data.nodes.length,
+            topologyLastRefresh: Date.now(),
+          },
+          undefined,
+          "gitOps:topology/loadOk",
+        );
+      } else {
         set({
-          nodes: result.data.nodes,
-          edges: result.data.edges,
+          topologyError: getErrorMessage(result.error),
           topologyIsLoading: false,
-          topologyHasMore: result.data.nodes.length === INITIAL_LIMIT,
-          topologyCurrentOffset: result.data.nodes.length,
-          topologyLastRefresh: Date.now(),
-        }, undefined, "gitOps:topology/loadOk");
-      } else {
-        set({ topologyError: getErrorMessage(result.error), topologyIsLoading: false });
+        });
       }
     } catch (e) {
       set({ topologyError: String(e), topologyIsLoading: false });
@@ -62,41 +73,68 @@ export const createTopologySlice: StateCreator<
   },
 
   loadMore: async () => {
-    const { topologyCurrentOffset, nodes, edges, topologyIsLoading, topologyHasMore } = get();
+    const {
+      topologyCurrentOffset,
+      nodes,
+      edges,
+      topologyIsLoading,
+      topologyHasMore,
+    } = get();
     if (topologyIsLoading || !topologyHasMore) return;
 
     set({ topologyIsLoading: true }, undefined, "gitOps:topology/loadMore");
     try {
-      const result = await commands.getCommitGraph(LOAD_MORE_AMOUNT, topologyCurrentOffset);
+      const result = await commands.getCommitGraph(
+        LOAD_MORE_AMOUNT,
+        topologyCurrentOffset,
+      );
       if (result.status === "ok") {
+        set(
+          {
+            nodes: [...nodes, ...result.data.nodes],
+            edges: [...edges, ...result.data.edges],
+            topologyIsLoading: false,
+            topologyHasMore: result.data.nodes.length === LOAD_MORE_AMOUNT,
+            topologyCurrentOffset:
+              topologyCurrentOffset + result.data.nodes.length,
+          },
+          undefined,
+          "gitOps:topology/loadMoreOk",
+        );
+      } else {
         set({
-          nodes: [...nodes, ...result.data.nodes],
-          edges: [...edges, ...result.data.edges],
+          topologyError: getErrorMessage(result.error),
           topologyIsLoading: false,
-          topologyHasMore: result.data.nodes.length === LOAD_MORE_AMOUNT,
-          topologyCurrentOffset: topologyCurrentOffset + result.data.nodes.length,
-        }, undefined, "gitOps:topology/loadMoreOk");
-      } else {
-        set({ topologyError: getErrorMessage(result.error), topologyIsLoading: false });
+        });
       }
     } catch (e) {
       set({ topologyError: String(e), topologyIsLoading: false });
     }
   },
 
-  selectCommit: (oid) => set({ topologySelectedCommit: oid }, undefined, "gitOps:topology/selectCommit"),
+  selectCommit: (oid) =>
+    set(
+      { topologySelectedCommit: oid },
+      undefined,
+      "gitOps:topology/selectCommit",
+    ),
 
   resetTopology: () =>
-    set({
-      nodes: [],
-      edges: [],
-      topologySelectedCommit: null,
-      topologyIsLoading: false,
-      topologyError: null,
-      topologyHasMore: true,
-      topologyLastRefresh: 0,
-      topologyCurrentOffset: 0,
-    }, undefined, "gitOps:topology/reset"),
+    set(
+      {
+        nodes: [],
+        edges: [],
+        topologySelectedCommit: null,
+        topologyIsLoading: false,
+        topologyError: null,
+        topologyHasMore: true,
+        topologyLastRefresh: 0,
+        topologyCurrentOffset: 0,
+      },
+      undefined,
+      "gitOps:topology/reset",
+    ),
 
-  clearTopologyError: () => set({ topologyError: null }, undefined, "gitOps:topology/clearError"),
+  clearTopologyError: () =>
+    set({ topologyError: null }, undefined, "gitOps:topology/clearError"),
 });
diff --git a/src/core/stores/domain/git-ops/undo.slice.ts b/src/core/stores/domain/git-ops/undo.slice.ts
index b214628b..396380f8 100644
--- a/src/core/stores/domain/git-ops/undo.slice.ts
+++ b/src/core/stores/domain/git-ops/undo.slice.ts
@@ -1,8 +1,8 @@
 import type { StateCreator } from "zustand";
 import type { UndoInfo } from "../../../../bindings";
 import { commands } from "../../../../bindings";
-import type { GitOpsMiddleware } from "./types";
 import type { GitOpsStore } from "./index";
+import type { GitOpsMiddleware } from "./types";
 
 export interface UndoSlice {
   undoInfo: UndoInfo | null;
@@ -28,7 +28,11 @@ export const createUndoSlice: StateCreator<
     try {
       const result = await commands.getUndoInfo();
       if (result.status === "ok") {
-        set({ undoInfo: result.data, undoIsLoading: false }, undefined, "gitOps:undo/loadOk");
+        set(
+          { undoInfo: result.data, undoIsLoading: false },
+          undefined,
+          "gitOps:undo/loadOk",
+        );
       } else {
         set({ undoInfo: null, undoIsLoading: false });
       }
diff --git a/src/core/stores/domain/git-ops/worktrees.slice.ts b/src/core/stores/domain/git-ops/worktrees.slice.ts
index 0689b3bd..e45d8ea5 100644
--- a/src/core/stores/domain/git-ops/worktrees.slice.ts
+++ b/src/core/stores/domain/git-ops/worktrees.slice.ts
@@ -1,9 +1,9 @@
 import type { StateCreator } from "zustand";
-import type { WorktreeInfo, CreateWorktreeOptions } from "../../../../bindings";
+import type { CreateWorktreeOptions, WorktreeInfo } from "../../../../bindings";
 import { commands } from "../../../../bindings";
 import { getErrorMessage } from "../../../lib/errors";
-import type { GitOpsMiddleware } from "./types";
 import type { GitOpsStore } from "./index";
+import type { GitOpsMiddleware } from "./types";
 
 export interface WorktreeSlice {
   worktreeList: WorktreeInfo[];
@@ -12,8 +12,14 @@ export interface WorktreeSlice {
   worktreeSelected: string | null;
 
   loadWorktrees: () => Promise<void>;
-  createWorktree: (options: CreateWorktreeOptions) => Promise<WorktreeInfo | null>;
-  deleteWorktree: (name: string, force: boolean, deleteBranch: boolean) => Promise<boolean>;
+  createWorktree: (
+    options: CreateWorktreeOptions,
+  ) => Promise<WorktreeInfo | null>;
+  deleteWorktree: (
+    name: string,
+    force: boolean,
+    deleteBranch: boolean,
+  ) => Promise<boolean>;
   selectWorktree: (name: string | null) => void;
   openInExplorer: (path: string) => Promise<void>;
   switchToWorktree: (path: string) => Promise<boolean>;
@@ -32,38 +38,64 @@ export const createWorktreeSlice: StateCreator<
   worktreeSelected: null,
 
   loadWorktrees: async () => {
-    set({ worktreeIsLoading: true, worktreeError: null }, undefined, "gitOps:worktree/load");
+    set(
+      { worktreeIsLoading: true, worktreeError: null },
+      undefined,
+      "gitOps:worktree/load",
+    );
     const result = await commands.listWorktrees();
     if (result.status === "ok") {
-      set({ worktreeList: result.data, worktreeIsLoading: false }, undefined, "gitOps:worktree/loadOk");
+      set(
+        { worktreeList: result.data, worktreeIsLoading: false },
+        undefined,
+        "gitOps:worktree/loadOk",
+      );
     } else {
-      set({ worktreeError: getErrorMessage(result.error), worktreeIsLoading: false });
+      set({
+        worktreeError: getErrorMessage(result.error),
+        worktreeIsLoading: false,
+      });
     }
   },
 
   createWorktree: async (options) => {
-    set({ worktreeIsLoading: true, worktreeError: null }, undefined, "gitOps:worktree/create");
+    set(
+      { worktreeIsLoading: true, worktreeError: null },
+      undefined,
+      "gitOps:worktree/create",
+    );
     const result = await commands.createWorktree(options);
     if (result.status === "ok") {
       await get().loadWorktrees();
       return result.data;
     }
-    set({ worktreeError: getErrorMessage(result.error), worktreeIsLoading: false });
+    set({
+      worktreeError: getErrorMessage(result.error),
+      worktreeIsLoading: false,
+    });
     return null;
   },
 
   deleteWorktree: async (name, force, deleteBranch) => {
-    set({ worktreeIsLoading: true, worktreeError: null }, undefined, "gitOps:worktree/delete");
+    set(
+      { worktreeIsLoading: true, worktreeError: null },
+      undefined,
+      "gitOps:worktree/delete",
+    );
     const result = await commands.deleteWorktree(name, force, deleteBranch);
     if (result.status === "ok") {
       await get().loadWorktrees();
       return true;
     }
-    set({ worktreeError: getErrorMessage(result.error), worktreeIsLoading: false });
+    set({
+      worktreeError: getErrorMessage(result.error),
+      worktreeIsLoading: false,
+    });
     return false;
   },
 
-  selectWorktree: (name) => set({ worktreeSelected: name }, undefined, "gitOps:worktree/select"),
+  selectWorktree: (name) =>
+    set({ worktreeSelected: name }, undefined, "gitOps:worktree/select"),
 
   openInExplorer: async (path) => {
     const { revealItemInDir } = await import("@tauri-apps/plugin-opener");
@@ -79,5 +111,6 @@ export const createWorktreeSlice: StateCreator<
     }
   },
 
-  clearWorktreeError: () => set({ worktreeError: null }, undefined, "gitOps:worktree/clearError"),
+  clearWorktreeError: () =>
+    set({ worktreeError: null }, undefined, "gitOps:worktree/clearError"),
 });
diff --git a/src/core/stores/domain/preferences/branch-metadata.slice.ts b/src/core/stores/domain/preferences/branch-metadata.slice.ts
index 5e011930..31c75c92 100644
--- a/src/core/stores/domain/preferences/branch-metadata.slice.ts
+++ b/src/core/stores/domain/preferences/branch-metadata.slice.ts
@@ -21,10 +21,7 @@ export interface BranchMetadataSlice {
   isBranchPinned: (repoPath: string, branchName: string) => boolean;
   recordBranchVisit: (repoPath: string, branchName: string) => Promise<void>;
   getMetaRecentBranches: (repoPath: string) => RecentBranchEntry[];
-  setMetaScopePreference: (
-    repoPath: string,
-    scopeId: string,
-  ) => Promise<void>;
+  setMetaScopePreference: (repoPath: string, scopeId: string) => Promise<void>;
   getMetaScopePreference: (repoPath: string) => string;
   initMetadata: () => Promise<void>;
 }
@@ -54,11 +51,7 @@ export const createBranchMetadataSlice: StateCreator<
     } catch (e) {
       console.error("Failed to persist pinned branches:", e);
     }
-    set(
-      { metaPinnedBranches: updated },
-      false,
-      "preferences:meta/pinBranch",
-    );
+    set({ metaPinnedBranches: updated }, false, "preferences:meta/pinBranch");
   },
 
   unpinBranch: async (repoPath: string, branchName: string) => {
@@ -75,11 +68,7 @@ export const createBranchMetadataSlice: StateCreator<
     } catch (e) {
       console.error("Failed to persist pinned branches:", e);
     }
-    set(
-      { metaPinnedBranches: updated },
-      false,
-      "preferences:meta/unpinBranch",
-    );
+    set({ metaPinnedBranches: updated }, false, "preferences:meta/unpinBranch");
   },
 
   isBranchPinned: (repoPath: string, branchName: string) => {
@@ -106,11 +95,7 @@ export const createBranchMetadataSlice: StateCreator<
     } catch (e) {
       console.error("Failed to persist recent branches:", e);
     }
-    set(
-      { metaRecentBranches: updated },
-      false,
-      "preferences:meta/recordVisit",
-    );
+    set({ metaRecentBranches: updated }, false, "preferences:meta/recordVisit");
   },
 
   getMetaRecentBranches: (repoPath: string) => {
diff --git a/src/core/stores/domain/preferences/diff.slice.ts b/src/core/stores/domain/preferences/diff.slice.ts
index 10474973..1d4f7264 100644
--- a/src/core/stores/domain/preferences/diff.slice.ts
+++ b/src/core/stores/domain/preferences/diff.slice.ts
@@ -47,11 +47,7 @@ export const createDiffSlice: StateCreator<
       await store.set("diff-preferences", newPrefs);
       await store.save();
 
-      set(
-        { diffPreferences: newPrefs },
-        false,
-        "preferences:diff/setViewMode",
-      );
+      set({ diffPreferences: newPrefs }, false, "preferences:diff/setViewMode");
     } catch (e) {
       console.error("Failed to update diff view mode:", e);
     }
diff --git a/src/core/stores/domain/preferences/index.ts b/src/core/stores/domain/preferences/index.ts
index f488a9b1..776ea341 100644
--- a/src/core/stores/domain/preferences/index.ts
+++ b/src/core/stores/domain/preferences/index.ts
@@ -1,33 +1,21 @@
 import { create } from "zustand";
 import { devtools } from "zustand/middleware";
 import {
-  createSettingsSlice,
-  type SettingsSlice,
-} from "./settings.slice";
-import {
-  createThemeSlice,
-  type ThemeSlice,
-} from "./theme.slice";
+  type BranchMetadataSlice,
+  createBranchMetadataSlice,
+} from "./branch-metadata.slice";
+import { createDiffSlice, type DiffSlice } from "./diff.slice";
+import { createLayoutSlice, type LayoutSlice } from "./layout.slice";
 import {
   createNavigationSlice,
   type NavigationSlice,
 } from "./navigation.slice";
-import {
-  createBranchMetadataSlice,
-  type BranchMetadataSlice,
-} from "./branch-metadata.slice";
 import {
   createReviewChecklistSlice,
   type ReviewChecklistSlice,
 } from "./review-checklist.slice";
-import {
-  createDiffSlice,
-  type DiffSlice,
-} from "./diff.slice";
-import {
-  createLayoutSlice,
-  type LayoutSlice,
-} from "./layout.slice";
+import { createSettingsSlice, type SettingsSlice } from "./settings.slice";
+import { createThemeSlice, type ThemeSlice } from "./theme.slice";
 
 export type PreferencesStore = SettingsSlice &
   ThemeSlice &
diff --git a/src/core/stores/domain/preferences/layout.slice.ts b/src/core/stores/domain/preferences/layout.slice.ts
index 8c205b75..29f2f77d 100644
--- a/src/core/stores/domain/preferences/layout.slice.ts
+++ b/src/core/stores/domain/preferences/layout.slice.ts
@@ -1,10 +1,10 @@
 import type { StateCreator } from "zustand";
-import { getStore } from "@/framework/stores/persistence/tauri";
 import {
   DEFAULT_PRESET_ID,
   getPresetById,
   type PresetId,
 } from "@/framework/layout/layoutPresets";
+import { getStore } from "@/framework/stores/persistence/tauri";
 import type { PreferencesStore } from "./index";
 import type { PreferencesMiddleware } from "./types";
 
diff --git a/src/core/stores/domain/preferences/navigation.slice.ts b/src/core/stores/domain/preferences/navigation.slice.ts
index bffb8ba1..49b03efd 100644
--- a/src/core/stores/domain/preferences/navigation.slice.ts
+++ b/src/core/stores/domain/preferences/navigation.slice.ts
@@ -95,11 +95,7 @@ export const createNavigationSlice: StateCreator<
     } catch (e) {
       console.error("Failed to persist pinned repos:", e);
     }
-    set(
-      { navPinnedRepoPaths: updated },
-      false,
-      "preferences:nav/pinRepo",
-    );
+    set({ navPinnedRepoPaths: updated }, false, "preferences:nav/pinRepo");
   },
 
   unpinRepo: async (path: string) => {
@@ -112,11 +108,7 @@ export const createNavigationSlice: StateCreator<
     } catch (e) {
       console.error("Failed to persist pinned repos:", e);
     }
-    set(
-      { navPinnedRepoPaths: updated },
-      false,
-      "preferences:nav/unpinRepo",
-    );
+    set({ navPinnedRepoPaths: updated }, false, "preferences:nav/unpinRepo");
   },
 
   isRepoPinned: (path: string) => {
diff --git a/src/core/stores/domain/preferences/preferences.test.ts b/src/core/stores/domain/preferences/preferences.test.ts
index fc08ab93..99296914 100644
--- a/src/core/stores/domain/preferences/preferences.test.ts
+++ b/src/core/stores/domain/preferences/preferences.test.ts
@@ -21,8 +21,8 @@ vi.mock("../../toast", () => ({
   },
 }));
 
-import { usePreferencesStore } from "./index";
 import { resetAllStores } from "../../registry";
+import { usePreferencesStore } from "./index";
 import { DEFAULT_CHECKLIST } from "./review-checklist.slice";
 
 describe("Preferences store", () => {
@@ -86,9 +86,9 @@ describe("Preferences store", () => {
         }),
       );
       expect(mockStore.save).toHaveBeenCalled();
-      expect(usePreferencesStore.getState().settingsData.git.defaultRemote).toBe(
-        "upstream",
-      );
+      expect(
+        usePreferencesStore.getState().settingsData.git.defaultRemote,
+      ).toBe("upstream");
     });
   });
 
@@ -155,9 +155,9 @@ describe("Preferences store", () => {
     it("pinRepo adds to navPinnedRepoPaths and persists", async () => {
       await usePreferencesStore.getState().pinRepo("/test/repo");
 
-      expect(
-        usePreferencesStore.getState().navPinnedRepoPaths,
-      ).toContain("/test/repo");
+      expect(usePreferencesStore.getState().navPinnedRepoPaths).toContain(
+        "/test/repo",
+      );
       expect(mockStore.set).toHaveBeenCalledWith(
         "nav-pinned-repos",
         expect.arrayContaining(["/test/repo"]),
@@ -168,9 +168,9 @@ describe("Preferences store", () => {
       await usePreferencesStore.getState().pinRepo("/test/repo");
       await usePreferencesStore.getState().unpinRepo("/test/repo");
 
-      expect(
-        usePreferencesStore.getState().navPinnedRepoPaths,
-      ).not.toContain("/test/repo");
+      expect(usePreferencesStore.getState().navPinnedRepoPaths).not.toContain(
+        "/test/repo",
+      );
     });
 
     it("pinRepo is idempotent", async () => {
@@ -209,10 +209,14 @@ describe("Preferences store", () => {
         .pinBranch("/test/repo", "feature/test");
 
       expect(
-        usePreferencesStore.getState().isBranchPinned("/test/repo", "feature/test"),
+        usePreferencesStore
+          .getState()
+          .isBranchPinned("/test/repo", "feature/test"),
       ).toBe(true);
       expect(
-        usePreferencesStore.getState().isBranchPinned("/test/repo", "other-branch"),
+        usePreferencesStore
+          .getState()
+          .isBranchPinned("/test/repo", "other-branch"),
       ).toBe(false);
     });
 
@@ -242,9 +246,7 @@ describe("Preferences store", () => {
 
   describe("review checklist slice", () => {
     it("getChecklistItems returns defaults for flow type", () => {
-      const items = usePreferencesStore
-        .getState()
-        .getChecklistItems("feature");
+      const items = usePreferencesStore.getState().getChecklistItems("feature");
       expect(items).toHaveLength(3);
       expect(items).toEqual(DEFAULT_CHECKLIST.feature);
     });
@@ -270,9 +272,7 @@ describe("Preferences store", () => {
       await usePreferencesStore
         .getState()
         .updateChecklistItems("feature", newItems);
-      await usePreferencesStore
-        .getState()
-        .resetChecklistToDefaults("feature");
+      await usePreferencesStore.getState().resetChecklistToDefaults("feature");
 
       expect(
         usePreferencesStore.getState().checklistCustomItems.feature,
diff --git a/src/core/stores/domain/preferences/review-checklist.slice.ts b/src/core/stores/domain/preferences/review-checklist.slice.ts
index 62d27f3d..bf9e048a 100644
--- a/src/core/stores/domain/preferences/review-checklist.slice.ts
+++ b/src/core/stores/domain/preferences/review-checklist.slice.ts
@@ -80,9 +80,7 @@ export const createReviewChecklistSlice: StateCreator<
   },
 
   getChecklistItems: (flowType: FlowType) => {
-    return (
-      get().checklistCustomItems[flowType] ?? DEFAULT_CHECKLIST[flowType]
-    );
+    return get().checklistCustomItems[flowType] ?? DEFAULT_CHECKLIST[flowType];
   },
 
   updateChecklistItems: async (
diff --git a/src/core/stores/domain/preferences/theme.slice.ts b/src/core/stores/domain/preferences/theme.slice.ts
index 9dd911f9..59a7198f 100644
--- a/src/core/stores/domain/preferences/theme.slice.ts
+++ b/src/core/stores/domain/preferences/theme.slice.ts
@@ -50,7 +50,11 @@ export const createThemeSlice: StateCreator<
       applyTheme(resolved);
 
       set(
-        { themePreference: theme, themeResolved: resolved, themeIsLoading: false },
+        {
+          themePreference: theme,
+          themeResolved: resolved,
+          themeIsLoading: false,
+        },
         false,
         "preferences:theme/init",
       );
diff --git a/src/core/stores/domain/ui-state/index.ts b/src/core/stores/domain/ui-state/index.ts
index cca30cd7..fa2b9989 100644
--- a/src/core/stores/domain/ui-state/index.ts
+++ b/src/core/stores/domain/ui-state/index.ts
@@ -2,13 +2,10 @@ import { create } from "zustand";
 import { devtools } from "zustand/middleware";
 import { registerStoreForReset } from "@/framework/stores/registry";
 import {
-  createStagingSlice,
-  type StagingSlice,
-} from "./staging.slice";
-import {
-  createCommandPaletteSlice,
   type CommandPaletteSlice,
+  createCommandPaletteSlice,
 } from "./command-palette.slice";
+import { createStagingSlice, type StagingSlice } from "./staging.slice";
 
 export type UIStore = StagingSlice & CommandPaletteSlice;
 
diff --git a/src/core/stores/index.ts b/src/core/stores/index.ts
index 12356a43..ac2a3c44 100644
--- a/src/core/stores/index.ts
+++ b/src/core/stores/index.ts
@@ -1,18 +1,19 @@
 // Domain stores
-export { useGitOpsStore } from "./domain/git-ops";
-export type { GitOpsStore } from "./domain/git-ops";
-export { useUIStore } from "./domain/ui-state";
-export type { UIStore } from "./domain/ui-state";
-export { usePreferencesStore, initAllPreferences } from "./domain/preferences";
-export type { PreferencesStore } from "./domain/preferences";
 
-// Infrastructure (re-exported from framework)
-export { useToastStore, toast } from "@/framework/stores/toast";
-export type { Toast, ToastType } from "@/framework/stores/toast";
-
-// Store utilities (re-exported from framework)
-export { resetAllStores, registerStoreForReset } from "@/framework/stores/registry";
 export { createBladeStore } from "@/framework/stores/createBladeStore";
-
+// Store utilities (re-exported from framework)
+export {
+  registerStoreForReset,
+  resetAllStores,
+} from "@/framework/stores/registry";
+export type { Toast, ToastType } from "@/framework/stores/toast";
+// Infrastructure (re-exported from framework)
+export { toast, useToastStore } from "@/framework/stores/toast";
 // Type definitions
-export type { BladeType, BladePropsMap, TypedBlade } from "./bladeTypes";
+export type { BladePropsMap, BladeType, TypedBlade } from "./bladeTypes";
+export type { GitOpsStore } from "./domain/git-ops";
+export { useGitOpsStore } from "./domain/git-ops";
+export type { PreferencesStore } from "./domain/preferences";
+export { initAllPreferences, usePreferencesStore } from "./domain/preferences";
+export type { UIStore } from "./domain/ui-state";
+export { useUIStore } from "./domain/ui-state";
diff --git a/src/core/stores/registry.test.ts b/src/core/stores/registry.test.ts
index 072097a0..79dc4bf2 100644
--- a/src/core/stores/registry.test.ts
+++ b/src/core/stores/registry.test.ts
@@ -1,12 +1,17 @@
 import { create } from "zustand";
-import { resetAllStores, registerStoreForReset } from "@/framework/stores/registry";
+import {
+  registerStoreForReset,
+  resetAllStores,
+} from "@/framework/stores/registry";
 
 describe("Store Registry", () => {
   it("resetAllStores resets a registered store to initial state", () => {
-    const useStore = create<{ count: number; increment: () => void }>((set) => ({
-      count: 0,
-      increment: () => set((s) => ({ count: s.count + 1 })),
-    }));
+    const useStore = create<{ count: number; increment: () => void }>(
+      (set) => ({
+        count: 0,
+        increment: () => set((s) => ({ count: s.count + 1 })),
+      }),
+    );
     registerStoreForReset(useStore);
 
     useStore.getState().increment();
@@ -18,14 +23,18 @@ describe("Store Registry", () => {
   });
 
   it("resetAllStores resets multiple registered stores", () => {
-    const useStoreA = create<{ value: string; setValue: (v: string) => void }>((set) => ({
-      value: "initial",
-      setValue: (v) => set({ value: v }),
-    }));
-    const useStoreB = create<{ count: number; increment: () => void }>((set) => ({
-      count: 0,
-      increment: () => set((s) => ({ count: s.count + 1 })),
-    }));
+    const useStoreA = create<{ value: string; setValue: (v: string) => void }>(
+      (set) => ({
+        value: "initial",
+        setValue: (v) => set({ value: v }),
+      }),
+    );
+    const useStoreB = create<{ count: number; increment: () => void }>(
+      (set) => ({
+        count: 0,
+        increment: () => set((s) => ({ count: s.count + 1 })),
+      }),
+    );
     registerStoreForReset(useStoreA);
     registerStoreForReset(useStoreB);
 
@@ -38,10 +47,12 @@ describe("Store Registry", () => {
   });
 
   it("unregistered stores are not affected by resetAllStores", () => {
-    const useStore = create<{ count: number; increment: () => void }>((set) => ({
-      count: 0,
-      increment: () => set((s) => ({ count: s.count + 1 })),
-    }));
+    const useStore = create<{ count: number; increment: () => void }>(
+      (set) => ({
+        count: 0,
+        increment: () => set((s) => ({ count: s.count + 1 })),
+      }),
+    );
     // Do NOT register
 
     useStore.getState().increment();
diff --git a/src/core/stores/repository.test.ts b/src/core/stores/repository.test.ts
index a6eebcfb..09a59484 100644
--- a/src/core/stores/repository.test.ts
+++ b/src/core/stores/repository.test.ts
@@ -1,8 +1,4 @@
-import {
-  createRepoStatus,
-  ok,
-  err,
-} from "../test-utils/mocks/tauri-commands";
+import { createRepoStatus, err, ok } from "../test-utils/mocks/tauri-commands";
 import { useGitOpsStore as useRepositoryStore } from "./domain/git-ops";
 
 const mockCommands = vi.hoisted(() => ({
diff --git a/src/core/stores/toast.test.ts b/src/core/stores/toast.test.ts
index 8b3d871d..e6d8f3a3 100644
--- a/src/core/stores/toast.test.ts
+++ b/src/core/stores/toast.test.ts
@@ -1,4 +1,4 @@
-import { useToastStore, toast } from "@/framework/stores/toast";
+import { toast, useToastStore } from "@/framework/stores/toast";
 
 describe("useToastStore", () => {
   it("has correct initial state with empty toasts", () => {
diff --git a/src/core/test-utils/index.ts b/src/core/test-utils/index.ts
index 320293a4..8acae8f3 100644
--- a/src/core/test-utils/index.ts
+++ b/src/core/test-utils/index.ts
@@ -1,20 +1,29 @@
 // Test utilities barrel export
-export { render, screen, within, waitFor, fireEvent, cleanup, act } from "./render";
+
 export {
-  ok,
-  err,
-  createMockCommands,
-  createRepoStatus,
-  createStagingStatus,
-  createFileChange,
   createBranchInfo,
-  createCommitSummary,
-  createFileDiff,
   createCommitDetails,
+  createCommitGraph,
   createCommitInfo,
-  createTagInfo,
-  createStashEntry,
+  createCommitSummary,
+  createFileChange,
+  createFileDiff,
+  createMockCommands,
   createRemoteInfo,
-  createCommitGraph,
+  createRepoStatus,
+  createStagingStatus,
+  createStashEntry,
+  createTagInfo,
   createWorktreeInfo,
+  err,
+  ok,
 } from "./mocks/tauri-commands";
+export {
+  act,
+  cleanup,
+  fireEvent,
+  render,
+  screen,
+  waitFor,
+  within,
+} from "./render";
diff --git a/src/core/test-utils/mocks/tauri-commands.ts b/src/core/test-utils/mocks/tauri-commands.ts
index ccf050bf..a100025b 100644
--- a/src/core/test-utils/mocks/tauri-commands.ts
+++ b/src/core/test-utils/mocks/tauri-commands.ts
@@ -1,39 +1,36 @@
 import type {
-  RepoStatus,
-  StagingStatus,
-  FileChange,
+  BatchDeleteResult,
   BranchInfo,
-  CommitSummary,
-  FileDiff,
+  ChangelogOutput,
   CommitDetails,
-  CommitInfo,
-  TagInfo,
-  StashEntry,
-  RemoteInfo,
   CommitGraph,
-  GitflowStatus,
+  CommitInfo,
+  CommitSummary,
+  FileChange,
+  FileChanged,
+  FileDiff,
+  GitError,
   GitflowContext,
+  GitflowError,
   GitflowInitResult,
+  GitflowStatus,
+  GitGlobalConfig,
+  InitResult,
+  LastCommitMessage,
   MergeResult,
   MergeStatus,
-  WorktreeInfo,
+  RemoteInfo,
+  RepoFileContent,
+  RepoStatus,
+  Result,
+  StagingStatus,
+  StashEntry,
   SyncResult,
-  UndoInfo,
+  TagInfo,
   TypeSuggestion,
-  ScopeSuggestion,
-  ChangelogOutput,
-  RepoFileEntry,
-  RepoFileContent,
-  GitGlobalConfig,
-  LastCommitMessage,
+  UndoInfo,
   ValidationResult,
-  InitResult,
-  BatchDeleteResult,
-  RecentCheckout,
-  Result,
-  GitError,
-  GitflowError,
-  FileChanged,
+  WorktreeInfo,
 } from "../../../bindings";
 
 // Result helpers
@@ -54,9 +51,7 @@ export function gitflowErr(error: GitflowError): Result<never, GitflowError> {
 }
 
 // Factory functions
-export function createRepoStatus(
-  overrides?: Partial<RepoStatus>,
-): RepoStatus {
+export function createRepoStatus(overrides?: Partial<RepoStatus>): RepoStatus {
   return {
     branchName: "main",
     isDirty: false,
@@ -77,9 +72,7 @@ export function createStagingStatus(
   };
 }
 
-export function createFileChange(
-  overrides?: Partial<FileChange>,
-): FileChange {
+export function createFileChange(overrides?: Partial<FileChange>): FileChange {
   return {
     path: "src/main.ts",
     status: "modified",
@@ -89,9 +82,7 @@ export function createFileChange(
   };
 }
 
-export function createBranchInfo(
-  overrides?: Partial<BranchInfo>,
-): BranchInfo {
+export function createBranchInfo(overrides?: Partial<BranchInfo>): BranchInfo {
   return {
     name: "main",
     isHead: true,
@@ -149,9 +140,7 @@ export function createCommitDetails(
   };
 }
 
-export function createCommitInfo(
-  overrides?: Partial<CommitInfo>,
-): CommitInfo {
+export function createCommitInfo(overrides?: Partial<CommitInfo>): CommitInfo {
   return {
     oid: "abc1234567890abcdef1234567890abcdef123456",
     shortOid: "abc1234",
@@ -173,9 +162,7 @@ export function createTagInfo(overrides?: Partial<TagInfo>): TagInfo {
   };
 }
 
-export function createStashEntry(
-  overrides?: Partial<StashEntry>,
-): StashEntry {
+export function createStashEntry(overrides?: Partial<StashEntry>): StashEntry {
   return {
     index: 0,
     message: "WIP: work in progress",
@@ -184,9 +171,7 @@ export function createStashEntry(
   };
 }
 
-export function createRemoteInfo(
-  overrides?: Partial<RemoteInfo>,
-): RemoteInfo {
+export function createRemoteInfo(overrides?: Partial<RemoteInfo>): RemoteInfo {
   return {
     name: "origin",
     url: "https://github.com/test/repo.git",
@@ -237,9 +222,7 @@ export function createMockCommands() {
     getRepositoryStatus: vi.fn().mockResolvedValue(ok(createRepoStatus())),
     isGitRepository: vi.fn().mockResolvedValue(ok(true)),
     closeRepository: vi.fn().mockResolvedValue(ok(null)),
-    getStagingStatus: vi
-      .fn()
-      .mockResolvedValue(ok(createStagingStatus())),
+    getStagingStatus: vi.fn().mockResolvedValue(ok(createStagingStatus())),
     stageFile: vi.fn().mockResolvedValue(ok(null)),
     unstageFile: vi.fn().mockResolvedValue(ok(null)),
     stageFiles: vi.fn().mockResolvedValue(ok(null)),
@@ -259,13 +242,9 @@ export function createMockCommands() {
       } satisfies LastCommitMessage),
     ),
     getCommitHistory: vi.fn().mockResolvedValue(ok([])),
-    getCommitDetails: vi
-      .fn()
-      .mockResolvedValue(ok(createCommitDetails())),
+    getCommitDetails: vi.fn().mockResolvedValue(ok(createCommitDetails())),
     searchCommits: vi.fn().mockResolvedValue(ok([])),
-    getCommitGraph: vi
-      .fn()
-      .mockResolvedValue(ok(createCommitGraph())),
+    getCommitGraph: vi.fn().mockResolvedValue(ok(createCommitGraph())),
     getRemotes: vi.fn().mockResolvedValue(ok([])),
     fetchFromRemote: vi.fn().mockResolvedValue(
       ok({
@@ -333,17 +312,11 @@ export function createMockCommands() {
         switchedToDevelop: true,
       } satisfies GitflowInitResult),
     ),
-    startFeature: vi
-      .fn()
-      .mockResolvedValue(gitflowOk("feature/test")),
+    startFeature: vi.fn().mockResolvedValue(gitflowOk("feature/test")),
     finishFeature: vi.fn().mockResolvedValue(gitflowOk(null)),
-    startRelease: vi
-      .fn()
-      .mockResolvedValue(gitflowOk("release/1.0.0")),
+    startRelease: vi.fn().mockResolvedValue(gitflowOk("release/1.0.0")),
     finishRelease: vi.fn().mockResolvedValue(gitflowOk("v1.0.0")),
-    startHotfix: vi
-      .fn()
-      .mockResolvedValue(gitflowOk("hotfix/fix-bug")),
+    startHotfix: vi.fn().mockResolvedValue(gitflowOk("hotfix/fix-bug")),
     finishHotfix: vi.fn().mockResolvedValue(gitflowOk("v1.0.1")),
     getGitflowStatus: vi.fn().mockResolvedValue(
       gitflowOk({
@@ -389,9 +362,7 @@ export function createMockCommands() {
       } satisfies ChangelogOutput),
     ),
     listWorktrees: vi.fn().mockResolvedValue(ok([])),
-    createWorktree: vi
-      .fn()
-      .mockResolvedValue(ok(createWorktreeInfo())),
+    createWorktree: vi.fn().mockResolvedValue(ok(createWorktreeInfo())),
     deleteWorktree: vi.fn().mockResolvedValue(ok(null)),
     getUndoInfo: vi.fn().mockResolvedValue(
       ok({
diff --git a/src/core/test-utils/render.tsx b/src/core/test-utils/render.tsx
index 0c8e8fec..30342660 100644
--- a/src/core/test-utils/render.tsx
+++ b/src/core/test-utils/render.tsx
@@ -1,7 +1,7 @@
-import type { ReactElement, ReactNode } from "react";
-import { render, type RenderOptions } from "@testing-library/react";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { type RenderOptions, render } from "@testing-library/react";
 import { MotionConfig } from "framer-motion";
+import type { ReactElement, ReactNode } from "react";
 import { NavigationProvider } from "@/framework/layout/navigation/context";
 
 function createTestQueryClient() {
diff --git a/src/core/workflows.ts b/src/core/workflows.ts
index e34bc80a..8264e3d2 100644
--- a/src/core/workflows.ts
+++ b/src/core/workflows.ts
@@ -6,12 +6,24 @@ import "./stores/bladeTypes";
 registerWorkflow({
   id: "staging",
   label: "Staging",
-  rootBlade: { type: "staging-changes", title: "Changes", props: {} as Record<string, never> },
+  rootBlade: {
+    type: "staging-changes",
+    title: "Changes",
+    props: {} as Record<string, never>,
+  },
 });
 
 registerWorkflow({
   id: "topology",
   label: "Topology",
-  rootBlade: { type: "topology-graph", title: "Topology", props: {} as Record<string, never> },
-  fallbackBlade: { type: "commit-list-fallback", title: "History", props: {} as Record<string, never> },
+  rootBlade: {
+    type: "topology-graph",
+    title: "Topology",
+    props: {} as Record<string, never>,
+  },
+  fallbackBlade: {
+    type: "commit-list-fallback",
+    title: "History",
+    props: {} as Record<string, never>,
+  },
 });
diff --git a/src/extensions/__tests__/ExtensionAPI.test.ts b/src/extensions/__tests__/ExtensionAPI.test.ts
index 48e1a4cf..5aca195a 100644
--- a/src/extensions/__tests__/ExtensionAPI.test.ts
+++ b/src/extensions/__tests__/ExtensionAPI.test.ts
@@ -1,14 +1,15 @@
-import { vi, describe, it, expect, beforeEach } from "vitest";
-import { ExtensionAPI } from "@/framework/extension-system/ExtensionAPI";
+import type { LucideIcon } from "lucide-react";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { gitHookBus } from "@/core/services/gitHookBus";
 import { useContextMenuRegistry } from "@/framework/extension-system/contextMenuRegistry";
-import { useSidebarPanelRegistry } from "@/framework/layout/sidebarPanelRegistry";
+import {
+  ExtensionAPI,
+  ExtensionAPI as ExtensionAPIClass,
+} from "@/framework/extension-system/ExtensionAPI";
 import { useStatusBarRegistry } from "@/framework/extension-system/statusBarRegistry";
 import { useToolbarRegistry } from "@/framework/extension-system/toolbarRegistry";
-import { gitHookBus } from "@/core/services/gitHookBus";
-import { ExtensionAPI as ExtensionAPIClass } from "@/framework/extension-system/ExtensionAPI";
 import { getBladeRegistration } from "@/framework/layout/bladeRegistry";
-import type { ContextMenuContext } from "@/framework/extension-system/contextMenuRegistry";
-import type { LucideIcon } from "lucide-react";
+import { useSidebarPanelRegistry } from "@/framework/layout/sidebarPanelRegistry";
 
 // Minimal stub for LucideIcon used by sidebar/toolbar configs
 const FakeIcon = (() => null) as unknown as LucideIcon;
@@ -44,8 +45,8 @@ describe("ExtensionAPI", () => {
 
     const items = useContextMenuRegistry.getState().items;
     expect(items.has("ext:test-ext:my-item")).toBe(true);
-    expect(items.get("ext:test-ext:my-item")!.source).toBe("ext:test-ext");
-    expect(items.get("ext:test-ext:my-item")!.label).toBe("Test Item");
+    expect(items.get("ext:test-ext:my-item")?.source).toBe("ext:test-ext");
+    expect(items.get("ext:test-ext:my-item")?.label).toBe("Test Item");
   });
 
   // Test 2
@@ -59,8 +60,13 @@ describe("ExtensionAPI", () => {
       priority: 100,
     });
 
-    expect(useSidebarPanelRegistry.getState().items.has("ext:test-ext:panel-high")).toBe(true);
-    expect(useSidebarPanelRegistry.getState().items.get("ext:test-ext:panel-high")!.priority).toBe(69);
+    expect(
+      useSidebarPanelRegistry.getState().items.has("ext:test-ext:panel-high"),
+    ).toBe(true);
+    expect(
+      useSidebarPanelRegistry.getState().items.get("ext:test-ext:panel-high")
+        ?.priority,
+    ).toBe(69);
 
     // Priority 0 should clamp to 1
     api.contributeSidebarPanel({
@@ -71,7 +77,10 @@ describe("ExtensionAPI", () => {
       priority: 0,
     });
 
-    expect(useSidebarPanelRegistry.getState().items.get("ext:test-ext:panel-low")!.priority).toBe(1);
+    expect(
+      useSidebarPanelRegistry.getState().items.get("ext:test-ext:panel-low")
+        ?.priority,
+    ).toBe(1);
 
     // Default priority (undefined) should become 50
     api.contributeSidebarPanel({
@@ -81,7 +90,10 @@ describe("ExtensionAPI", () => {
       component: () => null,
     });
 
-    expect(useSidebarPanelRegistry.getState().items.get("ext:test-ext:panel-default")!.priority).toBe(50);
+    expect(
+      useSidebarPanelRegistry.getState().items.get("ext:test-ext:panel-default")
+        ?.priority,
+    ).toBe(50);
   });
 
   // Test 3
@@ -94,8 +106,13 @@ describe("ExtensionAPI", () => {
       renderCustom: () => null,
     });
 
-    expect(useStatusBarRegistry.getState().items.has("ext:test-ext:status-high")).toBe(true);
-    expect(useStatusBarRegistry.getState().items.get("ext:test-ext:status-high")!.priority).toBe(89);
+    expect(
+      useStatusBarRegistry.getState().items.has("ext:test-ext:status-high"),
+    ).toBe(true);
+    expect(
+      useStatusBarRegistry.getState().items.get("ext:test-ext:status-high")
+        ?.priority,
+    ).toBe(89);
 
     // Priority -5 should clamp to 1
     api.contributeStatusBar({
@@ -105,7 +122,10 @@ describe("ExtensionAPI", () => {
       renderCustom: () => null,
     });
 
-    expect(useStatusBarRegistry.getState().items.get("ext:test-ext:status-low")!.priority).toBe(1);
+    expect(
+      useStatusBarRegistry.getState().items.get("ext:test-ext:status-low")
+        ?.priority,
+    ).toBe(1);
   });
 
   // Test 4
@@ -126,7 +146,10 @@ describe("ExtensionAPI", () => {
 
   // Test 5
   it("onWillGit registers handler that can cancel", async () => {
-    api.onWillGit("commit", () => ({ cancel: true, reason: "blocked by test" }));
+    api.onWillGit("commit", () => ({
+      cancel: true,
+      reason: "blocked by test",
+    }));
 
     const result = await gitHookBus.emitWill("commit");
 
@@ -248,7 +271,9 @@ describe("ExtensionAPI", () => {
       coreOverride: true,
     });
     expect(getBladeRegistration("viewer-markdown")).toBeDefined();
-    expect(getBladeRegistration("ext:content-viewers:viewer-markdown")).toBeUndefined();
+    expect(
+      getBladeRegistration("ext:content-viewers:viewer-markdown"),
+    ).toBeUndefined();
     api2.cleanup();
   });
 
@@ -287,7 +312,9 @@ describe("ExtensionAPI", () => {
       execute: vi.fn(),
     });
 
-    expect(useContextMenuRegistry.getState().items.has("ext:test-ext:item-2")).toBe(true);
+    expect(
+      useContextMenuRegistry.getState().items.has("ext:test-ext:item-2"),
+    ).toBe(true);
 
     // Second cleanup should only remove the second item, not error on missing first
     api.cleanup();
diff --git a/src/extensions/__tests__/ExtensionHost.test.ts b/src/extensions/__tests__/ExtensionHost.test.ts
index 2587a0c5..aec823ab 100644
--- a/src/extensions/__tests__/ExtensionHost.test.ts
+++ b/src/extensions/__tests__/ExtensionHost.test.ts
@@ -1,8 +1,8 @@
-import { vi, describe, it, expect, beforeEach } from "vitest";
+import type { LucideIcon } from "lucide-react";
+import { beforeEach, describe, expect, it, vi } from "vitest";
 import { useExtensionHost } from "@/framework/extension-system/ExtensionHost";
-import type { BuiltInExtensionConfig } from "@/framework/extension-system/types";
 import { useToolbarRegistry } from "@/framework/extension-system/toolbarRegistry";
-import type { LucideIcon } from "lucide-react";
+import type { BuiltInExtensionConfig } from "@/framework/extension-system/types";
 
 // Mock Tauri / infrastructure dependencies
 vi.mock("@tauri-apps/api/core", () => ({
@@ -60,7 +60,7 @@ describe("ExtensionHost", () => {
 
     const ext = useExtensionHost.getState().extensions.get("test-ext");
     expect(ext).toBeDefined();
-    expect(ext!.status).toBe("active");
+    expect(ext?.status).toBe("active");
   });
 
   it("registerBuiltIn sets trustLevel to built-in", async () => {
@@ -68,7 +68,7 @@ describe("ExtensionHost", () => {
     await useExtensionHost.getState().registerBuiltIn(config);
 
     const ext = useExtensionHost.getState().extensions.get("test-ext");
-    expect(ext!.trustLevel).toBe("built-in");
+    expect(ext?.trustLevel).toBe("built-in");
   });
 
   it("registerBuiltIn sets builtIn flag to true", async () => {
@@ -76,7 +76,7 @@ describe("ExtensionHost", () => {
     await useExtensionHost.getState().registerBuiltIn(config);
 
     const ext = useExtensionHost.getState().extensions.get("test-ext");
-    expect(ext!.builtIn).toBe(true);
+    expect(ext?.builtIn).toBe(true);
   });
 
   it("registerBuiltIn calls the activate callback with an ExtensionAPI", async () => {
@@ -96,10 +96,14 @@ describe("ExtensionHost", () => {
   it("deactivateExtension transitions to disabled status", async () => {
     const config = createTestConfig();
     await useExtensionHost.getState().registerBuiltIn(config);
-    expect(useExtensionHost.getState().extensions.get("test-ext")!.status).toBe("active");
+    expect(useExtensionHost.getState().extensions.get("test-ext")?.status).toBe(
+      "active",
+    );
 
     await useExtensionHost.getState().deactivateExtension("test-ext");
-    expect(useExtensionHost.getState().extensions.get("test-ext")!.status).toBe("disabled");
+    expect(useExtensionHost.getState().extensions.get("test-ext")?.status).toBe(
+      "disabled",
+    );
   });
 
   it("deactivateExtension calls api.cleanup() removing registrations", async () => {
@@ -117,10 +121,14 @@ describe("ExtensionHost", () => {
     });
 
     await useExtensionHost.getState().registerBuiltIn(config);
-    expect(useToolbarRegistry.getState().items.has("ext:test-ext:test-action")).toBe(true);
+    expect(
+      useToolbarRegistry.getState().items.has("ext:test-ext:test-action"),
+    ).toBe(true);
 
     await useExtensionHost.getState().deactivateExtension("test-ext");
-    expect(useToolbarRegistry.getState().items.has("ext:test-ext:test-action")).toBe(false);
+    expect(
+      useToolbarRegistry.getState().items.has("ext:test-ext:test-action"),
+    ).toBe(false);
   });
 
   it("deactivateExtension calls onDeactivate callback", async () => {
@@ -143,10 +151,14 @@ describe("ExtensionHost", () => {
     expect(activateFn).toHaveBeenCalledTimes(1);
 
     await useExtensionHost.getState().deactivateExtension("test-ext");
-    expect(useExtensionHost.getState().extensions.get("test-ext")!.status).toBe("disabled");
+    expect(useExtensionHost.getState().extensions.get("test-ext")?.status).toBe(
+      "disabled",
+    );
 
     await useExtensionHost.getState().activateExtension("test-ext");
-    expect(useExtensionHost.getState().extensions.get("test-ext")!.status).toBe("active");
+    expect(useExtensionHost.getState().extensions.get("test-ext")?.status).toBe(
+      "active",
+    );
     expect(activateFn).toHaveBeenCalledTimes(2);
   });
 
@@ -173,11 +185,13 @@ describe("ExtensionHost", () => {
     await useExtensionHost.getState().registerBuiltIn(config);
 
     const ext = useExtensionHost.getState().extensions.get("test-ext");
-    expect(ext!.status).toBe("error");
-    expect(ext!.error).toBe("activation boom");
+    expect(ext?.status).toBe("error");
+    expect(ext?.error).toBe("activation boom");
 
     // Partial toolbar registration should be cleaned up
-    expect(useToolbarRegistry.getState().items.has("ext:test-ext:partial-action")).toBe(false);
+    expect(
+      useToolbarRegistry.getState().items.has("ext:test-ext:partial-action"),
+    ).toBe(false);
 
     errorSpy.mockRestore();
   });
diff --git a/src/extensions/__tests__/conventional-commits.test.ts b/src/extensions/__tests__/conventional-commits.test.ts
index 3ee68fa8..07fa33b0 100644
--- a/src/extensions/__tests__/conventional-commits.test.ts
+++ b/src/extensions/__tests__/conventional-commits.test.ts
@@ -1,4 +1,4 @@
-import { describe, it, expect, beforeEach } from "vitest";
+import { beforeEach, describe, expect, it } from "vitest";
 import { ExtensionAPI } from "@/framework/extension-system/ExtensionAPI";
 import { getBladeRegistration } from "@/framework/layout/bladeRegistry";
 import { onActivate, onDeactivate } from "../conventional-commits";
@@ -23,8 +23,12 @@ describe("conventional-commits extension", () => {
     await onActivate(api);
 
     // Should NOT be namespaced
-    expect(getBladeRegistration("ext:conventional-commits:conventional-commit")).toBeUndefined();
-    expect(getBladeRegistration("ext:conventional-commits:changelog")).toBeUndefined();
+    expect(
+      getBladeRegistration("ext:conventional-commits:conventional-commit"),
+    ).toBeUndefined();
+    expect(
+      getBladeRegistration("ext:conventional-commits:changelog"),
+    ).toBeUndefined();
 
     api.cleanup();
   });
diff --git a/src/extensions/__tests__/gitflow.test.ts b/src/extensions/__tests__/gitflow.test.ts
index 870283e3..1f1bcd5c 100644
--- a/src/extensions/__tests__/gitflow.test.ts
+++ b/src/extensions/__tests__/gitflow.test.ts
@@ -1,8 +1,8 @@
-import { describe, it, expect, beforeEach } from "vitest";
+import { beforeEach, describe, expect, it } from "vitest";
 import { ExtensionAPI } from "@/framework/extension-system/ExtensionAPI";
+import { useToolbarRegistry } from "@/framework/extension-system/toolbarRegistry";
 import { getBladeRegistration } from "@/framework/layout/bladeRegistry";
 import { useSidebarPanelRegistry } from "@/framework/layout/sidebarPanelRegistry";
-import { useToolbarRegistry } from "@/framework/extension-system/toolbarRegistry";
 import { onActivate, onDeactivate } from "../gitflow";
 
 describe("gitflow extension", () => {
@@ -24,7 +24,9 @@ describe("gitflow extension", () => {
     await onActivate(api);
 
     // Should NOT be namespaced
-    expect(getBladeRegistration("ext:gitflow:gitflow-cheatsheet")).toBeUndefined();
+    expect(
+      getBladeRegistration("ext:gitflow:gitflow-cheatsheet"),
+    ).toBeUndefined();
 
     api.cleanup();
   });
@@ -60,7 +62,9 @@ describe("gitflow extension", () => {
   it("sidebar panel has priority 65 and defaultOpen false", async () => {
     await onActivate(api);
 
-    const panel = useSidebarPanelRegistry.getState().items.get("ext:gitflow:gitflow-panel");
+    const panel = useSidebarPanelRegistry
+      .getState()
+      .items.get("ext:gitflow:gitflow-panel");
     expect(panel?.priority).toBe(65);
     expect(panel?.defaultOpen).toBe(false);
 
@@ -81,8 +85,12 @@ describe("gitflow extension", () => {
     api.cleanup();
 
     expect(getBladeRegistration("gitflow-cheatsheet")).toBeUndefined();
-    expect(useSidebarPanelRegistry.getState().items.has("ext:gitflow:gitflow-panel")).toBe(false);
-    expect(useToolbarRegistry.getState().items.has("ext:gitflow:gitflow-guide")).toBe(false);
+    expect(
+      useSidebarPanelRegistry.getState().items.has("ext:gitflow:gitflow-panel"),
+    ).toBe(false);
+    expect(
+      useToolbarRegistry.getState().items.has("ext:gitflow:gitflow-guide"),
+    ).toBe(false);
   });
 
   it("onDeactivate is a no-op (cleanup handled by ExtensionAPI)", () => {
diff --git a/src/extensions/__tests__/github.test.ts b/src/extensions/__tests__/github.test.ts
index e9ea9ca6..712c451d 100644
--- a/src/extensions/__tests__/github.test.ts
+++ b/src/extensions/__tests__/github.test.ts
@@ -1,8 +1,8 @@
-import { vi, describe, it, expect, beforeEach, afterEach } from "vitest";
-import { ExtensionAPI } from "@/framework/extension-system/ExtensionAPI";
-import { getBladeRegistration } from "@/framework/layout/bladeRegistry";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { getCommandById } from "@/framework/command-palette/commandRegistry";
+import { ExtensionAPI } from "@/framework/extension-system/ExtensionAPI";
 import { useToolbarRegistry } from "@/framework/extension-system/toolbarRegistry";
+import { getBladeRegistration } from "@/framework/layout/bladeRegistry";
 
 // Mock blade components used by the GitHub extension
 vi.mock("../github/blades/GitHubAuthBlade", () => ({
@@ -85,7 +85,9 @@ describe("github extension", () => {
     onDeactivate = ghModule.onDeactivate;
 
     const ghStore = await import("../github/githubStore");
-    cancelGitHubPolling = ghStore.cancelGitHubPolling as ReturnType<typeof vi.fn>;
+    cancelGitHubPolling = ghStore.cancelGitHubPolling as ReturnType<
+      typeof vi.fn
+    >;
 
     const qc = await import("../../core/lib/queryClient");
     queryClient = qc.queryClient as { removeQueries: ReturnType<typeof vi.fn> };
diff --git a/src/extensions/__tests__/init-repo.test.ts b/src/extensions/__tests__/init-repo.test.ts
index 7d4dd50f..a051399d 100644
--- a/src/extensions/__tests__/init-repo.test.ts
+++ b/src/extensions/__tests__/init-repo.test.ts
@@ -1,4 +1,4 @@
-import { describe, it, expect, beforeEach, vi } from "vitest";
+import { beforeEach, describe, expect, it, vi } from "vitest";
 
 // Mock bladeOpener
 vi.mock("../../core/lib/bladeOpener", () => ({
@@ -14,9 +14,9 @@ vi.mock("../init-repo/store", () => ({
   },
 }));
 
+import { getCommandById } from "@/framework/command-palette/commandRegistry";
 import { ExtensionAPI } from "@/framework/extension-system/ExtensionAPI";
 import { getBladeRegistration } from "@/framework/layout/bladeRegistry";
-import { getCommandById } from "@/framework/command-palette/commandRegistry";
 import { onActivate, onDeactivate } from "../init-repo";
 
 describe("init-repo extension", () => {
diff --git a/src/extensions/__tests__/topology.test.ts b/src/extensions/__tests__/topology.test.ts
index 1452c22a..97e58ab8 100644
--- a/src/extensions/__tests__/topology.test.ts
+++ b/src/extensions/__tests__/topology.test.ts
@@ -1,4 +1,4 @@
-import { describe, it, expect, beforeEach, vi } from "vitest";
+import { beforeEach, describe, expect, it, vi } from "vitest";
 
 // Mock @tauri-apps/api/event (listen returns an unlisten function)
 vi.mock("@tauri-apps/api/event", () => ({
@@ -11,7 +11,7 @@ vi.mock("@tauri-apps/plugin-store", () => ({
     load: vi.fn(() =>
       Promise.resolve({
         get: vi.fn(() => Promise.resolve(null)),
-      })
+      }),
     ),
   },
 }));
@@ -34,9 +34,9 @@ vi.mock("../../core/stores/domain/git-ops", () => ({
   },
 }));
 
+import { getCommandById } from "@/framework/command-palette/commandRegistry";
 import { ExtensionAPI } from "@/framework/extension-system/ExtensionAPI";
 import { getBladeRegistration } from "@/framework/layout/bladeRegistry";
-import { getCommandById } from "@/framework/command-palette/commandRegistry";
 import { onActivate, onDeactivate } from "../topology";
 
 describe("topology extension", () => {
diff --git a/src/extensions/__tests__/viewer-3d.test.ts b/src/extensions/__tests__/viewer-3d.test.ts
index c9f483e8..b56f11d3 100644
--- a/src/extensions/__tests__/viewer-3d.test.ts
+++ b/src/extensions/__tests__/viewer-3d.test.ts
@@ -1,4 +1,4 @@
-import { describe, it, expect, beforeEach } from "vitest";
+import { beforeEach, describe, expect, it } from "vitest";
 import { ExtensionAPI } from "@/framework/extension-system/ExtensionAPI";
 import { getBladeRegistration } from "@/framework/layout/bladeRegistry";
 import { onActivate, onDeactivate } from "../viewer-3d";
diff --git a/src/extensions/__tests__/viewer-code.test.ts b/src/extensions/__tests__/viewer-code.test.ts
index 212c205c..54be112d 100644
--- a/src/extensions/__tests__/viewer-code.test.ts
+++ b/src/extensions/__tests__/viewer-code.test.ts
@@ -1,4 +1,4 @@
-import { describe, it, expect, beforeEach } from "vitest";
+import { beforeEach, describe, expect, it } from "vitest";
 import { ExtensionAPI } from "@/framework/extension-system/ExtensionAPI";
 import { getBladeRegistration } from "@/framework/layout/bladeRegistry";
 import { onActivate, onDeactivate } from "../viewer-code";
diff --git a/src/extensions/__tests__/viewer-image.test.ts b/src/extensions/__tests__/viewer-image.test.ts
index 8f1a64dd..7908e706 100644
--- a/src/extensions/__tests__/viewer-image.test.ts
+++ b/src/extensions/__tests__/viewer-image.test.ts
@@ -1,4 +1,4 @@
-import { describe, it, expect, beforeEach } from "vitest";
+import { beforeEach, describe, expect, it } from "vitest";
 import { ExtensionAPI } from "@/framework/extension-system/ExtensionAPI";
 import { getBladeRegistration } from "@/framework/layout/bladeRegistry";
 import { onActivate, onDeactivate } from "../viewer-image";
@@ -21,7 +21,9 @@ describe("viewer-image extension", () => {
   it("registers blade type without ext: namespace (coreOverride)", async () => {
     await onActivate(api);
 
-    expect(getBladeRegistration("ext:viewer-image:viewer-image")).toBeUndefined();
+    expect(
+      getBladeRegistration("ext:viewer-image:viewer-image"),
+    ).toBeUndefined();
 
     api.cleanup();
   });
diff --git a/src/extensions/__tests__/viewer-markdown.test.ts b/src/extensions/__tests__/viewer-markdown.test.ts
index d33f3562..f0d67a68 100644
--- a/src/extensions/__tests__/viewer-markdown.test.ts
+++ b/src/extensions/__tests__/viewer-markdown.test.ts
@@ -1,4 +1,4 @@
-import { describe, it, expect, beforeEach } from "vitest";
+import { beforeEach, describe, expect, it } from "vitest";
 import { ExtensionAPI } from "@/framework/extension-system/ExtensionAPI";
 import { getBladeRegistration } from "@/framework/layout/bladeRegistry";
 import { onActivate, onDeactivate } from "../viewer-markdown";
@@ -21,7 +21,9 @@ describe("viewer-markdown extension", () => {
   it("registers blade type without ext: namespace (coreOverride)", async () => {
     await onActivate(api);
 
-    expect(getBladeRegistration("ext:viewer-markdown:viewer-markdown")).toBeUndefined();
+    expect(
+      getBladeRegistration("ext:viewer-markdown:viewer-markdown"),
+    ).toBeUndefined();
 
     api.cleanup();
   });
diff --git a/src/extensions/__tests__/viewer-nupkg.test.ts b/src/extensions/__tests__/viewer-nupkg.test.ts
index e81d5d14..a9888206 100644
--- a/src/extensions/__tests__/viewer-nupkg.test.ts
+++ b/src/extensions/__tests__/viewer-nupkg.test.ts
@@ -1,4 +1,4 @@
-import { describe, it, expect, beforeEach } from "vitest";
+import { beforeEach, describe, expect, it } from "vitest";
 import { ExtensionAPI } from "@/framework/extension-system/ExtensionAPI";
 import { getBladeRegistration } from "@/framework/layout/bladeRegistry";
 import { onActivate, onDeactivate } from "../viewer-nupkg";
@@ -21,7 +21,9 @@ describe("viewer-nupkg extension", () => {
   it("registers blade type without ext: namespace (coreOverride)", async () => {
     await onActivate(api);
 
-    expect(getBladeRegistration("ext:viewer-nupkg:viewer-nupkg")).toBeUndefined();
+    expect(
+      getBladeRegistration("ext:viewer-nupkg:viewer-nupkg"),
+    ).toBeUndefined();
 
     api.cleanup();
   });
diff --git a/src/extensions/__tests__/viewer-plaintext.test.ts b/src/extensions/__tests__/viewer-plaintext.test.ts
index bbf79d82..9fe7946e 100644
--- a/src/extensions/__tests__/viewer-plaintext.test.ts
+++ b/src/extensions/__tests__/viewer-plaintext.test.ts
@@ -1,4 +1,4 @@
-import { describe, it, expect, beforeEach } from "vitest";
+import { beforeEach, describe, expect, it } from "vitest";
 import { ExtensionAPI } from "@/framework/extension-system/ExtensionAPI";
 import { getBladeRegistration } from "@/framework/layout/bladeRegistry";
 import { onActivate, onDeactivate } from "../viewer-plaintext";
@@ -21,7 +21,9 @@ describe("viewer-plaintext extension", () => {
   it("registers blade type without ext: namespace (coreOverride)", async () => {
     await onActivate(api);
 
-    expect(getBladeRegistration("ext:viewer-plaintext:viewer-plaintext")).toBeUndefined();
+    expect(
+      getBladeRegistration("ext:viewer-plaintext:viewer-plaintext"),
+    ).toBeUndefined();
 
     api.cleanup();
   });
diff --git a/src/extensions/__tests__/worktrees.test.ts b/src/extensions/__tests__/worktrees.test.ts
index 5cc98e24..0006e0dd 100644
--- a/src/extensions/__tests__/worktrees.test.ts
+++ b/src/extensions/__tests__/worktrees.test.ts
@@ -1,4 +1,4 @@
-import { describe, it, expect, beforeEach, vi } from "vitest";
+import { beforeEach, describe, expect, it, vi } from "vitest";
 
 // Mock git-ops store
 vi.mock("../../core/stores/domain/git-ops", () => ({
@@ -11,9 +11,9 @@ vi.mock("../../core/stores/domain/git-ops", () => ({
   },
 }));
 
+import { getCommandById } from "@/framework/command-palette/commandRegistry";
 import { ExtensionAPI } from "@/framework/extension-system/ExtensionAPI";
 import { useSidebarPanelRegistry } from "@/framework/layout/sidebarPanelRegistry";
-import { getCommandById } from "@/framework/command-palette/commandRegistry";
 import { onActivate, onDeactivate } from "../worktrees";
 
 describe("worktrees extension", () => {
@@ -65,7 +65,9 @@ describe("worktrees extension", () => {
     api.cleanup();
 
     expect(
-      useSidebarPanelRegistry.getState().items.has("ext:worktrees:worktree-panel")
+      useSidebarPanelRegistry
+        .getState()
+        .items.has("ext:worktrees:worktree-panel"),
     ).toBe(false);
     expect(getCommandById("ext:worktrees:create-worktree")).toBeUndefined();
     expect(getCommandById("ext:worktrees:refresh-worktrees")).toBeUndefined();
@@ -79,7 +81,9 @@ describe("worktrees extension", () => {
     await onActivate(api2);
 
     expect(
-      useSidebarPanelRegistry.getState().items.has("ext:worktrees:worktree-panel")
+      useSidebarPanelRegistry
+        .getState()
+        .items.has("ext:worktrees:worktree-panel"),
     ).toBe(true);
     expect(getCommandById("ext:worktrees:create-worktree")).toBeDefined();
 
diff --git a/src/extensions/branches/components/BranchItem.tsx b/src/extensions/branches/components/BranchItem.tsx
index 3e21b654..c49e0fc0 100644
--- a/src/extensions/branches/components/BranchItem.tsx
+++ b/src/extensions/branches/components/BranchItem.tsx
@@ -1,16 +1,22 @@
 import { Check, GitBranch, GitMerge, Loader2, Pin, Trash2 } from "lucide-react";
 import { useEffect, useState } from "react";
+import { gitHookBus } from "@/core/services/gitHookBus";
+import { useContextMenuRegistry } from "@/framework/extension-system/contextMenuRegistry";
+import { cn } from "@/framework/lib/utils";
 import type { AheadBehind } from "../../../bindings";
 import { commands } from "../../../bindings";
 import type { EnrichedBranch } from "../../../core/lib/branchClassifier";
-import { useContextMenuRegistry } from "@/framework/extension-system/contextMenuRegistry";
-import { gitHookBus } from "@/core/services/gitHookBus";
-import { cn } from "@/framework/lib/utils";
 import { BranchTypeBadge } from "./BranchTypeBadge";
 
-function AheadBehindBadge({ branchName, isRemote }: { branchName: string; isRemote: boolean }) {
+function AheadBehindBadge({
+  branchName,
+  isRemote,
+}: {
+  branchName: string;
+  isRemote: boolean;
+}) {
   const [counts, setCounts] = useState<AheadBehind | null>(null);
-  const [tick, setTick] = useState(0);
+  const [_tick, setTick] = useState(0);
 
   useEffect(() => {
     if (isRemote) return;
@@ -20,8 +26,10 @@ function AheadBehindBadge({ branchName, isRemote }: { branchName: string; isRemo
         setCounts(result.data);
       }
     });
-    return () => { cancelled = true; };
-  }, [branchName, isRemote, tick]);
+    return () => {
+      cancelled = true;
+    };
+  }, [branchName, isRemote]);
 
   // Re-fetch ahead/behind after push/fetch/pull
   useEffect(() => {
@@ -40,12 +48,18 @@ function AheadBehindBadge({ branchName, isRemote }: { branchName: string; isRemo
   return (
     <span className="flex items-center gap-1 text-xs font-mono shrink-0">
       {counts.ahead > 0 && (
-        <span className="text-ctp-green" title={`${counts.ahead} commit(s) ahead of upstream`}>
+        <span
+          className="text-ctp-green"
+          title={`${counts.ahead} commit(s) ahead of upstream`}
+        >
           ↑{counts.ahead}
         </span>
       )}
       {counts.behind > 0 && (
-        <span className="text-ctp-blue" title={`${counts.behind} commit(s) behind upstream`}>
+        <span
+          className="text-ctp-blue"
+          title={`${counts.behind} commit(s) behind upstream`}
+        >
           ↓{counts.behind}
         </span>
       )}
@@ -55,9 +69,9 @@ function AheadBehindBadge({ branchName, isRemote }: { branchName: string; isRemo
 
 interface BranchItemProps {
   branch: EnrichedBranch;
-  onCheckout: () => Promise<unknown> | void;
-  onDelete: () => Promise<unknown> | void;
-  onMerge: () => Promise<unknown> | void;
+  onCheckout: () => Promise<unknown> | undefined;
+  onDelete: () => Promise<unknown> | undefined;
+  onMerge: () => Promise<unknown> | undefined;
   onTogglePin?: () => void;
   disabled?: boolean;
 }
@@ -77,7 +91,7 @@ export function BranchItem({
 
   const handleAction = async (
     action: "checkout" | "merge" | "delete",
-    fn: () => Promise<unknown> | void,
+    fn: () => Promise<unknown> | undefined,
   ) => {
     setLoadingAction(action);
     try {
@@ -98,11 +112,12 @@ export function BranchItem({
       )}
       onContextMenu={(e) => {
         e.preventDefault();
-        useContextMenuRegistry.getState().showMenu(
-          { x: e.clientX, y: e.clientY },
-          "branch-list",
-          { location: "branch-list", branchName: branch.name },
-        );
+        useContextMenuRegistry
+          .getState()
+          .showMenu({ x: e.clientX, y: e.clientY }, "branch-list", {
+            location: "branch-list",
+            branchName: branch.name,
+          });
       }}
     >
       <div className="flex items-center gap-1.5 min-w-0 flex-1">
@@ -117,7 +132,7 @@ export function BranchItem({
               "p-0.5 rounded shrink-0 transition-opacity",
               branch.isPinned
                 ? "text-ctp-blue hover:text-ctp-sapphire opacity-100"
-                : "text-ctp-overlay0 hover:text-ctp-subtext0 opacity-0 group-hover/item:opacity-100"
+                : "text-ctp-overlay0 hover:text-ctp-subtext0 opacity-0 group-hover/item:opacity-100",
             )}
             title={branch.isPinned ? "Unpin branch" : "Pin branch"}
             aria-label={branch.isPinned ? "Unpin branch" : "Pin branch"}
diff --git a/src/extensions/branches/components/BranchList.tsx b/src/extensions/branches/components/BranchList.tsx
index babee196..ff7521f8 100644
--- a/src/extensions/branches/components/BranchList.tsx
+++ b/src/extensions/branches/components/BranchList.tsx
@@ -1,14 +1,19 @@
-import { useEffect, useMemo, useState } from "react";
 import { Pin, Shield } from "lucide-react";
-import { useBulkSelect } from "../../../core/hooks/useBulkSelect";
+import { useEffect, useMemo, useState } from "react";
+import { gitHookBus } from "@/core/services/gitHookBus";
+import { toast } from "@/framework/stores/toast";
 import { useBranchScopes } from "../../../core/hooks/useBranchScopes";
+import { useBulkSelect } from "../../../core/hooks/useBulkSelect";
 import { useMergeWorkflow } from "../../../core/hooks/useMergeWorkflow";
-import { bulkDeleteBranches, getProtectedBranches } from "../../../core/lib/bulkBranchOps";
-import { gitHookBus } from "@/core/services/gitHookBus";
+import {
+  bulkDeleteBranches,
+  getProtectedBranches,
+} from "../../../core/lib/bulkBranchOps";
+import {
+  useGitOpsStore as useBranchStore,
+  useGitOpsStore as useGitflowStore,
+} from "../../../core/stores/domain/git-ops";
 import { usePreferencesStore as useBranchMetadataStore } from "../../../core/stores/domain/preferences";
-import { useGitOpsStore as useBranchStore } from "../../../core/stores/domain/git-ops";
-import { useGitOpsStore as useGitflowStore } from "../../../core/stores/domain/git-ops";
-import { toast } from "@/framework/stores/toast";
 import { BranchBulkActions } from "./BranchBulkActions";
 import { BranchItem } from "./BranchItem";
 import { BranchScopeSelector } from "./BranchScopeSelector";
@@ -39,8 +44,17 @@ export function BranchList({
     loadAllBranches,
   } = useBranchScopes();
 
-  const { checkoutBranch, deleteBranch, clearBranchError: clearError } = useBranchStore();
-  const { mergeResult: lastMergeResult, startMerge, abort: abortMerge, isMerging: mergeIsLoading } = useMergeWorkflow();
+  const {
+    checkoutBranch,
+    deleteBranch,
+    clearBranchError: clearError,
+  } = useBranchStore();
+  const {
+    mergeResult: lastMergeResult,
+    startMerge,
+    abort: abortMerge,
+    isMerging: mergeIsLoading,
+  } = useMergeWorkflow();
   const [mergingBranch, setMergingBranch] = useState<string | null>(null);
 
   // Bulk delete state
@@ -82,7 +96,9 @@ export function BranchList({
     if (success) {
       await loadAllBranches(true);
       if (repoPath) {
-        await useBranchMetadataStore.getState().recordBranchVisit(repoPath, branchName);
+        await useBranchMetadataStore
+          .getState()
+          .recordBranchVisit(repoPath, branchName);
       }
     }
   };
@@ -180,8 +196,7 @@ export function BranchList({
         onSelectAllMerged={() => {
           const merged = branches
             .filter(
-              (b) =>
-                b.isMerged && !b.isHead && !protectedBranches.has(b.name),
+              (b) => b.isMerged && !b.isHead && !protectedBranches.has(b.name),
             )
             .map((b) => b.name);
           bulkSelect.selectAllMerged(merged);
@@ -214,8 +229,8 @@ export function BranchList({
 
         {branches.map((branch) => (
           <div key={branch.name} className="flex items-center gap-1">
-            {bulkSelect.selectionMode && (
-              protectedBranches.has(branch.name) ? (
+            {bulkSelect.selectionMode &&
+              (protectedBranches.has(branch.name) ? (
                 <span title="Protected branch" className="shrink-0 ml-1">
                   <Shield className="w-3.5 h-3.5 text-ctp-blue" />
                 </span>
@@ -224,16 +239,16 @@ export function BranchList({
                   type="checkbox"
                   checked={bulkSelect.isSelected(branch.name)}
                   onChange={(e) => {
-                    const shiftKey = e.nativeEvent instanceof MouseEvent
-                      ? (e.nativeEvent as MouseEvent).shiftKey
-                      : false;
+                    const shiftKey =
+                      e.nativeEvent instanceof MouseEvent
+                        ? (e.nativeEvent as MouseEvent).shiftKey
+                        : false;
                     bulkSelect.toggleSelect(branch.name, shiftKey);
                   }}
                   className="accent-ctp-blue shrink-0 ml-1"
                   aria-label={`Select ${branch.name}`}
                 />
-              )
-            )}
+              ))}
             <div className="flex-1 min-w-0">
               <BranchItem
                 branch={branch}
diff --git a/src/extensions/branches/components/BranchScopeSelector.tsx b/src/extensions/branches/components/BranchScopeSelector.tsx
index 04955c69..2e533589 100644
--- a/src/extensions/branches/components/BranchScopeSelector.tsx
+++ b/src/extensions/branches/components/BranchScopeSelector.tsx
@@ -1,5 +1,5 @@
-import type { BranchScopeDefinition } from "../../../core/lib/branchScopes";
 import { cn } from "@/framework/lib/utils";
+import type { BranchScopeDefinition } from "../../../core/lib/branchScopes";
 
 interface BranchScopeSelectorProps {
   scopes: BranchScopeDefinition[];
@@ -7,7 +7,11 @@ interface BranchScopeSelectorProps {
   onChange: (scopeId: string) => void;
 }
 
-export function BranchScopeSelector({ scopes, activeScopeId, onChange }: BranchScopeSelectorProps) {
+export function BranchScopeSelector({
+  scopes,
+  activeScopeId,
+  onChange,
+}: BranchScopeSelectorProps) {
   const handleKeyDown = (e: React.KeyboardEvent, idx: number) => {
     if (e.key === "ArrowRight") {
       e.preventDefault();
@@ -21,7 +25,11 @@ export function BranchScopeSelector({ scopes, activeScopeId, onChange }: BranchS
   };
 
   return (
-    <div role="radiogroup" aria-label="Branch scope" className="flex bg-ctp-surface0 rounded-md p-0.5 mx-2 mb-2">
+    <div
+      role="radiogroup"
+      aria-label="Branch scope"
+      className="flex bg-ctp-surface0 rounded-md p-0.5 mx-2 mb-2"
+    >
       {scopes.map((scope, idx) => {
         const active = scope.id === activeScopeId;
         return (
@@ -37,7 +45,7 @@ export function BranchScopeSelector({ scopes, activeScopeId, onChange }: BranchS
               "flex-1 text-xs font-medium rounded-sm py-1 px-2 transition-all",
               active
                 ? "bg-ctp-surface1 text-ctp-text shadow-sm"
-                : "text-ctp-overlay1 hover:text-ctp-subtext0"
+                : "text-ctp-overlay1 hover:text-ctp-subtext0",
             )}
           >
             {scope.label}
diff --git a/src/extensions/branches/components/BranchSwitcher.tsx b/src/extensions/branches/components/BranchSwitcher.tsx
index 420a840d..9eb5f383 100644
--- a/src/extensions/branches/components/BranchSwitcher.tsx
+++ b/src/extensions/branches/components/BranchSwitcher.tsx
@@ -1,11 +1,13 @@
 import { AnimatePresence, motion } from "framer-motion";
 import { ChevronDown, Circle, GitBranch } from "lucide-react";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import type { BranchInfo } from "../../../bindings";
 import { cn } from "@/framework/lib/utils";
-import { useGitOpsStore as useBranchStore } from "../../../core/stores/domain/git-ops";
+import type { BranchInfo } from "../../../bindings";
+import {
+  useGitOpsStore as useBranchStore,
+  useGitOpsStore as useRepositoryStore,
+} from "../../../core/stores/domain/git-ops";
 import { usePreferencesStore as useNavigationStore } from "../../../core/stores/domain/preferences";
-import { useGitOpsStore as useRepositoryStore } from "../../../core/stores/domain/git-ops";
 import { BranchSwitcherItem } from "./BranchSwitcherItem";
 import { SwitcherSearch } from "./SwitcherSearch";
 
diff --git a/src/extensions/branches/components/BranchSwitcherItem.tsx b/src/extensions/branches/components/BranchSwitcherItem.tsx
index 64bec58a..238139d1 100644
--- a/src/extensions/branches/components/BranchSwitcherItem.tsx
+++ b/src/extensions/branches/components/BranchSwitcherItem.tsx
@@ -1,6 +1,6 @@
 import { Check, GitBranch } from "lucide-react";
-import type { BranchInfo } from "../../../bindings";
 import { cn } from "@/framework/lib/utils";
+import type { BranchInfo } from "../../../bindings";
 
 interface BranchSwitcherItemProps {
   branch: BranchInfo;
diff --git a/src/extensions/branches/components/BranchTypeBadge.tsx b/src/extensions/branches/components/BranchTypeBadge.tsx
index d30b2002..ef8c0a6c 100644
--- a/src/extensions/branches/components/BranchTypeBadge.tsx
+++ b/src/extensions/branches/components/BranchTypeBadge.tsx
@@ -1,5 +1,9 @@
-import { classifyBranch, BRANCH_BADGE_STYLES, type GitflowBranchType } from "../../../core/lib/branchClassifier";
 import { cn } from "@/framework/lib/utils";
+import {
+  BRANCH_BADGE_STYLES,
+  classifyBranch,
+  type GitflowBranchType,
+} from "../../../core/lib/branchClassifier";
 
 const TEXT_COLORS: Record<GitflowBranchType, string> = {
   main: "text-ctp-blue",
@@ -15,8 +19,12 @@ interface BranchTypeBadgeProps {
   branchName?: string;
 }
 
-export function BranchTypeBadge({ branchType, branchName }: BranchTypeBadgeProps) {
-  const type = branchType ?? (branchName ? classifyBranch(branchName) : "other");
+export function BranchTypeBadge({
+  branchType,
+  branchName,
+}: BranchTypeBadgeProps) {
+  const type =
+    branchType ?? (branchName ? classifyBranch(branchName) : "other");
   if (type === "other") return null;
 
   return (
@@ -24,7 +32,7 @@ export function BranchTypeBadge({ branchType, branchName }: BranchTypeBadgeProps
       className={cn(
         "text-xs px-1.5 py-0.5 rounded border font-medium shrink-0",
         BRANCH_BADGE_STYLES[type],
-        TEXT_COLORS[type]
+        TEXT_COLORS[type],
       )}
       aria-label={`${type} branch`}
     >
diff --git a/src/extensions/branches/components/BulkDeleteDialog.tsx b/src/extensions/branches/components/BulkDeleteDialog.tsx
index 31e4f160..a7e0c910 100644
--- a/src/extensions/branches/components/BulkDeleteDialog.tsx
+++ b/src/extensions/branches/components/BulkDeleteDialog.tsx
@@ -1,6 +1,6 @@
 import { AlertTriangle, GitBranch, Loader2, Shield, X } from "lucide-react";
-import type { EnrichedBranch } from "../../../core/lib/branchClassifier";
 import { cn } from "@/framework/lib/utils";
+import type { EnrichedBranch } from "../../../core/lib/branchClassifier";
 
 interface BulkDeleteDialogProps {
   branches: EnrichedBranch[];
diff --git a/src/extensions/branches/components/CollapsibleSection.tsx b/src/extensions/branches/components/CollapsibleSection.tsx
index 308a6ee7..4dd26357 100644
--- a/src/extensions/branches/components/CollapsibleSection.tsx
+++ b/src/extensions/branches/components/CollapsibleSection.tsx
@@ -1,6 +1,6 @@
-import { useState, type ReactNode } from "react";
 import { AnimatePresence, motion } from "framer-motion";
 import { ChevronRight } from "lucide-react";
+import { type ReactNode, useState } from "react";
 
 interface CollapsibleSectionProps {
   title: string;
diff --git a/src/extensions/branches/components/CreateBranchDialog.tsx b/src/extensions/branches/components/CreateBranchDialog.tsx
index 461ae6ae..46416685 100644
--- a/src/extensions/branches/components/CreateBranchDialog.tsx
+++ b/src/extensions/branches/components/CreateBranchDialog.tsx
@@ -7,7 +7,11 @@ interface CreateBranchDialogProps {
 }
 
 export function CreateBranchDialog({ onClose }: CreateBranchDialogProps) {
-  const { createBranch, branchIsLoading: isLoading, branchError: error } = useBranchStore();
+  const {
+    createBranch,
+    branchIsLoading: isLoading,
+    branchError: error,
+  } = useBranchStore();
   const [name, setName] = useState("");
   const [checkout, setCheckout] = useState(true);
 
@@ -49,7 +53,6 @@ export function CreateBranchDialog({ onClose }: CreateBranchDialogProps) {
               onChange={(e) => setName(e.target.value)}
               placeholder="feature/my-feature"
               className="w-full px-3 py-2 bg-ctp-surface0 border border-ctp-surface1 rounded focus:outline-none focus:border-ctp-blue"
-              autoFocus
             />
           </div>
 
diff --git a/src/extensions/branches/components/SwitcherSearch.tsx b/src/extensions/branches/components/SwitcherSearch.tsx
index d84ff544..ce1ae3e1 100644
--- a/src/extensions/branches/components/SwitcherSearch.tsx
+++ b/src/extensions/branches/components/SwitcherSearch.tsx
@@ -24,7 +24,6 @@ export function SwitcherSearch({
         onChange={(e) => onChange(e.target.value)}
         placeholder={placeholder}
         className="w-full pl-8 pr-8 py-2 text-sm bg-ctp-surface0 text-ctp-text placeholder:text-ctp-overlay0 outline-none"
-        autoFocus
       />
       {value && (
         <button
diff --git a/src/extensions/branches/index.ts b/src/extensions/branches/index.ts
index 30c455aa..d4589e07 100644
--- a/src/extensions/branches/index.ts
+++ b/src/extensions/branches/index.ts
@@ -1,5 +1,5 @@
-import { lazy } from "react";
 import { GitBranch } from "lucide-react";
+import { lazy } from "react";
 import type { ExtensionAPI } from "@/framework/extension-system/ExtensionAPI";
 import { getNavigationActor } from "@/framework/layout/navigation/context";
 import { useGitOpsStore as useRepositoryStore } from "../../core/stores/domain/git-ops";
@@ -10,7 +10,7 @@ export async function onActivate(api: ExtensionAPI): Promise<void> {
   const BranchManagerBlade = lazy(() =>
     import("./blades/BranchManagerBlade").then((m) => ({
       default: m.BranchManagerBlade,
-    }))
+    })),
   );
 
   // Register blade type with coreOverride to preserve existing blade type name
diff --git a/src/extensions/commits/blades/CommitDetailsBlade.test.tsx b/src/extensions/commits/blades/CommitDetailsBlade.test.tsx
index 3e9052d1..c80347e0 100644
--- a/src/extensions/commits/blades/CommitDetailsBlade.test.tsx
+++ b/src/extensions/commits/blades/CommitDetailsBlade.test.tsx
@@ -19,7 +19,14 @@ const mockCommands = vi.hoisted(() => ({
   }),
   getCommitFileDiff: vi.fn().mockResolvedValue({
     status: "ok",
-    data: { path: "", oldContent: "", newContent: "", hunks: [], isBinary: false, language: "text" },
+    data: {
+      path: "",
+      oldContent: "",
+      newContent: "",
+      hunks: [],
+      isBinary: false,
+      language: "text",
+    },
   }),
 }));
 
diff --git a/src/extensions/commits/blades/CommitDetailsBlade.tsx b/src/extensions/commits/blades/CommitDetailsBlade.tsx
index 729c70b0..fa666da3 100644
--- a/src/extensions/commits/blades/CommitDetailsBlade.tsx
+++ b/src/extensions/commits/blades/CommitDetailsBlade.tsx
@@ -1,10 +1,10 @@
 import { useQuery } from "@tanstack/react-query";
 import { Check, Clock, Copy, GitCommit, Loader2, User } from "lucide-react";
 import { useState } from "react";
-import { commands } from "../../../bindings";
-import { useBladeNavigation } from "../../../core/hooks/useBladeNavigation";
 import { toast } from "@/framework/stores/toast";
+import { commands } from "../../../bindings";
 import { FileTreeBlade } from "../../../core/blades/_shared/FileTreeBlade";
+import { useBladeNavigation } from "../../../core/hooks/useBladeNavigation";
 
 interface CommitDetailsBladeProps {
   oid: string;
@@ -113,7 +113,8 @@ export function CommitDetailsBlade({ oid }: CommitDetailsBladeProps) {
           <div className="flex items-center gap-2 text-sm text-ctp-overlay0">
             <User className="w-4 h-4 shrink-0" />
             <span>
-              Committer: {details.committerName} &lt;{details.committerEmail}&gt;
+              Committer: {details.committerName} &lt;{details.committerEmail}
+              &gt;
             </span>
           </div>
         )}
diff --git a/src/extensions/commits/components/AuthorFilter.tsx b/src/extensions/commits/components/AuthorFilter.tsx
index 3548730f..d4c93a33 100644
--- a/src/extensions/commits/components/AuthorFilter.tsx
+++ b/src/extensions/commits/components/AuthorFilter.tsx
@@ -1,7 +1,7 @@
 import { Users } from "lucide-react";
 import { useMemo } from "react";
-import type { CommitSummary } from "../../../bindings";
 import { cn } from "@/framework/lib/utils";
+import type { CommitSummary } from "../../../bindings";
 
 interface AuthorFilterProps {
   commits: CommitSummary[];
@@ -47,9 +47,7 @@ export function AuthorFilter({
           "cursor-pointer",
         )}
       >
-        <option value="">
-          All Authors ({authors.length} contributors)
-        </option>
+        <option value="">All Authors ({authors.length} contributors)</option>
         {authors.map((author) => (
           <option key={author.key} value={author.key}>
             {author.name} &lt;{author.email}&gt;
diff --git a/src/extensions/commits/components/CommitDetails.tsx b/src/extensions/commits/components/CommitDetails.tsx
index 7d211567..3959fbd5 100644
--- a/src/extensions/commits/components/CommitDetails.tsx
+++ b/src/extensions/commits/components/CommitDetails.tsx
@@ -1,7 +1,7 @@
 import { useQuery } from "@tanstack/react-query";
 import { Clock, FileText, Loader2, User } from "lucide-react";
-import { type CommitSummary, commands } from "../../../bindings";
 import { cn } from "@/framework/lib/utils";
+import { type CommitSummary, commands } from "../../../bindings";
 
 interface CommitDetailsProps {
   commit: CommitSummary;
diff --git a/src/extensions/commits/components/CommitHistory.tsx b/src/extensions/commits/components/CommitHistory.tsx
index 36c08658..68f1e0d1 100644
--- a/src/extensions/commits/components/CommitHistory.tsx
+++ b/src/extensions/commits/components/CommitHistory.tsx
@@ -1,12 +1,12 @@
 import { useInfiniteQuery, useQuery } from "@tanstack/react-query";
 import { GitCommit, Loader2 } from "lucide-react";
 import { useCallback, useEffect, useMemo, useState } from "react";
-import { EmptyState } from "../../../core/components/ui/EmptyState";
-import { Skeleton } from "../../../core/components/ui/Skeleton";
 import { Virtuoso } from "react-virtuoso";
-import { type CommitSummary, commands } from "../../../bindings";
 import { useContextMenuRegistry } from "@/framework/extension-system/contextMenuRegistry";
 import { cn } from "@/framework/lib/utils";
+import { type CommitSummary, commands } from "../../../bindings";
+import { EmptyState } from "../../../core/components/ui/EmptyState";
+import { Skeleton } from "../../../core/components/ui/Skeleton";
 import { GravatarAvatar } from "../../git-insights/components/GravatarAvatar";
 import { useInsightsStore } from "../../git-insights/insightsStore";
 import { AuthorFilter } from "./AuthorFilter";
@@ -193,11 +193,12 @@ export function CommitHistory({
                 }}
                 onContextMenu={(e) => {
                   e.preventDefault();
-                  useContextMenuRegistry.getState().showMenu(
-                    { x: e.clientX, y: e.clientY },
-                    "commit-list",
-                    { location: "commit-list", commitOid: commit.oid },
-                  );
+                  useContextMenuRegistry
+                    .getState()
+                    .showMenu({ x: e.clientX, y: e.clientY }, "commit-list", {
+                      location: "commit-list",
+                      commitOid: commit.oid,
+                    });
                 }}
                 className={cn(
                   "w-full text-left px-3 py-2 cursor-pointer border-b border-ctp-surface0",
diff --git a/src/extensions/commits/components/CommitSearch.tsx b/src/extensions/commits/components/CommitSearch.tsx
index b474c406..47863476 100644
--- a/src/extensions/commits/components/CommitSearch.tsx
+++ b/src/extensions/commits/components/CommitSearch.tsx
@@ -8,7 +8,11 @@ interface CommitSearchProps {
   className?: string;
 }
 
-export function CommitSearch({ value, onChange, className }: CommitSearchProps) {
+export function CommitSearch({
+  value,
+  onChange,
+  className,
+}: CommitSearchProps) {
   const [localValue, setLocalValue] = useState(value);
 
   // Debounce the onChange callback
diff --git a/src/extensions/commits/components/CommitTypeIcon.tsx b/src/extensions/commits/components/CommitTypeIcon.tsx
index 642467d0..a69b5b04 100644
--- a/src/extensions/commits/components/CommitTypeIcon.tsx
+++ b/src/extensions/commits/components/CommitTypeIcon.tsx
@@ -1,11 +1,11 @@
 import { GitCommit } from "lucide-react";
 import { memo } from "react";
+import { parseConventionalType } from "@/core/lib/commitClassifier";
+import { cn } from "@/framework/lib/utils";
 import {
   COMMIT_TYPE_THEME,
   type ConventionalCommitType,
 } from "../../../extensions/conventional-commits/lib/commit-type-theme";
-import { cn } from "@/framework/lib/utils";
-import { parseConventionalType } from "@/core/lib/commitClassifier";
 
 interface CommitTypeIconProps {
   /** Pass a commit type directly. */
@@ -31,7 +31,9 @@ export const CommitTypeIcon = memo(function CommitTypeIcon({
 }: CommitTypeIconProps) {
   const resolvedType =
     commitType ??
-    ((message ? parseConventionalType(message) : null) as ConventionalCommitType | null);
+    ((message
+      ? parseConventionalType(message)
+      : null) as ConventionalCommitType | null);
 
   const theme = resolvedType ? COMMIT_TYPE_THEME[resolvedType] : null;
   const Icon = theme?.icon ?? GitCommit;
diff --git a/src/extensions/commits/index.ts b/src/extensions/commits/index.ts
index 1eb1c9f8..2ceaf100 100644
--- a/src/extensions/commits/index.ts
+++ b/src/extensions/commits/index.ts
@@ -1,5 +1,5 @@
-import { lazy } from "react";
 import { Copy } from "lucide-react";
+import { lazy } from "react";
 import type { ExtensionAPI } from "@/framework/extension-system/ExtensionAPI";
 import { toast } from "@/framework/stores/toast";
 
@@ -8,7 +8,7 @@ export async function onActivate(api: ExtensionAPI): Promise<void> {
   const CommitDetailsBlade = lazy(() =>
     import("./blades/CommitDetailsBlade").then((m) => ({
       default: m.CommitDetailsBlade,
-    }))
+    })),
   );
 
   // Register blade type with coreOverride to preserve existing blade type name
diff --git a/src/extensions/conflict-resolution/blades/ConflictResolutionBlade.tsx b/src/extensions/conflict-resolution/blades/ConflictResolutionBlade.tsx
index 5433270a..d40c89a0 100644
--- a/src/extensions/conflict-resolution/blades/ConflictResolutionBlade.tsx
+++ b/src/extensions/conflict-resolution/blades/ConflictResolutionBlade.tsx
@@ -1,16 +1,19 @@
 import { Check, GitMerge, Loader2, RotateCcw } from "lucide-react";
 import { useCallback, useEffect } from "react";
 import {
-  ResizablePanelLayout,
   ResizablePanel,
+  ResizablePanelLayout,
   ResizeHandle,
 } from "@/framework/layout/ResizablePanelLayout";
+import {
+  useConflictFileContent,
+  useConflictFiles,
+} from "../hooks/useConflictQuery";
 import { useConflictStore } from "../store";
-import { useConflictFiles, useConflictFileContent } from "../hooks/useConflictQuery";
-import { ConflictFileList } from "./components/ConflictFileList";
 import { ConflictDiffView } from "./components/ConflictDiffView";
-import { ConflictResultEditor } from "./components/ConflictResultEditor";
+import { ConflictFileList } from "./components/ConflictFileList";
 import { ConflictHunkActions } from "./components/ConflictHunkActions";
+import { ConflictResultEditor } from "./components/ConflictResultEditor";
 
 const EXT_LANGUAGE_MAP: Record<string, string> = {
   ts: "typescript",
@@ -64,7 +67,8 @@ export function ConflictResolutionBlade({
   } = useConflictStore();
 
   const { isLoading: isLoadingFiles } = useConflictFiles();
-  const { isLoading: isLoadingContent } = useConflictFileContent(activeFilePath);
+  const { isLoading: isLoadingContent } =
+    useConflictFileContent(activeFilePath);
 
   // Auto-select file from props on mount
   useEffect(() => {
@@ -124,7 +128,9 @@ export function ConflictResolutionBlade({
   }, [activeFilePath, markFileResolved]);
 
   const activeFile = activeFilePath ? files.get(activeFilePath) : undefined;
-  const canResolve = activeFilePath ? isFileFullyResolved(activeFilePath) : false;
+  const canResolve = activeFilePath
+    ? isFileFullyResolved(activeFilePath)
+    : false;
   const language = activeFilePath
     ? getLanguageFromPath(activeFilePath)
     : "plaintext";
@@ -185,11 +191,7 @@ export function ConflictResolutionBlade({
               direction="vertical"
             >
               {/* Diff view: ours vs theirs */}
-              <ResizablePanel
-                id="conflict-diff"
-                defaultSize={45}
-                minSize={20}
-              >
+              <ResizablePanel id="conflict-diff" defaultSize={45} minSize={20}>
                 <ConflictDiffView
                   oursContent={activeFile.oursFullContent}
                   theirsContent={activeFile.theirsFullContent}
diff --git a/src/extensions/conflict-resolution/blades/components/ConflictDiffView.tsx b/src/extensions/conflict-resolution/blades/components/ConflictDiffView.tsx
index 5762227e..8618f1eb 100644
--- a/src/extensions/conflict-resolution/blades/components/ConflictDiffView.tsx
+++ b/src/extensions/conflict-resolution/blades/components/ConflictDiffView.tsx
@@ -1,6 +1,9 @@
 import { DiffEditor, type DiffOnMount } from "@monaco-editor/react";
 import { useEffect, useMemo, useRef } from "react";
-import { MONACO_COMMON_OPTIONS, MONACO_THEME } from "../../../../core/lib/monacoConfig";
+import {
+  MONACO_COMMON_OPTIONS,
+  MONACO_THEME,
+} from "../../../../core/lib/monacoConfig";
 import "../../../../core/lib/monacoTheme";
 
 interface ConflictDiffViewProps {
diff --git a/src/extensions/conflict-resolution/blades/components/ConflictResultEditor.tsx b/src/extensions/conflict-resolution/blades/components/ConflictResultEditor.tsx
index 41ddbd8c..0dc9b9d0 100644
--- a/src/extensions/conflict-resolution/blades/components/ConflictResultEditor.tsx
+++ b/src/extensions/conflict-resolution/blades/components/ConflictResultEditor.tsx
@@ -1,7 +1,10 @@
 import Editor, { type OnMount } from "@monaco-editor/react";
-import { useEffect, useMemo, useRef } from "react";
 import type { editor } from "monaco-editor";
-import { MONACO_COMMON_OPTIONS, MONACO_THEME } from "../../../../core/lib/monacoConfig";
+import { useEffect, useMemo, useRef } from "react";
+import {
+  MONACO_COMMON_OPTIONS,
+  MONACO_THEME,
+} from "../../../../core/lib/monacoConfig";
 import "../../../../core/lib/monacoTheme";
 
 interface ConflictResultEditorProps {
diff --git a/src/extensions/conflict-resolution/index.ts b/src/extensions/conflict-resolution/index.ts
index e3b238c1..2bb5d783 100644
--- a/src/extensions/conflict-resolution/index.ts
+++ b/src/extensions/conflict-resolution/index.ts
@@ -1,9 +1,9 @@
-import { lazy } from "react";
 import { AlertTriangle } from "lucide-react";
+import { lazy } from "react";
 import type { ExtensionAPI } from "@/framework/extension-system/ExtensionAPI";
 import { openBlade } from "@/framework/layout/bladeOpener";
-import { useConflictStore } from "./store";
 import { useGitOpsStore } from "../../core/stores/domain/git-ops";
+import { useConflictStore } from "./store";
 
 export async function onActivate(api: ExtensionAPI): Promise<void> {
   const ConflictResolutionBlade = lazy(() =>
diff --git a/src/extensions/conflict-resolution/manifest.json b/src/extensions/conflict-resolution/manifest.json
index ff951293..f05a3ee5 100644
--- a/src/extensions/conflict-resolution/manifest.json
+++ b/src/extensions/conflict-resolution/manifest.json
@@ -7,13 +7,26 @@
   "main": "index.ts",
   "contributes": {
     "blades": [
-      { "type": "conflict-resolution", "title": "Conflict Resolution", "singleton": false }
+      {
+        "type": "conflict-resolution",
+        "title": "Conflict Resolution",
+        "singleton": false
+      }
     ],
     "commands": [
-      { "id": "open-conflict-resolution", "title": "Resolve Merge Conflicts", "category": "Git" }
+      {
+        "id": "open-conflict-resolution",
+        "title": "Resolve Merge Conflicts",
+        "category": "Git"
+      }
     ],
     "toolbar": [
-      { "id": "conflict-badge", "label": "Merge Conflicts", "group": "status", "priority": 40 }
+      {
+        "id": "conflict-badge",
+        "label": "Merge Conflicts",
+        "group": "status",
+        "priority": 40
+      }
     ]
   },
   "permissions": null,
diff --git a/src/extensions/conflict-resolution/store.ts b/src/extensions/conflict-resolution/store.ts
index ab2f1eb3..a353b248 100644
--- a/src/extensions/conflict-resolution/store.ts
+++ b/src/extensions/conflict-resolution/store.ts
@@ -1,7 +1,8 @@
 import { create } from "zustand";
+import { registerStoreForReset } from "@/framework/stores/registry";
 import { toast } from "@/framework/stores/toast";
 import { commands } from "../../bindings";
-import { registerStoreForReset } from "@/framework/stores/registry";
+import { buildResolvedContent } from "./lib/conflictParser";
 import type {
   ConflictFile,
   ConflictHunk,
@@ -9,7 +10,6 @@ import type {
   ResolutionChoice,
   UndoEntry,
 } from "./types";
-import { buildResolvedContent, parseConflictMarkers } from "./lib/conflictParser";
 
 function deriveStatus(hunks: ConflictHunk[]): FileResolutionStatus {
   const resolved = hunks.filter((h) => h.resolution !== null).length;
@@ -25,7 +25,11 @@ interface ConflictStore {
   // Actions
   loadConflictFiles: () => Promise<void>;
   openConflictFile: (path: string) => Promise<void>;
-  resolveHunk: (filePath: string, hunkId: string, choice: ResolutionChoice) => void;
+  resolveHunk: (
+    filePath: string,
+    hunkId: string,
+    choice: ResolutionChoice,
+  ) => void;
   undoHunkResolution: (filePath: string) => void;
   updateResultContent: (filePath: string, content: string) => void;
   resetFile: (filePath: string) => void;
@@ -164,7 +168,7 @@ export const useConflictStore = create<ConflictStore>()((set, get) => ({
           newResultContent = hunk.theirsContent;
           break;
         case "both":
-          newResultContent = hunk.oursContent + "\n" + hunk.theirsContent;
+          newResultContent = `${hunk.oursContent}\n${hunk.theirsContent}`;
           break;
         case "custom":
           newResultContent = file.resultContent;
@@ -174,7 +178,10 @@ export const useConflictStore = create<ConflictStore>()((set, get) => ({
       }
     } else {
       // Multi-hunk — rebuild from original with all resolved hunks
-      newResultContent = buildResolvedContent(file.oursFullContent, updatedHunks);
+      newResultContent = buildResolvedContent(
+        file.oursFullContent,
+        updatedHunks,
+      );
     }
 
     const updatedFile: ConflictFile = {
@@ -247,7 +254,10 @@ export const useConflictStore = create<ConflictStore>()((set, get) => ({
     const file = get().files.get(filePath);
     if (!file) return false;
 
-    const result = await commands.resolveConflictFile(filePath, file.resultContent);
+    const result = await commands.resolveConflictFile(
+      filePath,
+      file.resultContent,
+    );
     if (result.status === "error") {
       toast.error(`Failed to resolve: ${filePath}`);
       console.error("Failed to resolve conflict:", result.error);
diff --git a/src/extensions/conflict-resolution/types.ts b/src/extensions/conflict-resolution/types.ts
index 2aba836b..3d130f1c 100644
--- a/src/extensions/conflict-resolution/types.ts
+++ b/src/extensions/conflict-resolution/types.ts
@@ -1,5 +1,8 @@
 export type ResolutionChoice = "ours" | "theirs" | "both" | "custom";
-export type FileResolutionStatus = "unresolved" | "partially-resolved" | "resolved";
+export type FileResolutionStatus =
+  | "unresolved"
+  | "partially-resolved"
+  | "resolved";
 
 export interface ConflictHunk {
   id: string;
diff --git a/src/extensions/conventional-commits/blades/changelog/ChangelogBlade.tsx b/src/extensions/conventional-commits/blades/changelog/ChangelogBlade.tsx
index 4bd12d89..6b91e226 100644
--- a/src/extensions/conventional-commits/blades/changelog/ChangelogBlade.tsx
+++ b/src/extensions/conventional-commits/blades/changelog/ChangelogBlade.tsx
@@ -1,8 +1,8 @@
 import { cn } from "@/framework/lib/utils";
-import { useChangelogStore } from "./store";
+import { Button } from "../../../../core/components/ui/button";
 import { useBladeNavigation } from "../../../../core/hooks/useBladeNavigation";
 import { ChangelogPreview } from "./components/ChangelogPreview";
-import { Button } from "../../../../core/components/ui/button";
+import { useChangelogStore } from "./store";
 
 export function ChangelogBlade() {
   const {
@@ -88,11 +88,7 @@ export function ChangelogBlade() {
             </div>
           )}
 
-          <Button
-            onClick={generate}
-            disabled={isGenerating}
-            className="w-full"
-          >
+          <Button onClick={generate} disabled={isGenerating} className="w-full">
             {isGenerating ? "Generating..." : "Generate Changelog"}
           </Button>
         </div>
diff --git a/src/extensions/conventional-commits/blades/changelog/components/ChangelogPreview.tsx b/src/extensions/conventional-commits/blades/changelog/components/ChangelogPreview.tsx
index 098a58d7..6a587189 100644
--- a/src/extensions/conventional-commits/blades/changelog/components/ChangelogPreview.tsx
+++ b/src/extensions/conventional-commits/blades/changelog/components/ChangelogPreview.tsx
@@ -1,9 +1,9 @@
 import { Check, Copy } from "lucide-react";
 import { useState } from "react";
-import type { ConventionalCommitType } from "../../../lib/commit-type-theme";
 import { cn } from "@/framework/lib/utils";
-import type { ChangelogOutput } from "../store";
 import { CommitTypeIcon } from "../../../../commits/components/CommitTypeIcon";
+import type { ConventionalCommitType } from "../../../lib/commit-type-theme";
+import type { ChangelogOutput } from "../store";
 
 interface ChangelogPreviewProps {
   changelog: ChangelogOutput;
diff --git a/src/extensions/conventional-commits/blades/changelog/index.ts b/src/extensions/conventional-commits/blades/changelog/index.ts
index 307889d3..c08f29f1 100644
--- a/src/extensions/conventional-commits/blades/changelog/index.ts
+++ b/src/extensions/conventional-commits/blades/changelog/index.ts
@@ -1,3 +1,3 @@
 export { ChangelogBlade } from "./ChangelogBlade";
+export type { ChangelogCommit, ChangelogOutput, CommitGroup } from "./store";
 export { useChangelogStore } from "./store";
-export type { ChangelogOutput, CommitGroup, ChangelogCommit } from "./store";
diff --git a/src/extensions/conventional-commits/blades/changelog/store.ts b/src/extensions/conventional-commits/blades/changelog/store.ts
index 92022fd8..9bbe6f3e 100644
--- a/src/extensions/conventional-commits/blades/changelog/store.ts
+++ b/src/extensions/conventional-commits/blades/changelog/store.ts
@@ -1,10 +1,10 @@
-import { commands } from "../../../../bindings";
+import { createBladeStore } from "@/framework/stores/createBladeStore";
 import type {
   ChangelogCommit,
   ChangelogOutput,
   CommitGroup,
 } from "../../../../bindings";
-import { createBladeStore } from "@/framework/stores/createBladeStore";
+import { commands } from "../../../../bindings";
 
 interface ChangelogState {
   // Options
diff --git a/src/extensions/conventional-commits/blades/conventional-commit/ConventionalCommitBlade.tsx b/src/extensions/conventional-commits/blades/conventional-commit/ConventionalCommitBlade.tsx
index 351d9a21..46b26333 100644
--- a/src/extensions/conventional-commits/blades/conventional-commit/ConventionalCommitBlade.tsx
+++ b/src/extensions/conventional-commits/blades/conventional-commit/ConventionalCommitBlade.tsx
@@ -1,24 +1,24 @@
-import { useEffect, useRef, useState } from "react";
 import { motion } from "framer-motion";
 import { AlertTriangle, Check, RotateCcw } from "lucide-react";
-import { useConventionalCommit } from "../../hooks/useConventionalCommit";
-import { useCommitExecution } from "../../../../core/hooks/useCommitExecution";
-import { useAmendPrefill } from "../../hooks/useAmendPrefill";
-import { useBladeFormGuard } from "./hooks/useBladeFormGuard";
-import { useConventionalStore } from "../../store";
-import { useBladeNavigation } from "../../../../core/hooks/useBladeNavigation";
+import { useEffect, useRef, useState } from "react";
 import { SplitPaneLayout } from "@/framework/layout/SplitPaneLayout";
-import { TypeSelector } from "../../components/TypeSelector";
-import { ScopeAutocomplete } from "../../components/ScopeAutocomplete";
+import { cn } from "@/framework/lib/utils";
+import { useBladeNavigation } from "../../../../core/hooks/useBladeNavigation";
+import { useCommitExecution } from "../../../../core/hooks/useCommitExecution";
 import { BreakingChangeSection } from "../../components/BreakingChangeSection";
 import { CharacterProgress } from "../../components/CharacterProgress";
-import { ValidationErrors } from "../../components/ValidationErrors";
-import { CommitPreview } from "../../components/CommitPreview";
 import { CommitActionBar } from "../../components/CommitActionBar";
-import { TemplateSelector } from "../../components/TemplateSelector";
+import { CommitPreview } from "../../components/CommitPreview";
+import { ScopeAutocomplete } from "../../components/ScopeAutocomplete";
 import { ScopeFrequencyChart } from "../../components/ScopeFrequencyChart";
+import { TemplateSelector } from "../../components/TemplateSelector";
+import { TypeSelector } from "../../components/TypeSelector";
+import { ValidationErrors } from "../../components/ValidationErrors";
+import { useAmendPrefill } from "../../hooks/useAmendPrefill";
+import { useConventionalCommit } from "../../hooks/useConventionalCommit";
 import type { CommitTemplate } from "../../store";
-import { cn } from "@/framework/lib/utils";
+import { useConventionalStore } from "../../store";
+import { useBladeFormGuard } from "./hooks/useBladeFormGuard";
 
 const MAX_DESCRIPTION_LENGTH = 72;
 const BLADE_ID = "conventional-commit-blade";
@@ -70,8 +70,8 @@ export function ConventionalCommitBlade({
     mode: "conventional",
   });
 
-  const { commit, commitAndPush, isCommitting, isPushing } =
-    useCommitExecution({
+  const { commit, commitAndPush, isCommitting, isPushing } = useCommitExecution(
+    {
       onCommitSuccess: () => {
         setCommitSuccess(true);
         reset();
@@ -83,7 +83,8 @@ export function ConventionalCommitBlade({
           }, 1500);
         }
       },
-    });
+    },
+  );
 
   // Cleanup timer on unmount
   useEffect(() => {
@@ -103,7 +104,7 @@ export function ConventionalCommitBlade({
       store.getState().setIsAmend(true);
       prefillConventional(store.getState());
     }
-  }, [initialAmend, store, prefillConventional]);
+  }, [initialAmend, prefillConventional]);
 
   // Dirty form guard: mark dirty when form has content
   useEffect(() => {
@@ -121,7 +122,7 @@ export function ConventionalCommitBlade({
   // Fetch scope frequencies on mount
   useEffect(() => {
     store.getState().fetchScopeFrequencies();
-  }, [store]);
+  }, []);
 
   const isFormEmpty = !commitType && !description;
 
@@ -211,9 +212,7 @@ export function ConventionalCommitBlade({
           <AlertTriangle className="w-4 h-4 text-ctp-peach shrink-0" />
           <span className="text-ctp-peach">
             Amending previous commit
-            {originalMessage
-              ? `: "${originalMessage.split("\n")[0]}"`
-              : ""}
+            {originalMessage ? `: "${originalMessage.split("\n")[0]}"` : ""}
           </span>
         </div>
       )}
diff --git a/src/extensions/conventional-commits/blades/conventional-commit/hooks/useBladeFormGuard.ts b/src/extensions/conventional-commits/blades/conventional-commit/hooks/useBladeFormGuard.ts
index a40aa327..84e5cdc4 100644
--- a/src/extensions/conventional-commits/blades/conventional-commit/hooks/useBladeFormGuard.ts
+++ b/src/extensions/conventional-commits/blades/conventional-commit/hooks/useBladeFormGuard.ts
@@ -1,5 +1,5 @@
-import { useEffect, useCallback } from "react";
 import { useSelector } from "@xstate/react";
+import { useCallback, useEffect } from "react";
 import { useNavigationActorRef } from "@/framework/layout/navigation/context";
 
 /**
diff --git a/src/extensions/conventional-commits/components/CommitPreview.tsx b/src/extensions/conventional-commits/components/CommitPreview.tsx
index ae75cde0..7c8b9154 100644
--- a/src/extensions/conventional-commits/components/CommitPreview.tsx
+++ b/src/extensions/conventional-commits/components/CommitPreview.tsx
@@ -1,11 +1,11 @@
-import { useState, useCallback } from "react";
 import { Check, Copy } from "lucide-react";
-import { parseConventionalMessage } from "../lib/conventional-utils";
+import { useCallback, useState } from "react";
+import { cn } from "@/framework/lib/utils";
 import {
   COMMIT_TYPE_THEME,
   type ConventionalCommitType,
 } from "../lib/commit-type-theme";
-import { cn } from "@/framework/lib/utils";
+import { parseConventionalMessage } from "../lib/conventional-utils";
 
 interface CommitPreviewProps {
   message: string;
diff --git a/src/extensions/conventional-commits/components/ConventionalCommitForm.tsx b/src/extensions/conventional-commits/components/ConventionalCommitForm.tsx
index 796a4d41..b1d843e6 100644
--- a/src/extensions/conventional-commits/components/ConventionalCommitForm.tsx
+++ b/src/extensions/conventional-commits/components/ConventionalCommitForm.tsx
@@ -1,6 +1,6 @@
 import { useEffect } from "react";
-import { useConventionalCommit } from "../hooks/useConventionalCommit";
 import { cn } from "@/framework/lib/utils";
+import { useConventionalCommit } from "../hooks/useConventionalCommit";
 import { BreakingChangeSection } from "./BreakingChangeSection";
 import { CharacterProgress } from "./CharacterProgress";
 import { CommitActionBar } from "./CommitActionBar";
diff --git a/src/extensions/conventional-commits/components/ScopeAutocomplete.tsx b/src/extensions/conventional-commits/components/ScopeAutocomplete.tsx
index 4512756b..5cf9b4b3 100644
--- a/src/extensions/conventional-commits/components/ScopeAutocomplete.tsx
+++ b/src/extensions/conventional-commits/components/ScopeAutocomplete.tsx
@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useRef, useState } from "react";
-import type { ScopeSuggestion } from "../../../bindings";
 import { cn } from "@/framework/lib/utils";
+import type { ScopeSuggestion } from "../../../bindings";
 
 interface ScopeAutocompleteProps {
   value: string;
@@ -29,7 +29,7 @@ export function ScopeAutocomplete({
   // Reset highlighted index when suggestions change
   useEffect(() => {
     setHighlightedIndex(-1);
-  }, [suggestions]);
+  }, []);
 
   // Handle keyboard navigation
   const handleKeyDown = useCallback(
diff --git a/src/extensions/conventional-commits/components/ScopeFrequencyChart.tsx b/src/extensions/conventional-commits/components/ScopeFrequencyChart.tsx
index af9709cf..8d7c6a8f 100644
--- a/src/extensions/conventional-commits/components/ScopeFrequencyChart.tsx
+++ b/src/extensions/conventional-commits/components/ScopeFrequencyChart.tsx
@@ -1,7 +1,7 @@
-import { useState } from "react";
 import { ChevronDown, ChevronRight } from "lucide-react";
-import type { ScopeSuggestion } from "../../../bindings";
+import { useState } from "react";
 import { cn } from "@/framework/lib/utils";
+import type { ScopeSuggestion } from "../../../bindings";
 
 const BAR_COLORS = [
   "bg-ctp-blue",
@@ -74,10 +74,7 @@ export function ScopeFrequencyChart({
       {expanded && (
         <div className="space-y-1.5">
           {displayed.map((item, index) => {
-            const barWidth = Math.max(
-              (item.usageCount / maxCount) * 100,
-              8,
-            );
+            const barWidth = Math.max((item.usageCount / maxCount) * 100, 8);
             const color = BAR_COLORS[index % BAR_COLORS.length];
 
             return (
diff --git a/src/extensions/conventional-commits/components/TemplateSelector.tsx b/src/extensions/conventional-commits/components/TemplateSelector.tsx
index 2c34b5cb..81722974 100644
--- a/src/extensions/conventional-commits/components/TemplateSelector.tsx
+++ b/src/extensions/conventional-commits/components/TemplateSelector.tsx
@@ -1,16 +1,16 @@
-import { motion, AnimatePresence } from "framer-motion";
+import { AnimatePresence, motion } from "framer-motion";
 import {
-  Sparkles,
-  Bug,
   AlertTriangle,
-  Package,
+  Bug,
   FileText,
+  Package,
   RefreshCw,
+  Sparkles,
   Workflow,
 } from "lucide-react";
-import type { CommitTemplate } from "../store";
-import { BUILTIN_TEMPLATES } from "../lib/commit-templates";
 import { cn } from "@/framework/lib/utils";
+import { BUILTIN_TEMPLATES } from "../lib/commit-templates";
+import type { CommitTemplate } from "../store";
 
 const ICON_MAP: Record<string, React.ComponentType<{ className?: string }>> = {
   Sparkles,
diff --git a/src/extensions/conventional-commits/components/TypeSelector.tsx b/src/extensions/conventional-commits/components/TypeSelector.tsx
index 33d05f06..609a86ea 100644
--- a/src/extensions/conventional-commits/components/TypeSelector.tsx
+++ b/src/extensions/conventional-commits/components/TypeSelector.tsx
@@ -1,7 +1,7 @@
 import { motion } from "framer-motion";
+import { cn } from "@/framework/lib/utils";
 import type { TypeSuggestion } from "../../../bindings";
 import { COMMIT_TYPE_THEME } from "../lib/commit-type-theme";
-import { cn } from "@/framework/lib/utils";
 import { COMMIT_TYPES, type CommitType } from "../store";
 
 interface TypeSelectorProps {
diff --git a/src/extensions/conventional-commits/hooks/useAmendPrefill.ts b/src/extensions/conventional-commits/hooks/useAmendPrefill.ts
index 01a9a7be..3552c5dc 100644
--- a/src/extensions/conventional-commits/hooks/useAmendPrefill.ts
+++ b/src/extensions/conventional-commits/hooks/useAmendPrefill.ts
@@ -1,7 +1,7 @@
-import { useCallback, useState } from "react";
 import { useQuery } from "@tanstack/react-query";
-import { commands } from "../../../bindings";
+import { useCallback, useState } from "react";
 import type { CommitType } from "../../../bindings";
+import { commands } from "../../../bindings";
 import { parseConventionalMessage } from "../lib/conventional-utils";
 
 interface UseAmendPrefillOptions {
diff --git a/src/extensions/conventional-commits/hooks/useConventionalCommit.ts b/src/extensions/conventional-commits/hooks/useConventionalCommit.ts
index 9c438669..12ea70cc 100644
--- a/src/extensions/conventional-commits/hooks/useConventionalCommit.ts
+++ b/src/extensions/conventional-commits/hooks/useConventionalCommit.ts
@@ -2,8 +2,8 @@ import { useCallback, useEffect, useMemo, useRef } from "react";
 import { useShallow } from "zustand/react/shallow";
 import { debounce } from "../../../core/lib/utils";
 import {
-  COMMIT_TYPES,
   COMMIT_TYPE_LABELS,
+  COMMIT_TYPES,
   type CommitType,
   useConventionalStore,
 } from "../store";
diff --git a/src/extensions/conventional-commits/index.ts b/src/extensions/conventional-commits/index.ts
index 18cd9382..e8701ca2 100644
--- a/src/extensions/conventional-commits/index.ts
+++ b/src/extensions/conventional-commits/index.ts
@@ -1,5 +1,5 @@
-import { lazy } from "react";
 import { FileText } from "lucide-react";
+import { lazy } from "react";
 import type { ExtensionAPI } from "@/framework/extension-system/ExtensionAPI";
 import { openBlade } from "@/framework/layout/bladeOpener";
 import { useGitOpsStore as useRepositoryStore } from "../../core/stores/domain/git-ops";
@@ -8,14 +8,16 @@ import { useConventionalStore } from "./store";
 export async function onActivate(api: ExtensionAPI): Promise<void> {
   // Lazy component imports -- loaded on first blade render, not during activation
   const ConventionalCommitBlade = lazy(() =>
-    import("./blades/conventional-commit/ConventionalCommitBlade").then((m) => ({
-      default: m.ConventionalCommitBlade,
-    }))
+    import("./blades/conventional-commit/ConventionalCommitBlade").then(
+      (m) => ({
+        default: m.ConventionalCommitBlade,
+      }),
+    ),
   );
   const ChangelogBlade = lazy(() =>
     import("./blades/changelog/ChangelogBlade").then((m) => ({
       default: m.ChangelogBlade,
-    }))
+    })),
   );
 
   // Register blade types with coreOverride to preserve existing blade type names
diff --git a/src/extensions/conventional-commits/lib/commit-type-theme.ts b/src/extensions/conventional-commits/lib/commit-type-theme.ts
index 965235dd..17fc7f7f 100644
--- a/src/extensions/conventional-commits/lib/commit-type-theme.ts
+++ b/src/extensions/conventional-commits/lib/commit-type-theme.ts
@@ -1,4 +1,3 @@
-import type { ElementType } from "react";
 import {
   Bug,
   FileText,
@@ -12,6 +11,7 @@ import {
   Undo,
   Zap,
 } from "lucide-react";
+import type { ElementType } from "react";
 
 /**
  * All recognized conventional commit types.
@@ -53,93 +53,92 @@ export interface CommitTypeTheme {
  * 2. Add its entry here
  * 3. Done — all consumers derive from this map
  */
-export const COMMIT_TYPE_THEME: Record<ConventionalCommitType, CommitTypeTheme> =
-  {
-    feat: {
-      icon: Sparkles,
-      color: "text-ctp-green",
-      badgeClasses: "text-ctp-green bg-ctp-green/10 border-ctp-green/30",
-      emoji: "\u{2728}",
-      label: "Feature",
-    },
-    fix: {
-      icon: Bug,
-      color: "text-ctp-red",
-      badgeClasses: "text-ctp-red bg-ctp-red/10 border-ctp-red/30",
-      emoji: "\u{1F41B}",
-      label: "Bug Fix",
-    },
-    docs: {
-      icon: FileText,
-      color: "text-ctp-blue",
-      badgeClasses: "text-ctp-blue bg-ctp-blue/10 border-ctp-blue/30",
-      emoji: "\u{1F4DD}",
-      label: "Documentation",
-    },
-    style: {
-      icon: Paintbrush,
-      color: "text-ctp-pink",
-      badgeClasses: "text-ctp-pink bg-ctp-pink/10 border-ctp-pink/30",
-      emoji: "\u{1F3A8}",
-      label: "Style",
-    },
-    refactor: {
-      icon: Hammer,
-      color: "text-ctp-peach",
-      badgeClasses: "text-ctp-peach bg-ctp-peach/10 border-ctp-peach/30",
-      emoji: "\u{1F528}",
-      label: "Refactor",
-    },
-    perf: {
-      icon: Zap,
-      color: "text-ctp-yellow",
-      badgeClasses: "text-ctp-yellow bg-ctp-yellow/10 border-ctp-yellow/30",
-      emoji: "\u{26A1}",
-      label: "Performance",
-    },
-    test: {
-      icon: TestTube,
-      color: "text-ctp-teal",
-      badgeClasses: "text-ctp-teal bg-ctp-teal/10 border-ctp-teal/30",
-      emoji: "\u{1F9EA}",
-      label: "Test",
-    },
-    chore: {
-      icon: Settings,
-      color: "text-ctp-lavender",
-      badgeClasses:
-        "text-ctp-lavender bg-ctp-lavender/10 border-ctp-lavender/30",
-      emoji: "\u{2699}\u{FE0F}",
-      label: "Chore",
-    },
-    ci: {
-      icon: Rocket,
-      color: "text-ctp-sky",
-      badgeClasses: "text-ctp-sky bg-ctp-sky/10 border-ctp-sky/30",
-      emoji: "\u{1F680}",
-      label: "CI",
-    },
-    build: {
-      icon: Package,
-      color: "text-ctp-maroon",
-      badgeClasses: "text-ctp-maroon bg-ctp-maroon/10 border-ctp-maroon/30",
-      emoji: "\u{1F4E6}",
-      label: "Build",
-    },
-    revert: {
-      icon: Undo,
-      color: "text-ctp-mauve",
-      badgeClasses: "text-ctp-mauve bg-ctp-mauve/10 border-ctp-mauve/30",
-      emoji: "\u{21A9}\u{FE0F}",
-      label: "Revert",
-    },
-  };
+export const COMMIT_TYPE_THEME: Record<
+  ConventionalCommitType,
+  CommitTypeTheme
+> = {
+  feat: {
+    icon: Sparkles,
+    color: "text-ctp-green",
+    badgeClasses: "text-ctp-green bg-ctp-green/10 border-ctp-green/30",
+    emoji: "\u{2728}",
+    label: "Feature",
+  },
+  fix: {
+    icon: Bug,
+    color: "text-ctp-red",
+    badgeClasses: "text-ctp-red bg-ctp-red/10 border-ctp-red/30",
+    emoji: "\u{1F41B}",
+    label: "Bug Fix",
+  },
+  docs: {
+    icon: FileText,
+    color: "text-ctp-blue",
+    badgeClasses: "text-ctp-blue bg-ctp-blue/10 border-ctp-blue/30",
+    emoji: "\u{1F4DD}",
+    label: "Documentation",
+  },
+  style: {
+    icon: Paintbrush,
+    color: "text-ctp-pink",
+    badgeClasses: "text-ctp-pink bg-ctp-pink/10 border-ctp-pink/30",
+    emoji: "\u{1F3A8}",
+    label: "Style",
+  },
+  refactor: {
+    icon: Hammer,
+    color: "text-ctp-peach",
+    badgeClasses: "text-ctp-peach bg-ctp-peach/10 border-ctp-peach/30",
+    emoji: "\u{1F528}",
+    label: "Refactor",
+  },
+  perf: {
+    icon: Zap,
+    color: "text-ctp-yellow",
+    badgeClasses: "text-ctp-yellow bg-ctp-yellow/10 border-ctp-yellow/30",
+    emoji: "\u{26A1}",
+    label: "Performance",
+  },
+  test: {
+    icon: TestTube,
+    color: "text-ctp-teal",
+    badgeClasses: "text-ctp-teal bg-ctp-teal/10 border-ctp-teal/30",
+    emoji: "\u{1F9EA}",
+    label: "Test",
+  },
+  chore: {
+    icon: Settings,
+    color: "text-ctp-lavender",
+    badgeClasses: "text-ctp-lavender bg-ctp-lavender/10 border-ctp-lavender/30",
+    emoji: "\u{2699}\u{FE0F}",
+    label: "Chore",
+  },
+  ci: {
+    icon: Rocket,
+    color: "text-ctp-sky",
+    badgeClasses: "text-ctp-sky bg-ctp-sky/10 border-ctp-sky/30",
+    emoji: "\u{1F680}",
+    label: "CI",
+  },
+  build: {
+    icon: Package,
+    color: "text-ctp-maroon",
+    badgeClasses: "text-ctp-maroon bg-ctp-maroon/10 border-ctp-maroon/30",
+    emoji: "\u{1F4E6}",
+    label: "Build",
+  },
+  revert: {
+    icon: Undo,
+    color: "text-ctp-mauve",
+    badgeClasses: "text-ctp-mauve bg-ctp-mauve/10 border-ctp-mauve/30",
+    emoji: "\u{21A9}\u{FE0F}",
+    label: "Revert",
+  },
+};
 
 /** Lookup helpers — derived from the theme map for convenience. */
 
-export function getCommitTypeIcon(
-  type: ConventionalCommitType,
-): ElementType {
+export function getCommitTypeIcon(type: ConventionalCommitType): ElementType {
   return COMMIT_TYPE_THEME[type].icon;
 }
 
diff --git a/src/extensions/conventional-commits/lib/conventional-utils.test.ts b/src/extensions/conventional-commits/lib/conventional-utils.test.ts
index bad98fef..7bd92ce5 100644
--- a/src/extensions/conventional-commits/lib/conventional-utils.test.ts
+++ b/src/extensions/conventional-commits/lib/conventional-utils.test.ts
@@ -1,8 +1,8 @@
 import { describe, expect, it } from "vitest";
 import {
   buildCommitMessage,
-  parseConventionalMessage,
   type ConventionalMessageParts,
+  parseConventionalMessage,
 } from "./conventional-utils";
 
 describe("buildCommitMessage", () => {
@@ -128,35 +128,44 @@ describe("parseConventionalMessage", () => {
 
   it("parses all 11 commit types", () => {
     const types = [
-      "feat", "fix", "docs", "style", "refactor",
-      "perf", "test", "chore", "ci", "build", "revert",
+      "feat",
+      "fix",
+      "docs",
+      "style",
+      "refactor",
+      "perf",
+      "test",
+      "chore",
+      "ci",
+      "build",
+      "revert",
     ];
     for (const type of types) {
       const result = parseConventionalMessage(`${type}: some change`);
       expect(result).not.toBeNull();
-      expect(result!.commitType).toBe(type);
-      expect(result!.description).toBe("some change");
+      expect(result?.commitType).toBe(type);
+      expect(result?.description).toBe("some change");
     }
   });
 
   it("parses type with scope", () => {
     const result = parseConventionalMessage("feat(auth): add login flow");
     expect(result).not.toBeNull();
-    expect(result!.commitType).toBe("feat");
-    expect(result!.scope).toBe("auth");
-    expect(result!.description).toBe("add login flow");
+    expect(result?.commitType).toBe("feat");
+    expect(result?.scope).toBe("auth");
+    expect(result?.description).toBe("add login flow");
   });
 
   it("parses type without scope", () => {
     const result = parseConventionalMessage("fix: resolve crash");
     expect(result).not.toBeNull();
-    expect(result!.scope).toBe("");
+    expect(result?.scope).toBe("");
   });
 
   it("parses breaking change with !", () => {
     const result = parseConventionalMessage("feat(api)!: change response");
     expect(result).not.toBeNull();
-    expect(result!.isBreaking).toBe(true);
+    expect(result?.isBreaking).toBe(true);
   });
 
   it("parses body", () => {
@@ -164,7 +173,7 @@ describe("parseConventionalMessage", () => {
       "docs: update README\n\nAdded installation section",
     );
     expect(result).not.toBeNull();
-    expect(result!.body).toBe("Added installation section");
+    expect(result?.body).toBe("Added installation section");
   });
 
   it("parses BREAKING CHANGE footer", () => {
@@ -172,8 +181,8 @@ describe("parseConventionalMessage", () => {
       "feat: new auth\n\nBREAKING CHANGE: Old tokens expired",
     );
     expect(result).not.toBeNull();
-    expect(result!.isBreaking).toBe(true);
-    expect(result!.breakingDescription).toBe("Old tokens expired");
+    expect(result?.isBreaking).toBe(true);
+    expect(result?.breakingDescription).toBe("Old tokens expired");
   });
 
   it("parses BREAKING-CHANGE footer (hyphenated)", () => {
@@ -181,8 +190,8 @@ describe("parseConventionalMessage", () => {
       "feat: new auth\n\nBREAKING-CHANGE: Old tokens expired",
     );
     expect(result).not.toBeNull();
-    expect(result!.isBreaking).toBe(true);
-    expect(result!.breakingDescription).toBe("Old tokens expired");
+    expect(result?.isBreaking).toBe(true);
+    expect(result?.breakingDescription).toBe("Old tokens expired");
   });
 
   it("parses body and breaking change together", () => {
@@ -190,9 +199,9 @@ describe("parseConventionalMessage", () => {
       "feat!: new system\n\nMigrated to v2\n\nBREAKING CHANGE: Old API removed",
     );
     expect(result).not.toBeNull();
-    expect(result!.body).toBe("Migrated to v2");
-    expect(result!.isBreaking).toBe(true);
-    expect(result!.breakingDescription).toBe("Old API removed");
+    expect(result?.body).toBe("Migrated to v2");
+    expect(result?.isBreaking).toBe(true);
+    expect(result?.breakingDescription).toBe("Old API removed");
   });
 
   it("handles ! and BREAKING CHANGE footer together", () => {
@@ -200,8 +209,8 @@ describe("parseConventionalMessage", () => {
       "feat(api)!: change format\n\nBREAKING CHANGE: JSON only now",
     );
     expect(result).not.toBeNull();
-    expect(result!.isBreaking).toBe(true);
-    expect(result!.breakingDescription).toBe("JSON only now");
+    expect(result?.isBreaking).toBe(true);
+    expect(result?.breakingDescription).toBe("JSON only now");
   });
 });
 
@@ -220,11 +229,11 @@ describe("round-trip", () => {
     const parsed = parseConventionalMessage(message);
 
     expect(parsed).not.toBeNull();
-    expect(parsed!.commitType).toBe(original.commitType);
-    expect(parsed!.scope).toBe(original.scope);
-    expect(parsed!.description).toBe(original.description);
-    expect(parsed!.body).toBe(original.body);
-    expect(parsed!.isBreaking).toBe(original.isBreaking);
+    expect(parsed?.commitType).toBe(original.commitType);
+    expect(parsed?.scope).toBe(original.scope);
+    expect(parsed?.description).toBe(original.description);
+    expect(parsed?.body).toBe(original.body);
+    expect(parsed?.isBreaking).toBe(original.isBreaking);
   });
 
   it("round-trips with breaking change", () => {
@@ -241,8 +250,8 @@ describe("round-trip", () => {
     const parsed = parseConventionalMessage(message);
 
     expect(parsed).not.toBeNull();
-    expect(parsed!.isBreaking).toBe(true);
-    expect(parsed!.breakingDescription).toBe(original.breakingDescription);
+    expect(parsed?.isBreaking).toBe(true);
+    expect(parsed?.breakingDescription).toBe(original.breakingDescription);
   });
 
   it("round-trips with body and breaking change", () => {
@@ -259,11 +268,11 @@ describe("round-trip", () => {
     const parsed = parseConventionalMessage(message);
 
     expect(parsed).not.toBeNull();
-    expect(parsed!.commitType).toBe(original.commitType);
-    expect(parsed!.scope).toBe(original.scope);
-    expect(parsed!.description).toBe(original.description);
-    expect(parsed!.body).toBe(original.body);
-    expect(parsed!.isBreaking).toBe(true);
-    expect(parsed!.breakingDescription).toBe(original.breakingDescription);
+    expect(parsed?.commitType).toBe(original.commitType);
+    expect(parsed?.scope).toBe(original.scope);
+    expect(parsed?.description).toBe(original.description);
+    expect(parsed?.body).toBe(original.body);
+    expect(parsed?.isBreaking).toBe(true);
+    expect(parsed?.breakingDescription).toBe(original.breakingDescription);
   });
 });
diff --git a/src/extensions/conventional-commits/lib/conventional-utils.ts b/src/extensions/conventional-commits/lib/conventional-utils.ts
index dcdeffca..088943a2 100644
--- a/src/extensions/conventional-commits/lib/conventional-utils.ts
+++ b/src/extensions/conventional-commits/lib/conventional-utils.ts
@@ -18,7 +18,14 @@ export interface ConventionalMessageParts {
  * Returns an empty string if `commitType` or `description` is falsy.
  */
 export function buildCommitMessage(parts: ConventionalMessageParts): string {
-  const { commitType, scope, description, body, isBreaking, breakingDescription } = parts;
+  const {
+    commitType,
+    scope,
+    description,
+    body,
+    isBreaking,
+    breakingDescription,
+  } = parts;
 
   if (!commitType || !description) {
     return "";
diff --git a/src/extensions/conventional-commits/manifest.json b/src/extensions/conventional-commits/manifest.json
index 3f6c33c3..f2043bc7 100644
--- a/src/extensions/conventional-commits/manifest.json
+++ b/src/extensions/conventional-commits/manifest.json
@@ -7,15 +7,32 @@
   "main": "index.ts",
   "contributes": {
     "blades": [
-      { "type": "conventional-commit", "title": "Conventional Commit", "singleton": true },
+      {
+        "type": "conventional-commit",
+        "title": "Conventional Commit",
+        "singleton": true
+      },
       { "type": "changelog", "title": "Generate Changelog", "singleton": true }
     ],
     "commands": [
-      { "id": "generate-changelog", "title": "Generate Changelog", "category": "Repository" },
-      { "id": "open-conventional-commit", "title": "Open Conventional Commit Composer", "category": "Repository" }
+      {
+        "id": "generate-changelog",
+        "title": "Generate Changelog",
+        "category": "Repository"
+      },
+      {
+        "id": "open-conventional-commit",
+        "title": "Open Conventional Commit Composer",
+        "category": "Repository"
+      }
     ],
     "toolbar": [
-      { "id": "changelog", "label": "Changelog", "group": "views", "priority": 30 }
+      {
+        "id": "changelog",
+        "label": "Changelog",
+        "group": "views",
+        "priority": 30
+      }
     ]
   },
   "permissions": null,
diff --git a/src/extensions/conventional-commits/store.ts b/src/extensions/conventional-commits/store.ts
index 33bae2c3..74494c56 100644
--- a/src/extensions/conventional-commits/store.ts
+++ b/src/extensions/conventional-commits/store.ts
@@ -1,12 +1,12 @@
-import { commands } from "../../bindings";
+import { createBladeStore } from "@/framework/stores/createBladeStore";
 import type {
   CommitType,
   ScopeSuggestion,
   TypeSuggestion,
   ValidationResult,
 } from "../../bindings";
+import { commands } from "../../bindings";
 import { buildCommitMessage as buildMessage } from "./lib/conventional-utils";
-import { createBladeStore } from "@/framework/stores/createBladeStore";
 
 /**
  * Valid conventional commit types.
@@ -217,8 +217,22 @@ export const useConventionalStore = createBladeStore<ConventionalState>(
     },
 
     buildCommitMessage: () => {
-      const { commitType, scope, description, body, isBreaking, breakingDescription } = get();
-      return buildMessage({ commitType, scope, description, body, isBreaking, breakingDescription });
+      const {
+        commitType,
+        scope,
+        description,
+        body,
+        isBreaking,
+        breakingDescription,
+      } = get();
+      return buildMessage({
+        commitType,
+        scope,
+        description,
+        body,
+        isBreaking,
+        breakingDescription,
+      });
     },
 
     reset: () =>
diff --git a/src/extensions/diff/blades/DiffBlade.test.tsx b/src/extensions/diff/blades/DiffBlade.test.tsx
index 5493b8fa..f43a8fa4 100644
--- a/src/extensions/diff/blades/DiffBlade.test.tsx
+++ b/src/extensions/diff/blades/DiffBlade.test.tsx
@@ -3,11 +3,25 @@ import { render } from "../../test-utils/render";
 const mockCommands = vi.hoisted(() => ({
   getFileDiff: vi.fn().mockResolvedValue({
     status: "ok",
-    data: { path: "test.ts", oldContent: "", newContent: "", hunks: [], isBinary: false, language: "typescript" },
+    data: {
+      path: "test.ts",
+      oldContent: "",
+      newContent: "",
+      hunks: [],
+      isBinary: false,
+      language: "typescript",
+    },
   }),
   getCommitFileDiff: vi.fn().mockResolvedValue({
     status: "ok",
-    data: { path: "test.ts", oldContent: "", newContent: "", hunks: [], isBinary: false, language: "typescript" },
+    data: {
+      path: "test.ts",
+      oldContent: "",
+      newContent: "",
+      hunks: [],
+      isBinary: false,
+      language: "typescript",
+    },
   }),
   getStagingStatus: vi.fn().mockResolvedValue({
     status: "ok",
@@ -41,7 +55,9 @@ import { DiffBlade } from "./DiffBlade";
 describe("DiffBlade", () => {
   it("renders without crashing", () => {
     const { container } = render(
-      <DiffBlade source={{ mode: "staging", filePath: "test.ts", staged: false }} />,
+      <DiffBlade
+        source={{ mode: "staging", filePath: "test.ts", staged: false }}
+      />,
     );
     expect(container.firstChild).not.toBeNull();
   });
diff --git a/src/extensions/diff/blades/DiffBlade.tsx b/src/extensions/diff/blades/DiffBlade.tsx
index 758b54fb..074aaaf6 100644
--- a/src/extensions/diff/blades/DiffBlade.tsx
+++ b/src/extensions/diff/blades/DiffBlade.tsx
@@ -1,13 +1,13 @@
 import { Loader2 } from "lucide-react";
 import { useCallback, useMemo, useState } from "react";
-import { useDiffQuery } from "./hooks/useDiffQuery";
-import { useDiffPreferences } from "./hooks/useDiffPreferences";
-import { useHunkStaging } from "./hooks/useHunkStaging";
-import { useLineStaging } from "./hooks/useLineStaging";
 import { DiffContent } from "./components/DiffContent";
-import { DiffToolbar } from "./components/DiffToolbar";
 import { DiffMarkdownPreview } from "./components/DiffMarkdownPreview";
+import { DiffToolbar } from "./components/DiffToolbar";
 import { StagingDiffNavigation } from "./components/StagingDiffNavigation";
+import { useDiffPreferences } from "./hooks/useDiffPreferences";
+import { useDiffQuery } from "./hooks/useDiffQuery";
+import { useHunkStaging } from "./hooks/useHunkStaging";
+import { useLineStaging } from "./hooks/useLineStaging";
 import type { DiffSource } from "./types";
 
 interface DiffBladeProps {
@@ -15,7 +15,12 @@ interface DiffBladeProps {
 }
 
 export function DiffBlade({ source }: DiffBladeProps) {
-  const { viewMode, collapseUnchanged, setDiffViewMode, setDiffCollapseUnchanged } = useDiffPreferences();
+  const {
+    viewMode,
+    collapseUnchanged,
+    setDiffViewMode,
+    setDiffCollapseUnchanged,
+  } = useDiffPreferences();
   const inline = viewMode === "inline";
 
   const [showPreview, setShowPreview] = useState(false);
@@ -27,17 +32,12 @@ export function DiffBlade({ source }: DiffBladeProps) {
 
   const isStagingMode = source.mode === "staging";
 
-  const {
-    hunks,
-    toggleHunk,
-    stageHunks,
-    unstageHunks,
-    isOperationPending,
-  } = useHunkStaging({
-    filePath: source.filePath,
-    staged: isStagingMode ? source.staged : false,
-    enabled: isStagingMode,
-  });
+  const { hunks, toggleHunk, stageHunks, unstageHunks, isOperationPending } =
+    useHunkStaging({
+      filePath: source.filePath,
+      staged: isStagingMode ? source.staged : false,
+      enabled: isStagingMode,
+    });
 
   const lineStagingResult = useLineStaging({
     filePath: source.filePath,
@@ -53,10 +53,7 @@ export function DiffBlade({ source }: DiffBladeProps) {
     setDiffCollapseUnchanged(!collapseUnchanged);
   }, [collapseUnchanged, setDiffCollapseUnchanged]);
 
-  const allHunkIndices = useMemo(
-    () => hunks.map((_, i) => i),
-    [hunks],
-  );
+  const allHunkIndices = useMemo(() => hunks.map((_, i) => i), [hunks]);
 
   const handleStageAll = useCallback(() => {
     stageHunks(allHunkIndices);
diff --git a/src/extensions/diff/blades/components/DiffContent.tsx b/src/extensions/diff/blades/components/DiffContent.tsx
index 2c429d42..bcc274ed 100644
--- a/src/extensions/diff/blades/components/DiffContent.tsx
+++ b/src/extensions/diff/blades/components/DiffContent.tsx
@@ -1,7 +1,7 @@
 import { DiffEditor, type DiffOnMount } from "@monaco-editor/react";
 import { useEffect, useMemo, useRef } from "react";
-import type { DiffHunkDetail } from "../../../../bindings";
 import { MONACO_COMMON_OPTIONS, MONACO_THEME } from "@/core/lib/monacoConfig";
+import type { DiffHunkDetail } from "../../../../bindings";
 import "@/core/lib/monacoTheme";
 import { StagingDiffEditor } from "./StagingDiffEditor";
 
@@ -44,7 +44,8 @@ export function DiffContent({
   stagingSource,
 }: DiffContentProps) {
   const editorRef = useRef<Parameters<DiffOnMount>[0] | null>(null);
-  const modelsRef = useRef<ReturnType<Parameters<DiffOnMount>[0]["getModel"]>>(null);
+  const modelsRef =
+    useRef<ReturnType<Parameters<DiffOnMount>[0]["getModel"]>>(null);
 
   // Dispose models on unmount. keepCurrentOriginalModel/keepCurrentModifiedModel
   // tell @monaco-editor/react to skip model disposal in its own cleanup so the
diff --git a/src/extensions/diff/blades/components/DiffToolbar.tsx b/src/extensions/diff/blades/components/DiffToolbar.tsx
index d4c8dd21..7caac7d8 100644
--- a/src/extensions/diff/blades/components/DiffToolbar.tsx
+++ b/src/extensions/diff/blades/components/DiffToolbar.tsx
@@ -4,8 +4,8 @@ import {
   Columns,
   Eye,
   FoldVertical,
-  ListPlus,
   ListMinus,
+  ListPlus,
   UnfoldVertical,
 } from "lucide-react";
 import type { ReactNode } from "react";
@@ -106,7 +106,11 @@ export function DiffToolbar({
             variant="ghost"
             size="sm"
             onClick={onToggleCollapse}
-            title={collapseUnchanged ? "Show all lines" : "Collapse unchanged regions"}
+            title={
+              collapseUnchanged
+                ? "Show all lines"
+                : "Collapse unchanged regions"
+            }
             className="h-7 px-2"
           >
             {collapseUnchanged ? (
diff --git a/src/extensions/diff/blades/components/StagingDiffEditor.tsx b/src/extensions/diff/blades/components/StagingDiffEditor.tsx
index 4347d14c..fba30be2 100644
--- a/src/extensions/diff/blades/components/StagingDiffEditor.tsx
+++ b/src/extensions/diff/blades/components/StagingDiffEditor.tsx
@@ -1,10 +1,7 @@
 import { DiffEditor, type DiffOnMount } from "@monaco-editor/react";
 import { useCallback, useEffect, useMemo, useRef } from "react";
+import { MONACO_COMMON_OPTIONS, MONACO_THEME } from "@/core/lib/monacoConfig";
 import type { DiffHunkDetail } from "../../../../bindings";
-import {
-  MONACO_COMMON_OPTIONS,
-  MONACO_THEME,
-} from "@/core/lib/monacoConfig";
 import "@/core/lib/monacoTheme";
 import { findHunkForLine, isChangedLine } from "../lib/diffUtils";
 
@@ -46,18 +43,25 @@ export function StagingDiffEditor({
   lineSelection,
 }: StagingDiffEditorProps) {
   const editorRef = useRef<Parameters<DiffOnMount>[0] | null>(null);
-  const modelsRef = useRef<ReturnType<Parameters<DiffOnMount>[0]["getModel"]>>(null);
+  const modelsRef =
+    useRef<ReturnType<Parameters<DiffOnMount>[0]["getModel"]>>(null);
   const viewZoneIdsRef = useRef<string[]>([]);
-  const hunkDecorationRef = useRef<ReturnType<
-    Parameters<DiffOnMount>[0]["getModifiedEditor"]
-  >["createDecorationsCollection"] extends (...args: any) => infer R
-    ? R
-    : null>(null);
-  const lineDecorationRef = useRef<ReturnType<
-    Parameters<DiffOnMount>[0]["getModifiedEditor"]
-  >["createDecorationsCollection"] extends (...args: any) => infer R
-    ? R
-    : null>(null);
+  const hunkDecorationRef =
+    useRef<
+      ReturnType<
+        Parameters<DiffOnMount>[0]["getModifiedEditor"]
+      >["createDecorationsCollection"] extends (...args: any) => infer R
+        ? R
+        : null
+    >(null);
+  const lineDecorationRef =
+    useRef<
+      ReturnType<
+        Parameters<DiffOnMount>[0]["getModifiedEditor"]
+      >["createDecorationsCollection"] extends (...args: any) => infer R
+        ? R
+        : null
+    >(null);
   const announcementRef = useRef<HTMLDivElement>(null);
 
   // Store callbacks in refs so ViewZone DOM nodes always have current values
@@ -216,7 +220,7 @@ export function StagingDiffEditor({
         button.addEventListener("click", () => {
           if (isOperationPendingRef.current) return;
           const ls = lineSelectionRef.current;
-          if (ls && ls.hasSelection && selectedLinesInHunk(hunkIndex) > 0) {
+          if (ls?.hasSelection && selectedLinesInHunk(hunkIndex) > 0) {
             ls.stageSelectedLines();
             if (announcementRef.current) {
               const count = selectedLinesInHunk(hunkIndex);
@@ -279,8 +283,18 @@ export function StagingDiffEditor({
 
     const modifiedEditor = diffEditor.getModifiedEditor();
     const decorations: Array<{
-      range: { startLineNumber: number; startColumn: number; endLineNumber: number; endColumn: number };
-      options: { isWholeLine: boolean; className?: string; glyphMarginClassName?: string; glyphMarginHoverMessage?: { value: string } };
+      range: {
+        startLineNumber: number;
+        startColumn: number;
+        endLineNumber: number;
+        endColumn: number;
+      };
+      options: {
+        isWholeLine: boolean;
+        className?: string;
+        glyphMarginClassName?: string;
+        glyphMarginHoverMessage?: { value: string };
+      };
     }> = [];
 
     // Add glyph margin checkbox decorations for all changed lines
@@ -382,7 +396,7 @@ export function StagingDiffEditor({
     });
 
     return () => disposable.dispose();
-  }, [hunks]);
+  }, []);
 
   // Register keyboard actions on the modified editor
   useEffect(() => {
@@ -429,9 +443,7 @@ export function StagingDiffEditor({
           const currentHunks = hunksRef.current;
           if (currentHunks.length === 0) return;
           const cursorLine = modifiedEditor.getPosition()?.lineNumber ?? 0;
-          const prevHunks = currentHunks.filter(
-            (h) => h.newStart < cursorLine,
-          );
+          const prevHunks = currentHunks.filter((h) => h.newStart < cursorLine);
           const target =
             prevHunks.length > 0
               ? prevHunks[prevHunks.length - 1]
@@ -456,12 +468,11 @@ export function StagingDiffEditor({
         ],
         run: () => {
           const ls = lineSelectionRef.current;
-          if (ls && ls.hasSelection) {
+          if (ls?.hasSelection) {
             ls.stageSelectedLines();
           } else {
             // Stage hunk at cursor
-            const cursorLine =
-              modifiedEditor.getPosition()?.lineNumber ?? 0;
+            const cursorLine = modifiedEditor.getPosition()?.lineNumber ?? 0;
             const hunkIndex = findHunkForLine(hunksRef.current, cursorLine);
             if (hunkIndex >= 0) {
               onToggleHunkRef.current(hunkIndex);
@@ -482,11 +493,10 @@ export function StagingDiffEditor({
         ],
         run: () => {
           const ls = lineSelectionRef.current;
-          if (ls && ls.hasSelection) {
+          if (ls?.hasSelection) {
             ls.stageSelectedLines();
           } else {
-            const cursorLine =
-              modifiedEditor.getPosition()?.lineNumber ?? 0;
+            const cursorLine = modifiedEditor.getPosition()?.lineNumber ?? 0;
             const hunkIndex = findHunkForLine(hunksRef.current, cursorLine);
             if (hunkIndex >= 0) {
               onToggleHunkRef.current(hunkIndex);
@@ -508,7 +518,7 @@ export function StagingDiffEditor({
         precondition: undefined,
         run: () => {
           const ls = lineSelectionRef.current;
-          if (ls && ls.hasSelection) {
+          if (ls?.hasSelection) {
             ls.clearSelection();
           }
         },
diff --git a/src/extensions/diff/blades/components/StagingDiffNavigation.tsx b/src/extensions/diff/blades/components/StagingDiffNavigation.tsx
index f5013665..ebb49785 100644
--- a/src/extensions/diff/blades/components/StagingDiffNavigation.tsx
+++ b/src/extensions/diff/blades/components/StagingDiffNavigation.tsx
@@ -2,9 +2,9 @@ import { useQuery } from "@tanstack/react-query";
 import { ChevronLeft, ChevronRight } from "lucide-react";
 import { useCallback, useMemo } from "react";
 import { useHotkeys } from "react-hotkeys-hook";
-import { commands } from "../../../../bindings";
 import { useBladeNavigation } from "@/core/hooks/useBladeNavigation";
 import { useUIStore as useStagingStore } from "@/core/stores/domain/ui-state";
+import { commands } from "../../../../bindings";
 
 interface StagingDiffNavigationProps {
   currentFilePath: string;
diff --git a/src/extensions/diff/blades/hooks/useHunkStaging.ts b/src/extensions/diff/blades/hooks/useHunkStaging.ts
index 46d929f1..d0c8542e 100644
--- a/src/extensions/diff/blades/hooks/useHunkStaging.ts
+++ b/src/extensions/diff/blades/hooks/useHunkStaging.ts
@@ -1,7 +1,7 @@
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import { useCallback } from "react";
-import { commands } from "../../../../bindings";
 import type { DiffHunkDetail } from "../../../../bindings";
+import { commands } from "../../../../bindings";
 
 interface UseHunkStagingOptions {
   filePath: string;
diff --git a/src/extensions/diff/blades/hooks/useLineStaging.ts b/src/extensions/diff/blades/hooks/useLineStaging.ts
index 784eccb6..6237a1b7 100644
--- a/src/extensions/diff/blades/hooks/useLineStaging.ts
+++ b/src/extensions/diff/blades/hooks/useLineStaging.ts
@@ -1,7 +1,7 @@
 import { useMutation, useQueryClient } from "@tanstack/react-query";
-import { useState, useCallback, useRef } from "react";
-import { commands } from "../../../../bindings";
+import { useCallback, useRef, useState } from "react";
 import type { DiffHunkDetail } from "../../../../bindings";
+import { commands } from "../../../../bindings";
 import { findHunkForLine, linesToRanges } from "../lib/diffUtils";
 
 interface UseLineStagingOptions {
@@ -10,7 +10,11 @@ interface UseLineStagingOptions {
   hunks: DiffHunkDetail[];
 }
 
-export function useLineStaging({ filePath, staged, hunks }: UseLineStagingOptions) {
+export function useLineStaging({
+  filePath,
+  staged,
+  hunks,
+}: UseLineStagingOptions) {
   const queryClient = useQueryClient();
   const [selectedLines, setSelectedLines] = useState<Set<number>>(new Set());
   const lastClickedLine = useRef<number | null>(null);
@@ -22,7 +26,7 @@ export function useLineStaging({ filePath, staged, hunks }: UseLineStagingOption
   }, [queryClient, filePath]);
 
   const toggleLine = useCallback((lineNumber: number) => {
-    setSelectedLines(prev => {
+    setSelectedLines((prev) => {
       const next = new Set(prev);
       if (next.has(lineNumber)) next.delete(lineNumber);
       else next.add(lineNumber);
@@ -35,7 +39,7 @@ export function useLineStaging({ filePath, staged, hunks }: UseLineStagingOption
     const fromLine = lastClickedLine.current ?? toLine;
     const start = Math.min(fromLine, toLine);
     const end = Math.max(fromLine, toLine);
-    setSelectedLines(prev => {
+    setSelectedLines((prev) => {
       const next = new Set(prev);
       for (let i = start; i <= end; i++) next.add(i);
       return next;
diff --git a/src/extensions/diff/blades/lib/diffUtils.ts b/src/extensions/diff/blades/lib/diffUtils.ts
index 8e9ae3a7..07af9f81 100644
--- a/src/extensions/diff/blades/lib/diffUtils.ts
+++ b/src/extensions/diff/blades/lib/diffUtils.ts
@@ -1,4 +1,4 @@
-import type { DiffHunkDetail, DiffHunk } from "../../../../bindings";
+import type { DiffHunk, DiffHunkDetail } from "../../../../bindings";
 
 /**
  * Find which hunk a given line number belongs to (in the modified/new editor).
diff --git a/src/extensions/diff/index.ts b/src/extensions/diff/index.ts
index a11ba657..ed1a01eb 100644
--- a/src/extensions/diff/index.ts
+++ b/src/extensions/diff/index.ts
@@ -7,7 +7,7 @@ export async function onActivate(api: ExtensionAPI): Promise<void> {
   const DiffBlade = lazy(() =>
     import("./blades/DiffBlade").then((m) => ({
       default: m.DiffBlade,
-    }))
+    })),
   );
 
   api.registerBlade({
diff --git a/src/extensions/git-insights/blades/InsightsDashboardBlade.tsx b/src/extensions/git-insights/blades/InsightsDashboardBlade.tsx
index 83ef22ec..381886df 100644
--- a/src/extensions/git-insights/blades/InsightsDashboardBlade.tsx
+++ b/src/extensions/git-insights/blades/InsightsDashboardBlade.tsx
@@ -1,13 +1,13 @@
-import type { ComponentType } from "react";
 import { motion } from "framer-motion";
-import { BarChart3, GitBranch, Users, Activity } from "lucide-react";
-import { useInsightsData } from "../hooks/useInsightsData";
-import { TimeRangeSelector } from "../components/TimeRangeSelector";
-import { useInsightsStore } from "../insightsStore";
+import { Activity, BarChart3, GitBranch, Users } from "lucide-react";
+import type { ComponentType } from "react";
+import { BranchHealthOverview } from "../components/BranchHealthOverview";
 import { CommitActivityChart } from "../components/CommitActivityChart";
 import { ContributorBreakdown } from "../components/ContributorBreakdown";
-import { BranchHealthOverview } from "../components/BranchHealthOverview";
 import { RepoStatsCards } from "../components/RepoStatsCards";
+import { TimeRangeSelector } from "../components/TimeRangeSelector";
+import { useInsightsData } from "../hooks/useInsightsData";
+import { useInsightsStore } from "../insightsStore";
 
 export function InsightsDashboardBlade() {
   const { insights, branchHealth, isLoading, error } = useInsightsData();
diff --git a/src/extensions/git-insights/components/BranchHealthOverview.tsx b/src/extensions/git-insights/components/BranchHealthOverview.tsx
index ed0925e7..4c5f63b8 100644
--- a/src/extensions/git-insights/components/BranchHealthOverview.tsx
+++ b/src/extensions/git-insights/components/BranchHealthOverview.tsx
@@ -1,16 +1,16 @@
 import {
-  GitBranch,
-  ArrowUp,
-  ArrowDown,
   AlertTriangle,
+  ArrowDown,
+  ArrowUp,
   CheckCircle2,
-  Trash2,
   ExternalLink,
+  GitBranch,
+  Trash2,
 } from "lucide-react";
-import type { BranchHealthInfo } from "../types";
-import { commands } from "../../../bindings";
 import { toast } from "@/framework/stores/toast";
+import { commands } from "../../../bindings";
 import { useInsightsStore } from "../insightsStore";
+import type { BranchHealthInfo } from "../types";
 
 interface Props {
   branches: BranchHealthInfo[];
@@ -69,9 +69,7 @@ async function handleDelete(name: string) {
     toast.success(`Deleted branch ${name}`);
     useInsightsStore.getState().loadBranchHealth();
   } catch (e) {
-    toast.error(
-      `Delete failed: ${e instanceof Error ? e.message : String(e)}`,
-    );
+    toast.error(`Delete failed: ${e instanceof Error ? e.message : String(e)}`);
   }
 }
 
@@ -122,9 +120,7 @@ export function BranchHealthOverview({ branches }: Props) {
                 )}
               </div>
               <div className="mt-0.5 flex items-center gap-2 text-[10px] text-ctp-subtext0">
-                <span>
-                  {formatRelativeDate(branch.lastCommitTimestampMs)}
-                </span>
+                <span>{formatRelativeDate(branch.lastCommitTimestampMs)}</span>
                 {(branch.ahead > 0 || branch.behind > 0) && (
                   <span className="flex items-center gap-1">
                     {branch.ahead > 0 && (
diff --git a/src/extensions/git-insights/components/CommitActivityChart.tsx b/src/extensions/git-insights/components/CommitActivityChart.tsx
index c01ee5d4..d78a6864 100644
--- a/src/extensions/git-insights/components/CommitActivityChart.tsx
+++ b/src/extensions/git-insights/components/CommitActivityChart.tsx
@@ -1,10 +1,10 @@
 import { ParentSize } from "@visx/responsive";
 import {
-  XYChart,
   AnimatedBarSeries,
   AnimatedGrid,
   Axis,
   Tooltip,
+  XYChart,
 } from "@visx/xychart";
 import { BarChart3 } from "lucide-react";
 import { insightsChartTheme } from "../lib/chartTheme";
@@ -89,12 +89,7 @@ export function CommitActivityChart({ data }: Props) {
               tickFormat={formatDate}
               hideTicks
             />
-            <Axis
-              orientation="left"
-              numTicks={4}
-              hideTicks
-              hideAxisLine
-            />
+            <Axis orientation="left" numTicks={4} hideTicks hideAxisLine />
             <Tooltip
               snapTooltipToDatumX
               snapTooltipToDatumY
diff --git a/src/extensions/git-insights/components/ContributorBreakdown.tsx b/src/extensions/git-insights/components/ContributorBreakdown.tsx
index 719c1f0c..f57f7646 100644
--- a/src/extensions/git-insights/components/ContributorBreakdown.tsx
+++ b/src/extensions/git-insights/components/ContributorBreakdown.tsx
@@ -1,8 +1,8 @@
 import { motion } from "framer-motion";
 import { Users } from "lucide-react";
+import { useInsightsStore } from "../insightsStore";
 import type { ContributorStats } from "../types";
 import { GravatarAvatar } from "./GravatarAvatar";
-import { useInsightsStore } from "../insightsStore";
 
 interface Props {
   contributors: ContributorStats[];
diff --git a/src/extensions/git-insights/components/GravatarAvatar.tsx b/src/extensions/git-insights/components/GravatarAvatar.tsx
index 3988dfb0..09f0215e 100644
--- a/src/extensions/git-insights/components/GravatarAvatar.tsx
+++ b/src/extensions/git-insights/components/GravatarAvatar.tsx
@@ -1,4 +1,4 @@
-import { useState, useEffect } from "react";
+import { useEffect, useState } from "react";
 import { getGravatarUrl } from "../lib/gravatar";
 
 interface GravatarAvatarProps {
@@ -15,7 +15,12 @@ const SIZE_CLASSES = {
 
 const SIZE_PX = { sm: 24, md: 32 } as const;
 
-export function GravatarAvatar({ email, name, size = "sm", className = "" }: GravatarAvatarProps) {
+export function GravatarAvatar({
+  email,
+  name,
+  size = "sm",
+  className = "",
+}: GravatarAvatarProps) {
   const [url, setUrl] = useState<string | null>(null);
   const [hasError, setHasError] = useState(false);
 
@@ -24,7 +29,9 @@ export function GravatarAvatar({ email, name, size = "sm", className = "" }: Gra
     getGravatarUrl(email, SIZE_PX[size] * 2).then((u) => {
       if (!cancelled) setUrl(u);
     });
-    return () => { cancelled = true; };
+    return () => {
+      cancelled = true;
+    };
   }, [email, size]);
 
   const sizeClass = SIZE_CLASSES[size];
diff --git a/src/extensions/git-insights/components/RepoStatsCards.tsx b/src/extensions/git-insights/components/RepoStatsCards.tsx
index 3e25133d..4cd36667 100644
--- a/src/extensions/git-insights/components/RepoStatsCards.tsx
+++ b/src/extensions/git-insights/components/RepoStatsCards.tsx
@@ -1,5 +1,5 @@
 import { motion } from "framer-motion";
-import { GitCommitHorizontal, GitBranch, Users, Clock } from "lucide-react";
+import { Clock, GitBranch, GitCommitHorizontal, Users } from "lucide-react";
 import type { RepoInsights } from "../types";
 
 interface Props {
diff --git a/src/extensions/git-insights/hooks/useInsightsData.ts b/src/extensions/git-insights/hooks/useInsightsData.ts
index b8d72f5e..8bae9832 100644
--- a/src/extensions/git-insights/hooks/useInsightsData.ts
+++ b/src/extensions/git-insights/hooks/useInsightsData.ts
@@ -8,12 +8,12 @@ import { useInsightsStore } from "../insightsStore";
 export function useInsightsData() {
   const loadInsights = useInsightsStore((s) => s.loadInsights);
   const loadBranchHealth = useInsightsStore((s) => s.loadBranchHealth);
-  const timeRange = useInsightsStore((s) => s.timeRange);
+  const _timeRange = useInsightsStore((s) => s.timeRange);
 
   useEffect(() => {
     loadInsights();
     loadBranchHealth();
-  }, [loadInsights, loadBranchHealth, timeRange]);
+  }, [loadInsights, loadBranchHealth]);
 
   return useInsightsStore();
 }
diff --git a/src/extensions/git-insights/index.ts b/src/extensions/git-insights/index.ts
index a5de206d..3b75009f 100644
--- a/src/extensions/git-insights/index.ts
+++ b/src/extensions/git-insights/index.ts
@@ -1,6 +1,6 @@
-import { lazy } from "react";
-import { BarChart3 } from "lucide-react";
 import { listen } from "@tauri-apps/api/event";
+import { BarChart3 } from "lucide-react";
+import { lazy } from "react";
 import type { ExtensionAPI } from "@/framework/extension-system/ExtensionAPI";
 import { openBlade } from "@/framework/layout/bladeOpener";
 import { useGitOpsStore } from "../../core/stores/domain/git-ops";
diff --git a/src/extensions/git-insights/insightsStore.ts b/src/extensions/git-insights/insightsStore.ts
index 0d1698a3..571ae2be 100644
--- a/src/extensions/git-insights/insightsStore.ts
+++ b/src/extensions/git-insights/insightsStore.ts
@@ -1,7 +1,7 @@
 import { create } from "zustand";
 import { devtools } from "zustand/middleware";
 import { commands } from "../../bindings";
-import type { TimeRange, RepoInsights, BranchHealthInfo } from "./types";
+import type { BranchHealthInfo, RepoInsights, TimeRange } from "./types";
 
 interface InsightsState {
   // Data
diff --git a/src/extensions/git-insights/lib/gravatar.ts b/src/extensions/git-insights/lib/gravatar.ts
index 154ebf33..26025d83 100644
--- a/src/extensions/git-insights/lib/gravatar.ts
+++ b/src/extensions/git-insights/lib/gravatar.ts
@@ -1,6 +1,9 @@
 const hashCache = new Map<string, string>();
 
-export async function getGravatarUrl(email: string, size = 40): Promise<string> {
+export async function getGravatarUrl(
+  email: string,
+  size = 40,
+): Promise<string> {
   const normalized = email.trim().toLowerCase();
   const cached = hashCache.get(normalized);
   if (cached) return `https://gravatar.com/avatar/${cached}?s=${size}&d=retro`;
@@ -9,7 +12,9 @@ export async function getGravatarUrl(email: string, size = 40): Promise<string>
   const data = encoder.encode(normalized);
   const hashBuffer = await crypto.subtle.digest("SHA-256", data);
   const hashArray = Array.from(new Uint8Array(hashBuffer));
-  const hashHex = hashArray.map((b) => b.toString(16).padStart(2, "0")).join("");
+  const hashHex = hashArray
+    .map((b) => b.toString(16).padStart(2, "0"))
+    .join("");
 
   hashCache.set(normalized, hashHex);
   return `https://gravatar.com/avatar/${hashHex}?s=${size}&d=retro`;
diff --git a/src/extensions/git-insights/manifest.json b/src/extensions/git-insights/manifest.json
index 46d60dfb..3635323e 100644
--- a/src/extensions/git-insights/manifest.json
+++ b/src/extensions/git-insights/manifest.json
@@ -7,8 +7,21 @@
   "main": "index.ts",
   "contributes": {
     "blades": [{ "type": "insights-dashboard", "title": "Insights" }],
-    "commands": [{ "id": "show-insights", "title": "Show Insights", "category": "Navigation" }],
-    "toolbar": [{ "id": "insights", "label": "Insights", "group": "views", "priority": 40 }]
+    "commands": [
+      {
+        "id": "show-insights",
+        "title": "Show Insights",
+        "category": "Navigation"
+      }
+    ],
+    "toolbar": [
+      {
+        "id": "insights",
+        "label": "Insights",
+        "group": "views",
+        "priority": 40
+      }
+    ]
   },
   "trustLevel": "built-in"
 }
diff --git a/src/extensions/git-insights/types.ts b/src/extensions/git-insights/types.ts
index cdcfcf41..84f1f551 100644
--- a/src/extensions/git-insights/types.ts
+++ b/src/extensions/git-insights/types.ts
@@ -3,7 +3,7 @@ export type TimeRange = 7 | 30 | 90;
 
 // These types match the Rust structs in insights.rs (camelCase via serde)
 export interface DailyCommitCount {
-  date: string;    // "YYYY-MM-DD"
+  date: string; // "YYYY-MM-DD"
   count: number;
 }
 
@@ -29,7 +29,7 @@ export interface BranchHealthInfo {
   name: string;
   isHead: boolean;
   isRemote: boolean;
-  lastCommitDate: string;       // "YYYY-MM-DD"
+  lastCommitDate: string; // "YYYY-MM-DD"
   lastCommitTimestampMs: number;
   lastCommitMessage: string;
   ahead: number;
diff --git a/src/extensions/gitflow/blades/GitflowCheatsheetBlade.test.tsx b/src/extensions/gitflow/blades/GitflowCheatsheetBlade.test.tsx
index b3a40f94..a242557b 100644
--- a/src/extensions/gitflow/blades/GitflowCheatsheetBlade.test.tsx
+++ b/src/extensions/gitflow/blades/GitflowCheatsheetBlade.test.tsx
@@ -25,7 +25,12 @@ const mockCommands = vi.hoisted(() => ({
   }),
   getRepositoryStatus: vi.fn().mockResolvedValue({
     status: "ok",
-    data: { branchName: "main", isDirty: false, repoPath: "/test", repoName: "test" },
+    data: {
+      branchName: "main",
+      isDirty: false,
+      repoPath: "/test",
+      repoName: "test",
+    },
   }),
   listBranches: vi.fn().mockResolvedValue({ status: "ok", data: [] }),
 }));
diff --git a/src/extensions/gitflow/blades/GitflowCheatsheetBlade.tsx b/src/extensions/gitflow/blades/GitflowCheatsheetBlade.tsx
index 718b7875..1d8eea9f 100644
--- a/src/extensions/gitflow/blades/GitflowCheatsheetBlade.tsx
+++ b/src/extensions/gitflow/blades/GitflowCheatsheetBlade.tsx
@@ -1,11 +1,16 @@
 import { GitMerge } from "lucide-react";
-import { useGitOpsStore as useGitflowStore } from "../../../core/stores/domain/git-ops";
-import { useGitOpsStore as useRepositoryStore } from "../../../core/stores/domain/git-ops";
-import { classifyBranch, BRANCH_TYPE_COLORS } from "../../../core/lib/branchClassifier";
 import type { GitflowBranchType } from "../../../core/lib/branchClassifier";
-import { GitflowDiagram } from "../components/GitflowDiagram";
+import {
+  BRANCH_TYPE_COLORS,
+  classifyBranch,
+} from "../../../core/lib/branchClassifier";
+import {
+  useGitOpsStore as useGitflowStore,
+  useGitOpsStore as useRepositoryStore,
+} from "../../../core/stores/domain/git-ops";
 import { GitflowActionCards } from "../components/GitflowActionCards";
 import { GitflowBranchReference } from "../components/GitflowBranchReference";
+import { GitflowDiagram } from "../components/GitflowDiagram";
 
 export function GitflowCheatsheetBlade() {
   const gitflowStatus = useGitflowStore((s) => s.gitflowStatus);
@@ -13,7 +18,8 @@ export function GitflowCheatsheetBlade() {
 
   // Determine branch type from current branch name
   // Prefer gitflow status (has currentBranch), fall back to repo status (has branchName)
-  const branchName = gitflowStatus?.currentBranch || repoStatus?.branchName || "";
+  const branchName =
+    gitflowStatus?.currentBranch || repoStatus?.branchName || "";
   const branchType: GitflowBranchType = branchName
     ? classifyBranch(branchName)
     : "other";
diff --git a/src/extensions/gitflow/components/FinishFlowDialog.tsx b/src/extensions/gitflow/components/FinishFlowDialog.tsx
index bafbb36f..3b67da26 100644
--- a/src/extensions/gitflow/components/FinishFlowDialog.tsx
+++ b/src/extensions/gitflow/components/FinishFlowDialog.tsx
@@ -1,7 +1,7 @@
 import { X } from "lucide-react";
 import { useState } from "react";
-import { useGitflowWorkflow } from "../hooks/useGitflowWorkflow";
 import { useGitOpsStore as useGitflowStore } from "../../../core/stores/domain/git-ops";
+import { useGitflowWorkflow } from "../hooks/useGitflowWorkflow";
 import { ReviewChecklist } from "./ReviewChecklist";
 
 interface FinishFlowDialogProps {
diff --git a/src/extensions/gitflow/components/GitflowActionCards.tsx b/src/extensions/gitflow/components/GitflowActionCards.tsx
index d5139961..280e1d3e 100644
--- a/src/extensions/gitflow/components/GitflowActionCards.tsx
+++ b/src/extensions/gitflow/components/GitflowActionCards.tsx
@@ -1,7 +1,7 @@
+import type { LucideIcon } from "lucide-react";
 import { ArrowRight, GitBranch, GitMerge, Rocket, Tag } from "lucide-react";
 import type { GitflowBranchType } from "../../../core/lib/branchClassifier";
 import { BRANCH_TYPE_COLORS } from "../../../core/lib/branchClassifier";
-import type { LucideIcon } from "lucide-react";
 
 interface ActionCard {
   icon: LucideIcon;
@@ -96,11 +96,12 @@ export function GitflowActionCards({ branchType }: GitflowActionCardsProps) {
           className="bg-ctp-surface0/50 hover:bg-ctp-surface0 border border-ctp-surface1 rounded-lg p-4 transition-colors"
         >
           <div className="flex items-start gap-3">
-            <card.icon className="w-5 h-5 shrink-0 mt-0.5" style={{ color: BRANCH_TYPE_COLORS[branchType] }} />
+            <card.icon
+              className="w-5 h-5 shrink-0 mt-0.5"
+              style={{ color: BRANCH_TYPE_COLORS[branchType] }}
+            />
             <div className="min-w-0">
-              <p className="text-sm font-medium text-ctp-text">
-                {card.title}
-              </p>
+              <p className="text-sm font-medium text-ctp-text">{card.title}</p>
               <p className="text-sm text-ctp-subtext0 mt-0.5">
                 {card.description}
               </p>
diff --git a/src/extensions/gitflow/components/GitflowBranchReference.tsx b/src/extensions/gitflow/components/GitflowBranchReference.tsx
index 269603f6..64d72093 100644
--- a/src/extensions/gitflow/components/GitflowBranchReference.tsx
+++ b/src/extensions/gitflow/components/GitflowBranchReference.tsx
@@ -103,7 +103,9 @@ export function GitflowBranchReference({
                 className="w-3 h-3 rounded-full shrink-0"
                 style={{ backgroundColor: color }}
               />
-              <h4 className={`text-sm font-semibold ${isCurrent ? "text-ctp-text" : "text-ctp-subtext1"}`}>
+              <h4
+                className={`text-sm font-semibold ${isCurrent ? "text-ctp-text" : "text-ctp-subtext1"}`}
+              >
                 {info.name}
               </h4>
               {isCurrent && (
diff --git a/src/extensions/gitflow/components/GitflowDiagram.tsx b/src/extensions/gitflow/components/GitflowDiagram.tsx
index ee7f31bb..3e0d90f9 100644
--- a/src/extensions/gitflow/components/GitflowDiagram.tsx
+++ b/src/extensions/gitflow/components/GitflowDiagram.tsx
@@ -67,21 +67,61 @@ interface Connector {
 
 const CONNECTORS: Connector[] = [
   // Feature branch-out: develop -> feature (down)
-  { type: "feature", x: FEATURE_BRANCH_X, fromY: LANE_Y.develop, toY: LANE_Y.feature },
+  {
+    type: "feature",
+    x: FEATURE_BRANCH_X,
+    fromY: LANE_Y.develop,
+    toY: LANE_Y.feature,
+  },
   // Feature merge-back: feature -> develop (up)
-  { type: "feature", x: FEATURE_MERGE_X, fromY: LANE_Y.feature, toY: LANE_Y.develop },
+  {
+    type: "feature",
+    x: FEATURE_MERGE_X,
+    fromY: LANE_Y.feature,
+    toY: LANE_Y.develop,
+  },
   // Release branch-out: develop -> release (up)
-  { type: "release", x: RELEASE_BRANCH_X, fromY: LANE_Y.develop, toY: LANE_Y.release },
+  {
+    type: "release",
+    x: RELEASE_BRANCH_X,
+    fromY: LANE_Y.develop,
+    toY: LANE_Y.release,
+  },
   // Release merge to main (up)
-  { type: "release", x: RELEASE_MERGE_MAIN_X, fromY: LANE_Y.release, toY: LANE_Y.main },
+  {
+    type: "release",
+    x: RELEASE_MERGE_MAIN_X,
+    fromY: LANE_Y.release,
+    toY: LANE_Y.main,
+  },
   // Release merge to develop (down)
-  { type: "release", x: RELEASE_MERGE_DEV_X, fromY: LANE_Y.release, toY: LANE_Y.develop },
+  {
+    type: "release",
+    x: RELEASE_MERGE_DEV_X,
+    fromY: LANE_Y.release,
+    toY: LANE_Y.develop,
+  },
   // Hotfix branch-out: main -> hotfix (down)
-  { type: "hotfix", x: HOTFIX_BRANCH_X, fromY: LANE_Y.main, toY: LANE_Y.hotfix },
+  {
+    type: "hotfix",
+    x: HOTFIX_BRANCH_X,
+    fromY: LANE_Y.main,
+    toY: LANE_Y.hotfix,
+  },
   // Hotfix merge to main (up)
-  { type: "hotfix", x: HOTFIX_MERGE_MAIN_X, fromY: LANE_Y.hotfix, toY: LANE_Y.main },
+  {
+    type: "hotfix",
+    x: HOTFIX_MERGE_MAIN_X,
+    fromY: LANE_Y.hotfix,
+    toY: LANE_Y.main,
+  },
   // Hotfix merge to develop (down)
-  { type: "hotfix", x: HOTFIX_MERGE_DEV_X, fromY: LANE_Y.hotfix, toY: LANE_Y.develop },
+  {
+    type: "hotfix",
+    x: HOTFIX_MERGE_DEV_X,
+    fromY: LANE_Y.hotfix,
+    toY: LANE_Y.develop,
+  },
 ];
 
 const MARKER_TYPES: { id: string; type: GitflowBranchType }[] = [
@@ -104,11 +144,51 @@ interface LaneConfig {
 }
 
 const LANES: LaneConfig[] = [
-  { type: "main", label: "main", y: LANE_Y.main, xStart: LANE_X_START, xEnd: LANE_X_END, dashed: false, commits: MAIN_COMMITS },
-  { type: "hotfix", label: "hotfix/*", y: LANE_Y.hotfix, xStart: LANE_X_START, xEnd: LANE_X_END, dashed: true, commits: HOTFIX_COMMITS },
-  { type: "release", label: "release/*", y: LANE_Y.release, xStart: LANE_X_START, xEnd: LANE_X_END, dashed: true, commits: RELEASE_COMMITS },
-  { type: "develop", label: "develop", y: LANE_Y.develop, xStart: LANE_X_START, xEnd: LANE_X_END, dashed: false, commits: DEVELOP_COMMITS },
-  { type: "feature", label: "feature/*", y: LANE_Y.feature, xStart: LANE_X_START, xEnd: LANE_X_END, dashed: true, commits: FEATURE_COMMITS },
+  {
+    type: "main",
+    label: "main",
+    y: LANE_Y.main,
+    xStart: LANE_X_START,
+    xEnd: LANE_X_END,
+    dashed: false,
+    commits: MAIN_COMMITS,
+  },
+  {
+    type: "hotfix",
+    label: "hotfix/*",
+    y: LANE_Y.hotfix,
+    xStart: LANE_X_START,
+    xEnd: LANE_X_END,
+    dashed: true,
+    commits: HOTFIX_COMMITS,
+  },
+  {
+    type: "release",
+    label: "release/*",
+    y: LANE_Y.release,
+    xStart: LANE_X_START,
+    xEnd: LANE_X_END,
+    dashed: true,
+    commits: RELEASE_COMMITS,
+  },
+  {
+    type: "develop",
+    label: "develop",
+    y: LANE_Y.develop,
+    xStart: LANE_X_START,
+    xEnd: LANE_X_END,
+    dashed: false,
+    commits: DEVELOP_COMMITS,
+  },
+  {
+    type: "feature",
+    label: "feature/*",
+    y: LANE_Y.feature,
+    xStart: LANE_X_START,
+    xEnd: LANE_X_END,
+    dashed: true,
+    commits: FEATURE_COMMITS,
+  },
 ];
 
 /**
@@ -148,7 +228,14 @@ export function GitflowDiagram({ highlightedLane }: GitflowDiagramProps) {
       <defs>
         {/* Glow filter for active lane — uses userSpaceOnUse to avoid
             zero-height clipping on horizontal lines */}
-        <filter id="glow" filterUnits="userSpaceOnUse" x="0" y="0" width={SVG_WIDTH} height={SVG_HEIGHT}>
+        <filter
+          id="glow"
+          filterUnits="userSpaceOnUse"
+          x="0"
+          y="0"
+          width={SVG_WIDTH}
+          height={SVG_HEIGHT}
+        >
           <feGaussianBlur stdDeviation="3" result="blur" />
           <feMerge>
             <feMergeNode in="blur" />
diff --git a/src/extensions/gitflow/components/GitflowPanel.tsx b/src/extensions/gitflow/components/GitflowPanel.tsx
index c528ddae..81eb49c4 100644
--- a/src/extensions/gitflow/components/GitflowPanel.tsx
+++ b/src/extensions/gitflow/components/GitflowPanel.tsx
@@ -1,8 +1,18 @@
-import { AlertTriangle, BookOpen, Flag, GitBranch, Play, Square, X } from "lucide-react";
+import {
+  AlertTriangle,
+  BookOpen,
+  Flag,
+  GitBranch,
+  Play,
+  Square,
+  X,
+} from "lucide-react";
 import { useEffect, useState } from "react";
-import { useGitOpsStore as useBranchStore } from "../../../core/stores/domain/git-ops";
-import { useGitOpsStore as useGitflowStore } from "../../../core/stores/domain/git-ops";
 import { useBladeNavigation } from "../../../core/hooks/useBladeNavigation";
+import {
+  useGitOpsStore as useBranchStore,
+  useGitOpsStore as useGitflowStore,
+} from "../../../core/stores/domain/git-ops";
 import { useGitflowWorkflow } from "../hooks/useGitflowWorkflow";
 import { FinishFlowDialog } from "./FinishFlowDialog";
 import { InitGitflowDialog } from "./InitGitflowDialog";
@@ -11,11 +21,16 @@ import { StartFlowDialog } from "./StartFlowDialog";
 type FlowType = "feature" | "release" | "hotfix";
 
 export function GitflowPanel() {
-  const { gitflowStatus: status, gitflowIsLoading: isLoading, gitflowError: error, refreshGitflow: refresh, clearGitflowError: clearError } =
-    useGitflowStore();
+  const {
+    gitflowStatus: status,
+    gitflowIsLoading: isLoading,
+    gitflowError: error,
+    refreshGitflow: refresh,
+    clearGitflowError: clearError,
+  } = useGitflowStore();
   const { abortGitflow: abort, isBusy: machineIsBusy } = useGitflowWorkflow();
   const { openBlade } = useBladeNavigation();
-  const branches = useBranchStore((s) => s.branchList);
+  const _branches = useBranchStore((s) => s.branchList);
   const [showStartDialog, setShowStartDialog] = useState<FlowType | null>(null);
   const [showFinishDialog, setShowFinishDialog] = useState<FlowType | null>(
     null,
@@ -25,7 +40,7 @@ export function GitflowPanel() {
   // Refresh gitflow status when branches change (includes checkout, create, delete)
   useEffect(() => {
     refresh();
-  }, [refresh, branches]);
+  }, [refresh]);
 
   if (!status) {
     return (
@@ -205,7 +220,9 @@ export function GitflowPanel() {
       <div className="pt-1.5 border-t border-ctp-surface0">
         <button
           type="button"
-          onClick={() => openBlade("gitflow-cheatsheet", {} as Record<string, never>)}
+          onClick={() =>
+            openBlade("gitflow-cheatsheet", {} as Record<string, never>)
+          }
           className="w-full flex items-center gap-2 px-2.5 py-1.5 text-sm text-left rounded hover:bg-ctp-surface0 transition-colors text-ctp-subtext1"
         >
           <BookOpen className="w-3.5 h-3.5" />
diff --git a/src/extensions/gitflow/components/InitGitflowDialog.tsx b/src/extensions/gitflow/components/InitGitflowDialog.tsx
index 22fa6627..ff39c0f7 100644
--- a/src/extensions/gitflow/components/InitGitflowDialog.tsx
+++ b/src/extensions/gitflow/components/InitGitflowDialog.tsx
@@ -1,11 +1,13 @@
 import { AlertTriangle, X } from "lucide-react";
 import { useState } from "react";
-import type { GitflowConfig } from "../../../bindings";
 import { cn } from "@/framework/lib/utils";
-import { useGitOpsStore as useBranchStore } from "../../../core/stores/domain/git-ops";
-import { useGitOpsStore as useGitflowStore } from "../../../core/stores/domain/git-ops";
-import { useGitOpsStore as useRepositoryStore } from "../../../core/stores/domain/git-ops";
 import { toast } from "@/framework/stores/toast";
+import type { GitflowConfig } from "../../../bindings";
+import {
+  useGitOpsStore as useBranchStore,
+  useGitOpsStore as useGitflowStore,
+  useGitOpsStore as useRepositoryStore,
+} from "../../../core/stores/domain/git-ops";
 
 interface InitGitflowDialogProps {
   open: boolean;
@@ -16,8 +18,13 @@ export function InitGitflowDialog({
   open,
   onOpenChange,
 }: InitGitflowDialogProps) {
-  const { gitflowStatus: status, initGitflow, gitflowIsLoading: isLoading, gitflowError: error, clearGitflowError: clearError } =
-    useGitflowStore();
+  const {
+    gitflowStatus: status,
+    initGitflow,
+    gitflowIsLoading: isLoading,
+    gitflowError: error,
+    clearGitflowError: clearError,
+  } = useGitflowStore();
   const { loadBranches } = useBranchStore();
   const { refreshRepoStatus: refreshStatus } = useRepositoryStore();
 
diff --git a/src/extensions/gitflow/components/ReviewChecklist.tsx b/src/extensions/gitflow/components/ReviewChecklist.tsx
index ed868bf9..a0095ac3 100644
--- a/src/extensions/gitflow/components/ReviewChecklist.tsx
+++ b/src/extensions/gitflow/components/ReviewChecklist.tsx
@@ -1,7 +1,7 @@
 import { ClipboardCheck } from "lucide-react";
 import { useEffect, useState } from "react";
-import type { FlowType } from "../../../core/stores/domain/preferences/review-checklist.slice";
 import { usePreferencesStore as useReviewChecklistStore } from "../../../core/stores/domain/preferences";
+import type { FlowType } from "../../../core/stores/domain/preferences/review-checklist.slice";
 
 interface ReviewChecklistProps {
   flowType: FlowType;
@@ -17,7 +17,7 @@ export function ReviewChecklist({ flowType }: ReviewChecklistProps) {
   useEffect(() => {
     setChecked({});
     setCollapsed(false);
-  }, [flowType]);
+  }, []);
 
   if (items.length === 0) return null;
 
diff --git a/src/extensions/gitflow/components/StartFlowDialog.tsx b/src/extensions/gitflow/components/StartFlowDialog.tsx
index 0dd9bdab..9977e5fe 100644
--- a/src/extensions/gitflow/components/StartFlowDialog.tsx
+++ b/src/extensions/gitflow/components/StartFlowDialog.tsx
@@ -76,7 +76,6 @@ export function StartFlowDialog({ flowType, onClose }: StartFlowDialogProps) {
               }}
               placeholder={placeholder}
               className="w-full px-3 py-2 bg-ctp-surface0 border border-ctp-surface1 rounded text-sm focus:outline-none focus:border-ctp-blue focus:ring-1 focus:ring-ctp-blue"
-              autoFocus
             />
             <p className="text-xs text-ctp-overlay0 mt-1.5">
               Branch will be created as{" "}
diff --git a/src/extensions/gitflow/hooks/useGitflowWorkflow.ts b/src/extensions/gitflow/hooks/useGitflowWorkflow.ts
index 88fd91a7..335889ac 100644
--- a/src/extensions/gitflow/hooks/useGitflowWorkflow.ts
+++ b/src/extensions/gitflow/hooks/useGitflowWorkflow.ts
@@ -1,17 +1,17 @@
 import { useSelector } from "@xstate/react";
 import { getGitflowActor } from "../machines/context";
 import {
-  selectGitflowState,
-  selectOperation,
-  selectPhase,
-  selectGitflowResult,
   selectGitflowError,
-  selectRefreshErrors,
-  selectIsExecuting,
+  selectGitflowResult,
+  selectGitflowState,
   selectIsAborting,
+  selectIsBusy,
+  selectIsExecuting,
   selectIsRefreshing,
   selectIsStale,
-  selectIsBusy,
+  selectOperation,
+  selectPhase,
+  selectRefreshErrors,
 } from "../machines/selectors";
 import type { GitflowOp } from "../machines/types";
 
diff --git a/src/extensions/gitflow/index.ts b/src/extensions/gitflow/index.ts
index 6bbc1de4..dac03a20 100644
--- a/src/extensions/gitflow/index.ts
+++ b/src/extensions/gitflow/index.ts
@@ -1,5 +1,5 @@
-import { lazy } from "react";
 import { GitBranch, GitMerge } from "lucide-react";
+import { lazy } from "react";
 import type { ExtensionAPI } from "@/framework/extension-system/ExtensionAPI";
 import { openBlade } from "@/framework/layout/bladeOpener";
 import { useGitOpsStore as useRepositoryStore } from "../../core/stores/domain/git-ops";
@@ -10,7 +10,7 @@ export async function onActivate(api: ExtensionAPI): Promise<void> {
   const GitflowCheatsheetBlade = lazy(() =>
     import("./blades/GitflowCheatsheetBlade").then((m) => ({
       default: m.GitflowCheatsheetBlade,
-    }))
+    })),
   );
 
   // Register blade type with coreOverride to preserve existing blade type name
@@ -53,7 +53,14 @@ export async function onActivate(api: ExtensionAPI): Promise<void> {
     description: "Open the Gitflow workflow guide",
     category: "Navigation",
     icon: GitBranch,
-    keywords: ["gitflow", "workflow", "guide", "branching", "reference", "cheatsheet"],
+    keywords: [
+      "gitflow",
+      "workflow",
+      "guide",
+      "branching",
+      "reference",
+      "cheatsheet",
+    ],
     action: () => {
       openBlade("gitflow-cheatsheet", {} as Record<string, never>);
     },
diff --git a/src/extensions/gitflow/machines/actors.ts b/src/extensions/gitflow/machines/actors.ts
index a2a7a869..0b9871c2 100644
--- a/src/extensions/gitflow/machines/actors.ts
+++ b/src/extensions/gitflow/machines/actors.ts
@@ -37,9 +37,7 @@ export const executeGitflowOp = fromPromise<string | null, ExecuteGitflowInput>(
       return result.data;
     }
     const fn =
-      operation === "release"
-        ? commands.finishRelease
-        : commands.finishHotfix;
+      operation === "release" ? commands.finishRelease : commands.finishHotfix;
     const result = await fn(tagMessage ?? null);
     if (result.status === "error") {
       throw new Error(getErrorMessage(result.error));
diff --git a/src/extensions/gitflow/machines/context.ts b/src/extensions/gitflow/machines/context.ts
index 8422d401..7b659ee2 100644
--- a/src/extensions/gitflow/machines/context.ts
+++ b/src/extensions/gitflow/machines/context.ts
@@ -1,4 +1,4 @@
-import { createActor, type ActorRefFrom } from "xstate";
+import { type ActorRefFrom, createActor } from "xstate";
 import { gitflowMachine } from "./gitflowMachine";
 
 export type GitflowActorRef = ActorRefFrom<typeof gitflowMachine>;
diff --git a/src/extensions/gitflow/machines/gitflowMachine.ts b/src/extensions/gitflow/machines/gitflowMachine.ts
index 08500127..cf53835a 100644
--- a/src/extensions/gitflow/machines/gitflowMachine.ts
+++ b/src/extensions/gitflow/machines/gitflowMachine.ts
@@ -1,6 +1,6 @@
-import { setup, assign } from "xstate";
+import { assign, setup } from "xstate";
+import { abortGitflowOp, executeGitflowOp, refreshAll } from "./actors";
 import type { GitflowContext, GitflowEvent } from "./types";
-import { executeGitflowOp, abortGitflowOp, refreshAll } from "./actors";
 
 export const gitflowMachine = setup({
   types: {
@@ -100,9 +100,10 @@ export const gitflowMachine = setup({
         onError: {
           target: "error",
           actions: assign(({ event }) => ({
-            error: event.error instanceof Error
-              ? event.error.message
-              : "Unknown error",
+            error:
+              event.error instanceof Error
+                ? event.error.message
+                : "Unknown error",
           })),
         },
       },
@@ -114,9 +115,10 @@ export const gitflowMachine = setup({
         onError: {
           target: "error",
           actions: assign(({ event }) => ({
-            error: event.error instanceof Error
-              ? event.error.message
-              : "Unknown error",
+            error:
+              event.error instanceof Error
+                ? event.error.message
+                : "Unknown error",
           })),
         },
       },
diff --git a/src/extensions/gitflow/machines/index.ts b/src/extensions/gitflow/machines/index.ts
index eedefa97..3d24b87b 100644
--- a/src/extensions/gitflow/machines/index.ts
+++ b/src/extensions/gitflow/machines/index.ts
@@ -1,22 +1,22 @@
+export { type GitflowActorRef, getGitflowActor } from "./context";
 export { gitflowMachine } from "./gitflowMachine";
-export { getGitflowActor, type GitflowActorRef } from "./context";
 export {
-  selectGitflowState,
-  selectOperation,
-  selectPhase,
-  selectGitflowResult,
   selectGitflowError,
-  selectRefreshErrors,
-  selectIsExecuting,
+  selectGitflowResult,
+  selectGitflowState,
   selectIsAborting,
+  selectIsBusy,
+  selectIsExecuting,
   selectIsRefreshing,
   selectIsStale,
-  selectIsBusy,
+  selectOperation,
+  selectPhase,
+  selectRefreshErrors,
 } from "./selectors";
 export type {
   GitflowContext,
   GitflowEvent,
-  GitflowState,
   GitflowOp,
   GitflowPhase,
+  GitflowState,
 } from "./types";
diff --git a/src/extensions/gitflow/machines/selectors.ts b/src/extensions/gitflow/machines/selectors.ts
index 8ca881ef..8af6caa9 100644
--- a/src/extensions/gitflow/machines/selectors.ts
+++ b/src/extensions/gitflow/machines/selectors.ts
@@ -13,8 +13,7 @@ export const selectPhase = (snap: GitflowSnapshot) => snap.context.phase;
 export const selectGitflowResult = (snap: GitflowSnapshot) =>
   snap.context.result;
 
-export const selectGitflowError = (snap: GitflowSnapshot) =>
-  snap.context.error;
+export const selectGitflowError = (snap: GitflowSnapshot) => snap.context.error;
 
 export const selectRefreshErrors = (snap: GitflowSnapshot) =>
   snap.context.refreshErrors;
@@ -28,8 +27,7 @@ export const selectIsAborting = (snap: GitflowSnapshot) =>
 export const selectIsRefreshing = (snap: GitflowSnapshot) =>
   snap.matches("refreshing");
 
-export const selectIsStale = (snap: GitflowSnapshot) =>
-  snap.matches("stale");
+export const selectIsStale = (snap: GitflowSnapshot) => snap.matches("stale");
 
 export const selectIsBusy = (snap: GitflowSnapshot) =>
   snap.matches("executing") ||
diff --git a/src/extensions/gitflow/manifest.json b/src/extensions/gitflow/manifest.json
index 436d83e4..2fcd9f51 100644
--- a/src/extensions/gitflow/manifest.json
+++ b/src/extensions/gitflow/manifest.json
@@ -7,13 +7,26 @@
   "main": "index.ts",
   "contributes": {
     "blades": [
-      { "type": "gitflow-cheatsheet", "title": "Gitflow Guide", "singleton": true }
+      {
+        "type": "gitflow-cheatsheet",
+        "title": "Gitflow Guide",
+        "singleton": true
+      }
     ],
     "commands": [
-      { "id": "open-gitflow-cheatsheet", "title": "Gitflow Cheatsheet", "category": "Navigation" }
+      {
+        "id": "open-gitflow-cheatsheet",
+        "title": "Gitflow Cheatsheet",
+        "category": "Navigation"
+      }
     ],
     "toolbar": [
-      { "id": "gitflow-guide", "label": "Gitflow Guide", "group": "views", "priority": 50 }
+      {
+        "id": "gitflow-guide",
+        "label": "Gitflow Guide",
+        "group": "views",
+        "priority": 50
+      }
     ],
     "sidebarPanels": [
       { "id": "gitflow-panel", "title": "Gitflow", "defaultOpen": false }
diff --git a/src/extensions/github/blades/CreatePullRequestBlade.tsx b/src/extensions/github/blades/CreatePullRequestBlade.tsx
index 9a08a89d..4ee5f6e4 100644
--- a/src/extensions/github/blades/CreatePullRequestBlade.tsx
+++ b/src/extensions/github/blades/CreatePullRequestBlade.tsx
@@ -1,10 +1,10 @@
-import { useState, useEffect } from "react";
 import { GitPullRequestCreate } from "lucide-react";
+import { useEffect, useState } from "react";
 import { commands } from "../../../bindings";
 import { Button } from "../../../core/components/ui/button";
+import { useGitOpsStore as useRepositoryStore } from "../../../core/stores/domain/git-ops";
 import { ToggleSwitch } from "../components/ToggleSwitch";
 import { useCreatePullRequest } from "../hooks/useGitHubMutation";
-import { useGitOpsStore as useRepositoryStore } from "../../../core/stores/domain/git-ops";
 
 interface CreatePullRequestBladeProps {
   owner: string;
@@ -21,8 +21,13 @@ function branchToTitle(branch: string): string {
   return stripped.charAt(0).toUpperCase() + stripped.slice(1);
 }
 
-export function CreatePullRequestBlade({ owner, repo }: CreatePullRequestBladeProps) {
-  const currentBranch = useRepositoryStore((s) => s.repoStatus?.branchName ?? "");
+export function CreatePullRequestBlade({
+  owner,
+  repo,
+}: CreatePullRequestBladeProps) {
+  const currentBranch = useRepositoryStore(
+    (s) => s.repoStatus?.branchName ?? "",
+  );
 
   const [title, setTitle] = useState("");
   const [base, setBase] = useState("main");
@@ -58,11 +63,14 @@ export function CreatePullRequestBlade({ owner, repo }: CreatePullRequestBladePr
     }
 
     loadBranchInfo();
-    return () => { cancelled = true; };
+    return () => {
+      cancelled = true;
+    };
   }, [currentBranch]);
 
   const isSameBranch = currentBranch === base;
-  const canSubmit = title.trim().length > 0 && !isSameBranch && !mutation.isPending;
+  const canSubmit =
+    title.trim().length > 0 && !isSameBranch && !mutation.isPending;
 
   const handleSubmit = (e: React.FormEvent) => {
     e.preventDefault();
@@ -105,7 +113,10 @@ export function CreatePullRequestBlade({ owner, repo }: CreatePullRequestBladePr
 
         {/* Title */}
         <div>
-          <label htmlFor="pr-title" className="block text-xs font-medium text-ctp-subtext1 mb-1">
+          <label
+            htmlFor="pr-title"
+            className="block text-xs font-medium text-ctp-subtext1 mb-1"
+          >
             Title
           </label>
           <input
@@ -113,7 +124,6 @@ export function CreatePullRequestBlade({ owner, repo }: CreatePullRequestBladePr
             type="text"
             value={title}
             onChange={(e) => setTitle(e.target.value)}
-            autoFocus
             required
             disabled={isLoadingInfo}
             className="w-full bg-ctp-mantle border border-ctp-surface1 rounded px-3 py-2 text-sm text-ctp-text placeholder:text-ctp-overlay0 focus:outline-none focus:border-ctp-blue"
@@ -123,7 +133,10 @@ export function CreatePullRequestBlade({ owner, repo }: CreatePullRequestBladePr
 
         {/* Description */}
         <div>
-          <label htmlFor="pr-body" className="block text-xs font-medium text-ctp-subtext1 mb-1">
+          <label
+            htmlFor="pr-body"
+            className="block text-xs font-medium text-ctp-subtext1 mb-1"
+          >
             Description
           </label>
           <textarea
diff --git a/src/extensions/github/blades/GitHubAccountBlade.tsx b/src/extensions/github/blades/GitHubAccountBlade.tsx
index 9ed83ee1..5ea7edb1 100644
--- a/src/extensions/github/blades/GitHubAccountBlade.tsx
+++ b/src/extensions/github/blades/GitHubAccountBlade.tsx
@@ -6,12 +6,12 @@
  * When not authenticated, shows an empty state with sign-in button.
  */
 
+import { ExternalLink, Github, LogOut, UserCircle } from "lucide-react";
 import { useEffect } from "react";
-import { Github, LogOut, UserCircle, ExternalLink } from "lucide-react";
-import { Button } from "../../../core/components/ui/button";
 import { openBlade } from "@/framework/layout/bladeOpener";
-import { useGitHubStore } from "../githubStore";
+import { Button } from "../../../core/components/ui/button";
 import { RateLimitBar } from "../components/RateLimitBar";
+import { useGitHubStore } from "../githubStore";
 
 export function GitHubAccountBlade() {
   const isAuthenticated = useGitHubStore((s) => s.isAuthenticated);
@@ -37,7 +37,8 @@ export function GitHubAccountBlade() {
         <Github className="w-12 h-12 text-ctp-overlay1" />
         <h3 className="text-lg font-medium text-ctp-text">Not signed in</h3>
         <p className="text-sm text-ctp-subtext0 max-w-xs">
-          Sign in to GitHub to access repositories, view rate limits, and manage your account.
+          Sign in to GitHub to access repositories, view rate limits, and manage
+          your account.
         </p>
         <Button
           variant="default"
@@ -65,8 +66,10 @@ export function GitHubAccountBlade() {
                 const parent = (e.target as HTMLImageElement).parentElement;
                 if (parent) {
                   const fallback = document.createElement("div");
-                  fallback.className = "w-14 h-14 rounded-full bg-ctp-surface0 flex items-center justify-center";
-                  fallback.innerHTML = '<svg xmlns="http://www.w3.org/2000/svg" width="28" height="28" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="text-ctp-overlay1"><path d="M18 20a6 6 0 0 0-12 0"/><circle cx="12" cy="10" r="4"/><circle cx="12" cy="12" r="10"/></svg>';
+                  fallback.className =
+                    "w-14 h-14 rounded-full bg-ctp-surface0 flex items-center justify-center";
+                  fallback.innerHTML =
+                    '<svg xmlns="http://www.w3.org/2000/svg" width="28" height="28" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="text-ctp-overlay1"><path d="M18 20a6 6 0 0 0-12 0"/><circle cx="12" cy="10" r="4"/><circle cx="12" cy="12" r="10"/></svg>';
                   parent.insertBefore(fallback, e.target as HTMLImageElement);
                 }
               }}
@@ -148,10 +151,17 @@ export function GitHubAccountBlade() {
                   onClick={async (e) => {
                     e.preventDefault();
                     try {
-                      const { openUrl } = await import("@tauri-apps/plugin-opener");
-                      await openUrl(`https://github.com/${remote.owner}/${remote.repo}`);
+                      const { openUrl } = await import(
+                        "@tauri-apps/plugin-opener"
+                      );
+                      await openUrl(
+                        `https://github.com/${remote.owner}/${remote.repo}`,
+                      );
                     } catch {
-                      window.open(`https://github.com/${remote.owner}/${remote.repo}`, "_blank");
+                      window.open(
+                        `https://github.com/${remote.owner}/${remote.repo}`,
+                        "_blank",
+                      );
                     }
                   }}
                 >
diff --git a/src/extensions/github/blades/GitHubAuthBlade.tsx b/src/extensions/github/blades/GitHubAuthBlade.tsx
index 2c89dcc5..d6ae4925 100644
--- a/src/extensions/github/blades/GitHubAuthBlade.tsx
+++ b/src/extensions/github/blades/GitHubAuthBlade.tsx
@@ -8,17 +8,17 @@
  * 4. Error state with retry
  */
 
-import { useEffect, useRef, useState } from "react";
 import { motion } from "framer-motion";
-import { Check, AlertTriangle, Github } from "lucide-react";
+import { AlertTriangle, Check, Github } from "lucide-react";
+import { useEffect, useRef, useState } from "react";
+import { cn } from "@/framework/lib/utils";
 import { Button } from "../../../core/components/ui/button";
 import { useBladeNavigation } from "../../../core/hooks/useBladeNavigation";
+import { DeviceCodeDisplay } from "../components/DeviceCodeDisplay";
+import { ScopeSelector } from "../components/ScopeSelector";
 import { useGitHubStore } from "../githubStore";
-import { SCOPE_PROFILES } from "../types";
 import type { AuthStep } from "../types";
-import { ScopeSelector } from "../components/ScopeSelector";
-import { DeviceCodeDisplay } from "../components/DeviceCodeDisplay";
-import { cn } from "@/framework/lib/utils";
+import { SCOPE_PROFILES } from "../types";
 
 const STEP_LABELS = ["Permissions", "Authorize", "Done"];
 
@@ -43,17 +43,21 @@ function StepIndicator({ currentStep }: { currentStep: number }) {
             <span
               className={cn(
                 "text-xs",
-                i === currentStep ? "text-ctp-text font-medium" : "text-ctp-overlay0",
+                i === currentStep
+                  ? "text-ctp-text font-medium"
+                  : "text-ctp-overlay0",
               )}
             >
               {label}
             </span>
           </div>
           {i < STEP_LABELS.length - 1 && (
-            <div className={cn(
-              "w-8 h-px",
-              i < currentStep ? "bg-ctp-green" : "bg-ctp-surface1",
-            )} />
+            <div
+              className={cn(
+                "w-8 h-px",
+                i < currentStep ? "bg-ctp-green" : "bg-ctp-surface1",
+              )}
+            />
           )}
         </div>
       ))}
@@ -98,9 +102,7 @@ export function GitHubAuthBlade() {
   const handleContinue = () => {
     const profile = SCOPE_PROFILES.find((p) => p.id === selectedProfile);
     const selectedScopes =
-      selectedProfile === "custom"
-        ? customScopes
-        : profile?.scopes ?? [];
+      selectedProfile === "custom" ? customScopes : (profile?.scopes ?? []);
 
     if (selectedScopes.length === 0) return;
     startDeviceFlow(selectedScopes);
@@ -124,7 +126,9 @@ export function GitHubAuthBlade() {
       <div className="px-6 pt-4 pb-0">
         <div className="flex items-center gap-3 mb-4">
           <Github className="w-6 h-6 text-ctp-text" />
-          <h2 className="text-lg font-semibold text-ctp-text">Sign in to GitHub</h2>
+          <h2 className="text-lg font-semibold text-ctp-text">
+            Sign in to GitHub
+          </h2>
         </div>
         <StepIndicator currentStep={stepIndex[authStep]} />
       </div>
@@ -139,7 +143,8 @@ export function GitHubAuthBlade() {
                 Choose permissions
               </h3>
               <p className="text-xs text-ctp-subtext0">
-                Select the access level FlowForge should have for your GitHub account.
+                Select the access level FlowForge should have for your GitHub
+                account.
               </p>
             </div>
 
@@ -234,11 +239,7 @@ export function GitHubAuthBlade() {
             <AlertTriangle className="w-12 h-12 text-ctp-red" />
             <p className="text-sm text-ctp-red text-center">{authError}</p>
             <div className="flex gap-3">
-              <Button
-                variant="outline"
-                size="sm"
-                onClick={cancelAuth}
-              >
+              <Button variant="outline" size="sm" onClick={cancelAuth}>
                 Try Again
               </Button>
             </div>
diff --git a/src/extensions/github/blades/IssueDetailBlade.tsx b/src/extensions/github/blades/IssueDetailBlade.tsx
index 9d7cbfd7..644f7bfb 100644
--- a/src/extensions/github/blades/IssueDetailBlade.tsx
+++ b/src/extensions/github/blades/IssueDetailBlade.tsx
@@ -7,15 +7,15 @@
  */
 
 import { ExternalLink } from "lucide-react";
-import { useIssueDetail } from "../hooks/useGitHubQuery";
 import { BladeContentError } from "../../../core/blades/_shared/BladeContentError";
 import { BladeContentLoading } from "../../../core/blades/_shared/BladeContentLoading";
 import { MarkdownRenderer } from "../../../core/components/markdown/MarkdownRenderer";
-import { StatusBadge } from "../components/StatusBadge";
+import { CommentCard } from "../components/CommentCard";
 import { LabelPill } from "../components/LabelPill";
-import { UserAvatar } from "../components/UserAvatar";
+import { StatusBadge } from "../components/StatusBadge";
 import { TimeAgo } from "../components/TimeAgo";
-import { CommentCard } from "../components/CommentCard";
+import { UserAvatar } from "../components/UserAvatar";
+import { useIssueDetail } from "../hooks/useGitHubQuery";
 
 interface IssueDetailBladeProps {
   owner: string;
@@ -23,8 +23,16 @@ interface IssueDetailBladeProps {
   number: number;
 }
 
-export function IssueDetailBlade({ owner, repo, number }: IssueDetailBladeProps) {
-  const { data, isLoading, error, refetch } = useIssueDetail(owner, repo, number);
+export function IssueDetailBlade({
+  owner,
+  repo,
+  number,
+}: IssueDetailBladeProps) {
+  const { data, isLoading, error, refetch } = useIssueDetail(
+    owner,
+    repo,
+    number,
+  );
 
   if (isLoading) return <BladeContentLoading />;
 
@@ -56,7 +64,11 @@ export function IssueDetailBlade({ owner, repo, number }: IssueDetailBladeProps)
         {data.labels.length > 0 && (
           <div className="flex flex-wrap gap-1 mt-2">
             {data.labels.map((label) => (
-              <LabelPill key={label.name} name={label.name} color={label.color} />
+              <LabelPill
+                key={label.name}
+                name={label.name}
+                color={label.color}
+              />
             ))}
           </div>
         )}
@@ -73,7 +85,9 @@ export function IssueDetailBlade({ owner, repo, number }: IssueDetailBladeProps)
                     avatarUrl={assignee.avatarUrl}
                     size="sm"
                   />
-                  <span className="text-xs text-ctp-subtext1">{assignee.login}</span>
+                  <span className="text-xs text-ctp-subtext1">
+                    {assignee.login}
+                  </span>
                 </div>
               ))}
             </div>
@@ -96,7 +110,9 @@ export function IssueDetailBlade({ owner, repo, number }: IssueDetailBladeProps)
         {data.body ? (
           <MarkdownRenderer content={data.body} />
         ) : (
-          <p className="text-sm text-ctp-overlay0 italic">No description provided.</p>
+          <p className="text-sm text-ctp-overlay0 italic">
+            No description provided.
+          </p>
         )}
       </div>
 
diff --git a/src/extensions/github/blades/IssueListBlade.tsx b/src/extensions/github/blades/IssueListBlade.tsx
index f0253984..19b18dac 100644
--- a/src/extensions/github/blades/IssueListBlade.tsx
+++ b/src/extensions/github/blades/IssueListBlade.tsx
@@ -7,18 +7,18 @@
  * open/closed/all views. PRs are filtered out by the backend.
  */
 
+import { CircleDot, Loader2 } from "lucide-react";
 import { useState } from "react";
 import { Virtuoso } from "react-virtuoso";
-import { CircleDot, Loader2 } from "lucide-react";
-import { useGitHubStore } from "../githubStore";
-import { useIssueList } from "../hooks/useGitHubQuery";
-import { useBladeNavigation } from "../../../core/hooks/useBladeNavigation";
 import { BladeContentEmpty } from "../../../core/blades/_shared/BladeContentEmpty";
 import { BladeContentError } from "../../../core/blades/_shared/BladeContentError";
 import { BladeContentLoading } from "../../../core/blades/_shared/BladeContentLoading";
-import { StatusBadge } from "../components/StatusBadge";
+import { useBladeNavigation } from "../../../core/hooks/useBladeNavigation";
 import { LabelPill } from "../components/LabelPill";
+import { StatusBadge } from "../components/StatusBadge";
 import { TimeAgo } from "../components/TimeAgo";
+import { useGitHubStore } from "../githubStore";
+import { useIssueList } from "../hooks/useGitHubQuery";
 
 type StateFilter = "open" | "closed" | "all";
 
@@ -52,7 +52,9 @@ export function IssueListBlade() {
           <select
             value={selectedRemoteIndex}
             onChange={(e) =>
-              useGitHubStore.getState().setSelectedRemote(Number(e.target.value))
+              useGitHubStore
+                .getState()
+                .setSelectedRemote(Number(e.target.value))
             }
             className="w-full text-xs bg-ctp-surface0 text-ctp-text border border-ctp-surface1 rounded px-2 py-1"
           >
@@ -123,7 +125,9 @@ function IssueList({ owner, repo, state, onSelect }: IssueListInnerProps) {
     return (
       <BladeContentError
         message="Failed to load issues"
-        detail={query.error instanceof Error ? query.error.message : "Unknown error"}
+        detail={
+          query.error instanceof Error ? query.error.message : "Unknown error"
+        }
         onRetry={() => query.refetch()}
       />
     );
@@ -133,7 +137,7 @@ function IssueList({ owner, repo, state, onSelect }: IssueListInnerProps) {
     return (
       <BladeContentEmpty
         icon={CircleDot}
-        message={`No ${state === "all" ? "" : state + " "}issues`}
+        message={`No ${state === "all" ? "" : `${state} `}issues`}
       />
     );
   }
@@ -163,7 +167,11 @@ function IssueList({ owner, repo, state, onSelect }: IssueListInnerProps) {
                 <span>{issue.authorLogin}</span>
                 <TimeAgo date={issue.createdAt} />
                 {issue.labels.slice(0, 3).map((label) => (
-                  <LabelPill key={label.name} name={label.name} color={label.color} />
+                  <LabelPill
+                    key={label.name}
+                    name={label.name}
+                    color={label.color}
+                  />
                 ))}
                 {issue.assigneeLogins.length > 0 && (
                   <span className="text-ctp-subtext0 truncate">
diff --git a/src/extensions/github/blades/PullRequestDetailBlade.tsx b/src/extensions/github/blades/PullRequestDetailBlade.tsx
index 0ccd3e99..daeed5ee 100644
--- a/src/extensions/github/blades/PullRequestDetailBlade.tsx
+++ b/src/extensions/github/blades/PullRequestDetailBlade.tsx
@@ -6,19 +6,19 @@
  * Includes a link to open the PR on GitHub in an external browser.
  */
 
-import { useState, useEffect } from "react";
 import { ExternalLink, GitMerge } from "lucide-react";
-import { usePullRequestDetail } from "../hooks/useGitHubQuery";
-import { useMergePullRequest } from "../hooks/useGitHubMutation";
+import { useEffect, useState } from "react";
 import { BladeContentError } from "../../../core/blades/_shared/BladeContentError";
 import { BladeContentLoading } from "../../../core/blades/_shared/BladeContentLoading";
 import { MarkdownRenderer } from "../../../core/components/markdown/MarkdownRenderer";
 import { Button } from "../../../core/components/ui/button";
-import { StatusBadge } from "../components/StatusBadge";
-import { LabelPill } from "../components/LabelPill";
-import { TimeAgo } from "../components/TimeAgo";
 import { CommentCard } from "../components/CommentCard";
+import { LabelPill } from "../components/LabelPill";
 import { MergeConfirmDialog } from "../components/MergeConfirmDialog";
+import { StatusBadge } from "../components/StatusBadge";
+import { TimeAgo } from "../components/TimeAgo";
+import { useMergePullRequest } from "../hooks/useGitHubMutation";
+import { usePullRequestDetail } from "../hooks/useGitHubQuery";
 
 interface PullRequestDetailBladeProps {
   owner: string;
@@ -26,8 +26,16 @@ interface PullRequestDetailBladeProps {
   number: number;
 }
 
-export function PullRequestDetailBlade({ owner, repo, number }: PullRequestDetailBladeProps) {
-  const { data, isLoading, error, refetch } = usePullRequestDetail(owner, repo, number);
+export function PullRequestDetailBlade({
+  owner,
+  repo,
+  number,
+}: PullRequestDetailBladeProps) {
+  const { data, isLoading, error, refetch } = usePullRequestDetail(
+    owner,
+    repo,
+    number,
+  );
   const mergeMutation = useMergePullRequest(owner, repo);
   const [showMergeDialog, setShowMergeDialog] = useState(false);
 
@@ -58,7 +66,11 @@ export function PullRequestDetailBlade({ owner, repo, number }: PullRequestDetai
 
         {/* Status row */}
         <div className="flex items-center gap-2 mt-2">
-          <StatusBadge state={data.state} merged={data.merged} draft={data.draft} />
+          <StatusBadge
+            state={data.state}
+            merged={data.merged}
+            draft={data.draft}
+          />
           <span className="text-xs text-ctp-subtext0">#{number}</span>
           <span className="text-xs text-ctp-overlay0">{data.authorLogin}</span>
           <TimeAgo date={data.createdAt} />
@@ -87,7 +99,11 @@ export function PullRequestDetailBlade({ owner, repo, number }: PullRequestDetai
         {data.labels.length > 0 && (
           <div className="flex flex-wrap gap-1 mt-2">
             {data.labels.map((label) => (
-              <LabelPill key={label.name} name={label.name} color={label.color} />
+              <LabelPill
+                key={label.name}
+                name={label.name}
+                color={label.color}
+              />
             ))}
           </div>
         )}
@@ -112,7 +128,9 @@ export function PullRequestDetailBlade({ owner, repo, number }: PullRequestDetai
         {data.body ? (
           <MarkdownRenderer content={data.body} />
         ) : (
-          <p className="text-sm text-ctp-overlay0 italic">No description provided.</p>
+          <p className="text-sm text-ctp-overlay0 italic">
+            No description provided.
+          </p>
         )}
       </div>
 
diff --git a/src/extensions/github/blades/PullRequestListBlade.tsx b/src/extensions/github/blades/PullRequestListBlade.tsx
index a584feec..3e597577 100644
--- a/src/extensions/github/blades/PullRequestListBlade.tsx
+++ b/src/extensions/github/blades/PullRequestListBlade.tsx
@@ -7,18 +7,18 @@
  * open/closed/all views with stale-while-revalidate caching.
  */
 
+import { GitPullRequest, Loader2 } from "lucide-react";
 import { useState } from "react";
 import { Virtuoso } from "react-virtuoso";
-import { GitPullRequest, Loader2 } from "lucide-react";
-import { useGitHubStore } from "../githubStore";
-import { usePullRequestList } from "../hooks/useGitHubQuery";
-import { useBladeNavigation } from "../../../core/hooks/useBladeNavigation";
 import { BladeContentEmpty } from "../../../core/blades/_shared/BladeContentEmpty";
 import { BladeContentError } from "../../../core/blades/_shared/BladeContentError";
 import { BladeContentLoading } from "../../../core/blades/_shared/BladeContentLoading";
-import { StatusBadge } from "../components/StatusBadge";
+import { useBladeNavigation } from "../../../core/hooks/useBladeNavigation";
 import { LabelPill } from "../components/LabelPill";
+import { StatusBadge } from "../components/StatusBadge";
 import { TimeAgo } from "../components/TimeAgo";
+import { useGitHubStore } from "../githubStore";
+import { usePullRequestList } from "../hooks/useGitHubQuery";
 
 type StateFilter = "open" | "closed" | "all";
 
@@ -52,7 +52,9 @@ export function PullRequestListBlade() {
           <select
             value={selectedRemoteIndex}
             onChange={(e) =>
-              useGitHubStore.getState().setSelectedRemote(Number(e.target.value))
+              useGitHubStore
+                .getState()
+                .setSelectedRemote(Number(e.target.value))
             }
             className="w-full text-xs bg-ctp-surface0 text-ctp-text border border-ctp-surface1 rounded px-2 py-1"
           >
@@ -66,7 +68,11 @@ export function PullRequestListBlade() {
       )}
 
       {/* Filter tabs */}
-      <div className="px-3 py-2" role="tablist" aria-label="Pull request state filter">
+      <div
+        className="px-3 py-2"
+        role="tablist"
+        aria-label="Pull request state filter"
+      >
         <div className="flex gap-1 bg-ctp-mantle rounded-lg p-0.5">
           {FILTER_TABS.map((tab) => (
             <button
@@ -113,7 +119,12 @@ interface PullRequestListInnerProps {
   onSelect: (pr: { number: number; title: string }) => void;
 }
 
-function PullRequestList({ owner, repo, state, onSelect }: PullRequestListInnerProps) {
+function PullRequestList({
+  owner,
+  repo,
+  state,
+  onSelect,
+}: PullRequestListInnerProps) {
   const query = usePullRequestList(owner, repo, state);
   const prs = query.data?.pages.flatMap((p) => p.items) ?? [];
 
@@ -123,7 +134,9 @@ function PullRequestList({ owner, repo, state, onSelect }: PullRequestListInnerP
     return (
       <BladeContentError
         message="Failed to load pull requests"
-        detail={query.error instanceof Error ? query.error.message : "Unknown error"}
+        detail={
+          query.error instanceof Error ? query.error.message : "Unknown error"
+        }
         onRetry={() => query.refetch()}
       />
     );
@@ -133,7 +146,7 @@ function PullRequestList({ owner, repo, state, onSelect }: PullRequestListInnerP
     return (
       <BladeContentEmpty
         icon={GitPullRequest}
-        message={`No ${state === "all" ? "" : state + " "}pull requests`}
+        message={`No ${state === "all" ? "" : `${state} `}pull requests`}
       />
     );
   }
@@ -154,7 +167,11 @@ function PullRequestList({ owner, repo, state, onSelect }: PullRequestListInnerP
         >
           <div className="flex items-start gap-2">
             <div className="pt-0.5 shrink-0">
-              <StatusBadge state={pr.state} merged={pr.merged} draft={pr.draft} />
+              <StatusBadge
+                state={pr.state}
+                merged={pr.merged}
+                draft={pr.draft}
+              />
             </div>
             <div className="flex-1 min-w-0">
               <p className="text-sm text-ctp-text truncate">{pr.title}</p>
@@ -163,7 +180,11 @@ function PullRequestList({ owner, repo, state, onSelect }: PullRequestListInnerP
                 <span>{pr.authorLogin}</span>
                 <TimeAgo date={pr.createdAt} />
                 {pr.labels.slice(0, 3).map((label) => (
-                  <LabelPill key={label.name} name={label.name} color={label.color} />
+                  <LabelPill
+                    key={label.name}
+                    name={label.name}
+                    color={label.color}
+                  />
                 ))}
               </div>
             </div>
diff --git a/src/extensions/github/components/CommentCard.tsx b/src/extensions/github/components/CommentCard.tsx
index 4e1df04e..93360472 100644
--- a/src/extensions/github/components/CommentCard.tsx
+++ b/src/extensions/github/components/CommentCard.tsx
@@ -6,8 +6,8 @@
  */
 
 import { MarkdownRenderer } from "../../../core/components/markdown/MarkdownRenderer";
-import { UserAvatar } from "./UserAvatar";
 import { TimeAgo } from "./TimeAgo";
+import { UserAvatar } from "./UserAvatar";
 
 interface CommentCardProps {
   /** GitHub username of the comment author */
diff --git a/src/extensions/github/components/DeviceCodeDisplay.tsx b/src/extensions/github/components/DeviceCodeDisplay.tsx
index 491cf982..402f3f40 100644
--- a/src/extensions/github/components/DeviceCodeDisplay.tsx
+++ b/src/extensions/github/components/DeviceCodeDisplay.tsx
@@ -5,8 +5,8 @@
  * a countdown timer, and a polling spinner.
  */
 
-import { useEffect, useState } from "react";
 import { Check, Copy, ExternalLink, Loader2 } from "lucide-react";
+import { useEffect, useState } from "react";
 import { Button } from "../../../core/components/ui/button";
 
 interface DeviceCodeDisplayProps {
diff --git a/src/extensions/github/components/GitHubStatusButton.tsx b/src/extensions/github/components/GitHubStatusButton.tsx
index a73b7926..0254c339 100644
--- a/src/extensions/github/components/GitHubStatusButton.tsx
+++ b/src/extensions/github/components/GitHubStatusButton.tsx
@@ -9,9 +9,9 @@
  */
 
 import { Github } from "lucide-react";
+import { openBlade } from "@/framework/layout/bladeOpener";
 import { Button } from "../../../core/components/ui/button";
 import { ShortcutTooltip } from "../../../core/components/ui/ShortcutTooltip";
-import { openBlade } from "@/framework/layout/bladeOpener";
 import { useGitHubStore } from "../githubStore";
 
 interface GitHubStatusButtonProps {
diff --git a/src/extensions/github/components/MergeConfirmDialog.tsx b/src/extensions/github/components/MergeConfirmDialog.tsx
index b03fe67d..19400555 100644
--- a/src/extensions/github/components/MergeConfirmDialog.tsx
+++ b/src/extensions/github/components/MergeConfirmDialog.tsx
@@ -1,8 +1,17 @@
-import { useState, useEffect } from "react";
 import { AlertTriangle, GitMerge } from "lucide-react";
-import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogFooter } from "../../../core/components/ui/dialog";
+import { useEffect, useState } from "react";
 import { Button } from "../../../core/components/ui/button";
-import { MergeStrategySelector, type MergeMethod } from "./MergeStrategySelector";
+import {
+  Dialog,
+  DialogContent,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from "../../../core/components/ui/dialog";
+import {
+  type MergeMethod,
+  MergeStrategySelector,
+} from "./MergeStrategySelector";
 
 interface MergeConfirmDialogProps {
   open: boolean;
@@ -11,7 +20,11 @@ interface MergeConfirmDialogProps {
   prTitle: string;
   headRef: string;
   baseRef: string;
-  onMerge: (method: MergeMethod, commitTitle?: string, commitMessage?: string) => void;
+  onMerge: (
+    method: MergeMethod,
+    commitTitle?: string,
+    commitMessage?: string,
+  ) => void;
   isPending: boolean;
 }
 
diff --git a/src/extensions/github/components/MergeStrategySelector.tsx b/src/extensions/github/components/MergeStrategySelector.tsx
index dc800d30..e0d247ab 100644
--- a/src/extensions/github/components/MergeStrategySelector.tsx
+++ b/src/extensions/github/components/MergeStrategySelector.tsx
@@ -1,5 +1,5 @@
-import { GitBranch, GitMerge, Layers } from "lucide-react";
 import type { LucideIcon } from "lucide-react";
+import { GitBranch, GitMerge, Layers } from "lucide-react";
 import { cn } from "@/framework/lib/utils";
 
 export type MergeMethod = "merge" | "squash" | "rebase";
@@ -38,10 +38,16 @@ interface MergeStrategySelectorProps {
   disabled?: boolean;
 }
 
-export function MergeStrategySelector({ value, onChange, disabled }: MergeStrategySelectorProps) {
+export function MergeStrategySelector({
+  value,
+  onChange,
+  disabled,
+}: MergeStrategySelectorProps) {
   return (
-    <fieldset role="radiogroup" aria-label="Merge strategy" className="space-y-2">
-      <legend className="text-xs font-medium text-ctp-subtext1 mb-2">Merge method</legend>
+    <fieldset aria-label="Merge strategy" className="space-y-2">
+      <legend className="text-xs font-medium text-ctp-subtext1 mb-2">
+        Merge method
+      </legend>
       {strategies.map((strategy) => {
         const isSelected = value === strategy.value;
         const Icon = strategy.icon;
@@ -72,8 +78,12 @@ export function MergeStrategySelector({ value, onChange, disabled }: MergeStrate
               )}
             />
             <div className="min-w-0">
-              <div className="text-sm font-medium text-ctp-text">{strategy.label}</div>
-              <div className="text-xs text-ctp-overlay0 mt-0.5">{strategy.description}</div>
+              <div className="text-sm font-medium text-ctp-text">
+                {strategy.label}
+              </div>
+              <div className="text-xs text-ctp-overlay0 mt-0.5">
+                {strategy.description}
+              </div>
             </div>
           </label>
         );
diff --git a/src/extensions/github/components/RateLimitBar.tsx b/src/extensions/github/components/RateLimitBar.tsx
index dfb81dc8..1ae2894a 100644
--- a/src/extensions/github/components/RateLimitBar.tsx
+++ b/src/extensions/github/components/RateLimitBar.tsx
@@ -13,7 +13,12 @@ interface RateLimitBarProps {
   reset: number;
 }
 
-export function RateLimitBar({ label, remaining, limit, reset }: RateLimitBarProps) {
+export function RateLimitBar({
+  label,
+  remaining,
+  limit,
+  reset,
+}: RateLimitBarProps) {
   const pct = limit > 0 ? remaining / limit : 0;
   const widthPct = Math.max(0, Math.min(100, pct * 100));
 
@@ -38,13 +43,14 @@ export function RateLimitBar({ label, remaining, limit, reset }: RateLimitBarPro
       </div>
       <div className="w-full h-2 bg-ctp-surface0 rounded-full overflow-hidden">
         <div
-          className={cn("h-full rounded-full transition-all duration-300", barColor)}
+          className={cn(
+            "h-full rounded-full transition-all duration-300",
+            barColor,
+          )}
           style={{ width: `${widthPct}%` }}
         />
       </div>
-      <p className="text-xs text-ctp-overlay0">
-        Resets in {resetMinutes}min
-      </p>
+      <p className="text-xs text-ctp-overlay0">Resets in {resetMinutes}min</p>
     </div>
   );
 }
diff --git a/src/extensions/github/components/ScopeSelector.tsx b/src/extensions/github/components/ScopeSelector.tsx
index f916a2b7..72097b76 100644
--- a/src/extensions/github/components/ScopeSelector.tsx
+++ b/src/extensions/github/components/ScopeSelector.tsx
@@ -5,9 +5,9 @@
  * expandable custom scope checkbox section.
  */
 
-import { Eye, Shield, Settings } from "lucide-react";
-import { SCOPE_PROFILES, CUSTOM_SCOPES } from "../types";
+import { Eye, Settings, Shield } from "lucide-react";
 import { cn } from "@/framework/lib/utils";
+import { CUSTOM_SCOPES, SCOPE_PROFILES } from "../types";
 
 interface ScopeSelectorProps {
   selectedProfile: string;
@@ -61,14 +61,18 @@ export function ScopeSelector({
                   Recommended
                 </span>
               )}
-              <Icon className={cn(
-                "w-6 h-6",
-                isSelected ? "text-ctp-blue" : "text-ctp-overlay1",
-              )} />
-              <span className={cn(
-                "text-sm font-medium",
-                isSelected ? "text-ctp-blue" : "text-ctp-text",
-              )}>
+              <Icon
+                className={cn(
+                  "w-6 h-6",
+                  isSelected ? "text-ctp-blue" : "text-ctp-overlay1",
+                )}
+              />
+              <span
+                className={cn(
+                  "text-sm font-medium",
+                  isSelected ? "text-ctp-blue" : "text-ctp-text",
+                )}
+              >
                 {profile.name}
               </span>
               <span className="text-xs text-ctp-subtext0 text-center leading-tight">
diff --git a/src/extensions/github/components/StatusBadge.tsx b/src/extensions/github/components/StatusBadge.tsx
index 174fb605..d3706a7c 100644
--- a/src/extensions/github/components/StatusBadge.tsx
+++ b/src/extensions/github/components/StatusBadge.tsx
@@ -7,15 +7,15 @@
  * backgrounds for a subtle, consistent look.
  */
 
+import type { LucideIcon } from "lucide-react";
 import {
+  CheckCircle2,
+  CircleDot,
+  GitMerge,
   GitPullRequest,
   GitPullRequestClosed,
   GitPullRequestDraft,
-  GitMerge,
-  CircleDot,
-  CheckCircle2,
 } from "lucide-react";
-import type { LucideIcon } from "lucide-react";
 
 interface StatusBadgeProps {
   state: string;
@@ -31,7 +31,11 @@ interface BadgeConfig {
   text: string;
 }
 
-function resolvePrConfig(state: string, merged?: boolean, draft?: boolean): BadgeConfig {
+function resolvePrConfig(
+  state: string,
+  merged?: boolean,
+  draft?: boolean,
+): BadgeConfig {
   if (merged) {
     return {
       icon: GitMerge,
@@ -83,7 +87,12 @@ function resolveIssueConfig(state: string): BadgeConfig {
   };
 }
 
-export function StatusBadge({ state, merged, draft, type = "pr" }: StatusBadgeProps) {
+export function StatusBadge({
+  state,
+  merged,
+  draft,
+  type = "pr",
+}: StatusBadgeProps) {
   const config =
     type === "issue"
       ? resolveIssueConfig(state)
diff --git a/src/extensions/github/githubStore.ts b/src/extensions/github/githubStore.ts
index f9e61674..a729831e 100644
--- a/src/extensions/github/githubStore.ts
+++ b/src/extensions/github/githubStore.ts
@@ -9,9 +9,9 @@
 
 import { create } from "zustand";
 import { devtools } from "zustand/middleware";
-import { commands } from "../../bindings";
-import { toast } from "@/framework/stores/toast";
 import { openBlade } from "@/framework/layout/bladeOpener";
+import { toast } from "@/framework/stores/toast";
+import { commands } from "../../bindings";
 import type { AuthStep } from "./types";
 
 // Deduplication guard: prevents duplicate "Linked to" toast
@@ -114,7 +114,10 @@ export const useGitHubStore = create<GitHubState>()(
         try {
           const result = await commands.githubStartDeviceFlow(selectedScopes);
           if (result.status === "error") {
-            const errMsg = "message" in result.error ? result.error.message : result.error.type;
+            const errMsg =
+              "message" in result.error
+                ? result.error.message
+                : result.error.type;
             set(
               { authError: errMsg, authStep: "error", isAuthenticating: false },
               false,
@@ -158,7 +161,10 @@ export const useGitHubStore = create<GitHubState>()(
         if (!deviceCode) return;
 
         try {
-          const result = await commands.githubPollAuth(deviceCode, pollInterval);
+          const result = await commands.githubPollAuth(
+            deviceCode,
+            pollInterval,
+          );
 
           if (result.status === "error") {
             const err = result.error;
@@ -285,7 +291,10 @@ export const useGitHubStore = create<GitHubState>()(
         try {
           const result = await commands.githubSignOut();
           if (result.status === "error") {
-            const errMsg = "message" in result.error ? result.error.message : result.error.type;
+            const errMsg =
+              "message" in result.error
+                ? result.error.message
+                : result.error.type;
             toast.error(`Sign out failed: ${errMsg}`);
             return;
           }
@@ -311,7 +320,9 @@ export const useGitHubStore = create<GitHubState>()(
 
           toast.success("Signed out of GitHub");
         } catch (e) {
-          toast.error(`Sign out failed: ${e instanceof Error ? e.message : String(e)}`);
+          toast.error(
+            `Sign out failed: ${e instanceof Error ? e.message : String(e)}`,
+          );
         }
       },
 
@@ -346,11 +357,7 @@ export const useGitHubStore = create<GitHubState>()(
           const result = await commands.githubCheckRateLimit();
           if (result.status === "error") return;
 
-          set(
-            { rateLimit: result.data },
-            false,
-            "github/rate-limit-updated",
-          );
+          set({ rateLimit: result.data }, false, "github/rate-limit-updated");
 
           get().checkRateLimitWarning();
         } catch {
@@ -412,11 +419,19 @@ export const useGitHubStore = create<GitHubState>()(
 
       resetRemotes: () => {
         lastLinkedToastRepo = null;
-        set({ detectedRemotes: [], selectedRemoteIndex: 0 }, false, "github/reset-remotes");
+        set(
+          { detectedRemotes: [], selectedRemoteIndex: 0 },
+          false,
+          "github/reset-remotes",
+        );
       },
 
       setSelectedRemote: (index: number) => {
-        set({ selectedRemoteIndex: index }, false, "github/set-selected-remote");
+        set(
+          { selectedRemoteIndex: index },
+          false,
+          "github/set-selected-remote",
+        );
       },
     }),
     { name: "github-auth", enabled: import.meta.env.DEV },
diff --git a/src/extensions/github/hooks/useGitHubMutation.ts b/src/extensions/github/hooks/useGitHubMutation.ts
index d55fdc4d..470ae5bf 100644
--- a/src/extensions/github/hooks/useGitHubMutation.ts
+++ b/src/extensions/github/hooks/useGitHubMutation.ts
@@ -6,18 +6,24 @@
  */
 
 import { useMutation, useQueryClient } from "@tanstack/react-query";
-import { commands } from "../../../bindings";
 import { toast } from "@/framework/stores/toast";
+import { commands } from "../../../bindings";
 
 /**
  * Extract a human-readable error message from a GitHubError or unknown error.
  */
 function extractGitHubErrorMessage(error: unknown): string {
   if (error && typeof error === "object") {
-    if ("message" in error && typeof (error as Record<string, unknown>).message === "string") {
+    if (
+      "message" in error &&
+      typeof (error as Record<string, unknown>).message === "string"
+    ) {
       return (error as Record<string, string>).message;
     }
-    if ("type" in error && typeof (error as Record<string, unknown>).type === "string") {
+    if (
+      "type" in error &&
+      typeof (error as Record<string, unknown>).type === "string"
+    ) {
       return (error as Record<string, string>).type;
     }
   }
@@ -60,7 +66,13 @@ export function useMergePullRequest(owner: string, repo: string) {
     onSuccess: (_data, variables) => {
       toast.success(`Pull request #${variables.pullNumber} merged`);
       queryClient.invalidateQueries({
-        queryKey: ["ext:github", "pullRequest", owner, repo, variables.pullNumber],
+        queryKey: [
+          "ext:github",
+          "pullRequest",
+          owner,
+          repo,
+          variables.pullNumber,
+        ],
       });
       queryClient.invalidateQueries({
         queryKey: ["ext:github", "pullRequests", owner, repo],
diff --git a/src/extensions/github/hooks/useGitHubQuery.ts b/src/extensions/github/hooks/useGitHubQuery.ts
index 85a1a312..a058e493 100644
--- a/src/extensions/github/hooks/useGitHubQuery.ts
+++ b/src/extensions/github/hooks/useGitHubQuery.ts
@@ -11,7 +11,7 @@
  * Details use useQuery for single resource fetching.
  */
 
-import { useQuery, useInfiniteQuery } from "@tanstack/react-query";
+import { useInfiniteQuery, useQuery } from "@tanstack/react-query";
 import { commands } from "../../../bindings";
 
 const PER_PAGE = 30;
@@ -21,10 +21,16 @@ const PER_PAGE = 30;
  */
 function extractErrorMessage(error: unknown): string {
   if (error && typeof error === "object") {
-    if ("message" in error && typeof (error as Record<string, unknown>).message === "string") {
+    if (
+      "message" in error &&
+      typeof (error as Record<string, unknown>).message === "string"
+    ) {
       return (error as Record<string, string>).message;
     }
-    if ("type" in error && typeof (error as Record<string, unknown>).type === "string") {
+    if (
+      "type" in error &&
+      typeof (error as Record<string, unknown>).type === "string"
+    ) {
       return (error as Record<string, string>).type;
     }
   }
@@ -124,11 +130,7 @@ export function useIssueList(
 /**
  * Fetch detailed issue information including comments.
  */
-export function useIssueDetail(
-  owner: string,
-  repo: string,
-  number: number,
-) {
+export function useIssueDetail(owner: string, repo: string, number: number) {
   return useQuery({
     queryKey: ["ext:github", "issue", owner, repo, number],
     queryFn: async () => {
diff --git a/src/extensions/github/index.ts b/src/extensions/github/index.ts
index 8b985b55..339b06fd 100644
--- a/src/extensions/github/index.ts
+++ b/src/extensions/github/index.ts
@@ -6,14 +6,23 @@
  * GitHub-specific code in core UI files.
  */
 
+import {
+  CircleDot,
+  Github,
+  GitPullRequest,
+  GitPullRequestCreate,
+} from "lucide-react";
 import { createElement } from "react";
-import { Github, GitPullRequest, GitPullRequestCreate, CircleDot } from "lucide-react";
 import type { ExtensionAPI } from "@/framework/extension-system/ExtensionAPI";
-import { openBlade } from "@/framework/layout/bladeOpener";
-import { useGitHubStore, getSelectedRemote, cancelGitHubPolling } from "./githubStore";
-import { useGitOpsStore as useRepositoryStore } from "../../core/stores/domain/git-ops";
 import { useToolbarRegistry } from "@/framework/extension-system/toolbarRegistry";
+import { openBlade } from "@/framework/layout/bladeOpener";
 import { queryClient } from "../../core/lib/queryClient";
+import { useGitOpsStore as useRepositoryStore } from "../../core/stores/domain/git-ops";
+import {
+  cancelGitHubPolling,
+  getSelectedRemote,
+  useGitHubStore,
+} from "./githubStore";
 
 // Module-level unsubscribes for store listeners
 let unsubRepoWatch: (() => void) | null = null;
@@ -157,9 +166,15 @@ export async function onActivate(api: ExtensionAPI): Promise<void> {
     icon: GitPullRequest,
     action: () => {
       const remote = getSelectedRemote();
-      if (remote) openBlade("ext:github:pull-requests", { owner: remote.owner, repo: remote.repo });
+      if (remote)
+        openBlade("ext:github:pull-requests", {
+          owner: remote.owner,
+          repo: remote.repo,
+        });
     },
-    enabled: () => useGitHubStore.getState().isAuthenticated && useGitHubStore.getState().detectedRemotes.length > 0,
+    enabled: () =>
+      useGitHubStore.getState().isAuthenticated &&
+      useGitHubStore.getState().detectedRemotes.length > 0,
   });
 
   api.registerCommand({
@@ -169,9 +184,15 @@ export async function onActivate(api: ExtensionAPI): Promise<void> {
     icon: CircleDot,
     action: () => {
       const remote = getSelectedRemote();
-      if (remote) openBlade("ext:github:issues", { owner: remote.owner, repo: remote.repo });
+      if (remote)
+        openBlade("ext:github:issues", {
+          owner: remote.owner,
+          repo: remote.repo,
+        });
     },
-    enabled: () => useGitHubStore.getState().isAuthenticated && useGitHubStore.getState().detectedRemotes.length > 0,
+    enabled: () =>
+      useGitHubStore.getState().isAuthenticated &&
+      useGitHubStore.getState().detectedRemotes.length > 0,
   });
 
   api.registerCommand({
@@ -181,7 +202,11 @@ export async function onActivate(api: ExtensionAPI): Promise<void> {
     icon: GitPullRequestCreate,
     action: () => {
       const remote = getSelectedRemote();
-      if (remote) openBlade("ext:github:create-pr", { owner: remote.owner, repo: remote.repo });
+      if (remote)
+        openBlade("ext:github:create-pr", {
+          owner: remote.owner,
+          repo: remote.repo,
+        });
     },
     enabled: () => {
       const gh = useGitHubStore.getState();
@@ -221,7 +246,11 @@ export async function onActivate(api: ExtensionAPI): Promise<void> {
     },
     execute: () => {
       const remote = getSelectedRemote();
-      if (remote) openBlade("ext:github:pull-requests", { owner: remote.owner, repo: remote.repo });
+      if (remote)
+        openBlade("ext:github:pull-requests", {
+          owner: remote.owner,
+          repo: remote.repo,
+        });
     },
   });
 
@@ -237,7 +266,11 @@ export async function onActivate(api: ExtensionAPI): Promise<void> {
     },
     execute: () => {
       const remote = getSelectedRemote();
-      if (remote) openBlade("ext:github:issues", { owner: remote.owner, repo: remote.repo });
+      if (remote)
+        openBlade("ext:github:issues", {
+          owner: remote.owner,
+          repo: remote.repo,
+        });
     },
   });
 
@@ -250,11 +283,19 @@ export async function onActivate(api: ExtensionAPI): Promise<void> {
     when: () => {
       const { isAuthenticated, detectedRemotes } = useGitHubStore.getState();
       const repo = useRepositoryStore.getState();
-      return isAuthenticated && detectedRemotes.length > 0 && !!repo.repoStatus?.branchName;
+      return (
+        isAuthenticated &&
+        detectedRemotes.length > 0 &&
+        !!repo.repoStatus?.branchName
+      );
     },
     execute: () => {
       const remote = getSelectedRemote();
-      if (remote) openBlade("ext:github:create-pr", { owner: remote.owner, repo: remote.repo });
+      if (remote)
+        openBlade("ext:github:create-pr", {
+          owner: remote.owner,
+          repo: remote.repo,
+        });
     },
   });
 
@@ -262,7 +303,8 @@ export async function onActivate(api: ExtensionAPI): Promise<void> {
   useGitHubStore.getState().checkAuth();
 
   // Subscribe to repo changes for remote auto-detection
-  let prevRepoPath: string | null = useRepositoryStore.getState().repoStatus?.repoPath ?? null;
+  let prevRepoPath: string | null =
+    useRepositoryStore.getState().repoStatus?.repoPath ?? null;
   unsubRepoWatch = useRepositoryStore.subscribe((state) => {
     const currentPath = state.repoStatus?.repoPath ?? null;
     if (currentPath !== prevRepoPath) {
@@ -280,16 +322,14 @@ export async function onActivate(api: ExtensionAPI): Promise<void> {
   });
 
   // Refresh toolbar visibility when auth or remotes change
-  unsubGitHubWatch = useGitHubStore.subscribe(
-    (state, prevState) => {
-      if (
-        state.isAuthenticated !== prevState.isAuthenticated ||
-        state.detectedRemotes !== prevState.detectedRemotes
-      ) {
-        useToolbarRegistry.getState().refreshVisibility();
-      }
-    },
-  );
+  unsubGitHubWatch = useGitHubStore.subscribe((state, prevState) => {
+    if (
+      state.isAuthenticated !== prevState.isAuthenticated ||
+      state.detectedRemotes !== prevState.detectedRemotes
+    ) {
+      useToolbarRegistry.getState().refreshVisibility();
+    }
+  });
 
   // Also detect remotes if a repo is already open
   if (useRepositoryStore.getState().repoStatus) {
diff --git a/src/extensions/github/manifest.json b/src/extensions/github/manifest.json
index f411155b..dc9660aa 100644
--- a/src/extensions/github/manifest.json
+++ b/src/extensions/github/manifest.json
@@ -18,15 +18,43 @@
     "commands": [
       { "id": "sign-in", "title": "Sign in to GitHub", "category": "GitHub" },
       { "id": "sign-out", "title": "Sign out of GitHub", "category": "GitHub" },
-      { "id": "open-pull-requests", "title": "View Pull Requests", "category": "GitHub" },
+      {
+        "id": "open-pull-requests",
+        "title": "View Pull Requests",
+        "category": "GitHub"
+      },
       { "id": "open-issues", "title": "View Issues", "category": "GitHub" },
-      { "id": "create-pull-request", "title": "Create Pull Request", "category": "GitHub" }
+      {
+        "id": "create-pull-request",
+        "title": "Create Pull Request",
+        "category": "GitHub"
+      }
     ],
     "toolbar": [
-      { "id": "github-status", "label": "GitHub", "group": "app", "priority": 60 },
-      { "id": "open-pull-requests", "label": "Pull Requests", "group": "views", "priority": 50 },
-      { "id": "open-issues", "label": "Issues", "group": "views", "priority": 45 },
-      { "id": "create-pr", "label": "Create Pull Request", "group": "views", "priority": 55 }
+      {
+        "id": "github-status",
+        "label": "GitHub",
+        "group": "app",
+        "priority": 60
+      },
+      {
+        "id": "open-pull-requests",
+        "label": "Pull Requests",
+        "group": "views",
+        "priority": 50
+      },
+      {
+        "id": "open-issues",
+        "label": "Issues",
+        "group": "views",
+        "priority": 45
+      },
+      {
+        "id": "create-pr",
+        "label": "Create Pull Request",
+        "group": "views",
+        "priority": 55
+      }
     ]
   },
   "permissions": null,
diff --git a/src/extensions/github/types.ts b/src/extensions/github/types.ts
index cd20bf23..3479be15 100644
--- a/src/extensions/github/types.ts
+++ b/src/extensions/github/types.ts
@@ -17,13 +17,15 @@ export const SCOPE_PROFILES: ScopeProfile[] = [
   {
     id: "basic",
     name: "Basic (Read Only)",
-    description: "Read access to public repos, user profile, and organization membership",
+    description:
+      "Read access to public repos, user profile, and organization membership",
     scopes: ["public_repo", "read:user", "user:email", "read:org"],
   },
   {
     id: "full",
     name: "Full Access",
-    description: "Full repository access with user profile and organization membership",
+    description:
+      "Full repository access with user profile and organization membership",
     scopes: ["repo", "read:user", "user:email", "read:org"],
     recommended: true,
   },
@@ -35,7 +37,12 @@ export const SCOPE_PROFILES: ScopeProfile[] = [
   },
 ];
 
-export type AuthStep = "scopes" | "device-code" | "polling" | "success" | "error";
+export type AuthStep =
+  | "scopes"
+  | "device-code"
+  | "polling"
+  | "success"
+  | "error";
 
 export interface CustomScope {
   id: string;
@@ -45,9 +52,29 @@ export interface CustomScope {
 
 export const CUSTOM_SCOPES: CustomScope[] = [
   { id: "repo", label: "Repositories", description: "Full access to repos" },
-  { id: "public_repo", label: "Public Repos Only", description: "Read-only for public repos" },
-  { id: "read:user", label: "Read User Profile", description: "Read access to profile info" },
-  { id: "user:email", label: "User Email", description: "Access to email addresses" },
-  { id: "read:org", label: "Read Organizations", description: "Read organization membership" },
-  { id: "notifications", label: "Notifications", description: "Access to notifications" },
+  {
+    id: "public_repo",
+    label: "Public Repos Only",
+    description: "Read-only for public repos",
+  },
+  {
+    id: "read:user",
+    label: "Read User Profile",
+    description: "Read access to profile info",
+  },
+  {
+    id: "user:email",
+    label: "User Email",
+    description: "Access to email addresses",
+  },
+  {
+    id: "read:org",
+    label: "Read Organizations",
+    description: "Read organization membership",
+  },
+  {
+    id: "notifications",
+    label: "Notifications",
+    description: "Access to notifications",
+  },
 ];
diff --git a/src/extensions/index.ts b/src/extensions/index.ts
index a637805b..b3a43f91 100644
--- a/src/extensions/index.ts
+++ b/src/extensions/index.ts
@@ -1,10 +1,17 @@
-export { useExtensionHost, CURRENT_API_VERSION, configureExtensionHost } from "@/framework/extension-system/ExtensionHost";
 export { ExtensionAPI } from "@/framework/extension-system/ExtensionAPI";
+export {
+  CURRENT_API_VERSION,
+  configureExtensionHost,
+  useExtensionHost,
+} from "@/framework/extension-system/ExtensionHost";
 export type {
-  ExtensionManifest,
-  ExtensionContributes,
   ExtensionBladeContribution,
   ExtensionCommandContribution,
+  ExtensionContributes,
+  ExtensionManifest,
   ExtensionToolbarContribution,
 } from "@/framework/extension-system/manifest";
-export type { ExtensionStatus, ExtensionInfo } from "@/framework/extension-system/types";
+export type {
+  ExtensionInfo,
+  ExtensionStatus,
+} from "@/framework/extension-system/types";
diff --git a/src/extensions/init-repo/blades/InitRepoBlade.tsx b/src/extensions/init-repo/blades/InitRepoBlade.tsx
index 6a97a776..cccf6865 100644
--- a/src/extensions/init-repo/blades/InitRepoBlade.tsx
+++ b/src/extensions/init-repo/blades/InitRepoBlade.tsx
@@ -1,10 +1,10 @@
 import { useEffect } from "react";
-import { commands } from "../../../bindings";
-import { useProjectDetection } from "../hooks/useGitignoreTemplates";
-import { useInitRepoStore } from "../store";
 import { SplitPaneLayout } from "@/framework/layout/SplitPaneLayout";
+import { commands } from "../../../bindings";
 import { InitRepoForm } from "../components/InitRepoForm";
 import { InitRepoPreview } from "../components/InitRepoPreview";
+import { useProjectDetection } from "../hooks/useGitignoreTemplates";
+import { useInitRepoStore } from "../store";
 
 interface InitRepoBladeProps {
   directoryPath: string;
diff --git a/src/extensions/init-repo/components/InitRepoForm.tsx b/src/extensions/init-repo/components/InitRepoForm.tsx
index 6a35421f..9edb7d90 100644
--- a/src/extensions/init-repo/components/InitRepoForm.tsx
+++ b/src/extensions/init-repo/components/InitRepoForm.tsx
@@ -7,13 +7,13 @@ import {
 } from "lucide-react";
 import { useState } from "react";
 import { commands } from "../../../bindings";
+import { Button } from "../../../core/components/ui/button";
+import { useBladeNavigation } from "../../../core/hooks/useBladeNavigation";
+import { useRecentRepos } from "../../../core/hooks/useRecentRepos";
 import { getErrorMessage } from "../../../core/lib/errors";
+import { useGitOpsStore as useRepositoryStore } from "../../../core/stores/domain/git-ops";
 import { composeGitignore } from "../lib/gitignoreComposer";
 import { useInitRepoStore } from "../store";
-import { useGitOpsStore as useRepositoryStore } from "../../../core/stores/domain/git-ops";
-import { useRecentRepos } from "../../../core/hooks/useRecentRepos";
-import { useBladeNavigation } from "../../../core/hooks/useBladeNavigation";
-import { Button } from "../../../core/components/ui/button";
 import { ProjectDetectionBanner } from "./ProjectDetectionBanner";
 import { TemplateChips } from "./TemplateChips";
 import { TemplatePicker } from "./TemplatePicker";
@@ -200,9 +200,7 @@ export function InitRepoForm({ onCancel, onComplete }: InitRepoFormProps) {
               }`}
             />
             <FileText className="w-4 h-4 text-ctp-subtext0" />
-            <span className="text-sm font-medium text-ctp-text">
-              README.md
-            </span>
+            <span className="text-sm font-medium text-ctp-text">README.md</span>
           </button>
           {readmeOpen && (
             <div className="mt-3 ml-6 space-y-3">
diff --git a/src/extensions/init-repo/components/InitRepoPreview.tsx b/src/extensions/init-repo/components/InitRepoPreview.tsx
index abd865cd..da8e13ef 100644
--- a/src/extensions/init-repo/components/InitRepoPreview.tsx
+++ b/src/extensions/init-repo/components/InitRepoPreview.tsx
@@ -1,10 +1,5 @@
 import { AnimatePresence, motion } from "framer-motion";
-import {
-  FileText,
-  Folder,
-  GitCommitHorizontal,
-  Check,
-} from "lucide-react";
+import { Check, FileText, Folder, GitCommitHorizontal } from "lucide-react";
 import { useMemo } from "react";
 import { composeGitignore } from "../lib/gitignoreComposer";
 import { useInitRepoStore } from "../store";
@@ -126,9 +121,7 @@ function ReadmePreview({
           <h1 className="text-xl font-bold text-ctp-text">
             {name || "Project"}
           </h1>
-          {description && (
-            <p className="text-ctp-subtext1">{description}</p>
-          )}
+          {description && <p className="text-ctp-subtext1">{description}</p>}
         </div>
       ) : (
         <p className="text-sm text-ctp-subtext0 italic">
diff --git a/src/extensions/init-repo/components/TemplateChips.tsx b/src/extensions/init-repo/components/TemplateChips.tsx
index 39788c0f..c89b8998 100644
--- a/src/extensions/init-repo/components/TemplateChips.tsx
+++ b/src/extensions/init-repo/components/TemplateChips.tsx
@@ -7,9 +7,7 @@ export function TemplateChips() {
 
   if (selectedTemplates.length === 0) {
     return (
-      <p className="text-sm text-ctp-subtext0 italic">
-        No templates selected
-      </p>
+      <p className="text-sm text-ctp-subtext0 italic">No templates selected</p>
     );
   }
 
diff --git a/src/extensions/init-repo/components/TemplatePicker.tsx b/src/extensions/init-repo/components/TemplatePicker.tsx
index dc4dd631..57ee0fc3 100644
--- a/src/extensions/init-repo/components/TemplatePicker.tsx
+++ b/src/extensions/init-repo/components/TemplatePicker.tsx
@@ -1,7 +1,7 @@
 import { Check, Search, Wifi, WifiOff } from "lucide-react";
 import { useEffect, useMemo, useRef, useState } from "react";
-import { useGitignoreTemplateList } from "../hooks/useGitignoreTemplates";
 import { getCategoryForTemplate } from "../../../core/lib/gitignoreCategories";
+import { useGitignoreTemplateList } from "../hooks/useGitignoreTemplates";
 import { useInitRepoStore } from "../store";
 import { CategoryFilter } from "./CategoryFilter";
 
@@ -141,12 +141,10 @@ export function TemplatePicker() {
         ) : (
           <ul
             ref={listRef}
-            role="listbox"
             aria-multiselectable="true"
             aria-label="Gitignore templates"
             className="max-h-80 overflow-y-auto space-y-0.5"
             onKeyDown={handleKeyDown}
-            tabIndex={0}
           >
             {filteredTemplates.map((t, idx) => {
               const isSelected = selectedTemplates.includes(t.name);
@@ -155,7 +153,6 @@ export function TemplatePicker() {
               return (
                 <li
                   key={t.name}
-                  role="option"
                   aria-selected={isSelected}
                   onClick={() => toggleTemplate(t.name)}
                   className={`flex items-center gap-3 px-3 py-2 rounded-md cursor-pointer text-sm transition-colors ${
@@ -171,9 +168,7 @@ export function TemplatePicker() {
                         : "border-ctp-surface2 bg-ctp-surface0"
                     }`}
                   >
-                    {isSelected && (
-                      <Check className="w-3 h-3 text-ctp-base" />
-                    )}
+                    {isSelected && <Check className="w-3 h-3 text-ctp-base" />}
                   </div>
                   <span
                     className={isSelected ? "text-ctp-text font-medium" : ""}
diff --git a/src/extensions/init-repo/hooks/useGitignoreTemplates.ts b/src/extensions/init-repo/hooks/useGitignoreTemplates.ts
index 59600201..3966f66d 100644
--- a/src/extensions/init-repo/hooks/useGitignoreTemplates.ts
+++ b/src/extensions/init-repo/hooks/useGitignoreTemplates.ts
@@ -6,7 +6,8 @@ export function useGitignoreTemplateList() {
     queryKey: ["gitignore-templates"],
     queryFn: async () => {
       const result = await commands.listGitignoreTemplates();
-      if (result.status === "error") throw new Error("Failed to load templates");
+      if (result.status === "error")
+        throw new Error("Failed to load templates");
       return result.data;
     },
     staleTime: Infinity,
diff --git a/src/extensions/init-repo/index.ts b/src/extensions/init-repo/index.ts
index 48a2921b..0369d2c4 100644
--- a/src/extensions/init-repo/index.ts
+++ b/src/extensions/init-repo/index.ts
@@ -1,5 +1,5 @@
-import { lazy } from "react";
 import { FolderGit2 } from "lucide-react";
+import { lazy } from "react";
 import type { ExtensionAPI } from "@/framework/extension-system/ExtensionAPI";
 import { openBlade } from "@/framework/layout/bladeOpener";
 
@@ -7,7 +7,7 @@ export async function onActivate(api: ExtensionAPI): Promise<void> {
   const InitRepoBlade = lazy(() =>
     import("./blades/InitRepoBlade").then((m) => ({
       default: m.InitRepoBlade,
-    }))
+    })),
   );
 
   api.registerBlade({
diff --git a/src/extensions/init-repo/lib/gitignoreComposer.ts b/src/extensions/init-repo/lib/gitignoreComposer.ts
index 2b4aae03..56cbd27c 100644
--- a/src/extensions/init-repo/lib/gitignoreComposer.ts
+++ b/src/extensions/init-repo/lib/gitignoreComposer.ts
@@ -48,7 +48,7 @@ export function composeGitignore(templates: TemplateSection[]): string {
   result = result.replace(/\n{4,}/g, "\n\n\n");
 
   // Ensure single trailing newline
-  return result.trimEnd() + "\n";
+  return `${result.trimEnd()}\n`;
 }
 
 /**
diff --git a/src/extensions/init-repo/manifest.json b/src/extensions/init-repo/manifest.json
index dae2d61c..633c9a30 100644
--- a/src/extensions/init-repo/manifest.json
+++ b/src/extensions/init-repo/manifest.json
@@ -7,10 +7,18 @@
   "main": "index.ts",
   "contributes": {
     "blades": [
-      { "type": "init-repo", "title": "Initialize Repository", "singleton": true }
+      {
+        "type": "init-repo",
+        "title": "Initialize Repository",
+        "singleton": true
+      }
     ],
     "commands": [
-      { "id": "init-repository", "title": "Initialize Repository", "category": "Repository" }
+      {
+        "id": "init-repository",
+        "title": "Initialize Repository",
+        "category": "Repository"
+      }
     ],
     "toolbar": null
   },
diff --git a/src/extensions/repository/blades/RepoBrowserBlade.tsx b/src/extensions/repository/blades/RepoBrowserBlade.tsx
index 33f1ac1c..5f06e0d4 100644
--- a/src/extensions/repository/blades/RepoBrowserBlade.tsx
+++ b/src/extensions/repository/blades/RepoBrowserBlade.tsx
@@ -1,15 +1,15 @@
 import { useQuery } from "@tanstack/react-query";
 import { FolderOpen } from "lucide-react";
 import { forwardRef, useCallback, useEffect, useRef, useState } from "react";
-import { commands } from "../../../bindings";
-import type { RepoFileEntry } from "../../../bindings";
-import { bladeTypeForFile } from "../../../core/lib/fileDispatch";
 import { getBladeRegistration } from "@/framework/layout/bladeRegistry";
-import { useBladeNavigation } from "../../../core/hooks/useBladeNavigation";
-import { FileTypeIcon } from "../../../core/components/icons/FileTypeIcon";
-import { BladeContentLoading } from "../../../core/blades/_shared/BladeContentLoading";
-import { BladeContentError } from "../../../core/blades/_shared/BladeContentError";
+import type { RepoFileEntry } from "../../../bindings";
+import { commands } from "../../../bindings";
 import { BladeContentEmpty } from "../../../core/blades/_shared/BladeContentEmpty";
+import { BladeContentError } from "../../../core/blades/_shared/BladeContentError";
+import { BladeContentLoading } from "../../../core/blades/_shared/BladeContentLoading";
+import { FileTypeIcon } from "../../../core/components/icons/FileTypeIcon";
+import { useBladeNavigation } from "../../../core/hooks/useBladeNavigation";
+import { bladeTypeForFile } from "../../../core/lib/fileDispatch";
 
 interface RepoBrowserBladeProps {
   path?: string;
@@ -40,12 +40,12 @@ export function RepoBrowserBlade({ path = "" }: RepoBrowserBladeProps) {
   // Reset focus when path changes
   useEffect(() => {
     setFocusedIndex(0);
-  }, [path]);
+  }, []);
 
   // Focus the item when focusedIndex changes
   useEffect(() => {
     itemRefs.current[focusedIndex]?.focus();
-  }, [focusedIndex, entries]);
+  }, [focusedIndex]);
 
   const navigateToDirectory = useCallback(
     (dirPath: string) => {
@@ -69,7 +69,9 @@ export function RepoBrowserBlade({ path = "" }: RepoBrowserBladeProps) {
       const title = entry.name;
       // Fall back to viewer-plaintext if the dispatched blade type is not registered
       // (e.g., content-viewers extension is disabled)
-      const bladeType = getBladeRegistration(dispatched) ? dispatched : "viewer-plaintext";
+      const bladeType = getBladeRegistration(dispatched)
+        ? dispatched
+        : "viewer-plaintext";
       pushBlade({ type: bladeType, title, props: { filePath: entry.path } });
     },
     [pushBlade, navigateToDirectory],
@@ -173,43 +175,39 @@ interface FileRowProps {
   onFocus: () => void;
 }
 
-const FileRow = forwardRef<HTMLButtonElement, FileRowProps>(
-  function FileRow({ entry, isFocused, onClick, onFocus }, ref) {
-    return (
-      <button
-        ref={ref}
-        type="button"
-        role="option"
-        aria-selected={false}
-        onClick={onClick}
-        onFocus={onFocus}
-        tabIndex={isFocused ? 0 : -1}
-        className={`
+const FileRow = forwardRef<HTMLButtonElement, FileRowProps>(function FileRow(
+  { entry, isFocused, onClick, onFocus },
+  ref,
+) {
+  return (
+    <button
+      ref={ref}
+      type="button"
+      role="option"
+      aria-selected={false}
+      onClick={onClick}
+      onFocus={onFocus}
+      tabIndex={isFocused ? 0 : -1}
+      className={`
           w-full flex items-center gap-2.5 px-3 py-1.5 text-left text-sm
           hover:bg-ctp-surface0/50 transition-colors
           focus:bg-ctp-surface0/50 focus:outline-none focus:ring-1 focus:ring-ctp-blue/50 focus:ring-inset
           ${isFocused ? "bg-ctp-surface0/30" : ""}
         `}
-      >
-        <FileTypeIcon
-          path={entry.name}
-          isDirectory={entry.isDir}
-        />
-        <span className="flex-1 truncate text-ctp-text">
-          {entry.name}
-          {entry.isDir && (
-            <span className="text-ctp-overlay0">/</span>
-          )}
+    >
+      <FileTypeIcon path={entry.name} isDirectory={entry.isDir} />
+      <span className="flex-1 truncate text-ctp-text">
+        {entry.name}
+        {entry.isDir && <span className="text-ctp-overlay0">/</span>}
+      </span>
+      {!entry.isDir && entry.size > 0 && (
+        <span className="text-xs text-ctp-overlay0 tabular-nums shrink-0">
+          {formatFileSize(entry.size)}
         </span>
-        {!entry.isDir && entry.size > 0 && (
-          <span className="text-xs text-ctp-overlay0 tabular-nums shrink-0">
-            {formatFileSize(entry.size)}
-          </span>
-        )}
-      </button>
-    );
-  },
-);
+      )}
+    </button>
+  );
+});
 
 function formatFileSize(bytes: number): string {
   if (bytes < 1024) return `${bytes} B`;
diff --git a/src/extensions/repository/components/CloneForm.tsx b/src/extensions/repository/components/CloneForm.tsx
index d17ee69d..bd6fba43 100644
--- a/src/extensions/repository/components/CloneForm.tsx
+++ b/src/extensions/repository/components/CloneForm.tsx
@@ -1,18 +1,20 @@
+import { useMutation } from "@tanstack/react-query";
 import { Channel } from "@tauri-apps/api/core";
 import { open } from "@tauri-apps/plugin-dialog";
-import { useMutation } from "@tanstack/react-query";
 import { FolderOpen, GitFork, Loader2, X } from "lucide-react";
 import { useEffect, useState } from "react";
+import { cn } from "@/framework/lib/utils";
+import { toast } from "@/framework/stores/toast";
 import {
   type CloneProgress as CloneProgressType,
   commands,
 } from "../../../bindings";
-import { cn } from "@/framework/lib/utils";
-import { useRecentRepos } from "../../../core/hooks/useRecentRepos";
-import { useGitOpsStore as useCloneStore } from "../../../core/stores/domain/git-ops";
-import { useGitOpsStore as useRepositoryStore } from "../../../core/stores/domain/git-ops";
-import { toast } from "@/framework/stores/toast";
 import { Button } from "../../../core/components/ui/button";
+import { useRecentRepos } from "../../../core/hooks/useRecentRepos";
+import {
+  useGitOpsStore as useCloneStore,
+  useGitOpsStore as useRepositoryStore,
+} from "../../../core/stores/domain/git-ops";
 import { CloneProgress } from "./CloneProgress";
 
 /** Extract repository name from a Git URL */
diff --git a/src/extensions/repository/components/CloneProgress.tsx b/src/extensions/repository/components/CloneProgress.tsx
index e9cc75fd..7ac3f627 100644
--- a/src/extensions/repository/components/CloneProgress.tsx
+++ b/src/extensions/repository/components/CloneProgress.tsx
@@ -1,7 +1,7 @@
 import { motion } from "framer-motion";
 import { CheckCircle, Loader2 } from "lucide-react";
-import type { CloneProgress as CloneProgressType } from "../../../bindings";
 import { cn } from "@/framework/lib/utils";
+import type { CloneProgress as CloneProgressType } from "../../../bindings";
 
 interface CloneProgressProps {
   progress: CloneProgressType | null;
diff --git a/src/extensions/repository/components/RepoSwitcher.tsx b/src/extensions/repository/components/RepoSwitcher.tsx
index 57ec4f98..444d8dd9 100644
--- a/src/extensions/repository/components/RepoSwitcher.tsx
+++ b/src/extensions/repository/components/RepoSwitcher.tsx
@@ -1,11 +1,11 @@
 import { AnimatePresence, motion } from "framer-motion";
 import { ChevronDown, FolderGit } from "lucide-react";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { useRecentRepos } from "../../../core/hooks/useRecentRepos";
 import { cn } from "@/framework/lib/utils";
-import { usePreferencesStore as useNavigationStore } from "../../../core/stores/domain/preferences";
+import { useRecentRepos } from "../../../core/hooks/useRecentRepos";
 import { useGitOpsStore as useRepositoryStore } from "../../../core/stores/domain/git-ops";
-import { RepoSwitcherItem, type RepoItemData } from "./RepoSwitcherItem";
+import { usePreferencesStore as useNavigationStore } from "../../../core/stores/domain/preferences";
+import { type RepoItemData, RepoSwitcherItem } from "./RepoSwitcherItem";
 
 const slideDown = {
   hidden: { opacity: 0, y: -8 },
diff --git a/src/extensions/repository/index.tsx b/src/extensions/repository/index.tsx
index 978f2ec8..4d00b7fb 100644
--- a/src/extensions/repository/index.tsx
+++ b/src/extensions/repository/index.tsx
@@ -1,19 +1,12 @@
+import { FolderOpen, FolderTree, GitFork, RefreshCw, X } from "lucide-react";
 import { lazy } from "react";
-import {
-  FolderOpen,
-  FolderTree,
-  GitFork,
-  RefreshCw,
-  X,
-} from "lucide-react";
 import type { ExtensionAPI } from "@/framework/extension-system/ExtensionAPI";
 import { openBlade } from "@/framework/layout/bladeOpener";
-import { useGitOpsStore as useRepositoryStore } from "../../core/stores/domain/git-ops";
 import { BladeBreadcrumb } from "../../core/blades/_shared/BladeBreadcrumb";
+import { useGitOpsStore as useRepositoryStore } from "../../core/stores/domain/git-ops";
 
 /** Shared repo-open condition. */
-const whenRepoOpen = (): boolean =>
-  !!useRepositoryStore.getState().repoStatus;
+const whenRepoOpen = (): boolean => !!useRepositoryStore.getState().repoStatus;
 
 /** Shared repo-closed condition. */
 const whenRepoNotOpen = (): boolean =>
@@ -144,7 +137,7 @@ export async function onActivate(api: ExtensionAPI): Promise<void> {
       try {
         const { revealItemInDir } = await import("@tauri-apps/plugin-opener");
         await revealItemInDir(
-          useRepositoryStore.getState().repoStatus!.repoPath,
+          useRepositoryStore.getState().repoStatus?.repoPath,
         );
       } catch (e) {
         const { toast } = await import("@/framework/stores/toast");
diff --git a/src/extensions/sandbox/SandboxBridge.ts b/src/extensions/sandbox/SandboxBridge.ts
index 659b8e83..17cd8680 100644
--- a/src/extensions/sandbox/SandboxBridge.ts
+++ b/src/extensions/sandbox/SandboxBridge.ts
@@ -13,11 +13,14 @@ import type { HostToWorkerMessage, WorkerToHostMessage } from "./types";
  */
 export class SandboxBridge {
   private worker: Worker | null = null;
-  private pendingCalls = new Map<string, {
-    resolve: (value: unknown) => void;
-    reject: (error: Error) => void;
-    timer: ReturnType<typeof setTimeout>;
-  }>();
+  private pendingCalls = new Map<
+    string,
+    {
+      resolve: (value: unknown) => void;
+      reject: (error: Error) => void;
+      timer: ReturnType<typeof setTimeout>;
+    }
+  >();
   private _isRunning = false;
   private readonly callTimeout: number;
 
@@ -71,7 +74,7 @@ export class SandboxBridge {
   async initialize(extensionId: string, code: string): Promise<void> {
     this.assertRunning();
     const msg: HostToWorkerMessage = { type: "init", extensionId, code };
-    this.worker!.postMessage(msg);
+    this.worker?.postMessage(msg);
 
     // Wait for "initialized" response
     return new Promise<void>((resolve, reject) => {
@@ -109,8 +112,8 @@ export class SandboxBridge {
     if (!isSandboxSafe(method)) {
       throw new Error(
         `Method "${method}" is not sandbox-safe and cannot be called ` +
-        `through the sandbox bridge. It requires trust level "built-in" ` +
-        `or "user-trusted".`
+          `through the sandbox bridge. It requires trust level "built-in" ` +
+          `or "user-trusted".`,
       );
     }
 
@@ -119,7 +122,11 @@ export class SandboxBridge {
     return new Promise<unknown>((resolve, reject) => {
       const timer = setTimeout(() => {
         this.pendingCalls.delete(callId);
-        reject(new Error(`API call "${method}" timed out after ${this.callTimeout}ms`));
+        reject(
+          new Error(
+            `API call "${method}" timed out after ${this.callTimeout}ms`,
+          ),
+        );
       }, this.callTimeout);
 
       this.pendingCalls.set(callId, { resolve, reject, timer });
@@ -130,7 +137,7 @@ export class SandboxBridge {
         method,
         args,
       };
-      this.worker!.postMessage(msg);
+      this.worker?.postMessage(msg);
     });
   }
 
diff --git a/src/extensions/sandbox/SandboxedExtensionAPI.ts b/src/extensions/sandbox/SandboxedExtensionAPI.ts
index e122f8e2..a2afa32e 100644
--- a/src/extensions/sandbox/SandboxedExtensionAPI.ts
+++ b/src/extensions/sandbox/SandboxedExtensionAPI.ts
@@ -1,9 +1,15 @@
-import { REQUIRES_TRUST_METHODS } from "./sandbox-api-surface";
+import type { GitHookContext, GitOperation } from "@/core/services/gitHookBus";
+import type {
+  BladeNavigationEvent,
+  Disposable,
+  ExtensionAPI,
+} from "@/framework/extension-system/ExtensionAPI";
+import type {
+  DidHandler,
+  WillHandler,
+} from "@/framework/extension-system/operationBus";
 import type { RequiresTrustMethod } from "./sandbox-api-surface";
-import type { ExtensionAPI, BladeNavigationEvent } from "@/framework/extension-system/ExtensionAPI";
-import type { GitOperation, GitHookContext } from "@/core/services/gitHookBus";
-import type { DidHandler, WillHandler } from "@/framework/extension-system/operationBus";
-import type { Disposable } from "@/framework/extension-system/ExtensionAPI";
+import { REQUIRES_TRUST_METHODS } from "./sandbox-api-surface";
 
 /**
  * Restricted API proxy for sandboxed (untrusted) extensions.
@@ -42,7 +48,10 @@ export class SandboxedExtensionAPI {
     this.hostApi.onDidGit(operation, handler);
   }
 
-  onWillGit(operation: GitOperation, handler: WillHandler<GitHookContext>): void {
+  onWillGit(
+    operation: GitOperation,
+    handler: WillHandler<GitHookContext>,
+  ): void {
     this.hostApi.onWillGit(operation, handler);
   }
 
@@ -65,9 +74,9 @@ export class SandboxedExtensionAPI {
   private trustError(method: string): Error {
     return new Error(
       `${method}() requires trust level "built-in" or "user-trusted". ` +
-      `Sandboxed extensions cannot call this method because it requires ` +
-      `React component references or closure access that cannot be ` +
-      `serialized across the Worker boundary.`
+        `Sandboxed extensions cannot call this method because it requires ` +
+        `React component references or closure access that cannot be ` +
+        `serialized across the Worker boundary.`,
     );
   }
 }
diff --git a/src/extensions/sandbox/__tests__/SandboxBridge.test.ts b/src/extensions/sandbox/__tests__/SandboxBridge.test.ts
index 8ec5c861..92230e26 100644
--- a/src/extensions/sandbox/__tests__/SandboxBridge.test.ts
+++ b/src/extensions/sandbox/__tests__/SandboxBridge.test.ts
@@ -6,7 +6,7 @@
  * This validates: ready handshake, API call/response, method blocking,
  * termination, and double-start prevention.
  */
-import { describe, it, expect, beforeEach, afterEach, vi } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { SandboxBridge } from "../SandboxBridge";
 import type { HostToWorkerMessage, WorkerToHostMessage } from "../types";
 
@@ -21,10 +21,7 @@ class MockWorker {
   onerror: ((event: ErrorEvent) => void) | null = null;
   private messageHandler: ((msg: HostToWorkerMessage) => void) | null = null;
 
-  constructor(
-    _url: string | URL,
-    _opts?: WorkerOptions,
-  ) {
+  constructor(_url: string | URL, _opts?: WorkerOptions) {
     // Register in the global mock so tests can configure behavior
     MockWorker.lastInstance = this;
   }
@@ -141,12 +138,24 @@ describe("SandboxBridge", () => {
     worker.simulateSend({ type: "ready" });
     await startPromise;
 
-    await expect(bridge.callApi("registerBlade", [])).rejects.toThrow("not sandbox-safe");
-    await expect(bridge.callApi("contributeToolbar", [])).rejects.toThrow("not sandbox-safe");
-    await expect(bridge.callApi("registerCommand", [])).rejects.toThrow("not sandbox-safe");
-    await expect(bridge.callApi("contributeContextMenu", [])).rejects.toThrow("not sandbox-safe");
-    await expect(bridge.callApi("contributeSidebarPanel", [])).rejects.toThrow("not sandbox-safe");
-    await expect(bridge.callApi("contributeStatusBar", [])).rejects.toThrow("not sandbox-safe");
+    await expect(bridge.callApi("registerBlade", [])).rejects.toThrow(
+      "not sandbox-safe",
+    );
+    await expect(bridge.callApi("contributeToolbar", [])).rejects.toThrow(
+      "not sandbox-safe",
+    );
+    await expect(bridge.callApi("registerCommand", [])).rejects.toThrow(
+      "not sandbox-safe",
+    );
+    await expect(bridge.callApi("contributeContextMenu", [])).rejects.toThrow(
+      "not sandbox-safe",
+    );
+    await expect(bridge.callApi("contributeSidebarPanel", [])).rejects.toThrow(
+      "not sandbox-safe",
+    );
+    await expect(bridge.callApi("contributeStatusBar", [])).rejects.toThrow(
+      "not sandbox-safe",
+    );
   });
 
   it("allows all sandbox-safe methods", async () => {
@@ -199,7 +208,9 @@ describe("SandboxBridge", () => {
     worker.simulateSend({ type: "ready" });
     await startPromise;
 
-    await expect(bridge.start("worker://test2")).rejects.toThrow("already running");
+    await expect(bridge.start("worker://test2")).rejects.toThrow(
+      "already running",
+    );
   });
 
   it("handles api-response errors from worker", async () => {
@@ -218,6 +229,8 @@ describe("SandboxBridge", () => {
       }
     });
 
-    await expect(bridge.callApi("onDidGit", [])).rejects.toThrow("handler threw an error");
+    await expect(bridge.callApi("onDidGit", [])).rejects.toThrow(
+      "handler threw an error",
+    );
   });
 });
diff --git a/src/extensions/stash/components/StashDialog.tsx b/src/extensions/stash/components/StashDialog.tsx
index b88ec6fd..0e95737b 100644
--- a/src/extensions/stash/components/StashDialog.tsx
+++ b/src/extensions/stash/components/StashDialog.tsx
@@ -1,5 +1,4 @@
 import { useState } from "react";
-import { useGitOpsStore as useStashStore } from "@/core/stores/domain/git-ops";
 import { Button } from "@/core/components/ui/button";
 import {
   Dialog,
@@ -9,13 +8,18 @@ import {
   DialogTitle,
 } from "@/core/components/ui/dialog";
 import { Input } from "@/core/components/ui/input";
+import { useGitOpsStore as useStashStore } from "@/core/stores/domain/git-ops";
 
 interface StashDialogProps {
   onClose: () => void;
 }
 
 export function StashDialog({ onClose }: StashDialogProps) {
-  const { saveStash, stashIsLoading: isLoading, stashError: error } = useStashStore();
+  const {
+    saveStash,
+    stashIsLoading: isLoading,
+    stashError: error,
+  } = useStashStore();
   const [message, setMessage] = useState("");
   const [includeUntracked, setIncludeUntracked] = useState(false);
 
diff --git a/src/extensions/stash/components/StashItem.tsx b/src/extensions/stash/components/StashItem.tsx
index 15181599..20133db9 100644
--- a/src/extensions/stash/components/StashItem.tsx
+++ b/src/extensions/stash/components/StashItem.tsx
@@ -1,13 +1,13 @@
 import { Archive, Download, Loader2, Play, Trash2 } from "lucide-react";
 import { useState } from "react";
-import type { StashEntry } from "../../../bindings";
 import { parseStashMessage } from "@/core/lib/stash-utils";
+import type { StashEntry } from "../../../bindings";
 
 interface StashItemProps {
   stash: StashEntry;
-  onApply: () => Promise<unknown> | void;
-  onPop: () => Promise<unknown> | void;
-  onDrop: () => Promise<unknown> | void;
+  onApply: () => Promise<unknown> | undefined;
+  onPop: () => Promise<unknown> | undefined;
+  onDrop: () => Promise<unknown> | undefined;
   disabled?: boolean;
 }
 
@@ -25,7 +25,7 @@ export function StashItem({
 
   const handleAction = async (
     action: "apply" | "pop" | "drop",
-    fn: () => Promise<unknown> | void,
+    fn: () => Promise<unknown> | undefined,
   ) => {
     setLoadingAction(action);
     try {
@@ -44,7 +44,7 @@ export function StashItem({
         <div className="min-w-0">
           <p className="truncate text-sm text-ctp-text">{parsed.description}</p>
           <span className="text-xs text-ctp-overlay0">
-            stash@{"{" + stash.index + "}"}
+            stash@{`{${stash.index}}`}
             {parsed.branch && (
               <span className="text-ctp-overlay1"> on {parsed.branch}</span>
             )}
diff --git a/src/extensions/stash/components/StashList.tsx b/src/extensions/stash/components/StashList.tsx
index e5b94339..4033871c 100644
--- a/src/extensions/stash/components/StashList.tsx
+++ b/src/extensions/stash/components/StashList.tsx
@@ -1,7 +1,7 @@
 import { Archive } from "lucide-react";
-import { useEffect, useState } from "react";
-import { useGitOpsStore as useStashStore } from "@/core/stores/domain/git-ops";
+import { useEffect } from "react";
 import { EmptyState } from "@/core/components/ui/EmptyState";
+import { useGitOpsStore as useStashStore } from "@/core/stores/domain/git-ops";
 import { StashDialog } from "./StashDialog";
 import { StashItem } from "./StashItem";
 
diff --git a/src/extensions/sync/components/SyncButtons.tsx b/src/extensions/sync/components/SyncButtons.tsx
index 179f4099..9910c257 100644
--- a/src/extensions/sync/components/SyncButtons.tsx
+++ b/src/extensions/sync/components/SyncButtons.tsx
@@ -2,12 +2,11 @@ import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import { Channel } from "@tauri-apps/api/core";
 import { ArrowDown, ArrowUp, CloudDownload, Loader2 } from "lucide-react";
 import { useCallback, useState } from "react";
-import { type SyncProgress, commands } from "../../../bindings";
-import { formatShortcut } from "@/framework/command-palette/formatShortcut";
+import { Button } from "@/core/components/ui/button";
+import { ShortcutTooltip } from "@/core/components/ui/ShortcutTooltip";
 import { gitHookBus } from "@/core/services/gitHookBus";
 import { toast } from "@/framework/stores/toast";
-import { ShortcutTooltip } from "@/core/components/ui/ShortcutTooltip";
-import { Button } from "@/core/components/ui/button";
+import { commands, type SyncProgress } from "../../../bindings";
 import { SyncProgressDisplay } from "./SyncProgress";
 
 export function SyncButtons() {
diff --git a/src/extensions/sync/index.ts b/src/extensions/sync/index.ts
index a075b4c0..f706117c 100644
--- a/src/extensions/sync/index.ts
+++ b/src/extensions/sync/index.ts
@@ -7,22 +7,21 @@ import {
   RotateCcw,
   Undo2,
 } from "lucide-react";
+import { gitHookBus } from "@/core/services/gitHookBus";
+import type { ExtensionAPI } from "@/framework/extension-system/ExtensionAPI";
+import { toast } from "@/framework/stores/toast";
 import type { SyncProgress } from "../../bindings";
 import { commands as tauriCommands } from "../../bindings";
 import { getErrorMessage } from "../../core/lib/errors";
 import { queryClient } from "../../core/lib/queryClient";
-import type { ExtensionAPI } from "@/framework/extension-system/ExtensionAPI";
-import { gitHookBus } from "@/core/services/gitHookBus";
 import { useGitOpsStore as useRepositoryStore } from "../../core/stores/domain/git-ops";
-import { toast } from "@/framework/stores/toast";
 
 // Module-level loading flags for sync operations.
 let fetchLoading = false;
 let pullLoading = false;
 let pushLoading = false;
 
-const whenRepoOpen = (): boolean =>
-  !!useRepositoryStore.getState().repoStatus;
+const whenRepoOpen = (): boolean => !!useRepositoryStore.getState().repoStatus;
 
 export async function onActivate(api: ExtensionAPI): Promise<void> {
   // ── Commands ──────────────────────────────────────────────
diff --git a/src/extensions/tags/components/CreateTagDialog.tsx b/src/extensions/tags/components/CreateTagDialog.tsx
index edb2a58d..4f422c4e 100644
--- a/src/extensions/tags/components/CreateTagDialog.tsx
+++ b/src/extensions/tags/components/CreateTagDialog.tsx
@@ -1,7 +1,7 @@
 import { X } from "lucide-react";
 import { useState } from "react";
-import { commands } from "../../../bindings";
 import { getErrorMessage } from "@/core/lib/errors";
+import { commands } from "../../../bindings";
 
 interface CreateTagDialogProps {
   onClose: () => void;
@@ -65,7 +65,6 @@ export function CreateTagDialog({ onClose, onCreated }: CreateTagDialogProps) {
               onChange={(e) => setName(e.target.value)}
               placeholder="v1.0.0"
               className="w-full px-3 py-2 bg-ctp-surface0 border border-ctp-surface1 rounded focus:outline-none focus:border-ctp-blue"
-              autoFocus
             />
           </div>
 
diff --git a/src/extensions/tags/components/TagList.tsx b/src/extensions/tags/components/TagList.tsx
index b5aedad4..967bff67 100644
--- a/src/extensions/tags/components/TagList.tsx
+++ b/src/extensions/tags/components/TagList.tsx
@@ -1,7 +1,7 @@
 import { Plus, Tag } from "lucide-react";
 import { useEffect } from "react";
-import { useGitOpsStore as useTagStore } from "@/core/stores/domain/git-ops";
 import { EmptyState } from "@/core/components/ui/EmptyState";
+import { useGitOpsStore as useTagStore } from "@/core/stores/domain/git-ops";
 import { CreateTagDialog } from "./CreateTagDialog";
 import { TagItem } from "./TagItem";
 
@@ -16,8 +16,14 @@ export function TagList({
   onCloseCreateDialog,
   onOpenCreateDialog,
 }: TagListProps) {
-  const { tagList: tags, tagIsLoading: isLoading, tagError: error, loadTags, deleteTag, clearTagError: clearError } =
-    useTagStore();
+  const {
+    tagList: tags,
+    tagIsLoading: isLoading,
+    tagError: error,
+    loadTags,
+    deleteTag,
+    clearTagError: clearError,
+  } = useTagStore();
 
   useEffect(() => {
     loadTags();
diff --git a/src/extensions/topology/__tests__/TopologyRootBlade.test.tsx b/src/extensions/topology/__tests__/TopologyRootBlade.test.tsx
index 5ff0fd2c..454d9de5 100644
--- a/src/extensions/topology/__tests__/TopologyRootBlade.test.tsx
+++ b/src/extensions/topology/__tests__/TopologyRootBlade.test.tsx
@@ -16,15 +16,25 @@ vi.mock("../../../bindings", () => ({
 }));
 
 vi.mock("@xyflow/react", () => ({
-  ReactFlow: ({ children }: { children?: React.ReactNode }) => <div data-testid="mock-reactflow">{children}</div>,
+  ReactFlow: ({ children }: { children?: React.ReactNode }) => (
+    <div data-testid="mock-reactflow">{children}</div>
+  ),
   Background: () => null,
   Controls: () => null,
   MiniMap: () => null,
-  Panel: ({ children }: { children?: React.ReactNode }) => <div>{children}</div>,
+  Panel: ({ children }: { children?: React.ReactNode }) => (
+    <div>{children}</div>
+  ),
   useNodesState: () => [[], vi.fn(), vi.fn()],
   useEdgesState: () => [[], vi.fn(), vi.fn()],
-  useReactFlow: () => ({ fitView: vi.fn(), getNodes: () => [], setCenter: vi.fn() }),
-  ReactFlowProvider: ({ children }: { children?: React.ReactNode }) => <div>{children}</div>,
+  useReactFlow: () => ({
+    fitView: vi.fn(),
+    getNodes: () => [],
+    setCenter: vi.fn(),
+  }),
+  ReactFlowProvider: ({ children }: { children?: React.ReactNode }) => (
+    <div>{children}</div>
+  ),
   Position: { Top: "top", Bottom: "bottom", Left: "left", Right: "right" },
   MarkerType: { Arrow: "arrow", ArrowClosed: "arrowclosed" },
   Handle: () => null,
diff --git a/src/extensions/topology/blades/TopologyRootBlade.tsx b/src/extensions/topology/blades/TopologyRootBlade.tsx
index b336023a..fbb9b0d6 100644
--- a/src/extensions/topology/blades/TopologyRootBlade.tsx
+++ b/src/extensions/topology/blades/TopologyRootBlade.tsx
@@ -10,7 +10,8 @@ type TopologyView = "graph" | "history";
 export function TopologyRootBlade() {
   const [view, setView] = useState<TopologyView>("graph");
   const { openBlade } = useBladeNavigation();
-  const openCommitDetails = (oid: string) => openBlade("commit-details", { oid });
+  const openCommitDetails = (oid: string) =>
+    openBlade("commit-details", { oid });
 
   return (
     <div className="flex flex-col h-full">
diff --git a/src/extensions/topology/components/CommitBadge.tsx b/src/extensions/topology/components/CommitBadge.tsx
index 1c62d747..c6c0b967 100644
--- a/src/extensions/topology/components/CommitBadge.tsx
+++ b/src/extensions/topology/components/CommitBadge.tsx
@@ -1,12 +1,12 @@
 import { GitCommit } from "lucide-react";
 import { memo } from "react";
+import { useContextMenuRegistry } from "@/framework/extension-system/contextMenuRegistry";
+import { cn } from "@/framework/lib/utils";
 import type { GraphNode } from "../../../bindings";
 import {
   COMMIT_TYPE_THEME,
   type ConventionalCommitType,
 } from "../../conventional-commits/lib/commit-type-theme";
-import { useContextMenuRegistry } from "@/framework/extension-system/contextMenuRegistry";
-import { cn } from "@/framework/lib/utils";
 import {
   BRANCH_BADGE_STYLES,
   BRANCH_RING_COLORS,
@@ -38,11 +38,12 @@ export const CommitBadge = memo(
         onClick={onClick}
         onContextMenu={(e) => {
           e.preventDefault();
-          useContextMenuRegistry.getState().showMenu(
-            { x: e.clientX, y: e.clientY },
-            "commit-list",
-            { location: "commit-list", commitOid: node.oid },
-          );
+          useContextMenuRegistry
+            .getState()
+            .showMenu({ x: e.clientX, y: e.clientY }, "commit-list", {
+              location: "commit-list",
+              commitOid: node.oid,
+            });
         }}
         className={cn(
           "px-2 py-1 rounded-md border cursor-pointer transition-all",
diff --git a/src/extensions/topology/components/CommitTooltip.tsx b/src/extensions/topology/components/CommitTooltip.tsx
index 9ca643ad..60a6db52 100644
--- a/src/extensions/topology/components/CommitTooltip.tsx
+++ b/src/extensions/topology/components/CommitTooltip.tsx
@@ -52,9 +52,7 @@ export function CommitTooltip({ node, style }: CommitTooltipProps) {
   const shouldReduceMotion = useReducedMotion();
 
   const truncatedMessage =
-    node.message.length > 60
-      ? `${node.message.slice(0, 60)}...`
-      : node.message;
+    node.message.length > 60 ? `${node.message.slice(0, 60)}...` : node.message;
 
   const content = (
     <div className="flex flex-col gap-1">
@@ -65,7 +63,9 @@ export function CommitTooltip({ node, style }: CommitTooltipProps) {
       <div className="text-[11px] text-ctp-overlay0">
         {formatRelativeDate(node.timestampMs)}
       </div>
-      <div className="text-xs text-ctp-text leading-snug">{truncatedMessage}</div>
+      <div className="text-xs text-ctp-text leading-snug">
+        {truncatedMessage}
+      </div>
     </div>
   );
 
diff --git a/src/extensions/topology/components/HeatMapLegend.tsx b/src/extensions/topology/components/HeatMapLegend.tsx
index eccffd48..0b893e46 100644
--- a/src/extensions/topology/components/HeatMapLegend.tsx
+++ b/src/extensions/topology/components/HeatMapLegend.tsx
@@ -19,11 +19,7 @@ function formatDate(date: Date): string {
   const yesterday = new Date(today);
   yesterday.setDate(yesterday.getDate() - 1);
 
-  const dateDay = new Date(
-    date.getFullYear(),
-    date.getMonth(),
-    date.getDate(),
-  );
+  const dateDay = new Date(date.getFullYear(), date.getMonth(), date.getDate());
 
   if (dateDay.getTime() === today.getTime()) {
     return "Today";
diff --git a/src/extensions/topology/components/LaneHeader.tsx b/src/extensions/topology/components/LaneHeader.tsx
index 821056ff..9401d1e0 100644
--- a/src/extensions/topology/components/LaneHeader.tsx
+++ b/src/extensions/topology/components/LaneHeader.tsx
@@ -1,6 +1,6 @@
+import { cn } from "@/framework/lib/utils";
 import type { BranchType } from "../../../bindings";
 import { BRANCH_BADGE_STYLES } from "../lib/layoutUtils";
-import { cn } from "@/framework/lib/utils";
 
 interface Lane {
   column: number;
diff --git a/src/extensions/topology/components/TopologyEmptyState.tsx b/src/extensions/topology/components/TopologyEmptyState.tsx
index d97f486e..ce7f97f7 100644
--- a/src/extensions/topology/components/TopologyEmptyState.tsx
+++ b/src/extensions/topology/components/TopologyEmptyState.tsx
@@ -17,20 +17,68 @@ export function TopologyEmptyState() {
         aria-hidden="true"
       >
         {/* Trunk */}
-        <line x1="60" y1="100" x2="60" y2="40" stroke="currentColor" strokeWidth="2" strokeLinecap="round" />
+        <line
+          x1="60"
+          y1="100"
+          x2="60"
+          y2="40"
+          stroke="currentColor"
+          strokeWidth="2"
+          strokeLinecap="round"
+        />
         {/* Left branch */}
-        <line x1="60" y1="60" x2="35" y2="35" stroke="currentColor" strokeWidth="2" strokeLinecap="round" />
+        <line
+          x1="60"
+          y1="60"
+          x2="35"
+          y2="35"
+          stroke="currentColor"
+          strokeWidth="2"
+          strokeLinecap="round"
+        />
         {/* Right branch */}
-        <line x1="60" y1="50" x2="85" y2="30" stroke="currentColor" strokeWidth="2" strokeLinecap="round" />
+        <line
+          x1="60"
+          y1="50"
+          x2="85"
+          y2="30"
+          stroke="currentColor"
+          strokeWidth="2"
+          strokeLinecap="round"
+        />
         {/* Empty circles at tips */}
-        <circle cx="60" cy="35" r="5" stroke="currentColor" strokeWidth="1.5" fill="none" />
-        <circle cx="35" cy="30" r="5" stroke="currentColor" strokeWidth="1.5" fill="none" />
-        <circle cx="85" cy="25" r="5" stroke="currentColor" strokeWidth="1.5" fill="none" />
+        <circle
+          cx="60"
+          cy="35"
+          r="5"
+          stroke="currentColor"
+          strokeWidth="1.5"
+          fill="none"
+        />
+        <circle
+          cx="35"
+          cy="30"
+          r="5"
+          stroke="currentColor"
+          strokeWidth="1.5"
+          fill="none"
+        />
+        <circle
+          cx="85"
+          cy="25"
+          r="5"
+          stroke="currentColor"
+          strokeWidth="1.5"
+          fill="none"
+        />
       </svg>
       <div className="text-center space-y-1.5">
-        <h3 className="text-sm font-medium text-ctp-subtext1">No commits yet</h3>
+        <h3 className="text-sm font-medium text-ctp-subtext1">
+          No commits yet
+        </h3>
         <p className="text-xs text-ctp-overlay0 max-w-xs">
-          This repository has no commits. Create your first commit to see the topology graph.
+          This repository has no commits. Create your first commit to see the
+          topology graph.
         </p>
       </div>
       <button
diff --git a/src/extensions/topology/components/TopologyPanel.tsx b/src/extensions/topology/components/TopologyPanel.tsx
index 3f61d971..5e1b42d5 100644
--- a/src/extensions/topology/components/TopologyPanel.tsx
+++ b/src/extensions/topology/components/TopologyPanel.tsx
@@ -1,22 +1,22 @@
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { Flame, Loader2 } from "lucide-react";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { useCommitGraph } from "../../../core/hooks/useCommitGraph";
-import { classifyBranch } from "../../../core/lib/branchClassifier";
 import type { GitflowBranchType } from "../../../core/lib/branchClassifier";
-import { LaneHeader } from "./LaneHeader";
-import { CommitBadge } from "./CommitBadge";
-import { CommitTooltip } from "./CommitTooltip";
-import { HeatMapLegend } from "./HeatMapLegend";
-import { TopologyEmptyState } from "./TopologyEmptyState";
+import { classifyBranch } from "../../../core/lib/branchClassifier";
+import { getHeatColor } from "../lib/heatMapUtils";
 import {
   BADGE_HEIGHT,
   BADGE_WIDTH,
+  computeLayout,
   type LaneLine,
   type PositionedEdge,
   type PositionedNode,
-  computeLayout,
 } from "../lib/layoutUtils";
-import { getHeatColor } from "../lib/heatMapUtils";
+import { CommitBadge } from "./CommitBadge";
+import { CommitTooltip } from "./CommitTooltip";
+import { HeatMapLegend } from "./HeatMapLegend";
+import { LaneHeader } from "./LaneHeader";
+import { TopologyEmptyState } from "./TopologyEmptyState";
 
 interface TopologyPanelProps {
   onCommitSelect?: (oid: string) => void;
@@ -192,9 +192,7 @@ export function TopologyPanel({ onCommitSelect }: TopologyPanelProps) {
                   r={pn.r}
                   fill={nodeFill}
                   fillOpacity={0.9}
-                  stroke={
-                    pn.node.oid === selectedCommit ? "#ffffff" : nodeFill
-                  }
+                  stroke={pn.node.oid === selectedCommit ? "#ffffff" : nodeFill}
                   strokeWidth={pn.node.oid === selectedCommit ? 3 : 1.5}
                   strokeOpacity={pn.node.oid === selectedCommit ? 1 : 0.6}
                   className="cursor-pointer pointer-events-auto"
@@ -267,10 +265,7 @@ export function TopologyPanel({ onCommitSelect }: TopologyPanelProps) {
       {/* Heat map legend overlay */}
       {heatMapEnabled && (
         <div className="absolute bottom-3 left-3 z-40">
-          <HeatMapLegend
-            minDate={new Date(minTs)}
-            maxDate={new Date(maxTs)}
-          />
+          <HeatMapLegend minDate={new Date(minTs)} maxDate={new Date(maxTs)} />
         </div>
       )}
     </div>
diff --git a/src/extensions/topology/index.ts b/src/extensions/topology/index.ts
index 533d3a59..6551b171 100644
--- a/src/extensions/topology/index.ts
+++ b/src/extensions/topology/index.ts
@@ -1,6 +1,6 @@
-import { lazy } from "react";
-import { History } from "lucide-react";
 import { listen } from "@tauri-apps/api/event";
+import { History } from "lucide-react";
+import { lazy } from "react";
 import type { ExtensionAPI } from "@/framework/extension-system/ExtensionAPI";
 import { getNavigationActor } from "@/framework/layout/navigation/context";
 import { useGitOpsStore } from "../../core/stores/domain/git-ops";
@@ -10,7 +10,7 @@ export async function onActivate(api: ExtensionAPI): Promise<void> {
   const TopologyRootBlade = lazy(() =>
     import("./blades/TopologyRootBlade").then((m) => ({
       default: m.TopologyRootBlade,
-    }))
+    })),
   );
 
   api.registerBlade({
@@ -34,29 +34,40 @@ export async function onActivate(api: ExtensionAPI): Promise<void> {
     icon: History,
     keywords: ["topology", "history", "graph", "commits"],
     action: () => {
-      getNavigationActor().send({ type: "SWITCH_WORKFLOW", workflow: "topology" });
+      getNavigationActor().send({
+        type: "SWITCH_WORKFLOW",
+        workflow: "topology",
+      });
     },
     enabled: () => !!useGitOpsStore.getState().repoStatus,
   });
 
   // 3. File watcher: auto-refresh topology when repository files change externally
-  const unlisten = await listen<{ paths: string[] }>("repository-changed", () => {
-    const state = useGitOpsStore.getState();
-    if (state.nodes.length > 0) {
-      state.loadGraph();
-    }
-  });
+  const unlisten = await listen<{ paths: string[] }>(
+    "repository-changed",
+    () => {
+      const state = useGitOpsStore.getState();
+      if (state.nodes.length > 0) {
+        state.loadGraph();
+      }
+    },
+  );
   api.onDispose(() => unlisten());
 
   // 4. Apply defaultTab setting: if user prefers topology as default, switch to it
   try {
     const { Store } = await import("@tauri-apps/plugin-store");
     const store = await Store.load("settings.json");
-    const settings = await store.get<{ general?: { defaultTab?: string } }>("settings");
+    const settings = await store.get<{ general?: { defaultTab?: string } }>(
+      "settings",
+    );
     const defaultTab = settings?.general?.defaultTab;
     if (defaultTab === "topology" || defaultTab === "history") {
       if (useGitOpsStore.getState().repoStatus) {
-        getNavigationActor().send({ type: "SWITCH_WORKFLOW", workflow: "topology" });
+        getNavigationActor().send({
+          type: "SWITCH_WORKFLOW",
+          workflow: "topology",
+        });
       }
     }
   } catch {
diff --git a/src/extensions/topology/lib/layoutUtils.ts b/src/extensions/topology/lib/layoutUtils.ts
index 6180785c..e4282ea4 100644
--- a/src/extensions/topology/lib/layoutUtils.ts
+++ b/src/extensions/topology/lib/layoutUtils.ts
@@ -1,7 +1,7 @@
 import type { GraphEdge, GraphNode } from "../../../bindings";
 import {
-  BRANCH_HEX_COLORS,
   BRANCH_BADGE_STYLES,
+  BRANCH_HEX_COLORS,
   BRANCH_RING_COLORS,
 } from "../../../core/lib/branchClassifier";
 import { parseConventionalMessage } from "../../conventional-commits/lib/conventional-utils";
diff --git a/src/extensions/topology/manifest.json b/src/extensions/topology/manifest.json
index 27ac5734..f78cc893 100644
--- a/src/extensions/topology/manifest.json
+++ b/src/extensions/topology/manifest.json
@@ -7,7 +7,13 @@
   "main": "index.ts",
   "contributes": {
     "blades": [{ "type": "topology-graph", "title": "Topology" }],
-    "commands": [{ "id": "show-topology", "title": "Show History", "category": "Navigation" }]
+    "commands": [
+      {
+        "id": "show-topology",
+        "title": "Show History",
+        "category": "Navigation"
+      }
+    ]
   },
   "trustLevel": "built-in"
 }
diff --git a/src/extensions/viewer-3d/blades/Viewer3dBlade.test.tsx b/src/extensions/viewer-3d/blades/Viewer3dBlade.test.tsx
index 1e7ed30f..72de0619 100644
--- a/src/extensions/viewer-3d/blades/Viewer3dBlade.test.tsx
+++ b/src/extensions/viewer-3d/blades/Viewer3dBlade.test.tsx
@@ -39,13 +39,22 @@ vi.mock("three", () => {
       updateProjectionMatrix: vi.fn(),
     })),
     WebGLRenderer: vi.fn().mockImplementation(() => mockRenderer),
-    AmbientLight: vi.fn().mockImplementation(() => ({ position: { set: vi.fn() } })),
-    DirectionalLight: vi.fn().mockImplementation(() => ({ position: { set: vi.fn() } })),
+    AmbientLight: vi
+      .fn()
+      .mockImplementation(() => ({ position: { set: vi.fn() } })),
+    DirectionalLight: vi
+      .fn()
+      .mockImplementation(() => ({ position: { set: vi.fn() } })),
     GridHelper: vi.fn(),
     Box3: vi.fn().mockImplementation(() => ({
       setFromObject: vi.fn().mockReturnThis(),
       getCenter: vi.fn().mockReturnValue({ x: 0, y: 0, z: 0 }),
-      getSize: vi.fn().mockReturnValue({ x: 1, y: 1, z: 1, length: vi.fn().mockReturnValue(1) }),
+      getSize: vi.fn().mockReturnValue({
+        x: 1,
+        y: 1,
+        z: 1,
+        length: vi.fn().mockReturnValue(1),
+      }),
     })),
     Vector3: vi.fn().mockImplementation(() => ({ x: 0, y: 0, z: 0 })),
     Color: vi.fn(),
diff --git a/src/extensions/viewer-3d/blades/Viewer3dBlade.tsx b/src/extensions/viewer-3d/blades/Viewer3dBlade.tsx
index dcd86684..05c9b490 100644
--- a/src/extensions/viewer-3d/blades/Viewer3dBlade.tsx
+++ b/src/extensions/viewer-3d/blades/Viewer3dBlade.tsx
@@ -1,13 +1,13 @@
-import * as THREE from "three";
-import { GLTFLoader } from "three/examples/jsm/loaders/GLTFLoader.js";
-import { OrbitControls } from "three/examples/jsm/controls/OrbitControls.js";
 import { Box, Info, RotateCcw } from "lucide-react";
 import { useCallback, useEffect, useRef, useState } from "react";
+import * as THREE from "three";
+import { OrbitControls } from "three/examples/jsm/controls/OrbitControls.js";
+import { GLTFLoader } from "three/examples/jsm/loaders/GLTFLoader.js";
 import { commands } from "../../../bindings";
-import { getErrorMessage } from "../../../core/lib/errors";
-import { BladeContentLoading } from "../../../core/blades/_shared/BladeContentLoading";
-import { BladeContentError } from "../../../core/blades/_shared/BladeContentError";
 import { BladeContentEmpty } from "../../../core/blades/_shared/BladeContentEmpty";
+import { BladeContentError } from "../../../core/blades/_shared/BladeContentError";
+import { BladeContentLoading } from "../../../core/blades/_shared/BladeContentLoading";
+import { getErrorMessage } from "../../../core/lib/errors";
 
 interface Viewer3dBladeProps {
   filePath: string;
@@ -53,7 +53,9 @@ export function Viewer3dBlade({ filePath }: Viewer3dBladeProps) {
       const gl =
         testCanvas.getContext("webgl2") || testCanvas.getContext("webgl");
       if (!gl) {
-        console.error("[Viewer3dBlade] WebGL not supported — neither webgl2 nor webgl context available");
+        console.error(
+          "[Viewer3dBlade] WebGL not supported — neither webgl2 nor webgl context available",
+        );
         if (myVersion === loadVersionRef.current) {
           setFetchError("WebGL is not supported by your browser or GPU");
           setLoading(false);
@@ -61,9 +63,7 @@ export function Viewer3dBlade({ filePath }: Viewer3dBladeProps) {
         return;
       }
     } catch {
-      console.warn(
-        "[Viewer3dBlade] WebGL detection failed, proceeding anyway",
-      );
+      console.warn("[Viewer3dBlade] WebGL detection failed, proceeding anyway");
     }
 
     try {
@@ -80,7 +80,11 @@ export function Viewer3dBlade({ filePath }: Viewer3dBladeProps) {
 
       const { content, isBinary, size } = result.data;
       setFileSize(size);
-      console.log("[Viewer3dBlade] readRepoFile OK:", { isBinary, size, contentLength: content.length });
+      console.log("[Viewer3dBlade] readRepoFile OK:", {
+        isBinary,
+        size,
+        contentLength: content.length,
+      });
 
       let arrayBuffer: ArrayBuffer;
 
@@ -93,7 +97,10 @@ export function Viewer3dBlade({ filePath }: Viewer3dBladeProps) {
             bytes[i] = binaryString.charCodeAt(i);
           }
           arrayBuffer = bytes.buffer as ArrayBuffer;
-          console.log("[Viewer3dBlade] Base64 decode OK, arrayBuffer byteLength:", arrayBuffer.byteLength);
+          console.log(
+            "[Viewer3dBlade] Base64 decode OK, arrayBuffer byteLength:",
+            arrayBuffer.byteLength,
+          );
         } catch (decodeErr) {
           console.error("[Viewer3dBlade] Base64 decode failed:", decodeErr);
           setFetchError(
@@ -106,8 +113,7 @@ export function Viewer3dBlade({ filePath }: Viewer3dBladeProps) {
         }
       } else {
         // Text (.gltf) — encode to ArrayBuffer
-        arrayBuffer = new TextEncoder().encode(content)
-          .buffer as ArrayBuffer;
+        arrayBuffer = new TextEncoder().encode(content).buffer as ArrayBuffer;
       }
 
       // Store the buffer for the Three.js effect to pick up
@@ -139,7 +145,10 @@ export function Viewer3dBlade({ filePath }: Viewer3dBladeProps) {
 
     let disposed = false;
     const arrayBuffer = bufferRef.current;
-    console.log("[Viewer3dBlade] Three.js setup starting, buffer byteLength:", arrayBuffer.byteLength);
+    console.log(
+      "[Viewer3dBlade] Three.js setup starting, buffer byteLength:",
+      arrayBuffer.byteLength,
+    );
 
     // Create renderer
     const renderer = new THREE.WebGLRenderer({
@@ -241,7 +250,9 @@ export function Viewer3dBlade({ filePath }: Viewer3dBladeProps) {
           controls.target.set(0, 0, 0);
           controls.update();
 
-          console.log("[Viewer3dBlade] Model parsed successfully, adding to scene");
+          console.log(
+            "[Viewer3dBlade] Model parsed successfully, adding to scene",
+          );
           setModelReady(true);
 
           // Show interaction hint on first ever load
@@ -255,9 +266,7 @@ export function Viewer3dBlade({ filePath }: Viewer3dBladeProps) {
           if (disposed) return;
           console.error("[Viewer3dBlade] GLTF parse error:", error);
           setFetchError(
-            error instanceof Error
-              ? error.message
-              : "Failed to parse 3D model",
+            error instanceof Error ? error.message : "Failed to parse 3D model",
           );
         },
       );
@@ -308,7 +317,7 @@ export function Viewer3dBlade({ filePath }: Viewer3dBladeProps) {
       canvas.removeEventListener("webglcontextrestored", handleContextRestored);
       sceneRef.current = null;
     };
-  }, [loading]);
+  }, [loading, fetchError]);
 
   // Auto-hide interaction hint
   useEffect(() => {
diff --git a/src/extensions/viewer-3d/manifest.json b/src/extensions/viewer-3d/manifest.json
index f122abca..2e7fd4c1 100644
--- a/src/extensions/viewer-3d/manifest.json
+++ b/src/extensions/viewer-3d/manifest.json
@@ -6,9 +6,7 @@
   "apiVersion": "1",
   "main": "index.ts",
   "contributes": {
-    "blades": [
-      { "type": "viewer-3d", "title": "3D Model" }
-    ],
+    "blades": [{ "type": "viewer-3d", "title": "3D Model" }],
     "commands": null,
     "toolbar": null
   },
diff --git a/src/extensions/viewer-code/blades/ViewerCodeBlade.tsx b/src/extensions/viewer-code/blades/ViewerCodeBlade.tsx
index 36773cb9..8ca81bc8 100644
--- a/src/extensions/viewer-code/blades/ViewerCodeBlade.tsx
+++ b/src/extensions/viewer-code/blades/ViewerCodeBlade.tsx
@@ -1,11 +1,14 @@
 import { Editor } from "@monaco-editor/react";
 import { FileCode } from "lucide-react";
 import { useRepoFile } from "../../../core/hooks/useRepoFile";
-import { MONACO_COMMON_OPTIONS, MONACO_THEME } from "../../../core/lib/monacoConfig";
+import {
+  MONACO_COMMON_OPTIONS,
+  MONACO_THEME,
+} from "../../../core/lib/monacoConfig";
 import "../../../core/lib/monacoTheme";
-import { BladeContentLoading } from "../../../core/blades/_shared/BladeContentLoading";
-import { BladeContentError } from "../../../core/blades/_shared/BladeContentError";
 import { BladeContentEmpty } from "../../../core/blades/_shared/BladeContentEmpty";
+import { BladeContentError } from "../../../core/blades/_shared/BladeContentError";
+import { BladeContentLoading } from "../../../core/blades/_shared/BladeContentLoading";
 
 interface ViewerCodeBladeProps {
   filePath: string;
@@ -44,7 +47,9 @@ export function ViewerCodeBlade({ filePath }: ViewerCodeBladeProps) {
     return (
       <div className="flex-1 flex flex-col items-center justify-center bg-ctp-mantle gap-3">
         <FileCode className="w-10 h-10 text-ctp-overlay0" />
-        <p className="text-sm text-ctp-subtext0">Binary file — preview not available</p>
+        <p className="text-sm text-ctp-subtext0">
+          Binary file — preview not available
+        </p>
         <p className="text-xs text-ctp-overlay0">{filePath}</p>
         <p className="text-xs text-ctp-overlay0">{sizeLabel}</p>
       </div>
diff --git a/src/extensions/viewer-code/manifest.json b/src/extensions/viewer-code/manifest.json
index 437fe1b1..3e1270e5 100644
--- a/src/extensions/viewer-code/manifest.json
+++ b/src/extensions/viewer-code/manifest.json
@@ -6,9 +6,7 @@
   "apiVersion": "1",
   "main": "index.ts",
   "contributes": {
-    "blades": [
-      { "type": "viewer-code", "title": "Code" }
-    ],
+    "blades": [{ "type": "viewer-code", "title": "Code" }],
     "commands": null,
     "toolbar": null
   },
diff --git a/src/extensions/viewer-image/manifest.json b/src/extensions/viewer-image/manifest.json
index 0304c930..405cf292 100644
--- a/src/extensions/viewer-image/manifest.json
+++ b/src/extensions/viewer-image/manifest.json
@@ -6,9 +6,7 @@
   "apiVersion": "1",
   "main": "index.ts",
   "contributes": {
-    "blades": [
-      { "type": "viewer-image", "title": "Image" }
-    ],
+    "blades": [{ "type": "viewer-image", "title": "Image" }],
     "commands": null,
     "toolbar": null
   },
diff --git a/src/extensions/viewer-markdown/blades/ViewerMarkdownBlade.tsx b/src/extensions/viewer-markdown/blades/ViewerMarkdownBlade.tsx
index f59fabb6..11f7c922 100644
--- a/src/extensions/viewer-markdown/blades/ViewerMarkdownBlade.tsx
+++ b/src/extensions/viewer-markdown/blades/ViewerMarkdownBlade.tsx
@@ -1,10 +1,10 @@
 import { FileText } from "lucide-react";
 import { useEffect, useRef } from "react";
-import { useRepoFile } from "../../../core/hooks/useRepoFile";
-import { BladeContentLoading } from "../../../core/blades/_shared/BladeContentLoading";
-import { BladeContentError } from "../../../core/blades/_shared/BladeContentError";
 import { BladeContentEmpty } from "../../../core/blades/_shared/BladeContentEmpty";
+import { BladeContentError } from "../../../core/blades/_shared/BladeContentError";
+import { BladeContentLoading } from "../../../core/blades/_shared/BladeContentLoading";
 import { MarkdownRenderer } from "../../../core/components/markdown/MarkdownRenderer";
+import { useRepoFile } from "../../../core/hooks/useRepoFile";
 
 interface ViewerMarkdownBladeProps {
   filePath: string;
@@ -18,7 +18,7 @@ export function ViewerMarkdownBlade({ filePath }: ViewerMarkdownBladeProps) {
   // move focus to the content container for keyboard users.
   useEffect(() => {
     containerRef.current?.focus();
-  }, [filePath]);
+  }, []);
 
   if (isLoading) {
     return <BladeContentLoading />;
@@ -51,10 +51,7 @@ export function ViewerMarkdownBlade({ filePath }: ViewerMarkdownBladeProps) {
       className="flex-1 overflow-y-auto h-full bg-ctp-base outline-none"
     >
       <div className="p-6 max-w-3xl mx-auto">
-        <MarkdownRenderer
-          content={data.content}
-          currentFilePath={filePath}
-        />
+        <MarkdownRenderer content={data.content} currentFilePath={filePath} />
       </div>
     </div>
   );
diff --git a/src/extensions/viewer-markdown/manifest.json b/src/extensions/viewer-markdown/manifest.json
index b3452c59..5204fdb6 100644
--- a/src/extensions/viewer-markdown/manifest.json
+++ b/src/extensions/viewer-markdown/manifest.json
@@ -6,9 +6,7 @@
   "apiVersion": "1",
   "main": "index.ts",
   "contributes": {
-    "blades": [
-      { "type": "viewer-markdown", "title": "Markdown" }
-    ],
+    "blades": [{ "type": "viewer-markdown", "title": "Markdown" }],
     "commands": null,
     "toolbar": null
   },
diff --git a/src/extensions/viewer-nupkg/blades/ViewerNupkgBlade.tsx b/src/extensions/viewer-nupkg/blades/ViewerNupkgBlade.tsx
index ebc052a0..09b6fbbf 100644
--- a/src/extensions/viewer-nupkg/blades/ViewerNupkgBlade.tsx
+++ b/src/extensions/viewer-nupkg/blades/ViewerNupkgBlade.tsx
@@ -1,5 +1,5 @@
-import { NugetPackageViewer } from "../components/NugetPackageViewer";
 import type { FileChange } from "../../../bindings";
+import { NugetPackageViewer } from "../components/NugetPackageViewer";
 
 interface ViewerNupkgBladeProps {
   filePath: string;
diff --git a/src/extensions/viewer-nupkg/manifest.json b/src/extensions/viewer-nupkg/manifest.json
index 869b0068..ebfb2270 100644
--- a/src/extensions/viewer-nupkg/manifest.json
+++ b/src/extensions/viewer-nupkg/manifest.json
@@ -6,9 +6,7 @@
   "apiVersion": "1",
   "main": "index.ts",
   "contributes": {
-    "blades": [
-      { "type": "viewer-nupkg", "title": "Package" }
-    ],
+    "blades": [{ "type": "viewer-nupkg", "title": "Package" }],
     "commands": null,
     "toolbar": null
   },
diff --git a/src/extensions/viewer-plaintext/blades/ViewerPlaintextBlade.tsx b/src/extensions/viewer-plaintext/blades/ViewerPlaintextBlade.tsx
index 32d6ab73..4dde1cbe 100644
--- a/src/extensions/viewer-plaintext/blades/ViewerPlaintextBlade.tsx
+++ b/src/extensions/viewer-plaintext/blades/ViewerPlaintextBlade.tsx
@@ -1,8 +1,8 @@
 import { FileText } from "lucide-react";
-import { useRepoFile } from "../../../core/hooks/useRepoFile";
-import { BladeContentLoading } from "../../../core/blades/_shared/BladeContentLoading";
-import { BladeContentError } from "../../../core/blades/_shared/BladeContentError";
 import { BladeContentEmpty } from "../../../core/blades/_shared/BladeContentEmpty";
+import { BladeContentError } from "../../../core/blades/_shared/BladeContentError";
+import { BladeContentLoading } from "../../../core/blades/_shared/BladeContentLoading";
+import { useRepoFile } from "../../../core/hooks/useRepoFile";
 
 interface ViewerPlaintextBladeProps {
   filePath: string;
diff --git a/src/extensions/viewer-plaintext/manifest.json b/src/extensions/viewer-plaintext/manifest.json
index b03119d4..f478988f 100644
--- a/src/extensions/viewer-plaintext/manifest.json
+++ b/src/extensions/viewer-plaintext/manifest.json
@@ -6,9 +6,7 @@
   "apiVersion": "1",
   "main": "index.ts",
   "contributes": {
-    "blades": [
-      { "type": "viewer-plaintext", "title": "Plain Text" }
-    ],
+    "blades": [{ "type": "viewer-plaintext", "title": "Plain Text" }],
     "commands": null,
     "toolbar": null
   },
diff --git a/src/extensions/welcome-screen/blades/WelcomeBlade.tsx b/src/extensions/welcome-screen/blades/WelcomeBlade.tsx
index ad8344e8..f6b88dc8 100644
--- a/src/extensions/welcome-screen/blades/WelcomeBlade.tsx
+++ b/src/extensions/welcome-screen/blades/WelcomeBlade.tsx
@@ -9,7 +9,8 @@ export function WelcomeBlade() {
   // (e.g. Settings, Extension Manager from command palette or toolbar)
   const actorRef = useNavigationActorRef();
   const bladeStack = useSelector(actorRef, selectBladeStack);
-  const pushedBlade = bladeStack.length > 1 ? bladeStack[bladeStack.length - 1] : null;
+  const pushedBlade =
+    bladeStack.length > 1 ? bladeStack[bladeStack.length - 1] : null;
 
   // Show blades pushed via command palette / toolbar while on WelcomeView
   if (pushedBlade) {
diff --git a/src/extensions/welcome-screen/components/GitInitBanner.tsx b/src/extensions/welcome-screen/components/GitInitBanner.tsx
index 26742a84..ffe7403f 100644
--- a/src/extensions/welcome-screen/components/GitInitBanner.tsx
+++ b/src/extensions/welcome-screen/components/GitInitBanner.tsx
@@ -9,9 +9,12 @@ interface GitInitBannerProps {
   onSetup: () => void;
 }
 
-export function GitInitBanner({ path, onDismiss, onSetup }: GitInitBannerProps) {
-  const folderName =
-    path.split("/").pop() || path.split("\\").pop() || path;
+export function GitInitBanner({
+  path,
+  onDismiss,
+  onSetup,
+}: GitInitBannerProps) {
+  const folderName = path.split("/").pop() || path.split("\\").pop() || path;
 
   return (
     <motion.div
diff --git a/src/extensions/welcome-screen/components/GitInitFallbackBanner.tsx b/src/extensions/welcome-screen/components/GitInitFallbackBanner.tsx
index e2a5f6fd..239ec5dc 100644
--- a/src/extensions/welcome-screen/components/GitInitFallbackBanner.tsx
+++ b/src/extensions/welcome-screen/components/GitInitFallbackBanner.tsx
@@ -1,8 +1,8 @@
 import { motion } from "framer-motion";
 import { FolderGit2, GitBranch, Info, Loader2 } from "lucide-react";
 import { useState } from "react";
-import { commands } from "../../../bindings";
 import { fadeInUp } from "@/framework/theme/animations";
+import { commands } from "../../../bindings";
 import { Button } from "../../../core/components/ui/button";
 
 interface GitInitFallbackBannerProps {
@@ -16,8 +16,7 @@ export function GitInitFallbackBanner({
   onDismiss,
   onComplete,
 }: GitInitFallbackBannerProps) {
-  const folderName =
-    path.split("/").pop() || path.split("\\").pop() || path;
+  const folderName = path.split("/").pop() || path.split("\\").pop() || path;
 
   const [isInitializing, setIsInitializing] = useState(false);
   const [error, setError] = useState<string | null>(null);
@@ -33,7 +32,9 @@ export function GitInitFallbackBanner({
       }
       onComplete(path);
     } catch (e) {
-      setError(e instanceof Error ? e.message : "Failed to initialize repository");
+      setError(
+        e instanceof Error ? e.message : "Failed to initialize repository",
+      );
     } finally {
       setIsInitializing(false);
     }
@@ -60,9 +61,7 @@ export function GitInitFallbackBanner({
         </div>
       </div>
 
-      {error && (
-        <div className="ml-8 text-sm text-ctp-red">{error}</div>
-      )}
+      {error && <div className="ml-8 text-sm text-ctp-red">{error}</div>}
 
       <div className="ml-8 flex gap-2">
         <Button
@@ -84,7 +83,12 @@ export function GitInitFallbackBanner({
             </>
           )}
         </Button>
-        <Button variant="ghost" size="sm" onClick={onDismiss} disabled={isInitializing}>
+        <Button
+          variant="ghost"
+          size="sm"
+          onClick={onDismiss}
+          disabled={isInitializing}
+        >
           Dismiss
         </Button>
       </div>
diff --git a/src/extensions/welcome-screen/components/RecentRepos.tsx b/src/extensions/welcome-screen/components/RecentRepos.tsx
index 6ac321a4..eb341bb4 100644
--- a/src/extensions/welcome-screen/components/RecentRepos.tsx
+++ b/src/extensions/welcome-screen/components/RecentRepos.tsx
@@ -1,11 +1,14 @@
-import { useCallback } from "react";
 import { Clock, Pin } from "lucide-react";
-import { type RecentRepo, useRecentRepos } from "../../../core/hooks/useRecentRepos";
+import { useCallback } from "react";
+import { commands } from "../../../bindings";
+import {
+  type RecentRepo,
+  useRecentRepos,
+} from "../../../core/hooks/useRecentRepos";
 import { useGitOpsStore as useRepositoryStore } from "../../../core/stores/domain/git-ops";
 import { usePreferencesStore } from "../../../core/stores/domain/preferences";
-import { commands } from "../../../bindings";
-import { RepoCard } from "./RepoCard";
 import { useRepoHealth } from "../hooks/useRepoHealth";
+import { RepoCard } from "./RepoCard";
 
 interface RecentReposProps {
   onRepoOpened?: () => void;
@@ -15,7 +18,9 @@ export function RecentRepos({ onRepoOpened }: RecentReposProps) {
   const { recentRepos, isLoading, removeRecentRepo, addRecentRepo, togglePin } =
     useRecentRepos();
   const { openRepository } = useRepositoryStore();
-  const terminal = usePreferencesStore((s) => s.settingsData.integrations.terminal);
+  const terminal = usePreferencesStore(
+    (s) => s.settingsData.integrations.terminal,
+  );
   const healthMap = useRepoHealth(recentRepos);
 
   const handleOpenInTerminal = useCallback(
diff --git a/src/extensions/welcome-screen/components/RepoCard.tsx b/src/extensions/welcome-screen/components/RepoCard.tsx
index 899d4a6a..e3a11b71 100644
--- a/src/extensions/welcome-screen/components/RepoCard.tsx
+++ b/src/extensions/welcome-screen/components/RepoCard.tsx
@@ -1,8 +1,8 @@
 import { Folder, FolderOpen, Pin, Terminal, X } from "lucide-react";
-import type { RecentRepo } from "../../../core/hooks/useRecentRepos";
 import { Button } from "../../../core/components/ui/button";
-import { HealthDot } from "./HealthDot";
+import type { RecentRepo } from "../../../core/hooks/useRecentRepos";
 import type { RepoHealthStatus } from "../hooks/useRepoHealth";
+import { HealthDot } from "./HealthDot";
 
 interface RepoCardProps {
   repo: RecentRepo;
@@ -79,9 +79,7 @@ export function RepoCard({
         }}
         aria-label={repo.isPinned ? "Unpin repository" : "Pin repository"}
       >
-        <Pin
-          className={`w-4 h-4 ${repo.isPinned ? "rotate-45" : ""}`}
-        />
+        <Pin className={`w-4 h-4 ${repo.isPinned ? "rotate-45" : ""}`} />
       </Button>
       {/* Open button */}
       <Button
diff --git a/src/extensions/welcome-screen/components/WelcomeContent.tsx b/src/extensions/welcome-screen/components/WelcomeContent.tsx
index 52c1e11e..69488b3d 100644
--- a/src/extensions/welcome-screen/components/WelcomeContent.tsx
+++ b/src/extensions/welcome-screen/components/WelcomeContent.tsx
@@ -1,30 +1,41 @@
 import { open } from "@tauri-apps/plugin-dialog";
 import { motion } from "framer-motion";
 import { AlertCircle, FolderOpen, GitFork } from "lucide-react";
-import appIcon from "../../../../src-tauri/icons/icon.png";
 import { Suspense, useCallback, useEffect, useState } from "react";
+import { useBladeRegistry } from "@/framework/layout/bladeRegistry";
+import {
+  fadeInUp,
+  staggerContainer,
+  staggerItem,
+} from "@/framework/theme/animations";
+import appIcon from "../../../../src-tauri/icons/icon.png";
 import { commands } from "../../../bindings";
+import { Button } from "../../../core/components/ui/button";
 import { useRecentRepos } from "../../../core/hooks/useRecentRepos";
-import { fadeInUp, staggerContainer, staggerItem } from "@/framework/theme/animations";
-import { useBladeRegistry } from "@/framework/layout/bladeRegistry";
 import { modKeyLabel } from "../../../core/lib/platform";
 import { useGitOpsStore as useRepositoryStore } from "../../../core/stores/domain/git-ops";
 import { CloneForm } from "../../../extensions/repository/components/CloneForm";
-import { Button } from "../../../core/components/ui/button";
 import { AnimatedGradientBg } from "./AnimatedGradientBg";
 import { GitInitBanner } from "./GitInitBanner";
 import { GitInitFallbackBanner } from "./GitInitFallbackBanner";
 import { RecentRepos } from "./RecentRepos";
 
 export function WelcomeContent() {
-  const { openRepository, repoIsLoading: isLoading, repoError: error, clearRepoError: clearError } = useRepositoryStore();
+  const {
+    openRepository,
+    repoIsLoading: isLoading,
+    repoError: error,
+    clearRepoError: clearError,
+  } = useRepositoryStore();
   const { addRecentRepo } = useRecentRepos();
   const [isDragOver, setIsDragOver] = useState(false);
   const [showCloneForm, setShowCloneForm] = useState(false);
   const [pendingInitPath, setPendingInitPath] = useState<string | null>(null);
   const [showInitRepo, setShowInitRepo] = useState(false);
 
-  const initRepoRegistration = useBladeRegistry((s) => s.items.get("init-repo"));
+  const initRepoRegistration = useBladeRegistry((s) =>
+    s.items.get("init-repo"),
+  );
 
   // Mid-session disable recovery: if user is viewing Init Repo blade
   // and the extension is disabled, reset to prevent stuck loading screen
@@ -262,8 +273,10 @@ export function WelcomeContent() {
           </motion.div>
         )}
 
-        {pendingInitPath && !error && !showInitRepo && (
-          initRepoRegistration ? (
+        {pendingInitPath &&
+          !error &&
+          !showInitRepo &&
+          (initRepoRegistration ? (
             <GitInitBanner
               path={pendingInitPath}
               onDismiss={() => setPendingInitPath(null)}
@@ -279,8 +292,7 @@ export function WelcomeContent() {
                 setPendingInitPath(null);
               }}
             />
-          )
-        )}
+          ))}
 
         {/* Recent repos */}
         <motion.div variants={staggerItem}>
diff --git a/src/extensions/welcome-screen/index.ts b/src/extensions/welcome-screen/index.ts
index eb80a844..6ea6b2e4 100644
--- a/src/extensions/welcome-screen/index.ts
+++ b/src/extensions/welcome-screen/index.ts
@@ -5,7 +5,7 @@ export async function onActivate(api: ExtensionAPI): Promise<void> {
   const WelcomeBlade = lazy(() =>
     import("./blades/WelcomeBlade").then((m) => ({
       default: m.WelcomeBlade,
-    }))
+    })),
   );
 
   api.registerBlade({
diff --git a/src/extensions/worktrees/components/CreateWorktreeDialog.tsx b/src/extensions/worktrees/components/CreateWorktreeDialog.tsx
index f395a729..4299b559 100644
--- a/src/extensions/worktrees/components/CreateWorktreeDialog.tsx
+++ b/src/extensions/worktrees/components/CreateWorktreeDialog.tsx
@@ -1,8 +1,6 @@
 import { open } from "@tauri-apps/plugin-dialog";
 import { Folder } from "lucide-react";
 import { useEffect, useState } from "react";
-import { useGitOpsStore as useBranchStore } from "../../../core/stores/domain/git-ops";
-import { useGitOpsStore as useWorktreeStore } from "../../../core/stores/domain/git-ops";
 import { Button } from "../../../core/components/ui/button";
 import {
   Dialog,
@@ -12,6 +10,10 @@ import {
   DialogTitle,
 } from "../../../core/components/ui/dialog";
 import { Input } from "../../../core/components/ui/input";
+import {
+  useGitOpsStore as useBranchStore,
+  useGitOpsStore as useWorktreeStore,
+} from "../../../core/stores/domain/git-ops";
 
 interface CreateWorktreeDialogProps {
   open: boolean;
@@ -23,7 +25,12 @@ export function CreateWorktreeDialog({
   onOpenChange,
 }: CreateWorktreeDialogProps) {
   const { branchList: branches, loadBranches } = useBranchStore();
-  const { createWorktree, worktreeIsLoading: isLoading, worktreeError: error, clearWorktreeError: clearError } = useWorktreeStore();
+  const {
+    createWorktree,
+    worktreeIsLoading: isLoading,
+    worktreeError: error,
+    clearWorktreeError: clearError,
+  } = useWorktreeStore();
 
   const [name, setName] = useState("");
   const [path, setPath] = useState("");
@@ -73,7 +80,9 @@ export function CreateWorktreeDialog({
     const result = await createWorktree({
       name: name.trim(),
       path: path.trim(),
-      branch: createNewBranch ? newBranchName.trim() || null : selectedBranch || null,
+      branch: createNewBranch
+        ? newBranchName.trim() || null
+        : selectedBranch || null,
       createBranch: createNewBranch,
     });
 
diff --git a/src/extensions/worktrees/components/DeleteWorktreeDialog.tsx b/src/extensions/worktrees/components/DeleteWorktreeDialog.tsx
index abc5a924..97225be7 100644
--- a/src/extensions/worktrees/components/DeleteWorktreeDialog.tsx
+++ b/src/extensions/worktrees/components/DeleteWorktreeDialog.tsx
@@ -1,7 +1,5 @@
 import { AlertTriangle } from "lucide-react";
 import { useMemo, useState } from "react";
-import { useGitOpsStore as useBranchStore } from "../../../core/stores/domain/git-ops";
-import { useGitOpsStore as useWorktreeStore } from "../../../core/stores/domain/git-ops";
 import { Button } from "../../../core/components/ui/button";
 import {
   Dialog,
@@ -10,6 +8,10 @@ import {
   DialogHeader,
   DialogTitle,
 } from "../../../core/components/ui/dialog";
+import {
+  useGitOpsStore as useBranchStore,
+  useGitOpsStore as useWorktreeStore,
+} from "../../../core/stores/domain/git-ops";
 
 interface DeleteWorktreeDialogProps {
   worktreeName: string | null;
@@ -20,8 +22,13 @@ export function DeleteWorktreeDialog({
   worktreeName,
   onOpenChange,
 }: DeleteWorktreeDialogProps) {
-  const { worktreeList: worktrees, deleteWorktree, worktreeIsLoading: isLoading, worktreeError: error, clearWorktreeError: clearError } =
-    useWorktreeStore();
+  const {
+    worktreeList: worktrees,
+    deleteWorktree,
+    worktreeIsLoading: isLoading,
+    worktreeError: error,
+    clearWorktreeError: clearError,
+  } = useWorktreeStore();
   const { branchList: branches } = useBranchStore();
 
   const [deleteBranch, setDeleteBranch] = useState(false);
@@ -29,7 +36,7 @@ export function DeleteWorktreeDialog({
 
   const worktree = useMemo(
     () => worktrees.find((wt) => wt.name === worktreeName),
-    [worktrees, worktreeName]
+    [worktrees, worktreeName],
   );
 
   // Check if branch is merged (can be safely deleted)
@@ -45,7 +52,11 @@ export function DeleteWorktreeDialog({
   const handleDelete = async () => {
     if (!worktreeName) return;
 
-    const success = await deleteWorktree(worktreeName, forceDelete, deleteBranch);
+    const success = await deleteWorktree(
+      worktreeName,
+      forceDelete,
+      deleteBranch,
+    );
 
     if (success) {
       onOpenChange(false);
diff --git a/src/extensions/worktrees/components/WorktreeItem.tsx b/src/extensions/worktrees/components/WorktreeItem.tsx
index 0350bce4..bfe44611 100644
--- a/src/extensions/worktrees/components/WorktreeItem.tsx
+++ b/src/extensions/worktrees/components/WorktreeItem.tsx
@@ -5,8 +5,8 @@ import {
   Home,
   Trash2,
 } from "lucide-react";
-import type { WorktreeInfo } from "../../../bindings";
 import { cn } from "@/framework/lib/utils";
+import type { WorktreeInfo } from "../../../bindings";
 
 interface WorktreeItemProps {
   worktree: WorktreeInfo;
diff --git a/src/extensions/worktrees/components/WorktreeSidebarPanel.tsx b/src/extensions/worktrees/components/WorktreeSidebarPanel.tsx
index 98beb4c4..23afebfa 100644
--- a/src/extensions/worktrees/components/WorktreeSidebarPanel.tsx
+++ b/src/extensions/worktrees/components/WorktreeSidebarPanel.tsx
@@ -1,7 +1,7 @@
 import { useEffect, useState } from "react";
-import { WorktreePanel } from "./WorktreePanel";
 import { CreateWorktreeDialog } from "./CreateWorktreeDialog";
 import { DeleteWorktreeDialog } from "./DeleteWorktreeDialog";
+import { WorktreePanel } from "./WorktreePanel";
 
 export function WorktreeSidebarPanel() {
   const [showCreate, setShowCreate] = useState(false);
@@ -11,16 +11,14 @@ export function WorktreeSidebarPanel() {
   useEffect(() => {
     const handler = () => setShowCreate(true);
     document.addEventListener("worktree:open-create-dialog", handler);
-    return () => document.removeEventListener("worktree:open-create-dialog", handler);
+    return () =>
+      document.removeEventListener("worktree:open-create-dialog", handler);
   }, []);
 
   return (
     <>
       <WorktreePanel onOpenDeleteDialog={setDeleteTarget} />
-      <CreateWorktreeDialog
-        open={showCreate}
-        onOpenChange={setShowCreate}
-      />
+      <CreateWorktreeDialog open={showCreate} onOpenChange={setShowCreate} />
       <DeleteWorktreeDialog
         worktreeName={deleteTarget}
         onOpenChange={(open) => !open && setDeleteTarget(null)}
diff --git a/src/extensions/worktrees/manifest.json b/src/extensions/worktrees/manifest.json
index 1c5a5a18..9b642a1a 100644
--- a/src/extensions/worktrees/manifest.json
+++ b/src/extensions/worktrees/manifest.json
@@ -8,8 +8,16 @@
   "contributes": {
     "blades": null,
     "commands": [
-      { "id": "create-worktree", "title": "Create Worktree", "category": "Worktrees" },
-      { "id": "refresh-worktrees", "title": "Refresh Worktrees", "category": "Worktrees" }
+      {
+        "id": "create-worktree",
+        "title": "Create Worktree",
+        "category": "Worktrees"
+      },
+      {
+        "id": "refresh-worktrees",
+        "title": "Refresh Worktrees",
+        "category": "Worktrees"
+      }
     ],
     "toolbar": null,
     "sidebarPanels": [
diff --git a/src/framework/command-palette/commandRegistry.ts b/src/framework/command-palette/commandRegistry.ts
index d3528a43..2b3aff3a 100644
--- a/src/framework/command-palette/commandRegistry.ts
+++ b/src/framework/command-palette/commandRegistry.ts
@@ -61,8 +61,8 @@ export const useCommandRegistry = _useCommandRegistry;
 // --- Standalone query functions ---
 
 export function getEnabled(): Command[] {
-  return Array.from(useCommandRegistry.getState().items.values()).filter((cmd) =>
-    cmd.enabled ? cmd.enabled() : true,
+  return Array.from(useCommandRegistry.getState().items.values()).filter(
+    (cmd) => (cmd.enabled ? cmd.enabled() : true),
   );
 }
 
diff --git a/src/framework/command-palette/components/CommandPalette.tsx b/src/framework/command-palette/components/CommandPalette.tsx
index 980fd46f..c2cd1965 100644
--- a/src/framework/command-palette/components/CommandPalette.tsx
+++ b/src/framework/command-palette/components/CommandPalette.tsx
@@ -1,8 +1,8 @@
 import { AnimatePresence, motion, useReducedMotion } from "framer-motion";
 import { Search } from "lucide-react";
 import { useEffect, useMemo, useRef } from "react";
-import { useCommandRegistry, getOrderedCategories } from "../commandRegistry";
 import type { CommandCategory } from "../commandRegistry";
+import { getOrderedCategories, useCommandRegistry } from "../commandRegistry";
 import { searchCommands } from "../fuzzySearch";
 import { usePaletteStore as useCommandPaletteStore } from "../paletteStore";
 import { CommandPaletteItem } from "./CommandPaletteItem";
@@ -25,7 +25,10 @@ export function CommandPalette() {
   const commandsMap = useCommandRegistry((s) => s.items);
 
   const enabledCommands = useMemo(
-    () => Array.from(commandsMap.values()).filter((cmd) => (cmd.enabled ? cmd.enabled() : true)),
+    () =>
+      Array.from(commandsMap.values()).filter((cmd) =>
+        cmd.enabled ? cmd.enabled() : true,
+      ),
     [commandsMap],
   );
   const results = useMemo(
@@ -40,14 +43,16 @@ export function CommandPalette() {
     for (const item of results) {
       const cat = item.command.category;
       if (!groups.has(cat)) groups.set(cat, []);
-      groups.get(cat)!.push(item);
+      groups.get(cat)?.push(item);
     }
     // Sort groups by category order (core first, then extension alphabetically)
-    return getOrderedCategories().filter((cat) => groups.has(cat as CommandCategory)).map((cat) => ({
-      category: cat,
-      items: groups.get(cat)!,
-    }));
-  }, [results, query, commandsMap]);
+    return getOrderedCategories()
+      .filter((cat) => groups.has(cat as CommandCategory))
+      .map((cat) => ({
+        category: cat,
+        items: groups.get(cat)!,
+      }));
+  }, [results, query]);
 
   // Clamp selectedIndex when results list shrinks (e.g., extension disabled while palette open)
   useEffect(() => {
@@ -173,7 +178,6 @@ export function CommandPalette() {
               {/* Results list */}
               <ul
                 id="command-palette-list"
-                role="listbox"
                 aria-label="Commands"
                 className="max-h-80 overflow-y-auto py-1"
               >
@@ -191,7 +195,6 @@ export function CommandPalette() {
                             return (
                               <li
                                 key={scored.command.id}
-                                role="option"
                                 id={`cmd-${scored.command.id}`}
                                 aria-selected={currentIndex === selectedIndex}
                               >
@@ -213,7 +216,6 @@ export function CommandPalette() {
                     results.map((scored, i) => (
                       <li
                         key={scored.command.id}
-                        role="option"
                         id={`cmd-${scored.command.id}`}
                         aria-selected={i === selectedIndex}
                       >
diff --git a/src/framework/command-palette/components/CommandPaletteItem.tsx b/src/framework/command-palette/components/CommandPaletteItem.tsx
index 94365a0a..ef4ea83d 100644
--- a/src/framework/command-palette/components/CommandPaletteItem.tsx
+++ b/src/framework/command-palette/components/CommandPaletteItem.tsx
@@ -1,6 +1,6 @@
 import type { Command } from "../commandRegistry";
-import { highlightMatches } from "../fuzzySearch";
 import { formatShortcut } from "../formatShortcut";
+import { highlightMatches } from "../fuzzySearch";
 
 interface CommandPaletteItemProps {
   command: Command;
diff --git a/src/framework/command-palette/fuzzySearch.ts b/src/framework/command-palette/fuzzySearch.ts
index efa49421..9985c42f 100644
--- a/src/framework/command-palette/fuzzySearch.ts
+++ b/src/framework/command-palette/fuzzySearch.ts
@@ -12,7 +12,11 @@ export function searchCommands(
 ): ScoredCommand[] {
   const trimmed = query.trim();
   if (!trimmed) {
-    return commands.map((command) => ({ command, score: 0, matchedRanges: [] }));
+    return commands.map((command) => ({
+      command,
+      score: 0,
+      matchedRanges: [],
+    }));
   }
 
   const q = trimmed.toLowerCase();
@@ -60,9 +64,7 @@ export function searchCommands(
     }
 
     // Keywords match
-    if (
-      command.keywords?.some((kw) => kw.toLowerCase().includes(q))
-    ) {
+    if (command.keywords?.some((kw) => kw.toLowerCase().includes(q))) {
       results.push({ command, score: 35, matchedRanges: [] });
       continue;
     }
@@ -71,7 +73,6 @@ export function searchCommands(
     const ranges = fuzzyMatch(q, command.title);
     if (ranges) {
       results.push({ command, score: 20, matchedRanges: ranges });
-      continue;
     }
   }
 
@@ -104,7 +105,10 @@ export function fuzzyMatch(
 
   // Close any open range
   if (rangeStart !== -1) {
-    ranges.push([rangeStart, rangeStart + (qi - ranges.reduce((sum, r) => sum + (r[1] - r[0]), 0))]);
+    ranges.push([
+      rangeStart,
+      rangeStart + (qi - ranges.reduce((sum, r) => sum + (r[1] - r[0]), 0)),
+    ]);
   }
 
   return ranges;
diff --git a/src/framework/command-palette/index.ts b/src/framework/command-palette/index.ts
index b7fbeba8..1a25eedb 100644
--- a/src/framework/command-palette/index.ts
+++ b/src/framework/command-palette/index.ts
@@ -1,30 +1,27 @@
 export {
-  type CoreCommandCategory,
-  type CommandCategory,
   type Command,
-  getEnabled,
+  type CommandCategory,
+  type CoreCommandCategory,
+  executeCommand,
   getById,
+  getCommandById,
+  getCommands,
+  getEnabled,
+  getEnabledCommands,
+  getOrderedCategories,
   getOrderedCommandCategories,
-  useCommandRegistry,
   registerCommand,
   unregisterCommand,
   unregisterCommandsBySource,
-  getCommands,
-  getEnabledCommands,
-  getCommandById,
-  executeCommand,
-  getOrderedCategories,
+  useCommandRegistry,
 } from "./commandRegistry";
-
+export { CommandPalette } from "./components";
+export { formatShortcut } from "./formatShortcut";
 export {
-  type ScoredCommand,
-  searchCommands,
   fuzzyMatch,
   highlightMatches,
+  type ScoredCommand,
+  searchCommands,
 } from "./fuzzySearch";
 
-export { CommandPalette } from "./components";
-
-export { formatShortcut } from "./formatShortcut";
-
-export { usePaletteStore, type PaletteState } from "./paletteStore";
+export { type PaletteState, usePaletteStore } from "./paletteStore";
diff --git a/src/framework/command-palette/paletteStore.ts b/src/framework/command-palette/paletteStore.ts
index 6d755027..3b1c4c5d 100644
--- a/src/framework/command-palette/paletteStore.ts
+++ b/src/framework/command-palette/paletteStore.ts
@@ -54,11 +54,7 @@ export const usePaletteStore = create<PaletteState>()(
           "palette/setQuery",
         ),
       setPaletteSelectedIndex: (index) =>
-        set(
-          { paletteSelectedIndex: index },
-          false,
-          "palette/setSelectedIndex",
-        ),
+        set({ paletteSelectedIndex: index }, false, "palette/setSelectedIndex"),
     }),
     { name: "command-palette", enabled: import.meta.env.DEV },
   ),
diff --git a/src/framework/extension-system/ExtensionAPI.ts b/src/framework/extension-system/ExtensionAPI.ts
index ce6889c0..a77dae2b 100644
--- a/src/framework/extension-system/ExtensionAPI.ts
+++ b/src/framework/extension-system/ExtensionAPI.ts
@@ -1,41 +1,34 @@
-import type { ComponentType, ReactNode } from "react";
 import type { LucideIcon } from "lucide-react";
+import type { ComponentType, ReactNode } from "react";
 import type { AnyActorRef, AnyStateMachine, Subscription } from "xstate";
 import { createActor } from "xstate";
 import {
-  registerBlade,
-  unregisterBlade,
-  type BladeRenderContext,
-} from "../layout/bladeRegistry";
-import {
+  type CommandCategory,
   registerCommand,
   unregisterCommand,
-  type CommandCategory,
 } from "../command-palette/commandRegistry";
 import {
-  useMachineRegistry,
-  type MachineRegistryEntry,
-} from "./machineRegistry";
-import { useToolbarRegistry, type ToolbarGroup } from "./toolbarRegistry";
+  type BladeRenderContext,
+  registerBlade,
+  unregisterBlade,
+} from "../layout/bladeRegistry";
+import { getNavigationActor } from "../layout/navigation/context";
+import type { LastAction } from "../layout/navigation/types";
+import { useSidebarPanelRegistry } from "../layout/sidebarPanelRegistry";
 import {
-  useContextMenuRegistry,
-  type ContextMenuLocation,
   type ContextMenuContext,
+  type ContextMenuLocation,
+  useContextMenuRegistry,
 } from "./contextMenuRegistry";
-import { useSidebarPanelRegistry } from "../layout/sidebarPanelRegistry";
+import { type EventHandler, extensionEventBus } from "./eventBus";
+import { useMachineRegistry } from "./machineRegistry";
+import type { DidHandler, OperationBus, WillHandler } from "./operationBus";
+import { ExtensionSettings } from "./settings";
 import {
-  useStatusBarRegistry,
   type StatusBarAlignment,
+  useStatusBarRegistry,
 } from "./statusBarRegistry";
-import {
-  OperationBus,
-  type DidHandler,
-  type WillHandler,
-} from "./operationBus";
-import { getNavigationActor } from "../layout/navigation/context";
-import type { LastAction } from "../layout/navigation/types";
-import { ExtensionSettings } from "./settings";
-import { extensionEventBus, type EventHandler } from "./eventBus";
+import { type ToolbarGroup, useToolbarRegistry } from "./toolbarRegistry";
 
 // --- Navigation event type for extensions ---
 
@@ -342,7 +335,10 @@ export class ExtensionAPI {
         handler({
           action: lastAction,
           blade: topBlade
-            ? { type: topBlade.type, props: topBlade.props as Record<string, unknown> }
+            ? {
+                type: topBlade.type,
+                props: topBlade.props as Record<string, unknown>,
+              }
             : { type: "", props: {} },
           stackDepth: bladeStack.length,
         });
@@ -462,9 +458,7 @@ export class ExtensionAPI {
     for (const id of this.registeredCommands) {
       unregisterCommand(id);
     }
-    useToolbarRegistry
-      .getState()
-      .unregisterBySource(`ext:${this.extensionId}`);
+    useToolbarRegistry.getState().unregisterBySource(`ext:${this.extensionId}`);
 
     // 2. New UI registries (context menu, sidebar, status bar)
     useContextMenuRegistry
@@ -498,9 +492,7 @@ export class ExtensionAPI {
         );
       }
     }
-    useMachineRegistry
-      .getState()
-      .unregisterBySource(`ext:${this.extensionId}`);
+    useMachineRegistry.getState().unregisterBySource(`ext:${this.extensionId}`);
 
     // 4. Extension event bus
     extensionEventBus.removeAllForSource(this.extensionId);
diff --git a/src/framework/extension-system/ExtensionHost.ts b/src/framework/extension-system/ExtensionHost.ts
index 560d115e..36488bf7 100644
--- a/src/framework/extension-system/ExtensionHost.ts
+++ b/src/framework/extension-system/ExtensionHost.ts
@@ -1,11 +1,11 @@
+import { convertFileSrc } from "@tauri-apps/api/core";
 import { create } from "zustand";
 import { devtools } from "zustand/middleware";
-import { convertFileSrc } from "@tauri-apps/api/core";
-import { toast } from "../stores/toast";
 import { getStore } from "../stores/persistence/tauri";
+import { toast } from "../stores/toast";
 import { ExtensionAPI } from "./ExtensionAPI";
-import type { BuiltInExtensionConfig, ExtensionInfo } from "./types";
 import type { ExtensionManifest } from "./manifest";
+import type { BuiltInExtensionConfig, ExtensionInfo } from "./types";
 
 // ---------------------------------------------------------------------------
 // Dependency Injection
@@ -13,7 +13,12 @@ import type { ExtensionManifest } from "./manifest";
 
 interface ExtensionHostDeps {
   /** Discover extensions on the filesystem and return their manifests. */
-  discoverExtensions: (path: string) => Promise<{ status: "ok"; data: ExtensionManifest[] } | { status: "error"; error: string }>;
+  discoverExtensions: (
+    path: string,
+  ) => Promise<
+    | { status: "ok"; data: ExtensionManifest[] }
+    | { status: "error"; error: string }
+  >;
 }
 
 let hostDeps: ExtensionHostDeps | null = null;
@@ -76,11 +81,15 @@ interface ExtensionHostState {
 // ---------------------------------------------------------------------------
 
 /** Persist disabled extension IDs to tauri-plugin-store */
-async function persistDisabledExtensions(extensions: Map<string, ExtensionInfo>): Promise<void> {
+async function persistDisabledExtensions(
+  extensions: Map<string, ExtensionInfo>,
+): Promise<void> {
   try {
     const store = await getStore();
     const disabledIds = Array.from(extensions.values())
-      .filter((ext) => ext.status === "deactivated" || ext.status === "disabled")
+      .filter(
+        (ext) => ext.status === "deactivated" || ext.status === "disabled",
+      )
       .map((ext) => ext.id);
     await store.set("disabledExtensions", disabledIds);
     await store.save();
@@ -136,16 +145,13 @@ export const useExtensionHost = create<ExtensionHostState>()(
       discoverExtensions: async (repoPath: string) => {
         set({ isDiscovering: true }, false, "extension-host/discover:start");
 
-        const extensionsDir = repoPath + "/.flowforge/extensions";
+        const extensionsDir = `${repoPath}/.flowforge/extensions`;
 
         try {
           const result = await getHostDeps().discoverExtensions(extensionsDir);
 
           if (result.status === "error") {
-            console.error(
-              "Extension discovery failed:",
-              result.error,
-            );
+            console.error("Extension discovery failed:", result.error);
             toast.error(`Extension discovery failed: ${result.error}`);
             set(
               { isDiscovering: false },
@@ -198,11 +204,7 @@ export const useExtensionHost = create<ExtensionHostState>()(
           );
         } catch (e) {
           console.error("Extension discovery threw:", e);
-          set(
-            { isDiscovering: false },
-            false,
-            "extension-host/discover:error",
-          );
+          set({ isDiscovering: false }, false, "extension-host/discover:error");
         }
       },
 
@@ -212,7 +214,13 @@ export const useExtensionHost = create<ExtensionHostState>()(
 
       activateExtension: async (id: string) => {
         const ext = get().extensions.get(id);
-        if (!ext || (ext.status !== "discovered" && ext.status !== "disabled" && ext.status !== "deactivated")) return;
+        if (
+          !ext ||
+          (ext.status !== "discovered" &&
+            ext.status !== "disabled" &&
+            ext.status !== "deactivated")
+        )
+          return;
 
         // Built-in extensions use their stored config instead of filesystem import
         const builtInConfig = builtInConfigs.get(id);
@@ -222,15 +230,25 @@ export const useExtensionHost = create<ExtensionHostState>()(
           try {
             await builtInConfig.activate(api);
             extensionApis.set(id, api);
-            extensionModules.set(id, { onDeactivate: builtInConfig.deactivate });
-            updateExtension(get, set, id, { status: "active", error: undefined });
+            extensionModules.set(id, {
+              onDeactivate: builtInConfig.deactivate,
+            });
+            updateExtension(get, set, id, {
+              status: "active",
+              error: undefined,
+            });
             await persistDisabledExtensions(get().extensions);
           } catch (e) {
             api.cleanup();
             const errorMessage = e instanceof Error ? e.message : String(e);
             console.error(`Failed to activate built-in extension "${id}":`, e);
-            updateExtension(get, set, id, { status: "error", error: errorMessage });
-            toast.error(`Extension "${ext.name}" failed to activate: ${errorMessage}`);
+            updateExtension(get, set, id, {
+              status: "error",
+              error: errorMessage,
+            });
+            toast.error(
+              `Extension "${ext.name}" failed to activate: ${errorMessage}`,
+            );
           }
           return;
         }
@@ -243,7 +261,7 @@ export const useExtensionHost = create<ExtensionHostState>()(
           // Build entry point URL from basePath + main using Tauri asset protocol
           const basePath = ext.manifest.basePath ?? "";
           const mainFile = ext.manifest.main;
-          const filePath = basePath + "/" + mainFile;
+          const filePath = `${basePath}/${mainFile}`;
 
           // convertFileSrc converts an absolute filesystem path to a URL
           // that the Tauri webview can load (asset:// protocol on desktop)
@@ -274,8 +292,7 @@ export const useExtensionHost = create<ExtensionHostState>()(
           // Clean up any partial registrations made before the error
           api.cleanup();
 
-          const errorMessage =
-            e instanceof Error ? e.message : String(e);
+          const errorMessage = e instanceof Error ? e.message : String(e);
           console.error(`Failed to activate extension "${id}":`, e);
 
           updateExtension(get, set, id, {
@@ -303,10 +320,7 @@ export const useExtensionHost = create<ExtensionHostState>()(
           try {
             await module.onDeactivate();
           } catch (e) {
-            console.error(
-              `Error during onDeactivate of extension "${id}":`,
-              e,
-            );
+            console.error(`Error during onDeactivate of extension "${id}":`, e);
           }
         }
 
@@ -412,12 +426,8 @@ export const useExtensionHost = create<ExtensionHostState>()(
           });
         } catch (e) {
           api.cleanup();
-          const errorMessage =
-            e instanceof Error ? e.message : String(e);
-          console.error(
-            `Failed to activate built-in extension "${id}":`,
-            e,
-          );
+          const errorMessage = e instanceof Error ? e.message : String(e);
+          console.error(`Failed to activate built-in extension "${id}":`, e);
           updateExtension(get, set, id, {
             status: "error",
             error: errorMessage,
diff --git a/src/framework/extension-system/contextMenuRegistry.ts b/src/framework/extension-system/contextMenuRegistry.ts
index a4801233..7fdad0d5 100644
--- a/src/framework/extension-system/contextMenuRegistry.ts
+++ b/src/framework/extension-system/contextMenuRegistry.ts
@@ -85,11 +85,7 @@ export const useContextMenuRegistry = create<ContextMenuRegistryState>()(
             next.delete(id);
           }
         }
-        set(
-          { items: next },
-          false,
-          "context-menu-registry/unregisterBySource",
-        );
+        set({ items: next }, false, "context-menu-registry/unregisterBySource");
       },
 
       getItemsForLocation: (location, context) => {
diff --git a/src/framework/extension-system/eventBus.ts b/src/framework/extension-system/eventBus.ts
index abfd320a..f679feff 100644
--- a/src/framework/extension-system/eventBus.ts
+++ b/src/framework/extension-system/eventBus.ts
@@ -54,7 +54,7 @@ export class ExtensionEventBus {
     }
 
     const entry: HandlerEntry = { handler, source };
-    bySource.get(source)!.add(entry);
+    bySource.get(source)?.add(entry);
 
     return () => {
       this.off(event, entry);
diff --git a/src/framework/extension-system/index.ts b/src/framework/extension-system/index.ts
index d72fc874..a844d8e6 100644
--- a/src/framework/extension-system/index.ts
+++ b/src/framework/extension-system/index.ts
@@ -1,74 +1,77 @@
-export { CURRENT_API_VERSION, useExtensionHost, configureExtensionHost } from "./ExtensionHost";
+export {
+  type ActiveMenu,
+  type ContextMenuContext,
+  type ContextMenuItem,
+  type ContextMenuLocation,
+  type ContextMenuRegistryState,
+  useContextMenuRegistry,
+} from "./contextMenuRegistry";
 export {
   type BladeNavigationEvent,
+  type Disposable,
+  ExtensionAPI,
   type ExtensionBladeConfig,
   type ExtensionCommandConfig,
-  type ExtensionToolbarConfig,
   type ExtensionContextMenuConfig,
-  type ExtensionSidebarPanelConfig,
-  type ExtensionStatusBarConfig,
   type ExtensionGitHookConfig,
   type ExtensionMachineConfig,
-  type Disposable,
-  ExtensionAPI,
+  type ExtensionSidebarPanelConfig,
+  type ExtensionStatusBarConfig,
+  type ExtensionToolbarConfig,
 } from "./ExtensionAPI";
 export {
-  type TrustLevel,
-  type ExtensionStatus,
-  type ExtensionInfo,
-  type BuiltInExtensionConfig,
-} from "./types";
+  CURRENT_API_VERSION,
+  configureExtensionHost,
+  useExtensionHost,
+} from "./ExtensionHost";
 export {
   type EventHandler,
   ExtensionEventBus,
   extensionEventBus,
 } from "./eventBus";
-export { ExtensionSettings } from "./settings";
+// Registry stores (moved from core/lib/)
+export {
+  getMachineActor,
+  type MachineRegistryEntry,
+  type MachineRegistryState,
+  registerMachine,
+  unregisterMachine,
+  unregisterMachinesBySource,
+  useMachineRegistry,
+} from "./machineRegistry";
 
 // Extension manifest types
 export type {
-  ExtensionManifest,
-  ExtensionContributes,
   ExtensionBladeContribution,
   ExtensionCommandContribution,
+  ExtensionContributes,
+  ExtensionManifest,
   ExtensionToolbarContribution,
 } from "./manifest";
-
-// Registry stores (moved from core/lib/)
-export {
-  useMachineRegistry,
-  registerMachine,
-  unregisterMachine,
-  unregisterMachinesBySource,
-  getMachineActor,
-  type MachineRegistryEntry,
-  type MachineRegistryState,
-} from "./machineRegistry";
 export {
-  useToolbarRegistry,
-  type ToolbarAction,
-  type ToolbarGroup,
-  TOOLBAR_GROUP_ORDER,
-  getGroupedToolbarActions,
-} from "./toolbarRegistry";
-export {
-  useContextMenuRegistry,
-  type ContextMenuItem,
-  type ContextMenuContext,
-  type ContextMenuLocation,
-  type ActiveMenu,
-  type ContextMenuRegistryState,
-} from "./contextMenuRegistry";
+  type DidHandler,
+  OperationBus,
+  type WillHandler,
+  type WillHookResult,
+} from "./operationBus";
+export { ExtensionSettings } from "./settings";
 export {
-  useStatusBarRegistry,
-  type StatusBarItem,
-  type StatusBarAlignment,
   getLeftItems,
   getRightItems,
+  type StatusBarAlignment,
+  type StatusBarItem,
+  useStatusBarRegistry,
 } from "./statusBarRegistry";
 export {
-  OperationBus,
-  type WillHookResult,
-  type DidHandler,
-  type WillHandler,
-} from "./operationBus";
+  getGroupedToolbarActions,
+  TOOLBAR_GROUP_ORDER,
+  type ToolbarAction,
+  type ToolbarGroup,
+  useToolbarRegistry,
+} from "./toolbarRegistry";
+export type {
+  BuiltInExtensionConfig,
+  ExtensionInfo,
+  ExtensionStatus,
+  TrustLevel,
+} from "./types";
diff --git a/src/framework/extension-system/machineRegistry.ts b/src/framework/extension-system/machineRegistry.ts
index 4f5df055..0050499c 100644
--- a/src/framework/extension-system/machineRegistry.ts
+++ b/src/framework/extension-system/machineRegistry.ts
@@ -1,7 +1,7 @@
-import { create } from "zustand";
-import { devtools } from "zustand/middleware";
 import type { AnyActorRef, AnyStateMachine } from "xstate";
 import { createActor } from "xstate";
+import { create } from "zustand";
+import { devtools } from "zustand/middleware";
 
 export interface MachineRegistryEntry {
   id: string;
@@ -35,7 +35,9 @@ export const useMachineRegistry = create<MachineRegistryState>()(
       register: (entry) => {
         const prev = get().machines;
         if (prev.has(entry.id)) {
-          console.warn(`[MachineRegistry] Machine "${entry.id}" already registered`);
+          console.warn(
+            `[MachineRegistry] Machine "${entry.id}" already registered`,
+          );
           return;
         }
         const next = new Map(prev);
diff --git a/src/framework/extension-system/manifest.ts b/src/framework/extension-system/manifest.ts
index 1e67c215..a5dbda22 100644
--- a/src/framework/extension-system/manifest.ts
+++ b/src/framework/extension-system/manifest.ts
@@ -1,8 +1,8 @@
 // Re-export generated manifest types from Rust bindings
 export type {
-  ExtensionManifest,
-  ExtensionContributes,
   ExtensionBladeContribution,
   ExtensionCommandContribution,
+  ExtensionContributes,
+  ExtensionManifest,
   ExtensionToolbarContribution,
 } from "../../bindings";
diff --git a/src/framework/extension-system/operationBus.ts b/src/framework/extension-system/operationBus.ts
index c49edc64..a1fef7fe 100644
--- a/src/framework/extension-system/operationBus.ts
+++ b/src/framework/extension-system/operationBus.ts
@@ -14,7 +14,7 @@ export interface WillHookResult {
 export type DidHandler<TCtx> = (ctx: TCtx) => void | Promise<void>;
 export type WillHandler<TCtx> = (
   ctx: TCtx,
-) => WillHookResult | Promise<WillHookResult | void> | void;
+) => WillHookResult | Promise<WillHookResult | undefined> | undefined;
 
 interface HandlerEntry<H> {
   handler: H;
@@ -64,7 +64,7 @@ export class OperationBus<
       priority,
       source,
     };
-    this.didHandlers.get(operation)!.add(entry);
+    this.didHandlers.get(operation)?.add(entry);
 
     return () => {
       this.didHandlers.get(operation)?.delete(entry);
@@ -85,7 +85,7 @@ export class OperationBus<
       priority,
       source,
     };
-    this.willHandlers.get(operation)!.add(entry);
+    this.willHandlers.get(operation)?.add(entry);
 
     return () => {
       this.willHandlers.get(operation)?.delete(entry);
@@ -167,4 +167,3 @@ export class OperationBus<
     }
   }
 }
-
diff --git a/src/framework/extension-system/toolbarRegistry.ts b/src/framework/extension-system/toolbarRegistry.ts
index ebadba18..5632cd4f 100644
--- a/src/framework/extension-system/toolbarRegistry.ts
+++ b/src/framework/extension-system/toolbarRegistry.ts
@@ -1,5 +1,5 @@
-import type { ReactNode } from "react";
 import type { LucideIcon } from "lucide-react";
+import type { ReactNode } from "react";
 import { createRegistry } from "../stores/createRegistry";
 
 // --- Types ---
@@ -63,7 +63,10 @@ export const useToolbarRegistry = createRegistry<ToolbarAction>({
 
 // --- Standalone query functions ---
 
-export function getGroupedToolbarActions(): Record<ToolbarGroup, ToolbarAction[]> {
+export function getGroupedToolbarActions(): Record<
+  ToolbarGroup,
+  ToolbarAction[]
+> {
   const { items } = useToolbarRegistry.getState();
   const grouped: Record<ToolbarGroup, ToolbarAction[]> = {
     navigation: [],
diff --git a/src/framework/index.ts b/src/framework/index.ts
index 1bfb6711..094785dc 100644
--- a/src/framework/index.ts
+++ b/src/framework/index.ts
@@ -1,5 +1,5 @@
-export * from "./layout";
 export * from "./command-palette";
-export * from "./stores";
 export * from "./extension-system";
+export * from "./layout";
+export * from "./stores";
 export * from "./theme";
diff --git a/src/framework/layout/BladeContainer.tsx b/src/framework/layout/BladeContainer.tsx
index 578b6dd5..00fd6e21 100644
--- a/src/framework/layout/BladeContainer.tsx
+++ b/src/framework/layout/BladeContainer.tsx
@@ -1,18 +1,18 @@
-import { AnimatePresence, motion, useReducedMotion } from "framer-motion";
 import { useSelector } from "@xstate/react";
-import { useNavigationActorRef } from "./navigation/context";
-import {
-  selectBladeStack,
-  selectLastAction,
-  selectDirtyBladeIds,
-} from "./navigation/selectors";
+import { AnimatePresence, motion, useReducedMotion } from "framer-motion";
 import {
-  bladeTransitionVariants,
   bladeTransitionConfig,
+  bladeTransitionVariants,
 } from "../theme/animations";
 import { BladeRenderer } from "./BladeRenderer";
 import { BladeStrip } from "./BladeStrip";
 import { NavigationGuardDialog } from "./NavigationGuardDialog";
+import { useNavigationActorRef } from "./navigation/context";
+import {
+  selectBladeStack,
+  selectDirtyBladeIds,
+  selectLastAction,
+} from "./navigation/selectors";
 
 interface BladeContainerProps {
   /** Whether focus mode is currently active (passed through to BladePanel). */
@@ -21,7 +21,10 @@ interface BladeContainerProps {
   onToggleFocusMode?: () => void;
 }
 
-export function BladeContainer({ isFocusMode, onToggleFocusMode }: BladeContainerProps = {}) {
+export function BladeContainer({
+  isFocusMode,
+  onToggleFocusMode,
+}: BladeContainerProps = {}) {
   const actorRef = useNavigationActorRef();
   const bladeStack = useSelector(actorRef, selectBladeStack);
   const lastAction = useSelector(actorRef, selectLastAction);
diff --git a/src/framework/layout/BladeRenderer.tsx b/src/framework/layout/BladeRenderer.tsx
index 63ac4a70..fcc7617b 100644
--- a/src/framework/layout/BladeRenderer.tsx
+++ b/src/framework/layout/BladeRenderer.tsx
@@ -1,10 +1,10 @@
-import { Suspense } from "react";
 import { Puzzle } from "lucide-react";
-import { useBladeRegistry } from "./bladeRegistry";
-import { openBlade } from "./bladeOpener";
-import { BladePanel } from "./BladePanel";
-import { BladeLoadingFallback } from "./BladeLoadingFallback";
+import { Suspense } from "react";
 import { BladeErrorBoundary } from "./BladeErrorBoundary";
+import { BladeLoadingFallback } from "./BladeLoadingFallback";
+import { BladePanel } from "./BladePanel";
+import { openBlade } from "./bladeOpener";
+import { useBladeRegistry } from "./bladeRegistry";
 import type { TypedBlade } from "./navigation/types";
 
 interface BladeRendererProps {
@@ -16,7 +16,12 @@ interface BladeRendererProps {
   onToggleFocusMode?: () => void;
 }
 
-export function BladeRenderer({ blade, goBack, isFocusMode, onToggleFocusMode }: BladeRendererProps) {
+export function BladeRenderer({
+  blade,
+  goBack,
+  isFocusMode,
+  onToggleFocusMode,
+}: BladeRendererProps) {
   const reg = useBladeRegistry((s) => s.items.get(blade.type));
   if (!reg)
     return (
diff --git a/src/framework/layout/BladeStrip.tsx b/src/framework/layout/BladeStrip.tsx
index 001409ee..35ba3afb 100644
--- a/src/framework/layout/BladeStrip.tsx
+++ b/src/framework/layout/BladeStrip.tsx
@@ -23,10 +23,12 @@ export function BladeStrip({ title, isDirty, onExpand }: BladeStripProps) {
       {isDirty && (
         <Circle className="w-2 h-2 fill-ctp-yellow text-ctp-yellow shrink-0 motion-safe:animate-pulse" />
       )}
-      <span className={cn(
-        "text-xs [writing-mode:vertical-lr] rotate-180",
-        isDirty ? "text-ctp-yellow" : "text-ctp-subtext0",
-      )}>
+      <span
+        className={cn(
+          "text-xs [writing-mode:vertical-lr] rotate-180",
+          isDirty ? "text-ctp-yellow" : "text-ctp-subtext0",
+        )}
+      >
         {title}
       </span>
     </button>
diff --git a/src/framework/layout/NavigationGuardDialog.tsx b/src/framework/layout/NavigationGuardDialog.tsx
index 4110b166..846e0136 100644
--- a/src/framework/layout/NavigationGuardDialog.tsx
+++ b/src/framework/layout/NavigationGuardDialog.tsx
@@ -1,19 +1,19 @@
 import { useSelector } from "@xstate/react";
 import { AlertTriangle } from "lucide-react";
-import { useNavigationActorRef } from "@/framework/layout/navigation/context";
-import {
-  selectIsConfirmingDiscard,
-  selectDirtyBladeIds,
-  selectBladeStack,
-} from "@/framework/layout/navigation/selectors";
+import { Button } from "@/core/components/ui/button";
 import {
   Dialog,
   DialogContent,
+  DialogFooter,
   DialogHeader,
   DialogTitle,
-  DialogFooter,
 } from "@/core/components/ui/dialog";
-import { Button } from "@/core/components/ui/button";
+import { useNavigationActorRef } from "@/framework/layout/navigation/context";
+import {
+  selectBladeStack,
+  selectDirtyBladeIds,
+  selectIsConfirmingDiscard,
+} from "@/framework/layout/navigation/selectors";
 
 export function NavigationGuardDialog() {
   const actorRef = useNavigationActorRef();
@@ -26,11 +26,14 @@ export function NavigationGuardDialog() {
     .map((b) => b.title);
 
   return (
-    <Dialog open={isOpen} onOpenChange={(open) => {
-      if (!open) {
-        actorRef.send({ type: "CANCEL_DISCARD" });
-      }
-    }}>
+    <Dialog
+      open={isOpen}
+      onOpenChange={(open) => {
+        if (!open) {
+          actorRef.send({ type: "CANCEL_DISCARD" });
+        }
+      }}
+    >
       <DialogContent>
         <DialogHeader>
           <div className="flex items-center gap-2">
@@ -41,7 +44,9 @@ export function NavigationGuardDialog() {
         <p className="text-sm text-ctp-subtext0">
           You have unsaved changes in{" "}
           <span className="font-medium text-ctp-text">
-            {dirtyTitles.length > 0 ? dirtyTitles.join(", ") : "the current blade"}
+            {dirtyTitles.length > 0
+              ? dirtyTitles.join(", ")
+              : "the current blade"}
           </span>{" "}
           that will be lost if you navigate away.
         </p>
diff --git a/src/framework/layout/ResizablePanelLayout.tsx b/src/framework/layout/ResizablePanelLayout.tsx
index 333fa3be..308df214 100644
--- a/src/framework/layout/ResizablePanelLayout.tsx
+++ b/src/framework/layout/ResizablePanelLayout.tsx
@@ -1,13 +1,13 @@
+import type { ReactNode, Ref } from "react";
 import {
   Group,
-  Panel,
-  Separator,
   type GroupImperativeHandle,
-  type PanelImperativeHandle,
   type Layout,
+  Panel,
+  type PanelImperativeHandle,
   type PanelSize,
+  Separator,
 } from "react-resizable-panels";
-import type { ReactNode, Ref } from "react";
 import { cn } from "../lib/utils";
 
 interface ResizablePanelLayoutProps {
diff --git a/src/framework/layout/SplitPaneLayout.tsx b/src/framework/layout/SplitPaneLayout.tsx
index f4ed5fd7..a391230b 100644
--- a/src/framework/layout/SplitPaneLayout.tsx
+++ b/src/framework/layout/SplitPaneLayout.tsx
@@ -1,8 +1,8 @@
 import type { ReactNode } from "react";
 import { cn } from "../lib/utils";
 import {
-  ResizablePanelLayout,
   ResizablePanel,
+  ResizablePanelLayout,
   ResizeHandle,
 } from "./ResizablePanelLayout";
 
diff --git a/src/framework/layout/bladeOpener.ts b/src/framework/layout/bladeOpener.ts
index e1677d55..dfe87133 100644
--- a/src/framework/layout/bladeOpener.ts
+++ b/src/framework/layout/bladeOpener.ts
@@ -1,5 +1,5 @@
-import type { CoreBladeType, BladePropsMap } from "./bladeTypes";
 import { getBladeRegistration } from "./bladeRegistry";
+import type { BladePropsMap, CoreBladeType } from "./bladeTypes";
 import { getNavigationActor } from "./navigation/context";
 
 /** Open a core blade with type-safe props */
@@ -24,7 +24,12 @@ export function openBlade(
     title ??
     (typeof reg?.defaultTitle === "function"
       ? reg.defaultTitle(props as any)
-      : reg?.defaultTitle ?? type);
+      : (reg?.defaultTitle ?? type));
 
-  getNavigationActor().send({ type: "PUSH_BLADE", bladeType: type as any, title: resolvedTitle, props });
+  getNavigationActor().send({
+    type: "PUSH_BLADE",
+    bladeType: type as any,
+    title: resolvedTitle,
+    props,
+  });
 }
diff --git a/src/framework/layout/bladeRegistry.ts b/src/framework/layout/bladeRegistry.ts
index a410821b..3006a34c 100644
--- a/src/framework/layout/bladeRegistry.ts
+++ b/src/framework/layout/bladeRegistry.ts
@@ -28,7 +28,9 @@ export const useBladeRegistry = createRegistry<BladeRegistration<any>>({
 
 // --- Standalone query functions ---
 
-export function getRegistration(type: string): BladeRegistration<any> | undefined {
+export function getRegistration(
+  type: string,
+): BladeRegistration<any> | undefined {
   return useBladeRegistry.getState().get(type);
 }
 
@@ -43,9 +45,7 @@ export function isSingleton(type: string): boolean {
 // --- Backward-compatible function exports ---
 // All 26 consumer files continue importing these same functions unchanged.
 
-export function registerBlade<TProps>(
-  config: BladeRegistration<TProps>,
-): void {
+export function registerBlade<TProps>(config: BladeRegistration<TProps>): void {
   useBladeRegistry.getState().register(config);
 }
 
diff --git a/src/framework/layout/bladeTypes.ts b/src/framework/layout/bladeTypes.ts
index 45cbee17..f780364e 100644
--- a/src/framework/layout/bladeTypes.ts
+++ b/src/framework/layout/bladeTypes.ts
@@ -17,7 +17,7 @@
 
 /** Base blade props map — apps extend via module augmentation */
 // eslint-disable-next-line @typescript-eslint/no-empty-object-type
-export interface BladePropsMap {}
+export type BladePropsMap = {};
 
 /** Core blade types derived from the map */
 export type CoreBladeType = keyof BladePropsMap;
@@ -43,4 +43,9 @@ export type TypedBlade =
         props: BladePropsMap[K];
       };
     }[CoreBladeType]
-  | { id: string; type: ExtensionBladeType; title: string; props: Record<string, unknown> };
+  | {
+      id: string;
+      type: ExtensionBladeType;
+      title: string;
+      props: Record<string, unknown>;
+    };
diff --git a/src/framework/layout/index.ts b/src/framework/layout/index.ts
index 8a4e885d..db041183 100644
--- a/src/framework/layout/index.ts
+++ b/src/framework/layout/index.ts
@@ -1,49 +1,49 @@
+export { BladeContainer } from "./BladeContainer";
+export { BladeErrorBoundary } from "./BladeErrorBoundary";
+export { BladeLoadingFallback } from "./BladeLoadingFallback";
+export { BladePanel } from "./BladePanel";
+export { BladeRenderer } from "./BladeRenderer";
+export { BladeStrip } from "./BladeStrip";
+export { openBlade } from "./bladeOpener";
 export {
-  type BladePropsMap,
-  type CoreBladeType,
-  type ExtensionBladeType,
-  type BladeType,
-  type TypedBlade,
-  isCoreBladeType,
-} from "./bladeTypes";
-
-export {
-  type BladeRenderContext,
   type BladeRegistration,
-  getRegistration,
+  type BladeRenderContext,
+  clearCoreRegistry,
+  getAllBladeTypes,
   getAllTypes,
+  getBladeRegistration,
+  getRegistration,
   isSingleton,
-  useBladeRegistry,
+  isSingletonBlade,
   registerBlade,
   unregisterBlade,
   unregisterBySource,
-  clearCoreRegistry,
-  getBladeRegistration,
-  getAllBladeTypes,
-  isSingletonBlade,
+  useBladeRegistry,
 } from "./bladeRegistry";
-
 export {
-  type SidebarPanelConfig,
-  useSidebarPanelRegistry,
-  getVisiblePanels,
-} from "./sidebarPanelRegistry";
-
+  type BladePropsMap,
+  type BladeType,
+  type CoreBladeType,
+  type ExtensionBladeType,
+  isCoreBladeType,
+  type TypedBlade,
+} from "./bladeTypes";
 export {
-  type LayoutPreset,
-  type PresetId,
   DEFAULT_PRESET_ID,
-  LAYOUT_PRESETS,
   getPresetById,
+  LAYOUT_PRESETS,
+  type LayoutPreset,
+  type PresetId,
 } from "./layoutPresets";
-
-export { BladeContainer } from "./BladeContainer";
-export { BladeRenderer } from "./BladeRenderer";
-export { BladePanel } from "./BladePanel";
-export { BladeStrip } from "./BladeStrip";
-export { BladeLoadingFallback } from "./BladeLoadingFallback";
-export { BladeErrorBoundary } from "./BladeErrorBoundary";
 export { NavigationGuardDialog } from "./NavigationGuardDialog";
-export { openBlade } from "./bladeOpener";
-export { ResizablePanelLayout, ResizablePanel, ResizeHandle } from "./ResizablePanelLayout";
+export {
+  ResizablePanel,
+  ResizablePanelLayout,
+  ResizeHandle,
+} from "./ResizablePanelLayout";
 export { SplitPaneLayout } from "./SplitPaneLayout";
+export {
+  getVisiblePanels,
+  type SidebarPanelConfig,
+  useSidebarPanelRegistry,
+} from "./sidebarPanelRegistry";
diff --git a/src/framework/layout/layoutPresets.ts b/src/framework/layout/layoutPresets.ts
index 4ecc2486..e4a7a73c 100644
--- a/src/framework/layout/layoutPresets.ts
+++ b/src/framework/layout/layoutPresets.ts
@@ -1,10 +1,5 @@
 import type { LucideIcon } from "lucide-react";
-import {
-  FolderSearch,
-  LayoutGrid,
-  Maximize2,
-  SquarePen,
-} from "lucide-react";
+import { FolderSearch, LayoutGrid, Maximize2, SquarePen } from "lucide-react";
 
 export interface LayoutPreset {
   id: PresetId;
diff --git a/src/framework/layout/navigation/actions.ts b/src/framework/layout/navigation/actions.ts
index ab01e2a8..976c8ffd 100644
--- a/src/framework/layout/navigation/actions.ts
+++ b/src/framework/layout/navigation/actions.ts
@@ -1,6 +1,6 @@
 import { useBladeRegistry } from "../bladeRegistry";
-import { getWorkflow, getDefaultWorkflowId } from "./workflowRegistry";
-import type { WorkflowType, TypedBlade } from "./types";
+import type { TypedBlade, WorkflowType } from "./types";
+import { getDefaultWorkflowId, getWorkflow } from "./workflowRegistry";
 
 export function rootBladeForWorkflow(workflow: WorkflowType): TypedBlade {
   const config = getWorkflow(workflow);
@@ -11,7 +11,12 @@ export function rootBladeForWorkflow(workflow: WorkflowType): TypedBlade {
     if (fallback) {
       return { id: "root", ...fallback.rootBlade } as TypedBlade;
     }
-    return { id: "root", type: "empty" as any, title: "Empty", props: {} } as TypedBlade;
+    return {
+      id: "root",
+      type: "empty" as any,
+      title: "Empty",
+      props: {},
+    } as TypedBlade;
   }
 
   // Check if fallback needed (root blade not registered)
diff --git a/src/framework/layout/navigation/context.tsx b/src/framework/layout/navigation/context.tsx
index 8b61a490..7524ad0b 100644
--- a/src/framework/layout/navigation/context.tsx
+++ b/src/framework/layout/navigation/context.tsx
@@ -1,5 +1,5 @@
-import { createContext, useContext, type ReactNode } from "react";
-import { createActor, type ActorRefFrom } from "xstate";
+import { createContext, type ReactNode, useContext } from "react";
+import { type ActorRefFrom, createActor } from "xstate";
 import { navigationMachine } from "./navigationMachine";
 
 type NavigationActorRef = ActorRefFrom<typeof navigationMachine>;
diff --git a/src/framework/layout/navigation/index.ts b/src/framework/layout/navigation/index.ts
index 5f439c42..2c528ef2 100644
--- a/src/framework/layout/navigation/index.ts
+++ b/src/framework/layout/navigation/index.ts
@@ -1,37 +1,37 @@
-export { navigationMachine } from "./navigationMachine";
 export { rootBladeForWorkflow } from "./actions";
 export {
-  NavigationProvider,
   getNavigationActor,
+  NavigationProvider,
   setNavigationActor,
   useNavigationActorRef,
 } from "./context";
 export { getInspector } from "./inspector";
+export { navigationMachine } from "./navigationMachine";
 export {
-  selectBladeStack,
   selectActiveBlade,
   selectActiveWorkflow,
+  selectBladeStack,
+  selectDirtyBladeIds,
   selectIsConfirmingDiscard,
   selectLastAction,
-  selectDirtyBladeIds,
   selectPendingEvent,
   selectStackDepth,
 } from "./selectors";
 export type {
+  BladePropsMap,
+  BladeType,
+  LastAction,
   NavigationContext,
   NavigationEvent,
-  WorkflowType,
-  LastAction,
   TypedBlade,
-  BladeType,
-  BladePropsMap,
+  WorkflowType,
 } from "./types";
 
 export {
-  registerWorkflow,
-  getWorkflow,
-  getDefaultWorkflowId,
-  getAllWorkflows,
   clearWorkflows,
+  getAllWorkflows,
+  getDefaultWorkflowId,
+  getWorkflow,
+  registerWorkflow,
   type WorkflowConfig,
 } from "./workflowRegistry";
diff --git a/src/framework/layout/navigation/navigationMachine.test.ts b/src/framework/layout/navigation/navigationMachine.test.ts
index b1358217..ad016567 100644
--- a/src/framework/layout/navigation/navigationMachine.test.ts
+++ b/src/framework/layout/navigation/navigationMachine.test.ts
@@ -1,8 +1,8 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
 import { createActor } from "xstate";
-import { describe, it, expect, vi, beforeEach } from "vitest";
-import { navigationMachine } from "./navigationMachine";
 import { registerBlade, unregisterBlade } from "../bladeRegistry";
-import { registerWorkflow, clearWorkflows } from "./workflowRegistry";
+import { navigationMachine } from "./navigationMachine";
+import { clearWorkflows, registerWorkflow } from "./workflowRegistry";
 
 function createTestActor() {
   const actor = createActor(navigationMachine);
@@ -19,16 +19,34 @@ describe("navigationMachine", () => {
     registerWorkflow({
       id: "staging",
       label: "Staging",
-      rootBlade: { type: "staging-changes", title: "Changes", props: {} as Record<string, never> },
+      rootBlade: {
+        type: "staging-changes",
+        title: "Changes",
+        props: {} as Record<string, never>,
+      },
     });
     registerWorkflow({
       id: "topology",
       label: "Topology",
-      rootBlade: { type: "topology-graph", title: "Topology", props: {} as Record<string, never> },
-      fallbackBlade: { type: "commit-list-fallback", title: "History", props: {} as Record<string, never> },
+      rootBlade: {
+        type: "topology-graph",
+        title: "Topology",
+        props: {} as Record<string, never>,
+      },
+      fallbackBlade: {
+        type: "commit-list-fallback",
+        title: "History",
+        props: {} as Record<string, never>,
+      },
     });
 
-    const singletonTypes = ["settings", "changelog", "gitflow-cheatsheet", "conventional-commit", "repo-browser"];
+    const singletonTypes = [
+      "settings",
+      "changelog",
+      "gitflow-cheatsheet",
+      "conventional-commit",
+      "repo-browser",
+    ];
     for (const type of singletonTypes) {
       registerBlade({
         type,
@@ -496,9 +514,7 @@ describe("navigationMachine", () => {
     actor.send({ type: "POP_BLADE" });
 
     // The dirty entry should be removed
-    expect(
-      actor.getSnapshot().context.dirtyBladeIds[bladeId],
-    ).toBeUndefined();
+    expect(actor.getSnapshot().context.dirtyBladeIds[bladeId]).toBeUndefined();
 
     actor.stop();
   });
@@ -647,9 +663,9 @@ describe("navigationMachine", () => {
 
     actor.send({ type: "RESET_STACK" });
 
-    expect(
-      Object.keys(actor.getSnapshot().context.dirtyBladeIds),
-    ).toHaveLength(0);
+    expect(Object.keys(actor.getSnapshot().context.dirtyBladeIds)).toHaveLength(
+      0,
+    );
 
     actor.stop();
   });
@@ -744,7 +760,9 @@ describe("navigationMachine", () => {
       workflow: "topology",
     });
 
-    expect(Object.keys(actor.getSnapshot().context.dirtyBladeIds)).toHaveLength(0);
+    expect(Object.keys(actor.getSnapshot().context.dirtyBladeIds)).toHaveLength(
+      0,
+    );
     expect(actor.getSnapshot().context.activeWorkflow).toBe("topology");
 
     actor.stop();
diff --git a/src/framework/layout/navigation/navigationMachine.ts b/src/framework/layout/navigation/navigationMachine.ts
index 300d9726..bdc9a432 100644
--- a/src/framework/layout/navigation/navigationMachine.ts
+++ b/src/framework/layout/navigation/navigationMachine.ts
@@ -1,9 +1,9 @@
-import { setup, assign, and, not } from "xstate";
-import { rootBladeForWorkflow } from "./actions";
+import { and, assign, not, setup } from "xstate";
 import { toast } from "../../stores/toast";
 import { isSingletonBlade } from "../bladeRegistry";
-import { getDefaultWorkflowId } from "./workflowRegistry";
+import { rootBladeForWorkflow } from "./actions";
 import type { NavigationContext, NavigationEvent, TypedBlade } from "./types";
+import { getDefaultWorkflowId } from "./workflowRegistry";
 
 const DEFAULT_MAX_STACK_DEPTH = 8;
 
diff --git a/src/framework/layout/navigation/selectors.ts b/src/framework/layout/navigation/selectors.ts
index 44677e38..675e8199 100644
--- a/src/framework/layout/navigation/selectors.ts
+++ b/src/framework/layout/navigation/selectors.ts
@@ -3,8 +3,7 @@ import type { navigationMachine } from "./navigationMachine";
 
 type NavSnapshot = SnapshotFrom<typeof navigationMachine>;
 
-export const selectBladeStack = (snap: NavSnapshot) =>
-  snap.context.bladeStack;
+export const selectBladeStack = (snap: NavSnapshot) => snap.context.bladeStack;
 
 export const selectActiveBlade = (snap: NavSnapshot) =>
   snap.context.bladeStack[snap.context.bladeStack.length - 1];
@@ -15,8 +14,7 @@ export const selectActiveWorkflow = (snap: NavSnapshot) =>
 export const selectIsConfirmingDiscard = (snap: NavSnapshot) =>
   snap.matches("confirmingDiscard");
 
-export const selectLastAction = (snap: NavSnapshot) =>
-  snap.context.lastAction;
+export const selectLastAction = (snap: NavSnapshot) => snap.context.lastAction;
 
 export const selectDirtyBladeIds = (snap: NavSnapshot) =>
   snap.context.dirtyBladeIds;
diff --git a/src/framework/layout/navigation/types.ts b/src/framework/layout/navigation/types.ts
index 9deb5db0..93b01683 100644
--- a/src/framework/layout/navigation/types.ts
+++ b/src/framework/layout/navigation/types.ts
@@ -1,6 +1,18 @@
-import type { BladeType, BladePropsMap, TypedBlade, CoreBladeType, ExtensionBladeType } from "../bladeTypes";
+import type {
+  BladePropsMap,
+  BladeType,
+  CoreBladeType,
+  ExtensionBladeType,
+  TypedBlade,
+} from "../bladeTypes";
 
-export type { TypedBlade, BladeType, BladePropsMap, CoreBladeType, ExtensionBladeType };
+export type {
+  TypedBlade,
+  BladeType,
+  BladePropsMap,
+  CoreBladeType,
+  ExtensionBladeType,
+};
 
 export type WorkflowType = string;
 
diff --git a/src/framework/layout/sidebarPanelRegistry.ts b/src/framework/layout/sidebarPanelRegistry.ts
index a9c20289..f1847557 100644
--- a/src/framework/layout/sidebarPanelRegistry.ts
+++ b/src/framework/layout/sidebarPanelRegistry.ts
@@ -1,5 +1,5 @@
-import type { ComponentType, ReactNode } from "react";
 import type { LucideIcon } from "lucide-react";
+import type { ComponentType, ReactNode } from "react";
 import { createRegistry } from "../stores/createRegistry";
 
 // --- Types ---
diff --git a/src/framework/stores/createRegistry.ts b/src/framework/stores/createRegistry.ts
index 443137ec..b9638e59 100644
--- a/src/framework/stores/createRegistry.ts
+++ b/src/framework/stores/createRegistry.ts
@@ -1,6 +1,6 @@
+import type { StoreApi, UseBoundStore } from "zustand";
 import { create } from "zustand";
 import { devtools } from "zustand/middleware";
-import type { UseBoundStore, StoreApi } from "zustand";
 
 // ---------------------------------------------------------------------------
 // Types
@@ -77,7 +77,9 @@ export function createRegistry<TItem extends RegistryItem>(
  */
 export function createRegistry<TItem extends RegistryItem>(
   options: CreateRegistryOptions<TItem>,
-): UseBoundStore<StoreApi<BaseRegistryState<TItem> & Partial<VisibilityMixin>>> {
+): UseBoundStore<
+  StoreApi<BaseRegistryState<TItem> & Partial<VisibilityMixin>>
+> {
   const {
     name,
     getKey = (item: TItem) => (item as TItem & { id: string }).id,
diff --git a/src/framework/stores/index.ts b/src/framework/stores/index.ts
index 0151b018..c454766f 100644
--- a/src/framework/stores/index.ts
+++ b/src/framework/stores/index.ts
@@ -1,17 +1,17 @@
-export { resetAllStores, registerStoreForReset } from "./registry";
 export { createBladeStore } from "./createBladeStore";
 export {
-  type ToastType,
-  type ToastAction,
-  type Toast,
-  useToastStore,
-  toast,
-} from "./toast";
-export { getStore } from "./persistence/tauri";
-export {
+  type BaseRegistryState,
+  type CreateRegistryOptions,
   createRegistry,
   type RegistryItem,
-  type BaseRegistryState,
   type VisibilityMixin,
-  type CreateRegistryOptions,
 } from "./createRegistry";
+export { getStore } from "./persistence/tauri";
+export { registerStoreForReset, resetAllStores } from "./registry";
+export {
+  type Toast,
+  type ToastAction,
+  type ToastType,
+  toast,
+  useToastStore,
+} from "./toast";
diff --git a/src/framework/stores/registry.ts b/src/framework/stores/registry.ts
index 3b09a22b..401b3261 100644
--- a/src/framework/stores/registry.ts
+++ b/src/framework/stores/registry.ts
@@ -6,9 +6,7 @@ export function resetAllStores(): void {
   storeResetFns.forEach((resetFn) => resetFn());
 }
 
-export function registerStoreForReset<T>(
-  store: StoreApi<T>,
-): void {
+export function registerStoreForReset<T>(store: StoreApi<T>): void {
   storeResetFns.add(() => {
     store.setState(store.getInitialState(), true);
   });
diff --git a/src/framework/stores/toast.ts b/src/framework/stores/toast.ts
index a4160609..7c06854f 100644
--- a/src/framework/stores/toast.ts
+++ b/src/framework/stores/toast.ts
@@ -63,15 +63,21 @@ export const useToastStore = create<ToastState>((set) => ({
 
 export const toast = {
   success: (message: string, action?: ToastAction): string => {
-    return useToastStore.getState().addToast({ type: "success", message, action });
+    return useToastStore
+      .getState()
+      .addToast({ type: "success", message, action });
   },
   error: (message: string, action?: ToastAction): string => {
-    return useToastStore.getState().addToast({ type: "error", message, action });
+    return useToastStore
+      .getState()
+      .addToast({ type: "error", message, action });
   },
   info: (message: string, action?: ToastAction): string => {
     return useToastStore.getState().addToast({ type: "info", message, action });
   },
   warning: (message: string, action?: ToastAction): string => {
-    return useToastStore.getState().addToast({ type: "warning", message, action });
+    return useToastStore
+      .getState()
+      .addToast({ type: "warning", message, action });
   },
 };
diff --git a/src/framework/theme/animations.ts b/src/framework/theme/animations.ts
index 010bd95a..0a9d9708 100644
--- a/src/framework/theme/animations.ts
+++ b/src/framework/theme/animations.ts
@@ -1,4 +1,4 @@
-import type { Variants, Transition } from "framer-motion";
+import type { Transition, Variants } from "framer-motion";
 
 // Standard transitions
 export const springTransition: Transition = {
@@ -105,31 +105,49 @@ export const bladeSlideIn: Variants = {
 };
 
 // Direction-aware blade transitions driven by FSM lastAction
-export type BladeTransitionDirection = "push" | "pop" | "replace" | "reset" | "init";
+export type BladeTransitionDirection =
+  | "push"
+  | "pop"
+  | "replace"
+  | "reset"
+  | "init";
 
 export const bladeTransitionVariants: Variants = {
   initial: (direction: BladeTransitionDirection) => {
     switch (direction) {
-      case "push": return { x: "100%", opacity: 0 };
-      case "pop": return { x: "-30%", opacity: 0 };
-      case "replace": return { opacity: 0, scale: 0.98 };
-      case "reset": return { opacity: 0, scale: 0.95 };
-      default: return { x: 40, opacity: 0 };
+      case "push":
+        return { x: "100%", opacity: 0 };
+      case "pop":
+        return { x: "-30%", opacity: 0 };
+      case "replace":
+        return { opacity: 0, scale: 0.98 };
+      case "reset":
+        return { opacity: 0, scale: 0.95 };
+      default:
+        return { x: 40, opacity: 0 };
     }
   },
   animate: { x: 0, opacity: 1, scale: 1 },
   exit: (direction: BladeTransitionDirection) => {
     switch (direction) {
-      case "push": return { x: "-30%", opacity: 0 };
-      case "pop": return { x: "100%", opacity: 0 };
-      case "replace": return { opacity: 0, scale: 0.98 };
-      case "reset": return { opacity: 0, scale: 0.95 };
-      default: return { x: 40, opacity: 0 };
+      case "push":
+        return { x: "-30%", opacity: 0 };
+      case "pop":
+        return { x: "100%", opacity: 0 };
+      case "replace":
+        return { opacity: 0, scale: 0.98 };
+      case "reset":
+        return { opacity: 0, scale: 0.95 };
+      default:
+        return { x: 40, opacity: 0 };
     }
   },
 };
 
-export const bladeTransitionConfig: Record<BladeTransitionDirection, Transition> = {
+export const bladeTransitionConfig: Record<
+  BladeTransitionDirection,
+  Transition
+> = {
   push: { type: "tween", ease: "easeOut", duration: 0.2 },
   pop: { type: "tween", ease: "easeOut", duration: 0.18 },
   replace: { type: "tween", ease: "easeInOut", duration: 0.15 },
diff --git a/src/framework/theme/index.ts b/src/framework/theme/index.ts
index 4997dc39..ddc266b7 100644
--- a/src/framework/theme/index.ts
+++ b/src/framework/theme/index.ts
@@ -1,15 +1,15 @@
 export {
-  springTransition,
+  type BladeTransitionDirection,
+  bladeSlideIn,
+  bladeTransitionConfig,
+  bladeTransitionVariants,
   easeTransition,
-  staggerContainer,
-  staggerItem,
-  fadeInUp,
-  fadeInScale,
   fadeIn,
+  fadeInScale,
+  fadeInUp,
   slideInLeft,
+  springTransition,
+  staggerContainer,
+  staggerItem,
   tabContent,
-  bladeSlideIn,
-  type BladeTransitionDirection,
-  bladeTransitionVariants,
-  bladeTransitionConfig,
 } from "./animations";
diff --git a/src/index.css b/src/index.css
index cffc2229..d660bec5 100644
--- a/src/index.css
+++ b/src/index.css
@@ -28,193 +28,195 @@
 
 /* React Flow Controls - Theme-aware */
 .react-flow__controls {
-    background: var(--catppuccin-color-mantle);
-    border: 1px solid var(--catppuccin-color-surface0);
-    border-radius: 6px;
-    box-shadow: 0 4px 6px -1px rgb(0 0 0 / 0.1);
+  background: var(--catppuccin-color-mantle);
+  border: 1px solid var(--catppuccin-color-surface0);
+  border-radius: 6px;
+  box-shadow: 0 4px 6px -1px rgb(0 0 0 / 0.1);
 }
 
 .react-flow__controls-button {
-    background: var(--catppuccin-color-mantle);
-    border-bottom: 1px solid var(--catppuccin-color-surface0);
-    fill: var(--catppuccin-color-subtext0);
-    width: 28px;
-    height: 28px;
+  background: var(--catppuccin-color-mantle);
+  border-bottom: 1px solid var(--catppuccin-color-surface0);
+  fill: var(--catppuccin-color-subtext0);
+  width: 28px;
+  height: 28px;
 }
 
 .react-flow__controls-button:hover {
-    background: var(--catppuccin-color-surface0);
-    fill: var(--catppuccin-color-text);
+  background: var(--catppuccin-color-surface0);
+  fill: var(--catppuccin-color-text);
 }
 
 .react-flow__controls-button:last-child {
-    border-bottom: none;
+  border-bottom: none;
 }
 
 /* React Flow Attribution - Theme-aware */
 .react-flow__attribution {
-    background: var(--catppuccin-color-mantle);
-    border: 1px solid var(--catppuccin-color-surface0);
-    border-radius: 4px;
-    padding: 2px 6px;
-    font-size: 10px;
+  background: var(--catppuccin-color-mantle);
+  border: 1px solid var(--catppuccin-color-surface0);
+  border-radius: 4px;
+  padding: 2px 6px;
+  font-size: 10px;
 }
 
 .react-flow__attribution a {
-    color: var(--catppuccin-color-overlay0);
-    text-decoration: none;
+  color: var(--catppuccin-color-overlay0);
+  text-decoration: none;
 }
 
 .react-flow__attribution a:hover {
-    color: var(--catppuccin-color-subtext0);
+  color: var(--catppuccin-color-subtext0);
 }
 
 @keyframes dirty-pulse {
-    0%,
-    100% {
-        filter: drop-shadow(0 0 0px var(--catppuccin-color-yellow));
-        opacity: 1;
-    }
-    50% {
-        filter: drop-shadow(0 0 4px var(--catppuccin-color-yellow));
-        opacity: 0.7;
-    }
+  0%,
+  100% {
+    filter: drop-shadow(0 0 0px var(--catppuccin-color-yellow));
+    opacity: 1;
+  }
+  50% {
+    filter: drop-shadow(0 0 4px var(--catppuccin-color-yellow));
+    opacity: 0.7;
+  }
 }
 
 @keyframes gentle-pulse {
-    0%,
-    100% {
-        opacity: 1;
-    }
-    50% {
-        opacity: 0.6;
-    }
+  0%,
+  100% {
+    opacity: 1;
+  }
+  50% {
+    opacity: 0.6;
+  }
 }
 
 @keyframes stage-flash {
-    0% {
-        background-color: rgb(166 227 161 / 0.3);
-    }
-    100% {
-        background-color: transparent;
-    }
+  0% {
+    background-color: rgb(166 227 161 / 0.3);
+  }
+  100% {
+    background-color: transparent;
+  }
 }
 
 /* Hunk staging gutter controls */
 .hunk-stage-glyph {
-    cursor: pointer;
+  cursor: pointer;
 }
 .hunk-stage-glyph::before {
-    content: "+";
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: 16px;
-    height: 16px;
-    border-radius: 3px;
-    font-size: 12px;
-    font-weight: bold;
-    color: var(--catppuccin-color-green);
-    background: rgb(166 227 161 / 0.15);
-    transition: background 0.15s;
+  content: "+";
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 16px;
+  height: 16px;
+  border-radius: 3px;
+  font-size: 12px;
+  font-weight: bold;
+  color: var(--catppuccin-color-green);
+  background: rgb(166 227 161 / 0.15);
+  transition: background 0.15s;
 }
 .hunk-stage-glyph:hover::before {
-    background: rgb(166 227 161 / 0.3);
+  background: rgb(166 227 161 / 0.3);
 }
 
 .hunk-unstage-glyph {
-    cursor: pointer;
+  cursor: pointer;
 }
 .hunk-unstage-glyph::before {
-    content: "\2212";
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: 16px;
-    height: 16px;
-    border-radius: 3px;
-    font-size: 12px;
-    font-weight: bold;
-    color: var(--catppuccin-color-peach);
-    background: rgb(250 179 135 / 0.15);
-    transition: background 0.15s;
+  content: "\2212";
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 16px;
+  height: 16px;
+  border-radius: 3px;
+  font-size: 12px;
+  font-weight: bold;
+  color: var(--catppuccin-color-peach);
+  background: rgb(250 179 135 / 0.15);
+  transition: background 0.15s;
 }
 .hunk-unstage-glyph:hover::before {
-    background: rgb(250 179 135 / 0.3);
+  background: rgb(250 179 135 / 0.3);
 }
 
 /* Line selection gutter controls */
 .line-stage-checkbox {
-    cursor: pointer;
+  cursor: pointer;
 }
 .line-stage-checkbox::before {
-    content: "";
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: 12px;
-    height: 12px;
-    border: 1.5px solid var(--catppuccin-color-overlay1);
-    border-radius: 2px;
-    margin: 2px;
-    transition: border-color 0.15s, background 0.15s;
+  content: "";
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 12px;
+  height: 12px;
+  border: 1.5px solid var(--catppuccin-color-overlay1);
+  border-radius: 2px;
+  margin: 2px;
+  transition:
+    border-color 0.15s,
+    background 0.15s;
 }
 .line-stage-checkbox:hover::before {
-    border-color: var(--catppuccin-color-blue);
-    background: rgb(137 180 250 / 0.1);
+  border-color: var(--catppuccin-color-blue);
+  background: rgb(137 180 250 / 0.1);
 }
 
 .line-stage-checkbox-checked {
-    cursor: pointer;
+  cursor: pointer;
 }
 .line-stage-checkbox-checked::before {
-    content: "";
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: 12px;
-    height: 12px;
-    border: 1.5px solid var(--catppuccin-color-blue);
-    border-radius: 2px;
-    margin: 2px;
-    background: var(--catppuccin-color-blue);
+  content: "";
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 12px;
+  height: 12px;
+  border: 1.5px solid var(--catppuccin-color-blue);
+  border-radius: 2px;
+  margin: 2px;
+  background: var(--catppuccin-color-blue);
 }
 
 .line-stage-selected {
-    cursor: pointer;
+  cursor: pointer;
 }
 .line-stage-selected::before {
-    content: "";
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: 12px;
-    height: 12px;
-    border: 1.5px solid var(--catppuccin-color-blue);
-    border-radius: 2px;
-    margin: 2px;
-    background: var(--catppuccin-color-blue);
+  content: "";
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 12px;
+  height: 12px;
+  border: 1.5px solid var(--catppuccin-color-blue);
+  border-radius: 2px;
+  margin: 2px;
+  background: var(--catppuccin-color-blue);
 }
 
 /* Selected line highlight */
 .line-selected-for-staging {
-    background: rgb(137 180 250 / 0.1) !important;
+  background: rgb(137 180 250 / 0.1);
 }
 
 @keyframes fadeOut {
-    from {
-        opacity: 1;
-    }
-    to {
-        opacity: 0;
-    }
+  from {
+    opacity: 1;
+  }
+  to {
+    opacity: 0;
+  }
 }
 
 /* Color scheme meta for browser UI (scrollbars, etc.) */
 html.mocha {
-    color-scheme: dark;
+  color-scheme: dark;
 }
 
 html.latte {
-    color-scheme: light;
+  color-scheme: light;
 }