drydock-cli 1.5.2__tar.gz → 1.5.4__tar.gz

{drydock_cli-1.5.2 → drydock_cli-1.5.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 1.5.2
+Version: 1.5.4
 Summary: Drydock — nautical CLI coding agent
 Project-URL: Homepage, https://github.com/fbobe321/drydock
 Project-URL: Repository, https://github.com/fbobe321/drydock

{drydock_cli-1.5.2 → drydock_cli-1.5.4}/PRD.md

@@ -1,9 +1,12 @@
 # DryDock — Local CLI Coding Agent
 
 **Repository:** https://github.com/fbobe321/drydock
-**PyPI:** https://pypi.org/project/drydock-cli/ (v1.5.0)
+**PyPI:** https://pypi.org/project/drydock-cli/ (v1.5.3)
 **License:** Apache 2.0 (fork of [mistralai/mistral-vibe](https://github.com/mistralai/mistral-vibe))
-**Status:** Active development — continuous improvement running
+**Status:** Active development
+**Current version:** 1.5.3
+**Hardware:** 2x RTX 4060 Ti 16GB, devstral-24B-AWQ-4bit via vLLM at localhost:8000
+**Server:** remus (Ubuntu 22.04, user: bobef)
 
 ---
 
@@ -30,31 +33,143 @@ Scripts:
 
 ---
 
+## Configuration Management
+
+**CRITICAL: Every script and cron MUST follow these rules.**
+
+### Python Path
+All scripts use explicit Python path, never bare `python3`:
+```bash
+export PATH="/home/bobef/miniconda3/bin:$PATH"
+PYTHON="/home/bobef/miniconda3/bin/python3"
+```
+**Why:** Cron environment doesn't inherit shell PATH. Bare `python3` resolves to `/usr/bin/python3` (system Python, no packages). This caused an 8-hour crash loop where the test battery restarted every 10 minutes and immediately failed.
+
+### Version Tracking
+- `pyproject.toml` is the single source of truth for version
+- `publish_to_pypi.sh` creates git tags (`v1.5.3`, etc.)
+- `publish_to_pypi.sh` runs post-publish integration test (install in venv, verify version)
+- Test scripts log version before running
+
+### Cron Jobs (DryDock)
+| Schedule | Script | Purpose |
+|---|---|---|
+| 2 AM daily | `test_full.sh` | Nightly regression (smoke + real backend) |
+| 3 AM daily | `backup.sh` | rsync to NAS |
+| 4 AM daily | `deploy_to_github.sh` | Sync code to GitHub |
+| Every 10 min | `monitor_test_battery.sh` | Monitor/restart long test runs |
+
+### Pre-Publish Checklist
+1. All smoke tests pass (169 tests)
+2. Version bumped in pyproject.toml
+3. Build succeeds
+4. Upload to PyPI
+5. Git tag created
+6. Integration test: install from wheel in temp venv, verify version matches
+7. Deploy to GitHub
+
+---
+
+## File Locations (CRITICAL for session continuity)
+
+```
+/data3/drydock/                    ← Main repo (git)
+├── drydock/                       ← Python package (source code)
+│   ├── core/
+│   │   ├── agent_loop.py          ← THE most important file. Loop detection, circuit breaker, auto-delegation
+│   │   ├── prompts/cli.md         ← System prompt (debugging rules, tool usage, import rules)
+│   │   ├── tools/builtins/        ← 24 builtin tools
+│   │   ├── agents/                ← Subagent definitions (explore, diagnostic, planner)
+│   │   └── skills/                ← Skill framework
+│   ├── cli/textual_ui/app.py     ← TUI application
+│   └── skills/                    ← 7 bundled skill markdown files
+├── tests/
+│   ├── test_smoke.py              ← 20 fast tests (imports, branding, safety)
+│   ├── test_loop_detection.py     ← 38 loop/circuit breaker tests
+│   ├── test_drydock_*.py          ← ~100 regression tests
+│   ├── test_bank_prd.py           ← 15 PRD-driven tests (CORE usability tests)
+│   ├── test_bank_prd_extended.py  ← 50 extended PRD tests (overnight battery)
+│   ├── test_bank_build.py         ← 25 build tests
+│   ├── test_bank_debug.py         ← 20 debug tests
+│   ├── test_bank_update.py        ← 15 update tests
+│   ├── test_bank_multiagent.py    ← 10 multi-agent tests
+│   ├── test_bank_tools.py         ← 13 tool integration tests
+│   └── testbank_helpers.py        ← Shared test infrastructure
+├── scripts/
+│   ├── deploy_to_github.sh        ← Clone GitHub, sync, push (daily 4 AM)
+│   ├── publish_to_pypi.sh         ← Tests → build → PyPI → tag → integration test
+│   ├── test_full.sh               ← Smoke + real backend regression (nightly 2 AM)
+│   ├── test_bank.sh               ← 83-test bank runner with category selection
+│   ├── monitor_test_battery.sh    ← Cron monitor: restart stuck tests, skip repeat failures
+│   ├── backup.sh                  ← rsync to NAS (daily 3 AM)
+│   └── install.sh                 ← User installation script
+├── test_bank_results/             ← Test logs (overnight runs, partial results)
+├── pyproject.toml                 ← Version, dependencies, build config
+├── CLAUDE.md                      ← Instructions for AI assistants working on this repo
+└── PRD.md                         ← This file
+```
+
+```
+/data3/swe_bench_runs/             ← SWE-bench infrastructure (SEPARATE from drydock repo)
+├── harness.py                     ← Runs drydock on SWE-bench tasks
+├── continuous_bench.sh            ← Continuous improvement loop (CURRENTLY PAUSED)
+├── analyze_batch.py               ← Post-batch analysis
+├── auto_fix.py                    ← Auto-apply prompt fixes
+└── monitor_health.sh              ← Worktree cleanup (CURRENTLY PAUSED)
+```
+
+```
+~/.config/drydock/
+├── github_token                   ← GitHub PAT for push/deploy
+└── pypi_token                     ← PyPI API token for publishing
+```
+
+### Key Paths
+- **vLLM server:** http://localhost:8000 (devstral-24B-AWQ-4bit)
+- **NAS backup:** 192.168.50.183 via rsync
+- **Conda env:** `/home/bobef/miniconda3/bin/python3` (ALWAYS use this, never bare `python3`)
+- **Git remotes:** `drydock` → github.com/fbobe321/drydock, `origin` → github.com/mistralai/mistral-vibe
+- **Main branch:** `main` (push to `drydock` remote, not `origin`)
+
+---
+
 ## Test Suite
 
-| Tier | File | Tests | Backend | Time | When |
-|------|------|-------|---------|------|------|
+| Tier | File(s) | Tests | Backend | Time | When |
+|------|---------|-------|---------|------|------|
 | **Smoke** | `test_smoke.py` | 20 | None | <1s | Every deploy |
+| **Loop Detection** | `test_loop_detection.py` | 38 | None | <1s | Every deploy |
+| **Regression** | `test_drydock_*.py` | ~100 | None | ~1min | Every deploy |
 | **Full Regression** | `test_full_regression.py` | 13 | Real vLLM | 5-10 min | Nightly 2 AM |
+| **PRD Battery** | `test_bank_prd.py` | 15 | Real vLLM | ~20 min | On demand |
+| **Extended PRD** | `test_bank_prd_extended.py` | 50 | Real vLLM | ~3-6 hours | Overnight |
+| **Build/Debug/Update** | `test_bank_*.py` | 83 | Real vLLM | ~90 min | On demand |
+
+**Run commands:**
+```bash
+# Quick smoke (every change)
+python3 -m pytest tests/test_smoke.py tests/test_loop_detection.py -q
+
+# All fast tests (before commit)
+python3 -m pytest tests/test_drydock_regression.py tests/test_drydock_tasks.py tests/test_loop_detection.py tests/test_smoke.py -q
+
+# PRD battery (user-realistic, needs vLLM)
+python3 -m pytest tests/test_bank_prd.py -v -s
+
+# Overnight (needs vLLM, 3-6 hours)
+nohup python3 -m pytest tests/test_bank_prd.py tests/test_bank_prd_extended.py -v --tb=short > test_bank_results/run.log 2>&1 &
+```
 
 ---
 
-## Continuous Improvement
+## SWE-bench (CURRENTLY PAUSED)
 
-| System | Schedule | What it does |
-|--------|----------|-------------|
-| `continuous_bench.sh` | Always running | SWE-bench batches (20 tasks, 600s timeout) |
-| `analyze_batch.py` | After each batch | Detects crash patterns, multi-file misses, test edits |
-| `auto_fix.py` | After analysis | Applies safe prompt fixes based on patterns |
-| `monitor_health.sh` | Every 30 min | Prunes worktrees, checks vLLM, disk space, pass rates |
-| `deploy_to_github.sh` | Daily 4 AM | Smoke tests → push to GitHub |
-| `backup.sh` | Daily 3 AM | rsync to NAS (192.168.50.183) |
-| `@reboot` cron | On restart | Restarts bench loop after 2 min |
+Infrastructure at `/data3/swe_bench_runs/` (not in drydock repo). Paused to focus on usability testing.
 
-**Latest SWE-bench results (Mar 28):**
+**Latest results (Mar 28):**
 - 2,220/2,294 unique tasks tested (97%)
-- Recent pass rate: **39-42%** (up from 17% baseline)
-- Net improvement: **+22% pass rate** after bash abuse fix and nudge improvements
+- Pass rate: **39-42%** (up from 17% baseline)
+- Crons removed — re-enable with `continuous_bench.sh` when ready
 
 ---
 
@@ -279,3 +394,20 @@ User reported DryDock was unusable — model looped 12+ times running the same c
 Run with: `./scripts/test_bank.sh` (full) or `./scripts/test_bank.sh quick` (easy only, ~2h)
 
 **Removed:** False-positive test file guard in search_replace that blocked any file in a directory containing "test" in its name.
+
+### Phase 12 (Mar 29): Configuration Management + Auto-Delegation + PRD Tests
+
+**Config management crisis:** Overnight test battery crashed for 8 hours because cron used system Python (no pytest). All scripts now use explicit `/home/bobef/miniconda3/bin/python3`.
+
+**Auto-delegation:** Model wasn't using subagents despite prompt instructions. Fixed by injecting context automatically before the model's first turn:
+- Project file listing (replaces explore subagent)
+- Skill content injection (matches prompt keywords to skills)
+- Planning prompt for complex builds (forces absolute imports, python3 -m)
+
+**Circuit breaker reset:** After write_file/search_replace, circuit breaker history clears. Previously-failing commands can be retried after code changes.
+
+**Post-success stop:** After 3 successful bash runs, model is told to stop testing and summarize.
+
+**PRD-driven test bank:** 65 tests (15 core + 50 extended) that give DryDock a PRD and verify the built project RUNS. Core 15 pass at 100%.
+
+**Relative import auto-fix:** When model gets "relative import with no known parent package", agent loop explains absolute imports vs python3 -m and forces search_replace.

{drydock_cli-1.5.2 → drydock_cli-1.5.4}/drydock/core/agent_loop.py

@@ -193,6 +193,7 @@ class AgentLoop:
         self._tool_call_history: dict[str, tuple[int, str]] = {}
         self._consecutive_circuit_breaker_fires: int = 0
         self._empty_responses: int = 0
+        self._successful_test_runs: int = 0
 
         system_prompt = get_universal_system_prompt(
             self.tool_manager, self.config, self.skill_manager, self.agent_manager
@@ -571,6 +572,10 @@ class AgentLoop:
                                     first_edit = not has_made_edit
                                     has_made_edit = True
                                     bash_count = 0  # Reset on successful edit
+                                    # Reset circuit breaker — the world changed after an edit,
+                                    # so previously-failing commands may now succeed
+                                    self._tool_call_history.clear()
+                                    self._consecutive_circuit_breaker_fires = 0
                                     # Track blast radius
                                     try:
                                         edit_args = json.loads(tc.function.arguments or "{}")
@@ -644,13 +649,13 @@ class AgentLoop:
                             consecutive_bash += 1
                         else:
                             break
-                    if consecutive_bash >= 4:
+                    if consecutive_bash >= 3:
                         self._inject_system_note(
-                            "You have run 4+ bash commands in a row after editing files. "
-                            "Each one failed or gave the same result. STOP running bash. "
-                            "Read the error message carefully, then use search_replace "
-                            "to fix the actual code. Running the same command again will "
-                            "not give a different result."
+                            "You have run 3+ bash commands in a row. "
+                            "If your project is WORKING, you are DONE — tell the user the project "
+                            "is complete and what commands they can use. "
+                            "If it is FAILING, STOP running bash and use read_file + search_replace "
+                            "to fix the code. Do NOT keep running the same test."
                         )
 
                 # Detect bash file creation (touch, echo >, cat <<)
@@ -1169,6 +1174,17 @@ class AgentLoop:
 
             result_dict = result_model.model_dump()
             text = "\n".join(f"{k}: {v}" for k, v in result_dict.items())
+
+            # After a successful bash test of built code, nudge to wrap up
+            if tool_call.tool_name in ("bash", "run_command"):
+                self._successful_test_runs += 1
+                if self._successful_test_runs >= 3:
+                    self._inject_system_note(
+                        "Your project is WORKING. You have verified it successfully. "
+                        "STOP testing. Summarize what you built and tell the user "
+                        "how to use it. Do NOT run any more bash commands."
+                    )
+
             # Record for circuit breaker
             self._circuit_breaker_record(tool_call, text)
             self._handle_tool_response(

{drydock_cli-1.5.2 → drydock_cli-1.5.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "drydock-cli"
-version = "1.5.2"
+version = "1.5.4"
 description = "Drydock — nautical CLI coding agent"
 readme = "README.md"
 requires-python = ">=3.12"

{drydock_cli-1.5.2 → drydock_cli-1.5.4}/scripts/deploy_to_github.sh

@@ -7,6 +7,9 @@
 
 set -euo pipefail
 
+export PATH="/home/bobef/miniconda3/bin:$PATH"
+PYTHON="/home/bobef/miniconda3/bin/python3"
+
 DRYDOCK_SRC="/data3/drydock"
 GITHUB_REPO="https://github.com/fbobe321/drydock.git"
 TOKEN_FILE="$HOME/.config/drydock/github_token"
@@ -37,8 +40,8 @@ AUTH_URL="https://${GITHUB_TOKEN}@github.com/fbobe321/drydock.git"
 
 log "Running regression tests..."
 cd "$DRYDOCK_SRC"
-python3 -m pip install -q "pytest>=9.0" 2>/dev/null
-if ! python3 -m pytest tests/test_drydock_regression.py tests/test_drydock_tasks.py tests/test_loop_detection.py tests/test_agent_tasks.py tests/test_integration.py tests/test_user_issues.py tests/test_real_issues.py \
+$PYTHON -m pip install -q "pytest>=9.0" 2>/dev/null
+if ! $PYTHON -m pytest tests/test_drydock_regression.py tests/test_drydock_tasks.py tests/test_loop_detection.py tests/test_agent_tasks.py tests/test_integration.py tests/test_user_issues.py tests/test_real_issues.py \
     -p no:xdist -p no:cov --override-ini="addopts=" -q 2>&1; then
     log "TESTS FAILED — deploy aborted. Fix the tests before deploying."
     exit 1

{drydock_cli-1.5.2 → drydock_cli-1.5.4}/scripts/publish_to_pypi.sh

@@ -9,7 +9,8 @@ set -euo pipefail
 
 DRYDOCK_SRC="/data3/drydock"
 TOKEN_FILE="$HOME/.config/drydock/pypi_token"
-PYTHON="python3"
+PYTHON="/home/bobef/miniconda3/bin/python3"
+export PATH="/home/bobef/miniconda3/bin:$PATH"
 
 cd "$DRYDOCK_SRC"
 
@@ -71,4 +72,24 @@ if [ -x "$DRYDOCK_SRC/scripts/deploy_to_github.sh" ]; then
     "$DRYDOCK_SRC/scripts/deploy_to_github.sh" 2>&1 || log "GitHub deploy failed (non-fatal)"
 fi
 
+# --- Git tag ---
+git tag -a "v$NEW_VERSION" -m "Release v$NEW_VERSION" 2>/dev/null || true
+log "Tagged v$NEW_VERSION"
+
+# --- Quick integration test (install in temp venv and verify) ---
+log "Running integration test..."
+TMPVENV=$(mktemp -d)
+$PYTHON -m venv "$TMPVENV/venv" 2>/dev/null
+if "$TMPVENV/venv/bin/pip" install -q "dist/drydock_cli-${NEW_VERSION}-py3-none-any.whl" 2>/dev/null; then
+    INSTALLED_VER=$("$TMPVENV/venv/bin/python3" -c "from importlib.metadata import version; print(version('drydock-cli'))" 2>/dev/null || echo "unknown")
+    if [ "$INSTALLED_VER" = "$NEW_VERSION" ]; then
+        log "Integration test PASSED: installed version $INSTALLED_VER matches"
+    else
+        log "WARNING: version mismatch — expected $NEW_VERSION, got $INSTALLED_VER"
+    fi
+else
+    log "WARNING: integration test failed to install (non-fatal)"
+fi
+rm -rf "$TMPVENV"
+
 log "Published drydock-cli $NEW_VERSION to PyPI"

{drydock_cli-1.5.2 → drydock_cli-1.5.4}/scripts/test_bank.sh

@@ -14,9 +14,19 @@
 set -euo pipefail
 cd "$(dirname "$0")/.."
 
-pip install -q "pytest>=9.0" pytest-asyncio httpx 2>/dev/null
+export PATH="/home/bobef/miniconda3/bin:$PATH"
+PYTHON="/home/bobef/miniconda3/bin/python3"
 
-COMMON_ARGS="-v -s -p no:xdist -p no:cov --override-ini=addopts="
+$PYTHON -m pip install -q "pytest>=9.0" pytest-asyncio httpx 2>/dev/null
+
+# Version gate — log what we're testing
+VERSION=$($PYTHON -c "import tomli; print(tomli.load(open('pyproject.toml','rb'))['project']['version'])" 2>/dev/null || echo "unknown")
+echo "Testing drydock source version: $VERSION"
+echo "Python: $($PYTHON --version)"
+echo "vLLM: $(curl -s http://localhost:8000/v1/models | python3 -c 'import json,sys; print(json.load(sys.stdin)["data"][0]["id"])' 2>/dev/null || echo 'NOT RUNNING')"
+echo ""
+
+COMMON_ARGS="-v -p no:xdist -p no:cov --override-ini=addopts="
 CATEGORY="${1:-all}"
 TIMESTAMP=$(date +%Y%m%d_%H%M%S)
 LOG_DIR="test_bank_results"

drydock_cli-1.5.4/scripts/test_full.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+# FULL REGRESSION — Run nightly or before releases (5-10 min)
+# Requires vLLM at localhost:8000. Real backend, no mocks.
+set -euo pipefail
+cd "$(dirname "$0")/.."
+
+export PATH="/home/bobef/miniconda3/bin:$PATH"
+PYTHON="/home/bobef/miniconda3/bin/python3"
+
+$PYTHON -m pip install -q "pytest>=9.0" pytest-asyncio 2>/dev/null
+
+VERSION=$(grep '^version' pyproject.toml | head -1 | sed 's/.*"\(.*\)".*/\1/')
+echo "Drydock v$VERSION — $(date)"
+echo "Python: $($PYTHON --version)"
+echo ""
+
+echo "=== SMOKE TESTS ==="
+$PYTHON -m pytest tests/test_smoke.py -p no:xdist -p no:cov --override-ini="addopts=" -q
+
+echo ""
+echo "=== FULL REGRESSION (real backend) ==="
+$PYTHON -m pytest tests/test_full_regression.py -v -p no:xdist -p no:cov --override-ini="addopts="
+
+echo ""
+echo "=== BUILD PROJECT TESTS (real backend, 30-60 min) ==="
+$PYTHON -m pytest tests/test_build_projects.py -v -s -p no:xdist -p no:cov --override-ini="addopts="

drydock_cli-1.5.2/scripts/test_full.sh

@@ -1,17 +0,0 @@
-#!/bin/bash
-# FULL REGRESSION — Run nightly or before releases (5-10 min)
-# Requires vLLM at localhost:8000. Real backend, no mocks.
-set -euo pipefail
-cd "$(dirname "$0")/.."
-pip install -q "pytest>=9.0" pytest-asyncio 2>/dev/null
-
-echo "=== SMOKE TESTS ==="
-python3 -m pytest tests/test_smoke.py -p no:xdist -p no:cov --override-ini="addopts=" -q
-
-echo ""
-echo "=== FULL REGRESSION (real backend) ==="
-python3 -m pytest tests/test_full_regression.py -v -p no:xdist -p no:cov --override-ini="addopts="
-
-echo ""
-echo "=== BUILD PROJECT TESTS (real backend, 30-60 min) ==="
-python3 -m pytest tests/test_build_projects.py -v -s -p no:xdist -p no:cov --override-ini="addopts="