multacd 2.0.0b4__tar.gz → 2.0.0b5__tar.gz

{multacd-2.0.0b4 → multacd-2.0.0b5}/.github/workflows/release.yml

@@ -101,7 +101,7 @@ jobs:
 
             ```bash
             pkg install -y python git
-            pip install "multacd==2.0.0b4"
+            pip install "multacd==2.0.0b5"
             ```
 
             Windows (PowerShell):

{multacd-2.0.0b4 → multacd-2.0.0b5}/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 Format: Keep a Changelog. Versi: Semantic Versioning.
 
+## [2.0.0b5] - 2026-09-12
+
+Beta v2 kelima — fix chat 2-turn 400 (#25): `add_assistant_tool_calls`
+omit key `tool_calls` saat tanpa tool + `_sanitize_messages` safety net
+di openai_compat. Belajar dari opencode `transform.ts` (part kosong
+tidak pernah dikirim). Install: `pip install "multacd==2.0.0b5"`.
+
 ## [2.0.0b4] - 2026-09-12
 
 Beta v2 keempat — Termux harusnya tembus sekarang (#24): `pydantic`

{multacd-2.0.0b4 → multacd-2.0.0b5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: multacd
-Version: 2.0.0b4
+Version: 2.0.0b5
 Summary: Agentic TUI for coding, research, and personal automation
 Project-URL: Homepage, https://github.com/prototypeall850-creator/multacd
 Project-URL: Issues, https://github.com/prototypeall850-creator/multacd/issues

{multacd-2.0.0b4 → multacd-2.0.0b5}/core/providers/openai_compat.py

@@ -136,6 +136,29 @@ def map_http_error(status: int, body: str, model: str) -> ProviderError:
     return ProviderError(f"Provider error HTTP {status}. {snippet}".strip())
 
 
+def _sanitize_messages(messages: list[dict[str, Any]]) -> list[dict[str, Any]]:
+    """Bersihkan messages sebelum kirim (ala opencode transform.ts).
+
+    - `tool_calls: []` / None → key di-drop (provider strict 400 kalau
+      array kosong ikut terkirim — issue #25).
+    - `content: None` tanpa tool_calls → `""` (beberapa gateway nolak null).
+    - `content: None` + tool_calls non-kosong → dibiarkan (valid OpenAI).
+    Pure function — input tidak dimutasi.
+    """
+    clean: list[dict[str, Any]] = []
+    for m in messages:
+        if not isinstance(m, dict):
+            continue
+        msg = dict(m)
+        tcs = msg.get("tool_calls")
+        if not tcs:
+            msg.pop("tool_calls", None)
+        if msg.get("content") is None and not msg.get("tool_calls"):
+            msg["content"] = ""
+        clean.append(msg)
+    return clean
+
+
 async def stream_chat(spec: ProviderSpec, api_key: str,
                       messages: list[dict[str, Any]],
                       tools: list[dict[str, Any]] | None,
@@ -146,7 +169,7 @@ async def stream_chat(spec: ProviderSpec, api_key: str,
     """Kirim chat completions streaming. `client` injeksi buat test."""
     body: dict[str, Any] = {
         "model": spec.model,
-        "messages": messages,
+        "messages": _sanitize_messages(messages),
         "stream": True,
         "stream_options": {"include_usage": True},
         "max_tokens": max_tokens,

{multacd-2.0.0b4 → multacd-2.0.0b5}/core/version.py

@@ -8,7 +8,7 @@ Saat bump versi (Step 10 → 1.0.0): ubah pyproject + FALLBACK di sini.
 
 from __future__ import annotations
 
-FALLBACK = "2.0.0b4"  # beta v2; samakan dengan pyproject.toml
+FALLBACK = "2.0.0b5"  # beta v2; samakan dengan pyproject.toml
 
 
 def get_version() -> str:

{multacd-2.0.0b4 → multacd-2.0.0b5}/memory/context.py

@@ -56,9 +56,18 @@ class ConversationContext:
         (mis. ToolCallRequest dari core.llm_client). Wajib ada agar
         provider tidak 400 pada turn berikutnya (tool_call_id harus
         merujuk ke assistant message sebelumnya).
+
+        Belajar dari opencode (AI SDK): tool adalah content part —
+        part kosong tidak pernah dikirim. Jadi kalau `calls` kosong,
+        key `tool_calls` di-OMIT total (bukan `[]`): provider strict
+        (400 `tool_calls must be non-empty if provided`) nolak array
+        kosong. Lihat issue #25.
         """
         import json as _json
 
+        if not calls:
+            self._messages.append({"role": "assistant", "content": text or ""})
+            return
         self._messages.append({
             "role": "assistant",
             "content": text or None,

{multacd-2.0.0b4 → multacd-2.0.0b5}/pyproject.toml

@@ -8,7 +8,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "multacd"
-version = "2.0.0b4"
+version = "2.0.0b5"
 description = "Agentic TUI for coding, research, and personal automation"
 readme = "README.md"
 requires-python = ">=3.10"

{multacd-2.0.0b4 → multacd-2.0.0b5}/scripts/install.sh

@@ -78,7 +78,7 @@ termux_pip_guide() {
     echo "     (ringan: tanpa kompilasi Rust — dependensi wheel murni)"
     echo ""
     echo "  2. Install multacd:"
-    echo "     pip install \"multacd==2.0.0b4\""
+    echo "     pip install \"multacd==2.0.0b5\""
     echo ""
     echo "  3. Jalankan: multacd"
     echo ""

{multacd-2.0.0b4 → multacd-2.0.0b5}/tests/integration/test_agent_loop.py

@@ -34,6 +34,10 @@ def test_plain_text_no_tool(sample_config, fake_llm_factory):
     events = _run(_drain(run_agent("hi", ctx, sample_config, llm_client=fake)))
     assert isinstance(events[-1], AgentDone)
     assert "halo" in events[-1].text
+    # #25: assistant tanpa tool TIDAK boleh bawa key tool_calls
+    # (provider strict 400 kalau array kosong ikut terkirim).
+    assts = [m for m in ctx.get_messages() if m.get("role") == "assistant"]
+    assert assts and all("tool_calls" not in m for m in assts), assts
 
 
 def test_single_auto_tool_runs(sample_config, fake_llm_factory, tmp_path):