diff --git a/lisp/doom-cli-lib.el b/lisp/doom-cli-lib.el
index b2255a740..b451122d6 100644
--- a/lisp/doom-cli-lib.el
+++ b/lisp/doom-cli-lib.el
@@ -10,6 +10,21 @@
 (require 'seq)
 (require 'map)
 
+;; Load these eagerly, since autoloads may not have been generated/loaded yet
+(load! "lib/process")
+(load! "lib/system")
+(load! "lib/git")
+(load! "lib/plist")
+(load! "lib/files")
+(load! "lib/debug")
+(load! "lib/print")
+;; (load! "lib/autoloads")
+
+;; Ensure straight and core packages are ready to go for CLI commands.
+(require 'doom-modules)
+(require 'doom-packages)
+;; TODO (require 'doom-profiles)
+
 
 ;;
 ;;; Variables
diff --git a/lisp/doom-cli.el b/lisp/doom-cli.el
index ef291e6bc..c7a71b40e 100644
--- a/lisp/doom-cli.el
+++ b/lisp/doom-cli.el
@@ -87,22 +87,6 @@
 ;; Just the... bear necessities~
 (require 'doom (expand-file-name "doom" (file-name-directory load-file-name)))
 
-;; Load these eagerly, since autoloads haven't been generated/loaded yet
-(load! "lib/process")
-(load! "lib/system")
-(load! "lib/plist")
-(load! "lib/files")
-(load! "lib/debug")
-(load! "lib/print")
-;; (load! "lib/autoloads")
-
-;; Ensure straight and core packages are ready to go for CLI commands.
-(require 'doom-modules)
-(require 'doom-packages)
-
-;; Our DSL, API, and everything nice.
-(require 'doom-cli-lib)
-
 ;; Don't generate superfluous files when writing temp buffers.
 (setq make-backup-files nil)
 ;; Stop user configuration from interfering with package management.
diff --git a/lisp/doom.el b/lisp/doom.el
index 981190612..bf61bab52 100644
--- a/lisp/doom.el
+++ b/lisp/doom.el
@@ -353,6 +353,9 @@ Otherwise, `en/disable-command' (in novice.el.gz) is hardcoded to write them to
 
 ;; ...then load *the* one
 (require 'doom-lib)
+;; ...and in batch session, load our CLI framework
+(when noninteractive
+  (require 'doom-cli-lib))
 
 
 ;;
diff --git a/modules/lang/emacs-lisp/autoload.el b/modules/lang/emacs-lisp/autoload.el
index a77fb45d4..45d04db8d 100644
--- a/modules/lang/emacs-lisp/autoload.el
+++ b/modules/lang/emacs-lisp/autoload.el
@@ -262,7 +262,6 @@ verbosity when editing a file in `doom-private-dir' or `doom-emacs-dir'."
                      (setq doom-modules ',doom-modules
                            doom-disabled-packages ',doom-disabled-packages)
                      (require 'doom)
-                     (require 'doom-cli-lib)
                      (ignore-errors (load ,user-init-file t t))
                      (setq byte-compile-warnings
                            '(obsolete cl-functions