From 1dad4f44bd28f2900b3a16ac3141ee93f8adc82b Mon Sep 17 00:00:00 2001
From: Amr Gharbeia <amr@gharbeia.net>
Date: Wed, 8 Apr 2026 16:16:09 -0400
Subject: [PATCH] refactor: rename economist to token-accountant in core

---
 README.org       |  4 ++--
 src/neuro.lisp   |  4 ++--
 src/package.lisp | 21 +++++++++++++++++++--
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/README.org b/README.org
index 66d2e4c..fcdc034 100644
--- a/README.org
+++ b/README.org
@@ -709,8 +709,8 @@ EXAMPLES:
 
 ;; --- Sovereign Service Fallbacks ---
 
-(defun economist-route-task (context)
-  "Generic fallback for routing. Overridden by skill-economist."
+(defun token-accountant-route-task (context)
+  "Generic fallback for routing. Overridden by skill-token-accountant."
   (declare (ignore context))
   '(:openrouter :gemini))
 
diff --git a/src/neuro.lisp b/src/neuro.lisp
index 156154d..aeeac1e 100644
--- a/src/neuro.lisp
+++ b/src/neuro.lisp
@@ -54,8 +54,8 @@
 
 ;; --- Sovereign Service Fallbacks ---
 
-(defun economist-route-task (context)
-  "Generic fallback for routing. Overridden by skill-economist."
+(defun token-accountant-route-task (context)
+  "Generic fallback for routing. Overridden by skill-token-accountant."
   (declare (ignore context))
   '(:openrouter :gemini))
 
diff --git a/src/package.lisp b/src/package.lisp
index b77dcd1..36fa707 100644
--- a/src/package.lisp
+++ b/src/package.lisp
@@ -62,8 +62,25 @@
    #:skill-trigger-fn
    #:skill-neuro-prompt
    #:skill-symbolic-fn
-   
+
+   ;; --- Tool Registry ---
+   #:def-cognitive-tool
+   #:*cognitive-tools*
+   #:cognitive-tool
+   #:cognitive-tool-name
+   #:cognitive-tool-description
+   #:cognitive-tool-parameters
+   #:cognitive-tool-guard
+   #:cognitive-tool-body
+
+   ;; --- Emacs Client Registry ---
+   #:*emacs-clients*
+   #:*clients-lock*
+   #:register-emacs-client
+   #:unregister-emacs-client
+
    ;; --- Neuro (System 1) ---
+
    #:ask-neuro
    #:register-neuro-backend
    #:register-auth-provider
@@ -74,7 +91,7 @@
    #:find-most-similar
    #:openrouter-get-available-models
    #:*provider-cascade*
-   #:economist-route-task
+   #:token-accountant-route-task
    
    ;; --- Symbolic Logic ---
    #:list-objects-with-attribute