Skip to content

Commit 80c18b9

Browse files
lroollelroolle
authored
Merge pull request #253 from thevibeworks/fix/upgrade-mounts
Improve rust image upgrades and built-in browser tooling
2 parents a011481 + bc633a9 commit 80c18b9

6 files changed

Lines changed: 258 additions & 5 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ jobs:
4747
- name: Unit tests (release-utils.sh)
4848
run: bash tests/test_release_utils.sh
4949

50+
- name: Unit tests (version-upgrade.sh)
51+
run: bash tests/version-upgrade.sh
52+
5053
smoke:
5154
name: Installer Smoke Test
5255
runs-on: ubuntu-latest

‎Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ buildx-multi-local:
197197
versions-up:
198198
@MAIN_IMAGE=$(DETECTED_IMAGE) \
199199
BUILD_IMAGE=$(MAIN_IMAGE) \
200+
CORE_IMAGE=$(CORE_IMAGE) \
200201
RUST_IMAGE=$(RUST_IMAGE) \
201202
DOCKERFILE=$(DOCKERFILE) \
202203
RUST_DOCKERFILE=$(RUST_DOCKERFILE) \

‎deva.sh‎

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -567,9 +567,12 @@ user_volume_mounts_target() {
567567
local target="$1"
568568
local spec remainder dest
569569

570+
target="$(normalize_container_bind_target "$target")"
571+
570572
for spec in "${USER_VOLUMES[@]+"${USER_VOLUMES[@]}"}"; do
571573
remainder="${spec#*:}"
572574
dest="${remainder%%:*}"
575+
dest="$(normalize_container_bind_target "$dest")"
573576
if [ "$dest" = "$target" ]; then
574577
return 0
575578
fi
@@ -578,6 +581,27 @@ user_volume_mounts_target() {
578581
return 1
579582
}
580583

584+
normalize_container_bind_target() {
585+
local path="$1"
586+
587+
while [ "$path" != "/" ] && [[ "$path" == */ ]]; do
588+
path="${path%/}"
589+
done
590+
591+
printf '%s' "$path"
592+
}
593+
594+
append_shared_agents_mount() {
595+
local target="/home/deva/.agents"
596+
597+
[ "$QUICK_MODE" = false ] || return 0
598+
[ -d "$HOME/.agents" ] || return 0
599+
600+
if ! user_volume_mounts_target "$target"; then
601+
USER_VOLUMES+=("$HOME/.agents:$target")
602+
fi
603+
}
604+
581605
prepare_claude_chrome_detection_mount() {
582606
local profile_path=""
583607
local user_data_dir=""
@@ -2936,6 +2960,7 @@ autolink_legacy_into_deva_root() {
29362960
check_agent "$ACTIVE_AGENT"
29372961
prepare_browser_integration
29382962
prepare_claude_chrome_bridge
2963+
append_shared_agents_mount
29392964
29402965
if [ -n "$CONFIG_HOME" ] && [ "$DRY_RUN" != true ]; then
29412966
if [ ! -d "$CONFIG_HOME" ]; then
@@ -3137,9 +3162,6 @@ if [ "$CONFIG_HOME_FROM_CLI" = false ] && [ "$QUICK_MODE" = false ]; then
31373162
if [ -d "$HOME/.cache/deva" ]; then
31383163
DOCKER_ARGS+=("-v" "$HOME/.cache/deva:/home/deva/.cache/deva")
31393164
fi
3140-
if [ -d "$HOME/.agents" ]; then
3141-
DOCKER_ARGS+=("-v" "$HOME/.agents:/home/deva/.agents")
3142-
fi
31433165
fi
31443166
31453167
append_user_envs

‎scripts/test-mount-shape.sh‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,20 @@ if grep -F -- "-v $hybrid_root/host/.codex:/home/deva/.codex" <<<"$cli_out" >/de
124124
exit 1
125125
fi
126126

127+
mkdir -p "$hybrid_root/home/.agents" "$hybrid_root/cli/.agents"
128+
agents_out="$(run_hybrid claude --dry-run -v "$hybrid_root/cli/.agents/:/home/deva/.agents" || true)"
129+
if grep -F -- 'duplicate bind mount target detected' <<<"$agents_out" >/dev/null; then
130+
echo "CLI -v override for /home/deva/.agents triggered duplicate-target error" >&2
131+
echo "$agents_out" >&2
132+
exit 1
133+
fi
134+
agents_count="$(count_target /home/deva/.agents "$agents_out")"
135+
if [[ "$agents_count" -ne 1 ]]; then
136+
echo "CLI -v override for /home/deva/.agents emitted $agents_count times (want 1)" >&2
137+
echo "$agents_out" >&2
138+
exit 1
139+
fi
140+
127141
# ───── hybrid-by-default coverage ─────
128142
# Populated per-agent XDG subdirs trigger hybrid mounts automatically,
129143
# without any .deva VOLUME= entries. --config-home DIR still isolates.

‎scripts/version-upgrade.sh‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ source "$SCRIPT_DIR/version-pins.sh"
2626
# Defaults
2727
CHECK_IMAGE=${MAIN_IMAGE:-ghcr.io/thevibeworks/deva:latest}
2828
BUILD_IMAGE=${BUILD_IMAGE:-ghcr.io/thevibeworks/deva:latest}
29+
CORE_IMAGE=${CORE_IMAGE:-ghcr.io/thevibeworks/deva:core}
2930
RUST_IMAGE=${RUST_IMAGE:-ghcr.io/thevibeworks/deva:rust}
3031
DOCKERFILE=${DOCKERFILE:-Dockerfile}
3132
RUST_DOCKERFILE=${RUST_DOCKERFILE:-Dockerfile.rust}
@@ -42,6 +43,7 @@ Options:
4243
4344
Environment:
4445
MAIN_IMAGE Main image name (default: ghcr.io/thevibeworks/deva:latest)
46+
CORE_IMAGE Core image name (default: ghcr.io/thevibeworks/deva:core)
4547
RUST_IMAGE Rust image name (default: ghcr.io/thevibeworks/deva:rust)
4648
VERSION_PINS_FILE Shared version pin file (default: versions.env)
4749
CLAUDE_CODE_VERSION Override claude-code version
@@ -69,7 +71,7 @@ main() {
6971
echo -e "${CYAN}${BOLD}║ Upgrading to Latest Versions ║${RESET}"
7072
echo -e "${CYAN}${BOLD}╚════════════════════════════════════════════════════╝${RESET}"
7173
echo -e "${DIM}Time: $(date '+%Y-%m-%d %H:%M:%S')${RESET}"
72-
echo -e "${DIM}Check: ${CHECK_IMAGE} Build: ${BUILD_IMAGE}${RESET}"
74+
echo -e "${DIM}Check: ${CHECK_IMAGE} Build: ${BUILD_IMAGE} Core: ${CORE_IMAGE}${RESET}"
7375
echo ""
7476

7577
bash "$SCRIPT_DIR/toolchain-report.sh"
@@ -122,6 +124,19 @@ main() {
122124
echo ""
123125
fi
124126

127+
section "Building Core Image"
128+
docker build -f "$DOCKERFILE" \
129+
--target agent-base \
130+
--build-arg NODE_MAJOR="$NODE_MAJOR" \
131+
--build-arg GO_VERSION="$GO_VERSION" \
132+
--build-arg PYTHON_VERSION="$PYTHON_VERSION" \
133+
--build-arg DELTA_VERSION="$DELTA_VERSION" \
134+
--build-arg TMUX_VERSION="$TMUX_VERSION" \
135+
--build-arg TMUX_SHA256="$TMUX_SHA256" \
136+
--build-arg COPILOT_API_VERSION="$copilot_ver" \
137+
-t "$CORE_IMAGE" .
138+
139+
echo ""
125140
section "Building Main Image"
126141
docker build -f "$DOCKERFILE" \
127142
--build-arg NODE_MAJOR="$NODE_MAJOR" \
@@ -141,7 +156,7 @@ main() {
141156
echo ""
142157
section "Building Rust Image"
143158
docker build -f "$RUST_DOCKERFILE" \
144-
--build-arg BASE_IMAGE="$BUILD_IMAGE" \
159+
--build-arg BASE_IMAGE="$CORE_IMAGE" \
145160
--build-arg CLAUDE_CODE_VERSION="$claude_ver" \
146161
--build-arg CLAUDE_TRACE_VERSION="$claude_trace_ver" \
147162
--build-arg CODEX_VERSION="$codex_ver" \

‎tests/version-upgrade.sh‎

Lines changed: 198 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,198 @@
1+
#!/usr/bin/env bash
2+
set -euo pipefail
3+
4+
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
5+
REPO_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
6+
7+
TMP_ROOT="$(mktemp -d)"
8+
FAKE_BIN="$TMP_ROOT/bin"
9+
DOCKER_BUILD_LOG="$TMP_ROOT/docker-build.log"
10+
mkdir -p "$FAKE_BIN"
11+
12+
cleanup() {
13+
rm -rf "$TMP_ROOT"
14+
}
15+
trap cleanup EXIT
16+
17+
cat >"$FAKE_BIN/docker" <<'EOF'
18+
#!/usr/bin/env bash
19+
set -euo pipefail
20+
21+
case "${1:-}" in
22+
inspect)
23+
cat <<'JSON'
24+
[{"Config":{"Labels":{
25+
"org.opencontainers.image.claude_code_version":"2.1.81",
26+
"org.opencontainers.image.claude_trace_version":"1.0.8",
27+
"org.opencontainers.image.codex_version":"0.116.0",
28+
"org.opencontainers.image.gemini_cli_version":"0.35.0",
29+
"org.opencontainers.image.atlas_cli_version":"v0.1.4",
30+
"org.opencontainers.image.copilot_api_version":"0ea08febdd7e3e055b03dd298bf57e669500b5c1",
31+
"org.opencontainers.image.playwright_version":"1.59.0"
32+
}}}]
33+
JSON
34+
;;
35+
build)
36+
printf '%s\n' "$*" >>"$DOCKER_BUILD_LOG"
37+
;;
38+
*)
39+
echo "unexpected docker invocation: $*" >&2
40+
exit 1
41+
;;
42+
esac
43+
EOF
44+
45+
cat >"$FAKE_BIN/npm" <<'EOF'
46+
#!/usr/bin/env bash
47+
set -euo pipefail
48+
49+
if [[ "${1:-}" != "view" ]]; then
50+
echo "unexpected npm invocation: $*" >&2
51+
exit 1
52+
fi
53+
54+
case "${2:-}" in
55+
@anthropic-ai/claude-code)
56+
echo "2.1.87"
57+
;;
58+
@anthropic-ai/claude-code@2.1.87)
59+
echo '{"2.1.87":"2026-03-29T01:40:00Z"}'
60+
;;
61+
@mariozechner/claude-trace)
62+
echo "1.0.9"
63+
;;
64+
@mariozechner/claude-trace@1.0.9)
65+
echo '{"1.0.9":"2026-03-29T01:40:00Z"}'
66+
;;
67+
@openai/codex)
68+
echo "0.117.0"
69+
;;
70+
@openai/codex@0.117.0)
71+
echo '{"0.117.0":"2026-03-26T22:28:00Z"}'
72+
;;
73+
@google/gemini-cli)
74+
echo "0.35.3"
75+
;;
76+
@google/gemini-cli@0.35.3)
77+
echo '{"0.35.3":"2026-03-28T03:17:00Z"}'
78+
;;
79+
playwright)
80+
echo "1.60.0"
81+
;;
82+
playwright@1.60.0)
83+
echo '{"1.60.0":"2026-05-14T08:00:00Z"}'
84+
;;
85+
*)
86+
echo "unexpected npm view args: $*" >&2
87+
exit 1
88+
;;
89+
esac
90+
EOF
91+
92+
cat >"$FAKE_BIN/gh" <<'EOF'
93+
#!/usr/bin/env bash
94+
set -euo pipefail
95+
96+
if [[ "${1:-}" != "api" ]]; then
97+
echo "unexpected gh invocation: $*" >&2
98+
exit 1
99+
fi
100+
101+
case "${2:-}" in
102+
repos/lroolle/atlas-cli/releases/latest)
103+
echo "v0.1.4"
104+
;;
105+
repos/ericc-ch/copilot-api/branches/master)
106+
echo "0ea08febdd7e3e055b03dd298bf57e669500b5c1"
107+
;;
108+
repos/lroolle/atlas-cli/releases/tags/v0.1.4)
109+
echo "2026-01-16T05:42:00Z"
110+
;;
111+
repos/ericc-ch/copilot-api/commits/0ea08febdd7e3e055b03dd298bf57e669500b5c1)
112+
echo "2025-10-05T03:49:00Z"
113+
;;
114+
repos/openai/codex/releases)
115+
echo '[]'
116+
;;
117+
repos/mariozechner/claude-trace/releases)
118+
echo '[]'
119+
;;
120+
repos/microsoft/playwright/releases)
121+
echo '[]'
122+
;;
123+
*)
124+
echo "unexpected gh api args: $*" >&2
125+
exit 1
126+
;;
127+
esac
128+
EOF
129+
130+
cat >"$FAKE_BIN/curl" <<'EOF'
131+
#!/usr/bin/env bash
132+
set -euo pipefail
133+
printf ''
134+
EOF
135+
136+
chmod +x "$FAKE_BIN/docker" "$FAKE_BIN/npm" "$FAKE_BIN/gh" "$FAKE_BIN/curl"
137+
138+
PATH="$FAKE_BIN:$PATH" \
139+
DOCKER_BUILD_LOG="$DOCKER_BUILD_LOG" \
140+
AUTO_YES=1 \
141+
CHECK_IMAGE="ghcr.io/thevibeworks/deva:rust" \
142+
BUILD_IMAGE="ghcr.io/thevibeworks/deva:latest" \
143+
CORE_IMAGE="ghcr.io/thevibeworks/deva:core" \
144+
RUST_IMAGE="ghcr.io/thevibeworks/deva:rust" \
145+
GO_VERSION="1.26.2" \
146+
CLAUDE_TRACE_VERSION="1.0.9" \
147+
PLAYWRIGHT_VERSION="1.60.0" \
148+
"$REPO_ROOT/scripts/version-upgrade.sh" >/dev/null
149+
150+
core_build="$(sed -n '1p' "$DOCKER_BUILD_LOG")"
151+
main_build="$(sed -n '2p' "$DOCKER_BUILD_LOG")"
152+
rust_build="$(sed -n '3p' "$DOCKER_BUILD_LOG")"
153+
154+
[[ -n "$core_build" ]] || { echo "missing core build invocation" >&2; exit 1; }
155+
[[ -n "$main_build" ]] || { echo "missing main build invocation" >&2; exit 1; }
156+
[[ -n "$rust_build" ]] || { echo "missing rust build invocation" >&2; exit 1; }
157+
158+
for expected in \
159+
"--target agent-base" \
160+
"--build-arg COPILOT_API_VERSION=0ea08febdd7e3e055b03dd298bf57e669500b5c1" \
161+
"--build-arg GO_VERSION=1.26.2" \
162+
"-t ghcr.io/thevibeworks/deva:core ."
163+
do
164+
[[ "$core_build" == *"$expected"* ]] || {
165+
echo "core build missing expected arg: $expected" >&2
166+
exit 1
167+
}
168+
done
169+
170+
for expected in \
171+
"--build-arg CLAUDE_CODE_VERSION=2.1.87" \
172+
"--build-arg CLAUDE_TRACE_VERSION=1.0.9" \
173+
"--build-arg CODEX_VERSION=0.117.0" \
174+
"--build-arg GEMINI_CLI_VERSION=0.35.3" \
175+
"--build-arg ATLAS_CLI_VERSION=v0.1.4" \
176+
"--build-arg COPILOT_API_VERSION=0ea08febdd7e3e055b03dd298bf57e669500b5c1" \
177+
"--build-arg GO_VERSION=1.26.2"
178+
do
179+
[[ "$main_build" == *"$expected"* ]] || {
180+
echo "main build missing expected arg: $expected" >&2
181+
exit 1
182+
}
183+
done
184+
185+
for expected in \
186+
"--build-arg BASE_IMAGE=ghcr.io/thevibeworks/deva:core" \
187+
"--build-arg CLAUDE_CODE_VERSION=2.1.87" \
188+
"--build-arg CLAUDE_TRACE_VERSION=1.0.9" \
189+
"--build-arg CODEX_VERSION=0.117.0" \
190+
"--build-arg GEMINI_CLI_VERSION=0.35.3" \
191+
"--build-arg ATLAS_CLI_VERSION=v0.1.4" \
192+
"--build-arg PLAYWRIGHT_VERSION=1.60.0"
193+
do
194+
[[ "$rust_build" == *"$expected"* ]] || {
195+
echo "rust build missing expected arg: $expected" >&2
196+
exit 1
197+
}
198+
done

0 commit comments

Comments
 (0)