subtask-mcp 0.2.4__tar.gz → 0.2.7__tar.gz

{subtask_mcp-0.2.4 → subtask_mcp-0.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: subtask-mcp
-Version: 0.2.4
+Version: 0.2.7
 Summary: Background sub-agents for Claude Code, Codex, Kimi and OpenCode, over MCP or CLI, with a spend cap
 License: MIT
 Project-URL: Homepage, https://github.com/tedin7/subtask
@@ -70,7 +70,7 @@ The distribution is `subtask-mcp` (the PyPI name `subtask` is an unrelated
 project). Full guide, per client, with native commands: [docs/install.md](docs/install.md).
 
 ```sh
-uv tool install "git+https://github.com/tedin7/subtask@v0.2.4"   # or: uv tool install /path/to/checkout
+uv tool install "git+https://github.com/tedin7/subtask@v0.2.7"   # or: uv tool install /path/to/checkout
 subtask install --client all          # prints the plan for every detected client
 subtask install --client all --yes    # applies it: MCP server + skill
 subtask doctor --client all           # checks app, config entry and a real handshake

{subtask_mcp-0.2.4 → subtask_mcp-0.2.7}/README.md

@@ -39,7 +39,7 @@ The distribution is `subtask-mcp` (the PyPI name `subtask` is an unrelated
 project). Full guide, per client, with native commands: [docs/install.md](docs/install.md).
 
 ```sh
-uv tool install "git+https://github.com/tedin7/subtask@v0.2.4"   # or: uv tool install /path/to/checkout
+uv tool install "git+https://github.com/tedin7/subtask@v0.2.7"   # or: uv tool install /path/to/checkout
 subtask install --client all          # prints the plan for every detected client
 subtask install --client all --yes    # applies it: MCP server + skill
 subtask doctor --client all           # checks app, config entry and a real handshake

{subtask_mcp-0.2.4 → subtask_mcp-0.2.7}/subtask/__init__.py

@@ -1,3 +1,3 @@
 """subtask: background sub-agents for coding agents."""
 
-__version__ = "0.2.4"
+__version__ = "0.2.7"

{subtask_mcp-0.2.4 → subtask_mcp-0.2.7}/subtask/events.py

@@ -35,11 +35,24 @@ def emit(
     state: str | None = None,
     source: str = "lifecycle",
     attempt: int | None = None,
+) -> dict | None:
+    """Append one event. Never raises: progress must not be able to fail a job."""
+    try:
+        return _emit(job_id, phase, msg, state, source, attempt)
+    except (OSError, ValueError, TypeError) as exc:
+        import sys
+
+        print(f"subtask: progress event not written: {type(exc).__name__}: {exc}", file=sys.stderr)
+        return None
+
+
+def _emit(
+    job_id: str, phase: str, msg: str, state: str | None, source: str, attempt: int | None
 ) -> dict | None:
     path = _path(job_id)
     if not path.parent.is_dir():
         return None
-    with path.open("a+", encoding="utf-8") as fh:
+    with path.open("ab+") as fh:
         fcntl.flock(fh, fcntl.LOCK_EX)
         last = _last(fh)
         seq = int(last.get("seq", 0)) + 1
@@ -57,16 +70,21 @@ def emit(
             "source": source,
         }
         fh.seek(0, os.SEEK_END)
-        fh.write(json.dumps(event, ensure_ascii=False) + "\n")
+        fh.write((json.dumps(event, ensure_ascii=False) + "\n").encode("utf-8"))
         fh.flush()
     return event
 
 
 def _last(fh) -> dict:
+    """The last complete event, reading only the tail (bytes: the cut may split a UTF-8 character)."""
     fh.seek(0, os.SEEK_END)
     size = fh.tell()
     fh.seek(max(0, size - 4096))
-    lines = fh.read().splitlines()
+    data = fh.read()
+    text = data.decode("utf-8", errors="replace") if isinstance(data, bytes) else data
+    lines = text.splitlines()
+    if size > 4096 and lines:
+        lines = lines[1:]  # the first line is cut by the seek: never trust it
     for line in reversed(lines):
         try:
             return json.loads(line)
@@ -99,7 +117,7 @@ def read_since(job_id: str, offset: int = 0, limit: int = 500) -> tuple[list[dic
 def last(job_id: str) -> dict:
     path = _path(job_id)
     try:
-        with path.open("r", encoding="utf-8") as fh:
+        with path.open("rb") as fh:
             return _last(fh)
-    except FileNotFoundError:
+    except (FileNotFoundError, OSError):
         return {}

{subtask_mcp-0.2.4 → subtask_mcp-0.2.7}/subtask/worker.py

@@ -147,6 +147,13 @@ def main() -> int:
                 error=None,
             )
         emit("start", f"{spec['engine']} attempt {attempt}", state="running")
+        if adapter.capabilities.paid and not rid:
+            # Started by an older server that left the booking to the worker (v0 jobs):
+            # reserve here, so the spend still counts against the monthly cap.
+            rid = f"{job_id}#w{attempt}-{os.getpid()}"
+            if ledger.reserve(rid, job_id, float(spec["max_usd"])) is None:
+                rid = None
+                raise RuntimeError(f"monthly cap {config.MONTHLY_CAP_USD} $ reached")
         if not Path(spec["cwd"]).is_dir():
             raise RuntimeError(f"working folder is gone: {spec['cwd']} (cleaned up?)")
         level = (spec.get("policy") or {}).get("effective")

{subtask_mcp-0.2.4 → subtask_mcp-0.2.7}/subtask_mcp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: subtask-mcp
-Version: 0.2.4
+Version: 0.2.7
 Summary: Background sub-agents for Claude Code, Codex, Kimi and OpenCode, over MCP or CLI, with a spend cap
 License: MIT
 Project-URL: Homepage, https://github.com/tedin7/subtask
@@ -70,7 +70,7 @@ The distribution is `subtask-mcp` (the PyPI name `subtask` is an unrelated
 project). Full guide, per client, with native commands: [docs/install.md](docs/install.md).
 
 ```sh
-uv tool install "git+https://github.com/tedin7/subtask@v0.2.4"   # or: uv tool install /path/to/checkout
+uv tool install "git+https://github.com/tedin7/subtask@v0.2.7"   # or: uv tool install /path/to/checkout
 subtask install --client all          # prints the plan for every detected client
 subtask install --client all --yes    # applies it: MCP server + skill
 subtask doctor --client all           # checks app, config entry and a real handshake

{subtask_mcp-0.2.4 → subtask_mcp-0.2.7}/tests/test_concurrency.py

@@ -273,3 +273,27 @@ def test_missing_active_index_does_not_forget_running_jobs(home):
     assert sorted(admission.active()) == sorted([first, second])
     core.stop(first)
     core.stop(second)
+
+
+def test_job_started_by_an_old_server_still_books_its_spend(home, monkeypatch):
+    """v0 spec/status (no attempts, no reservation): the worker reserves and settles itself."""
+    import signal
+
+    from subtask import jobs, ledger, worker
+
+    job = "st-v0v0v0v0v0"
+    folder = jobs.job_dir(job)
+    folder.mkdir(parents=True)
+    jobs.write_json(folder / "spec.json", {"task": "x", "engine": "fake", "cwd": str(home), "max_usd": 2.0,
+                                           "max_turns": 5, "effort": "low", "created": time.time()})  # fmt: skip
+    jobs.write_json(folder / "status.json", {"state": "queued"})
+    monkeypatch.setenv("SUBTASK_FAKE_SCRIPT", 'echo \'{"say":"ok"}\'')
+    monkeypatch.setattr(sys, "argv", ["worker", job])
+    old = signal.getsignal(signal.SIGTERM)
+    try:
+        worker.main()
+    finally:
+        signal.signal(signal.SIGTERM, old)
+    assert jobs.status(job)["state"] == "done"
+    assert ledger.committed() == pytest.approx(0.25)
+    assert ledger.open_for(job) == []

{subtask_mcp-0.2.4 → subtask_mcp-0.2.7}/tests/test_routing_results.py

@@ -196,16 +196,23 @@ def test_doctor_reports_without_spending(home):
 
 
 def test_active_index_makes_counting_independent_of_history(home):
+    """Counting must not grow with finished jobs: compare with an empty history, not a fixed time."""
     from subtask import admission, config, jobs
 
+    def per_call() -> float:
+        t = time.perf_counter()
+        for _ in range(20):
+            admission.count()
+        return (time.perf_counter() - t) / 20
+
+    admission.count()
+    empty = per_call()
     for i in range(300):
         folder = config.JOBS / f"st-old{i:05d}"
         folder.mkdir(parents=True)
         jobs.write_json(folder / "status.json", {"state": "done"})
-    t = time.perf_counter()
-    for _ in range(20):
-        admission.count()
-    assert (time.perf_counter() - t) / 20 < 0.02  # does not scan 300 finished jobs
+    full = per_call()
+    assert full < empty * 3 + 0.005, (empty, full)  # O(history) would be ~300x
 
 
 def test_narrator_context_includes_observed_activity_not_only_intentions(home):

{subtask_mcp-0.2.4 → subtask_mcp-0.2.7}/tests/test_security.py

@@ -180,3 +180,19 @@ def test_isolated_is_refused_when_bwrap_cannot_run(home, monkeypatch):
     monkeypatch.setattr(runners, "bwrap_available", lambda: False)
     out = core.start("x", engine="kimi", cwd=str(home), policy="isolated")
     assert "bubblewrap" in out and "started" not in out
+
+
+def test_progress_log_survives_multibyte_text_across_the_tail_boundary(home):
+    """Reading the last event seeks back 4096 bytes: that may land inside a UTF-8 character."""
+    import json
+
+    from subtask import events, jobs
+
+    folder = jobs.job_dir("st-utf8utf800")
+    folder.mkdir(parents=True)
+    line = json.dumps({"seq": 1, "msg": "…" * 50}, ensure_ascii=False) + "\n"  # "…" is 3 bytes
+    for pad in range(3):  # one of the three alignments puts byte -4096 inside a "…"
+        body = ("x" * pad + "\n" + line * 40).encode()
+        (folder / "progress.jsonl").write_bytes(body)
+        assert events.emit("st-utf8utf800", "tool", "dopo", source="adapter") is not None, pad
+        assert events.last("st-utf8utf800")["msg"] == "dopo"