Skip to content

fix: move pre-existing .devcontainer aside instead of refusing to init #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ai-anant wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: move pre-existing .devcontainer aside instead of refusing to init #21

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 28 additions & 6 deletions lib/aidc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1465,18 +1465,40 @@ aidc::shell_escape() {
printf '%q' "$1"
}

# Move aside any pre-existing files/dirs that aidc manages so `init` can
# scaffold its own without clobbering user content. The user's originals are
# preserved (renamed, never deleted) and a restore hint is printed. Only the
# top-level directories aidc scaffolds wholesale can conflict here
# (.devcontainer/, .cursor/rules/00-core-logics.mdc); .ai-container/ can't,
# because a present project.env returns early above.
aidc::check_init_conflicts() {
local workspace="$1"
local project_env="$workspace/.ai-container/project.env"
if [[ -f "$project_env" ]]; then
return
fi

local path
for path in "${AIDC_MANAGED_PATHS[@]}"; do
if [[ -e "$workspace/$path" ]]; then
aidc::die "refusing to overwrite existing file: $workspace/$path"
fi
local top
for top in .devcontainer .cursor; do
local managed=0
local path
for path in "${AIDC_MANAGED_PATHS[@]}"; do
if [[ "$path" == "$top"/* && -e "$workspace/$path" ]]; then
managed=1
break
fi
done
[[ "$managed" -eq 1 ]] || continue

local backup="$workspace/$top.aidc-backup"
local n=1
while [[ -e "$backup" ]]; do
backup="$workspace/$top.aidc-backup.$n"
n=$((n + 1))
done
mv "$workspace/$top" "$backup"
aidc::warn "existing $top moved to $(basename "$backup") so aidc can scaffold its own"
aidc::warn "restore it later with: mv $(basename "$backup") $top"
done
}

Expand All @@ -1496,7 +1518,7 @@ aidc::ensure_local_git_excludes() {
touch "$exclude_file"

local pattern
for pattern in ".devcontainer/" ".ai-container/" ".cursor/rules/00-core-logics.mdc" "CLAUDE.md" "AGENTS.md"; do
for pattern in ".devcontainer/" ".devcontainer.aidc-backup*/" ".ai-container/" ".cursor/rules/00-core-logics.mdc" "CLAUDE.md" "AGENTS.md"; do
if ! grep -Fxq "$pattern" "$exclude_file"; then
printf '%s\n' "$pattern" >>"$exclude_file"
fi
Expand Down