Drop shell prefix from shared stores

Renames use-shell-{command,draft,navigation}-store to
use-{command,draft,navigation}-store and use-shell-store to
use-app-state, along with all exported symbols (useShellFooStore →
useFooStore, shellStore → appStore, etc.). The "shell" prefix was
vestigial after moving these out of features/shell/.

Author: ChristianChiarulli

app/src/features/editor/extensions/link-interactions.test.ts

@@ -8,10 +8,10 @@ import {
 import { EditorView } from "@codemirror/view";
 import { afterEach, describe, expect, it, vi } from "vitest";
 import {
-  resetShellCommandState,
-  useShellCommandStore,
-} from "@/shared/stores/use-shell-command-store";
-import { shellStore } from "@/shared/stores/use-shell-store";
+  resetCommandState,
+  useCommandStore,
+} from "@/shared/stores/use-command-store";
+import { appStore } from "@/shared/stores/use-app-state";
 import { WikiLinkGrammar } from "@/features/editor/extensions/markdown-decorations/wikilink-syntax";
 
 const { invokeMock, openUrlMock } = vi.hoisted(() => ({
@@ -69,8 +69,8 @@ async function flush() {
 afterEach(() => {
   invokeMock.mockReset();
   openUrlMock.mockClear();
-  resetShellCommandState();
-  shellStore.setState({
+  resetCommandState();
+  appStore.setState({
     draftMarkdown: "",
     draftNoteId: null,
     draftWikilinkResolutions: [],
@@ -430,7 +430,7 @@ describe("Editor link interactions", () => {
   });
 
   it("prefers unsaved draft wikilink resolutions before backend lookup", () => {
-    shellStore.setState({
+    appStore.setState({
       draftMarkdown: "[[Target]]",
       draftNoteId: "note-1",
       draftWikilinkResolutions: [
@@ -482,9 +482,7 @@ describe("Editor link interactions", () => {
         title: "Target",
       },
     });
-    expect(
-      useShellCommandStore.getState().createNoteFromWikilinkRequest,
-    ).toEqual({
+    expect(useCommandStore.getState().createNoteFromWikilinkRequest).toEqual({
       location: 0,
       requestId: 1,
       sourceNoteId: "note-1",

app/src/features/editor/extensions/markdown-decorations/builders/links.ts

@@ -10,7 +10,7 @@ import { Decoration, EditorView } from "@codemirror/view";
 import type { SyntaxNode, SyntaxNodeRef } from "@lezer/common";
 
 import { overlapsAny } from "@/features/editor/extensions/markdown-decorations/cursor";
-import { useShellDraftStore } from "@/shared/stores/use-shell-draft-store";
+import { useDraftStore } from "@/shared/stores/use-draft-store";
 import { utf8ByteOffsetForText } from "@/shared/lib/wikilinks";
 import type {
   BuilderContext,
@@ -66,8 +66,7 @@ export function resolveDraftWikiLinkTarget(
     return null;
   }
 
-  const { draftNoteId, draftWikilinkResolutions } =
-    useShellDraftStore.getState();
+  const { draftNoteId, draftWikilinkResolutions } = useDraftStore.getState();
   if (draftNoteId !== noteId) {
     return null;
   }

app/src/features/editor/extensions/note-autocomplete.ts

@@ -29,7 +29,7 @@ import {
   matchWikiLinkCompletionAtCursor,
   utf8ByteOffsetForText,
 } from "@/shared/lib/wikilinks";
-import { useShellDraftStore } from "@/shared/stores/use-shell-draft-store";
+import { useDraftStore } from "@/shared/stores/use-draft-store";
 import { searchNoteTitles } from "@/shared/api/invoke";
 
 const TAG_COMPLETION_TEXT_RE = /^[-/\p{L}\p{N}_]*$/u;
@@ -231,15 +231,15 @@ function buildWikiLinkCompletionSource(noteId: string | null) {
                 console.debug(
                   "[wikilinks] autocomplete selected wikilink target",
                   {
-                    draftNoteId: useShellDraftStore.getState().draftNoteId,
+                    draftNoteId: useDraftStore.getState().draftNoteId,
                     occurrenceId,
                     location,
                     noteId,
                     targetNoteId: result.id,
                     title: result.title,
                   },
                 );
-                useShellDraftStore
+                useDraftStore
                   .getState()
                   .actions.upsertDraftWikilinkResolution(noteId, {
                     occurrenceId,

app/src/features/editor/hooks/use-find-bar.ts

@@ -8,7 +8,7 @@ import {
 
 import { type NoteEditorHandle } from "@/features/editor/note-editor";
 import { useCommandRequestId } from "@/shared/hooks/use-command-request";
-import { useShellCommandStore } from "@/shared/stores/use-shell-command-store";
+import { useCommandStore } from "@/shared/stores/use-command-store";
 import {
   isEditorFindShortcut,
   isNotesSearchShortcut,
@@ -31,7 +31,7 @@ export function useFindBar({
   const [findQuery, setFindQuery] = useState("");
   const [activeFindMatchIndex, setActiveFindMatchIndex] = useState(0);
   const [findScrollRevision, setFindScrollRevision] = useState(0);
-  const editorFindRequestId = useShellCommandStore(
+  const editorFindRequestId = useCommandStore(
     (state) => state.editorFindRequestId,
   );
   const findInputRef = useRef<HTMLInputElement | null>(null);

app/src/features/editor/note-editor.tsx

@@ -81,7 +81,7 @@ import {
 import { useNoteEditorSearchSync } from "@/features/editor/hooks/use-note-editor-search-sync";
 import { useNoteEditorToolbarActions } from "@/features/editor/hooks/use-note-editor-toolbar-actions";
 import { uiStore } from "@/shared/stores/use-ui-store";
-import { useShellNavigationStore } from "@/shared/stores/use-shell-navigation-store";
+import { useNavigationStore } from "@/shared/stores/use-navigation-store";
 import {
   isEditorFindShortcut,
   isNotesSearchShortcut,
@@ -250,7 +250,7 @@ function focusEditorPreservingScroll(view: EditorView) {
   const scrollContainer = findEditorScrollContainer(view);
   const scrollTop = scrollContainer?.scrollTop ?? 0;
 
-  useShellNavigationStore.getState().actions.setFocusedPane("editor");
+  useNavigationStore.getState().actions.setFocusedPane("editor");
   view.focus();
 
   if (scrollContainer) {
@@ -262,7 +262,7 @@ function focusEditorAtEndPreservingScroll(view: EditorView) {
   const scrollContainer = findEditorScrollContainer(view);
   const scrollTop = scrollContainer?.scrollTop ?? 0;
 
-  useShellNavigationStore.getState().actions.setFocusedPane("editor");
+  useNavigationStore.getState().actions.setFocusedPane("editor");
   view.dispatch({
     selection: EditorSelection.cursor(view.state.doc.length),
     scrollIntoView: false,
@@ -275,7 +275,7 @@ function focusEditorAtEndPreservingScroll(view: EditorView) {
 }
 
 function focusEditorAtStart(view: EditorView) {
-  useShellNavigationStore.getState().actions.setFocusedPane("editor");
+  useNavigationStore.getState().actions.setFocusedPane("editor");
   view.focus();
   view.dispatch({
     selection: EditorSelection.cursor(0),
@@ -305,7 +305,7 @@ function handleSpecialMouseDownSelection(view: EditorView, event: MouseEvent) {
   if (horizontalRuleSelection) {
     event.preventDefault();
     event.stopPropagation();
-    useShellNavigationStore.getState().actions.setFocusedPane("editor");
+    useNavigationStore.getState().actions.setFocusedPane("editor");
     view.focus();
     view.dispatch({ selection: horizontalRuleSelection });
     return true;
@@ -320,7 +320,7 @@ function handleSpecialMouseDownSelection(view: EditorView, event: MouseEvent) {
   if (tableBoundarySelection) {
     event.preventDefault();
     event.stopPropagation();
-    useShellNavigationStore.getState().actions.setFocusedPane("editor");
+    useNavigationStore.getState().actions.setFocusedPane("editor");
     view.focus();
     view.dispatch({
       scrollIntoView: false,
@@ -368,7 +368,7 @@ export const NoteEditor = forwardRef<NoteEditorHandle, NoteEditorProps>(
     const vimCompartmentRef = useRef(new Compartment());
     const applyingExternalChangeRef = useRef(false);
     const lastLoadKeyRef = useRef(loadKey);
-    const prevPaneRef = useRef(useShellNavigationStore.getState().focusedPane);
+    const prevPaneRef = useRef(useNavigationStore.getState().focusedPane);
     const initialAutoFocusRef = useRef(autoFocus);
     const initialOnAutoFocusHandledRef = useRef(onAutoFocusHandled);
     const initialMarkdownRef = useRef(markdown);
@@ -568,9 +568,7 @@ export const NoteEditor = forwardRef<NoteEditorHandle, NoteEditorProps>(
                 if (!uiState.notesPanelVisible) {
                   uiState.actions.toggleFocusMode();
                 }
-                useShellNavigationStore
-                  .getState()
-                  .actions.setFocusedPane("notes");
+                useNavigationStore.getState().actions.setFocusedPane("notes");
                 blurEditorView(view);
                 return true;
               },
@@ -662,7 +660,7 @@ export const NoteEditor = forwardRef<NoteEditorHandle, NoteEditorProps>(
       );
 
       syncEditorPaneFocusState(view, prevPaneRef.current);
-      const unsubscribeShell = useShellNavigationStore.subscribe((state) => {
+      const unsubscribeShell = useNavigationStore.subscribe((state) => {
         prevPaneRef.current = state.focusedPane;
         syncEditorPaneFocusState(view, state.focusedPane);
       });
@@ -755,13 +753,13 @@ export const NoteEditor = forwardRef<NoteEditorHandle, NoteEditorProps>(
         });
 
         if (autoFocus) {
-          useShellNavigationStore.getState().actions.setFocusedPane("editor");
+          useNavigationStore.getState().actions.setFocusedPane("editor");
           view.focus();
           onAutoFocusHandled?.();
         } else {
           requestAnimationFrame(() => {
             requestAnimationFrame(() => {
-              if (useShellNavigationStore.getState().focusedPane !== "editor") {
+              if (useNavigationStore.getState().focusedPane !== "editor") {
                 blurEditorView(view);
               }
             });

app/src/features/editor/ui/editor-pane.tsx

@@ -19,8 +19,8 @@ import {
   useUIActions,
 } from "@/shared/stores/use-ui-store";
 import { useCommandRequest } from "@/shared/hooks/use-command-request";
-import { useShellCommandStore } from "@/shared/stores/use-shell-command-store";
-import { useShellNavigationStore } from "@/shared/stores/use-shell-navigation-store";
+import { useCommandStore } from "@/shared/stores/use-command-store";
+import { useNavigationStore } from "@/shared/stores/use-navigation-store";
 import cometLogo from "@/assets/comet.svg";
 import { LogicalPosition } from "@tauri-apps/api/dpi";
 import {
@@ -128,7 +128,7 @@ export function EditorPane({
   const [toolbarContainer, setToolbarContainer] = useState<HTMLElement | null>(
     null,
   );
-  const focusEditorRequest = useShellCommandStore(
+  const focusEditorRequest = useCommandStore(
     (state) => state.focusEditorRequest,
   );
   const editorFontSize = useEditorFontSize();
@@ -137,7 +137,7 @@ export function EditorPane({
   const editorSpellCheck = useEditorSpellCheck();
   const editorVimMode = useEditorVimMode();
   const { setShowEditorToolbar: setShowToolbar } = useUIActions();
-  const { setFocusedPane } = useShellNavigationStore((state) => state.actions);
+  const { setFocusedPane } = useNavigationStore((state) => state.actions);
   const noteTitle = firstLineH1Title(markdown);
   const hasConflict = (noteConflict?.snapshotCount ?? 0) > 1;
   const viewableConflictSnapshots =

app/src/features/notes-pane/ui/note-row.tsx

@@ -4,7 +4,7 @@ import { GitMergeConflict, Pin } from "lucide-react";
 import { motion } from "framer-motion";
 
 import { uiStore, useSidebarVisible } from "@/shared/stores/use-ui-store";
-import { useShellNavigationStore } from "@/shared/stores/use-shell-navigation-store";
+import { useNavigationStore } from "@/shared/stores/use-navigation-store";
 import { dispatchFocusEditor } from "@/shared/lib/pane-navigation";
 import {
   type NoteListNavigationDirection,
@@ -57,7 +57,7 @@ export function NoteRow({
   const isActive = note.id === selectedNoteId;
   const cardPreview = noteCardPreview(note, searchWords);
   const sidebarVisible = useSidebarVisible();
-  const { setFocusedPane } = useShellNavigationStore((state) => state.actions);
+  const { setFocusedPane } = useNavigationStore((state) => state.actions);
 
   return (
     <motion.div

app/src/features/notes-pane/ui/notes-pane-utils.ts

@@ -7,7 +7,7 @@ import {
   Submenu,
 } from "@tauri-apps/api/menu";
 
-import { useShellNavigationStore } from "@/shared/stores/use-shell-navigation-store";
+import { useNavigationStore } from "@/shared/stores/use-navigation-store";
 import {
   type NoteFilter,
   type NoteSortDirection,
@@ -123,7 +123,7 @@ export function handleNoteRowPointerDown(
 export function focusSelectedNoteRow(root?: ParentNode | null) {
   requestAnimationFrame(() => {
     requestAnimationFrame(() => {
-      if (useShellNavigationStore.getState().focusedPane !== "notes") {
+      if (useNavigationStore.getState().focusedPane !== "notes") {
         return;
       }
 
@@ -143,7 +143,7 @@ export function focusSelectedNoteRow(root?: ParentNode | null) {
 export function focusNotesPaneTarget(scrollContainer: HTMLDivElement | null) {
   requestAnimationFrame(() => {
     requestAnimationFrame(() => {
-      if (useShellNavigationStore.getState().focusedPane !== "notes") {
+      if (useNavigationStore.getState().focusedPane !== "notes") {
         return;
       }
 

app/src/features/notes-pane/ui/notes-pane.tsx

@@ -26,9 +26,9 @@ import {
   useNoteFilter,
   useSearchQuery,
   useTagViewActive,
-} from "@/shared/stores/use-shell-store";
-import { useShellCommandStore } from "@/shared/stores/use-shell-command-store";
-import { useShellNavigationStore } from "@/shared/stores/use-shell-navigation-store";
+} from "@/shared/stores/use-app-state";
+import { useCommandStore } from "@/shared/stores/use-command-store";
+import { useNavigationStore } from "@/shared/stores/use-navigation-store";
 import {
   type NoteSortDirection,
   type NoteSortField,
@@ -100,14 +100,15 @@ export function NotesPane({
   const noteFilter = tagViewActive ? "all" : storeNoteFilter;
   const searchQuery = useSearchQuery();
   const creatingNoteId = useCreatingSelectedNoteId();
-  const focusNotesPaneRequest = useShellCommandStore(
+  const focusNotesPaneRequest = useCommandStore(
     (state) => state.focusNotesPaneRequest,
   );
-  const focusNotesSearchRequestId = useShellCommandStore(
+  const focusNotesSearchRequestId = useCommandStore(
     (state) => state.focusNotesSearchRequestId,
   );
-  const { setFocusedPane, setSearchQuery: onChangeSearch } =
-    useShellNavigationStore((state) => state.actions);
+  const { setFocusedPane, setSearchQuery: onChangeSearch } = useNavigationStore(
+    (state) => state.actions,
+  );
   const { setNoteSortPrefs } = useUIActions();
 
   const sortViewKey = noteFilter;

app/src/features/shell/hooks/use-draft-control.ts

@@ -6,7 +6,7 @@ import type {
   NoteConflictInfo,
   WikiLinkResolutionInput,
 } from "@/shared/api/types";
-import { useShellDraftStore } from "@/shared/stores/use-shell-draft-store";
+import { useDraftStore } from "@/shared/stores/use-draft-store";
 import { haveSameWikilinkResolutions } from "@/shared/lib/wikilink-resolutions";
 
 export interface DraftControlDeps {
@@ -31,7 +31,7 @@ export function useDraftControl(deps: DraftControlDeps) {
 
   const getCurrentDraftState = () => {
     const { draftMarkdown, draftNoteId, draftWikilinkResolutions } =
-      useShellDraftStore.getState();
+      useDraftStore.getState();
     if (!draftNoteId) {
       return null;
     }