codeforge-dev 1.9.0 → 1.10.0

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

@@ -17,146 +17,187 @@ 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
+	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
+}
+
+has_project_markers() {
+	local dir="$1"
+	[ -d "$dir/.git" ] || [ -f "$dir/package.json" ] || [ -f "$dir/pyproject.toml" ] ||
+		[ -f "$dir/Cargo.toml" ] || [ -f "$dir/go.mod" ] || [ -f "$dir/deno.json" ] ||
+		[ -f "$dir/Makefile" ] || [ -f "$dir/CLAUDE.md" ]
 }
 
 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 .
+	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 .
+}
+
+register_project() {
+	local projects_json="$1"
+	local name="$2"
+	local dir="$3"
+	local tags
+	tags=$(detect_tags "$dir")
+	echo "$projects_json" | jq \
+		--arg name "$name" \
+		--arg path "$dir" \
+		--argjson tags "$tags" \
+		'. += [{"name": $name, "rootPath": ($path | rtrimstr("/")), "tags": $tags, "enabled": true}]'
 }
 
 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
+	# Build the new auto-detected projects array (two-pass: depth 1 + depth 2)
+	local new_projects="[]"
+
+	for dir in "$WORKSPACE_ROOT"/*/; do
+		[ -d "$dir" ] || continue
+		local name
+		name=$(basename "$dir")
+
+		is_excluded "$name" && continue
+
+		if has_project_markers "$dir"; then
+			# Depth 1: directory has project markers — register it directly
+			new_projects=$(register_project "$new_projects" "$name" "$dir")
+		else
+			# Depth 2: no markers — treat as container dir, scan its children
+			for subdir in "${dir%/}"/*/; do
+				[ -d "$subdir" ] || continue
+				local subname
+				subname=$(basename "$subdir")
+				is_excluded "$subname" && continue
+				new_projects=$(register_project "$new_projects" "$subname" "$subdir")
+			done
+		fi
+	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
+}
+
+stop_watcher() {
+	if [ -f "$PID_FILE" ]; then
+		local old_pid
+		old_pid=$(cat "$PID_FILE" 2>/dev/null)
+		if [ -n "$old_pid" ]; then
+			# Kill the process group to stop both the subshell and inotifywait pipeline
+			kill -- -"$old_pid" 2>/dev/null || kill "$old_pid" 2>/dev/null || true
+		fi
+		rm -f "$PID_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)"
+	# 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
+		stop_watcher
+	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 in its own process group for clean shutdown
+	set -m
+	(
+		# Watch for directory create/delete/move events recursively under /workspaces/
+		# -r watches subdirectories (catches events inside container dirs like projects/)
+		# --exclude filters noisy dirs that generate frequent irrelevant events
+		inotifywait -m -r -q -e create,delete,moved_to,moved_from \
+			--exclude '(node_modules|\.git/|\.tmp|__pycache__|\.venv)' \
+			--format '%w%f %e' "$WORKSPACE_ROOT" 2>/dev/null |
+			while read -r _path 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=$!
+	set +m
+	echo "$watcher_pid" >"$PID_FILE"
+	disown
+
+	echo "$LOG_PREFIX Background watcher started (PID $watcher_pid)"
 }
 
 # --- Main ---

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

@@ -0,0 +1,48 @@
+#!/bin/bash
+# Configure VS Code Shift+Enter → newline for Claude Code terminal input
+# Writes to ~/.config/Code/User/keybindings.json (same path /terminal-setup uses)
+
+echo "[setup-terminal] Configuring Shift+Enter keybinding for Claude Code..."
+
+KEYBINDINGS_DIR="$HOME/.config/Code/User"
+KEYBINDINGS_FILE="$KEYBINDINGS_DIR/keybindings.json"
+
+# === Create directory if needed ===
+mkdir -p "$KEYBINDINGS_DIR"
+
+# === Check if already configured ===
+if [ -f "$KEYBINDINGS_FILE" ] && grep -q "workbench.action.terminal.sendSequence" "$KEYBINDINGS_FILE" 2>/dev/null; then
+	echo "[setup-terminal] Shift+Enter binding already present, skipping"
+	exit 0
+fi
+
+# === Merge or create keybindings ===
+BINDING='{"key":"shift+enter","command":"workbench.action.terminal.sendSequence","args":{"text":"\\u001b\\r"},"when":"terminalFocus"}'
+
+if [ -f "$KEYBINDINGS_FILE" ] && command -v jq &>/dev/null; then
+	# Merge into existing keybindings
+	if jq empty "$KEYBINDINGS_FILE" 2>/dev/null; then
+		jq ". + [$BINDING]" "$KEYBINDINGS_FILE" >"$KEYBINDINGS_FILE.tmp" &&
+			mv "$KEYBINDINGS_FILE.tmp" "$KEYBINDINGS_FILE"
+		echo "[setup-terminal] Merged binding into existing keybindings"
+	else
+		# Invalid JSON — overwrite
+		echo "[$BINDING]" | jq '.' >"$KEYBINDINGS_FILE"
+		echo "[setup-terminal] Replaced invalid keybindings file"
+	fi
+else
+	# No existing file — write fresh
+	cat >"$KEYBINDINGS_FILE" <<'EOF'
+[
+    {
+        "key": "shift+enter",
+        "command": "workbench.action.terminal.sendSequence",
+        "args": {
+            "text": "\u001b\r"
+        },
+        "when": "terminalFocus"
+    }
+]
+EOF
+	echo "[setup-terminal] Created keybindings file at $KEYBINDINGS_FILE"
+fi

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

@@ -3,7 +3,15 @@
 # Runs non-blocking in background by default via setup.sh
 # All failures are warnings — this script never blocks container startup
 
-echo "[update-claude] Checking for Claude Code updates..."
+# Log to file (simple append — process substitution breaks under disown)
+LOG_FILE="${TMPDIR:-/tmp}/claude-update.log"
+
+log() { echo "[update-claude] $(date '+%Y-%m-%d %H:%M:%S') $*" | tee -a "$LOG_FILE"; }
+
+log "Checking for Claude Code updates..."
+
+# === Clear nesting guard (postStartCommand may inherit from VS Code extension) ===
+unset CLAUDECODE
 
 # === TMPDIR ===
 _TMPDIR="${TMPDIR:-/tmp}"
@@ -11,124 +19,58 @@ _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
+	log "Another update is already running, skipping"
+	exit 0
 fi
 
 # === CLEANUP TRAP ===
 cleanup() {
-    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
+	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
 
 # === VERIFY CLAUDE IS INSTALLED ===
 if ! command -v claude &>/dev/null; then
-    echo "[update-claude] Claude Code not found, skipping update"
-    exit 0
+	log "Claude Code not found, skipping update"
+	exit 0
 fi
 
-# === DETECT INSTALL METHOD ===
-CLAUDE_PATH=$(command -v claude)
-if [[ "$CLAUDE_PATH" != "/usr/local/bin/claude" ]]; then
-    echo "[update-claude] Non-native install detected ($CLAUDE_PATH), skipping"
-    exit 0
-fi
-
-# === VALIDATE DEPENDENCIES ===
-for dep in curl jq sha256sum sudo; do
-    if ! command -v "$dep" &>/dev/null; then
-        echo "[update-claude] WARNING: $dep not available, skipping update"
-        exit 0
-    fi
-done
-
-# === GET CURRENT VERSION ===
-CURRENT_VERSION=$(claude --version 2>/dev/null | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | head -1 || echo "unknown")
-echo "[update-claude] Current version: ${CURRENT_VERSION}"
-
-# === FETCH LATEST VERSION ===
-BASE_URL="https://storage.googleapis.com/claude-code-dist-86c565f3-f756-42ad-8dfa-d59b1c096819/claude-code-releases"
-
-LATEST_VERSION=$(curl -fsSL "${BASE_URL}/stable" 2>/dev/null)
-if [ -z "$LATEST_VERSION" ]; then
-    echo "[update-claude] WARNING: Failed to fetch latest version, skipping"
-    exit 0
+# === ENSURE NATIVE BINARY EXISTS ===
+# 'claude install' puts the binary at ~/.local/bin/claude (symlink to ~/.local/share/claude/versions/*)
+# Legacy manual installs used /usr/local/bin/claude — check both, prefer ~/.local
+if [ -x "$HOME/.local/bin/claude" ]; then
+	NATIVE_BIN="$HOME/.local/bin/claude"
+elif [ -x "/usr/local/bin/claude" ]; then
+	NATIVE_BIN="/usr/local/bin/claude"
+else
+	NATIVE_BIN=""
 fi
-
-echo "[update-claude] Latest version: ${LATEST_VERSION}"
-
-# === COMPARE VERSIONS ===
-if [ "$CURRENT_VERSION" = "$LATEST_VERSION" ]; then
-    echo "[update-claude] Already up to date (${CURRENT_VERSION})"
-    exit 0
+if [ -z "$NATIVE_BIN" ]; then
+	log "Native binary not found, installing..."
+	if claude install 2>&1 | tee -a "$LOG_FILE"; then
+		log "Native binary installed successfully"
+	else
+		log "WARNING: 'claude install' failed, skipping"
+		exit 0
+	fi
+	# Skip update check on first install — next start will handle it
+	exit 0
 fi
 
-echo "[update-claude] Updating from ${CURRENT_VERSION} to ${LATEST_VERSION}..."
-
-# === DETECT PLATFORM ===
-ARCH=$(uname -m)
-case "${ARCH}" in
-    x86_64)
-        PLATFORM="linux-x64"
-        ;;
-    aarch64|arm64)
-        PLATFORM="linux-arm64"
-        ;;
-    *)
-        echo "[update-claude] WARNING: Unsupported architecture: ${ARCH}, skipping"
-        exit 0
-        ;;
-esac
-
-# Detect musl (Alpine Linux)
-if ldd --version 2>&1 | grep -qi musl; then
-    PLATFORM="${PLATFORM}-musl"
+# === CHECK FOR UPDATES ===
+CURRENT_VERSION=$("$NATIVE_BIN" --version 2>/dev/null | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | head -1 || echo "unknown")
+log "Current version: ${CURRENT_VERSION}"
+
+# Use the official update command (handles download, verification, and versioned install)
+if "$NATIVE_BIN" update 2>&1 | tee -a "$LOG_FILE"; then
+	UPDATED_VERSION=$("$NATIVE_BIN" --version 2>/dev/null | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | head -1 || echo "unknown")
+	if [ "$CURRENT_VERSION" != "$UPDATED_VERSION" ]; then
+		log "Updated Claude Code: ${CURRENT_VERSION} → ${UPDATED_VERSION}"
+	else
+		log "Already up to date (${CURRENT_VERSION})"
+	fi
+else
+	log "WARNING: 'claude update' failed, skipping"
 fi
-
-echo "[update-claude] Platform: ${PLATFORM}"
-
-# === DOWNLOAD MANIFEST ===
-MANIFEST_URL="${BASE_URL}/${LATEST_VERSION}/manifest.json"
-
-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" ${_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
-fi
-
-# === DOWNLOAD BINARY ===
-BINARY_URL="${BASE_URL}/${LATEST_VERSION}/${PLATFORM}/claude"
-
-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 ${_TMPDIR}/claude-update | cut -d' ' -f1)
-
-if [ "${ACTUAL_CHECKSUM}" != "${EXPECTED_CHECKSUM}" ]; then
-    echo "[update-claude] WARNING: Checksum verification failed, skipping"
-    echo "[update-claude]   Expected: ${EXPECTED_CHECKSUM}"
-    echo "[update-claude]   Actual:   ${ACTUAL_CHECKSUM}"
-    exit 0
-fi
-
-# === INSTALL (atomic replace) ===
-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
-
-# === VERIFY UPDATE ===
-INSTALLED_VERSION=$(claude --version 2>/dev/null | grep -oE '[0-9]+\.[0-9]+\.[0-9]+' | head -1 || echo "unknown")
-echo "[update-claude] Updated Claude Code: ${CURRENT_VERSION} → ${INSTALLED_VERSION}"

package/.devcontainer/scripts/setup.sh

@@ -21,8 +21,9 @@ fi
 : "${SETUP_PLUGINS:=true}"
 : "${SETUP_UPDATE_CLAUDE:=true}"
 : "${SETUP_PROJECTS:=true}"
+: "${SETUP_TERMINAL:=true}"
 
-export CLAUDE_CONFIG_DIR CONFIG_SOURCE_DIR SETUP_CONFIG SETUP_ALIASES SETUP_AUTH SETUP_PLUGINS SETUP_UPDATE_CLAUDE SETUP_PROJECTS
+export CLAUDE_CONFIG_DIR CONFIG_SOURCE_DIR SETUP_CONFIG SETUP_ALIASES SETUP_AUTH SETUP_PLUGINS SETUP_UPDATE_CLAUDE SETUP_PROJECTS SETUP_TERMINAL
 
 SETUP_START=$(date +%s)
 SETUP_RESULTS=()
@@ -64,22 +65,8 @@ 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-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 "  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 "  setup-update-claude... skipped (disabled)"
-    SETUP_RESULTS+=("setup-update-claude:disabled")
-fi
+run_script "$SCRIPT_DIR/setup-terminal.sh" "$SETUP_TERMINAL"
+run_script "$SCRIPT_DIR/setup-update-claude.sh" "$SETUP_UPDATE_CLAUDE"
 
 echo ""
 echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"

package/README.md

@@ -65,9 +65,9 @@ tree-sitter (JS/TS/Python), ast-grep, Pyright, TypeScript LSP
 
 tmux, agent-browser, claude-monitor, ccusage, ccburn, ccstatusline, ast-grep, tree-sitter, lsp-servers, biome, notify-hook, mcp-qdrant, mcp-reasoner, splitrail
 
-### Agents (17) & Skills (16)
+### Agents (17) & Skills (17)
 
-The `code-directive` plugin includes specialized agents (architect, explorer, test-writer, security-auditor, etc.) and domain-specific coding reference skills (fastapi, svelte5, docker, testing, etc.).
+The `code-directive` plugin includes 17 specialized agents (architect, explorer, test-writer, security-auditor, etc.) and 17 domain-specific coding reference skills (fastapi, svelte5, docker, testing, spec-refine, etc.).
 
 ## Quick Start
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "codeforge-dev",
-	"version": "1.9.0",
+	"version": "1.10.0",
 	"description": "Complete development container that sets up Claude Code with modular devcontainer features, modern dev tools, and persistent configurations. Drop it into any project and get a production-ready AI development environment in minutes.",
 	"main": "setup.js",
 	"bin": {