Fix IPv6 connectivity failures: force IPv4 preference in CI builds

Mount ~/.config/opencode as a directory instead of individual files.
This persists all config changes (opencode.json, oh-my-opencode-slim.json,
skills) across container restarts. Add make to README architecture diagram.

.gitea/workflows/docker-publish.yml

@@ -14,11 +14,18 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Force IPv4 for Docker Hub
+        run: |
+          # Prefer IPv4 to avoid intermittent IPv6 connectivity failures
+          echo 'precedence ::ffff:0:0/96  100' >> /etc/gai.conf
+
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v4
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v4
+        with:
+          driver-opts: network=host
 
       - name: Login to Docker Hub
         uses: docker/login-action@v4
@@ -50,11 +57,18 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Force IPv4 for Docker Hub
+        run: |
+          # Prefer IPv4 to avoid intermittent IPv6 connectivity failures
+          echo 'precedence ::ffff:0:0/96  100' >> /etc/gai.conf
+
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v4
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v4
+        with:
+          driver-opts: network=host
 
       - name: Login to Docker Hub
         uses: docker/login-action@v4
@@ -100,16 +114,18 @@ jobs:
             exit 1
           fi
           HTTP_CODE=$(jq -n \
-            --arg full "$(cat DOCKER_HUB.md)" \
+            --rawfile full DOCKER_HUB.md \
             --arg short "Portable AI dev environment for opencode. Debian-based with git, Node.js, AWS CLI, and SSH support. Available in base and omos (multi-agent) variants." \
             '{"full_description": $full, "description": $short}' | \
-            curl -s -o /dev/null -w "%{http_code}" -X PATCH \
+            curl -s -o /tmp/hub-response.txt -w "%{http_code}" -X PATCH \
               "https://hub.docker.com/v2/repositories/${{ vars.DOCKERHUB_USERNAME }}/opencode-devbox/" \
               -H "Authorization: JWT $TOKEN" \
               -H "Content-Type: application/json" \
               -d @-)
           echo "Docker Hub API returned: $HTTP_CODE"
           if [ "$HTTP_CODE" != "200" ]; then
+            echo "Response body:"
+            cat /tmp/hub-response.txt
             echo "::error::Docker Hub description update failed with HTTP $HTTP_CODE"
             exit 1
           fi

DOCKER_HUB.md

@@ -9,7 +9,7 @@ Two image variants are published for each release:
 | Tag | Description |
 |---|---|
 | `latest` / `vX.Y.Z` | Base image — opencode, Node.js, AWS CLI, dev tools |
-| `latest-omos` / `vX.Y.Z-omos` | Base + [oh-my-opencode-slim](https://github.com/alvinunreal/oh-my-opencode-slim) multi-agent orchestration, Bun, and tmux |
+| `latest-omos` / `vX.Y.Z-omos` | Base + [oh-my-opencode-slim](https://github.com/alvinunreal/oh-my-opencode-slim) multi-agent orchestration and Bun |
 
 Both variants support `linux/amd64` and `linux/arm64`.
 
@@ -184,28 +184,38 @@ Understanding what survives container restarts and what doesn't:
 | `/home/developer/.ssh` | Host bind mount (ro) | ✅ Yes — lives on host | SSH keys |
 | `/home/developer/.aws` | Host bind mount | ✅ Yes — lives on host | AWS credentials/SSO cache |
 | `/home/developer/.local/share/opencode` | Named volume (if configured) | ✅ Yes — Docker volume | Session history, memory, auth tokens |
-| `/home/developer/.config/opencode/opencode.json` | Generated by entrypoint | ❌ No — regenerated each start | Provider config, MCP server definitions |
+| `/home/developer/.config/opencode` | Host bind mount (if configured) | ✅ Yes — lives on host | opencode.json, oh-my-opencode-slim.json, skills |
-| `/home/developer/.config/opencode/oh-my-opencode-slim.json` | Generated by entrypoint (OMOS variant) | ❌ No — regenerated each start | Agent/model mappings |
 
 ### Key points
 
 - **Project files** (`/workspace`) are always safe — they're your host filesystem.
-- **opencode config** is auto-generated from `OPENCODE_PROVIDER` env var on each start. It only sets provider and model — no MCP servers. To persist MCP server config, mount your own config file (see Custom opencode Config below).
+- **opencode config** is auto-generated from `OPENCODE_PROVIDER` env var on each start if no existing config is found. To persist config changes, mount the config directory from the host (see Custom opencode Config below).
 - **opencode data** (session history, memory) is lost with `--rm` unless you add a named volume.
 - **AWS SSO tokens** persist across restarts when `~/.aws` is mounted (recommended for Bedrock users).
 
 ## Custom opencode Config
 
-For full control (MCP servers, custom models, keybindings), mount your own config:
+For full control over opencode settings (MCP servers, custom models, oh-my-opencode-slim agents, etc.), mount the entire config directory from the host:
 
 ```bash
 docker run -it --rm \
-  -v ./my-opencode.json:/home/developer/.config/opencode/opencode.json:ro \
+  -v ~/.config/opencode:/home/developer/.config/opencode \
   ... \
   joakimp/opencode-devbox:latest
 ```
 
-When a config file is mounted, the `OPENCODE_PROVIDER` auto-config is skipped.
+This persists all configuration changes across container restarts. When an existing `opencode.json` is found, the `OPENCODE_PROVIDER` auto-config is skipped.
+
+## Neovim Configuration
+
+The image includes neovim 0.12 with `EDITOR=nvim` set by default. To use your own neovim config (and have plugins auto-install via lazy.nvim on first start), mount it from the host:
+
+```bash
+docker run -it --rm \
+  -v ~/.config/nvim:/home/developer/.config/nvim:ro \
+  ... \
+  joakimp/opencode-devbox:latest
+```
 
 ## Using docker-compose
 
@@ -246,11 +256,12 @@ services:
       - devbox-data:/home/developer/.local/share/opencode
       # Mount AWS config for Bedrock SSO (required for amazon-bedrock provider)
       # - ~/.aws:/home/developer/.aws
-      # Optional: mount your own opencode config (MCP servers, custom models, etc.)
+      # Optional: mount opencode config directory (persists config changes across restarts)
-      # - ./opencode.json:/home/developer/.config/opencode/opencode.json:ro
+      # - ~/.config/opencode:/home/developer/.config/opencode
-      # Optional: mount opencode skills from host
+      # Optional: mount opencode agent skills from host
-      # - ~/.config/opencode/skills:/home/developer/.config/opencode/skills:ro
       # - ~/.agents/skills:/home/developer/.agents/skills:ro
+      # Optional: mount neovim config from host (plugins auto-install on first start)
+      # - ~/.config/nvim:/home/developer/.config/nvim:ro
 
 volumes:
   devbox-data:
@@ -287,7 +298,7 @@ docker compose run --rm devbox bash   # interactive shell
 - **opencode** — AI coding assistant
 - **Node.js 22** — for npx-based MCP servers
 - **AWS CLI v2** — SSO and Bedrock authentication
-- **Dev tools** — git, git-lfs, ssh, ripgrep, fd, fzf, jq, curl, wget, vim, tree
+- **Dev tools** — git, git-lfs, ssh, ripgrep, fd, fzf, bat, eza, zoxide, jq, make, curl, wget, neovim 0.12, tmux, htop, tree
 - **Non-root user** — runs as `developer` with UID auto-matched to workspace owner (sudo available)
 
 ### OMOS image (`latest-omos`)
@@ -296,7 +307,6 @@ Everything in the base image, plus:
 
 - **[oh-my-opencode-slim](https://github.com/alvinunreal/oh-my-opencode-slim)** — multi-agent orchestration plugin
 - **Bun** — JavaScript runtime required by oh-my-opencode-slim
-- **tmux** — terminal multiplexer (used by OMOS for agent pane integration, but also useful on its own for managing multiple terminal sessions)
 - **6 specialized agents** — Orchestrator, Explorer, Oracle, Librarian, Designer, Fixer
 
 ### Additional runtimes (build from source)
@@ -335,15 +345,7 @@ On first start, the entrypoint configures oh-my-opencode-slim automatically. The
 
 ### Custom OMOS configuration
 
-Mount your own config to control which models power each agent:
+If you mount the opencode config directory (see Custom opencode Config above), the `oh-my-opencode-slim.json` file is included and persists across restarts. Edit it directly to control which models power each agent, fallback chains, council setup, and more.
-
-```bash
-docker run -it --rm \
-  -e ENABLE_OMOS=true \
-  -v ./oh-my-opencode-slim.json:/home/developer/.config/opencode/oh-my-opencode-slim.json:ro \
-  ... \
-  joakimp/opencode-devbox:latest-omos
-```
 
 See the [oh-my-opencode-slim configuration docs](https://github.com/alvinunreal/oh-my-opencode-slim/blob/master/docs/configuration.md) for the full reference.
 

Dockerfile

@@ -27,7 +27,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     fd-find \
     tree \
     less \
-    vim-tiny \
+    htop \
+    tmux \
+    make \
+    patch \
+    diffutils \
     sudo \
     locales \
     procps \
@@ -59,11 +63,39 @@ RUN ARCH=$(case "${TARGETARCH}" in amd64) echo "amd64" ;; arm64) echo "arm64" ;;
     git lfs install --system && \
     git-lfs --version
 
+# neovim — modern text editor (pre-built release from GitHub)
+ARG NVIM_VERSION=0.12.1
+RUN ARCH=$(case "${TARGETARCH}" in amd64) echo "x86_64" ;; arm64) echo "arm64" ;; *) echo "x86_64" ;; esac) && \
+    curl -fsSL "https://github.com/neovim/neovim/releases/download/v${NVIM_VERSION}/nvim-linux-${ARCH}.tar.gz" | tar -xz -C /opt && \
+    ln -s /opt/nvim-linux-${ARCH}/bin/nvim /usr/local/bin/nvim && \
+    nvim --version | head -1
+
+# bat — syntax-highlighted cat replacement
+ARG BAT_VERSION=0.25.0
+RUN ARCH=$(case "${TARGETARCH}" in amd64) echo "x86_64" ;; arm64) echo "aarch64" ;; *) echo "x86_64" ;; esac) && \
+    curl -fsSL "https://github.com/sharkdp/bat/releases/download/v${BAT_VERSION}/bat-v${BAT_VERSION}-${ARCH}-unknown-linux-musl.tar.gz" | tar -xz -C /tmp && \
+    install /tmp/bat-v${BAT_VERSION}-${ARCH}-unknown-linux-musl/bat /usr/local/bin/bat && \
+    rm -rf /tmp/bat-v${BAT_VERSION}-* && \
+    bat --version
+
+# eza — modern ls replacement
+ARG EZA_VERSION=0.23.4
+RUN ARCH=$(case "${TARGETARCH}" in amd64) echo "x86_64" ;; arm64) echo "aarch64" ;; *) echo "x86_64" ;; esac) && \
+    curl -fsSL "https://github.com/eza-community/eza/releases/download/v${EZA_VERSION}/eza_${ARCH}-unknown-linux-gnu.tar.gz" | tar -xz -C /usr/local/bin && \
+    eza --version | head -1
+
+# zoxide — smarter cd command
+ARG ZOXIDE_VERSION=0.9.9
+RUN ARCH=$(case "${TARGETARCH}" in amd64) echo "x86_64" ;; arm64) echo "aarch64" ;; *) echo "x86_64" ;; esac) && \
+    curl -fsSL "https://github.com/ajeetdsouza/zoxide/releases/download/v${ZOXIDE_VERSION}/zoxide-${ZOXIDE_VERSION}-${ARCH}-unknown-linux-musl.tar.gz" | tar -xz -C /usr/local/bin zoxide && \
+    zoxide --version
+
 # Set locale
 RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
 ENV LANG=en_US.UTF-8
 ENV LANGUAGE=en_US:en
 ENV LC_ALL=en_US.UTF-8
+ENV EDITOR=nvim
 
 # ── Node.js (required for opencode v1.x install + MCP servers) ──────
 ARG NODE_VERSION=22
@@ -107,13 +139,11 @@ RUN if [ "${INSTALL_GO}" = "true" ]; then \
     fi
 
 # ── Optional: oh-my-opencode-slim (multi-agent orchestration) ────────
-# Installs Bun runtime, tmux, and the oh-my-opencode-slim npm package.
+# Installs Bun runtime and the oh-my-opencode-slim npm package.
 # Runtime activation is controlled by ENABLE_OMOS env var in entrypoint.
 ARG INSTALL_OMOS=false
 ARG OMOS_VERSION=latest
 RUN if [ "${INSTALL_OMOS}" = "true" ]; then \
-      apt-get update && apt-get install -y --no-install-recommends tmux && \
-      rm -rf /var/lib/apt/lists/* && \
       curl -fsSL https://bun.sh/install | BUN_INSTALL=/usr/local bash && \
       bun --version && \
       npm install -g oh-my-opencode-slim@${OMOS_VERSION}; \

README.md

@@ -110,23 +110,33 @@ docker compose exec -u developer devbox aws --version
 
 ### Custom opencode config
 
-Mount your own `opencode.json` for full control (MCP servers, custom models, etc.):
+For full control over opencode settings (MCP servers, custom models, oh-my-opencode-slim agents, etc.), mount the entire config directory from the host:
 
 ```yaml
 volumes:
-  - ./my-opencode.json:/home/developer/.config/opencode/opencode.json:ro
+  - ~/.config/opencode:/home/developer/.config/opencode
 ```
 
+This persists all configuration changes across container restarts, including `opencode.json`, `oh-my-opencode-slim.json`, and skills. When an existing `opencode.json` is found, the `OPENCODE_PROVIDER` auto-config is skipped.
+
 ### Custom skills
 
-Mount your host's opencode skills into the container:
+Mount agent skills from the host:
 
 ```yaml
 volumes:
-  - ~/.config/opencode/skills:/home/developer/.config/opencode/skills:ro
   - ~/.agents/skills:/home/developer/.agents/skills:ro
 ```
 
+### Neovim configuration
+
+The image includes neovim 0.12 with `EDITOR=nvim` set by default. To use your own neovim config (and have plugins auto-install via lazy.nvim on first start), mount it from the host:
+
+```yaml
+volumes:
+  - ~/.config/nvim:/home/developer/.config/nvim:ro
+```
+
 ### Rebuilding the Image
 
 `docker compose run` and `docker compose up` use the existing image — they **do not rebuild** when you change the Dockerfile or build args (e.g. updating `OPENCODE_VERSION`). Rebuild explicitly:
@@ -153,7 +163,7 @@ docker compose build --build-arg OPENCODE_VERSION=1.5.0
 |---|---|---|
 | `INSTALL_PYTHON` | `false` | Python 3 + pip + venv |
 | `INSTALL_GO` | `false` | Go toolchain |
-| `INSTALL_OMOS` | `false` | [oh-my-opencode-slim](https://github.com/alvinunreal/oh-my-opencode-slim) multi-agent orchestration (installs Bun, tmux, and plugin) |
+| `INSTALL_OMOS` | `false` | [oh-my-opencode-slim](https://github.com/alvinunreal/oh-my-opencode-slim) multi-agent orchestration (installs Bun and plugin) |
 | `OMOS_VERSION` | `latest` | Pin a specific oh-my-opencode-slim version |
 
 ## oh-my-opencode-slim (Multi-Agent Orchestration)
@@ -170,7 +180,7 @@ A pre-built OMOS image is available on Docker Hub as `joakimp/opencode-devbox:la
 docker compose build --build-arg INSTALL_OMOS=true
 ```
 
-This installs Bun, tmux, and the oh-my-opencode-slim package into the image.
+This installs Bun and the oh-my-opencode-slim package into the image.
 
 **2. Enable in `.env`:**
 
@@ -191,20 +201,15 @@ On first start, the entrypoint runs the oh-my-opencode-slim installer in non-int
 | Variable | Default | Description |
 |---|---|---|
 | `ENABLE_OMOS` | `false` | Activate oh-my-opencode-slim on container start |
-| `OMOS_TMUX` | `false` | Enable tmux pane integration (tmux is included with `INSTALL_OMOS`) |
+| `OMOS_TMUX` | `false` | Enable tmux pane integration (tmux is included in the base image) |
 | `OMOS_SKILLS` | `true` | Install recommended skills (simplify, agent-browser, cartography) |
 | `OMOS_RESET` | `false` | Force regenerate config on next start (backs up existing config) |
 
 ### Custom Configuration
 
-You can mount your own oh-my-opencode-slim config instead of using the auto-generated one:
+If you mount the opencode config directory (see Custom opencode config above), the `oh-my-opencode-slim.json` file is included and persists across restarts. Edit it directly to control which models power each agent, fallback chains, council setup, and more.
 
-```yaml
+See the [oh-my-opencode-slim configuration docs](https://github.com/alvinunreal/oh-my-opencode-slim/blob/master/docs/configuration.md) for the full reference.
-volumes:
-  - ./oh-my-opencode-slim.json:/home/developer/.config/opencode/oh-my-opencode-slim.json:ro
-```
-
-The config file controls which models power each agent, fallback chains, council setup, and more. See the [oh-my-opencode-slim configuration docs](https://github.com/alvinunreal/oh-my-opencode-slim/blob/master/docs/configuration.md) for the full reference.
 
 ### Verifying Agents
 
@@ -303,12 +308,12 @@ Host Machine
 
 Container (Debian bookworm)
 ├── opencode binary
-├── oh-my-opencode-slim (optional — multi-agent orchestration plugin, includes Bun + tmux)
+├── oh-my-opencode-slim (optional — multi-agent orchestration plugin, includes Bun)
 ├── AWS CLI v2 (SSO + Bedrock auth)
-├── git, ssh, ripgrep, fd, jq, curl, fzf
+├── neovim 0.12, tmux, htop, bat, eza, zoxide, make
+├── git, ssh, ripgrep, fd, fzf, jq, curl, tree
 ├── Node.js (for MCP servers)
 ├── Bun (optional — included with oh-my-opencode-slim)
-├── tmux (optional — included with oh-my-opencode-slim, also useful independently)
 ├── entrypoint.sh (UID adjustment, git config, provider setup)
 └── /workspace ← your code lives here
 ```
@@ -321,10 +326,9 @@ Container (Debian bookworm)
 | `/home/developer/.ssh` | Host bind mount (ro) | ✅ Yes | SSH keys |
 | `/home/developer/.aws` | Host bind mount (if configured) | ✅ Yes | AWS credentials/SSO cache |
 | `/home/developer/.local/share/opencode` | Named volume `devbox-data` | ✅ Yes | Session history, memory |
-| `/home/developer/.config/opencode/opencode.json` | Generated by entrypoint | ❌ No | Provider/model config |
+| `/home/developer/.config/opencode` | Host bind mount (if configured) | ✅ Yes | opencode.json, oh-my-opencode-slim.json, skills |
-| `/home/developer/.config/opencode/oh-my-opencode-slim.json` | Generated by entrypoint (if OMOS enabled) | ❌ No | Agent/model mappings |
 
-**opencode config** (`opencode.json`) is auto-generated from `OPENCODE_PROVIDER` on each start. It sets provider and model only — no MCP servers. To use MCP servers or custom settings, mount your own config file (see Custom opencode config above).
+**opencode config** (`opencode.json`) is auto-generated from `OPENCODE_PROVIDER` on each start. It sets provider and model only — no MCP servers. To persist config changes and use custom settings, mount the config directory from the host (see Custom opencode config above).
 
 ## License
 

docker-compose.yml

@@ -31,15 +31,16 @@ services:
       # SSH keys (read-only) — for git push/pull
       - ${SSH_KEY_PATH:-~/.ssh}:/home/developer/.ssh:ro
 
-      # Optional: mount your own opencode config (MCP servers, custom models, etc.)
+      # Optional: mount opencode config directory (persists config changes across restarts)
-      # - ./opencode.json:/home/developer/.config/opencode/opencode.json:ro
+      # Includes opencode.json, oh-my-opencode-slim.json, skills, etc.
+      # When mounted, OPENCODE_PROVIDER auto-config is skipped if opencode.json exists.
+      # - ~/.config/opencode:/home/developer/.config/opencode
 
-      # Optional: mount opencode skills from host
+      # Optional: mount opencode agent skills from host
-      # - ~/.config/opencode/skills:/home/developer/.config/opencode/skills:ro
       # - ~/.agents/skills:/home/developer/.agents/skills:ro
 
-      # Optional: mount your own oh-my-opencode-slim config
+      # Optional: mount neovim config from host (plugins auto-install on first start)
-      # - ./oh-my-opencode-slim.json:/home/developer/.config/opencode/oh-my-opencode-slim.json:ro
+      # - ~/.config/nvim:/home/developer/.config/nvim:ro
 
       # Optional: persist opencode data (auth, memory, etc.)
       - devbox-data:/home/developer/.local/share/opencode