aibox-cli 0.3.0 → 0.4.2

package/README.md

@@ -19,11 +19,8 @@ On macOS, if Docker isn't installed, aibox will offer to install [Colima](https:
 ## Usage
 
 ```bash
-# first time (once)
-aibox build
-
 # in any project directory
-aibox up                    # start container
+aibox up                    # start container (auto-builds image on first run)
 aibox claude --yolo         # no prompts, full sudo, no firewall
 aibox claude --safe         # keep prompts, restricted sudo, firewall on
 aibox claude                # asks you each time
@@ -71,6 +68,17 @@ aibox down --all          # stop all containers for this project
 aibox nuke                # remove ALL aibox containers
 ```
 
+### From a Git Repo
+
+Start directly from a repo URL — aibox clones it and runs:
+
+```bash
+aibox --repo https://github.com/user/project.git claude --yolo
+aibox --repo git@github.com:user/project.git --branch dev claude
+```
+
+Repos are cloned to `~/.config/aibox/repos/` with `--recursive` (submodules included). On subsequent runs, the existing clone is reused.
+
 ### Custom Image
 
 ```bash
@@ -151,6 +159,8 @@ SHARED_MODULES=false
 |-------|------|-------------|
 | `-n` | `--name NAME` | Named instance (multiple containers per project) |
 | `-d` | `--dir PATH` | Run in a different project directory |
+| `-r` | `--repo URL` | Clone a git repo and run in it |
+| `-b` | `--branch NAME` | Branch to checkout (with `--repo`) |
 | `-i` | `--image NAME` | Override base Docker image |
 | `-c` | `--copy` | Copy repo into Docker volume (full isolation) |
 | `-w` | `--worktree` | Use git worktree (lightweight isolation) |

package/bin/aibox

@@ -23,6 +23,8 @@
 #   -n, --name NAME       Run a named instance (e.g. -n refactor)
 #                         Allows multiple containers per project
 #   -d, --dir PATH        Run in a different project directory
+#   -r, --repo URL        Clone a git repo and run in it
+#   -b, --branch NAME     Branch to checkout (with --repo)
 #   -i, --image NAME      Override base Docker image (default: aibox:latest)
 #   -c, --copy            Copy project into container (full isolation, no host sync)
 #   -w, --worktree        Use git worktree (lightweight isolation, stays on host)
@@ -55,11 +57,25 @@ set -euo pipefail
 
 # ── Script identity ──────────────────────────────────────────────
 SCRIPT_NAME="$(basename "$0")"
-AIBOX_VERSION="6"
+AIBOX_VERSION="7"
 CONFIG_DIR="${HOME}/.config/aibox"
 DEFAULT_IMAGE="aibox:latest"
 CONTAINER_PREFIX="aibox"
 
+# ── Output helpers ─────────────────────────────────────────────
+_step() {
+  local msg="$1"
+  local width=60
+  local pad
+  pad=$(( width - ${#msg} - 5 ))  # 5 = "── " + " ─"
+  [[ $pad -lt 3 ]] && pad=3
+  local line
+  line=$(printf '─%.0s' $(seq 1 "$pad"))
+  echo ""
+  echo "── ${msg} ${line}"
+  echo ""
+}
+
 # ── Machine-aware Colima start ───────────────────────────────────
 _colima_start() {
   local total_cpu total_mem_gb vm_cpu vm_mem vm_disk
@@ -185,6 +201,8 @@ IMAGE="$DEFAULT_IMAGE"
 SHARED_MODULES=false
 INSTANCE_NAME=""
 PROJECT_DIR_FLAG=""
+REPO_URL=""
+REPO_BRANCH=""
 DOWN_ALL=false
 DOWN_CLEAN=false
 SKIP_PERMISSIONS=false
@@ -207,6 +225,14 @@ parse_flags() {
         PROJECT_DIR_FLAG="${2:?'--dir requires a value'}"
         shift 2
         ;;
+      -r|--repo)
+        REPO_URL="${2:?'--repo requires a value'}"
+        shift 2
+        ;;
+      -b|--branch)
+        REPO_BRANCH="${2:?'--branch requires a value'}"
+        shift 2
+        ;;
       --shared-modules)
         SHARED_MODULES=true
         shift
@@ -259,6 +285,31 @@ elif [[ "$SAFE_MODE" == "true" ]]; then
   export AIBOX_MODE="safe"
 fi
 
+# ── Repo clone ───────────────────────────────────────────────────
+if [[ -n "$REPO_URL" ]]; then
+  # Derive a directory name from the repo URL (hash prevents collisions)
+  _repo_name=$(basename "$REPO_URL" .git)
+  _repo_hash=$(printf '%s' "$REPO_URL" | shasum | cut -c1-6)
+  _repo_dir="${CONFIG_DIR}/repos/${_repo_name}-${_repo_hash}"
+
+  if [[ -d "$_repo_dir/.git" ]]; then
+    echo "Repo already cloned (${_repo_dir}). Reusing."
+    # Fetch latest and checkout branch if specified
+    if [[ -n "$REPO_BRANCH" ]]; then
+      git -C "$_repo_dir" fetch --all --quiet 2>/dev/null || true
+      git -C "$_repo_dir" checkout "$REPO_BRANCH" 2>/dev/null || true
+    fi
+  else
+    echo "Cloning ${REPO_URL}..."
+    mkdir -p "${CONFIG_DIR}/repos"
+    _clone_args=(--recursive)
+    [[ -n "$REPO_BRANCH" ]] && _clone_args+=(--branch "$REPO_BRANCH")
+    git clone "${_clone_args[@]}" "$REPO_URL" "$_repo_dir"
+  fi
+
+  PROJECT_DIR_FLAG="$_repo_dir"
+fi
+
 # ── Per-project config file (.aibox) ─────────────────────────────
 if [[ -n "$PROJECT_DIR_FLAG" ]]; then
   PROJECT_DIR="$(cd "$PROJECT_DIR_FLAG" 2>/dev/null && pwd)" || {
@@ -347,7 +398,7 @@ if ! [[ "$INSTANCE_NAME" =~ ^[a-z0-9_-]+$ ]]; then
   exit 1
 fi
 CONTAINER_NAME="${BASE_CONTAINER_NAME}-${INSTANCE_NAME}"
-WORKSPACE_DIR="/workspace/${PROJECT_NAME}"
+WORKSPACE_DIR="${PROJECT_DIR}"
 
 # ── Isolation mode setup ─────────────────────────────────────────
 COPY_VOLUME=""
@@ -385,7 +436,7 @@ ensure_dockerfile() {
 
   if [[ "$current_version" != "$AIBOX_VERSION" || ! -f "$dockerfile" ]]; then
     if [[ -f "$dockerfile" && "$current_version" != "$AIBOX_VERSION" ]]; then
-      echo "Dockerfile outdated (v${current_version} → v${AIBOX_VERSION}). Regenerating..."
+      echo "Dockerfile outdated (v${current_version} → v${AIBOX_VERSION}). Regenerating (one-time)..."
     fi
     cat > "$dockerfile" << DOCKERFILE
 FROM node:20-alpine
@@ -436,16 +487,6 @@ set -e
 # Fix auth volume ownership (Docker creates volumes as root)
 chown -R aibox:aibox /home/aibox/.claude 2>/dev/null || true
 
-# ── IDE path symlink ─────────────────────────────────────────
-# Create symlink so container paths match host paths for IDE integration.
-# Claude Code reports cwd-based paths to the IDE plugin; if they don't
-# match host paths, diffs break (empty left side, wrong file path).
-if [[ -n "${AIBOX_HOST_DIR:-}" && -n "${AIBOX_WORKSPACE_DIR:-}" \
-      && "$AIBOX_HOST_DIR" != "$AIBOX_WORKSPACE_DIR" ]]; then
-  mkdir -p "$(dirname "$AIBOX_HOST_DIR")"
-  ln -sfn "$AIBOX_WORKSPACE_DIR" "$AIBOX_HOST_DIR"
-fi
-
 # ── Mode-dependent setup ──────────────────────────────────────
 MODE="${AIBOX_MODE:-safe}"
 
@@ -545,14 +586,14 @@ _prepare_copy_volume() {
 
   # Check if volume already has content (--entrypoint bypasses su-exec drop)
   local has_content
-  has_content=$(docker run --rm --entrypoint sh -v "${COPY_VOLUME}:${WORKSPACE_DIR}" "$IMAGE" -c "ls -A ${WORKSPACE_DIR} 2>/dev/null | head -1" 2>/dev/null || true)
+  has_content=$(docker run --rm --entrypoint sh -v "${COPY_VOLUME}:${WORKSPACE_DIR}" "$IMAGE" -c "ls -A '${WORKSPACE_DIR}' 2>/dev/null | head -1" 2>/dev/null || true)
 
   if [[ -n "$has_content" ]]; then
     echo "Copy volume already populated (${COPY_VOLUME}). Reusing."
     return
   fi
 
-  echo "Copying project into isolated volume (branch: ${branch_name})..."
+  _step "Copying project into volume (branch: ${branch_name})"
 
   # Create bundle to a temp file first so we can check for failure
   local bundle_file
@@ -568,12 +609,12 @@ _prepare_copy_volume() {
       -v "${COPY_VOLUME}:${WORKSPACE_DIR}" \
       "$IMAGE" -c "
         cat > /tmp/repo.bundle
-        mkdir -p ${WORKSPACE_DIR}
-        cd ${WORKSPACE_DIR}
+        mkdir -p '${WORKSPACE_DIR}'
+        cd '${WORKSPACE_DIR}'
         git clone /tmp/repo.bundle .
         rm /tmp/repo.bundle
         git checkout -b '${branch_name}' 2>/dev/null || git checkout '${branch_name}'
-        chown -R aibox:aibox ${WORKSPACE_DIR}
+        chown -R aibox:aibox '${WORKSPACE_DIR}'
       "; then
     rm -f "$bundle_file"
     docker volume rm "$COPY_VOLUME" 2>/dev/null || true
@@ -596,7 +637,7 @@ _prepare_worktree() {
 
   mkdir -p "${CONFIG_DIR}/worktrees"
 
-  echo "Creating worktree (branch: ${branch_name})..."
+  _step "Creating worktree (branch: ${branch_name})"
 
   # Try creating with a new branch, fall back to existing branch
   if git -C "$PROJECT_DIR" worktree add "$WORKTREE_DIR" -b "$branch_name" 2>/dev/null; then
@@ -659,8 +700,6 @@ _environment_yaml() {
   echo "${indent}- CLAUDE_CONFIG_DIR=/home/aibox/.claude"
   echo "${indent}- AIBOX_MODE=\${AIBOX_MODE:-safe}"
   echo "${indent}- AIBOX_EXTRA_DOMAINS=\${AIBOX_EXTRA_DOMAINS:-}"
-  echo "${indent}- AIBOX_HOST_DIR=${PROJECT_DIR}"
-  echo "${indent}- AIBOX_WORKSPACE_DIR=${WORKSPACE_DIR}"
 }
 
 # Build -e flags for docker exec from current terminal environment
@@ -832,15 +871,16 @@ dc() {
 cmd_build() {
   _check_deps
   ensure_dockerfile
-  echo "Building ${IMAGE}..."
+  _step "Building ${IMAGE}"
   docker build -t "$IMAGE" "$CONFIG_DIR"
-  echo "Done. Image: ${IMAGE}"
+  echo "Done."
 }
 
 ensure_init() {
   if [[ ! -f "${PROJECT_DIR}/compose.dev.yaml" ]]; then
     _require_safe_dir
-    echo "No ${SCRIPT_NAME} config found. Will create compose.dev.yaml, .aibox, and .idea/workspace.xml."
+    _step "Initializing project (one-time)"
+    echo "Will create compose.dev.yaml, .aibox, and .idea/workspace.xml."
     if _confirm_yes "Initialize?"; then
       _init_files
       echo ""
@@ -856,14 +896,14 @@ cmd_up() {
   ensure_init
 
   if ! docker image inspect "$IMAGE" &>/dev/null; then
-    echo "Image '${IMAGE}' not found. Building..."
+    echo "Image '${IMAGE}' not found. Building (one-time)..."
     cmd_build
   else
     # Check if image version matches script version
     local img_version
     img_version=$(docker inspect "$IMAGE" --format '{{index .Config.Labels "aibox.version"}}' 2>/dev/null || echo "")
     if [[ "$img_version" != "$AIBOX_VERSION" ]]; then
-      echo "Image outdated (v${img_version:-0} → v${AIBOX_VERSION}). Rebuilding..."
+      echo "Image outdated (v${img_version:-0} → v${AIBOX_VERSION}). Rebuilding (one-time)..."
       cmd_build
     fi
   fi
@@ -878,9 +918,9 @@ cmd_up() {
   if ! docker ps --format '{{.Names}}' | grep -Fxq "$CONTAINER_NAME"; then
     # Ensure shared auth volume exists (external: true requires it)
     docker volume create "$AUTH_VOLUME" &>/dev/null || true
-    echo "Starting ${CONTAINER_NAME} (image: ${IMAGE})..."
+    _step "Starting ${CONTAINER_NAME}"
     dc up -d
-    echo "Container running. Workspace: ${WORKSPACE_DIR}"
+    echo "Container running."
   else
     echo "${CONTAINER_NAME} is already running."
   fi
@@ -930,7 +970,7 @@ cmd_claude() {
     local current_mode
     current_mode=$(docker exec "$CONTAINER_NAME" sh -c 'echo ${AIBOX_MODE:-safe}' 2>/dev/null || echo "unknown")
     if [[ "$current_mode" != "$AIBOX_MODE" ]]; then
-      echo "Restarting container in ${AIBOX_MODE} mode (was: ${current_mode})..."
+      _step "Restarting container in ${AIBOX_MODE} mode (was: ${current_mode})"
       dc down --remove-orphans >/dev/null
     fi
   fi

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aibox-cli",
-  "version": "0.3.0",
+  "version": "0.4.2",
   "description": "Run AI coding agents in isolated Docker containers",
   "author": "repalash <palash@shaders.app>",
   "license": "MIT",
@@ -35,5 +35,8 @@
   ],
   "engines": {
     "node": ">=18"
+  },
+  "scripts": {
+    "release": "git tag v$npm_package_version && git push origin v$npm_package_version"
   }
 }