@alanbem/dclaude 0.0.3 → 0.0.5

package/README.md

@@ -151,16 +151,6 @@ dclaude chrome                    # Launch Chrome with DevTools
 dclaude                           # Claude can now interact with the browser
 ```
 
-### Config Mounting
-
-Mount your host configs for seamless tool integration:
-
-```bash
-DCLAUDE_MOUNT_CONFIGS=true dclaude
-```
-
-This mounts (read-only): `.docker/`, `.gitconfig`, `.config/gh/`, `.npmrc`
-
 ### System Context
 
 dclaude automatically tells Claude about its container environment so it can give better suggestions:
@@ -184,7 +174,6 @@ DCLAUDE_SYSTEM_CONTEXT=false dclaude
 | `DCLAUDE_TAG` | `latest` | Docker image tag |
 | `DCLAUDE_NETWORK` | `auto` | Network mode: `auto`, `host`, `bridge` |
 | `DCLAUDE_GIT_AUTH` | `auto` | SSH auth: `auto`, `agent-forwarding`, `key-mount`, `none` |
-| `DCLAUDE_MOUNT_CONFIGS` | `false` | Mount host config files |
 | `DCLAUDE_DEBUG` | `false` | Enable debug output |
 | `DCLAUDE_QUIET` | `false` | Suppress info messages |
 | `DCLAUDE_NO_UPDATE` | `false` | Skip image update check |

package/dclaude

@@ -14,7 +14,6 @@ readonly QUIET="${DCLAUDE_QUIET:-false}"
 readonly REMOVE_CONTAINER="${DCLAUDE_RM:-false}"
 # Docker socket will be detected dynamically unless overridden
 DOCKER_SOCKET="${DCLAUDE_DOCKER_SOCKET:-}"
-readonly MOUNT_CONFIGS="${DCLAUDE_MOUNT_CONFIGS:-false}"
 readonly GIT_AUTH_MODE="${DCLAUDE_GIT_AUTH:-auto}"  # auto, agent-forwarding, key-mount, none
 readonly ENABLE_SYSTEM_CONTEXT="${DCLAUDE_SYSTEM_CONTEXT:-true}"  # Inform Claude about dclaude environment
 
@@ -419,21 +418,19 @@ detect_network_capability() {
 
 # Create Docker volumes if they don't exist
 create_volumes() {
-    # Create essential volumes for persistence
-    local volumes=("${VOLUME_PREFIX}-claude" "${VOLUME_PREFIX}-config")
-
-    for volume in "${volumes[@]}"; do
-        if ! docker volume inspect "$volume" &> /dev/null; then
-            info "Creating volume: $volume"
-            if ! docker volume create "$volume" > /dev/null; then
-                error "Failed to create volume: $volume"
-                exit 1
-            fi
-            debug "Volume created successfully: $volume"
-        else
-            debug "Volume exists: $volume"
+    # Create essential volume for Claude CLI persistence
+    local volume="${VOLUME_PREFIX}-claude"
+
+    if ! docker volume inspect "$volume" &> /dev/null; then
+        info "Creating volume: $volume"
+        if ! docker volume create "$volume" > /dev/null; then
+            error "Failed to create volume: $volume"
+            exit 1
         fi
-    done
+        debug "Volume created successfully: $volume"
+    else
+        debug "Volume exists: $volume"
+    fi
 }
 
 # Pull or update the Docker image
@@ -736,14 +733,6 @@ handle_git_auth() {
     local docker_args=()
     local git_auth_mode="${GIT_AUTH_MODE}"
 
-    # If config mounting is enabled and git auth mode is auto, prefer key-mount for consistency
-    if [[ "$MOUNT_CONFIGS" == "true" ]] && [[ "$git_auth_mode" == "auto" ]]; then
-        if [[ -d "${HOME}/.ssh" ]] && [[ -r "${HOME}/.ssh" ]]; then
-            git_auth_mode="key-mount"
-            debug "Git auth: key-mount (DCLAUDE_MOUNT_CONFIGS=true prefers key mounting)"
-        fi
-    fi
-
     # Auto-detect best method if set to auto
     if [[ "$git_auth_mode" == "auto" ]]; then
         if [[ -n "${SSH_AUTH_SOCK:-}" ]] && [[ -S "${SSH_AUTH_SOCK}" ]]; then
@@ -827,112 +816,23 @@ handle_git_auth() {
     fi
 }
 
-# Mount configuration directories from host
-mount_host_configs() {
-    local docker_args=()
-    local mounted_count=0
-
-    if [[ "$MOUNT_CONFIGS" != "true" ]]; then
-        debug "Config mounting disabled (DCLAUDE_MOUNT_CONFIGS=$MOUNT_CONFIGS)"
-        return 0
-    fi
-
-    info "Mounting host configurations (read-only)"
-    debug "SSH authentication handled separately via DCLAUDE_GIT_AUTH"
-
-    # Docker configuration (docker-cli installed)
-    # Default to true when master switch is enabled
-    if [[ "${DCLAUDE_MOUNT_DOCKER:-true}" == "true" ]] && [[ -d "${HOME}/.docker" ]]; then
-        if [[ -r "${HOME}/.docker" ]]; then
-            docker_args+=(-v "${HOME}/.docker:/home/claude/.docker:ro")
-            debug "Mounting Docker config: ${HOME}/.docker"
-            ((mounted_count++))
-        else
-            warning "Docker config exists but is not readable: ${HOME}/.docker"
-        fi
-    elif [[ "${DCLAUDE_MOUNT_DOCKER:-true}" == "true" ]]; then
-        debug "Docker config not found: ${HOME}/.docker"
-    fi
-
-    # GitHub CLI configuration (github-cli installed)
-    # Default to true when master switch is enabled
-    if [[ "${DCLAUDE_MOUNT_GH:-true}" == "true" ]] && [[ -d "${HOME}/.config/gh" ]]; then
-        if [[ -r "${HOME}/.config/gh" ]]; then
-            docker_args+=(-v "${HOME}/.config/gh:/home/claude/.config/gh:ro")
-            debug "Mounting GitHub CLI config: ${HOME}/.config/gh"
-            ((mounted_count++))
-        else
-            warning "GitHub CLI config exists but is not readable: ${HOME}/.config/gh"
-        fi
-    elif [[ "${DCLAUDE_MOUNT_GH:-true}" == "true" ]]; then
-        debug "GitHub CLI config not found: ${HOME}/.config/gh"
-    fi
-
-    # Git configuration (git installed)
-    # Default to true when master switch is enabled
-    if [[ "${DCLAUDE_MOUNT_GIT:-true}" == "true" ]] && [[ -f "${HOME}/.gitconfig" ]]; then
-        if [[ -r "${HOME}/.gitconfig" ]]; then
-            docker_args+=(-v "${HOME}/.gitconfig:/home/claude/.gitconfig:ro")
-            debug "Mounting Git config: ${HOME}/.gitconfig"
-            ((mounted_count++))
-        else
-            warning "Git config exists but is not readable: ${HOME}/.gitconfig"
-        fi
-    elif [[ "${DCLAUDE_MOUNT_GIT:-true}" == "true" ]]; then
-        debug "Git config not found: ${HOME}/.gitconfig"
-    fi
-
-    # NPM configuration (npm installed)
-    # Default to true when master switch is enabled
-    if [[ "${DCLAUDE_MOUNT_NPM:-true}" == "true" ]] && [[ -f "${HOME}/.npmrc" ]]; then
-        if [[ -r "${HOME}/.npmrc" ]]; then
-            docker_args+=(-v "${HOME}/.npmrc:/home/claude/.npmrc:ro")
-            debug "Mounting NPM config: ${HOME}/.npmrc"
-            ((mounted_count++))
-        else
-            warning "NPM config exists but is not readable: ${HOME}/.npmrc"
-        fi
-    elif [[ "${DCLAUDE_MOUNT_NPM:-true}" == "true" ]]; then
-        debug "NPM config not found: ${HOME}/.npmrc"
-    fi
-
-    # Note: AWS CLI, gcloud, kubectl are NOT installed in the container
-    # These configs will not be mounted unless those tools are added to Dockerfile
-
-    # Security warning with details
-    if [[ $mounted_count -gt 0 ]]; then
-        warning "Mounted $mounted_count configuration directories (read-only)"
-        warning "Security: The following sensitive data is now accessible in the container:"
-        # SSH is now handled separately, don't warn here
-        if [[ "${DCLAUDE_MOUNT_DOCKER:-true}" == "true" ]] && [[ -d "${HOME}/.docker" ]] && [[ -r "${HOME}/.docker" ]]; then
-            warning "  - Docker registry authentication tokens"
-        fi
-        if [[ "${DCLAUDE_MOUNT_GH:-true}" == "true" ]] && [[ -d "${HOME}/.config/gh" ]] && [[ -r "${HOME}/.config/gh" ]]; then
-            warning "  - GitHub CLI authentication tokens"
-        fi
-        if [[ "${DCLAUDE_MOUNT_NPM:-true}" == "true" ]] && [[ -f "${HOME}/.npmrc" ]] && [[ -r "${HOME}/.npmrc" ]]; then
-            warning "  - NPM registry authentication tokens"
-        fi
-        warning "Only use in trusted environments!"
-    fi
-
-    # Print arguments separated by null characters for safe parsing (only if we have args)
-    if [[ ${#docker_args[@]} -gt 0 ]]; then
-        printf '%s\0' "${docker_args[@]}"
-    fi
-}
-
 # Detect TTY availability and return appropriate Docker flags
+# Detect TTY status early (before any subshells)
+# Must be done at script top-level since $() subshells don't inherit TTY
+STDIN_IS_TTY=false
+STDOUT_IS_TTY=false
+[[ -t 0 ]] && STDIN_IS_TTY=true
+[[ -t 1 ]] && STDOUT_IS_TTY=true
+
 detect_tty_flags() {
     local tty_flags=""
 
-    # Check if stdin is a TTY
-    if [[ -t 0 ]]; then
+    # Use pre-detected TTY status (can't detect inside subshell)
+    if [[ "$STDIN_IS_TTY" == "true" ]]; then
         tty_flags="-i"
     fi
 
-    # Check if stdout is a TTY
-    if [[ -t 1 ]]; then
+    if [[ "$STDOUT_IS_TTY" == "true" ]]; then
         tty_flags="${tty_flags} -t"
     fi
 
@@ -940,7 +840,7 @@ detect_tty_flags() {
     tty_flags=$(echo $tty_flags | xargs)
 
     if [[ "$DEBUG" == "true" ]]; then
-        debug "TTY detection: stdin=$(test -t 0 && echo yes || echo no), stdout=$(test -t 1 && echo yes || echo no)"
+        debug "TTY detection: stdin=$STDIN_IS_TTY, stdout=$STDOUT_IS_TTY"
         debug "TTY flags: ${tty_flags:-none}"
     fi
 
@@ -1054,10 +954,7 @@ main() {
     local resolved_git_auth="$GIT_AUTH_MODE"
     if [[ "$GIT_AUTH_MODE" == "auto" ]]; then
         # Same auto-detection logic as handle_git_auth()
-        if [[ "$MOUNT_CONFIGS" == "true" ]] && [[ -d "${HOME}/.ssh" ]] && [[ -r "${HOME}/.ssh" ]]; then
-            resolved_git_auth="key-mount"
-            debug "Git auth resolved: key-mount (DCLAUDE_MOUNT_CONFIGS=true)"
-        elif [[ -n "${SSH_AUTH_SOCK:-}" ]] && [[ -S "${SSH_AUTH_SOCK}" ]]; then
+        if [[ -n "${SSH_AUTH_SOCK:-}" ]] && [[ -S "${SSH_AUTH_SOCK}" ]]; then
             resolved_git_auth="agent-forwarding"
             debug "Git auth resolved: agent-forwarding (active agent detected)"
         elif [[ -d "${HOME}/.ssh" ]] && [[ -r "${HOME}/.ssh" ]]; then
@@ -1180,8 +1077,6 @@ main() {
         -v "${HOST_PATH}:${HOST_PATH}"
         # Mount persistent Claude configuration volume
         -v "${VOLUME_PREFIX}-claude:/home/claude/.claude"
-        # Mount persistent config volume (gh, etc.)
-        -v "${VOLUME_PREFIX}-config:/home/claude/.config"
         # Set working directory
         -w "${HOST_PATH}"
         # Network mode
@@ -1234,12 +1129,6 @@ main() {
         [[ -n "$ssh_arg" ]] && DOCKER_ARGS+=("$ssh_arg")
     done < <(handle_git_auth)
 
-    # Mount host configurations if enabled
-    # Use process substitution to preserve null bytes
-    while IFS= read -r -d '' config_arg; do
-        [[ -n "$config_arg" ]] && DOCKER_ARGS+=("$config_arg")
-    done < <(mount_host_configs)
-
     # Add any additional environment variables
     if [[ -n "${CLAUDE_MODEL:-}" ]]; then
         DOCKER_ARGS+=(-e "CLAUDE_MODEL=${CLAUDE_MODEL}")
@@ -1893,6 +1782,94 @@ cmd_rm() {
     exit 0
 }
 
+# Subcommand: configure git identity
+cmd_git() {
+    local container_name=$(get_container_name "$HOST_PATH")
+
+    # Check if container exists
+    if ! docker ps -a --format '{{.Names}}' | grep -q "^${container_name}$"; then
+        error "No container found for this directory"
+        info "Run 'dclaude' first to create a container"
+        exit 1
+    fi
+
+    # Check if container is running
+    local container_status=$(docker inspect --format='{{.State.Status}}' "$container_name" 2>/dev/null)
+    if [[ "$container_status" != "running" ]]; then
+        if [[ "$container_status" == "exited" ]]; then
+            info "Starting container: $container_name"
+            docker start "$container_name" >/dev/null
+            sleep 1
+        else
+            error "Container $container_name is in unexpected state: $container_status"
+            exit 1
+        fi
+    fi
+
+    # Check if git config already exists
+    local existing_name existing_email
+    existing_name=$(docker exec -u claude "$container_name" git config --global user.name 2>/dev/null || echo "")
+    existing_email=$(docker exec -u claude "$container_name" git config --global user.email 2>/dev/null || echo "")
+
+    echo ""
+    echo "Git Configuration"
+    echo "─────────────────"
+
+    if [[ -n "$existing_name" && -n "$existing_email" ]]; then
+        echo "Current config:"
+        echo "  Name:  $existing_name"
+        echo "  Email: $existing_email"
+        echo ""
+        read -p "Update? [y/N]: " update
+        if [[ "$update" != "y" && "$update" != "Y" ]]; then
+            exit 0
+        fi
+    fi
+
+    # Try to get from host
+    local host_name host_email
+    host_name=$(git config --global user.name 2>/dev/null || echo "")
+    host_email=$(git config --global user.email 2>/dev/null || echo "")
+
+    local name="" email=""
+
+    if [[ -n "$host_name" && -n "$host_email" ]]; then
+        echo "Found on host:"
+        echo "  Name:  $host_name"
+        echo "  Email: $host_email"
+        echo ""
+        read -p "Copy to container? [Y/n]: " copy
+        if [[ "$copy" != "n" && "$copy" != "N" ]]; then
+            name="$host_name"
+            email="$host_email"
+        fi
+    fi
+
+    # Prompt if not copying from host
+    if [[ -z "$name" ]]; then
+        if [[ -z "$host_name" && -z "$host_email" ]]; then
+            echo "No git config found on host."
+            echo ""
+        fi
+        read -p "Enter your name: " name
+        read -p "Enter your email: " email
+    fi
+
+    # Validate
+    if [[ -z "$name" || -z "$email" ]]; then
+        error "Name and email are required"
+        exit 1
+    fi
+
+    # Save to container
+    docker exec -u claude "$container_name" git config --global user.name "$name"
+    docker exec -u claude "$container_name" git config --global user.email "$email"
+
+    echo ""
+    success "Git config saved"
+    exit 0
+}
+
 # Initialize HOST_PATH once for all commands
 HOST_PATH=$(get_host_path)
 
@@ -1940,6 +1917,10 @@ if [[ $# -gt 0 ]]; then
             shift
             cmd_ssh "$@"
             ;;
+        git)
+            shift
+            cmd_git "$@"
+            ;;
         --help|-h|help)
             cat << 'EOF'
 dclaude - Dockerized Claude Code Launcher
@@ -1953,6 +1934,7 @@ Usage:
   dclaude stop                Stop container for current directory
   dclaude rm [-f]             Remove container for current directory
   dclaude ssh                 Start SSH server for remote access
+  dclaude git                 Configure git identity (name/email)
   dclaude chrome [options]    Launch Chrome with DevTools and MCP integration
   dclaude gh                  Authenticate GitHub CLI (runs gh auth login)
   dclaude exec [command]      Execute command in container (default: bash)
@@ -1963,7 +1945,6 @@ Environment Variables:
   DCLAUDE_TAG                Docker image tag (default: latest)
   DCLAUDE_RM                 Remove container on exit (default: false)
   DCLAUDE_DEBUG              Enable debug output (default: false)
-  DCLAUDE_MOUNT_CONFIGS      Mount host configs (default: false)
   DCLAUDE_GIT_AUTH           SSH auth for Git: auto, agent-forwarding, key-mount, none
   DCLAUDE_NETWORK            Network mode: auto, host, bridge
   DCLAUDE_DOCKER_SOCKET      Override Docker socket path
@@ -2006,7 +1987,7 @@ Examples:
   dclaude chrome --setup-only                   # Just create .mcp.json, don't launch
   DCLAUDE_CHROME_PROFILE=testing dclaude chrome # Use different profile
 
-  # Authenticate GitHub CLI (persists in dclaude-config volume)
+  # Authenticate GitHub CLI (persists until container is removed)
   dclaude gh
 
   # Open bash shell in running container

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alanbem/dclaude",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "description": "Dockerized Claude Code CLI launcher with MCP support",
   "main": "dclaude",
   "bin": {