@melaya/runner 1.1.79 → 1.1.80

package/dist/assistantHost.py

@@ -229,7 +229,42 @@ def _render_summary_text(summary) -> str:
 # STOP flag: set by the stdin-reader thread, polled by the running turn.
 _stream = {"turnId": "", "lens": {}, "cancel": False, "usedBrowser": False,
            "deltaBuf": "", "deltaMid": "", "deltaAt": 0.0,
-           "thinkLens": {}, "toolIds": set()}
+           "thinkLens": {}, "toolIds": set(),
+           # Progress watchdog (see _progress_watchdog): what the turn is doing
+           # right now and when the client last heard from it.
+           "activity": "", "lastEmitAt": 0.0, "turnStartAt": 0.0}
+
+# One event line at a time: the progress watchdog writes from its own thread.
+_EMIT_LOCK = threading.Lock()
+
+# A turn that is silent this long gets a visible "Still working" status line
+# (2026-11-05, conv 33d90517: a Luma → Google Sheet turn went quiet for 5+
+# minutes and the user pressed STOP four times, never seeing what it was doing).
+_PROGRESS_SILENCE_S = 20.0
+
+
+def _fmt_elapsed(seconds: float) -> str:
+    s = int(max(0, seconds))
+    return f"{s // 60}m {s % 60:02d}s" if s >= 60 else f"{s}s"
+
+
+def _progress_watchdog(turn_id: str, stop: "threading.Event") -> None:
+    """While a turn runs, say what it is doing whenever it has been silent for
+    _PROGRESS_SILENCE_S: one `think` line in the chat and one line in the runner
+    log. Never raises, never touches the turn itself."""
+    while not stop.wait(5.0):
+        try:
+            if _stream.get("turnId") != turn_id:
+                return
+            now = time.monotonic()
+            if now - float(_stream.get("lastEmitAt") or now) < _PROGRESS_SILENCE_S:
+                continue
+            activity = _stream.get("activity") or "waiting for the model"
+            line = f"Still working ({_fmt_elapsed(now - float(_stream.get('turnStartAt') or now))}): {activity}"
+            _log(f"progress turn={turn_id[:8]} {line}")
+            _emit(turn_id, "think", content=f"\n{line}\n")
+        except Exception:
+            pass
 
 # Coalesce per-token pre_print fragments before emitting a `delta`. agentscope
 # hands us one cumulative snapshot per model chunk; a streaming Anthropic/OpenAI
@@ -689,8 +724,12 @@ def _emit(turn_id: str, kind: str, **fields) -> None:
     """Write one structured event line to stdout (flushed) for the runner to relay."""
     try:
         payload = {"turnId": turn_id, "kind": kind, **fields}
-        sys.stdout.write(_EVENT_PREFIX + json.dumps(payload, ensure_ascii=False, default=str) + "\n")
-        sys.stdout.flush()
+        line = _EVENT_PREFIX + json.dumps(payload, ensure_ascii=False, default=str) + "\n"
+        with _EMIT_LOCK:
+            sys.stdout.write(line)
+            sys.stdout.flush()
+        if turn_id:
+            _stream["lastEmitAt"] = time.monotonic()
     except Exception:
         # Never let event emission crash the turn loop.
         pass
@@ -761,6 +800,24 @@ def _emit_turn_files(turn_id: str) -> int:
     return n
 
 
+def _last_tool_input_size(content) -> "tuple[str, int]":
+    """(name, characters of its arguments so far) of the last tool call in a
+    streamed message, so a long silent argument write can be reported."""
+    blocks = content if isinstance(content, (list, tuple)) else [content]
+    for b in reversed(list(blocks)):
+        btype = b.get("type") if isinstance(b, dict) else getattr(b, "type", None)
+        if btype != "tool_use":
+            continue
+        name = b.get("name") if isinstance(b, dict) else getattr(b, "name", "")
+        args = b.get("input") if isinstance(b, dict) else getattr(b, "input", None)
+        try:
+            size = len(args) if isinstance(args, str) else len(json.dumps(args or {}, default=str))
+        except Exception:
+            size = 0
+        return str(name or ""), size
+    return "", 0
+
+
 def _split_stream_blocks(content):
     """Split a streamed message's content into (answer_text, thinking_text,
     [(tool_id, tool_name)]).
@@ -1430,6 +1487,16 @@ def _register_stream_hooks(agent) -> None:
                 return
             mid = str(getattr(msg, "id", "") or id(msg))
             text, thinking, tool_uses = _split_stream_blocks(getattr(msg, "content", msg))
+            # What the progress watchdog reports if the turn goes quiet.
+            if tool_uses:
+                _tname_now, _tchars = _last_tool_input_size(getattr(msg, "content", msg))
+                if _tname_now:
+                    _stream["activity"] = (f"writing the {_tname_now} call ({_tchars // 1024} KB so far)"
+                                           if _tchars >= 1024 else f"writing the {_tname_now} call")
+            elif text:
+                _stream["activity"] = "writing the answer"
+            elif thinking:
+                _stream["activity"] = "thinking"
             # Reasoning (Codex reasoning summaries, Claude thinking) streams to the
             # thinking strip as `think`, never into the answer bubble.
             if thinking:
@@ -1531,8 +1598,29 @@ def _register_stream_hooks(agent) -> None:
         except Exception:
             return False
 
+    def _pre_acting_hook(_self, kw, *_rest) -> None:
+        # Progress only: which tool is running now (no event of its own).
+        try:
+            if getattr(_self, "name", "") != "Assistant" or not _stream.get("turnId") or not isinstance(kw, dict):
+                return
+            tc = kw.get("tool_call") or {}
+            name = tc.get("name", "") if isinstance(tc, dict) else getattr(tc, "name", "")
+            if name:
+                _stream["activity"] = f"running {name}"
+        except Exception:
+            pass
+
+    def _progress_after_tool(_self, kw, *_rest) -> None:
+        try:
+            if getattr(_self, "name", "") == "Assistant" and _stream.get("turnId"):
+                _stream["activity"] = "waiting for the model"
+        except Exception:
+            pass
+
     ok_a = _reg("pre_print", "mel_assistant_delta", _pre_print_hook)
     ok_b = _reg("post_acting", "mel_assistant_tool", _post_acting_hook)
+    _reg("pre_acting", "mel_assistant_progress", _pre_acting_hook)
+    _reg("post_acting", "mel_assistant_progress", _progress_after_tool)
     _HOOKS_REGISTERED = ok_a or ok_b
     _log(f"stream hooks registered (delta={ok_a} tool={ok_b})")
 
@@ -1575,6 +1663,11 @@ def _run_turn(agent, turn_id: str, message: str, browser_turn: bool = False, ima
     _stream["deltaMid"] = ""
     _stream["cancel"] = False  # fresh turn — clear any stale STOP
     _stream["usedBrowser"] = False
+    _stream["activity"] = "waiting for the model"
+    _stream["turnStartAt"] = _stream["lastEmitAt"] = time.monotonic()
+    _progress_stop = threading.Event()
+    threading.Thread(target=_progress_watchdog, args=(turn_id, _progress_stop),
+                     name="mel-progress", daemon=True).start()
 
     # Reset the per-turn sub-agent delegation budget so the breadth cap is per
     # turn, not per session. Best-effort: never let a stale/absent bundle break a
@@ -1622,7 +1715,10 @@ def _run_turn(agent, turn_id: str, message: str, browser_turn: bool = False, ima
         return task.result()
 
     try:
-        result = asyncio.run(_go())
+        try:
+            result = asyncio.run(_go())
+        finally:
+            _progress_stop.set()
     except Exception as exc:
         _log("turn error:\n" + traceback.format_exc())
         _stream["turnId"] = ""

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@melaya/runner",
-  "version": "1.1.79",
+  "version": "1.1.80",
   "description": "Run Melaya AI pipelines locally with your own LM Studio or Ollama models",
   "license": "Apache-2.0",
   "author": "Melaya Labs LLC",