codeforge-dev 1.5.8 → 1.8.0

package/.devcontainer/scripts/setup-config.sh

@@ -1,28 +1,120 @@
 #!/bin/bash
-# Copy Claude configuration files to workspace
+# Copy configuration files to workspace based on file-manifest.json
 
 CONFIG_DIR="${CONFIG_SOURCE_DIR:?CONFIG_SOURCE_DIR not set}"
-TARGET_DIR="${CLAUDE_CONFIG_DIR:?CLAUDE_CONFIG_DIR not set}"
-OVERWRITE="${OVERWRITE_CONFIG:-false}"
-
-echo "[setup-config] Copying configuration files..."
-[ "$OVERWRITE" = "true" ] && echo "[setup-config] Overwrite mode enabled"
-
-mkdir -p "$TARGET_DIR"
-
-copy_file() {
-    local file="$1"
-    if [ -f "$CONFIG_DIR/$file" ]; then
-        if [ "$OVERWRITE" = "true" ] || [ ! -f "$TARGET_DIR/$file" ]; then
-            cp "$CONFIG_DIR/$file" "$TARGET_DIR/$file"
-            echo "[setup-config] Copied $file"
-        else
-            echo "[setup-config] $file already exists, skipping"
+MANIFEST="$CONFIG_DIR/file-manifest.json"
+
+log()  { echo "[setup-config] $*"; }
+warn() { echo "[setup-config] WARNING: $*"; }
+err()  { echo "[setup-config] ERROR: $*" >&2; }
+
+# Deprecation notice if legacy OVERWRITE_CONFIG is still set
+if [ -n "${OVERWRITE_CONFIG+x}" ]; then
+    warn "OVERWRITE_CONFIG is deprecated. Use per-file 'overwrite' in config/file-manifest.json instead."
+fi
+
+# ── Legacy fallback ──────────────────────────────────────────────
+legacy_copy() {
+    local target_dir="${CLAUDE_CONFIG_DIR:?CLAUDE_CONFIG_DIR not set}"
+    warn "file-manifest.json not found, falling back to legacy copy"
+    mkdir -p "$target_dir"
+    for file in defaults/settings.json defaults/keybindings.json defaults/main-system-prompt.md; do
+        if [ -f "$CONFIG_DIR/$file" ]; then
+            local basename="${file##*/}"
+            cp "$CONFIG_DIR/$file" "$target_dir/$basename"
+            chown "$(id -un):$(id -gn)" "$target_dir/$basename" 2>/dev/null || true
+            log "Copied $basename (legacy)"
         fi
+    done
+    log "Configuration complete (legacy)"
+}
+
+if [ ! -f "$MANIFEST" ]; then
+    legacy_copy
+    exit 0
+fi
+
+# ── Validate manifest JSON ──────────────────────────────────────
+if ! jq empty "$MANIFEST" 2>/dev/null; then
+    err "Invalid JSON in file-manifest.json"
+    exit 1
+fi
+
+# ── Variable expansion ───────────────────────────────────────────
+expand_vars() {
+    local val="$1"
+    val="${val//\$\{CLAUDE_CONFIG_DIR\}/$CLAUDE_CONFIG_DIR}"
+    val="${val//\$\{WORKSPACE_ROOT\}/$WORKSPACE_ROOT}"
+    # Warn on any remaining unresolved ${...} tokens
+    if [[ "$val" =~ \$\{[^}]+\} ]]; then
+        warn "Unresolved variable in: $val"
     fi
+    echo "$val"
+}
+
+# ── Change detection ─────────────────────────────────────────────
+should_copy() {
+    local src="$1" dest="$2"
+    [ ! -f "$dest" ] && return 0
+    local src_hash dest_hash
+    src_hash=$(sha256sum "$src" | cut -d' ' -f1)
+    dest_hash=$(sha256sum "$dest" | cut -d' ' -f1)
+    [ "$src_hash" != "$dest_hash" ]
 }
 
-copy_file "settings.json"
-copy_file "main-system-prompt.md"
+# ── Process manifest ─────────────────────────────────────────────
+log "Copying configuration files..."
+
+# Single jq invocation to extract all fields (reduces N×5 subprocess calls to 1)
+jq -r '.[] | [.src, .dest, (.destFilename // ""), (.enabled // true | tostring), (.overwrite // "if-changed")] | @tsv' "$MANIFEST" |
+while IFS=$'\t' read -r src dest dest_filename enabled overwrite; do
+    # Skip disabled entries
+    if [ "$enabled" = "false" ]; then
+        log "Skipping $src (disabled)"
+        continue
+    fi
+
+    # Resolve paths
+    src_path="$CONFIG_DIR/$src"
+    dest_dir=$(expand_vars "$dest")
+    filename="${dest_filename:-${src##*/}}"
+    dest_path="$dest_dir/$filename"
+
+    # Validate source exists
+    if [ ! -f "$src_path" ]; then
+        warn "$src not found in config dir, skipping"
+        continue
+    fi
+
+    # Ensure destination directory exists
+    mkdir -p "$dest_dir"
+
+    # Apply overwrite strategy
+    case "$overwrite" in
+        always)
+            cp "$src_path" "$dest_path"
+            log "Copied $src → $dest_path (always)"
+            ;;
+        never)
+            if [ ! -f "$dest_path" ]; then
+                cp "$src_path" "$dest_path"
+                log "Copied $src → $dest_path (new)"
+            else
+                log "Skipping $src (exists, overwrite=never)"
+            fi
+            ;;
+        if-changed|*)
+            if should_copy "$src_path" "$dest_path"; then
+                cp "$src_path" "$dest_path"
+                log "Copied $src → $dest_path (changed)"
+            else
+                log "Skipping $src (unchanged)"
+            fi
+            ;;
+    esac
+
+    # Fix ownership
+    chown "$(id -un):$(id -gn)" "$dest_path" 2>/dev/null || true
+done
 
-echo "[setup-config] Configuration complete"
+log "Configuration complete"

package/.devcontainer/scripts/setup-plugins.sh

@@ -1,5 +1,21 @@
 #!/bin/bash
-# Install plugins: official Anthropic + local devs-marketplace
+# Install plugins: official Anthropic + local devs-marketplace registration
+#
+# Individual marketplace plugins are enabled via enabledPlugins in settings.json.
+# This script only handles:
+# 1. Official Anthropic plugin installs (not managed by enabledPlugins)
+# 2. Local marketplace registration (so Claude Code can discover devs-marketplace)
+
+# Source .env for PLUGIN_BLACKLIST if not already set (e.g., standalone invocation)
+if [ -z "${PLUGIN_BLACKLIST+x}" ]; then
+    SCRIPT_DIR_INIT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+    ENV_FILE="${SCRIPT_DIR_INIT}/../.env"
+    if [ -f "$ENV_FILE" ]; then
+        set -a
+        source "$ENV_FILE"
+        set +a
+    fi
+fi
 
 echo "[setup-plugins] Installing plugins..."
 
@@ -18,33 +34,13 @@ for plugin in "${OFFICIAL_PLUGINS[@]}"; do
     fi
 done
 
-# --- Local Marketplace Plugins ---
+# --- Local Marketplace Registration ---
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 MARKETPLACE_PATH="${SCRIPT_DIR}/../plugins/devs-marketplace"
 
-# Load PLUGIN_BLACKLIST from .env if not already set in environment
-ENV_FILE="${SCRIPT_DIR}/../.env"
-if [ -z "${PLUGIN_BLACKLIST+x}" ] && [ -f "$ENV_FILE" ]; then
-    PLUGIN_BLACKLIST=$(grep -E '^PLUGIN_BLACKLIST=' "$ENV_FILE" | cut -d'=' -f2- | tr -d '"')
-fi
-
-# Parse blacklist into array
-IFS=',' read -ra BLACKLIST <<< "${PLUGIN_BLACKLIST:-}"
-
-# Helper function to check if plugin is blacklisted
-is_blacklisted() {
-    local plugin_name="$1"
-    for blocked in "${BLACKLIST[@]}"; do
-        # Trim whitespace and compare
-        blocked="${blocked// /}"
-        if [ "$plugin_name" = "$blocked" ]; then
-            return 0
-        fi
-    done
-    return 1
-}
-
 # Add local marketplace (if not already added)
+# This is still needed so Claude Code can discover devs-marketplace plugins
+# listed in enabledPlugins in settings.json
 if ! claude plugin marketplace list 2>/dev/null | grep -q "devs-marketplace"; then
     echo "[setup-plugins] Adding devs-marketplace..."
     claude plugin marketplace add "$MARKETPLACE_PATH" 2>/dev/null || {
@@ -52,29 +48,25 @@ if ! claude plugin marketplace list 2>/dev/null | grep -q "devs-marketplace"; th
     }
 fi
 
-# Install ALL plugins from marketplace.json (dynamic discovery)
-MARKETPLACE_JSON="$MARKETPLACE_PATH/.claude-plugin/marketplace.json"
-if [ -f "$MARKETPLACE_JSON" ]; then
-    PLUGINS=$(jq -r '.plugins[].name' "$MARKETPLACE_JSON" 2>/dev/null)
+# --- Install/Update devs-marketplace plugins (syncs cache from source) ---
+# enabledPlugins in settings.json controls enabled/disabled state, but plugins
+# must be explicitly installed to populate the cache. This loop ensures the
+# cache stays in sync with the source directory on every container start.
+if [ -d "$MARKETPLACE_PATH/plugins" ]; then
+    for plugin_dir in "$MARKETPLACE_PATH"/plugins/*/; do
+        plugin_name=$(basename "$plugin_dir")
 
-    if [ -z "$PLUGINS" ]; then
-        echo "[setup-plugins] WARNING: No plugins found in marketplace.json"
-    else
-        for plugin in $PLUGINS; do
-            if is_blacklisted "$plugin"; then
-                echo "[setup-plugins] Skipping $plugin (blacklisted)"
-                continue
-            fi
-            echo "[setup-plugins] Installing $plugin from devs-marketplace..."
-            if claude plugin install "${plugin}@devs-marketplace" 2>/dev/null; then
-                echo "[setup-plugins] Installed: $plugin"
-            else
-                echo "[setup-plugins] WARNING: Failed to install $plugin (may already be installed)"
-            fi
-        done
-    fi
-else
-    echo "[setup-plugins] WARNING: marketplace.json not found at $MARKETPLACE_JSON"
+        # Skip blacklisted plugins
+        if echo ",$PLUGIN_BLACKLIST," | grep -q ",$plugin_name,"; then
+            echo "[setup-plugins] Skipping $plugin_name (blacklisted)"
+            continue
+        fi
+
+        echo "[setup-plugins] Installing $plugin_name@devs-marketplace..."
+        claude plugin install "$plugin_name@devs-marketplace" 2>/dev/null || {
+            echo "[setup-plugins] Warning: Failed to install $plugin_name"
+        }
+    done
 fi
 
 echo "[setup-plugins] Plugin installation complete"

package/.devcontainer/scripts/setup-projects.sh

@@ -0,0 +1,175 @@
+#!/bin/bash
+# Auto-detect projects under /workspaces/ and register them in Project Manager's projects.json.
+# Runs an initial scan synchronously, then starts an inotifywait background watcher
+# that updates the project list instantly when directories are created or removed.
+
+set -euo pipefail
+
+WORKSPACE_ROOT="${WORKSPACE_ROOT:-/workspaces}"
+PROJECTS_DIR="${WORKSPACE_ROOT}/.config/project-manager"
+PROJECTS_FILE="${PROJECTS_DIR}/projects.json"
+PID_FILE="/tmp/project-watcher.pid"
+LOG_PREFIX="[setup-projects]"
+
+# Directories to exclude from project detection (hidden/config dirs)
+EXCLUDED_DIRS=".claude .gh .tmp .devcontainer .config node_modules .git"
+
+# --- Helpers ---
+
+is_excluded() {
+    local name="$1"
+    # Skip hidden directories (start with .)
+    [[ "$name" == .* ]] && return 0
+    # Skip explicitly excluded names
+    for excluded in $EXCLUDED_DIRS; do
+        [[ "$name" == "$excluded" ]] && return 0
+    done
+    return 1
+}
+
+detect_tags() {
+    local dir="$1"
+    local tags=()
+
+    [ -d "$dir/.git" ]         && tags+=("git")
+    [ -f "$dir/package.json" ] && tags+=("node")
+    [ -f "$dir/pyproject.toml" ] && tags+=("python")
+    [ -f "$dir/Cargo.toml" ]   && tags+=("rust")
+    [ -f "$dir/go.mod" ]       && tags+=("go")
+    [ -f "$dir/deno.json" ]    && tags+=("deno")
+    [ -f "$dir/Makefile" ]     && tags+=("make")
+    [ -f "$dir/CLAUDE.md" ]    && tags+=("claude")
+
+    # Always add "auto" tag to mark as script-managed
+    tags+=("auto")
+
+    # If no markers found (only "auto"), add "folder" tag
+    if [ ${#tags[@]} -eq 1 ]; then
+        tags=("folder" "${tags[@]}")
+    fi
+
+    # Output as JSON array
+    printf '%s\n' "${tags[@]}" | jq -R . | jq -s .
+}
+
+scan_and_update() {
+    # Build the new auto-detected projects array
+    local new_projects="[]"
+
+    for dir in "$WORKSPACE_ROOT"/*/; do
+        [ -d "$dir" ] || continue
+        local name
+        name=$(basename "$dir")
+
+        is_excluded "$name" && continue
+
+        local tags
+        tags=$(detect_tags "$dir")
+
+        new_projects=$(echo "$new_projects" | jq \
+            --arg name "$name" \
+            --arg path "$dir" \
+            --argjson tags "$tags" \
+            '. += [{"name": $name, "rootPath": ($path | rtrimstr("/")), "tags": $tags, "enabled": true}]')
+    done
+
+    # Read existing projects.json (or empty array if missing/invalid)
+    local existing="[]"
+    if [ -f "$PROJECTS_FILE" ] && jq empty "$PROJECTS_FILE" 2>/dev/null; then
+        existing=$(cat "$PROJECTS_FILE")
+    fi
+
+    # Separate user entries (no "auto" tag) from auto entries
+    local user_entries
+    user_entries=$(echo "$existing" | jq '[.[] | select(.tags | index("auto") | not)]')
+
+    # Merge: user entries + new auto-detected entries
+    local merged
+    merged=$(jq -n --argjson user "$user_entries" --argjson auto "$new_projects" '$user + $auto')
+
+    # Only write if content changed (avoid unnecessary file writes that trigger Project Manager reloads)
+    local current_hash new_hash
+    current_hash=""
+    [ -f "$PROJECTS_FILE" ] && current_hash=$(md5sum "$PROJECTS_FILE" 2>/dev/null | cut -d' ' -f1)
+
+    local tmp_file
+    tmp_file=$(mktemp)
+    echo "$merged" | jq '.' > "$tmp_file"
+    new_hash=$(md5sum "$tmp_file" | cut -d' ' -f1)
+
+    if [ "$current_hash" != "$new_hash" ]; then
+        mv "$tmp_file" "$PROJECTS_FILE"
+        chmod 644 "$PROJECTS_FILE"
+        local count
+        count=$(echo "$merged" | jq 'length')
+        echo "$LOG_PREFIX Updated projects.json ($count projects)"
+    else
+        rm -f "$tmp_file"
+    fi
+}
+
+start_watcher() {
+    # Guard: don't start if already running
+    if [ -f "$PID_FILE" ]; then
+        local old_pid
+        old_pid=$(cat "$PID_FILE" 2>/dev/null)
+        if [ -n "$old_pid" ] && kill -0 "$old_pid" 2>/dev/null; then
+            echo "$LOG_PREFIX Watcher already running (PID $old_pid), skipping"
+            return 0
+        fi
+        # Stale PID file — clean up
+        rm -f "$PID_FILE"
+    fi
+
+    # Check if inotifywait is available
+    if ! command -v inotifywait &>/dev/null; then
+        echo "$LOG_PREFIX Installing inotify-tools..."
+        if command -v sudo &>/dev/null; then
+            sudo apt-get update -qq && sudo apt-get install -y -qq inotify-tools >/dev/null 2>&1
+        else
+            apt-get update -qq && apt-get install -y -qq inotify-tools >/dev/null 2>&1
+        fi
+
+        if ! command -v inotifywait &>/dev/null; then
+            echo "$LOG_PREFIX WARNING: Could not install inotify-tools, watcher disabled"
+            return 1
+        fi
+        echo "$LOG_PREFIX inotify-tools installed"
+    fi
+
+    # Fork background watcher
+    (
+        # Watch for directory create/delete/move events in /workspaces/
+        # --quiet suppresses header, --monitor keeps watching indefinitely
+        inotifywait -m -q -e create,delete,moved_to,moved_from \
+            --format '%f %e' "$WORKSPACE_ROOT" 2>/dev/null |
+        while read -r name event; do
+            # Small delay to let filesystem settle (e.g., move operations)
+            sleep 1
+            scan_and_update
+        done
+
+        # Cleanup on exit
+        rm -f "$PID_FILE"
+    ) &
+    local watcher_pid=$!
+    echo "$watcher_pid" > "$PID_FILE"
+    disown
+
+    echo "$LOG_PREFIX Background watcher started (PID $watcher_pid)"
+}
+
+# --- Main ---
+
+echo "$LOG_PREFIX Configuring Project Manager auto-detection..."
+
+# Ensure projects directory exists
+mkdir -p "$PROJECTS_DIR"
+
+# Initial scan (synchronous — runs in <1 second)
+scan_and_update
+
+# Start background watcher
+start_watcher
+
+echo "$LOG_PREFIX Done"

package/.devcontainer/scripts/setup-symlink-claude.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+# Symlink $HOME/.claude → $CLAUDE_CONFIG_DIR so third-party tools
+# (ccburn, ccusage, etc.) that hardcode ~/.claude can find auth and config.
+
+CLAUDE_DIR="${CLAUDE_CONFIG_DIR:=/workspaces/.claude}"
+HOME_CLAUDE="$HOME/.claude"
+
+echo "[setup-symlink] Ensuring $HOME_CLAUDE → $CLAUDE_DIR ..."
+
+# Already a correct symlink — nothing to do
+if [ -L "$HOME_CLAUDE" ]; then
+    CURRENT_TARGET="$(readlink "$HOME_CLAUDE")"
+    if [ "$CURRENT_TARGET" = "$CLAUDE_DIR" ]; then
+        echo "[setup-symlink] Symlink already correct, skipping"
+        exit 0
+    fi
+    # Points somewhere else — remove stale symlink
+    echo "[setup-symlink] Removing stale symlink ($CURRENT_TARGET)"
+    rm "$HOME_CLAUDE"
+fi
+
+# Real directory exists — merge contents into target, then remove
+if [ -d "$HOME_CLAUDE" ]; then
+    echo "[setup-symlink] Moving existing $HOME_CLAUDE contents into $CLAUDE_DIR"
+    mkdir -p "$CLAUDE_DIR"
+    # Copy contents preserving attributes; skip files that already exist in target
+    cp -rn "$HOME_CLAUDE/." "$CLAUDE_DIR/" 2>/dev/null || true
+    rm -rf "$HOME_CLAUDE"
+fi
+
+# Ensure target exists
+mkdir -p "$CLAUDE_DIR"
+
+# Create symlink
+ln -s "$CLAUDE_DIR" "$HOME_CLAUDE"
+echo "[setup-symlink] Created symlink: $HOME_CLAUDE → $CLAUDE_DIR"

package/.devcontainer/scripts/setup-update-claude.sh

@@ -5,10 +5,21 @@
 
 echo "[update-claude] Checking for Claude Code updates..."
 
+# === TMPDIR ===
+_TMPDIR="${TMPDIR:-/tmp}"
+
+# === LOCK FILE (prevent concurrent updates) ===
+LOCK_FILE="${_TMPDIR}/claude-update.lock"
+if ! mkdir "$LOCK_FILE" 2>/dev/null; then
+    echo "[update-claude] Another update is already running, skipping"
+    exit 0
+fi
+
 # === CLEANUP TRAP ===
 cleanup() {
-    rm -f /tmp/claude-update 2>/dev/null || true
-    rm -f /tmp/claude-update-manifest.json 2>/dev/null || true
+    rm -f "${_TMPDIR}/claude-update" 2>/dev/null || true
+    rm -f "${_TMPDIR}/claude-update-manifest.json" 2>/dev/null || true
+    rm -rf "$LOCK_FILE" 2>/dev/null || true
 }
 trap cleanup EXIT
 
@@ -81,13 +92,13 @@ echo "[update-claude] Platform: ${PLATFORM}"
 # === DOWNLOAD MANIFEST ===
 MANIFEST_URL="${BASE_URL}/${LATEST_VERSION}/manifest.json"
 
-if ! curl -fsSL "${MANIFEST_URL}" -o /tmp/claude-update-manifest.json 2>/dev/null; then
+if ! curl -fsSL "${MANIFEST_URL}" -o ${_TMPDIR}/claude-update-manifest.json 2>/dev/null; then
     echo "[update-claude] WARNING: Failed to download manifest, skipping"
     exit 0
 fi
 
 # === EXTRACT AND VERIFY CHECKSUM ===
-EXPECTED_CHECKSUM=$(jq -r ".platforms.\"${PLATFORM}\".checksum" /tmp/claude-update-manifest.json)
+EXPECTED_CHECKSUM=$(jq -r ".platforms.\"${PLATFORM}\".checksum" ${_TMPDIR}/claude-update-manifest.json)
 if [ -z "${EXPECTED_CHECKSUM}" ] || [ "${EXPECTED_CHECKSUM}" = "null" ]; then
     echo "[update-claude] WARNING: Platform ${PLATFORM} not found in manifest, skipping"
     exit 0
@@ -96,13 +107,13 @@ fi
 # === DOWNLOAD BINARY ===
 BINARY_URL="${BASE_URL}/${LATEST_VERSION}/${PLATFORM}/claude"
 
-if ! curl -fsSL "${BINARY_URL}" -o /tmp/claude-update 2>/dev/null; then
+if ! curl -fsSL "${BINARY_URL}" -o ${_TMPDIR}/claude-update 2>/dev/null; then
     echo "[update-claude] WARNING: Failed to download binary, skipping"
     exit 0
 fi
 
 # === VERIFY CHECKSUM ===
-ACTUAL_CHECKSUM=$(sha256sum /tmp/claude-update | cut -d' ' -f1)
+ACTUAL_CHECKSUM=$(sha256sum ${_TMPDIR}/claude-update | cut -d' ' -f1)
 
 if [ "${ACTUAL_CHECKSUM}" != "${EXPECTED_CHECKSUM}" ]; then
     echo "[update-claude] WARNING: Checksum verification failed, skipping"
@@ -112,8 +123,8 @@ if [ "${ACTUAL_CHECKSUM}" != "${EXPECTED_CHECKSUM}" ]; then
 fi
 
 # === INSTALL (atomic replace) ===
-chmod +x /tmp/claude-update
-if ! sudo mv /tmp/claude-update /usr/local/bin/claude; then
+chmod +x ${_TMPDIR}/claude-update
+if ! sudo mv ${_TMPDIR}/claude-update /usr/local/bin/claude; then
     echo "[update-claude] WARNING: Failed to install update (sudo mv failed), skipping"
     exit 0
 fi

package/.devcontainer/scripts/setup.sh

@@ -1,8 +1,6 @@
 #!/bin/bash
 # Master setup script for CodeForge devcontainer
 
-set -e
-
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 DEVCONTAINER_DIR="$(dirname "$SCRIPT_DIR")"
 ENV_FILE="$DEVCONTAINER_DIR/.env"
@@ -19,12 +17,15 @@ fi
 : "${CONFIG_SOURCE_DIR:=$DEVCONTAINER_DIR/config}"
 : "${SETUP_CONFIG:=true}"
 : "${SETUP_ALIASES:=true}"
-: "${OVERWRITE_CONFIG:=false}"
+: "${SETUP_AUTH:=true}"
 : "${SETUP_PLUGINS:=true}"
 : "${SETUP_UPDATE_CLAUDE:=true}"
+: "${SETUP_PROJECTS:=true}"
 
-export CLAUDE_CONFIG_DIR CONFIG_SOURCE_DIR SETUP_CONFIG SETUP_ALIASES OVERWRITE_CONFIG SETUP_PLUGINS SETUP_UPDATE_CLAUDE
+export CLAUDE_CONFIG_DIR CONFIG_SOURCE_DIR SETUP_CONFIG SETUP_ALIASES SETUP_AUTH SETUP_PLUGINS SETUP_UPDATE_CLAUDE SETUP_PROJECTS
 
+SETUP_START=$(date +%s)
+SETUP_RESULTS=()
 
 echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
 echo "  CodeForge Setup"
@@ -34,37 +35,71 @@ echo ""
 run_script() {
     local script="$1"
     local enabled="$2"
-    local name="$(basename $script .sh)"
+    local name
+    name="$(basename "$script" .sh)"
 
     if [ "$enabled" = "true" ]; then
         if [ -f "$script" ]; then
-            echo "Running $name..."
-            bash "$script"
-            echo ""
+            printf "  %-30s" "$name..."
+            if bash "$script" 2>&1; then
+                echo "done"
+                SETUP_RESULTS+=("$name:ok")
+            else
+                echo "FAILED (exit $?)"
+                SETUP_RESULTS+=("$name:failed")
+            fi
         else
-            echo "WARNING: $script not found, skipping"
+            echo "  $name... not found, skipping"
+            SETUP_RESULTS+=("$name:missing")
         fi
     else
-        echo "Skipping $name (disabled)"
+        echo "  $name... skipped (disabled)"
+        SETUP_RESULTS+=("$name:disabled")
     fi
 }
 
+run_script "$SCRIPT_DIR/setup-symlink-claude.sh" "true"
+run_script "$SCRIPT_DIR/setup-auth.sh" "$SETUP_AUTH"
 run_script "$SCRIPT_DIR/setup-config.sh" "$SETUP_CONFIG"
 run_script "$SCRIPT_DIR/setup-aliases.sh" "$SETUP_ALIASES"
 run_script "$SCRIPT_DIR/setup-plugins.sh" "$SETUP_PLUGINS"
-run_script "$SCRIPT_DIR/setup-irie-claude.sh" "true"
+run_script "$SCRIPT_DIR/setup-projects.sh" "$SETUP_PROJECTS"
 
 # Non-blocking: check for Claude Code updates in background
 if [ "$SETUP_UPDATE_CLAUDE" = "true" ]; then
     if [ -f "$SCRIPT_DIR/setup-update-claude.sh" ]; then
-        echo "Running setup-update-claude (background)..."
+        echo "  Claude Code update checking in background..."
+        echo "  (If 'claude' fails, wait a moment and retry)"
         bash "$SCRIPT_DIR/setup-update-claude.sh" &
         disown
+        SETUP_RESULTS+=("setup-update-claude:ok")
+    else
+        SETUP_RESULTS+=("setup-update-claude:missing")
     fi
 else
-    echo "Skipping setup-update-claude (disabled)"
+    echo "  setup-update-claude... skipped (disabled)"
+    SETUP_RESULTS+=("setup-update-claude:disabled")
 fi
 
+echo ""
 echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
-echo "  Setup Complete"
+echo "  Setup Summary"
+echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
+FAILURES=0
+for result in "${SETUP_RESULTS[@]}"; do
+    name="${result%%:*}"
+    status="${result##*:}"
+    case "$status" in
+        ok)       printf "  ✓ %s\n" "$name" ;;
+        failed)   printf "  ✗ %s (FAILED)\n" "$name"; FAILURES=$((FAILURES + 1)) ;;
+        disabled) printf "  - %s (disabled)\n" "$name" ;;
+        missing)  printf "  ? %s (not found)\n" "$name" ;;
+    esac
+done
+ELAPSED=$(( $(date +%s) - SETUP_START ))
+echo ""
+if [ $FAILURES -gt 0 ]; then
+    echo "  $FAILURES step(s) failed. Check output above for details."
+fi
+echo "  Completed in ${ELAPSED}s"
 echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"