Claude
parent
34d4136f2e
commit
94a66e1957
4 changed files with 171 additions and 34 deletions
|
|
@ -1,8 +1,10 @@
|
|||
#!/usr/bin/env bash
|
||||
# lib/claude-config.sh — Shared Claude config directory helpers (#641)
|
||||
# lib/claude-config.sh — Shared Claude config directory helpers (#641, #707)
|
||||
#
|
||||
# Provides setup_claude_config_dir() for creating/migrating CLAUDE_CONFIG_DIR
|
||||
# and _env_set_idempotent() for writing env vars to .env files.
|
||||
# Provides:
|
||||
# setup_claude_dir <dir> [<auto_yes>] — Create/migrate a Claude config directory
|
||||
# setup_claude_config_dir [auto_yes] — Wrapper for default CLAUDE_CONFIG_DIR
|
||||
# _env_set_idempotent() — Write env vars to .env files
|
||||
#
|
||||
# Requires: CLAUDE_CONFIG_DIR, CLAUDE_SHARED_DIR (set by lib/env.sh)
|
||||
|
||||
|
|
@ -21,24 +23,33 @@ _env_set_idempotent() {
|
|||
fi
|
||||
}
|
||||
|
||||
# Create the shared CLAUDE_CONFIG_DIR, optionally migrating ~/.claude.
|
||||
# Usage: setup_claude_config_dir [auto_yes]
|
||||
setup_claude_config_dir() {
|
||||
local auto_yes="${1:-false}"
|
||||
# Create a Claude config directory, optionally migrating ~/.claude.
|
||||
# This is the parameterized helper that handles any CLAUDE_CONFIG_DIR path.
|
||||
# Usage: setup_claude_dir <config_dir> [auto_yes]
|
||||
# setup_claude_dir /path/to/config [true]
|
||||
#
|
||||
# Parameters:
|
||||
# $1 - Path to the Claude config directory to create
|
||||
# $2 - Auto-confirm mode (true/false), defaults to false
|
||||
#
|
||||
# Returns: 0 on success, 1 on failure
|
||||
setup_claude_dir() {
|
||||
local config_dir="$1"
|
||||
local auto_yes="${2:-false}"
|
||||
local home_claude="${HOME}/.claude"
|
||||
|
||||
# Create the shared config directory (idempotent)
|
||||
install -d -m 0700 -o "$USER" "$CLAUDE_CONFIG_DIR"
|
||||
echo "Claude: ${CLAUDE_CONFIG_DIR} (ready)"
|
||||
# Create the config directory (idempotent)
|
||||
install -d -m 0700 -o "$USER" "$config_dir"
|
||||
echo "Claude: ${config_dir} (ready)"
|
||||
|
||||
# If ~/.claude is already a symlink to CLAUDE_CONFIG_DIR, nothing to do
|
||||
# If ~/.claude is already a symlink to config_dir, nothing to do
|
||||
if [ -L "$home_claude" ]; then
|
||||
local link_target
|
||||
link_target=$(readlink -f "$home_claude")
|
||||
local config_real
|
||||
config_real=$(readlink -f "$CLAUDE_CONFIG_DIR")
|
||||
config_real=$(readlink -f "$config_dir")
|
||||
if [ "$link_target" = "$config_real" ]; then
|
||||
echo "Claude: ${home_claude} -> ${CLAUDE_CONFIG_DIR} (symlink OK)"
|
||||
echo "Claude: ${home_claude} -> ${config_dir} (symlink OK)"
|
||||
return 0
|
||||
fi
|
||||
fi
|
||||
|
|
@ -54,25 +65,25 @@ setup_claude_config_dir() {
|
|||
fi
|
||||
fi
|
||||
|
||||
# Check CLAUDE_CONFIG_DIR contents
|
||||
if [ -n "$(ls -A "$CLAUDE_CONFIG_DIR" 2>/dev/null)" ]; then
|
||||
# Check config_dir contents
|
||||
if [ -n "$(ls -A "$config_dir" 2>/dev/null)" ]; then
|
||||
config_nonempty=true
|
||||
fi
|
||||
|
||||
# Case: both non-empty — abort, operator must reconcile
|
||||
if [ "$home_nonempty" = true ] && [ "$config_nonempty" = true ]; then
|
||||
echo "ERROR: both ${home_claude} and ${CLAUDE_CONFIG_DIR} exist and are non-empty" >&2
|
||||
echo "ERROR: both ${home_claude} and ${config_dir} exist and are non-empty" >&2
|
||||
echo " Reconcile manually: merge or remove one, then re-run disinto init" >&2
|
||||
return 1
|
||||
fi
|
||||
|
||||
# Case: ~/.claude exists and CLAUDE_CONFIG_DIR is empty — offer migration
|
||||
# Case: ~/.claude exists and config_dir is empty — offer migration
|
||||
if [ "$home_nonempty" = true ] && [ "$config_nonempty" = false ]; then
|
||||
local do_migrate=false
|
||||
if [ "$auto_yes" = true ]; then
|
||||
do_migrate=true
|
||||
elif [ -t 0 ]; then
|
||||
read -rp "Migrate ${home_claude} to ${CLAUDE_CONFIG_DIR}? [Y/n] " confirm
|
||||
read -rp "Migrate ${home_claude} to ${config_dir}? [Y/n] " confirm
|
||||
if [[ ! "$confirm" =~ ^[Nn] ]]; then
|
||||
do_migrate=true
|
||||
fi
|
||||
|
|
@ -83,11 +94,11 @@ setup_claude_config_dir() {
|
|||
fi
|
||||
|
||||
if [ "$do_migrate" = true ]; then
|
||||
# Move contents (not the dir itself) to preserve CLAUDE_CONFIG_DIR ownership
|
||||
cp -a "$home_claude/." "$CLAUDE_CONFIG_DIR/"
|
||||
# Move contents (not the dir itself) to preserve config_dir ownership
|
||||
cp -a "$home_claude/." "$config_dir/"
|
||||
rm -rf "$home_claude"
|
||||
ln -sfn "$CLAUDE_CONFIG_DIR" "$home_claude"
|
||||
echo "Claude: migrated ${home_claude} -> ${CLAUDE_CONFIG_DIR}"
|
||||
ln -sfn "$config_dir" "$home_claude"
|
||||
echo "Claude: migrated ${home_claude} -> ${config_dir}"
|
||||
return 0
|
||||
fi
|
||||
fi
|
||||
|
|
@ -97,7 +108,15 @@ setup_claude_config_dir() {
|
|||
rmdir "$home_claude" 2>/dev/null || true
|
||||
fi
|
||||
if [ ! -e "$home_claude" ]; then
|
||||
ln -sfn "$CLAUDE_CONFIG_DIR" "$home_claude"
|
||||
echo "Claude: ${home_claude} -> ${CLAUDE_CONFIG_DIR} (symlink created)"
|
||||
ln -sfn "$config_dir" "$home_claude"
|
||||
echo "Claude: ${home_claude} -> ${config_dir} (symlink created)"
|
||||
fi
|
||||
}
|
||||
|
||||
# Create the shared CLAUDE_CONFIG_DIR, optionally migrating ~/.claude.
|
||||
# Wrapper around setup_claude_dir for the default config directory.
|
||||
# Usage: setup_claude_config_dir [auto_yes]
|
||||
setup_claude_config_dir() {
|
||||
local auto_yes="${1:-false}"
|
||||
setup_claude_dir "$CLAUDE_CONFIG_DIR" "$auto_yes"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -473,9 +473,10 @@ services:
|
|||
- disinto-net
|
||||
command: ["echo", "staging slot — replace with project image"]
|
||||
|
||||
# Chat container — Claude chat UI backend (#705)
|
||||
# Chat container — Claude chat UI backend (#705, #707)
|
||||
# Internal service only; edge proxy routes to chat:8080
|
||||
# Sandbox hardened per #706 — no docker.sock, read-only rootfs, minimal caps
|
||||
# Separate identity mount (#707) to avoid OAuth refresh races with factory agents
|
||||
chat:
|
||||
build:
|
||||
context: ./docker/chat
|
||||
|
|
@ -495,8 +496,8 @@ services:
|
|||
volumes:
|
||||
# Mount claude binary from host (same as agents)
|
||||
- CLAUDE_BIN_PLACEHOLDER:/usr/local/bin/claude:ro
|
||||
# Throwaway named volume for chat config (isolated from host ~/.claude)
|
||||
- chat-config:/var/chat/config
|
||||
# Separate Claude identity mount for chat — isolated from factory agents (#707)
|
||||
- ${CHAT_CLAUDE_DIR:-${HOME}/.claude-chat}:/home/chat/.claude-chat
|
||||
environment:
|
||||
CHAT_HOST: "0.0.0.0"
|
||||
CHAT_PORT: "8080"
|
||||
|
|
@ -505,6 +506,9 @@ services:
|
|||
CHAT_OAUTH_CLIENT_SECRET: ${CHAT_OAUTH_CLIENT_SECRET:-}
|
||||
EDGE_TUNNEL_FQDN: ${EDGE_TUNNEL_FQDN:-}
|
||||
DISINTO_CHAT_ALLOWED_USERS: ${DISINTO_CHAT_ALLOWED_USERS:-}
|
||||
# Point Claude to separate identity directory (#707)
|
||||
CLAUDE_CONFIG_DIR: /home/chat/.claude-chat/config
|
||||
CLAUDE_CREDENTIALS_DIR: /home/chat/.claude-chat/config/credentials
|
||||
networks:
|
||||
- disinto-net
|
||||
|
||||
|
|
@ -514,7 +518,6 @@ volumes:
|
|||
agent-data:
|
||||
project-repos:
|
||||
caddy_data:
|
||||
chat-config:
|
||||
|
||||
networks:
|
||||
disinto-net:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue