drydock-cli 3.1.33__tar.gz → 3.1.34__tar.gz

{drydock_cli-3.1.33/drydock_cli.egg-info → drydock_cli-3.1.34}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.1.33
+Version: 3.1.34
 Summary: Drydock — a local, provider-agnostic terminal coding agent for local LLMs
 Author: Frank Bobe III
 License-Expression: Apache-2.0

{drydock_cli-3.1.33 → drydock_cli-3.1.34}/drydock/swarm.py

@@ -693,17 +693,18 @@ def _peer_notes(candidates: list[Candidate], limit: int = 8) -> str:
     each attempt's verdict + verified score + one-line summary, so a reader builds on the
     partials and avoids repeating the failures. Only summaries cross between agents, never
     full transcripts (§8 — preserve independence while still comparing notes)."""
+    # Rank strongest-first so the reader sees the best partial at the top, and explicitly flag
+    # it as the base to EXTEND — the actionable core of cross-pollination (§14): don't restart
+    # from scratch, continue the leading partial (and skip the failed approaches below it).
+    ranked = sorted(candidates, key=lambda c: (c.tests_passed, c.tests_total), reverse=True)[:limit]
     lines = []
-    for c in candidates[:limit]:
+    for i, c in enumerate(ranked):
         score = f"{c.tests_passed}/{c.tests_total}" if c.tests_total else "unverified"
-        if c.tests_total and c.tests_passed >= c.tests_total:
-            verdict = "SOLVED"
-        elif c.tests_passed:
-            verdict = "partial"
-        else:
-            verdict = "failed"
+        solved = bool(c.tests_total and c.tests_passed >= c.tests_total)
+        verdict = "SOLVED" if solved else ("partial" if c.tests_passed else "failed")
         summ = (c.summary or "").strip().splitlines()[0][:160] if c.summary else "(no summary)"
-        lines.append(f"- {c.agent} [{verdict} {score}]: {summ}")
+        tag = "  ⟵ STRONGEST partial — EXTEND this approach" if (i == 0 and c.tests_passed and not solved) else ""
+        lines.append(f"- {c.agent} [{verdict} {score}]{tag}: {summ}")
     return "\n".join(lines)
 
 
@@ -971,6 +972,11 @@ def run_cli(argv: list, config: dict | None = None) -> int:
     p.add_argument("--max-turns", type=int, default=40)
     p.add_argument("--max-tool-calls", type=int, default=40)
     p.add_argument("--max-workers", type=int, default=None, help="max concurrent workers")
+    p.add_argument("--share", action="store_true",
+                   help="blackboard cross-pollination: run in waves; later agents read peers' "
+                        "verified attempts and build on partials instead of repeating failures")
+    p.add_argument("--waves", type=int, default=2,
+                   help="number of waves when --share is set (wave 0 explores blind; default 2)")
     try:
         args = p.parse_args(argv)
     except SystemExit as e:
@@ -986,12 +992,27 @@ def run_cli(argv: list, config: dict | None = None) -> int:
         return 1
 
     print(f"⚓ Drydock swarm — {args.agents} agents on: {objective}")
-    print("   (isolated git worktrees, independent verification, evidence-based judging)\n")
+    print("   (isolated git worktrees, independent verification, evidence-based judging)"
+          + (f"\n   🔗 shared communication ON — {args.waves} waves, peers' notes cross the "
+             "blackboard\n" if args.share else "\n"))
+
+    def _on(kind: str, d: dict) -> None:
+        if kind == "share":
+            print(f"  🔗 wave {d.get('wave')}: {d.get('agents')} agent(s) reading peers' notes")
+        elif kind == "worker_done":
+            print(f"  · {d.get('agent')}: {'ok' if d.get('ok') else 'failed'}"
+                  + (f" ({d.get('files')} files)" if d.get('files') else ""))
+        elif kind == "verified":
+            print(f"  ✓ {d.get('candidate')}: {d.get('passed')}/{d.get('total')} ({d.get('status')})")
+        elif kind == "judge":
+            print(f"  ⚖ winner={d.get('agent') or '—'} converged={d.get('converged')}")
+
     try:
         res = run_swarm(cwd, objective, agents=args.agents, base_config=config,
                         base_ref=args.base_ref, verify_cmd=args.verify, fitness=args.fitness,
                         max_turns=args.max_turns, max_tool_calls=args.max_tool_calls,
-                        max_workers=args.max_workers)
+                        max_workers=args.max_workers, share=args.share, waves=args.waves,
+                        on_event=_on)
     except ValueError as e:
         print(f"Error: {e}")
         return 1

{drydock_cli-3.1.33 → drydock_cli-3.1.34/drydock_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: drydock-cli
-Version: 3.1.33
+Version: 3.1.34
 Summary: Drydock — a local, provider-agnostic terminal coding agent for local LLMs
 Author: Frank Bobe III
 License-Expression: Apache-2.0

{drydock_cli-3.1.33 → drydock_cli-3.1.34}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 # PyPI distribution name is drydock-cli (the established install name, continued
 # from the retired v2 fork); the import package + CLI command stay `drydock`.
 name = "drydock-cli"
-version = "3.1.33"
+version = "3.1.34"
 description = "Drydock — a local, provider-agnostic terminal coding agent for local LLMs"
 readme = "README.md"
 requires-python = ">=3.11"

{drydock_cli-3.1.33 → drydock_cli-3.1.34}/tests/test_swarm.py

@@ -313,6 +313,26 @@ def test_share_injects_peer_notes_into_later_waves(tmp_path):
     assert any("agent-1" in s and "SOLVED" in s for s in seen)
 
 
+def test_peer_notes_rank_and_flag_strongest_partial():
+    from drydock.swarm import Candidate, _peer_notes
+    cands = [
+        Candidate(id="c1", agent="agent-1", summary="tried A", tests_passed=1, tests_total=6),
+        Candidate(id="c2", agent="agent-2", summary="tried B", tests_passed=4, tests_total=6),
+        Candidate(id="c3", agent="agent-3", summary="tried C", tests_passed=0, tests_total=6),
+    ]
+    notes = _peer_notes(cands)
+    first_line = notes.splitlines()[0]
+    assert "agent-2" in first_line and "EXTEND this approach" in first_line   # strongest partial, ranked first + flagged
+    assert notes.index("agent-2") < notes.index("agent-1") < notes.index("agent-3")  # ranked by score
+    assert "EXTEND" not in notes.split("agent-1")[1].split("\n")[0]           # only the leader is flagged
+
+
+def test_peer_notes_no_flag_when_already_solved():
+    from drydock.swarm import Candidate, _peer_notes
+    notes = _peer_notes([Candidate(id="c1", agent="a1", summary="done", tests_passed=6, tests_total=6)])
+    assert "SOLVED" in notes and "EXTEND" not in notes    # nothing to extend if it's fully solved
+
+
 def test_no_share_means_no_peer_notes(tmp_path):
     import threading
     repo = _init_repo(tmp_path / "repo")
@@ -398,6 +418,30 @@ def test_cli_solve_requires_git_repo(tmp_path, capsys):
     assert "git" in capsys.readouterr().out.lower()
 
 
+def test_cli_share_flag_reaches_run_swarm(tmp_path, monkeypatch):
+    repo = _init_repo(tmp_path / "repo")
+    captured = {}
+
+    def fake_run_swarm(cwd, objective, **kw):
+        captured.update(objective=objective, **kw)
+        return swarm.SwarmResult(swarm_id="s", objective=objective, root="r",
+                                 converged=False, winner=None, candidates=[])
+    monkeypatch.setattr(swarm, "run_swarm", fake_run_swarm)
+    rc = swarm.run_cli(["fix the bug", "--agents", "4", "--share", "--waves", "3"], {"cwd": repo})
+    assert rc == 0
+    assert captured["share"] is True and captured["waves"] == 3   # cross-pollination reachable via CLI
+
+
+def test_cli_default_is_blind_parallel(tmp_path, monkeypatch):
+    repo = _init_repo(tmp_path / "repo")
+    captured = {}
+    monkeypatch.setattr(swarm, "run_swarm",
+                        lambda cwd, objective, **kw: captured.update(kw) or
+                        swarm.SwarmResult("s", objective, "r", False, None, []))
+    swarm.run_cli(["fix it"], {"cwd": repo})
+    assert captured["share"] is False                             # default unchanged (blind parallel)
+
+
 def test_cli_solve_empty_objective(tmp_path):
     repo = _init_repo(tmp_path / "repo")
     assert swarm.run_cli([], {"cwd": repo}) == 1