Compare commits
10 Commits
57d171a592
...
cff3ed880d
| Author | SHA1 | Date | |
|---|---|---|---|
| cff3ed880d | |||
| 08f23e857e | |||
| 986abf5101 | |||
| 7187aa6669 | |||
| c86110fbd6 | |||
| 76fb86f910 | |||
| 50c26736f1 | |||
| 71ef0f76f3 | |||
| 88061f310a | |||
| c6161c3332 |
44
home-configs/claude/hooks/switch-account-hook.sh
Executable file
44
home-configs/claude/hooks/switch-account-hook.sh
Executable file
@@ -0,0 +1,44 @@
|
||||
#!/usr/bin/env bash
|
||||
# UserPromptSubmit hook: перехватывает /switch-account без участия LLM
|
||||
|
||||
input=$(cat)
|
||||
prompt=$(echo "$input" | jq -r '.user_prompt // .prompt // empty' 2>/dev/null)
|
||||
|
||||
# Нормализуем: убираем пробелы и слэш в начале
|
||||
normalized=$(echo "$prompt" | sed 's|^[[:space:]]*/||; s|[[:space:]]*$||')
|
||||
|
||||
[ "$normalized" != "switch-account" ] && exit 0
|
||||
|
||||
# --- Переключаем аккаунт ---
|
||||
ACCOUNTS_DIR="$HOME/.claude/accounts"
|
||||
CREDS="$HOME/.claude/.credentials.json"
|
||||
CURRENT_FILE="$ACCOUNTS_DIR/current"
|
||||
|
||||
mkdir -p "$ACCOUNTS_DIR"
|
||||
|
||||
mapfile -t accounts < <(ls "$ACCOUNTS_DIR"/*.credentials.json 2>/dev/null \
|
||||
| xargs -I{} basename {} .credentials.json | sort)
|
||||
|
||||
if [ ${#accounts[@]} -eq 0 ]; then
|
||||
echo "Аккаунты не настроены. Создай ~/.claude/accounts/<name>.credentials.json для каждого аккаунта." >&2
|
||||
exit 2
|
||||
fi
|
||||
|
||||
current=$(cat "$CURRENT_FILE" 2>/dev/null || echo "")
|
||||
|
||||
# Найти следующий по кругу
|
||||
idx=-1
|
||||
for i in "${!accounts[@]}"; do
|
||||
[ "${accounts[$i]}" = "$current" ] && idx=$i && break
|
||||
done
|
||||
next_idx=$(( (idx + 1) % ${#accounts[@]} ))
|
||||
next="${accounts[$next_idx]}"
|
||||
|
||||
cp "$ACCOUNTS_DIR/${next}.credentials.json" "$CREDS"
|
||||
chmod 600 "$CREDS"
|
||||
echo "$next" > "$CURRENT_FILE"
|
||||
|
||||
echo "Аккаунт: ${current:-?} -> ${next} (всего: ${#accounts[@]})" >&2
|
||||
|
||||
|
||||
exit 2
|
||||
4
home-configs/claude/skills/switch-account/SKILL.md
Normal file
4
home-configs/claude/skills/switch-account/SKILL.md
Normal file
@@ -0,0 +1,4 @@
|
||||
---
|
||||
name: switch-account
|
||||
description: Switch to next Claude.ai account (handled by UserPromptSubmit hook, no LLM needed)
|
||||
---
|
||||
@@ -15,7 +15,19 @@ short_cwd="${cwd/#$HOME/\~}"
|
||||
printf "\033[00;37m%s\033[00m" "$short_cwd"
|
||||
|
||||
[ -n "$branch" ] && printf " \033[00;37m[%s]\033[00m" "$branch"
|
||||
[ -n "$model" ] && printf " \033[38;5;173m%s\033[00m" "$model"
|
||||
if [ -n "$model" ]; then
|
||||
effort=$(jq -r '.effortLevel // empty' ~/.claude/settings.json 2>/dev/null)
|
||||
account=$(cat ~/.claude/accounts/current 2>/dev/null)
|
||||
if [ -n "$effort" ] && [ -n "$account" ]; then
|
||||
printf " \033[38;5;173m%s [%s·%s]\033[00m" "$model" "$effort" "$account"
|
||||
elif [ -n "$effort" ]; then
|
||||
printf " \033[38;5;173m%s [%s]\033[00m" "$model" "$effort"
|
||||
elif [ -n "$account" ]; then
|
||||
printf " \033[38;5;173m%s [%s]\033[00m" "$model" "$account"
|
||||
else
|
||||
printf " \033[38;5;173m%s\033[00m" "$model"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Форматирует оставшееся время до сброса лимита
|
||||
fmt_remaining() {
|
||||
|
||||
@@ -633,11 +633,11 @@ EOF
|
||||
for skill_dir in "$SKILLS_SRC"/*; do
|
||||
[ -d "$skill_dir" ] || continue
|
||||
skill_name=$(basename "$skill_dir")
|
||||
|
||||
|
||||
# Деплой для Claude
|
||||
mkdir -p "$CLAUDE_SKILLS_DST/$skill_name"
|
||||
cp -r "$skill_dir/"* "$CLAUDE_SKILLS_DST/$skill_name/"
|
||||
|
||||
|
||||
# Деплой для Gemini (agy)
|
||||
mkdir -p "$GEMINI_SKILLS_DST/$skill_name"
|
||||
cp -r "$skill_dir/"* "$GEMINI_SKILLS_DST/$skill_name/"
|
||||
@@ -681,6 +681,41 @@ else
|
||||
warn "Файл $STATUSLINE_SRC не найден, пропускаю"
|
||||
fi
|
||||
|
||||
# ── 6.7.1. Хук switch-account ───────────────────────────────────
|
||||
info "Деплою хук switch-account..."
|
||||
SWITCH_HOOK_SRC="$SCRIPT_DIR/home-configs/claude/hooks/switch-account-hook.sh"
|
||||
SWITCH_HOOK_DST="$HOME/.claude/hooks/switch-account-hook.sh"
|
||||
mkdir -p "$HOME/.claude/hooks"
|
||||
if [ -f "$SWITCH_HOOK_SRC" ]; then
|
||||
cp "$SWITCH_HOOK_SRC" "$SWITCH_HOOK_DST"
|
||||
chmod +x "$SWITCH_HOOK_DST"
|
||||
# Прописываем хук в settings.json (идемпотентно)
|
||||
python3 - "$HOME/.claude/settings.json" "$SWITCH_HOOK_DST" <<'PYEOF'
|
||||
import sys, json, os
|
||||
settings_path, hook_path = sys.argv[1], sys.argv[2]
|
||||
data = {}
|
||||
if os.path.exists(settings_path):
|
||||
with open(settings_path) as f:
|
||||
try: data = json.load(f)
|
||||
except json.JSONDecodeError: pass
|
||||
data.setdefault("hooks", {}).setdefault("UserPromptSubmit", [{"hooks": []}])
|
||||
hook_cmd = f'bash "{hook_path}"'
|
||||
ups = data["hooks"]["UserPromptSubmit"]
|
||||
already = any(
|
||||
any(h.get("command", "") == hook_cmd for h in entry.get("hooks", []))
|
||||
for entry in ups
|
||||
)
|
||||
if not already:
|
||||
ups[0]["hooks"].append({"type": "command", "command": hook_cmd})
|
||||
with open(settings_path, "w") as f:
|
||||
json.dump(data, f, indent=2, ensure_ascii=False)
|
||||
f.write("\n")
|
||||
PYEOF
|
||||
success "Хук switch-account установлен"
|
||||
else
|
||||
warn "Файл $SWITCH_HOOK_SRC не найден, пропускаю"
|
||||
fi
|
||||
|
||||
# ── 6.8. Регистрация официального маркетплейса плагинов Claude ──
|
||||
info "Настраиваю маркетплейс плагинов Claude Code..."
|
||||
if ! command -v claude &>/dev/null; then
|
||||
|
||||
Reference in New Issue
Block a user