power-loop 6.46.2__tar.gz → 6.46.4__tar.gz

{power_loop-6.46.2 → power_loop-6.46.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: power-loop
-Version: 6.46.2
+Version: 6.46.4
 Summary: Embeddable agent execution kernel — LLM loop, hooks, events, tools, dynamic sub-agents.
 Author-email: zhangran <zhangran24@126.com>
 License: MIT

{power_loop-6.46.2 → power_loop-6.46.4}/power_loop/__init__.py

@@ -15,7 +15,7 @@ Stability tiers
 无版本承诺，可随时变更或删除。
 """
 
-__version__ = "6.46.2"
+__version__ = "6.46.4"
 
 # Public LLM contract (SDK-free) re-exported so callers (e.g. writing llm.* hooks or
 # a custom LLMService) don't reach into the internal vendored transport package (H3.4).

{power_loop-6.46.2 → power_loop-6.46.4}/power_loop/workflow/engine.py

@@ -514,7 +514,10 @@ class WorkflowEngine:
             lc = {"loop_id": node.id, "iteration": iteration, "max": node.max_iterations,
                   "continue": set(node.continue_nodes), "prev": dict(prev), "why": why,
                   "feedback": self._loop_feedback(feedback_node) if iteration > 1 else ""}
-            await self._exec(node.body, {**env, _LOOP_KEY: lc, "loop_iteration": iteration}, driver_sid)
+            body_result = await self._exec(node.body, {**env, _LOOP_KEY: lc, "loop_iteration": iteration}, driver_sid)
+            if body_result is not None and body_result.status not in ("completed", "skipped") and body_result.node_id not in self._tolerated:
+                why = f"上游 {body_result.node_id} 未完成：{body_result.status}；审核与下一轮已阻断"
+                break
             for nid in node.continue_nodes:
                 r = self._results.get(nid)
                 if r is not None and r.session_id:
@@ -526,7 +529,9 @@ class WorkflowEngine:
         last = {nid: {"status": r.status, "text": (r.text or "")[:4000], "payload": r.payload, "session_id": r.session_id}
                 for nid in body_ids if (r := self._results.get(nid)) is not None}
         payload = {"converged": converged, "iterations": iteration, "why": why, "last": last}
-        ok = converged or (node.on_exhausted == "continue" and not self._cancel.is_cancelled())
+        broken = any(r.status not in ("completed", "skipped") and nid not in self._tolerated
+                     for nid in body_ids if (r := self._results.get(nid)) is not None)
+        ok = converged or (node.on_exhausted == "continue" and not broken and not self._cancel.is_cancelled())
         err = None if converged else (f"跑了 {iteration} 轮仍不满足 until：{why}" if not self._cancel.is_cancelled()
                                       else "循环被取消")
         res = AgentResult(node_id=node.id, status="completed" if ok else ("cancelled" if self._cancel.is_cancelled() else "failed"),
@@ -789,7 +794,7 @@ class WorkflowEngine:
 
         res = AgentResult(
             node_id=node.id,
-            status=str(raw.get("status")),
+            status="failed" if err else str(raw.get("status")),
             text=raw.get("final_text") or "",
             payload=payload,
             usage=dict(raw.get("usage") or {}),
@@ -804,7 +809,6 @@ class WorkflowEngine:
         self._add_usage(res.usage)
         if self._budget is not None:
             self._budget.commit(res.usage)
-        await self._emit_step(res)
 
         # ── 兜底节点：所有 attempt 用尽仍失败时跑，成功则**顶替**本节点的结果供下游引用 ──
         if res.status != "completed" and node.fallback is not None and not self._cancelled:
@@ -825,6 +829,7 @@ class WorkflowEngine:
         # continue_on_error:失败但明确放行——记下来,run 终态判定跳过它。被单独取消的节点同样放行。
         if (res.status == "failed" and node.continue_on_error) or node.id in self._node_cancelled:
             self._tolerated.add(node.id)
+        await self._emit_step(res)
         return res
 
     def _session_cb(self, node_id: str) -> Callable[[str], Awaitable[None]]:
@@ -952,6 +957,8 @@ class WorkflowEngine:
             last = await self._exec(step, env, driver_sid)
             if self._budget_hit or self._cancelled:
                 break
+            if last is not None and last.status not in ("completed", "skipped") and last.node_id not in self._tolerated:
+                break
         return last
 
     async def _gather_branches(
@@ -1014,7 +1021,9 @@ class WorkflowEngine:
         for r in gathered:
             if isinstance(r, BaseException):
                 self._errors.append(f"parallel branch error: {r}")
-        return next((r for r in reversed(gathered) if isinstance(r, AgentResult)), None)
+        broken = next((r for r in gathered if isinstance(r, AgentResult)
+                       and r.status not in ("completed", "skipped") and r.node_id not in self._tolerated), None)
+        return broken or next((r for r in reversed(gathered) if isinstance(r, AgentResult)), None)
 
     async def _exec_foreach(self, node: ForeachNode, env: dict[str, Any], driver_sid: str) -> AgentResult | None:
         # Resume: a foreach is replayed atomically via its journaled aggregate.

{power_loop-6.46.2 → power_loop-6.46.4}/power_loop/workflow/runner.py

@@ -80,6 +80,11 @@ _HANDLES: dict[str, WorkflowRunHandle] = {}
 #: runs stopped by :func:`stop_run` — they settle ``cancelled`` and must NOT wake the parent agent
 #: (the user said stop; a "your workflow finished" wake-up would contradict them).
 _STOPPED_RUNS: set[str] = set()
+#: runs whose engine finished and whose journal is final, but whose background task is still
+#: delivering the completion (``on_complete`` / wake). From here on the run is NOT live: the woken
+#: parent may nudge / resume its leaves and a stop is a no-op (6.46.3 — the parent's whole wake
+#: turn ran inside that task, so ``nudge`` was refused and ``cancel`` deadlocked on itself).
+_SETTLED_RUNS: set[str] = set()
 
 
 def get_run_handle(run_id: str) -> WorkflowRunHandle | None:
@@ -94,8 +99,10 @@ async def stop_run(run_id: str, *, grace_s: float = 60.0, reason: str = "stopped
     if handle is None:
         return "unknown"
     task = handle.task
-    if task is None or task.done():
+    if task is None or task.done() or run_id in _SETTLED_RUNS:
         return "finished"
+    if task is asyncio.current_task():
+        return "finished"      # called from inside the run's own completion delivery — never wait on ourselves
     _STOPPED_RUNS.add(run_id)
     handle.cancel(reason)
     done, _ = await asyncio.wait({task}, timeout=grace_s)
@@ -370,6 +377,9 @@ def spawn_background(
             status = "failed"
             note = _wake_note(run_id, "failed", repr(exc))
             _publish(loop, parent_sid, run_id, "failed", "failed", level="error")
+        # The journal is final: the run is over even though this task still delivers the wake below.
+        _LIVE_RUN_IDS.discard(run_id)
+        _SETTLED_RUNS.add(run_id)
         if run_id in _STOPPED_RUNS:
             return  # stopped by request — journaled as cancelled, no wake (design/124 §8.4)
         if on_complete is not None:
@@ -386,6 +396,7 @@ def spawn_background(
     # In-process liveness (workflow-durability-3): mark live now, discard when the task settles —
     # a crashed run is therefore NOT marked live, so resume-after-crash still works.
     _LIVE_RUN_IDS.add(run_id)
+    _SETTLED_RUNS.discard(run_id)      # a resumed run starts unsettled again
     task.add_done_callback(lambda _t: _LIVE_RUN_IDS.discard(run_id))
     handle = WorkflowRunHandle(run_id=run_id, task=task, cancel_token=cancel_token)
     _HANDLES[run_id] = handle
@@ -394,6 +405,7 @@ def spawn_background(
         if _HANDLES.get(run_id) is handle:
             _HANDLES.pop(run_id, None)
         _STOPPED_RUNS.discard(run_id)
+        _SETTLED_RUNS.discard(run_id)
 
     task.add_done_callback(_forget)
     return handle

{power_loop-6.46.2 → power_loop-6.46.4}/power_loop.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: power-loop
-Version: 6.46.2
+Version: 6.46.4
 Summary: Embeddable agent execution kernel — LLM loop, hooks, events, tools, dynamic sub-agents.
 Author-email: zhangran <zhangran24@126.com>
 License: MIT