codeforge-dev 1.8.0 → 1.10.0

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

@@ -4,117 +4,120 @@
 CONFIG_DIR="${CONFIG_SOURCE_DIR:?CONFIG_SOURCE_DIR not set}"
 MANIFEST="$CONFIG_DIR/file-manifest.json"
 
-log()  { echo "[setup-config] $*"; }
+log() { echo "[setup-config] $*"; }
 warn() { echo "[setup-config] WARNING: $*"; }
-err()  { echo "[setup-config] ERROR: $*" >&2; }
+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."
+	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)"
+	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
+	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
+	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"
+	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" ]
+	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" ]
 }
 
 # ── 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
+# Note: empty destFilename uses "__NONE__" sentinel because bash read collapses
+# consecutive tab delimiters, which shifts fields when destFilename is empty.
+jq -r '.[] | [.src, .dest, (.destFilename // "__NONE__"), (.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")
+		[ "$dest_filename" = "__NONE__" ] && dest_filename=""
+		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
 
 log "Configuration complete"

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