Merge 'ocaml-precommit/' from /Users/samoht/git/blacksun/src/ocaml-precommit

git-subtree-dir: ocaml-precommit
git-subtree-mainline: d7749ca85dfc7cf9aa15c540326728c94d25713a

bin/main.ml

···
 (* {1 Common arguments} *)
 
 let dirs =
-  let doc =
-    "Root directories to scan for git projects. Defaults to the current \
-     directory. Each directory is scanned recursively for repositories \
-     containing a $(b,.git) entry."
-  in
+  let doc = "Directories to operate on. Defaults to the current directory." in
   Arg.(value & pos_all dir [ "." ] & info [] ~docv:"DIR" ~doc)
 
 let dry_run =
   let doc = "Show what would be done without making changes." in
   Arg.(value & flag & info [ "n"; "dry-run" ] ~doc)
+
+let recursive =
+  let doc = "Operate on all OCaml projects in subdirectories." in
+  Arg.(value & flag & info [ "r"; "recursive" ] ~doc)
 
 let force =
   let doc = "Install hooks even if no dune-project is found." in
···
       error "%s" msg;
       exit 1
 
-let collect_dirs ~fs dirs =
-  List.concat_map (fun d -> Precommit.find_git_projects ~fs d) dirs
+let collect_dirs ~fs ~recursive dirs =
+  if recursive then
+    List.concat_map (fun d -> Precommit.find_git_projects ~fs d) dirs
+  else dirs
 
 (* {1 Init command} *)
 
-let init_impl ~fs dry_run force hooks dirs =
-  let dirs = collect_dirs ~fs dirs in
+let init_impl ~fs dry_run force hooks recursive dirs =
+  let dirs = collect_dirs ~fs ~recursive dirs in
   let count = ref 0 in
   List.iter
     (fun d ->
···
     Log.info (fun m ->
         m "Processed %d director%s" !count (if !count = 1 then "y" else "ies"))
 
-let init dry_run force hooks dirs =
+let init dry_run force hooks recursive dirs =
   Eio_main.run @@ fun env ->
   let fs = Eio.Stdenv.cwd env in
-  init_impl ~fs dry_run force hooks dirs
+  init_impl ~fs dry_run force hooks recursive dirs
 
 let init_cmd =
   let doc = "Initialise pre-commit hooks for OCaml projects." in
···
       `P "Initialise hooks in the current directory:";
       `Pre "  precommit init";
       `P "Initialise hooks in all projects under src/:";
-      `Pre "  precommit init src/";
+      `Pre "  precommit init -r src/";
       `P "Preview what would be done:";
-      `Pre "  precommit init -n";
+      `Pre "  precommit init -n -r .";
       `P "Install only the AI attribution hook in a non-OCaml project:";
       `Pre "  precommit init -f --hooks ai";
       `P "Install only the dune fmt hook:";
···
     ]
   in
   let info = Cmd.info "init" ~doc ~man in
-  Cmd.v info Term.(const init $ dry_run $ force $ hooks $ dirs)
+  Cmd.v info Term.(const init $ dry_run $ force $ hooks $ recursive $ dirs)
 
 (* {1 Status command} *)
 
···
   if b then Tty.Span.styled Tty.Style.(fg Tty.Color.green) "+"
   else Tty.Span.styled Tty.Style.(fg Tty.Color.red) "-"
 
-let status_impl ~fs dirs =
-  let dirs = collect_dirs ~fs dirs in
+let status_impl ~fs recursive dirs =
+  let dirs = collect_dirs ~fs ~recursive dirs in
   let missing = ref 0 in
   let ok = ref 0 in
   let rows =
···
   else if !ok > 0 then
     success "%d project%s properly configured" !ok (if !ok = 1 then "" else "s")
 
-let status dirs =
+let status recursive dirs =
   Eio_main.run @@ fun env ->
   let fs = Eio.Stdenv.cwd env in
-  status_impl ~fs dirs
+  status_impl ~fs recursive dirs
 
 let status_cmd =
   let doc = "Check pre-commit hook status." in
···
          hooks, .ocamlformat, or has formatting disabled.";
       `S Manpage.s_examples;
       `P "Check status of all projects under src/:";
-      `Pre "  precommit status src/";
+      `Pre "  precommit status -r src/";
     ]
   in
   let info = Cmd.info "status" ~doc ~man in
-  Cmd.v info Term.(const status $ dirs)
+  Cmd.v info Term.(const status $ recursive $ dirs)
 
 (* {1 Check command} *)
 
···
   end;
   (List.rev !affected_dirs, !total_commits, !repos_with_issues)
 
-let check_impl ~process_mgr ~fs dirs =
-  let dirs = collect_dirs ~fs dirs in
+let check_impl ~process_mgr ~fs recursive dirs =
+  let dirs = collect_dirs ~fs ~recursive dirs in
   let _affected, total_commits, repos_with_issues =
     find_and_display_ai_commits ~process_mgr ~fs dirs
   in
···
   end
   else success "No AI attribution found in commit history"
 
-let check dirs =
+let check recursive dirs =
   Eio_main.run @@ fun env ->
   let fs = Eio.Stdenv.cwd env in
   let process_mgr = Eio.Stdenv.process_mgr env in
-  check_impl ~process_mgr ~fs dirs
+  check_impl ~process_mgr ~fs recursive dirs
 
 let check_cmd =
   let doc = "Check git history for commits with AI attribution." in
···
          'claude' in the commit message. Exit code is 1 if any are found.";
       `S Manpage.s_examples;
       `P "Check all projects under src/:";
-      `Pre "  precommit check src/";
+      `Pre "  precommit check -r src/";
     ]
   in
   let info = Cmd.info "check" ~doc ~man in
-  Cmd.v info Term.(const check $ dirs)
+  Cmd.v info Term.(const check $ recursive $ dirs)
 
 (* {1 Fix command} *)
 
···
   let answer = String.trim line in
   answer = "y" || answer = "Y"
 
-let fix_impl ~process_mgr ~fs dry_run yes dirs =
-  let dirs = collect_dirs ~fs dirs in
+let fix_impl ~process_mgr ~fs dry_run yes recursive dirs =
+  let dirs = collect_dirs ~fs ~recursive dirs in
   let affected, total_commits, repos_with_issues =
     find_and_display_ai_commits ~process_mgr ~fs dirs
   in
···
   let doc = "Skip interactive confirmation prompt." in
   Arg.(value & flag & info [ "y"; "yes" ] ~doc)
 
-let fix dry_run yes dirs =
+let fix dry_run yes recursive dirs =
   Eio_main.run @@ fun env ->
   let fs = Eio.Stdenv.cwd env in
   let process_mgr = Eio.Stdenv.process_mgr env in
-  fix_impl ~process_mgr ~fs dry_run yes dirs
+  fix_impl ~process_mgr ~fs dry_run yes recursive dirs
 
 let fix_cmd =
   let doc = "Remove AI attribution from commit history." in
···
          the interactive confirmation prompt.";
       `S Manpage.s_examples;
       `P "Fix all projects under the current directory:";
-      `Pre "  precommit fix";
+      `Pre "  precommit fix -r";
       `P "Preview what would be done:";
-      `Pre "  precommit fix -n";
+      `Pre "  precommit fix -n -r .";
       `P "Fix without confirmation prompt:";
       `Pre "  precommit fix -y";
     ]
   in
   let info = Cmd.info "fix" ~doc ~man in
-  Cmd.v info Term.(const fix $ dry_run $ yes $ dirs)
+  Cmd.v info Term.(const fix $ dry_run $ yes $ recursive $ dirs)
 
 (* {1 Main} *)
 

lib/precommit.ml

···
   | `Directory -> true
   | _ -> false
 
-let is_symlink ~fs path =
-  match Eio.Path.kind ~follow:false Eio.Path.(fs / path) with
-  | `Symbolic_link -> true
-  | _ -> false
-
 let read_file ~fs path = Eio.Path.load Eio.Path.(fs / path)
 
 let write_file ~fs ~dry_run path content =
···
   |> List.sort String.compare
 
 let rec find_git_projects ~fs dir =
-  let entries = try Eio.Path.read_dir Eio.Path.(fs / dir) with _ -> [] in
-  let child_path name = if dir = "." then name else Filename.concat dir name in
-  let self = if List.mem ".git" entries then [ dir ] else [] in
-  let children =
+  let git_dir = Filename.concat dir ".git" in
+  if file_exists ~fs git_dir then [ dir ]
+  else
+    let entries = try Eio.Path.read_dir Eio.Path.(fs / dir) with _ -> [] in
     entries
     |> List.filter_map (fun name ->
-        if String.length name > 0 && (name.[0] = '.' || name.[0] = '_') then
-          None
+        if String.length name > 0 && name.[0] = '.' then None
         else
-          let path = child_path name in
-          (* Skip symlinks to avoid traversing outside the sandbox *)
-          if is_symlink ~fs path then None
-          else if is_directory ~fs path then Some path
-          else None)
+          let path = Filename.concat dir name in
+          if is_directory ~fs path then Some path else None)
     |> List.sort String.compare
-    |> List.concat_map (fun sub ->
-        if file_exists ~fs (Filename.concat sub ".git") then [ sub ]
-        else find_git_projects ~fs sub)
-  in
-  self @ children
+    |> List.concat_map (fun sub -> find_git_projects ~fs sub)
 
 let run_in_dir ~process_mgr ~fs dir cmd =
   let cwd = Eio.Path.(fs / dir) in
···
     | Ok _lines ->
         (* Count how many commits were actually rewritten *)
         let count_cmd =
-          "git log --format='%H' HEAD --grep='Co-Authored-By.*[Cc]laude' \
+          "git log --format='%H' --all --grep='Co-Authored-By.*[Cc]laude' \
            2>/dev/null | wc -l"
         in
         let remaining =