diff --git a/frontend/src/components/shared/config/configSections/HotkeysSection.tsx b/frontend/src/components/shared/config/configSections/HotkeysSection.tsx
index acd6d4be2..520f1730a 100644
--- a/frontend/src/components/shared/config/configSections/HotkeysSection.tsx
+++ b/frontend/src/components/shared/config/configSections/HotkeysSection.tsx
@@ -6,7 +6,6 @@ import { useHotkeys } from '../../../../contexts/HotkeyContext';
 import { ToolId } from '../../../../types/toolId';
 import HotkeyDisplay from '../../../hotkeys/HotkeyDisplay';
 import { bindingEquals, eventToBinding, HotkeyBinding } from '../../../../utils/hotkeys';
-import { ToolId } from 'src/types/toolId';
 import { ToolRegistryEntry } from 'src/data/toolsTaxonomy';
 
 const rowStyle: React.CSSProperties = {
diff --git a/frontend/src/components/tools/FullscreenToolSurface.tsx b/frontend/src/components/tools/FullscreenToolSurface.tsx
index 1e8a8cd2a..1f0f9d95b 100644
--- a/frontend/src/components/tools/FullscreenToolSurface.tsx
+++ b/frontend/src/components/tools/FullscreenToolSurface.tsx
@@ -13,7 +13,7 @@ import { ToolPanelGeometry } from '../../hooks/tools/useToolPanelGeometry';
 
 interface FullscreenToolSurfaceProps {
   searchQuery: string;
-  toolRegistry: Record<ToolId, ToolRegistryEntry>;
+  toolRegistry: Partial<Record<ToolId, ToolRegistryEntry>>;
   filteredTools: Array<{ item: [ToolId, ToolRegistryEntry]; matchedText?: string }>;
   selectedToolKey: string | null;
   showDescriptions: boolean;
diff --git a/frontend/src/components/tools/SearchResults.tsx b/frontend/src/components/tools/SearchResults.tsx
index 3bd306953..5fef3d858 100644
--- a/frontend/src/components/tools/SearchResults.tsx
+++ b/frontend/src/components/tools/SearchResults.tsx
@@ -8,7 +8,6 @@ import { useToolSections } from '../../hooks/useToolSections';
 import SubcategoryHeader from './shared/SubcategoryHeader';
 import NoToolsFound from './shared/NoToolsFound';
 import "./toolPicker/ToolPicker.css";
-import { ToolId } from 'src/types/toolId';
 
 interface SearchResultsProps {
   filteredTools: Array<{ item: [ToolId, ToolRegistryEntry]; matchedText?: string }>;
diff --git a/frontend/src/components/tools/fullscreen/shared.ts b/frontend/src/components/tools/fullscreen/shared.ts
index 393aa4894..6355c3828 100644
--- a/frontend/src/components/tools/fullscreen/shared.ts
+++ b/frontend/src/components/tools/fullscreen/shared.ts
@@ -31,7 +31,7 @@ export function useToolMeta(id: string, tool: ToolRegistryEntry) {
   const { isFavorite, toggleFavorite } = useToolWorkflow();
 
   const isFav = isFavorite(id as ToolId);
-  const binding = hotkeys[id];
+  const binding = hotkeys[id as ToolId];
   const disabled = isToolDisabled(id, tool);
 
   return {
diff --git a/frontend/src/components/tools/toolPicker/ToolSearch.tsx b/frontend/src/components/tools/toolPicker/ToolSearch.tsx
index 42965c57c..d94003d2c 100644
--- a/frontend/src/components/tools/toolPicker/ToolSearch.tsx
+++ b/frontend/src/components/tools/toolPicker/ToolSearch.tsx
@@ -11,7 +11,7 @@ import { ToolId } from "src/types/toolId";
 interface ToolSearchProps {
   value: string;
   onChange: (value: string) => void;
-  toolRegistry: Readonly<Record<ToolId, ToolRegistryEntry>>;
+  toolRegistry: Partial<Record<ToolId, ToolRegistryEntry>>;
   onToolSelect?: (toolId: ToolId) => void;
   mode: "filter" | "dropdown" | "unstyled";
   selectedToolKey?: string | null;
diff --git a/frontend/src/hooks/tools/useFavoriteToolItems.ts b/frontend/src/hooks/tools/useFavoriteToolItems.ts
index 267909a08..9101e3e3e 100644
--- a/frontend/src/hooks/tools/useFavoriteToolItems.ts
+++ b/frontend/src/hooks/tools/useFavoriteToolItems.ts
@@ -4,7 +4,7 @@ import { ToolRegistryEntry } from '../../data/toolsTaxonomy';
 
 export function useFavoriteToolItems(
   favoriteTools: ToolId[],
-  toolRegistry: Readonly<Record<ToolId, ToolRegistryEntry>>
+  toolRegistry: Partial<Record<ToolId, ToolRegistryEntry>>
 ): Array<{ id: ToolId; tool: ToolRegistryEntry }> {
   return useMemo(() => {
     return favoriteTools