Add error handling to Docker Hub description update step

Integrate oh-my-opencode-slim as an opt-in feature via INSTALL_OMOS build arg.
A single build arg installs Bun, tmux, and the plugin; runtime activation is
controlled by ENABLE_OMOS and related env vars in the entrypoint.

.env.example

@@ -30,3 +30,10 @@ WORKSPACE_PATH=~/projects
 
 # Path to SSH keys on host
 SSH_KEY_PATH=~/.ssh
+
+# ── oh-my-opencode-slim (multi-agent orchestration) ──────────────────
+# Requires image built with INSTALL_OMOS=true
+# ENABLE_OMOS=false
+# OMOS_TMUX=false              # Enable tmux multiplexer integration
+# OMOS_SKILLS=true             # Install recommended skills (simplify, agent-browser, cartography)
+# OMOS_RESET=false             # Force regenerate oh-my-opencode-slim config on next start

.gitea/workflows/docker-publish.yml

@@ -6,7 +6,7 @@ on:
       - 'v*'
 
 jobs:
-  build-and-push:
+  build-base:
     runs-on: ubuntu-latest
     container:
       image: catthehacker/ubuntu:act-latest
@@ -32,7 +32,7 @@ jobs:
           VERSION=${GITHUB_REF#refs/tags/}
           echo "version=${VERSION}" >> $GITHUB_OUTPUT
 
-      - name: Build and push
+      - name: Build and push (base)
         uses: docker/build-push-action@v7
         with:
           context: .
@@ -42,18 +42,74 @@ jobs:
             ${{ vars.DOCKERHUB_USERNAME }}/opencode-devbox:${{ steps.version.outputs.version }}
             ${{ vars.DOCKERHUB_USERNAME }}/opencode-devbox:latest
 
+  build-omos:
+    runs-on: ubuntu-latest
+    container:
+      image: catthehacker/ubuntu:act-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v4
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v4
+        with:
+          username: ${{ vars.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Extract version from tag
+        id: version
+        run: |
+          VERSION=${GITHUB_REF#refs/tags/}
+          echo "version=${VERSION}" >> $GITHUB_OUTPUT
+
+      - name: Build and push (omos)
+        uses: docker/build-push-action@v7
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          build-args: |
+            INSTALL_OMOS=true
+          tags: |
+            ${{ vars.DOCKERHUB_USERNAME }}/opencode-devbox:${{ steps.version.outputs.version }}-omos
+            ${{ vars.DOCKERHUB_USERNAME }}/opencode-devbox:latest-omos
+
+  update-description:
+    runs-on: ubuntu-latest
+    needs: [build-base, build-omos]
+    container:
+      image: catthehacker/ubuntu:act-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
       - name: Update Docker Hub description
         run: |
           TOKEN=$(curl -s -X POST https://hub.docker.com/v2/users/login/ \
             -H "Content-Type: application/json" \
             -d '{"username":"${{ vars.DOCKERHUB_USERNAME }}","password":"${{ secrets.DOCKERHUB_TOKEN }}"}' \
             | jq -r .token)
-          jq -n \
+          if [ "$TOKEN" = "null" ] || [ -z "$TOKEN" ]; then
+            echo "::error::Failed to authenticate with Docker Hub API"
+            exit 1
+          fi
+          HTTP_CODE=$(jq -n \
             --arg full "$(cat DOCKER_HUB.md)" \
-            --arg short "Portable AI dev environment for opencode. Debian-based with git, Node.js, AWS CLI, and SSH support." \
+            --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 \
               "https://hub.docker.com/v2/repositories/${{ vars.DOCKERHUB_USERNAME }}/opencode-devbox/" \
               -H "Authorization: JWT $TOKEN" \
               -H "Content-Type: application/json" \
-              -d @-
+              -d @-)
+          echo "Docker Hub API returned: $HTTP_CODE"
+          if [ "$HTTP_CODE" != "200" ]; then
+            echo "::error::Docker Hub description update failed with HTTP $HTTP_CODE"
+            exit 1
+          fi

DOCKER_HUB.md

@@ -2,6 +2,17 @@
 
 Portable AI developer environment for [opencode](https://opencode.ai). Debian-based, with git, SSH, Node.js, AWS CLI v2, and common dev tools pre-installed.
 
+## Image Variants
+
+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 |
+
+Both variants support `linux/amd64` and `linux/arm64`.
+
 ## Quick Start
 
 ```bash
@@ -174,6 +185,7 @@ Understanding what survives container restarts and what doesn't:
 | `/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/oh-my-opencode-slim.json` | Generated by entrypoint (OMOS variant) | ❌ No — regenerated each start | Agent/model mappings |
 
 ### Key points
 
@@ -220,6 +232,8 @@ GIT_USER_EMAIL=you@example.com
 services:
   devbox:
     image: joakimp/opencode-devbox:latest
+    # For multi-agent orchestration, use the omos variant instead:
+    # image: joakimp/opencode-devbox:latest-omos
     stdin_open: true
     tty: true
     env_file:
@@ -267,6 +281,8 @@ docker compose run --rm devbox bash   # interactive shell
 
 ## What's Included
 
+### Base image (`latest`)
+
 - **Debian bookworm-slim** — glibc, full terminal/PTY support
 - **opencode** — AI coding assistant
 - **Node.js 22** — for npx-based MCP servers
@@ -274,6 +290,73 @@ docker compose run --rm devbox bash   # interactive shell
 - **Dev tools** — git, git-lfs, ssh, ripgrep, fd, fzf, jq, curl, wget, vim, tree
 - **Non-root user** — runs as `developer` with UID auto-matched to workspace owner (sudo available)
 
+### OMOS image (`latest-omos`)
+
+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)
+
+When [building from source](https://gitea.jordbo.se/joakimp/opencode-devbox), additional runtimes are available via build args:
+
+- **Python 3** (`INSTALL_PYTHON=true`) — Python 3 + pip + venv
+- **Go** (`INSTALL_GO=true`) — Go toolchain
+
+## oh-my-opencode-slim (OMOS variant)
+
+The `-omos` image variant includes [oh-my-opencode-slim](https://github.com/alvinunreal/oh-my-opencode-slim), which adds a multi-agent layer on top of opencode. An Orchestrator delegates tasks to specialized agents, each configurable with different models and providers.
+
+### Quick start with OMOS
+
+```bash
+docker run -it --rm \
+  -e OPENAI_API_KEY=your-key \
+  -e OPENCODE_PROVIDER=openai \
+  -e ENABLE_OMOS=true \
+  -v ~/projects:/workspace \
+  -v ~/.ssh:/home/developer/.ssh:ro \
+  joakimp/opencode-devbox:latest-omos
+```
+
+On first start, the entrypoint configures oh-my-opencode-slim automatically. The default preset uses OpenAI models.
+
+### OMOS environment variables
+
+| Variable | Default | Description |
+|---|---|---|
+| `ENABLE_OMOS` | `false` | Activate oh-my-opencode-slim on container start |
+| `OMOS_TMUX` | `false` | Enable tmux pane integration (watch agents in split panes) |
+| `OMOS_SKILLS` | `true` | Install recommended skills (simplify, agent-browser, cartography) |
+| `OMOS_RESET` | `false` | Force regenerate config on next start (backs up existing config) |
+
+### Custom OMOS configuration
+
+Mount your own config to control which models power each agent:
+
+```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.
+
+### Verifying agents
+
+After starting opencode with OMOS enabled, run inside the opencode session:
+
+```
+ping all agents
+```
+
+All six agents should respond if your provider authentication is working.
+
 ## Source
 
 Build from source or contribute: [opencode-devbox on Gitea](https://gitea.jordbo.se/joakimp/opencode-devbox)

Dockerfile

@@ -20,7 +20,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     curl \
     wget \
     git \
-    git-lfs \
     openssh-client \
     gnupg \
     jq \
@@ -36,19 +35,30 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     && ln -s /usr/bin/fdfind /usr/local/bin/fd \
     && rm -rf /var/lib/apt/lists/*
 
-# ── gosu (install from GitHub to avoid CVEs in Debian's old Go-compiled package)
+# ── Go-compiled tools (install from GitHub to avoid CVEs in Debian's old Go builds)
+
+# gosu — privilege de-escalation (built with Go 1.24.6)
 ARG GOSU_VERSION=1.19
 RUN ARCH=$(case "${TARGETARCH}" in amd64) echo "amd64" ;; arm64) echo "arm64" ;; *) echo "amd64" ;; esac) && \
     curl -fsSL "https://github.com/tianon/gosu/releases/download/${GOSU_VERSION}/gosu-${ARCH}" -o /usr/local/bin/gosu && \
     chmod +x /usr/local/bin/gosu && \
     gosu --version
 
-# ── fzf (install from GitHub to avoid CVEs in Debian's old Go-compiled package)
+# fzf — fuzzy finder (built with Go 1.23.12)
 ARG FZF_VERSION=0.71.0
 RUN ARCH=$(case "${TARGETARCH}" in amd64) echo "amd64" ;; arm64) echo "arm64" ;; *) echo "amd64" ;; esac) && \
     curl -fsSL "https://github.com/junegunn/fzf/releases/download/v${FZF_VERSION}/fzf-${FZF_VERSION}-linux_${ARCH}.tar.gz" | tar -xz -C /usr/local/bin fzf && \
     fzf --version
 
+# git-lfs — Git Large File Storage (built with Go 1.25)
+ARG GIT_LFS_VERSION=3.7.1
+RUN ARCH=$(case "${TARGETARCH}" in amd64) echo "amd64" ;; arm64) echo "arm64" ;; *) echo "amd64" ;; esac) && \
+    curl -fsSL "https://github.com/git-lfs/git-lfs/releases/download/v${GIT_LFS_VERSION}/git-lfs-linux-${ARCH}-v${GIT_LFS_VERSION}.tar.gz" | tar -xz -C /tmp && \
+    install /tmp/git-lfs-${GIT_LFS_VERSION}/git-lfs /usr/local/bin/git-lfs && \
+    rm -rf /tmp/git-lfs-${GIT_LFS_VERSION} && \
+    git lfs install --system && \
+    git-lfs --version
+
 # Set locale
 RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen
 ENV LANG=en_US.UTF-8
@@ -96,6 +106,19 @@ RUN if [ "${INSTALL_GO}" = "true" ]; then \
       ln -s /usr/local/go/bin/gofmt /usr/local/bin/gofmt; \
     fi
 
+# ── Optional: oh-my-opencode-slim (multi-agent orchestration) ────────
+# Installs Bun runtime, tmux, 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}; \
+    fi
+
 # ── Non-root user ────────────────────────────────────────────────────
 ARG USER_NAME=developer
 ARG USER_UID=1000

README.md

@@ -34,6 +34,7 @@ docker compose run --rm devbox
 - **MCP server support** — Node.js included for `npx`-based MCP servers
 - **Non-root user** — runs as `developer` with UID auto-matched to workspace owner (sudo available)
 - **Optional runtimes** — Python, Go via build args (Node.js always included — required for opencode v1.x)
+- **Multi-agent orchestration** — optional [oh-my-opencode-slim](https://github.com/alvinunreal/oh-my-opencode-slim) integration via build arg
 - **AWS CLI v2** — built-in SSO/Bedrock authentication with headless device-code flow
 - **Multi-arch** — amd64 and arm64
 
@@ -102,6 +103,10 @@ docker compose exec -u developer devbox aws --version
 | `SSH_KEY_PATH` | Host SSH key directory | `~/.ssh` |
 | `USER_UID` | Override container user UID | Auto-detect from `/workspace` |
 | `USER_GID` | Override container user GID | Auto-detect from `/workspace` |
+| `ENABLE_OMOS` | Enable oh-my-opencode-slim multi-agent orchestration | `false` |
+| `OMOS_TMUX` | Enable tmux pane integration for OMOS | `false` |
+| `OMOS_SKILLS` | Install OMOS recommended skills on first run | `true` |
+| `OMOS_RESET` | Force regenerate OMOS config on next start | `false` |
 
 ### Custom opencode config
 
@@ -148,6 +153,68 @@ 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) |
+| `OMOS_VERSION` | `latest` | Pin a specific oh-my-opencode-slim version |
+
+## oh-my-opencode-slim (Multi-Agent Orchestration)
+
+[oh-my-opencode-slim](https://github.com/alvinunreal/oh-my-opencode-slim) adds a multi-agent layer on top of opencode — an Orchestrator delegates tasks to specialized agents (Explorer, Oracle, Librarian, Designer, Fixer), each configurable with different models and providers.
+
+### Setup
+
+A pre-built OMOS image is available on Docker Hub as `joakimp/opencode-devbox:latest-omos`. Alternatively, build from source:
+
+**1. Build the image with OMOS support:**
+
+```bash
+docker compose build --build-arg INSTALL_OMOS=true
+```
+
+This installs Bun, tmux, and the oh-my-opencode-slim package into the image.
+
+**2. Enable in `.env`:**
+
+```bash
+ENABLE_OMOS=true
+```
+
+**3. Run as normal:**
+
+```bash
+docker compose run --rm devbox
+```
+
+On first start, the entrypoint runs the oh-my-opencode-slim installer in non-interactive mode. It generates agent configuration at `~/.config/opencode/oh-my-opencode-slim.json` inside the container. The default preset uses OpenAI models — edit the generated config or mount your own to customize.
+
+### OMOS Environment Variables
+
+| 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_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:
+
+```yaml
+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
+
+After starting opencode with OMOS enabled, run inside the opencode session:
+
+```
+ping all agents
+```
+
+All six agents should respond if your provider authentication is working.
 
 ## AWS Bedrock Authentication
 
@@ -236,9 +303,12 @@ Host Machine
 
 Container (Debian bookworm)
 ├── opencode binary
+├── oh-my-opencode-slim (optional — multi-agent orchestration plugin, includes Bun + tmux)
 ├── AWS CLI v2 (SSO + Bedrock auth)
 ├── git, ssh, ripgrep, fd, jq, curl, fzf
 ├── 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
 ```
@@ -252,6 +322,7 @@ Container (Debian bookworm)
 | `/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/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).
 

docker-compose.yml

@@ -15,6 +15,7 @@ services:
       args:
         INSTALL_PYTHON: "false"
         INSTALL_GO: "false"
+        INSTALL_OMOS: "false"
     image: opencode-devbox:latest
     container_name: opencode-devbox
     stdin_open: true
@@ -37,6 +38,9 @@ services:
       # - ~/.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
+      # - ./oh-my-opencode-slim.json:/home/developer/.config/opencode/oh-my-opencode-slim.json:ro
+
       # Optional: persist opencode data (auth, memory, etc.)
       - devbox-data:/home/developer/.local/share/opencode
 

entrypoint-user.sh

@@ -68,5 +68,54 @@ EOF
   esac
 fi
 
+# ── oh-my-opencode-slim setup (multi-agent orchestration) ────────────
+# Activated by ENABLE_OMOS=true. Requires the image to be built with
+# INSTALL_OMOS=true (which installs bun + the oh-my-opencode-slim package).
+OMOS_CONFIG="$CONFIG_DIR/oh-my-opencode-slim.json"
+
+if [ "${ENABLE_OMOS:-false}" = "true" ]; then
+  if ! command -v bunx &>/dev/null; then
+    echo "WARNING: ENABLE_OMOS=true but bun is not installed."
+    echo "Rebuild with: docker compose build --build-arg INSTALL_OMOS=true"
+  elif [ ! -f "$OMOS_CONFIG" ]; then
+    echo "Setting up oh-my-opencode-slim agents..."
+
+    # Determine installer flags
+    OMOS_TMUX_FLAG="no"
+    if [ "${OMOS_TMUX:-false}" = "true" ]; then
+      OMOS_TMUX_FLAG="yes"
+    fi
+
+    OMOS_SKILLS_FLAG="yes"
+    if [ "${OMOS_SKILLS:-true}" = "false" ]; then
+      OMOS_SKILLS_FLAG="no"
+    fi
+
+    bunx oh-my-opencode-slim@latest install \
+      --no-tui \
+      --tmux="${OMOS_TMUX_FLAG}" \
+      --skills="${OMOS_SKILLS_FLAG}"
+
+    echo "oh-my-opencode-slim configured successfully."
+  else
+    echo "oh-my-opencode-slim config found at $OMOS_CONFIG (use OMOS_RESET=true to overwrite)."
+
+    # Allow reset via env var (creates backup automatically)
+    if [ "${OMOS_RESET:-false}" = "true" ]; then
+      echo "OMOS_RESET=true — regenerating oh-my-opencode-slim config..."
+      OMOS_TMUX_FLAG="no"
+      [ "${OMOS_TMUX:-false}" = "true" ] && OMOS_TMUX_FLAG="yes"
+      OMOS_SKILLS_FLAG="yes"
+      [ "${OMOS_SKILLS:-true}" = "false" ] && OMOS_SKILLS_FLAG="no"
+
+      bunx oh-my-opencode-slim@latest install \
+        --no-tui \
+        --tmux="${OMOS_TMUX_FLAG}" \
+        --skills="${OMOS_SKILLS_FLAG}" \
+        --reset
+    fi
+  fi
+fi
+
 # ── Execute command ──────────────────────────────────────────────────
 exec "$@"