diff --git a/literate/setup.org b/literate/setup.org index 9a6ab2d..482faa9 100644 --- a/literate/setup.org +++ b/literate/setup.org @@ -4,148 +4,105 @@ #+STARTUP: content * Overview: The Zero-to-One Experience -The *Setup & Onboarding* process ensures that users can boot the ~opencortex~ Lisp Machine with zero friction. +The *Setup & Onboarding* process ensures that users can boot the ~opencortex~ Lisp Machine with zero friction using a single unified script. + +* 1. The Unified Conductor (opencortex.sh) +This script handles the entire lifecycle: Bootstrap, Setup, Boot, and Interaction. -* 1. The Unified Entrypoint (opencortex.sh) #+begin_src bash :tangle ../opencortex.sh :shebang "#!/bin/bash" +# OpenCortex: The Unified Conductor set -e PORT=9105 HOST=${1:-localhost} - -RED='\033[0;31m' -GREEN='\033[0;32m' -BLUE='\033[0;34m' -YELLOW='\033[0;33m' -NC='\033[0m' +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; } -# --- Bootstrap Mode --- -bootstrap_opencortex() { +# --- 1. BOOTSTRAP (Clone) --- +if [ ! -d ".git" ] && [[ ! "$(pwd)" =~ "opencortex" ]]; then echo -e "${BLUE}=== OpenCortex: Zero-to-One Bootstrapper ===${NC}" - if [ -d ".git" ]; then return; fi - TARGET_DIR="opencortex" if [ ! -d "$TARGET_DIR" ]; then - echo -e "${BLUE}Cloning repository into $TARGET_DIR...${NC}" + echo -e "Cloning repository..." git clone http://10.10.10.201:3001/amr/opencortex.git "$TARGET_DIR" fi cd "$TARGET_DIR" git submodule update --init --recursive - echo -e "${GREEN}✓ Repository prepared.${NC}" - ./scripts/onboard-baremetal.sh - echo -e "${GREEN}✓ Setup phase complete.${NC}" - exit 0 -} - -if [ ! -d ".git" ] && [[ ! "$(pwd)" =~ "opencortex" ]]; then - bootstrap_opencortex + exec ./opencortex.sh "$@" fi -# --- Helper: Load Env --- -load_env() { +# --- 2. SETUP (Deps & Tangle) --- +setup_system() { + echo -e "${BLUE}=== OpenCortex: Initializing System ===${NC}" + + # Dependencies + if ! command_exists sbcl; then + echo -e "Installing dependencies..." + sudo apt-get update && sudo apt-get install -y sbcl emacs git curl socat || true + fi + + # Quicklisp + if [ ! -d "$HOME/quicklisp" ]; then + echo -e "Installing Quicklisp..." + 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 + + # Tangle + if [ ! -f "src/package.lisp" ]; then + echo -e "Tangling brain from literate source..." + 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 + fi + + # .env + if [ ! -f .env ]; then + cp .env.example .env + sed -i "s/MEMEX_USER=.*/MEMEX_USER=\"User\"/g" .env + sed -i "s/MEMEX_ASSISTANT=.*/MEMEX_ASSISTANT=\"OpenCortex\"/g" .env + sed -i "s|SKILLS_DIR=.*|SKILLS_DIR=\"$(pwd)/skills\"|g" .env + fi + + # PATH installation + mkdir -p "$HOME/.local/bin" + ln -sf "$(pwd)/opencortex.sh" "$HOME/.local/bin/opencortex" + echo -e "${GREEN}✓ Setup complete. 'opencortex' command ready in PATH.${NC}" +} + +if [ ! -f "src/package.lisp" ] || [ ! -f .env ]; then + setup_system +fi + +# --- 3. BOOT (The Brain) --- +if [[ "$1" == "--boot" ]]; then + echo -e "${BLUE}Starting OpenCortex Brain...${NC}" if [ -f .env ]; then while IFS='=' read -r key value || [ -n "$key" ]; do - # Remove whitespace and quotes - key=$(echo "$key" | xargs) - value=$(echo "$value" | xargs | sed 's/^"//;s/"$//') - if [[ "$key" =~ ^[a-zA-Z_][a-zA-Z0-9_]*$ ]]; then + if [[ $key =~ ^[a-zA-Z_][a-zA-Z0-9_]*$ ]]; then + value=$(echo "$value" | sed 's/^"//;s/"$//') export "$key=$value" fi done < .env fi -} - -# --- Force Boot --- -if [[ "$1" == "--boot" ]]; then - load_env - echo -e "${BLUE}Starting OpenCortex Brain...${NC}" - # Use absolute path to the directory containing this script for ASDF - SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" exec sbcl --non-interactive \ --eval "(load \"~/quicklisp/setup.lisp\")" \ - --eval "(push \"$SCRIPT_DIR/\" asdf:*central-registry*)" \ + --eval "(push \"$(cd "$(dirname "$0")" && pwd)/\" asdf:*central-registry*)" \ --eval "(ql:quickload :opencortex)" \ --eval "(opencortex:main)" fi -# --- Client Mode --- +# --- 4. INTERACT (The Client) --- if command_exists socat && socat - TCP:$HOST:$PORT,connect-timeout=1 2>/dev/null; then - echo -e "${BLUE}Connected to autonomous brain at $HOST:$PORT...${NC}" socat READLINE,history=$HOME/.org_agent_history TCP:$HOST:$PORT exit 0 fi -# --- Auto-Boot Logic --- -if [ -f "opencortex.asd" ] || [ -f "$(dirname "$0")/opencortex.asd" ]; then - echo -e "${YELLOW}Brain is offline. Starting it now...${NC}" - # Use the absolute path to ourselves to ensure the right script boots - SELF="$(cd "$(dirname "$0")" && pwd)/$(basename "$0")" - "$SELF" --boot > brain.log 2>&1 & - sleep 10 - exec "$SELF" "$@" -fi -#+end_src - -* 2. The Baremetal Path (onboard-baremetal.sh) -#+begin_src bash :tangle ../scripts/onboard-baremetal.sh :shebang "#!/bin/bash" -# OpenCortex Final-Mile Installer -RED='\033[0;31m'; GREEN='\033[0;32m'; BLUE='\033[0;34m'; YELLOW='\033[0;33m'; NC='\033[0m' -echo -e "${BLUE}=== OpenCortex: Baremetal Power-User Setup ===${NC}" - -prompt_user() { - local prompt="$1" - local default="$2" - local var_name="$3" - local result="" - echo -n -e "${YELLOW}$prompt (default: $default): ${NC}" >&2 - if read -t 5 result; then :; else result="$default"; echo -e "${BLUE} [Auto-Selected: $default]${NC}" >&2; fi - val=${result:-$default} - eval "$var_name=\"$val\"" -} - -# 1. Dependencies -if ! command -v sbcl >/dev/null 2>&1; then - echo -e "${BLUE}Installing dependencies...${NC}" - sudo apt-get update && sudo apt-get install -y sbcl emacs git curl socat || true -fi - -# 2. Quicklisp -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 - -# 3. Tangling -echo -e "${BLUE}Tangling source files...${NC}" -mkdir -p src -for f in literate/*.org; do - echo " - Tangling $f" - emacs --batch --eval "(require 'org)" --eval "(org-babel-tangle-file \"$f\")" >/dev/null 2>&1 -done - -# 4. Config -if [ ! -f .env ]; then cp .env.example .env; fi -prompt_user "What is your name?" "User" "USER_NAME" -prompt_user "What shall we name your Assistant?" "OpenCortex" "AGENT_NAME" -prompt_user "Select provider (1:Gemini, 2:OpenRouter)" "1" "LLM_CHOICE" - -sed -i "s/MEMEX_USER=.*/MEMEX_USER=\"$USER_NAME\"/g" .env -sed -i "s/MEMEX_ASSISTANT=.*/MEMEX_ASSISTANT=\"$AGENT_NAME\"/g" .env - -# 5. Path Alignment -INSTALL_DIR="$(cd "$(dirname "$0")/.." && pwd)" -sed -i "s|MEMEX_DIR=.*|MEMEX_DIR=\"$(dirname "$INSTALL_DIR")\"|g" .env -sed -i "s|SKILLS_DIR=.*|SKILLS_DIR=\"$INSTALL_DIR/skills\"|g" .env - -mkdir -p "$HOME/.local/bin" -ln -sf "$INSTALL_DIR/opencortex.sh" "$HOME/.local/bin/opencortex" -echo -e "${GREEN}✓ Installed 'opencortex' command to ~/.local/bin${NC}" - -echo -e "\n${GREEN}==============================================${NC}" -echo -e " OpenCortex Installation Complete! " -echo -e "==============================================${NC}" -echo -e "To start: opencortex" +echo -e "${YELLOW}Brain is offline. Awakening...${NC}" +./opencortex.sh --boot > brain.log 2>&1 & +sleep 15 +exec ./opencortex.sh "$@" #+end_src diff --git a/opencortex.sh b/opencortex.sh index 4b35d14..d28e578 100755 --- a/opencortex.sh +++ b/opencortex.sh @@ -1,79 +1,96 @@ #!/bin/bash +# OpenCortex: The Unified Conductor set -e PORT=9105 HOST=${1:-localhost} - -RED='\033[0;31m' -GREEN='\033[0;32m' -BLUE='\033[0;34m' -YELLOW='\033[0;33m' -NC='\033[0m' +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; } -# --- Bootstrap Mode --- -bootstrap_opencortex() { +# --- 1. BOOTSTRAP (Clone) --- +if [ ! -d ".git" ] && [[ ! "$(pwd)" =~ "opencortex" ]]; then echo -e "${BLUE}=== OpenCortex: Zero-to-One Bootstrapper ===${NC}" - if [ -d ".git" ]; then return; fi - TARGET_DIR="opencortex" if [ ! -d "$TARGET_DIR" ]; then - echo -e "${BLUE}Cloning repository into $TARGET_DIR...${NC}" + echo -e "Cloning repository..." git clone http://10.10.10.201:3001/amr/opencortex.git "$TARGET_DIR" fi cd "$TARGET_DIR" git submodule update --init --recursive - echo -e "${GREEN}✓ Repository prepared.${NC}" - ./scripts/onboard-baremetal.sh - echo -e "${GREEN}✓ Setup phase complete.${NC}" - exit 0 -} - -if [ ! -d ".git" ] && [[ ! "$(pwd)" =~ "opencortex" ]]; then - bootstrap_opencortex + exec ./opencortex.sh "$@" fi -# --- Helper: Load Env --- -load_env() { +# --- 2. SETUP (Deps & Tangle) --- +setup_system() { + echo -e "${BLUE}=== OpenCortex: Initializing System ===${NC}" + + # Dependencies + if ! command_exists sbcl; then + echo -e "Installing dependencies..." + sudo apt-get update && sudo apt-get install -y sbcl emacs git curl socat || true + fi + + # Quicklisp + if [ ! -d "$HOME/quicklisp" ]; then + echo -e "Installing Quicklisp..." + 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 + + # Tangle + if [ ! -f "src/package.lisp" ]; then + echo -e "Tangling brain from literate source..." + 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 + fi + + # .env + if [ ! -f .env ]; then + cp .env.example .env + sed -i "s/MEMEX_USER=.*/MEMEX_USER=\"User\"/g" .env + sed -i "s/MEMEX_ASSISTANT=.*/MEMEX_ASSISTANT=\"OpenCortex\"/g" .env + sed -i "s|SKILLS_DIR=.*|SKILLS_DIR=\"$(pwd)/skills\"|g" .env + fi + + # PATH installation + mkdir -p "$HOME/.local/bin" + ln -sf "$(pwd)/opencortex.sh" "$HOME/.local/bin/opencortex" + echo -e "${GREEN}✓ Setup complete. 'opencortex' command ready in PATH.${NC}" +} + +if [ ! -f "src/package.lisp" ] || [ ! -f .env ]; then + setup_system +fi + +# --- 3. BOOT (The Brain) --- +if [[ "$1" == "--boot" ]]; then + echo -e "${BLUE}Starting OpenCortex Brain...${NC}" if [ -f .env ]; then while IFS='=' read -r key value || [ -n "$key" ]; do - # Remove whitespace and quotes - key=$(echo "$key" | xargs) - value=$(echo "$value" | xargs | sed 's/^"//;s/"$//') - if [[ "$key" =~ ^[a-zA-Z_][a-zA-Z0-9_]*$ ]]; then + if [[ $key =~ ^[a-zA-Z_][a-zA-Z0-9_]*$ ]]; then + value=$(echo "$value" | sed 's/^"//;s/"$//') export "$key=$value" fi done < .env fi -} - -# --- Force Boot --- -if [[ "$1" == "--boot" ]]; then - load_env - echo -e "${BLUE}Starting OpenCortex Brain...${NC}" - # Use absolute path to the directory containing this script for ASDF - SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" exec sbcl --non-interactive \ --eval "(load \"~/quicklisp/setup.lisp\")" \ - --eval "(push \"$SCRIPT_DIR/\" asdf:*central-registry*)" \ + --eval "(push \"$(cd "$(dirname "$0")" && pwd)/\" asdf:*central-registry*)" \ --eval "(ql:quickload :opencortex)" \ --eval "(opencortex:main)" fi -# --- Client Mode --- +# --- 4. INTERACT (The Client) --- if command_exists socat && socat - TCP:$HOST:$PORT,connect-timeout=1 2>/dev/null; then - echo -e "${BLUE}Connected to autonomous brain at $HOST:$PORT...${NC}" socat READLINE,history=$HOME/.org_agent_history TCP:$HOST:$PORT exit 0 fi -# --- Auto-Boot Logic --- -if [ -f "opencortex.asd" ] || [ -f "$(dirname "$0")/opencortex.asd" ]; then - echo -e "${YELLOW}Brain is offline. Starting it now...${NC}" - # Use the absolute path to ourselves to ensure the right script boots - SELF="$(cd "$(dirname "$0")" && pwd)/$(basename "$0")" - "$SELF" --boot > brain.log 2>&1 & - sleep 10 - exec "$SELF" "$@" -fi +echo -e "${YELLOW}Brain is offline. Awakening...${NC}" +./opencortex.sh --boot > brain.log 2>&1 & +sleep 15 +exec ./opencortex.sh "$@"