perf(api): speed up controller Docker rebuilds

Author: skulidropek

.dockerignore

@@ -1,5 +1,19 @@
 .git
+.codex
+.github
+.knowledge
 node_modules
 **/node_modules
 **/.cache
+**/.turbo
+coverage
+dist
+dist-test
+dist-web
+packages/*/coverage
+packages/*/dist
+packages/*/dist-test
+packages/*/dist-web
+**/.vite
+**/*.log
 third_party/skiller-desktop-skills-manager/out

.github/workflows/check.yml

@@ -153,6 +153,8 @@ jobs:
     name: E2E (Browser command)
     runs-on: ubuntu-latest
     timeout-minutes: 40
+    env:
+      DOCKER_GIT_CONTROLLER_BUILD_SKILLER: "0"
     steps:
       - uses: actions/checkout@v6
         with:
@@ -170,6 +172,8 @@ jobs:
     name: E2E (OpenCode)
     runs-on: ubuntu-latest
     timeout-minutes: 40
+    env:
+      DOCKER_GIT_CONTROLLER_BUILD_SKILLER: "0"
     steps:
       - uses: actions/checkout@v6
         with:
@@ -187,6 +191,8 @@ jobs:
     name: E2E (Clone cache)
     runs-on: ubuntu-latest
     timeout-minutes: 40
+    env:
+      DOCKER_GIT_CONTROLLER_BUILD_SKILLER: "0"
     steps:
       - uses: actions/checkout@v6
         with:
@@ -204,6 +210,8 @@ jobs:
     name: E2E (Login context)
     runs-on: ubuntu-latest
     timeout-minutes: 40
+    env:
+      DOCKER_GIT_CONTROLLER_BUILD_SKILLER: "0"
     steps:
       - uses: actions/checkout@v6
         with:
@@ -221,6 +229,8 @@ jobs:
     name: E2E (Runtime volumes + SSH)
     runs-on: ubuntu-latest
     timeout-minutes: 60
+    env:
+      DOCKER_GIT_CONTROLLER_BUILD_SKILLER: "0"
     steps:
       - uses: actions/checkout@v6
         with:
@@ -238,6 +248,8 @@ jobs:
     name: E2E (Clone auto-open SSH)
     runs-on: ubuntu-latest
     timeout-minutes: 40
+    env:
+      DOCKER_GIT_CONTROLLER_BUILD_SKILLER: "0"
     steps:
       - uses: actions/checkout@v6
         with:

docker-compose.api.yml

@@ -4,10 +4,13 @@ services:
       context: .
       dockerfile: packages/api/Dockerfile
       args:
+        DOCKER_GIT_CONTROLLER_REV: ${DOCKER_GIT_CONTROLLER_REV:-unknown}
+        DOCKER_GIT_CONTROLLER_BUILD_SKILLER: ${DOCKER_GIT_CONTROLLER_BUILD_SKILLER:-1}
         UBUNTU_APT_MIRROR: ${UBUNTU_APT_MIRROR:-}
     container_name: ${DOCKER_GIT_API_CONTAINER_NAME:-docker-git-api}
     environment:
       DOCKER_GIT_API_PORT: ${DOCKER_GIT_API_PORT:-3334}
+      DOCKER_GIT_CONTROLLER_REV: ${DOCKER_GIT_CONTROLLER_REV:-unknown}
       DOCKER_GIT_DOCKER_RUNTIME: ${DOCKER_GIT_DOCKER_RUNTIME:-isolated}
       DOCKER_HOST: ${DOCKER_GIT_CONTROLLER_DOCKER_HOST:-unix:///var/run/docker.sock}
       DOCKER_GIT_DOCKERD_TCP_HOST: ${DOCKER_GIT_DOCKERD_TCP_HOST:-tcp://0.0.0.0:2375}

docker-compose.yml

@@ -5,6 +5,7 @@ services:
       dockerfile: packages/api/Dockerfile
       args:
         DOCKER_GIT_CONTROLLER_REV: ${DOCKER_GIT_CONTROLLER_REV:-unknown}
+        DOCKER_GIT_CONTROLLER_BUILD_SKILLER: ${DOCKER_GIT_CONTROLLER_BUILD_SKILLER:-1}
         UBUNTU_APT_MIRROR: ${UBUNTU_APT_MIRROR:-}
     container_name: ${DOCKER_GIT_API_CONTAINER_NAME:-docker-git-api}
     environment:

packages/api/Dockerfile

@@ -1,11 +1,8 @@
-FROM ubuntu:26.04
+FROM ubuntu:26.04 AS controller-base
 
-ARG DOCKER_GIT_CONTROLLER_REV=unknown
 ARG UBUNTU_APT_MIRROR=
-LABEL io.prover-coder-ai.docker-git.controller-rev=$DOCKER_GIT_CONTROLLER_REV
 
 ENV DEBIAN_FRONTEND=noninteractive
-ENV DOCKER_GIT_CONTROLLER_REV=$DOCKER_GIT_CONTROLLER_REV
 ENV BUN_INSTALL=/opt/bun
 ENV PATH=/opt/bun/bin:$PATH
 WORKDIR /workspace
@@ -55,16 +52,23 @@ RUN curl -fsSL https://deb.nodesource.com/setup_24.x | bash - \
  && npm i -g node-gyp \
  && rm -rf /var/lib/apt/lists/*
 
+FROM controller-base AS workspace-deps
+
 COPY package.json bun.lock bunfig.toml tsconfig.base.json tsconfig.json ./
-COPY patches ./patches
-COPY scripts ./scripts
-COPY packages ./packages
-COPY .gitmodules ./.gitmodules
-COPY third_party ./third_party
+RUN mkdir -p packages/api packages/app packages/docker-git-session-sync packages/lib
+COPY packages/api/package.json ./packages/api/package.json
+COPY packages/app/package.json ./packages/app/package.json
+COPY packages/docker-git-session-sync/package.json ./packages/docker-git-session-sync/package.json
+COPY packages/lib/package.json ./packages/lib/package.json
 
 RUN set -eu; \
     for attempt in 1 2 3 4 5; do \
-      if bun install --frozen-lockfile --silent; then \
+      if bun install \
+        --frozen-lockfile \
+        --silent \
+        --filter @effect-template/api \
+        --filter @effect-template/lib \
+        --filter @prover-coder-ai/docker-git-session-sync; then \
         exit 0; \
       fi; \
       echo "bun install attempt ${attempt} failed; retrying..." >&2; \
@@ -73,28 +77,78 @@ RUN set -eu; \
     done; \
     echo "bun install failed after retries" >&2; \
     exit 1
+
+FROM workspace-deps AS workspace-static
+
+COPY patches ./patches
+COPY scripts ./scripts
+COPY packages/docker-git-session-sync ./packages/docker-git-session-sync
+COPY packages/lib ./packages/lib
+
+RUN bun run --cwd packages/docker-git-session-sync build
 RUN bun run --cwd packages/lib build
-RUN bun run --cwd packages/api build
-RUN bun scripts/skiller-apply-docker-git-patches.mjs
-RUN test -f third_party/skiller-desktop-skills-manager/package.json \
- && cd third_party/skiller-desktop-skills-manager \
- && for attempt in 1 2 3 4 5; do \
-      if bun install --frozen-lockfile --silent; then \
-        break; \
-      fi; \
-      if [ "$attempt" = "5" ]; then \
-        echo "skiller bun install failed after retries" >&2; \
-        exit 1; \
-      fi; \
-      echo "skiller bun install attempt ${attempt} failed; retrying..." >&2; \
-      rm -rf /root/.bun/install/cache node_modules; \
-      sleep $((attempt * 2)); \
-    done \
- && bun run build \
- && touch out/.docker-git-browser-folder-picker.patch \
- && mkdir -p out/preload \
- && ln -sf index.mjs out/preload/index.js
 
+FROM controller-base AS skiller-build
+
+ARG DOCKER_GIT_CONTROLLER_BUILD_SKILLER=1
+
+COPY patches ./patches
+COPY scripts/skiller-apply-docker-git-patches.mjs ./scripts/skiller-apply-docker-git-patches.mjs
+COPY .gitmodules ./.gitmodules
+COPY third_party ./third_party
+
+RUN if [ "$DOCKER_GIT_CONTROLLER_BUILD_SKILLER" = "1" ]; then \
+      bun scripts/skiller-apply-docker-git-patches.mjs; \
+    else \
+      echo "Skipping Skiller build for controller image."; \
+    fi
+RUN if [ "$DOCKER_GIT_CONTROLLER_BUILD_SKILLER" = "1" ]; then \
+      test -f third_party/skiller-desktop-skills-manager/package.json \
+      && cd third_party/skiller-desktop-skills-manager \
+      && for attempt in 1 2 3 4 5; do \
+          if bun install --frozen-lockfile --silent; then \
+            break; \
+          fi; \
+          if [ "$attempt" = "5" ]; then \
+            echo "skiller bun install failed after retries" >&2; \
+            exit 1; \
+          fi; \
+          echo "skiller bun install attempt ${attempt} failed; retrying..." >&2; \
+          rm -rf /root/.bun/install/cache node_modules; \
+          sleep $((attempt * 2)); \
+        done \
+      && bun run build \
+      && touch out/.docker-git-browser-folder-picker.patch \
+      && mkdir -p out/preload \
+      && ln -sf index.mjs out/preload/index.js; \
+    else \
+      cd third_party/skiller-desktop-skills-manager \
+      && mkdir -p node_modules/electron/dist out/main out/renderer out/preload \
+      && printf '%s\n' '#!/usr/bin/env sh' 'echo "Skiller is not bundled in this controller image." >&2' 'exit 1' \
+        > node_modules/electron/dist/electron \
+      && chmod +x node_modules/electron/dist/electron \
+      && printf '%s\n' 'throw new Error("Skiller is not bundled in this controller image.")' > out/main/index.js \
+      && printf '%s\n' '<!doctype html><title>Skiller unavailable</title>' > out/renderer/index.html \
+      && printf '%s\n' 'export {}' > out/preload/index.mjs \
+      && touch out/.docker-git-browser-folder-picker.patch \
+      && ln -sf index.mjs out/preload/index.js; \
+    fi
+
+FROM workspace-static AS controller-final
+
+COPY .gitmodules ./.gitmodules
+COPY --from=skiller-build /workspace/third_party/skiller-desktop-skills-manager ./third_party/skiller-desktop-skills-manager
+COPY packages/api ./packages/api
+
+RUN ./packages/api/node_modules/.bin/tsc -p packages/api/tsconfig.json
+
+ARG DOCKER_GIT_CONTROLLER_REV=unknown
+ARG DOCKER_GIT_CONTROLLER_BUILD_SKILLER=1
+LABEL io.prover-coder-ai.docker-git.controller-rev=$DOCKER_GIT_CONTROLLER_REV
+LABEL io.prover-coder-ai.docker-git.controller-build-skiller=$DOCKER_GIT_CONTROLLER_BUILD_SKILLER
+
+ENV DOCKER_GIT_CONTROLLER_REV=$DOCKER_GIT_CONTROLLER_REV
+ENV DOCKER_GIT_CONTROLLER_BUILD_SKILLER=$DOCKER_GIT_CONTROLLER_BUILD_SKILLER
 ENV DOCKER_GIT_API_PORT=3334
 ENV DOCKER_GIT_DOCKER_RUNTIME=isolated
 ENV DOCKER_HOST=unix:///var/run/docker.sock

packages/app/src/docker-git/controller-bootstrap-plan.ts

@@ -0,0 +1,76 @@
+export type ControllerComposeUpPlan = {
+  readonly buildController: boolean
+  readonly forceRecreateController: boolean
+}
+
+export type ControllerImageBuildInput = {
+  readonly localControllerRevision: string
+  readonly currentControllerRevision: string | null
+  readonly currentImageRevision: string | null
+  readonly forceRecreateController: boolean
+}
+
+/**
+ * Renders the docker compose `up` arguments for the controller bootstrap plan.
+ *
+ * @param plan - Immutable build/recreate decision.
+ * @returns Compose arguments preserving the fixed `up -d` prefix.
+ *
+ * @pure true
+ * @effect n/a
+ * @invariant `--build` is present iff `plan.buildController`.
+ * @precondition Plan booleans are already resolved from Docker state.
+ * @postcondition Returned arguments contain no duplicate compose flags.
+ * @complexity O(1) time and O(1) space.
+ * @throws Never
+ */
+// CHANGE: derive docker compose up flags from explicit bootstrap requirements
+// WHY: matching controller images should be started without invalidating Docker build cache
+// QUOTE(ТЗ): "хочу сузить время билда докер контейнера"
+// REF: user-request-2026-05-22-controller-build-speed
+// SOURCE: n/a
+// FORMAT THEOREM: forall p: build(p) <=> "--build" in args(p)
+// PURITY: CORE
+// EFFECT: n/a
+// INVARIANT: forceRecreateController controls only --force-recreate
+// COMPLEXITY: O(1)
+export const resolveControllerComposeUpArgs = (
+  plan: ControllerComposeUpPlan
+): ReadonlyArray<string> => [
+  "up",
+  "-d",
+  ...(plan.buildController ? ["--build"] : []),
+  ...(plan.forceRecreateController ? ["--force-recreate"] : [])
+]
+
+/**
+ * Decides whether the controller image must be rebuilt before `docker compose up`.
+ *
+ * @param input - Current controller/image revisions and recreate requirement.
+ * @returns `true` only when neither reusable Docker object proves the local revision.
+ *
+ * @pure true
+ * @effect n/a
+ * @invariant A matching image revision is sufficient proof to skip build.
+ * @precondition Revisions are normalized controller revision strings or null.
+ * @postcondition Forced recreation rebuilds only when no matching image exists.
+ * @complexity O(1) time and O(1) space.
+ * @throws Never
+ */
+// CHANGE: decide whether controller bootstrap needs a Docker image build
+// WHY: source revision can be satisfied by either the existing container or an already-built image
+// QUOTE(ТЗ): "контейнер собирается минут 5-6"
+// REF: user-request-2026-05-22-controller-build-speed
+// SOURCE: n/a
+// FORMAT THEOREM: image_rev = local_rev -> build_required = false
+// PURITY: CORE
+// EFFECT: n/a
+// INVARIANT: forced recreation without a matching image requires a rebuild
+// COMPLEXITY: O(1)
+export const shouldBuildControllerImage = (input: ControllerImageBuildInput): boolean => {
+  if (input.currentImageRevision === input.localControllerRevision) {
+    return false
+  }
+
+  return input.currentControllerRevision !== input.localControllerRevision || input.forceRecreateController
+}