mirror of
https://github.com/0xWheatyz/handler.git
synced 2026-08-30 12:16:26 +00:00
0xWheatyz
1517e4dca8
Agent runs are now always worker-owned 'claude -p' subprocesses; tmux survives only for the interactive /login flow. - deleted: worker.capture_agent_output/_pane_tail + the capture loop arm (the empty-/log bug's home), spawn's tmux launch/_claude_command, the tmux resume/kill branches (the silent-send-keys bug's home), tmux.session_name/list_sessions, the CLI attach subcommand, the 'runner' setting - spawn: task is now a hard requirement (headless has no idle REPL) - enforced in spawn (SpawnError) and the API (400); onboarding seeding dropped (-p skips the trust dialog) - resume: single headless path; pre-headless agent rows (no session_id) degrade to the context-re-injection fresh run - settings_gen: permissions allowlist is always emitted - credsync: change-triggered uploads key on .claude/.credentials.json only (claude touches ~/.claude.json every run - keying on it would ping-pong uploads between workers); logins still publish explicitly - cli list: liveness from agent_runs in the DB, not tmux - tests: spawn/kill/resume re-pointed at the fake_launch seam (conftest); integration test now drives API -> worker -> real fake claude subprocess -> events endpoint; README documents the headless model + multi-worker deployment invariants Suite 295 green; frontend unchanged since phase 3.
77 lines
2.8 KiB
Python
77 lines
2.8 KiB
Python
"""Slot-aware command claiming: a worker at max_concurrent_runs must leave run-starting
|
|
commands queued (for a less-loaded worker) while still processing everything else. Slot
|
|
accounting is DB-driven — this worker's ``running`` agent_runs rows — so it needs no
|
|
in-memory registry and is exercised here without real subprocesses."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import pytest
|
|
|
|
from handler.control import spawn, worker
|
|
from handler.db import repository as repo
|
|
from handler.db.engine import get_engine
|
|
|
|
|
|
@pytest.fixture
|
|
def headless_env(env, monkeypatch):
|
|
from handler import config
|
|
|
|
monkeypatch.setenv("MAX_CONCURRENT_RUNS", "2")
|
|
config.get_settings.cache_clear()
|
|
yield env
|
|
config.get_settings.cache_clear()
|
|
|
|
|
|
def _seed(conn_count_running_for=None):
|
|
with get_engine().begin() as conn:
|
|
repo.create_project(conn, "p", "/tmp/p")
|
|
agent = repo.create_agent(conn, "p", "a", "/tmp/p/a")
|
|
return agent
|
|
|
|
|
|
def _running_run(agent_id, worker_id):
|
|
with get_engine().begin() as conn:
|
|
return repo.create_run(conn, agent_id, f"sid-{worker_id}", worker_id, "spawn")
|
|
|
|
|
|
def test_full_worker_skips_run_commands_but_processes_others(headless_env, monkeypatch):
|
|
agent = _seed()
|
|
_running_run(agent["id"], "w-full")
|
|
_running_run(agent["id"], "w-full") # 2 running == MAX_CONCURRENT_RUNS
|
|
|
|
spawned = {}
|
|
monkeypatch.setattr(
|
|
spawn, "spawn",
|
|
lambda project_id, name, **kw: spawned.update(name=name, **kw)
|
|
or {"id": 1, "name": name, "working_dir": "/tmp/p/x", "forge_note": None},
|
|
)
|
|
with get_engine().begin() as conn:
|
|
spawn_cmd = repo.enqueue_command(conn, "spawn", project_id="p", agent_name="x")
|
|
kill_cmd = repo.enqueue_command(conn, "kill", project_id="p", agent_name="a")
|
|
monkeypatch.setattr(spawn, "kill", lambda p, n: None)
|
|
|
|
# The full worker processes the kill but leaves the spawn queued.
|
|
assert worker.drain("w-full") == 1
|
|
with get_engine().begin() as conn:
|
|
assert repo.get_command(conn, kill_cmd["id"])["status"] == "done"
|
|
assert repo.get_command(conn, spawn_cmd["id"])["status"] == "queued"
|
|
assert spawned == {}
|
|
|
|
# A worker with free slots picks the spawn up.
|
|
assert worker.drain("w-free") == 1
|
|
with get_engine().begin() as conn:
|
|
assert repo.get_command(conn, spawn_cmd["id"])["status"] == "done"
|
|
assert spawned["name"] == "x"
|
|
assert spawned["worker_id"] == "w-free"
|
|
|
|
|
|
def test_slot_frees_when_run_finishes(headless_env, monkeypatch):
|
|
agent = _seed()
|
|
run1 = _running_run(agent["id"], "w1")
|
|
_running_run(agent["id"], "w1")
|
|
assert worker._full_slot_exclusions("w1") == worker._RUN_COMMANDS
|
|
|
|
with get_engine().begin() as conn:
|
|
repo.finish_run(conn, run1["id"], "completed", exit_code=0)
|
|
assert worker._full_slot_exclusions("w1") == ()
|