drydock-cli 2.6.148__tar.gz → 2.7.1__tar.gz

drydock_cli-2.7.1/.auto_release.lock

@@ -0,0 +1 @@
+2859910

{drydock_cli-2.6.148 → drydock_cli-2.7.1}/CHANGELOG.md

@@ -5,6 +5,91 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.7.0] - 2026-04-21
+
+### Added
+
+- **Meta-Harness autoresearch loop** (`research/` subsystem). Opus-driven
+  search over a bounded mutation surface. Fixed 5-minute kernel,
+  append-only results log, contrastive proposer with access to source +
+  top/bottom traces. See `research/domain_spec.md` for the design.
+- **Admiral actuator**: `scripts/stress_watcher.py` sends SIGUSR1 to the
+  stress harness on unrecoverable TUI wedges; the harness respawns its
+  drydock child at the next iteration boundary. Rate-limited. First loop
+  where admiral *acts* on its observations.
+- **Env override surface** for experiments:
+  `DRYDOCK_AUTO_CONTINUE_DISABLE`,
+  `DRYDOCK_STRESS_{SESSION_RESET_EVERY,MAX_CONSECUTIVE_SKIPS_BEFORE_RESET,SEND_PROMPT_RETRY_COUNT,SEND_PROMPT_WAIT_PER_RETRY_SEC}`,
+  `DRYDOCK_ADMIRAL_{REPEAT_WARNING_THRESHOLD,REPEAT_FORCE_STOP_THRESHOLD,EMPTY_RESULT_THRESHOLD,SAME_TOOL_NAME_REPEAT_LIMIT_{BASH,READ}}`,
+  `DRYDOCK_PROMPTS_DIR`. All default to the prior hardcoded values;
+  production behavior unchanged.
+- **`DEPLOYMENT.md`**: known-working hardware + vLLM Docker flags +
+  `~/.drydock/config.toml` template + env var table + diagnostic
+  checklist. Answers the "works on your machine, not mine" question.
+- **`scripts/stress_babysitter.sh`**: hourly monitor cron that
+  auto-restarts long stress runs from the last successful step. Silent
+  when healthy; Telegrams only on state change.
+- **Check 0 empty-result loop detector** in `agent_loop.py`. Fires
+  FORCE_STOP at 3 identical tool calls when the result matches an
+  empty pattern (`total_count: 0`, `no todos`, `no tasks`,
+  `no matches`, blank). Catches todo / task / grep-empty loops that
+  Check 1's threshold-of-8 is too lax for.
+- **Proactive write-oscillation prune** in
+  `_sanitize_message_ordering`. Any path with ≥3 `write_file` history
+  entries gets its older copies pruned before the next LLM call, so
+  context stays below Gemma 4's 131K ceiling instead of waiting for
+  a 400.
+- **Raw-markdown leakage detector** in stress harness + admiral.
+  Surfaces TUI rendering regressions as `stress-alert/raw-markdown-
+  leakage` on the admiral dashboard.
+- **`OVERNIGHT_PROGRESS.md`** session-continuity doc template.
+
+### Changed
+
+- **`should_break_loop`** in `agent_loop.py:876` — the condition
+  `tool_turns == 0` was unreachable since the file's current structure
+  landed. Text-only assistant responses now cleanly close the user
+  turn instead of regenerating until `PER_PROMPT_BUDGET_SEC` times
+  out. **This is a behavior fix users will notice immediately** —
+  questions the model asks now wait for input.
+- **Continue-loop**: env-gated via `DRYDOCK_AUTO_CONTINUE_DISABLE=1`
+  so stress runs (and any workflow hitting text-only prompt loops)
+  can opt out.
+- **`SESSION_ROOT` resolution** in `scripts/shakedown_interactive.py`:
+  now reads the path from `~/.drydock/config.toml`'s
+  `[session_logging].save_dir` instead of hardcoding
+  `~/.drydock/logs/session/`. Fixes false-SKIP reporting on any
+  machine whose drydock config has the newer default
+  `~/.vibe/logs/session/`.
+- **Todo tool** (`todo.py`): empty-read response now escalates.
+  First empty: *"No todos yet. Write one or proceed with the task."*
+  Second+: *"Still no todos. Stop calling read. Empty state will
+  not change on its own."* Closes GitHub #10.
+- **Fresh-start wipe** in stress harness: wipes cwd to fixtures
+  (PRD/AGENTS/functional_tests) instead of accumulating prior
+  runs' half-written artifacts.
+- **Raw-markdown detector** patterns tightened (`**bold**`,
+  `##heading`, `[link](url)` only — dropped bullet + numbered-list
+  patterns that matched rendered lists and generated 45 % false
+  positives).
+
+### Infrastructure
+
+- First clean 1658-prompt stress run completed 2026-04-21.
+  ~1622 successful prompts (run + babysitter auto-restart),
+  35 SKIPs, 0 TIMEOUTs, ~60 admiral-initiated TUI recycles.
+  ~46-hour wall-clock. Reference baseline for future experiments.
+- `scripts/auto_release.sh` supports `DRYDOCK_FORCE_VERSION` for
+  MINOR / MAJOR bumps (the ordinary PATCH-bumper would have taken
+  us to 2.6.149, not 2.7.0).
+
+### Known follow-ups
+
+- Meta-Harness median-of-3 replication before promotion (currently
+  single-sample).
+- TUI Markdown widget regression surfaced by admiral but not yet
+  fixed.
+
 ## [2.4.2] - 2026-03-12
 
 ### Added

{drydock_cli-2.6.148 → drydock_cli-2.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 2.6.148
+Version: 2.7.1
 Summary: Local-first CLI coding agent — tested with Gemma 4 26B via vLLM
 Project-URL: Homepage, https://github.com/fbobe321/drydock
 Project-URL: Repository, https://github.com/fbobe321/drydock

drydock_cli-2.7.1/drydock/core/prompts/__init__.py

@@ -0,0 +1,56 @@
+from __future__ import annotations
+
+import os
+from enum import StrEnum, auto
+from pathlib import Path
+
+from drydock import DRYDOCK_ROOT
+
+_PROMPTS_DIR = DRYDOCK_ROOT / "core" / "prompts"
+
+
+def _resolve_prompt_path(name: str) -> Path:
+    """Return the .md file for a prompt name.
+
+    If DRYDOCK_PROMPTS_DIR is set and contains a matching file, use that
+    override. Falls back to the shipped prompt. Used by the Meta-Harness
+    research kernel (research/kernel.py) to swap in per-experiment
+    prompt variants without mutating the installed package.
+
+    Missing override file = use shipped (not an error) so experiments
+    can mutate only gemma4 without also overriding every other prompt.
+    """
+    override_dir = os.environ.get("DRYDOCK_PROMPTS_DIR", "")
+    if override_dir:
+        candidate = Path(override_dir) / f"{name}.md"
+        if candidate.is_file():
+            return candidate
+    return (_PROMPTS_DIR / name).with_suffix(".md")
+
+
+class Prompt(StrEnum):
+    @property
+    def path(self) -> Path:
+        return _resolve_prompt_path(self.value)
+
+    def read(self) -> str:
+        return self.path.read_text(encoding="utf-8").strip()
+
+
+class SystemPrompt(Prompt):
+    CLI = auto()
+    EXPLORE = auto()
+    TESTS = auto()
+    BUILDER = auto()
+    PLANNER = auto()
+    DIAGNOSTIC = auto()
+    GEMMA4 = auto()
+
+
+class UtilityPrompt(Prompt):
+    COMPACT = auto()
+    DANGEROUS_DIRECTORY = auto()
+    PROJECT_CONTEXT = auto()
+
+
+__all__ = ["SystemPrompt", "UtilityPrompt"]

{drydock_cli-2.6.148 → drydock_cli-2.7.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "drydock-cli"
-version = "2.6.148"
+version = "2.7.1"
 description = "Local-first CLI coding agent — tested with Gemma 4 26B via vLLM"
 readme = "README.md"
 requires-python = ">=3.12"

drydock_cli-2.7.1/research/config_best.toml

@@ -0,0 +1,147 @@
+[target]
+model = "mistral-vibe-cli-latest"
+task = "unknown"
+
+[[knob]]
+name = "per_prompt_budget_sec"
+default = 300
+min = 300
+max = 3600
+mutable = true
+why = "Hard ceiling on a single user turn. Too low wastes work; too high lets loops run wild."
+value = 900
+
+[[knob]]
+name = "hard_stop_tool_calls"
+default = 100
+min = 30
+max = 250
+mutable = true
+why = "HARD_STOP_CALLS in agent_loop. Cap on tool-call depth per user turn."
+
+[[knob]]
+name = "wrap_up_warn_at"
+default = 40
+min = 10
+max = 100
+mutable = true
+why = "First progressive nudge. Earlier = tighter turns, may lose quality."
+
+[[knob]]
+name = "stop_now_warn_at"
+default = 60
+min = 20
+max = 150
+mutable = true
+why = "Second progressive nudge. Gemma often ignores the wrap-up; this is the harder prod."
+
+[[knob]]
+name = "temperature"
+default = 0.3
+min = 0.0
+max = 0.9
+mutable = true
+why = "Sampling temperature. Lower = more deterministic; higher = more exploration."
+value = 0.1
+
+[[knob]]
+name = "loop_detector_window"
+default = 3
+min = 2
+max = 6
+mutable = true
+why = "How many consecutive identical tool calls trigger the loop advisor."
+
+[[knob]]
+name = "struggle_threshold"
+default = 20
+min = 10
+max = 40
+mutable = true
+why = "Reads-without-a-write before admiral fires the struggle directive."
+value = 40
+
+[env_flags]
+DRYDOCK_AUTO_CONTINUE_DISABLE = "1"
+
+[prompts.gemma4]
+source_path = ""
+mutable = true
+why = "Single highest-leverage mutable target. Governs how Gemma 4 interprets every turn."
+
+[prompts.cli]
+source_path = ""
+mutable = true
+why = "Alternate non-Gemma system prompt. Rarely the right target but available for cross-model experiments."
+
+[[harness_threshold]]
+name = "MAX_CONSECUTIVE_SKIPS_BEFORE_RESET"
+default = 2
+min = 1
+max = 5
+mutable = true
+why = "Force ESC+/clear after N consecutive SKIPs. Lower = aggressive recycling; higher = tolerant of transient wedges."
+
+[[harness_threshold]]
+name = "SESSION_RESET_EVERY"
+default = 15
+min = 5
+max = 50
+mutable = true
+why = "Periodic /clear cadence in prompts. Tight cadence bounds context but costs reset overhead every N prompts."
+
+[[harness_threshold]]
+name = "SEND_PROMPT_RETRY_COUNT"
+default = 3
+min = 1
+max = 6
+mutable = true
+why = "How many times send_prompt_and_confirm re-types before marking SKIP. Each retry is ~120s."
+
+[[harness_threshold]]
+name = "SEND_PROMPT_WAIT_PER_RETRY_SEC"
+default = 120
+min = 30
+max = 300
+mutable = true
+why = "Seconds to wait for user-msg confirmation before retyping. Tighter = faster SKIP, may miss slow prompts."
+
+[[admiral_detector]]
+name = "REPEAT_WARNING_THRESHOLD"
+default = 4
+min = 2
+max = 8
+mutable = true
+why = "Consecutive identical tool calls before a WARNING. Lower = early nudge; higher = tolerant of legit repetition."
+
+[[admiral_detector]]
+name = "REPEAT_FORCE_STOP_THRESHOLD"
+default = 8
+min = 4
+max = 20
+mutable = true
+why = "Consecutive identical tool calls before FORCE_STOP. Must be >= REPEAT_WARNING_THRESHOLD."
+
+[[admiral_detector]]
+name = "EMPTY_RESULT_THRESHOLD"
+default = 3
+min = 2
+max = 6
+mutable = true
+why = "Check 0 (empty-result loop). Fire FORCE_STOP after N identical-call + empty-result in a row."
+
+[[admiral_detector]]
+name = "SAME_TOOL_NAME_REPEAT_LIMIT_BASH"
+default = 5
+min = 3
+max = 10
+mutable = true
+why = "Same-tool repetition limit for bash. Different from read/grep which need more headroom."
+
+[[admiral_detector]]
+name = "SAME_TOOL_NAME_REPEAT_LIMIT_READ"
+default = 7
+min = 4
+max = 12
+mutable = true
+why = "Same-tool repetition limit for read_file + grep. Investigation tools legitimately repeat more."

{drydock_cli-2.6.148 → drydock_cli-2.7.1}/research/domain_spec.md

@@ -4,6 +4,25 @@ Produced per stanford-iris-lab/meta-harness ONBOARDING.md template.
 First-cut spec; refine as the proposer exposes failure modes the
 current evaluation set doesn't distinguish.
 
+## Non-Negotiable: Air-Gap-Safe Proposer
+
+Drydock's positioning is **self-hosted AI coding agents for air-gapped
+and regulated environments** (defense/gov vertical, 90-day pilot plan).
+That pitch collapses the moment any component — including the
+self-tuning loop — phones home to a cloud LLM.
+
+**The Meta-Harness proposer MUST use the local vLLM endpoint** (the
+same one drydock's TUI uses). The `local` proposer mode is the
+default in `experimenter.py` and `research_babysitter.sh`. The `opus`
+mode exists for development when a stronger reasoner is convenient,
+but it requires `DRYDOCK_RESEARCH_ALLOW_OPUS=1` to actually dispatch
+cloud calls — otherwise it silently falls back to local.
+
+Any future change that makes cloud the default (or silently enables
+cloud without the explicit env var) is a regression. See
+`research/proposer.py::propose` — the local-first dispatch is the
+load-bearing guarantee.
+
 ## Domain Summary
 
 **What the user is trying to improve:** drydock's acceptance rate,

{drydock_cli-2.6.148 → drydock_cli-2.7.1}/research/experimenter.py

@@ -30,6 +30,7 @@ from __future__ import annotations
 
 import argparse
 import copy
+import os
 import random
 import shutil
 import signal
@@ -135,21 +136,63 @@ def mutate_opus(cfg: dict) -> tuple[dict, str] | None:
     elif target == "env_flag":
         flags = new.setdefault("env_flags", {})
         flags[name] = str(value)
+    elif target == "prompt":
+        # Materialize the proposed prompt to a candidate-local file and
+        # point the variant's source_path at it. The kernel will copy
+        # this into the isolated HOME's DRYDOCK_PROMPTS_DIR at spawn.
+        # Staging dir mirrors the variant toml: one sibling per exp.
+        # Using a stable-per-variant name (no exp_id here yet — caller
+        # provides it via the outer staged path). We write into the
+        # per-variant staged_prompts subdir and let the kernel resolve.
+        prompts = new.setdefault("prompts", {})
+        prompt_entry = prompts.setdefault(name, {})
+        prompts_dir = STAGED_DIR / "prompts"
+        prompts_dir.mkdir(parents=True, exist_ok=True)
+        # Use a content-hash so concurrent / retried variants don't
+        # stomp each other. Kernel reads the file by source_path.
+        import hashlib as _hashlib
+        h = _hashlib.sha1(str(value).encode()).hexdigest()[:12]
+        target_file = prompts_dir / f"{name}_{h}.md"
+        target_file.write_text(str(value))
+        prompt_entry["source_path"] = str(target_file)
+        prompt_entry["mutable"] = True
     else:
         return None
 
-    desc = f"opus {target}:{name} -> {value} ({reason})"
+    # Label says "llm" to avoid implying we called Opus even in local
+    # mode (proposer transport chooses local-first when ALLOW_OPUS=0).
+    # Keeps the results.tsv "note" column truthful when read later.
+    if target == "prompt":
+        size = len(str(value))
+        desc = f"llm prompt:{name} -> [{size} chars] ({reason})"
+    else:
+        desc = f"llm {target}:{name} -> {value} ({reason})"
     return new, desc
 
 
 def mutate(cfg: dict, rng: random.Random, mode: str) -> tuple[dict, str]:
-    """Dispatch to the requested proposer. Opus mode falls back to
-    random if the proposer doesn't deliver."""
-    if mode == "opus":
-        r = mutate_opus(cfg)
+    """Dispatch to the requested proposer. LLM modes fall back to
+    random if the proposer doesn't deliver.
+
+    `local` and `opus` share the same proposer code; the difference is
+    the transport (proposer.py decides based on
+    DRYDOCK_RESEARCH_ALLOW_OPUS). `opus` only contacts the cloud if
+    the operator explicitly set the env var; otherwise it behaves like
+    `local` (which calls the on-box vLLM endpoint).
+    """
+    if mode in ("opus", "local"):
+        # Hint to the proposer's transport preference via env var.
+        # propose() checks this before reaching for the cloud.
+        if mode == "opus":
+            os.environ["DRYDOCK_RESEARCH_ALLOW_OPUS"] = "1"
+        else:
+            # Local mode: disable cloud fallback regardless of ambient env.
+            os.environ["DRYDOCK_RESEARCH_ALLOW_OPUS"] = "0"
+        r = mutate_opus(cfg)  # function name is historical; contract unchanged
         if r is not None:
             return r
-        print("  opus mutator returned nothing; falling back to random", flush=True)
+        print(f"  {mode} mutator returned nothing; falling back to random",
+              flush=True)
     return mutate_random(cfg, rng)
 
 
@@ -240,12 +283,22 @@ def main() -> int:
     ap.add_argument("--cooldown-s", type=float, default=10.0,
                     help="Sleep between experiments (lets GPU settle).")
     ap.add_argument("--results-tsv", type=Path, default=DEFAULT_RESULTS)
-    ap.add_argument("--proposer", choices=("random", "opus"),
-                    default="random",
-                    help="random = bounded uniform + nudge sampling. "
-                         "opus = Meta-Harness-style LLM proposer using "
-                         "ANTHROPIC_API_KEY or the `claude` CLI; falls "
-                         "back to random on any failure.")
+    ap.add_argument("--proposer", choices=("random", "local", "opus"),
+                    default="local",
+                    help="local = Meta-Harness LLM proposer against the "
+                         "local vLLM endpoint (drydock's own model). "
+                         "THIS IS THE DEFAULT. Keeps the self-tuning loop "
+                         "air-gap-safe — matches the 'self-hosted agents "
+                         "for regulated environments' positioning. "
+                         "random = bounded uniform + nudge sampling, no "
+                         "LLM involved. "
+                         "opus = cloud proposer via ANTHROPIC_API_KEY or "
+                         "the `claude` CLI — NOT AIRGAP-SAFE; only use "
+                         "for development when you want a smarter "
+                         "reasoner. Also requires setting env "
+                         "DRYDOCK_RESEARCH_ALLOW_OPUS=1 to actually "
+                         "dispatch cloud calls. Falls back to random "
+                         "otherwise.")
     args = ap.parse_args()
 
     signal.signal(signal.SIGTERM, _handle_signal)

{drydock_cli-2.6.148 → drydock_cli-2.7.1}/research/kernel.py

@@ -93,14 +93,46 @@ def setup_isolated_home(tmpdir: Path, cfg: dict) -> tuple[Path, Path, Path]:
     drydock_dir.mkdir(parents=True)
     cwd.mkdir(parents=True)
 
-    # Drydock config — point session_logging at the isolated session dir.
-    # Everything else falls back to drydock defaults.
-    (drydock_dir / "config.toml").write_text(
-        '[session_logging]\n'
-        f'save_dir = "{session_root}"\n'
-        'session_prefix = "session"\n'
-        'enabled = true\n'
-    )
+    # Drydock config — parse the USER'S real ~/.drydock/config.toml
+    # (so providers + models + tool permissions + MCP servers carry
+    # through) and overwrite ONLY [session_logging] with the
+    # per-experiment path. First pass just appended a second
+    # [session_logging] table, which tomllib correctly rejects with
+    # "Cannot declare ('session_logging',) twice". Parse → mutate →
+    # re-serialize is the only safe overlay.
+    real_config = Path.home() / ".drydock" / "config.toml"
+    base: dict = {}
+    if real_config.is_file():
+        try:
+            with real_config.open("rb") as f:
+                base = tomllib.load(f)
+        except (tomllib.TOMLDecodeError, OSError):
+            base = {}
+    base["session_logging"] = {
+        "save_dir": str(session_root),
+        "session_prefix": "session",
+        "enabled": True,
+    }
+    try:
+        import tomli_w
+        with (drydock_dir / "config.toml").open("wb") as f:
+            tomli_w.dump(base, f)
+    except ImportError:
+        # Fallback: if tomli_w isn't available, write just the minimal
+        # config. Drydock will start but without the user's providers
+        # — experiments will fail, but at least with a clear error.
+        (drydock_dir / "config.toml").write_text(
+            '[session_logging]\n'
+            f'save_dir = "{session_root}"\n'
+            'session_prefix = "session"\n'
+            'enabled = true\n'
+        )
+    # Trust the isolated cwd so drydock doesn't pop the modal — this
+    # is what shakedown_interactive's harness handles inline, but from
+    # a fresh HOME there's nothing to answer yet.
+    trusted = drydock_dir / "trusted_folders.toml"
+    if not trusted.exists():
+        trusted.write_text(f'trusted_folders = ["{cwd}"]\n')
 
     # Admiral tuning — write variant knobs keyed on (model, task).
     knobs = validate_and_collect_knobs(cfg)
@@ -170,6 +202,31 @@ def run_kernel(variant_path: Path, results_tsv: Path,
         if name and val is not None:
             env[f"DRYDOCK_ADMIRAL_{name}"] = str(val)
 
+    # Variant prompt overrides. For each [prompts.<name>] with a
+    # non-empty source_path, copy into the isolated HOME's prompts
+    # dir. DRYDOCK_PROMPTS_DIR tells drydock (see core/prompts/__init__.py)
+    # to check there before the shipped prompt. Unset prompts fall
+    # through to the installed package defaults.
+    prompts_override_dir = home / ".drydock" / "prompts"
+    prompts_override_dir.mkdir(parents=True, exist_ok=True)
+    any_prompt_override = False
+    for prompt_name, entry in (cfg.get("prompts") or {}).items():
+        if not isinstance(entry, dict):
+            continue
+        source_path = entry.get("source_path", "")
+        if not source_path:
+            continue
+        try:
+            src = Path(source_path)
+            if src.is_file():
+                dest = prompts_override_dir / f"{prompt_name}.md"
+                dest.write_bytes(src.read_bytes())
+                any_prompt_override = True
+        except OSError:
+            continue
+    if any_prompt_override:
+        env["DRYDOCK_PROMPTS_DIR"] = str(prompts_override_dir)
+
     log_path = tmpdir / "tui.log"
     start = time.time()