@gmickel/gno 0.34.0 → 0.35.0

package/src/serve/public/components/CaptureModal.tsx

@@ -19,6 +19,11 @@ import { useCallback, useEffect, useRef, useState } from "react";
 
 import type { WikiLinkDoc } from "./WikiLinkAutocomplete";
 
+import {
+  getNotePreset,
+  NOTE_PRESETS,
+  resolveNotePreset,
+} from "../../../core/note-presets";
 import { apiFetch } from "../hooks/use-api";
 import { getActiveWikiLinkQuery } from "../lib/wiki-link";
 import { IndexingProgress } from "./IndexingProgress";
@@ -48,6 +53,12 @@ export interface CaptureModalProps {
   open: boolean;
   /** Prefill title when opening from another surface */
   draftTitle?: string;
+  /** Default collection from current workspace context */
+  defaultCollection?: string;
+  /** Default folder path from current workspace context */
+  defaultFolderPath?: string;
+  /** Optional preset id */
+  presetId?: string;
   /** Callback when open state changes */
   onOpenChange: (open: boolean) => void;
   /** Callback when document created successfully */
@@ -62,8 +73,11 @@ interface Collection {
 interface CreateDocResponse {
   uri: string;
   path: string;
-  jobId: string;
+  jobId: string | null;
   note: string;
+  openedExisting?: boolean;
+  created?: boolean;
+  relPath?: string;
 }
 
 interface CollectionsResponse {
@@ -91,8 +105,11 @@ type ModalState = "form" | "submitting" | "success" | "error";
 export function CaptureModal({
   open,
   draftTitle = "",
+  defaultCollection = "",
+  defaultFolderPath = "",
   onOpenChange,
   onSuccess,
+  presetId = "",
 }: CaptureModalProps) {
   // Form state
   const [title, setTitle] = useState("");
@@ -100,6 +117,9 @@ export function CaptureModal({
   const [collection, setCollection] = useState("");
   const [collections, setCollections] = useState<Collection[]>([]);
   const [tags, setTags] = useState<string[]>([]);
+  const [selectedPresetId, setSelectedPresetId] = useState<string>(presetId);
+  const [contentTouched, setContentTouched] = useState(false);
+  const [lastGeneratedContent, setLastGeneratedContent] = useState("");
   const [wikiLinkDocs, setWikiLinkDocs] = useState<WikiLinkDoc[]>([]);
   const [wikiLinkOpen, setWikiLinkOpen] = useState(false);
   const [wikiLinkQuery, setWikiLinkQuery] = useState("");
@@ -123,6 +143,7 @@ export function CaptureModal({
     if (draftTitle.trim()) {
       setTitle(draftTitle);
     }
+    setSelectedPresetId(presetId || "blank");
 
     void apiFetch<CollectionsResponse>("/api/status").then(({ data }) => {
       if (data?.collections) {
@@ -130,9 +151,17 @@ export function CaptureModal({
           data.collections.map((c) => ({ name: c.name, path: c.path }))
         );
 
-        // Restore last used collection or default to first
+        const requestedCollection = defaultCollection.trim();
         const lastUsed = localStorage.getItem(STORAGE_KEY);
-        if (lastUsed && data.collections.some((c) => c.name === lastUsed)) {
+        if (
+          requestedCollection &&
+          data.collections.some((c) => c.name === requestedCollection)
+        ) {
+          setCollection(requestedCollection);
+        } else if (
+          lastUsed &&
+          data.collections.some((c) => c.name === lastUsed)
+        ) {
           setCollection(lastUsed);
         } else {
           const firstCollection = data.collections.at(0);
@@ -142,7 +171,7 @@ export function CaptureModal({
         }
       }
     });
-  }, [draftTitle, open]);
+  }, [defaultCollection, draftTitle, open, presetId]);
 
   // Reset form when modal closes
   useEffect(() => {
@@ -152,6 +181,9 @@ export function CaptureModal({
         setTitle("");
         setContent("");
         setTags([]);
+        setContentTouched(false);
+        setLastGeneratedContent("");
+        setSelectedPresetId("blank");
         setState("form");
         setError(null);
         setJobId(null);
@@ -168,6 +200,44 @@ export function CaptureModal({
   // Validate form
   const isValid = title.trim() && content.trim() && collection;
 
+  useEffect(() => {
+    if (!open) {
+      return;
+    }
+
+    const resolved = resolveNotePreset({
+      presetId: selectedPresetId || "blank",
+      title: title.trim() || draftTitle.trim() || "Untitled",
+      tags,
+    });
+    const generatedContent = resolved?.content ?? "";
+    const shouldApply =
+      !contentTouched || !content.trim() || content === lastGeneratedContent;
+
+    setLastGeneratedContent(generatedContent);
+    if (shouldApply) {
+      setContent(generatedContent);
+      if (resolved?.tags) {
+        const nextTags = resolved.tags;
+        const sameTags =
+          nextTags.length === tags.length &&
+          nextTags.every((tag, index) => tags[index] === tag);
+        if (!sameTags) {
+          setTags(nextTags);
+        }
+      }
+    }
+  }, [
+    content,
+    contentTouched,
+    draftTitle,
+    lastGeneratedContent,
+    open,
+    selectedPresetId,
+    tags,
+    title,
+  ]);
+
   // Submit form
   const handleSubmit = useCallback(async () => {
     if (!isValid) return;
@@ -175,9 +245,6 @@ export function CaptureModal({
     setState("submitting");
     setError(null);
 
-    const filename = sanitizeFilename(title) || "untitled";
-    const relPath = `${filename}.md`;
-
     // Include tags in the POST request (server writes to frontmatter)
     const { data, error: err } = await apiFetch<CreateDocResponse>(
       "/api/docs",
@@ -185,8 +252,11 @@ export function CaptureModal({
         method: "POST",
         body: JSON.stringify({
           collection,
-          relPath,
+          title,
+          folderPath: defaultFolderPath || undefined,
           content,
+          presetId: selectedPresetId || undefined,
+          collisionPolicy: "create_with_suffix",
           ...(tags.length > 0 && { tags }),
         }),
       }
@@ -207,7 +277,16 @@ export function CaptureModal({
       setCreatedUri(data.uri);
       onSuccess?.(data.uri);
     }
-  }, [isValid, title, collection, content, tags, onSuccess]);
+  }, [
+    collection,
+    content,
+    defaultFolderPath,
+    isValid,
+    onSuccess,
+    selectedPresetId,
+    tags,
+    title,
+  ]);
 
   // Handle keyboard submit
   const handleKeyDown = useCallback(
@@ -249,16 +328,16 @@ export function CaptureModal({
 
   const handleCreateLinkedNote = useCallback(
     async (linkedTitle: string) => {
-      const filename = sanitizeFilename(linkedTitle) || "untitled";
-      const relPath = `${filename}.md`;
       const { data, error: err } = await apiFetch<CreateDocResponse>(
         "/api/docs",
         {
           method: "POST",
           body: JSON.stringify({
             collection,
-            relPath,
+            title: linkedTitle,
+            folderPath: defaultFolderPath || undefined,
             content: `# ${linkedTitle}\n`,
+            collisionPolicy: "open_existing",
           }),
         }
       );
@@ -279,10 +358,11 @@ export function CaptureModal({
         ]);
       }
     },
-    [collection, insertWikiLink]
+    [collection, defaultFolderPath, insertWikiLink]
   );
 
   const handleContentInput = useCallback((nextContent: string) => {
+    setContentTouched(true);
     setContent(nextContent);
     const cursorPos = contentRef.current?.selectionStart ?? nextContent.length;
     const activeQuery = getActiveWikiLinkQuery(nextContent, cursorPos);
@@ -414,6 +494,48 @@ export function CaptureModal({
               )}
             </div>
 
+            {/* Preset */}
+            <div>
+              <label
+                className="mb-1.5 block font-medium text-sm"
+                htmlFor="capture-preset"
+              >
+                Preset
+              </label>
+              <Select
+                disabled={state === "submitting"}
+                onValueChange={setSelectedPresetId}
+                value={selectedPresetId}
+              >
+                <SelectTrigger className="w-full" id="capture-preset">
+                  <SelectValue placeholder="Select a preset" />
+                </SelectTrigger>
+                <SelectContent>
+                  {NOTE_PRESETS.map((preset) => (
+                    <SelectItem key={preset.id} value={preset.id}>
+                      {preset.label}
+                    </SelectItem>
+                  ))}
+                </SelectContent>
+              </Select>
+              {getNotePreset(selectedPresetId)?.description && (
+                <p className="mt-1 text-muted-foreground text-xs">
+                  {getNotePreset(selectedPresetId)?.description}
+                </p>
+              )}
+            </div>
+
+            {defaultFolderPath && (
+              <div className="rounded-lg border border-border/50 bg-muted/20 p-3">
+                <div className="mb-1 font-mono text-[10px] text-muted-foreground uppercase tracking-[0.14em]">
+                  Target location
+                </div>
+                <div className="font-mono text-xs text-muted-foreground">
+                  {collection || defaultCollection} / {defaultFolderPath}
+                </div>
+              </div>
+            )}
+
             {/* Tags */}
             <div>
               <span className="mb-1.5 block font-medium text-sm">

package/src/serve/public/components/QuickSwitcher.tsx

@@ -8,8 +8,12 @@ import {
 } from "lucide-react";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 
+import type { DocumentSection } from "../../../core/sections";
+import type { CaptureModalOpenOptions } from "../hooks/useCaptureModal";
+
+import { NOTE_PRESETS } from "../../../core/note-presets";
 import { apiFetch } from "../hooks/use-api";
-import { buildDocDeepLink } from "../lib/deep-links";
+import { buildDocDeepLink, parseDocumentDeepLink } from "../lib/deep-links";
 import {
   loadFavoriteCollections,
   loadFavoriteDocuments,
@@ -18,6 +22,10 @@ import {
   type FavoriteDoc,
   type RecentDoc,
 } from "../lib/navigation-state";
+import {
+  getWorkspaceActions,
+  runWorkspaceAction,
+} from "../lib/workspace-actions";
 import {
   CommandDialog,
   CommandEmpty,
@@ -45,14 +53,25 @@ interface SearchResponse {
   results: SearchResult[];
 }
 
+interface DocLookupResponse {
+  docid: string;
+  uri: string;
+}
+
+interface SectionsResponse {
+  sections: DocumentSection[];
+}
+
 export interface QuickSwitcherProps {
+  location: string;
   open: boolean;
   onOpenChange: (open: boolean) => void;
   navigate: (to: string) => void;
-  onCreateNote: (draftTitle?: string) => void;
+  onCreateNote: (options?: string | CaptureModalOpenOptions) => void;
 }
 
 export function QuickSwitcher({
+  location,
   open,
   onOpenChange,
   navigate,
@@ -65,6 +84,7 @@ export function QuickSwitcher({
   const [favoriteCollections, setFavoriteCollections] = useState<
     FavoriteCollection[]
   >([]);
+  const [sections, setSections] = useState<DocumentSection[]>([]);
   const [loading, setLoading] = useState(false);
   const requestIdRef = useRef(0);
 
@@ -80,6 +100,35 @@ export function QuickSwitcher({
     setFavoriteCollections(loadFavoriteCollections());
   }, [open]);
 
+  useEffect(() => {
+    if (!open || !location.startsWith("/doc?")) {
+      setSections([]);
+      return;
+    }
+
+    const target = parseDocumentDeepLink(
+      location.includes("?") ? `?${location.split("?")[1] ?? ""}` : ""
+    );
+    if (!target.uri) {
+      setSections([]);
+      return;
+    }
+
+    void apiFetch<DocLookupResponse>(
+      `/api/doc?uri=${encodeURIComponent(target.uri)}`
+    ).then(({ data }) => {
+      if (!data?.docid) {
+        setSections([]);
+        return;
+      }
+      void apiFetch<SectionsResponse>(
+        `/api/doc/${encodeURIComponent(data.docid)}/sections`
+      ).then(({ data: sectionData }) => {
+        setSections(sectionData?.sections ?? []);
+      });
+    });
+  }, [location, open]);
+
   useEffect(() => {
     if (!open) return;
     if (!query.trim()) {
@@ -118,6 +167,31 @@ export function QuickSwitcher({
     () => favoriteCollections.slice(0, 6),
     [favoriteCollections]
   );
+  const workspaceActions = useMemo(
+    () => getWorkspaceActions({ location }),
+    [location]
+  );
+  const exactResult = useMemo(() => {
+    const normalizedQuery = query.trim().toLowerCase();
+    if (!normalizedQuery) {
+      return null;
+    }
+
+    return (
+      results.find((result) => {
+        const normalizedTitle = (result.title ?? "").trim().toLowerCase();
+        const normalizedLeaf = decodeURIComponent(
+          result.uri.split("/").pop() ?? ""
+        )
+          .replace(/\.[^.]+$/u, "")
+          .toLowerCase();
+        return (
+          normalizedTitle === normalizedQuery ||
+          normalizedLeaf === normalizedQuery
+        );
+      }) ?? null
+    );
+  }, [query, results]);
 
   const openTarget = useCallback(
     (target: { uri: string; lineStart?: number; lineEnd?: number }) => {
@@ -134,7 +208,32 @@ export function QuickSwitcher({
     [navigate, onOpenChange]
   );
 
-  const showCreateAction = query.trim().length > 0;
+  const showCreateAction = true;
+  const actionHandlers = useMemo(
+    () => ({
+      navigate,
+      openCapture: onCreateNote,
+      closePalette: () => onOpenChange(false),
+    }),
+    [navigate, onCreateNote, onOpenChange]
+  );
+  const filteredPresetActions = useMemo(() => {
+    const normalizedQuery = query.trim().toLowerCase();
+    return NOTE_PRESETS.filter((preset) => preset.id !== "blank").filter(
+      (preset) =>
+        !normalizedQuery ||
+        preset.label.toLowerCase().includes(normalizedQuery) ||
+        preset.description.toLowerCase().includes(normalizedQuery)
+    );
+  }, [query]);
+  const filteredSections = useMemo(() => {
+    const normalizedQuery = query.trim().toLowerCase();
+    return sections.filter(
+      (section) =>
+        !normalizedQuery ||
+        section.title.toLowerCase().includes(normalizedQuery)
+    );
+  }, [query, sections]);
 
   return (
     <CommandDialog
@@ -214,10 +313,24 @@ export function QuickSwitcher({
         {showCreateAction && (
           <>
             <CommandGroup heading="Actions">
+              {exactResult && (
+                <CommandItem
+                  onSelect={() =>
+                    openTarget({
+                      uri: exactResult.uri,
+                    })
+                  }
+                  value={`open-exact-${query}`}
+                >
+                  <FileTextIcon />
+                  <span>Open exact match</span>
+                  <CommandShortcut>Exact</CommandShortcut>
+                </CommandItem>
+              )}
               <CommandItem
                 onSelect={() => {
                   onOpenChange(false);
-                  onCreateNote(query.trim());
+                  onCreateNote({ draftTitle: query.trim() });
                 }}
                 value={`create-${query}`}
               >
@@ -225,11 +338,122 @@ export function QuickSwitcher({
                 <span>Create new note</span>
                 <CommandShortcut>{query.trim()}</CommandShortcut>
               </CommandItem>
+              {workspaceActions
+                .filter((action) =>
+                  [
+                    "new-note-in-context",
+                    "create-folder-here",
+                    "rename-current-note",
+                    "move-current-note",
+                    "duplicate-current-note",
+                  ].includes(action.id)
+                )
+                .map((action) => (
+                  <CommandItem
+                    disabled={!action.available}
+                    key={action.id}
+                    onSelect={() =>
+                      runWorkspaceAction(
+                        action,
+                        { location },
+                        actionHandlers,
+                        query.trim()
+                      )
+                    }
+                    value={`${action.label} ${action.keywords.join(" ")} ${query}`}
+                  >
+                    <FolderIcon />
+                    <span>{action.label}</span>
+                    <CommandShortcut>
+                      {action.id === "new-note-in-context"
+                        ? "Context"
+                        : "Action"}
+                    </CommandShortcut>
+                  </CommandItem>
+                ))}
             </CommandGroup>
             <CommandSeparator />
           </>
         )}
 
+        <CommandGroup heading="Go To">
+          {workspaceActions
+            .filter((action) => action.group === "Go To" && action.available)
+            .map((action) => (
+              <CommandItem
+                key={action.id}
+                onSelect={() =>
+                  runWorkspaceAction(
+                    action,
+                    { location },
+                    actionHandlers,
+                    query.trim()
+                  )
+                }
+                value={`${action.label} ${action.keywords.join(" ")}`}
+              >
+                <FolderIcon />
+                <span>{action.label}</span>
+              </CommandItem>
+            ))}
+        </CommandGroup>
+
+        {filteredPresetActions.length > 0 && (
+          <CommandGroup heading="Presets">
+            {filteredPresetActions.map((preset) => (
+              <CommandItem
+                key={preset.id}
+                onSelect={() => {
+                  onCreateNote({
+                    draftTitle: query.trim() || undefined,
+                    presetId: preset.id,
+                  });
+                  onOpenChange(false);
+                }}
+                value={`${preset.label} ${preset.description} preset`}
+              >
+                <FilePlusIcon />
+                <span>{preset.label}</span>
+                <CommandShortcut>Preset</CommandShortcut>
+              </CommandItem>
+            ))}
+          </CommandGroup>
+        )}
+
+        {filteredSections.length > 0 && (
+          <CommandGroup heading="Sections">
+            {filteredSections.map((section) => {
+              const target = parseDocumentDeepLink(
+                location.includes("?") ? `?${location.split("?")[1] ?? ""}` : ""
+              );
+              if (!target.uri) {
+                return null;
+              }
+              return (
+                <CommandItem
+                  key={section.anchor}
+                  onSelect={() => {
+                    navigate(
+                      `${buildDocDeepLink({
+                        uri: target.uri,
+                        view: "rendered",
+                      })}#${section.anchor}`
+                    );
+                    onOpenChange(false);
+                  }}
+                  value={`${section.title} section heading outline`}
+                >
+                  <SearchIcon />
+                  <span>{section.title}</span>
+                  <CommandShortcut>{`H${section.level}`}</CommandShortcut>
+                </CommandItem>
+              );
+            })}
+          </CommandGroup>
+        )}
+
+        {!query.trim() && <CommandSeparator />}
+
         {query.trim() && (
           <CommandGroup heading="Documents">
             {results.map((result) => (

package/src/serve/public/components/ShortcutHelpModal.tsx

@@ -29,12 +29,17 @@ interface ShortcutGroup {
   shortcuts: ShortcutItem[];
 }
 
+interface CommandExampleGroup {
+  title: string;
+  commands: string[];
+}
+
 const shortcutGroups: ShortcutGroup[] = [
   {
     title: "Global",
     shortcuts: [
       { keys: "N", description: "New note" },
-      { keys: "Cmd+K", description: "Quick switcher" },
+      { keys: "Cmd+K", description: "Command palette" },
       { keys: "/", description: "Focus search" },
       { keys: "T", description: "Cycle search depth" },
       { keys: "?", description: "Show shortcuts" },
@@ -59,6 +64,29 @@ const footerShortcut: ShortcutItem = {
   description: "Submit form",
 };
 
+const commandExamples: CommandExampleGroup[] = [
+  {
+    title: "Create",
+    commands: [
+      "new note",
+      "new note in current location",
+      "create folder here",
+      "Project Note",
+      "Research Note",
+    ],
+  },
+  {
+    title: "Current Note",
+    commands: [
+      "rename current note",
+      "move current note",
+      "duplicate current note",
+      "Intro",
+      "Details",
+    ],
+  },
+];
+
 function KeyCombo({ keys }: { keys: string }) {
   const parts = keys.split("+");
 
@@ -202,6 +230,31 @@ export function ShortcutHelpModal({
           </div>
           <KeyCombo keys={footerShortcut.keys} />
         </div>
+
+        <div className="mt-4 space-y-3 rounded-md border border-[hsl(var(--secondary)/0.12)] bg-[hsl(var(--secondary)/0.03)] p-3">
+          <div className="font-mono text-[10px] uppercase tracking-[0.15em] text-[hsl(var(--secondary)/0.7)]">
+            Command Palette Examples
+          </div>
+          <div className="grid grid-cols-2 gap-4">
+            {commandExamples.map((group) => (
+              <div className="space-y-1" key={group.title}>
+                <div className="font-mono text-[10px] uppercase tracking-[0.12em] text-muted-foreground/60">
+                  {group.title}
+                </div>
+                <div className="space-y-1">
+                  {group.commands.map((command) => (
+                    <div
+                      className="rounded px-2 py-1 font-mono text-[11px] text-muted-foreground/80"
+                      key={command}
+                    >
+                      {command}
+                    </div>
+                  ))}
+                </div>
+              </div>
+            ))}
+          </div>
+        </div>
       </DialogContent>
     </Dialog>
   );