codeforge-dev 1.9.0 → 1.11.0

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

@@ -1,117 +1,122 @@
 #!/bin/bash
 # Setup cc/claude/ccraw aliases for claude with local system prompt support
+#
+# Idempotent: removes the entire managed block then re-writes it fresh.
+# Safe to run on every container start via postStartCommand.
 
 CLAUDE_DIR="${CLAUDE_CONFIG_DIR:?CLAUDE_CONFIG_DIR not set}"
 
 echo "[setup-aliases] Configuring Claude aliases..."
 
-# Simple alias definitions (not functions — functions don't behave reliably across shell contexts)
-ALIAS_CC='alias cc='"'"'CLAUDE_CODE_ADDITIONAL_DIRECTORIES_CLAUDE_MD=1 command claude --system-prompt-file "$CLAUDE_CONFIG_DIR/system-prompt.md" --permission-mode plan --allow-dangerously-skip-permissions'"'"''
-ALIAS_CLAUDE='alias claude='"'"'CLAUDE_CODE_ADDITIONAL_DIRECTORIES_CLAUDE_MD=1 command claude --system-prompt-file "$CLAUDE_CONFIG_DIR/system-prompt.md" --permission-mode plan --allow-dangerously-skip-permissions'"'"''
-ALIAS_CCRAW='alias ccraw="command claude"'
+# Resolve check-setup path once (used inside the block we write)
+DEVCONTAINER_SCRIPTS="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+BLOCK_START='# === CodeForge Claude aliases START (managed by setup-aliases.sh — do not edit) ==='
+BLOCK_END='# === CodeForge Claude aliases END ==='
 
 for rc in ~/.bashrc ~/.zshrc; do
-    if [ -f "$rc" ]; then
-        # --- Backup before modifying ---
-        cp "$rc" "${rc}.bak.$(date +%s)" 2>/dev/null || true
-        # Clean old backups (keep last 3)
-        ls -t "${rc}.bak."* 2>/dev/null | tail -n +4 | xargs rm -f 2>/dev/null || true
-
-        # --- Cleanup old definitions ---
-
-        # Remove old cc alias
-        if grep -q "alias cc=" "$rc" 2>/dev/null; then
-            sed -i '/alias cc=/d' "$rc"
-            echo "[setup-aliases] Removed old cc alias from $(basename $rc)"
-        fi
-        # Remove old cc function (single-line or multi-line)
-        if grep -q "^cc()" "$rc" 2>/dev/null; then
-            sed -i '/^cc() {/,/^}/d' "$rc"
-            echo "[setup-aliases] Removed old cc function from $(basename $rc)"
-        fi
-        # Remove old _claude_with_config function
-        if grep -q "^_claude_with_config()" "$rc" 2>/dev/null; then
-            sed -i '/^_claude_with_config() {/,/^}/d' "$rc"
-            echo "[setup-aliases] Removed old _claude_with_config function from $(basename $rc)"
-        fi
-        # Remove old claude function override
-        if grep -q "^claude() {" "$rc" 2>/dev/null; then
-            sed -i '/^claude() { _claude_with_config/d' "$rc"
-            echo "[setup-aliases] Removed old claude function from $(basename $rc)"
-        fi
-        # Remove old claude alias
-        if grep -q "alias claude=" "$rc" 2>/dev/null; then
-            sed -i '/alias claude=/d' "$rc"
-        fi
-        # Remove old ccraw alias
-        if grep -q "alias ccraw=" "$rc" 2>/dev/null; then
-            sed -i '/alias ccraw=/d' "$rc"
-        fi
-        # Remove old specwright alias
-        if grep -q "alias specwright=" "$rc" 2>/dev/null; then
-            sed -i '/alias specwright=/d' "$rc"
-        fi
-        # Remove old cc-tools/check-setup functions
-        if grep -q "^cc-tools()" "$rc" 2>/dev/null; then
-            sed -i '/^cc-tools() {/,/^}/d' "$rc"
-        fi
-        if grep -q "alias check-setup=" "$rc" 2>/dev/null; then
-            sed -i '/alias check-setup=/d' "$rc"
-        fi
-
-        # --- Add environment and aliases (idempotent) ---
-        # Guard: skip if aliases already present from a previous run
-        if grep -q '# Claude Code environment and aliases' "$rc" 2>/dev/null; then
-            echo "[setup-aliases] Aliases already present in $(basename $rc), skipping"
-            continue
-        fi
-        echo "" >> "$rc"
-        echo "# Claude Code environment and aliases (managed by setup-aliases.sh)" >> "$rc"
-        # Export CLAUDE_CONFIG_DIR so it's available in all shells (not just VS Code remoteEnv)
-        if ! grep -q 'export CLAUDE_CONFIG_DIR=' "$rc" 2>/dev/null; then
-            echo "export CLAUDE_CONFIG_DIR=\"${CLAUDE_CONFIG_DIR}\"" >> "$rc"
-        fi
-        # Export UTF-8 locale so tmux renders Unicode correctly (docker exec doesn't inherit locale)
-        if ! grep -q 'export LANG=en_US.UTF-8' "$rc" 2>/dev/null; then
-            echo 'export LANG=en_US.UTF-8' >> "$rc"
-            echo 'export LC_ALL=en_US.UTF-8' >> "$rc"
-        fi
-        echo "$ALIAS_CC" >> "$rc"
-        echo "$ALIAS_CLAUDE" >> "$rc"
-        echo "$ALIAS_CCRAW" >> "$rc"
-
-        # cc-tools: list all available CodeForge tools with version info
-        cat >> "$rc" << 'CCTOOLS_EOF'
+	if [ -f "$rc" ]; then
+		# --- 1. Backup before modifying ---
+		cp "$rc" "${rc}.bak.$(date +%s)" 2>/dev/null || true
+		# Clean old backups (keep last 3)
+		ls -t "${rc}.bak."* 2>/dev/null | tail -n +4 | xargs rm -f 2>/dev/null || true
+
+		# --- 2. Remove existing managed block (if present) ---
+		sed -i '/# === CodeForge Claude aliases START/,/# === CodeForge Claude aliases END/d' "$rc"
+
+		# --- 3. Legacy cleanup (pre-marker formats only) ---
+		# These remove remnants from versions that predated the block-marker system.
+		# After step 2, anything matching these patterns is orphaned from old formats.
+
+		# Old function forms (pre-v1.10.0)
+		if grep -q "^cc()" "$rc" 2>/dev/null; then
+			sed -i '/^cc() {/,/^}/d' "$rc"
+			echo "[setup-aliases] Removed legacy cc() function from $(basename "$rc")"
+		fi
+		if grep -q "^_claude_with_config()" "$rc" 2>/dev/null; then
+			sed -i '/^_claude_with_config() {/,/^}/d' "$rc"
+			echo "[setup-aliases] Removed legacy _claude_with_config() function from $(basename "$rc")"
+		fi
+		if grep -q "^claude() { _claude_with_config" "$rc" 2>/dev/null; then
+			sed -i '/^claude() { _claude_with_config/d' "$rc"
+			echo "[setup-aliases] Removed legacy claude() function from $(basename "$rc")"
+		fi
+		if grep -q "alias specwright=" "$rc" 2>/dev/null; then
+			sed -i '/alias specwright=/d' "$rc"
+			echo "[setup-aliases] Removed legacy specwright alias from $(basename "$rc")"
+		fi
+
+		# Old alias/export form (v1.10.0 — no block markers)
+		sed -i '/# Claude Code environment and aliases/d' "$rc"
+		sed -i '/^export CLAUDE_CONFIG_DIR="/d' "$rc"
+		sed -i '/^export LANG=en_US\.UTF-8$/d' "$rc"
+		sed -i '/^export LC_ALL=en_US\.UTF-8$/d' "$rc"
+		# _CLAUDE_BIN if-block (4 patterns: if, elif, else, fi + assignments)
+		sed -i '/^if \[ -x "\$HOME\/\.local\/bin\/claude" \]/,/^fi$/d' "$rc"
+		sed -i '/^    _CLAUDE_BIN=/d' "$rc"
+		# Standalone aliases from old format
+		sed -i "/^alias cc='/d" "$rc"
+		sed -i "/^alias claude='/d" "$rc"
+		sed -i "/^alias ccraw='/d" "$rc"
+		sed -i "/^alias ccw='/d" "$rc"
+		sed -i '/^alias check-setup=/d' "$rc"
+		# cc-tools function from old format
+		if grep -q "^cc-tools()" "$rc" 2>/dev/null; then
+			sed -i '/^cc-tools() {/,/^}/d' "$rc"
+		fi
+
+		# --- 5. Write fresh managed block ---
+		cat >>"$rc" <<BLOCK_EOF
+
+${BLOCK_START}
+export CLAUDE_CONFIG_DIR="${CLAUDE_CONFIG_DIR}"
+export LANG=en_US.UTF-8
+export LC_ALL=en_US.UTF-8
+
+# Prefer native binary over npm-installed version
+if [ -x "\$HOME/.local/bin/claude" ]; then
+    _CLAUDE_BIN="\$HOME/.local/bin/claude"
+elif [ -x /usr/local/bin/claude ]; then
+    _CLAUDE_BIN=/usr/local/bin/claude
+else
+    _CLAUDE_BIN=claude
+fi
+
+alias cc='CLAUDE_CODE_ADDITIONAL_DIRECTORIES_CLAUDE_MD=1 command "\$_CLAUDE_BIN" --system-prompt-file "\$CLAUDE_CONFIG_DIR/main-system-prompt.md" --permission-mode plan --allow-dangerously-skip-permissions'
+alias claude='CLAUDE_CODE_ADDITIONAL_DIRECTORIES_CLAUDE_MD=1 command "\$_CLAUDE_BIN" --system-prompt-file "\$CLAUDE_CONFIG_DIR/main-system-prompt.md" --permission-mode plan --allow-dangerously-skip-permissions'
+alias ccraw='command "\$_CLAUDE_BIN"'
+alias ccw='CLAUDE_CODE_ADDITIONAL_DIRECTORIES_CLAUDE_MD=1 command "\$_CLAUDE_BIN" --system-prompt-file "\$CLAUDE_CONFIG_DIR/writing-system-prompt.md" --permission-mode plan --allow-dangerously-skip-permissions'
+
 cc-tools() {
   echo "CodeForge Available Tools"
   echo "━━━━━━━━━━━━━━━━━━━━━━━━"
   printf "  %-20s %s\n" "COMMAND" "STATUS"
   echo "  ────────────────────────────────────"
-  for cmd in claude cc ccraw ccusage ccburn claude-monitor \
-             ruff biome dprint shfmt shellcheck hadolint \
-             ast-grep tree-sitter pyright typescript-language-server \
+  for cmd in claude cc ccw ccraw ccusage ccburn claude-monitor \\
+             ccms cargo ruff biome dprint shfmt shellcheck hadolint \\
+             ast-grep tree-sitter pyright typescript-language-server \\
              agent-browser gh docker git jq tmux bun go; do
-    if command -v "$cmd" >/dev/null 2>&1; then
-      ver=$("$cmd" --version 2>/dev/null | head -1 || echo "installed")
-      printf "  %-20s ✓ %s\n" "$cmd" "$ver"
+    if command -v "\$cmd" >/dev/null 2>&1; then
+      ver=\$("\$cmd" --version 2>/dev/null | head -1 || echo "installed")
+      printf "  %-20s ✓ %s\n" "\$cmd" "\$ver"
     else
-      printf "  %-20s ✗ not found\n" "$cmd"
+      printf "  %-20s ✗ not found\n" "\$cmd"
     fi
   done
 }
-CCTOOLS_EOF
 
-        # check-setup: alias to the health check script
-        DEVCONTAINER_SCRIPTS="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-        echo "alias check-setup='bash ${DEVCONTAINER_SCRIPTS}/check-setup.sh'" >> "$rc"
+alias check-setup='bash ${DEVCONTAINER_SCRIPTS}/check-setup.sh'
+${BLOCK_END}
+BLOCK_EOF
 
-        echo "[setup-aliases] Added aliases to $(basename $rc)"
-    fi
+		echo "[setup-aliases] Added aliases to $(basename "$rc")"
+	fi
 done
 
 echo "[setup-aliases] Aliases configured:"
-echo "  cc          -> claude with \$CLAUDE_CONFIG_DIR/system-prompt.md"
-echo "  claude      -> claude with \$CLAUDE_CONFIG_DIR/system-prompt.md"
+echo "  cc          -> claude with \$CLAUDE_CONFIG_DIR/main-system-prompt.md"
+echo "  claude      -> claude with \$CLAUDE_CONFIG_DIR/main-system-prompt.md"
 echo "  ccraw       -> vanilla claude without any config"
+echo "  ccw         -> claude with \$CLAUDE_CONFIG_DIR/writing-system-prompt.md"
 echo "  cc-tools    -> list all available CodeForge tools"
 echo "  check-setup -> verify CodeForge setup health"

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