@peaske7/readit 0.1.8 → 0.2.1

package/src/{cli/index.ts → cli.ts}

@@ -13,11 +13,10 @@ import * as os from "node:os";
 import { join, resolve } from "node:path";
 import { Command } from "commander";
 import open from "open";
-import { getCommentPath, parseCommentFile } from "../lib/comment-storage.js";
-import { getFileType } from "../lib/utils.js";
-import type { FileEntry } from "../server/index.js";
-import { removeServerInfo, startServer } from "../server/index.js";
-import type { DocumentType } from "../types/index.js";
+import { getCommentPath, parseCommentFile } from "./lib/comment-storage.js";
+import { isMarkdownFile } from "./lib/utils.js";
+import type { FileEntry } from "./server.js";
+import { removeServerInfo, startServer } from "./server.js";
 
 const program = new Command();
 
@@ -81,9 +80,7 @@ async function clearStaleServerLock(): Promise<void> {
       try {
         const lock = JSON.parse(content) as { pid?: number };
         pid = lock.pid;
-      } catch {
-        // Ignore malformed lock files and fall back to age-based cleanup.
-      }
+      } catch {}
     }
 
     if (age > SERVER_LOCK_MAX_AGE_MS || (pid !== undefined && !isAlive(pid))) {
@@ -139,12 +136,10 @@ async function discoverServer(): Promise<ServerInfo | null> {
     const content = readFileSync(SERVER_INFO_PATH, "utf-8");
     const info: ServerInfo = JSON.parse(content);
 
-    // Verify the process is alive
     if (!isAlive(info.pid)) {
       return null;
     }
 
-    // Verify health endpoint responds
     try {
       const res = await fetch(`http://127.0.0.1:${info.port}/api/health`);
       if (!res.ok) return null;
@@ -160,7 +155,7 @@ async function discoverServer(): Promise<ServerInfo | null> {
 
 async function attachFiles(
   server: ServerInfo,
-  files: { path: string; type: DocumentType }[],
+  files: { path: string }[],
 ): Promise<void> {
   for (const file of files) {
     try {
@@ -178,9 +173,9 @@ async function attachFiles(
 
       const data = await res.json();
       if (data.status === "added") {
-        console.log(`Added: ${data.fileName} (${data.type})`);
+        console.log(`Added: ${data.fileName}`);
       } else {
-        console.log(`Present: ${data.fileName} (${data.type})`);
+        console.log(`Present: ${data.fileName}`);
       }
     } catch (err) {
       console.error(
@@ -217,9 +212,6 @@ async function getServerTarget(
   });
 }
 
-/**
- * Recursively find all .comments.md files in a directory.
- */
 function findCommentFiles(dir: string): string[] {
   const results: string[] = [];
 
@@ -250,16 +242,12 @@ function findCommentFiles(dir: string): string[] {
   return results;
 }
 
-/**
- * Recursively find reviewable files (.md, .markdown, .html, .htm) in a directory.
- */
 function findReviewableFiles(dir: string): FileEntry[] {
   const results: FileEntry[] = [];
 
   try {
     const entries = readdirSync(dir);
     for (const entry of entries) {
-      // Skip hidden directories and node_modules
       if (entry.startsWith(".") || entry === "node_modules") continue;
 
       const fullPath = join(dir, entry);
@@ -268,14 +256,8 @@ function findReviewableFiles(dir: string): FileEntry[] {
         if (lstat.isSymbolicLink()) continue;
         if (lstat.isDirectory()) {
           results.push(...findReviewableFiles(fullPath));
-        } else {
-          const type = getFileType(entry);
-          if (type) {
-            results.push({
-              type,
-              filePath: fullPath,
-            });
-          }
+        } else if (isMarkdownFile(entry)) {
+          results.push({ filePath: fullPath });
         }
       } catch (err) {
         if (isPermissionError(err)) {
@@ -292,9 +274,6 @@ function findReviewableFiles(dir: string): FileEntry[] {
   return results;
 }
 
-/**
- * Resolve CLI arguments into a deduplicated list of FileEntry objects.
- */
 function resolveFiles(args: string[]): FileEntry[] {
   const seen = new Set<string>();
   const files: FileEntry[] = [];
@@ -322,27 +301,21 @@ function resolveFiles(args: string[]): FileEntry[] {
     } else {
       if (seen.has(filePath)) continue;
 
-      const type = getFileType(filePath);
-      if (!type) {
+      if (!isMarkdownFile(filePath)) {
         console.error(
-          `error: unsupported file type: ${arg} (expected .md, .markdown, .html, or .htm)`,
+          `error: unsupported file type: ${arg} (expected .md or .markdown)`,
         );
         process.exit(1);
       }
 
       seen.add(filePath);
-      files.push({
-        type,
-        filePath,
-      });
+      files.push({ filePath });
     }
   }
 
   return files;
 }
 
-// ─── Onboarding ──────────────────────────────────────────────────────
-
 const SETTINGS_PATH = join(os.homedir(), ".readit", "settings.json");
 
 function isOnboarded(): boolean {
@@ -360,9 +333,7 @@ async function markOnboarded(): Promise<void> {
   try {
     const content = readFileSync(SETTINGS_PATH, "utf-8");
     settings = JSON.parse(content);
-  } catch {
-    // No existing settings
-  }
+  } catch {}
   settings.onboarded = true;
   const dir = join(os.homedir(), ".readit");
   await fs.mkdir(dir, { recursive: true });
@@ -447,14 +418,11 @@ Go ahead and add a few comments to this document. When you're done, export them
 
 const WELCOME_PATH = join(os.homedir(), ".readit", "welcome.md");
 
-// ─── Program ─────────────────────────────────────────────────────────
-
 program
   .name("readit")
-  .description("Review Markdown and HTML documents with inline comments")
-  .version("0.1.3");
+  .description("Review Markdown documents with inline comments")
+  .version("0.2.0");
 
-// List command: show all commented files
 program
   .command("list")
   .description("List all files with comments")
@@ -487,13 +455,10 @@ program
           `    ${commentCount} comment${commentCount !== 1 ? "s" : ""}`,
         );
         console.log();
-      } catch {
-        // Skip unreadable files
-      }
+      } catch {}
     }
   });
 
-// Show command: display comments for a file
 program
   .command("show <file>")
   .description("Show comments for a file")
@@ -525,7 +490,6 @@ program
           `Selected: "${comment.selectedText.slice(0, 80)}${comment.selectedText.length > 80 ? "..." : ""}"`,
         );
         console.log(`Comment: ${comment.comment}`);
-        console.log(`Created: ${comment.createdAt}`);
         console.log();
       }
     } catch (err) {
@@ -537,9 +501,8 @@ program
     }
   });
 
-// Main review command (default) — accepts zero or more files/directories
 program
-  .argument("[files...]", "Markdown or HTML files/directories to review")
+  .argument("[files...]", "Markdown files/directories to review")
   .option("-p, --port <number>", "Port to run server on", "4567")
   .option("--host <address>", "Host address to bind to", "127.0.0.1")
   .option("--no-open", "Don't automatically open browser")
@@ -563,7 +526,6 @@ program
           files = [
             {
               content: WELCOME_CONTENT,
-              type: "markdown" as DocumentType,
               filePath: WELCOME_PATH,
             },
           ];
@@ -588,6 +550,14 @@ program
         process.exit(1);
       }
 
+      let previousPort: number | undefined;
+      try {
+        const info = JSON.parse(readFileSync(SERVER_INFO_PATH, "utf-8"));
+        if (!isAlive(info.pid)) {
+          previousPort = info.port;
+        }
+      } catch {}
+
       try {
         const { url, server } = await startServer({
           files,
@@ -608,7 +578,7 @@ readit - Document Review Tool
   Server running. Press Ctrl+C to stop.
 `);
         } else {
-          const fileList = files.map((f) => `  ${f.filePath} (${f.type})`);
+          const fileList = files.map((f) => `  ${f.filePath}`);
 
           console.log(`
 readit - Document Review Tool
@@ -622,16 +592,18 @@ ${fileList.join("\n")}
 `);
         }
 
-        if (options.open) {
+        const browserLikelyOpen =
+          previousPort === preferredPort ||
+          process.env.NODE_ENV === "development";
+
+        if (options.open && !browserLikelyOpen) {
           open(url);
         }
 
-        // Mark onboarding complete on first server start
         if (fileArgs.length === 0) {
           await markOnboarded();
         }
 
-        // Graceful shutdown on Ctrl+C
         process.on("SIGINT", async () => {
           console.log("\n\nShutting down...");
           server.stop();
@@ -648,17 +620,15 @@ ${fileList.join("\n")}
     },
   );
 
-// Open command: add files to running server or start new one
 program
   .command("open")
-  .argument("<files...>", "Markdown or HTML files to add to running server")
+  .argument("<files...>", "Markdown files to add to running server")
   .description("Add files to a running readit server, or start a new one")
   .option("-p, --port <number>", "Port for new server (if starting)", "4567")
   .option("--host <address>", "Host for new server (if starting)", "127.0.0.1")
   .action(
     async (fileArgs: string[], options: { port: string; host: string }) => {
-      // Resolve and validate files
-      const resolvedFiles: { path: string; type: DocumentType }[] = [];
+      const resolvedFiles: { path: string }[] = [];
       for (const arg of fileArgs) {
         const inputPath = resolve(process.cwd(), arg);
 
@@ -669,19 +639,17 @@ program
 
         const filePath = realpathSync(inputPath);
 
-        const type = getFileType(filePath);
-        if (!type) {
+        if (!isMarkdownFile(filePath)) {
           console.error(
-            `error: unsupported file type: ${arg} (expected .md, .markdown, .html, or .htm)`,
+            `error: unsupported file type: ${arg} (expected .md or .markdown)`,
           );
           process.exit(1);
         }
 
-        resolvedFiles.push({ path: filePath, type });
+        resolvedFiles.push({ path: filePath });
       }
 
       const files = resolvedFiles.map((f) => ({
-        type: f.type,
         filePath: f.path,
       }));
 
@@ -702,7 +670,7 @@ program
           return;
         }
 
-        const fileList = files.map((f) => `  ${f.filePath} (${f.type})`);
+        const fileList = files.map((f) => `  ${f.filePath}`);
         console.log(`
 readit - Document Review Tool
 
@@ -732,4 +700,182 @@ ${fileList.join("\n")}
     },
   );
 
+program
+  .command("completion")
+  .argument("[shell]", "Shell type (zsh, bash, fish)", "zsh")
+  .description("Output shell completion and integration script")
+  .action((shell: string) => {
+    const shellDir = join(import.meta.dir, "..", "shell");
+
+    switch (shell) {
+      case "zsh": {
+        // Output the full zsh integration:
+        //   1. _readit compdef (loaded into fpath via autoload) - handles @ prefix
+        //   2. readit.zsh widget (accept-line bracket stripping + syntax highlighting)
+        const widgetPath = join(shellDir, "readit.zsh");
+        const compPath = join(shellDir, "_readit");
+
+        if (!existsSync(widgetPath) || !existsSync(compPath)) {
+          console.log(generateInlineZshCompletion());
+          return;
+        }
+
+        // Wrap the compdef in an autoload function so eval works cleanly
+        const compdefContent = readFileSync(compPath, "utf-8");
+        const widgetContent = readFileSync(widgetPath, "utf-8");
+
+        const lines: string[] = [];
+        lines.push("# readit shell integration for zsh");
+        lines.push('# Add to your .zshrc: eval "$(readit completion zsh)"');
+        lines.push("");
+        lines.push("# ── _readit compdef (autoloaded) ──");
+        lines.push(
+          "# This handles: subcommand/option completion + @ file autocomplete",
+        );
+        lines.push(
+          "# Renders [file.md] in a native multi-column grid via compadd",
+        );
+        lines.push("");
+        // Replace #compdef with autoload -Uz _readit; _readit() { ... }
+        lines.push(
+          compdefContent
+            .replace(
+              /^#compdef readit\n/,
+              "autoload -Uz _readit\n_readit() {\n",
+            )
+            .replace(/\n_readit "\$@"\n?$/, "\n}\n"),
+        );
+        lines.push("");
+        lines.push("# ── readit.zsh (sourced) ──");
+        lines.push(
+          "# This handles: @[...] bracket stripping on Enter + syntax highlighting",
+        );
+        lines.push("");
+        // Strip the shebang and guard from the widget since it's being eval'd
+        lines.push(
+          widgetContent
+            .replace(/^#!/, "#")
+            .replace(/\n\(\( \$\+ functions\[_readit_plugin_loaded\] \)\)/, ""),
+        );
+        console.log(lines.join("\n"));
+        break;
+      }
+      case "bash":
+        console.log(generateBashCompletion());
+        break;
+      case "fish":
+        console.log(generateFishCompletion());
+        break;
+      default:
+        console.error(`error: unsupported shell: ${shell}`);
+        console.error("Supported shells: zsh, bash, fish");
+        process.exit(1);
+    }
+  });
+
 program.parse();
+
+function generateInlineZshCompletion(): string {
+  return `
+#compdef readit
+
+_readit_markdown_files() {
+  local -a files
+  files=( \${(f)"$(find . -type f \\( -name '*.md' -o -name '*.markdown' \\) -not -path '*/\\.*' -not -path '*/node_modules/*' 2>/dev/null | sed 's|^\\./||')"} )
+  _describe -t files 'markdown files' files
+}
+
+_readit() {
+  local context state state_descr line
+  typeset -A opt_args
+  _arguments -C '1:command:->cmd_or_files' '*::arg:->args'
+  case "$state" in
+    cmd_or_files)
+      local -a commands=(
+        'open:Add files to running server'
+        'list:List files with comments'
+        'show:Show comments for a file'
+        'completion:Output shell completion script'
+      )
+      _alternative 'commands:command:compadd -a commands' 'files:markdown file:_readit_markdown_files'
+      ;;
+    args)
+      case "\${line[1]}" in
+        open) _arguments '*:file:_readit_markdown_files' ;;
+        show) _arguments '1:file:_files -g "*.md *.markdown"' ;;
+        *) _arguments '*:file:_readit_markdown_files' ;;
+      esac
+      ;;
+  esac
+}
+_readit "$@"
+`.trim();
+}
+
+function generateBashCompletion(): string {
+  return `
+# readit bash completion
+# Add to .bashrc: eval "$(readit completion bash)"
+
+_readit_completions() {
+  local cur prev commands
+  COMPREPLY=()
+  cur="\${COMP_WORDS[COMP_CWORD]}"
+  prev="\${COMP_WORDS[COMP_CWORD-1]}"
+  commands="open list show completion"
+
+  if [[ \${COMP_CWORD} -eq 1 ]]; then
+    COMPREPLY=( $(compgen -W "\${commands}" -- "\${cur}") )
+    # Also complete markdown files
+    local files=$(find . -type f \\( -name '*.md' -o -name '*.markdown' \\) \\
+      -not -path '*/.*' -not -path '*/node_modules/*' 2>/dev/null | sed 's|^\\./||')
+    COMPREPLY+=( $(compgen -W "\${files}" -- "\${cur}") )
+    return 0
+  fi
+
+  case "\${COMP_WORDS[1]}" in
+    open|show)
+      local files=$(find . -type f \\( -name '*.md' -o -name '*.markdown' \\) \\
+        -not -path '*/.*' -not -path '*/node_modules/*' 2>/dev/null | sed 's|^\\./||')
+      COMPREPLY=( $(compgen -W "\${files}" -- "\${cur}") )
+      ;;
+    completion)
+      COMPREPLY=( $(compgen -W "zsh bash fish" -- "\${cur}") )
+      ;;
+  esac
+  return 0
+}
+
+complete -F _readit_completions readit
+`.trim();
+}
+
+function generateFishCompletion(): string {
+  return `
+# readit fish completion
+# Add to config.fish: readit completion fish | source
+
+# Disable file completions by default
+complete -c readit -f
+
+# Subcommands
+complete -c readit -n '__fish_use_subcommand' -a 'open' -d 'Add files to running server'
+complete -c readit -n '__fish_use_subcommand' -a 'list' -d 'List files with comments'
+complete -c readit -n '__fish_use_subcommand' -a 'show' -d 'Show comments for a file'
+complete -c readit -n '__fish_use_subcommand' -a 'completion' -d 'Output shell completion script'
+
+# Options
+complete -c readit -s p -l port -d 'Port to run server on'
+complete -c readit -l host -d 'Host address to bind to'
+complete -c readit -l no-open -d "Don't automatically open browser"
+complete -c readit -l clean -d 'Clear existing comments'
+
+# File arguments for default command and open
+complete -c readit -n '__fish_use_subcommand' -F -a '(find . -type f \\( -name "*.md" -o -name "*.markdown" \\) -not -path "*/.*" -not -path "*/node_modules/*" 2>/dev/null | sed "s|^\\./||")'
+complete -c readit -n '__fish_seen_subcommand_from open' -F -a '(find . -type f \\( -name "*.md" -o -name "*.markdown" \\) -not -path "*/.*" -not -path "*/node_modules/*" 2>/dev/null | sed "s|^\\./||")'
+complete -c readit -n '__fish_seen_subcommand_from show' -F -a '(find . -type f \\( -name "*.md" -o -name "*.markdown" \\) -not -path "*/.*" -not -path "*/node_modules/*" 2>/dev/null | sed "s|^\\./||")'
+
+# Shell completions for completion subcommand
+complete -c readit -n '__fish_seen_subcommand_from completion' -a 'zsh bash fish'
+`.trim();
+}

package/src/components/ActionsMenu.svelte

@@ -0,0 +1,95 @@
+<script lang="ts">
+import {
+  ClipboardCopy,
+  FileDown,
+  FileText,
+  MoreHorizontal,
+  RefreshCw,
+  Settings,
+} from "lucide-svelte";
+import { t } from "../stores/locale.svelte";
+import RawModal from "./RawModal.svelte";
+import SettingsModal from "./SettingsModal.svelte";
+import Button from "./ui/Button.svelte";
+import DropdownMenu from "./ui/DropdownMenu.svelte";
+import DropdownMenuItem from "./ui/DropdownMenuItem.svelte";
+import DropdownMenuSeparator from "./ui/DropdownMenuSeparator.svelte";
+
+interface Props {
+  commentCount: number;
+  oncopyall: () => void;
+  onexportjson: () => void;
+  onreload: () => void;
+}
+
+let { commentCount, oncopyall, onexportjson, onreload }: Props = $props();
+
+let menuOpen = $state(false);
+let rawModalOpen = $state(false);
+let settingsOpen = $state(false);
+</script>
+
+<DropdownMenu bind:open={menuOpen} align="end" contentClass="min-w-[160px]">
+  {#snippet trigger()}
+    <Button
+      variant="ghost"
+      size="icon"
+      class="size-7"
+      title={t("actions.ariaLabel")}
+    >
+      <MoreHorizontal class="w-4 h-4" />
+    </Button>
+  {/snippet}
+
+  <DropdownMenuItem
+    onselect={() => {
+      settingsOpen = true;
+      menuOpen = false;
+    }}
+  >
+    <Settings />
+    {t("actions.settings")}
+  </DropdownMenuItem>
+  <DropdownMenuSeparator />
+  <DropdownMenuItem
+    onselect={() => {
+      onreload();
+      menuOpen = false;
+    }}
+  >
+    <RefreshCw />
+    {t("actions.reload")}
+  </DropdownMenuItem>
+  {#if commentCount > 0}
+    <DropdownMenuItem
+      onselect={() => {
+        oncopyall();
+        menuOpen = false;
+      }}
+    >
+      <ClipboardCopy />
+      {t("actions.copyAll")}
+    </DropdownMenuItem>
+    <DropdownMenuItem
+      onselect={() => {
+        onexportjson();
+        menuOpen = false;
+      }}
+    >
+      <FileDown />
+      {t("actions.exportJson")}
+    </DropdownMenuItem>
+    <DropdownMenuItem
+      onselect={() => {
+        rawModalOpen = true;
+        menuOpen = false;
+      }}
+    >
+      <FileText />
+      {t("actions.viewRaw")}
+    </DropdownMenuItem>
+  {/if}
+</DropdownMenu>
+
+<RawModal bind:open={rawModalOpen} onclose={() => (rawModalOpen = false)} />
+<SettingsModal bind:open={settingsOpen} onclose={() => (settingsOpen = false)} />

package/src/components/CommentBadge.svelte

@@ -0,0 +1,67 @@
+<script lang="ts">
+import { cn } from "../lib/utils";
+import type { Comment } from "../schema";
+import { t } from "../stores/locale.svelte";
+import CommentManager from "./CommentManager.svelte";
+import DropdownMenu from "./ui/DropdownMenu.svelte";
+
+interface Props {
+  comments: Comment[];
+  fileName: string;
+  onedit: (id: string, newText: string) => void;
+  ondelete: (id: string) => void;
+  ondeleteall: () => void;
+  onnavigate: (id: string) => void;
+  onstartreanchor: (id: string) => void;
+}
+
+let {
+  comments,
+  fileName,
+  onedit,
+  ondelete,
+  ondeleteall,
+  onnavigate,
+  onstartreanchor,
+}: Props = $props();
+
+let commentsOpen = $state(false);
+let commentCount = $derived(comments.length);
+</script>
+
+{#if commentCount > 0}
+  <DropdownMenu
+    bind:open={commentsOpen}
+    align="end"
+    contentClass="w-80 max-h-96 overflow-hidden p-0"
+  >
+    {#snippet trigger()}
+      <button
+        type="button"
+        class={cn(
+          "inline-flex items-center gap-1 text-xs tabular-nums select-none transition-colors",
+          commentsOpen
+            ? "text-zinc-600"
+            : "text-zinc-400 hover:text-zinc-600",
+        )}
+        title={commentCount === 1
+          ? t("commentBadge.title", { count: commentCount })
+          : t("commentBadge.titlePlural", { count: commentCount })}
+      >
+        <span class="text-zinc-300">·</span>
+        {commentCount}
+      </button>
+    {/snippet}
+
+    <CommentManager
+      {comments}
+      {fileName}
+      onclose={() => (commentsOpen = false)}
+      {onedit}
+      {ondelete}
+      {ondeleteall}
+      {onnavigate}
+      {onstartreanchor}
+    />
+  </DropdownMenu>
+{/if}

package/src/components/CommentErrorBanner.svelte

@@ -0,0 +1,33 @@
+<script lang="ts">
+import { AlertCircle, X } from "lucide-svelte";
+
+interface Props {
+  error: string | null;
+  ondismiss: () => void;
+}
+
+let { error, ondismiss }: Props = $props();
+</script>
+
+{#if error}
+  <div
+    role="alert"
+    aria-live="polite"
+    class="fixed top-24 left-1/2 -translate-x-1/2 z-40 w-full max-w-3xl px-4 pointer-events-none"
+  >
+    <div
+      class="flex items-start gap-3 px-4 py-2 text-sm bg-red-50 dark:bg-red-950 border border-red-200 dark:border-red-900 text-red-900 dark:text-red-200 rounded-lg shadow-lg pointer-events-auto"
+    >
+      <AlertCircle class="size-4 shrink-0 mt-0.5" />
+      <p class="flex-1 select-text break-words">{error}</p>
+      <button
+        type="button"
+        onclick={ondismiss}
+        aria-label="Dismiss"
+        class="shrink-0 rounded p-1 -mr-1 hover:bg-red-100 dark:hover:bg-red-900/40 transition-colors"
+      >
+        <X class="size-4" />
+      </button>
+    </div>
+  </div>
+{/if}