mirror of
https://github.com/affaan-m/everything-claude-code.git
synced 2026-06-27 00:31:11 +08:00
e3f467989a
* fix(clv2): escape $HOME before pgrep -f in migrate-homunculus.sh pgrep -f treats its argument as an extended regular expression, but the running-observer guard interpolated $HOME unescaped. Paths containing regex metacharacters (e.g. /home/user.name, /home/c++dev, /home/user (work)) made the match over-broad or invalid, causing either a false negative (live observer missed, migration proceeds and risks registry corruption) or a false positive (migration blocked unnecessarily). Escape the ERE metacharacters in $HOME via sed before building the pattern so the home prefix is matched literally while the trailing .*observer-loop\.sh regex is preserved. Portable across BSD and GNU sed. Fixes #2301 * test(clv2): add regression test for migrate-homunculus.sh $HOME escaping Guards the #2301 fix: extracts the script's sed escaping command and asserts the resulting pgrep -f pattern matches the literal home path while no longer over-matching a regex-expanded decoy (HOME=/home/user.name must not match /home/userXname). Also pins that the guard uses escaped_home rather than $HOME directly. Follows the existing clv2 shell-test convention in tests/hooks/observe-entrypoint-allowlist.test.js. Refs #2301 * test(clv2): skip migrate-homunculus escaping test on Windows The test relies on POSIX bash/sed/grep -E semantics, which differ on the Windows CI runners. Guard with the same process.platform === 'win32' early exit used by tests/hooks/observe-subdirectory-detection.test.js so the bash-dependent assertions only run on POSIX platforms. Refs #2301
69 lines
2.2 KiB
Bash
Executable File
69 lines
2.2 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# One-shot migration from the legacy Claude config tree into the
|
|
# continuous-learning-v2 data directory.
|
|
set -euo pipefail
|
|
|
|
OLD="${HOME}/.claude/homunculus"
|
|
|
|
# shellcheck disable=SC1091
|
|
. "$(dirname "$0")/lib/homunculus-dir.sh"
|
|
NEW="$(_ecc_resolve_homunculus_dir)"
|
|
|
|
if [ "$NEW" = "$OLD" ]; then
|
|
echo "Resolved destination equals source ($OLD); nothing to migrate."
|
|
exit 0
|
|
fi
|
|
|
|
if [ ! -d "$OLD" ]; then
|
|
echo "Nothing to migrate (no $OLD)."
|
|
exit 0
|
|
fi
|
|
|
|
if command -v pgrep >/dev/null 2>&1; then
|
|
# pgrep -f treats its argument as an extended regular expression, so $HOME
|
|
# must be escaped before interpolation. Without this, regex metacharacters in
|
|
# the path (e.g. /home/user.name, /home/c++dev, /home/user (work)) would make
|
|
# the match over-broad or invalid, causing false negatives (observer missed,
|
|
# migration proceeds unsafely) or false positives (migration blocked).
|
|
escaped_home="$(printf '%s' "$HOME" | sed 's/[]\.[(){}+*?|^$]/\\&/g')"
|
|
if pgrep -f "${escaped_home}.*observer-loop\\.sh" >/dev/null 2>&1; then
|
|
echo "Refusing to migrate: observer-loop.sh is running." >&2
|
|
echo "Exit all Claude Code sessions, then re-run." >&2
|
|
exit 1
|
|
fi
|
|
else
|
|
echo "Warning: pgrep not available; skipping running-observer check." >&2
|
|
fi
|
|
|
|
mkdir -p "$(dirname "$NEW")"
|
|
|
|
if [ ! -d "$NEW" ]; then
|
|
mv "$OLD" "$NEW"
|
|
echo "Moved $OLD -> $NEW"
|
|
elif [ -z "$(ls -A "$NEW" 2>/dev/null || true)" ]; then
|
|
rmdir "$NEW"
|
|
mv "$OLD" "$NEW"
|
|
echo "Moved $OLD -> $NEW (replaced empty destination)"
|
|
else
|
|
old_count="$(find "$OLD" -type f 2>/dev/null | wc -l | tr -d ' ')"
|
|
new_count="$(find "$NEW" -type f 2>/dev/null | wc -l | tr -d ' ')"
|
|
echo "Refusing to migrate: both paths exist with content." >&2
|
|
echo " Old: $OLD ($old_count files)" >&2
|
|
echo " New: $NEW ($new_count files)" >&2
|
|
echo "Resolve manually, then re-run." >&2
|
|
exit 1
|
|
fi
|
|
|
|
settings="${HOME}/.claude/settings.json"
|
|
if [ -f "$settings" ] && grep -q '"CLV2_CONFIG"' "$settings" 2>/dev/null; then
|
|
if grep -q '\.claude/homunculus' "$settings" 2>/dev/null; then
|
|
cat >&2 <<WARN
|
|
|
|
Advisory: ~/.claude/settings.json still sets CLV2_CONFIG under the old path.
|
|
Update it to: ${NEW}/config.json
|
|
(Not editing settings.json automatically.)
|
|
|
|
WARN
|
|
fi
|
|
fi
|