Merge pull request #389 from thevibeworks/fix/statusline-data-dir-388

fix: stop hard-coding statusline data dir into containers

Author: lroolle

.gitignore

@@ -1,6 +1,7 @@
 # Created by https://www.toptal.com/developers/gitignore/api/node
 # Edit at https://www.toptal.com/developers/gitignore?templates=node
 
+.claude/
 *.bak
 
 ### Node ###

AGENTS.md

@@ -1,209 +1,25 @@
-This file provides guidance to coding agents working in this repository.
-
-## What This Repo Is
-
-`deva.sh` is a Docker-based multi-agent launcher for:
-
-- OpenAI Codex
-- Claude Code
-- Google Gemini CLI
-
-The container is the sandbox. Agent-level permission theater is not.
-
-That is the core design. Do not "improve" it by moving trust back into
-interactive prompt confirmations.
-
-## Workflow Rules
-
-We use issue-based development.
-
-1. Before any Git or GitHub CLI command, read the matching file in
-   `workflows/`:
-   - `GITHUB-ISSUE.md`
-   - `GIT-COMMIT.md`
-   - `GITHUB-PR.md`
-   - `RELEASE.md`
-2. Keep one branch per issue when practical.
-3. PRs should reference and close the relevant issue.
-
-## Release Rules
-
-Release workflow lives in `workflows/RELEASE.md`.
-
-Current release source of truth:
-
-- version comes from `deva.sh`
-- changelog comes from `CHANGELOG.md`
-- images are published by GitHub Actions
-
-Do not use `claude.sh` as the version source. That is old baggage.
-
-## Project Structure
-
-```text
-deva/
-├── deva.sh
-├── claude.sh
-├── claude-yolo
-├── agents/
-├── Dockerfile
-├── Dockerfile.rust
-├── docker-entrypoint.sh
-├── install.sh
-├── .deva.example
-├── examples/
-├── docs/
-├── .github/workflows/
-├── workflows/
-├── CHANGELOG.md
-├── DEV-LOGS.md
-└── AGENTS.md
-```
-
-Important current roles:
-
-- `deva.sh`: primary entrypoint and container lifecycle manager
-- `agents/*.sh`: agent-specific auth and command wiring
-- `install.sh`: one-line installer
-- `.github/workflows/ci.yml`: lint, docs, and smoke coverage
-- `.github/workflows/release.yml`: tagged image + release flow
-- `.github/workflows/nightly-images.yml`: scheduled nightly image refresh
-
-Legacy compatibility wrappers still exist:
-
-- `claude.sh`
-- `claude-yolo`
-
-They are compatibility shims, not primary branding.
-
-## Security Model
-
-Deva runs agent CLIs inside Docker and disables their built-in permission
-prompts:
-
-- Claude: `--dangerously-skip-permissions`
-- Gemini: `--yolo`
-- Codex: unrestricted mode equivalent
-
-That is deliberate.
-
-The security boundary is:
-
-- the container
-- the exact mounts and env vars we pass into it
-
-So the real risks are the host bridges we expose:
-
-- mounted workspace paths
-- mounted auth files
-- `/var/run/docker.sock`
-- `--host-net`
-- tmux bridge tooling
-
-Do not document or implement this as if the agent sandbox is protecting the
-host. It is not.
-
-## Auth And Config Model
-
-Deva supports multiple auth modes per agent.
-
-Current design:
-
-- default config root is `~/.config/deva`
-- per-agent homes live under that root
-- `--config-home` isolates auth state
-- `-Q` means bare mode: no config loading, no autolink, no host auth mounts
-- non-default auth overlays default credential paths instead of moving live
-  host files around
-
-If you touch auth code, verify real `--dry-run` output and one live path.
-Auth bugs are usually mount bugs wearing a fake auth moustache.
-
-## Container Model
-
-Persistent containers are keyed by workspace plus container shape.
-
-Shape includes things like:
-
-- selected agent
-- extra volumes
-- explicit config home
-- auth mode
-
-So it is not "one container per repo" in the naive sense. Different shapes
-must not collide.
-
-For clean repros and CI smoke tests, use:
-
-```bash
-deva.sh claude -Q -- --version
-deva.sh codex -Q -- --version
-deva.sh gemini -Q -- --version
-```
-
-Non-interactive launch paths must work without a TTY.
-
-## Common Checks
-
-Run these before claiming things work:
-
-```bash
-./deva.sh --help
-./deva.sh --version
-./claude-yolo --help
-./scripts/version-check.sh
-```
-
-If you changed container launch, mounts, auth, or the installer, also run:
-
-```bash
-./deva.sh claude --debug --dry-run
-./deva.sh claude -Q -- --version
-./deva.sh codex -Q -- --version
-./deva.sh gemini -Q -- --version
-```
-
-If you changed docs site plumbing, also run:
-
-```bash
-mkdocs build --strict
-```
-
-## Bridges
-
-Bridges are deliberate holes from container back to host.
-
-Current ones:
-
-- Docker socket mount
-- tmux bridge
-
-Treat bridge changes as security-sensitive. They change the real trust
-boundary, not some fake marketing boundary.
-
-## Documentation Rules
-
-Public copy should say `deva.sh` first.
-
-Allowed:
-
-- mention `claude.sh` / `claude-yolo` as compatibility wrappers
-- historical notes in changelog/dev logs
-
-Not allowed:
-
-- presenting the project as Claude-only
-- using `claude.sh` as the primary interface in current docs
-- leaving stale release or workflow prompts centered on old naming
-
-## Issue Hygiene
-
-Do not use the issue queue as a mirror of every upstream vendor changelog.
-
-If upstream version tracking is automated, close the old noise and keep the
-real issue queue for:
-
-- bugs in deva
-- missing features in deva
-- docs gaps in deva
-- concrete release/process work in deva
+@./.claude/CLAUDE.md
+@./CLAUDE.md
+
+<!-- deva:container-context -->
+# Container Environment (deva)
+
+You are inside a Docker container running Ubuntu Linux 24.04 LTS
+(Noble Numbat), not on the host machine. The workspace is a
+bind-mount from the host at the same absolute path, but the
+runtime is Linux.
+
+- This is Linux. Host-only tools (open, pbcopy, pbpaste, sw_vers,
+  diskutil, defaults, launchctl) are not available.
+- No display server. Browsers and GUI tools will not work.
+- Hard links (`ln` without -s) fail across mount boundaries.
+  Use `cp` or relative symbolic links (`ln -sr`).
+- Prefer relative paths for project-internal references.
+  Absolute paths work here but are container-specific.
+- $HOME is /home/deva (not /root). sudo works without password.
+- Pre-installed: Node.js, Python (use `uv`, not pip), Go, git,
+  gh, make, curl. pip is NOT in PATH.
+- Docker is available (socket mounted from host).
+- System packages and build caches persist across sessions.
+- Container details are in DEVA_* environment variables.
+<!-- /deva:container-context -->

Dockerfile

@@ -151,9 +151,11 @@ RUN --mount=type=cache,target=/tmp/tmux-cache,sharing=locked \
     hash -r && \
     tmux -V
 
-ENV NPM_CONFIG_FETCH_RETRIES=5 \
+ENV NPM_CONFIG_FETCH_RETRIES=2 \
     NPM_CONFIG_FETCH_RETRY_FACTOR=2 \
-    NPM_CONFIG_FETCH_RETRY_MINTIMEOUT=10000
+    NPM_CONFIG_FETCH_RETRY_MINTIMEOUT=1000 \
+    NPM_CONFIG_FETCH_RETRY_MAXTIMEOUT=10000 \
+    NPM_CONFIG_FETCH_TIMEOUT=30000
 
 # Stable agent base: user, shell, and shared runtimes.
 # Keep volatile agent package installs out of this stage so downstream

Makefile

@@ -40,6 +40,8 @@ PLAYWRIGHT_VERSION ?= 1.60.0
 RUST_TOOLCHAINS ?= stable
 RUST_DEFAULT_TOOLCHAIN ?= stable
 RUST_TARGETS ?= wasm32-unknown-unknown
+DOCKER_BUILD_EXTRA_ARGS ?=
+SKIP_BUILD_NETWORK_CHECK ?= 0
 
 TOOLCHAIN_BUILD_ARGS := \
 	--build-arg NODE_MAJOR=$(NODE_MAJOR) \
@@ -91,15 +93,26 @@ export VERSION_PINS_FILE
 
 .DEFAULT_GOAL := help
 
-.PHONY: build build-main rebuild build-core build-rust-image build-rust build-all
+.PHONY: build build-network-check build-main rebuild build-core build-rust-image build-rust build-all
 .PHONY: buildx buildx-multi buildx-multi-rust buildx-multi-local
 .PHONY: versions-up versions versions-pin toolchains scripts commands clean clean-all shell test test-rust test-local
 .PHONY: info push pull build-test dev context-size lint version-check
 .PHONY: release-patch release-minor release-major help
 
 build: build-all
 
-build-main:
+build-network-check:
+	@if [ "$(SKIP_BUILD_NETWORK_CHECK)" = "1" ]; then \
+		echo "Skipping Docker build network check"; \
+	else \
+		echo "Checking Docker build DNS for registry.npmjs.org..."; \
+		printf '%s\n' \
+			'FROM node:$(NODE_MAJOR)-bookworm-slim' \
+			'RUN node -e "require('\''dns'\'').lookup('\''registry.npmjs.org'\'',{all:true},(e,a)=>{if(e){console.error(e);process.exit(1)};console.log(a.map(x=>x.address).slice(0,3).join('\'','\''))})"' \
+			| docker build $(DOCKER_BUILD_EXTRA_ARGS) --progress=plain --no-cache -f - . >/dev/null; \
+	fi
+
+build-main: build-network-check
 	@echo "🔨 Building Docker image with $(DOCKERFILE)..."
 	@if [ -f "$(VERSION_PINS_FILE)" ]; then \
 		echo "📌 Using shared defaults from $(VERSION_PINS_FILE)"; \
@@ -136,23 +149,23 @@ build-main:
 		   fi; \
 		 fi
 	@echo "Hint: override via GO_VERSION=... CLAUDE_CODE_VERSION=... or run 'make versions-pin'"
-	docker build -f $(DOCKERFILE) $(MAIN_BUILD_ARGS) -t $(MAIN_IMAGE) .
+	docker build $(DOCKER_BUILD_EXTRA_ARGS) -f $(DOCKERFILE) $(MAIN_BUILD_ARGS) -t $(MAIN_IMAGE) .
 	@echo "✅ Build completed: $(MAIN_IMAGE)"
 
 rebuild:
 	@echo "🔨 Rebuilding Docker image (no cache) with $(DOCKERFILE)..."
-	docker build -f $(DOCKERFILE) --no-cache $(MAIN_BUILD_ARGS) -t $(MAIN_IMAGE) .
+	docker build $(DOCKER_BUILD_EXTRA_ARGS) -f $(DOCKERFILE) --no-cache $(MAIN_BUILD_ARGS) -t $(MAIN_IMAGE) .
 	@echo "✅ Rebuild completed: $(MAIN_IMAGE)"
 
 
 build-core:
 	@echo "🔨 Building stable core image..."
-	docker build -f $(DOCKERFILE) --target agent-base $(CORE_BUILD_ARGS) -t $(CORE_IMAGE) .
+	docker build $(DOCKER_BUILD_EXTRA_ARGS) -f $(DOCKERFILE) --target agent-base $(CORE_BUILD_ARGS) -t $(CORE_IMAGE) .
 	@echo "✅ Core build completed: $(CORE_IMAGE)"
 
-build-rust-image:
+build-rust-image: build-network-check
 	@echo "🔨 Building Rust Docker image..."
-	docker build -f $(RUST_DOCKERFILE) \
+	docker build $(DOCKER_BUILD_EXTRA_ARGS) -f $(RUST_DOCKERFILE) \
 		--build-arg BASE_IMAGE=$(CORE_IMAGE) \
 		$(RUST_BUILD_ARGS) \
 		-t $(RUST_IMAGE) .
@@ -348,6 +361,7 @@ help:
 	@echo ""
 	@echo "Available targets:"
 	@echo "  build                Build all images with pinned Makefile defaults"
+	@echo "  build-network-check  Check Docker build DNS before npm-heavy stages"
 	@echo "  build-core           Build stable core image only"
 	@echo "  build-main           Build main Docker image only"
 	@echo "  build-rust           Build Rust Docker image"