sanduary 1.0.4 → 1.1.0

package/.devcontainer/Dockerfile

@@ -20,10 +20,11 @@ RUN apt-get update && apt-get install -y \
 # 開発に便利なツール
 RUN apt-get update && apt-get install -y \
     git \
-    vim \
     jq \
-    zip \
     less \
+    lsof \
+    vim \
+    zip \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 

package/.devcontainer/devcontainer.base.json

@@ -5,7 +5,7 @@
   "workspaceMount": "",
   "updateRemoteUserUID": true,
   "initializeCommand": "echo 'PROJECT_ROOT='$(pwd) > .devcontainer/.env && echo 'PROJECT_NAME='$(basename $(pwd)) >> .devcontainer/.env && echo 'GIT_ORIGIN_URL='$(git remote get-url origin 2>/dev/null || echo '') >> .devcontainer/.env && [ -f ~/.claude-sandbox-credentials.json ] || echo '{}' > ~/.claude-sandbox-credentials.json && [ -f ~/.claude-sandbox.json ] || echo '{}' > ~/.claude-sandbox.json && [ -d ~/.claude/plugins ] || mkdir -p ~/.claude/plugins",
-  "postCreateCommand": "git init && git remote add origin \"${GIT_ORIGIN_URL:-/host-project}\" && git fetch && git checkout $(git -C /host-project branch --show-current) && echo 'alias claude=\"npx claude --dangerously-skip-permissions\"' >> ~/.bashrc",
+  "postCreateCommand": "git init && git remote add origin \"${GIT_ORIGIN_URL}\" && git fetch && git checkout $(git -C /host-project branch --show-current) && echo 'alias claude=\"npx claude --dangerously-skip-permissions\"' >> ~/.bashrc",
   "postStartCommand": "cp -rT /home/node/.claude-host-plugins /home/node/.claude/plugins 2>/dev/null || true; [ -f /home/node/.claude/plugins/known_marketplaces.json ] && sed -i 's|/Users/[^/]*/|/home/node/|g' /home/node/.claude/plugins/known_marketplaces.json; [ -f /home/node/.claude/plugins/installed_plugins.json ] && sed -i 's|/Users/[^/]*/|/home/node/|g' /home/node/.claude/plugins/installed_plugins.json; true",
   "shutdownAction": "stopCompose",
   "remoteUser": "node",

package/.devcontainer/docker-compose.yml

@@ -1,6 +1,5 @@
 services:
   devcontainer:
-    platform: linux/amd64
     build:
       context: .
       dockerfile: Dockerfile
@@ -14,7 +13,8 @@ services:
       - ${HOME}/.claude:/home/node/.claude
       - ${HOME}/.claude/plugins:/home/node/.claude-host-plugins:ro
       - /home/node/.claude/plugins
-      - ${HOME}/.claude-sandbox.json:/home/node/.claude.json
+      # .claude.jsonは共有しない（並列実行時の書き込み競合を回避）
+      # 各コンテナで独立して自動生成される
       - ${HOME}/.claude-sandbox-credentials.json:/home/node/.claude/.credentials.json
       - ${HOME}/.gitconfig:/home/node/.gitconfig
     working_dir: /workspaces/${PROJECT_NAME:-project}
@@ -25,4 +25,4 @@ services:
       GIT_CONFIG_COUNT: 1
       GIT_CONFIG_KEY_0: safe.directory
       GIT_CONFIG_VALUE_0: /workspaces/${PROJECT_NAME:-project}
-      GIT_ORIGIN_URL: ${GIT_ORIGIN_URL:-/host-project}
+      GIT_ORIGIN_URL: ${GIT_ORIGIN_URL}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sanduary",
-  "version": "1.0.4",
+  "version": "1.1.0",
   "description": "Development sandbox environment for AI agents - A secure sanctuary for running AI coding assistants in Docker DevContainers",
   "keywords": [
     "devcontainer",

package/scripts/sandbox.sh

@@ -6,83 +6,700 @@ SCRIPT_PATH="$(realpath "$0")"
 SCRIPT_DIR="$(dirname "$SCRIPT_PATH")"
 PACKAGE_ROOT="$(dirname "$SCRIPT_DIR")"
 
-COMMAND="${1:-run}"
+# ================================================
+# カラーコード（ターミナル出力用）
+# ================================================
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+NC='\033[0m' # No Color
 
-case "$COMMAND" in
-    init)
-        node "$SCRIPT_DIR/postinstall.js"
-        ;;
-    run)
-        # プロジェクトルートをgitから取得
-        PROJECT_ROOT="$(git rev-parse --show-toplevel)"
-        export PROJECT_ROOT
+# ================================================
+# ユーティリティ関数
+# ================================================
+
+# Dockerが起動しているか確認
+check_docker() {
+    local json_output="${1:-false}"
+    if ! command -v docker &> /dev/null; then
+        if [[ "$json_output" == true ]]; then
+            echo '{"error": "Docker is not installed"}'
+        else
+            echo -e "${RED}Error: Docker is not installed${NC}" >&2
+        fi
+        exit 1
+    fi
+
+    if ! docker info &> /dev/null; then
+        if [[ "$json_output" == true ]]; then
+            echo '{"error": "Docker is not running"}'
+        else
+            echo -e "${RED}Error: Docker is not running${NC}" >&2
+        fi
+        exit 1
+    fi
+}
+
+# 現在のプロジェクト名を取得
+get_current_project() {
+    if [[ -f "package.json" ]]; then
+        grep '"name"' package.json | head -1 | sed 's/.*"name"[[:space:]]*:[[:space:]]*"\([^"]*\)".*/\1/'
+    else
+        echo ""
+    fi
+}
+
+# devcontainer一覧を取得
+get_devcontainers() {
+    docker ps --format "{{.Names}}" | grep -E "devcontainer" || true
+}
+
+# コンテナ内のプロジェクト名を取得
+get_container_project() {
+    local container_name=$1
+    local project_name=""
+
+    # コンテナ内のpackage.jsonからプロジェクト名を取得
+    # 一般的なdevcontainerのワークスペースパスを試行
+    for workspace_path in "/workspaces" "/workspace" "/app" "/home"; do
+        project_name=$(docker exec "$container_name" bash -c "
+            for dir in ${workspace_path}/*/; do
+                if [[ -f \"\${dir}package.json\" ]]; then
+                    grep '\"name\"' \"\${dir}package.json\" 2>/dev/null | head -1 | sed 's/.*\"name\"[[:space:]]*:[[:space:]]*\"\([^\"]*\)\".*/\1/'
+                    break
+                fi
+            done
+        " 2>/dev/null || true)
+
+        if [[ -n "$project_name" ]]; then
+            echo "$project_name"
+            return
+        fi
+    done
+
+    # ルートディレクトリのpackage.jsonも確認
+    project_name=$(docker exec "$container_name" bash -c "
+        if [[ -f /package.json ]]; then
+            grep '\"name\"' /package.json 2>/dev/null | head -1 | sed 's/.*\"name\"[[:space:]]*:[[:space:]]*\"\([^\"]*\)\".*/\1/'
+        fi
+    " 2>/dev/null || true)
+
+    echo "${project_name:-unknown}"
+}
+
+# サブモジュール一覧を取得
+get_submodules() {
+    if [[ -f ".gitmodules" ]]; then
+        grep 'path = ' .gitmodules | sed 's/.*path = //'
+    fi
+}
+
+# コンテナが空きかどうか判定（Claude Codeワンライナー実行中かどうか）
+is_container_available() {
+    local container_name=$1
+
+    # pgrep -af claude | grep -E " -p( |$)" でワンライナー実行中かどうか確認
+    # 結果があれば使用中（false）、なければ空き（true）
+    local result
+    result=$(docker exec "$container_name" bash -c 'pgrep -af claude 2>/dev/null | grep -E " -p( |$)"' 2>/dev/null || true)
+
+    if [[ -z "$result" ]]; then
+        echo "true"
+    else
+        echo "false"
+    fi
+}
+
+# ================================================
+# containers サブコマンド用関数
+# ================================================
+
+# テーブル形式で出力
+output_table() {
+    local current_project=$1
+    shift
+    local containers=("$@")
+    local matched_count=0
+    local available_count=0
+
+    echo ""
+    echo "## 検出されたコンテナ"
+    echo ""
+    echo "| コンテナ名 | プロジェクト | 状態 | 空き |"
+    echo "|-----------|-------------|------|-----|"
+
+    for container in "${containers[@]}"; do
+        local project
+        project=$(get_container_project "$container")
+
+        local matched_status
+        local available_status
+        local is_matched=false
+
+        # マッチ判定
+        if [[ "$project" == "$current_project" ]]; then
+            matched_status="✅ マッチ"
+            is_matched=true
+            ((matched_count++))
+        else
+            matched_status="❌ 別プロジェクト"
+        fi
+
+        # 空き判定（マッチしたコンテナのみ）
+        if [[ "$is_matched" == true ]]; then
+            if [[ $(is_container_available "$container") == "true" ]]; then
+                available_status="✅ 空き"
+                ((available_count++))
+            else
+                available_status="❌ 使用中"
+            fi
+        else
+            available_status="-"
+        fi
+
+        echo "| $container | $project | $matched_status | $available_status |"
+    done
+
+    echo ""
+    echo "マッチしたコンテナ: ${matched_count}個"
+    echo "空きコンテナ: ${available_count}個"
+}
+
+# JSON形式で出力
+output_json() {
+    local current_project=$1
+    shift
+    local containers=("$@")
+    local matched_count=0
+    local available_count=0
+    local json_containers=""
+    local first=true
+
+    for container in "${containers[@]}"; do
+        local project
+        project=$(get_container_project "$container")
+
+        local matched=false
+        local available=false
+
+        # マッチ判定
+        if [[ "$project" == "$current_project" ]]; then
+            matched=true
+            ((matched_count++))
+
+            # 空き判定（マッチしたコンテナのみ）
+            if [[ $(is_container_available "$container") == "true" ]]; then
+                available=true
+                ((available_count++))
+            fi
+        fi
+
+        # JSON配列要素を構築
+        if [[ "$first" == true ]]; then
+            first=false
+        else
+            json_containers+=","
+        fi
+
+        json_containers+="
+    {
+      \"name\": \"$container\",
+      \"project\": \"$project\",
+      \"matched\": $matched,
+      \"available\": $available
+    }"
+    done
+
+    cat << EOF
+{
+  "currentProject": "$current_project",
+  "containers": [$json_containers
+  ],
+  "matchedCount": $matched_count,
+  "availableCount": $available_count
+}
+EOF
+}
+
+# containers コマンドのメイン処理
+cmd_containers() {
+    local json_output=false
+
+    # 引数解析
+    while [[ $# -gt 0 ]]; do
+        case $1 in
+            --json)
+                json_output=true
+                shift
+                ;;
+            *)
+                echo "Unknown option: $1" >&2
+                exit 1
+                ;;
+        esac
+    done
+
+    # Dockerの起動確認
+    check_docker "$json_output"
+
+    # 現在のプロジェクト名を取得
+    local current_project
+    current_project=$(get_current_project)
+
+    if [[ -z "$current_project" ]]; then
+        if [[ "$json_output" == true ]]; then
+            echo '{"error": "Could not determine current project (package.json not found)"}'
+        else
+            echo -e "${YELLOW}Warning: Could not determine current project (package.json not found)${NC}" >&2
+        fi
+        exit 1
+    fi
+
+    # devcontainer一覧を取得
+    local containers_raw
+    containers_raw=$(get_devcontainers)
+
+    if [[ -z "$containers_raw" ]]; then
+        if [[ "$json_output" == true ]]; then
+            echo "{\"currentProject\": \"$current_project\", \"containers\": [], \"matchedCount\": 0, \"availableCount\": 0}"
+        else
+            echo ""
+            echo "## 検出されたコンテナ"
+            echo ""
+            echo "devcontainerが見つかりませんでした。"
+        fi
+        exit 0
+    fi
+
+    # 配列に変換
+    local containers=()
+    while IFS= read -r line; do
+        containers+=("$line")
+    done <<< "$containers_raw"
+
+    # 出力
+    if [[ "$json_output" == true ]]; then
+        output_json "$current_project" "${containers[@]}"
+    else
+        output_table "$current_project" "${containers[@]}"
+    fi
+}
+
+# ================================================
+# sync-submodules サブコマンド用関数
+# ================================================
+
+# サブモジュールをコンテナに同期
+sync_submodules_to_container() {
+    local container_name=$1
+    local submodules
+    submodules=$(get_submodules)
+
+    if [[ -z "$submodules" ]]; then
+        echo "サブモジュールが見つかりません。"
+        return 0
+    fi
+
+    echo "## サブモジュール同期"
+    echo ""
+    echo "対象コンテナ: $container_name"
+    echo ""
+
+    # コンテナ内のワークスペースパスを検出
+    local workspace_path
+    workspace_path=$(docker exec "$container_name" bash -c '
+        for dir in /workspaces/*/; do
+            if [[ -f "${dir}package.json" ]]; then
+                echo "${dir%/}"
+                break
+            fi
+        done
+    ' 2>/dev/null)
+
+    if [[ -z "$workspace_path" ]]; then
+        echo -e "${RED}Error: コンテナ内のワークスペースが見つかりません${NC}" >&2
+        return 1
+    fi
+
+    echo "ワークスペースパス: $workspace_path"
+    echo ""
+
+    while IFS= read -r submodule_path; do
+        [[ -z "$submodule_path" ]] && continue
 
-        DEVCONTAINER_DIR="$PROJECT_ROOT/.devcontainer"
-        DEVCONTAINER_JSON="$PROJECT_ROOT/.devcontainer/devcontainer.json"
+        echo "### $submodule_path"
 
-        # ランダムなプロジェクト名を生成（sandbox-XXXX形式）
-        PROJECT_NAME="sandbox-$(head -c 4 /dev/urandom | xxd -p)"
-        export PROJECT_NAME
+        # サブモジュールディレクトリのコピー
+        if [[ -d "$submodule_path" ]]; then
+            local parent_dir
+            parent_dir=$(dirname "$submodule_path")
 
-        cd "$DEVCONTAINER_DIR"
+            echo "  - ディレクトリをコピー中..."
+            docker exec "$container_name" rm -rf "${workspace_path}/${submodule_path}" 2>/dev/null || true
+            docker cp "$submodule_path" "${container_name}:${workspace_path}/${parent_dir}/"
 
-        # devcontainer.jsonからinitializeCommandを読み取って実行（ホスト側で実行）
-        INITIALIZE_CMD=$(jq -r '.initializeCommand // empty' "$DEVCONTAINER_JSON")
-        if [ -n "$INITIALIZE_CMD" ]; then
-            echo "Running initializeCommand..."
-            eval "$INITIALIZE_CMD"
+            # node_modulesを削除し、所有権をnodeユーザーに変更
+            docker exec -u root "$container_name" rm -rf "${workspace_path}/${submodule_path}/node_modules" 2>/dev/null || true
+            docker exec -u root "$container_name" chown -R node:node "${workspace_path}/${submodule_path}" 2>/dev/null || true
+
+            if [[ $? -eq 0 ]]; then
+                echo -e "    ${GREEN}OK $submodule_path コピー完了${NC}"
+            else
+                echo -e "    ${RED}NG $submodule_path コピー失敗${NC}"
+            fi
+        else
+            echo -e "    ${YELLOW}WARN $submodule_path が存在しません${NC}"
         fi
 
-        # 終了時のcleanup関数
+        # .git/modules/下のgit情報のコピー
+        local git_modules_path=".git/modules/${submodule_path}"
+        if [[ -d "$git_modules_path" ]]; then
+            echo "  - Git modules をコピー中..."
+
+            # コンテナ内のディレクトリを作成
+            local container_git_modules_parent
+            container_git_modules_parent=$(dirname "${workspace_path}/.git/modules/${submodule_path}")
+            docker exec "$container_name" mkdir -p "$container_git_modules_parent" 2>/dev/null
+
+            docker exec "$container_name" rm -rf "${workspace_path}/.git/modules/${submodule_path}" 2>/dev/null || true
+            docker cp "$git_modules_path" "${container_name}:${container_git_modules_parent}/"
+
+            if [[ $? -eq 0 ]]; then
+                echo -e "    ${GREEN}OK .git/modules/${submodule_path} コピー完了${NC}"
+            else
+                echo -e "    ${RED}NG .git/modules/${submodule_path} コピー失敗${NC}"
+            fi
+        else
+            echo -e "    ${YELLOW}WARN .git/modules/${submodule_path} が存在しません${NC}"
+        fi
+
+        echo ""
+    done <<< "$submodules"
+
+    echo "サブモジュール同期が完了しました。"
+}
+
+# sync-submodules コマンドのメイン処理
+cmd_sync_submodules() {
+    local target_container=""
+
+    # 引数解析
+    if [[ $# -eq 0 ]]; then
+        echo -e "${RED}Error: コンテナ名が指定されていません${NC}" >&2
+        echo "Usage: $(basename "$0") sync-submodules <container>" >&2
+        exit 1
+    fi
+
+    target_container="$1"
+
+    # Dockerの起動確認
+    check_docker false
+
+    # コンテナの存在確認
+    if ! docker ps --format "{{.Names}}" | grep -q "^${target_container}$"; then
+        echo -e "${RED}Error: コンテナ '$target_container' が見つかりません${NC}" >&2
+        exit 1
+    fi
+
+    sync_submodules_to_container "$target_container"
+}
+
+# ================================================
+# exec サブコマンド用関数
+# ================================================
+
+cmd_exec() {
+    # containers --json で情報を取得
+    local json_output
+    json_output=$(cmd_containers --json 2>/dev/null)
+
+    if [ $? -ne 0 ]; then
+        echo "Error: Failed to get container information" >&2
+        exit 1
+    fi
+
+    # エラーチェック
+    if echo "$json_output" | grep -q '"error"'; then
+        local error_msg
+        error_msg=$(echo "$json_output" | grep -o '"error"[[:space:]]*:[[:space:]]*"[^"]*"' | sed 's/"error"[[:space:]]*:[[:space:]]*"\([^"]*\)"/\1/')
+        echo "Error: $error_msg" >&2
+        exit 1
+    fi
+
+    # matched: true かつ available: true のコンテナをフィルタ
+    local available_containers
+    available_containers=$(echo "$json_output" | jq -r '.containers[] | select(.matched == true and .available == true) | .name')
+
+    # 空行を除いてカウント
+    local container_count
+    if [ -z "$available_containers" ]; then
+        container_count=0
+    else
+        container_count=$(echo "$available_containers" | wc -l | tr -d ' ')
+    fi
+
+    local selected_container
+    if [ "$container_count" -eq 0 ]; then
+        echo "Error: No available containers found for this project" >&2
+        echo "Please start a container first with: $(basename "$0") run" >&2
+        exit 1
+    elif [ "$container_count" -eq 1 ]; then
+        # 1つなら自動選択
+        selected_container="$available_containers"
+    else
+        # 複数ならselectメニューで選択
+        echo "Multiple containers available. Please select one:"
+        select selected_container in $available_containers; do
+            if [ -n "$selected_container" ]; then
+                break
+            fi
+        done
+    fi
+
+    # ワークスペースディレクトリを自動検出
+    local workspace_dir
+    workspace_dir=$(docker exec "$selected_container" bash -c 'ls -d /workspaces/*/ 2>/dev/null | head -1 | sed "s/\/$//"' 2>/dev/null || echo "")
+
+    if [ -z "$workspace_dir" ]; then
+        echo "Warning: Could not detect workspace directory, using root" >&2
+        workspace_dir="/"
+    fi
+
+    # 引数がなければエラー
+    if [ $# -eq 0 ]; then
+        echo "Error: No command specified" >&2
+        echo "Usage: $(basename "$0") exec <command>..." >&2
+        exit 1
+    fi
+
+    # コンテナ内でコマンドを実行
+    docker exec -it -w "$workspace_dir" "$selected_container" "$@"
+}
+
+# ================================================
+# run サブコマンド用関数
+# ================================================
+
+cmd_run() {
+    # オプション解析
+    local detach_mode=false
+    while [ $# -gt 0 ]; do
+        case "$1" in
+            -d|--detach)
+                detach_mode=true
+                shift
+                ;;
+            *)
+                echo "Unknown option: $1" >&2
+                exit 1
+                ;;
+        esac
+    done
+
+    # プロジェクトルートをgitから取得
+    PROJECT_ROOT="$(git rev-parse --show-toplevel)"
+    export PROJECT_ROOT
+
+    DEVCONTAINER_DIR="$PROJECT_ROOT/.devcontainer"
+    DEVCONTAINER_JSON="$PROJECT_ROOT/.devcontainer/devcontainer.json"
+
+    # ランダムなプロジェクト名を生成（sandbox-XXXX形式）
+    PROJECT_NAME="sandbox-$(head -c 4 /dev/urandom | xxd -p)"
+    export PROJECT_NAME
+
+    # devcontainer.jsonからinitializeCommandを読み取って実行（ホスト側で実行）
+    INITIALIZE_CMD=$(jq -r '.initializeCommand // empty' "$DEVCONTAINER_JSON")
+    if [ -n "$INITIALIZE_CMD" ]; then
+        echo "Running initializeCommand..."
+        eval "$INITIALIZE_CMD"
+    fi
+
+    # 終了時のcleanup関数（detachモードでは設定しない）
+    if [ "$detach_mode" = false ]; then
         cleanup() {
             echo ""
             echo "Stopping Dev Container..."
-            docker compose -p "$PROJECT_NAME" down -v --remove-orphans 2>/dev/null || true
+            docker compose -f "$DEVCONTAINER_DIR/docker-compose.yml" -p "$PROJECT_NAME" down -v --remove-orphans 2>/dev/null || true
         }
-
-        # 終了時に必ずcleanupを実行
         trap cleanup EXIT
+    fi
+
+    echo "Starting Dev Container (project: $PROJECT_NAME)..."
+    docker compose -f "$DEVCONTAINER_DIR/docker-compose.yml" -p "$PROJECT_NAME" up -d
 
-        echo "Starting Dev Container (project: $PROJECT_NAME)..."
-        docker compose -p "$PROJECT_NAME" up -d
+    # コンテナが起動するまで待機
+    echo "Waiting for container to be ready..."
+    sleep 5
 
-        # コンテナが起動するまで待機
-        echo "Waiting for container to be ready..."
-        sleep 5
+    # コンテナIDを取得
+    CONTAINER_ID=$(docker compose -f "$DEVCONTAINER_DIR/docker-compose.yml" -p "$PROJECT_NAME" ps -q devcontainer)
 
-        # コンテナIDを取得
-        CONTAINER_ID=$(docker compose -p "$PROJECT_NAME" ps -q devcontainer)
+    # devcontainer.jsonからコマンドを読み取って実行
+    POST_CREATE_CMD=$(jq -r '.postCreateCommand // empty' "$DEVCONTAINER_JSON")
+    POST_START_CMD=$(jq -r '.postStartCommand // empty' "$DEVCONTAINER_JSON")
 
-        # devcontainer.jsonからコマンドを読み取って実行
-        POST_CREATE_CMD=$(jq -r '.postCreateCommand // empty' "$DEVCONTAINER_JSON")
-        POST_START_CMD=$(jq -r '.postStartCommand // empty' "$DEVCONTAINER_JSON")
+    # ワークディレクトリを設定
+    WORKSPACE_DIR="/workspaces/$PROJECT_NAME"
 
-        # ワークディレクトリを設定
-        WORKSPACE_DIR="/workspaces/$PROJECT_NAME"
+    if [ -n "$POST_CREATE_CMD" ]; then
+        # postCreateCommandを && で分割し、git checkoutまでとそれ以降に分ける
+        GIT_CMDS=""
+        OTHER_CMDS=""
+        checkout_found=false
+
+        # && で分割して処理
+        IFS='&' read -ra PARTS <<< "$POST_CREATE_CMD"
+        for part in "${PARTS[@]}"; do
+            # 空や&のみの部分をスキップ
+            cmd=$(echo "$part" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')
+            [[ -z "$cmd" ]] && continue
+
+            if [[ "$checkout_found" == false ]]; then
+                # git checkoutが見つかるまではGIT_CMDSに追加
+                if [[ -n "$GIT_CMDS" ]]; then
+                    GIT_CMDS="$GIT_CMDS && $cmd"
+                else
+                    GIT_CMDS="$cmd"
+                fi
+                # git checkoutを含むコマンドを見つけたらフラグを立てる
+                if [[ "$cmd" == *"git checkout"* ]]; then
+                    checkout_found=true
+                fi
+            else
+                # git checkout以降はOTHER_CMDSに追加
+                if [[ -n "$OTHER_CMDS" ]]; then
+                    OTHER_CMDS="$OTHER_CMDS && $cmd"
+                else
+                    OTHER_CMDS="$cmd"
+                fi
+            fi
+        done
+
+        # 1. Git系コマンドを実行（git checkoutまで）
+        if [[ -n "$GIT_CMDS" ]]; then
+            echo "Running postCreateCommand (git setup)..."
+            docker exec -w "$WORKSPACE_DIR" -e GIT_ORIGIN_URL=/host-project "$CONTAINER_ID" bash -c "$GIT_CMDS"
+        fi
 
-        if [ -n "$POST_CREATE_CMD" ]; then
-            echo "Running postCreateCommand..."
-            # sandbox.sh経由の場合はGIT_ORIGIN_URLを/host-projectに設定
-            docker exec -w "$WORKSPACE_DIR" -e GIT_ORIGIN_URL=/host-project "$CONTAINER_ID" bash -c "$POST_CREATE_CMD"
+        # 2. サブモジュールをホストからコンテナに同期
+        if [[ -f "$PROJECT_ROOT/.gitmodules" ]]; then
+            echo "Syncing submodules from host..."
+            sync_submodules_to_container "$CONTAINER_ID"
         fi
 
-        if [ -n "$POST_START_CMD" ]; then
-            echo "Running postStartCommand..."
-            docker exec -w "$WORKSPACE_DIR" "$CONTAINER_ID" bash -c "$POST_START_CMD"
+        # 3. 残りのコマンドを実行（npm ci等）
+        if [[ -n "$OTHER_CMDS" ]]; then
+            # Sandbox環境ではgit submodule updateは不要（sync_submodules_to_containerで代替）
+            # git submodule updateコマンドを除外し、残った && を整理
+            OTHER_CMDS=$(echo "$OTHER_CMDS" | sed 's/git submodule update[^&;]*//g' | sed 's/&& &&/\&\&/g' | sed 's/^[[:space:]]*&&[[:space:]]*//;s/[[:space:]]*&&[[:space:]]*$//')
+            echo "Running postCreateCommand (setup)..."
+            docker exec -w "$WORKSPACE_DIR" -e GIT_ORIGIN_URL=/host-project "$CONTAINER_ID" bash -c "$OTHER_CMDS"
         fi
+    else
+        # postCreateCommandがない場合もサブモジュール同期は実行
+        if [[ -f "$PROJECT_ROOT/.gitmodules" ]]; then
+            echo "Syncing submodules from host..."
+            sync_submodules_to_container "$CONTAINER_ID"
+        fi
+    fi
+
+    if [ -n "$POST_START_CMD" ]; then
+        echo "Running postStartCommand..."
+        docker exec -w "$WORKSPACE_DIR" "$CONTAINER_ID" bash -c "$POST_START_CMD"
+    fi
+
+    # detachモードの場合はコンテナ情報を表示して終了
+    if [ "$detach_mode" = true ]; then
+        CONTAINER_NAME=$(docker compose -f "$DEVCONTAINER_DIR/docker-compose.yml" -p "$PROJECT_NAME" ps --format '{{.Names}}' devcontainer)
+        echo ""
+        echo "Container started in detach mode."
+        echo "  Container: $CONTAINER_NAME"
+        echo "  Workspace: $WORKSPACE_DIR"
+        echo ""
+        echo "To connect: $(basename "$0") exec bash"
+        echo "To stop:    docker compose -p $PROJECT_NAME down -v"
+        exit 0
+    fi
+
+    # ランダムな色コードを生成（31-36: 赤、緑、黄、青、マゼンタ、シアン）
+    COLORS=(31 32 33 34 35 36)
+    RANDOM_COLOR=${COLORS[$RANDOM % ${#COLORS[@]}]}
+
+    # カスタムPS1を設定してbashを起動
+    echo "Connecting to Dev Container..."
+    docker exec -it -w "$WORKSPACE_DIR" "$CONTAINER_ID" bash -c "export PS1='\[\e[${RANDOM_COLOR}m\]\h\[\e[0m\]:\w# '; exec bash" || true
+}
+
+# ================================================
+# 使い方表示
+# ================================================
+
+usage() {
+    cat << EOF
+Usage: $(basename "$0") <command> [options]
+
+DevContainerの管理とコマンド実行を行うスクリプト
 
-        # ランダムな色コードを生成（31-36: 赤、緑、黄、青、マゼンタ、シアン）
-        COLORS=(31 32 33 34 35 36)
-        RANDOM_COLOR=${COLORS[$RANDOM % ${#COLORS[@]}]}
+Commands:
+  init                          devcontainerファイルを初期化
+  run [-d|--detach]             Dev Containerを起動 (デフォルト: インタラクティブ)
+  exec <cmd>...                 起動中のコンテナでコマンドを実行
+  containers [--json]           コンテナ一覧を表示
+  sync-submodules <container>   指定コンテナにサブモジュールを同期
 
-        # カスタムPS1を設定してbashを起動
-        echo "Connecting to Dev Container..."
-        docker exec -it -w "$WORKSPACE_DIR" "$CONTAINER_ID" bash -c "export PS1='\[\e[${RANDOM_COLOR}m\]\h\[\e[0m\]:\w# '; exec bash" || true
+Options:
+  run:
+    -d, --detach                バックグラウンドで起動
+
+  containers:
+    --json                      JSON形式で出力
+
+Examples:
+  $(basename "$0") run                              # インタラクティブモードで起動
+  $(basename "$0") run --detach                     # バックグラウンドで起動
+  $(basename "$0") exec bash                        # コンテナ内でbashを起動
+  $(basename "$0") containers                       # コンテナ一覧をテーブル表示
+  $(basename "$0") containers --json                # コンテナ一覧をJSON出力
+  $(basename "$0") sync-submodules sandbox-xxx-1    # サブモジュール同期
+EOF
+    exit 0
+}
+
+# ================================================
+# メイン処理
+# ================================================
+
+COMMAND="${1:-}"
+
+case "$COMMAND" in
+    init)
+        node "$SCRIPT_DIR/postinstall.js"
+        ;;
+    exec)
+        shift
+        cmd_exec "$@"
+        ;;
+    run)
+        shift
+        cmd_run "$@"
+        ;;
+    containers)
+        shift
+        cmd_containers "$@"
+        ;;
+    sync-submodules)
+        shift
+        cmd_sync_submodules "$@"
+        ;;
+    --help|-h|help)
+        usage
+        ;;
+    "")
+        usage
         ;;
     *)
-        echo "Usage: $(basename "$0") [init|run]"
-        echo "  init  - Initialize devcontainer files"
-        echo "  run   - Start Dev Container (default)"
-        exit 1
+        echo "Unknown command: $COMMAND" >&2
+        echo ""
+        usage
         ;;
 esac

package/.devcontainer/devcontainer.json

@@ -1,18 +0,0 @@
-{
-  "service": "devcontainer",
-  "dockerComposeFile": [
-    "docker-compose.yml"
-  ],
-  "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
-  "workspaceMount": "",
-  "updateRemoteUserUID": true,
-  "initializeCommand": "echo 'PROJECT_ROOT='$(pwd) > .devcontainer/.env && echo 'PROJECT_NAME='$(basename $(pwd)) >> .devcontainer/.env && echo 'GIT_ORIGIN_URL='$(git remote get-url origin 2>/dev/null || echo '') >> .devcontainer/.env && [ -f ~/.claude-sandbox-credentials.json ] || echo '{}' > ~/.claude-sandbox-credentials.json && [ -f ~/.claude-sandbox.json ] || echo '{}' > ~/.claude-sandbox.json && [ -d ~/.claude-test-nonexistent/plugins ] || mkdir -p ~/.claude-test-nonexistent/plugins",
-  "postCreateCommand": "git init && git remote add origin \"${GIT_ORIGIN_URL:-/host-project}\" && git fetch && git checkout $(git -C /host-project branch --show-current) && echo 'alias claude=\"npx claude --dangerously-skip-permissions\"' >> ~/.bashrc",
-  "postStartCommand": "cp -rT /home/node/.claude-host-plugins /home/node/.claude/plugins 2>/dev/null || true; [ -f /home/node/.claude/plugins/known_marketplaces.json ] && sed -i 's|/Users/[^/]*/|/home/node/|g' /home/node/.claude/plugins/known_marketplaces.json; [ -f /home/node/.claude/plugins/installed_plugins.json ] && sed -i 's|/Users/[^/]*/|/home/node/|g' /home/node/.claude/plugins/installed_plugins.json; true",
-  "shutdownAction": "stopCompose",
-  "remoteUser": "node",
-  "remoteEnv": {
-    "LANG": "ja_JP.UTF-8",
-    "LC_ALL": "ja_JP.UTF-8"
-  }
-}

package/.devcontainer/sample.devcontainer.override.json

@@ -1,30 +0,0 @@
-{
-  "name": "sandbox",
-  "dockerComposeFile": ["docker-compose.override.yml"],
-  "postCreateCommand": "npm ci",
-  "forwardPorts": [3000, 3306],
-  "portsAttributes": {
-    "3000": {
-      "label": "Frontend",
-      "onAutoForward": "notify"
-    },
-    "3306": {
-      "label": "Database",
-      "onAutoForward": "silent"
-    }
-  },
-  "customizations": {
-    "vscode": {
-      "extensions": ["Prisma.prisma"],
-      "settings": {
-        "[prisma]": {
-          "editor.defaultFormatter": "Prisma.prisma"
-        }
-      }
-    }
-  },
-  "remoteEnv": {
-    "DATABASE_URL": "mysql://root:password@db:3306/sandbox",
-    "NODE_ENV": "development"
-  }
-}

package/.devcontainer/sample.docker-compose.override.yml

@@ -1,24 +0,0 @@
-services:
-  devcontainer:
-    depends_on:
-      db:
-        condition: service_healthy
-    environment:
-      DATABASE_URL: mysql://root:password@db:3306/sandbox
-      NODE_ENV: development
-
-  db:
-    image: mysql:8.0
-    environment:
-      MYSQL_ROOT_PASSWORD: password
-      MYSQL_DATABASE: "sandbox"
-    healthcheck:
-      test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-    volumes:
-      - db_data:/var/lib/mysql
-
-volumes:
-  db_data: