fix(setup): Sync literate setup.org with clean re-write of opencortex.sh

literate/setup.org

@@ -1,13 +1,14 @@
-#+TITLE: Setup & Onboarding (setup.org)
+#+TITLE: Zero-to-One Setup (setup.org)
 #+AUTHOR: Amr
-#+FILETAGS: :harness:setup:onboarding:
+#+FILETAGS: :harness:setup:
 #+STARTUP: content
 
-* Overview: The Zero-to-One Experience
-The *Setup & Onboarding* process ensures that users can boot the ~opencortex~ Lisp Machine with zero friction.
+* Zero-to-One Setup (setup.org)
+The ~setup.org~ file defines the automated installation and initialization sequence for the OpenCortex.
 
-* 1. The Unified Conductor (opencortex.sh)
-#+begin_src bash :tangle ../opencortex.sh :shebang "#!/bin/bash"
+** The Installer Script (opencortex.sh)
+#+begin_src bash :tangle ../opencortex.sh
+#!/bin/bash
 set -e
 
 PORT=9105
@@ -15,6 +16,7 @@ HOST=${1:-localhost}
 RED='\033[0;31m'; GREEN='\033[0;32m'; BLUE='\033[0;34m'; YELLOW='\033[0;33m'; NC='\033[0m'
 
 command_exists() { command -v "$1" >/dev/null 2>&1; }
+
 # Resolve symlinks to find the actual repository location
 SOURCE="${BASH_SOURCE[0]}"
 while [ -h "$SOURCE" ]; do
@@ -24,8 +26,19 @@ while [ -h "$SOURCE" ]; do
 done
 SCRIPT_DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 
+# Load environment variables if they exist
+if [ -f "$SCRIPT_DIR/.env" ]; then
+    while IFS="=" read -r key value || [ -n "$key" ]; do
+        if [[ $key =~ ^[a-zA-Z_][a-zA-Z0-9_]*$ ]]; then
+            val=$(echo "$value" | sed "s/^\"//;s/\"$//")
+            export "$key=$val"
+        fi
+    done < "$SCRIPT_DIR/.env"
+    [ -n "$HARNESS_PORT" ] && PORT=$HARNESS_PORT
+    [ -n "$HARNESS_HOST" ] && HOST=$HARNESS_HOST
+fi
+
 # --- 1. BOOTSTRAP ---
-# Only bootstrap if we are not in a git repo and the target hidden folder does not exist
 if [ ! -d "$SCRIPT_DIR/.git" ] && [ ! -d "$HOME/.opencortex" ] && [[ ! "$(pwd)" =~ "opencortex" ]]; then
     echo -e "${BLUE}=== OpenCortex: Zero-to-One Bootstrapper ===${NC}"
     git clone http://10.10.10.201:3001/amr/opencortex.git ~/.opencortex
@@ -39,12 +52,13 @@ setup_system() {
     echo -e "${YELLOW}--- Installing System Dependencies ---${NC}"
     if command_exists apt-get; then
         sudo apt-get update && sudo apt-get install -y sbcl emacs-nox rlwrap netcat-openbsd curl git socat libssl-dev libncurses5-dev libffi-dev zlib1g-dev libsqlite3-dev
- fi
- if [ ! -d "$HOME/quicklisp" ]; then
+    fi
+    if [ ! -d "$HOME/quicklisp" ]; then
         curl -O https://beta.quicklisp.org/quicklisp.lisp
         sbcl --non-interactive --load quicklisp.lisp --eval "(quicklisp-quickstart:install)" --eval "(ql-util:without-prompting (ql:add-to-init-file))"
         rm quicklisp.lisp
     fi
+    
     cd "$SCRIPT_DIR"
     if [ ! -f .env ]; then
         cp .env.example .env
@@ -60,7 +74,6 @@ setup_system() {
         sed -i "s|MEMEX_ASSISTANT=.*|MEMEX_ASSISTANT=\"$agent_name\"|" .env
 
         echo -e "\n${YELLOW}--- LLM Configuration ---${NC}"
-        echo "You can enter your LLM API keys now, or press Enter to skip and configure them later."
         read -p "Gemini API Key: " gemini_key < /dev/tty
         [ -n "$gemini_key" ] && sed -i "s|GEMINI_API_KEY=.*|GEMINI_API_KEY=\"$gemini_key\"|" .env
         read -p "Anthropic API Key: " anthropic_key < /dev/tty
@@ -71,46 +84,37 @@ setup_system() {
         [ -n "$openrouter_key" ] && sed -i "s|OPENROUTER_API_KEY=.*|OPENROUTER_API_KEY=\"$openrouter_key\"|" .env
 
         echo -e "\n${YELLOW}--- Memex Folder Structure ---${NC}"
-        echo "Enter the absolute paths for your existing folder structure (press Enter to accept default)."
-        read -p "Memex Root [$HOME/memex]: " memex_dir < /dev/tty
-        memex_dir=${memex_dir:-$HOME/memex}
+        read -p "Memex Root [\$HOME/memex]: " memex_dir < /dev/tty
+        memex_dir=${memex_dir:-\$HOME/memex}
         sed -i "s|MEMEX_DIR=.*|MEMEX_DIR=\"$memex_dir\"|" .env
         sed -i "s|\"/memex/|\"$memex_dir/|g" .env
         sed -i "s|SKILLS_DIR=.*|SKILLS_DIR=\"$SCRIPT_DIR/skills\"|" .env
         sed -i "s|ZETTELKASTEN_DIR=.*|ZETTELKASTEN_DIR=\"$memex_dir/notes\"|" .env
 
-
-        read -p "Inbox Directory [$memex_dir/inbox]: " inbox_dir < /dev/tty
-        inbox_dir=${inbox_dir:-$memex_dir/inbox}
+        read -p "Inbox Directory [\$memex_dir/inbox]: " inbox_dir < /dev/tty
+        inbox_dir=${inbox_dir:-\$memex_dir/inbox}
         sed -i "s|INBOX_DIR=.*|INBOX_DIR=\"$inbox_dir\"|" .env
 
-        read -p "Daily Directory [$memex_dir/daily]: " daily_dir < /dev/tty
-        daily_dir=${daily_dir:-$memex_dir/daily}
+        read -p "Daily Directory [\$memex_dir/daily]: " daily_dir < /dev/tty
+        daily_dir=${daily_dir:-\$memex_dir/daily}
         sed -i "s|DAILY_DIR=.*|DAILY_DIR=\"$daily_dir\"|" .env
 
-        read -p "Projects Directory [$memex_dir/projects]: " proj_dir < /dev/tty
-        proj_dir=${proj_dir:-$memex_dir/projects}
+        read -p "Projects Directory [\$memex_dir/projects]: " proj_dir < /dev/tty
+        proj_dir=${proj_dir:-\$memex_dir/projects}
         sed -i "s|PROJECTS_DIR=.*|PROJECTS_DIR=\"$proj_dir\"|" .env
+        
+        mkdir -p "$memex_dir" "$inbox_dir" "$daily_dir" "$proj_dir"
+        mkdir -p "$memex_dir/notes" "$memex_dir/areas" "$memex_dir/resources" "$memex_dir/archives" "$memex_dir/system"
     fi
-        # Ensure the directories actually exist
-        mkdir -p "$memex_dir"
-        mkdir -p "$inbox_dir"
-        mkdir -p "$daily_dir"
-        mkdir -p "$proj_dir"
-        mkdir -p "$memex_dir/notes"
-        mkdir -p "$memex_dir/areas"
-        mkdir -p "$memex_dir/resources"
-        mkdir -p "$memex_dir/archives"
-        mkdir -p "$memex_dir/system"
 
     mkdir -p src
     for f in literate/*.org; do
         emacs --batch --eval "(require 'org)" --eval "(org-babel-tangle-file \"$f\")" >/dev/null 2>&1 || true
     done
+    
     mkdir -p "$HOME/.local/bin"
     ln -sf "$SCRIPT_DIR/opencortex.sh" "$HOME/.local/bin/opencortex"
 
-    # Ensure ~/.local/bin is in PATH for future sessions
     for shell_config in "$HOME/.bashrc" "$HOME/.profile"; do
         if [ -f "$shell_config" ]; then
             if ! grep -q ".local/bin" "$shell_config"; then
@@ -120,17 +124,15 @@ setup_system() {
     done
     export PATH="$HOME/.local/bin:$PATH"
 
-
     echo -e "${YELLOW}--- Compiling and Loading OpenCortex (this may take a minute) ---${NC}"
-sbcl --non-interactive   --eval "(load (merge-pathnames \"quicklisp/setup.lisp\" (user-homedir-pathname)))" --eval "(push (truename \"$SCRIPT_DIR/\") asdf:*central-registry*)" --eval "(ql:quickload '(:opencortex :croatoan))"
-
+    sbcl --non-interactive --eval "(load (merge-pathnames \"quicklisp/setup.lisp\" (user-homedir-pathname)))" --eval "(push (truename \"$SCRIPT_DIR/\") asdf:*central-registry*)" --eval "(ql:quickload '(:opencortex :croatoan))"
+    
     if [ $? -ne 0 ]; then
         echo -e "${RED}✗ Compilation or Loading failed.${NC}"
         exit 1
     fi
 
     echo -e "${YELLOW}--- Finalizing: Awakening the Brain as a background daemon ---${NC}"
-    # Nuke any existing brain logs
     > "$SCRIPT_DIR/brain.log"
     "$SCRIPT_DIR/opencortex.sh" --boot > "$SCRIPT_DIR/brain.log" 2>&1 &
 
@@ -146,15 +148,16 @@ sbcl --non-interactive   --eval "(load (merge-pathnames \"quicklisp/setup.lisp\"
 
     if [ "$success" = true ]; then
         echo -e "\n${GREEN}✓ Brain is alive and responsive on port $PORT.${NC}"
-        echo -e "${GREEN}✓ Setup complete. You can now run 'opencortex tui'.${NC}"
+        echo -e "${GREEN}✓ Setup complete.${NC}"
+        if command -v opencortex >/dev/null 2>&1; then
+            echo -e "${BLUE}To start, run:${NC} ${GREEN}opencortex tui${NC}"
+        else
+            echo -e "${BLUE}To start, run:${NC} ${GREEN}exec bash && opencortex tui${NC}"
+        fi
     else
         echo -e "\n${RED}✗ Brain failed to wake up.${NC}"
         echo -e "${YELLOW}Full Log Path: $(realpath "$SCRIPT_DIR/brain.log")${NC}"
-        echo -e "${YELLOW}--- LOG START ---${NC}"
         cat "$SCRIPT_DIR/brain.log"
-        echo -e "${YELLOW}--- LOG END ---${NC}"
-        # Kill the background process if it exists
-        pkill -f "sbcl.*opencortex" || true
         exit 1
     fi
 }
@@ -163,60 +166,44 @@ if [ ! -f "$SCRIPT_DIR/src/package.lisp" ] || [ ! -f "$SCRIPT_DIR/.env" ]; then
     setup_system
 fi
 
-# --- 3. BOOT ---
 if [[ "$1" == "--boot" ]]; then
-    if [ -f "$SCRIPT_DIR/.env" ]; then
-        while IFS='=' read -r key value || [ -n "$key" ]; do
-          if [[ $key =~ ^[a-zA-Z_][a-zA-Z0-9_]*$ ]]; then
-            val=$(echo "$value" | sed 's/^"//;s/"$//')
-            export "$key=$val"
-          fi
-        done < "$SCRIPT_DIR/.env"
-    fi
-exec sbcl   --eval "(load (merge-pathnames \"quicklisp/setup.lisp\" (user-homedir-pathname)))" --eval "(setf *debugger-hook* (lambda (c h) (declare (ignore h)) (format *error-output* \"FATAL LISP ERROR: ~a~%\" c) (uiop:print-backtrace :stream *error-output*) (uiop:quit 1)))" --eval "(push (truename \"$SCRIPT_DIR/\") asdf:*central-registry*)" --eval "(format t \"--- Quickloading OpenCortex ---~%\")" --eval "(ql:quickload '(:opencortex :croatoan))" --eval "(opencortex:main)"
+    export SKILLS_DIR="${SCRIPT_DIR}/skills"
+    [ -z "$MEMEX_DIR" ] && export MEMEX_DIR="$HOME/memex"
+    exec sbcl --eval "(load (merge-pathnames \"quicklisp/setup.lisp\" (user-homedir-pathname)))" --eval "(setf *debugger-hook* (lambda (c h) (declare (ignore h)) (format *error-output* \"FATAL LISP ERROR: ~a~%\" c) (uiop:print-backtrace :stream *error-output*) (uiop:quit 1)))" --eval "(push (truename \"$SCRIPT_DIR/\") asdf:*central-registry*)" --eval "(format t \"--- Quickloading OpenCortex ---~%\")" --eval "(ql:quickload '(:opencortex :croatoan))" --eval "(opencortex:main)"
 fi
 
-# --- 4. INTERACT ---
 if [[ "$1" == "tui" ]]; then
-    # Ensure daemon is running
-    if ! (nc -z $HOST $PORT 2>/dev/null || (command_exists socat && socat - TCP:$HOST:$PORT,connect-timeout=1 2>/dev/null)); then
+    if ! nc -z $HOST $PORT 2>/dev/null; then
         echo -e "${YELLOW}Brain is offline. Awakening...${NC}"
         "$SCRIPT_DIR/opencortex.sh" --boot > "$SCRIPT_DIR/brain.log" 2>&1 &
         for i in {1..15}; do
             sleep 2
-            if nc -z $HOST $PORT 2>/dev/null || (command_exists socat && socat - TCP:$HOST:$PORT,connect-timeout=1 2>/dev/null); then break; fi
+            if nc -z $HOST $PORT 2>/dev/null; then break; fi
             echo -n "."
         done
         echo ""
     fi
-
-    # Launch TUI
     echo -e "${BLUE}Launching Croatoan TUI...${NC}"
-exec sbcl   --eval "(load (merge-pathnames \"quicklisp/setup.lisp\" (user-homedir-pathname)))" --eval "(push (truename \"$SCRIPT_DIR/\") asdf:*central-registry*)" --eval "(ql:quickload :opencortex/tui)" --eval "(opencortex.tui:main)"
+    export SKILLS_DIR="${SCRIPT_DIR}/skills"
+    [ -z "$MEMEX_DIR" ] && export MEMEX_DIR="$HOME/memex"
+    exec sbcl --eval "(load (merge-pathnames \"quicklisp/setup.lisp\" (user-homedir-pathname)))" --eval "(push (truename \"$SCRIPT_DIR/\") asdf:*central-registry*)" --eval "(ql:quickload :opencortex/tui)" --eval "(opencortex.tui:main)"
 fi
 
-connect() {
-    if command_exists socat && socat - TCP:$HOST:$PORT,connect-timeout=1 2>/dev/null; then
-        socat - TCP:$HOST:$PORT
-        return 0
-    elif command_exists nc && nc -z $HOST $PORT 2>/dev/null; then
-        nc $HOST $PORT
-        return 0
+if [ -z "$1" ]; then
+    if ! nc -z $HOST $PORT 2>/dev/null; then
+        echo -e "${YELLOW}Brain is offline. Awakening...${NC}"
+        "$SCRIPT_DIR/opencortex.sh" --boot > "$SCRIPT_DIR/brain.log" 2>&1 &
+        for i in {1..15}; do
+            sleep 2
+            if nc -z $HOST $PORT 2>/dev/null; then break; fi
+            echo -n "."
+        done
+        echo ""
     fi
-    return 1
-}
-
-if connect; then exit 0; fi
-
-echo -e "${YELLOW}Brain is offline. Awakening...${NC}"
-"$SCRIPT_DIR/opencortex.sh" --boot > "$SCRIPT_DIR/brain.log" 2>&1 &
-
-for i in {1..15}; do
-    sleep 2
-    if connect; then exit 0; fi
-    echo -n "."
-done
-
-echo -e "${RED}\n✗ Failed to connect to brain.${NC}"
-exit 1
+    if command_exists socat; then
+        exec socat - TCP:$HOST:$PORT
+    else
+        exec nc $HOST $PORT
+    fi
+fi
 #+end_src