REFAC: Applied literate granularity and configuration externalization to loop

src/loop.lisp

@@ -2,6 +2,7 @@
 
 (defvar *interrupt-flag* nil)
 (defvar *interrupt-lock* (bt:make-lock "harness-interrupt-lock"))
+(defvar *heartbeat-thread* nil)
 
 (defun process-signal (signal)
   "The entry point to the Metabolic Pipeline: Perceive -> Reason -> Act."
@@ -19,31 +20,47 @@
               (setf current-signal (reason-gate current-signal))
               (setf current-signal (act-gate current-signal)))
           (error (c)
-            (harness-log "METABOLISM CRASH: ~a - Initiating Micro-Rollback." c)
-            (rollback-memory 0)
             (let ((sensor (ignore-errors (getf (getf current-signal :payload) :sensor))))
+              (harness-log "METABOLISM CRASH [~a]: ~a" (or sensor :unknown) c)
+              ;; Only rollback on critical errors, not standard tool or loop errors
+              (unless (member sensor '(:loop-error :tool-error :syntax-error))
+                (harness-log "CRITICAL ERROR: Initiating Micro-Rollback.")
+                (rollback-memory 0))
               (if (or (> depth 2) (member sensor '(:loop-error :tool-error)))
                   (setf current-signal nil)
                   (setf current-signal (list :type :EVENT :depth (1+ depth) :reply-stream (getf current-signal :reply-stream)
                                              :payload (list :sensor :loop-error :message (format nil "~a" c) :depth depth)))))))))))
 
-(defvar *default-heartbeat-interval* 60)
-(defvar *heartbeat-thread* nil)
-
-(defun start-heartbeat (&optional (interval *default-heartbeat-interval*))
-  (setf *heartbeat-thread* 
-        (bt:make-thread 
-         (lambda () 
-           (loop 
-             (sleep interval) 
-             (inject-stimulus (list :type :EVENT :payload (list :sensor :heartbeat :unix-time (get-universal-time)))))) 
-         :name "org-agent-heartbeat")))
+(defun start-heartbeat ()
+  "Starts the background heartbeat thread. Interval is loaded from HEARTBEAT_INTERVAL."
+  (let ((interval (or (ignore-errors (parse-integer (uiop:getenv "HEARTBEAT_INTERVAL"))) 60)))
+    (setf *heartbeat-thread* 
+          (bt:make-thread 
+           (lambda () 
+             (loop 
+               (sleep interval) 
+               ;; inject-stimulus is synchronous for heartbeats, preventing accumulation.
+               (inject-stimulus (list :type :EVENT :payload (list :sensor :heartbeat :unix-time (get-universal-time)))))) 
+           :name "org-agent-heartbeat"))))
 
 (defun main ()
-  "Entry point for the Skeleton MVP."
+  "Entry point for the Skeleton MVP. Handles initialization and graceful shutdown."
   (let* ((home (uiop:getenv "HOME"))
          (env-file (uiop:merge-pathnames* ".local/share/org-agent/.env" (uiop:ensure-directory-pathname home))))
     (when (uiop:file-exists-p env-file) (cl-dotenv:load-env env-file)))
+  
   (initialize-all-skills)
   (start-heartbeat)
-  (loop (sleep 3600)))
+  
+  ;; Graceful shutdown handler for SBCL
+  #+sbcl
+  (sb-sys:enable-interrupt sb-unix:sigint 
+                           (lambda (sig code scp) 
+                             (declare (ignore sig code scp)) 
+                             (harness-log "SHUTDOWN: SIGINT received. Exiting...")
+                             (uiop:quit 0)))
+
+  (let ((sleep-interval (or (ignore-errors (parse-integer (uiop:getenv "DAEMON_SLEEP_INTERVAL"))) 3600)))
+    (loop 
+      (when (bt:with-lock-held (*interrupt-lock*) *interrupt-flag*) (return))
+      (sleep sleep-interval))))