maesttro 0.4.4 → 0.6.0

package/docker/Dockerfile

@@ -1,5 +1,5 @@
 # git is built from source: Debian ships 2.47 and the runner wants a recent
-# git. Builder matches node:22-slim's Debian so the runtime libs line up.
+# git. Builder matches node:24-slim's Debian so the runtime libs line up.
 FROM debian:bookworm-slim AS git-build
 ARG GIT_VERSION=2.55.0
 ARG GIT_SHA256=457fdb04dc8728e007d4688695e6912e6f680727920f2a40bf11eacc17505357
@@ -14,9 +14,18 @@ RUN apt-get update \
     && make -j"$(nproc)" prefix=/usr/local sysconfdir=/etc NO_TCLTK=1 NO_PERL=1 NO_PYTHON=1 NO_GETTEXT=1 NO_RUST=1 \
       DESTDIR=/out all install
 
-FROM node:22-slim
+FROM oven/bun:1.4.2-slim AS bun
+FROM ghcr.io/astral-sh/uv:0.12.19 AS uv
+
+FROM node:24-slim
+
+# Lets `maesttro update` find and remove older runner images once they lose their tag
+LABEL org.maesttro.runner="1"
 
 COPY --from=git-build /out/usr/local /usr/local
+COPY --from=bun /usr/local/bin/bun /usr/local/bin/bun
+COPY --from=uv /uv /uvx /usr/local/bin/
+RUN ln -s /usr/local/bin/bun /usr/local/bin/bunx
 
 # gh comes from GitHub's apt repo: Debian's lags by years and predates the
 # hosts.yml / config.yml behaviour the CLI's read-only session mount relies on
@@ -30,28 +39,74 @@ RUN apt-get update \
       > /etc/apt/sources.list.d/github-cli.list \
     && apt-get update \
     && apt-get install -y --no-install-recommends gh \
+      build-essential pkg-config \
+      unzip zip xz-utils bzip2 wget jq ripgrep fd-find tree file procps rsync patch sqlite3 \
+      libicu72 libssl3 zlib1g libgssapi-krb5-2 \
+    && ln -s /usr/bin/fdfind /usr/local/bin/fd \
     && rm -rf /var/lib/apt/lists/*
 
-# System-level, not ~/.gitconfig: /home/agent is the persistent volume and
-# shadows anything baked into home for existing installs
+ARG DOTNET_SDK_CHANNEL=10.0
+ENV DOTNET_ROOT=/usr/share/dotnet \
+    DOTNET_CLI_TELEMETRY_OPTOUT=1 \
+    DOTNET_NOLOGO=1 \
+    DOTNET_GENERATE_ASPNET_CERTIFICATE=false \
+    DOTNET_SKIP_WORKLOAD_INTEGRITY_CHECK=true \
+    NUGET_XMLDOC_MODE=skip
+RUN curl -fsSL https://dot.net/v1/dotnet-install.sh -o /tmp/dotnet-install.sh \
+    && bash /tmp/dotnet-install.sh --channel "${DOTNET_SDK_CHANNEL}" --install-dir "${DOTNET_ROOT}" \
+    && ln -s "${DOTNET_ROOT}/dotnet" /usr/local/bin/dotnet \
+    && rm /tmp/dotnet-install.sh
+
+# Python comes from uv (python-build-standalone), not Debian: one toolchain for
+# interpreters, venvs and tools; python/python3/pip stay on PATH for node-gyp and habit
+ARG PYTHON_VERSION=3.14
+RUN UV_PYTHON_INSTALL_DIR=/usr/local/share/uv/python UV_PYTHON_BIN_DIR=/usr/local/bin \
+      uv python install "${PYTHON_VERSION}" --default \
+    && ln -s "$(dirname "$(readlink -f /usr/local/bin/python3)")/pip3" /usr/local/bin/pip3 \
+    && ln -s pip3 /usr/local/bin/pip
+
+# System-level, not ~/.gitconfig: the per-session home mounted at /home/agent
+# shadows anything baked into the image's home
 COPY gitconfig /etc/gitconfig
 COPY runner-marker /etc/maesttro/runner
 
 # Curated client CLIs — keep in sync with src/clients.ts
 RUN npm install -g \
     @anthropic-ai/claude-code \
-    opencode-ai
+    opencode-ai \
+    typescript \
+    && corepack enable
+# The image pins the client version; an in-container update would only land on
+# the ephemeral layer and be re-downloaded every session
+ENV DISABLE_AUTOUPDATER=1
 
 RUN useradd -m -s /bin/bash agent
 USER agent
-# Created as agent so a fresh volume inherits them; otherwise Docker creates
-# ~/.config and ~/.claude as root when it sets up the nested read-only mounts
-RUN mkdir -p /home/agent/.config/opencode /home/agent/.claude
 WORKDIR /workspace
 
+# Everything the agent installs lands on the container's writable layer, never
+# the session's home, so it is gone when the session's container exits
+ENV AGENT_TOOLS=/opt/agent-tools
+ENV NPM_CONFIG_PREFIX=${AGENT_TOOLS} \
+    NPM_CONFIG_CACHE=${AGENT_TOOLS}/cache/npm \
+    COREPACK_HOME=${AGENT_TOOLS}/corepack \
+    COREPACK_ENABLE_DOWNLOAD_PROMPT=0 \
+    BUN_INSTALL=${AGENT_TOOLS}/bun \
+    PYTHONUSERBASE=${AGENT_TOOLS} \
+    PIP_BREAK_SYSTEM_PACKAGES=1 \
+    PIP_CACHE_DIR=${AGENT_TOOLS}/cache/pip \
+    UV_CACHE_DIR=${AGENT_TOOLS}/cache/uv \
+    UV_TOOL_DIR=${AGENT_TOOLS}/uv/tools \
+    UV_TOOL_BIN_DIR=${AGENT_TOOLS}/bin \
+    UV_PYTHON_INSTALL_DIR=${AGENT_TOOLS}/uv/python \
+    UV_PYTHON_BIN_DIR=${AGENT_TOOLS}/bin \
+    DOTNET_CLI_HOME=${AGENT_TOOLS}/dotnet \
+    NUGET_PACKAGES=${AGENT_TOOLS}/cache/nuget \
+    NUGET_HTTP_CACHE_PATH=${AGENT_TOOLS}/cache/nuget-http
+ENV PATH=${AGENT_TOOLS}/bin:${AGENT_TOOLS}/bun/bin:${AGENT_TOOLS}/dotnet/.dotnet/tools:${PATH}
+
 # Client configs are applied at container start by `maesttro configure`
-# (mounted from the host's install): /home/agent is a persistent volume, so
-# anything baked here would only ever reach brand-new volumes.
+# (mounted from the host's install): the session home shadows /home/agent
 
 # Starts as root only to remap agent to the host user's uid/gid (bind mounts
 # keep host ownership on Linux), then drops to agent before running anything

package/docker/entrypoint.sh

@@ -9,10 +9,16 @@ if [ -n "$uid" ] && [ "$uid" != "$(id -u agent)" ]; then
   usermod --non-unique --uid "$uid" --gid "$gid" agent
 fi
 
-owner="$(id -u agent):$(id -g agent)"
-if [ -n "$uid" ] && [ "$(stat -c %u:%g /home/agent)" != "$owner" ]; then
-  find /home/agent -xdev -exec chown -h "$owner" {} + 2>/dev/null || true
+# cp -a onto the directory itself would copy /etc/skel's own mode, clobbering the 0700 the host set
+if [ ! -e /home/agent/.profile ]; then
+  find /etc/skel -mindepth 1 -maxdepth 1 -exec cp -a {} /home/agent/ \;
 fi
 
+owner="$(id -u agent):$(id -g agent)"
+find /home/agent /home/agent/.claude -xdev \! -user agent -exec chown -h "$owner" {} + 2>/dev/null || true
+
+mkdir -p "$AGENT_TOOLS"
+chown "$owner" "$AGENT_TOOLS"
+
 export HOME=/home/agent USER=agent LOGNAME=agent
 exec setpriv --reuid=agent --regid=agent --init-groups /bin/bash -c "$*"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "maesttro",
-  "version": "0.4.4",
+  "version": "0.6.0",
   "description": "Isolated Docker runner for local coding agents (opencode, claude, ...) under a dedicated bot GitHub identity, with curated configs baked in per client.",
   "type": "module",
   "bin": {
@@ -26,5 +26,8 @@
     "node": ">=18"
   },
   "license": "UNLICENSED",
-  "private": false
+  "private": false,
+  "devDependencies": {
+    "@clack/prompts": "1.8.1"
+  }
 }